高敬炎 преди 2 години
родител
ревизия
305dd8f931
променени са 2 файла, в които са добавени 9 реда и са изтрити 9 реда
  1. 1 1
      src/views/outboundManagement/weighingManagementNew.vue
  2. 8 8
      src/views/profitable/expensemanagementdetails.vue

+ 1 - 1
src/views/outboundManagement/weighingManagementNew.vue

@@ -1534,7 +1534,7 @@
           //   })
           //   return
           // }
-          console.log(this.outContractNo)
+          console.log(this.outContractNo,1111)
           if(this.weighingList.agreementType!='代储合同'&&this.tpyeNo == 1){
             if(this.weighingList.agreementType=='销售合同'&&this.outContractNo.settlementWeightMethod==1||this.weighingList.agreementType!='销售合同'){
               if (!this.weighingList.contractPrice && this.weighingList.inOutType != '移库出库'

+ 8 - 8
src/views/profitable/expensemanagementdetails.vue

@@ -169,7 +169,7 @@
             <template slot-scope="scope">
               <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
                 src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" />
-              <span v-if="scope.row.addressUrlArray != null">
+              <span v-show="scope.row.addressUrlArray != null">
                 {{
                   scope.row.addressUrlArray.length == 0
                     ? ''
@@ -190,21 +190,21 @@
           </el-table-column>
           <el-table-column prop="address" label="操作" width="300">
             <template slot-scope="scope">
-              <el-button v-if="scope.row.expenseName != '保证金抵粮款'" @click="look(scope.row)" type="primary">查看</el-button>
-              <el-button v-if="
+              <el-button v-show="scope.row.expenseName != '保证金抵粮款'" @click="look(scope.row)" type="primary">查看</el-button>
+              <el-button v-show="
                 (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-if="
+                <el-button v-show="
                   scope.row.status == '待确认' && scope.row.expenseName != '保证金抵粮款'
                 " @click="shoukuanqueren(scope.row)" type="primary">确认</el-button>
-                <el-button v-if="
+                <el-button v-show="
                   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-if="
+              <el-button v-show="
                 (scope.row.expensesPurpose == 1 &&
                   scope.row.status == '已收款' &&
                   !scope.row.approveStatus) ||
@@ -215,8 +215,8 @@
                   scope.row.status == '已付款' &&
                   !scope.row.approveStatus)
               " @click="accomplish(scope.row)" type="primary">完成</el-button>
-              <el-button v-if="scope.row.approveStatus && scope.row.approveStatus != '发起人撤回'"
-                v-show="scope.row.showFlag" @click="withdraw(scope.row)" type="primary">撤回</el-button>
+              <div v-show="scope.row.showFlag"><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>
               <el-button v-if="