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

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, isBoolean, debounce, cloneDeep as cloneDeep$1, throttle, isEmpty } from 'lodash';
+import _, { omit, uniqBy, escapeRegExp, isNil, trim, 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';
@@ -5323,7 +5323,9 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     viewShowValueStr = _ref.viewShowValueStr,
     searchStartLength = _ref.searchStartLength,
     _ref$isQuery = _ref.isQuery,
-    isQuery = _ref$isQuery === void 0 ? false : _ref$isQuery;
+    isQuery = _ref$isQuery === void 0 ? false : _ref$isQuery,
+    _ref$requireSearchCon = _ref.requireSearchCondition,
+    requireSearchCondition = _ref$requireSearchCon === void 0 ? false : _ref$requireSearchCon;
   var requestConfig = _objectSpread2({
     url: url,
     method: method,
@@ -5886,6 +5888,16 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   };
   var onSearchTable = function onSearchTable() {
     var params = form.getFieldsValue();
+    // 必须选择一个值
+    if (requireSearchCondition) {
+      var hasValidValue = Object.values(params).some(function (value) {
+        return Array.isArray(value) && value.length > 0 || typeof value === 'string' && value.trim().length > 0;
+      });
+      if (!hasValidValue) {
+        message$1.warning('请至少选择一个搜索条件');
+        return;
+      }
+    }
     setModalSearched(true);
     setTableFormParams(params);
     getData(_objectSpread2(_objectSpread2({}, params), {}, {
@@ -6180,7 +6192,26 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     });
   };
   var renderShowTable = function renderShowTable(tableList, type) {
-    var tableBoxHeighth = getTableHeigth(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableSearchForm);
+    var _modalTableProps$tabl;
+    var viCount = (modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.visibleFieldsCount) || defaultVisibleFieldsCount;
+    var canExpand = hasMoreQueryFields(modalTableProps);
+    var collapsedList = modalTableProps === null || modalTableProps === void 0 ? void 0 : (_modalTableProps$tabl = modalTableProps.tableSearchForm) === null || _modalTableProps$tabl === void 0 ? void 0 : _modalTableProps$tabl.slice(0, viCount);
+    var baseHeight = getTableHeigth(collapsedList);
+    var rowsCollapsed = getFormRowInfo(collapsedList, modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableSearchColSpan).totalRows;
+    var rowsExpandedData = getFormRowInfo(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableSearchForm, modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableSearchColSpan);
+    var rowsExpanded = rowsExpandedData.totalRows;
+    var isMoreAction = false;
+    if (24 / (modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableSearchColSpan) - rowsExpandedData.emptyArray.length === 1) {
+      rowsExpanded++;
+      isMoreAction = true;
+    }
+    var extraRows = !collapsed && canExpand ? Math.max(0, rowsExpanded - rowsCollapsed) : 0;
+    var tableBoxHeighth = baseHeight;
+    if (isMoreAction && extraRows > 0) {
+      tableBoxHeighth = tableBoxHeighth + (extraRows - 1 ? extraRows - 1 : 0) * 34 + 32;
+    } else {
+      tableBoxHeighth = tableBoxHeighth + extraRows * 34;
+    }
     var x = (tableList === null || tableList === void 0 ? void 0 : tableList.length) ? 82 : 28; // 无数据没有分页，有数据计算减去：分页 24+16*2+10 「高 + margin * 2 + paddingBottom 10 」
     var oSY = "calc(100vh - ".concat(tableBoxHeighth, "px - ").concat(x, "px)");
     var mTB = "calc(50vh - ".concat(tableBoxHeighth / 2, "px - ").concat(x / 2, "px - 40px)");
@@ -10455,7 +10486,7 @@ function commonFun(type, prefixUrl, parentProps) {
     }, {
       name: 'qp-zzdlbm-in',
       type: 'select',
-      label: '大类',
+      label: '品类',
       field: {
         type: 'select',
         props: {
@@ -10474,7 +10505,7 @@ function commonFun(type, prefixUrl, parentProps) {
     }, {
       name: 'qp-zzzlbm-in',
       type: 'select',
-      label: '中类',
+      label: '大类',
       field: {
         type: 'select',
         props: {
@@ -10493,7 +10524,7 @@ function commonFun(type, prefixUrl, parentProps) {
     }, {
       name: 'qp-zzxlbm-in',
       type: 'select',
-      label: '小类',
+      label: '中类',
       field: {
         type: 'select',
         props: {
@@ -10583,7 +10614,6 @@ function commonFun(type, prefixUrl, parentProps) {
       tableSearchForm: tableSearchForm,
       isHorizontally: true,
       tableSearchColSpan: 6,
-      visibleFieldsCount: 13,
       tableColumns: [{
         title: '序号',
         dataIndex: 'keyIndex',
@@ -11343,14 +11373,25 @@ function commonFun(type, prefixUrl, parentProps) {
     }, 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 _x$, _x$$data$, _x$$data$$channelInfo;
+      debugger;
+      // 战区限制一级数据
+      var newData1 = [];
+      (_x$ = x[0]) === null || _x$ === void 0 ? void 0 : (_x$$data$ = _x$.data[0]) === null || _x$$data$ === void 0 ? void 0 : (_x$$data$$channelInfo = _x$$data$.channelInfoSon) === null || _x$$data$$channelInfo === void 0 ? void 0 : _x$$data$$channelInfo.forEach(function (item) {
+        newData1.push({
+          code: item.code,
+          name: item.name
+        });
+      });
+      x[0].data = newData1;
       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);
+      formatTreeDataSource(x, 0, 3, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
+      formatTreeDataSource(x, 1, 4, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude);
     });
     tableSearchForm = [{
       name: 'realWarehouseName*multiInput',
@@ -11365,17 +11406,9 @@ function commonFun(type, prefixUrl, parentProps) {
       type: 'select',
       label: '逻辑仓类型',
       initialSource: getDictionarySource$1('SC00004')
-    }, {
-      name: 'belongArea',
-      field: {
-        type: 'select',
-        props: {
-          mode: 'multiple'
-        }
-      },
-      label: '管理大区',
-      initialSource: getDictionarySource$1('BUSINESS_belongArea')
-    }, {
+    },
+    // { name: 'belongArea', field: {type: 'select', props: {mode: 'multiple',}}, label: '管理大区', initialSource: getDictionarySource('BUSINESS_belongArea'),   },
+    {
       name: 'qp-channelCode-in',
       type: 'treeSelect',
       label: '战区',
@@ -11476,7 +11509,7 @@ function commonFun(type, prefixUrl, parentProps) {
         },
         width: 100
       }, {
-        title: '所属销售渠道',
+        title: '战区',
         dataIndex: 'channelName',
         defaultSort: 4,
         width: 100
@@ -11557,11 +11590,11 @@ function commonFun(type, prefixUrl, parentProps) {
         }
       }
     }, {
-      name: 'qp-channelCode-in',
-      type: 'treeSelect',
-      label: '销售渠道',
+      name: 'qp-operationWarehouseClassification-in',
+      type: 'select',
+      label: '分类',
       field: {
-        type: 'treeSelect',
+        type: 'select',
         props: {
           multiple: true,
           treeData: [],
@@ -11577,7 +11610,8 @@ function commonFun(type, prefixUrl, parentProps) {
           },
           showCheckedStrategy: 'TreeSelect.SHOW_ALL'
         }
-      }
+      },
+      initialSource: getDictionarySource$1('BASIC_OPS_WH_TYPE')
     }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
       name: 'qp-status-eq',
       type: 'select',
@@ -11595,11 +11629,16 @@ function commonFun(type, prefixUrl, parentProps) {
       'qp-isMain-eq': 1,
       'qp-type-in': '1,2'
     }, getQueryHeadersItem(_queryHeaderParams8, 'qp-orgCode-in'))]).then(function (x) {
+      var _x$2, _x$2$data$, _x$2$data$$channelInf;
       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);
+      var newData1 = [];
+      (_x$2 = x[1]) === null || _x$2 === void 0 ? void 0 : (_x$2$data$ = _x$2.data[0]) === null || _x$2$data$ === void 0 ? void 0 : (_x$2$data$$channelInf = _x$2$data$.channelInfoSon) === null || _x$2$data$$channelInf === void 0 ? void 0 : _x$2$data$$channelInf.forEach(function (item) {
+        newData1.push({
+          code: item.code,
+          name: item.name
+        });
+      });
+      x[1].data = newData1;
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择运营仓',
@@ -11871,18 +11910,18 @@ function commonFun(type, prefixUrl, parentProps) {
       name: 'qp-code-like',
       label: '客户编码'
     }, {
-      name: 'qp-createOrgCode-eq',
+      name: 'qp-createOrgCode-in',
       type: 'select',
       label: '创建组织',
       field: {
         type: 'select',
         props: {
-          // mode: 'multiple',
+          mode: 'multiple',
           notFoundContent: '暂无数据',
           allowClear: true,
           showSearch: true,
           showArrow: true,
-          // maxTagCount: 1,
+          maxTagCount: 1,
           optionFilterProp: 'children',
           filterOption: function filterOption(input, option) {
             return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
@@ -12360,24 +12399,100 @@ function commonFun(type, prefixUrl, parentProps) {
       }
     }, {
       name: 'qp-manageSupervisor-like',
+      type: 'select',
       label: '管理督导',
-      type: 'input'
+      field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            var _option$value;
+            debugger;
+            return ((_option$value = option === null || option === void 0 ? void 0 : option.value) !== null && _option$value !== void 0 ? _option$value : '').toLowerCase().includes(input.toLowerCase());
+          }
+        }
+      }
     }, {
       name: 'qp-directSupervisor-like',
+      type: 'select',
       label: '直接督导',
-      type: 'input'
+      field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            var _option$value2;
+            return ((_option$value2 = option === null || option === void 0 ? void 0 : option.value) !== null && _option$value2 !== void 0 ? _option$value2 : '').toLowerCase().includes(input.toLowerCase());
+          }
+        }
+      }
     }, {
       name: 'qp-distributionItem-like',
+      type: 'select',
       label: '分销商品',
-      type: 'input'
+      field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            var _option$value3;
+            return ((_option$value3 = option === null || option === void 0 ? void 0 : option.value) !== null && _option$value3 !== void 0 ? _option$value3 : '').toLowerCase().includes(input.toLowerCase());
+          }
+        }
+      }
     }, {
       name: 'qp-headItem-like',
+      type: 'select',
       label: '总部商品',
-      type: 'input'
+      field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            var _option$value4;
+            return ((_option$value4 = option === null || option === void 0 ? void 0 : option.value) !== null && _option$value4 !== void 0 ? _option$value4 : '').toLowerCase().includes(input.toLowerCase());
+          }
+        }
+      }
     }, {
       name: 'qp-storeChannelName-like',
+      type: 'select',
       label: '管理模式',
-      type: 'input'
+      field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            var _option$value5;
+            return ((_option$value5 = option === null || option === void 0 ? void 0 : option.value) !== null && _option$value5 !== void 0 ? _option$value5 : '').toLowerCase().includes(input.toLowerCase());
+          }
+        }
+      }
     }];
     var _queryHeaderParams10 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
@@ -12397,7 +12512,18 @@ function commonFun(type, prefixUrl, parentProps) {
       pageSize: 5000,
       currentPage: 1,
       'ctl-withAuth': true
-    }, getQueryHeadersItem(_queryHeaderParams10, 'ctl-withAuth'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams10, 'ctl-withAuth')), loadSelectSource$1("/channel-manage/store/selectStoreOperationalInfo", {}, {
+      headers: _objectSpread2({}, extralHeaders)
+    })]).then(function (x) {
+      var _x$3, _x$3$data$, _x$3$data$$channelInf, _x$4, _opList, _opList$, _opList2, _opList3, _opList4, _opList5, _opList6;
+      var newData1 = [];
+      (_x$3 = x[1]) === null || _x$3 === void 0 ? void 0 : (_x$3$data$ = _x$3.data[0]) === null || _x$3$data$ === void 0 ? void 0 : (_x$3$data$$channelInf = _x$3$data$.channelInfoSon) === null || _x$3$data$$channelInf === void 0 ? void 0 : _x$3$data$$channelInf.forEach(function (item) {
+        newData1.push({
+          code: item.code,
+          name: item.name
+        });
+      });
+      x[1].data = newData1;
       var channelDisabledJude = function channelDisabledJude(data) {
         return data['parentCode'] === '0';
       }; // 所属销售渠道 树节点不能点判断
@@ -12408,6 +12534,46 @@ function commonFun(type, prefixUrl, parentProps) {
       formatTreeDataSource(x, 1, 4, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
       formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude);
       formatSource(x, 3, 7, tableSearchForm, ['brandCode', 'name']);
+      var opRaw = (_x$4 = x[4]) === null || _x$4 === void 0 ? void 0 : _x$4.data;
+      // 新增label属性
+      (_opList = opList) === null || _opList === void 0 ? void 0 : _opList.forEach(function (r) {
+        r.label = r === null || r === void 0 ? void 0 : r.value;
+      });
+      var opList = Array.isArray(opRaw) ? opRaw : (opRaw === null || opRaw === void 0 ? void 0 : opRaw.items) || (opRaw === null || opRaw === void 0 ? void 0 : opRaw.list) || [];
+      if (Array.isArray(opList) && Array.isArray(opList[0]) && !((_opList$ = opList[0]) === null || _opList$ === void 0 ? void 0 : _opList$.field)) {
+        opList = opList[0];
+      }
+      var m1 = (_opList2 = opList) === null || _opList2 === void 0 ? void 0 : _opList2.filter(function (r) {
+        return (r === null || r === void 0 ? void 0 : r.field) === 'manage_supervisor' && trim(r === null || r === void 0 ? void 0 : r.value);
+      });
+      var m2 = (_opList3 = opList) === null || _opList3 === void 0 ? void 0 : _opList3.filter(function (r) {
+        return (r === null || r === void 0 ? void 0 : r.field) === 'direct_supervisor' && trim(r === null || r === void 0 ? void 0 : r.value);
+      });
+      var m3 = (_opList4 = opList) === null || _opList4 === void 0 ? void 0 : _opList4.filter(function (r) {
+        return (r === null || r === void 0 ? void 0 : r.field) === 'distribution_item' && trim(r === null || r === void 0 ? void 0 : r.value);
+      });
+      debugger;
+      var m4 = (_opList5 = opList) === null || _opList5 === void 0 ? void 0 : _opList5.filter(function (r) {
+        return (r === null || r === void 0 ? void 0 : r.field) === 'head_item' && trim(r === null || r === void 0 ? void 0 : r.value);
+      });
+      var m5 = (_opList6 = opList) === null || _opList6 === void 0 ? void 0 : _opList6.filter(function (r) {
+        return (r === null || r === void 0 ? void 0 : r.field) === 'store_channel_name' && trim(r === null || r === void 0 ? void 0 : r.value);
+      });
+      tableSearchForm[8] = _objectSpread2(_objectSpread2({}, tableSearchForm[8]), {}, {
+        initialSource: m1
+      });
+      tableSearchForm[9] = _objectSpread2(_objectSpread2({}, tableSearchForm[9]), {}, {
+        initialSource: m2
+      });
+      tableSearchForm[10] = _objectSpread2(_objectSpread2({}, tableSearchForm[10]), {}, {
+        initialSource: m3
+      });
+      tableSearchForm[11] = _objectSpread2(_objectSpread2({}, tableSearchForm[11]), {}, {
+        initialSource: m4
+      });
+      tableSearchForm[12] = _objectSpread2(_objectSpread2({}, tableSearchForm[12]), {}, {
+        initialSource: m5
+      });
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择商店',

package/dist/index.js

@@ -5346,7 +5346,9 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     viewShowValueStr = _ref.viewShowValueStr,
     searchStartLength = _ref.searchStartLength,
     _ref$isQuery = _ref.isQuery,
-    isQuery = _ref$isQuery === void 0 ? false : _ref$isQuery;
+    isQuery = _ref$isQuery === void 0 ? false : _ref$isQuery,
+    _ref$requireSearchCon = _ref.requireSearchCondition,
+    requireSearchCondition = _ref$requireSearchCon === void 0 ? false : _ref$requireSearchCon;
   var requestConfig = _objectSpread2({
     url: url,
     method: method,
@@ -5909,6 +5911,16 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
   };
   var onSearchTable = function onSearchTable() {
     var params = form.getFieldsValue();
+    // 必须选择一个值
+    if (requireSearchCondition) {
+      var hasValidValue = Object.values(params).some(function (value) {
+        return Array.isArray(value) && value.length > 0 || typeof value === 'string' && value.trim().length > 0;
+      });
+      if (!hasValidValue) {
+        antd.message.warning('请至少选择一个搜索条件');
+        return;
+      }
+    }
     setModalSearched(true);
     setTableFormParams(params);
     getData(_objectSpread2(_objectSpread2({}, params), {}, {
@@ -6203,7 +6215,26 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     });
   };
   var renderShowTable = function renderShowTable(tableList, type) {
-    var tableBoxHeighth = getTableHeigth(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableSearchForm);
+    var _modalTableProps$tabl;
+    var viCount = (modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.visibleFieldsCount) || defaultVisibleFieldsCount;
+    var canExpand = hasMoreQueryFields(modalTableProps);
+    var collapsedList = modalTableProps === null || modalTableProps === void 0 ? void 0 : (_modalTableProps$tabl = modalTableProps.tableSearchForm) === null || _modalTableProps$tabl === void 0 ? void 0 : _modalTableProps$tabl.slice(0, viCount);
+    var baseHeight = getTableHeigth(collapsedList);
+    var rowsCollapsed = getFormRowInfo(collapsedList, modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableSearchColSpan).totalRows;
+    var rowsExpandedData = getFormRowInfo(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableSearchForm, modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableSearchColSpan);
+    var rowsExpanded = rowsExpandedData.totalRows;
+    var isMoreAction = false;
+    if (24 / (modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableSearchColSpan) - rowsExpandedData.emptyArray.length === 1) {
+      rowsExpanded++;
+      isMoreAction = true;
+    }
+    var extraRows = !collapsed && canExpand ? Math.max(0, rowsExpanded - rowsCollapsed) : 0;
+    var tableBoxHeighth = baseHeight;
+    if (isMoreAction && extraRows > 0) {
+      tableBoxHeighth = tableBoxHeighth + (extraRows - 1 ? extraRows - 1 : 0) * 34 + 32;
+    } else {
+      tableBoxHeighth = tableBoxHeighth + extraRows * 34;
+    }
     var x = (tableList === null || tableList === void 0 ? void 0 : tableList.length) ? 82 : 28; // 无数据没有分页，有数据计算减去：分页 24+16*2+10 「高 + margin * 2 + paddingBottom 10 」
     var oSY = "calc(100vh - ".concat(tableBoxHeighth, "px - ").concat(x, "px)");
     var mTB = "calc(50vh - ".concat(tableBoxHeighth / 2, "px - ").concat(x / 2, "px - 40px)");
@@ -10478,7 +10509,7 @@ function commonFun(type, prefixUrl, parentProps) {
     }, {
       name: 'qp-zzdlbm-in',
       type: 'select',
-      label: '大类',
+      label: '品类',
       field: {
         type: 'select',
         props: {
@@ -10497,7 +10528,7 @@ function commonFun(type, prefixUrl, parentProps) {
     }, {
       name: 'qp-zzzlbm-in',
       type: 'select',
-      label: '中类',
+      label: '大类',
       field: {
         type: 'select',
         props: {
@@ -10516,7 +10547,7 @@ function commonFun(type, prefixUrl, parentProps) {
     }, {
       name: 'qp-zzxlbm-in',
       type: 'select',
-      label: '小类',
+      label: '中类',
       field: {
         type: 'select',
         props: {
@@ -10606,7 +10637,6 @@ function commonFun(type, prefixUrl, parentProps) {
       tableSearchForm: tableSearchForm,
       isHorizontally: true,
       tableSearchColSpan: 6,
-      visibleFieldsCount: 13,
       tableColumns: [{
         title: '序号',
         dataIndex: 'keyIndex',
@@ -11366,14 +11396,25 @@ function commonFun(type, prefixUrl, parentProps) {
     }, 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 _x$, _x$$data$, _x$$data$$channelInfo;
+      debugger;
+      // 战区限制一级数据
+      var newData1 = [];
+      (_x$ = x[0]) === null || _x$ === void 0 ? void 0 : (_x$$data$ = _x$.data[0]) === null || _x$$data$ === void 0 ? void 0 : (_x$$data$$channelInfo = _x$$data$.channelInfoSon) === null || _x$$data$$channelInfo === void 0 ? void 0 : _x$$data$$channelInfo.forEach(function (item) {
+        newData1.push({
+          code: item.code,
+          name: item.name
+        });
+      });
+      x[0].data = newData1;
       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);
+      formatTreeDataSource(x, 0, 3, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
+      formatTreeDataSource(x, 1, 4, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude);
     });
     tableSearchForm = [{
       name: 'realWarehouseName*multiInput',
@@ -11388,17 +11429,9 @@ function commonFun(type, prefixUrl, parentProps) {
       type: 'select',
       label: '逻辑仓类型',
       initialSource: getDictionarySource$1('SC00004')
-    }, {
-      name: 'belongArea',
-      field: {
-        type: 'select',
-        props: {
-          mode: 'multiple'
-        }
-      },
-      label: '管理大区',
-      initialSource: getDictionarySource$1('BUSINESS_belongArea')
-    }, {
+    },
+    // { name: 'belongArea', field: {type: 'select', props: {mode: 'multiple',}}, label: '管理大区', initialSource: getDictionarySource('BUSINESS_belongArea'),   },
+    {
       name: 'qp-channelCode-in',
       type: 'treeSelect',
       label: '战区',
@@ -11499,7 +11532,7 @@ function commonFun(type, prefixUrl, parentProps) {
         },
         width: 100
       }, {
-        title: '所属销售渠道',
+        title: '战区',
         dataIndex: 'channelName',
         defaultSort: 4,
         width: 100
@@ -11580,11 +11613,11 @@ function commonFun(type, prefixUrl, parentProps) {
         }
       }
     }, {
-      name: 'qp-channelCode-in',
-      type: 'treeSelect',
-      label: '销售渠道',
+      name: 'qp-operationWarehouseClassification-in',
+      type: 'select',
+      label: '分类',
       field: {
-        type: 'treeSelect',
+        type: 'select',
         props: {
           multiple: true,
           treeData: [],
@@ -11600,7 +11633,8 @@ function commonFun(type, prefixUrl, parentProps) {
           },
           showCheckedStrategy: 'TreeSelect.SHOW_ALL'
         }
-      }
+      },
+      initialSource: getDictionarySource$1('BASIC_OPS_WH_TYPE')
     }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
       name: 'qp-status-eq',
       type: 'select',
@@ -11618,11 +11652,16 @@ function commonFun(type, prefixUrl, parentProps) {
       'qp-isMain-eq': 1,
       'qp-type-in': '1,2'
     }, getQueryHeadersItem(_queryHeaderParams8, 'qp-orgCode-in'))]).then(function (x) {
+      var _x$2, _x$2$data$, _x$2$data$$channelInf;
       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);
+      var newData1 = [];
+      (_x$2 = x[1]) === null || _x$2 === void 0 ? void 0 : (_x$2$data$ = _x$2.data[0]) === null || _x$2$data$ === void 0 ? void 0 : (_x$2$data$$channelInf = _x$2$data$.channelInfoSon) === null || _x$2$data$$channelInf === void 0 ? void 0 : _x$2$data$$channelInf.forEach(function (item) {
+        newData1.push({
+          code: item.code,
+          name: item.name
+        });
+      });
+      x[1].data = newData1;
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择运营仓',
@@ -11894,18 +11933,18 @@ function commonFun(type, prefixUrl, parentProps) {
       name: 'qp-code-like',
       label: '客户编码'
     }, {
-      name: 'qp-createOrgCode-eq',
+      name: 'qp-createOrgCode-in',
       type: 'select',
       label: '创建组织',
       field: {
         type: 'select',
         props: {
-          // mode: 'multiple',
+          mode: 'multiple',
           notFoundContent: '暂无数据',
           allowClear: true,
           showSearch: true,
           showArrow: true,
-          // maxTagCount: 1,
+          maxTagCount: 1,
           optionFilterProp: 'children',
           filterOption: function filterOption(input, option) {
             return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
@@ -12383,24 +12422,100 @@ function commonFun(type, prefixUrl, parentProps) {
       }
     }, {
       name: 'qp-manageSupervisor-like',
+      type: 'select',
       label: '管理督导',
-      type: 'input'
+      field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            var _option$value;
+            debugger;
+            return ((_option$value = option === null || option === void 0 ? void 0 : option.value) !== null && _option$value !== void 0 ? _option$value : '').toLowerCase().includes(input.toLowerCase());
+          }
+        }
+      }
     }, {
       name: 'qp-directSupervisor-like',
+      type: 'select',
       label: '直接督导',
-      type: 'input'
+      field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            var _option$value2;
+            return ((_option$value2 = option === null || option === void 0 ? void 0 : option.value) !== null && _option$value2 !== void 0 ? _option$value2 : '').toLowerCase().includes(input.toLowerCase());
+          }
+        }
+      }
     }, {
       name: 'qp-distributionItem-like',
+      type: 'select',
       label: '分销商品',
-      type: 'input'
+      field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            var _option$value3;
+            return ((_option$value3 = option === null || option === void 0 ? void 0 : option.value) !== null && _option$value3 !== void 0 ? _option$value3 : '').toLowerCase().includes(input.toLowerCase());
+          }
+        }
+      }
     }, {
       name: 'qp-headItem-like',
+      type: 'select',
       label: '总部商品',
-      type: 'input'
+      field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            var _option$value4;
+            return ((_option$value4 = option === null || option === void 0 ? void 0 : option.value) !== null && _option$value4 !== void 0 ? _option$value4 : '').toLowerCase().includes(input.toLowerCase());
+          }
+        }
+      }
     }, {
       name: 'qp-storeChannelName-like',
+      type: 'select',
       label: '管理模式',
-      type: 'input'
+      field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            var _option$value5;
+            return ((_option$value5 = option === null || option === void 0 ? void 0 : option.value) !== null && _option$value5 !== void 0 ? _option$value5 : '').toLowerCase().includes(input.toLowerCase());
+          }
+        }
+      }
     }];
     var _queryHeaderParams10 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
@@ -12420,7 +12535,18 @@ function commonFun(type, prefixUrl, parentProps) {
       pageSize: 5000,
       currentPage: 1,
       'ctl-withAuth': true
-    }, getQueryHeadersItem(_queryHeaderParams10, 'ctl-withAuth'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams10, 'ctl-withAuth')), loadSelectSource$1("/channel-manage/store/selectStoreOperationalInfo", {}, {
+      headers: _objectSpread2({}, extralHeaders)
+    })]).then(function (x) {
+      var _x$3, _x$3$data$, _x$3$data$$channelInf, _x$4, _opList, _opList$, _opList2, _opList3, _opList4, _opList5, _opList6;
+      var newData1 = [];
+      (_x$3 = x[1]) === null || _x$3 === void 0 ? void 0 : (_x$3$data$ = _x$3.data[0]) === null || _x$3$data$ === void 0 ? void 0 : (_x$3$data$$channelInf = _x$3$data$.channelInfoSon) === null || _x$3$data$$channelInf === void 0 ? void 0 : _x$3$data$$channelInf.forEach(function (item) {
+        newData1.push({
+          code: item.code,
+          name: item.name
+        });
+      });
+      x[1].data = newData1;
       var channelDisabledJude = function channelDisabledJude(data) {
         return data['parentCode'] === '0';
       }; // 所属销售渠道 树节点不能点判断
@@ -12431,6 +12557,46 @@ function commonFun(type, prefixUrl, parentProps) {
       formatTreeDataSource(x, 1, 4, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
       formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude);
       formatSource(x, 3, 7, tableSearchForm, ['brandCode', 'name']);
+      var opRaw = (_x$4 = x[4]) === null || _x$4 === void 0 ? void 0 : _x$4.data;
+      // 新增label属性
+      (_opList = opList) === null || _opList === void 0 ? void 0 : _opList.forEach(function (r) {
+        r.label = r === null || r === void 0 ? void 0 : r.value;
+      });
+      var opList = Array.isArray(opRaw) ? opRaw : (opRaw === null || opRaw === void 0 ? void 0 : opRaw.items) || (opRaw === null || opRaw === void 0 ? void 0 : opRaw.list) || [];
+      if (Array.isArray(opList) && Array.isArray(opList[0]) && !((_opList$ = opList[0]) === null || _opList$ === void 0 ? void 0 : _opList$.field)) {
+        opList = opList[0];
+      }
+      var m1 = (_opList2 = opList) === null || _opList2 === void 0 ? void 0 : _opList2.filter(function (r) {
+        return (r === null || r === void 0 ? void 0 : r.field) === 'manage_supervisor' && _.trim(r === null || r === void 0 ? void 0 : r.value);
+      });
+      var m2 = (_opList3 = opList) === null || _opList3 === void 0 ? void 0 : _opList3.filter(function (r) {
+        return (r === null || r === void 0 ? void 0 : r.field) === 'direct_supervisor' && _.trim(r === null || r === void 0 ? void 0 : r.value);
+      });
+      var m3 = (_opList4 = opList) === null || _opList4 === void 0 ? void 0 : _opList4.filter(function (r) {
+        return (r === null || r === void 0 ? void 0 : r.field) === 'distribution_item' && _.trim(r === null || r === void 0 ? void 0 : r.value);
+      });
+      debugger;
+      var m4 = (_opList5 = opList) === null || _opList5 === void 0 ? void 0 : _opList5.filter(function (r) {
+        return (r === null || r === void 0 ? void 0 : r.field) === 'head_item' && _.trim(r === null || r === void 0 ? void 0 : r.value);
+      });
+      var m5 = (_opList6 = opList) === null || _opList6 === void 0 ? void 0 : _opList6.filter(function (r) {
+        return (r === null || r === void 0 ? void 0 : r.field) === 'store_channel_name' && _.trim(r === null || r === void 0 ? void 0 : r.value);
+      });
+      tableSearchForm[8] = _objectSpread2(_objectSpread2({}, tableSearchForm[8]), {}, {
+        initialSource: m1
+      });
+      tableSearchForm[9] = _objectSpread2(_objectSpread2({}, tableSearchForm[9]), {}, {
+        initialSource: m2
+      });
+      tableSearchForm[10] = _objectSpread2(_objectSpread2({}, tableSearchForm[10]), {}, {
+        initialSource: m3
+      });
+      tableSearchForm[11] = _objectSpread2(_objectSpread2({}, tableSearchForm[11]), {}, {
+        initialSource: m4
+      });
+      tableSearchForm[12] = _objectSpread2(_objectSpread2({}, tableSearchForm[12]), {}, {
+        initialSource: m5
+      });
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择商店',

package/package.json

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

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

@@ -6,7 +6,7 @@ import { handleTextOverflow, tableColumnsImage, handleTooltip } from '@/componen
 import { getSkuImg } from '@/utils/TableUtils';
 import { getEmployeeCode, getCurrentTargetBgId } from '@/utils/LocalstorageUtils';
 import { Image } from 'antd';
-import { isBoolean } from 'lodash';
+import { isBoolean, trim } from 'lodash';
 
 const hasDictSharingType =  getDictionarySource('UC000013')?.length;
 const sharingTypeDataList = hasDictSharingType && getDictionarySource('UC000013') || sharingType
@@ -487,7 +487,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
                 option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
             },
           } },
-        { name: 'qp-zzdlbm-in', type: 'select', label: '大类', field: {
+        { name: 'qp-zzdlbm-in', type: 'select', label: '品类', field: {
             type: 'select',
             props: {
               mode: 'multiple',
@@ -501,7 +501,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
                 option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
             },
           } },
-        { name: 'qp-zzzlbm-in', type: 'select', label: '中类', field: {
+        { name: 'qp-zzzlbm-in', type: 'select', label: '大类', field: {
             type: 'select',
             props: {
               mode: 'multiple',
@@ -515,7 +515,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
                 option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
             },
           } },
-        { name: 'qp-zzxlbm-in', type: 'select', label: '小类', field: {
+        { name: 'qp-zzxlbm-in', type: 'select', label: '中类', field: {
             type: 'select',
             props: {
               mode: 'multiple',
@@ -595,7 +595,6 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       tableSearchForm,
       isHorizontally: true,
       tableSearchColSpan: 6,
-      visibleFieldsCount: 13,
       tableColumns: [
         {
           title: '序号',
@@ -1352,16 +1351,26 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
         'qp-status-eq': 1,
       },getQueryHeadersItem(queryHeaderParams,'qp-orgCode-in')),
     ]).then((x: any)=>{
+      debugger
+      // 战区限制一级数据
+      const newData1 = [];
+      x[0]?.data[0]?.channelInfoSon?.forEach((item: any) => {
+        newData1.push({
+          code: item.code,
+          name: item.name
+        })
+      })
+      x[0].data = newData1;
       const channelDisabledJude = (data: any) => data['parentCode'] === '0'; // 所属销售渠道 树节点不能点判断
       const areaDisabledJude = (data: any) => data['parent'] === '0'; // 所属营销区域 树节点不能点判断
-      formatTreeDataSource(x, 0, 4, tableSearchForm, ['code','name'], 'channelInfoSon', channelDisabledJude)
-      formatTreeDataSource(x, 1, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude)
+      formatTreeDataSource(x, 0, 3, tableSearchForm, ['code','name'], 'channelInfoSon', channelDisabledJude)
+      formatTreeDataSource(x, 1, 4, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude)
     })
     tableSearchForm = [
       { name: 'realWarehouseName*multiInput', label: '逻辑仓名称', type: 'multipleQueryInput' },
       { name: 'realWarehouseCode*multiInput', label: '逻辑仓编码', type: 'multipleQueryInput' },
       { name: 'qp-realWarehouseType-eq', type: 'select', label: '逻辑仓类型', initialSource: getDictionarySource('SC00004')  },
-      { name: 'belongArea', field: {type: 'select', props: {mode: 'multiple',}}, label: '管理大区', initialSource: getDictionarySource('BUSINESS_belongArea'),   },
+      // { name: 'belongArea', field: {type: 'select', props: {mode: 'multiple',}}, label: '管理大区', initialSource: getDictionarySource('BUSINESS_belongArea'),   },
       {
         name: 'qp-channelCode-in', type: 'treeSelect', label: '战区', field: {
           type: 'treeSelect',
@@ -1453,7 +1462,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           width: 100,
         },
         {
-          title: '所属销售渠道',
+          title: '战区',
           dataIndex: 'channelName',
           defaultSort: 4,
           width: 100,
@@ -1530,8 +1539,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           },
         } },
         {
-        name: 'qp-channelCode-in', type: 'treeSelect', label: '销售渠道', field: {
-          type: 'treeSelect',
+        name: 'qp-operationWarehouseClassification-in', type: 'select', label: '分类', field: {
+          type: 'select',
           props: {
             multiple: true,
             treeData: [],
@@ -1546,7 +1555,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
               option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
             showCheckedStrategy: 'TreeSelect.SHOW_ALL',
           },
-        }
+        },
+         initialSource: getDictionarySource('BASIC_OPS_WH_TYPE')
       },
       ...(modalTableBusProps?.needStatusSearch?[{ name: 'qp-status-eq', type: 'select', label: '运营仓状态', initialSource: getDictionarySource('SC00001')  }]:[]),
     ]
@@ -1560,8 +1570,11 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       },getQueryHeadersItem(queryHeaderParams,'qp-orgCode-in')),
     ]).then((x: any)=>{
       formatSource(x,0, 2, tableSearchForm,['groupCode','groupName']);
-      const channelDisabledJude = (data: any) => data['parentCode'] === '0'; // 所属销售渠道 树节点不能点判断
-      formatTreeDataSource(x, 1, 3, tableSearchForm, ['code','name'], 'channelInfoSon', channelDisabledJude)
+      const newData1: any[] = [];
+      x[1]?.data[0]?.channelInfoSon?.forEach((item: any) => {
+        newData1.push({ code: item.code, name: item.name })
+      });
+      x[1].data = newData1;
     })
     modalTableProps = {
       modalTableTitle: '选择运营仓',
@@ -1844,15 +1857,15 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
     tableSearchForm = [
       { name: 'qp-name-like', label: '客户名称' },
       { name: 'qp-code-like', label: '客户编码' },
-      { name: 'qp-createOrgCode-eq', type: 'select', label: '创建组织', field: {
+      { name: 'qp-createOrgCode-in', type: 'select', label: '创建组织', field: {
           type: 'select',
           props: {
-            // mode: 'multiple',
+            mode: 'multiple',
             notFoundContent: '暂无数据',
             allowClear: true,
             showSearch: true,
             showArrow: true,
-            // maxTagCount: 1,
+            maxTagCount: 1,
             optionFilterProp: 'children',
             filterOption: (input: string, option: { props: { children: string } }) =>
               option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
@@ -2281,11 +2294,74 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           },
         },
       },
-      { name: 'qp-manageSupervisor-like', label: '管理督导', type: 'input' },
-      { name: 'qp-directSupervisor-like', label: '直接督导', type: 'input' },
-      { name: 'qp-distributionItem-like', label: '分销商品', type: 'input' },
-      { name: 'qp-headItem-like', label: '总部商品', type: 'input' },
-      { name: 'qp-storeChannelName-like', label: '管理模式', type: 'input' },
+      { name: 'qp-manageSupervisor-like', type: 'select', label: '管理督导', field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: (input: string, option: { props: { children: string } }) =>
+             {
+              debugger
+              return (option?.value ?? '').toLowerCase().includes(input.toLowerCase())
+             }
+        },
+      } },
+      { name: 'qp-directSupervisor-like', type: 'select', label: '直接督导', field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: (input: string, option: { props: { children: string } }) =>
+             (option?.value ?? '').toLowerCase().includes(input.toLowerCase())
+        },
+      } },
+      { name: 'qp-distributionItem-like', type: 'select', label: '分销商品', field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: (input: string, option: { props: { children: string } }) =>
+             (option?.value ?? '').toLowerCase().includes(input.toLowerCase())
+        },
+      } },
+      { name: 'qp-headItem-like', type: 'select', label: '总部商品', field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: (input: string, option: { props: { children: string } }) =>
+             (option?.value ?? '').toLowerCase().includes(input.toLowerCase())
+        },
+      } },
+      { name: 'qp-storeChannelName-like', type: 'select', label: '管理模式', field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: (input: string, option: { props: { children: string } }) =>
+             (option?.value ?? '').toLowerCase().includes(input.toLowerCase())
+        },
+      } },
     ]
     const queryHeaderParams  = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
     Promise.all([
@@ -2306,14 +2382,43 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
         pageSize: 5000,
         currentPage: 1,
         'ctl-withAuth': true,
-      },getQueryHeadersItem(queryHeaderParams,'ctl-withAuth'))
+      },getQueryHeadersItem(queryHeaderParams,'ctl-withAuth')),
+      loadSelectSource(`/channel-manage/store/selectStoreOperationalInfo`, {}, {
+        headers: {
+          ...extralHeaders
+        },
+      })
     ]).then((x: any)=>{
+      const newData1: any[] = [];
+      x[1]?.data[0]?.channelInfoSon?.forEach((item: any) => {
+        newData1.push({ code: item.code, name: item.name })
+      });
+      x[1].data = newData1;
       const channelDisabledJude = (data: any) => data['parentCode'] === '0'; // 所属销售渠道 树节点不能点判断
       const areaDisabledJude = (data: any) => data['parent'] === '0'; // 所属营销区域 树节点不能点判断
       formatSource(x,0, 3, tableSearchForm);
       formatTreeDataSource(x, 1, 4, tableSearchForm, ['code','name'], 'channelInfoSon', channelDisabledJude)
       formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude)
       formatSource(x,3, 7, tableSearchForm, ['brandCode', 'name']);
+      
+      const opRaw = x[4]?.data;
+      // 新增label属性
+      opList?.forEach((r: any) => {
+        r.label = r?.value;
+      })
+      let opList = Array.isArray(opRaw) ? opRaw : (opRaw?.items || opRaw?.list || []);
+      if (Array.isArray(opList) && Array.isArray(opList[0]) && !opList[0]?.field) { opList = opList[0]; }
+      const m1 = opList?.filter((r: any) => r?.field === 'manage_supervisor' && trim(r?.value));
+      const m2 = opList?.filter((r: any) => r?.field === 'direct_supervisor' && trim(r?.value));
+      const m3 = opList?.filter((r: any) => r?.field === 'distribution_item' && trim(r?.value));
+      debugger
+      const m4 = opList?.filter((r: any) => r?.field === 'head_item' && trim(r?.value));
+      const m5 = opList?.filter((r: any) => r?.field === 'store_channel_name' && trim(r?.value));
+      tableSearchForm[8] = { ...tableSearchForm[8], initialSource: m1 };
+      tableSearchForm[9] = { ...tableSearchForm[9], initialSource: m2 };
+      tableSearchForm[10] = { ...tableSearchForm[10], initialSource: m3 };
+      tableSearchForm[11] = { ...tableSearchForm[11], initialSource: m4 };
+      tableSearchForm[12] = { ...tableSearchForm[12], initialSource: m5 };
     })
     modalTableProps = {
       modalTableTitle: '选择商店',

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

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

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

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