@bit-sun/business-component 4.0.11-alpha.9 → 4.0.12-alpha.2
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.
- package/dist/components/Business/BsSulaQueryTable/SearchItemSetting.d.ts +2 -4
- package/dist/components/Functional/SearchSelect/utils.d.ts +4 -0
- package/dist/index.esm.js +637 -424
- package/dist/index.js +638 -425
- package/package.json +2 -2
- package/src/components/Business/BsLayouts/index.tsx +17 -0
- package/src/components/Business/BsSulaQueryTable/SearchItemSetting.tsx +45 -17
- package/src/components/Business/BsSulaQueryTable/index.less +21 -38
- package/src/components/Business/BsSulaQueryTable/setting.tsx +5 -5
- package/src/components/Business/DetailPageWrapper/index.less +10 -1
- package/src/components/Business/DetailPageWrapper/index.tsx +27 -2
- package/src/components/Business/HomePageWrapper/index.less +9 -0
- package/src/components/Business/HomePageWrapper/index.tsx +1 -1
- package/src/components/Business/SearchSelect/BusinessUtils.tsx +66 -25
- package/src/components/Business/SearchSelect/index.md +6 -5
- package/src/components/Business/columnSettingTable/columnSetting.tsx +5 -5
- package/src/components/Business/columnSettingTable/index.less +33 -71
- package/src/components/Functional/QueryMutipleInput/index.tsx +2 -0
- package/src/components/Functional/SearchSelect/index.less +22 -5
- package/src/components/Functional/SearchSelect/index.tsx +146 -67
- package/src/components/Functional/SearchSelect/utils.ts +12 -1
- package/src/components/Functional/TreeSearchSelect/index.tsx +1 -1
- package/src/plugin/TableColumnSetting/index.less +38 -70
- package/src/plugin/TableColumnSetting/index.tsx +5 -5
- package/src/styles/bsDefault.less +130 -123
|
@@ -4,7 +4,7 @@ import { shopFileType, arrivalPaySupportList, sharingType, shopFile2Type, shopFi
|
|
|
4
4
|
import { getDictionarySource, getDictionaryTextByValue, loadSelectSource, handleHiddenFields, handleHiddenFieldsRequest, getFieldIndex } from './utils';
|
|
5
5
|
import { handleTextOverflow, tableColumnsImage, handleTooltip } from '@/components/Business/BsSulaQueryTable/utils';
|
|
6
6
|
import { getSkuImg } from '@/utils/TableUtils';
|
|
7
|
-
import { getEmployeeCode } from '@/utils/LocalstorageUtils';
|
|
7
|
+
import { getEmployeeCode, getCurrentTargetBgId } from '@/utils/LocalstorageUtils';
|
|
8
8
|
import { Image } from 'antd';
|
|
9
9
|
|
|
10
10
|
const hasDictSharingType = getDictionarySource('UC000013')?.length;
|
|
@@ -18,7 +18,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
18
18
|
url: `${prefixUrl.selectPrefix}/supplier`,
|
|
19
19
|
filter: 'qp-name,code-orGroup,like', // 过滤参数
|
|
20
20
|
otherParams: {
|
|
21
|
-
sorter: 'desc-id'
|
|
21
|
+
sorter: 'desc-id',
|
|
22
|
+
...(requestConfigProp?.addOtherParams || {}),
|
|
22
23
|
}, // 默认参数
|
|
23
24
|
...requestConfigProp
|
|
24
25
|
}
|
|
@@ -296,11 +297,14 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
296
297
|
requestConfig = {
|
|
297
298
|
url: `${prefixUrl.selectPrefix}/sku/doPageBySelect/v3`,
|
|
298
299
|
filter: 'skuCodeAndSkuName', // 过滤参数
|
|
300
|
+
searchStartLength: 4,
|
|
299
301
|
mappingTextField: 'name',
|
|
300
302
|
mappingValueField: 'skuCode',
|
|
301
303
|
mappingTextShowTextField: ['name', 'propertyNameAndValue'],
|
|
302
304
|
otherParams: {
|
|
305
|
+
'ownOrgSign': getCurrentTargetBgId(),
|
|
303
306
|
// 'qp-type-eq': 10, // 查唯一国际条码【有些项目不需要必须要有国际条码,故注释,需要的项目自己定义otherParams补充上这个条件】
|
|
307
|
+
...(requestConfigProp?.addOtherParams || {}),
|
|
304
308
|
}, // 默认参数
|
|
305
309
|
sourceName: 'skuCode',
|
|
306
310
|
...requestConfigProp,
|
|
@@ -380,7 +384,6 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
380
384
|
modalTableTitle: '选择SKU',
|
|
381
385
|
tableSearchForm,
|
|
382
386
|
isHorizontally: true,
|
|
383
|
-
modalRadioNeedFooter: true,
|
|
384
387
|
tableColumns: [
|
|
385
388
|
{
|
|
386
389
|
title: '序号',
|
|
@@ -468,7 +471,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
468
471
|
mappingValueField: 'itemCode',
|
|
469
472
|
otherParams: {
|
|
470
473
|
'qp-approveStatus-eq': 1, // 审核状态(0.待审批;1.审批通过;2.驳回;3.审批未通过)
|
|
471
|
-
sorter: 'desc-id'
|
|
474
|
+
sorter: 'desc-id',
|
|
475
|
+
...(requestConfigProp?.addOtherParams || {}),
|
|
472
476
|
}, // 默认参数
|
|
473
477
|
sourceName: 'itemCode',
|
|
474
478
|
...requestConfigProp,
|
|
@@ -705,6 +709,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
705
709
|
mappingValueField: 'code',
|
|
706
710
|
otherParams: {
|
|
707
711
|
'qp-skcStatus-eq': 1, // 状态:0禁用 1启用
|
|
712
|
+
...(requestConfigProp?.addOtherParams || {}),
|
|
708
713
|
}, // 默认参数
|
|
709
714
|
sourceName: 'qp-skcCode-eq',
|
|
710
715
|
...requestConfigProp,
|
|
@@ -785,7 +790,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
785
790
|
mappingTextShowKeyField: 'propertyValueCode',
|
|
786
791
|
mappingValueField: 'propertyValueCode',
|
|
787
792
|
otherParams: {
|
|
788
|
-
sorter: 'desc-id'
|
|
793
|
+
sorter: 'desc-id',
|
|
794
|
+
...(requestConfigProp?.addOtherParams || {}),
|
|
789
795
|
}, // 默认参数
|
|
790
796
|
sourceName: 'qp-propertyValueCode-in',
|
|
791
797
|
...requestConfigProp,
|
|
@@ -810,6 +816,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
810
816
|
...selectConfigProps,
|
|
811
817
|
}
|
|
812
818
|
requestConfig = {
|
|
819
|
+
init: true,
|
|
813
820
|
url: `${prefixUrl.selectPrefix}/physicalWarehouse`,
|
|
814
821
|
filter: 'qp-physicalWarehouseName,physicalWarehouseCode-orGroup,like', // 过滤参数
|
|
815
822
|
mappingTextField: 'physicalWarehouseName',
|
|
@@ -817,7 +824,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
817
824
|
mappingValueField: 'id',
|
|
818
825
|
otherParams: {
|
|
819
826
|
...(modalTableBusProps?.needStatusSearch?{}:{'qp-isEnable-eq': 1}),
|
|
820
|
-
sorter: 'desc-id'
|
|
827
|
+
sorter: 'desc-id',
|
|
828
|
+
...(requestConfigProp?.addOtherParams || {}),
|
|
821
829
|
}, // 默认参数
|
|
822
830
|
sourceName: 'warehouseIds',
|
|
823
831
|
...requestConfigProp,
|
|
@@ -906,6 +914,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
906
914
|
...selectConfigProps,
|
|
907
915
|
}
|
|
908
916
|
requestConfig = {
|
|
917
|
+
init: true,
|
|
909
918
|
url: `${prefixUrl.selectPrefix}/realWarehouse`,
|
|
910
919
|
filter: 'qp-realWarehouseName,realWarehouseCode-orGroup,like', // 过滤参数
|
|
911
920
|
mappingTextField: 'realWarehouseName',
|
|
@@ -913,7 +922,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
913
922
|
mappingValueField: 'id',
|
|
914
923
|
otherParams: {
|
|
915
924
|
...(modalTableBusProps?.needStatusSearch?{}:{'qp-isEnable-eq': 1}),
|
|
916
|
-
sorter: 'desc-id'
|
|
925
|
+
sorter: 'desc-id',
|
|
926
|
+
...(requestConfigProp?.addOtherParams || {}),
|
|
917
927
|
}, // 默认参数
|
|
918
928
|
sourceName: 'warehouseIds',
|
|
919
929
|
...requestConfigProp,
|
|
@@ -975,6 +985,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
975
985
|
...selectConfigProps,
|
|
976
986
|
}
|
|
977
987
|
requestConfig = {
|
|
988
|
+
init: true,
|
|
978
989
|
url: `${prefixUrl.selectPrefix}/ownerWarehouse`,
|
|
979
990
|
filter: 'qp-name,operationWarehouseCode-orGroup,like', // 过滤参数
|
|
980
991
|
mappingTextField: 'name',
|
|
@@ -982,7 +993,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
982
993
|
mappingValueField: 'operationWarehouseCode',
|
|
983
994
|
otherParams: {
|
|
984
995
|
...(modalTableBusProps?.needStatusSearch?{}:{'qp-status-eq': 1}),
|
|
985
|
-
sorter: 'desc-id'
|
|
996
|
+
sorter: 'desc-id',
|
|
997
|
+
...(requestConfigProp?.addOtherParams || {}),
|
|
986
998
|
}, // 默认参数
|
|
987
999
|
sourceName: 'qp-operationWarehouseCode-in',
|
|
988
1000
|
...requestConfigProp,
|
|
@@ -1063,6 +1075,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
1063
1075
|
...selectConfigProps,
|
|
1064
1076
|
}
|
|
1065
1077
|
requestConfig = {
|
|
1078
|
+
init: true,
|
|
1066
1079
|
url: `${prefixUrl.selectPrefix}/virtualWarehouse`,
|
|
1067
1080
|
filter: 'qp-virtualWarehouseName,virtualWarehouseCode-orGroup,like', // 过滤参数
|
|
1068
1081
|
mappingTextField: 'virtualWarehouseName',
|
|
@@ -1070,7 +1083,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
1070
1083
|
mappingValueField: 'id',
|
|
1071
1084
|
otherParams: {
|
|
1072
1085
|
'qp-isEnable-eq': 1,
|
|
1073
|
-
sorter: 'desc-id'
|
|
1086
|
+
sorter: 'desc-id',
|
|
1087
|
+
...(requestConfigProp?.addOtherParams || {}),
|
|
1074
1088
|
}, // 默认参数
|
|
1075
1089
|
sourceName: 'warehouseIds',
|
|
1076
1090
|
...requestConfigProp,
|
|
@@ -1093,6 +1107,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
1093
1107
|
...selectConfigProps,
|
|
1094
1108
|
}
|
|
1095
1109
|
requestConfig = {
|
|
1110
|
+
init: true,
|
|
1096
1111
|
url: `${prefixUrl.selectPrefix}/channelWarehouse`,
|
|
1097
1112
|
filter: 'qp-channelWarehouseName,channelWarehouseCode-orGroup,like', // 过滤参数
|
|
1098
1113
|
mappingTextField: 'channelWarehouseName',
|
|
@@ -1100,7 +1115,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
1100
1115
|
mappingValueField: 'id',
|
|
1101
1116
|
otherParams: {
|
|
1102
1117
|
'qp-isEnable-eq': 1,
|
|
1103
|
-
sorter: 'desc-id'
|
|
1118
|
+
sorter: 'desc-id',
|
|
1119
|
+
...(requestConfigProp?.addOtherParams || {}),
|
|
1104
1120
|
}, // 默认参数
|
|
1105
1121
|
sourceName: 'warehouseIds',
|
|
1106
1122
|
...requestConfigProp,
|
|
@@ -1125,13 +1141,15 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
1125
1141
|
...selectConfigProps,
|
|
1126
1142
|
}
|
|
1127
1143
|
requestConfig = {
|
|
1144
|
+
init: true,
|
|
1128
1145
|
url: `${prefixUrl.selectPrefix}/uc/customer/v2`,
|
|
1129
1146
|
filter: 'qp-name,code-orGroup,like', // 过滤参数
|
|
1130
1147
|
mappingTextField: 'name',
|
|
1131
1148
|
mappingValueField: 'code',
|
|
1132
1149
|
otherParams: {
|
|
1133
1150
|
'qp-status-eq': 10,
|
|
1134
|
-
sorter: 'desc-id'
|
|
1151
|
+
sorter: 'desc-id',
|
|
1152
|
+
...(requestConfigProp?.addOtherParams || {}),
|
|
1135
1153
|
}, // 默认参数
|
|
1136
1154
|
sourceName: 'customCode',
|
|
1137
1155
|
...requestConfigProp,
|
|
@@ -1262,6 +1280,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
1262
1280
|
}
|
|
1263
1281
|
// 版本2
|
|
1264
1282
|
requestConfig = {
|
|
1283
|
+
init: true,
|
|
1265
1284
|
url: `${prefixUrl.selectPrefix}/customer`,
|
|
1266
1285
|
filter: 'qp-name,code-orGroup,like', // 过滤参数
|
|
1267
1286
|
mappingTextField: 'name',
|
|
@@ -1269,7 +1288,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
1269
1288
|
otherParams: {
|
|
1270
1289
|
'qp-isMain-eq': 1, // 员工权限过滤,若不需要不要加
|
|
1271
1290
|
'qp-status-eq': 1, // 1启用 0禁用
|
|
1272
|
-
sorter: 'desc-id'
|
|
1291
|
+
sorter: 'desc-id',
|
|
1292
|
+
...(requestConfigProp?.addOtherParams || {}),
|
|
1273
1293
|
}, // 默认参数
|
|
1274
1294
|
sourceName: 'customCode',
|
|
1275
1295
|
...requestConfigProp,
|
|
@@ -1365,12 +1385,14 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
1365
1385
|
...selectConfigProps,
|
|
1366
1386
|
}
|
|
1367
1387
|
requestConfig = {
|
|
1388
|
+
init: true,
|
|
1368
1389
|
url: `${prefixUrl.selectPrefix}/store`,
|
|
1369
1390
|
filter: 'qp-name,code-orGroup,like', // 过滤参数
|
|
1370
1391
|
mappingTextField: 'name',
|
|
1371
1392
|
mappingValueField: 'code',
|
|
1372
1393
|
otherParams: {
|
|
1373
|
-
sorter: 'desc-id'
|
|
1394
|
+
sorter: 'desc-id',
|
|
1395
|
+
...(requestConfigProp?.addOtherParams || {}),
|
|
1374
1396
|
}, // 默认参数
|
|
1375
1397
|
sourceName: 'code',
|
|
1376
1398
|
...requestConfigProp,
|
|
@@ -1543,12 +1565,14 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
1543
1565
|
...selectConfigProps,
|
|
1544
1566
|
}
|
|
1545
1567
|
requestConfig = {
|
|
1568
|
+
init: true,
|
|
1546
1569
|
url: `${prefixUrl.selectPrefix}/store/page`,
|
|
1547
1570
|
filter: 'qp-name,code-orGroup,like', // 过滤参数
|
|
1548
1571
|
mappingTextField: 'name',
|
|
1549
1572
|
mappingValueField: 'code',
|
|
1550
1573
|
otherParams: {
|
|
1551
|
-
sorter: 'desc-id'
|
|
1574
|
+
sorter: 'desc-id',
|
|
1575
|
+
...(requestConfigProp?.addOtherParams || {}),
|
|
1552
1576
|
}, // 默认参数
|
|
1553
1577
|
sourceName: 'code',
|
|
1554
1578
|
...requestConfigProp,
|
|
@@ -1645,7 +1669,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
1645
1669
|
mappingTextShowKeyField: 'code',
|
|
1646
1670
|
mappingValueField: 'id',
|
|
1647
1671
|
otherParams: {
|
|
1648
|
-
sorter: 'desc-id'
|
|
1672
|
+
sorter: 'desc-id',
|
|
1673
|
+
...(requestConfigProp?.addOtherParams || {}),
|
|
1649
1674
|
}, // 默认参数
|
|
1650
1675
|
sourceName: 'accountingSubjectCode',
|
|
1651
1676
|
...requestConfigProp,
|
|
@@ -1675,7 +1700,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
1675
1700
|
mappingTextShowKeyField: 'code',
|
|
1676
1701
|
mappingValueField: 'id',
|
|
1677
1702
|
otherParams: {
|
|
1678
|
-
sorter: 'desc-id'
|
|
1703
|
+
sorter: 'desc-id',
|
|
1704
|
+
...(requestConfigProp?.addOtherParams || {}),
|
|
1679
1705
|
}, // 默认参数
|
|
1680
1706
|
sourceName: 'inventoryOrgCode',
|
|
1681
1707
|
...requestConfigProp,
|
|
@@ -1706,7 +1732,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
1706
1732
|
mappingTextShowKeyField: 'code',
|
|
1707
1733
|
mappingValueField: 'id',
|
|
1708
1734
|
otherParams: {
|
|
1709
|
-
sorter: 'desc-id'
|
|
1735
|
+
sorter: 'desc-id',
|
|
1736
|
+
...(requestConfigProp?.addOtherParams || {}),
|
|
1710
1737
|
}, // 默认参数
|
|
1711
1738
|
sourceName: 'corporationCompany',
|
|
1712
1739
|
...requestConfigProp,
|
|
@@ -1737,7 +1764,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
1737
1764
|
mappingTextShowKeyField: 'socialCreditCode',
|
|
1738
1765
|
mappingValueField: 'socialCreditCode',
|
|
1739
1766
|
otherParams: {
|
|
1740
|
-
sorter: 'desc-id'
|
|
1767
|
+
sorter: 'desc-id',
|
|
1768
|
+
...(requestConfigProp?.addOtherParams || {}),
|
|
1741
1769
|
}, // 默认参数
|
|
1742
1770
|
sourceName: 'platCompany',
|
|
1743
1771
|
...requestConfigProp,
|
|
@@ -1770,7 +1798,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
1770
1798
|
otherParams: {
|
|
1771
1799
|
'qp-enable-eq': 10, // 启用状态 10-启用,20-禁用
|
|
1772
1800
|
'qp-employmentType-eq': 20,
|
|
1773
|
-
sorter: 'desc-id'
|
|
1801
|
+
sorter: 'desc-id',
|
|
1802
|
+
...(requestConfigProp?.addOtherParams || {}),
|
|
1774
1803
|
}, // 默认参数
|
|
1775
1804
|
sourceName: 'employeeNumber',
|
|
1776
1805
|
...requestConfigProp,
|
|
@@ -1867,7 +1896,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
1867
1896
|
'qp-enable-eq': 10, // 启用状态 10-启用,20-禁用
|
|
1868
1897
|
'qp-orgViewIds-like': 'administrative-organization-view', // 为了兼容 搜素所属组织机构时候需要传此参数
|
|
1869
1898
|
...(modalTableBusProps?.needTypeSearch?{}:{'qp-employmentType-eq': 20}), // 10外部员工;20内部员工
|
|
1870
|
-
sorter: 'desc-id'
|
|
1899
|
+
sorter: 'desc-id',
|
|
1900
|
+
...(requestConfigProp?.addOtherParams || {}),
|
|
1871
1901
|
}, // 默认参数
|
|
1872
1902
|
sourceName: 'employeeNumber',
|
|
1873
1903
|
...requestConfigProp,
|
|
@@ -1984,7 +2014,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
1984
2014
|
mappingTextShowKeyField: 'code',
|
|
1985
2015
|
mappingValueField: 'code',
|
|
1986
2016
|
otherParams: {
|
|
1987
|
-
sorter: 'desc-id'
|
|
2017
|
+
sorter: 'desc-id',
|
|
2018
|
+
...(requestConfigProp?.addOtherParams || {}),
|
|
1988
2019
|
}, // 默认参数
|
|
1989
2020
|
sourceName: 'deliveryModeCode',
|
|
1990
2021
|
...requestConfigProp
|
|
@@ -2110,7 +2141,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
2110
2141
|
mappingTextShowKeyField: 'code',
|
|
2111
2142
|
mappingValueField: 'code',
|
|
2112
2143
|
otherParams: {
|
|
2113
|
-
sorter: 'desc-id'
|
|
2144
|
+
sorter: 'desc-id',
|
|
2145
|
+
...(requestConfigProp?.addOtherParams || {}),
|
|
2114
2146
|
}, // 默认参数
|
|
2115
2147
|
sourceName: 'ruleTemplateCode',
|
|
2116
2148
|
...requestConfigProp
|
|
@@ -2186,6 +2218,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
2186
2218
|
otherParams: {
|
|
2187
2219
|
'qp-status-eq': 10, // 10启用 20禁用
|
|
2188
2220
|
sorter: 'desc-id',
|
|
2221
|
+
...(requestConfigProp?.addOtherParams || {}),
|
|
2189
2222
|
}, // 默认参数
|
|
2190
2223
|
sourceName: 'roleCode',
|
|
2191
2224
|
...requestConfigProp
|
|
@@ -2285,6 +2318,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
2285
2318
|
'qp-isMain-eq': 1,
|
|
2286
2319
|
'qp-status-eq': 10, // 10启用 20禁用
|
|
2287
2320
|
sorter: 'desc-id',
|
|
2321
|
+
...(requestConfigProp?.addOtherParams || {}),
|
|
2288
2322
|
}, // 默认参数
|
|
2289
2323
|
sourceName: 'marketChannelCode',
|
|
2290
2324
|
...requestConfigProp
|
|
@@ -2371,6 +2405,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
2371
2405
|
mappingValueField: 'code',
|
|
2372
2406
|
otherParams: {
|
|
2373
2407
|
sorter: 'desc-createTime',
|
|
2408
|
+
...(requestConfigProp?.addOtherParams || {}),
|
|
2374
2409
|
}, // 默认参数
|
|
2375
2410
|
sourceName: 'organizationCode',
|
|
2376
2411
|
...requestConfigProp
|
|
@@ -2502,7 +2537,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
2502
2537
|
mappingTextShowKeyField: 'code',
|
|
2503
2538
|
mappingValueField: 'code',
|
|
2504
2539
|
otherParams: {
|
|
2505
|
-
sorter: 'desc-id'
|
|
2540
|
+
sorter: 'desc-id',
|
|
2541
|
+
...(requestConfigProp?.addOtherParams || {}),
|
|
2506
2542
|
}, // 默认参数
|
|
2507
2543
|
sourceName: 'personCode',
|
|
2508
2544
|
...requestConfigProp,
|
|
@@ -2564,6 +2600,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
2564
2600
|
...selectConfigProps,
|
|
2565
2601
|
}
|
|
2566
2602
|
requestConfig = {
|
|
2603
|
+
init: true,
|
|
2567
2604
|
url: `${prefixUrl.selectPrefix}/brand/list`,
|
|
2568
2605
|
filter: 'qp-brandCode,name-orGroup,like', // 过滤参数
|
|
2569
2606
|
mappingTextField: 'name',
|
|
@@ -2572,7 +2609,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
2572
2609
|
otherParams: {
|
|
2573
2610
|
'ctl-withAuth': true,
|
|
2574
2611
|
'qp-status-in': '1', // 1启用 0禁用
|
|
2575
|
-
sorter: 'desc-id'
|
|
2612
|
+
sorter: 'desc-id',
|
|
2613
|
+
...(requestConfigProp?.addOtherParams || {}),
|
|
2576
2614
|
}, // 默认参数
|
|
2577
2615
|
sourceName: 'brandCode',
|
|
2578
2616
|
...requestConfigProp,
|
|
@@ -2656,7 +2694,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
2656
2694
|
mappingValueField: 'code',
|
|
2657
2695
|
otherParams: {
|
|
2658
2696
|
'qp-enabled-eq': true, // true启用 false禁用
|
|
2659
|
-
sorter: 'desc-id'
|
|
2697
|
+
sorter: 'desc-id',
|
|
2698
|
+
...(requestConfigProp?.addOtherParams || {}),
|
|
2660
2699
|
}, // 默认参数
|
|
2661
2700
|
sourceName: 'priceCode',
|
|
2662
2701
|
...requestConfigProp,
|
|
@@ -2717,6 +2756,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
2717
2756
|
...selectConfigProps,
|
|
2718
2757
|
}
|
|
2719
2758
|
requestConfig = {
|
|
2759
|
+
init: true,
|
|
2720
2760
|
url: `${prefixUrl.selectPrefix}/orgViewNode/listNoPage`,
|
|
2721
2761
|
filter: 'qp-code,name-orGroup,like', // 过滤参数
|
|
2722
2762
|
mappingTextField: 'name',
|
|
@@ -2726,6 +2766,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
2726
2766
|
'qp-orgViewCode-eq': 'sales-organizational-view',
|
|
2727
2767
|
'qp-status-eq': 10,
|
|
2728
2768
|
sorter: 'desc-createTime',
|
|
2769
|
+
...(requestConfigProp?.addOtherParams || {}),
|
|
2729
2770
|
}, // 默认参数
|
|
2730
2771
|
sourceName: 'supplierCode',
|
|
2731
2772
|
...requestConfigProp
|
|
@@ -115,6 +115,11 @@ export default () => {
|
|
|
115
115
|
const selectPropsMultiple = {
|
|
116
116
|
mode: 'multiple',
|
|
117
117
|
maxTagCount: 1,
|
|
118
|
+
onSaveCallback: (rows) => {
|
|
119
|
+
console.log('save call', rows);
|
|
120
|
+
return Promise.resolve(true);
|
|
121
|
+
// return Promise.reject('FAILE')
|
|
122
|
+
}
|
|
118
123
|
}
|
|
119
124
|
|
|
120
125
|
const singleConfirmModalTableProps = {
|
|
@@ -146,11 +151,6 @@ export default () => {
|
|
|
146
151
|
// prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
|
|
147
152
|
selectProps,
|
|
148
153
|
selectBusinessType: 'skuCommodity',
|
|
149
|
-
onSaveCallback: (rows) => {
|
|
150
|
-
console.log('save call', rows);
|
|
151
|
-
return Promise.resolve(true);
|
|
152
|
-
// return Promise.reject('FAILE')
|
|
153
|
-
}
|
|
154
154
|
};
|
|
155
155
|
|
|
156
156
|
const onTabChange = (key) => {
|
|
@@ -774,6 +774,7 @@ export default () => {
|
|
|
774
774
|
setValue(value)
|
|
775
775
|
},
|
|
776
776
|
// requestConfig: {
|
|
777
|
+
// noOperate: true,
|
|
777
778
|
// url: `/bop/api/customer`,
|
|
778
779
|
// filter: 'qp-name,code-orGroup,like', // 过滤参数
|
|
779
780
|
// mappingTextField: 'name',
|
|
@@ -650,7 +650,7 @@ class SortableTable extends React.Component<SortTableProps> {
|
|
|
650
650
|
return (
|
|
651
651
|
<div className={'sort_table_wrapper'}>
|
|
652
652
|
{visible && <Modal
|
|
653
|
-
title="
|
|
653
|
+
title="筛选条件设置"
|
|
654
654
|
wrapClassName={'sort_table_wrapper'}
|
|
655
655
|
width={820}
|
|
656
656
|
visible={visible}
|
|
@@ -687,15 +687,15 @@ class SortableTable extends React.Component<SortTableProps> {
|
|
|
687
687
|
<div className={'sort_table'}>
|
|
688
688
|
<div className={'sort_table_column_wrapper'}>
|
|
689
689
|
<span className={'sort_table_column_count'}>
|
|
690
|
-
|
|
690
|
+
<span>勾选你想使用的筛选条件</span>
|
|
691
691
|
</span>
|
|
692
692
|
<div className={'sort_table_column'}>
|
|
693
693
|
<Input
|
|
694
694
|
prefix={<SearchOutlined className="site-form-item-icon" />}
|
|
695
|
-
placeholder="
|
|
695
|
+
placeholder="输入筛选条件名称搜索"
|
|
696
696
|
allowClear
|
|
697
697
|
onChange={this.onSearch}
|
|
698
|
-
style={{ width:
|
|
698
|
+
style={{ width: 525 }}
|
|
699
699
|
/>
|
|
700
700
|
<div>
|
|
701
701
|
{!searchDataSource && (
|
|
@@ -819,7 +819,7 @@ class SortableTable extends React.Component<SortTableProps> {
|
|
|
819
819
|
</div>
|
|
820
820
|
<div className={'sort_table_content_wrapper'}>
|
|
821
821
|
<span className={'sort_table_content_count'}>
|
|
822
|
-
|
|
822
|
+
<span>已选择的搜索条件排序</span>
|
|
823
823
|
</span>
|
|
824
824
|
<div className={'sort_table_content'}>
|
|
825
825
|
<span style={{ paddingLeft: '10px' }}>
|
|
@@ -1,11 +1,10 @@
|
|
|
1
|
-
// 列自定义
|
|
2
1
|
.sort_table_wrapper {
|
|
3
2
|
.sort_table {
|
|
4
3
|
display: flex;
|
|
5
4
|
|
|
6
5
|
.sort_table_column_wrapper {
|
|
7
6
|
width: 560px;
|
|
8
|
-
margin-right:
|
|
7
|
+
margin-right: 8px;
|
|
9
8
|
}
|
|
10
9
|
|
|
11
10
|
.sort_table_content_wrapper {
|
|
@@ -17,12 +16,12 @@
|
|
|
17
16
|
height: 20px;
|
|
18
17
|
font-family: PingFangSC-Regular;
|
|
19
18
|
font-weight: 400;
|
|
20
|
-
font-size:
|
|
19
|
+
font-size: 12px;
|
|
21
20
|
color: #000000;
|
|
22
21
|
letter-spacing: 0;
|
|
23
22
|
|
|
24
23
|
span {
|
|
25
|
-
color: #
|
|
24
|
+
color: #8E8E8E;
|
|
26
25
|
}
|
|
27
26
|
}
|
|
28
27
|
|
|
@@ -47,7 +46,7 @@
|
|
|
47
46
|
text-align: center;
|
|
48
47
|
font-family: PingFangSC-Regular;
|
|
49
48
|
font-weight: 400;
|
|
50
|
-
font-size:
|
|
49
|
+
font-size: 12px;
|
|
51
50
|
color: #848484;
|
|
52
51
|
}
|
|
53
52
|
}
|
|
@@ -58,22 +57,25 @@
|
|
|
58
57
|
height: 20px;
|
|
59
58
|
font-family: PingFangSC-Regular;
|
|
60
59
|
font-weight: 400;
|
|
61
|
-
font-size:
|
|
60
|
+
font-size: 12px;
|
|
62
61
|
color: #848484;
|
|
63
62
|
letter-spacing: 0;
|
|
64
63
|
}
|
|
65
64
|
|
|
66
65
|
.ant-checkbox-wrapper {
|
|
67
66
|
width: 144px;
|
|
67
|
+
height: 16px;
|
|
68
|
+
line-height: 16px;
|
|
68
69
|
margin-top: 16px;
|
|
69
70
|
}
|
|
70
71
|
|
|
71
|
-
.ant-checkbox-wrapper
|
|
72
|
+
.ant-checkbox-wrapper + .ant-checkbox-wrapper {
|
|
72
73
|
margin-left: 0px;
|
|
73
74
|
}
|
|
74
75
|
}
|
|
75
76
|
|
|
76
77
|
.sort_table_content {
|
|
78
|
+
height: 430px;
|
|
77
79
|
margin-top: 10px;
|
|
78
80
|
padding-top: 10px;
|
|
79
81
|
padding-bottom: 10px;
|
|
@@ -83,7 +85,6 @@
|
|
|
83
85
|
.ant-table-wrapper {
|
|
84
86
|
padding: 0px !important;
|
|
85
87
|
}
|
|
86
|
-
|
|
87
88
|
.sort_table_title {
|
|
88
89
|
height: 32px;
|
|
89
90
|
line-height: 32px;
|
|
@@ -92,29 +93,11 @@
|
|
|
92
93
|
}
|
|
93
94
|
}
|
|
94
95
|
}
|
|
95
|
-
|
|
96
|
-
div.ant-modal-header {
|
|
97
|
-
width: 820px;
|
|
98
|
-
height: 64px;
|
|
99
|
-
background: #ffffff;
|
|
100
|
-
padding: 20px;
|
|
101
|
-
border: 0px;
|
|
102
|
-
|
|
103
|
-
div.ant-modal-title {
|
|
104
|
-
height: 24px;
|
|
105
|
-
font-family: PingFangSC-Medium;
|
|
106
|
-
font-weight: 500;
|
|
107
|
-
font-size: 18px;
|
|
108
|
-
color: #000000;
|
|
109
|
-
letter-spacing: 0;
|
|
110
|
-
line-height: 24px;
|
|
111
|
-
}
|
|
112
|
-
}
|
|
96
|
+
|
|
113
97
|
|
|
114
98
|
.ant-modal-body {
|
|
115
|
-
padding:
|
|
99
|
+
padding: 10px 16px;
|
|
116
100
|
}
|
|
117
|
-
|
|
118
101
|
.ant-modal-close-x {
|
|
119
102
|
height: 24px;
|
|
120
103
|
font-family: PingFangSC-Medium;
|
|
@@ -130,7 +113,7 @@
|
|
|
130
113
|
}
|
|
131
114
|
|
|
132
115
|
input {
|
|
133
|
-
height:
|
|
116
|
+
height: 22px;
|
|
134
117
|
padding: 6px 4px;
|
|
135
118
|
border-radius: 5px;
|
|
136
119
|
}
|
|
@@ -138,34 +121,33 @@
|
|
|
138
121
|
.ant-input-prefix {
|
|
139
122
|
width: 24px;
|
|
140
123
|
height: 24px;
|
|
141
|
-
margin: 4px;
|
|
124
|
+
margin: 0 4px;
|
|
142
125
|
// border: 1px dashed #d9d9d9;
|
|
143
126
|
display: flex;
|
|
144
127
|
justify-content: center;
|
|
145
128
|
}
|
|
146
129
|
|
|
147
130
|
.ant-modal-footer {
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
131
|
+
padding: 8px 16px;
|
|
132
|
+
display: flex;
|
|
133
|
+
justify-content: space-between;
|
|
134
|
+
|
|
152
135
|
.ant-btn {
|
|
153
136
|
width: 80px;
|
|
154
|
-
height:
|
|
155
|
-
border-radius: 5px;
|
|
137
|
+
height: 28px;
|
|
156
138
|
|
|
157
139
|
span {
|
|
158
140
|
font-family: PingFangSC-Medium;
|
|
159
141
|
font-weight: 600;
|
|
160
|
-
font-size:
|
|
142
|
+
font-size: 12px;
|
|
161
143
|
letter-spacing: 0;
|
|
162
144
|
text-align: center;
|
|
163
145
|
line-height: 20px;
|
|
164
146
|
}
|
|
165
147
|
|
|
166
|
-
&:first-child {
|
|
167
|
-
|
|
168
|
-
}
|
|
148
|
+
// &:first-child {
|
|
149
|
+
// margin-right: 524px;
|
|
150
|
+
// }
|
|
169
151
|
}
|
|
170
152
|
}
|
|
171
153
|
|
|
@@ -180,14 +162,13 @@
|
|
|
180
162
|
padding-bottom: 50px;
|
|
181
163
|
|
|
182
164
|
tr {
|
|
183
|
-
height:
|
|
184
|
-
|
|
165
|
+
height: 30px;
|
|
185
166
|
td {
|
|
186
167
|
width: 24px !important;
|
|
187
|
-
height:
|
|
168
|
+
height: 30px !important;
|
|
188
169
|
font-family: PingFangSC-Regular;
|
|
189
170
|
font-weight: 400;
|
|
190
|
-
font-size:
|
|
171
|
+
font-size: 12px;
|
|
191
172
|
color: #000000;
|
|
192
173
|
letter-spacing: 0;
|
|
193
174
|
|
|
@@ -199,8 +180,8 @@
|
|
|
199
180
|
overflow: hidden;
|
|
200
181
|
text-overflow: ellipsis;
|
|
201
182
|
white-space: nowrap;
|
|
202
|
-
height:
|
|
203
|
-
line-height:
|
|
183
|
+
height: 30px !important;
|
|
184
|
+
line-height: 30px !important;
|
|
204
185
|
}
|
|
205
186
|
|
|
206
187
|
img {
|
|
@@ -216,7 +197,7 @@
|
|
|
216
197
|
&:last-child {
|
|
217
198
|
padding-left: 0px !important;
|
|
218
199
|
padding-right: 3px !important;
|
|
219
|
-
width:
|
|
200
|
+
width: 30px !important;
|
|
220
201
|
|
|
221
202
|
img {
|
|
222
203
|
// border: 1px dashed #d9d9d9;
|
|
@@ -227,27 +208,8 @@
|
|
|
227
208
|
}
|
|
228
209
|
}
|
|
229
210
|
}
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
}
|
|
235
|
-
|
|
236
|
-
.row-dragging {
|
|
237
|
-
background: #fafafa;
|
|
238
|
-
border: 1px solid #ccc;
|
|
239
|
-
z-index: 10000;
|
|
240
|
-
}
|
|
241
|
-
|
|
242
|
-
.row-dragging td {
|
|
243
|
-
padding: 7px 16px;
|
|
244
|
-
display: none;
|
|
245
|
-
|
|
246
|
-
}
|
|
247
|
-
.row-dragging td:first-child {
|
|
248
|
-
display: inline-block;
|
|
249
|
-
}
|
|
250
|
-
|
|
251
|
-
.row-dragging .drag-visible {
|
|
252
|
-
visibility: visible;
|
|
253
|
-
}
|
|
211
|
+
|
|
212
|
+
.ant-dropdown-link {
|
|
213
|
+
cursor: pointer;
|
|
214
|
+
}
|
|
215
|
+
}
|