零售发货申请单、工程发货申请单、零售发货单、销售政策订单增加产品类别查询条件

src/views/supply/apply/apply_list.vue

@@ -97,7 +97,13 @@
                 <el-input v-model="screenForm.mainOrderId" placeholder="请输入订单号"></el-input>
               </el-form-item>
             </el-col>
-
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="产品类别" >
+                <el-select v-model="screenForm.categoryId" style="width: 100%" placeholder="选择产品类别" filterable clearable>
+                  <el-option v-for="item in categoryList" :key="item.name" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :xs="24" :sm="24" :lg="6" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
@@ -191,6 +197,11 @@
                 <span>{{scope.row.specification}}</span>
               </template>
             </el-table-column>
+            <el-table-column align="left" label="产品类别" prop="categoryName" min-width="350" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{scope.row.categoryName}}</span>
+              </template>
+            </el-table-column>
             <el-table-column align="left" label="销售政策名称" prop="policyTitle" min-width="350" show-overflow-tooltip>
 
             </el-table-column>
@@ -320,7 +331,7 @@
 
 <script>
 import { getApplyList, submitApply, deleteApply, abandonApply, examineBatchApply } from "@/api/supply/apply";
-import { getSalesmanList } from '@/api/common'
+import {getCategoryList, getSalesmanList} from '@/api/common'
 import ApplyDetail from "@/views/supply/apply/components/apply_detail";
 import ApplyExamine from "@/views/supply/apply/components/apply_examine";
 import ApplyForm from "@/views/supply/apply/components/apply_form";
@@ -366,7 +377,8 @@ export default {
         orderType: '',
         mainOrderId: '',
         k3ServiceId:'',
-        serviceId:''
+        serviceId:'',
+        categoryId: ''
       },
       statusList: [
         { label: '已保存', value: 'SAVE' },
@@ -394,6 +406,7 @@ export default {
         status: '',
         remark: '',
       },
+      categoryList: []
     }
   },
 
@@ -409,10 +422,11 @@ export default {
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         examineStatus: this.screenForm.status,
-         k3ServiceId:this.screenForm.k3ServiceId,
+        k3ServiceId:this.screenForm.k3ServiceId,
         serviceId:this.screenForm.serviceId,
         type: this.screenForm.orderType,
         mainOrderId: this.screenForm.mainOrderId,
+        categoryId: this.screenForm.categoryId
       }
     },
   },
@@ -424,6 +438,7 @@ export default {
   created() {
     this.getSalesmanList();
     this.getList();
+    this.getCategoryList();
   },
   activated() {
       this.isShow = false
@@ -465,9 +480,9 @@ export default {
         examineStatus: this.screenForm.status,
         serviceId: this.screenForm.salesMan,
         type: this.screenForm.orderType,
-         k3ServiceId:this.screenForm.k3ServiceId,
-        serviceId:this.screenForm.serviceId,
+        k3ServiceId:this.screenForm.k3ServiceId,
         mainOrderId: this.screenForm.mainOrderId,
+        categoryId: this.screenForm.categoryId
       };
       getApplyList(params).then((res) => {
         res.data.records.forEach(item => {
@@ -586,6 +601,15 @@ export default {
         this.$successMsg('审批成功');
       })
     },
+    // 获取存货类别列表
+    getCategoryList() {
+      getCategoryList({
+        pageNum: 1,
+        pageSize: -1
+      }).then(res => {
+        this.categoryList = res.data.records
+      })
+    },
   }
 }
 </script>

src/views/supply/apply/engin_list.vue

@@ -84,7 +84,7 @@
                 <el-input v-model="screenForm.refUseUnit" placeholder="请输入使用单位"></el-input>
               </el-form-item>
             </el-col>
-     <el-col :xs="24" :sm="12" :lg="6">
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="表头业务员" prop="k3ServiceId">
                 <el-select v-model="screenForm.k3ServiceId" placeholder="选择表头业务员" clearable filterable style="width: 100%">
                   <el-option
@@ -96,7 +96,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-                 <el-col :xs="24" :sm="12" :lg="6">
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="表体业务员" prop="salesMan">
                 <el-select v-model="screenForm.salesMan" placeholder="选择表体业务员" clearable filterable style="width: 100%">
                   <el-option
@@ -108,6 +108,13 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="产品类别" >
+                <el-select v-model="screenForm.categoryId" style="width: 100%" placeholder="选择产品类别" filterable clearable>
+                  <el-option v-for="item in categoryList" :key="item.name" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :xs="24" :sm="24" :lg="24" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
@@ -211,6 +218,11 @@
                 <span>{{scope.row.specification}}</span>
               </template>
             </el-table-column>
+            <el-table-column align="left" label="产品类别" prop="categoryName" min-width="350" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{scope.row.categoryName}}</span>
+              </template>
+            </el-table-column>
             <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="文件编号" prop="itemFileNo" min-width="200" show-overflow-tooltip>
             </el-table-column>
@@ -334,7 +346,7 @@
 
 <script>
 import { getEnginList, submitEngin, deleteEngin, abandonEngin, examineBatchEngin } from "@/api/supply/apply";
-import { getSalesmanList } from '@/api/common'
+import {getCategoryList, getSalesmanList} from '@/api/common'
 import EnginDetail from "@/views/supply/apply/components/engin_detail";
 import EnginExamine from "@/views/supply/apply/components/engin_examine";
 import EnginForm from "@/views/supply/apply/components/engin_form";
@@ -381,7 +393,8 @@ export default {
         mainOrderId: '',
         refEnginRecordNo: '',
         refUseUnit: '',
-        k3ServiceId:''
+        k3ServiceId:'',
+        categoryId: ''
       },
       statusList: [
         { label: '已保存', value: 'SAVE' },
@@ -409,7 +422,8 @@ export default {
         status: '',
         remark: '',
       },
-      isShow:false
+      isShow:false,
+      categoryList: []
     }
   },
 
@@ -431,6 +445,7 @@ export default {
         mainOrderId: this.screenForm.mainOrderId,
         refEnginRecordNo: this.screenForm.refEnginRecordNo,
         refUseUnit: this.screenForm.refUseUnit,
+        categoryId: this.screenForm.categoryId
       }
     },
   },
@@ -442,6 +457,7 @@ export default {
   created() {
     this.getSalesmanList();
     this.getList();
+    this.getCategoryList();
   },
   activated() {
     // keepAlice  activated 主要是从发货单汇总调用退货申请按钮
@@ -486,6 +502,7 @@ export default {
         mainOrderId: this.screenForm.mainOrderId,
         refEnginRecordNo: this.screenForm.refEnginRecordNo,
         refUseUnit: this.screenForm.refUseUnit,
+        categoryId: this.screenForm.categoryId
       };
       getEnginList(params).then((res) => {
         res.data.records.forEach(item => {
@@ -604,6 +621,15 @@ export default {
         this.$successMsg('审批成功');
       })
     },
+    // 获取存货类别列表
+    getCategoryList() {
+      getCategoryList({
+        pageNum: 1,
+        pageSize: -1
+      }).then(res => {
+        this.categoryList = res.data.records
+      })
+    },
   }
 }
 </script>

src/views/supply/deliver/deliver_list.vue

@@ -36,8 +36,8 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item prop="type" label="存货类别">
-                <el-select v-model="screenForm.type" placeholder="选择存货类别" style="width: 100%" clearable>
+              <el-form-item prop="type" label="产品类别">
+                <el-select v-model="screenForm.type" placeholder="选择产品类别" style="width: 100%" clearable>
                   <el-option v-for="item in categoryList" :key="item.name" :label="item.name" :value="item.name"></el-option>
                 </el-select>
               </el-form-item>
@@ -148,6 +148,11 @@
                 <span>{{scope.row.specification}}</span>
               </template>
             </el-table-column>
+            <el-table-column align="left" label="产品类别" prop="categoryName" min-width="350" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{scope.row.categoryName}}</span>
+              </template>
+            </el-table-column>
             <!-- <el-table-column align="left" label="文件编号" prop="itemFileNo" min-width="350" show-overflow-tooltip/> -->
             <el-table-column align="right" label="价税合计" prop="payAmount" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">

src/views/supply/policy/policy_list.vue

@@ -136,15 +136,20 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="规格型号
-" prop="specification">
+              <el-form-item label="规格型号" prop="specification">
                 <el-input
                   v-model="screenForm.specification"
-                  placeholder="请输入规格型号
-"
+                  placeholder="请输入规格型号"
                 />
               </el-form-item>
             </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="产品类别" >
+                <el-select v-model="screenForm.categoryNumber" style="width: 100%" placeholder="选择产品类别" filterable clearable>
+                  <el-option v-for="item in categoryList" :key="item.name" :label="item.name" :value="item.number" />
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :xs="24" :sm="24" :lg="6" class="tr">
               <el-form-item label="">
                 <el-button
@@ -304,6 +309,13 @@
             </el-table-column>
             <el-table-column
               align="left"
+              label="产品类别"
+              prop="k3CategoryName"
+              min-width="100"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              align="left"
               label="计量单位"
               prop="unit"
               min-width="100"
@@ -415,7 +427,7 @@
               min-width="100"
               show-overflow-tooltip
             />
-              <el-table-column align="left" label="表体备注" prop="itemRemark" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="表体备注" prop="itemRemark" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="表头备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column
               align="left"
@@ -613,7 +625,7 @@ import RetailExamine from './components/retail_examine'
 import RetailReturn from './components/retail_return'
 import EditDateDialog from '@/components/Common/edit-date-dialog'
 import ExamineDialog from '@/components/Common/examine-dialog'
-import { getSalesmanList } from '@/api/common'
+import { getSalesmanList, getCategoryList } from '@/api/common'
 
 let that
 export default {
@@ -652,7 +664,8 @@ export default {
         isDirectTransfer:null,
         specification:'',
         k3ServiceId:'',
-        serviceId:''
+        serviceId:'',
+        categoryNumber: ''
       },
       transfer:[
         {label:'是',value:true},
@@ -680,6 +693,7 @@ export default {
         status: 'OK',
         remark: '',
       },
+      categoryList: []
     }
   },
   computed: {
@@ -694,6 +708,7 @@ export default {
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         createBy: this.screenForm.zbMan,
         examineBy: this.screenForm.shMan,
+        k3CategoryNumber: this.screenForm.categoryNumber,
         type: 2 // 1:普通零售单，2:政策零售单
       }
     }
@@ -706,6 +721,7 @@ export default {
   created() {
     this.getList()
     this.getSalesmanList();
+    this.getCategoryList()
   },
 
   methods: {
@@ -783,6 +799,7 @@ export default {
         serviceId:this.screenForm.serviceId,
         isDirectTransfer: this.screenForm.isDirectTransfer,
         specification:this.screenForm.specification,
+        k3CategoryNumber: this.screenForm.categoryNumber,
         type: 2 // 1:普通零售单，2:政策零售单
       }
       getList(params).then((res) => {
@@ -900,7 +917,16 @@ export default {
         this.getList()
         this.$successMsg('修改成功')
       })
-    }
+    },
+    // 获取存货类别列表
+    getCategoryList() {
+      getCategoryList({
+        pageNum: 1,
+        pageSize: -1
+      }).then(res => {
+        this.categoryList = res.data.records
+      })
+    },
   }
 }
 </script>