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

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, trim } from 'lodash';
+import { isBoolean } from 'lodash';
 
 const hasDictSharingType =  getDictionarySource('UC000013')?.length;
 const sharingTypeDataList = hasDictSharingType && getDictionarySource('UC000013') || sharingType
@@ -85,7 +85,6 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
   let modalTableProps = {
     modalTableTitle: '',
     tableSearchForm,
-    visibleFieldsCount: 13,
     tableColumns: [],
     ...modalTableBusProps,
   }
@@ -238,7 +237,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
     }
     tableSearchForm = [
       { name: 'qp-name-like', label: '供应商名称' }, // field: { type: 'input', props: { placeholder: '请输入'}}
-      { name: 'qp-code-like', label: '供应商编码' },
+      { name: 'qp-code-in', label: '供应商编码', type: 'multipleQueryInput' },
       { name: 'qp-createOrgCode-eq', type: 'select', label: '创建组织', field: {
           type: 'select',
           props: {
@@ -267,6 +266,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
               option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
           },
         } },
+      { name: 'qp-enableDropShipping-eq', label: '启用工厂直发', type: 'select', initialSource: getDictionarySource('BSC00001')  },
+      { name: 'qp-enableVmiStock-eq', label: '启用VMI库存管理', type: 'select', initialSource: getDictionarySource('BSC00001')  },
     ]
     const queryHeaderParams  = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
     Promise.all([
@@ -306,6 +307,18 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           dataIndex: 'salesOrgName',
           defaultSort: 4,
         },
+        {
+          title: '启用工厂直发',
+          dataIndex: 'enableDropShipping',
+          defaultSort: 5,
+          render: (text: number) => getDictionaryTextByValue('BSC00001', text),
+        },
+        {
+          title: '启用VMI库存管理',
+          dataIndex: 'enableVmiStock',
+          defaultSort: 6,
+          render: (text: number) => getDictionaryTextByValue('BSC00001', text),
+        },
       ],
       ...modalTableBusProps
     }
@@ -424,125 +437,30 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
             dropdownStyle: { maxHeight: 400, maxWidth: 100, overflow: 'auto' }
           },
         } },
-{ name: 'qp-skcCode-in', label: 'SKC编码', field: {
-        type:'multipleQuerySearchSelect',
-        props: {
-          selectProps: {
-            mode: "multiple",
-            placeholder: '请输入SKC编码查询'
-          },
-          requestConfig: {
-            url: '/items/sku//listNoPage/Simple',
-            filter: 'qp-skcCode,name-orGroup,like',
-            mappingTextField: 'name',
-            mappingValueField: 'skcCode',
-            sourceName: 'qp-skcCode-in',
-            specialBracket: true,
-            otherParams: {
-              'ownOrgSign': getCurrentTargetBgId(),
-              'ctl-count': true
-            }, // 默认参数
+      { name: 'UNIQUE_SPEC', label: '属性', field: {
+          type: 'proppertySelector',
+        } },
+      { name: 'qp-itemLabelId-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,
           },
-        }
-      } },
-        { name: 'qp-year-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,
-            },
-          } },
-        { name: 'qp-season-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,
-            },
-          } },
-        { name: 'qp-zzbdbm-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,
-            },
-          } },
-        { name: 'qp-zzdlbm-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,
-            },
-          } },
-        { name: 'qp-zzzlbm-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,
-            },
-          } },
-        { name: 'qp-zzxlbm-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,
-            },
-          } },
-
-      // { name: 'UNIQUE_SPEC', label: '属性', field: {
-      //     type: 'proppertySelector',
-      //   } },
+        } },
+       { name: 'qp-skcCode-like', label: 'SKC编码' },
     ]
     const defaultQSHL = [
-      { isOpen: true, queryKey: 'qp-brandId-in' },
-      { isOpen: true, queryKey: 'qp-categoryId-in' },
-      { isOpen: true, queryKey: 'qp-year-in' },
-      { isOpen: true, queryKey: 'qp-season-in' },
-      { isOpen: true, queryKey: 'qp-zzbdbm-in' },
-      { isOpen: true, queryKey: 'qp-zzdlbm-in' },
-      { isOpen: true, queryKey: 'qp-zzzlbm-in' },
-      { isOpen: true, queryKey: 'qp-zzxlbm-in' },
+      {
+        isOpen: true,
+        queryKey: 'qp-brandId-in',
+      },
     ]
     const queryHeaderParams  = getQueryHeadersList({defaultQSHL, querySelectHeadersList, extralHeaders});
 
@@ -556,45 +474,20 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
         pageSize: 5000,
         currentPage: 1,
       },getQueryHeadersItem(queryHeaderParams,'qp-categoryId-in')),
-      loadSelectSource(`${prefixUrl.formSelectFix}/item/propertyValue`, {
-        'qp-propertyCode-eq': 'PROP_YEAR',
-        pageSize: 999,
-      }, getQueryHeadersItem(queryHeaderParams,'qp-year-in')),
-      loadSelectSource(`${prefixUrl.formSelectFix}/item/propertyValue`, {
-        'qp-propertyCode-eq': 'PROP_SEASON',
-        pageSize: 999,
-      }, getQueryHeadersItem(queryHeaderParams,'qp-season-in')),
-      loadSelectSource(`${prefixUrl.formSelectFix}/band`, {
-        pageSize: 999,
+      loadSelectSource(`${prefixUrl.formSelectFix}/label`, {
+        pageSize: 500,
         currentPage: 1,
-      }, getQueryHeadersItem(queryHeaderParams,'qp-zzbdbm-in')),
-      loadSelectSource(`${prefixUrl.formSelectFix}/rule/getClassPropertyValue/110000217`, {
-      }, getQueryHeadersItem(queryHeaderParams,'qp-zzdlbm-in')),
-      loadSelectSource(`${prefixUrl.formSelectFix}/item/propertyValue`, {
-        'qp-propertyCode-eq': 'MID_CATA',
-        pageSize: 999,
-      }, getQueryHeadersItem(queryHeaderParams,'qp-zzzlbm-in')),
-      loadSelectSource(`${prefixUrl.formSelectFix}/item/propertyValue`, {
-        'qp-propertyCode-eq': 'PROP_SUBCATEORY',
-        pageSize: 999,
-      }, getQueryHeadersItem(queryHeaderParams,'qp-zzxlbm-in')),
+        'qp-labelType-eq': 1,
+      },getQueryHeadersItem(queryHeaderParams,'qp-itemLabelId-in')),
     ]).then((x: any)=>{
       formatSource(x,0, 3, tableSearchForm,['id','name'])
       formatTreeDataSource(x,1, 4, tableSearchForm)
-      formatSource(x,0, getFieldIndex(tableSearchForm, 'qp-brandId-in'), tableSearchForm,['id','name'])
-      formatTreeDataSource(x,1, getFieldIndex(tableSearchForm, 'qp-categoryId-in'), tableSearchForm)
-      formatSource(x,2, getFieldIndex(tableSearchForm, 'qp-year-in'), tableSearchForm,['value','value'])
-      formatSource(x,3, getFieldIndex(tableSearchForm, 'qp-season-in'), tableSearchForm,['value','value'])
-      formatSource(x,4, getFieldIndex(tableSearchForm, 'qp-zzbdbm-in'), tableSearchForm,['bandCode','bandName'])
-      formatSource(x,5, getFieldIndex(tableSearchForm, 'qp-zzdlbm-in'), tableSearchForm,['value','value'])
-      formatSource(x,6, getFieldIndex(tableSearchForm, 'qp-zzzlbm-in'), tableSearchForm,['value','value'])
-      formatSource(x,7, getFieldIndex(tableSearchForm, 'qp-zzxlbm-in'), tableSearchForm,['value','value'])
+      formatSource(x,2, 6, tableSearchForm,['id','name'])
     })
     modalTableProps = {
       modalTableTitle: '选择SKU',
       tableSearchForm,
       isHorizontally: true,
-      tableSearchColSpan: 6,
       tableColumns: [
         {
           title: '序号',
@@ -737,6 +630,20 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
               option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
           },
         } },
+      { name: 'qp-itemLabelId-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,
+          },
+        } },
     ]
     const queryHeaderParams  = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
     Promise.all([
@@ -753,10 +660,16 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
         pageSize: 5000,
         currentPage: 1,
       },getQueryHeadersItem(queryHeaderParams,'qp-classId-in')),
+      loadSelectSource(`${prefixUrl.formSelectFix}/label`, {
+        pageSize: 500,
+        currentPage: 1,
+        'qp-labelType-eq': 1,
+      },getQueryHeadersItem(queryHeaderParams,'qp-itemLabelId-in')),
     ]).then((x: any)=>{
       formatSource(x,0, 2, tableSearchForm,['id','name']);
       formatTreeDataSource(x,1, 3, tableSearchForm);
       formatSource(x,2, 4, tableSearchForm,['id','name']);
+      formatSource(x,3, 5, tableSearchForm,['id','name']);
     })
     modalTableProps = {
       modalTableTitle: '选择商品(SPU) ',
@@ -930,6 +843,20 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
             }
           }
         },
+        { name: 'qp-itemLabelId-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,
+          },
+        } },
     ]
     const queryHeaderParams  = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
     Promise.all([
@@ -946,10 +873,16 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
         pageSize: 5000,
         currentPage: 1,
       },getQueryHeadersItem(queryHeaderParams,'qp-classId-in')),
+      loadSelectSource(`${prefixUrl.formSelectFix}/label`, {
+        pageSize: 500,
+        currentPage: 1,
+        'qp-labelType-eq': 1,
+      },getQueryHeadersItem(queryHeaderParams,'qp-itemLabelId-in')),
     ]).then((x: any)=>{
       formatSource(x,0, 2, tableSearchForm,['id','name']);
       formatTreeDataSource(x,1, 3, tableSearchForm);
       formatSource(x,2, 4, tableSearchForm,['id','name']);
+      formatSource(x,3, 10, tableSearchForm,['id','name']);
     })
     modalTableProps = {
       modalTableTitle: '选择SPU',
@@ -1351,28 +1284,18 @@ 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, 3, tableSearchForm, ['code','name'], 'channelInfoSon', channelDisabledJude)
-      formatTreeDataSource(x, 1, 4, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude)
+      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'),   },
+      { name: 'belongArea', field: {type: 'select', props: {mode: 'multiple',}}, label: '管理大区', initialSource: getDictionarySource('BUSINESS_belongArea'),   },
       {
-        name: 'qp-channelCode-in', type: 'treeSelect', label: '战区', field: {
+        name: 'qp-channelCode-in', type: 'treeSelect', label: '销售渠道', field: {
           type: 'treeSelect',
           props: {
             multiple: true,
@@ -1391,7 +1314,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
         }
       },
       {
-        name: 'qp-refCode-in', type: 'treeSelect', label: '大区', field: {
+        name: 'qp-refCode-in', type: 'treeSelect', label: '营销区域', field: {
           type: 'treeSelect',
           props: {
             multiple: true,
@@ -1462,7 +1385,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           width: 100,
         },
         {
-          title: '战区',
+          title: '所属销售渠道',
           dataIndex: 'channelName',
           defaultSort: 4,
           width: 100,
@@ -1539,7 +1462,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           },
         } },
         {
-        name: 'qp-channelCode-in', type: 'treeSelect', label: '战区', field: {
+        name: 'qp-channelCode-in', type: 'treeSelect', label: '销售渠道', field: {
           type: 'treeSelect',
           props: {
             multiple: true,
@@ -1569,11 +1492,6 @@ 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 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'; // 所属销售渠道 树节点不能点判断
       formatTreeDataSource(x, 1, 3, tableSearchForm, ['code','name'], 'channelInfoSon', channelDisabledJude)
     })
@@ -1857,22 +1775,22 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
     }
     tableSearchForm = [
       { name: 'qp-name-like', label: '客户名称' },
-      { name: 'qp-code-like', label: '客户编码' },
-      { name: 'qp-createOrgCode-in', type: 'select', label: '创建组织', field: {
+      { name: 'qp-code-in', label: '客户编码', type: 'multipleQueryInput' },
+      { name: 'qp-createOrgCode-eq', 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,
           },
         } },
-      { name: 'qp-salesOrgCode-eq', type: 'select', label: '使用组织', field: {
+      { name: 'qp-salesOrgCode-eq', type: 'select', label: '销售组织', field: {
           type: 'select',
           props: {
             // mode: 'multiple',
@@ -1928,24 +1846,30 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
     ];
     const queryHeaderParams  = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
     Promise.all([
-      loadSelectSource(`${prefixUrl.formSelectFix}/org/listNoPage`, {},getQueryHeadersItem(queryHeaderParams,'qp-createOrgCode-eq')),
+      loadSelectSource(`${prefixUrl.formSelectFix}/org/listNoPage`, {
+      },getQueryHeadersItem(queryHeaderParams,'qp-createOrgCode-eq')),
+      loadSelectSource(`${prefixUrl.formSelectFix}/orgView/getTree/sales-organizational-view`, {
+        'qp-employeeCode-eq': getEmployeeCode(),
+        'qp-realOrg-eq': true,
+        'qp-status-eq': 10
+      },getQueryHeadersItem(queryHeaderParams,'qp-salesOrgCode-eq')),
       loadSelectSource(`/channel-manage/channelInfo/tree`, {
         'qp-status-eq': 10,
         'qp-isMain-eq': 1,
         'qp-type-in': '1,2',
-      },getQueryHeadersItem(queryHeaderParams,'qp-orgCode-in')),
+      },getQueryHeadersItem(queryHeaderParams,'qp-saleChannel-in')),
       loadSelectSource(`/channel-manage/tagNode/getTree/10`, {
         'qp-status-eq': 1,
-      },getQueryHeadersItem(queryHeaderParams,'qp-orgCode-in')),
+      },getQueryHeadersItem(queryHeaderParams,'qp-refCode-in')),
     ]).then((x: any)=>{
       const firstElement = x?.[0];
       const allList = firstElement && [firstElement, firstElement];
-      formatSource(allList,0, 2, tableSearchForm);
-      formatSource(allList,1, 3, tableSearchForm);
+      formatSource(x, 0, 2, tableSearchForm);
+      formatSource(x, 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)
+      formatTreeDataSource(x, 2, 4, tableSearchForm, ['code','name'], 'channelInfoSon', channelDisabledJude)
+      formatTreeDataSource(x, 3, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude)
     })
     modalTableProps = {
       modalTableTitle: '选择客户',
@@ -1972,7 +1896,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           defaultSort: 3,
         },
         {
-          title: '使用组织',
+          title: '销售组织',
           dataIndex: 'salesOrgName',
           defaultSort: 4,
           width: 100,
@@ -2226,7 +2150,7 @@ 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: {
+      { name: 'qp-channelCode-in', type: 'treeSelect', label: '所属销售渠道', field: {
         type: 'treeSelect',
         props: {
           multiple: true,
@@ -2243,7 +2167,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           showCheckedStrategy: 'TreeSelect.SHOW_ALL',
         },
       } },
-      { name: 'qp-commonRelationAreaCode-in', type: 'treeSelect', label: '大区', field: {
+      { name: 'qp-commonRelationAreaCode-in', type: 'treeSelect', label: '营销区域', field: {
         type: 'treeSelect',
         props: {
           multiple: true,
@@ -2295,25 +2219,154 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           },
         },
       },
-      { 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())
-             }
+    ]
+    const queryHeaderParams  = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
+    Promise.all([
+      loadSelectSource(`${prefixUrl.formSelectFix}/orgView/getTree/sales-organizational-view`, {
+        'qp-employeeCode-eq': getEmployeeCode(),
+        '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)=>{
+      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: '选择商店',
+      tableSearchForm,
+      tableColumns: [
+        {
+          title: '序号',
+          dataIndex: 'keyIndex',
+          defaultSort: 0,
+          width: 60,
         },
-      } },
-      { name: 'qp-directSupervisor-like', type: 'select', label: '直接督导', field: {
-        type: 'select',
+        {
+          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
+    }
+  }
+  if(type === 'shopFile3') {
+    selectProps = {
+      placeholder: '输入商店编码或名称',
+      renderTableColumns: [
+        {
+          title: '商店编码',
+          dataIndex: 'code',
+        },
+        {
+          title: '商店名称',
+          dataIndex: 'name',
+        },
+      ],
+      ...selectConfigProps,
+    }
+    requestConfig = {
+      init: true,
+      url: `${prefixUrl.selectPrefix}/store/doPagerPw`,
+      filter: 'qp-name,code-orGroup,like', // 过滤参数
+      mappingTextField: 'name',
+      mappingValueField: 'code',
+      otherParams: {
+        sorter: 'desc-id',
+        'qp-status-in': 10,
+        ...(requestConfigProp?.addOtherParams || {}),
+      }, // 默认参数
+      sourceName: 'code',
+      ...requestConfigProp,
+    }
+    tableSearchForm = [
+      { 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-orgCode-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,
+          },
+        } },
+      { name: 'qp-channelCode-in', type: 'treeSelect', label: '所属销售渠道', field: {
+        type: 'treeSelect',
         props: {
+          multiple: true,
+          treeData: [],
+          treeCheckable: false,
           notFoundContent: '暂无数据',
           allowClear: true,
           showSearch: true,
@@ -2321,12 +2374,16 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           maxTagCount: 1,
           optionFilterProp: 'children',
           filterOption: (input: string, option: { props: { children: string } }) =>
-             (option?.value ?? '').toLowerCase().includes(input.toLowerCase())
+            option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
+          showCheckedStrategy: 'TreeSelect.SHOW_ALL',
         },
       } },
-      { name: 'qp-distributionItem-like', type: 'select', label: '分销商品', field: {
-        type: 'select',
+      { name: 'qp-commonRelationAreaCode-in', type: 'treeSelect', label: '营销区域', field: {
+        type: 'treeSelect',
         props: {
+          multiple: true,
+          treeData: [],
+          treeCheckable: false,
           notFoundContent: '暂无数据',
           allowClear: true,
           showSearch: true,
@@ -2334,12 +2391,15 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           maxTagCount: 1,
           optionFilterProp: 'children',
           filterOption: (input: string, option: { props: { children: string } }) =>
-             (option?.value ?? '').toLowerCase().includes(input.toLowerCase())
+            option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
+
+          showCheckedStrategy: 'TreeSelect.SHOW_ALL',
         },
       } },
-      { name: 'qp-headItem-like', type: 'select', label: '总部商品', field: {
+      { name: 'qp-businessType-in', type: 'select', label: '店铺性质', field: {
         type: 'select',
         props: {
+          mode: 'multiple',
           notFoundContent: '暂无数据',
           allowClear: true,
           showSearch: true,
@@ -2347,22 +2407,50 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           maxTagCount: 1,
           optionFilterProp: 'children',
           filterOption: (input: string, option: { props: { children: string } }) =>
-             (option?.value ?? '').toLowerCase().includes(input.toLowerCase())
+            option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
         },
-      } },
-      { name: 'qp-storeChannelName-like', type: 'select', label: '管理模式', field: {
+      } ,
+      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,
+          },
+        },
+      },
+      {
+        name: 'qp-physicalWarehouseCode-in',
         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())
+        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([
@@ -2384,38 +2472,28 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
         currentPage: 1,
         'ctl-withAuth': true,
       },getQueryHeadersItem(queryHeaderParams,'ctl-withAuth')),
-      loadSelectSource(`/channel-manage/store/selectStoreOperationalInfo`, {}, getQueryHeadersItem(queryHeaderParams,'qp-orgCode-in'))
+      loadSelectSource(
+        `/stock/physicalWarehouse`,
+        {
+          pageSize: 5000,
+          currentPage: 1,
+          'qp-isEnable-eq': 1,
+          sorter: 'desc-id',
+        },
+        {
+          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 };
+      formatSource(x,4, 8, tableSearchForm, ['physicalWarehouseCode', 'physicalWarehouseName']);
     })
     modalTableProps = {
       modalTableTitle: '选择商店',
@@ -2478,47 +2556,17 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           width: 80,
         },
         {
-          title: '品牌',
-          dataIndex: 'brandName',
+          title: '库存组织编码',
+          dataIndex: 'physicalWarehouseCode',
+          render: (text: any) => text?.physicalWarehouseCode || '-',
           defaultSort: 8,
-          width: 80,
-        },
-        {
-          title: '管理督导',
-          dataIndex: 'manageSupervisor',
-          defaultSort: 9,
           width: 100,
-        },
-        {
-          title: '直接督导',
-          dataIndex: 'directSupervisor',
-          defaultSort: 10,
-          width: 100,
-        },
-        {
-          title: '分销商品',
-          dataIndex: 'distributionItem',
-          defaultSort: 11,
-          width: 100,
-        },
-        {
-          title: '总部商品',
-          dataIndex: 'headItem',
-          defaultSort: 12,
-          width: 100,
-        },
-        {
-          title: '管理模式',
-          dataIndex: 'storeChannelName',
-          defaultSort: 13,
-          width: 100,
-        },
+        }
       ],
       noEmptySearchField: true,
       ...modalTableBusProps
     }
   }
-
   // 核算主体选择器（无弹窗）
   if(type === 'accountingSubject') {
     selectProps = {