@bit-sun/business-component 4.2.0-alpha.6.3 → 4.2.0-alpha.6.5

package/dist/index.esm.js

@@ -11109,7 +11109,7 @@ function commonFun(type, prefixUrl, parentProps) {
       options: getQueryHeadersItem(_queryHeaderParams5, 'qp-brandId-in')
     }], ['colorName', 'categoryId', 'classId', 'brandId'], hiddenFields);
     var fieldLoadSource = fieldsRequest.map(function (i) {
-      return loadSelectSource$1(i.url, i.params, options);
+      return loadSelectSource$1(i.url, i.params, i.options);
     });
     requestConfig = _objectSpread2({
       url: "".concat(prefixUrl.selectPrefix, "/skc/skcSelect"),
@@ -11539,6 +11539,28 @@ function commonFun(type, prefixUrl, parentProps) {
           }
         }
       }
+    }, {
+      name: 'qp-channelCode-in',
+      type: 'treeSelect',
+      label: '销售渠道',
+      field: {
+        type: 'treeSelect',
+        props: {
+          multiple: true,
+          treeData: [],
+          treeCheckable: false,
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          },
+          showCheckedStrategy: 'TreeSelect.SHOW_ALL'
+        }
+      }
     }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
       name: 'qp-status-eq',
       type: 'select',
@@ -11551,8 +11573,16 @@ function commonFun(type, prefixUrl, parentProps) {
     });
     Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/groupInfo/listNoPage"), {
       'qp-status-eq': 1
-    }, getQueryHeadersItem(_queryHeaderParams8, 'qp-groupCode-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams8, 'qp-groupCode-in')), loadSelectSource$1("/channel-manage/channelInfo/tree", {
+      'qp-status-eq': 10,
+      'qp-isMain-eq': 1,
+      'qp-type-in': '1,2'
+    }, getQueryHeadersItem(_queryHeaderParams8, 'qp-orgCode-in'))]).then(function (x) {
       formatSource(x, 0, 2, tableSearchForm, ['groupCode', 'groupName']);
+      var channelDisabledJude = function channelDisabledJude(data) {
+        return data['parentCode'] === '0';
+      }; // 所属销售渠道 树节点不能点判断
+      formatTreeDataSource(x, 1, 3, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择运营仓',
@@ -11580,7 +11610,12 @@ function commonFun(type, prefixUrl, parentProps) {
         render: function render(text) {
           return getDictionaryTextByValue$1('SC00001', text);
         }
-      }] : []))
+      }] : []), [{
+        title: '所属销售渠道',
+        dataIndex: 'channelName',
+        defaultSort: 5,
+        width: 100
+      }])
     }, modalTableBusProps);
   }
   // 仓库选择器（虚拟、渠道仓）（无弹窗）
@@ -11856,16 +11891,74 @@ function commonFun(type, prefixUrl, parentProps) {
           }
         }
       }
+    }, {
+      name: 'qp-saleChannel-in',
+      type: 'treeSelect',
+      label: '销售渠道',
+      field: {
+        type: 'treeSelect',
+        props: {
+          multiple: true,
+          treeData: [],
+          treeCheckable: false,
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          },
+          showCheckedStrategy: 'TreeSelect.SHOW_ALL'
+        }
+      }
+    }, {
+      name: 'qp-refCode-in',
+      type: 'treeSelect',
+      label: '营销区域',
+      field: {
+        type: 'treeSelect',
+        props: {
+          multiple: true,
+          treeData: [],
+          treeCheckable: false,
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          },
+          showCheckedStrategy: 'TreeSelect.SHOW_ALL'
+        }
+      }
     }];
     var _queryHeaderParams10 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
-    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/org/listNoPage"), {}, getQueryHeadersItem(_queryHeaderParams10, 'qp-createOrgCode-eq'))]).then(function (x) {
+    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/org/listNoPage"), {}, getQueryHeadersItem(_queryHeaderParams10, 'qp-createOrgCode-eq')), loadSelectSource$1("/channel-manage/channelInfo/tree", {
+      'qp-status-eq': 10,
+      'qp-isMain-eq': 1,
+      'qp-type-in': '1,2'
+    }, getQueryHeadersItem(_queryHeaderParams10, 'qp-orgCode-in')), loadSelectSource$1("/channel-manage/tagNode/getTree/10", {
+      'qp-status-eq': 1
+    }, getQueryHeadersItem(_queryHeaderParams10, 'qp-orgCode-in'))]).then(function (x) {
       var firstElement = x === null || x === void 0 ? void 0 : x[0];
       var allList = firstElement && [firstElement, firstElement];
       formatSource(allList, 0, 2, tableSearchForm);
       formatSource(allList, 1, 3, tableSearchForm);
+      var channelDisabledJude = function channelDisabledJude(data) {
+        return data['parentCode'] === '0';
+      }; // 所属销售渠道 树节点不能点判断
+      var areaDisabledJude = function areaDisabledJude(data) {
+        return data['parent'] === '0';
+      }; // 所属营销区域 树节点不能点判断
+      formatTreeDataSource(x, 1, 4, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
+      formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude);
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择客户',
@@ -11889,7 +11982,18 @@ function commonFun(type, prefixUrl, parentProps) {
       }, {
         title: '使用组织',
         dataIndex: 'salesOrgName',
-        defaultSort: 4
+        defaultSort: 4,
+        width: 100
+      }, {
+        title: '所属销售渠道',
+        dataIndex: 'channelName',
+        defaultSort: 5,
+        width: 100
+      }, {
+        title: '营销区域',
+        dataIndex: 'commonRelationAreaName',
+        defaultSort: 6,
+        width: 100
       }]
     }, modalTableBusProps);
   }
@@ -11917,12 +12021,17 @@ function commonFun(type, prefixUrl, parentProps) {
       sourceName: 'code'
     }, requestConfigProp);
     tableSearchForm = [{
-      name: 'qp-name-like',
-      label: '店铺名称'
-    }, {
-      name: 'qp-code-like',
-      label: '店铺编码'
+      name: 'name*multiInput',
+      label: '店铺名称',
+      type: 'multipleQueryInput'
     }, {
+      name: 'code*multiInput',
+      label: '店铺编码',
+      type: 'multipleQueryInput'
+    },
+    // { name: 'qp-name-like', label: '店铺名称' },
+    // { name: 'qp-code-like', label: '店铺编码' },
+    {
       name: 'qp-conglomerateCode-in',
       type: 'select',
       label: '归属集团',
@@ -38485,7 +38594,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           display: 'flex',
           marginBottom: '0px',
           padding: '10px 0px'
-        }
+        },
+        key: itemDetail.elementId
       }, /*#__PURE__*/React$1.createElement("div", {
         className: 'logical_operate_content',
         style: {

package/dist/index.js

@@ -11132,7 +11132,7 @@ function commonFun(type, prefixUrl, parentProps) {
       options: getQueryHeadersItem(_queryHeaderParams5, 'qp-brandId-in')
     }], ['colorName', 'categoryId', 'classId', 'brandId'], hiddenFields);
     var fieldLoadSource = fieldsRequest.map(function (i) {
-      return loadSelectSource$1(i.url, i.params, options);
+      return loadSelectSource$1(i.url, i.params, i.options);
     });
     requestConfig = _objectSpread2({
       url: "".concat(prefixUrl.selectPrefix, "/skc/skcSelect"),
@@ -11562,6 +11562,28 @@ function commonFun(type, prefixUrl, parentProps) {
           }
         }
       }
+    }, {
+      name: 'qp-channelCode-in',
+      type: 'treeSelect',
+      label: '销售渠道',
+      field: {
+        type: 'treeSelect',
+        props: {
+          multiple: true,
+          treeData: [],
+          treeCheckable: false,
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          },
+          showCheckedStrategy: 'TreeSelect.SHOW_ALL'
+        }
+      }
     }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
       name: 'qp-status-eq',
       type: 'select',
@@ -11574,8 +11596,16 @@ function commonFun(type, prefixUrl, parentProps) {
     });
     Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/groupInfo/listNoPage"), {
       'qp-status-eq': 1
-    }, getQueryHeadersItem(_queryHeaderParams8, 'qp-groupCode-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams8, 'qp-groupCode-in')), loadSelectSource$1("/channel-manage/channelInfo/tree", {
+      'qp-status-eq': 10,
+      'qp-isMain-eq': 1,
+      'qp-type-in': '1,2'
+    }, getQueryHeadersItem(_queryHeaderParams8, 'qp-orgCode-in'))]).then(function (x) {
       formatSource(x, 0, 2, tableSearchForm, ['groupCode', 'groupName']);
+      var channelDisabledJude = function channelDisabledJude(data) {
+        return data['parentCode'] === '0';
+      }; // 所属销售渠道 树节点不能点判断
+      formatTreeDataSource(x, 1, 3, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择运营仓',
@@ -11603,7 +11633,12 @@ function commonFun(type, prefixUrl, parentProps) {
         render: function render(text) {
           return getDictionaryTextByValue$1('SC00001', text);
         }
-      }] : []))
+      }] : []), [{
+        title: '所属销售渠道',
+        dataIndex: 'channelName',
+        defaultSort: 5,
+        width: 100
+      }])
     }, modalTableBusProps);
   }
   // 仓库选择器（虚拟、渠道仓）（无弹窗）
@@ -11879,16 +11914,74 @@ function commonFun(type, prefixUrl, parentProps) {
           }
         }
       }
+    }, {
+      name: 'qp-saleChannel-in',
+      type: 'treeSelect',
+      label: '销售渠道',
+      field: {
+        type: 'treeSelect',
+        props: {
+          multiple: true,
+          treeData: [],
+          treeCheckable: false,
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          },
+          showCheckedStrategy: 'TreeSelect.SHOW_ALL'
+        }
+      }
+    }, {
+      name: 'qp-refCode-in',
+      type: 'treeSelect',
+      label: '营销区域',
+      field: {
+        type: 'treeSelect',
+        props: {
+          multiple: true,
+          treeData: [],
+          treeCheckable: false,
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          },
+          showCheckedStrategy: 'TreeSelect.SHOW_ALL'
+        }
+      }
     }];
     var _queryHeaderParams10 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
-    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/org/listNoPage"), {}, getQueryHeadersItem(_queryHeaderParams10, 'qp-createOrgCode-eq'))]).then(function (x) {
+    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/org/listNoPage"), {}, getQueryHeadersItem(_queryHeaderParams10, 'qp-createOrgCode-eq')), loadSelectSource$1("/channel-manage/channelInfo/tree", {
+      'qp-status-eq': 10,
+      'qp-isMain-eq': 1,
+      'qp-type-in': '1,2'
+    }, getQueryHeadersItem(_queryHeaderParams10, 'qp-orgCode-in')), loadSelectSource$1("/channel-manage/tagNode/getTree/10", {
+      'qp-status-eq': 1
+    }, getQueryHeadersItem(_queryHeaderParams10, 'qp-orgCode-in'))]).then(function (x) {
       var firstElement = x === null || x === void 0 ? void 0 : x[0];
       var allList = firstElement && [firstElement, firstElement];
       formatSource(allList, 0, 2, tableSearchForm);
       formatSource(allList, 1, 3, tableSearchForm);
+      var channelDisabledJude = function channelDisabledJude(data) {
+        return data['parentCode'] === '0';
+      }; // 所属销售渠道 树节点不能点判断
+      var areaDisabledJude = function areaDisabledJude(data) {
+        return data['parent'] === '0';
+      }; // 所属营销区域 树节点不能点判断
+      formatTreeDataSource(x, 1, 4, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
+      formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude);
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择客户',
@@ -11912,7 +12005,18 @@ function commonFun(type, prefixUrl, parentProps) {
       }, {
         title: '使用组织',
         dataIndex: 'salesOrgName',
-        defaultSort: 4
+        defaultSort: 4,
+        width: 100
+      }, {
+        title: '所属销售渠道',
+        dataIndex: 'channelName',
+        defaultSort: 5,
+        width: 100
+      }, {
+        title: '营销区域',
+        dataIndex: 'commonRelationAreaName',
+        defaultSort: 6,
+        width: 100
       }]
     }, modalTableBusProps);
   }
@@ -11940,12 +12044,17 @@ function commonFun(type, prefixUrl, parentProps) {
       sourceName: 'code'
     }, requestConfigProp);
     tableSearchForm = [{
-      name: 'qp-name-like',
-      label: '店铺名称'
-    }, {
-      name: 'qp-code-like',
-      label: '店铺编码'
+      name: 'name*multiInput',
+      label: '店铺名称',
+      type: 'multipleQueryInput'
     }, {
+      name: 'code*multiInput',
+      label: '店铺编码',
+      type: 'multipleQueryInput'
+    },
+    // { name: 'qp-name-like', label: '店铺名称' },
+    // { name: 'qp-code-like', label: '店铺编码' },
+    {
       name: 'qp-conglomerateCode-in',
       type: 'select',
       label: '归属集团',
@@ -38508,7 +38617,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           display: 'flex',
           marginBottom: '0px',
           padding: '10px 0px'
-        }
+        },
+        key: itemDetail.elementId
       }, /*#__PURE__*/React__default['default'].createElement("div", {
         className: 'logical_operate_content',
         style: {

package/package.json

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

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

@@ -13,7 +13,7 @@ const sharingTypeDataList = hasDictSharingType && getDictionarySource('UC000013'
 
 export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
   const { requestConfig:requestConfigProp={},  selectProps:selectConfigProps={}, modalTableProps:modalTableBusProps={}, hiddenFields=[]} = parentProps || {};
-  
+
   // 默认type === 'supplier' 供应商选择器
   let requestConfig = {
     init: true,
@@ -56,11 +56,11 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
     };
   };
   const formatTreeDataSource = (
-    reData: any, 
-    position: number, 
+    reData: any,
+    position: number,
     changePosition: number,
     changeSearchForm: any,
-    resKeyValue=['id', 'name'], 
+    resKeyValue=['id', 'name'],
     childrenKey = 'children',
     nodeDisabledJudge?: (data: any) => boolean, // 树节点能不能选 函数判断
   ) => {
@@ -344,7 +344,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
     }
     tableSearchForm =  [
       { name: 'qp-skuCode-in', label: 'SKU编码', field: {
-        type:'multipleQuerySearchSelect', 
+        type:'multipleQuerySearchSelect',
         props: {
           selectProps: {
             mode: "multiple",
@@ -366,7 +366,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       } },
       { name: 'qp-skuName-like', label: 'SKU名称' },
       { name: 'qp-itemCode-in', label: 'SPU编码', field: {
-        type:'multipleQuerySearchSelect', 
+        type:'multipleQuerySearchSelect',
         props: {
           selectProps: {
             placeholder: '请输入SPU编码查询'
@@ -733,9 +733,9 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
               option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
           },
         } },
-        { 
-          name: 'qp-year-in', 
-          label: '年份', 
+        {
+          name: 'qp-year-in',
+          label: '年份',
           field: {
             type: 'itemPropertySelector',
             props: {
@@ -744,9 +744,9 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
             }
           }
         },
-        { 
-          name: 'qp-season-in', 
-          label: '季节', 
+        {
+          name: 'qp-season-in',
+          label: '季节',
           field: {
             type: 'itemPropertySelector',
             props: {
@@ -755,9 +755,9 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
             }
           }
         },
-        { 
-          name: 'qp-zzdlbm-in', 
-          label: '大类', 
+        {
+          name: 'qp-zzdlbm-in',
+          label: '大类',
           field: {
             type: 'itemPropertySelector',
             props: {
@@ -766,9 +766,9 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
             }
           }
         },
-        { 
-          name: 'qp-zzzlbm-in', 
-          label: '中类', 
+        {
+          name: 'qp-zzzlbm-in',
+          label: '中类',
           field: {
             type: 'itemPropertySelector',
             props: {
@@ -777,9 +777,9 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
             }
           }
         },
-        { 
-          name: 'qp-zzxlbm-in', 
-          label: '小类', 
+        {
+          name: 'qp-zzxlbm-in',
+          label: '小类',
           field: {
             type: 'itemPropertySelector',
             props: {
@@ -970,7 +970,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ['colorName', 'categoryId', 'classId', 'brandId'],
       hiddenFields,
     );
-    const fieldLoadSource = fieldsRequest.map((i: any) => loadSelectSource(i.url, i.params,options));
+    const fieldLoadSource = fieldsRequest.map((i: any) => loadSelectSource(i.url, i.params,i.options));
     requestConfig = {
       url: `${prefixUrl.selectPrefix}/skc/skcSelect`,
       filter: 'qp-code,name-orGroup,like', // 过滤参数
@@ -1379,13 +1379,39 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
               option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
           },
         } },
-      ...(modalTableBusProps?.needStatusSearch?[{ name: 'qp-status-eq', type: 'select', label: '运营仓状态', initialSource: getDictionarySource('SC00001')  }]:[])
+        {
+        name: 'qp-channelCode-in', type: 'treeSelect', label: '销售渠道', field: {
+          type: 'treeSelect',
+          props: {
+            multiple: true,
+            treeData: [],
+            treeCheckable: false,
+            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,
+            showCheckedStrategy: 'TreeSelect.SHOW_ALL',
+          },
+        }
+      },
+      ...(modalTableBusProps?.needStatusSearch?[{ name: 'qp-status-eq', type: 'select', label: '运营仓状态', initialSource: getDictionarySource('SC00001')  }]:[]),
     ]
     const queryHeaderParams  = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
     Promise.all([
       loadSelectSource(`${prefixUrl.formSelectFix}/groupInfo/listNoPage`, { 'qp-status-eq': 1 },getQueryHeadersItem(queryHeaderParams,'qp-groupCode-in')),
+      loadSelectSource(`/channel-manage/channelInfo/tree`, {
+        'qp-status-eq': 10,
+        'qp-isMain-eq': 1,
+        'qp-type-in': '1,2',
+      },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)
     })
     modalTableProps = {
       modalTableTitle: '选择运营仓',
@@ -1417,6 +1443,12 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           defaultSort: 4,
           render: (text: number) => getDictionaryTextByValue('SC00001', text),
         }]:[]),
+         {
+          title: '所属销售渠道',
+          dataIndex: 'channelName',
+          defaultSort: 5,
+          width: 100,
+        },
       ],
       ...modalTableBusProps,
     }
@@ -1690,15 +1722,66 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
               option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
           },
         } },
-    ]
+        {
+        name: 'qp-saleChannel-in', type: 'treeSelect', label: '销售渠道', field: {
+          type: 'treeSelect',
+          props: {
+            multiple: true,
+            treeData: [],
+            treeCheckable: false,
+            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,
+            showCheckedStrategy: 'TreeSelect.SHOW_ALL',
+          },
+        }
+      },
+      {
+        name: 'qp-refCode-in', type: 'treeSelect', label: '营销区域', field: {
+          type: 'treeSelect',
+          props: {
+            multiple: true,
+            treeData: [],
+            treeCheckable: false,
+            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,
+
+            showCheckedStrategy: 'TreeSelect.SHOW_ALL',
+          },
+        }
+      },
+    ];
     const queryHeaderParams  = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
     Promise.all([
       loadSelectSource(`${prefixUrl.formSelectFix}/org/listNoPage`, {},getQueryHeadersItem(queryHeaderParams,'qp-createOrgCode-eq')),
+      loadSelectSource(`/channel-manage/channelInfo/tree`, {
+        'qp-status-eq': 10,
+        'qp-isMain-eq': 1,
+        'qp-type-in': '1,2',
+      },getQueryHeadersItem(queryHeaderParams,'qp-orgCode-in')),
+      loadSelectSource(`/channel-manage/tagNode/getTree/10`, {
+        'qp-status-eq': 1,
+      },getQueryHeadersItem(queryHeaderParams,'qp-orgCode-in')),
     ]).then((x: any)=>{
       const firstElement = x?.[0];
       const allList = firstElement && [firstElement, firstElement];
       formatSource(allList,0, 2, tableSearchForm);
       formatSource(allList,1, 3, tableSearchForm);
+      const channelDisabledJude = (data: any) => data['parentCode'] === '0'; // 所属销售渠道 树节点不能点判断
+      const areaDisabledJude = (data: any) => data['parent'] === '0'; // 所属营销区域 树节点不能点判断
+      formatTreeDataSource(x, 1, 4, tableSearchForm, ['code','name'], 'channelInfoSon', channelDisabledJude)
+      formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude)
     })
     modalTableProps = {
       modalTableTitle: '选择客户',
@@ -1728,6 +1811,19 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           title: '使用组织',
           dataIndex: 'salesOrgName',
           defaultSort: 4,
+          width: 100,
+        },
+         {
+          title: '所属销售渠道',
+          dataIndex: 'channelName',
+          defaultSort: 5,
+          width: 100,
+        },
+        {
+          title: '营销区域',
+          dataIndex: 'commonRelationAreaName',
+          defaultSort: 6,
+          width: 100,
         },
       ],
       ...modalTableBusProps
@@ -1764,8 +1860,10 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ...requestConfigProp,
     }
     tableSearchForm = [
-      { name: 'qp-name-like', label: '店铺名称' },
-      { name: 'qp-code-like', label: '店铺编码' },
+      { name: 'name*multiInput', label: '店铺名称', type: 'multipleQueryInput' },
+      { name: 'code*multiInput', label: '店铺编码', type: 'multipleQueryInput' },
+      // { name: 'qp-name-like', label: '店铺名称' },
+      // { name: 'qp-code-like', label: '店铺编码' },
       { name: 'qp-conglomerateCode-in', type: 'select', label: '归属集团', field: {
           type: 'select',
           props: {
@@ -1995,7 +2093,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           optionFilterProp: 'children',
           filterOption: (input: string, option: { props: { children: string } }) =>
             option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
-        
+
           showCheckedStrategy: 'TreeSelect.SHOW_ALL',
         },
       } },
@@ -2013,7 +2111,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
             option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
         },
       } ,
-      initialSource: getDictionarySource('BUSINESS_StoreType') 
+      initialSource: getDictionarySource('BUSINESS_StoreType')
     },
     ]
     const queryHeaderParams  = getQueryHeadersList({ querySelectHeadersList, extralHeaders});

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

@@ -1,3 +1,4 @@
+// @ts-nocheck
 import React, { useState } from 'react';
 import { Table, Tooltip, Typography } from 'antd';
 import { Resizable } from 'react-resizable';
@@ -81,9 +82,9 @@ export default class ColumnSettingTable extends React.Component {
 
   /**
      * 新增函数，用于根据传入的小数位数进行四舍五入
-     * @param number 
-     * @param decimalPlaces 
-     * @returns 
+     * @param number
+     * @param decimalPlaces
+     * @returns
      */
   roundToDecimalPlaces = (number: any, decimalPlaces: number) => {
     const factor = Math.pow(10, (decimalPlaces || 2));
@@ -92,7 +93,7 @@ export default class ColumnSettingTable extends React.Component {
 
   /**
    * 合计行逻辑
-   * @returns 
+   * @returns
    */
   getTableSummaryInfo = () => {
     const { summary = undefined, rowSelection, expandable, modeType, dataSource, isSpecial = false, }: any = this.props;
@@ -232,7 +233,7 @@ export default class ColumnSettingTable extends React.Component {
 
   /**
    * 处理行点击事件
-   * @param record 
+   * @param record
    */
   handleRowClick = (record: any) => {
     const { selectedRowKeys, selectedRows, } = this.state;
@@ -316,7 +317,7 @@ export default class ColumnSettingTable extends React.Component {
         ...propRowSelection,
         selectedRowKeys: this.state.selectedRowKeys,
         onChange: (selectedRowKeys: any, selectedRows: any) => {
-            this.setState({ 
+            this.setState({
                 selectedRowKeys,
                 selectedRows
             });

package/src/components/Business/columnSettingTable/sulaSettingTable.tsx

@@ -1,3 +1,4 @@
+// @ts-nocheck
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { Table as SulaTable, request } from 'bssula';
 import { Resizable } from 'react-resizable';
@@ -22,7 +23,7 @@ export default class ColumnSettingSulaTable extends React.Component {
       showColumns: [],
       selectedRowKeys: [], // 新增状态，用于跟踪选中的行的键
       selectedRows: [],
-      showSummary: null 
+      showSummary: null
     }
     this.sulaTableRef = React.createRef<any>();
   }
@@ -79,9 +80,9 @@ export default class ColumnSettingSulaTable extends React.Component {
 
   /**
    * 新增函数，用于根据传入的小数位数进行四舍五入
-   * @param number 
-   * @param decimalPlaces 
-   * @returns 
+   * @param number
+   * @param decimalPlaces
+   * @returns
    */
   roundToDecimalPlaces = (number: any, decimalPlaces: number) => {
     const factor = Math.pow(10, (decimalPlaces || 2));
@@ -90,7 +91,7 @@ export default class ColumnSettingSulaTable extends React.Component {
 
   /**
    * 合计行逻辑
-   * @returns 
+   * @returns
    */
   getTableSummaryInfo = () => {
     const { summary = undefined, rowSelection, expandable, isSpecial = false, modeType }: any = this.props;
@@ -167,10 +168,10 @@ export default class ColumnSettingSulaTable extends React.Component {
         </Table.Summary.Row>
       </Table.Summary>
     );
-    
+
     return () => summaryDom;
-  }; 
-  
+  };
+
   handledynamicColumns = (col: any[]) => {
     let { dynamicColumns, modeType }: any = this.props;
     col = col.map((item: any) => {
@@ -205,7 +206,7 @@ export default class ColumnSettingSulaTable extends React.Component {
 
   ResizeableTitle = (props: any) => {
     const { onResize, width, ...restProps } = props;
-    
+
     const [innerWidth, setInnerWidth] = useState(width);
     const [isResizing, setIsResizing] = useState(false); // 标记是否正在拖拽
     const [isDragging, setIsDragging] = useState(false); // 标记拖拽句柄是否被拖拽
@@ -213,9 +214,9 @@ export default class ColumnSettingSulaTable extends React.Component {
     const markerPosition = useRef({ left: 0, top: 0 });
     const currentStart = useRef(0);
     const uuidref = useRef(uuid());
-    
+
     const prevWidthRef = useRef(width);
-  
+
     const handleMouseDown = (e: any) => {
       currentStart.current = e.clientX;
       markerPosition.current = { left: e.clientX, top: e.clientY }
@@ -223,35 +224,35 @@ export default class ColumnSettingSulaTable extends React.Component {
       document.addEventListener('mousemove', handleMouseMove);
       document.addEventListener('mouseup', handleMouseUp);
     };
-  
+
     const handleMouseMove = (e: any) => {
       e.stopPropagation();
       e.preventDefault();
       // 更新标记位置
       markerPosition.current = { left: e.clientX, top: e.clientY }
       const dom: HTMLElement | null =  document.getElementById('text1');
-  
+
       if (dom && dom.style) {
         dom.style.left = `${e.clientX}px`;
         dom.style.top = `${e.clientY - 20}px`;
       }
     };
-  
+
     const handleMouseUp = (e: any) => {
       document.removeEventListener('mousemove', handleMouseMove);
       document.removeEventListener('mouseup', handleMouseUp);
       setIsResizing(false);
     };
-    
+
     const handleresize = (e: any, data: any, title: string) => {
       const newWidth = data?.size?.width || 0;
       setInnerWidth(newWidth); // 更新内部分宽度
     };
-  
+
     const handleResizeStart = () => {
       setIsResizing(true);
     };
-  
+
     const handleResizeStop = (e: any, data: any) => {
       setIsResizing(false);
       if (onResize) {
@@ -265,11 +266,11 @@ export default class ColumnSettingSulaTable extends React.Component {
         setInnerWidth(width);
       }
     }, [width]);
-  
+
     const thStyle = {
       boxShadow: isResizing ? '2px 2px 10px rgba(0, 0, 0, 0.3)' : 'none',
     };
-  
+
     return (
       <Resizable
         width={innerWidth}
@@ -333,7 +334,7 @@ export default class ColumnSettingSulaTable extends React.Component {
 
   /**
    * 处理行点击事件
-   * @param record 
+   * @param record
    */
   handleRowClick = (record: any) => {
     const { selectedRowKeys, selectedRows, } = this.state;
@@ -420,7 +421,7 @@ export default class ColumnSettingSulaTable extends React.Component {
         ...propRowSelection,
         selectedRowKeys: this.state.selectedRowKeys,
         onChange: (selectedRowKeys: any, selectedRows: any) => {
-            this.setState({ 
+            this.setState({
                 selectedRowKeys,
                 selectedRows
             });
@@ -436,7 +437,7 @@ export default class ColumnSettingSulaTable extends React.Component {
         };
       },
     }
-    
+
     return (
       <div style={{ position: 'relative' }}>
         <span style={{ position: 'absolute', zIndex: '10', right: '8px', top: '10px' }} className="ant-dropdown-link">

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

@@ -748,6 +748,7 @@ class RuleObjectComponent extends Component {
       <div
         className={'rule_line_content'}
         style={{ display: 'flex', marginBottom: '0px', padding: '10px 0px' }}
+        key={itemDetail.elementId}
       >
         <div
           className={'logical_operate_content'}