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

src/views/reportManagement/whgenleg/index.vue

@@ -121,6 +121,11 @@
           <span>{{ parseTime(scope.row.fOriginalbilldate , "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="仓储费计算日期" align="center" prop="fChargedate" width="120">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.fChargedate , "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="提单号" align="center" prop="fMblno" show-overflow-tooltip width="120"/>
       <el-table-column label="货物属性" align="center" prop="fBusinessTypes" width="120"/>
       <el-table-column label="属性详情" align="center" prop="fMarks" width="120"/>

src/views/warehouseBusiness/inStock/index.vue

@@ -4406,6 +4406,8 @@ export default {
         }
         this.kqhouseOptions = response.data.warehouseAreas;
         this.warehouseDrList = response.data.warehousebillsfeesDr;
+        console.log(this.businessTypeOption)
+        console.log(this.warehouseDrList)
         for (let dr in this.warehouseDrList) {
           this.$forceUpdate()
           this.$set(this.warehouseDrList[dr], "fFeeUnitid", this.warehouseDrList[dr].fFeeunitid + "");
@@ -4417,6 +4419,7 @@ export default {
           this.$set(this.warehouseCrList[cr], "fFeeUnitid", this.warehouseCrList[cr].fFeeunitid + "");
         }
         this.userOptions = response.data.sysUser;
+        this.warehouseDrList[0].fBusinessType = this.form.fBusinessType
         this.open = true;
         this.title = "修改仓入库";
       });

src/views/warehouseBusiness/outStock/index.vue

@@ -3185,6 +3185,7 @@ export default {
             this.$set(this.warehouseDrList[dr], "fAmount", this.warehouseDrList[dr].fAmount.toFixed(2));
           }
           this.warehouseCrList = response.data.warehousebillsfeesCr;
+          console.log("zhangs1")
           for (let cr in this.warehouseCrList) {
             this.$set(this.warehouseCrList[cr], "fFeeunitid", this.warehouseCrList[cr].fFeeunitid + "");
           }
@@ -4030,6 +4031,9 @@ export default {
         this.warehouseCrList = response.data.warehousebillsfeesCr;
         for (let cr in this.warehouseCrList) {
           this.$set(this.warehouseCrList[cr], "fFeeunitid", this.warehouseCrList[cr].fFeeunitid + "");
+          this.$set(this.warehouseDrList[cr], "fBusinessType", this.warehouseDrList[cr].fBusinessType + "");
+
+          console.log(this.warehouseDrList[cr].fBusinessType)
         }
         this.userOptions = response.data.sysUser;
         this.open = true;

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -471,9 +471,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-
-        </el-row>
-        <el-row>
           <el-col :span="8">
             <el-form-item label="单据编号" prop="fBillno">
               <el-input
@@ -639,11 +636,13 @@
               <el-select
                 style="width: 80%"
                 v-model="form.fLabour"
+                @keyup.enter.native="handleQuery"
                 :remote-method="flabourRemoteMethod"
-                filterable
                 remote
+                filterable
                 :disabled="contrOl"
-                placeholder="请输入劳务公司">
+                placeholder="请输入劳务公司"
+              >
                 <el-option
                   v-for="(dict, index) in fCompanyOptIons"
                   :key="index.fId"
@@ -2685,7 +2684,6 @@ export default {
       this.fleetOptions = response.data;
     });
     treeselect().then(response => {
-      console.log(response)
       this.warehouseOptions = response.data
     })
     this.warehousesssMethod()
@@ -3373,6 +3371,15 @@ export default {
     },
     /** 查询仓库主(出入库)列表 */
     getList() {
+      let queryParams = { pageNum: 1, pageSize: 10, fTypeid: 6}
+      listCorps(queryParams).then((response) => {
+        this.fCompanyOptIons = response.rows;
+      });
+      let params = { pageNum: 1, pageSize: 10, fTypeid: 2}
+      listCorps(params).then((response) => {
+        console.log(response)
+        this.fleetOptions = response.rows;
+      });
       this.loading = true;
       getStockTransferList(this.queryParams).then((response) => {
         this.warehousebillsList = response.rows;

src/views/warehouseBusiness/storageFeeCalculation/index.vue

@@ -1231,11 +1231,13 @@
             cancelButtonText: '取消',
             type: 'warning'
           }).then(() => {
+            this.dataList = []
             this.getStorageFee()
           }).catch(() => {
             return false
           })
         } else {
+          this.dataList = []
           this.getStorageFee()
         }
       },