【新增】工程订单/工程信息单/销售单执行明细 - 添加筛选条件

src/views/supply/apply/engin_list.vue

@@ -56,8 +56,20 @@
                 <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="业务员" prop="salesMan">
+                <el-select v-model="screenForm.salesMan" placeholder="选择业务员" size="small" clearable filterable style="width: 100%">
+                  <el-option
+                    v-for="item in salesmanList"
+                    :key="item.adminUserId"
+                    :label="item.nickName"
+                    :value="item.adminUserId">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
             
-            <el-col :xs="24" :sm="12" :lg="6" class="tr">
+            <el-col :xs="24" :sm="24" :lg="24" class="tr">
               <el-form-item label="">
                 <el-button size="small" @click="resetScreenForm">清空</el-button>
                 <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
@@ -202,6 +214,7 @@
 
 <script>
 import { getEnginList, submitEngin, deleteEngin, abandonEngin } from "@/api/supply/apply";
+import { 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";
@@ -234,6 +247,7 @@ export default {
         date: '',
         chName: '',
         model: '',
+        salesMan: '',
         status: '',
       },
       statusList: [
@@ -243,6 +257,7 @@ export default {
         { label: '审核驳回', value: 'FAIL' },
         { label: '已关闭', value: 'CLOSE' },
       ],
+      salesmanList: [],
 
       queryItem: {},
       isShowDetail: false,
@@ -263,6 +278,7 @@ export default {
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         examineStatus: this.screenForm.status,
+        serviceId: this.screenForm.salesMan,
       }
     },
   },
@@ -272,17 +288,21 @@ export default {
   },
 
   created() {
+    this.getSalesmanList();
     this.getList();
   },
 
   methods: {
-    // 查询按钮权限
-    checkBtnRole(value) {
-      // let btnRole = this.$route.meta.roles;
-      // if(!btnRole) {return true}
-      // let index = btnRole.indexOf(value);
-      // return index >= 0;
-      return true
+    // 获取业务员列表
+    getSalesmanList() {
+      getSalesmanList({
+        pageNum: 1,
+        pageSize: -1,
+        isCustomer: 0,
+        status: true,
+      }).then(res => {
+        this.salesmanList = res.data.records;
+      })
     },
 
     // 查询列表
@@ -301,6 +321,7 @@ export default {
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         examineStatus: this.screenForm.status,
+        serviceId: this.screenForm.salesMan,
       };
       getEnginList(params).then((res) => {
         res.data.records.forEach(item => {

src/views/supply/engin/commerce_list.vue

@@ -23,8 +23,8 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="工程登录单号" prop="loginNum">
-                <el-input v-model="screenForm.loginNum" placeholder="请输入工程登录单号"></el-input>
+              <el-form-item label="工程信息单号" prop="loginNum">
+                <el-input v-model="screenForm.loginNum" placeholder="请输入工程信息单号"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -51,6 +51,11 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="经销商" prop="dealer">
+                <el-input v-model="screenForm.dealer" placeholder="请输入经销商"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="制表人" prop="createMan">
                 <el-input v-model="screenForm.createMan" placeholder="请输入制表人"></el-input>
               </el-form-item>
@@ -73,7 +78,7 @@
               </el-form-item>
             </el-col>
 
-            <el-col :xs="24" :sm="12" :lg="18" class="tr">
+            <el-col :xs="24" :sm="24" :lg="12" class="tr">
               <el-form-item label="">
                 <el-button size="small" @click="resetScreenForm">清空</el-button>
                 <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
@@ -121,7 +126,7 @@
               </template>
             </el-table-column>
             <el-table-column align="center" label="工程编码" prop="refProjectNo" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="工程登录单号" prop="refEnginRecordNo" min-width="200" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="工程信息单号" prop="refEnginRecordNo" min-width="200" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="订单类型" prop="enginOrderType" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{scope.row.enginOrderType | typeFilter}}
@@ -300,6 +305,7 @@ export default {
         createMan: '',
         examineMan: '',
         salesMan: '',
+        dealer: '',
       },
       statusList: [
         { label: '已保存', value: 'SAVE' },
@@ -343,6 +349,7 @@ export default {
         createName: this.screenForm.createMan,
         confirmName: this.screenForm.examineMan,
         serviceId: this.screenForm.salesMan,
+        customerKeyWord: this.screenForm.dealer,
         enginOrderType: 'TRADE', // TRADE=商用 HOME=家用
       }
     },
@@ -388,6 +395,7 @@ export default {
         createName: this.screenForm.createMan,
         confirmName: this.screenForm.examineMan,
         serviceId: this.screenForm.salesMan,
+        customerKeyWord: this.screenForm.dealer,
         enginOrderType: 'TRADE', // TRADE=商用 HOME=家用
       };
       getOrderList(params).then((res) => {

src/views/supply/engin/engin_list.vue

@@ -65,8 +65,20 @@
                 <el-input v-model="screenForm.examineMan" placeholder="请输入审核人"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="业务员" prop="salesMan">
+                <el-select v-model="screenForm.salesMan" placeholder="选择业务员" size="small" clearable filterable style="width: 100%">
+                  <el-option
+                    v-for="item in salesmanList"
+                    :key="item.adminUserId"
+                    :label="item.nickName"
+                    :value="item.adminUserId">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
 
-            <el-col :xs="24" :sm="12" :lg="18" class="tr">
+            <el-col :xs="24" :sm="24" :lg="12" class="tr">
               <el-form-item label="">
                 <el-button size="small" @click="resetScreenForm">清空</el-button>
                 <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
@@ -147,7 +159,7 @@
                 <el-button 
                   type="text" 
                   @click="toForm(scope.row)" 
-                  v-if="$checkBtnRole('edit', $route.meta.roles) && (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'OK')">
+                  v-if="$checkBtnRole('edit', $route.meta.roles) && scope.row.examineStatus === 'SAVE'">
                   编辑
                 </el-button>
                 <el-button 
@@ -199,6 +211,7 @@
 
 <script>
 import { getEnginList, applyEngin, withdrawEngin, deleteEngin, editDateEngin } from "@/api/supply/engin";
+import { getSalesmanList } from '@/api/common'
 import EnginDetail from "@/views/supply/engin/components/engin_detail";
 import EnginForm from "@/views/supply/engin/components/engin_form";
 import EnginExamine from "@/views/supply/engin/components/engin_examine";
@@ -236,6 +249,7 @@ export default {
         createMan: '',
         examineMan: '',
         status: [],
+        salesMan: '',
       },
       statusList: [
         { label: '已保存', value: 'SAVE' },
@@ -244,6 +258,7 @@ export default {
         { label: '审核驳回', value: 'FAIL' },
         { label: '已关闭', value: 'CLOSE' },
       ],
+      salesmanList: [],
 
       queryItem: {},
       isShowDetail: false,
@@ -272,6 +287,7 @@ export default {
         createName: this.screenForm.createMan,
         confirmName: this.screenForm.examineMan,
         examineStatus: this.screenForm.status.join(','),
+        serviceId: this.screenForm.salesMan,
       }
     },
   },
@@ -281,10 +297,23 @@ export default {
   },
 
   created() {
+    this.getSalesmanList();
     this.getList();
   },
 
   methods: {
+    // 获取业务员列表
+    getSalesmanList() {
+      getSalesmanList({
+        pageNum: 1,
+        pageSize: -1,
+        isCustomer: 0,
+        status: true,
+      }).then(res => {
+        this.salesmanList = res.data.records;
+      })
+    },
+
     // 查询列表
     getList() {
       this.listLoading = true;
@@ -303,6 +332,7 @@ export default {
         createName: this.screenForm.createMan,
         confirmName: this.screenForm.examineMan,
         examineStatus: this.screenForm.status.join(','),
+        serviceId: this.screenForm.salesMan,
       };
       getEnginList(params).then((res) => {
         res.data.records.forEach(item => {

src/views/supply/implement/implement_list.vue

@@ -33,6 +33,11 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="规格型号" prop="model">
+                <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="业务员" prop="saleMan">
                 <el-input v-model="screenForm.saleMan" placeholder="请输入业务员"></el-input>
               </el-form-item>
@@ -66,7 +71,7 @@
               </el-form-item>
             </el-col>
             
-            <el-col :xs="24" :sm="12" :lg="18" class="tr">
+            <el-col :xs="24" :sm="24" :lg="12" class="tr">
               <el-form-item label="">
                 <el-button size="small" @click="resetScreenForm">清空</el-button>
                 <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
@@ -182,6 +187,7 @@ export default {
         saleNum: '',
         dealer: '',
         goodsName: '',
+        model: '',
         date: '',
         saleMan: '',
         saleMan2: '',
@@ -205,6 +211,7 @@ export default {
         id: this.screenForm.saleNum,
         customerName: this.screenForm.dealer,
         materialName: this.screenForm.goodsName,
+        specification: this.screenForm.model,
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         serviceName: this.screenForm.saleMan,
@@ -245,6 +252,7 @@ export default {
         id: this.screenForm.saleNum,
         customerName: this.screenForm.dealer,
         materialName: this.screenForm.goodsName,
+        specification: this.screenForm.model,
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         serviceName: this.screenForm.saleMan,