供应商下拉框-显示字段修改

src/views/baseCode/ShipArchive/BaseShipArchive.data.ts

@@ -45,7 +45,7 @@ export const searchFormSchema: FormSchema[] = [
     label: 'IMO',
     field: 'imo',
     component: 'JInput',
-    labelWidth: 150,
+    labelWidth: 180,
     // colProps: {span: 8},
   },
   {
@@ -56,16 +56,6 @@ export const searchFormSchema: FormSchema[] = [
     // colProps: {span: 8},
 
   },
-  {
-    label: '关联客户(relate customer)',
-    field: 'relateCustomer',
-    component: 'JSelect',
-    componentProps: {
-      getOptionUrl: () => defHttp.get({ url: '/cuspCode/cuspCustomerProfile/list?pageSize=-1'}),
-      showField:"currency+name"
-    },
-    labelWidth: 180,
-  },
   {
     label: 'hull number',
     field: 'hullNumber',
@@ -77,13 +67,26 @@ export const searchFormSchema: FormSchema[] = [
     label: '船厂(ship factory)',
     field: 'shipFactory',
     component: 'JDictSelectTag',
-    labelWidth: 150,
+    labelWidth: 180,
     componentProps: {
       dictCode: 'ship_factory',
       showSearch: true,
     },
     //colProps: {span: 6},
   },
+  {
+    label: '关联客户(relate customer)',
+    field: 'relateCustomer',
+    component: 'JSelect',
+    componentProps: {
+      getOptionUrl: () => defHttp.get({ url: '/cuspCode/cuspCustomerProfile/list?pageSize=-1'}),
+      showField:"currency+name"
+    },
+    labelWidth: 180,
+    colProps: {span: 12},
+  },
+  
+ 
   {
     label: '序列号(serial number)',
     field: 'serialNumber',
@@ -106,7 +109,7 @@ export const searchFormSchema: FormSchema[] = [
     label: '船类型(ship type)',
     field: 'shipType',
     component: 'JDictSelectTag',
-    labelWidth: 150,
+    labelWidth: 180,
     componentProps: {
       dictCode: 'ship_type',
       showSearch: true,

src/views/cuspCode/SupplierEvaluation/CuspSupplierEvaluation.data.ts

@@ -66,31 +66,6 @@ export const searchFormSchema: FormSchema[] = [
     },
     //colProps: {span: 6},
   },
-  {
-    label: '供应商(supplier)',
-    field: 'supplierId',
-    labelWidth: 150,
-    component: 'ApiSelect',
-    componentProps: {
-      // mode: 'multiple',//multiple: 多选；不填写为单选
-      //请求api,返回结果{ result: { records: [{'id':'1',name:'scott'},{'id':'2',name:'小张'}] }}
-      api: () => defHttp.get({ url: '/cuspCode/cuspSupplierProfile/list',params:{pageSize: -1}}),
-      //数值转成String
-      numberToString: false,
-      //标题字段
-      labelField: 'name',
-      //值字段
-      valueField: 'id',
-      //请求参数
-      params: { pageSize: -1 },
-      //返回结果字段
-      resultField: 'records',
-      filterOption: 'true',
-      optionFilterProp: 'label',
-      showSearch: 'true',
-    },
-    //colProps: {span: 6},
-  },
   {
     label: '单据日期(billDate)',
     field: 'billDate',
@@ -102,6 +77,18 @@ export const searchFormSchema: FormSchema[] = [
     },
     //colProps: {span: 6},
   },
+  {
+    label: '供应商(supplier)',
+    field: 'supplierId',
+    labelWidth: 150,
+    component: 'JSelect',
+    componentProps: {
+      getOptionUrl: () => defHttp.get({ url: '/cuspCode/cuspCustomerProfile/list?pageSize=-1'}),
+      showField:"currency+name"
+    },
+    colProps: {span: 12},
+  },
+  
   {
     label: '提交(submit)',
     field: 'submit',

src/views/inventiry/defectiveProducts/defectiveProductsList.vue

@@ -2,7 +2,7 @@
   <div class="p-2">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
-      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="{ style: 'width: 200px' }">
         <a-row :gutter="24">
           <a-col :lg="8">
             <a-form-item name="billDate">
@@ -33,20 +33,10 @@
                 <JInput placeholder="请输入入库单号(bill code)" v-model:value="queryParam.billCode" allow-clear AutoComplete="off" />
               </a-form-item>
             </a-col>
-            <a-col :lg="8">
+            <a-col :lg="16">
               <a-form-item name="supplier">
                 <template #label><span title="供应商(supplier)">供应商(supplier)</span></template>
-                <ApiSelect
-                  :api="supplierOption"
-                  showSearch
-                  v-model:value="queryParam.supplier"
-                  :filterOption="true"
-                  resultField="records"
-                  labelField="name"
-                  valueField="id"
-                  :params="{ pageSize: -1 }"
-                  optionFilterProp="label"
-                />
+                <JSelect   v-model:value="queryParam.supplier" :get-option-url="supplierOption" :showField="showField"></JSelect>
               </a-form-item>
             </a-col>
           </template>
@@ -84,11 +74,12 @@
   import { columns } from './defectiveProductsForm.data';
   import { list, getExportUrl, supplierOption, ProjectOption } from './defectiveProductsForm.api';
   import { cloneDeep } from 'lodash-es';
-  import { ApiSelect, JInput } from '/@/components/Form';
+  import { ApiSelect, JInput,JSelect } from '/@/components/Form';
   const formRef = ref();
   const queryParam = reactive<any>({
     type: '2',
   });
+  var showField = ref('currency+name');
   //注册table数据
   const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     tableProps: {

src/views/inventiry/existingQuantity/existingQuantityList.vue

@@ -2,7 +2,7 @@
   <div class="p-2">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
-      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="{ style: 'width: 200px' }">
         <a-row :gutter="24">
           <a-col :lg="8">
             <a-form-item name="warehouse">
@@ -33,20 +33,10 @@
                 <JDictSelectTag v-model:value="queryParam.goodsAllocation" placeholder="请选择" dictCode="goods_allocation" />
               </a-form-item>
             </a-col>
-            <a-col :lg="8">
+            <a-col :lg="16">
               <a-form-item name="supplier">
                 <template #label><span title="供应商(supplier)">供应商(supplier)</span></template>
-                <ApiSelect
-                  :api="supplierOption"
-                  showSearch
-                  v-model:value="queryParam.supplier"
-                  :filterOption="true"
-                  resultField="records"
-                  labelField="name"
-                  valueField="id"
-                  :params="{ pageSize: -1 }"
-                  optionFilterProp="label"
-                />
+                <JSelect   v-model:value="queryParam.supplier" :get-option-url="supplierOption" :showField="showField"></JSelect>
               </a-form-item>
             </a-col>
             <!-- <a-col :lg="8">
@@ -143,12 +133,13 @@
   import { columns } from './existingQuantityForm.data';
   import { list, getExportUrl, CustomerOption, ProjectOption, ClassList, supplierOption } from './existingQuantityForm.api';
   import { cloneDeep } from 'lodash-es';
-  import { JDictSelectTag, ApiSelect, JInput } from '/@/components/Form';
+  import { JDictSelectTag, ApiSelect, JInput,JSelect } from '/@/components/Form';
   const formRef = ref();
   const queryParam = reactive<any>({
     type: '2',
     quantity:'1'
   });
+  var showField = ref('currency+name');
   //注册model
   //注册table数据
   const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({

src/views/inventiry/otherIn/components/otherInForm.vue

@@ -21,18 +21,7 @@
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="供应商(supplier)" v-bind="validateInfos.supplier"  id="SaleOrderForm-supplier" name="supplier">
-                <ApiSelect
-                    :api="supplierOption"
-                    showSearch
-                    v-model:value="formData.supplier"
-                    :filterOption="true"
-                    resultField="records"
-                    labelField="name"
-                    valueField="id"
-                    @change="changeSupplier"
-                    :params='{pageSize:-1}'
-                    optionFilterProp='label'
-                  />
+                <JSelect   v-model:value="formData.supplier" :get-option-url="supplierOption" :showField="showField" @change="changeSupplier"></JSelect>
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
@@ -153,7 +142,7 @@
   import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
   import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
   import JSelectInput from '/@/components/Form/src/jeecg/components/JSelectInput.vue';
-  import { JDictSelectTag,ApiSelect} from '/@/components/Form';
+  import { JDictSelectTag,ApiSelect,JSelect} from '/@/components/Form';
   import { Form, message } from 'ant-design-vue';
   import moment from 'moment';
   const useForm = Form.useForm;
@@ -169,7 +158,8 @@
       SelectPrpductModal,
       SelectShipSModal,
       JSelectInput,
-      ApiSelect
+      ApiSelect,
+      JSelect
     },
     props:{
       formDisabled:{
@@ -182,6 +172,7 @@
     emits:['success'],
     setup(props, {emit}) {
       const loading = ref(false);
+      var showField = ref('currency+name');
       const formRef = ref();
       const SelectProjectModalRef = ref()
       const SelectPrpductModalRef = ref()
@@ -382,9 +373,9 @@
       }
       async function changeSupplier(prop){
         if(prop){
-          var params={id:formData.supplier}
+          var params={id:prop}
           var obj = await supplierOption(params)
-          formData.suppilerName = obj.records[0].name
+          formData.supplierName = obj.records[0].name
         }else{
           formData.supplier = ''
           formData.supplierName = ''
@@ -431,7 +422,8 @@
         addShip,
         changeSupplier,
         ClassList,
-        supplierOption
+        supplierOption,
+        showField
       }
     }
   });

src/views/inventiry/otherIn/othernList.vue

@@ -2,7 +2,7 @@
   <div class="p-2">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
-      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="{ style: 'width: 200px' }">
         <a-row :gutter="24">
           <a-col :lg="8">
             <a-form-item name="billDate">
@@ -33,20 +33,10 @@
                 <JInput placeholder="请输入入库单号(bill code)" v-model:value="queryParam.billCode" allow-clear AutoComplete="off" />
               </a-form-item>
             </a-col>
-            <a-col :lg="8">
+            <a-col :lg="16">
               <a-form-item name="supplier">
                 <template #label><span title="供应商(supplier)">供应商(supplier)</span></template>
-                <ApiSelect
-                  :api="supplierOption"
-                  showSearch
-                  v-model:value="queryParam.supplier"
-                  :filterOption="true"
-                  resultField="records"
-                  labelField="name"
-                  valueField="id"
-                  :params="{ pageSize: -1 }"
-                  optionFilterProp="label"
-                />
+                <JSelect   v-model:value="queryParam.supplier" :get-option-url="supplierOption" :showField="showField"></JSelect>
               </a-form-item>
             </a-col>
             <a-col :lg="8">
@@ -176,10 +166,11 @@
     ClassList,
   } from './otherInForm.api';
   import { cloneDeep } from 'lodash-es';
-  import { JDictSelectTag, ApiSelect, JInput } from '/@/components/Form';
+  import { JDictSelectTag, ApiSelect, JInput,JSelect } from '/@/components/Form';
   import { message } from 'ant-design-vue';
   const formRef = ref();
   const queryParam = reactive<any>({});
+  var showField = ref('currency+name');
   //注册model
   const [registerModal, { openModal }] = useModal();
   //注册table数据

src/views/inventiry/purInAbnormal/purInAbnormalList.vue

@@ -2,7 +2,7 @@
   <div class="p-2">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
-      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="{ style: 'width: 200px' }">
         <a-row :gutter="24">
           <a-col :lg="8">
             <a-form-item name="billDate">
@@ -32,19 +32,10 @@
                 <JInput placeholder="请输入入库单号(bill code)" v-model:value="queryParam.billCode" allow-clear AutoComplete="off" />
               </a-form-item>
             </a-col>
-            <a-col :lg="8">
+            <a-col :lg="16">
               <a-form-item name="supplier">
                 <template #label><span title="供应商(supplier)">供应商(supplier)</span></template>
-                <ApiSelect
-                  :api="supplierOption"
-                  showSearch
-                  v-model:value="queryParam.supplier"
-                  :filterOption="false"
-                  resultField="records"
-                  labelField="name"
-                  valueField="id"
-                  :params="{ pageSize: -1 }"
-                />
+                <JSelect   v-model:value="queryParam.supplier" :get-option-url="supplierOption" :showField="showField"></JSelect>
               </a-form-item>
             </a-col>
             <a-col :lg="8">
@@ -136,12 +127,13 @@
   import { columns } from './purInAbnormalForm.data';
   import { list, getImportUrl, getExportUrl, ProcessedList, ProjectOption, supplierOption, ClassList } from './purInAbnormalForm.api';
   import { cloneDeep } from 'lodash-es';
-  import { JDictSelectTag, ApiSelect, JInput } from '/@/components/Form';
+  import { JDictSelectTag, ApiSelect, JInput,JSelect } from '/@/components/Form';
   import { message } from 'ant-design-vue';
   const formRef = ref();
   const queryParam = reactive<any>({
     type: '2',
   });
+  var showField = ref('currency+name');
   //注册model
   const [registerModal, { openModal }] = useModal();
   //注册table数据

src/views/inventiry/purchaseIn/purchaseInList.vue

@@ -2,7 +2,7 @@
   <div class="p-2">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
-      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="{ style: 'width: 200px' }">
         <a-row :gutter="24">
           <a-col :lg="8">
             <a-form-item name="billDate">
@@ -33,20 +33,10 @@
                 <JInput placeholder="请输入入库单号(bill code)" v-model:value="queryParam.billCode" allow-clear AutoComplete="off" />
               </a-form-item>
             </a-col>
-            <a-col :lg="8">
+            <a-col :lg="16">
               <a-form-item name="supplier">
                 <template #label><span title="供应商(supplier)">供应商(supplier)</span></template>
-                <ApiSelect
-                  :api="supplierOption"
-                  showSearch
-                  v-model:value="queryParam.supplier"
-                  :filterOption="true"
-                  resultField="records"
-                  labelField="name"
-                  valueField="id"
-                  :params="{ pageSize: -1 }"
-                  optionFilterProp="label"
-                />
+                <JSelect   v-model:value="queryParam.supplier" :get-option-url="supplierOption" :showField="showField"></JSelect>
               </a-form-item>
             </a-col>
             <a-col :lg="8">
@@ -169,10 +159,11 @@
     ClassList,
   } from './purchaseInForm.api';
   import { cloneDeep } from 'lodash-es';
-  import { JDictSelectTag, ApiSelect, JInput } from '/@/components/Form';
+  import { JDictSelectTag, ApiSelect, JInput ,JSelect} from '/@/components/Form';
   import { message } from 'ant-design-vue';
   const formRef = ref();
   const queryParam = reactive<any>({});
+    var showField = ref('currency+name');
   //注册model
   const [registerModal, { openModal }] = useModal();
   //注册table数据

src/views/inventiry/salesOutbound/components/SelectStaningStockModal.vue

@@ -24,16 +24,11 @@
                     </a-col> 
                     <template v-if="toggleSearchStatus">
                         <a-col :md="6" :sm="8">
-                            <a-form-item label="项目(project)">
-                                <j-input placeholder="请输入" v-model:value="queryParams.projectName" :disabled="father.project!==''"></j-input>
-                            </a-form-item>
-                        </a-col>
-                        <a-col :md="6" :sm="8">
-                            <a-form-item label="供应商(supplier)">
+                            <a-form-item label="产品分类(production class)" >
                                 <ApiSelect
-                                    :api="supplierOption"
+                                    :api="ClassList"
                                     showSearch
-                                    v-model:value="queryParams.supplier"
+                                    v-model:value="queryParams.productionClass"
                                     optionFilterProp="label"
                                     resultField="records"
                                     labelField="name"
@@ -42,25 +37,22 @@
                                 />
                             </a-form-item>
                         </a-col>
+                        <a-col :md="6" :sm="8">
+                            <a-form-item label="项目(project)">
+                                <j-input placeholder="请输入" v-model:value="queryParams.projectName" :disabled="father.project!==''"></j-input>
+                            </a-form-item>
+                        </a-col>
                         <a-col :md="12" :sm="16">
-                            <a-form-item label="客户(customer)">
-                                <JSelect   v-model:value="queryParams.customer" :get-option-url="CustomerOption" :showField="showField"></JSelect>
+                            <a-form-item label="供应商(supplier)">
+                                <JSelect   v-model:value="queryParams.supplier" :get-option-url="supplierOption" :showField="showField"></JSelect>
                             </a-form-item>
                         </a-col>
-                        <a-col :md="6" :sm="8">
-                            <a-form-item label="产品分类(production class)" >
-                                <ApiSelect
-                                    :api="ClassList"
-                                    showSearch
-                                    v-model:value="queryParams.productionClass"
-                                    optionFilterProp="label"
-                                    resultField="records"
-                                    labelField="name"
-                                    valueField="id"
-                                    :params='{pageSize:-1}'
-                                />
+                        <a-col :md="12" :sm="16">
+                            <a-form-item label="客户(customer)">
+                                <JSelect   v-model:value="queryParams.customer" :get-option-url="CustomerOption" :showField="showField"></JSelect>
                             </a-form-item>
                         </a-col>
+                        
                         <a-col :md="6" :sm="8">
                             <a-form-item label="优先级(priority)" >
                                 <JDictSelectTag v-model:value="queryParams.priority" placeholder="请选择" dictCode="priority"/>

src/views/publicComponents/SelectContractModal.vue

@@ -132,7 +132,7 @@
                 size="small"
                 @change="handleTableChange"
                 :pagination="pagination"
-                :scroll="{ x: 3500, y: 400 }"
+                :scroll="{ x: 3800, y: 400 }"
                 :rowSelection="{  onSelect: onSelect, onSelectAll: onSelectAll,selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
             >
             </a-table>
@@ -185,7 +185,8 @@
             title: '客户(custormer)',
             dataIndex: 'quotationCustomerName',
             key: 'quotationCustomerName',
-            align:"center",ellipsis: true,
+            align:"center",
+            width:200,
         },
         {
             title: '优先级(priority)',
@@ -232,6 +233,7 @@
             dataIndex: 'englishName',
             align:"center",
             width:250,
+            ellipsis: true,
         },
         // {
         //     title: '规格(specifications)',

src/views/publicComponents/SelectPurchaseOrderMainModal.vue

@@ -11,7 +11,7 @@
         <div>
           <a-card  :body-style="{ padding: '10px' }" :bordered="false" style="margin: 10px;">
             <div class="table-page-search-wrapper">
-                <a-form :model="queryParams" :label-col="labelCol" :wrapper-col="wrapperCol" @keyup.enter.native="searchQuery" >
+                <a-form :model="queryParams" :label-col="{ style: 'width: 200px' }" @keyup.enter.native="searchQuery" >
                 <a-row :gutter="24">
                     <a-col :md="6" :sm="8">
                         <a-form-item label="订单编号(bill code)">
@@ -39,7 +39,7 @@
                             </a-form-item>
                         </a-col>
                         <a-col :md="6" :sm="8">
-                            <a-form-item label="产品分类(production class)" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+                            <a-form-item label="产品分类(production class)" >
                                 <ApiSelect
                                 :api="ClassList"
                                 showSearch
@@ -52,18 +52,9 @@
                                 />
                             </a-form-item>
                         </a-col>
-                        <a-col :md="6" :sm="8">
+                        <a-col :md="12" :sm="16">
                             <a-form-item label="供应商(supplier)">
-                                <ApiSelect
-                                :api="supplierOption"
-                                showSearch
-                                v-model:value="queryParams.supplier"
-                                optionFilterProp="label"
-                                resultField="records"
-                                labelField="name"
-                                valueField="id"
-                                :params='{pageSize:-1}'
-                                />
+                                <JSelect   v-model:value="queryParams.supplier" :get-option-url="supplierOption" :showField="showField"></JSelect>
                             </a-form-item>
                         </a-col>
                         <a-col :md="6" :sm="8">
@@ -78,7 +69,7 @@
                             </a-form-item>
                         </a-col>
                         <a-col :md="6" :sm="8">
-                            <a-form-item label="产品编码(product code)" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+                            <a-form-item label="产品编码(product code)" >
                                 <j-input placeholder="请输入" v-model:value="queryParams.productCode"></j-input>
                             </a-form-item>
                         </a-col>                  
@@ -133,9 +124,10 @@
     import { message } from 'ant-design-vue';
     import {  ApiSelect, } from '/@/components/Form/index';
     import { filterObj, getFileAccessHttpUrl } from '/@/utils/common/compUtils';
-    import { JDictSelectTag,JInput} from '/@/components/Form';
+    import { JDictSelectTag,JInput,JSelect} from '/@/components/Form';
     import {ProjectOption,supplierOption,ClassList} from '../purchase/arrivedGoods/ArriveGoodsForm.api';
     const emit = defineEmits([ 'selectPurchaseOrderMian']); //定义emit
+    var showField = ref('currency+name');
     var visible = ref(false)
     var getListUrl=ref('')
     const columns = [

src/views/publicComponents/SelectPurchaseOrderModal.vue

@@ -8,9 +8,9 @@
       @ok = "handleOk"
       @cancel="handleCancel">
         <div>
-          <a-card  :body-style="{ padding: '10px' }" :bordered="false" style="margin: 10px;">
+          <a-card  :body-style="{ padding: '10px' }"  :bordered="false" style="margin: 10px;">
             <div class="table-page-search-wrapper">
-                <a-form :model="queryParams" :label-col="labelCol" :wrapper-col="wrapperCol" @keyup.enter.native="searchQuery" >
+                <a-form :model="queryParams" @keyup.enter.native="searchQuery" :label-col="{ style: 'width: 200px' }">
                 <a-row :gutter="24">
                     <a-col :md="6" :sm="8">
                         <a-form-item label="订单编号(bill code)">
@@ -39,7 +39,7 @@
                             </a-form-item>
                         </a-col>
                         <a-col :md="6" :sm="8">
-                            <a-form-item label="产品分类(production class)" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+                            <a-form-item label="产品分类(production class)" >
                                 <ApiSelect
                                 :api="ClassList"
                                 showSearch
@@ -52,18 +52,9 @@
                                 />
                             </a-form-item>
                         </a-col>
-                        <a-col :md="6" :sm="8">
+                        <a-col :md="12" :sm="16">
                             <a-form-item label="供应商(supplier)">
-                                <ApiSelect
-                                :api="supplierOption"
-                                showSearch
-                                v-model:value="queryParams.supplier"
-                                optionFilterProp="label"
-                                resultField="records"
-                                labelField="name"
-                                valueField="id"
-                                :params='{pageSize:-1}'
-                                />
+                                <JSelect   v-model:value="queryParams.supplier" :get-option-url="supplierOption" :showField="showField"></JSelect>
                             </a-form-item>
                         </a-col>
                         <a-col :md="6" :sm="8">
@@ -78,7 +69,7 @@
                             </a-form-item>
                         </a-col>
                         <a-col :md="6" :sm="8">
-                            <a-form-item label="产品编码(product code)" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+                            <a-form-item label="产品编码(product code)" >
                                 <j-input placeholder="请输入" v-model:value="queryParams.productCode"></j-input>
                             </a-form-item>
                         </a-col>                  
@@ -131,11 +122,11 @@
     import {ref, reactive } from 'vue';
     import { defHttp} from '/@/utils/http/axios';
     import { message } from 'ant-design-vue';
-    import {  ApiSelect, } from '/@/components/Form/index';
     import { filterObj, getFileAccessHttpUrl } from '/@/utils/common/compUtils';
-    import { JDictSelectTag,JInput} from '/@/components/Form';
+    import { JDictSelectTag,JInput,JSelect,ApiSelect} from '/@/components/Form';
     import {ProjectOption,supplierOption,ClassList} from '../purchase/arrivedGoods/ArriveGoodsForm.api';
     const emit = defineEmits([ 'selectPurchaseOrder']); //定义emit
+    var showField = ref('currency+name');
     var visible = ref(false)
     var fatherProject = ref('')
     var fatherSourceCode = ref('')

src/views/publicComponents/SelectQuotationModal.vue

@@ -120,7 +120,7 @@
                 size="small"
                 @change="handleTableChange"
                 :pagination="pagination"
-                :scroll="{ x: 3500, y: 400 }"
+                :scroll="{ x: 3800, y: 400 }"
                 :rowSelection="{ onSelect: onSelect, onSelectAll: onSelectAll,selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
             >
             </a-table>
@@ -158,7 +158,8 @@
             title: '单据日期(bill date)',
             dataIndex: 'billDate',
             key: 'billDate',
-            align:"center"
+            align:"center",
+            width:200,
         },
         {
             title: '报价项目(quotation project)',
@@ -173,7 +174,7 @@
             dataIndex: 'quotationCustomerName',
             key: 'quotationCustomerName',
             align:"center",
-            ellipsis: true,
+            width:250,
         },
         {
             title: '报价有效期(quotation period)',
@@ -218,7 +219,7 @@
             dataIndex: 'productCode',
             key: 'productCode',
             align:"center",
-            width:250,
+            width:200,
         },
         {
             title: '产品英文名(English name)',

src/views/publicComponents/SelectSaleOrderModal.vue

@@ -58,19 +58,9 @@
                                 <JDictSelectTag v-model:value="queryParams.priority" placeholder="请选择" dictCode="priority"/>
                             </a-form-item>
                         </a-col>
-                        <a-col :md="6" :sm="8" v-if="showCustomer=='no'">
+                        <a-col :md="12" :sm="16" v-if="showCustomer=='no'">
                             <a-form-item label="供应商(supplier)" >
-                                <ApiSelect
-                                    :api="supplierOption"
-                                    showSearch
-                                    v-model:value="queryParams.supplierId"
-                                    optionFilterProp="label"
-                                    resultField="records"
-                                    labelField="name"
-                                    valueField="id"
-                                    :params='{pageSize:-1}'
-                                    :disabled="fatherSupplier!==''"
-                                    />
+                                <JSelect   v-model:value="queryParams.supplierId" :get-option-url="supplierOption" :showField="showField"  @change="changeCustmer" :disabled="fatherSupplier!==''"></JSelect>
                             </a-form-item>
                         </a-col>
                         <a-col :md="12" :sm="16" v-if="showCustomer=='yes'">
@@ -216,7 +206,8 @@
             dataIndex: 'customerName',
             key: 'customerName',
             align:"center",
-            ellipsis: true,
+            width:250,
+            // ellipsis: true,
             // className:showCustomer.value=='yes'?'tableShow':'tableHiddl
         },
         {

src/views/publicComponents/SelectStaningStockModal.vue

@@ -39,12 +39,12 @@
                             </a-form-item>
                         </a-col>
                         <a-col :md="6" :sm="8">
-                            <a-form-item label="供应商(supplier)">
+                            <a-form-item label="产品分类(production class)" :label-col="labelCol1" :wrapper-col="wrapperCol1">
                                 <ApiSelect
-                                    :api="supplierOption"
+                                    :api="ClassList"
                                     showSearch
-                                    v-model:value="queryParams.supplier"
-                                    optionFilterProp="label"
+                                    v-model:value="queryParams.productionClass"
+                                    :filterOption="false"
                                     resultField="records"
                                     labelField="name"
                                     valueField="id"
@@ -53,24 +53,16 @@
                             </a-form-item>
                         </a-col>
                         <a-col :md="12" :sm="16">
-                            <a-form-item label="客户(customer)">
-                                <JSelect   v-model:value="queryParams.customer" :get-option-url="CustomerOption" :showField="showField"></JSelect>
+                            <a-form-item label="供应商(supplier)">
+                                <JSelect   v-model:value="queryParams.supplier" :get-option-url="supplierOption" :showField="showField"></JSelect>
                             </a-form-item>
                         </a-col>
-                        <a-col :md="6" :sm="8">
-                            <a-form-item label="产品分类(production class)" :label-col="labelCol1" :wrapper-col="wrapperCol1">
-                                <ApiSelect
-                                    :api="ClassList"
-                                    showSearch
-                                    v-model:value="queryParams.productionClass"
-                                    :filterOption="false"
-                                    resultField="records"
-                                    labelField="name"
-                                    valueField="id"
-                                    :params='{pageSize:-1}'
-                                />
+                        <a-col :md="12" :sm="16">
+                            <a-form-item label="客户(customer)">
+                                <JSelect   v-model:value="queryParams.customer" :get-option-url="CustomerOption" :showField="showField"></JSelect>
                             </a-form-item>
                         </a-col>
+                        
                         <a-col :md="6" :sm="8">
                             <a-form-item label="优先级(priority)" >
                                 <JDictSelectTag v-model:value="queryParams.priority" placeholder="请选择" dictCode="priority"/>

src/views/publicComponents/selectArrivalList.vue

@@ -10,7 +10,7 @@
         <div>
           <a-card  :body-style="{ padding: '10px' }" :bordered="false" style="margin: 10px;">
             <div class="table-page-search-wrapper">
-                <a-form :model="queryParams" :label-col="labelCol" :wrapper-col="wrapperCol" @keyup.enter.native="searchQuery">
+                <a-form :model="queryParams" :label-col="{ style: 'width: 200px' }" @keyup.enter.native="searchQuery">
                 <a-row :gutter="24">
                     <a-col :md="6" :sm="8">
                         <a-form-item label="到货单号(bill code)">
@@ -39,7 +39,7 @@
                             </a-form-item>
                         </a-col>
                         <a-col :md="6" :sm="8">
-                            <a-form-item label="产品分类(production class)" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+                            <a-form-item label="产品分类(production class)">
                                 <ApiSelect
                                 :api="ClassList"
                                 showSearch
@@ -52,18 +52,9 @@
                                 />
                             </a-form-item>
                         </a-col>
-                        <a-col :md="6" :sm="8">
+                        <a-col :md="12" :sm="16">
                             <a-form-item label="供应商(supplier)">
-                                <ApiSelect
-                                :api="supplierOption"
-                                showSearch
-                                v-model:value="queryParams.supplier"
-                                optionFilterProp="label"
-                                resultField="records"
-                                labelField="name"
-                                valueField="id"
-                                :params='{pageSize:-1}'
-                                />
+                                <JSelect   v-model:value="queryParams.supplier" :get-option-url="supplierOption" :showField="showField"></JSelect>
                             </a-form-item>
                         </a-col>
                         <a-col :md="6" :sm="8">
@@ -78,7 +69,7 @@
                             </a-form-item>
                         </a-col>
                         <a-col :md="6" :sm="8">
-                            <a-form-item label="产品编码(product code)" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+                            <a-form-item label="产品编码(product code)">
                                 <j-input placeholder="请输入" v-model:value="queryParams.productCode"></j-input>
                             </a-form-item>
                         </a-col>                  
@@ -132,12 +123,13 @@
     import { defHttp} from '/@/utils/http/axios';
     import { message } from 'ant-design-vue';
     import { filterObj} from '/@/utils/common/compUtils';
-    import { JDictSelectTag,ApiSelect,JInput} from '/@/components/Form';
+    import { JDictSelectTag,ApiSelect,JInput,JSelect} from '/@/components/Form';
     const emit = defineEmits([ 'selectArrrivalOrder']); //定义emit
     import {supplierOption,ProjectOption,ClassList} from '../inventiry/purchaseIn/purchaseInForm.api';
     var visible = ref(false)
     var fatherProject = ref('')
     var fatherSourceCode = ref('')
+    var showField = ref('currency+name');
     const columns = [
         { 
             type: 'selection',

src/views/purchase/arrivedGoods/ArriveGoodsList.vue

@@ -2,7 +2,7 @@
   <div class="p-2">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
-      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="{ style: 'width: 220px' }">
         <a-row :gutter="24">
           <a-col :lg="8">
             <a-form-item name="billCode">
@@ -18,7 +18,7 @@
           </a-col>
           <template v-if="toggleSearchStatus">
             <a-col :lg="8">
-              <a-form-item name="project" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+              <a-form-item name="project" >
                 <template #label><span title="项目(project)">项目(project)</span></template>
                 <ApiSelect
                   :api="ProjectOption"
@@ -33,20 +33,10 @@
                 />
               </a-form-item>
             </a-col>
-            <a-col :lg="8">
+            <a-col :lg="16">
               <a-form-item name="supplier">
                 <template #label><span title="供应商(supplier)">供应商(supplierName)</span></template>
-                <ApiSelect
-                  :api="supplierOption"
-                  showSearch
-                  v-model:value="queryParam.supplier"
-                  :filterOption="true"
-                  resultField="records"
-                  labelField="name"
-                  valueField="id"
-                  :params="{ pageSize: -1 }"
-                  optionFilterProp="label"
-                />
+                <JSelect   v-model:value="queryParam.supplier" :get-option-url="supplierOption" :showField="showField"></JSelect>
               </a-form-item>
             </a-col>
             <a-col :lg="8">
@@ -56,7 +46,7 @@
               </a-form-item>
             </a-col>
             <a-col :lg="8">
-              <a-form-item name="productionClass" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+              <a-form-item name="productionClass" >
                 <template #label><span title="产品分类(production class)">产品分类(production class)</span></template>
                 <ApiSelect
                   :api="ClassList"
@@ -90,7 +80,7 @@
               </a-form-item>
             </a-col> -->
             <a-col :lg="8">
-              <a-form-item name="purchaseDepartment" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+              <a-form-item name="purchaseDepartment" >
                 <template #label><span title="采购部门(purchase department)">采购部门(purchase department)</span></template>
                 <JInput
                   placeholder="请输入采购部门(purchase department)"
@@ -113,7 +103,7 @@
               </a-form-item>
             </a-col>
             <a-col :lg="8">
-              <a-form-item name="close" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+              <a-form-item name="close" >
                 <template #label><span title="关闭(close)">关闭(close)</span></template>
                 <JDictSelectTag v-model:value="queryParam.close" placeholder="请选择" dictCode="yes_or_no" />
               </a-form-item>
@@ -196,10 +186,11 @@
   } from './ArriveGoodsForm.api';
   import { cloneDeep } from 'lodash-es';
   import { defHttp } from '/@/utils/http/axios';
-  import { JDictSelectTag, ApiSelect, JInput } from '/@/components/Form';
+  import { JDictSelectTag, ApiSelect, JInput,JSelect } from '/@/components/Form';
   import { message } from 'ant-design-vue';
   const formRef = ref();
   const queryParam = reactive<any>({});
+    var showField = ref('currency+name');
   //注册model
   const [registerModal, { openModal }] = useModal();
   //注册table数据

src/views/purchase/arrivedGoods/components/ArriveGoodsFormForm.vue

@@ -50,18 +50,7 @@
                 id="ArriveGoodsForm-supplier"
                 name="supplierName"
               >
-                <ApiSelect
-                  :api="supplierOption"
-                  showSearch
-                  v-model:value="formData.supplier"
-                  :filterOption="true"
-                  resultField="records"
-                  labelField="name"
-                  valueField="id"
-                  :params="{ pageSize: -1 }"
-                  @change="changeSupplier"
-                  optionFilterProp="label"
-                />
+              <JSelect   v-model:value="formData.supplier" :get-option-url="supplierOption" :showField="showField"  @change="changeSupplier"></JSelect>
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -306,9 +295,8 @@
   import SelectPurchaseOrderModal from '../../../publicComponents/SelectPurchaseOrderModal.vue';
   import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
   import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
-  import { JDictSelectTag } from '/@/components/Form';
+  import { JDictSelectTag,JSelect,ApiSelect } from '/@/components/Form';
   import JSelectInput from '/@/components/Form/src/jeecg/components/JSelectInput.vue';
-  import { ApiSelect } from '/@/components/Form/index';
   import { Form, message } from 'ant-design-vue';
   import { useUserStore } from '/@/store/modules/user';
   import moment from 'moment';
@@ -325,6 +313,7 @@
       BaseShipArchiveAccessoriesModal,
       SelectPurchaseOrderModal,
       ApiSelect,
+      JSelect
     },
     props: {
       formDisabled: {
@@ -336,6 +325,7 @@
     },
     emits: ['success'],
     setup(props, { emit }) {
+      var showField = ref('currency+name');
       const userStore = useUserStore();
       const loading = ref(false);
       const formRef = ref();
@@ -561,7 +551,6 @@
           formData.projectName = data[0].projectName
           formData.supplierName = data[0].supplierName
           formData.supplier= data[0].supplier
-          debugger
           formData.priority =data[0].priority
           formData.productionClass =data[0].productionClass
           formData.model =data[0].headModel
@@ -575,9 +564,9 @@
       }
       async function changeSupplier(prop) {
         if (prop) {
-          var params = { id: formData.supplier };
+          var params = { id: prop };
           var obj = await supplierOption(params);
-          formData.suppilerName = obj.records[0].name;
+          formData.supplierName = obj.records[0].name;
         } else {
           formData.supplier = '';
           formData.supplierName = '';
@@ -624,6 +613,7 @@
         changeSupplier,
         supplierOption,
         ClassList,
+        showField
       };
     },
   });

src/views/purchase/freightPurchaseOrder/FreightPurchaseOrderList.vue

@@ -2,7 +2,7 @@
   <div class="p-2">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
-      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="{ style: 'width: 200px' }">
         <a-row :gutter="24">
           <a-col :lg="8">
             <a-form-item name="billCode">
@@ -23,19 +23,10 @@
                 <JDictSelectTag v-model:value="queryParam.currency" placeholder="请选择" dictCode="currency" />
               </a-form-item>
             </a-col>
-            <a-col :lg="8">
+            <a-col :lg="16">
               <a-form-item name="supplierName">
                 <template #label><span title="供应商(supplierName)">供应商(supplierName)</span></template>
-                <ApiSelect
-                  :api="Supplierlist"
-                  showSearch
-                  v-model:value="queryParam.supplier"
-                  :filterOption="true"
-                  resultField="records"
-                  labelField="name"
-                  valueField="id"
-                  optionFilterProp="label"
-                />
+                <JSelect   v-model:value="queryParam.supplier" :get-option-url="Supplierlist" :showField="showField"></JSelect>
               </a-form-item>
             </a-col>
           </template>
@@ -117,12 +108,11 @@
     CancelBatchConfirm,
   } from './FreightPurOrder.api';
   import { cloneDeep } from 'lodash-es';
-  import { defHttp } from '/@/utils/http/axios';
-  import { JDictSelectTag, JInput } from '/@/components/Form';
-  import { ApiSelect } from '/@/components/Form/index';
+  import { JDictSelectTag, JInput,JSelect,ApiSelect } from '/@/components/Form';
   import { message } from 'ant-design-vue';
   const formRef = ref();
   const queryParam = reactive<any>({});
+  var showField = ref('currency+name');
   //注册model
   const [registerModal, { openModal }] = useModal();
   //注册table数据

src/views/purchase/freightPurchaseOrder/components/FreightPurOrderForm.vue

@@ -21,17 +21,7 @@
 						</a-col>	
 						<a-col :span="12">
 							<a-form-item label="供应商(supplier)" v-bind="validateInfos.supplier"  id="SaleOrderForm-supplierName" name="supplierName">
-                <ApiSelect
-                  :api="Supplierlist"
-                  showSearch
-                  v-model:value="formData.supplier"
-                  :filterOption="true"
-                  resultField="records"
-                  labelField="name"
-                  valueField="id"
-                  @change="changeSupplier"
-                  optionFilterProp='label'
-                />
+                <JSelect   v-model:value="formData.supplier" :get-option-url="Supplierlist" :showField="showField"   @change="changeSupplier"></JSelect>
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
@@ -105,7 +95,7 @@
   import SelectPrpductModal from '../../../publicComponents/SelectPrpductModal.vue';
   import SelectDeliveryNoticeModal from './SelectDeliveryNoticeModal.vue';
   import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
-  import { JDictSelectTag,ApiSelect} from '/@/components/Form';
+  import { JDictSelectTag,ApiSelect,JSelect} from '/@/components/Form';
   import JSelectInput from '/@/components/Form/src/jeecg/components/JSelectInput.vue';
   import { Form, message } from 'ant-design-vue';
   import moment from 'moment';
@@ -119,7 +109,8 @@
       JSelectInput,
       SelectPrpductModal,
       SelectDeliveryNoticeModal,
-      ApiSelect
+      ApiSelect,
+      JSelect
     },
     props:{
       formDisabled:{
@@ -131,6 +122,7 @@
     },
     emits:['success'],
     setup(props, {emit}) {
+      var showField = ref('currency+name');
       const loading = ref(false);
       const formRef = ref();
       const SelectDeliveryNoticeModalRef= ref();
@@ -282,9 +274,10 @@
       }
       async function changeSupplier(prop){
         if(prop){
-          var params={id:formData.supplier}
+          var params={id:prop}
           var obj = await Supplierlist(params)
           formData.supplierName = obj.records[0].name
+          debugger
         }else{
           formData.supplier = ''
           formData.supplierName = ''
@@ -357,6 +350,7 @@
         SelectDeliveryNoticeModalRef,
         addDelivery,
         selectDelivery,
+        showField
       }
     }
   });
@@ -380,5 +374,8 @@
   /deep/.ant-form-item{
     margin-bottom: 8px !important;
   }
-      
+  /deep/.vxe-cell--valid-error-msg{
+    color: white !important;
+    background-color: white !important;
+  }
 </style>

src/views/purchase/freightPurchaseOrder/components/SelectDeliveryNoticeModal.vue

@@ -10,7 +10,7 @@
         <div>
           <a-card  :body-style="{ padding: '10px' }" :bordered="false" style="margin: 10px;">
             <div class="table-page-search-wrapper">
-                <a-form :model="queryParams" :label-col="{ style: 'width: 280px' }">
+                <a-form :model="queryParams" :label-col="{ style: 'width: 200px' }">
                 <a-row :gutter="24">
                     <a-col :md="6" :sm="8">
                         <a-form-item label="通知单号(bill code)">
@@ -37,17 +37,18 @@
                                     />
                             </a-form-item>
                         </a-col>
+                        <a-col :md="6" :sm="8">
+                            <a-form-item label="优先级(priority)" >
+                                <JDictSelectTag v-model:value="queryParams.priority" placeholder="请选择" dictCode="priority"/>
+                            </a-form-item>
+                        </a-col>
                         <a-col :md="12" :sm="16">
                             <a-form-item name="customer">
                             <template #label><span title="客户(customer)">客户(customer)</span></template>
                             <JSelect   v-model:value="queryParams.customer" :get-option-url="CustomerOption" :showField="showField"></JSelect>
                             </a-form-item>
                         </a-col>
-                        <a-col :md="6" :sm="8">
-                            <a-form-item label="优先级(priority)" >
-                                <JDictSelectTag v-model:value="queryParams.priority" placeholder="请选择" dictCode="priority"/>
-                            </a-form-item>
-                        </a-col>
+                        
                         <a-col :md="6" :sm="8">
                             <a-form-item label="产品分类(production class)" >
                                 <ApiSelect
@@ -173,6 +174,7 @@
             dataIndex: 'customerName',
             key: 'customerName',
             align:"center",
+            width:220,
             ellipsis: true,
         },
         {

src/views/purchase/payment/paymentList.vue

@@ -26,17 +26,7 @@
             <a-col :lg="8">
               <a-form-item name="sellerId">
                 <template #label><span title="销方(seller)">销方(seller)</span></template>
-                <ApiSelect
-                  :api="supplierOption"
-                  showSearch
-                  v-model:value="queryParam.sellerId"
-                  :filterOption="true"
-                  resultField="records"
-                  labelField="name"
-                  valueField="id"
-                  :params="{ pageSize: -1 }"
-                  optionFilterProp="label"
-                />
+                <JSelect   v-model:value="queryParam.sellerId" :get-option-url="supplierOption" :showField="showField"></JSelect>
               </a-form-item>
             </a-col>
             <a-col :lg="8">
@@ -106,11 +96,12 @@
   import { columns } from './paymentForm.data';
   import { list, deleteOne, batchDelete, getImportUrl, getExportUrl, batchSubmit, cancelBatchSubmit, supplierOption } from './paymentForm.api';
   import { cloneDeep } from 'lodash-es';
-  import { JDictSelectTag, ApiSelect, JInput } from '/@/components/Form';
+  import { JDictSelectTag, ApiSelect, JInput,JSelect } from '/@/components/Form';
   import paymentFormModal from './components/paymentFormModal.vue';
   import { message } from 'ant-design-vue';
   const formRef = ref();
   const queryParam = reactive<any>({});
+  var showField = ref('currency+name');
   //注册model
   const [registerModal, { openModal }] = useModal();
   //注册table数据

src/views/purchase/purPaymentRequest/components/purPaymentRequestForm.vue

@@ -16,18 +16,7 @@
 						</a-col>
             <a-col :span="12">
               <a-form-item label="供应商(supplier)" v-bind="validateInfos.supplier" id="purPaymnetRequest-supplier" name="supplier">
-                <ApiSelect
-                  :api="supplierOption"
-                  showSearch
-                  v-model:value="formData.supplier"
-                  :filterOption="true"
-                  resultField="records"
-                  labelField="name"
-                  valueField="id"
-                  :params='{pageSize:-1}'
-                  @change="changeSupplier"
-                  optionFilterProp='label'
-                />
+                <JSelect   v-model:value="formData.supplier" :get-option-url="supplierOption" :showField="showField"  @change="changeSupplier"></JSelect>
               </a-form-item>
             </a-col>
 						<a-col :span="12">
@@ -121,8 +110,7 @@
   import SelectPurchaseOrderModal from '../../../publicComponents/SelectPurchaseOrderMainModal.vue';
   import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
   import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
-  import { ApiSelect } from '/@/components/Form';
-  import { JDictSelectTag} from '/@/components/Form';
+  import { JDictSelectTag,JSelect,ApiSelect} from '/@/components/Form';
   import { Form,message } from 'ant-design-vue';
   import { useUserStore } from '/@/store/modules/user';
   import moment from 'moment';
@@ -136,7 +124,8 @@
       JUpload,
       JDictSelectTag,
       SelectPurchaseOrderModal,
-      ApiSelect
+      ApiSelect,
+      JSelect
     },
     props:{
       formDisabled:{
@@ -148,6 +137,7 @@
     },
     emits:['success'],
     setup(props, {emit}) {
+      var showField = ref('currency+name');
       const loading = ref(false);
       const formRef = ref();
       const SelectPurchaseOrderModalRef = ref()
@@ -323,9 +313,11 @@
         paymentDetailsTable.dataSource=arrSonFormDelivery     
       }
       async function changeSupplier(value){
+        debugger
         var param={id:value}
         var result=await supplierOption(param)     
         formData.supplierName =result.records[0].name
+        debugger
       }
       return {
         supplierOption,
@@ -351,7 +343,8 @@
         SelectPurchaseOrderModalRef,
         selectOrder,
         addDetailList,
-        changeSupplier
+        changeSupplier,
+        showField
       }
     }
   });

src/views/purchase/purPaymentRequest/purPaymentRequesttList.vue

@@ -2,7 +2,7 @@
   <div class="p-2">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
-      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="{ style: 'width: 200px' }">
         <a-row :gutter="24">
           <a-col :lg="8">
             <a-form-item name="billDate">
@@ -17,28 +17,18 @@
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
-            <a-col :lg="8">
-              <a-form-item name="supplier">
-                <template #label><span title="供应商(supplier)">供应商(supplier)</span></template>
-                <ApiSelect
-                  :api="supplierOption"
-                  showSearch
-                  v-model:value="queryParam.supplier"
-                  :filterOption="true"
-                  resultField="records"
-                  labelField="name"
-                  valueField="id"
-                  :params="{ pageSize: -1 }"
-                  optionFilterProp="label"
-                />
-              </a-form-item>
-            </a-col>
             <a-col :lg="8">
               <a-form-item name="submit">
                 <template #label><span title="提交(submit)">提交(submit)</span></template>
                 <JDictSelectTag v-model:value="queryParam.submit" placeholder="请选择" dictCode="yes_or_no" style="width: 100%" />
               </a-form-item>
             </a-col>
+            <a-col :lg="16">
+              <a-form-item name="supplier">
+                <template #label><span title="供应商(supplier)">供应商(supplier)</span></template>
+                <JSelect   v-model:value="queryParam.supplier" :get-option-url="supplierOption" :showField="showField"></JSelect>
+              </a-form-item>
+            </a-col>
             <a-col :lg="8">
               <a-form-item name="approve">
                 <template #label><span title="审批(approve)">审批(approve)</span></template>
@@ -123,11 +113,12 @@
     supplierOption,
   } from './purPaymentRequestForm.api';
   import { cloneDeep } from 'lodash-es';
-  import { JDictSelectTag, ApiSelect, JInput } from '/@/components/Form';
+  import { JDictSelectTag, ApiSelect, JInput ,JSelect} from '/@/components/Form';
   import purPaymentRequestFormModal from './components/purPaymentRequestFormModal.vue';
   import { message } from 'ant-design-vue';
   const formRef = ref();
   const queryParam = reactive<any>({});
+  var showField = ref('currency+name');
   //注册model
   const [registerModal, { openModal }] = useModal();
   //注册table数据

src/views/purchase/purchaseInquiryForm/components/PurchaseInquiryFormForm.vue

@@ -56,7 +56,8 @@
                 :label-col="formItemLayout.labelCol1"
                 :wrapper-col="formItemLayout.wrapperCol1"
               >
-                <ApiSelect
+              <JSelect   v-model:value="formData.inquirySuppiler" :get-option-url="supplierOption" :showField="showField" @change="changeSupplier"></JSelect>
+                <!-- <ApiSelect
                   :api="supplierOption"
                   showSearch
                   v-model:value="formData.inquirySuppiler"
@@ -67,7 +68,7 @@
                   :params="{ pageSize: -1 }"
                   @change="changeSupplier"
                   optionFilterProp="label"
-                />
+                /> -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -298,7 +299,7 @@
   import SelectCustomerInquiryModal from './SelectCustomerInquiryModal.vue';
   import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
   import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
-  import { JDictSelectTag, ApiSelect } from '/@/components/Form';
+  import { JDictSelectTag, ApiSelect ,JSelect} from '/@/components/Form';
   import JSelectInput from '/@/components/Form/src/jeecg/components/JSelectInput.vue';
   import { Form, message } from 'ant-design-vue';
   import moment from 'moment';
@@ -316,6 +317,7 @@
       JSelectInput,
       SelectCustomerInquiryModal,
       ApiSelect,
+      JSelect
     },
     props: {
       formDisabled: {
@@ -329,6 +331,7 @@
     setup(props, { emit }) {
       const loading = ref(false);
       const formRef = ref();
+      var showField = ref('currency+name');
       var SelectPrpductModalRef = ref();
       var SelectProjectModalRef = ref();
       var SelectCustomerInquiryModalRef = ref();
@@ -697,6 +700,7 @@
         changeSupplier,
         notAllowEdit,
         supplierOption,
+        showField
       };
     },
   });

src/views/purchase/purchaseInquiryForm/purchaseInquiryFormList.vue

@@ -2,7 +2,7 @@
   <div class="p-2">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
-      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="{ style: 'width: 200px' }">
         <a-row :gutter="24">
           <a-col :lg="8">
             <a-form-item name="billCode">
@@ -40,10 +40,11 @@
                 <JDictSelectTag v-model:value="queryParam.priority" placeholder="请选择" dictCode="priority" />
               </a-form-item>
             </a-col>
-            <a-col :lg="8">
+            <a-col :lg="16">
               <a-form-item name="inquirySuppiler">
                 <template #label><span title="询价供应商(inquiry supplier)">询价供应商(inquiry supplier)</span></template>
-                <ApiSelect
+                <JSelect   v-model:value="queryParam.inquirySuppiler" :get-option-url="supplierOption" :showField="showField"></JSelect>
+                <!-- <ApiSelect
                   :api="supplierOption"
                   showSearch
                   v-model:value="queryParam.inquirySuppiler"
@@ -53,7 +54,7 @@
                   valueField="id"
                   :params="{ pageSize: -1 }"
                   optionFilterProp="label"
-                />
+                /> -->
               </a-form-item>
             </a-col>
             <a-col :lg="8">
@@ -182,7 +183,7 @@
     ClassList,
   } from './purchaseInquiryForm.api';
   import { cloneDeep } from 'lodash-es';
-  import { JDictSelectTag, ApiSelect, JInput } from '/@/components/Form';
+  import { JDictSelectTag, ApiSelect, JInput,JSelect } from '/@/components/Form';
   import { message } from 'ant-design-vue';
   import { useGlobSetting } from '/@/hooks/setting';
   import { useMethods } from '/@/hooks/system/useMethods';
@@ -191,6 +192,7 @@
   const baseUrl = domainUrl + '/sys/common/static/';
   const formRef = ref();
   const queryParam = reactive<any>({});
+  var showField = ref('currency+name');
   const checkedKeys = ref<Array<string | number>>([]);
   //注册model
   const [registerModal, { openModal }] = useModal();

src/views/purchase/purchaseOrder/PurchaseOrderFormList.vue

@@ -2,7 +2,7 @@
   <div class="p-2">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
-      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="{ style: 'width: 220px' }">
         <a-row :gutter="24">
           <a-col :lg="8">
             <a-form-item name="billDate">
@@ -11,7 +11,7 @@
             </a-form-item>
           </a-col>
           <a-col :lg="8">
-            <a-form-item name="project" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+            <a-form-item name="project" >
               <template #label><span title="系统项目(project)">系统项目(project)</span></template>
               <ApiSelect
                   :api="ProjectOption"
@@ -34,24 +34,14 @@
                 <JInput placeholder="请输入订单编号(bill code)" v-model:value="queryParam.billCode" allow-clear AutoComplete="off" />
               </a-form-item>
             </a-col>
-            <a-col :lg="8">
+            <a-col :lg="16">
               <a-form-item name="supplier">
                 <template #label><span title="供应商(supplier)">供应商(supplier)</span></template>
-                <ApiSelect
-                  :api="supplierOption"
-                  showSearch
-                  v-model:value="queryParam.supplier"
-                  :filterOption="true"
-                  resultField="records"
-                  labelField="name"
-                  valueField="id"
-                  :params="{ pageSize: -1 }"
-                  optionFilterProp="label"
-                />
+                <JSelect   v-model:value="queryParam.supplier" :get-option-url="supplierOption" :showField="showField"></JSelect>
               </a-form-item>
             </a-col>
             <a-col :lg="8">
-              <a-form-item name="priority" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+              <a-form-item name="priority" >
                 <template #label><span title="优先级(priority)">优先级(priority)</span></template>
                 <JDictSelectTag v-model:value="queryParam.priority" placeholder="请选择" dictCode="priority" style="width: 100%" />
               </a-form-item>
@@ -75,7 +65,7 @@
               </a-form-item>
             </a-col>
             <a-col :lg="8">
-              <a-form-item name="maker" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+              <a-form-item name="maker" >
                 <template #label><span title="厂家(maker)">厂家(maker)</span></template>
                 <JInput placeholder="请输入厂家(maker)" v-model:value="queryParam.maker" allow-clear AutoComplete="off" />
               </a-form-item>
@@ -93,7 +83,7 @@
               </a-form-item>
             </a-col>
             <a-col :lg="8">
-              <a-form-item name="purchaseDepartment" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+              <a-form-item name="purchaseDepartment" >
                 <template #label><span title="采购部门(purchase saleDepartment)">采购部门(purchase department)</span></template>
                 <JSelectDept v-model:value="queryParam.purchaseDepartment" :multiple="false" />
               </a-form-item>
@@ -111,7 +101,7 @@
               </a-form-item>
             </a-col>
             <a-col :lg="8">
-              <a-form-item name="status" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+              <a-form-item name="status" >
                 <template #label><span title="供应商确认(supplier confirm)">供应商确认(supplier confirm)</span></template>
                 <JDictSelectTag v-model:value="queryParam.status" placeholder="请选择" dictCode="yes_or_no" />
               </a-form-item>
@@ -204,9 +194,7 @@
     ProjectOption
   } from './PurchaseOrderyForm.api';
   import { cloneDeep } from 'lodash-es';
-  import { defHttp } from '/@/utils/http/axios';
-  import { JDictSelectTag, ApiSelect, JInput } from '/@/components/Form';
-  import JSelectInput from '/@/components/Form/src/jeecg/components/JSelectInput.vue';
+  import { JDictSelectTag, ApiSelect, JInput,JSelect } from '/@/components/Form';
   import JSelectUser from '/@/components/Form/src/jeecg/components/JSelectUser.vue';
   import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
   import ViewFileListModal from './components/ViewFileListModal.vue';
@@ -220,6 +208,7 @@
   const SelectPurOrderModalRef = ref();
   const ViewHistoryVersionModallRef = ref();
   const queryParam = reactive<any>({});
+    var showField = ref('currency+name');
   //注册model
   const [registerModal, { openModal }] = useModal();
   //注册table数据

src/views/purchase/purchaseQuotationFrm/components/PurchaseQuotationFormForm.vue

@@ -46,18 +46,7 @@
                 id="PuechaseQuotationFormForm-quotationSuppiler"
                 name="quotationSuppiler"
               >
-                <ApiSelect
-                  :api="supplierOption"
-                  showSearch
-                  v-model:value="formData.quotationSuppiler"
-                  :filterOption="true"
-                  resultField="records"
-                  labelField="name"
-                  valueField="id"
-                  :params="{ pageSize: -1 }"
-                  @change="changeSupplier"
-                  optionFilterProp="label"
-                />
+              <JSelect   v-model:value="formData.quotationSuppiler" :get-option-url="supplierOption" :showField="showField" @change="changeSupplier"></JSelect>
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -288,9 +277,8 @@
   import SelectSupplierInquiryModal from './SelectSupplierInquiryModal.vue';
   import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
   import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
-  import { JDictSelectTag } from '/@/components/Form';
+  import { JDictSelectTag,ApiSelect,JSelect } from '/@/components/Form';
   import JSelectInput from '/@/components/Form/src/jeecg/components/JSelectInput.vue';
-  import { ApiSelect } from '/@/components/Form/index';
   import { Form, message } from 'ant-design-vue';
   import moment from 'moment';
   const useForm = Form.useForm;
@@ -307,6 +295,7 @@
       JSelectInput,
       SelectSupplierInquiryModal,
       ApiSelect,
+      JSelect
     },
     props: {
       formDisabled: {
@@ -320,6 +309,7 @@
     setup(props, { emit }) {
       const loading = ref(false);
       const formRef = ref();
+      var showField = ref('currency+name');
       var SelectPrpductModalRef = ref();
       var SelectProjectModalRef = ref();
       var SelectSupplierInquiryModalRef = ref();
@@ -608,18 +598,15 @@
         SelectSupplierInquiryModalRef.value.getTable(formData);
       }
       async function changeSupplier(prop){
-        if(Array.isArray(prop)){
           if(prop){
-            var params={id:prop[0]}
+            var params={id:prop}
             var obj = await supplierOption(params)
             formData.suppilerName = obj.records[0].name
             formData.paymentTerms = obj.records[0].paymentTerms
           }else{
             formData.quotationSuppiler = ''
             formData.suppilerName = ''
-          }
-        }
-        
+          }        
       }
       return {
         PuechaseQuotationFormShipTableRef,
@@ -659,6 +646,7 @@
         changeSupplier,
         notAllowEdit,
         ClassList,
+        showField
       };
     },
   });

src/views/purchase/purchaseQuotationFrm/components/SelectSupplierInquiryModal.vue

@@ -10,7 +10,7 @@
         <div>
           <a-card  :body-style="{ padding: '10px' }" :bordered="false" style="margin: 10px;">
             <div class="table-page-search-wrapper">
-                <a-form :model="queryParams" :label-col="labelCol" :wrapper-col="wrapperCol" @keyup.enter.native="searchQuery">
+                <a-form :model="queryParams" :label-col="{ style: 'width: 200px' }" @keyup.enter.native="searchQuery">
                 <a-row :gutter="24">
                     <a-col :md="6" :sm="8">
                         <a-form-item label="询价单号(bill code)">
@@ -38,26 +38,16 @@
                         </a-form-item>
                     </a-col>
                     <template v-if="toggleSearchStatus">
-                        <a-col :md="6" :sm="8">
-                            <a-form-item label="询价供应商(inquiry supplier)"  :label-col="labelCol1" :wrapper-col="wrapperCol1">
-                                <ApiSelect
-                                :api="supplierOption"
-                                showSearch
-                                v-model:value="queryParams.inquirySuppiler"
-                                optionFilterProp="label"
-                                resultField="records"
-                                labelField="name"
-                                valueField="id"
-                                :disabled="fatherSupplier!==''"
-                                :params="{ pageSize: -1 }"
-                             />
-                            </a-form-item>
-                        </a-col>
                         <a-col :md="6" :sm="8">
                             <a-form-item label="优先级(priority)">
                                 <JDictSelectTag v-model:value="queryParams.priority" placeholder="请选择" dictCode="priority"/>
                             </a-form-item>
                         </a-col>
+                        <a-col :md="12" :sm="16">
+                            <a-form-item label="询价供应商(inquiry supplier)"  >
+                                <JSelect   v-model:value="queryParams.inquirySuppiler" :get-option-url="supplierOption" :showField="showField"></JSelect>
+                            </a-form-item>
+                        </a-col>
                         <a-col :md="6" :sm="8">
                             <a-form-item label="产品分类(production class)" >
                                 <ApiSelect
@@ -78,7 +68,7 @@
                             </a-form-item>
                         </a-col>
                         <a-col :md="6" :sm="8">
-                            <a-form-item label="产品编号(product code)" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+                            <a-form-item label="产品编号(product code)" >
                                 <j-input placeholder="请输入" v-model:value="queryParams.productCode"></j-input>
                             </a-form-item>
                         </a-col>
@@ -132,11 +122,11 @@
     import { defHttp } from '/@/utils/http/axios';
     import { message } from 'ant-design-vue';
     import { filterObj } from '/@/utils/common/compUtils';
-    import { JDictSelectTag,JInput} from '/@/components/Form';
-    import {  ApiSelect, } from '/@/components/Form/index';
+    import { JDictSelectTag,JInput,JSelect,ApiSelect} from '/@/components/Form';
     import {ProjectOption,supplierOption,ClassList} from '../PurchaseQuotationForm.api';
     const emit = defineEmits([ 'selectCustomerInquiry']); //定义emit
     var visible = ref(false)
+    var showField = ref('currency+name');
     const columns = [
         { 
             type: 'selection',

src/views/purchase/purchaseQuotationFrm/purchaseQuotationFormList.vue

@@ -2,7 +2,7 @@
   <div class="p-2">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
-      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam"  :label-col="{ style: 'width: 260px' }">
         <a-row :gutter="24">
           <a-col :lg="8">
             <a-form-item name="billCode">
@@ -34,20 +34,10 @@
                 <a-range-picker value-format="YYYY-MM-DD" v-model:value="queryParam.billDate" class="query-group-cust" />
               </a-form-item>
             </a-col>
-            <a-col :lg="8">
+            <a-col :lg="16">
               <a-form-item name="quotationSuppiler">
                 <template #label><span title="报价供应商(quotation supplier)">报价供应商(quotation supplier)</span></template>
-                <ApiSelect
-                  :api="supplierOption"
-                  showSearch
-                  v-model:value="queryParam.quotationSuppiler"
-                  :filterOption="true"
-                  resultField="records"
-                  labelField="name"
-                  valueField="id"
-                  :params="{ pageSize: -1 }"
-                  optionFilterProp="label"
-                />
+                <JSelect   v-model:value="queryParam.quotationSuppiler" :get-option-url="supplierOption" :showField="showField"></JSelect>
               </a-form-item>
             </a-col>
             <a-col :lg="8">
@@ -182,13 +172,14 @@
   } from './PurchaseQuotationForm.api';
   import { cloneDeep } from 'lodash-es';
   import { defHttp } from '/@/utils/http/axios';
-  import { JDictSelectTag, ApiSelect, JInput } from '/@/components/Form';
+  import { JDictSelectTag, ApiSelect, JInput,JSelect } from '/@/components/Form';
   import { message } from 'ant-design-vue';
   import { useGlobSetting } from '/@/hooks/setting';
   const { domainUrl } = useGlobSetting();
   const baseUrl = domainUrl + '/sys/common/static/';
   const formRef = ref();
   const queryParam = reactive<any>({});
+    var showField = ref('currency+name');
   //注册model
   const [registerModal, { openModal }] = useModal();
   //注册table数据