@bit-sun/business-component 4.2.0-alpha.6 → 4.2.0-alpha.6.2

package/dist/index.esm.js

@@ -11174,6 +11174,26 @@ function commonFun(type, prefixUrl, parentProps) {
       }, (requestConfigProp === null || requestConfigProp === void 0 ? void 0 : requestConfigProp.addOtherParams) || {}),
       sourceName: 'warehouseIds'
     }, requestConfigProp);
+    var _queryHeaderParams7 = getQueryHeadersList({
+      querySelectHeadersList: querySelectHeadersList,
+      extralHeaders: extralHeaders
+    });
+    Promise.all([loadSelectSource$1("/channel-manage/channelInfo/tree", {
+      'qp-status-eq': 10,
+      'qp-isMain-eq': 1,
+      'qp-type-in': '1,2'
+    }, getQueryHeadersItem(_queryHeaderParams7, 'qp-orgCode-in')), loadSelectSource$1("/channel-manage/tagNode/getTree/10", {
+      'qp-status-eq': 1
+    }, getQueryHeadersItem(_queryHeaderParams7, 'qp-orgCode-in'))]).then(function (x) {
+      var channelDisabledJude = function channelDisabledJude(data) {
+        return data['parentCode'] === '0';
+      }; // 所属销售渠道 树节点不能点判断
+      var areaDisabledJude = function areaDisabledJude(data) {
+        return data['parent'] === '0';
+      }; // 所属营销区域 树节点不能点判断
+      formatTreeDataSource(x, 0, 4, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
+      formatTreeDataSource(x, 1, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude);
+    });
     tableSearchForm = [{
       name: 'realWarehouseName*multiInput',
       label: '逻辑仓名称',
@@ -11197,6 +11217,70 @@ function commonFun(type, prefixUrl, parentProps) {
       },
       label: '管理大区',
       initialSource: getDictionarySource$1('BUSINESS_belongArea')
+    }, {
+      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'
+        }
+      }
+    }, {
+      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'
+        }
+      }
+    }, {
+      name: 'qp-type-in',
+      type: 'select',
+      label: '店铺性质',
+      field: {
+        type: 'select',
+        props: {
+          mode: 'multiple',
+          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;
+          }
+        }
+      },
+      initialSource: getDictionarySource$1('BUSINESS_StoreType')
     }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
       name: 'qp-isEnable-eq',
       type: 'select',
@@ -11225,10 +11309,28 @@ function commonFun(type, prefixUrl, parentProps) {
         render: function render(text) {
           return getDictionaryTextByValue$1('SC00004', text);
         }
+      }, {
+        title: '所属销售渠道',
+        dataIndex: 'channelName',
+        defaultSort: 4,
+        width: 100
+      }, {
+        title: '营销区域',
+        dataIndex: 'commonRelationAreaName',
+        defaultSort: 5,
+        width: 100
+      }, {
+        title: '店铺性质',
+        dataIndex: 'type',
+        defaultSort: 6,
+        render: function render(text) {
+          return getDictionaryTextByValue$1('BUSINESS_StoreType', text);
+        },
+        width: 80
       }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
         title: '状态',
         dataIndex: 'isEnable',
-        defaultSort: 4,
+        defaultSort: 7,
         render: function render(text) {
           return getDictionaryTextByValue$1('SC00001', text);
         }
@@ -11294,13 +11396,13 @@ function commonFun(type, prefixUrl, parentProps) {
       label: '运营仓状态',
       initialSource: getDictionarySource$1('SC00001')
     }] : []));
-    var _queryHeaderParams7 = getQueryHeadersList({
+    var _queryHeaderParams8 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
     Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/groupInfo/listNoPage"), {
       'qp-status-eq': 1
-    }, getQueryHeadersItem(_queryHeaderParams7, 'qp-groupCode-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams8, 'qp-groupCode-in'))]).then(function (x) {
       formatSource(x, 0, 2, tableSearchForm, ['groupCode', 'groupName']);
     });
     modalTableProps = _objectSpread2({
@@ -11478,7 +11580,7 @@ function commonFun(type, prefixUrl, parentProps) {
       label: '共享类型',
       initialSource: sharingTypeDataList
     }];
-    var _queryHeaderParams8 = getQueryHeadersList({
+    var _queryHeaderParams9 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
@@ -11486,14 +11588,14 @@ function commonFun(type, prefixUrl, parentProps) {
       pageSize: 5000,
       currentPage: 1,
       'qp-companyType-eq': '30'
-    }, getQueryHeadersItem(_queryHeaderParams8, 'qp-conglomerateCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/accountingSubject"), {
+    }, getQueryHeadersItem(_queryHeaderParams9, 'qp-conglomerateCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/accountingSubject"), {
       pageSize: 5000,
       currentPage: 1
-    }, getQueryHeadersItem(_queryHeaderParams8, 'qp-accountingCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/company"), {
+    }, getQueryHeadersItem(_queryHeaderParams9, 'qp-accountingCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/company"), {
       pageSize: 5000,
       currentPage: 1,
       'qp-companyType-eq': '20'
-    }, getQueryHeadersItem(_queryHeaderParams8, 'qp-sharingType-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams9, 'qp-sharingType-in'))]).then(function (x) {
       formatSource(x, 0, 2, tableSearchForm);
       formatSource(x, 1, 3, tableSearchForm);
       formatSource(x, 2, 4, tableSearchForm);
@@ -11606,11 +11708,11 @@ function commonFun(type, prefixUrl, parentProps) {
         }
       }
     }];
-    var _queryHeaderParams9 = getQueryHeadersList({
+    var _queryHeaderParams10 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
-    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/org/listNoPage"), {}, getQueryHeadersItem(_queryHeaderParams9, 'qp-createOrgCode-eq'))]).then(function (x) {
+    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/org/listNoPage"), {}, getQueryHeadersItem(_queryHeaderParams10, 'qp-createOrgCode-eq'))]).then(function (x) {
       var firstElement = x === null || x === void 0 ? void 0 : x[0];
       var allList = firstElement && [firstElement, firstElement];
       formatSource(allList, 0, 2, tableSearchForm);
@@ -11772,7 +11874,7 @@ function commonFun(type, prefixUrl, parentProps) {
         }
       }
     }];
-    var _queryHeaderParams10 = getQueryHeadersList({
+    var _queryHeaderParams11 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
@@ -11780,21 +11882,21 @@ function commonFun(type, prefixUrl, parentProps) {
       pageSize: 5000,
       currentPage: 1,
       'qp-companyType-eq': '30'
-    }, getQueryHeadersItem(_queryHeaderParams10, 'qp-conglomerateCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/company"), {
+    }, getQueryHeadersItem(_queryHeaderParams11, 'qp-conglomerateCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/company"), {
       pageSize: 5000,
       currentPage: 1,
       'qp-companyType-eq': '20'
-    }, getQueryHeadersItem(_queryHeaderParams10, 'qp-companyCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/platformRecord/getPlatformRecordList"), {
+    }, getQueryHeadersItem(_queryHeaderParams11, 'qp-companyCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/platformRecord/getPlatformRecordList"), {
       // pageSize: 5000,
       // currentPage: 1,
       'qp-status-eq': '1'
-    }, getQueryHeadersItem(_queryHeaderParams10, 'qp-plateformCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/store"), {
+    }, getQueryHeadersItem(_queryHeaderParams11, 'qp-plateformCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/store"), {
       pageSize: 5000,
       currentPage: 1
-    }, getQueryHeadersItem(_queryHeaderParams10, 'qp-mainBrandCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/accountingSubject"), {
+    }, getQueryHeadersItem(_queryHeaderParams11, 'qp-mainBrandCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/accountingSubject"), {
       pageSize: 5000,
       currentPage: 1
-    }, getQueryHeadersItem(_queryHeaderParams10, 'qp-accountingCode-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams11, 'qp-accountingCode-in'))]).then(function (x) {
       formatSource(x, 0, 2, tableSearchForm);
       formatSource(x, 1, 3, tableSearchForm);
       formatSource(x, 2, 5, tableSearchForm);
@@ -11964,7 +12066,7 @@ function commonFun(type, prefixUrl, parentProps) {
       },
       initialSource: getDictionarySource$1('BUSINESS_StoreType')
     }];
-    var _queryHeaderParams11 = getQueryHeadersList({
+    var _queryHeaderParams12 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
@@ -11972,13 +12074,13 @@ function commonFun(type, prefixUrl, parentProps) {
       'qp-employeeCode-eq': getEmployeeCode(),
       'qp-realOrg-eq': true,
       'qp-status-eq': 10
-    }, getQueryHeadersItem(_queryHeaderParams11, 'qp-orgCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/channelInfo/tree"), {
+    }, getQueryHeadersItem(_queryHeaderParams12, 'qp-orgCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/channelInfo/tree"), {
       'qp-status-eq': 10,
       'qp-isMain-eq': 1,
       'qp-type-in': '1,2'
-    }, getQueryHeadersItem(_queryHeaderParams11, 'qp-orgCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/tagNode/getTree/10"), {
+    }, getQueryHeadersItem(_queryHeaderParams12, 'qp-orgCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/tagNode/getTree/10"), {
       'qp-status-eq': 1
-    }, getQueryHeadersItem(_queryHeaderParams11, 'qp-orgCode-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams12, 'qp-orgCode-in'))]).then(function (x) {
       var channelDisabledJude = function channelDisabledJude(data) {
         return data['parentCode'] === '0';
       }; // 所属销售渠道 树节点不能点判断
@@ -12216,7 +12318,7 @@ function commonFun(type, prefixUrl, parentProps) {
       name: 'qp-officeTelephone-like',
       label: '手机号'
     }];
-    var _queryHeaderParams12 = getQueryHeadersList({
+    var _queryHeaderParams13 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
@@ -12224,7 +12326,7 @@ function commonFun(type, prefixUrl, parentProps) {
       pageSize: 5000,
       currentPage: 1,
       'qp-companyType-eq': 20
-    }, getQueryHeadersItem(_queryHeaderParams12, 'qp-companyCode-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams13, 'qp-companyCode-in'))]).then(function (x) {
       formatSource(x, 0, 2, tableSearchForm);
     });
     modalTableProps = _objectSpread2({
@@ -12333,13 +12435,13 @@ function commonFun(type, prefixUrl, parentProps) {
       name: 'qp-officeTelephone-like',
       label: '手机号'
     }]);
-    var _queryHeaderParams13 = getQueryHeadersList({
+    var _queryHeaderParams14 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
     Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/orgViewNode/common/getTreeForOrgViewAndTenant"), {
       'orgViewCode': 'administrative-organization-view'
-    }, getQueryHeadersItem(_queryHeaderParams13, 'qp-code-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams14, 'qp-code-in'))]).then(function (x) {
       formatTreeDataSource(x, 0, 2, tableSearchForm, ['code', 'name']);
     });
     modalTableProps = _objectSpread2({
@@ -12486,17 +12588,17 @@ function commonFun(type, prefixUrl, parentProps) {
       name: 'qp-remark-like',
       label: '备注'
     }];
-    var _queryHeaderParams14 = getQueryHeadersList({
+    var _queryHeaderParams15 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
     Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/logisCompany"), {
       pageSize: 5000,
       currentPage: 1
-    }, getQueryHeadersItem(_queryHeaderParams14, logisCompanyCodeSingleSearchName)), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/printTemplate"), {
+    }, getQueryHeadersItem(_queryHeaderParams15, logisCompanyCodeSingleSearchName)), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/printTemplate"), {
       pageSize: 5000,
       currentPage: 1
-    }, getQueryHeadersItem(_queryHeaderParams14, 'qp-sheetTemplateCode-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams15, 'qp-sheetTemplateCode-in'))]).then(function (x) {
       formatSource(x, 0, 2, tableSearchForm);
       formatSource(x, 1, 5, tableSearchForm);
     });
@@ -12666,14 +12768,14 @@ function commonFun(type, prefixUrl, parentProps) {
         }
       }
     }];
-    var _queryHeaderParams15 = getQueryHeadersList({
+    var _queryHeaderParams16 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
     Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/permissionCategory"), {
       pageSize: 5000,
       currentPage: 1
-    }, getQueryHeadersItem(_queryHeaderParams15, 'qp-categoryCode-eq'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams16, 'qp-categoryCode-eq'))]).then(function (x) {
       formatSource(x, 0, 2, tableSearchForm);
     });
     modalTableProps = _objectSpread2({
@@ -12770,7 +12872,7 @@ function commonFun(type, prefixUrl, parentProps) {
         }
       }
     }];
-    var _queryHeaderParams16 = getQueryHeadersList({
+    var _queryHeaderParams17 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
@@ -12778,7 +12880,7 @@ function commonFun(type, prefixUrl, parentProps) {
       'qp-employeeCode-eq': getEmployeeCode(),
       'qp-realOrg-eq': true,
       'qp-status-eq': 10
-    }, getQueryHeadersItem(_queryHeaderParams16, 'qp-salesOrgCode-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams17, 'qp-salesOrgCode-in'))]).then(function (x) {
       formatSource(x, 0, 2, tableSearchForm);
     });
     modalTableProps = _objectSpread2({
@@ -12884,13 +12986,13 @@ function commonFun(type, prefixUrl, parentProps) {
       },
       initialSource: nodeType
     }];
-    var _queryHeaderParams17 = getQueryHeadersList({
+    var _queryHeaderParams18 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
     Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/orgView/getOrgViewListNoPage"), {
       'qp-status-eq': 10
-    }, getQueryHeadersItem(_queryHeaderParams17, 'qp-orgViewCode-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams18, 'qp-orgViewCode-in'))]).then(function (x) {
       formatSource(x, 0, 2, tableSearchForm);
     });
     modalTableProps = _objectSpread2({
@@ -13216,13 +13318,13 @@ function commonFun(type, prefixUrl, parentProps) {
       },
       initialSource: nodeType
     }];
-    var _queryHeaderParams18 = getQueryHeadersList({
+    var _queryHeaderParams19 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
     Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/orgView/getOrgViewListNoPage"), {
       'qp-status-eq': 10
-    }, getQueryHeadersItem(_queryHeaderParams18, 'qp-orgViewCode-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams19, 'qp-orgViewCode-in'))]).then(function (x) {
       formatSource(x, 0, 2, tableSearchForm);
     });
     modalTableProps = _objectSpread2({

package/dist/index.js

@@ -11197,6 +11197,26 @@ function commonFun(type, prefixUrl, parentProps) {
       }, (requestConfigProp === null || requestConfigProp === void 0 ? void 0 : requestConfigProp.addOtherParams) || {}),
       sourceName: 'warehouseIds'
     }, requestConfigProp);
+    var _queryHeaderParams7 = getQueryHeadersList({
+      querySelectHeadersList: querySelectHeadersList,
+      extralHeaders: extralHeaders
+    });
+    Promise.all([loadSelectSource$1("/channel-manage/channelInfo/tree", {
+      'qp-status-eq': 10,
+      'qp-isMain-eq': 1,
+      'qp-type-in': '1,2'
+    }, getQueryHeadersItem(_queryHeaderParams7, 'qp-orgCode-in')), loadSelectSource$1("/channel-manage/tagNode/getTree/10", {
+      'qp-status-eq': 1
+    }, getQueryHeadersItem(_queryHeaderParams7, 'qp-orgCode-in'))]).then(function (x) {
+      var channelDisabledJude = function channelDisabledJude(data) {
+        return data['parentCode'] === '0';
+      }; // 所属销售渠道 树节点不能点判断
+      var areaDisabledJude = function areaDisabledJude(data) {
+        return data['parent'] === '0';
+      }; // 所属营销区域 树节点不能点判断
+      formatTreeDataSource(x, 0, 4, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
+      formatTreeDataSource(x, 1, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude);
+    });
     tableSearchForm = [{
       name: 'realWarehouseName*multiInput',
       label: '逻辑仓名称',
@@ -11220,6 +11240,70 @@ function commonFun(type, prefixUrl, parentProps) {
       },
       label: '管理大区',
       initialSource: getDictionarySource$1('BUSINESS_belongArea')
+    }, {
+      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'
+        }
+      }
+    }, {
+      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'
+        }
+      }
+    }, {
+      name: 'qp-type-in',
+      type: 'select',
+      label: '店铺性质',
+      field: {
+        type: 'select',
+        props: {
+          mode: 'multiple',
+          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;
+          }
+        }
+      },
+      initialSource: getDictionarySource$1('BUSINESS_StoreType')
     }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
       name: 'qp-isEnable-eq',
       type: 'select',
@@ -11248,10 +11332,28 @@ function commonFun(type, prefixUrl, parentProps) {
         render: function render(text) {
           return getDictionaryTextByValue$1('SC00004', text);
         }
+      }, {
+        title: '所属销售渠道',
+        dataIndex: 'channelName',
+        defaultSort: 4,
+        width: 100
+      }, {
+        title: '营销区域',
+        dataIndex: 'commonRelationAreaName',
+        defaultSort: 5,
+        width: 100
+      }, {
+        title: '店铺性质',
+        dataIndex: 'type',
+        defaultSort: 6,
+        render: function render(text) {
+          return getDictionaryTextByValue$1('BUSINESS_StoreType', text);
+        },
+        width: 80
       }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
         title: '状态',
         dataIndex: 'isEnable',
-        defaultSort: 4,
+        defaultSort: 7,
         render: function render(text) {
           return getDictionaryTextByValue$1('SC00001', text);
         }
@@ -11317,13 +11419,13 @@ function commonFun(type, prefixUrl, parentProps) {
       label: '运营仓状态',
       initialSource: getDictionarySource$1('SC00001')
     }] : []));
-    var _queryHeaderParams7 = getQueryHeadersList({
+    var _queryHeaderParams8 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
     Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/groupInfo/listNoPage"), {
       'qp-status-eq': 1
-    }, getQueryHeadersItem(_queryHeaderParams7, 'qp-groupCode-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams8, 'qp-groupCode-in'))]).then(function (x) {
       formatSource(x, 0, 2, tableSearchForm, ['groupCode', 'groupName']);
     });
     modalTableProps = _objectSpread2({
@@ -11501,7 +11603,7 @@ function commonFun(type, prefixUrl, parentProps) {
       label: '共享类型',
       initialSource: sharingTypeDataList
     }];
-    var _queryHeaderParams8 = getQueryHeadersList({
+    var _queryHeaderParams9 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
@@ -11509,14 +11611,14 @@ function commonFun(type, prefixUrl, parentProps) {
       pageSize: 5000,
       currentPage: 1,
       'qp-companyType-eq': '30'
-    }, getQueryHeadersItem(_queryHeaderParams8, 'qp-conglomerateCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/accountingSubject"), {
+    }, getQueryHeadersItem(_queryHeaderParams9, 'qp-conglomerateCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/accountingSubject"), {
       pageSize: 5000,
       currentPage: 1
-    }, getQueryHeadersItem(_queryHeaderParams8, 'qp-accountingCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/company"), {
+    }, getQueryHeadersItem(_queryHeaderParams9, 'qp-accountingCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/company"), {
       pageSize: 5000,
       currentPage: 1,
       'qp-companyType-eq': '20'
-    }, getQueryHeadersItem(_queryHeaderParams8, 'qp-sharingType-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams9, 'qp-sharingType-in'))]).then(function (x) {
       formatSource(x, 0, 2, tableSearchForm);
       formatSource(x, 1, 3, tableSearchForm);
       formatSource(x, 2, 4, tableSearchForm);
@@ -11629,11 +11731,11 @@ function commonFun(type, prefixUrl, parentProps) {
         }
       }
     }];
-    var _queryHeaderParams9 = getQueryHeadersList({
+    var _queryHeaderParams10 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
-    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/org/listNoPage"), {}, getQueryHeadersItem(_queryHeaderParams9, 'qp-createOrgCode-eq'))]).then(function (x) {
+    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/org/listNoPage"), {}, getQueryHeadersItem(_queryHeaderParams10, 'qp-createOrgCode-eq'))]).then(function (x) {
       var firstElement = x === null || x === void 0 ? void 0 : x[0];
       var allList = firstElement && [firstElement, firstElement];
       formatSource(allList, 0, 2, tableSearchForm);
@@ -11795,7 +11897,7 @@ function commonFun(type, prefixUrl, parentProps) {
         }
       }
     }];
-    var _queryHeaderParams10 = getQueryHeadersList({
+    var _queryHeaderParams11 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
@@ -11803,21 +11905,21 @@ function commonFun(type, prefixUrl, parentProps) {
       pageSize: 5000,
       currentPage: 1,
       'qp-companyType-eq': '30'
-    }, getQueryHeadersItem(_queryHeaderParams10, 'qp-conglomerateCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/company"), {
+    }, getQueryHeadersItem(_queryHeaderParams11, 'qp-conglomerateCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/company"), {
       pageSize: 5000,
       currentPage: 1,
       'qp-companyType-eq': '20'
-    }, getQueryHeadersItem(_queryHeaderParams10, 'qp-companyCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/platformRecord/getPlatformRecordList"), {
+    }, getQueryHeadersItem(_queryHeaderParams11, 'qp-companyCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/platformRecord/getPlatformRecordList"), {
       // pageSize: 5000,
       // currentPage: 1,
       'qp-status-eq': '1'
-    }, getQueryHeadersItem(_queryHeaderParams10, 'qp-plateformCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/store"), {
+    }, getQueryHeadersItem(_queryHeaderParams11, 'qp-plateformCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/store"), {
       pageSize: 5000,
       currentPage: 1
-    }, getQueryHeadersItem(_queryHeaderParams10, 'qp-mainBrandCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/accountingSubject"), {
+    }, getQueryHeadersItem(_queryHeaderParams11, 'qp-mainBrandCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/accountingSubject"), {
       pageSize: 5000,
       currentPage: 1
-    }, getQueryHeadersItem(_queryHeaderParams10, 'qp-accountingCode-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams11, 'qp-accountingCode-in'))]).then(function (x) {
       formatSource(x, 0, 2, tableSearchForm);
       formatSource(x, 1, 3, tableSearchForm);
       formatSource(x, 2, 5, tableSearchForm);
@@ -11987,7 +12089,7 @@ function commonFun(type, prefixUrl, parentProps) {
       },
       initialSource: getDictionarySource$1('BUSINESS_StoreType')
     }];
-    var _queryHeaderParams11 = getQueryHeadersList({
+    var _queryHeaderParams12 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
@@ -11995,13 +12097,13 @@ function commonFun(type, prefixUrl, parentProps) {
       'qp-employeeCode-eq': getEmployeeCode(),
       'qp-realOrg-eq': true,
       'qp-status-eq': 10
-    }, getQueryHeadersItem(_queryHeaderParams11, 'qp-orgCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/channelInfo/tree"), {
+    }, getQueryHeadersItem(_queryHeaderParams12, 'qp-orgCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/channelInfo/tree"), {
       'qp-status-eq': 10,
       'qp-isMain-eq': 1,
       'qp-type-in': '1,2'
-    }, getQueryHeadersItem(_queryHeaderParams11, 'qp-orgCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/tagNode/getTree/10"), {
+    }, getQueryHeadersItem(_queryHeaderParams12, 'qp-orgCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/tagNode/getTree/10"), {
       'qp-status-eq': 1
-    }, getQueryHeadersItem(_queryHeaderParams11, 'qp-orgCode-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams12, 'qp-orgCode-in'))]).then(function (x) {
       var channelDisabledJude = function channelDisabledJude(data) {
         return data['parentCode'] === '0';
       }; // 所属销售渠道 树节点不能点判断
@@ -12239,7 +12341,7 @@ function commonFun(type, prefixUrl, parentProps) {
       name: 'qp-officeTelephone-like',
       label: '手机号'
     }];
-    var _queryHeaderParams12 = getQueryHeadersList({
+    var _queryHeaderParams13 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
@@ -12247,7 +12349,7 @@ function commonFun(type, prefixUrl, parentProps) {
       pageSize: 5000,
       currentPage: 1,
       'qp-companyType-eq': 20
-    }, getQueryHeadersItem(_queryHeaderParams12, 'qp-companyCode-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams13, 'qp-companyCode-in'))]).then(function (x) {
       formatSource(x, 0, 2, tableSearchForm);
     });
     modalTableProps = _objectSpread2({
@@ -12356,13 +12458,13 @@ function commonFun(type, prefixUrl, parentProps) {
       name: 'qp-officeTelephone-like',
       label: '手机号'
     }]);
-    var _queryHeaderParams13 = getQueryHeadersList({
+    var _queryHeaderParams14 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
     Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/orgViewNode/common/getTreeForOrgViewAndTenant"), {
       'orgViewCode': 'administrative-organization-view'
-    }, getQueryHeadersItem(_queryHeaderParams13, 'qp-code-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams14, 'qp-code-in'))]).then(function (x) {
       formatTreeDataSource(x, 0, 2, tableSearchForm, ['code', 'name']);
     });
     modalTableProps = _objectSpread2({
@@ -12509,17 +12611,17 @@ function commonFun(type, prefixUrl, parentProps) {
       name: 'qp-remark-like',
       label: '备注'
     }];
-    var _queryHeaderParams14 = getQueryHeadersList({
+    var _queryHeaderParams15 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
     Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/logisCompany"), {
       pageSize: 5000,
       currentPage: 1
-    }, getQueryHeadersItem(_queryHeaderParams14, logisCompanyCodeSingleSearchName)), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/printTemplate"), {
+    }, getQueryHeadersItem(_queryHeaderParams15, logisCompanyCodeSingleSearchName)), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/printTemplate"), {
       pageSize: 5000,
       currentPage: 1
-    }, getQueryHeadersItem(_queryHeaderParams14, 'qp-sheetTemplateCode-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams15, 'qp-sheetTemplateCode-in'))]).then(function (x) {
       formatSource(x, 0, 2, tableSearchForm);
       formatSource(x, 1, 5, tableSearchForm);
     });
@@ -12689,14 +12791,14 @@ function commonFun(type, prefixUrl, parentProps) {
         }
       }
     }];
-    var _queryHeaderParams15 = getQueryHeadersList({
+    var _queryHeaderParams16 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
     Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/permissionCategory"), {
       pageSize: 5000,
       currentPage: 1
-    }, getQueryHeadersItem(_queryHeaderParams15, 'qp-categoryCode-eq'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams16, 'qp-categoryCode-eq'))]).then(function (x) {
       formatSource(x, 0, 2, tableSearchForm);
     });
     modalTableProps = _objectSpread2({
@@ -12793,7 +12895,7 @@ function commonFun(type, prefixUrl, parentProps) {
         }
       }
     }];
-    var _queryHeaderParams16 = getQueryHeadersList({
+    var _queryHeaderParams17 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
@@ -12801,7 +12903,7 @@ function commonFun(type, prefixUrl, parentProps) {
       'qp-employeeCode-eq': getEmployeeCode(),
       'qp-realOrg-eq': true,
       'qp-status-eq': 10
-    }, getQueryHeadersItem(_queryHeaderParams16, 'qp-salesOrgCode-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams17, 'qp-salesOrgCode-in'))]).then(function (x) {
       formatSource(x, 0, 2, tableSearchForm);
     });
     modalTableProps = _objectSpread2({
@@ -12907,13 +13009,13 @@ function commonFun(type, prefixUrl, parentProps) {
       },
       initialSource: nodeType
     }];
-    var _queryHeaderParams17 = getQueryHeadersList({
+    var _queryHeaderParams18 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
     Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/orgView/getOrgViewListNoPage"), {
       'qp-status-eq': 10
-    }, getQueryHeadersItem(_queryHeaderParams17, 'qp-orgViewCode-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams18, 'qp-orgViewCode-in'))]).then(function (x) {
       formatSource(x, 0, 2, tableSearchForm);
     });
     modalTableProps = _objectSpread2({
@@ -13239,13 +13341,13 @@ function commonFun(type, prefixUrl, parentProps) {
       },
       initialSource: nodeType
     }];
-    var _queryHeaderParams18 = getQueryHeadersList({
+    var _queryHeaderParams19 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
     Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/orgView/getOrgViewListNoPage"), {
       'qp-status-eq': 10
-    }, getQueryHeadersItem(_queryHeaderParams18, 'qp-orgViewCode-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams19, 'qp-orgViewCode-in'))]).then(function (x) {
       formatSource(x, 0, 2, tableSearchForm);
     });
     modalTableProps = _objectSpread2({

package/package.json

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

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

@@ -1198,12 +1198,84 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       sourceName: 'warehouseIds',
       ...requestConfigProp,
     }
+    const queryHeaderParams  = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
+    Promise.all([
+      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 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)
+    })
     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'),   },
-      ...(modalTableBusProps?.needStatusSearch?[{ name: 'qp-isEnable-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',
+          },
+        }
+      },
+      {
+        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',
+          },
+        }
+      },
+      {
+        name: 'qp-type-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,
+          },
+        },
+        initialSource: getDictionarySource('BUSINESS_StoreType')
+      },
+      ...(modalTableBusProps?.needStatusSearch?[{ name: 'qp-isEnable-eq', type: 'select', label: '逻辑仓状态', initialSource: getDictionarySource('SC00001')  }]:[]),
     ]
     modalTableProps = {
       modalTableTitle: '选择逻辑仓',
@@ -1230,10 +1302,29 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           defaultSort: 3,
           render: (text: number) => getDictionaryTextByValue('SC00004', text),
         },
+        {
+          title: '所属销售渠道',
+          dataIndex: 'channelName',
+          defaultSort: 4,
+          width: 100,
+        },
+        {
+          title: '营销区域',
+          dataIndex: 'commonRelationAreaName',
+          defaultSort: 5,
+          width: 100,
+        },
+        {
+          title: '店铺性质',
+          dataIndex: 'type',
+          defaultSort: 6,
+          render: (text: any) => getDictionaryTextByValue('BUSINESS_StoreType', text),
+          width: 80,
+        },
         ...(modalTableBusProps?.needStatusSearch?[{
           title: '状态',
           dataIndex: 'isEnable',
-          defaultSort: 4,
+          defaultSort: 7,
           render: (text: number) => getDictionaryTextByValue('SC00001', text),
         }]:[]),
       ],