@bit-sun/business-component 4.2.0-alpha.jw-1 → 4.2.1-alpha.10-aiwei

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

@@ -6,7 +6,7 @@ import { handleTextOverflow, tableColumnsImage, handleTooltip } from '@/componen
 import { getSkuImg } from '@/utils/TableUtils';
 import { getEmployeeCode, getCurrentTargetBgId } from '@/utils/LocalstorageUtils';
 import { Image } from 'antd';
-import { isBoolean } from 'lodash';
+import { isBoolean, trim } from 'lodash';
 
 const hasDictSharingType =  getDictionarySource('UC000013')?.length;
 const sharingTypeDataList = hasDictSharingType && getDictionarySource('UC000013') || sharingType
@@ -85,6 +85,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
   let modalTableProps = {
     modalTableTitle: '',
     tableSearchForm,
+    visibleFieldsCount: 13,
     tableColumns: [],
     ...modalTableBusProps,
   }
@@ -423,15 +424,125 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
             dropdownStyle: { maxHeight: 400, maxWidth: 100, overflow: 'auto' }
           },
         } },
-      { name: 'UNIQUE_SPEC', label: '属性', field: {
-          type: 'proppertySelector',
-        } },
+{ name: 'qp-skcCode-in', label: 'SKC编码', field: {
+        type:'multipleQuerySearchSelect',
+        props: {
+          selectProps: {
+            mode: "multiple",
+            placeholder: '请输入SKC编码查询'
+          },
+          requestConfig: {
+            url: '/items/sku//listNoPage/Simple',
+            filter: 'qp-skcCode,name-orGroup,like',
+            mappingTextField: 'name',
+            mappingValueField: 'skcCode',
+            sourceName: 'qp-skcCode-in',
+            specialBracket: true,
+            otherParams: {
+              'ownOrgSign': getCurrentTargetBgId(),
+              'ctl-count': true
+            }, // 默认参数
+          },
+        }
+      } },
+        { name: 'qp-year-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-season-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-zzbdbm-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-zzdlbm-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-zzzlbm-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-zzxlbm-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: 'UNIQUE_SPEC', label: '属性', field: {
+      //     type: 'proppertySelector',
+      //   } },
     ]
     const defaultQSHL = [
-      {
-        isOpen: true,
-        queryKey: 'qp-brandId-in',
-      },
+      { isOpen: true, queryKey: 'qp-brandId-in' },
+      { isOpen: true, queryKey: 'qp-categoryId-in' },
+      { isOpen: true, queryKey: 'qp-year-in' },
+      { isOpen: true, queryKey: 'qp-season-in' },
+      { isOpen: true, queryKey: 'qp-zzbdbm-in' },
+      { isOpen: true, queryKey: 'qp-zzdlbm-in' },
+      { isOpen: true, queryKey: 'qp-zzzlbm-in' },
+      { isOpen: true, queryKey: 'qp-zzxlbm-in' },
     ]
     const queryHeaderParams  = getQueryHeadersList({defaultQSHL, querySelectHeadersList, extralHeaders});
 
@@ -445,14 +556,45 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
         pageSize: 5000,
         currentPage: 1,
       },getQueryHeadersItem(queryHeaderParams,'qp-categoryId-in')),
+      loadSelectSource(`${prefixUrl.formSelectFix}/item/propertyValue`, {
+        'qp-propertyCode-eq': 'PROP_YEAR',
+        pageSize: 999,
+      }, getQueryHeadersItem(queryHeaderParams,'qp-year-in')),
+      loadSelectSource(`${prefixUrl.formSelectFix}/item/propertyValue`, {
+        'qp-propertyCode-eq': 'PROP_SEASON',
+        pageSize: 999,
+      }, getQueryHeadersItem(queryHeaderParams,'qp-season-in')),
+      loadSelectSource(`${prefixUrl.formSelectFix}/band`, {
+        pageSize: 999,
+        currentPage: 1,
+      }, getQueryHeadersItem(queryHeaderParams,'qp-zzbdbm-in')),
+      loadSelectSource(`${prefixUrl.formSelectFix}/rule/getClassPropertyValue/110000217`, {
+      }, getQueryHeadersItem(queryHeaderParams,'qp-zzdlbm-in')),
+      loadSelectSource(`${prefixUrl.formSelectFix}/item/propertyValue`, {
+        'qp-propertyCode-eq': 'MID_CATA',
+        pageSize: 999,
+      }, getQueryHeadersItem(queryHeaderParams,'qp-zzzlbm-in')),
+      loadSelectSource(`${prefixUrl.formSelectFix}/item/propertyValue`, {
+        'qp-propertyCode-eq': 'PROP_SUBCATEORY',
+        pageSize: 999,
+      }, getQueryHeadersItem(queryHeaderParams,'qp-zzxlbm-in')),
     ]).then((x: any)=>{
       formatSource(x,0, 3, tableSearchForm,['id','name'])
       formatTreeDataSource(x,1, 4, tableSearchForm)
+      formatSource(x,0, getFieldIndex(tableSearchForm, 'qp-brandId-in'), tableSearchForm,['id','name'])
+      formatTreeDataSource(x,1, getFieldIndex(tableSearchForm, 'qp-categoryId-in'), tableSearchForm)
+      formatSource(x,2, getFieldIndex(tableSearchForm, 'qp-year-in'), tableSearchForm,['value','value'])
+      formatSource(x,3, getFieldIndex(tableSearchForm, 'qp-season-in'), tableSearchForm,['value','value'])
+      formatSource(x,4, getFieldIndex(tableSearchForm, 'qp-zzbdbm-in'), tableSearchForm,['bandCode','bandName'])
+      formatSource(x,5, getFieldIndex(tableSearchForm, 'qp-zzdlbm-in'), tableSearchForm,['value','value'])
+      formatSource(x,6, getFieldIndex(tableSearchForm, 'qp-zzzlbm-in'), tableSearchForm,['value','value'])
+      formatSource(x,7, getFieldIndex(tableSearchForm, 'qp-zzxlbm-in'), tableSearchForm,['value','value'])
     })
     modalTableProps = {
       modalTableTitle: '选择SKU',
       tableSearchForm,
       isHorizontally: true,
+      tableSearchColSpan: 6,
       tableColumns: [
         {
           title: '序号',
@@ -1209,18 +1351,28 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
         'qp-status-eq': 1,
       },getQueryHeadersItem(queryHeaderParams,'qp-orgCode-in')),
     ]).then((x: any)=>{
+      debugger
+      // 战区限制一级数据
+      const newData1 = [];
+      x[0]?.data[0]?.channelInfoSon?.forEach((item: any) => {
+        newData1.push({
+          code: item.code,
+          name: item.name
+        })
+      })
+      x[0].data = newData1;
       const channelDisabledJude = (data: any) => data['parentCode'] === '0'; // 所属销售渠道 树节点不能点判断
       const areaDisabledJude = (data: any) => data['parent'] === '0'; // 所属营销区域 树节点不能点判断
-      formatTreeDataSource(x, 0, 4, tableSearchForm, ['code','name'], 'channelInfoSon', channelDisabledJude)
-      formatTreeDataSource(x, 1, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude)
+      formatTreeDataSource(x, 0, 3, tableSearchForm, ['code','name'], 'channelInfoSon', channelDisabledJude)
+      formatTreeDataSource(x, 1, 4, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude)
     })
     tableSearchForm = [
       { name: 'realWarehouseName*multiInput', label: '逻辑仓名称', type: 'multipleQueryInput' },
       { name: 'realWarehouseCode*multiInput', label: '逻辑仓编码', type: 'multipleQueryInput' },
       { name: 'qp-realWarehouseType-eq', type: 'select', label: '逻辑仓类型', initialSource: getDictionarySource('SC00004')  },
-      { name: 'belongArea', field: {type: 'select', props: {mode: 'multiple',}}, label: '管理大区', initialSource: getDictionarySource('BUSINESS_belongArea'),   },
+      // { name: 'belongArea', field: {type: 'select', props: {mode: 'multiple',}}, label: '管理大区', initialSource: getDictionarySource('BUSINESS_belongArea'),   },
       {
-        name: 'qp-channelCode-in', type: 'treeSelect', label: '销售渠道', field: {
+        name: 'qp-channelCode-in', type: 'treeSelect', label: '战区', field: {
           type: 'treeSelect',
           props: {
             multiple: true,
@@ -1239,7 +1391,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
         }
       },
       {
-        name: 'qp-refCode-in', type: 'treeSelect', label: '营销区域', field: {
+        name: 'qp-refCode-in', type: 'treeSelect', label: '大区', field: {
           type: 'treeSelect',
           props: {
             multiple: true,
@@ -1310,7 +1462,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           width: 100,
         },
         {
-          title: '所属销售渠道',
+          title: '战区',
           dataIndex: 'channelName',
           defaultSort: 4,
           width: 100,
@@ -1387,8 +1539,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           },
         } },
         {
-        name: 'qp-channelCode-in', type: 'treeSelect', label: '销售渠道', field: {
-          type: 'treeSelect',
+        name: 'qp-operationWarehouseClassification-in', type: 'select', label: '分类', field: {
+          type: 'select',
           props: {
             multiple: true,
             treeData: [],
@@ -1403,7 +1555,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
               option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
             showCheckedStrategy: 'TreeSelect.SHOW_ALL',
           },
-        }
+        },
+         initialSource: getDictionarySource('BASIC_OPS_WH_TYPE')
       },
       ...(modalTableBusProps?.needStatusSearch?[{ name: 'qp-status-eq', type: 'select', label: '运营仓状态', initialSource: getDictionarySource('SC00001')  }]:[]),
     ]
@@ -1417,8 +1570,11 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       },getQueryHeadersItem(queryHeaderParams,'qp-orgCode-in')),
     ]).then((x: any)=>{
       formatSource(x,0, 2, tableSearchForm,['groupCode','groupName']);
-      const channelDisabledJude = (data: any) => data['parentCode'] === '0'; // 所属销售渠道 树节点不能点判断
-      formatTreeDataSource(x, 1, 3, tableSearchForm, ['code','name'], 'channelInfoSon', channelDisabledJude)
+      const newData1: any[] = [];
+      x[1]?.data[0]?.channelInfoSon?.forEach((item: any) => {
+        newData1.push({ code: item.code, name: item.name })
+      });
+      x[1].data = newData1;
     })
     modalTableProps = {
       modalTableTitle: '选择运营仓',
@@ -1701,15 +1857,15 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
     tableSearchForm = [
       { name: 'qp-name-like', label: '客户名称' },
       { name: 'qp-code-like', label: '客户编码' },
-      { name: 'qp-createOrgCode-eq', type: 'select', label: '创建组织', field: {
+      { name: 'qp-createOrgCode-in', type: 'select', label: '创建组织', field: {
           type: 'select',
           props: {
-            // mode: 'multiple',
+            mode: 'multiple',
             notFoundContent: '暂无数据',
             allowClear: true,
             showSearch: true,
             showArrow: true,
-            // maxTagCount: 1,
+            maxTagCount: 1,
             optionFilterProp: 'children',
             filterOption: (input: string, option: { props: { children: string } }) =>
               option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
@@ -2069,7 +2225,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
               option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
           },
         } },
-      { name: 'qp-channelCode-in', type: 'treeSelect', label: '所属销售渠道', field: {
+      { name: 'qp-channelCode-in', type: 'treeSelect', label: '战区', field: {
         type: 'treeSelect',
         props: {
           multiple: true,
@@ -2086,7 +2242,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           showCheckedStrategy: 'TreeSelect.SHOW_ALL',
         },
       } },
-      { name: 'qp-commonRelationAreaCode-in', type: 'treeSelect', label: '营销区域', field: {
+      { name: 'qp-commonRelationAreaCode-in', type: 'treeSelect', label: '大区', field: {
         type: 'treeSelect',
         props: {
           multiple: true,
@@ -2138,6 +2294,74 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           },
         },
       },
+      { name: 'qp-manageSupervisor-like', type: 'select', label: '管理督导', field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: (input: string, option: { props: { children: string } }) =>
+             {
+              debugger
+              return (option?.value ?? '').toLowerCase().includes(input.toLowerCase())
+             }
+        },
+      } },
+      { name: 'qp-directSupervisor-like', type: 'select', label: '直接督导', field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: (input: string, option: { props: { children: string } }) =>
+             (option?.value ?? '').toLowerCase().includes(input.toLowerCase())
+        },
+      } },
+      { name: 'qp-distributionItem-like', type: 'select', label: '分销商品', field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: (input: string, option: { props: { children: string } }) =>
+             (option?.value ?? '').toLowerCase().includes(input.toLowerCase())
+        },
+      } },
+      { name: 'qp-headItem-like', type: 'select', label: '总部商品', field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: (input: string, option: { props: { children: string } }) =>
+             (option?.value ?? '').toLowerCase().includes(input.toLowerCase())
+        },
+      } },
+      { name: 'qp-storeChannelName-like', type: 'select', label: '管理模式', field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: (input: string, option: { props: { children: string } }) =>
+             (option?.value ?? '').toLowerCase().includes(input.toLowerCase())
+        },
+      } },
     ]
     const queryHeaderParams  = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
     Promise.all([
@@ -2158,14 +2382,43 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
         pageSize: 5000,
         currentPage: 1,
         'ctl-withAuth': true,
-      },getQueryHeadersItem(queryHeaderParams,'ctl-withAuth'))
+      },getQueryHeadersItem(queryHeaderParams,'ctl-withAuth')),
+      loadSelectSource(`/channel-manage/store/selectStoreOperationalInfo`, {}, {
+        headers: {
+          ...extralHeaders
+        },
+      })
     ]).then((x: any)=>{
+      const newData1: any[] = [];
+      x[1]?.data[0]?.channelInfoSon?.forEach((item: any) => {
+        newData1.push({ code: item.code, name: item.name })
+      });
+      x[1].data = newData1;
       const channelDisabledJude = (data: any) => data['parentCode'] === '0'; // 所属销售渠道 树节点不能点判断
       const areaDisabledJude = (data: any) => data['parent'] === '0'; // 所属营销区域 树节点不能点判断
       formatSource(x,0, 3, tableSearchForm);
       formatTreeDataSource(x, 1, 4, tableSearchForm, ['code','name'], 'channelInfoSon', channelDisabledJude)
       formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude)
       formatSource(x,3, 7, tableSearchForm, ['brandCode', 'name']);
+      
+      const opRaw = x[4]?.data;
+      // 新增label属性
+      opList?.forEach((r: any) => {
+        r.label = r?.value;
+      })
+      let opList = Array.isArray(opRaw) ? opRaw : (opRaw?.items || opRaw?.list || []);
+      if (Array.isArray(opList) && Array.isArray(opList[0]) && !opList[0]?.field) { opList = opList[0]; }
+      const m1 = opList?.filter((r: any) => r?.field === 'manage_supervisor' && trim(r?.value));
+      const m2 = opList?.filter((r: any) => r?.field === 'direct_supervisor' && trim(r?.value));
+      const m3 = opList?.filter((r: any) => r?.field === 'distribution_item' && trim(r?.value));
+      debugger
+      const m4 = opList?.filter((r: any) => r?.field === 'head_item' && trim(r?.value));
+      const m5 = opList?.filter((r: any) => r?.field === 'store_channel_name' && trim(r?.value));
+      tableSearchForm[8] = { ...tableSearchForm[8], initialSource: m1 };
+      tableSearchForm[9] = { ...tableSearchForm[9], initialSource: m2 };
+      tableSearchForm[10] = { ...tableSearchForm[10], initialSource: m3 };
+      tableSearchForm[11] = { ...tableSearchForm[11], initialSource: m4 };
+      tableSearchForm[12] = { ...tableSearchForm[12], initialSource: m5 };
     })
     modalTableProps = {
       modalTableTitle: '选择商店',
@@ -2227,6 +2480,42 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           render: (text: any) => getDictionaryTextByValue('BUSINESS_StoreType', text),
           width: 80,
         },
+        {
+          title: '品牌',
+          dataIndex: 'brandName',
+          defaultSort: 8,
+          width: 80,
+        },
+        {
+          title: '管理督导',
+          dataIndex: 'manageSupervisor',
+          defaultSort: 9,
+          width: 100,
+        },
+        {
+          title: '直接督导',
+          dataIndex: 'directSupervisor',
+          defaultSort: 10,
+          width: 100,
+        },
+        {
+          title: '分销商品',
+          dataIndex: 'distributionItem',
+          defaultSort: 11,
+          width: 100,
+        },
+        {
+          title: '总部商品',
+          dataIndex: 'headItem',
+          defaultSort: 12,
+          width: 100,
+        },
+        {
+          title: '管理模式',
+          dataIndex: 'storeChannelName',
+          defaultSort: 13,
+          width: 100,
+        },
       ],
       noEmptySearchField: true,
       ...modalTableBusProps

package/src/components/Business/SearchSelect/index.md

@@ -150,7 +150,7 @@ export default () => {
     // },
     // prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
     selectProps,
-    selectBusinessType: 'shopFile2',
+    selectBusinessType: 'skuCommodity',
   };
 
   const onTabChange = (key) => {
@@ -317,7 +317,7 @@ export default () => {
     },
     // prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
     selectProps,
-    selectBusinessType: 'spuCommodityWithProperty',
+    selectBusinessType: 'skuCommodity',
   };
 
   const onTabChange = (key) => {
@@ -859,16 +859,17 @@ export default () => {
       console.log(value)
       setValue(value)
     },
-    // requestConfig: {
-    //   url: `/bop/api/store`,
-    //   filter: 'qp-name,code-orGroup,like',,
-    //   mappingTextField: 'name',
-    //   mappingValueField: 'code',
-    //   otherParams: {
-    //     sorter: 'desc-id'
-    //   }, // 默认参数
-    //   sourceName: 'code',
-    // },
+    requestConfig: {
+      url: `/bop/api/store`,
+      filter: 'qp-name,code-orGroup,like',
+      mappingTextField: 'name',
+      mappingValueField: 'code',
+      otherParams: {
+        sorter: 'desc-id'
+      }, // 默认参数
+      sourceName: 'code',
+      extralHeaders: {'x-biz-code': 3}
+    },
     // prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
     selectProps,
     selectBusinessType: 'shopFile',
@@ -878,6 +879,25 @@ export default () => {
     ...props,
     // prefixUrl: { selectPrefix: '/channel-manage/', formSelectFix: '/channel-manage/' },
     selectBusinessType: 'shopFile2',
+    modalTableProps: {
+      isOpen: true,
+      querySelectHeadersList: [
+        {
+        'x-biz-code': 3
+      }
+      ]
+    },
+    requestConfig: {
+      url: `/bop/api/store`,
+      filter: 'qp-name,code-orGroup,like',
+      mappingTextField: 'name',
+      mappingValueField: 'code',
+      otherParams: {
+        sorter: 'desc-id'
+      }, // 默认参数
+      sourceName: 'code',
+      extralHeaders: {'x-biz-code': 3}
+    },
   }
 
   const onTabChange = (key) => {

package/src/components/Functional/SearchSelect/index.tsx

@@ -55,6 +55,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     viewShowValueStr, // 详情展示值,不传展示组件处理的默认值
     searchStartLength, // 默认不校验长度去搜索，如果配置了，则按照配置项长度进行处理搜索
     isQuery = false, // 是否是查询条件
+    requireSearchCondition = false, // 是否必须选择一个值
   } = rCTemp || {};
   const requestConfig = {url,method,otherParams,isMap,fixedparameter,fieldValToParam,fixedparamsDisabled,mappingTextField,mappingTextShowKeyField,mappingValueField,mappingTextShowTextField,init,extralHeaders,specialBracket,noNeedSplit,noOperate,viewShowValueStr,searchStartLength,...rCTemp};
   const resultSourceKey = handleSourceName(sourceName || requestConfig?.sourceName || ctx?.name || 'supplierCode')
@@ -479,6 +480,18 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
 
   const onSearchTable = () => {
     const params = form.getFieldsValue();
+    // 必须选择一个值
+    if(requireSearchCondition) {
+      const hasValidValue = Object.values(params).some(value => 
+        (Array.isArray(value) && value.length > 0) || 
+        (typeof value === 'string' && value.trim().length > 0)
+      );
+      
+      if(!hasValidValue) {
+        message.warning('请至少选择一个搜索条件');
+        return;
+      }
+    }
     setModalSearched(true);
     setTableFormParams(params);
     getData({ ...params, pageSize: tableInitPageSize }, 2, null);
@@ -570,6 +583,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
 
   const formItem = (list) => {
     if (isModalVisible && list?.length) {
+      debugger
       const setDisabled = (name: any) => {
         if (fixedparamsDisabled && fixedparameter?.length && fixedparameter.find((item: any) => item === name)) {
           return true
@@ -710,7 +724,25 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   }
 
   const renderShowTable =  (tableList, type) => {
-    const tableBoxHeighth = getTableHeigth(modalTableProps?.tableSearchForm);
+    const viCount = modalTableProps?.visibleFieldsCount || defaultVisibleFieldsCount;
+    const canExpand = hasMoreQueryFields(modalTableProps);
+    const collapsedList = modalTableProps?.tableSearchForm?.slice(0, viCount);
+    const baseHeight = getTableHeigth(collapsedList);
+    const rowsCollapsed = getFormRowInfo(collapsedList, modalTableProps?.tableSearchColSpan).totalRows;
+    const rowsExpandedData = getFormRowInfo(modalTableProps?.tableSearchForm, modalTableProps?.tableSearchColSpan);
+    let rowsExpanded = rowsExpandedData.totalRows;
+    let isMoreAction = false;
+    if(24 / modalTableProps?.tableSearchColSpan  - rowsExpandedData.emptyArray.length === 1) {
+      rowsExpanded++; 
+      isMoreAction = true;
+    }
+    const extraRows = (!collapsed && canExpand) ? Math.max(0, rowsExpanded - rowsCollapsed) : 0;
+    let tableBoxHeighth = baseHeight;
+    if(isMoreAction && extraRows > 0) {
+      tableBoxHeighth = tableBoxHeighth + ((extraRows - 1) ? (extraRows - 1) : 0) * 34 + 32
+    } else {
+      tableBoxHeighth = tableBoxHeighth + extraRows * 34
+    }
     const x = tableList?.length ? 82 : 28;  // 无数据没有分页，有数据计算减去：分页 24+16*2+10 「高 + margin * 2 + paddingBottom 10 」
     const oSY = `calc(100vh - ${tableBoxHeighth}px - ${x}px)`; 
     const mTB = `calc(50vh - ${tableBoxHeighth/2}px - ${x/2}px - 40px)`

package/src/components/Solution/RuleComponent/RenderCompItem.tsx

@@ -589,7 +589,7 @@ export default function RenderCompItem(props:any){
           null}
         {/* 单选/多选  配送方式选择器  */}
         {((ites?.inputType === 20 || ites?.inputType === 30) &&
-          ites?.choiceType === 310 && (
+          (ites?.choiceType === 310 || ites?.choiceType === 311)&& (
             <BusinessSearchSelect
               selectBusinessType="deliveryMode"
               selectProps={{
@@ -606,6 +606,14 @@ export default function RenderCompItem(props:any){
               labelInValue={true}
               value={showValue(ites.code)}
               requestConfig={{
+                ...(ites?.choiceType === 311
+                  ? {
+                      otherParams: {
+                        // 配送方式只选择标准配送方式
+                        'qp-recordChannnelCode-eq': 80,
+                      },
+                    }
+                  : {}),
                 filterInit: 'qp-code-in',
               }}
               onChange={(value) => {