@kmkf-fe-packages/basic-components 2.2.13-beta.103 → 2.2.13-beta.108
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 +205 -14
- package/dist/index.js +205 -14
- package/package.json +3 -3
package/dist/index.esm.js
CHANGED
|
@@ -8712,6 +8712,25 @@ var processWdtAftersaleGoods = function processWdtAftersaleGoods(templateColumns
|
|
|
8712
8712
|
};
|
|
8713
8713
|
};
|
|
8714
8714
|
};
|
|
8715
|
+
var processJstAftersaleGoods = function processJstAftersaleGoods(templateColumns) {
|
|
8716
|
+
return function (getValue) {
|
|
8717
|
+
return function (nex) {
|
|
8718
|
+
var _values = {
|
|
8719
|
+
jstAftersaleGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_jstAftersaleGoods")), []),
|
|
8720
|
+
shopCode: getValue("".concat(nex.uniqueKey, "_shopCode"))
|
|
8721
|
+
};
|
|
8722
|
+
var orderNo = '';
|
|
8723
|
+
var tradeId = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
|
|
8724
|
+
return col.workOrderComponentType === 'TRADE_ID_INPUT';
|
|
8725
|
+
});
|
|
8726
|
+
if (tradeId) {
|
|
8727
|
+
orderNo = getValue("".concat(tradeId.uniqueKey, "_").concat(updateWorkTypeKeys[tradeId.workOrderComponentType]));
|
|
8728
|
+
}
|
|
8729
|
+
_values.orderNo = orderNo;
|
|
8730
|
+
return _defineProperty({}, nex.uniqueKey, _values);
|
|
8731
|
+
};
|
|
8732
|
+
};
|
|
8733
|
+
};
|
|
8715
8734
|
var processBsE3Goods = function processBsE3Goods(templateColumns) {
|
|
8716
8735
|
return function (getValue) {
|
|
8717
8736
|
return function (nex, config) {
|
|
@@ -9189,14 +9208,14 @@ var processJstReturnGoods = function processJstReturnGoods(templateColumns) {
|
|
|
9189
9208
|
};
|
|
9190
9209
|
var processLabel = function processLabel(getValue) {
|
|
9191
9210
|
return function (nex, config) {
|
|
9192
|
-
var
|
|
9193
|
-
return
|
|
9211
|
+
var _ref74;
|
|
9212
|
+
return _ref74 = {}, _defineProperty(_ref74, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref74, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref74;
|
|
9194
9213
|
};
|
|
9195
9214
|
};
|
|
9196
9215
|
var processMemberLevel = function processMemberLevel(getValue) {
|
|
9197
9216
|
return function (nex, config) {
|
|
9198
|
-
var
|
|
9199
|
-
return
|
|
9217
|
+
var _ref75;
|
|
9218
|
+
return _ref75 = {}, _defineProperty(_ref75, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref75, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref75;
|
|
9200
9219
|
};
|
|
9201
9220
|
};
|
|
9202
9221
|
var processAfterSalesOrderId = function processAfterSalesOrderId(getValue) {
|
|
@@ -9315,6 +9334,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
|
|
|
9315
9334
|
BS_GOODS: processBsGoods,
|
|
9316
9335
|
WDT_GOODS: processWdtGoods(templateColumns),
|
|
9317
9336
|
WDT_AFTERSALE_GOODS: processWdtAftersaleGoods(templateColumns),
|
|
9337
|
+
JST_AFTERSALE_GOODS: processJstAftersaleGoods(templateColumns),
|
|
9318
9338
|
BS_E3_GOODS: processBsE3Goods(templateColumns),
|
|
9319
9339
|
GY_GOODS: processGyGoods(templateColumns),
|
|
9320
9340
|
KM_GOODS: processKmGoods(templateColumns),
|
|
@@ -12924,6 +12944,9 @@ var LogisticsInterception = function LogisticsInterception(props) {
|
|
|
12924
12944
|
return item.value === (value === null || value === void 0 ? void 0 : value.interceptType);
|
|
12925
12945
|
})) === null || _find3 === void 0 ? void 0 : (_find3$config = _find3.config) === null || _find3$config === void 0 ? void 0 : _find3$config.showSenderMobile;
|
|
12926
12946
|
}, [value === null || value === void 0 ? void 0 : value.interceptType, typeOptions, value === null || value === void 0 ? void 0 : value.interceptCompany]);
|
|
12947
|
+
var senderMobileLabel = useMemo(function () {
|
|
12948
|
+
return (value === null || value === void 0 ? void 0 : value.interceptCompany) === 'ZTO' ? '发件人/收件人手机号' : '发件人手机号';
|
|
12949
|
+
}, [value === null || value === void 0 ? void 0 : value.interceptCompany]);
|
|
12927
12950
|
var showKcode = useMemo(function () {
|
|
12928
12951
|
var isShow = false;
|
|
12929
12952
|
if (value === null || value === void 0 ? void 0 : value.interceptCompany) {
|
|
@@ -13158,14 +13181,14 @@ var LogisticsInterception = function LogisticsInterception(props) {
|
|
|
13158
13181
|
return option.label.includes(input);
|
|
13159
13182
|
}
|
|
13160
13183
|
})), /*#__PURE__*/React.createElement(Item, {
|
|
13161
|
-
label:
|
|
13184
|
+
label: senderMobileLabel,
|
|
13162
13185
|
// required={true}
|
|
13163
13186
|
key: 'interceptSenderMobile',
|
|
13164
13187
|
hidden: !showSenderMobile
|
|
13165
13188
|
}, /*#__PURE__*/React.createElement(Input, {
|
|
13166
13189
|
value: value === null || value === void 0 ? void 0 : value.interceptSenderMobile,
|
|
13167
13190
|
disabled: disabled || isEdit,
|
|
13168
|
-
placeholder:
|
|
13191
|
+
placeholder: senderMobileLabel,
|
|
13169
13192
|
onChange: function onChange(e) {
|
|
13170
13193
|
return changeHandle(e.target.value, 'interceptSenderMobile');
|
|
13171
13194
|
}
|
|
@@ -13473,7 +13496,7 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
|
|
|
13473
13496
|
style: {
|
|
13474
13497
|
marginTop: '8px'
|
|
13475
13498
|
},
|
|
13476
|
-
placeholder: company === 'ZTO' ? '
|
|
13499
|
+
placeholder: company === 'ZTO' ? '发件人/收件人手机号' : '手机号',
|
|
13477
13500
|
onChange: function onChange(e) {
|
|
13478
13501
|
return handleInputChange(e, 'trajectoryPhone');
|
|
13479
13502
|
},
|
|
@@ -20625,7 +20648,161 @@ var getColumns$5 = function getColumns() {
|
|
|
20625
20648
|
}
|
|
20626
20649
|
}) : renderTextEllipsis(val);
|
|
20627
20650
|
}
|
|
20628
|
-
}].map(fillAttrs)
|
|
20651
|
+
}].map(fillAttrs),
|
|
20652
|
+
// jst售后商品信息
|
|
20653
|
+
JST_AFTERSALE_GOODS: [{
|
|
20654
|
+
dataIndex: 'asId',
|
|
20655
|
+
title: "\u805A\u6C34\u6F6D\u552E\u540E\u5355\u53F7",
|
|
20656
|
+
width: 200,
|
|
20657
|
+
align: 'center',
|
|
20658
|
+
ellipsis: true,
|
|
20659
|
+
render: renderTextEllipsis
|
|
20660
|
+
}, {
|
|
20661
|
+
dataIndex: 'asiId',
|
|
20662
|
+
title: "\u552E\u540E\u5B50\u5355\u53F7",
|
|
20663
|
+
width: 200,
|
|
20664
|
+
align: 'center',
|
|
20665
|
+
ellipsis: true,
|
|
20666
|
+
render: renderTextEllipsis
|
|
20667
|
+
}, {
|
|
20668
|
+
dataIndex: 'outerOiId',
|
|
20669
|
+
title: "\u5B50\u8BA2\u5355\u53F7",
|
|
20670
|
+
width: 200,
|
|
20671
|
+
align: 'center',
|
|
20672
|
+
ellipsis: true,
|
|
20673
|
+
render: renderTextEllipsis
|
|
20674
|
+
}, {
|
|
20675
|
+
dataIndex: 'pic',
|
|
20676
|
+
title: "\u56FE\u7247",
|
|
20677
|
+
width: 100,
|
|
20678
|
+
align: 'center',
|
|
20679
|
+
render: function render(val) {
|
|
20680
|
+
return /*#__PURE__*/React.createElement(Image, {
|
|
20681
|
+
width: 30,
|
|
20682
|
+
src: val
|
|
20683
|
+
});
|
|
20684
|
+
},
|
|
20685
|
+
headerComponentType: 'pic'
|
|
20686
|
+
}, {
|
|
20687
|
+
dataIndex: 'name',
|
|
20688
|
+
title: "\u5546\u54C1\u540D\u79F0",
|
|
20689
|
+
width: 250,
|
|
20690
|
+
align: 'center',
|
|
20691
|
+
ellipsis: true,
|
|
20692
|
+
render: renderTextEllipsis
|
|
20693
|
+
}, {
|
|
20694
|
+
dataIndex: 'skuId',
|
|
20695
|
+
title: "\u5546\u54C1\u7F16\u7801",
|
|
20696
|
+
width: 200,
|
|
20697
|
+
align: 'center',
|
|
20698
|
+
ellipsis: true,
|
|
20699
|
+
render: renderTextEllipsis
|
|
20700
|
+
}, {
|
|
20701
|
+
dataIndex: 'propertiesValue',
|
|
20702
|
+
title: "\u89C4\u683C\u5C5E\u6027\u503C",
|
|
20703
|
+
width: 150,
|
|
20704
|
+
align: 'center',
|
|
20705
|
+
ellipsis: true,
|
|
20706
|
+
render: renderTextEllipsis
|
|
20707
|
+
}, {
|
|
20708
|
+
dataIndex: 'qty',
|
|
20709
|
+
title: "\u7533\u8BF7\u6570\u91CF",
|
|
20710
|
+
width: 150,
|
|
20711
|
+
align: 'center',
|
|
20712
|
+
ellipsis: true,
|
|
20713
|
+
render: renderTextEllipsis
|
|
20714
|
+
}, {
|
|
20715
|
+
dataIndex: 'rQty',
|
|
20716
|
+
title: "\u5B9E\u6536\u9000\u8D27\u6570\u91CF",
|
|
20717
|
+
width: 150,
|
|
20718
|
+
align: 'center',
|
|
20719
|
+
ellipsis: true,
|
|
20720
|
+
render: renderTextEllipsis
|
|
20721
|
+
}, {
|
|
20722
|
+
dataIndex: 'defectiveQty',
|
|
20723
|
+
title: "\u6B21\u54C1\u6570\u91CF",
|
|
20724
|
+
width: 150,
|
|
20725
|
+
align: 'center',
|
|
20726
|
+
ellipsis: true,
|
|
20727
|
+
render: renderTextEllipsis
|
|
20728
|
+
}, {
|
|
20729
|
+
dataIndex: 'amount',
|
|
20730
|
+
title: "\u7533\u8BF7\u91D1\u989D",
|
|
20731
|
+
width: 150,
|
|
20732
|
+
align: 'center',
|
|
20733
|
+
ellipsis: true,
|
|
20734
|
+
render: renderTextEllipsis
|
|
20735
|
+
}, {
|
|
20736
|
+
dataIndex: 'shopAmount',
|
|
20737
|
+
title: "\u7EBF\u4E0A\u660E\u7EC6\u91D1\u989D",
|
|
20738
|
+
width: 150,
|
|
20739
|
+
align: 'center',
|
|
20740
|
+
ellipsis: true,
|
|
20741
|
+
render: renderTextEllipsis
|
|
20742
|
+
}, {
|
|
20743
|
+
dataIndex: 'price',
|
|
20744
|
+
title: "\u5355\u4EF7",
|
|
20745
|
+
width: 150,
|
|
20746
|
+
align: 'center',
|
|
20747
|
+
ellipsis: true,
|
|
20748
|
+
render: renderTextEllipsis
|
|
20749
|
+
}, {
|
|
20750
|
+
dataIndex: 'combineSkuId',
|
|
20751
|
+
title: "\u7EC4\u5408\u5546\u54C1\u7F16\u7801",
|
|
20752
|
+
width: 200,
|
|
20753
|
+
align: 'center',
|
|
20754
|
+
ellipsis: true,
|
|
20755
|
+
render: renderTextEllipsis
|
|
20756
|
+
}, {
|
|
20757
|
+
dataIndex: 'shopSkuId',
|
|
20758
|
+
title: "\u5E97\u94FA\u5546\u54C1\u7F16\u7801",
|
|
20759
|
+
width: 200,
|
|
20760
|
+
align: 'center',
|
|
20761
|
+
ellipsis: true,
|
|
20762
|
+
render: renderTextEllipsis
|
|
20763
|
+
}, {
|
|
20764
|
+
dataIndex: 'iId',
|
|
20765
|
+
title: "\u6B3E\u5F0F\u7F16\u7801",
|
|
20766
|
+
width: 200,
|
|
20767
|
+
align: 'center',
|
|
20768
|
+
ellipsis: true,
|
|
20769
|
+
render: renderTextEllipsis
|
|
20770
|
+
}, {
|
|
20771
|
+
dataIndex: 'type',
|
|
20772
|
+
title: "\u552E\u540E\u7C7B\u578B",
|
|
20773
|
+
width: 150,
|
|
20774
|
+
align: 'center',
|
|
20775
|
+
ellipsis: true,
|
|
20776
|
+
render: renderTextEllipsis
|
|
20777
|
+
}, {
|
|
20778
|
+
dataIndex: 'skuType',
|
|
20779
|
+
title: "\u5546\u54C1\u7C7B\u578B",
|
|
20780
|
+
width: 150,
|
|
20781
|
+
align: 'center',
|
|
20782
|
+
ellipsis: true,
|
|
20783
|
+
render: renderTextEllipsis
|
|
20784
|
+
}, {
|
|
20785
|
+
dataIndex: 'isGift',
|
|
20786
|
+
title: '是否赠品',
|
|
20787
|
+
width: 100,
|
|
20788
|
+
render: function render(val) {
|
|
20789
|
+
return /*#__PURE__*/React.createElement("span", null, typeof val !== 'boolean' ? '' : val ? '是' : '否');
|
|
20790
|
+
}
|
|
20791
|
+
}, {
|
|
20792
|
+
dataIndex: 'receiveDate',
|
|
20793
|
+
title: "\u5165\u4ED3\u65F6\u95F4",
|
|
20794
|
+
width: 200,
|
|
20795
|
+
align: 'center',
|
|
20796
|
+
ellipsis: true,
|
|
20797
|
+
render: renderTextEllipsis
|
|
20798
|
+
}, {
|
|
20799
|
+
dataIndex: 'remark',
|
|
20800
|
+
title: "\u660E\u7EC6\u5907\u6CE8",
|
|
20801
|
+
width: 200,
|
|
20802
|
+
align: 'center',
|
|
20803
|
+
ellipsis: true,
|
|
20804
|
+
render: renderTextEllipsis
|
|
20805
|
+
}]
|
|
20629
20806
|
};
|
|
20630
20807
|
};
|
|
20631
20808
|
|
|
@@ -22200,6 +22377,7 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
22200
22377
|
templateDetail = _props$templateDetail === void 0 ? {} : _props$templateDetail,
|
|
22201
22378
|
_props$hasSelectedSys = props.hasSelectedSystemOrder,
|
|
22202
22379
|
hasSelectedSystemOrder = _props$hasSelectedSys === void 0 ? false : _props$hasSelectedSys;
|
|
22380
|
+
var canDelete = ['JST_AFTERSALE_GOODS'].includes(type);
|
|
22203
22381
|
var uniqueKey = (tradeGoods === null || tradeGoods === void 0 ? void 0 : tradeGoods.uniqueKey) || 'uuid';
|
|
22204
22382
|
// 监听聚水潭退货商品
|
|
22205
22383
|
var jstReturnGoods = Form === null || Form === void 0 ? void 0 : Form.useWatch('3979edfd6d', form);
|
|
@@ -22290,6 +22468,7 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
22290
22468
|
case 'JST_REISSUE_GOODS':
|
|
22291
22469
|
case 'JST_EXCHANGE_GOODS':
|
|
22292
22470
|
case 'JST_RETURN_GOODS':
|
|
22471
|
+
case 'JST_AFTERSALE_GOODS':
|
|
22293
22472
|
case 'GY_REISSUE_GOODS':
|
|
22294
22473
|
case 'GY_RETURN_GOODS':
|
|
22295
22474
|
case 'KM_GOODS':
|
|
@@ -22382,7 +22561,7 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
22382
22561
|
render: function render(val, record, index) {
|
|
22383
22562
|
return /*#__PURE__*/React.createElement(HoverTableRowDeleteIcon, {
|
|
22384
22563
|
index: index,
|
|
22385
|
-
hoveredRowIndex: !disabled && record.canDelete ? hoveredRowIndex : null,
|
|
22564
|
+
hoveredRowIndex: !disabled && (record.canDelete || canDelete) ? hoveredRowIndex : null,
|
|
22386
22565
|
handleClick: function handleClick() {
|
|
22387
22566
|
return handleDelete(record, index);
|
|
22388
22567
|
}
|
|
@@ -22397,7 +22576,7 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
22397
22576
|
ellipsis: true,
|
|
22398
22577
|
width: 100,
|
|
22399
22578
|
render: function render(val, record, index) {
|
|
22400
|
-
return record.canDelete ? /*#__PURE__*/React.createElement(Button, {
|
|
22579
|
+
return record.canDelete || canDelete ? /*#__PURE__*/React.createElement(Button, {
|
|
22401
22580
|
type: "link",
|
|
22402
22581
|
onClick: function onClick() {
|
|
22403
22582
|
return handleDelete(record, index);
|
|
@@ -25061,13 +25240,23 @@ var componentMap$2 = {
|
|
|
25061
25240
|
// pubsub 事件
|
|
25062
25241
|
type: 'wdtAftersaleType',
|
|
25063
25242
|
updateGoodsHandle: updateWdtAftersaleGoodsHandle,
|
|
25064
|
-
selectListReturn: 'wdtAftersaleSelectListReturn',
|
|
25065
|
-
selectList: 'wdtAftersaleSelectList',
|
|
25066
|
-
reissueSelectList: 'wdtAftersaleReissueSelectList',
|
|
25067
|
-
reissueSelectListReturn: 'wdtAftersaleReissueSelectListReturn',
|
|
25068
25243
|
reissueDeleteGood: 'wdtAftersaleReissueDeleteGood'
|
|
25069
25244
|
},
|
|
25070
25245
|
getOrderList: wdtUtils.getWdtOrderListSingleton
|
|
25246
|
+
},
|
|
25247
|
+
JST_AFTERSALE_GOODS: {
|
|
25248
|
+
type: 'jstAftersale',
|
|
25249
|
+
key: 'jstAftersaleGoods',
|
|
25250
|
+
name: 'jst售后',
|
|
25251
|
+
orderNo: 'asId',
|
|
25252
|
+
goodDetailOrderNo: 'asId',
|
|
25253
|
+
showChangeBtn: false,
|
|
25254
|
+
eventNameMap: {
|
|
25255
|
+
// pubsub 事件
|
|
25256
|
+
type: 'jstAftersaleType',
|
|
25257
|
+
deleteGood: 'jstAftersaleDeleteGood'
|
|
25258
|
+
},
|
|
25259
|
+
getOrderList: jstUtils.getJstOrderListSingleton
|
|
25071
25260
|
}
|
|
25072
25261
|
};
|
|
25073
25262
|
var CommonGoods = function CommonGoods(props) {
|
|
@@ -25228,6 +25417,7 @@ var CommonGoods = function CommonGoods(props) {
|
|
|
25228
25417
|
var getGoodDetails = function getGoodDetails(_ref2) {
|
|
25229
25418
|
var mode = _ref2.mode;
|
|
25230
25419
|
var updateHandle = componentMap$2[compType].eventNameMap['updateGoodsHandle'];
|
|
25420
|
+
if (!updateHandle) return [];
|
|
25231
25421
|
var goodDetails = updateHandle((value === null || value === void 0 ? void 0 : value.orders) || [], {
|
|
25232
25422
|
orderBackGoodsLevel: props.orderBackGoodsLevel
|
|
25233
25423
|
});
|
|
@@ -25242,6 +25432,7 @@ var CommonGoods = function CommonGoods(props) {
|
|
|
25242
25432
|
var mode = _ref3.mode;
|
|
25243
25433
|
var updateHandle = componentMap$2[compType].eventNameMap['updateGoodsHandle'];
|
|
25244
25434
|
console.log('value?.allOrders', value, (value === null || value === void 0 ? void 0 : value.allOrders) || []);
|
|
25435
|
+
if (!updateHandle) return [];
|
|
25245
25436
|
var goodDetails = updateHandle((value === null || value === void 0 ? void 0 : value.allOrders) || [], {
|
|
25246
25437
|
orderBackGoodsLevel: props.orderBackGoodsLevel
|
|
25247
25438
|
});
|
package/dist/index.js
CHANGED
|
@@ -8727,6 +8727,25 @@ var processWdtAftersaleGoods = function processWdtAftersaleGoods(templateColumns
|
|
|
8727
8727
|
};
|
|
8728
8728
|
};
|
|
8729
8729
|
};
|
|
8730
|
+
var processJstAftersaleGoods = function processJstAftersaleGoods(templateColumns) {
|
|
8731
|
+
return function (getValue) {
|
|
8732
|
+
return function (nex) {
|
|
8733
|
+
var _values = {
|
|
8734
|
+
jstAftersaleGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_jstAftersaleGoods")), []),
|
|
8735
|
+
shopCode: getValue("".concat(nex.uniqueKey, "_shopCode"))
|
|
8736
|
+
};
|
|
8737
|
+
var orderNo = '';
|
|
8738
|
+
var tradeId = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
|
|
8739
|
+
return col.workOrderComponentType === 'TRADE_ID_INPUT';
|
|
8740
|
+
});
|
|
8741
|
+
if (tradeId) {
|
|
8742
|
+
orderNo = getValue("".concat(tradeId.uniqueKey, "_").concat(updateWorkTypeKeys[tradeId.workOrderComponentType]));
|
|
8743
|
+
}
|
|
8744
|
+
_values.orderNo = orderNo;
|
|
8745
|
+
return _defineProperty({}, nex.uniqueKey, _values);
|
|
8746
|
+
};
|
|
8747
|
+
};
|
|
8748
|
+
};
|
|
8730
8749
|
var processBsE3Goods = function processBsE3Goods(templateColumns) {
|
|
8731
8750
|
return function (getValue) {
|
|
8732
8751
|
return function (nex, config) {
|
|
@@ -9204,14 +9223,14 @@ var processJstReturnGoods = function processJstReturnGoods(templateColumns) {
|
|
|
9204
9223
|
};
|
|
9205
9224
|
var processLabel = function processLabel(getValue) {
|
|
9206
9225
|
return function (nex, config) {
|
|
9207
|
-
var
|
|
9208
|
-
return
|
|
9226
|
+
var _ref74;
|
|
9227
|
+
return _ref74 = {}, _defineProperty(_ref74, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref74, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref74;
|
|
9209
9228
|
};
|
|
9210
9229
|
};
|
|
9211
9230
|
var processMemberLevel = function processMemberLevel(getValue) {
|
|
9212
9231
|
return function (nex, config) {
|
|
9213
|
-
var
|
|
9214
|
-
return
|
|
9232
|
+
var _ref75;
|
|
9233
|
+
return _ref75 = {}, _defineProperty(_ref75, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref75, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref75;
|
|
9215
9234
|
};
|
|
9216
9235
|
};
|
|
9217
9236
|
var processAfterSalesOrderId = function processAfterSalesOrderId(getValue) {
|
|
@@ -9330,6 +9349,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
|
|
|
9330
9349
|
BS_GOODS: processBsGoods,
|
|
9331
9350
|
WDT_GOODS: processWdtGoods(templateColumns),
|
|
9332
9351
|
WDT_AFTERSALE_GOODS: processWdtAftersaleGoods(templateColumns),
|
|
9352
|
+
JST_AFTERSALE_GOODS: processJstAftersaleGoods(templateColumns),
|
|
9333
9353
|
BS_E3_GOODS: processBsE3Goods(templateColumns),
|
|
9334
9354
|
GY_GOODS: processGyGoods(templateColumns),
|
|
9335
9355
|
KM_GOODS: processKmGoods(templateColumns),
|
|
@@ -12939,6 +12959,9 @@ var LogisticsInterception = function LogisticsInterception(props) {
|
|
|
12939
12959
|
return item.value === (value === null || value === void 0 ? void 0 : value.interceptType);
|
|
12940
12960
|
})) === null || _find3 === void 0 ? void 0 : (_find3$config = _find3.config) === null || _find3$config === void 0 ? void 0 : _find3$config.showSenderMobile;
|
|
12941
12961
|
}, [value === null || value === void 0 ? void 0 : value.interceptType, typeOptions, value === null || value === void 0 ? void 0 : value.interceptCompany]);
|
|
12962
|
+
var senderMobileLabel = React.useMemo(function () {
|
|
12963
|
+
return (value === null || value === void 0 ? void 0 : value.interceptCompany) === 'ZTO' ? '发件人/收件人手机号' : '发件人手机号';
|
|
12964
|
+
}, [value === null || value === void 0 ? void 0 : value.interceptCompany]);
|
|
12942
12965
|
var showKcode = React.useMemo(function () {
|
|
12943
12966
|
var isShow = false;
|
|
12944
12967
|
if (value === null || value === void 0 ? void 0 : value.interceptCompany) {
|
|
@@ -13173,14 +13196,14 @@ var LogisticsInterception = function LogisticsInterception(props) {
|
|
|
13173
13196
|
return option.label.includes(input);
|
|
13174
13197
|
}
|
|
13175
13198
|
})), /*#__PURE__*/React__default['default'].createElement(Item, {
|
|
13176
|
-
label:
|
|
13199
|
+
label: senderMobileLabel,
|
|
13177
13200
|
// required={true}
|
|
13178
13201
|
key: 'interceptSenderMobile',
|
|
13179
13202
|
hidden: !showSenderMobile
|
|
13180
13203
|
}, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
|
|
13181
13204
|
value: value === null || value === void 0 ? void 0 : value.interceptSenderMobile,
|
|
13182
13205
|
disabled: disabled || isEdit,
|
|
13183
|
-
placeholder:
|
|
13206
|
+
placeholder: senderMobileLabel,
|
|
13184
13207
|
onChange: function onChange(e) {
|
|
13185
13208
|
return changeHandle(e.target.value, 'interceptSenderMobile');
|
|
13186
13209
|
}
|
|
@@ -13488,7 +13511,7 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
|
|
|
13488
13511
|
style: {
|
|
13489
13512
|
marginTop: '8px'
|
|
13490
13513
|
},
|
|
13491
|
-
placeholder: company === 'ZTO' ? '
|
|
13514
|
+
placeholder: company === 'ZTO' ? '发件人/收件人手机号' : '手机号',
|
|
13492
13515
|
onChange: function onChange(e) {
|
|
13493
13516
|
return handleInputChange(e, 'trajectoryPhone');
|
|
13494
13517
|
},
|
|
@@ -20640,7 +20663,161 @@ var getColumns$5 = function getColumns() {
|
|
|
20640
20663
|
}
|
|
20641
20664
|
}) : renderTextEllipsis(val);
|
|
20642
20665
|
}
|
|
20643
|
-
}].map(fillAttrs)
|
|
20666
|
+
}].map(fillAttrs),
|
|
20667
|
+
// jst售后商品信息
|
|
20668
|
+
JST_AFTERSALE_GOODS: [{
|
|
20669
|
+
dataIndex: 'asId',
|
|
20670
|
+
title: "\u805A\u6C34\u6F6D\u552E\u540E\u5355\u53F7",
|
|
20671
|
+
width: 200,
|
|
20672
|
+
align: 'center',
|
|
20673
|
+
ellipsis: true,
|
|
20674
|
+
render: renderTextEllipsis
|
|
20675
|
+
}, {
|
|
20676
|
+
dataIndex: 'asiId',
|
|
20677
|
+
title: "\u552E\u540E\u5B50\u5355\u53F7",
|
|
20678
|
+
width: 200,
|
|
20679
|
+
align: 'center',
|
|
20680
|
+
ellipsis: true,
|
|
20681
|
+
render: renderTextEllipsis
|
|
20682
|
+
}, {
|
|
20683
|
+
dataIndex: 'outerOiId',
|
|
20684
|
+
title: "\u5B50\u8BA2\u5355\u53F7",
|
|
20685
|
+
width: 200,
|
|
20686
|
+
align: 'center',
|
|
20687
|
+
ellipsis: true,
|
|
20688
|
+
render: renderTextEllipsis
|
|
20689
|
+
}, {
|
|
20690
|
+
dataIndex: 'pic',
|
|
20691
|
+
title: "\u56FE\u7247",
|
|
20692
|
+
width: 100,
|
|
20693
|
+
align: 'center',
|
|
20694
|
+
render: function render(val) {
|
|
20695
|
+
return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
|
|
20696
|
+
width: 30,
|
|
20697
|
+
src: val
|
|
20698
|
+
});
|
|
20699
|
+
},
|
|
20700
|
+
headerComponentType: 'pic'
|
|
20701
|
+
}, {
|
|
20702
|
+
dataIndex: 'name',
|
|
20703
|
+
title: "\u5546\u54C1\u540D\u79F0",
|
|
20704
|
+
width: 250,
|
|
20705
|
+
align: 'center',
|
|
20706
|
+
ellipsis: true,
|
|
20707
|
+
render: renderTextEllipsis
|
|
20708
|
+
}, {
|
|
20709
|
+
dataIndex: 'skuId',
|
|
20710
|
+
title: "\u5546\u54C1\u7F16\u7801",
|
|
20711
|
+
width: 200,
|
|
20712
|
+
align: 'center',
|
|
20713
|
+
ellipsis: true,
|
|
20714
|
+
render: renderTextEllipsis
|
|
20715
|
+
}, {
|
|
20716
|
+
dataIndex: 'propertiesValue',
|
|
20717
|
+
title: "\u89C4\u683C\u5C5E\u6027\u503C",
|
|
20718
|
+
width: 150,
|
|
20719
|
+
align: 'center',
|
|
20720
|
+
ellipsis: true,
|
|
20721
|
+
render: renderTextEllipsis
|
|
20722
|
+
}, {
|
|
20723
|
+
dataIndex: 'qty',
|
|
20724
|
+
title: "\u7533\u8BF7\u6570\u91CF",
|
|
20725
|
+
width: 150,
|
|
20726
|
+
align: 'center',
|
|
20727
|
+
ellipsis: true,
|
|
20728
|
+
render: renderTextEllipsis
|
|
20729
|
+
}, {
|
|
20730
|
+
dataIndex: 'rQty',
|
|
20731
|
+
title: "\u5B9E\u6536\u9000\u8D27\u6570\u91CF",
|
|
20732
|
+
width: 150,
|
|
20733
|
+
align: 'center',
|
|
20734
|
+
ellipsis: true,
|
|
20735
|
+
render: renderTextEllipsis
|
|
20736
|
+
}, {
|
|
20737
|
+
dataIndex: 'defectiveQty',
|
|
20738
|
+
title: "\u6B21\u54C1\u6570\u91CF",
|
|
20739
|
+
width: 150,
|
|
20740
|
+
align: 'center',
|
|
20741
|
+
ellipsis: true,
|
|
20742
|
+
render: renderTextEllipsis
|
|
20743
|
+
}, {
|
|
20744
|
+
dataIndex: 'amount',
|
|
20745
|
+
title: "\u7533\u8BF7\u91D1\u989D",
|
|
20746
|
+
width: 150,
|
|
20747
|
+
align: 'center',
|
|
20748
|
+
ellipsis: true,
|
|
20749
|
+
render: renderTextEllipsis
|
|
20750
|
+
}, {
|
|
20751
|
+
dataIndex: 'shopAmount',
|
|
20752
|
+
title: "\u7EBF\u4E0A\u660E\u7EC6\u91D1\u989D",
|
|
20753
|
+
width: 150,
|
|
20754
|
+
align: 'center',
|
|
20755
|
+
ellipsis: true,
|
|
20756
|
+
render: renderTextEllipsis
|
|
20757
|
+
}, {
|
|
20758
|
+
dataIndex: 'price',
|
|
20759
|
+
title: "\u5355\u4EF7",
|
|
20760
|
+
width: 150,
|
|
20761
|
+
align: 'center',
|
|
20762
|
+
ellipsis: true,
|
|
20763
|
+
render: renderTextEllipsis
|
|
20764
|
+
}, {
|
|
20765
|
+
dataIndex: 'combineSkuId',
|
|
20766
|
+
title: "\u7EC4\u5408\u5546\u54C1\u7F16\u7801",
|
|
20767
|
+
width: 200,
|
|
20768
|
+
align: 'center',
|
|
20769
|
+
ellipsis: true,
|
|
20770
|
+
render: renderTextEllipsis
|
|
20771
|
+
}, {
|
|
20772
|
+
dataIndex: 'shopSkuId',
|
|
20773
|
+
title: "\u5E97\u94FA\u5546\u54C1\u7F16\u7801",
|
|
20774
|
+
width: 200,
|
|
20775
|
+
align: 'center',
|
|
20776
|
+
ellipsis: true,
|
|
20777
|
+
render: renderTextEllipsis
|
|
20778
|
+
}, {
|
|
20779
|
+
dataIndex: 'iId',
|
|
20780
|
+
title: "\u6B3E\u5F0F\u7F16\u7801",
|
|
20781
|
+
width: 200,
|
|
20782
|
+
align: 'center',
|
|
20783
|
+
ellipsis: true,
|
|
20784
|
+
render: renderTextEllipsis
|
|
20785
|
+
}, {
|
|
20786
|
+
dataIndex: 'type',
|
|
20787
|
+
title: "\u552E\u540E\u7C7B\u578B",
|
|
20788
|
+
width: 150,
|
|
20789
|
+
align: 'center',
|
|
20790
|
+
ellipsis: true,
|
|
20791
|
+
render: renderTextEllipsis
|
|
20792
|
+
}, {
|
|
20793
|
+
dataIndex: 'skuType',
|
|
20794
|
+
title: "\u5546\u54C1\u7C7B\u578B",
|
|
20795
|
+
width: 150,
|
|
20796
|
+
align: 'center',
|
|
20797
|
+
ellipsis: true,
|
|
20798
|
+
render: renderTextEllipsis
|
|
20799
|
+
}, {
|
|
20800
|
+
dataIndex: 'isGift',
|
|
20801
|
+
title: '是否赠品',
|
|
20802
|
+
width: 100,
|
|
20803
|
+
render: function render(val) {
|
|
20804
|
+
return /*#__PURE__*/React__default['default'].createElement("span", null, typeof val !== 'boolean' ? '' : val ? '是' : '否');
|
|
20805
|
+
}
|
|
20806
|
+
}, {
|
|
20807
|
+
dataIndex: 'receiveDate',
|
|
20808
|
+
title: "\u5165\u4ED3\u65F6\u95F4",
|
|
20809
|
+
width: 200,
|
|
20810
|
+
align: 'center',
|
|
20811
|
+
ellipsis: true,
|
|
20812
|
+
render: renderTextEllipsis
|
|
20813
|
+
}, {
|
|
20814
|
+
dataIndex: 'remark',
|
|
20815
|
+
title: "\u660E\u7EC6\u5907\u6CE8",
|
|
20816
|
+
width: 200,
|
|
20817
|
+
align: 'center',
|
|
20818
|
+
ellipsis: true,
|
|
20819
|
+
render: renderTextEllipsis
|
|
20820
|
+
}]
|
|
20644
20821
|
};
|
|
20645
20822
|
};
|
|
20646
20823
|
|
|
@@ -22215,6 +22392,7 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
22215
22392
|
templateDetail = _props$templateDetail === void 0 ? {} : _props$templateDetail,
|
|
22216
22393
|
_props$hasSelectedSys = props.hasSelectedSystemOrder,
|
|
22217
22394
|
hasSelectedSystemOrder = _props$hasSelectedSys === void 0 ? false : _props$hasSelectedSys;
|
|
22395
|
+
var canDelete = ['JST_AFTERSALE_GOODS'].includes(type);
|
|
22218
22396
|
var uniqueKey = (tradeGoods === null || tradeGoods === void 0 ? void 0 : tradeGoods.uniqueKey) || 'uuid';
|
|
22219
22397
|
// 监听聚水潭退货商品
|
|
22220
22398
|
var jstReturnGoods = antd.Form === null || antd.Form === void 0 ? void 0 : antd.Form.useWatch('3979edfd6d', form);
|
|
@@ -22305,6 +22483,7 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
22305
22483
|
case 'JST_REISSUE_GOODS':
|
|
22306
22484
|
case 'JST_EXCHANGE_GOODS':
|
|
22307
22485
|
case 'JST_RETURN_GOODS':
|
|
22486
|
+
case 'JST_AFTERSALE_GOODS':
|
|
22308
22487
|
case 'GY_REISSUE_GOODS':
|
|
22309
22488
|
case 'GY_RETURN_GOODS':
|
|
22310
22489
|
case 'KM_GOODS':
|
|
@@ -22397,7 +22576,7 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
22397
22576
|
render: function render(val, record, index) {
|
|
22398
22577
|
return /*#__PURE__*/React__default['default'].createElement(HoverTableRowDeleteIcon, {
|
|
22399
22578
|
index: index,
|
|
22400
|
-
hoveredRowIndex: !disabled && record.canDelete ? hoveredRowIndex : null,
|
|
22579
|
+
hoveredRowIndex: !disabled && (record.canDelete || canDelete) ? hoveredRowIndex : null,
|
|
22401
22580
|
handleClick: function handleClick() {
|
|
22402
22581
|
return handleDelete(record, index);
|
|
22403
22582
|
}
|
|
@@ -22412,7 +22591,7 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
22412
22591
|
ellipsis: true,
|
|
22413
22592
|
width: 100,
|
|
22414
22593
|
render: function render(val, record, index) {
|
|
22415
|
-
return record.canDelete ? /*#__PURE__*/React__default['default'].createElement(antd.Button, {
|
|
22594
|
+
return record.canDelete || canDelete ? /*#__PURE__*/React__default['default'].createElement(antd.Button, {
|
|
22416
22595
|
type: "link",
|
|
22417
22596
|
onClick: function onClick() {
|
|
22418
22597
|
return handleDelete(record, index);
|
|
@@ -25076,13 +25255,23 @@ var componentMap$2 = {
|
|
|
25076
25255
|
// pubsub 事件
|
|
25077
25256
|
type: 'wdtAftersaleType',
|
|
25078
25257
|
updateGoodsHandle: kmkfUtils.updateWdtAftersaleGoodsHandle,
|
|
25079
|
-
selectListReturn: 'wdtAftersaleSelectListReturn',
|
|
25080
|
-
selectList: 'wdtAftersaleSelectList',
|
|
25081
|
-
reissueSelectList: 'wdtAftersaleReissueSelectList',
|
|
25082
|
-
reissueSelectListReturn: 'wdtAftersaleReissueSelectListReturn',
|
|
25083
25258
|
reissueDeleteGood: 'wdtAftersaleReissueDeleteGood'
|
|
25084
25259
|
},
|
|
25085
25260
|
getOrderList: wdtUtils.getWdtOrderListSingleton
|
|
25261
|
+
},
|
|
25262
|
+
JST_AFTERSALE_GOODS: {
|
|
25263
|
+
type: 'jstAftersale',
|
|
25264
|
+
key: 'jstAftersaleGoods',
|
|
25265
|
+
name: 'jst售后',
|
|
25266
|
+
orderNo: 'asId',
|
|
25267
|
+
goodDetailOrderNo: 'asId',
|
|
25268
|
+
showChangeBtn: false,
|
|
25269
|
+
eventNameMap: {
|
|
25270
|
+
// pubsub 事件
|
|
25271
|
+
type: 'jstAftersaleType',
|
|
25272
|
+
deleteGood: 'jstAftersaleDeleteGood'
|
|
25273
|
+
},
|
|
25274
|
+
getOrderList: jstUtils.getJstOrderListSingleton
|
|
25086
25275
|
}
|
|
25087
25276
|
};
|
|
25088
25277
|
var CommonGoods = function CommonGoods(props) {
|
|
@@ -25243,6 +25432,7 @@ var CommonGoods = function CommonGoods(props) {
|
|
|
25243
25432
|
var getGoodDetails = function getGoodDetails(_ref2) {
|
|
25244
25433
|
var mode = _ref2.mode;
|
|
25245
25434
|
var updateHandle = componentMap$2[compType].eventNameMap['updateGoodsHandle'];
|
|
25435
|
+
if (!updateHandle) return [];
|
|
25246
25436
|
var goodDetails = updateHandle((value === null || value === void 0 ? void 0 : value.orders) || [], {
|
|
25247
25437
|
orderBackGoodsLevel: props.orderBackGoodsLevel
|
|
25248
25438
|
});
|
|
@@ -25257,6 +25447,7 @@ var CommonGoods = function CommonGoods(props) {
|
|
|
25257
25447
|
var mode = _ref3.mode;
|
|
25258
25448
|
var updateHandle = componentMap$2[compType].eventNameMap['updateGoodsHandle'];
|
|
25259
25449
|
console.log('value?.allOrders', value, (value === null || value === void 0 ? void 0 : value.allOrders) || []);
|
|
25450
|
+
if (!updateHandle) return [];
|
|
25260
25451
|
var goodDetails = updateHandle((value === null || value === void 0 ? void 0 : value.allOrders) || [], {
|
|
25261
25452
|
orderBackGoodsLevel: props.orderBackGoodsLevel
|
|
25262
25453
|
});
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/basic-components",
|
|
3
|
-
"version": "2.2.13-beta.
|
|
3
|
+
"version": "2.2.13-beta.108",
|
|
4
4
|
"description": "> TODO: description",
|
|
5
5
|
"homepage": "",
|
|
6
6
|
"license": "ISC",
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
"watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
|
|
21
21
|
},
|
|
22
22
|
"dependencies": {
|
|
23
|
-
"@kmkf-fe-packages/kmkf-utils": "2.2.13-beta.
|
|
23
|
+
"@kmkf-fe-packages/kmkf-utils": "2.2.13-beta.106",
|
|
24
24
|
"ahooks": "^3.7.4",
|
|
25
25
|
"ali-react-table": "2.6.1",
|
|
26
26
|
"bignumber.js": "^9.1.2",
|
|
@@ -66,5 +66,5 @@
|
|
|
66
66
|
"publishConfig": {
|
|
67
67
|
"access": "public"
|
|
68
68
|
},
|
|
69
|
-
"gitHead": "
|
|
69
|
+
"gitHead": "f158c3333248dfc684757d1efa02cad4578644fc"
|
|
70
70
|
}
|