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

package/dist/plugin/TableColumnSetting/index.d.ts

@@ -38,14 +38,14 @@ declare class TableColumnSetting extends React.Component<TableColumnSettingProps
     } | {
         title: string;
         dataIndex: string;
-        render: (text: any, record: any) => React.JSX.Element;
+        render: (text: any, record: any) => JSX.Element;
         className?: undefined;
         width?: undefined;
     } | {
         title: string;
         dataIndex: string;
         className: string;
-        render: () => React.JSX.Element;
+        render: () => JSX.Element;
         width?: undefined;
     })[];
     showModal: () => void;
@@ -53,13 +53,13 @@ declare class TableColumnSetting extends React.Component<TableColumnSettingProps
     handleCancel: (e: React.MouseEvent<HTMLElement>) => void;
     handleTableHeadHidden: (title: string) => void;
     onSortEnd: ({ oldIndex, newIndex }: any) => void;
-    DraggableContainer: (props: any) => React.JSX.Element;
-    DraggableBodyRow: ({ className, style, ...restProps }: any) => React.JSX.Element;
+    DraggableContainer: (props: any) => JSX.Element;
+    DraggableBodyRow: ({ className, style, ...restProps }: any) => JSX.Element;
     onChange: (e: any, title: any) => void;
     handleReset: () => void;
     handleResetSetting: () => Promise<unknown>;
     onSearch: (e: any) => void;
     onSearchSort: (e: any) => void;
-    render(): React.JSX.Element;
+    render(): JSX.Element;
 }
 export default TableColumnSetting;

package/dist/utils/TableUtils.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import moment from 'moment';
 type mediaListType = {
     type: number;
@@ -49,24 +48,24 @@ declare const updateGuanDate: (requestParams: any, dateKeyParams?: any) => {
     };
     submit: any;
 };
-declare const textIcon: (type: string | number, text?: string) => React.JSX.Element | undefined;
-declare const handleTextDoubleOrId: (textOne: string | undefined, textTwo: string | undefined) => React.JSX.Element;
-declare const handleTextDouble: (textOne: string | undefined, textTwo: string | undefined) => React.JSX.Element;
-declare const handleTextOverflow: (text: string | undefined, width?: number) => React.JSX.Element;
-declare const handleTextLineFeed: (text: string | undefined, width?: number) => React.JSX.Element;
-declare const handleTextTooltip: (text: any) => React.JSX.Element;
-declare const handleTextBreakSpaces: (text: any) => React.JSX.Element;
-declare const handleStatusBadge: (text: any, color: any) => React.JSX.Element;
-declare const HandleTotalCount: (totalParams: any) => React.JSX.Element;
+declare const textIcon: (type: string | number, text?: string) => JSX.Element | undefined;
+declare const handleTextDoubleOrId: (textOne: string | undefined, textTwo: string | undefined) => JSX.Element;
+declare const handleTextDouble: (textOne: string | undefined, textTwo: string | undefined) => JSX.Element;
+declare const handleTextOverflow: (text: string | undefined, width?: number) => JSX.Element;
+declare const handleTextLineFeed: (text: string | undefined, width?: number) => JSX.Element;
+declare const handleTextTooltip: (text: any) => JSX.Element;
+declare const handleTextBreakSpaces: (text: any) => JSX.Element;
+declare const handleStatusBadge: (text: any, color: any) => JSX.Element;
+declare const HandleTotalCount: (totalParams: any) => JSX.Element;
 declare const handleCommonTimeRender: (text: any, format?: any) => any;
-declare const handleTooltip: (text: any, timeTrue?: boolean) => React.JSX.Element;
-declare const handleTooltipHours: (text: any, timeTrue?: boolean) => React.JSX.Element;
+declare const handleTooltip: (text: any, timeTrue?: boolean) => JSX.Element;
+declare const handleTooltipHours: (text: any, timeTrue?: boolean) => JSX.Element;
 type tableColumnsImageType = {
     width?: number | string;
     height?: number | string;
     [key: string]: any;
 };
-declare const tableColumnsImage: (url?: string, paramsObj?: tableColumnsImageType) => React.JSX.Element;
+declare const tableColumnsImage: (url?: string, paramsObj?: tableColumnsImageType) => JSX.Element;
 interface ColumnsEditInterfave {
     text?: string;
     record?: any;
@@ -82,7 +81,7 @@ interface ColumnsEditInterfave {
     };
     [key: string]: any;
 }
-declare const ColumnsEdit: (props: ColumnsEditInterfave) => React.JSX.Element;
+declare const ColumnsEdit: (props: ColumnsEditInterfave) => JSX.Element;
 type UserColumnsType = {
     name: string;
     department?: string;
@@ -90,13 +89,13 @@ type UserColumnsType = {
     company?: string;
     avatar?: string;
 };
-declare const userColumns: (props: UserColumnsType) => React.JSX.Element;
-declare const userInfoCard: (props: any) => React.JSX.Element;
+declare const userColumns: (props: UserColumnsType) => JSX.Element;
+declare const userInfoCard: (props: any) => JSX.Element;
 declare const getItemDefaultWidth: (item: any) => number;
-declare const sulaTableRenderTooltip: ({ text }: any) => React.JSX.Element;
+declare const sulaTableRenderTooltip: ({ text }: any) => JSX.Element;
 declare const renderNumberText: ({ text }: any) => any;
 declare const renderFixed2: (text: any) => any;
-declare const handleTextWarpCustom: (text: any, style?: {}) => React.JSX.Element;
+declare const handleTextWarpCustom: (text: any, style?: {}) => JSX.Element;
 declare const calculateValidPeriod: (start: any, end: any) => string;
-declare const handleTextWarp: (text: any) => React.JSX.Element;
+declare const handleTextWarp: (text: any) => JSX.Element;
 export { getSkuImg, updateGuanDate, textIcon, handleTextDoubleOrId, handleTextDouble, handleTextOverflow, handleTextLineFeed, handleTextTooltip, handleTextBreakSpaces, handleStatusBadge, HandleTotalCount, handleTooltip, handleCommonTimeRender, handleTooltipHours, tableColumnsImage, ColumnsEdit, userColumns, userInfoCard, getItemDefaultWidth, renderNumberText, sulaTableRenderTooltip, renderFixed2, handleTextWarpCustom, handleTextWarp, calculateValidPeriod };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "4.2.0-alpha.6.9",
+  "version": "4.2.1-alpha.1-aiwei",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/components/Business/BsSulaQueryTable/index.tsx

@@ -852,16 +852,16 @@ export default (props: any) => {
   };
 
   useEffect(() => {
-    if (!localStorage.getItem('isTabChange') || state?.updateCurrentPage) {
-      if (pagePath === pathname) {
-        // @ts-ignore
-        config.ref?.current?.tableRef?.current?.refreshTable();
-      }
-    }
-    setTimeout(() => {
-      // 处理页面刷新两面
-      localStorage.removeItem('isTabChange');
-    }, 0);
+    // if (!localStorage.getItem('isTabChange') || state?.updateCurrentPage) {
+    //   if (pagePath === pathname) {
+    //     // @ts-ignore
+    //     config.ref?.current?.tableRef?.current?.refreshTable();
+    //   }
+    // }
+    // setTimeout(() => {
+    //   // 处理页面刷新两面
+    //   localStorage.removeItem('isTabChange');
+    // }, 0);
   }, [pathname]);
 
   const expandedRowKeys = props?.expandable?.expandedRowKeys;
@@ -967,6 +967,7 @@ export default (props: any) => {
       {/* 列设置弹出框表格 */}
       <SortableTable
         ref={sortTableRef}
+        disableColumnFixed={props.tableProps?.isVirtualTable}
         setShowColumns={setResizeShowColumns}
         showColumn={showColumn}
         setInitialTableInfo={setInitialTableInfo}

package/src/components/Business/BsSulaQueryTable/setting.tsx

@@ -288,6 +288,9 @@ class SortableTable extends React.Component {
       title: '列首',
       dataIndex: 'fixedLeft',
       render: (text, record) => {
+        if(this.props.disableColumnFixed) {
+          return null
+        }
         return (
           <span
             onClick={() => {
@@ -375,6 +378,9 @@ class SortableTable extends React.Component {
       title: '列尾',
       dataIndex: 'fixedRight',
       render: (text, record) => {
+        if(this.props.disableColumnFixed) {
+          return null
+        }
         return (
           <span
             onClick={() => {

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

@@ -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,46 @@ 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,
+      visibleFieldsCount: 13,
       tableColumns: [
         {
           title: '序号',
@@ -1220,7 +1363,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       { name: 'qp-realWarehouseType-eq', type: 'select', label: '逻辑仓类型', initialSource: getDictionarySource('SC00004')  },
       { 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 +1382,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,
@@ -2069,7 +2212,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 +2229,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,
@@ -2120,6 +2263,29 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       } ,
       initialSource: getDictionarySource('BUSINESS_StoreType')
     },
+      {
+        name: "qp-brandCode-in",
+        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-manageSupervisor-like', label: '管理督导', type: 'input' },
+      { name: 'qp-directSupervisor-like', label: '直接督导', type: 'input' },
+      { name: 'qp-distributionItem-like', label: '分销商品', type: 'input' },
+      { name: 'qp-headItem-like', label: '总部商品', type: 'input' },
+      { name: 'qp-storeChannelName-like', label: '管理模式', type: 'input' },
     ]
     const queryHeaderParams  = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
     Promise.all([
@@ -2136,12 +2302,18 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       loadSelectSource(`${prefixUrl.formSelectFix}/tagNode/getTree/10`, {
         'qp-status-eq': 1,
       },getQueryHeadersItem(queryHeaderParams,'qp-orgCode-in')),
+      loadSelectSource(`${prefixUrl.formSelectFix}/brand/queryBrandList`, {
+        pageSize: 5000,
+        currentPage: 1,
+        'ctl-withAuth': true,
+      },getQueryHeadersItem(queryHeaderParams,'ctl-withAuth'))
     ]).then((x: any)=>{
       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']);
     })
     modalTableProps = {
       modalTableTitle: '选择商店',
@@ -2203,6 +2375,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
@@ -2389,7 +2597,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           },
         } },
       { name: 'qp-email-like', label: '邮箱' },
-      { name: 'qp-phone-like', label: '手机号' },
+      { name: 'qp-officeTelephone-like', label: '手机号' },
     ]
     const queryHeaderParams  = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
     Promise.all([
@@ -2550,7 +2758,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
         },
         {
           title: '手机号',
-          dataIndex: 'officeTelephone',
+          dataIndex: 'phone',
           defaultSort: 4,
           render: (text: any, record: any) => handleTextOverflow(text||record?.phone),
         },

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) => {

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

@@ -477,9 +477,10 @@ customSort = (a, b) => {
     });
   }
 
-  resetData = () => {
-    const { validDataUrl, validDataParams, updateData, columns, isBrandAuth, isCheckStockNum = true, customerColumnsMapping } = this.props;
-    const resultData = this.getData().filter(d => {
+  resetData = async () => {
+    const { validDataUrl, validDataParams, updateData, columns, isBrandAuth, isCheckStockNum = true, customerColumnsMapping, checkSharedValue, beforeCheckCallback } = this.props;
+   
+    let resultData = this.getData().filter(d => {
       return _.compact(Object.values(d)).length
     })
 
@@ -491,6 +492,24 @@ customSort = (a, b) => {
       otherParams = { brandAuth: 'ctl-withAuth' }
     }
 
+    // 处理校验参数，隐藏校验参数（公用的部分）
+    if(checkSharedValue){
+      resultData = resultData.map(d => {
+        return {
+          ...d,
+          ...checkSharedValue,
+        }
+      })
+    }
+
+    // 调用回调函数
+     if(beforeCheckCallback){
+      resultData = await beforeCheckCallback(resultData);
+      if(!resultData){
+        return;
+      }
+    }
+
     request
       .post(validDataUrl, {
         ...otherParams,

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

@@ -570,6 +570,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

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) => {

package/src/components/Solution/RuleComponent/ruleFiled.js

@@ -1932,7 +1932,7 @@ export default class RuleField extends Component {
         }
       }
       // 配送方式选择器
-      if (dataChoiceBusinessType == 310) {
+      if (dataChoiceBusinessType == 310 || dataChoiceBusinessType == 311) {
         if (INTERVAL_TYPE.indexOf(selectOperation) > -1) {
           return (
             <>
@@ -1952,6 +1952,14 @@ export default class RuleField extends Component {
                 labelInValue={true}
                 value={values[0]}
                 requestConfig={{
+                  ...(dataChoiceBusinessType === 311
+                  ? {
+                      otherParams: {
+                        // 配送方式只选择标准配送方式
+                        'qp-recordChannnelCode-eq': 80,
+                      },
+                    }
+                  : {}),
                   filterInit: 'qp-code-in',
                 }}
                 onChange={(value) => {
@@ -1983,6 +1991,14 @@ export default class RuleField extends Component {
                 labelInValue={true}
                 value={values[1]}
                 requestConfig={{
+                  ...(dataChoiceBusinessType === 311
+                  ? {
+                      otherParams: {
+                        // 配送方式只选择标准配送方式
+                        'qp-recordChannnelCode-eq': 80,
+                      },
+                    }
+                  : {}),
                   filterInit: 'qp-code-in',
                 }}
                 onChange={(value) => {
@@ -2020,6 +2036,14 @@ export default class RuleField extends Component {
               labelInValue={true}
               value={currentValue}
               requestConfig={{
+                ...(dataChoiceBusinessType === 311
+                ? {
+                    otherParams: {
+                      // 配送方式只选择标准配送方式
+                      'qp-recordChannnelCode-eq': 80,
+                    },
+                  }
+                : {}),
                 filterInit: 'qp-code-in',
               }}
               onChange={(value) => {