@kmkf-fe-packages/basic-components 2.2.13-beta.87 → 2.2.13-beta.92
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/index.esm.js +338 -110
- package/dist/index.js +337 -109
- package/dist/src/bs/component/GoodItem/index.d.ts +5 -2
- package/dist/src/constants/systemOrderColumnsMap.d.ts +6 -0
- package/package.json +3 -3
package/dist/index.js
CHANGED
|
@@ -8123,6 +8123,11 @@ var systemOrderMap = {
|
|
|
8123
8123
|
no: 'jstSystemOrderNo',
|
|
8124
8124
|
ids: 'jstSystemSelectIds',
|
|
8125
8125
|
order: 'jstSystemShowOrder'
|
|
8126
|
+
},
|
|
8127
|
+
WDT_RETURN_BILL_NO: {
|
|
8128
|
+
no: 'wdtReturnBillNo',
|
|
8129
|
+
ids: 'wdtReturnBillNoSelectIds',
|
|
8130
|
+
order: 'wdtReturnBillNoShowOrder'
|
|
8126
8131
|
}
|
|
8127
8132
|
};
|
|
8128
8133
|
//直接将key component 添加到 transformWorkOrderData中的componentProcessors
|
|
@@ -8695,6 +8700,33 @@ var processWdtGoods = function processWdtGoods(templateColumns) {
|
|
|
8695
8700
|
};
|
|
8696
8701
|
};
|
|
8697
8702
|
};
|
|
8703
|
+
var processWdtAftersaleGoods = function processWdtAftersaleGoods(templateColumns) {
|
|
8704
|
+
return function (getValue) {
|
|
8705
|
+
return function (nex, config) {
|
|
8706
|
+
var _values = {
|
|
8707
|
+
wdtAftersaleGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_wdtAftersaleGoods")), []),
|
|
8708
|
+
shopCode: getValue("".concat(nex.uniqueKey, "_shopCode"))
|
|
8709
|
+
};
|
|
8710
|
+
var selectIds = [];
|
|
8711
|
+
var orderNo = '';
|
|
8712
|
+
var tradeId = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
|
|
8713
|
+
return col.workOrderComponentType === 'TRADE_ID_INPUT';
|
|
8714
|
+
});
|
|
8715
|
+
if (tradeId) {
|
|
8716
|
+
orderNo = getValue("".concat(tradeId.uniqueKey, "_").concat(updateWorkTypeKeys[tradeId.workOrderComponentType]));
|
|
8717
|
+
}
|
|
8718
|
+
var wdtAftersaleSystemOrder = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
|
|
8719
|
+
return col.workOrderComponentType === 'WDT_RETURN_BILL_NO';
|
|
8720
|
+
});
|
|
8721
|
+
if (wdtAftersaleSystemOrder) {
|
|
8722
|
+
selectIds = jsonParseSecurity(getValue("".concat(wdtAftersaleSystemOrder.uniqueKey, "_").concat(systemOrderMap[wdtAftersaleSystemOrder.workOrderComponentType].ids)), []);
|
|
8723
|
+
}
|
|
8724
|
+
_values.selectIds = selectIds;
|
|
8725
|
+
_values.orderNo = orderNo;
|
|
8726
|
+
return _defineProperty({}, nex.uniqueKey, _values);
|
|
8727
|
+
};
|
|
8728
|
+
};
|
|
8729
|
+
};
|
|
8698
8730
|
var processBsE3Goods = function processBsE3Goods(templateColumns) {
|
|
8699
8731
|
return function (getValue) {
|
|
8700
8732
|
return function (nex, config) {
|
|
@@ -8927,11 +8959,16 @@ var processErpSystemOrder = function processErpSystemOrder(getValue) {
|
|
|
8927
8959
|
no: 'jstSystemOrderNo',
|
|
8928
8960
|
ids: 'jstSystemSelectIds',
|
|
8929
8961
|
order: 'jstSystemShowOrder'
|
|
8962
|
+
},
|
|
8963
|
+
WDT_RETURN_BILL_NO: {
|
|
8964
|
+
no: 'wdtReturnBillNo',
|
|
8965
|
+
ids: 'wdtReturnBillNoSelectIds',
|
|
8966
|
+
order: 'wdtReturnBillNoShowOrder'
|
|
8930
8967
|
}
|
|
8931
8968
|
};
|
|
8932
8969
|
return _defineProperty({}, nex.uniqueKey, {
|
|
8933
8970
|
orderNo: getValue("".concat(nex.uniqueKey, "_").concat(systemOrderMap[nex.workOrderComponentType].no)),
|
|
8934
|
-
orders: [],
|
|
8971
|
+
orders: nex.workOrderComponentType === 'WDT_RETURN_BILL_NO' ? jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(systemOrderMap[nex.workOrderComponentType].order)), []) : [],
|
|
8935
8972
|
selectIds: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(systemOrderMap[nex.workOrderComponentType].ids)), []),
|
|
8936
8973
|
showOrderInfo: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(systemOrderMap[nex.workOrderComponentType].order)), [])
|
|
8937
8974
|
});
|
|
@@ -9162,14 +9199,14 @@ var processJstReturnGoods = function processJstReturnGoods(templateColumns) {
|
|
|
9162
9199
|
};
|
|
9163
9200
|
var processLabel = function processLabel(getValue) {
|
|
9164
9201
|
return function (nex, config) {
|
|
9165
|
-
var
|
|
9166
|
-
return
|
|
9202
|
+
var _ref73;
|
|
9203
|
+
return _ref73 = {}, _defineProperty(_ref73, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref73, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref73;
|
|
9167
9204
|
};
|
|
9168
9205
|
};
|
|
9169
9206
|
var processMemberLevel = function processMemberLevel(getValue) {
|
|
9170
9207
|
return function (nex, config) {
|
|
9171
|
-
var
|
|
9172
|
-
return
|
|
9208
|
+
var _ref74;
|
|
9209
|
+
return _ref74 = {}, _defineProperty(_ref74, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref74, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref74;
|
|
9173
9210
|
};
|
|
9174
9211
|
};
|
|
9175
9212
|
var processAfterSalesOrderId = function processAfterSalesOrderId(getValue) {
|
|
@@ -9287,6 +9324,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
|
|
|
9287
9324
|
BS_POSTING: processBsPosting,
|
|
9288
9325
|
BS_GOODS: processBsGoods,
|
|
9289
9326
|
WDT_GOODS: processWdtGoods(templateColumns),
|
|
9327
|
+
WDT_AFTERSALE_GOODS: processWdtAftersaleGoods(templateColumns),
|
|
9290
9328
|
BS_E3_GOODS: processBsE3Goods(templateColumns),
|
|
9291
9329
|
GY_GOODS: processGyGoods(templateColumns),
|
|
9292
9330
|
KM_GOODS: processKmGoods(templateColumns),
|
|
@@ -9303,6 +9341,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
|
|
|
9303
9341
|
KM_SYSTEM_ORDER: processErpSystemOrder,
|
|
9304
9342
|
WLN_SYSTEM_ORDER: processErpSystemOrder,
|
|
9305
9343
|
WDT_SYSTEM_ORDER: processErpSystemOrder,
|
|
9344
|
+
WDT_RETURN_BILL_NO: processErpSystemOrder,
|
|
9306
9345
|
BS_E3_SYSTEM_ORDER: processErpSystemOrder,
|
|
9307
9346
|
JST_SYSTEM_ORDER: processErpSystemOrder,
|
|
9308
9347
|
GY_SYSTEM_ORDER: processErpSystemOrder,
|
|
@@ -19341,6 +19380,141 @@ var getColumns$2 = function getColumns(_ref) {
|
|
|
19341
19380
|
}
|
|
19342
19381
|
}) : /*#__PURE__*/React__default['default'].createElement("span", null, typeMap[val]);
|
|
19343
19382
|
}
|
|
19383
|
+
}],
|
|
19384
|
+
// 旺店通售后商品信息
|
|
19385
|
+
WDT_AFTERSALE_GOODS: [{
|
|
19386
|
+
dataIndex: 'oid',
|
|
19387
|
+
title: "\u539F\u59CB\u5B50\u5355\u53F7",
|
|
19388
|
+
width: 200,
|
|
19389
|
+
align: 'center',
|
|
19390
|
+
ellipsis: true,
|
|
19391
|
+
render: renderTextEllipsis
|
|
19392
|
+
}, {
|
|
19393
|
+
dataIndex: 'goodsName',
|
|
19394
|
+
title: "\u8D27\u54C1\u540D\u79F0",
|
|
19395
|
+
width: 250,
|
|
19396
|
+
align: 'center',
|
|
19397
|
+
ellipsis: true,
|
|
19398
|
+
render: renderTextEllipsis
|
|
19399
|
+
}, {
|
|
19400
|
+
dataIndex: 'goodsNo',
|
|
19401
|
+
title: "\u8D27\u54C1\u7F16\u53F7",
|
|
19402
|
+
width: 150,
|
|
19403
|
+
align: 'center',
|
|
19404
|
+
ellipsis: true,
|
|
19405
|
+
render: renderTextEllipsis
|
|
19406
|
+
}, {
|
|
19407
|
+
dataIndex: 'specName',
|
|
19408
|
+
title: "\u89C4\u683C\u540D\u79F0",
|
|
19409
|
+
width: 150,
|
|
19410
|
+
align: 'center',
|
|
19411
|
+
ellipsis: true,
|
|
19412
|
+
render: renderTextEllipsis
|
|
19413
|
+
}, {
|
|
19414
|
+
dataIndex: 'specNo',
|
|
19415
|
+
title: "\u5546\u5BB6\u7F16\u7801",
|
|
19416
|
+
width: 200,
|
|
19417
|
+
align: 'center',
|
|
19418
|
+
ellipsis: true,
|
|
19419
|
+
render: renderTextEllipsis
|
|
19420
|
+
}, {
|
|
19421
|
+
dataIndex: 'specCode',
|
|
19422
|
+
title: "\u89C4\u683C\u7F16\u53F7",
|
|
19423
|
+
width: 150,
|
|
19424
|
+
align: 'center',
|
|
19425
|
+
ellipsis: true,
|
|
19426
|
+
render: renderTextEllipsis
|
|
19427
|
+
}, {
|
|
19428
|
+
dataIndex: 'barcode',
|
|
19429
|
+
title: "\u6761\u7801",
|
|
19430
|
+
width: 150,
|
|
19431
|
+
align: 'center',
|
|
19432
|
+
ellipsis: true,
|
|
19433
|
+
render: renderTextEllipsis
|
|
19434
|
+
}, {
|
|
19435
|
+
dataIndex: 'apiGoodsName',
|
|
19436
|
+
title: "\u5E73\u53F0\u8D27\u54C1\u540D\u79F0",
|
|
19437
|
+
width: 250,
|
|
19438
|
+
align: 'center',
|
|
19439
|
+
ellipsis: true,
|
|
19440
|
+
render: renderTextEllipsis
|
|
19441
|
+
}, {
|
|
19442
|
+
dataIndex: 'apiSpecName',
|
|
19443
|
+
title: "\u5E73\u53F0\u89C4\u683C\u540D\u79F0",
|
|
19444
|
+
width: 250,
|
|
19445
|
+
align: 'center',
|
|
19446
|
+
ellipsis: true,
|
|
19447
|
+
render: renderTextEllipsis
|
|
19448
|
+
}, {
|
|
19449
|
+
dataIndex: 'suiteName',
|
|
19450
|
+
title: "\u7EC4\u5408\u88C5\u540D\u79F0",
|
|
19451
|
+
width: 150,
|
|
19452
|
+
align: 'center',
|
|
19453
|
+
ellipsis: true,
|
|
19454
|
+
render: renderTextEllipsis
|
|
19455
|
+
}, {
|
|
19456
|
+
dataIndex: 'suiteNo',
|
|
19457
|
+
title: "\u7EC4\u5408\u88C5\u7F16\u53F7",
|
|
19458
|
+
width: 150,
|
|
19459
|
+
align: 'center',
|
|
19460
|
+
ellipsis: true,
|
|
19461
|
+
render: renderTextEllipsis
|
|
19462
|
+
}, {
|
|
19463
|
+
dataIndex: 'stockinNum',
|
|
19464
|
+
title: "\u5165\u5E93\u6570\u91CF",
|
|
19465
|
+
width: 100,
|
|
19466
|
+
align: 'center',
|
|
19467
|
+
ellipsis: true,
|
|
19468
|
+
render: renderTextEllipsis
|
|
19469
|
+
}, {
|
|
19470
|
+
dataIndex: 'refundNum',
|
|
19471
|
+
title: "\u9000\u6B3E\u6570\u91CF",
|
|
19472
|
+
width: 100,
|
|
19473
|
+
align: 'center',
|
|
19474
|
+
ellipsis: true,
|
|
19475
|
+
render: renderTextEllipsis
|
|
19476
|
+
}, {
|
|
19477
|
+
dataIndex: 'totalAmount',
|
|
19478
|
+
title: "\u9000\u8D27\u603B\u989D",
|
|
19479
|
+
width: 100,
|
|
19480
|
+
align: 'center',
|
|
19481
|
+
ellipsis: true,
|
|
19482
|
+
render: renderTextEllipsis
|
|
19483
|
+
}, {
|
|
19484
|
+
dataIndex: 'refundAmount',
|
|
19485
|
+
title: "\u5DF2\u9000\u6B3E\u91D1\u989D",
|
|
19486
|
+
width: 100,
|
|
19487
|
+
align: 'center',
|
|
19488
|
+
ellipsis: true,
|
|
19489
|
+
render: renderTextEllipsis
|
|
19490
|
+
}, {
|
|
19491
|
+
dataIndex: 'orderNum',
|
|
19492
|
+
title: "\u5B9E\u9645\u53D1\u51FA\u6570\u91CF",
|
|
19493
|
+
width: 100,
|
|
19494
|
+
align: 'center',
|
|
19495
|
+
ellipsis: true,
|
|
19496
|
+
render: renderTextEllipsis
|
|
19497
|
+
}, {
|
|
19498
|
+
dataIndex: 'price',
|
|
19499
|
+
title: "\u4EF7\u683C",
|
|
19500
|
+
width: 100,
|
|
19501
|
+
align: 'center',
|
|
19502
|
+
ellipsis: true,
|
|
19503
|
+
render: renderTextEllipsis
|
|
19504
|
+
}, {
|
|
19505
|
+
dataIndex: 'originalPrice',
|
|
19506
|
+
title: "\u539F\u4EF7",
|
|
19507
|
+
width: 100,
|
|
19508
|
+
align: 'center',
|
|
19509
|
+
ellipsis: true,
|
|
19510
|
+
render: renderTextEllipsis
|
|
19511
|
+
}, {
|
|
19512
|
+
dataIndex: 'giftType',
|
|
19513
|
+
title: "\u8D60\u54C1\u7C7B\u578B",
|
|
19514
|
+
width: 100,
|
|
19515
|
+
align: 'center',
|
|
19516
|
+
ellipsis: true,
|
|
19517
|
+
render: renderTextEllipsis
|
|
19344
19518
|
}]
|
|
19345
19519
|
};
|
|
19346
19520
|
};
|
|
@@ -21832,11 +22006,17 @@ var systemOrderNoMap = {
|
|
|
21832
22006
|
GY_GOODS: 'code',
|
|
21833
22007
|
KM_GOODS: 'sid',
|
|
21834
22008
|
WDT_GOODS: 'tradeNo',
|
|
22009
|
+
WDT_AFTERSALE_GOODS: 'tid',
|
|
21835
22010
|
BS_E3_GOODS: 'orderSn',
|
|
21836
22011
|
JST_GOODS: 'oId',
|
|
21837
22012
|
WLN_GOODS: 'tradeNo',
|
|
21838
22013
|
JY_GOODS: 'tradeNo',
|
|
21839
|
-
JY_REISSUE_GOODS: 'tradeNo'
|
|
22014
|
+
JY_REISSUE_GOODS: 'tradeNo',
|
|
22015
|
+
KM_REISSUE_GOODS: 'sid',
|
|
22016
|
+
JST_REISSUE_GOODS: 'oId',
|
|
22017
|
+
GY_REISSUE_GOODS: 'code',
|
|
22018
|
+
BS_E3_REISSUE_GOODS: 'orderSn',
|
|
22019
|
+
WDT_REISSUE_GOODS: 'tradeNo'
|
|
21840
22020
|
};
|
|
21841
22021
|
var SelectTradeGoods = function SelectTradeGoods(_ref) {
|
|
21842
22022
|
var columns = _ref.columns,
|
|
@@ -21846,14 +22026,19 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
|
|
|
21846
22026
|
onChangeSelectedKeys = _ref.onChangeSelectedKeys,
|
|
21847
22027
|
_ref$uniqueKey = _ref.uniqueKey,
|
|
21848
22028
|
uniqueKey = _ref$uniqueKey === void 0 ? 'uuid' : _ref$uniqueKey,
|
|
21849
|
-
_ref$
|
|
21850
|
-
|
|
22029
|
+
_ref$isShowSelect = _ref.isShowSelect,
|
|
22030
|
+
isShowSelect = _ref$isShowSelect === void 0 ? false : _ref$isShowSelect,
|
|
21851
22031
|
_ref$systemOrders = _ref.systemOrders,
|
|
21852
22032
|
systemOrders = _ref$systemOrders === void 0 ? [] : _ref$systemOrders,
|
|
21853
22033
|
_ref$selectedSystemOr = _ref.selectedSystemOrders,
|
|
22034
|
+
selectedSystemOrders = _ref$selectedSystemOr === void 0 ? [] : _ref$selectedSystemOr,
|
|
22035
|
+
_ref$validSystemOrder = _ref.validSystemOrder,
|
|
22036
|
+
validSystemOrder = _ref$validSystemOrder === void 0 ? false : _ref$validSystemOrder,
|
|
21854
22037
|
_ref$type = _ref.type,
|
|
21855
22038
|
type = _ref$type === void 0 ? '' : _ref$type,
|
|
21856
|
-
width = _ref.width
|
|
22039
|
+
width = _ref.width,
|
|
22040
|
+
_ref$isReissueType = _ref.isReissueType,
|
|
22041
|
+
isReissueType = _ref$isReissueType === void 0 ? false : _ref$isReissueType;
|
|
21857
22042
|
var _useState = React.useState(),
|
|
21858
22043
|
_useState2 = _slicedToArray(_useState, 2),
|
|
21859
22044
|
selectSystemNo = _useState2[0],
|
|
@@ -21863,6 +22048,10 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
|
|
|
21863
22048
|
tradeGoodsVisible = _useState4[0],
|
|
21864
22049
|
setTradeGoodsVisible = _useState4[1];
|
|
21865
22050
|
var openModal = function openModal() {
|
|
22051
|
+
if (validSystemOrder) {
|
|
22052
|
+
antd.message.warning('请选择补发系统单');
|
|
22053
|
+
return;
|
|
22054
|
+
}
|
|
21866
22055
|
if (getDataSourceAsync && !(dataSource === null || dataSource === void 0 ? void 0 : dataSource.length)) {
|
|
21867
22056
|
getDataSourceAsync().then(function () {
|
|
21868
22057
|
setTradeGoodsVisible(true);
|
|
@@ -21870,15 +22059,11 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
|
|
|
21870
22059
|
} else {
|
|
21871
22060
|
setTradeGoodsVisible(true);
|
|
21872
22061
|
}
|
|
21873
|
-
//
|
|
21874
|
-
|
|
21875
|
-
|
|
21876
|
-
|
|
21877
|
-
// );
|
|
21878
|
-
// setSelectSystemNo(codeList || []);
|
|
21879
|
-
// }
|
|
22062
|
+
// 补发直接传入的是systemNo
|
|
22063
|
+
if (isShowSelect && isReissueType) {
|
|
22064
|
+
setSelectSystemNo(selectedSystemOrders || []);
|
|
22065
|
+
}
|
|
21880
22066
|
};
|
|
21881
|
-
|
|
21882
22067
|
var closeModal = function closeModal() {
|
|
21883
22068
|
return setTradeGoodsVisible(false);
|
|
21884
22069
|
};
|
|
@@ -21894,10 +22079,6 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
|
|
|
21894
22079
|
return item === null || item === void 0 ? void 0 : item[uniqueKey];
|
|
21895
22080
|
}));
|
|
21896
22081
|
var handleChangeSelectedKeys = function handleChangeSelectedKeys(keys) {
|
|
21897
|
-
console.log('handleChangeSelectedKeys', keys, unCurrentTradeOriginGoods);
|
|
21898
|
-
console.log('filterDataSource', filterDataSource === null || filterDataSource === void 0 ? void 0 : filterDataSource.map(function (item) {
|
|
21899
|
-
return item === null || item === void 0 ? void 0 : item[uniqueKey];
|
|
21900
|
-
}));
|
|
21901
22082
|
onChangeSelectedKeys(keys.concat(unCurrentTradeOriginGoods));
|
|
21902
22083
|
};
|
|
21903
22084
|
var rowSelection = {
|
|
@@ -21922,7 +22103,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
|
|
|
21922
22103
|
style: {
|
|
21923
22104
|
maxWidth: '1000px'
|
|
21924
22105
|
}
|
|
21925
|
-
},
|
|
22106
|
+
}, isShowSelect && /*#__PURE__*/React__default['default'].createElement(antd.Row, {
|
|
21926
22107
|
style: {
|
|
21927
22108
|
marginBottom: '12px'
|
|
21928
22109
|
}
|
|
@@ -22026,13 +22207,16 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
22026
22207
|
systemOrders = props.systemOrders,
|
|
22027
22208
|
selectedSystemOrders = props.selectedSystemOrders,
|
|
22028
22209
|
_props$templateDetail = props.templateDetail,
|
|
22029
|
-
templateDetail = _props$templateDetail === void 0 ? {} : _props$templateDetail
|
|
22210
|
+
templateDetail = _props$templateDetail === void 0 ? {} : _props$templateDetail,
|
|
22211
|
+
_props$hasSelectedSys = props.hasSelectedSystemOrder,
|
|
22212
|
+
hasSelectedSystemOrder = _props$hasSelectedSys === void 0 ? false : _props$hasSelectedSys;
|
|
22030
22213
|
var uniqueKey = (tradeGoods === null || tradeGoods === void 0 ? void 0 : tradeGoods.uniqueKey) || 'uuid';
|
|
22031
22214
|
// 监听聚水潭退货商品
|
|
22032
22215
|
var jstReturnGoods = antd.Form === null || antd.Form === void 0 ? void 0 : antd.Form.useWatch('3979edfd6d', form);
|
|
22033
22216
|
var isShowSelectTradeGoods = type !== 'JST_EXCHANGE_GOODS' || (jstReturnGoods === null || jstReturnGoods === void 0 ? void 0 : jstReturnGoods.jstSystemOrderNo);
|
|
22034
|
-
//
|
|
22035
|
-
var
|
|
22217
|
+
// 判断是否为是否展示系统单筛选项
|
|
22218
|
+
var isShowSelect = type && ['WDT_GOODS', 'BS_E3_GOODS', 'GY_GOODS', 'JST_GOODS', 'WLN_GOODS', 'KM_GOODS', 'JY_GOODS', 'JY_REISSUE_GOODS', 'GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS'].includes(type) || false;
|
|
22219
|
+
var isReissueType = type && ['GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS', 'JY_REISSUE_GOODS'].includes(type) || false;
|
|
22036
22220
|
var refModal = React.useRef();
|
|
22037
22221
|
console.debug('表格数据', value);
|
|
22038
22222
|
var handleDelete = function handleDelete(record, index) {
|
|
@@ -22105,6 +22289,7 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
22105
22289
|
var columns = [];
|
|
22106
22290
|
switch (type) {
|
|
22107
22291
|
case 'WDT_GOODS':
|
|
22292
|
+
case 'WDT_AFTERSALE_GOODS':
|
|
22108
22293
|
case 'WDT_RETURN_GOODS':
|
|
22109
22294
|
case 'WDT_EXCHANGE_GOODS':
|
|
22110
22295
|
case 'BS_E3_GOODS':
|
|
@@ -22308,6 +22493,9 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
22308
22493
|
return params;
|
|
22309
22494
|
}, [tableSelect, selectedRowKeys, value]);
|
|
22310
22495
|
var TheGoodsModal = GoodsModalMap[type || 'OTHER_GOODS'] || GoodsModalMap['OTHER_GOODS'];
|
|
22496
|
+
var validSystemOrder = React.useMemo(function () {
|
|
22497
|
+
return ['GY_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'JST_REISSUE_GOODS', 'KM_REISSUE_GOODS'].includes(type) && !hasSelectedSystemOrder;
|
|
22498
|
+
}, [type, hasSelectedSystemOrder]);
|
|
22311
22499
|
return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, !disabled && (showChangeBtn ? /*#__PURE__*/React__default['default'].createElement("div", {
|
|
22312
22500
|
style: {
|
|
22313
22501
|
float: 'right'
|
|
@@ -22316,7 +22504,8 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
22316
22504
|
checked: isStrict,
|
|
22317
22505
|
onChange: handleCheckboxChange
|
|
22318
22506
|
}, "\u5408\u5E76\u5355\uFF0C\u52FE\u9009\u540E\u53EA\u5C55\u793A\u5F53\u524D\u5E73\u53F0\u8BA2\u5355\u5546\u54C1"), !lodash.isEmpty(tradeGoods) && isShowSelectTradeGoods && /*#__PURE__*/React__default['default'].createElement(SelectTradeGoods, {
|
|
22319
|
-
|
|
22507
|
+
validSystemOrder: validSystemOrder,
|
|
22508
|
+
isShowSelect: isShowSelect,
|
|
22320
22509
|
uniqueKey: uniqueKey,
|
|
22321
22510
|
type: type,
|
|
22322
22511
|
columns: orderModalColumns,
|
|
@@ -22326,7 +22515,8 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
22326
22515
|
onChangeSelectedKeys: tradeGoods.selectedGoodsChange,
|
|
22327
22516
|
systemOrders: systemOrders,
|
|
22328
22517
|
selectedSystemOrders: selectedSystemOrders,
|
|
22329
|
-
width: width || 850
|
|
22518
|
+
width: width || 850,
|
|
22519
|
+
isReissueType: isReissueType
|
|
22330
22520
|
}), showErpGoodsBtn && /*#__PURE__*/React__default['default'].createElement(antd.Button, {
|
|
22331
22521
|
type: "link",
|
|
22332
22522
|
onClick: handleChangeGoods
|
|
@@ -23376,7 +23566,8 @@ var columnsMap = {
|
|
|
23376
23566
|
BS_E3_SYSTEM_ORDER: kmkfUtils.BS_E3_SYSTEM_ORDER_CONFIG.columns,
|
|
23377
23567
|
GY_SYSTEM_ORDER: kmkfUtils.GY_SYSTEM_ORDER_CONFIG.columns,
|
|
23378
23568
|
JST_SYSTEM_ORDER: kmkfUtils.JST_SYSTEM_ORDER_CONFIG.columns,
|
|
23379
|
-
JY_SYSTEM_ORDER: kmkfUtils.JY_SYSTEM_ORDER_CONFIG.columns
|
|
23569
|
+
JY_SYSTEM_ORDER: kmkfUtils.JY_SYSTEM_ORDER_CONFIG.columns,
|
|
23570
|
+
WDT_RETURN_BILL_NO: kmkfUtils.WDT_RETURN_BILL_NO_CONFIG.columns
|
|
23380
23571
|
};
|
|
23381
23572
|
var rowKeyMap = {
|
|
23382
23573
|
BS_SYSTEM_ORDER: 'billNo',
|
|
@@ -23386,7 +23577,8 @@ var rowKeyMap = {
|
|
|
23386
23577
|
BS_E3_SYSTEM_ORDER: 'orderSn',
|
|
23387
23578
|
GY_SYSTEM_ORDER: 'billNo',
|
|
23388
23579
|
JST_SYSTEM_ORDER: 'oId',
|
|
23389
|
-
JY_SYSTEM_ORDER: 'tradeNo'
|
|
23580
|
+
JY_SYSTEM_ORDER: 'tradeNo',
|
|
23581
|
+
WDT_RETURN_BILL_NO: 'refundNo'
|
|
23390
23582
|
};
|
|
23391
23583
|
var index$2 = (function (props) {
|
|
23392
23584
|
var value = props.value,
|
|
@@ -23400,6 +23592,7 @@ var index$2 = (function (props) {
|
|
|
23400
23592
|
React.useEffect(function () {
|
|
23401
23593
|
var _value$orders, _value$showOrderInfo;
|
|
23402
23594
|
valueRef.current = value;
|
|
23595
|
+
console.log('value77777777', value);
|
|
23403
23596
|
if (!(value === null || value === void 0 ? void 0 : (_value$orders = value.orders) === null || _value$orders === void 0 ? void 0 : _value$orders.length) && (value === null || value === void 0 ? void 0 : value.orderNo) && (value === null || value === void 0 ? void 0 : (_value$showOrderInfo = value.showOrderInfo) === null || _value$showOrderInfo === void 0 ? void 0 : _value$showOrderInfo.length) && !onceRef.current) {
|
|
23404
23597
|
onceRef.current = true;
|
|
23405
23598
|
if (type === 'BS_SYSTEM_ORDER') {
|
|
@@ -24866,10 +25059,29 @@ var componentMap$2 = {
|
|
|
24866
25059
|
exchangeDeleteGood: 'jyExchangeDeleteGood'
|
|
24867
25060
|
},
|
|
24868
25061
|
getOrderList: jyUtils.getJyOrderListSingleton
|
|
25062
|
+
},
|
|
25063
|
+
WDT_AFTERSALE_GOODS: {
|
|
25064
|
+
type: 'wdtAftersale',
|
|
25065
|
+
key: 'wdtAftersaleGoods',
|
|
25066
|
+
name: '旺店通售后',
|
|
25067
|
+
orderNo: 'srcTids',
|
|
25068
|
+
goodDetailOrderNo: 'srcTids',
|
|
25069
|
+
showChangeBtn: false,
|
|
25070
|
+
eventNameMap: {
|
|
25071
|
+
// pubsub 事件
|
|
25072
|
+
type: 'wdtAftersaleType',
|
|
25073
|
+
updateGoodsHandle: kmkfUtils.updateWdtAftersaleGoodsHandle,
|
|
25074
|
+
selectListReturn: 'wdtAftersaleSelectListReturn',
|
|
25075
|
+
selectList: 'wdtAftersaleSelectList',
|
|
25076
|
+
reissueSelectList: 'wdtAftersaleReissueSelectList',
|
|
25077
|
+
reissueSelectListReturn: 'wdtAftersaleReissueSelectListReturn',
|
|
25078
|
+
reissueDeleteGood: 'wdtAftersaleReissueDeleteGood'
|
|
25079
|
+
},
|
|
25080
|
+
getOrderList: wdtUtils.getWdtOrderListSingleton
|
|
24869
25081
|
}
|
|
24870
25082
|
};
|
|
24871
25083
|
var CommonGoods = function CommonGoods(props) {
|
|
24872
|
-
var _componentMap$compTyp5, _withInfo$current3, _withInfo$current4;
|
|
25084
|
+
var _componentMap$compTyp5, _withInfo$current3, _withInfo$current4, _componentMap$compTyp7;
|
|
24873
25085
|
var value = props.value,
|
|
24874
25086
|
disabled = props.disabled,
|
|
24875
25087
|
onChange = props.onChange,
|
|
@@ -25100,6 +25312,7 @@ var CommonGoods = function CommonGoods(props) {
|
|
|
25100
25312
|
isStrict: value === null || value === void 0 ? void 0 : value.isStrict,
|
|
25101
25313
|
systemOrders: value === null || value === void 0 ? void 0 : value.allOrders,
|
|
25102
25314
|
selectedSystemOrders: value === null || value === void 0 ? void 0 : value.orders,
|
|
25315
|
+
showChangeBtn: (_componentMap$compTyp7 = componentMap$2[compType]) === null || _componentMap$compTyp7 === void 0 ? void 0 : _componentMap$compTyp7.showChangeBtn,
|
|
25103
25316
|
tradeGoods: {
|
|
25104
25317
|
originDataSource: getAllTradeGoodsDetails({
|
|
25105
25318
|
mode: value === null || value === void 0 ? void 0 : value.isStrict
|
|
@@ -25448,11 +25661,12 @@ var typeMap$1 = {
|
|
|
25448
25661
|
money: 'orderPrice',
|
|
25449
25662
|
share: 'sharePrice'
|
|
25450
25663
|
},
|
|
25451
|
-
getOrderList: wdtUtils.getWdtOrderListSingleton
|
|
25664
|
+
getOrderList: wdtUtils.getWdtOrderListSingleton,
|
|
25665
|
+
isShowSelectTradeGoods: true
|
|
25452
25666
|
}
|
|
25453
25667
|
};
|
|
25454
25668
|
var wdtReissue = function wdtReissue(props) {
|
|
25455
|
-
var _value$wdtSystemOrder, _typeMap$type24, _typeMap$type26, _typeMap$type27, _value$typeMap$type$s6, _typeMap$type28, _typeMap$type29, _typeMap$type30;
|
|
25669
|
+
var _value$wdtSystemOrder, _typeMap$type24, _typeMap$type26, _typeMap$type27, _value$typeMap$type$s6, _typeMap$type28, _typeMap$type29, _typeMap$type30, _typeMap$type31, _value$typeMap$type$s7, _typeMap$type32, _typeMap$type33, _typeMap$type34;
|
|
25456
25670
|
var value = props.value,
|
|
25457
25671
|
onChange = props.onChange,
|
|
25458
25672
|
_props$reasonList = props.reasonList,
|
|
@@ -25481,36 +25695,6 @@ var wdtReissue = function wdtReissue(props) {
|
|
|
25481
25695
|
}
|
|
25482
25696
|
return;
|
|
25483
25697
|
}, [value]);
|
|
25484
|
-
// useEffect(() => {
|
|
25485
|
-
// const systemOrderNo = value?.[typeMap[type]?.systemOrderNo];
|
|
25486
|
-
// if (systemOrderNo) {
|
|
25487
|
-
// if (['1'].includes(value?.[typeMap[type]?.typeName]?.[0])) {
|
|
25488
|
-
// onChange?.({
|
|
25489
|
-
// ...value,
|
|
25490
|
-
// [typeMap[type]?.key]: getGoodDetails({
|
|
25491
|
-
// mode: isStrict
|
|
25492
|
-
// })
|
|
25493
|
-
// })
|
|
25494
|
-
// }
|
|
25495
|
-
// }
|
|
25496
|
-
// return;
|
|
25497
|
-
// }, [value?.[typeMap[type]?.systemOrderNo]]);
|
|
25498
|
-
// const getWdtOrderList = async (orderNo: string) => {
|
|
25499
|
-
// wdtUtils.getWdtOrderListSingleton(orderNo).then(data => {
|
|
25500
|
-
// const orders = data?.trades || [];
|
|
25501
|
-
// const showOrderInfo = orders.map(({ billNo, billType, billTag }: any) => {
|
|
25502
|
-
// return { billNo, billType, billTag }
|
|
25503
|
-
// });
|
|
25504
|
-
// onChange({
|
|
25505
|
-
// ...value,
|
|
25506
|
-
// [typeMap[type]?.systemOrder]: {
|
|
25507
|
-
// ...value[typeMap[type]?.systemOrder],
|
|
25508
|
-
// showOrderInfo,
|
|
25509
|
-
// orders,
|
|
25510
|
-
// },
|
|
25511
|
-
// });
|
|
25512
|
-
// })
|
|
25513
|
-
// };
|
|
25514
25698
|
var getOrderList = /*#__PURE__*/function () {
|
|
25515
25699
|
var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(orderNo) {
|
|
25516
25700
|
var _typeMap$type5;
|
|
@@ -25570,17 +25754,24 @@ var wdtReissue = function wdtReissue(props) {
|
|
|
25570
25754
|
}))));
|
|
25571
25755
|
};
|
|
25572
25756
|
var getGoodDetails = function getGoodDetails(_ref3) {
|
|
25573
|
-
var _typeMap$type14, _typeMap$type15
|
|
25757
|
+
var _typeMap$type14, _typeMap$type15;
|
|
25574
25758
|
var mode = _ref3.mode,
|
|
25575
|
-
sysOrderNo = _ref3.sysOrderNo
|
|
25759
|
+
sysOrderNo = _ref3.sysOrderNo,
|
|
25760
|
+
_ref3$isAllOrders = _ref3.isAllOrders,
|
|
25761
|
+
isAllOrders = _ref3$isAllOrders === void 0 ? false : _ref3$isAllOrders;
|
|
25576
25762
|
var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type14 = typeMap$1[type]) === null || _typeMap$type14 === void 0 ? void 0 : _typeMap$type14.systemOrder];
|
|
25577
25763
|
var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type15 = typeMap$1[type]) === null || _typeMap$type15 === void 0 ? void 0 : _typeMap$type15.systemOrderNo];
|
|
25578
25764
|
var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
|
|
25579
25765
|
return order.tradeNo === systemOrderNo;
|
|
25580
25766
|
});
|
|
25581
|
-
var
|
|
25767
|
+
var orders = isAllOrders ? (systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || [] : [order];
|
|
25768
|
+
var hasGoodDetails = orders === null || orders === void 0 ? void 0 : orders.some(function (order) {
|
|
25769
|
+
var _order$goodDetails;
|
|
25770
|
+
return order === null || order === void 0 ? void 0 : (_order$goodDetails = order.goodDetails) === null || _order$goodDetails === void 0 ? void 0 : _order$goodDetails.length;
|
|
25771
|
+
});
|
|
25772
|
+
var goodDetails = hasGoodDetails ? kmkfUtils.updateWdtGoodsHandle([order]) : [];
|
|
25582
25773
|
var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
|
|
25583
|
-
return mode ? goodDetails.filter(function (goodItem) {
|
|
25774
|
+
return mode && !isAllOrders ? goodDetails.filter(function (goodItem) {
|
|
25584
25775
|
return !orderNo || goodItem.srcTid === orderNo;
|
|
25585
25776
|
}) : goodDetails;
|
|
25586
25777
|
};
|
|
@@ -25683,7 +25874,8 @@ var wdtReissue = function wdtReissue(props) {
|
|
|
25683
25874
|
type: type,
|
|
25684
25875
|
disabled: disabled,
|
|
25685
25876
|
canUpdateNumber: showChangeBtn,
|
|
25686
|
-
|
|
25877
|
+
hasSelectedSystemOrder: showChangeBtn,
|
|
25878
|
+
// showChangeBtn={showChangeBtn}
|
|
25687
25879
|
shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
|
|
25688
25880
|
value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type30 = typeMap$1[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.key)],
|
|
25689
25881
|
onChange: function onChange(val) {
|
|
@@ -25692,9 +25884,13 @@ var wdtReissue = function wdtReissue(props) {
|
|
|
25692
25884
|
onModeChange: handleModeChange,
|
|
25693
25885
|
showModeBtn: showModeBtn,
|
|
25694
25886
|
isStrict: isStrict,
|
|
25887
|
+
isShowSelectTradeGoods: typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type31 = typeMap$1[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.isShowSelectTradeGoods,
|
|
25888
|
+
systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s7 = value[(_typeMap$type32 = typeMap$1[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.systemOrder]) === null || _value$typeMap$type$s7 === void 0 ? void 0 : _value$typeMap$type$s7.orders,
|
|
25889
|
+
selectedSystemOrders: showChangeBtn ? [value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type33 = typeMap$1[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.systemOrderNo)]] : [],
|
|
25695
25890
|
tradeGoods: {
|
|
25696
25891
|
originDataSource: getGoodDetails({
|
|
25697
|
-
mode: isStrict
|
|
25892
|
+
mode: isStrict,
|
|
25893
|
+
isAllOrders: typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type34 = typeMap$1[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.isShowSelectTradeGoods
|
|
25698
25894
|
}),
|
|
25699
25895
|
selectedGoodsChange: selectedGoodsChange
|
|
25700
25896
|
}
|
|
@@ -25718,7 +25914,8 @@ var typeMap$2 = {
|
|
|
25718
25914
|
outerOiIdKey: '',
|
|
25719
25915
|
goodDetailsKey: 'items',
|
|
25720
25916
|
mergeIdenticalGoods: kmkfUtils.jstMergeIdenticalGoods,
|
|
25721
|
-
uniqueKey: 'uuid'
|
|
25917
|
+
uniqueKey: 'uuid',
|
|
25918
|
+
isShowSelectTradeGoods: true
|
|
25722
25919
|
},
|
|
25723
25920
|
JST_RETURN_GOODS: {
|
|
25724
25921
|
compType: '退货',
|
|
@@ -25757,7 +25954,8 @@ var typeMap$2 = {
|
|
|
25757
25954
|
oIdKey: 'billNo',
|
|
25758
25955
|
outerOiIdKey: '',
|
|
25759
25956
|
goodDetailsKey: 'subOrders',
|
|
25760
|
-
uniqueKey: 'id'
|
|
25957
|
+
uniqueKey: 'id',
|
|
25958
|
+
isShowSelectTradeGoods: true
|
|
25761
25959
|
},
|
|
25762
25960
|
JY_REISSUE_GOODS: {
|
|
25763
25961
|
compType: '补发',
|
|
@@ -25776,7 +25974,7 @@ var typeMap$2 = {
|
|
|
25776
25974
|
}
|
|
25777
25975
|
};
|
|
25778
25976
|
var PublicReissue = function PublicReissue(props) {
|
|
25779
|
-
var _typeMap$type34, _typeMap$type40, _typeMap$type41, _typeMap$type42, _typeMap$type43, _value$typeMap$type$s8, _typeMap$type44, _typeMap$type45, _typeMap$type46, _typeMap$type47, _typeMap$type48, _typeMap$type49, _typeMap$type50,
|
|
25977
|
+
var _typeMap$type34, _typeMap$type40, _typeMap$type41, _typeMap$type42, _typeMap$type43, _value$typeMap$type$s8, _typeMap$type44, _typeMap$type45, _typeMap$type46, _typeMap$type47, _typeMap$type48, _typeMap$type49, _typeMap$type50, _value$typeMap$type$s9, _typeMap$type51, _typeMap$type52, _typeMap$type53, _typeMap$type54;
|
|
25780
25978
|
var value = props.value,
|
|
25781
25979
|
onChange = props.onChange,
|
|
25782
25980
|
_props$reasonList = props.reasonList,
|
|
@@ -26045,25 +26243,27 @@ var PublicReissue = function PublicReissue(props) {
|
|
|
26045
26243
|
type: type,
|
|
26046
26244
|
disabled: disabled,
|
|
26047
26245
|
canUpdateNumber: showChangeBtn,
|
|
26048
|
-
|
|
26049
|
-
|
|
26050
|
-
|
|
26246
|
+
hasSelectedSystemOrder: showChangeBtn,
|
|
26247
|
+
// showChangeBtn={showChangeBtn || typeMap?.[type]?.isShowSelectTradeGoods}
|
|
26248
|
+
alwaysShowChooseErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type48 = typeMap$2[type]) === null || _typeMap$type48 === void 0 ? void 0 : _typeMap$type48.alwaysShowChooseErpGoodsBtn,
|
|
26249
|
+
// showErpGoodsBtn={typeMap?.[type]?.showErpGoodsBtn}
|
|
26051
26250
|
shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
|
|
26052
|
-
value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$
|
|
26251
|
+
value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type49 = typeMap$2[type]) === null || _typeMap$type49 === void 0 ? void 0 : _typeMap$type49.key)],
|
|
26053
26252
|
onChange: function onChange(val) {
|
|
26054
26253
|
return changeGoodHandle(val);
|
|
26055
26254
|
},
|
|
26056
26255
|
onModeChange: handleModeChange,
|
|
26057
26256
|
showModeBtn: false,
|
|
26058
26257
|
isStrict: isStrict,
|
|
26059
|
-
isShowSelectTradeGoods: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$
|
|
26060
|
-
systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$
|
|
26258
|
+
isShowSelectTradeGoods: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type50 = typeMap$2[type]) === null || _typeMap$type50 === void 0 ? void 0 : _typeMap$type50.isShowSelectTradeGoods,
|
|
26259
|
+
systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$type51 = typeMap$2[type]) === null || _typeMap$type51 === void 0 ? void 0 : _typeMap$type51.systemOrder]) === null || _value$typeMap$type$s9 === void 0 ? void 0 : _value$typeMap$type$s9.orders,
|
|
26260
|
+
selectedSystemOrders: showChangeBtn ? [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type52 = typeMap$2[type]) === null || _typeMap$type52 === void 0 ? void 0 : _typeMap$type52.systemOrderNo)]] : [],
|
|
26061
26261
|
tradeGoods: {
|
|
26062
26262
|
originDataSource: getGoodDetails({
|
|
26063
26263
|
mode: isStrict,
|
|
26064
|
-
isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$
|
|
26264
|
+
isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type53 = typeMap$2[type]) === null || _typeMap$type53 === void 0 ? void 0 : _typeMap$type53.isShowSelectTradeGoods
|
|
26065
26265
|
}),
|
|
26066
|
-
uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$
|
|
26266
|
+
uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type54 = typeMap$2[type]) === null || _typeMap$type54 === void 0 ? void 0 : _typeMap$type54.uniqueKey) || 'uuid',
|
|
26067
26267
|
selectedGoodsChange: selectedGoodsChange
|
|
26068
26268
|
}
|
|
26069
26269
|
})));
|
|
@@ -26851,11 +27051,12 @@ var typeMap$3 = {
|
|
|
26851
27051
|
typeName: 'bsE3ReissueType',
|
|
26852
27052
|
systemOrder: 'bsE3SystemOrder',
|
|
26853
27053
|
systemOrderNo: 'bsE3SystemOrderNo',
|
|
26854
|
-
getOrderList: bsE3Utils.getBsE3OrderListSingleton
|
|
27054
|
+
getOrderList: bsE3Utils.getBsE3OrderListSingleton,
|
|
27055
|
+
isShowSelectTradeGoods: true
|
|
26855
27056
|
}
|
|
26856
27057
|
};
|
|
26857
27058
|
var bsE3Reissue = function bsE3Reissue(props) {
|
|
26858
|
-
var _typeMap$type22, _typeMap$type25, _typeMap$type26, _value$typeMap$type$s6, _typeMap$type27, _typeMap$type28, _typeMap$type29;
|
|
27059
|
+
var _typeMap$type22, _typeMap$type25, _typeMap$type26, _value$typeMap$type$s6, _typeMap$type27, _typeMap$type28, _typeMap$type29, _typeMap$type30, _value$typeMap$type$s7, _typeMap$type31, _typeMap$type32, _typeMap$type33;
|
|
26859
27060
|
var value = props.value,
|
|
26860
27061
|
onChange = props.onChange,
|
|
26861
27062
|
_props$reasonList = props.reasonList,
|
|
@@ -26957,17 +27158,24 @@ var bsE3Reissue = function bsE3Reissue(props) {
|
|
|
26957
27158
|
}))));
|
|
26958
27159
|
};
|
|
26959
27160
|
var getGoodDetails = function getGoodDetails(_ref4) {
|
|
26960
|
-
var _typeMap$type13, _typeMap$type14
|
|
27161
|
+
var _typeMap$type13, _typeMap$type14;
|
|
26961
27162
|
var mode = _ref4.mode,
|
|
26962
|
-
sysOrderNo = _ref4.sysOrderNo
|
|
27163
|
+
sysOrderNo = _ref4.sysOrderNo,
|
|
27164
|
+
_ref4$isAllOrders = _ref4.isAllOrders,
|
|
27165
|
+
isAllOrders = _ref4$isAllOrders === void 0 ? false : _ref4$isAllOrders;
|
|
26963
27166
|
var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type13 = typeMap$3[type]) === null || _typeMap$type13 === void 0 ? void 0 : _typeMap$type13.systemOrder];
|
|
26964
27167
|
var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type14 = typeMap$3[type]) === null || _typeMap$type14 === void 0 ? void 0 : _typeMap$type14.systemOrderNo];
|
|
26965
27168
|
var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
|
|
26966
27169
|
return order.orderSn === systemOrderNo;
|
|
26967
27170
|
});
|
|
26968
|
-
var
|
|
27171
|
+
var orders = isAllOrders ? (systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || [] : [order];
|
|
27172
|
+
var hasGoodDetails = orders === null || orders === void 0 ? void 0 : orders.some(function (order) {
|
|
27173
|
+
var _order$orderDetailGet;
|
|
27174
|
+
return order === null || order === void 0 ? void 0 : (_order$orderDetailGet = order.orderDetailGets) === null || _order$orderDetailGet === void 0 ? void 0 : _order$orderDetailGet.length;
|
|
27175
|
+
});
|
|
27176
|
+
var goodDetails = hasGoodDetails ? kmkfUtils.updateBsE3GoodsHandle([order], 'sharePrice') : [];
|
|
26969
27177
|
var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
|
|
26970
|
-
return mode ? goodDetails.filter(function (goodItem) {
|
|
27178
|
+
return mode && !isAllOrders ? goodDetails.filter(function (goodItem) {
|
|
26971
27179
|
return !orderNo || goodItem.originalOrderSn === orderNo;
|
|
26972
27180
|
}) : goodDetails;
|
|
26973
27181
|
};
|
|
@@ -27068,7 +27276,8 @@ var bsE3Reissue = function bsE3Reissue(props) {
|
|
|
27068
27276
|
type: type,
|
|
27069
27277
|
disabled: disabled,
|
|
27070
27278
|
canUpdateNumber: showChangeBtn,
|
|
27071
|
-
|
|
27279
|
+
hasSelectedSystemOrder: showChangeBtn,
|
|
27280
|
+
// showChangeBtn={showChangeBtn}
|
|
27072
27281
|
shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
|
|
27073
27282
|
value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type29 = typeMap$3[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.key)],
|
|
27074
27283
|
onChange: function onChange(val) {
|
|
@@ -27077,9 +27286,13 @@ var bsE3Reissue = function bsE3Reissue(props) {
|
|
|
27077
27286
|
onModeChange: handleModeChange,
|
|
27078
27287
|
showModeBtn: false,
|
|
27079
27288
|
isStrict: isStrict,
|
|
27289
|
+
isShowSelectTradeGoods: typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type30 = typeMap$3[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.isShowSelectTradeGoods,
|
|
27290
|
+
systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s7 = value[(_typeMap$type31 = typeMap$3[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.systemOrder]) === null || _value$typeMap$type$s7 === void 0 ? void 0 : _value$typeMap$type$s7.orders,
|
|
27291
|
+
selectedSystemOrders: showChangeBtn ? [value === null || value === void 0 ? void 0 : value["".concat(typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type32 = typeMap$3[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.systemOrderNo)]] : [],
|
|
27080
27292
|
tradeGoods: {
|
|
27081
27293
|
originDataSource: getGoodDetails({
|
|
27082
|
-
mode: isStrict
|
|
27294
|
+
mode: isStrict,
|
|
27295
|
+
isAllOrders: typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type33 = typeMap$3[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.isShowSelectTradeGoods
|
|
27083
27296
|
}),
|
|
27084
27297
|
selectedGoodsChange: selectedGoodsChange
|
|
27085
27298
|
}
|
|
@@ -27108,11 +27321,12 @@ var typeMap$4 = {
|
|
|
27108
27321
|
money: 'orderPrice',
|
|
27109
27322
|
share: 'sharePrice'
|
|
27110
27323
|
},
|
|
27111
|
-
getOrderList: gyUtils.getGyOrderListSingleton
|
|
27324
|
+
getOrderList: gyUtils.getGyOrderListSingleton,
|
|
27325
|
+
isShowSelectTradeGoods: true
|
|
27112
27326
|
}
|
|
27113
27327
|
};
|
|
27114
27328
|
var GyReissue = function GyReissue(props) {
|
|
27115
|
-
var _typeMap$
|
|
27329
|
+
var _typeMap$type32, _typeMap$type33, _typeMap$type34, _systemOrder$orders, _typeMap$type35, _value$typeMap$type$s9, _typeMap$type36, _typeMap$type37, _typeMap$type38, _typeMap$type39, _value$typeMap$type$s10, _typeMap$type40, _typeMap$type41, _typeMap$type42;
|
|
27116
27330
|
var value = props.value,
|
|
27117
27331
|
onChange = props.onChange,
|
|
27118
27332
|
_props$reasonList = props.reasonList,
|
|
@@ -27258,17 +27472,24 @@ var GyReissue = function GyReissue(props) {
|
|
|
27258
27472
|
}))));
|
|
27259
27473
|
};
|
|
27260
27474
|
var getGoodDetails = function getGoodDetails(_ref7) {
|
|
27261
|
-
var _ref8, _typeMap$type19, _ref9, _typeMap$type20
|
|
27475
|
+
var _ref8, _typeMap$type19, _ref9, _typeMap$type20;
|
|
27262
27476
|
var mode = _ref7.mode,
|
|
27263
|
-
sysOrderNo = _ref7.sysOrderNo
|
|
27477
|
+
sysOrderNo = _ref7.sysOrderNo,
|
|
27478
|
+
_ref7$isAllOrders = _ref7.isAllOrders,
|
|
27479
|
+
isAllOrders = _ref7$isAllOrders === void 0 ? false : _ref7$isAllOrders;
|
|
27264
27480
|
var systemOrder = (_ref8 = valueRef.current || {}) === null || _ref8 === void 0 ? void 0 : _ref8[(_typeMap$type19 = typeMap$4[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.systemOrder];
|
|
27265
27481
|
var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : (_ref9 = valueRef.current || {}) === null || _ref9 === void 0 ? void 0 : _ref9[(_typeMap$type20 = typeMap$4[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.systemOrderNo];
|
|
27266
27482
|
var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
|
|
27267
27483
|
return order.code === systemOrderNo;
|
|
27268
27484
|
});
|
|
27269
|
-
var
|
|
27485
|
+
var orders = isAllOrders ? (systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || [] : [order];
|
|
27486
|
+
var hasGoodDetails = orders === null || orders === void 0 ? void 0 : orders.some(function (order) {
|
|
27487
|
+
var _order$details;
|
|
27488
|
+
return order === null || order === void 0 ? void 0 : (_order$details = order.details) === null || _order$details === void 0 ? void 0 : _order$details.length;
|
|
27489
|
+
});
|
|
27490
|
+
var goodDetails = hasGoodDetails ? kmkfUtils.updateGyGoodsHandle(orders) : [];
|
|
27270
27491
|
var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
|
|
27271
|
-
return mode ? goodDetails.filter(function (goodItem) {
|
|
27492
|
+
return mode && !isAllOrders ? goodDetails.filter(function (goodItem) {
|
|
27272
27493
|
return !orderNo || (orderNo || '').includes(goodItem.oid);
|
|
27273
27494
|
}) : goodDetails;
|
|
27274
27495
|
};
|
|
@@ -27305,25 +27526,26 @@ var GyReissue = function GyReissue(props) {
|
|
|
27305
27526
|
onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
|
|
27306
27527
|
};
|
|
27307
27528
|
var selectedGoodsChange = React.useCallback(function (skuList) {
|
|
27308
|
-
var _ref12, _typeMap$
|
|
27529
|
+
var _typeMap$type29, _ref12, _typeMap$type30, _typeMap$type31, _uniqBy;
|
|
27309
27530
|
kmkfUtils.pushGyLog('beforeSelectedGoodsChange', valueRef.current || {});
|
|
27310
27531
|
var newValue = _objectSpread2({}, valueRef.current || {});
|
|
27311
27532
|
// 原订单商品
|
|
27312
27533
|
var originTradeGoodList = getGoodDetails({
|
|
27313
|
-
mode: isStrict
|
|
27534
|
+
mode: isStrict,
|
|
27535
|
+
isAllOrders: typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type29 = typeMap$4[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.isShowSelectTradeGoods
|
|
27314
27536
|
}) || [];
|
|
27315
27537
|
// 当前选中的所有商品【包含了原订单+商品库】
|
|
27316
|
-
var currentSelectGoodList = ((_ref12 = valueRef.current || {}) === null || _ref12 === void 0 ? void 0 : _ref12["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$
|
|
27317
|
-
newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$
|
|
27538
|
+
var currentSelectGoodList = ((_ref12 = valueRef.current || {}) === null || _ref12 === void 0 ? void 0 : _ref12["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type30 = typeMap$4[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.key)]) || [];
|
|
27539
|
+
newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type31 = typeMap$4[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.key)] = (_uniqBy = lodash.uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
|
|
27318
27540
|
return skuList.includes(item.uuid);
|
|
27319
27541
|
});
|
|
27320
27542
|
// console.log('商品发生变化', newValue[`${typeMap?.[type]?.key}`]);
|
|
27321
27543
|
onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
|
|
27322
27544
|
kmkfUtils.pushGyLog('afterSelectedGoodsChange', newValue);
|
|
27323
|
-
}, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$
|
|
27545
|
+
}, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type32 = typeMap$4[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.key)], isStrict]);
|
|
27324
27546
|
//系统单选择后展示选择商品按钮,系统单未选择的时候不展示
|
|
27325
|
-
var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$
|
|
27326
|
-
var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$
|
|
27547
|
+
var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type33 = typeMap$4[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.systemOrder];
|
|
27548
|
+
var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type34 = typeMap$4[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.systemOrderNo]);
|
|
27327
27549
|
var showErpGoodsBtn = showChangeBtn || type === 'GY_REISSUE_GOODS' && systemOrder && systemOrder.orderNo && !((_systemOrder$orders = systemOrder.orders) === null || _systemOrder$orders === void 0 ? void 0 : _systemOrder$orders.length);
|
|
27328
27550
|
return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(antd.Row, {
|
|
27329
27551
|
gutter: 8,
|
|
@@ -27343,12 +27565,12 @@ var GyReissue = function GyReissue(props) {
|
|
|
27343
27565
|
},
|
|
27344
27566
|
disabled: disabled,
|
|
27345
27567
|
allowClear: false,
|
|
27346
|
-
value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$
|
|
27568
|
+
value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type35 = typeMap$4[type]) === null || _typeMap$type35 === void 0 ? void 0 : _typeMap$type35.systemOrderNo)],
|
|
27347
27569
|
onChange: function onChange(val) {
|
|
27348
27570
|
return changeSystemOrderHandle(val);
|
|
27349
27571
|
},
|
|
27350
27572
|
placeholder: "\u9009\u62E9\u8865\u53D1\u7CFB\u7EDF\u5355"
|
|
27351
|
-
}, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$
|
|
27573
|
+
}, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$type36 = typeMap$4[type]) === null || _typeMap$type36 === void 0 ? void 0 : _typeMap$type36.systemOrder]) === null || _value$typeMap$type$s9 === void 0 ? void 0 : _value$typeMap$type$s9.showOrderInfo) || []).map(function (item) {
|
|
27352
27574
|
return /*#__PURE__*/React__default['default'].createElement(antd.Select.Option, {
|
|
27353
27575
|
className: styles$6.systemNoDisabled,
|
|
27354
27576
|
key: item.billNo,
|
|
@@ -27372,7 +27594,7 @@ var GyReissue = function GyReissue(props) {
|
|
|
27372
27594
|
disabled: isSettingConfig ? !isSettingConfig : disabled,
|
|
27373
27595
|
allowClear: false,
|
|
27374
27596
|
options: reasonList,
|
|
27375
|
-
value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$
|
|
27597
|
+
value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type37 = typeMap$4[type]) === null || _typeMap$type37 === void 0 ? void 0 : _typeMap$type37.typeName)],
|
|
27376
27598
|
onChange: function onChange(val) {
|
|
27377
27599
|
return changeTypeHandle(val);
|
|
27378
27600
|
}
|
|
@@ -27382,19 +27604,24 @@ var GyReissue = function GyReissue(props) {
|
|
|
27382
27604
|
type: type,
|
|
27383
27605
|
disabled: disabled,
|
|
27384
27606
|
canUpdateNumber: showChangeBtn,
|
|
27385
|
-
|
|
27386
|
-
|
|
27387
|
-
alwaysShowChooseErpGoodsBtn:
|
|
27607
|
+
// showChangeBtn={showChangeBtn}
|
|
27608
|
+
// showErpGoodsBtn={showErpGoodsBtn}
|
|
27609
|
+
alwaysShowChooseErpGoodsBtn: true,
|
|
27610
|
+
hasSelectedSystemOrder: showChangeBtn,
|
|
27388
27611
|
shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
|
|
27389
|
-
value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$
|
|
27612
|
+
value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type38 = typeMap$4[type]) === null || _typeMap$type38 === void 0 ? void 0 : _typeMap$type38.key)],
|
|
27390
27613
|
onChange: function onChange(val) {
|
|
27391
27614
|
return changeGoodHandle(val);
|
|
27392
27615
|
},
|
|
27393
27616
|
onModeChange: handleModeChange,
|
|
27394
27617
|
isStrict: isStrict,
|
|
27618
|
+
isShowSelectTradeGoods: typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type39 = typeMap$4[type]) === null || _typeMap$type39 === void 0 ? void 0 : _typeMap$type39.isShowSelectTradeGoods,
|
|
27619
|
+
systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s10 = value[(_typeMap$type40 = typeMap$4[type]) === null || _typeMap$type40 === void 0 ? void 0 : _typeMap$type40.systemOrder]) === null || _value$typeMap$type$s10 === void 0 ? void 0 : _value$typeMap$type$s10.orders,
|
|
27620
|
+
selectedSystemOrders: showChangeBtn ? [value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type41 = typeMap$4[type]) === null || _typeMap$type41 === void 0 ? void 0 : _typeMap$type41.systemOrderNo)]] : [],
|
|
27395
27621
|
tradeGoods: {
|
|
27396
27622
|
originDataSource: getGoodDetails({
|
|
27397
|
-
mode: isStrict
|
|
27623
|
+
mode: isStrict,
|
|
27624
|
+
isAllOrders: typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type42 = typeMap$4[type]) === null || _typeMap$type42 === void 0 ? void 0 : _typeMap$type42.isShowSelectTradeGoods
|
|
27398
27625
|
}),
|
|
27399
27626
|
selectedGoodsChange: selectedGoodsChange
|
|
27400
27627
|
}
|
|
@@ -28332,7 +28559,8 @@ var SYSTEM_ORDER_COLUMNS_MAP = {
|
|
|
28332
28559
|
BS_E3_SYSTEM_ORDER: kmkfUtils.BS_E3_SYSTEM_ORDER_CONFIG.columns,
|
|
28333
28560
|
GY_SYSTEM_ORDER: kmkfUtils.GY_SYSTEM_ORDER_CONFIG.columns,
|
|
28334
28561
|
JST_SYSTEM_ORDER: kmkfUtils.JST_SYSTEM_ORDER_CONFIG.columns,
|
|
28335
|
-
JY_SYSTEM_ORDER: kmkfUtils.JY_SYSTEM_ORDER_CONFIG.columns
|
|
28562
|
+
JY_SYSTEM_ORDER: kmkfUtils.JY_SYSTEM_ORDER_CONFIG.columns,
|
|
28563
|
+
WDT_RETURN_BILL_NO: kmkfUtils.WDT_RETURN_BILL_NO_CONFIG.columns
|
|
28336
28564
|
};
|
|
28337
28565
|
|
|
28338
28566
|
exports.Address = ApaasAddress;
|