[CODE]: 出库、调拨、货转 回显字典表数据

src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -2159,7 +2159,7 @@
         this.warehouseDrList.push({
           fCorpid: null,
           fFeeid: null,
-          fFeeunitid: 1,
+          fFeeunitid: "1",
           fQty: fQty,
           fUnitprice: 0,
           fAmount: 0,
@@ -2185,7 +2185,7 @@
         this.warehouseCrList.push({
           fCorpid: null,
           fFeeid: null,
-          fFeeunitid: 1,
+          fFeeunitid: "1",
           fQty: fQty,
           fUnitprice: 0,
           fAmount: 0,
@@ -2442,9 +2442,15 @@
           this.goodsOptions = response.data.goodsList
           if (response.data.warehousebillsfeesDr) {
             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.enclosures) {
             this.relevantAttachments = response.data.enclosures;

src/views/warehouseBusiness/outStock/index.vue

@@ -3044,9 +3044,9 @@ export default {
         }
         let qty = 1;
         if (this.dialogWhgenlegList[zhgen].fFeeUnitid === 1) {
-          qty = (this.fQty/1000).toFixed(2)
+          qty = this.fQty
         } else if (this.dialogWhgenlegList[zhgen].fFeeUnitid === 2) {
-          qty = (this.fGrossweight/1000).toFixed(2)
+          qty = this.fGrossweight
         } else if (this.dialogWhgenlegList[zhgen].fFeeUnitid === 3) {
           qty = this.fNetweight
         } else if (this.dialogWhgenlegList[zhgen].fFeeUnitid === 4) {
@@ -3059,7 +3059,7 @@ export default {
             fQty: qty,
             fCorpid: this.dialogWhgenlegList[zhgen].fCorpid,
             fFeeid: feeId,
-            fFeeunitid: this.dialogWhgenlegList[zhgen].fFeeUnitid,
+            fFeeunitid: this.dialogWhgenlegList[zhgen].fFeeUnitid + '',
             fUnitprice: this.dialogWhgenlegList[zhgen].fPrice,
             fCurrency: 'RMB',
             fExrate: 1,
@@ -3072,7 +3072,7 @@ export default {
             fQty: qty,
             fCorpid: this.dialogWhgenlegList[zhgen].fCorpid,
             fFeeid: feeId,
-            fFeeunitid: this.dialogWhgenlegList[zhgen].fFeeUnitid,
+            fFeeunitid: this.dialogWhgenlegList[zhgen].fFeeUnitid + '',
             fUnitprice: this.dialogWhgenlegList[zhgen].fPrice,
             fCurrency: 'RMB',
             fExrate: 1,
@@ -3609,13 +3609,13 @@ export default {
         this.kqhouseOptions = response.data.warehouseAreas;
         this.warehouseDrList = response.data.warehousebillsfeesDr;
         for (let dr in this.warehouseDrList) {
-          this.$set(this.warehouseDrList[dr], "fFeeUnitid", this.warehouseDrList[dr].fFeeunitid + "");
+          this.$set(this.warehouseDrList[dr], "fFeeunitid", this.warehouseDrList[dr].fFeeunitid + '');
           this.$set(this.warehouseDrList[dr], "fQty", this.warehouseDrList[dr].fQty.toFixed(2));
           this.$set(this.warehouseDrList[dr], "fAmount", this.warehouseDrList[dr].fAmount.toFixed(2));
         }
         this.warehouseCrList = response.data.warehousebillsfeesCr;
         for (let cr in this.warehouseCrList) {
-          this.$set(this.warehouseCrList[cr], "fFeeUnitid", this.warehouseCrList[cr].fFeeunitid + "");
+          this.$set(this.warehouseCrList[cr], "fFeeunitid", this.warehouseCrList[cr].fFeeunitid + "");
         }
         this.userOptions = response.data.sysUser;
         this.open = true;
@@ -3800,15 +3800,15 @@ export default {
           volumn = parseFloat(Number(volumn) + Number(this.dataList[li].volumn)).toFixed(2)
         }
       }
-      if (row.fFeeunitid === 1) {
+      if (row.fFeeunitid == "1") {
         this.$set(row, 'fQty', (fQty/1000).toFixed(2))
-      } else if (row.fFeeunitid === 2) {
+      } else if (row.fFeeunitid == "2") {
         this.$set(row, 'fQty', (fGrossweight/1000).toFixed(2))
-      }else if (row.fFeeunitid === 3) {
+      }else if (row.fFeeunitid == "3") {
         this.$set(row, 'fQty', (fNetweight/1000).toFixed(2))
-      }else if (row.fFeeunitid === 4) {
+      }else if (row.fFeeunitid == "4") {
         this.$set(row, 'fQty', (volumn/1000).toFixed(2))
-      }else if (row.fFeeunitid === 5) {
+      }else if (row.fFeeunitid == "5") {
         this.$set(row, 'fQty', (fixed/1000).toFixed(2))
       }
       if (row.fUnitprice) {

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -2256,11 +2256,11 @@ export default {
       fWbuOptions: [],
       // 计价单位
       jFeetunitOptions: [
-        {dictLabel: "件数",dictValue: 1},
+        /*{dictLabel: "件数",dictValue: 1},
         {dictLabel: "毛重",dictValue: 2},
         {dictLabel: "净重",dictValue: 3},
         {dictLabel: "尺码",dictValue: 4},
-        {dictLabel: "固定",dictValue: 5},
+        {dictLabel: "固定",dictValue: 5},*/
       ],
       // 查询参数
       queryParams: {
@@ -2384,6 +2384,9 @@ export default {
     this.getDicts("sys_common_status").then((response) => {
       this.fBillstatusOptions = response.data;
     });
+    this.getDicts("data_unitfees").then((response) => {
+      this.jFeetunitOptions = response.data;
+    });
     this.register()
   },
   activated(){
@@ -2717,7 +2720,7 @@ export default {
             fQty: qty,
             fCorpid: this.dialogWhgenlegList[zhgen].fCorpid,
             fFeeid: feeId,
-            fFeeunitid: this.dialogWhgenlegList[zhgen].fFeeUnitid,
+            fFeeunitid: this.dialogWhgenlegList[zhgen].fFeeUnitid + '',
             fUnitprice: this.dialogWhgenlegList[zhgen].fPrice,
             fCurrency: 'RMB',
             fExrate: 1,
@@ -2729,7 +2732,7 @@ export default {
             fQty: qty,
             fCorpid: this.dialogWhgenlegList[zhgen].fCorpid,
             fFeeid: feeId,
-            fFeeunitid: this.dialogWhgenlegList[zhgen].fFeeUnitid,
+            fFeeunitid: this.dialogWhgenlegList[zhgen].fFeeUnitid + '',
             fUnitprice: this.dialogWhgenlegList[zhgen].fPrice,
             fCurrency: 'RMB',
             fExrate: 1,
@@ -3322,8 +3325,17 @@ export default {
         if (response.data.warehouse) {
           this.warehouseDrList = response.data.warehousebillsfeesDr;
         }
+        if (response.data.warehousebillsfeesDr) {
+          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
@@ -3506,15 +3518,15 @@ export default {
           volumn = parseFloat(Number(volumn) + Number(this.dataList[li].volumn)).toFixed(2)
         }
       }
-      if (row.fFeeunitid === 1) {
+      if (row.fFeeunitid == "1") {
         this.$set(row, 'fQty', (fQty/1000).toFixed(2))
-      } else if (row.fFeeunitid === 2) {
+      } else if (row.fFeeunitid == "2") {
         this.$set(row, 'fQty', (fGrossweight/1000).toFixed(2))
-      }else if (row.fFeeunitid === 3) {
+      }else if (row.fFeeunitid == "3") {
         this.$set(row, 'fQty', (fNetweight/1000).toFixed(2))
-      }else if (row.fFeeunitid === 4) {
+      }else if (row.fFeeunitid == "4") {
         this.$set(row, 'fQty', (volumn/1000).toFixed(2))
-      }else if (row.fFeeunitid === 5) {
+      }else if (row.fFeeunitid == "5") {
         this.$set(row, 'fQty', (fixed/1000).toFixed(2))
       }
       if (row.fUnitprice) {