@bit-sun/business-component 4.0.11-alpha.1 → 4.0.11-alpha.10

package/src/components/Business/SearchSelect/BusinessUtils.tsx

@@ -10,7 +10,9 @@ import { Image } from 'antd';
 const hasDictSharingType =  getDictionarySource('UC000013')?.length;
 const sharingTypeDataList = hasDictSharingType && getDictionarySource('UC000013') || sharingType
 
-export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: any, modalTableBusProps?:any, hiddenFields?:any) {
+export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
+  const { requestConfig:requestConfigProp={},  selectProps:selectConfigProps={}, modalTableProps:modalTableBusProps={}, hiddenFields=[]} = parentProps || {};
+  
   // 默认type === 'supplier' 供应商选择器
   let requestConfig = {
     url: `${prefixUrl.selectPrefix}/supplier`,
@@ -20,6 +22,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
     }, // 默认参数
     ...requestConfigProp
   }
+  let selectProps = selectConfigProps;
 
   /*
   * 处理 格式化下拉框数据源
@@ -52,7 +55,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
   const formatTreeDataSource = (reData: any, position: number, changePosition: number,changeSearchForm: any,resKeyValue=['id', 'name']) => {
     let data = reData && reData[position]?.data;
     let disabledJudge;
-    if(Object.keys(data).length) {
+    if(data && typeof data === 'object' && !Array.isArray(data) && Object.keys(data).length > 0) {
       data = [data];
       disabledJudge=false
     }
@@ -64,7 +67,6 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
     changeSearchForm[changePosition].field.props.treeData = formatData;
   }
 
-
   let tableSearchForm: any [] = [];
   let modalTableProps = {
     modalTableTitle: '',
@@ -76,6 +78,20 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
 
   // 供应商选择器
   if(type === 'supplier') {
+    selectProps = {
+      placeholder: '输入供应商编码或名称',
+      renderTableColumns: [
+        {
+          title: '供应商编码',
+          dataIndex: 'code',
+        },
+        {
+          title: '供应商名称',
+          dataIndex: 'name',
+        },
+      ],
+      ...selectConfigProps,
+    }
     tableSearchForm = [
       { name: 'qp-name-like', label: '供应商名称' }, // field: { type: 'input', props: { placeholder: '请输入'}}
       { name: 'qp-code-like', label: '供应商编码' },
@@ -147,13 +163,20 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       modalTableTitle: '选择供应商',
       tableSearchForm,
       tableColumns: [
+        {
+          title: '序号',
+          dataIndex: 'keyIndex',
+          defaultSort: 0,
+        },
         {
           title: '供应商编码',
           dataIndex: 'code',
+          defaultSort: 1,
         },
         {
           title: '供应商名称',
           dataIndex: 'name',
+          defaultSort: 2,
         },
         {
           title: '归属集团',
@@ -162,6 +185,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
         {
           title: '归属法人公司',
           dataIndex: 'legalCompanyName',
+          defaultSort: 3,
         },
         {
           title: '归属核算主体',
@@ -170,6 +194,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
         {
           title: '共享类型',
           dataIndex: 'sharingType',
+          defaultSort: 4,
           render: (text: number) => hasDictSharingType ? getDictionaryTextByValue('UC000013', text) : sharingType.find((i: any) => i.value === text)?.text
         },
       ],
@@ -178,6 +203,20 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
   }
   if(type === 'supplier2') {
     // 版本2
+    selectProps = {
+      placeholder: '输入供应商编码或名称',
+      renderTableColumns: [
+        {
+          title: '供应商编码',
+          dataIndex: 'code',
+        },
+        {
+          title: '供应商名称',
+          dataIndex: 'name',
+        },
+      ],
+      ...selectConfigProps,
+    }
     tableSearchForm = [
       { name: 'qp-name-like', label: '供应商名称' }, // field: { type: 'input', props: { placeholder: '请输入'}}
       { name: 'qp-code-like', label: '供应商编码' },
@@ -222,21 +261,30 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       modalTableTitle: '选择供应商',
       tableSearchForm,
       tableColumns: [
+        {
+          title: '序号',
+          dataIndex: 'keyIndex',
+          defaultSort: 0,
+        },
         {
           title: '供应商编码',
           dataIndex: 'code',
+          defaultSort: 1,
         },
         {
           title: '供应商名称',
           dataIndex: 'name',
+          defaultSort: 2,
         },
         {
           title: '创建组织',
           dataIndex: 'createOrgName',
+          defaultSort: 3,
         },
         {
           title: '使用组织',
           dataIndex: 'salesOrgName',
+          defaultSort: 4,
         },
       ],
       ...modalTableBusProps
@@ -246,102 +294,41 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
   // 商品选择器sku
   if(type === 'skuCommodity') {
     requestConfig = {
-      url: `${prefixUrl.selectPrefix}/sku/pager/v2`,
+      url: `${prefixUrl.selectPrefix}/sku/doPageBySelect/v3`,
       filter: 'skuCodeAndSkuName', // 过滤参数
       mappingTextField: 'name',
       mappingValueField: 'skuCode',
       mappingTextShowTextField: ['name', 'propertyNameAndValue'],
       otherParams: {
-        'qp-combination-eq': false,
-        'qp-approveStatus-eq': 1,
-        'qp-status-eq': 1,
         // 'qp-type-eq': 10, // 查唯一国际条码【有些项目不需要必须要有国际条码，故注释，需要的项目自己定义otherParams补充上这个条件】
-        sorter: 'desc-id'
       }, // 默认参数
       sourceName: 'skuCode',
       ...requestConfigProp,
     }
-    tableSearchForm = requestConfig.url.includes('v2') ? [
-      requestConfig.url.includes('v2') ? { name: 'qp-skuName-like', label: 'SKU名称' } : { name: 'qp-name-like', label: 'SKU名称' },
-      { name: 'qp-skuCode-in', label: 'SKU编码', field: {
-          type: 'multipleQueryInput',
-          props: {
-            ...(requestConfigProp?.skuCodeValueRequestConfig || {}),
-          },
-        }},
-      requestConfig.url.includes('v2') ? { name: 'qp-code-like', label: '国际条码' } : { name: 'qp-barCode-like', label: '国际条码'},
-      { name: 'qp-itemName-like', label: '所属SPU名称' },
-      { name: 'qp-itemCode-like', label: '所属SPU编码' },
-      requestConfig.url.includes('v2') ?{ name: 'qp-externalCode-like', label: '外部编码' } : null,
-      requestConfig.url.includes('v2') ? { name: 'qp-propertyValueCode-in', type: 'businessSearchSelect', label: '规格', field: {
-          type: 'businessSearchSelect',
-          props: {
-            selectBusinessType: 'skuPropertyValue',
-            selectProps: {
-              mode: 'multiple',
-              maxTagCount: 1,
-            },
-            ...(requestConfigProp?.skuPropertyValueRequestConfig || { prefixUrl }), // 可自定义此处规格请求接口相关参数，默认前缀取自sku选择器
-          },
-        }
-      } : null,
-      { name: 'qp-brandId-in', type: 'select', label: '品牌', field: {
-          type: 'select',
-          props: {
-            mode: 'multiple',
-            notFoundContent: '暂无数据',
-            allowClear: true,
-            showSearch: true,
-            showArrow: true,
-            maxTagCount: 1,
-            optionFilterProp: 'children',
-            filterOption: (input: string, option: { props: { children: string } }) =>
-              option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
-          },
-        } },
-      { name: 'qp-categoryId-in', type: 'treeSelect', label: '类目', field: {
-          type: 'treeSelect',
-          props: {
-            treeData: [],
-            treeCheckable: true,
-            showSearch: true,
-            allowClear: true,
-            showArrow: true,
-            treeNodeFilterProp: 'title',
-            treeDefaultExpandAll: true,
-            maxTagCount: 1,
-            placeholder: '请选择',
-            style: {
-              width: '100%',
-            },
-            dropdownStyle: { maxHeight: 400, maxWidth: 100, overflow: 'auto' }
-          },
-        } },
-      { name: 'qp-classId-in', type: 'select', label: '品类', field: {
-          type: 'select',
-          props: {
-            mode: 'multiple',
-            notFoundContent: '暂无数据',
-            allowClear: true,
-            showSearch: true,
-            showArrow: true,
-            maxTagCount: 1,
-            optionFilterProp: 'children',
-            filterOption: (input: string, option: { props: { children: string } }) =>
-              option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
-          },
-        } },
-    ] : [
-      { name: 'qp-name-like', label: 'SKU名称' },
-      { name: 'qp-skuCode-in', label: 'SKU编码', field: {
-          type: 'multipleQueryInput',
-          props: {
-            ...(requestConfigProp?.skuCodeValueRequestConfig || {}),
-          },
-        }},
-      { name: 'qp-barCode-like', label: '国际条码'},
-      { name: 'qp-itemName-like', label: '所属SPU名称' },
-      { name: 'qp-itemCode-like', label: '所属SPU编码' },
+    selectProps = {
+      placeholder: '输入sku编码或名称',
+      renderTableColumns: [
+        {
+          title: 'SKU编码',
+          dataIndex: 'skuCode',
+        },
+        {
+          title: '商品名称',
+          dataIndex: 'skuName',
+        },
+      ],
+      ...selectConfigProps,
+    }
+    tableSearchForm =  [
+      { name: 'qp-skuCode-in', label: 'SKU编码',type:'multipleQueryInput' },
+      { name: 'qp-skuName-like', label: 'SKU名称' },
+      { name: 'qp-spuCode-like', label: '外部SPU编码' },
+      { name: 'qp-eancode-in', label: '商品条码', field: {
+        type: 'multipleQueryInput',
+        props: {
+          ...(requestConfigProp?.itemEancodeValueRequestConfig || {}),
+        },
+      }},
       { name: 'qp-brandId-in', type: 'select', label: '品牌', field: {
           type: 'select',
           props: {
@@ -374,20 +361,6 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
             dropdownStyle: { maxHeight: 400, maxWidth: 100, overflow: 'auto' }
           },
         } },
-      { name: 'qp-classId-in', type: 'select', label: '品类', field: {
-          type: 'select',
-          props: {
-            mode: 'multiple',
-            notFoundContent: '暂无数据',
-            allowClear: true,
-            showSearch: true,
-            showArrow: true,
-            maxTagCount: 1,
-            optionFilterProp: 'children',
-            filterOption: (input: string, option: { props: { children: string } }) =>
-              option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
-          },
-        } },
     ]
     Promise.all([
       loadSelectSource(`${prefixUrl.formSelectFix}/brand/queryBrandList`, {
@@ -399,35 +372,44 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
         pageSize: 5000,
         currentPage: 1,
       }),
-      loadSelectSource(`${prefixUrl.formSelectFix}/class/withProperty`, {
-        pageSize: 5000,
-        currentPage: 1,
-      }),
     ]).then((x: any)=>{
-      requestConfig.url.includes('v2') ? formatSource(x,0, 7, tableSearchForm,['id','name']) : formatSource(x,0, 5, tableSearchForm,['id','name'])
-      requestConfig.url.includes('v2') ? formatTreeDataSource(x,1, 8, tableSearchForm) : formatTreeDataSource(x,1, 6, tableSearchForm)
-      requestConfig.url.includes('v2') ? formatSource(x,2, 9, tableSearchForm,['id','name']) : formatSource(x,2, 7, tableSearchForm,['id','name'])
+      formatSource(x,0, 4, tableSearchForm,['id','name'])
+      formatTreeDataSource(x,1, 5, tableSearchForm)
     })
     modalTableProps = {
       modalTableTitle: '选择SKU',
       tableSearchForm,
-      tableColumns: requestConfig.url.includes('v2') ? [
+      isHorizontally: true,
+      modalRadioNeedFooter: true,
+      tableColumns: [
+        {
+          title: '序号',
+          dataIndex: 'keyIndex',
+          defaultSort: 0,
+        },
         {
           title: 'SKU编码',
           dataIndex: 'skuCode',
+          defaultSort: 2,
         },
         {
           title: 'SKU名称',
-          dataIndex: 'name',
+          dataIndex: 'skuName',
+          defaultSort: 3,
         },
         {
           title: '图片',
           dataIndex: 'itemUrl',
-          render: (text: any,record: any) => tableColumnsImage(getSkuImg(record), { width: 28, height: 28 }),
+          defaultSort: 1,
+          render: (text: any,record: any) => tableColumnsImage(getSkuImg(record), { width: 16, height: 16 }),
+        },
+        {
+          title: '商品条码',
+          dataIndex: 'eancode',
         },
         {
-          title: '国际条码',
-          dataIndex: 'barCode',
+          title: 'SKC编码',
+          dataIndex: 'skcCode',
         },
         {
           title: '所属SPU名称',
@@ -437,50 +419,13 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
           title: '所属SPU编码',
           dataIndex: 'itemCode',
         },
-        requestConfig.url.includes('v2') ? {
+        {
           title: '外部编码',
           dataIndex: 'externalCode',
-        } : false,
-        {
-          title: '规格',
-          dataIndex: requestConfig.url.includes('v2') ? 'propertyNameAndValue' : 'skuSpec',
-        },
-        {
-          title: '类目',
-          dataIndex: 'categoryName',
-        },
-        {
-          title: '品类',
-          dataIndex: 'className',
-        },
-        {
-          title: '品牌',
-          dataIndex: 'brandName',
-        },
-      ] : [
-        {
-          title: 'SKU编码',
-          dataIndex: 'skuCode',
-        },
-        {
-          title: 'SKU名称',
-          dataIndex: 'name',
-        },
-        {
-          title: '国际条码',
-          dataIndex: 'barCode',
-        },
-        {
-          title: '所属SPU名称',
-          dataIndex: 'itemName',
-        },
-        {
-          title: '所属SPU编码',
-          dataIndex: 'itemCode',
         },
         {
           title: '规格',
-          dataIndex: 'skuSpec',
+          dataIndex: 'propertyNameAndValue',
         },
         {
           title: '类目',
@@ -493,6 +438,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
         {
           title: '品牌',
           dataIndex: 'brandName',
+          defaultSort: 4,
         },
       ],
       ...modalTableBusProps
@@ -501,6 +447,20 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
 
   // 商品选择器spu
   if(type === 'spuCommodity') {
+    selectProps = {
+      placeholder: '输入spu编码或名称',
+      renderTableColumns: [
+        {
+          title: 'spu编码',
+          dataIndex: 'itemCode',
+        },
+        {
+          title: 'spu名称',
+          dataIndex: 'name',
+        },
+      ],
+      ...selectConfigProps,
+    }
     requestConfig = {
       url: `${prefixUrl.selectPrefix}/item`,
       filter: 'qp-itemCode,name-orGroup,like', // 过滤参数
@@ -586,21 +546,30 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       modalTableTitle: '选择SPU',
       tableSearchForm,
       tableColumns: [
+        {
+          title: '序号',
+          dataIndex: 'keyIndex',
+          defaultSort: 0,
+        },
         {
           title: 'SPU编码',
           dataIndex: 'itemCode',
+          defaultSort: 1,
         },
         {
           title: 'SPU名称',
           dataIndex: 'name',
+          defaultSort: 2,
         },
         {
           title: '品牌',
           dataIndex: 'brandName',
+          defaultSort: 3,
         },
         {
           title: '类目',
           dataIndex: 'categoryText',
+          defaultSort: 4,
         },
         {
           title: '品类',
@@ -613,6 +582,20 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
 
   // 商品选择器skc
   if(type === 'skcCommodity') {
+    selectProps = {
+      placeholder: '输入SKC编码或名称',
+      renderTableColumns: [
+        {
+          title: 'SKC编码',
+          dataIndex: 'code',
+        },
+        {
+          title: 'SKC名称',
+          dataIndex: 'name',
+        },
+      ],
+      ...selectConfigProps,
+    }
     const tableSearchForm = handleHiddenFields([
       { name: 'qp-code-like', label: 'SKC编码' },
       { name: 'qp-skcName-like', label: 'SKC名称' },
@@ -737,13 +720,20 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       modalTableTitle: '选择SKC',
       tableSearchForm,
       tableColumns: handleHiddenFields([
+        {
+          title: '序号',
+          dataIndex: 'keyIndex',
+          defaultSort: 0,
+        },
         {
           title: 'SKC编码',
           dataIndex: 'code',
+          defaultSort: 1,
         },
         {
           title: 'SKC名称',
           dataIndex: 'name',
+          defaultSort: 2,
         },
         {
           title: '商品名称',
@@ -752,6 +742,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
         {
           title: '颜色',
           dataIndex: 'colorName',
+          defaultSort: 3,
         },
         {
           title: '类目',
@@ -764,6 +755,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
         {
           title: '品牌',
           dataIndex: 'brandName',
+          defaultSort: 4,
         },
       ], hiddenFields),
       ...modalTableBusProps
@@ -772,6 +764,20 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
 
   // 商品规格选择器（无弹窗）
   if(type === 'skuPropertyValue') {
+    selectProps = {
+      placeholder: '输入规格编码或名称',
+      renderTableColumns: [
+        {
+          title: '规格编码',
+          dataIndex: 'propertyValueCode',
+        },
+        {
+          title: '规格名称',
+          dataIndex: 'propertyValueName',
+        },
+      ],
+      ...selectConfigProps,
+    }
     requestConfig = {
       url: `${prefixUrl.selectPrefix}/skuPropertyValue/list`,
       filter: 'qp-value-like', // 过滤参数
@@ -789,6 +795,20 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
 
   // 仓库选择器（物理、逻辑仓、运营仓）
   if(type === 'physicalWarehouse') {
+    selectProps = {
+      placeholder: '输入物理仓编码或名称',
+      renderTableColumns: [
+        {
+          title: '物理仓编码',
+          dataIndex: 'physicalWarehouseCode',
+        },
+        {
+          title: '物理仓名称',
+          dataIndex: 'physicalWarehouseName',
+        },
+      ],
+      ...selectConfigProps,
+    }
     requestConfig = {
       url: `${prefixUrl.selectPrefix}/physicalWarehouse`,
       filter: 'qp-physicalWarehouseName,physicalWarehouseCode-orGroup,like', // 过滤参数
@@ -835,17 +855,25 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       modalTableTitle: '选择物理仓',
       tableSearchForm,
       tableColumns: [
+        {
+          title: '序号',
+          dataIndex: 'keyIndex',
+          defaultSort: 0,
+        },
         {
           title: '物理仓编码',
           dataIndex: 'physicalWarehouseCode',
+          defaultSort: 1,
         },
         {
           title: '物理仓名称',
           dataIndex: 'physicalWarehouseName',
+          defaultSort: 2,
         },
         {
           title: '物理仓类型',
           dataIndex: 'physicalWarehouseType',
+          defaultSort: 3,
           render: (text: number) => getDictionaryTextByValue('SC00002', text),
         },
         ...(modalTableBusProps?.needStatusSearch?[{
@@ -856,12 +884,27 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
         {
           title: '所属公司',
           dataIndex: 'companyName',
+          defaultSort: 4,
         },
       ],
       ...modalTableBusProps
     }
   }
   if(type === 'realWarehouse') {
+    selectProps = {
+      placeholder: '输入逻辑仓编码或名称',
+      renderTableColumns: [
+        {
+          title: '逻辑仓编码',
+          dataIndex: 'realWarehouseCode',
+        },
+        {
+          title: '逻辑仓名称',
+          dataIndex: 'realWarehouseName',
+        },
+      ],
+      ...selectConfigProps,
+    }
     requestConfig = {
       url: `${prefixUrl.selectPrefix}/realWarehouse`,
       filter: 'qp-realWarehouseName,realWarehouseCode-orGroup,like', // 过滤参数
@@ -885,22 +928,31 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       modalTableTitle: '选择逻辑仓',
       tableSearchForm,
       tableColumns: [
+        {
+          title: '序号',
+          dataIndex: 'keyIndex',
+          defaultSort: 0,
+        },
         {
           title: '逻辑仓编码',
           dataIndex: 'realWarehouseCode',
+          defaultSort: 1,
         },
         {
           title: '逻辑仓名称',
           dataIndex: 'realWarehouseName',
+          defaultSort: 2,
         },
         {
           title: '逻辑仓类型',
           dataIndex: 'realWarehouseType',
+          defaultSort: 3,
           render: (text: number) => getDictionaryTextByValue('SC00004', text),
         },
         ...(modalTableBusProps?.needStatusSearch?[{
           title: '状态',
           dataIndex: 'isEnable',
+          defaultSort: 4,
           render: (text: number) => getDictionaryTextByValue('SC00001', text),
         }]:[]),
       ],
@@ -908,6 +960,20 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
     }
   }
   if(type === 'ownerWarehouse') {
+    selectProps = {
+      placeholder: '输入运营仓编码或名称',
+      renderTableColumns: [
+        {
+          title: '运营仓编码',
+          dataIndex: 'operationWarehouseCode',
+        },
+        {
+          title: '运营仓名称',
+          dataIndex: 'name',
+        },
+      ],
+      ...selectConfigProps,
+    }
     requestConfig = {
       url: `${prefixUrl.selectPrefix}/ownerWarehouse`,
       filter: 'qp-name,operationWarehouseCode-orGroup,like', // 过滤参数
@@ -949,21 +1015,30 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       modalTableTitle: '选择运营仓',
       tableSearchForm,
       tableColumns: [
+        {
+          title: '序号',
+          dataIndex: 'keyIndex',
+          defaultSort: 0,
+        },
         {
           title: '运营仓编码',
           dataIndex: 'operationWarehouseCode',
+          defaultSort: 1,
         },
         {
           title: '运营仓名称',
           dataIndex: 'name',
+          defaultSort: 2,
         },
         {
           title: '运营组',
           dataIndex: 'groupName',
+          defaultSort: 3,
         },
         ...(modalTableBusProps?.needStatusSearch?[{
           title: '状态',
           dataIndex: 'status',
+          defaultSort: 4,
           render: (text: number) => getDictionaryTextByValue('SC00001', text),
         }]:[]),
       ],
@@ -973,6 +1048,20 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
 
   // 仓库选择器（虚拟、渠道仓）（无弹窗）
   if(type === 'virtualWarehouse') {
+    selectProps = {
+      placeholder: '输入虚拟仓编码或名称',
+      renderTableColumns: [
+        {
+          title: '虚拟仓编码',
+          dataIndex: 'virtualWarehouseCode',
+        },
+        {
+          title: '虚拟仓名称',
+          dataIndex: 'virtualWarehouseName',
+        },
+      ],
+      ...selectConfigProps,
+    }
     requestConfig = {
       url: `${prefixUrl.selectPrefix}/virtualWarehouse`,
       filter: 'qp-virtualWarehouseName,virtualWarehouseCode-orGroup,like', // 过滤参数
@@ -989,6 +1078,20 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
     needModalTable = false
   }
   if(type === 'channelWarehouse') {
+    selectProps = {
+      placeholder: '输入渠道仓编码或名称',
+      renderTableColumns: [
+        {
+          title: '渠道仓编码',
+          dataIndex: 'channelWarehouseCode',
+        },
+        {
+          title: '渠道仓名称',
+          dataIndex: 'channelWarehouseName',
+        },
+      ],
+      ...selectConfigProps,
+    }
     requestConfig = {
       url: `${prefixUrl.selectPrefix}/channelWarehouse`,
       filter: 'qp-channelWarehouseName,channelWarehouseCode-orGroup,like', // 过滤参数
@@ -1007,6 +1110,20 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
 
   // 客户选择器
   if(type === 'customer') {
+    selectProps = {
+      placeholder: '输入客户编码或名称',
+      renderTableColumns: [
+        {
+          title: '客户编码',
+          dataIndex: 'code',
+        },
+        {
+          title: '客户名称',
+          dataIndex: 'name',
+        },
+      ],
+      ...selectConfigProps,
+    }
     requestConfig = {
       url: `${prefixUrl.selectPrefix}/uc/customer/v2`,
       filter: 'qp-name,code-orGroup,like', // 过滤参数
@@ -1090,17 +1207,25 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       modalTableTitle: '选择客户',
       tableSearchForm,
       tableColumns: [
+        {
+          title: '序号',
+          dataIndex: 'keyIndex',
+          defaultSort: 0,
+        },
         {
           title: '客户编码',
           dataIndex: 'code',
+          defaultSort: 1,
         },
         {
           title: '客户名称',
           dataIndex: 'name',
+          defaultSort: 2,
         },
         {
           title: '归属集团',
           dataIndex: 'conglomerateName',
+          defaultSort: 3,
         },
         {
           title: '归属法人公司',
@@ -1113,6 +1238,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
         {
           title: '共享类型',
           dataIndex: 'sharingType',
+          defaultSort: 4,
           render: (text: number) => hasDictSharingType ? getDictionaryTextByValue('UC000013', text) : sharingType.find((i: any) => i.value === text)?.text,
         },
       ],
@@ -1120,6 +1246,20 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
     }
   }
   if(type === 'customer2') {
+    selectProps = {
+      placeholder: '输入客户编码或名称',
+      renderTableColumns: [
+        {
+          title: '客户编码',
+          dataIndex: 'code',
+        },
+        {
+          title: '客户名称',
+          dataIndex: 'name',
+        },
+      ],
+      ...selectConfigProps,
+    }
     // 版本2
     requestConfig = {
       url: `${prefixUrl.selectPrefix}/customer`,
@@ -1178,21 +1318,30 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       modalTableTitle: '选择客户',
       tableSearchForm,
       tableColumns: [
+        {
+          title: '序号',
+          dataIndex: 'keyIndex',
+          defaultSort: 0,
+        },
         {
           title: '客户编码',
           dataIndex: 'code',
+          defaultSort: 1,
         },
         {
           title: '客户名称',
           dataIndex: 'name',
+          defaultSort: 2,
         },
         {
           title: '创建组织',
           dataIndex: 'createOrgName',
+          defaultSort: 3,
         },
         {
           title: '使用组织',
           dataIndex: 'salesOrgName',
+          defaultSort: 4,
         },
       ],
       ...modalTableBusProps
@@ -1201,11 +1350,25 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
 
   // 店铺选择器
   if(type === 'shopFile') {
-    requestConfig = {
-      url: `${prefixUrl.selectPrefix}/store`,
-      filter: 'qp-name,code-orGroup,like', // 过滤参数
-      mappingTextField: 'name',
-      mappingValueField: 'code',
+    selectProps = {
+      placeholder: '输入店铺编码或名称',
+      renderTableColumns: [
+        {
+          title: '店铺编码',
+          dataIndex: 'code',
+        },
+        {
+          title: '店铺名称',
+          dataIndex: 'name',
+        },
+      ],
+      ...selectConfigProps,
+    }
+    requestConfig = {
+      url: `${prefixUrl.selectPrefix}/store`,
+      filter: 'qp-name,code-orGroup,like', // 过滤参数
+      mappingTextField: 'name',
+      mappingValueField: 'code',
       otherParams: {
         sorter: 'desc-id'
       }, // 默认参数
@@ -1322,13 +1485,20 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       modalTableTitle: '选择店铺',
       tableSearchForm,
       tableColumns: [
+        {
+          title: '序号',
+          dataIndex: 'keyIndex',
+          defaultSort: 0,
+        },
         {
           title: '店铺编码',
           dataIndex: 'code',
+          defaultSort: 1,
         },
         {
           title: '店铺名称',
           dataIndex: 'name',
+          defaultSort: 2,
         },
         {
           title: '归属集团',
@@ -1341,11 +1511,13 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
         {
           title: '店铺类型',
           dataIndex: 'type',
+          defaultSort: 3,
           render: (text: number) => shopFileType.find((i: any) => i.value === text)?.text,
         },
         {
           title: '店铺来源',
           dataIndex: 'platformName',
+          defaultSort: 4,
         },
         {
           title: '归属核算主体',
@@ -1356,6 +1528,20 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
     }
   }
   if(type === 'shopFile2') {
+    selectProps = {
+      placeholder: '输入商店编码或名称',
+      renderTableColumns: [
+        {
+          title: '商店编码',
+          dataIndex: 'code',
+        },
+        {
+          title: '商店名称',
+          dataIndex: 'name',
+        },
+      ],
+      ...selectConfigProps,
+    }
     requestConfig = {
       url: `${prefixUrl.selectPrefix}/store/page`,
       filter: 'qp-name,code-orGroup,like', // 过滤参数
@@ -1400,17 +1586,25 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       modalTableTitle: '选择商店',
       tableSearchForm,
       tableColumns: [
+        {
+          title: '序号',
+          dataIndex: 'keyIndex',
+          defaultSort: 0,
+        },
         {
           title: '商店编码',
           dataIndex: 'code',
+          defaultSort: 1,
         },
         {
           title: '商店名称',
           dataIndex: 'name',
+          defaultSort: 2,
         },
         {
           title: '商店类型',
           dataIndex: 'type',
+          defaultSort: 3,
           render: (text: number) => shopFile2Type.find((i: any) => i.value === text)?.text,
         },
         {
@@ -1421,6 +1615,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
         {
           title: '所属销售组织',
           dataIndex: 'orgName',
+          defaultSort: 4,
         },
       ],
       ...modalTableBusProps
@@ -1429,6 +1624,20 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
 
   // 核算主体选择器（无弹窗）
   if(type === 'accountingSubject') {
+    selectProps = {
+      placeholder: '输入核算主体编码或名称',
+      renderTableColumns: [
+        {
+          title: '核算主体编码',
+          dataIndex: 'code',
+        },
+        {
+          title: '核算主体名称',
+          dataIndex: 'name',
+        },
+      ],
+      ...selectConfigProps,
+    }
     requestConfig = {
       url: `${prefixUrl.selectPrefix}/accountingSubject`,
       filter: 'qp-name,code-orGroup,like', // 过滤参数
@@ -1445,6 +1654,20 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
   }
   // 库存组织选择器（无弹窗）
   if(type === 'inventoryOrg') {
+    selectProps = {
+      placeholder: '输入库存组织编码或名称',
+      renderTableColumns: [
+        {
+          title: '库存组织编码',
+          dataIndex: 'code',
+        },
+        {
+          title: '库存组织名称',
+          dataIndex: 'name',
+        },
+      ],
+      ...selectConfigProps,
+    }
     requestConfig = {
       url: `${prefixUrl.selectPrefix}/inventoryOrg`,
       filter: 'qp-name,code-orGroup,like', // 过滤参数
@@ -1462,6 +1685,20 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
 
   // 法人公司选择器（无弹窗）
   if(type === 'corporationCompany') {
+    selectProps = {
+      placeholder: '输入法人公司编码或名称',
+      renderTableColumns: [
+        {
+          title: '法人公司编码',
+          dataIndex: 'code',
+        },
+        {
+          title: '法人公司名称',
+          dataIndex: 'name',
+        },
+      ],
+      ...selectConfigProps,
+    }
     requestConfig = {
       url: `${prefixUrl.selectPrefix}/company`,
       filter: 'qp-name,code-orGroup,like', // 过滤参数
@@ -1479,6 +1716,20 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
 
   // 新-法人公司选择器（无弹窗）
   if(type === 'platCompany') {
+    selectProps = {
+      placeholder: '输入法人公司编码或名称',
+      renderTableColumns: [
+        {
+          title: '法人公司编码',
+          dataIndex: 'socialCreditCode',
+        },
+        {
+          title: '法人公司名称',
+          dataIndex: 'name',
+        },
+      ],
+      ...selectConfigProps,
+    }
     requestConfig = {
       url: `${prefixUrl.selectPrefix}/platCompany`,
       filter: 'qp-name,socialCreditCode-orGroup,like', // 过滤参数
@@ -1496,6 +1747,20 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
 
   // 员工选择器
   if(type === 'employee') {
+    selectProps = {
+      placeholder: '输入员工编码或名称',
+      renderTableColumns: [
+        {
+          title: '员工编码',
+          dataIndex: 'employeeNumber',
+        },
+        {
+          title: '员工名称',
+          dataIndex: 'name',
+        },
+      ],
+      ...selectConfigProps,
+    }
     requestConfig = {
       url: `${prefixUrl.selectPrefix}/employee/v2`,
       filter: 'qp-employeeNumber,name-orGroup,like', // 过滤参数
@@ -1543,17 +1808,25 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       modalTableTitle: '选择员工',
       tableSearchForm,
       tableColumns: [
+        {
+          title: '序号',
+          dataIndex: 'keyIndex',
+          defaultSort: 0,
+        },
         {
           title: '员工编码',
           dataIndex: 'employeeNumber',
+          defaultSort: 1,
         },
         {
           title: '员工名称',
           dataIndex: 'name',
+          defaultSort: 2,
         },
         {
           title: '所属公司',
           dataIndex: 'companyName',
+          defaultSort: 3,
         },
         {
           title: '邮箱',
@@ -1562,6 +1835,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
         {
           title: '手机号',
           dataIndex: 'officeTelephone',
+          defaultSort: 4,
         },
       ],
       ...modalTableBusProps
@@ -1569,6 +1843,20 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
   }
   if(type === 'employee2') {
     // 版本2
+    selectProps = {
+      placeholder: '输入员工编码或名称',
+      renderTableColumns: [
+        {
+          title: '员工编码',
+          dataIndex: 'username',
+        },
+        {
+          title: '员工名称',
+          dataIndex: 'name',
+        },
+      ],
+      ...selectConfigProps,
+    }
     requestConfig = {
       url: `${prefixUrl.selectPrefix}/employee/pageList/v2`,
       filter: 'qp-username,name-orGroup,like', // 过滤参数
@@ -1621,14 +1909,21 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       modalTableTitle: '添加员工',
       tableSearchForm,
       tableColumns: [
+        {
+          title: '序号',
+          dataIndex: 'keyIndex',
+          defaultSort: 0,
+        },
         {
           title: '账户名称',
           dataIndex: 'username',
+          defaultSort: 1,
           render: (text: any) => handleTextOverflow(text),
         },
         {
           title: '显示名称',
           dataIndex: 'name',
+          defaultSort: 2,
         },
         // {
         //   title: '员工编码',
@@ -1641,6 +1936,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
         {
           title: '所属组织机构',
           dataIndex: 'administrativeNames',
+          defaultSort: 3,
           render: (text: any) => handleTextOverflow(text),
         },
         ...(modalTableBusProps?.needTypeSearch?[{
@@ -1655,6 +1951,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
         {
           title: '手机号',
           dataIndex: 'officeTelephone',
+          defaultSort: 4,
           render: (text: any, record: any) => handleTextOverflow(text||record?.phone),
         },
       ],
@@ -1664,6 +1961,20 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
 
   // 配送方式选择器
   if(type === 'deliveryMode') {
+    selectProps = {
+      placeholder: '输入配送方式编码或名称',
+      renderTableColumns: [
+        {
+          title: '配送方式编码',
+          dataIndex: 'code',
+        },
+        {
+          title: '配送方式名称',
+          dataIndex: 'name',
+        },
+      ],
+      ...selectConfigProps,
+    }
     const isLogisCompanyCodeSingleSearch = requestConfigProp?.fixedparameter?.some((i: any) => i == 'qp-logisCompanyCode-eq');
     const logisCompanyCodeSingleSearchName = isLogisCompanyCodeSingleSearch ? 'qp-logisCompanyCode-eq' : 'qp-logisCompanyCode-in';
     requestConfig = {
@@ -1732,17 +2043,25 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       modalTableTitle: '选择配送方式',
       tableSearchForm,
       tableColumns: [
+        {
+          title: '序号',
+          dataIndex: 'keyIndex',
+          defaultSort: 0,
+        },
         {
           title: '配送方式编码',
           dataIndex: 'code',
+          defaultSort: 1,
         },
         {
           title: '配送方式名称',
           dataIndex: 'name',
+          defaultSort: 2,
         },
         {
           title: '所属物流商',
           dataIndex: 'logisCompanyName',
+          defaultSort: 3,
         },
         {
           dataIndex: 'recordChannnelCode',
@@ -1761,6 +2080,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
         {
           dataIndex: 'remark',
           title: '备注',
+          defaultSort: 4,
         },
       ],
       ...modalTableBusProps
@@ -1769,6 +2089,20 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
 
   // 规则模板选择器
   if(type === 'ruleTemplate') {
+    selectProps = {
+      placeholder: '输入规则模板编码或名称',
+      renderTableColumns: [
+        {
+          title: '规则模板编码',
+          dataIndex: 'code',
+        },
+        {
+          title: '规则模板名称',
+          dataIndex: 'name',
+        },
+      ],
+      ...selectConfigProps,
+    }
     requestConfig = {
       url: `${prefixUrl.selectPrefix}/ruleTemplate`,
       filter: 'qp-name,code-orGroup,like', // 过滤参数
@@ -1789,18 +2123,26 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       modalTableTitle: '选择规则模板',
       tableSearchForm,
       tableColumns: [
+        {
+          title: '序号',
+          dataIndex: 'keyIndex',
+          defaultSort: 0,
+        },
         {
           title: '规则模板编码',
           dataIndex: 'code',
+          defaultSort: 1,
         },
         {
           title: '规则模板名称',
           dataIndex: 'name',
+          defaultSort: 2,
           render: (text: any) => handleTextOverflow(text),
         },
         {
           title: '条件对象',
           dataIndex: 'objectName',
+          defaultSort: 3,
           render: (text: any) => handleTextOverflow(text),
         },
         {
@@ -1811,6 +2153,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
         {
           dataIndex: 'actionName',
           title: '执行动作',
+          defaultSort: 4,
           render: (text: any) => handleTextOverflow(text),
         },
       ],
@@ -1820,6 +2163,20 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
 
   // 角色选择器
   if(type === 'role') {
+    selectProps = {
+      placeholder: '输入角色编码或名称',
+      renderTableColumns: [
+        {
+          title: '角色编码',
+          dataIndex: 'code',
+        },
+        {
+          title: '角色名称',
+          dataIndex: 'name',
+        },
+      ],
+      ...selectConfigProps,
+    }
     requestConfig = {
       url: `${prefixUrl.selectPrefix}/role`,
       filter: 'qp-name,code-orGroup,like', // 过滤参数
@@ -1863,18 +2220,26 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       modalTableTitle: '选择角色',
       tableSearchForm,
       tableColumns: [
+        {
+          title: '序号',
+          dataIndex: 'keyIndex',
+          defaultSort: 0,
+        },
         {
           title: '角色编码',
           dataIndex: 'code',
+          defaultSort: 1,
         },
         {
           title: '角色名称',
           dataIndex: 'name',
+          defaultSort: 2,
           render: (text: any) => handleTextOverflow(text),
         },
         {
           title: '角色分类',
           dataIndex: 'categoryName',
+          defaultSort: 3,
           render: (text: any) => handleTextOverflow(text),
         },
         {
@@ -1885,6 +2250,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
         {
           dataIndex: 'applicationName',
           title: '应用',
+          defaultSort: 4,
           render: (text: any) => handleTextOverflow(text),
         },
       ],
@@ -1894,6 +2260,20 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
 
   // 销售渠道选择器
   if(type === 'market-channel') {
+    selectProps = {
+      placeholder: '输入销售渠道编码或名称',
+      renderTableColumns: [
+        {
+          title: '销售渠道编码',
+          dataIndex: 'code',
+        },
+        {
+          title: '销售渠道名称',
+          dataIndex: 'name',
+        },
+      ],
+      ...selectConfigProps,
+    }
     requestConfig = {
       url: `${prefixUrl.selectPrefix}/channelInfo`,
       filter: 'qp-name,code-orGroup,like', // 过滤参数
@@ -1940,18 +2320,26 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       modalTableTitle: '选择销售渠道',
       tableSearchForm,
       tableColumns: [
+        {
+          title: '序号',
+          dataIndex: 'keyIndex',
+          defaultSort: 0,
+        },
         {
           title: '销售渠道编码',
           dataIndex: 'code',
+          defaultSort: 1,
         },
         {
           title: '销售渠道名称',
           dataIndex: 'name',
+          defaultSort: 2,
           render: (text: any) => handleTextOverflow(text),
         },
         {
           title: '所属销售组织',
           dataIndex: 'salesOrgCodeName',
+          defaultSort: 3,
           render: (text: any) => handleTextOverflow(text),
         },
       ],
@@ -1961,6 +2349,20 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
 
   //业务组织选择器（可筛选业务职能/组织类型/组织形态）
   if (type === 'business-organization') {
+    selectProps = {
+      placeholder: '输入业务组织编码或名称',
+      renderTableColumns: [
+        {
+          title: '业务组织编码',
+          dataIndex: 'code',
+        },
+        {
+          title: '业务组织名称',
+          dataIndex: 'name',
+        },
+      ],
+      ...selectConfigProps,
+    }
     requestConfig = {
       url: `${prefixUrl.selectPrefix}/orgViewNode/common/pageList`,
       filter: 'qp-name-like', // 过滤参数
@@ -2030,18 +2432,26 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       modalTableTitle: '选择组织',
       tableSearchForm,
       tableColumns: [
+        {
+          title: '序号',
+          dataIndex: 'keyIndex',
+          defaultSort: 0,
+        },
         {
           title: '组织编码',
           dataIndex: 'code',
+          defaultSort: 1,
         },
         {
           title: '组织名称',
           dataIndex: 'name',
+          defaultSort: 2,
           render: (text: any) => handleTextOverflow(text),
         },
         {
           title: '业务职能',
           dataIndex: 'orgViewNameList',
+          defaultSort: 3,
           render: (text: any, record: any) => {
             const { orgViewNameList = [] } = record;
             return orgViewNameList.length ? orgViewNameList.join('/') : '--';
@@ -2050,6 +2460,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
         {
           title: '组织类型',
           dataIndex: 'orgType',
+          defaultSort: 4,
           render: (text: any) => {
             const obj = orgType.find((i: any) => i.value == text);
             return obj ? obj.text : '--';
@@ -2070,6 +2481,20 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
 
   // 人员选择器
   if(type === 'person') {
+    selectProps = {
+      placeholder: '输入人员编码或名称',
+      renderTableColumns: [
+        {
+          title: '人员编码',
+          dataIndex: 'code',
+        },
+        {
+          title: '人员名称',
+          dataIndex: 'name',
+        },
+      ],
+      ...selectConfigProps,
+    }
     requestConfig = {
       url: `${prefixUrl.selectPrefix}/person`,
       filter: 'qp-code,name-orGroup,like', // 过滤参数
@@ -2091,22 +2516,31 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       modalTableTitle: '添加人员',
       tableSearchForm,
       tableColumns: [
+        {
+          title: '序号',
+          dataIndex: 'keyIndex',
+          defaultSort: 0,
+        },
         {
           title: '姓名',
           dataIndex: 'name',
+          defaultSort: 1,
         },
         {
           title: '员工工号',
           dataIndex: 'code',
+          defaultSort: 2,
         },
         {
           title: '员工类型',
           dataIndex: 'dataSource',
+          defaultSort: 3,
           render: (text: number) => personDataSourceType.find((i: any) => i.value == text)?.text,
         },
         {
           title: '手机号',
           dataIndex: 'phone',
+          defaultSort: 4,
         },
       ],
       ...modalTableBusProps
@@ -2115,6 +2549,20 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
 
   // 品牌选择器
   if(type === 'brand') {
+    selectProps = {
+      placeholder: '输入品牌编码或名称',
+      renderTableColumns: [
+        {
+          title: '品牌编码',
+          dataIndex: 'brandCode',
+        },
+        {
+          title: '品牌名称',
+          dataIndex: 'name',
+        },
+      ],
+      ...selectConfigProps,
+    }
     requestConfig = {
       url: `${prefixUrl.selectPrefix}/brand/list`,
       filter: 'qp-brandCode,name-orGroup,like', // 过滤参数
@@ -2137,9 +2585,15 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       modalTableTitle: '添加品牌',
       tableSearchForm,
       tableColumns: [
+        {
+          title: '序号',
+          dataIndex: 'keyIndex',
+          defaultSort: 0,
+        },
         {
           title: '品牌图片',
           dataIndex: 'logoUrl',
+          defaultSort: 1,
           render: (text: any) => (
             <Image.PreviewGroup>
               {(text && Object.prototype.toString.call(JSON.parse(text)) === '[object Array]' &&
@@ -2153,10 +2607,12 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
         {
           title: '品牌编码',
           dataIndex: 'brandCode',
+          defaultSort: 2,
         },
         {
           title: '品牌中文名',
           dataIndex: 'name',
+          defaultSort: 3,
         },
         {
           title: '品牌英文名',
@@ -2165,6 +2621,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
         {
           title: '品牌首字母',
           dataIndex: 'brandInitial',
+          defaultSort: 4,
         },
         {
           title: '描述',
@@ -2177,6 +2634,20 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
 
    // 价格项选择器
   if(type === 'priceItem') {
+    selectProps = {
+      placeholder: '输入价格项编码或名称',
+      renderTableColumns: [
+        {
+          title: '价格项编码',
+          dataIndex: 'code',
+        },
+        {
+          title: '价格项名称',
+          dataIndex: 'name',
+        },
+      ],
+      ...selectConfigProps,
+    }
     requestConfig = {
       url: `${prefixUrl.selectPrefix}/priceType`,
       filter: 'qp-code,name-orGroup,like', // 过滤参数
@@ -2198,27 +2669,170 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       modalTableTitle: '选择价格项',
       tableSearchForm,
       tableColumns: [
+        {
+          title: '序号',
+          dataIndex: 'keyIndex',
+          defaultSort: 0,
+        },
         {
           title: '代码',
           dataIndex: 'code',
+          defaultSort: 1,
         },
         {
           title: '名称',
           dataIndex: 'name',
+          defaultSort: 2,
         },
         {
           title: '创建时间',
           dataIndex: 'createTime',
+          defaultSort: 3,
           render: (text: any) =>  handleTooltip(text, true),
         },
         {
           title: '创建人',
           dataIndex: 'createUserName',
+          defaultSort: 4,
+        },
+      ],
+      ...modalTableBusProps
+    }
+  }
+
+  // 销售组织
+  if (type === 'sales-organization') {
+    selectProps = {
+      placeholder: '输入销售组织编码或名称',
+      renderTableColumns: [
+        {
+          title: '销售组织编码',
+          dataIndex: 'code',
+        },
+        {
+          title: '销售组织名称',
+          dataIndex: 'name',
+        },
+      ],
+      ...selectConfigProps,
+    }
+    requestConfig = {
+      url: `${prefixUrl.selectPrefix}/orgViewNode/listNoPage`,
+      filter: 'qp-code,name-orGroup,like', // 过滤参数
+      mappingTextField: 'name',
+      mappingTextShowKeyField: 'code',
+      mappingValueField: 'code',
+      otherParams: {
+        'qp-orgViewCode-eq': 'sales-organizational-view',
+        'qp-status-eq': 10,
+        sorter: 'desc-createTime',
+      }, // 默认参数
+      sourceName: 'supplierCode',
+      ...requestConfigProp
+    },
+    tableSearchForm = [
+      { name: 'qp-name-like', label: '组织名称' },
+      { name: 'qp-code-like', label: '组织编码' },
+      { name: 'qp-orgViewCode-in', type: 'select', label: '业务职能', field: {
+          type: 'select',
+          props: {
+            mode: 'multiple',
+            notFoundContent: '暂无数据',
+            allowClear: true,
+            showSearch: true,
+            showArrow: true,
+            maxTagCount: 1,
+            optionFilterProp: 'children',
+            filterOption: (input: string, option: { props: { children: string } }) =>
+              option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
+          },
+        }
+      },
+      {
+        name: 'qp-orgType-in',
+        type: 'select',
+        label: '组织类型',
+        field: {
+          type: 'select',
+          props: {
+            mode: 'multiple',
+            allowClear: true,
+            maxTagCount: 1,
+          },
+        },
+        initialSource: orgType
+      },
+      {
+        name: 'qp-nodeType-in',
+        type: 'select',
+        label: '组织形态',
+        field: {
+          type: 'select',
+          props: {
+            mode: 'multiple',
+            allowClear: true,
+            maxTagCount: 1,
+          },
+        },
+        initialSource: nodeType
+      }]
+    Promise.all([
+      loadSelectSource(`${prefixUrl.formSelectFix}/orgView/getOrgViewListNoPage`, {
+        'qp-status-eq': 10
+      }),
+    ]).then((x: any)=>{
+      formatSource(x, 0, 2, tableSearchForm);
+    })
+    modalTableProps = {
+      modalTableTitle: '选择组织',
+      tableSearchForm,
+      tableColumns: [
+        {
+          title: '序号',
+          dataIndex: 'keyIndex',
+          defaultSort: 0,
+        },
+        {
+          title: '组织编码',
+          dataIndex: 'code',
+          defaultSort: 1,
+        },
+        {
+          title: '组织名称',
+          dataIndex: 'name',
+          defaultSort: 2,
+          render: (text: any) => handleTextOverflow(text),
+        },
+        {
+          title: '业务职能',
+          dataIndex: 'orgViewNameList',
+          defaultSort: 3,
+          render: (text: any, record: any) => {
+            const { orgViewNameList = [] } = record;
+            return orgViewNameList.length ? orgViewNameList.join('/') : '--';
+          },
+        },
+        {
+          title: '组织类型',
+          dataIndex: 'orgType',
+          defaultSort: 4,
+          render: (text: any) => {
+            const obj = orgType.find((i: any) => i.value == text);
+            return obj ? obj.text : '--';
+          }
+        },
+        {
+          title: '组织形态',
+          dataIndex: 'nodeType',
+          render: (text: any) => {
+            const obj = nodeType.find((i: any) => i.value == text);
+            return obj ? obj.text : '--';
+          }
         },
       ],
       ...modalTableBusProps
     }
   }
 
-  return { modalTableProps, requestConfig, needModalTable };
+  return { modalTableProps, selectProps, requestConfig, needModalTable };
 }