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

src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -2769,7 +2769,7 @@
                 this.$message.error('请维护主表计费单位为件数、毛重(kg)或净重(kg)')
                 return false
               }
-              if (!this.dataList[li].fWarehouselocids) {
+              if (!this.dataList[li].fWarehouselocid) {
                 this.$message({ message: '请维护第' + Number(li) + 1 + '行库区', type: 'warning' })
                 return false
               }

src/views/warehouseBusiness/inStock/index.vue

@@ -464,7 +464,7 @@
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="业务日期" prop="fBsdate">
+            <el-form-item label="入库日期" prop="fBsdate">
               <el-date-picker
                 v-model="form.fBsdate"
                 style="width: 80%"
@@ -472,7 +472,7 @@
                 :disabled="browseStatus || formBrowseStatus"
                 @change="changefBsdate"
                 value-format="timestamp"
-                placeholder="业务日期"
+                placeholder="入库日期"
               >
               </el-date-picker>
             </el-form-item>
@@ -736,12 +736,23 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="2">
             <el-form-item>
               <el-button @click="detailsHidden ? (detailsHidden = false) : (detailsHidden = true)">{{ detailsHidden ? '隐藏' : '展开' }}
               </el-button>
             </el-form-item>
-
+          </el-col>
+          <el-col :span="5">
+            <el-form-item prop="fChargedate">
+              <el-date-picker
+                v-model="form.fChargedate"
+                type="date"
+                :disabled="browseStatus || formBrowseStatus"
+                value-format="timestamp"
+                placeholder="仓储费计算日期"
+              >
+              </el-date-picker>
+            </el-form-item>
           </el-col>
         </el-row>
 
@@ -4489,10 +4500,11 @@ export default {
           }
           this.$set(this.form, "fEta", Date.parse(this.form.fEta));
           this.$set(this.form, "fStltypeid", this.form.fStltypeid + "");
+          this.$set(this.form, "fFeeUnitid", this.form.fFeeunitid + "");
           this.$set(this.form, "fBsdate", Date.parse(this.form.fBsdate));
           this.$set(this.form, "fTrademodeid", this.form.fTrademodeid + "");
           this.$set(this.form, "createTime", Date.parse(this.form.createTime));
-          this.$set(this.form, "fFeeUnitid", this.form.fFeeunitid + "");
+          this.$set(this.form, "fChargedate", Date.parse(this.form.fChargedate));
           this.$set(this.form, "fPlannetweight", this.form.fPlannetweight.toFixed(2));
           this.$set(this.form, "fPlangrossweight", this.form.fPlangrossweight.toFixed(2));
         }
@@ -4734,6 +4746,7 @@ export default {
       }
     },
     changefBsdate(row) {
+      this.$set(this.form, 'fChargedate', row)
       if (this.dataList.length > 0) {
         for (var i = 0; i < this.dataList.length; i++) {
           this.$set(this.dataList[i], "fBsdate", row);
@@ -4836,10 +4849,11 @@ export default {
                 }
                 this.$set(this.form, "fEta", Date.parse(this.form.fEta));
                 this.$set(this.form, "fStltypeid", this.form.fStltypeid + "");
+                this.$set(this.form, "fFeeUnitid", this.form.fFeeunitid + "");
                 this.$set(this.form, "fBsdate", Date.parse(this.form.fBsdate));
                 this.$set(this.form, "fTrademodeid", this.form.fTrademodeid + "");
                 this.$set(this.form, "createTime", Date.parse(this.form.createTime));
-                this.$set(this.form, "fFeeUnitid", this.form.fFeeunitid + "");
+                this.$set(this.form, "fChargedate", Date.parse(this.form.fChargedate));
                 this.$set(this.form, "fPlannetweight", this.form.fPlannetweight.toFixed(2));
                 this.$set(this.form, "fPlangrossweight", this.form.fPlangrossweight.toFixed(2));
               }
@@ -5087,6 +5101,7 @@ export default {
                   this.$set(this.form, "fBsdate", Date.parse(this.form.fBsdate));
                   this.$set(this.form, "fTrademodeid", this.form.fTrademodeid + "");
                   this.$set(this.form, "createTime", Date.parse(this.form.createTime));
+                  this.$set(this.form, "fChargedate", Date.parse(this.form.fChargedate));
                   this.$set(this.form, "fFeeUnitid", this.form.fFeeunitid + "");
                   this.$set(this.form, "fPlannetweight", this.form.fPlannetweight.toFixed(2));
                   this.$set(this.form, "fPlangrossweight", this.form.fPlangrossweight.toFixed(2));
@@ -5242,6 +5257,7 @@ export default {
               this.$set(this.form, 'fBsdate', Date.parse(this.form.fBsdate))
               this.$set(this.form, 'fTrademodeid', this.form.fTrademodeid + '')
               this.$set(this.form, 'createTime', Date.parse(this.form.createTime))
+              this.$set(this.form, "fChargedate", Date.parse(this.form.fChargedate));
               this.dataList = response.data.warehousebillsitems
               for (let list in this.dataList) {
                 this.$set(this.dataList[list], 'fBsdate', Date.parse(this.dataList[list].fBsdate))