Browse Source

协议管理OK

caojunjie 4 years ago
parent
commit
7b4e813be9

+ 4 - 1
src/views/agreement/agreementTask/index.vue

@@ -635,7 +635,9 @@ export default {
       }
       let queryParams = { pageNum: 1, pageSize: 10, fName: name };
       listFees(queryParams).then((response) => {
-        this.fWbuOptions = response.rows;
+        let fWbuOptions = this.fWbuOptions.concat(response.rows)
+        this.fWbuOptions = Array.from(new Set(fWbuOptions))
+        console.log(this.fWbuOptions)
       });
     },
     /** 新增按钮操作 */
@@ -669,6 +671,7 @@ export default {
         for (let item in this.agreementitemsList) {
           this.$set(this.agreementitemsList[item], 'fFeeunitid', this.agreementitemsList[item].fFeeunitid + '')
         }
+        this.fWbuOptions = response.data.feesList
         console.log(JSON.stringify(this.agreementitemsList))
 
         this.open = true

+ 3 - 3
src/views/index.vue

@@ -97,7 +97,7 @@ export default {
       version: "3.2.1",
       tableData: [{
         date: '2020-11-20 12:00',
-        name: "<p>维护内容</p>",
+        name: "某客户账单审核",
         address: '查看详情'
       }, {
         date: '2020-11-20 12:00',
@@ -242,8 +242,8 @@ export default {
                   }
                 }
               },
-              {value: 500, name: '荆州'},
-              {value: 500, name: '兖州'},
+              {value: 200, name: '1号仓库'},
+              {value: 500, name: '剩余库容'},
             ],
             emphasis: {
               itemStyle: {

+ 21 - 14
src/views/warehouseBusiness/agreement/index.vue

@@ -342,14 +342,14 @@
           header-align="center"
           align="center"
           width="180px"
-          label="费用名称"
+          label="费用名称1"
         >
           <template slot-scope="scope">
             <el-select
               v-model="scope.row.fFeeid"
               filterable
-              :disabled="browseStatus"
               remote
+              :disabled="browseStatus"
               :remote-method="fWRemoteMethod"
               placeholder="费用名称"
             >
@@ -434,6 +434,7 @@ export default {
       agreementList: [],
       // 弹出层标题
       title: '',
+      add:'',
       // 是否显示弹出层
       open: false,
       // 结算方式,也可以从表t_stltypes中下拉选择,存储id,显示name字典
@@ -562,7 +563,20 @@ export default {
         this.loading = false
       })
     },
-
+// 远程模糊查询费用名称
+    fWRemoteMethod(name) {
+      if (name == null || name === "") {
+        return false;
+      }
+      let queryParams = { pageNum: 1, pageSize: 10, fName: name };
+      listFees(queryParams).then((response) => {
+        // this.fWbuOptions = response.rows;
+        // console.log(response)
+        let fWbuOptions = this.fWbuOptions.concat(response.rows)
+        this.fWbuOptions = Array.from(new Set(fWbuOptions))
+        console.log(this.fWbuOptions)
+      });
+    },
     // 结算方式,也可以从表t_stltypes中下拉选择,存储id,显示name字典翻译
     fStltypeidFormat(row, column) {
       return this.selectDictLabel(this.fStltypeidOptions, row.fStltypeid)
@@ -648,16 +662,6 @@ export default {
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
-    // 远程模糊查询费用名称
-    fWRemoteMethod(name) {
-      if (name == null || name === "") {
-        return false;
-      }
-      let queryParams = { pageNum: 1, pageSize: 10, fName: name };
-      listFees(queryParams).then((response) => {
-        this.fWbuOptions = response.rows;
-      });
-    },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset()
@@ -686,9 +690,12 @@ export default {
         this.agreementitemsList = response.data.tWarehouseAgreementitems
         for (let item in this.agreementitemsList) {
           this.$set(this.agreementitemsList[item], 'fFeeunitid', this.agreementitemsList[item].fFeeunitid + '')
+          // this.fWRemoteMethod(this.agreementitemsList[item].fFeeid)
         }
+        // console.log(response.data.feesList)
+        this.fWbuOptions = response.data.feesList
+        this.add = row
         console.log(JSON.stringify(this.agreementitemsList))
-
         this.open = true
         this.title = '修改仓储费'
       })