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

src/views/finance/contrast/index.vue

@@ -159,6 +159,7 @@
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
+        width="160"
       >
         <template slot-scope="scope">
           <el-button
@@ -500,6 +501,44 @@
               </el-select>
             </template>
           </el-form-item>
+          <el-form-item label="仓储业务" prop="fFeeid">
+            <el-select
+              v-model="TWareHouseFees.fBilltype"
+              filterable
+              :disabled="browseStatus"
+              remote
+              size="small"
+              style="width:200px"
+              :remote-method="fWRemoteMethod"
+              placeholder="请选择仓储业务"
+              multiple
+            >
+              <el-option label="入库" value="SJRK"></el-option>
+              <el-option label="实际出库" value="SJCK"></el-option>
+              <el-option label="调拨" value="CKDB"></el-option>
+              <el-option label="货权转移" value="HQZY"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="作业类型" prop="fBusinessType">
+            <el-select
+              v-model="TWareHouseFees.fBusinessType"
+              filterable
+              :disabled="browseStatus"
+              remote
+              size="small"
+              style="width:200px"
+              placeholder="作业类型"
+              multiple
+            >
+              <el-option
+                v-for="dict in businessTypeOption"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="dict.dictValue"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
 
           <el-form-item label="审核日期" prop="timeExamine">
             <el-date-picker
@@ -526,7 +565,6 @@
               :default-time="['00:00:00', '23:59:59']"
             ></el-date-picker>
           </el-form-item>
-
           <el-form-item>
             <!-- <el-button class="btnColor" type="info" size="mini">导入</el-button> -->
             <el-button
@@ -747,6 +785,7 @@ export default {
       },
       hide:false,
       cancelButton:true,
+      businessTypeOption:[],
       // 传值对象
       TWareHouseFees:{
         fCorpid:'',
@@ -759,6 +798,8 @@ export default {
         fDc:'D',
         fReconciliation:'0',
         timeReconci:'',
+        fBusinessType:'',
+        fBilltype:'SJRK'
       },
       // 查询参数
       queryParams: {
@@ -836,6 +877,9 @@ export default {
     this.getDicts("data_unitfees").then((response) => {
       this.jFeetunitOptions = response.data;
     });
+    this.getDicts("st_in_type").then((response) => {
+      this.businessTypeOption = response.data;
+    });
   },
   activated(){
     this.Jump()
@@ -1078,7 +1122,8 @@ export default {
         fSrcdc:'',
         fReconciliation:'0',
         timeReconci: '',
-        fDc:'D'
+        fDc:'D',
+        fBilltype:'SJRK'
       }
       if(this.queryParams.fCorpid){
         this.doNot = true

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/storageFeeCalculation/index.vue

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