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

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

@@ -6,13 +6,14 @@ 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
 
 export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
   const { requestConfig:requestConfigProp={},  selectProps:selectConfigProps={}, modalTableProps:modalTableBusProps={}, hiddenFields=[]} = parentProps || {};
-  
+
   // 默认type === 'supplier' 供应商选择器
   let requestConfig = {
     init: true,
@@ -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;
   }
@@ -332,7 +344,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
     }
     tableSearchForm =  [
       { name: 'qp-skuCode-in', label: 'SKU编码', field: {
-        type:'multipleQuerySearchSelect', 
+        type:'multipleQuerySearchSelect',
         props: {
           selectProps: {
             mode: "multiple",
@@ -354,7 +366,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       } },
       { name: 'qp-skuName-like', label: 'SKU名称' },
       { name: 'qp-itemCode-in', label: 'SPU编码', field: {
-        type:'multipleQuerySearchSelect', 
+        type:'multipleQuerySearchSelect',
         props: {
           selectProps: {
             placeholder: '请输入SPU编码查询'
@@ -511,11 +523,11 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       placeholder: '输入商品(SPU)编码或名称',
       renderTableColumns: [
         {
-          title: '商品编码(SPU)',
+          title: 'SPU编码',
           dataIndex: 'itemCode',
         },
         {
-          title: '商品名称(SPU)',
+          title: 'SPU名称',
           dataIndex: 'name',
         },
       ],
@@ -535,8 +547,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ...requestConfigProp,
     }
     tableSearchForm = [
-      { name: 'itemCode*multiInput', label: '商品编码(SPU)', type: 'multipleQueryInput' },
-      { name: 'name*multiInput', label: '商品名称(SPU)', type: 'multipleQueryInput' },
+      { name: 'itemCode*multiInput', label: 'SPU编码', type: 'multipleQueryInput' },
+      { name: 'name*multiInput', label: 'SPU名称', type: 'multipleQueryInput' },
       { name: 'qp-brandId-in', type: 'select', label: '品牌', field: {
           type: 'select',
           props: {
@@ -614,12 +626,12 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           defaultSort: 0,
         },
         {
-          title: '商品编码(SPU)',
+          title: 'SPU编码',
           dataIndex: 'itemCode',
           defaultSort: 1,
         },
         {
-          title: '商品名称(SPU) ',
+          title: 'SPU名称',
           dataIndex: 'name',
           defaultSort: 2,
         },
@@ -721,9 +733,9 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
               option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
           },
         } },
-        { 
-          name: 'qp-year-in', 
-          label: '年份', 
+        {
+          name: 'qp-year-in',
+          label: '年份',
           field: {
             type: 'itemPropertySelector',
             props: {
@@ -732,9 +744,9 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
             }
           }
         },
-        { 
-          name: 'qp-season-in', 
-          label: '季节', 
+        {
+          name: 'qp-season-in',
+          label: '季节',
           field: {
             type: 'itemPropertySelector',
             props: {
@@ -743,9 +755,9 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
             }
           }
         },
-        { 
-          name: 'qp-zzdlbm-in', 
-          label: '大类', 
+        {
+          name: 'qp-zzdlbm-in',
+          label: '大类',
           field: {
             type: 'itemPropertySelector',
             props: {
@@ -754,9 +766,9 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
             }
           }
         },
-        { 
-          name: 'qp-zzzlbm-in', 
-          label: '中类', 
+        {
+          name: 'qp-zzzlbm-in',
+          label: '中类',
           field: {
             type: 'itemPropertySelector',
             props: {
@@ -765,9 +777,9 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
             }
           }
         },
-        { 
-          name: 'qp-zzxlbm-in', 
-          label: '小类', 
+        {
+          name: 'qp-zzxlbm-in',
+          label: '小类',
           field: {
             type: 'itemPropertySelector',
             props: {
@@ -958,7 +970,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ['colorName', 'categoryId', 'classId', 'brandId'],
       hiddenFields,
     );
-    const fieldLoadSource = fieldsRequest.map((i: any) => loadSelectSource(i.url, i.params,options));
+    const fieldLoadSource = fieldsRequest.map((i: any) => loadSelectSource(i.url, i.params, i.options));
     requestConfig = {
       url: `${prefixUrl.selectPrefix}/skc/skcSelect`,
       filter: 'qp-code,name-orGroup,like', // 过滤参数
@@ -1186,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: '选择逻辑仓',
@@ -1218,10 +1302,36 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           defaultSort: 3,
           render: (text: number) => getDictionaryTextByValue('SC00004', text),
         },
+        {
+          title: '运营组名称',
+          dataIndex: 'groupCode',
+          defaultSort: 7,
+          render: (text: any, record) => record?.groupName ? `【${text}】${record?.groupName}` : "",
+          width: 100,
+        },
+        {
+          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: 8,
           render: (text: number) => getDictionaryTextByValue('SC00001', text),
         }]:[]),
       ],
@@ -1276,13 +1386,39 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
               option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
           },
         } },
-      ...(modalTableBusProps?.needStatusSearch?[{ name: 'qp-status-eq', type: 'select', label: '运营仓状态', initialSource: getDictionarySource('SC00001')  }]:[])
+        {
+        name: 'qp-channelCode-in', type: 'treeSelect', label: '销售渠道', field: {
+          type: 'treeSelect',
+          props: {
+            multiple: true,
+            treeData: [],
+            treeCheckable: false,
+            notFoundContent: '暂无数据',
+            allowClear: true,
+            showSearch: true,
+            showArrow: true,
+            maxTagCount: 1,
+            optionFilterProp: 'children',
+            filterOption: (input: string, option: { props: { children: string } }) =>
+              option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
+            showCheckedStrategy: 'TreeSelect.SHOW_ALL',
+          },
+        }
+      },
+      ...(modalTableBusProps?.needStatusSearch?[{ name: 'qp-status-eq', type: 'select', label: '运营仓状态', initialSource: getDictionarySource('SC00001')  }]:[]),
     ]
     const queryHeaderParams  = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
     Promise.all([
       loadSelectSource(`${prefixUrl.formSelectFix}/groupInfo/listNoPage`, { 'qp-status-eq': 1 },getQueryHeadersItem(queryHeaderParams,'qp-groupCode-in')),
+      loadSelectSource(`/channel-manage/channelInfo/tree`, {
+        'qp-status-eq': 10,
+        'qp-isMain-eq': 1,
+        'qp-type-in': '1,2',
+      },getQueryHeadersItem(queryHeaderParams,'qp-orgCode-in')),
     ]).then((x: any)=>{
       formatSource(x,0, 2, tableSearchForm,['groupCode','groupName']);
+      const channelDisabledJude = (data: any) => data['parentCode'] === '0'; // 所属销售渠道 树节点不能点判断
+      formatTreeDataSource(x, 1, 3, tableSearchForm, ['code','name'], 'channelInfoSon', channelDisabledJude)
     })
     modalTableProps = {
       modalTableTitle: '选择运营仓',
@@ -1314,6 +1450,12 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           defaultSort: 4,
           render: (text: number) => getDictionaryTextByValue('SC00001', text),
         }]:[]),
+         {
+          title: '所属销售渠道',
+          dataIndex: 'channelName',
+          defaultSort: 5,
+          width: 100,
+        },
       ],
       ...modalTableBusProps,
     }
@@ -1587,15 +1729,66 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
               option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
           },
         } },
-    ]
+        {
+        name: 'qp-saleChannel-in', type: 'treeSelect', label: '销售渠道', field: {
+          type: 'treeSelect',
+          props: {
+            multiple: true,
+            treeData: [],
+            treeCheckable: false,
+            notFoundContent: '暂无数据',
+            allowClear: true,
+            showSearch: true,
+            showArrow: true,
+            maxTagCount: 1,
+            optionFilterProp: 'children',
+            filterOption: (input: string, option: { props: { children: string } }) =>
+              option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
+            showCheckedStrategy: 'TreeSelect.SHOW_ALL',
+          },
+        }
+      },
+      {
+        name: 'qp-refCode-in', type: 'treeSelect', label: '营销区域', field: {
+          type: 'treeSelect',
+          props: {
+            multiple: true,
+            treeData: [],
+            treeCheckable: false,
+            notFoundContent: '暂无数据',
+            allowClear: true,
+            showSearch: true,
+            showArrow: true,
+            maxTagCount: 1,
+            optionFilterProp: 'children',
+            filterOption: (input: string, option: { props: { children: string } }) =>
+              option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
+
+            showCheckedStrategy: 'TreeSelect.SHOW_ALL',
+          },
+        }
+      },
+    ];
     const queryHeaderParams  = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
     Promise.all([
       loadSelectSource(`${prefixUrl.formSelectFix}/org/listNoPage`, {},getQueryHeadersItem(queryHeaderParams,'qp-createOrgCode-eq')),
+      loadSelectSource(`/channel-manage/channelInfo/tree`, {
+        'qp-status-eq': 10,
+        'qp-isMain-eq': 1,
+        'qp-type-in': '1,2',
+      },getQueryHeadersItem(queryHeaderParams,'qp-orgCode-in')),
+      loadSelectSource(`/channel-manage/tagNode/getTree/10`, {
+        'qp-status-eq': 1,
+      },getQueryHeadersItem(queryHeaderParams,'qp-orgCode-in')),
     ]).then((x: any)=>{
       const firstElement = x?.[0];
       const allList = firstElement && [firstElement, firstElement];
       formatSource(allList,0, 2, tableSearchForm);
       formatSource(allList,1, 3, tableSearchForm);
+      const channelDisabledJude = (data: any) => data['parentCode'] === '0'; // 所属销售渠道 树节点不能点判断
+      const areaDisabledJude = (data: any) => data['parent'] === '0'; // 所属营销区域 树节点不能点判断
+      formatTreeDataSource(x, 1, 4, tableSearchForm, ['code','name'], 'channelInfoSon', channelDisabledJude)
+      formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude)
     })
     modalTableProps = {
       modalTableTitle: '选择客户',
@@ -1625,6 +1818,19 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           title: '使用组织',
           dataIndex: 'salesOrgName',
           defaultSort: 4,
+          width: 100,
+        },
+         {
+          title: '所属销售渠道',
+          dataIndex: 'channelName',
+          defaultSort: 5,
+          width: 100,
+        },
+        {
+          title: '营销区域',
+          dataIndex: 'commonRelationAreaName',
+          defaultSort: 6,
+          width: 100,
         },
       ],
       ...modalTableBusProps
@@ -1661,8 +1867,10 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ...requestConfigProp,
     }
     tableSearchForm = [
-      { name: 'qp-name-like', label: '店铺名称' },
-      { name: 'qp-code-like', label: '店铺编码' },
+      { name: 'name*multiInput', label: '店铺名称', type: 'multipleQueryInput' },
+      { name: 'code*multiInput', label: '店铺编码', type: 'multipleQueryInput' },
+      // { name: 'qp-name-like', label: '店铺名称' },
+      // { name: 'qp-code-like', label: '店铺编码' },
       { name: 'qp-conglomerateCode-in', type: 'select', label: '归属集团', field: {
           type: 'select',
           props: {
@@ -1836,6 +2044,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 +2054,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 +2069,75 @@ 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')
+    },
+      {
+        name: "qp-brandCode-in",
+        label: "品牌",
+        field: {
+          type:'select',
+          props: {
+            mode: 'multiple',
+            notFoundContent: '暂无数据',
+            allowClear: true,
+            showSearch: true,
+            showArrow: true,
+            maxTagCount: 1,
+            optionFilterProp: 'children',
+            filterOption: (input: string, option: { props: { children: string } }) =>
+              option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
+          },
+        },
+      },
     ]
     const queryHeaderParams  = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
     Promise.all([
@@ -1868,8 +2146,26 @@ 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')),
+      loadSelectSource(`${prefixUrl.formSelectFix}/brand/queryBrandList`, {
+        pageSize: 5000,
+        currentPage: 1,
+        'ctl-withAuth': true,
+      },getQueryHeadersItem(queryHeaderParams,'ctl-withAuth'))
     ]).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, ['code','name'], 'channelInfoSon', channelDisabledJude)
+      formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude)
+      formatSource(x,3, 7, tableSearchForm, ['brandCode', 'name']);
     })
     modalTableProps = {
       modalTableTitle: '选择商店',
@@ -1879,34 +2175,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
     }
   }
@@ -2199,7 +2521,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
         } },
       ...(modalTableBusProps?.needTypeSearch?[{ name: 'qp-employmentType-eq', type: 'select', label: '员工类型', initialSource: employeeType  }]:[]),
       { name: 'qp-email-like', label: '邮箱' },
-      { name: 'qp-officeTelephone-like', label: '手机号' },
+      { name: 'qp-phone-like', label: '手机号' },
     ]
     const queryHeaderParams  = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
     Promise.all([
@@ -2252,7 +2574,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
         },
         {
           title: '手机号',
-          dataIndex: 'officeTelephone',
+          dataIndex: 'phone',
           defaultSort: 4,
           render: (text: any, record: any) => handleTextOverflow(text||record?.phone),
         },