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

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -3169,9 +3169,15 @@ export default {
         }
         if (response.data.warehouse) {
           this.warehouseDrList = response.data.warehousebillsfeesDr;
+          for (let dr in this.warehouseDrList) {
+            this.$set(this.warehouseDrList[dr], "fFeeunitid", this.warehouseDrList[dr].fFeeunitid + '');
+          }
         }
         if (response.data.warehousebillsfeesCr) {
           this.warehouseCrList = response.data.warehousebillsfeesCr;
+          for (let cr in this.warehouseCrList) {
+            this.$set(this.warehouseCrList[cr], "fFeeunitid", this.warehouseCrList[cr].fFeeunitid + "");
+          }
         }
         if (response.data.sysUser) {
           this.userVal = response.data.sysUser

src/views/warehouseBusiness/storageFeeCalculation/index.vue

@@ -953,7 +953,7 @@
         // 制单部门
         deptOptions: [],
         // 计费单位(数据字典),下拉选择毛重或净重字典
-        fFeetunitOptions: [{
+        fFeetunitOptions: [/*{
           dictLabel: '件数',
           dictValue: 1
         }, {
@@ -968,7 +968,7 @@
         }, {
           dictLabel: '固定',
           dictValue: 5
-        }],
+        }*/],
         fTaxrate: 0,
         // 费用名称
         fWbuOptions: [],
@@ -1034,6 +1034,9 @@
       this.getDicts("tax_rate").then((response) => {
         this.fTaxrate = response.data[0].dictValue
       });
+      this.getDicts('data_unitfees').then((response) => {
+        this.fFeetunitOptions = response.data
+      })
       this.register()
     },
     activated(){
@@ -1237,7 +1240,7 @@
         this.warehouseDrList.push({
           fCorpid: null,
           fFeeid: null,
-          fFeeunitid: 2,
+          fFeeunitid: "2",
           fQty: 0,
           fUnitprice: 0,
           fAmount: 0,
@@ -1401,6 +1404,9 @@
           }
           if (response.data.warehouseFeesList) {
             this.warehouseDrList = response.data.warehouseFeesList
+            for (let dr in this.warehouseDrList) {
+              this.$set(this.warehouseDrList[dr], "fFeeunitid", this.warehouseDrList[dr].fFeeunitid + '');
+            }
           }
           if (response.data.feesList) {
             this.fWbuOptions = response.data.feesList
@@ -1440,6 +1446,9 @@
           }
           if (response.data.warehouseFeesList) {
             this.warehouseDrList = response.data.warehouseFeesList
+            for (let dr in this.warehouseDrList) {
+              this.$set(this.warehouseDrList[dr], "fFeeunitid", this.warehouseDrList[dr].fFeeunitid + '');
+            }
           }
           if (response.data.feesList) {
             this.fWbuOptions = response.data.feesList