【新增】零售单/工程订单/发货单-业务员筛选条件

src/views/supply/deliver/commerce_list.vue

@@ -74,8 +74,20 @@
                 </el-select>
               </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>
@@ -190,7 +202,7 @@
 
 <script>
 import { getEnginList, getPassword, getPasswordRecord } from "@/api/supply/deliver";
-import { getCategoryList } from '@/api/common'
+import { getCategoryList, getSalesmanList } from '@/api/common'
 import CommerceDetail from "@/views/supply/deliver/components/commerce_detail";
 
 let that
@@ -216,8 +228,10 @@ export default {
         date: '',
         jxsNum: '',
         status: '',
+        salesMan: '',
       },
       categoryList: [],
+      salesmanList: [],
 
       isShowDialog: false, // 密码记录 - 弹窗
       dialogTable_dataList: null, // 密码记录 - 列表数据
@@ -243,6 +257,7 @@ export default {
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         categoryName: this.screenForm.type,
+        serviceId: this.screenForm.salesMan,
         orderType: 3, // 2家用工程 3商用工程
       }
     },
@@ -256,18 +271,22 @@ export default {
   },
 
   created() {
+    this.getSalesmanList();
     this.getCategoryList();
     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;
+      })
     },
 
     // 获取存货类别列表
@@ -297,6 +316,7 @@ export default {
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         categoryName: this.screenForm.type,
+        serviceId: this.screenForm.salesMan,
         orderType: 3, // 2家用工程 3商用工程
       };
       getEnginList(params).then((res) => {

src/views/supply/deliver/deliver_list.vue

@@ -55,8 +55,20 @@
                 </el-date-picker>
               </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="24" :lg="24" class="tr">
+            <el-col :xs="24" :sm="12" :lg="18" class="tr">
               <el-form-item label="">
                 <el-button size="small" @click="resetScreenForm">清空</el-button>
                 <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
@@ -174,7 +186,7 @@
 
 <script>
 import { getDeliverList, getPassword, getPasswordRecord } from "@/api/supply/deliver";
-import { getCategoryList } from '@/api/common'
+import { getCategoryList, getSalesmanList } from '@/api/common'
 import DeliverDetail from "@/views/supply/deliver/components/deliver_detail";
 
 export default {
@@ -197,8 +209,10 @@ export default {
         model: '',
         date: '',
         type: '',
+        salesMan: '',
       },
       categoryList: [],
+      salesmanList: [],
 
       isShowDialog: false, // 密码记录 - 弹窗
       dialogTable_dataList: null, // 密码记录 - 列表数据
@@ -223,6 +237,7 @@ export default {
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         categoryName: this.screenForm.type,
+        serviceId: this.screenForm.salesMan,
       }
     },
     isShowDetail() {
@@ -231,18 +246,22 @@ export default {
   },
 
   created() {
+    this.getSalesmanList();
     this.getCategoryList();
     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;
+      })
     },
 
     // 获取存货类别列表
@@ -271,6 +290,7 @@ export default {
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         categoryName: this.screenForm.type,
+        serviceId: this.screenForm.salesMan,
       };
       getDeliverList(params).then((res) => {
         res.data.records.forEach(item => {

src/views/supply/deliver/home_list.vue

@@ -3,7 +3,7 @@
     <div v-show="!isShowDetail">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <el-form ref="screenForm" :model="screenForm" label-width="90px" size="small" label-position="left">
+        <el-form ref="screenForm" :model="screenForm" label-width="85px" size="small" label-position="left">
           <el-row :gutter="20">
             <!-- <el-col :xs="24" :sm="24" :lg="24">
               <el-form-item prop="orderNum" label-width="0">
@@ -69,8 +69,20 @@
                 </el-select>
               </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>
@@ -193,7 +205,7 @@
 
 <script>
 import { getEnginList, getPassword, getPasswordRecord } from "@/api/supply/deliver";
-import { getCategoryList } from '@/api/common'
+import { getCategoryList, getSalesmanList } from '@/api/common'
 import HomeDetail from "@/views/supply/deliver/components/home_detail";
 
 let that
@@ -218,7 +230,9 @@ export default {
         date: '',
         jxsNum: '',
         status: '',
+        salesMan: '',
       },
+      salesmanList: [],
       categoryList: [],
 
       isShowDialog: false, // 密码记录 - 弹窗
@@ -245,6 +259,7 @@ export default {
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         categoryName: this.screenForm.type,
+        serviceId: this.screenForm.salesMan,
         orderType: 2, // 2家用工程 3商用工程
       }
     },
@@ -258,18 +273,22 @@ export default {
   },
 
   created() {
+    this.getSalesmanList();
     this.getCategoryList();
     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;
+      })
     },
 
     // 获取存货类别列表
@@ -299,6 +318,7 @@ export default {
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         categoryName: this.screenForm.type,
+        serviceId: this.screenForm.salesMan,
         orderType: 2, // 2家用工程 3商用工程
       };
       getEnginList(params).then((res) => {

src/views/supply/engin/commerce_list.vue

@@ -61,8 +61,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="24" :lg="24" class="tr">
+            <el-col :xs="24" :sm="12" :lg="18" class="tr">
               <el-form-item label="">
                 <el-button size="small" @click="resetScreenForm">清空</el-button>
                 <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
@@ -227,6 +239,7 @@
 
 <script>
 import { getOrderList, applyCom, withdrawCom, deleteCom, editDateCom, abandonCom } from "@/api/supply/engin";
+import { getSalesmanList } from '@/api/common'
 import CommerceDetail from "@/views/supply/engin/components/commerce_detail";
 import CommerceForm from "@/views/supply/engin/components/commerce_form";
 import CommerceExamine from "@/views/supply/engin/components/commerce_examine";
@@ -272,6 +285,7 @@ export default {
         saleType: '',
         createMan: '',
         examineMan: '',
+        salesMan: '',
       },
       statusList: [
         { label: '已保存', value: 'SAVE' },
@@ -280,6 +294,7 @@ export default {
         { label: '审核驳回', value: 'FAIL' },
         { label: '已关闭', value: 'CLOSE' },
       ],
+      salesmanList: [],
 
       multipleSelection: [],
 
@@ -310,6 +325,7 @@ export default {
         saleTypeId: this.screenForm.saleType,
         createName: this.screenForm.createMan,
         confirmName: this.screenForm.examineMan,
+        serviceId: this.screenForm.salesMan,
         enginOrderType: 'TRADE', // TRADE=商用 HOME=家用
       }
     },
@@ -320,17 +336,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;
+      })
     },
 
     // 查询列表
@@ -350,6 +370,7 @@ export default {
         saleTypeId: this.screenForm.saleType,
         createName: this.screenForm.createMan,
         confirmName: this.screenForm.examineMan,
+        serviceId: this.screenForm.salesMan,
         enginOrderType: 'TRADE', // TRADE=商用 HOME=家用
       };
       getOrderList(params).then((res) => {

src/views/supply/engin/home_list.vue

@@ -61,8 +61,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="24" :lg="24" class="tr">
+            <el-col :xs="24" :sm="12" :lg="18" class="tr">
               <el-form-item label="">
                 <el-button size="small" @click="resetScreenForm">清空</el-button>
                 <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
@@ -90,7 +102,7 @@
                 {{scope.row.examineStatus | statusFilter}}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="工程订单号" prop="enginOrderNo" min-width="200" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="工程订单号" prop="enginOrderNo" min-width="140" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="订单日期" prop="orderDate" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 <div>
@@ -227,6 +239,7 @@
 
 <script>
 import { getOrderList, applyHome, withdrawHome, deleteHome, editDateHome, abandonHome } from "@/api/supply/engin";
+import { getSalesmanList } from '@/api/common'
 import HomeDetail from "@/views/supply/engin/components/home_detail";
 import HomeForm from "@/views/supply/engin/components/home_form";
 import HomeExamine from "@/views/supply/engin/components/home_examine";
@@ -272,6 +285,7 @@ export default {
         saleType: '',
         createMan: '',
         examineMan: '',
+        salesMan: '',
       },
       statusList: [
         { label: '已保存', value: 'SAVE' },
@@ -280,6 +294,7 @@ export default {
         { label: '审核驳回', value: 'FAIL' },
         { label: '已关闭', value: 'CLOSE' },
       ],
+      salesmanList: [],
 
       multipleSelection: [],
 
@@ -310,6 +325,7 @@ export default {
         saleTypeId: this.screenForm.saleType,
         createName: this.screenForm.createMan,
         confirmName: this.screenForm.examineMan,
+        serviceId: this.screenForm.salesMan,
         enginOrderType: 'HOME', // TRADE=商用 HOME=家用
       }
     },
@@ -320,10 +336,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;
@@ -341,6 +370,7 @@ export default {
         saleTypeId: this.screenForm.saleType,
         createName: this.screenForm.createMan,
         confirmName: this.screenForm.examineMan,
+        serviceId: this.screenForm.salesMan,
         enginOrderType: 'HOME', // TRADE=商用 HOME=家用
       };
       getOrderList(params).then((res) => {

src/views/supply/retail/retail_list.vue

@@ -64,8 +64,20 @@
                 <el-input v-model="screenForm.shMan" 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="24" :lg="24" class="tr">
+            <el-col :xs="24" :sm="12" :lg="18" class="tr">
               <el-form-item label="">
                 <el-button size="small" @click="resetScreenForm">清空</el-button>
                 <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
@@ -254,6 +266,7 @@
 
 <script>
 import { getList, closeData, submitData, editData, abandonData, deleteData, withdrawData } from "@/api/supply/retail";
+import { getSalesmanList } from '@/api/common'
 import RetailDetail from "@/views/supply/retail/components/retail_detail";
 import RetailForm from "@/views/supply/retail/components/retail_form";
 import RetailExamine from "@/views/supply/retail/components/retail_examine";
@@ -291,6 +304,7 @@ export default {
         isDirectTransfer: '',
         zbMan: '',
         shMan: '',
+        salesMan: '',
         status: '',
       },
       statusList: [
@@ -299,6 +313,7 @@ export default {
         { label: '审核通过', value: 'OK' },
         { label: '已关闭', value: 'CLOSE' },
       ],
+      salesmanList: [],
 
       queryItem: {},
       isShowDetail: false,
@@ -327,6 +342,7 @@ export default {
         createBy: this.screenForm.zbMan,
         examineBy: this.screenForm.shMan,
         isDirectTransfer: this.screenForm.isDirectTransfer,
+        serviceId: this.screenForm.salesMan,
         type: 1, // 1:普通零售单，2:政策零售单
       }
     },
@@ -337,10 +353,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;
@@ -358,6 +387,7 @@ export default {
         createBy: this.screenForm.zbMan,
         examineBy: this.screenForm.shMan,
         isDirectTransfer: this.screenForm.isDirectTransfer,
+        serviceId: this.screenForm.salesMan,
         type: 1, // 1:普通零售单，2:政策零售单
       };
       getList(params).then((res) => {