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

src/views/finance/charge/index.vue

@@ -305,6 +305,7 @@
             <span v-else>{{ scope.row.fBilltype }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="作业类型" align="center" prop="fBusinessType" />
         <el-table-column label="金额" align="center" prop="fAmtdr"/>
         <el-table-column label="本次金额" align="center" prop="fAmt"/>
         <el-table-column label="备注" align="center" prop="fRemarks"/>
@@ -399,6 +400,38 @@
               </el-select>
             </template>
           </el-form-item>
+          <el-form-item label="仓储业务" prop="fFeeid">
+            <el-select
+              v-model="queryParameter.fBilltype"
+              size="small"
+              style="width:200px"
+              @change="changefBilltype"
+              placeholder="请选择仓储业务"
+            >
+              <el-option label="入库" value="SJRK"></el-option>
+              <el-option label="出库" value="SJCK"></el-option>
+              <el-option label="货权转移" value="HQZY"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="作业类型" prop="fBusinessType">
+            <el-select
+              v-model="queryParameter.fBusinessType"
+              filterable
+              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
               size="small"
@@ -446,6 +479,7 @@
               <span v-else>{{ scope.row.fBilltype }}</span>
             </template>
           </el-table-column>
+          <el-table-column label="作业类型" align="center" prop="fBusinessType" />
           <el-table-column label="审核日期" align="center" prop="fReviewDate"/>
           <el-table-column label="费用名称" align="center" prop="fFeeName"/>
           <el-table-column label="金额" align="center" prop="fAmtdr"/>
@@ -512,6 +546,7 @@
             <span v-else>{{ scope.row.fBilltype }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="作业类型" align="center" prop="fBusinessType" />
         <el-table-column label="金额" align="center" prop="fAmtdr" width="120"/>
         <el-table-column label="本次金额" align="center" prop="fAmt" width="120"/>
       </el-table>
@@ -553,6 +588,7 @@ export default {
       Operator:'',
       approve:false,
       addOrUpdateVisible: false,
+      businessTypeOption:[],
       contrastId:220,
       tablefilter:false,
       hide:false,
@@ -604,7 +640,10 @@ export default {
         fStatementNo: '',
         fFeeid: '',
         timeExamine: '',
-        timeInterval: ''
+        timeInterval: '',
+        fBilltype:'',
+        fBusinessType:''
+
       },
       empty: [],
       //导入从表传主表
@@ -691,6 +730,9 @@ export default {
   created() {
     this.getList()
     this.register()
+    this.getDicts("st_in_type").then((response) => {
+      this.businessTypeOption = response.data;
+    });
   },
   activated(){
     this.adoPt()
@@ -751,6 +793,22 @@ export default {
     getDataList(){
       this.addOrUpdateVisible = false
     },
+    changefBilltype(){
+      this.businessTypeOption = []
+      if (this.queryParameter.fBilltype == 'SJRK'){
+        this.getDicts("st_in_type").then((response) => {
+          this.businessTypeOption = response.data;
+        });
+      }else if (this.queryParameter.fBilltype == 'SJCK'){
+        this.getDicts("st_out_type").then((response) => {
+          this.businessTypeOption = response.data;
+        });
+      }else if(this.queryParameter.fBilltype == 'HQZY'){
+        this.getDicts("st_trans_type").then((response) => {
+          this.businessTypeOption = response.data;
+        });
+      }
+    },
     homepaGe(){
       let view = {
         fullPath: "/finance/charge",

src/views/finance/payment/index.vue

@@ -304,6 +304,7 @@
             <span v-else>{{ scope.row.fBilltype }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="作业类型" align="center" prop="fBusinessType" />
         <el-table-column label="金额" align="center" prop="fAmtdr"/>
         <el-table-column label="本次金额" align="center" prop="fAmt"/>
         <el-table-column label="备注" align="center" prop="fRemarks"/>
@@ -398,6 +399,38 @@
               </el-select>
             </template>
           </el-form-item>
+          <el-form-item label="仓储业务" prop="fFeeid">
+            <el-select
+              v-model="queryParameter.fBilltype"
+              size="small"
+              style="width:200px"
+              @change="changefBilltype"
+              placeholder="请选择仓储业务"
+            >
+              <el-option label="入库" value="SJRK"></el-option>
+              <el-option label="出库" value="SJCK"></el-option>
+              <el-option label="货权转移" value="HQZY"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="作业类型" prop="fBusinessType">
+            <el-select
+              v-model="queryParameter.fBusinessType"
+              filterable
+              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
               size="small"
@@ -445,6 +478,7 @@
               <span v-else>{{ scope.row.fBilltype }}</span>
             </template>
           </el-table-column>
+          <el-table-column label="作业类型" align="center" prop="fBusinessType" />
           <el-table-column label="审核日期" align="center" prop="fReviewDate"/>
           <el-table-column label="费用名称" align="center" prop="fFeeName"/>
           <el-table-column label="金额" align="center" prop="fAmtdr"/>
@@ -594,6 +628,7 @@ export default {
       title: '',
       // 是否显示弹出层
       open: false,
+      businessTypeOption:[],
       fMblnoOptions: '',
       //导入查询参数
       queryParameter: {
@@ -690,6 +725,9 @@ export default {
   created() {
     this.getList()
     this.register()
+    this.getDicts("st_in_type").then((response) => {
+      this.businessTypeOption = response.data;
+    });
   },
   activated(){
     this.adoPt()
@@ -742,6 +780,22 @@ export default {
         }
       })
     },
+    changefBilltype(){
+      this.businessTypeOption = []
+      if (this.queryParameter.fBilltype == 'SJRK'){
+        this.getDicts("st_in_type").then((response) => {
+          this.businessTypeOption = response.data;
+        });
+      }else if (this.queryParameter.fBilltype == 'SJCK'){
+        this.getDicts("st_out_type").then((response) => {
+          this.businessTypeOption = response.data;
+        });
+      }else if(this.queryParameter.fBilltype == 'HQZY'){
+        this.getDicts("st_trans_type").then((response) => {
+          this.businessTypeOption = response.data;
+        });
+      }
+    },
     returnData(){
       this.addOrUpdateVisib = false
       this.open = false

src/views/warehouseBusiness/inStock/index.vue

@@ -3867,7 +3867,8 @@ export default {
         remarks: null,
         fMblno:this.form.fMblno,
         fProductName:this.form.fProductName,
-        fMarks:this.form.fMarks
+        fMarks:this.form.fMarks,
+        fBusinessType:this.form.fBusinessType
       });
     },
     queryUser() {