@bit-sun/business-component 4.2.0-alpha.jw-1 → 4.2.1-alpha.2-aiwei

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (73) hide show
  1. package/.umirc.ts +9 -9
  2. package/dist/components/Business/AddSelectBusiness/index.d.ts +3 -4
  3. package/dist/components/Business/BsLayouts/Components/AllFunc/drawContent.d.ts +1 -2
  4. package/dist/components/Business/BsLayouts/Components/ChooseStore/index.d.ts +1 -2
  5. package/dist/components/Business/BsLayouts/Components/CustomerMenu/MenuSetting/index.d.ts +1 -1
  6. package/dist/components/Business/BsLayouts/Components/CustomerMenu/MenuSetting/leftTree.d.ts +1 -1
  7. package/dist/components/Business/BsLayouts/Components/CustomerMenu/MenuSetting/rightTree.d.ts +2 -2
  8. package/dist/components/Business/BsLayouts/Components/CustomerMenu/globalMenu/DrawContent.d.ts +1 -2
  9. package/dist/components/Business/BsLayouts/Components/CustomerMenu/globalMenu/customMenuHeader.d.ts +1 -2
  10. package/dist/components/Business/BsLayouts/Components/CustomerMenu/index.d.ts +1 -1
  11. package/dist/components/Business/BsLayouts/Components/GlobalHeader/index.d.ts +1 -2
  12. package/dist/components/Business/BsLayouts/Components/RightContent/LoginModal.d.ts +1 -2
  13. package/dist/components/Business/BsLayouts/index.d.ts +1 -1
  14. package/dist/components/Business/BsSulaQueryTable/SearchItemSetting.d.ts +5 -5
  15. package/dist/components/Business/BsSulaQueryTable/index.d.ts +1 -2
  16. package/dist/components/Business/BsSulaQueryTable/setting.d.ts +6 -6
  17. package/dist/components/Business/BsSulaQueryTable/utils.d.ts +14 -15
  18. package/dist/components/Business/CommodityEntry/index.d.ts +1 -2
  19. package/dist/components/Business/CommonAlert/index.d.ts +1 -2
  20. package/dist/components/Business/CommonGuideWrapper/index.d.ts +3 -3
  21. package/dist/components/Business/DetailPageWrapper/index.d.ts +11 -12
  22. package/dist/components/Business/HomePageWrapper/index.d.ts +1 -2
  23. package/dist/components/Business/ItemPropertySelector/index.d.ts +1 -2
  24. package/dist/components/Business/JsonQueryTable/components/FieldsModifyModal.d.ts +1 -2
  25. package/dist/components/Business/JsonQueryTable/components/FieldsSettingsTable.d.ts +1 -2
  26. package/dist/components/Business/JsonQueryTable/components/Formula.d.ts +1 -2
  27. package/dist/components/Business/JsonQueryTable/components/MaintainOptions.d.ts +1 -2
  28. package/dist/components/Business/JsonQueryTable/drawer/index.d.ts +1 -2
  29. package/dist/components/Business/PropertyModal/index.d.ts +1 -2
  30. package/dist/components/Business/PropertyModal/propertyGroup.d.ts +1 -1
  31. package/dist/components/Business/SearchSelect/index.d.ts +1 -1
  32. package/dist/components/Business/StateFlow/index.d.ts +1 -2
  33. package/dist/components/Business/TreeSearchSelect/index.d.ts +1 -1
  34. package/dist/components/Business/columnSettingTable/columnSetting.d.ts +6 -6
  35. package/dist/components/Business/columnSettingTable/components/TableSumComponent.d.ts +1 -2
  36. package/dist/components/Business/columnSettingTable/index.d.ts +3 -3
  37. package/dist/components/Business/columnSettingTable/sulaSettingTable.d.ts +3 -3
  38. package/dist/components/Business/columnSettingTable/utils.d.ts +1 -2
  39. package/dist/components/Business/moreTreeTable/FixedScrollBar.d.ts +1 -1
  40. package/dist/components/Common/ParagraphCopier/index.d.ts +1 -1
  41. package/dist/components/Common/Section/index.d.ts +1 -1
  42. package/dist/components/Functional/AddSelect/index.d.ts +1 -2
  43. package/dist/components/Functional/AuthButton/index.d.ts +1 -2
  44. package/dist/components/Functional/DataImport/index.d.ts +3 -3
  45. package/dist/components/Functional/DataValidation/index.d.ts +4 -4
  46. package/dist/components/Functional/ExportFunctions/ExportIcon/index.d.ts +1 -2
  47. package/dist/components/Functional/QueryMutipleInput/index.d.ts +1 -2
  48. package/dist/components/Functional/QueryMutipleSelect/index.d.ts +1 -2
  49. package/dist/components/Functional/SearchSelect/index.d.ts +1 -1
  50. package/dist/components/Functional/SearchSelect/utils.d.ts +2 -3
  51. package/dist/components/Functional/TreeSearchSelect/index.d.ts +1 -2
  52. package/dist/components/Solution/RuleComponent/CustomPlugin/CustomSelector/CustomSelectorModal.d.ts +1 -1
  53. package/dist/components/Solution/RuleComponent/CustomPlugin/CustomSelector/index.d.ts +1 -2
  54. package/dist/components/Solution/RuleComponent/Formula.d.ts +1 -2
  55. package/dist/components/Solution/RuleComponent/InnerSelect.d.ts +1 -2
  56. package/dist/components/Solution/RuleComponent/RenderCompItem.d.ts +1 -2
  57. package/dist/components/Solution/RuleSetter/RuleInstance.d.ts +1 -2
  58. package/dist/components/Solution/RuleSetter/baseRule.d.ts +1 -1
  59. package/dist/components/Solution/RuleSetter/index.d.ts +1 -1
  60. package/dist/index.esm.js +324 -50
  61. package/dist/index.js +324 -50
  62. package/dist/plugin/TableColumnSetting/index.d.ts +5 -5
  63. package/dist/utils/TableUtils.d.ts +18 -19
  64. package/package.json +1 -1
  65. package/src/components/Business/BsLayouts/Components/CustomerMenu/index.tsx +2 -2
  66. package/src/components/Business/BsLayouts/index.tsx +2 -2
  67. package/src/components/Business/BsSulaQueryTable/index.tsx +11 -10
  68. package/src/components/Business/BsSulaQueryTable/setting.tsx +6 -0
  69. package/src/components/Business/SearchSelect/BusinessUtils.tsx +196 -12
  70. package/src/components/Business/SearchSelect/index.md +1 -1
  71. package/src/components/Functional/SearchSelect/index.tsx +1 -0
  72. package/src/components/Solution/RuleComponent/RenderCompItem.tsx +9 -1
  73. package/src/components/Solution/RuleComponent/ruleFiled.js +25 -1
@@ -1,4 +1,3 @@
1
- import React from 'react';
2
1
  import moment from 'moment';
3
2
  type mediaListType = {
4
3
  type: number;
@@ -49,24 +48,24 @@ declare const updateGuanDate: (requestParams: any, dateKeyParams?: any) => {
49
48
  };
50
49
  submit: any;
51
50
  };
52
- declare const textIcon: (type: string | number, text?: string) => React.JSX.Element | undefined;
53
- declare const handleTextDoubleOrId: (textOne: string | undefined, textTwo: string | undefined) => React.JSX.Element;
54
- declare const handleTextDouble: (textOne: string | undefined, textTwo: string | undefined) => React.JSX.Element;
55
- declare const handleTextOverflow: (text: string | undefined, width?: number) => React.JSX.Element;
56
- declare const handleTextLineFeed: (text: string | undefined, width?: number) => React.JSX.Element;
57
- declare const handleTextTooltip: (text: any) => React.JSX.Element;
58
- declare const handleTextBreakSpaces: (text: any) => React.JSX.Element;
59
- declare const handleStatusBadge: (text: any, color: any) => React.JSX.Element;
60
- declare const HandleTotalCount: (totalParams: any) => React.JSX.Element;
51
+ declare const textIcon: (type: string | number, text?: string) => JSX.Element | undefined;
52
+ declare const handleTextDoubleOrId: (textOne: string | undefined, textTwo: string | undefined) => JSX.Element;
53
+ declare const handleTextDouble: (textOne: string | undefined, textTwo: string | undefined) => JSX.Element;
54
+ declare const handleTextOverflow: (text: string | undefined, width?: number) => JSX.Element;
55
+ declare const handleTextLineFeed: (text: string | undefined, width?: number) => JSX.Element;
56
+ declare const handleTextTooltip: (text: any) => JSX.Element;
57
+ declare const handleTextBreakSpaces: (text: any) => JSX.Element;
58
+ declare const handleStatusBadge: (text: any, color: any) => JSX.Element;
59
+ declare const HandleTotalCount: (totalParams: any) => JSX.Element;
61
60
  declare const handleCommonTimeRender: (text: any, format?: any) => any;
62
- declare const handleTooltip: (text: any, timeTrue?: boolean) => React.JSX.Element;
63
- declare const handleTooltipHours: (text: any, timeTrue?: boolean) => React.JSX.Element;
61
+ declare const handleTooltip: (text: any, timeTrue?: boolean) => JSX.Element;
62
+ declare const handleTooltipHours: (text: any, timeTrue?: boolean) => JSX.Element;
64
63
  type tableColumnsImageType = {
65
64
  width?: number | string;
66
65
  height?: number | string;
67
66
  [key: string]: any;
68
67
  };
69
- declare const tableColumnsImage: (url?: string, paramsObj?: tableColumnsImageType) => React.JSX.Element;
68
+ declare const tableColumnsImage: (url?: string, paramsObj?: tableColumnsImageType) => JSX.Element;
70
69
  interface ColumnsEditInterfave {
71
70
  text?: string;
72
71
  record?: any;
@@ -82,7 +81,7 @@ interface ColumnsEditInterfave {
82
81
  };
83
82
  [key: string]: any;
84
83
  }
85
- declare const ColumnsEdit: (props: ColumnsEditInterfave) => React.JSX.Element;
84
+ declare const ColumnsEdit: (props: ColumnsEditInterfave) => JSX.Element;
86
85
  type UserColumnsType = {
87
86
  name: string;
88
87
  department?: string;
@@ -90,13 +89,13 @@ type UserColumnsType = {
90
89
  company?: string;
91
90
  avatar?: string;
92
91
  };
93
- declare const userColumns: (props: UserColumnsType) => React.JSX.Element;
94
- declare const userInfoCard: (props: any) => React.JSX.Element;
92
+ declare const userColumns: (props: UserColumnsType) => JSX.Element;
93
+ declare const userInfoCard: (props: any) => JSX.Element;
95
94
  declare const getItemDefaultWidth: (item: any) => number;
96
- declare const sulaTableRenderTooltip: ({ text }: any) => React.JSX.Element;
95
+ declare const sulaTableRenderTooltip: ({ text }: any) => JSX.Element;
97
96
  declare const renderNumberText: ({ text }: any) => any;
98
97
  declare const renderFixed2: (text: any) => any;
99
- declare const handleTextWarpCustom: (text: any, style?: {}) => React.JSX.Element;
98
+ declare const handleTextWarpCustom: (text: any, style?: {}) => JSX.Element;
100
99
  declare const calculateValidPeriod: (start: any, end: any) => string;
101
- declare const handleTextWarp: (text: any) => React.JSX.Element;
100
+ declare const handleTextWarp: (text: any) => JSX.Element;
102
101
  export { getSkuImg, updateGuanDate, textIcon, handleTextDoubleOrId, handleTextDouble, handleTextOverflow, handleTextLineFeed, handleTextTooltip, handleTextBreakSpaces, handleStatusBadge, HandleTotalCount, handleTooltip, handleCommonTimeRender, handleTooltipHours, tableColumnsImage, ColumnsEdit, userColumns, userInfoCard, getItemDefaultWidth, renderNumberText, sulaTableRenderTooltip, renderFixed2, handleTextWarpCustom, handleTextWarp, calculateValidPeriod };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@bit-sun/business-component",
3
- "version": "4.2.0-alpha.jw-1",
3
+ "version": "4.2.1-alpha.2-aiwei",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",
@@ -89,7 +89,7 @@ const CustomerMenu = forwardRef(({isCollapse, handleClose, actionRef, originRout
89
89
 
90
90
  return (
91
91
  <div className={'customer_menu_content'}>
92
- {/* <div
92
+ <div
93
93
  style={{cursor: 'pointer'}}
94
94
  onClick={(e) => {
95
95
  handleClose();
@@ -106,7 +106,7 @@ const CustomerMenu = forwardRef(({isCollapse, handleClose, actionRef, originRout
106
106
  >
107
107
  自定义菜单
108
108
  </Button>
109
- </div> */}
109
+ </div>
110
110
  {!isCollapse && (
111
111
  <Drawer
112
112
  style={{ left: isDrawer ? 140 : 0 }}
@@ -87,7 +87,7 @@ const getAuthMenuPathAndDocsId = (pathToRegexp) => {
87
87
  if (item.children && item.children.length > 0) {
88
88
  getLimitedMenuKeys(item.children);
89
89
  } else {
90
- const originPath = (item.path || item.frontendPath).replace(/^\/\w+\//, '/');
90
+ const originPath = item.path.replace(/^\/\w+\//, '/');
91
91
  menuKeys.push(originPath);
92
92
  if (pathToRegexp('/operation-and-maintenance-center/configuration-management/all-general-documents-specific/:id').test(originPath)) {
93
93
  getId(originPath) && docsId.push(getId(originPath))
@@ -647,7 +647,7 @@ class BasicLayout extends React.PureComponent {
647
647
  return;
648
648
  }
649
649
  // todo:暂时处理非wujie环境不做404管控
650
- if (!window.__POWERED_BY_WUJIE__ && !this.props.isSingleSystem) {
650
+ if (!window.__POWERED_BY_WUJIE__) {
651
651
  treeList.push({
652
652
  tab: node.locale,
653
653
  key: node.path,
@@ -852,16 +852,16 @@ export default (props: any) => {
852
852
  };
853
853
 
854
854
  useEffect(() => {
855
- if (!localStorage.getItem('isTabChange') || state?.updateCurrentPage) {
856
- if (pagePath === pathname) {
857
- // @ts-ignore
858
- config.ref?.current?.tableRef?.current?.refreshTable();
859
- }
860
- }
861
- setTimeout(() => {
862
- // 处理页面刷新两面
863
- localStorage.removeItem('isTabChange');
864
- }, 0);
855
+ // if (!localStorage.getItem('isTabChange') || state?.updateCurrentPage) {
856
+ // if (pagePath === pathname) {
857
+ // // @ts-ignore
858
+ // config.ref?.current?.tableRef?.current?.refreshTable();
859
+ // }
860
+ // }
861
+ // setTimeout(() => {
862
+ // // 处理页面刷新两面
863
+ // localStorage.removeItem('isTabChange');
864
+ // }, 0);
865
865
  }, [pathname]);
866
866
 
867
867
  const expandedRowKeys = props?.expandable?.expandedRowKeys;
@@ -967,6 +967,7 @@ export default (props: any) => {
967
967
  {/* 列设置弹出框表格 */}
968
968
  <SortableTable
969
969
  ref={sortTableRef}
970
+ disableColumnFixed={props.tableProps?.isVirtualTable}
970
971
  setShowColumns={setResizeShowColumns}
971
972
  showColumn={showColumn}
972
973
  setInitialTableInfo={setInitialTableInfo}
@@ -288,6 +288,9 @@ class SortableTable extends React.Component {
288
288
  title: '列首',
289
289
  dataIndex: 'fixedLeft',
290
290
  render: (text, record) => {
291
+ if(this.props.disableColumnFixed) {
292
+ return null
293
+ }
291
294
  return (
292
295
  <span
293
296
  onClick={() => {
@@ -375,6 +378,9 @@ class SortableTable extends React.Component {
375
378
  title: '列尾',
376
379
  dataIndex: 'fixedRight',
377
380
  render: (text, record) => {
381
+ if(this.props.disableColumnFixed) {
382
+ return null
383
+ }
378
384
  return (
379
385
  <span
380
386
  onClick={() => {
@@ -85,6 +85,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
85
85
  let modalTableProps = {
86
86
  modalTableTitle: '',
87
87
  tableSearchForm,
88
+ visibleFieldsCount: 13,
88
89
  tableColumns: [],
89
90
  ...modalTableBusProps,
90
91
  }
@@ -423,15 +424,125 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
423
424
  dropdownStyle: { maxHeight: 400, maxWidth: 100, overflow: 'auto' }
424
425
  },
425
426
  } },
426
- { name: 'UNIQUE_SPEC', label: '属性', field: {
427
- type: 'proppertySelector',
428
- } },
427
+ { name: 'qp-skcCode-in', label: 'SKC编码', field: {
428
+ type:'multipleQuerySearchSelect',
429
+ props: {
430
+ selectProps: {
431
+ mode: "multiple",
432
+ placeholder: '请输入SKC编码查询'
433
+ },
434
+ requestConfig: {
435
+ url: '/items/sku//listNoPage/Simple',
436
+ filter: 'qp-skcCode,name-orGroup,like',
437
+ mappingTextField: 'name',
438
+ mappingValueField: 'skcCode',
439
+ sourceName: 'qp-skcCode-in',
440
+ specialBracket: true,
441
+ otherParams: {
442
+ 'ownOrgSign': getCurrentTargetBgId(),
443
+ 'ctl-count': true
444
+ }, // 默认参数
445
+ },
446
+ }
447
+ } },
448
+ { name: 'qp-year-in', type: 'select', label: '年份', field: {
449
+ type: 'select',
450
+ props: {
451
+ mode: 'multiple',
452
+ notFoundContent: '暂无数据',
453
+ allowClear: true,
454
+ showSearch: true,
455
+ showArrow: true,
456
+ maxTagCount: 1,
457
+ optionFilterProp: 'children',
458
+ filterOption: (input: string, option: { props: { children: string } }) =>
459
+ option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
460
+ },
461
+ } },
462
+ { name: 'qp-season-in', type: 'select', label: '季节', field: {
463
+ type: 'select',
464
+ props: {
465
+ mode: 'multiple',
466
+ notFoundContent: '暂无数据',
467
+ allowClear: true,
468
+ showSearch: true,
469
+ showArrow: true,
470
+ maxTagCount: 1,
471
+ optionFilterProp: 'children',
472
+ filterOption: (input: string, option: { props: { children: string } }) =>
473
+ option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
474
+ },
475
+ } },
476
+ { name: 'qp-zzbdbm-in', type: 'select', label: '波段', field: {
477
+ type: 'select',
478
+ props: {
479
+ mode: 'multiple',
480
+ notFoundContent: '暂无数据',
481
+ allowClear: true,
482
+ showSearch: true,
483
+ showArrow: true,
484
+ maxTagCount: 1,
485
+ optionFilterProp: 'children',
486
+ filterOption: (input: string, option: { props: { children: string } }) =>
487
+ option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
488
+ },
489
+ } },
490
+ { name: 'qp-zzdlbm-in', type: 'select', label: '大类', field: {
491
+ type: 'select',
492
+ props: {
493
+ mode: 'multiple',
494
+ notFoundContent: '暂无数据',
495
+ allowClear: true,
496
+ showSearch: true,
497
+ showArrow: true,
498
+ maxTagCount: 1,
499
+ optionFilterProp: 'children',
500
+ filterOption: (input: string, option: { props: { children: string } }) =>
501
+ option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
502
+ },
503
+ } },
504
+ { name: 'qp-zzzlbm-in', type: 'select', label: '中类', field: {
505
+ type: 'select',
506
+ props: {
507
+ mode: 'multiple',
508
+ notFoundContent: '暂无数据',
509
+ allowClear: true,
510
+ showSearch: true,
511
+ showArrow: true,
512
+ maxTagCount: 1,
513
+ optionFilterProp: 'children',
514
+ filterOption: (input: string, option: { props: { children: string } }) =>
515
+ option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
516
+ },
517
+ } },
518
+ { name: 'qp-zzxlbm-in', type: 'select', label: '小类', field: {
519
+ type: 'select',
520
+ props: {
521
+ mode: 'multiple',
522
+ notFoundContent: '暂无数据',
523
+ allowClear: true,
524
+ showSearch: true,
525
+ showArrow: true,
526
+ maxTagCount: 1,
527
+ optionFilterProp: 'children',
528
+ filterOption: (input: string, option: { props: { children: string } }) =>
529
+ option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
530
+ },
531
+ } },
532
+
533
+ // { name: 'UNIQUE_SPEC', label: '属性', field: {
534
+ // type: 'proppertySelector',
535
+ // } },
429
536
  ]
430
537
  const defaultQSHL = [
431
- {
432
- isOpen: true,
433
- queryKey: 'qp-brandId-in',
434
- },
538
+ { isOpen: true, queryKey: 'qp-brandId-in' },
539
+ { isOpen: true, queryKey: 'qp-categoryId-in' },
540
+ { isOpen: true, queryKey: 'qp-year-in' },
541
+ { isOpen: true, queryKey: 'qp-season-in' },
542
+ { isOpen: true, queryKey: 'qp-zzbdbm-in' },
543
+ { isOpen: true, queryKey: 'qp-zzdlbm-in' },
544
+ { isOpen: true, queryKey: 'qp-zzzlbm-in' },
545
+ { isOpen: true, queryKey: 'qp-zzxlbm-in' },
435
546
  ]
436
547
  const queryHeaderParams = getQueryHeadersList({defaultQSHL, querySelectHeadersList, extralHeaders});
437
548
 
@@ -445,14 +556,46 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
445
556
  pageSize: 5000,
446
557
  currentPage: 1,
447
558
  },getQueryHeadersItem(queryHeaderParams,'qp-categoryId-in')),
559
+ loadSelectSource(`${prefixUrl.formSelectFix}/item/propertyValue`, {
560
+ 'qp-propertyCode-eq': 'PROP_YEAR',
561
+ pageSize: 999,
562
+ }, getQueryHeadersItem(queryHeaderParams,'qp-year-in')),
563
+ loadSelectSource(`${prefixUrl.formSelectFix}/item/propertyValue`, {
564
+ 'qp-propertyCode-eq': 'PROP_SEASON',
565
+ pageSize: 999,
566
+ }, getQueryHeadersItem(queryHeaderParams,'qp-season-in')),
567
+ loadSelectSource(`${prefixUrl.formSelectFix}/band`, {
568
+ pageSize: 999,
569
+ currentPage: 1,
570
+ }, getQueryHeadersItem(queryHeaderParams,'qp-zzbdbm-in')),
571
+ loadSelectSource(`${prefixUrl.formSelectFix}/rule/getClassPropertyValue/110000217`, {
572
+ }, getQueryHeadersItem(queryHeaderParams,'qp-zzdlbm-in')),
573
+ loadSelectSource(`${prefixUrl.formSelectFix}/item/propertyValue`, {
574
+ 'qp-propertyCode-eq': 'MID_CATA',
575
+ pageSize: 999,
576
+ }, getQueryHeadersItem(queryHeaderParams,'qp-zzzlbm-in')),
577
+ loadSelectSource(`${prefixUrl.formSelectFix}/item/propertyValue`, {
578
+ 'qp-propertyCode-eq': 'PROP_SUBCATEORY',
579
+ pageSize: 999,
580
+ }, getQueryHeadersItem(queryHeaderParams,'qp-zzxlbm-in')),
448
581
  ]).then((x: any)=>{
449
582
  formatSource(x,0, 3, tableSearchForm,['id','name'])
450
583
  formatTreeDataSource(x,1, 4, tableSearchForm)
584
+ formatSource(x,0, getFieldIndex(tableSearchForm, 'qp-brandId-in'), tableSearchForm,['id','name'])
585
+ formatTreeDataSource(x,1, getFieldIndex(tableSearchForm, 'qp-categoryId-in'), tableSearchForm)
586
+ formatSource(x,2, getFieldIndex(tableSearchForm, 'qp-year-in'), tableSearchForm,['value','value'])
587
+ formatSource(x,3, getFieldIndex(tableSearchForm, 'qp-season-in'), tableSearchForm,['value','value'])
588
+ formatSource(x,4, getFieldIndex(tableSearchForm, 'qp-zzbdbm-in'), tableSearchForm,['bandCode','bandName'])
589
+ formatSource(x,5, getFieldIndex(tableSearchForm, 'qp-zzdlbm-in'), tableSearchForm,['value','value'])
590
+ formatSource(x,6, getFieldIndex(tableSearchForm, 'qp-zzzlbm-in'), tableSearchForm,['value','value'])
591
+ formatSource(x,7, getFieldIndex(tableSearchForm, 'qp-zzxlbm-in'), tableSearchForm,['value','value'])
451
592
  })
452
593
  modalTableProps = {
453
594
  modalTableTitle: '选择SKU',
454
595
  tableSearchForm,
455
596
  isHorizontally: true,
597
+ tableSearchColSpan: 6,
598
+ visibleFieldsCount: 13,
456
599
  tableColumns: [
457
600
  {
458
601
  title: '序号',
@@ -1218,9 +1361,9 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
1218
1361
  { name: 'realWarehouseName*multiInput', label: '逻辑仓名称', type: 'multipleQueryInput' },
1219
1362
  { name: 'realWarehouseCode*multiInput', label: '逻辑仓编码', type: 'multipleQueryInput' },
1220
1363
  { name: 'qp-realWarehouseType-eq', type: 'select', label: '逻辑仓类型', initialSource: getDictionarySource('SC00004') },
1221
- { name: 'belongArea', field: {type: 'select', props: {mode: 'multiple',}}, label: '管理大区', initialSource: getDictionarySource('BUSINESS_belongArea'), },
1364
+ // { name: 'belongArea', field: {type: 'select', props: {mode: 'multiple',}}, label: '管理大区', initialSource: getDictionarySource('BUSINESS_belongArea'), },
1222
1365
  {
1223
- name: 'qp-channelCode-in', type: 'treeSelect', label: '销售渠道', field: {
1366
+ name: 'qp-channelCode-in', type: 'treeSelect', label: '战区', field: {
1224
1367
  type: 'treeSelect',
1225
1368
  props: {
1226
1369
  multiple: true,
@@ -1239,7 +1382,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
1239
1382
  }
1240
1383
  },
1241
1384
  {
1242
- name: 'qp-refCode-in', type: 'treeSelect', label: '营销区域', field: {
1385
+ name: 'qp-refCode-in', type: 'treeSelect', label: '大区', field: {
1243
1386
  type: 'treeSelect',
1244
1387
  props: {
1245
1388
  multiple: true,
@@ -2069,7 +2212,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
2069
2212
  option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
2070
2213
  },
2071
2214
  } },
2072
- { name: 'qp-channelCode-in', type: 'treeSelect', label: '所属销售渠道', field: {
2215
+ { name: 'qp-channelCode-in', type: 'treeSelect', label: '战区', field: {
2073
2216
  type: 'treeSelect',
2074
2217
  props: {
2075
2218
  multiple: true,
@@ -2086,7 +2229,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
2086
2229
  showCheckedStrategy: 'TreeSelect.SHOW_ALL',
2087
2230
  },
2088
2231
  } },
2089
- { name: 'qp-commonRelationAreaCode-in', type: 'treeSelect', label: '营销区域', field: {
2232
+ { name: 'qp-commonRelationAreaCode-in', type: 'treeSelect', label: '大区', field: {
2090
2233
  type: 'treeSelect',
2091
2234
  props: {
2092
2235
  multiple: true,
@@ -2138,6 +2281,11 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
2138
2281
  },
2139
2282
  },
2140
2283
  },
2284
+ { name: 'qp-manageSupervisor-like', label: '管理督导', type: 'input' },
2285
+ { name: 'qp-directSupervisor-like', label: '直接督导', type: 'input' },
2286
+ { name: 'qp-distributionItem-like', label: '分销商品', type: 'input' },
2287
+ { name: 'qp-headItem-like', label: '总部商品', type: 'input' },
2288
+ { name: 'qp-storeChannelName-like', label: '管理模式', type: 'input' },
2141
2289
  ]
2142
2290
  const queryHeaderParams = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
2143
2291
  Promise.all([
@@ -2227,6 +2375,42 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
2227
2375
  render: (text: any) => getDictionaryTextByValue('BUSINESS_StoreType', text),
2228
2376
  width: 80,
2229
2377
  },
2378
+ {
2379
+ title: '品牌',
2380
+ dataIndex: 'brandName',
2381
+ defaultSort: 8,
2382
+ width: 80,
2383
+ },
2384
+ {
2385
+ title: '管理督导',
2386
+ dataIndex: 'manageSupervisor',
2387
+ defaultSort: 9,
2388
+ width: 100,
2389
+ },
2390
+ {
2391
+ title: '直接督导',
2392
+ dataIndex: 'directSupervisor',
2393
+ defaultSort: 10,
2394
+ width: 100,
2395
+ },
2396
+ {
2397
+ title: '分销商品',
2398
+ dataIndex: 'distributionItem',
2399
+ defaultSort: 11,
2400
+ width: 100,
2401
+ },
2402
+ {
2403
+ title: '总部商品',
2404
+ dataIndex: 'headItem',
2405
+ defaultSort: 12,
2406
+ width: 100,
2407
+ },
2408
+ {
2409
+ title: '管理模式',
2410
+ dataIndex: 'storeChannelName',
2411
+ defaultSort: 13,
2412
+ width: 100,
2413
+ },
2230
2414
  ],
2231
2415
  noEmptySearchField: true,
2232
2416
  ...modalTableBusProps
@@ -150,7 +150,7 @@ export default () => {
150
150
  // },
151
151
  // prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
152
152
  selectProps,
153
- selectBusinessType: 'shopFile2',
153
+ selectBusinessType: 'skuCommodity',
154
154
  };
155
155
 
156
156
  const onTabChange = (key) => {
@@ -570,6 +570,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
570
570
 
571
571
  const formItem = (list) => {
572
572
  if (isModalVisible && list?.length) {
573
+ debugger
573
574
  const setDisabled = (name: any) => {
574
575
  if (fixedparamsDisabled && fixedparameter?.length && fixedparameter.find((item: any) => item === name)) {
575
576
  return true
@@ -589,7 +589,7 @@ export default function RenderCompItem(props:any){
589
589
  null}
590
590
  {/* 单选/多选 配送方式选择器 */}
591
591
  {((ites?.inputType === 20 || ites?.inputType === 30) &&
592
- ites?.choiceType === 310 && (
592
+ (ites?.choiceType === 310 || ites?.choiceType === 311)&& (
593
593
  <BusinessSearchSelect
594
594
  selectBusinessType="deliveryMode"
595
595
  selectProps={{
@@ -606,6 +606,14 @@ export default function RenderCompItem(props:any){
606
606
  labelInValue={true}
607
607
  value={showValue(ites.code)}
608
608
  requestConfig={{
609
+ ...(ites?.choiceType === 311
610
+ ? {
611
+ otherParams: {
612
+ // 配送方式只选择标准配送方式
613
+ 'qp-recordChannnelCode-eq': 80,
614
+ },
615
+ }
616
+ : {}),
609
617
  filterInit: 'qp-code-in',
610
618
  }}
611
619
  onChange={(value) => {
@@ -1932,7 +1932,7 @@ export default class RuleField extends Component {
1932
1932
  }
1933
1933
  }
1934
1934
  // 配送方式选择器
1935
- if (dataChoiceBusinessType == 310) {
1935
+ if (dataChoiceBusinessType == 310 || dataChoiceBusinessType == 311) {
1936
1936
  if (INTERVAL_TYPE.indexOf(selectOperation) > -1) {
1937
1937
  return (
1938
1938
  <>
@@ -1952,6 +1952,14 @@ export default class RuleField extends Component {
1952
1952
  labelInValue={true}
1953
1953
  value={values[0]}
1954
1954
  requestConfig={{
1955
+ ...(dataChoiceBusinessType === 311
1956
+ ? {
1957
+ otherParams: {
1958
+ // 配送方式只选择标准配送方式
1959
+ 'qp-recordChannnelCode-eq': 80,
1960
+ },
1961
+ }
1962
+ : {}),
1955
1963
  filterInit: 'qp-code-in',
1956
1964
  }}
1957
1965
  onChange={(value) => {
@@ -1983,6 +1991,14 @@ export default class RuleField extends Component {
1983
1991
  labelInValue={true}
1984
1992
  value={values[1]}
1985
1993
  requestConfig={{
1994
+ ...(dataChoiceBusinessType === 311
1995
+ ? {
1996
+ otherParams: {
1997
+ // 配送方式只选择标准配送方式
1998
+ 'qp-recordChannnelCode-eq': 80,
1999
+ },
2000
+ }
2001
+ : {}),
1986
2002
  filterInit: 'qp-code-in',
1987
2003
  }}
1988
2004
  onChange={(value) => {
@@ -2020,6 +2036,14 @@ export default class RuleField extends Component {
2020
2036
  labelInValue={true}
2021
2037
  value={currentValue}
2022
2038
  requestConfig={{
2039
+ ...(dataChoiceBusinessType === 311
2040
+ ? {
2041
+ otherParams: {
2042
+ // 配送方式只选择标准配送方式
2043
+ 'qp-recordChannnelCode-eq': 80,
2044
+ },
2045
+ }
2046
+ : {}),
2023
2047
  filterInit: 'qp-code-in',
2024
2048
  }}
2025
2049
  onChange={(value) => {