给销售相关的单据页面增加销售人员的查询条件

jshERP-web/src/views/bill/SaleBackList.vue

@@ -95,6 +95,15 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="销售人员" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-select placeholder="请选择销售人员" showSearch allow-clear optionFilterProp="children" v-model="queryParam.salesMan">
+                      <a-select-option v-for="(item,index) in salesManList" :key="index" :value="item.value">
+                        {{ item.text }}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="单据备注" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <a-input placeholder="请输入单据备注" v-model="queryParam.remark"></a-input>
@@ -231,6 +240,7 @@
           linkNumber: "",
           accountId: undefined,
           status: undefined,
+          salesMan: undefined,
           remark: ""
         },
         prefixNo: 'XSTH',
@@ -308,6 +318,7 @@
     created () {
       this.initSystemConfig()
       this.initCustomer()
+      this.initSalesman()
       this.getDepotData()
       this.initUser()
       this.initAccount()

jshERP-web/src/views/bill/SaleOrderList.vue

@@ -72,6 +72,15 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="销售人员" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-select placeholder="请选择销售人员" showSearch allow-clear optionFilterProp="children" v-model="queryParam.salesMan">
+                      <a-select-option v-for="(item,index) in salesManList" :key="index" :value="item.value">
+                        {{ item.text }}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="单据备注" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <a-input placeholder="请输入单据备注" v-model="queryParam.remark"></a-input>
@@ -224,6 +233,7 @@
           depotId: undefined,
           creator: undefined,
           status: undefined,
+          salesMan: undefined,
           remark: ""
         },
         prefixNo: 'XSDD',
@@ -294,6 +304,7 @@
     created() {
       this.initSystemConfig()
       this.initCustomer()
+      this.initSalesman()
       this.initUser()
       this.getSystemConfig()
       this.initQuickBtn()

jshERP-web/src/views/bill/SaleOutList.vue

@@ -103,6 +103,15 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="销售人员" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-select placeholder="请选择销售人员" showSearch allow-clear optionFilterProp="children" v-model="queryParam.salesMan">
+                      <a-select-option v-for="(item,index) in salesManList" :key="index" :value="item.value">
+                        {{ item.text }}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="单据备注" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <a-input placeholder="请输入单据备注" v-model="queryParam.remark"></a-input>
@@ -255,6 +264,7 @@
           accountId: undefined,
           hasDebt: undefined,
           status: undefined,
+          salesMan: undefined,
           remark: ""
         },
         prefixNo: 'XSCK',
@@ -336,6 +346,7 @@
     created() {
       this.initSystemConfig()
       this.initCustomer()
+      this.initSalesman()
       this.getDepotData()
       this.initUser()
       this.initAccount()

jshERP-web/src/views/bill/mixins/BillListMixin.js

@@ -1,8 +1,8 @@
 import Vue from 'vue'
 import { getAction, postAction } from '@/api/manage'
 import { FormTypes } from '@/utils/JEditableTableUtil'
-import {findBillDetailByNumber, findBySelectSup, findBySelectCus, findBySelectRetail, getUserList, getAccount,
-  waitBillCount, getCurrentSystemConfig, getPlatformConfigByKey} from '@/api/api'
+import { findBillDetailByNumber, findBySelectSup, findBySelectCus, findBySelectRetail, getUserList, getAccount,
+  waitBillCount, getCurrentSystemConfig, getPlatformConfigByKey, getPersonByNumType } from '@/api/api'
 import { getCheckFlag, getFormatDate, getMpListShort, getPrevMonthFormatDate } from '@/utils/util'
 import moment from 'moment'
 import pick from 'lodash.pick'
@@ -23,6 +23,7 @@ export const BillListMixin = {
       supList: [],
       cusList: [],
       retailList: [],
+      salesManList: [],
       userList: [],
       accountList: [],
       // 实际索引
@@ -636,6 +637,14 @@ export const BillListMixin = {
         }
       });
     },
+    initSalesman() {
+      let that = this;
+      getPersonByNumType({type:1}).then((res)=>{
+        if(res) {
+          that.salesManList = res;
+        }
+      });
+    },
     getDepotData() {
       getAction('/depot/findDepotByCurrentUser').then((res)=>{
         if(res.code === 200){

jshERP-web/src/views/bill/modules/SaleOutModal.vue

@@ -182,7 +182,7 @@
           <a-col :lg="6" :md="12" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="销售人员" data-step="11" data-title="销售人员"
                          data-intro="销售人员的数据来自【经手人管理】菜单中的销售员">
-              <j-select-multiple style="width:185px;" placeholder="请选择销售人员" v-model="personList.value" :options="personList.options"/>
+              <j-select-multiple style="width:80%;" placeholder="请选择销售人员" v-model="personList.value" :options="personList.options"/>
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :sm="24">