Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/profitable/expenseallot.vue

@@ -586,7 +586,7 @@
         this.feeDetailsDistributions=[{proDate:'',weight:'',money:'',warehouse:'',belonging:'',index:0}]
         this.goodsourcelist = []
         this.$router.push({
-          path:'expensemanagementdetails'
+          name:'expensemanagementdetails'
         })
       },
        submit(){

src/views/profitable/expensemanagementdetails.vue

@@ -188,23 +188,23 @@
               <i @click="handlerecord(scope.row)" class="el-icon-s-claim"></i>
             </template>
           </el-table-column>
-          <el-table-column prop="address" label="操作" width="300">
+          <el-table-column prop="address" label="操作" width="500">
             <template slot-scope="scope">
-              <el-button v-show="scope.row.expenseName != '保证金抵粮款'" @click="look(scope.row)" type="primary">查看</el-button>
-              <el-button v-show="
+              <el-button v-if="scope.row.expenseName != '保证金抵粮款'" @click="look(scope.row)" type="primary">查看</el-button>
+              <el-button v-if="
                 (scope.row.expensesPurpose == 1 &&
                   scope.row.status == '待确认')
               " @click="chehui(scope.row)" type="primary">撤回</el-button>
               <div v-hasPermission="`lirunhesuan.feiyongguanli.queshou`" style="display: inline-block">
-                <el-button v-show="
+                <el-button v-if="
                   scope.row.status == '待确认' && scope.row.expenseName != '保证金抵粮款'
                 " @click="shoukuanqueren(scope.row)" type="primary">确认</el-button>
-                <el-button v-show="
+                <el-button v-if="
                   scope.row.status == '待确认' && scope.row.expenseName == '保证金抵粮款'
                 " @click="shoukuanqueren1(scope.row)" type="primary">确认</el-button>
               </div>
               <!-- <el-button v-if='scope.row.approveStatus=="待确认"' @click="accomplish(scope.row)" type="primary">完成</el-button> -->
-              <el-button v-show="
+              <el-button v-if="
                 (scope.row.expensesPurpose == 1 &&
                   scope.row.status == '已收款' &&
                   !scope.row.approveStatus) ||
@@ -215,7 +215,7 @@
                   scope.row.status == '已付款' &&
                   !scope.row.approveStatus)
               " @click="accomplish(scope.row)" type="primary">完成</el-button>
-              <div v-show="scope.row.showFlag"><el-button v-if="scope.row.approveStatus && scope.row.approveStatus != '发起人撤回'"
+              <div v-if="scope.row.showFlag" style="display: inline-block"><el-button v-if="scope.row.approveStatus && scope.row.approveStatus != '发起人撤回'"
                  @click="withdraw(scope.row)" type="primary">撤回</el-button></div>
               <el-button v-if="(scope.row.status == '已驳回' ) || (scope.row.approveStatus == '发起人撤回' && scope.row.expensesType != 1)|| (scope.row.status == '已撤回' && scope.row.expensesType== 1)" @click="edit(scope.row)"
                 type="primary">编辑</el-button>