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

src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -2594,6 +2594,8 @@
           this.$set(this.form, 'fBsdate', Date.parse(this.form.fBsdate))
           this.open = true
           this.title = '修改货存转移'
+
+          this.warehousesssMethod()
         })
       },
       // 库存明细合计

src/views/warehouseBusiness/inStock/index.vue

@@ -4422,6 +4422,7 @@ export default {
         this.warehouseDrList[0].fBusinessType = this.form.fBusinessType
         this.open = true;
         this.title = "修改仓入库";
+        this.warehousesssMethod()
       });
       queryUserVal().then((response)=>{
         this.current = response.user.userName

src/views/warehouseBusiness/outStock/index.vue

@@ -4038,6 +4038,7 @@ export default {
         this.userOptions = response.data.sysUser;
         this.open = true;
         this.title = "修改仓入库";
+        this.warehousesssMethod()
       });
       queryUserVal().then((response)=>{
         this.current = response.user.userName

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -929,7 +929,7 @@
             </el-table-column>
 
             <el-table-column
-              prop="fOrgWarehouseInformation"
+              prop="fOrgwarehouseInformation"
               header-align="center"
               align="center"
               label="库位"
@@ -3223,7 +3223,7 @@ export default {
           fGoodsids: this.dialogWhgenlegList[whgen].fGoodsids,
           fBillingway: this.dialogWhgenlegList[whgen].fBillingway,
           fChargedate: this.dialogWhgenlegList[whgen].fChargedate,
-          fOrgWarehouseInformation: this.dialogWhgenlegList[whgen].fWarehouseids,
+          fOrgwarehouseInformation: this.dialogWhgenlegList[whgen].fWarehouseids,
           fPackagespecs: this.dialogWhgenlegList[whgen].fPackagespecs,
           fPlannetweight: this.dialogWhgenlegList[whgen].fNetweightblc,
           fOriginalbillno: this.dialogWhgenlegList[whgen].fOriginalbillno,
@@ -3236,6 +3236,7 @@ export default {
           fTransferWarehouselocid: null,
           remark: null,
         });
+        console.log(this.dataList.fOrgWarehouseInformation)
       }
       this.whgenlegVisible = false;
     },
@@ -3707,7 +3708,6 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row, status) {
       this.reset();
-
       this.browseStatus = status;
       this.contrOl = status
       this.detailsHidden = false;
@@ -3795,6 +3795,8 @@ export default {
         }
         this.open = true;
         this.title = "修改调拨";
+
+        this.warehousesssMethod()
       });
     },
     // 数量计算

src/views/warehouseBusiness/storageFeeCalculation/index.vue

@@ -1270,11 +1270,15 @@
           }
           if (response.data.warehouseItemList) {
             this.dataList = response.data.warehouseItemList
+
+
+
             for (let li in this.dataList) {
               this.$set(this.dataList[li], 'fBsdate', Date.parse(this.dataList[li].fBsdate))
               this.$set(this.dataList[li], 'fChargedate', Date.parse(this.dataList[li].fChargedate))
               this.$set(this.dataList[li], 'fBillingDeadline', Date.parse(this.dataList[li].fBillingDeadline))
               this.$set(this.dataList[li], 'fOriginalbilldate', Date.parse(this.dataList[li].fOriginalbilldate))
+              this.$set(this.dataList[li], 'fBillingway', this.dataList[li].fBillingway + '')
             }
           }
           if (response.data.feesList) {