销售询价单-列表增加业务员，修改业务员筛选条件/销售订单-修改业务员筛选条件

src/views/saleCode/saleInquiryForm/SaleInquiryForm.api.ts

@@ -18,7 +18,8 @@ enum Api {
   cancelSubmitBatch='/saleCode/saleInquiryForm/returnSubmitBatch',
   customerList='/cuspCode/cuspCustomerProfile/list?pageSize=-1',
   projectList='/baseCode/baseProjectArchive/list',
-  classOption='baseCode/baseProductClass/list'
+  classOption='baseCode/baseProductClass/list',
+  salemanOption = 'sys/user/list'
 }
 /**
  * 导出api
@@ -127,4 +128,6 @@ export const CustomerOption = (params) => defHttp.get({ url: Api.customerList, p
 //获取项目下拉框列表
 export const ProjectOption = (params) => defHttp.get({ url: Api.projectList, params });
 //获取项目下拉框列表
-export const ClassOption = (params) => defHttp.get({ url: Api.classOption, params });
+export const ClassOption = (params) => defHttp.get({ url: Api.classOption, params });
+//获取业务员下拉框
+export const SaleManOption = (params) => defHttp.get({ url: Api.salemanOption, params });

src/views/saleCode/saleInquiryForm/SaleInquiryForm.data.ts

@@ -95,6 +95,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'maker'
    },
+   {
+    title: '业务员(salesman)',
+    align:"center",
+    dataIndex: 'salesmanName'
+   },
    {
     title: '采购询价组(procurement inquiry team)',
     align:"center",

src/views/saleCode/saleInquiryForm/SaleInquiryFormList.vue

@@ -80,9 +80,9 @@
               </a-form-item>
             </a-col>
             <a-col :lg="8">
-              <a-form-item name="inquiryPlatform" :label-col="{ style: 'width: 280px' }">
-                <template #label><span title="询价平台(inquiry platform)">询价平台(inquiry platform)</span></template>
-                <JDictSelectTag v-model:value="queryParam.inquiryPlatform" placeholder="请选择" dictCode="inquiry_platform" />
+              <a-form-item name="saleDepartment" :label-col="{ style: 'width: 280px' }">
+                <template #label><span title="销售部门(sale department)">销售部门(sale department)</span></template>
+                <JSelectDept v-model:value="queryParam.saleDepartment" :multiple="false" />
               </a-form-item>
             </a-col>
 
@@ -92,13 +92,13 @@
                 <JDictSelectTag v-model:value="queryParam.status" placeholder="请选择" dictCode="inquiry_status" />
               </a-form-item>
             </a-col>
-
             <a-col :lg="8">
-              <a-form-item name="saleDepartment" :label-col="{ style: 'width: 200px' }">
-                <template #label><span title="销售部门(sale department)">销售部门(sale department)</span></template>
-                <JSelectDept v-model:value="queryParam.saleDepartment" :multiple="false" />
+              <a-form-item name="inquiryPlatform" :label-col="{ style: 'width: 200px' }">
+                <template #label><span title="询价平台(inquiry platform)">询价平台(inquiry platform)</span></template>
+                <JDictSelectTag v-model:value="queryParam.inquiryPlatform" placeholder="请选择" dictCode="inquiry_platform" />
               </a-form-item>
             </a-col>
+            
             <a-col :lg="8">
               <a-form-item name="inquiryTeam" :label-col="{ style: 'width: 280px' }">
                 <template #label><span title="采购询价组(procurement inquiry team)">采购询价组(procurement inquiry team)</span></template>
@@ -108,7 +108,18 @@
             <a-col :lg="8">
               <a-form-item name="salesman" :label-col="{ style: 'width: 200px' }">
                 <template #label><span title="业务员(salesman)">业务员(salesman)</span></template>
-                <JSelectUser v-model:value="queryParam.salesman" placeholder="请选择" :multiple="false" />
+                <ApiSelect
+                  :api="SaleManOption"
+                  showSearch
+                  v-model:value="queryParam.salesman"
+                  :filterOption="true"
+                  resultField="records"
+                  labelField="realname"
+                  valueField="username"
+                  :params="{ pageSize: -1 }"
+                  optionFilterProp="label"
+                />
+                <!-- <JSelectUser v-model:value="queryParam.salesman" placeholder="请选择" :multiple="false" /> -->
               </a-form-item>
             </a-col>
             <a-col :lg="8">
@@ -207,6 +218,7 @@
     ProjectOption,
     CustomerOption,
     ClassOption,
+    SaleManOption
   } from './SaleInquiryForm.api';
   import { cloneDeep } from 'lodash-es';
   import { defHttp } from '/@/utils/http/axios';

src/views/saleCode/salesOrder/SaleOrderForm.data.ts

@@ -60,7 +60,6 @@ export const columns: BasicColumn[] = [
     title: '业务员(salesman)',
     align:"center",
     dataIndex: 'salesman',
-    width:'250'
    },
    {
     title: '提交(submit)',
@@ -90,6 +89,7 @@ export const columns: BasicColumn[] = [
     title: '客户确认(customer confirm)',
     align:"center",
     dataIndex: 'status',
+    width:250,
     customRender:function (t, r, index) {
       if(t.text==1){
         return '已确认'
@@ -102,39 +102,39 @@ export const columns: BasicColumn[] = [
     title: '基础协议(base protocaol)',
     align:"center",
     dataIndex: 'baseProtocaol',
-    width:'250',
+    width:250,
     slots: { customRender: 'viewFile' },
    },
    {
     title: '扫描合同(scan contract)',
     align:"center",
     dataIndex: 'scanProtocaol',
-    width:'250',
+    width:250,
     slots: { customRender: 'viewFile' },
    },
    {
     title: '订单金额(order money)',
     align:"center",
     dataIndex: 'orderMoney',
-    width:'250'
+    width:250
    },
    {
     title: '发货金额(delivery money)',
     align:"center",
     dataIndex: 'deliveryMoney',
-    width:'250'
+    width:250
    },
    {
     title: '发票金额(invoice money)',
     align:"center",
     dataIndex: 'invoiceMoney',
-    width:'250'
+    width:250
    },
    {
     title: '收款金额(collected money)',
     align:"center",
     dataIndex: 'collectedMoney',
-    width:'250'
+    width:250
    },
 ];
 

src/views/saleCode/salesOrder/SaleOrderFormList.vue

@@ -82,7 +82,18 @@
             <a-col :lg="8">
               <a-form-item name="salesman">
                 <template #label><span title="业务员(salesman)">业务员(salesman)</span></template>
-                <JSelectUser v-model:value="queryParam.salesman" placeholder="请选择" :multiple="false" />
+                <ApiSelect
+                  :api="SaleManOption"
+                  showSearch
+                  v-model:value="queryParam.salesman"
+                  :filterOption="true"
+                  resultField="records"
+                  labelField="realname"
+                  valueField="username"
+                  :params="{ pageSize: -1 }"
+                  optionFilterProp="label"
+                />
+                <!-- <JSelectUser v-model:value="queryParam.salesman" placeholder="请选择" :multiple="false" /> -->
               </a-form-item>
             </a-col>
             <a-col :lg="8">
@@ -189,7 +200,8 @@
     ProjectOption,
     CustomerOption,
     ClassList,
-    getExportUrlRow
+    getExportUrlRow,
+    SaleManOption
   } from './SaleOrderyForm.api';
   import { cloneDeep } from 'lodash-es';
   import { JDictSelectTag, ApiSelect, JInput,JSelect } from '/@/components/Form';
@@ -222,7 +234,7 @@
         fixed: 'right',
       },
       scroll: {
-        x: '4000px',
+        x: '4500px',
         y:'calc(100vh - 400px)',
       },
       beforeFetch: async (params) => {
@@ -469,11 +481,11 @@
   const toggleSearchStatus = ref<boolean>(false);
   const labelCol = reactive({
     xs: 24,
-    sm: 8,
+    sm: 9,
   });
   const wrapperCol = reactive({
     xs: 24,
-    sm: 16,
+    sm: 15,
   });
   const labelCol1 = reactive({
     xs: 24,

src/views/saleCode/salesOrder/SaleOrderyForm.api.ts

@@ -27,7 +27,8 @@ enum Api {
   cancelBatchConfirm = '/saleCode/saleOrder/returnSubmitConfirm',
   classList='baseCode/baseProductClass/list',
   customerList='/cuspCode/cuspCustomerProfile/list',
-  projectList='/baseCode/baseProjectArchive/list'
+  projectList='/baseCode/baseProjectArchive/list',
+  salemanOption = 'sys/user/list'
 }
 /**
  * 导出api
@@ -225,4 +226,6 @@ export const cancelBatchConfirm = (params, handleSuccess) => {
 export const CustomerOption = (params) => defHttp.get({ url: Api.customerList, params });
 
 //获取项目下拉框列表
-export const ProjectOption = (params) => defHttp.get({ url: Api.projectList, params });
+export const ProjectOption = (params) => defHttp.get({ url: Api.projectList, params });
+//获取业务员下拉框
+export const SaleManOption = (params) => defHttp.get({ url: Api.salemanOption, params });