@bit-sun/business-component 4.2.0-alpha.3 → 4.2.0-alpha.5

package/dist/index.esm.js

@@ -2,7 +2,7 @@ import axios from 'axios';
 import request$1 from 'umi-request';
 import cookie from 'js-cookie';
 import { message as message$1, Tooltip, Image, Popover, Card, Avatar, Badge, Menu, Input, InputNumber, Space, Button, Dropdown, Upload, Checkbox, Modal, ConfigProvider, Tag, Select, Spin, Form, Table, Empty, Row, Col, Tabs, TreeSelect, DatePicker, Typography, Alert, Breadcrumb, Drawer as Drawer$1, List, Radio, Tree, Result, Affix, Cascader, TimePicker, Divider, Switch, Collapse } from 'antd';
-import _, { omit, uniqBy, escapeRegExp, isNil, debounce, cloneDeep as cloneDeep$1, throttle, isEmpty } from 'lodash';
+import _, { omit, uniqBy, escapeRegExp, isNil, isBoolean, debounce, cloneDeep as cloneDeep$1, throttle, isEmpty } from 'lodash';
 import memoizeOne from 'memoize-one';
 import { formatMessage, history, useLocation, Link, useModel, setLocale, useIntl, request as request$3 } from 'umi';
 import isEqual from 'lodash/isEqual';
@@ -188,8 +188,8 @@ function _objectWithoutProperties(e, t) {
     r,
     i = _objectWithoutPropertiesLoose(e, t);
   if (Object.getOwnPropertySymbols) {
-    var n = Object.getOwnPropertySymbols(e);
-    for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
+    var s = Object.getOwnPropertySymbols(e);
+    for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
   }
   return i;
 }
@@ -197,7 +197,7 @@ function _objectWithoutPropertiesLoose(r, e) {
   if (null == r) return {};
   var t = {};
   for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
-    if (-1 !== e.indexOf(n)) continue;
+    if (e.includes(n)) continue;
     t[n] = r[n];
   }
   return t;
@@ -5515,7 +5515,8 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   };
   var tableInitPagination = _objectSpread2(_objectSpread2({}, initPagination), {}, {
     total: 0,
-    current: 1
+    current: 1,
+    pageSizeOptions: [10, 20, 50, 100, 500, 1000]
   });
   var disabled = !!noOperate || (selectProps === null || selectProps === void 0 ? void 0 : selectProps.disabled) || (props === null || props === void 0 ? void 0 : props.disabled);
   var isHaveDependency = fixedparameter && fieldValToParam && ctx;
@@ -9993,31 +9994,36 @@ function commonFun(type, prefixUrl, parentProps) {
     });
   };
   // 格式化树选择器数据源
-  var _mapSearchTree = function mapSearchTree(treeDataItem, resKeyValue, disabledJudge) {
-    var haveChildren = Array.isArray(treeDataItem.children) && treeDataItem.children.length > 0;
+  var _mapSearchTree = function mapSearchTree(treeDataItem, resKeyValue, disabledJudge, childrenKey) {
+    var haveChildren = Array.isArray(treeDataItem[childrenKey]) && treeDataItem[childrenKey].length > 0;
     return {
       title: treeDataItem[resKeyValue[1]],
       value: treeDataItem[resKeyValue[0]],
       parentId: treeDataItem.parent,
       data: _objectSpread2({}, treeDataItem),
       isLeaf: !haveChildren,
-      disabled: disabledJudge !== undefined ? disabledJudge : haveChildren,
-      children: haveChildren ? treeDataItem.children.map(function (i) {
-        return _mapSearchTree(i, resKeyValue, disabledJudge);
+      disabled: disabledJudge !== undefined ? isBoolean(disabledJudge) ? disabledJudge : disabledJudge(treeDataItem) : haveChildren,
+      children: haveChildren ? treeDataItem[childrenKey].map(function (i) {
+        return _mapSearchTree(i, resKeyValue, disabledJudge, childrenKey);
       }) : []
     };
   };
   var formatTreeDataSource = function formatTreeDataSource(reData, position, changePosition, changeSearchForm) {
     var _reData$position2;
     var resKeyValue = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : ['id', 'name'];
+    var childrenKey = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 'children';
+    var nodeDisabledJudge = arguments.length > 6 ? arguments[6] : undefined;
     var data = reData && ((_reData$position2 = reData[position]) === null || _reData$position2 === void 0 ? void 0 : _reData$position2.data);
     var disabledJudge;
     if (data && _typeof(data) === 'object' && !Array.isArray(data) && Object.keys(data).length > 0) {
       data = [data];
       disabledJudge = false;
     }
+    if (nodeDisabledJudge) {
+      disabledJudge = nodeDisabledJudge;
+    }
     var formatData = data && Array.isArray(data) && data.length && data.map(function (ites) {
-      return _mapSearchTree(ites, resKeyValue, disabledJudge);
+      return _mapSearchTree(ites, resKeyValue, disabledJudge, childrenKey);
     }) || [];
     changeSearchForm[changePosition].field.props.treeData = formatData;
   };
@@ -11854,7 +11860,8 @@ function commonFun(type, prefixUrl, parentProps) {
       mappingTextField: 'name',
       mappingValueField: 'code',
       otherParams: _objectSpread2({
-        sorter: 'desc-id'
+        sorter: 'desc-id',
+        'qp-status-in': 10
       }, (requestConfigProp === null || requestConfigProp === void 0 ? void 0 : requestConfigProp.addOtherParams) || {}),
       sourceName: 'code'
     }, requestConfigProp);
@@ -11871,12 +11878,9 @@ function commonFun(type, prefixUrl, parentProps) {
       type: 'select',
       label: '商店类型',
       initialSource: shopFile2Type
-    }, {
-      name: 'qp-status-in',
-      type: 'select',
-      label: '商店状态',
-      initialSource: shopFile2Status
-    }, {
+    },
+    // { name: 'qp-status-in', type: 'select', label: '商店状态', initialSource: shopFile2Status },
+    {
       name: 'qp-orgCode-in',
       type: 'select',
       label: '所属销售组织',
@@ -11895,6 +11899,70 @@ 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'
+        }
+      }
+    }, {
+      name: 'qp-commonRelationAreaCode-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-businessType-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')
     }];
     var _queryHeaderParams11 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
@@ -11904,8 +11972,22 @@ 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"), {
+      '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"), {
+      'qp-status-eq': 1
     }, getQueryHeadersItem(_queryHeaderParams11, 'qp-orgCode-in'))]).then(function (x) {
-      formatSource(x, 0, 4, tableSearchForm);
+      var channelDisabledJude = function channelDisabledJude(data) {
+        return data['parentCode'] === '0';
+      }; // 所属销售渠道 树节点不能点判断
+      var areaDisabledJude = function areaDisabledJude(data) {
+        return data['parent'] === '0';
+      }; // 所属营销区域 树节点不能点判断
+      formatSource(x, 0, 3, tableSearchForm);
+      formatTreeDataSource(x, 1, 4, tableSearchForm, ['id', 'name'], 'channelInfoSon', channelDisabledJude);
+      formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude);
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择商店',
@@ -11913,19 +11995,23 @@ function commonFun(type, prefixUrl, parentProps) {
       tableColumns: [{
         title: '序号',
         dataIndex: 'keyIndex',
-        defaultSort: 0
+        defaultSort: 0,
+        width: 60
       }, {
         title: '商店编码',
         dataIndex: 'code',
-        defaultSort: 1
+        defaultSort: 1,
+        width: 100
       }, {
         title: '商店名称',
         dataIndex: 'name',
-        defaultSort: 2
+        defaultSort: 2,
+        width: 120
       }, {
         title: '商店类型',
         dataIndex: 'type',
         defaultSort: 3,
+        width: 100,
         render: function render(text) {
           var _shopFile2Type$find;
           return (_shopFile2Type$find = shopFile2Type.find(function (i) {
@@ -11935,6 +12021,7 @@ function commonFun(type, prefixUrl, parentProps) {
       }, {
         title: '启用状态',
         dataIndex: 'status',
+        width: 80,
         render: function render(text) {
           var _shopFile2Status$find;
           return (_shopFile2Status$find = shopFile2Status.find(function (i) {
@@ -11944,8 +12031,28 @@ function commonFun(type, prefixUrl, parentProps) {
       }, {
         title: '所属销售组织',
         dataIndex: 'orgName',
-        defaultSort: 4
-      }]
+        defaultSort: 4,
+        width: 95
+      }, {
+        title: '所属销售渠道',
+        dataIndex: 'channelName',
+        defaultSort: 5,
+        width: 100
+      }, {
+        title: '营销区域',
+        dataIndex: 'commonRelationAreaName',
+        defaultSort: 6,
+        width: 100
+      }, {
+        title: '店铺性质',
+        dataIndex: 'businessType',
+        defaultSort: 7,
+        render: function render(text) {
+          return getDictionaryTextByValue$1('BUSINESS_StoreType', text);
+        },
+        width: 80
+      }],
+      noEmptySearchField: true
     }, modalTableBusProps);
   }
   // 核算主体选择器（无弹窗）

package/dist/index.js

@@ -211,8 +211,8 @@ function _objectWithoutProperties(e, t) {
     r,
     i = _objectWithoutPropertiesLoose(e, t);
   if (Object.getOwnPropertySymbols) {
-    var n = Object.getOwnPropertySymbols(e);
-    for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
+    var s = Object.getOwnPropertySymbols(e);
+    for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
   }
   return i;
 }
@@ -220,7 +220,7 @@ function _objectWithoutPropertiesLoose(r, e) {
   if (null == r) return {};
   var t = {};
   for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
-    if (-1 !== e.indexOf(n)) continue;
+    if (e.includes(n)) continue;
     t[n] = r[n];
   }
   return t;
@@ -5538,7 +5538,8 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
   };
   var tableInitPagination = _objectSpread2(_objectSpread2({}, initPagination), {}, {
     total: 0,
-    current: 1
+    current: 1,
+    pageSizeOptions: [10, 20, 50, 100, 500, 1000]
   });
   var disabled = !!noOperate || (selectProps === null || selectProps === void 0 ? void 0 : selectProps.disabled) || (props === null || props === void 0 ? void 0 : props.disabled);
   var isHaveDependency = fixedparameter && fieldValToParam && ctx;
@@ -10016,31 +10017,36 @@ function commonFun(type, prefixUrl, parentProps) {
     });
   };
   // 格式化树选择器数据源
-  var _mapSearchTree = function mapSearchTree(treeDataItem, resKeyValue, disabledJudge) {
-    var haveChildren = Array.isArray(treeDataItem.children) && treeDataItem.children.length > 0;
+  var _mapSearchTree = function mapSearchTree(treeDataItem, resKeyValue, disabledJudge, childrenKey) {
+    var haveChildren = Array.isArray(treeDataItem[childrenKey]) && treeDataItem[childrenKey].length > 0;
     return {
       title: treeDataItem[resKeyValue[1]],
       value: treeDataItem[resKeyValue[0]],
       parentId: treeDataItem.parent,
       data: _objectSpread2({}, treeDataItem),
       isLeaf: !haveChildren,
-      disabled: disabledJudge !== undefined ? disabledJudge : haveChildren,
-      children: haveChildren ? treeDataItem.children.map(function (i) {
-        return _mapSearchTree(i, resKeyValue, disabledJudge);
+      disabled: disabledJudge !== undefined ? _.isBoolean(disabledJudge) ? disabledJudge : disabledJudge(treeDataItem) : haveChildren,
+      children: haveChildren ? treeDataItem[childrenKey].map(function (i) {
+        return _mapSearchTree(i, resKeyValue, disabledJudge, childrenKey);
       }) : []
     };
   };
   var formatTreeDataSource = function formatTreeDataSource(reData, position, changePosition, changeSearchForm) {
     var _reData$position2;
     var resKeyValue = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : ['id', 'name'];
+    var childrenKey = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 'children';
+    var nodeDisabledJudge = arguments.length > 6 ? arguments[6] : undefined;
     var data = reData && ((_reData$position2 = reData[position]) === null || _reData$position2 === void 0 ? void 0 : _reData$position2.data);
     var disabledJudge;
     if (data && _typeof(data) === 'object' && !Array.isArray(data) && Object.keys(data).length > 0) {
       data = [data];
       disabledJudge = false;
     }
+    if (nodeDisabledJudge) {
+      disabledJudge = nodeDisabledJudge;
+    }
     var formatData = data && Array.isArray(data) && data.length && data.map(function (ites) {
-      return _mapSearchTree(ites, resKeyValue, disabledJudge);
+      return _mapSearchTree(ites, resKeyValue, disabledJudge, childrenKey);
     }) || [];
     changeSearchForm[changePosition].field.props.treeData = formatData;
   };
@@ -11877,7 +11883,8 @@ function commonFun(type, prefixUrl, parentProps) {
       mappingTextField: 'name',
       mappingValueField: 'code',
       otherParams: _objectSpread2({
-        sorter: 'desc-id'
+        sorter: 'desc-id',
+        'qp-status-in': 10
       }, (requestConfigProp === null || requestConfigProp === void 0 ? void 0 : requestConfigProp.addOtherParams) || {}),
       sourceName: 'code'
     }, requestConfigProp);
@@ -11894,12 +11901,9 @@ function commonFun(type, prefixUrl, parentProps) {
       type: 'select',
       label: '商店类型',
       initialSource: shopFile2Type
-    }, {
-      name: 'qp-status-in',
-      type: 'select',
-      label: '商店状态',
-      initialSource: shopFile2Status
-    }, {
+    },
+    // { name: 'qp-status-in', type: 'select', label: '商店状态', initialSource: shopFile2Status },
+    {
       name: 'qp-orgCode-in',
       type: 'select',
       label: '所属销售组织',
@@ -11918,6 +11922,70 @@ 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'
+        }
+      }
+    }, {
+      name: 'qp-commonRelationAreaCode-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-businessType-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')
     }];
     var _queryHeaderParams11 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
@@ -11927,8 +11995,22 @@ 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"), {
+      '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"), {
+      'qp-status-eq': 1
     }, getQueryHeadersItem(_queryHeaderParams11, 'qp-orgCode-in'))]).then(function (x) {
-      formatSource(x, 0, 4, tableSearchForm);
+      var channelDisabledJude = function channelDisabledJude(data) {
+        return data['parentCode'] === '0';
+      }; // 所属销售渠道 树节点不能点判断
+      var areaDisabledJude = function areaDisabledJude(data) {
+        return data['parent'] === '0';
+      }; // 所属营销区域 树节点不能点判断
+      formatSource(x, 0, 3, tableSearchForm);
+      formatTreeDataSource(x, 1, 4, tableSearchForm, ['id', 'name'], 'channelInfoSon', channelDisabledJude);
+      formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude);
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择商店',
@@ -11936,19 +12018,23 @@ function commonFun(type, prefixUrl, parentProps) {
       tableColumns: [{
         title: '序号',
         dataIndex: 'keyIndex',
-        defaultSort: 0
+        defaultSort: 0,
+        width: 60
       }, {
         title: '商店编码',
         dataIndex: 'code',
-        defaultSort: 1
+        defaultSort: 1,
+        width: 100
       }, {
         title: '商店名称',
         dataIndex: 'name',
-        defaultSort: 2
+        defaultSort: 2,
+        width: 120
       }, {
         title: '商店类型',
         dataIndex: 'type',
         defaultSort: 3,
+        width: 100,
         render: function render(text) {
           var _shopFile2Type$find;
           return (_shopFile2Type$find = shopFile2Type.find(function (i) {
@@ -11958,6 +12044,7 @@ function commonFun(type, prefixUrl, parentProps) {
       }, {
         title: '启用状态',
         dataIndex: 'status',
+        width: 80,
         render: function render(text) {
           var _shopFile2Status$find;
           return (_shopFile2Status$find = shopFile2Status.find(function (i) {
@@ -11967,8 +12054,28 @@ function commonFun(type, prefixUrl, parentProps) {
       }, {
         title: '所属销售组织',
         dataIndex: 'orgName',
-        defaultSort: 4
-      }]
+        defaultSort: 4,
+        width: 95
+      }, {
+        title: '所属销售渠道',
+        dataIndex: 'channelName',
+        defaultSort: 5,
+        width: 100
+      }, {
+        title: '营销区域',
+        dataIndex: 'commonRelationAreaName',
+        defaultSort: 6,
+        width: 100
+      }, {
+        title: '店铺性质',
+        dataIndex: 'businessType',
+        defaultSort: 7,
+        render: function render(text) {
+          return getDictionaryTextByValue$1('BUSINESS_StoreType', text);
+        },
+        width: 80
+      }],
+      noEmptySearchField: true
     }, modalTableBusProps);
   }
   // 核算主体选择器（无弹窗）

package/package.json

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

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

@@ -6,6 +6,7 @@ import { handleTextOverflow, tableColumnsImage, handleTooltip } from '@/componen
 import { getSkuImg } from '@/utils/TableUtils';
 import { getEmployeeCode, getCurrentTargetBgId } from '@/utils/LocalstorageUtils';
 import { Image } from 'antd';
+import { isBoolean } from 'lodash';
 
 const hasDictSharingType =  getDictionarySource('UC000013')?.length;
 const sharingTypeDataList = hasDictSharingType && getDictionarySource('UC000013') || sharingType
@@ -42,29 +43,40 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
   }
 
   // 格式化树选择器数据源
-  const mapSearchTree = (treeDataItem: any, resKeyValue: any, disabledJudge?: any) => {
-    const haveChildren = Array.isArray(treeDataItem.children) && treeDataItem.children.length > 0;
+  const mapSearchTree = (treeDataItem: any, resKeyValue: any, disabledJudge?: any, childrenKey?: any) => {
+    const haveChildren = Array.isArray(treeDataItem[childrenKey]) && treeDataItem[childrenKey].length > 0;
     return {
       title: treeDataItem[resKeyValue[1]],
       value: treeDataItem[resKeyValue[0]],
       parentId: treeDataItem.parent,
       data: { ...treeDataItem },
       isLeaf: !haveChildren,
-      disabled: disabledJudge!==undefined? disabledJudge : haveChildren,
-      children: haveChildren ? treeDataItem.children.map((i: any) => mapSearchTree(i, resKeyValue, disabledJudge)) : [],
+      disabled: disabledJudge !== undefined ? isBoolean(disabledJudge) ? disabledJudge : disabledJudge(treeDataItem) : haveChildren,
+      children: haveChildren ? treeDataItem[childrenKey].map((i: any) => mapSearchTree(i, resKeyValue, disabledJudge, childrenKey)) : [],
     };
   };
-  const formatTreeDataSource = (reData: any, position: number, changePosition: number,changeSearchForm: any,resKeyValue=['id', 'name']) => {
+  const formatTreeDataSource = (
+    reData: any, 
+    position: number, 
+    changePosition: number,
+    changeSearchForm: any,
+    resKeyValue=['id', 'name'], 
+    childrenKey = 'children',
+    nodeDisabledJudge?: (data: any) => boolean, // 树节点能不能选 函数判断
+  ) => {
     let data = reData && reData[position]?.data;
     let disabledJudge;
     if(data && typeof data === 'object' && !Array.isArray(data) && Object.keys(data).length > 0) {
       data = [data];
       disabledJudge=false
     }
+    if(nodeDisabledJudge) {
+      disabledJudge = nodeDisabledJudge;
+    }
     const formatData = (data &&
       Array.isArray(data) &&
       data.length &&
-      data.map((ites: any) => mapSearchTree(ites, resKeyValue, disabledJudge))) ||
+      data.map((ites: any) => mapSearchTree(ites, resKeyValue, disabledJudge, childrenKey))) ||
     []
     changeSearchForm[changePosition].field.props.treeData = formatData;
   }
@@ -1836,6 +1848,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       mappingValueField: 'code',
       otherParams: {
         sorter: 'desc-id',
+        'qp-status-in': 10,
         ...(requestConfigProp?.addOtherParams || {}),
       }, // 默认参数
       sourceName: 'code',
@@ -1845,7 +1858,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       { name: 'name*multiInput', label: '商店名称', type: 'multipleQueryInput' },
       { name: 'code*multiInput', label: '商店编码', type: 'multipleQueryInput' },
       { name: 'qp-type-in', type: 'select', label: '商店类型', initialSource: shopFile2Type },
-      { name: 'qp-status-in', type: 'select', label: '商店状态', initialSource: shopFile2Status },
+      // { name: 'qp-status-in', type: 'select', label: '商店状态', initialSource: shopFile2Status },
       { name: 'qp-orgCode-in', type: 'select', label: '所属销售组织', field: {
           type: 'select',
           props: {
@@ -1860,6 +1873,57 @@ 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: {
+        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-commonRelationAreaCode-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-businessType-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') 
+    },
     ]
     const queryHeaderParams  = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
     Promise.all([
@@ -1868,8 +1932,20 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
         'qp-realOrg-eq': true,
         'qp-status-eq': 10
       },getQueryHeadersItem(queryHeaderParams,'qp-orgCode-in')),
+      loadSelectSource(`${prefixUrl.formSelectFix}/channelInfo/tree`, {
+        'qp-status-eq': 10,
+        'qp-isMain-eq': 1,
+        'qp-type-in': '1,2',
+      },getQueryHeadersItem(queryHeaderParams,'qp-orgCode-in')),
+      loadSelectSource(`${prefixUrl.formSelectFix}/tagNode/getTree/10`, {
+        'qp-status-eq': 1,
+      },getQueryHeadersItem(queryHeaderParams,'qp-orgCode-in')),
     ]).then((x: any)=>{
-      formatSource(x,0, 4, tableSearchForm);
+      const channelDisabledJude = (data: any) => data['parentCode'] === '0'; // 所属销售渠道 树节点不能点判断
+      const areaDisabledJude = (data: any) => data['parent'] === '0'; // 所属营销区域 树节点不能点判断
+      formatSource(x,0, 3, tableSearchForm);
+      formatTreeDataSource(x, 1, 4, tableSearchForm, ['id','name'], 'channelInfoSon', channelDisabledJude)
+      formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude)
     })
     modalTableProps = {
       modalTableTitle: '选择商店',
@@ -1879,34 +1955,60 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           title: '序号',
           dataIndex: 'keyIndex',
           defaultSort: 0,
+          width: 60,
         },
         {
           title: '商店编码',
           dataIndex: 'code',
           defaultSort: 1,
+          width: 100,
         },
         {
           title: '商店名称',
           dataIndex: 'name',
           defaultSort: 2,
+          width: 120,
         },
         {
           title: '商店类型',
           dataIndex: 'type',
           defaultSort: 3,
+          width: 100,
           render: (text: number) => shopFile2Type.find((i: any) => i.value === text)?.text,
         },
         {
           title: '启用状态',
           dataIndex: 'status',
+          width: 80,
           render: (text: number) => shopFile2Status.find((i: any) => i.value === text)?.text,
         },
         {
           title: '所属销售组织',
           dataIndex: 'orgName',
           defaultSort: 4,
+          width: 95,
+        },
+        {
+          title: '所属销售渠道',
+          dataIndex: 'channelName',
+          defaultSort: 5,
+          width: 100,
+        },
+        {
+          title: '营销区域',
+          dataIndex: 'commonRelationAreaName',
+          defaultSort: 6,
+          width: 100,
+        },
+        {
+          title: '店铺性质',
+          dataIndex: 'businessType',
+          defaultSort: 7,
+          render: (text: any) => getDictionaryTextByValue('BUSINESS_StoreType', text),
+          width: 80,
         },
       ],
+      noEmptySearchField: true,
       ...modalTableBusProps
     }
   }

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

@@ -83,7 +83,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   const isFormPage = pathname.match(pattern)?.length > 0;
 
   const initPagination = { showQuickJumper: true, showSizeChanger: true, showTotal: (total: any) => `共 ${total} 条`, pageSize: tableInitPageSize }
-  const tableInitPagination = { ...initPagination, total: 0, current: 1 }
+  const tableInitPagination = { ...initPagination, total: 0, current: 1, pageSizeOptions: [10, 20, 50, 100, 500, 1000] }
   const disabled = !!noOperate || selectProps?.disabled || props?.disabled;
   const isHaveDependency = fixedparameter && fieldValToParam && ctx;
   const isHaveDValue = () => {