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

src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -1935,13 +1935,20 @@
                 this.formBrowseStatus = true
               }
               this.$set(this.dataList[list], 'fBsdate', Date.parse(this.dataList[list].fBsdate))
+              this.$set(this.dataList[list], 'fBusinessType', this.dataList[list].fBusinessType + '')
             }
             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;
@@ -2401,13 +2408,20 @@
               this.formBrowseStatus = true
             }
             this.$set(this.dataList[list], 'fBsdate', Date.parse(this.dataList[list].fBsdate))
+            this.$set(this.dataList[list], 'fBusinessType', this.dataList[list].fBusinessType + '')
           }
           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/inStock/index.vue

@@ -3125,6 +3125,7 @@ export default {
               "fBsdate",
               Date.parse(this.dataList[list].fBsdate)
             );
+            this.$set(this.dataList[list], 'fBusinessType', this.dataList[list].fBusinessType + '')
           }
           this.goodsOptions = response.data.goodsList;
           this.kqhouseOptions = response.data.warehouseAreas;

src/views/warehouseBusiness/outStock/index.vue

@@ -2812,6 +2812,7 @@ export default {
               "fBsdate",
               Date.parse(this.dataList[list].fBsdate)
             );
+            this.$set(this.dataList[list], 'fBusinessType', this.dataList[list].fBusinessType + '')
           }
           this.goodsOptions = response.data.goodsList;
           this.kqhouseOptions = response.data.warehouseAreas;

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -2460,6 +2460,7 @@ export default {
                 this.formBrowseStatus = true;
               }
               this.$set(this.dataList[list], "fBsdate", Date.parse(this.dataList[list].fBsdate));
+              this.$set(this.dataList[list], 'fBusinessType', this.dataList[list].fBusinessType + '')
             }
           }
           if (response.data.enclosures) {
@@ -2468,8 +2469,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
@@ -3244,6 +3254,7 @@ export default {
               this.formBrowseStatus = true;
             }
             this.$set(this.dataList[list], "fBsdate", Date.parse(this.dataList[list].fBsdate));
+            this.$set(this.dataList[list], 'fBusinessType', this.dataList[list].fBusinessType + '')
           }
         }
         if (response.data.enclosures) {
@@ -3252,8 +3263,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