Merge branch 'dev' of git.echepei.com:zhujiawei/Warehouse_management_ui into dev

src/views/finance/contrast/index.vue

@@ -3296,19 +3296,24 @@ export default {
       };
       this.innerVisible = true;
       this.feeList = [];
+      // this.TWareHouseFees = {
+      //   fCorpid: "",
+      //   fToCorpid: this.queryParams.fCorpid,
+      //   fMblno: "",
+      //   fStatementNo: "",
+      //   fFeeid: "",
+      //   timeExamine: "",
+      //   timeInterval: "",
+      //   fSrcdc: "",
+      //   fReconciliation: "0",
+      //   timeReconci: "",
+      //   fDc: "D",
+      //   fBilltype: "",
+      // };
       this.TWareHouseFees = {
-        fCorpid: "",
         fToCorpid: this.queryParams.fCorpid,
-        fMblno: "",
-        fStatementNo: "",
-        fFeeid: "",
-        timeExamine: "",
-        timeInterval: "",
-        fSrcdc: "",
         fReconciliation: "0",
-        timeReconci: "",
         fDc: "D",
-        fBilltype: "",
       };
       if (this.queryParams.fCorpid) {
         this.doNot = true;

src/views/warehouseBusiness/agreement/index.vue

@@ -219,7 +219,6 @@
       :visible.sync="open" width="65%"
       append-to-body
       :show-close="colseButton"
-      :close-on-click-modal="false"
     >
       <template slot="title">
         <div class="avue-crud__dialog__header">
@@ -952,7 +951,7 @@ export default {
       if (name == null || name === '') {
         return false
       }
-      let queryParams = { pageNum: 1, pageSize: 10, fName: name }
+      let queryParams = { fName: name }
       listFees(queryParams).then((response) => {
         this.fWbuOptions = response.rows
       })
@@ -1045,6 +1044,8 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+      this.form = {}
+      this.agreementitemsList = []
       this.reset()
       // this.agreementitemsList = {
       //   fFeeunitid:'',
@@ -1101,6 +1102,10 @@ export default {
             // this.fWRemoteMethod(this.agreementitemsList[item].fFeeid)
           }
           this.fWbuOptions = response.data.feesList
+          let queryParams = { fName: name }
+          listFees(queryParams).then((response) => {
+            this.fWbuOptions = response.rows
+          })
           this.add = row
           this.open = true
           this.title = '修改仓储费'