@bit-sun/business-component 4.0.13-alpha.9 → 4.2.0-alpha.0

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 (64) hide show
  1. package/.umirc.ts +21 -10
  2. package/dist/components/Business/BsSulaQueryTable/setting.d.ts +5 -2
  3. package/dist/components/Business/DetailPageWrapper/index.d.ts +6 -0
  4. package/dist/components/Business/ItemPropertySelector/index.d.ts +3 -0
  5. package/dist/components/Business/ModalUtils/index.d.ts +8 -0
  6. package/dist/components/Business/SearchSelect/utils.d.ts +4 -2
  7. package/dist/components/Business/columnSettingTable/columnSetting.d.ts +3 -2
  8. package/dist/components/Business/columnSettingTable/index.d.ts +19 -2
  9. package/dist/components/Business/columnSettingTable/sulaSettingTable.d.ts +20 -3
  10. package/dist/components/Functional/DataValidation/index.d.ts +11 -1
  11. package/dist/components/Functional/SearchSelect/utils.d.ts +2 -1
  12. package/dist/index.d.ts +1 -0
  13. package/dist/index.esm.js +2030 -901
  14. package/dist/index.js +2030 -900
  15. package/package.json +9 -7
  16. package/src/assets/btn-cancel.svg +3 -0
  17. package/src/assets/btn-copy.svg +3 -0
  18. package/src/assets/btn-delete.svg +2 -29
  19. package/src/assets/btn-edit.svg +2 -19
  20. package/src/assets/btn-hangUp.svg +3 -0
  21. package/src/assets/btn-print.svg +3 -0
  22. package/src/assets/btn-refresh.svg +3 -0
  23. package/src/assets/btn-unhook.svg +3 -0
  24. package/src/components/Business/BsSulaQueryTable/SearchItemSetting.tsx +4 -3
  25. package/src/components/Business/BsSulaQueryTable/bssulaquerytable.less +0 -4
  26. package/src/components/Business/BsSulaQueryTable/index.less +5 -3
  27. package/src/components/Business/BsSulaQueryTable/index.md +45 -32
  28. package/src/components/Business/BsSulaQueryTable/index.tsx +153 -76
  29. package/src/components/Business/BsSulaQueryTable/setting.tsx +40 -10
  30. package/src/components/Business/BsSulaQueryTable/utils.tsx +15 -12
  31. package/src/components/Business/CommodityEntry/index.md +1 -1
  32. package/src/components/Business/CommodityEntry/index.tsx +11 -9
  33. package/src/components/Business/DetailPageWrapper/index.less +1 -1
  34. package/src/components/Business/DetailPageWrapper/index.tsx +24 -5
  35. package/src/components/Business/DetailPageWrapper/utils.tsx +7 -2
  36. package/src/components/Business/HomePageWrapper/index.less +1 -1
  37. package/src/components/Business/ItemPropertySelector/index.tsx +88 -0
  38. package/src/components/Business/JsonQueryTable/function.ts +1 -1
  39. package/src/components/Business/ModalUtils/index.tsx +45 -0
  40. package/src/components/Business/SearchSelect/BusinessUtils.tsx +284 -57
  41. package/src/components/Business/SearchSelect/index.md +4 -4
  42. package/src/components/Business/SearchSelect/utils.ts +26 -4
  43. package/src/components/Business/columnSettingTable/columnSetting.tsx +27 -11
  44. package/src/components/Business/columnSettingTable/index.less +5 -3
  45. package/src/components/Business/columnSettingTable/index.md +200 -136
  46. package/src/components/Business/columnSettingTable/index.tsx +167 -39
  47. package/src/components/Business/columnSettingTable/sulaSettingTable.tsx +178 -47
  48. package/src/components/Functional/AddSelect/index.tsx +19 -9
  49. package/src/components/Functional/BillEntry/index.less +3 -0
  50. package/src/components/Functional/DataValidation/index.md +1 -0
  51. package/src/components/Functional/DataValidation/index.tsx +138 -23
  52. package/src/components/Functional/QueryMutipleSelect/index.tsx +2 -1
  53. package/src/components/Functional/SearchSelect/index.less +4 -0
  54. package/src/components/Functional/SearchSelect/index.tsx +61 -20
  55. package/src/components/Functional/SearchSelect/utils.tsx +13 -10
  56. package/src/components/Functional/TreeSearchSelect/index.tsx +2 -1
  57. package/src/components/Solution/RuleComponent/index.js +59 -1
  58. package/src/components/Solution/RuleComponent/ruleFiled.js +1 -1
  59. package/src/index.ts +1 -0
  60. package/src/plugin/TableColumnSetting/index.less +5 -3
  61. package/src/plugin/TableColumnSetting/index.tsx +4 -3
  62. package/src/styles/bsDefault.less +9 -3
  63. package/src/utils/request.ts +8 -4
  64. package/src/utils/utils.ts +11 -15
@@ -1,7 +1,7 @@
1
1
  // 此文件用于 处理业务组件 所用到的公共方法
2
2
  // @ts-nocheck
3
3
  import { shopFileType, arrivalPaySupportList, sharingType, shopFile2Type, shopFile2Status, employeeType, orgType, nodeType, personDataSourceType } from './common';
4
- import { getDictionarySource, getDictionaryTextByValue, loadSelectSource, handleHiddenFields, handleHiddenFieldsRequest, getFieldIndex } from './utils';
4
+ import { getDictionarySource, getDictionaryTextByValue, loadSelectSource, handleHiddenFields, handleHiddenFieldsRequest, getFieldIndex, getQueryHeadersList, getQueryHeadersItem } from './utils';
5
5
  import { handleTextOverflow, tableColumnsImage, handleTooltip } from '@/components/Business/BsSulaQueryTable/utils';
6
6
  import { getSkuImg } from '@/utils/TableUtils';
7
7
  import { getEmployeeCode, getCurrentTargetBgId } from '@/utils/LocalstorageUtils';
@@ -78,6 +78,9 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
78
78
  }
79
79
  let needModalTable = modalTableBusProps?.needModalTable !== undefined ? modalTableBusProps?.needModalTable : true;
80
80
 
81
+ const extralHeaders = requestConfigProp?.extralHeaders; // 拿到业务方设置的-选择器的额外请求头 不传则无,传了选择器查询接口传。
82
+ let querySelectHeadersList = modalTableBusProps?.querySelectHeadersList||[]; // 控制 选择器弹窗中查询条件额外请求头的列表--isOpen 是否开启, 设置true,默认取选择器的请求头;false则没有请求头。extralHeaders:当设置且isOpen为true时,取设置的请求头。queryKey为查询条件的key值。
83
+
81
84
  // 供应商选择器
82
85
  if(type === 'supplier') {
83
86
  selectProps = {
@@ -141,21 +144,22 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
141
144
  } },
142
145
  { name: 'qp-sharingType-eq', type: 'select', label: '共享类型', initialSource: sharingTypeDataList },
143
146
  ]
147
+ const queryHeaderParams = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
144
148
  Promise.all([
145
149
  loadSelectSource(`${prefixUrl.formSelectFix}/company`, {
146
150
  pageSize: 5000,
147
151
  currentPage: 1,
148
152
  'qp-companyType-eq': '30',
149
- }),
153
+ },getQueryHeadersItem(queryHeaderParams,'qp-conglomerateCode-in')),
150
154
  loadSelectSource(`${prefixUrl.formSelectFix}/accountingSubject`, {
151
155
  pageSize: 5000,
152
156
  currentPage: 1,
153
- }),
157
+ },getQueryHeadersItem(queryHeaderParams,'qp-accountingCode-in')),
154
158
  loadSelectSource(`${prefixUrl.formSelectFix}/company`, {
155
159
  pageSize: 5000,
156
160
  currentPage: 1,
157
161
  'qp-companyType-eq': '20',
158
- })
162
+ },getQueryHeadersItem(queryHeaderParams,'qp-companyCode-in'))
159
163
  ]).then((x: any)=>{
160
164
  formatSource(x,0, 2, tableSearchForm);
161
165
  formatSource(x,1, 3, tableSearchForm);
@@ -251,8 +255,9 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
251
255
  },
252
256
  } },
253
257
  ]
258
+ const queryHeaderParams = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
254
259
  Promise.all([
255
- loadSelectSource(`${prefixUrl.formSelectFix}/org/listNoPage`, {}),
260
+ loadSelectSource(`${prefixUrl.formSelectFix}/org/listNoPage`,{},getQueryHeadersItem(queryHeaderParams,'qp-createOrgCode-eq')),
256
261
  ]).then((x: any)=>{
257
262
  const firstElement = x?.[0];
258
263
  const allList = firstElement && [firstElement, firstElement];
@@ -368,12 +373,12 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
368
373
  },
369
374
  }
370
375
  } },
371
- { name: 'qp-eancode-in', label: '商品条码', field: {
372
- type: 'multipleQueryInput',
373
- props: {
374
- ...(requestConfigProp?.itemEancodeValueRequestConfig || {}),
375
- },
376
- }},
376
+ // { name: 'qp-eancode-in', label: '商品条码', field: {
377
+ // type: 'multipleQueryInput',
378
+ // props: {
379
+ // ...(requestConfigProp?.itemEancodeValueRequestConfig || {}),
380
+ // },
381
+ // }},
377
382
  { name: 'qp-brandId-in', type: 'select', label: '品牌', field: {
378
383
  type: 'select',
379
384
  props: {
@@ -410,19 +415,27 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
410
415
  type: 'proppertySelector',
411
416
  } },
412
417
  ]
418
+ const defaultQSHL = [
419
+ {
420
+ isOpen: true,
421
+ queryKey: 'qp-brandId-in',
422
+ },
423
+ ]
424
+ const queryHeaderParams = getQueryHeadersList({defaultQSHL, querySelectHeadersList, extralHeaders});
425
+
413
426
  Promise.all([
414
427
  loadSelectSource(`${prefixUrl.formSelectFix}/brand/queryBrandList`, {
415
428
  pageSize: 5000,
416
429
  currentPage: 1,
417
430
  'ctl-withAuth': true
418
- }),
431
+ },getQueryHeadersItem(queryHeaderParams,'qp-brandId-in')),
419
432
  loadSelectSource(`${prefixUrl.formSelectFix}/category/queryCategoryTree`, {
420
433
  pageSize: 5000,
421
434
  currentPage: 1,
422
- }),
435
+ },getQueryHeadersItem(queryHeaderParams,'qp-categoryId-in')),
423
436
  ]).then((x: any)=>{
424
- formatSource(x,0, 4, tableSearchForm,['id','name'])
425
- formatTreeDataSource(x,1, 5, tableSearchForm)
437
+ formatSource(x,0, 3, tableSearchForm,['id','name'])
438
+ formatTreeDataSource(x,1, 4, tableSearchForm)
426
439
  })
427
440
  modalTableProps = {
428
441
  modalTableTitle: '选择SKU',
@@ -494,6 +507,143 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
494
507
 
495
508
  // 商品选择器spu
496
509
  if(type === 'spuCommodity') {
510
+ selectProps = {
511
+ placeholder: '输入商品(SPU)编码或名称',
512
+ renderTableColumns: [
513
+ {
514
+ title: '商品编码(SPU)',
515
+ dataIndex: 'itemCode',
516
+ },
517
+ {
518
+ title: '商品名称(SPU)',
519
+ dataIndex: 'name',
520
+ },
521
+ ],
522
+ ...selectConfigProps,
523
+ }
524
+ requestConfig = {
525
+ url: `${prefixUrl.selectPrefix}/item`,
526
+ filter: 'qp-itemCode,name-orGroup,like', // 过滤参数
527
+ mappingTextField: 'name',
528
+ mappingValueField: 'itemCode',
529
+ otherParams: {
530
+ 'qp-approveStatus-eq': 1, // 审核状态(0.待审批;1.审批通过;2.驳回;3.审批未通过)
531
+ sorter: 'desc-id',
532
+ ...(requestConfigProp?.addOtherParams || {}),
533
+ }, // 默认参数
534
+ sourceName: 'itemCode',
535
+ ...requestConfigProp,
536
+ }
537
+ tableSearchForm = [
538
+ { name: 'itemCode*multiInput', label: '商品编码(SPU)', type: 'multipleQueryInput' },
539
+ { name: 'name*multiInput', label: '商品名称(SPU)', type: 'multipleQueryInput' },
540
+ { name: 'qp-brandId-in', type: 'select', label: '品牌', field: {
541
+ type: 'select',
542
+ props: {
543
+ mode: 'multiple',
544
+ notFoundContent: '暂无数据',
545
+ allowClear: true,
546
+ showSearch: true,
547
+ showArrow: true,
548
+ maxTagCount: 1,
549
+ optionFilterProp: 'children',
550
+ filterOption: (input: string, option: { props: { children: string } }) =>
551
+ option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
552
+ },
553
+ } },
554
+ { name: 'qp-categoryId-in', type: 'treeSelect', label: '类目', field: {
555
+ type: 'treeSelect',
556
+ props: {
557
+ treeData: [],
558
+ treeCheckable: true,
559
+ showSearch: true,
560
+ allowClear: true,
561
+ showArrow: true,
562
+ treeNodeFilterProp: 'title',
563
+ treeDefaultExpandAll: true,
564
+ maxTagCount: 1,
565
+ placeholder: '请选择',
566
+ style: {
567
+ width: '100%',
568
+ },
569
+ dropdownStyle: { maxHeight: 400, maxWidth: 100, overflow: 'auto' }
570
+ },
571
+ } },
572
+ { name: 'qp-classId-in', type: 'select', label: '品类', field: {
573
+ type: 'select',
574
+ props: {
575
+ mode: 'multiple',
576
+ notFoundContent: '暂无数据',
577
+ allowClear: true,
578
+ showSearch: true,
579
+ showArrow: true,
580
+ maxTagCount: 1,
581
+ optionFilterProp: 'children',
582
+ filterOption: (input: string, option: { props: { children: string } }) =>
583
+ option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
584
+ },
585
+ } },
586
+ ]
587
+ const queryHeaderParams = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
588
+ Promise.all([
589
+ loadSelectSource(`${prefixUrl.formSelectFix}/brand/queryBrandList`, {
590
+ pageSize: 5000,
591
+ currentPage: 1,
592
+ 'ctl-withAuth': true
593
+ },getQueryHeadersItem(queryHeaderParams,'qp-brandId-in')),
594
+ loadSelectSource(`${prefixUrl.formSelectFix}/category/queryCategoryTree`, {
595
+ pageSize: 5000,
596
+ currentPage: 1,
597
+ },getQueryHeadersItem(queryHeaderParams,'qp-categoryId-in')),
598
+ loadSelectSource(`${prefixUrl.formSelectFix}/class/withProperty`, {
599
+ pageSize: 5000,
600
+ currentPage: 1,
601
+ },getQueryHeadersItem(queryHeaderParams,'qp-classId-in')),
602
+ ]).then((x: any)=>{
603
+ formatSource(x,0, 2, tableSearchForm,['id','name']);
604
+ formatTreeDataSource(x,1, 3, tableSearchForm);
605
+ formatSource(x,2, 4, tableSearchForm,['id','name']);
606
+ })
607
+ modalTableProps = {
608
+ modalTableTitle: '选择商品(SPU) ',
609
+ tableSearchForm,
610
+ tableColumns: [
611
+ {
612
+ title: '序号',
613
+ dataIndex: 'keyIndex',
614
+ defaultSort: 0,
615
+ },
616
+ {
617
+ title: '商品编码(SPU)',
618
+ dataIndex: 'itemCode',
619
+ defaultSort: 1,
620
+ },
621
+ {
622
+ title: '商品名称(SPU) ',
623
+ dataIndex: 'name',
624
+ defaultSort: 2,
625
+ },
626
+ {
627
+ title: '品牌',
628
+ dataIndex: 'brandName',
629
+ defaultSort: 3,
630
+ },
631
+ {
632
+ title: '类目',
633
+ dataIndex: 'categoryText',
634
+ defaultSort: 4,
635
+ },
636
+ {
637
+ title: '品类',
638
+ dataIndex: 'className',
639
+ },
640
+ ],
641
+ ...modalTableBusProps
642
+ }
643
+ }
644
+
645
+ // 新库存商品选择器spu
646
+ if(type === 'spuCommodityWithProperty') {
497
647
  selectProps = {
498
648
  placeholder: '输入spu编码或名称',
499
649
  renderTableColumns: [
@@ -509,12 +659,13 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
509
659
  ...selectConfigProps,
510
660
  }
511
661
  requestConfig = {
512
- url: `${prefixUrl.selectPrefix}/item`,
662
+ url: `/stock/item/doItemPageAll`,
663
+ method: 'POST',
513
664
  filter: 'qp-itemCode,name-orGroup,like', // 过滤参数
514
665
  mappingTextField: 'name',
515
666
  mappingValueField: 'itemCode',
516
667
  otherParams: {
517
- 'qp-approveStatus-eq': 1, // 审核状态(0.待审批;1.审批通过;2.驳回;3.审批未通过)
668
+ // 'qp-approveStatus-eq': 1, // 审核状态(0.待审批;1.审批通过;2.驳回;3.审批未通过)
518
669
  sorter: 'desc-id',
519
670
  ...(requestConfigProp?.addOtherParams || {}),
520
671
  }, // 默认参数
@@ -522,8 +673,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
522
673
  ...requestConfigProp,
523
674
  }
524
675
  tableSearchForm = [
525
- { name: 'qp-name-like', label: 'SPU名称' },
526
- { name: 'qp-itemCode-like', label: 'SPU编码' },
676
+ { name: 'itemCode*multiInput', label: 'SPU编码', type: 'multipleQueryInput' },
677
+ { name: 'name*multiInput', label: 'SPU名称', type: 'multipleQueryInput' },
527
678
  { name: 'qp-brandId-in', type: 'select', label: '品牌', field: {
528
679
  type: 'select',
529
680
  props: {
@@ -570,21 +721,77 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
570
721
  option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
571
722
  },
572
723
  } },
724
+ {
725
+ name: 'qp-year-in',
726
+ label: '年份',
727
+ field: {
728
+ type: 'itemPropertySelector',
729
+ props: {
730
+ propertyCode: 'SX0000114',
731
+ mode: 'multiple',
732
+ }
733
+ }
734
+ },
735
+ {
736
+ name: 'qp-season-in',
737
+ label: '季节',
738
+ field: {
739
+ type: 'itemPropertySelector',
740
+ props: {
741
+ propertyCode: 'SX0000070',
742
+ mode: 'multiple',
743
+ }
744
+ }
745
+ },
746
+ {
747
+ name: 'qp-zzdlbm-in',
748
+ label: '大类',
749
+ field: {
750
+ type: 'itemPropertySelector',
751
+ props: {
752
+ propertyCode: 'SX0000071',
753
+ mode: 'multiple',
754
+ }
755
+ }
756
+ },
757
+ {
758
+ name: 'qp-zzzlbm-in',
759
+ label: '中类',
760
+ field: {
761
+ type: 'itemPropertySelector',
762
+ props: {
763
+ propertyCode: 'SX0000072',
764
+ mode: 'multiple',
765
+ }
766
+ }
767
+ },
768
+ {
769
+ name: 'qp-zzxlbm-in',
770
+ label: '小类',
771
+ field: {
772
+ type: 'itemPropertySelector',
773
+ props: {
774
+ propertyCode: 'SX0000110',
775
+ mode: 'multiple',
776
+ }
777
+ }
778
+ },
573
779
  ]
780
+ const queryHeaderParams = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
574
781
  Promise.all([
575
782
  loadSelectSource(`${prefixUrl.formSelectFix}/brand/queryBrandList`, {
576
783
  pageSize: 5000,
577
784
  currentPage: 1,
578
785
  'ctl-withAuth': true
579
- }),
786
+ },getQueryHeadersItem(queryHeaderParams,'qp-brandId-in')),
580
787
  loadSelectSource(`${prefixUrl.formSelectFix}/category/queryCategoryTree`, {
581
788
  pageSize: 5000,
582
789
  currentPage: 1,
583
- }),
790
+ },getQueryHeadersItem(queryHeaderParams,'qp-categoryId-in')),
584
791
  loadSelectSource(`${prefixUrl.formSelectFix}/class/withProperty`, {
585
792
  pageSize: 5000,
586
793
  currentPage: 1,
587
- }),
794
+ },getQueryHeadersItem(queryHeaderParams,'qp-classId-in')),
588
795
  ]).then((x: any)=>{
589
796
  formatSource(x,0, 2, tableSearchForm,['id','name']);
590
797
  formatTreeDataSource(x,1, 3, tableSearchForm);
@@ -624,6 +831,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
624
831
  dataIndex: 'className',
625
832
  },
626
833
  ],
834
+ noEmptySearchField: true,
627
835
  ...modalTableBusProps
628
836
  }
629
837
  }
@@ -709,6 +917,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
709
917
  },
710
918
  } },
711
919
  ], hiddenFields);
920
+ const queryHeaderParams = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
712
921
  const fieldsRequest = handleHiddenFieldsRequest(
713
922
  [
714
923
  {
@@ -717,21 +926,24 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
717
926
  pageSize: 10000,
718
927
  currentPage: 1,
719
928
  type: 2, // 类型:1尺码;2颜色
720
- }
929
+ },
930
+ options: getQueryHeadersItem(queryHeaderParams,'qp-colorName-in')
721
931
  },
722
932
  {
723
933
  url: `${prefixUrl.formSelectFix}/category/queryCategoryTree`,
724
934
  params: {
725
935
  pageSize: 5000,
726
936
  currentPage: 1,
727
- }
937
+ },
938
+ options: getQueryHeadersItem(queryHeaderParams,'qp-categoryId-in')
728
939
  },
729
940
  {
730
941
  url: `${prefixUrl.formSelectFix}/class/withProperty`,
731
942
  params: {
732
943
  pageSize: 5000,
733
944
  currentPage: 1,
734
- }
945
+ },
946
+ options: getQueryHeadersItem(queryHeaderParams,'qp-classId-in')
735
947
  },
736
948
  {
737
949
  url: `${prefixUrl.formSelectFix}/brand/queryBrandList`,
@@ -739,13 +951,14 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
739
951
  pageSize: 5000,
740
952
  currentPage: 1,
741
953
  'ctl-withAuth': true
742
- }
954
+ },
955
+ options: getQueryHeadersItem(queryHeaderParams,'qp-brandId-in')
743
956
  }
744
957
  ],
745
958
  ['colorName', 'categoryId', 'classId', 'brandId'],
746
959
  hiddenFields,
747
960
  );
748
- const fieldLoadSource = fieldsRequest.map((i: any) => loadSelectSource(i.url, i.params));
961
+ const fieldLoadSource = fieldsRequest.map((i: any) => loadSelectSource(i.url, i.params,options));
749
962
  requestConfig = {
750
963
  url: `${prefixUrl.selectPrefix}/skc/skcSelect`,
751
964
  filter: 'qp-code,name-orGroup,like', // 过滤参数
@@ -758,7 +971,6 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
758
971
  sourceName: 'qp-skcCode-eq',
759
972
  ...requestConfigProp,
760
973
  }
761
- tableSearchForm,
762
974
  Promise.all(fieldLoadSource).then((x: any)=>{
763
975
  formatSource(x,0, getFieldIndex(tableSearchForm, 'colorName'), tableSearchForm,['value','value']);
764
976
  formatTreeDataSource(x,1, getFieldIndex(tableSearchForm, 'categoryId'), tableSearchForm);
@@ -876,10 +1088,10 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
876
1088
  ...requestConfigProp,
877
1089
  }
878
1090
  tableSearchForm = [
879
- { name: 'qp-physicalWarehouseName-like', label: '物理仓名称' },
880
- { name: 'qp-physicalWarehouseCode-like', label: '物理仓编码' },
1091
+ { name: 'physicalWarehouseName*multiInput', label: '物理仓名称', type: 'multipleQueryInput' },
1092
+ { name: 'physicalWarehouseCode*multiInput', label: '物理仓编码', type: 'multipleQueryInput' },
881
1093
  { name: 'qp-physicalWarehouseType-eq', type: 'select', label: '物理仓类型', initialSource: getDictionarySource('SC00002') },
882
- { name: 'qp-companyCode-eq', type: 'select', label: '所属公司', field: {
1094
+ { name: 'qp-companyCode-in', type: 'select', label: '所属公司', field: {
883
1095
  type: 'select',
884
1096
  props: {
885
1097
  mode: 'multiple',
@@ -895,12 +1107,13 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
895
1107
  } },
896
1108
  ...(modalTableBusProps?.needStatusSearch?[{ name: 'qp-isEnable-eq', type: 'select', label: '物理仓状态', initialSource: getDictionarySource('SC00001') }]:[])
897
1109
  ]
1110
+ const queryHeaderParams = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
898
1111
  Promise.all([
899
1112
  loadSelectSource(`${prefixUrl.formSelectFix}/company`, {
900
1113
  pageSize: 5000,
901
1114
  currentPage: 1,
902
1115
  'qp-companyType-eq': 20,
903
- }),
1116
+ },getQueryHeadersItem(queryHeaderParams,'qp-companyCode-in')),
904
1117
  ]).then((x: any)=>{
905
1118
  formatSource(x,0, 3, tableSearchForm);
906
1119
  })
@@ -974,9 +1187,10 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
974
1187
  ...requestConfigProp,
975
1188
  }
976
1189
  tableSearchForm = [
977
- { name: 'qp-realWarehouseName-like', label: '逻辑仓名称' },
978
- { name: 'qp-realWarehouseCode-like', label: '逻辑仓编码' },
1190
+ { name: 'realWarehouseName*multiInput', label: '逻辑仓名称', type: 'multipleQueryInput' },
1191
+ { name: 'realWarehouseCode*multiInput', label: '逻辑仓编码', type: 'multipleQueryInput' },
979
1192
  { name: 'qp-realWarehouseType-eq', type: 'select', label: '逻辑仓类型', initialSource: getDictionarySource('SC00004') },
1193
+ { name: 'belongArea', field: {type: 'select', props: {mode: 'multiple',}}, label: '管理大区', initialSource: getDictionarySource('BUSINESS_belongArea'), },
980
1194
  ...(modalTableBusProps?.needStatusSearch?[{ name: 'qp-isEnable-eq', type: 'select', label: '逻辑仓状态', initialSource: getDictionarySource('SC00001') }]:[])
981
1195
  ]
982
1196
  modalTableProps = {
@@ -1011,6 +1225,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
1011
1225
  render: (text: number) => getDictionaryTextByValue('SC00001', text),
1012
1226
  }]:[]),
1013
1227
  ],
1228
+ noEmptySearchField: true,
1014
1229
  ...modalTableBusProps,
1015
1230
  }
1016
1231
  }
@@ -1045,8 +1260,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
1045
1260
  ...requestConfigProp,
1046
1261
  }
1047
1262
  tableSearchForm = [
1048
- { name: 'qp-name-like', label: '运营仓名称' },
1049
- { name: 'qp-operationWarehouseCode-like', label: '运营仓编码' },
1263
+ { name: 'name*multiInput', label: '运营仓名称', type: 'multipleQueryInput' },
1264
+ { name: 'operationWarehouseCode*multiInput', label: '运营仓编码', type: 'multipleQueryInput' },
1050
1265
  { name: 'qp-groupCode-in', type: 'select', label: '运营组', field: {
1051
1266
  type: 'select',
1052
1267
  props: {
@@ -1063,8 +1278,9 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
1063
1278
  } },
1064
1279
  ...(modalTableBusProps?.needStatusSearch?[{ name: 'qp-status-eq', type: 'select', label: '运营仓状态', initialSource: getDictionarySource('SC00001') }]:[])
1065
1280
  ]
1281
+ const queryHeaderParams = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
1066
1282
  Promise.all([
1067
- loadSelectSource(`${prefixUrl.formSelectFix}/groupInfo/listNoPage`, { 'qp-status-eq': 1 }),
1283
+ loadSelectSource(`${prefixUrl.formSelectFix}/groupInfo/listNoPage`, { 'qp-status-eq': 1 },getQueryHeadersItem(queryHeaderParams,'qp-groupCode-in')),
1068
1284
  ]).then((x: any)=>{
1069
1285
  formatSource(x,0, 2, tableSearchForm,['groupCode','groupName']);
1070
1286
  })
@@ -1246,21 +1462,22 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
1246
1462
  } },
1247
1463
  { name: 'qp-sharingType-eq', type: 'select', label: '共享类型', initialSource: sharingTypeDataList },
1248
1464
  ]
1465
+ const queryHeaderParams = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
1249
1466
  Promise.all([
1250
1467
  loadSelectSource(`${prefixUrl.formSelectFix}/company`, {
1251
1468
  pageSize: 5000,
1252
1469
  currentPage: 1,
1253
1470
  'qp-companyType-eq': '30',
1254
- }),
1471
+ },getQueryHeadersItem(queryHeaderParams,'qp-conglomerateCode-in')),
1255
1472
  loadSelectSource(`${prefixUrl.formSelectFix}/accountingSubject`, {
1256
1473
  pageSize: 5000,
1257
1474
  currentPage: 1,
1258
- }),
1475
+ },getQueryHeadersItem(queryHeaderParams,'qp-accountingCode-in')),
1259
1476
  loadSelectSource(`${prefixUrl.formSelectFix}/company`, {
1260
1477
  pageSize: 5000,
1261
1478
  currentPage: 1,
1262
1479
  'qp-companyType-eq': '20',
1263
- })
1480
+ },getQueryHeadersItem(queryHeaderParams,'qp-sharingType-in'))
1264
1481
  ]).then((x: any)=>{
1265
1482
  formatSource(x,0, 2, tableSearchForm);
1266
1483
  formatSource(x,1, 3, tableSearchForm);
@@ -1371,8 +1588,9 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
1371
1588
  },
1372
1589
  } },
1373
1590
  ]
1591
+ const queryHeaderParams = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
1374
1592
  Promise.all([
1375
- loadSelectSource(`${prefixUrl.formSelectFix}/org/listNoPage`, {}),
1593
+ loadSelectSource(`${prefixUrl.formSelectFix}/org/listNoPage`, {},getQueryHeadersItem(queryHeaderParams,'qp-createOrgCode-eq')),
1376
1594
  ]).then((x: any)=>{
1377
1595
  const firstElement = x?.[0];
1378
1596
  const allList = firstElement && [firstElement, firstElement];
@@ -1517,30 +1735,31 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
1517
1735
  },
1518
1736
  } },
1519
1737
  ]
1738
+ const queryHeaderParams = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
1520
1739
  Promise.all([
1521
1740
  loadSelectSource(`${prefixUrl.formSelectFix}/company`, {
1522
1741
  pageSize: 5000,
1523
1742
  currentPage: 1,
1524
1743
  'qp-companyType-eq': '30',
1525
- }),
1744
+ },getQueryHeadersItem(queryHeaderParams,'qp-conglomerateCode-in')),
1526
1745
  loadSelectSource(`${prefixUrl.formSelectFix}/company`, {
1527
1746
  pageSize: 5000,
1528
1747
  currentPage: 1,
1529
1748
  'qp-companyType-eq': '20',
1530
- }),
1749
+ },getQueryHeadersItem(queryHeaderParams,'qp-companyCode-in')),
1531
1750
  loadSelectSource(`${prefixUrl.formSelectFix}/platformRecord/getPlatformRecordList`, {
1532
1751
  // pageSize: 5000,
1533
1752
  // currentPage: 1,
1534
1753
  'qp-status-eq': '1',
1535
- }),
1754
+ },getQueryHeadersItem(queryHeaderParams,'qp-plateformCode-in')),
1536
1755
  loadSelectSource(`${prefixUrl.formSelectFix}/store`, {
1537
1756
  pageSize: 5000,
1538
1757
  currentPage: 1,
1539
- }),
1758
+ },getQueryHeadersItem(queryHeaderParams,'qp-mainBrandCode-in')),
1540
1759
  loadSelectSource(`${prefixUrl.formSelectFix}/accountingSubject`, {
1541
1760
  pageSize: 5000,
1542
1761
  currentPage: 1,
1543
- }),
1762
+ },getQueryHeadersItem(queryHeaderParams,'qp-accountingCode-in')),
1544
1763
  ]).then((x: any)=>{
1545
1764
  formatSource(x,0, 2, tableSearchForm);
1546
1765
  formatSource(x,1, 3, tableSearchForm);
@@ -1623,8 +1842,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
1623
1842
  ...requestConfigProp,
1624
1843
  }
1625
1844
  tableSearchForm = [
1626
- { name: 'qp-name-like', label: '商店名称' },
1627
- { name: 'qp-code-like', label: '商店编码' },
1845
+ { name: 'name*multiInput', label: '商店名称', type: 'multipleQueryInput' },
1846
+ { name: 'code*multiInput', label: '商店编码', type: 'multipleQueryInput' },
1628
1847
  { name: 'qp-type-in', type: 'select', label: '商店类型', initialSource: shopFile2Type },
1629
1848
  { name: 'qp-status-in', type: 'select', label: '商店状态', initialSource: shopFile2Status },
1630
1849
  { name: 'qp-orgCode-in', type: 'select', label: '所属销售组织', field: {
@@ -1642,12 +1861,13 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
1642
1861
  },
1643
1862
  } },
1644
1863
  ]
1864
+ const queryHeaderParams = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
1645
1865
  Promise.all([
1646
1866
  loadSelectSource(`${prefixUrl.formSelectFix}/orgView/getTree/sales-organizational-view`, {
1647
1867
  'qp-employeeCode-eq': getEmployeeCode(),
1648
1868
  'qp-realOrg-eq': true,
1649
1869
  'qp-status-eq': 10
1650
- }),
1870
+ },getQueryHeadersItem(queryHeaderParams,'qp-orgCode-in')),
1651
1871
  ]).then((x: any)=>{
1652
1872
  formatSource(x,0, 4, tableSearchForm);
1653
1873
  })
@@ -1873,12 +2093,13 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
1873
2093
  { name: 'qp-email-like', label: '邮箱' },
1874
2094
  { name: 'qp-officeTelephone-like', label: '手机号' },
1875
2095
  ]
2096
+ const queryHeaderParams = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
1876
2097
  Promise.all([
1877
2098
  loadSelectSource(`${prefixUrl.formSelectFix}/company`, {
1878
2099
  pageSize: 5000,
1879
2100
  currentPage: 1,
1880
2101
  'qp-companyType-eq': 20,
1881
- }),
2102
+ },getQueryHeadersItem(queryHeaderParams,'qp-companyCode-in')),
1882
2103
  ]).then((x: any)=>{
1883
2104
  formatSource(x,0, 2, tableSearchForm);
1884
2105
  })
@@ -1980,8 +2201,9 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
1980
2201
  { name: 'qp-email-like', label: '邮箱' },
1981
2202
  { name: 'qp-officeTelephone-like', label: '手机号' },
1982
2203
  ]
2204
+ const queryHeaderParams = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
1983
2205
  Promise.all([
1984
- loadSelectSource(`${prefixUrl.formSelectFix}/orgViewNode/common/getTreeForOrgViewAndTenant`, { 'orgViewCode': 'administrative-organization-view' }),
2206
+ loadSelectSource(`${prefixUrl.formSelectFix}/orgViewNode/common/getTreeForOrgViewAndTenant`, { 'orgViewCode': 'administrative-organization-view' },getQueryHeadersItem(queryHeaderParams,'qp-code-in')),
1985
2207
  ]).then((x: any)=>{
1986
2208
  formatTreeDataSource(x,0, 2, tableSearchForm,['code', 'name']);
1987
2209
  })
@@ -2108,15 +2330,16 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
2108
2330
  } },
2109
2331
  { name: 'qp-remark-like', label: '备注' },
2110
2332
  ]
2333
+ const queryHeaderParams = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
2111
2334
  Promise.all([
2112
2335
  loadSelectSource(`${prefixUrl.formSelectFix}/logisCompany`, {
2113
2336
  pageSize: 5000,
2114
2337
  currentPage: 1,
2115
- }),
2338
+ },getQueryHeadersItem(queryHeaderParams,logisCompanyCodeSingleSearchName)),
2116
2339
  loadSelectSource(`${prefixUrl.formSelectFix}/printTemplate`, {
2117
2340
  pageSize: 5000,
2118
2341
  currentPage: 1,
2119
- })
2342
+ },getQueryHeadersItem(queryHeaderParams,'qp-sheetTemplateCode-in'))
2120
2343
  ]).then((x: any)=>{
2121
2344
  formatSource(x,0, 2, tableSearchForm);
2122
2345
  formatSource(x,1, 5, tableSearchForm);
@@ -2294,11 +2517,12 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
2294
2517
  }
2295
2518
  },
2296
2519
  ]
2520
+ const queryHeaderParams = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
2297
2521
  Promise.all([
2298
2522
  loadSelectSource(`${prefixUrl.formSelectFix}/permissionCategory`, {
2299
2523
  pageSize: 5000,
2300
2524
  currentPage: 1,
2301
- }),
2525
+ },getQueryHeadersItem(queryHeaderParams,'qp-categoryCode-eq')),
2302
2526
  ]).then((x: any)=>{
2303
2527
  formatSource(x,0, 2, tableSearchForm);
2304
2528
  })
@@ -2395,12 +2619,13 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
2395
2619
  },
2396
2620
  } },
2397
2621
  ]
2622
+ const queryHeaderParams = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
2398
2623
  Promise.all([
2399
2624
  loadSelectSource(`${prefixUrl.formSelectFix}/orgView/getTree/sales-organizational-view`, {
2400
2625
  'qp-employeeCode-eq': getEmployeeCode(),
2401
2626
  'qp-realOrg-eq': true,
2402
2627
  'qp-status-eq': 10
2403
- }),
2628
+ },getQueryHeadersItem(queryHeaderParams,'qp-salesOrgCode-in')),
2404
2629
  ]).then((x: any)=>{
2405
2630
  formatSource(x, 0, 2, tableSearchForm);
2406
2631
  })
@@ -2511,10 +2736,11 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
2511
2736
  },
2512
2737
  initialSource: nodeType
2513
2738
  }]
2739
+ const queryHeaderParams = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
2514
2740
  Promise.all([
2515
2741
  loadSelectSource(`${prefixUrl.formSelectFix}/orgView/getOrgViewListNoPage`, {
2516
2742
  'qp-status-eq': 10
2517
- }),
2743
+ },getQueryHeadersItem(queryHeaderParams,'qp-orgViewCode-in')),
2518
2744
  ]).then((x: any)=>{
2519
2745
  formatSource(x, 0, 2, tableSearchForm);
2520
2746
  })
@@ -2874,10 +3100,11 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
2874
3100
  },
2875
3101
  initialSource: nodeType
2876
3102
  }]
3103
+ const queryHeaderParams = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
2877
3104
  Promise.all([
2878
3105
  loadSelectSource(`${prefixUrl.formSelectFix}/orgView/getOrgViewListNoPage`, {
2879
3106
  'qp-status-eq': 10
2880
- }),
3107
+ },getQueryHeadersItem(queryHeaderParams,'qp-orgViewCode-in')),
2881
3108
  ]).then((x: any)=>{
2882
3109
  formatSource(x, 0, 2, tableSearchForm);
2883
3110
  })