@kmkf-fe-packages/basic-components 2.10.3 → 2.10.5
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 +223 -156
- package/package.json +3 -3
package/dist/index.esm.js
CHANGED
|
@@ -7863,7 +7863,6 @@ var ParseLogistics = function ParseLogistics(props) {
|
|
|
7863
7863
|
onChange === null || onChange === void 0 ? void 0 : onChange(data);
|
|
7864
7864
|
}).catch(function (e) {
|
|
7865
7865
|
handleAIIdentify(fullAddress);
|
|
7866
|
-
console.log(e);
|
|
7867
7866
|
}).finally(function () {
|
|
7868
7867
|
setLoading(false);
|
|
7869
7868
|
});
|
|
@@ -7887,7 +7886,6 @@ var ParseLogistics = function ParseLogistics(props) {
|
|
|
7887
7886
|
var data = res.data;
|
|
7888
7887
|
onChange === null || onChange === void 0 ? void 0 : onChange(data);
|
|
7889
7888
|
}).catch(function (e) {
|
|
7890
|
-
console.log(e);
|
|
7891
7889
|
message.error('识别失败,请输入正确的信息');
|
|
7892
7890
|
}).finally(function () {
|
|
7893
7891
|
setAiLoading(false);
|
|
@@ -8671,6 +8669,7 @@ var processSceneStatus = function processSceneStatus(getValue) {
|
|
|
8671
8669
|
MSG_STATUS: 'msgStatusValues',
|
|
8672
8670
|
WDT_WAREHOUSING_STATUS: 'wdtInStockStatusItemList',
|
|
8673
8671
|
JKY_WAREHOUSING_STATUS: 'jkyInStockStatusItemList',
|
|
8672
|
+
JST_WAREHOUSING_STATUS: 'jstInStockStatusItemList',
|
|
8674
8673
|
WLN_WAREHOUSING_STATUS: 'wlnInStockStatusItemList'
|
|
8675
8674
|
};
|
|
8676
8675
|
return _defineProperty({}, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(STATUS_LIST_MAP[nex.workOrderComponentType])), []));
|
|
@@ -9395,7 +9394,8 @@ var processJstReturnGoods = function processJstReturnGoods(templateColumns) {
|
|
|
9395
9394
|
},
|
|
9396
9395
|
jstReturnType: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_jstReturnType")), !isNull(config === null || config === void 0 ? void 0 : config.initReason) ? [config.initReason] : ['1']),
|
|
9397
9396
|
jstReturnGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_jstReturnGoods")), []),
|
|
9398
|
-
jstSystemOrderBillType:
|
|
9397
|
+
// jstSystemOrderBillType:
|
|
9398
|
+
// getValue(`${nex.uniqueKey}_jstSystemOrderBillType`) || '',
|
|
9399
9399
|
shopCode: getValue("".concat(nex.uniqueKey, "_shopCode")),
|
|
9400
9400
|
jstSystemOrderNo: getValue("".concat(nex.uniqueKey, "_jstSystemOrderNo"))
|
|
9401
9401
|
});
|
|
@@ -9519,6 +9519,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
|
|
|
9519
9519
|
WDT_WAREHOUSING_STATUS: processSceneStatus,
|
|
9520
9520
|
WLN_WAREHOUSING_STATUS: processSceneStatus,
|
|
9521
9521
|
JKY_WAREHOUSING_STATUS: processSceneStatus,
|
|
9522
|
+
JST_WAREHOUSING_STATUS: processSceneStatus,
|
|
9522
9523
|
BS_LOGISTICS: processErpLogistics,
|
|
9523
9524
|
WLN_LOGISTICS: processErpLogistics,
|
|
9524
9525
|
WDT_LOGISTICS: processErpLogistics,
|
|
@@ -12115,7 +12116,7 @@ var Goods = function Goods(props) {
|
|
|
12115
12116
|
return querySkus({
|
|
12116
12117
|
shopId: shopId,
|
|
12117
12118
|
numIids: numIid
|
|
12118
|
-
}).catch(
|
|
12119
|
+
}).catch(function () {});
|
|
12119
12120
|
case 5:
|
|
12120
12121
|
res = _context3.sent;
|
|
12121
12122
|
data = (res === null || res === void 0 ? void 0 : res.success) && (res === null || res === void 0 ? void 0 : res.data);
|
|
@@ -12499,7 +12500,7 @@ var GoodItem = function GoodItem(props) {
|
|
|
12499
12500
|
return querySkus({
|
|
12500
12501
|
shopId: shopId,
|
|
12501
12502
|
numIids: numIid
|
|
12502
|
-
}).catch(
|
|
12503
|
+
}).catch(function () {});
|
|
12503
12504
|
case 5:
|
|
12504
12505
|
res = _context3.sent;
|
|
12505
12506
|
data = (res === null || res === void 0 ? void 0 : res.success) && (res === null || res === void 0 ? void 0 : res.data);
|
|
@@ -13441,7 +13442,6 @@ var LogisticsInterception = function LogisticsInterception(props) {
|
|
|
13441
13442
|
});
|
|
13442
13443
|
}
|
|
13443
13444
|
}
|
|
13444
|
-
console.log('newValue', newValue);
|
|
13445
13445
|
onChange === null || onChange === void 0 ? void 0 : onChange(newValue, type);
|
|
13446
13446
|
};
|
|
13447
13447
|
//智能识别回调
|
|
@@ -14024,21 +14024,14 @@ var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
|
|
|
14024
14024
|
}); // 1、初始值没有 传入值有请求快照
|
|
14025
14025
|
// 2、初始值有 传入值有 其中有不一样的请求快照
|
|
14026
14026
|
// 3、初始值有 传入值有 都一样的返回初始值
|
|
14027
|
-
console.log('list', initList, valueList, changeList);
|
|
14028
|
-
// console.log('old', initValue, value, changeValue);
|
|
14029
|
-
// console.log('一样', JSON.stringify(initList) !== JSON.stringify(valueList));
|
|
14030
|
-
// console.log(
|
|
14031
|
-
// '一样2',
|
|
14032
|
-
// JSON.stringify(changeList) !== JSON.stringify(valueList),
|
|
14033
|
-
// );
|
|
14034
14027
|
if (!(!initList.length && !valueList.length)) {
|
|
14035
|
-
_context.next =
|
|
14028
|
+
_context.next = 7;
|
|
14036
14029
|
break;
|
|
14037
14030
|
}
|
|
14038
14031
|
return _context.abrupt("return");
|
|
14039
|
-
case
|
|
14032
|
+
case 7:
|
|
14040
14033
|
if (!(JSON.stringify(initList) === JSON.stringify(valueList))) {
|
|
14041
|
-
_context.next =
|
|
14034
|
+
_context.next = 13;
|
|
14042
14035
|
break;
|
|
14043
14036
|
}
|
|
14044
14037
|
initSnapshotList = initValue.reduce(function (prv, next) {
|
|
@@ -14057,13 +14050,13 @@ var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
|
|
|
14057
14050
|
setNewValue(initValue);
|
|
14058
14051
|
onChange(initValue);
|
|
14059
14052
|
}
|
|
14060
|
-
_context.next =
|
|
14053
|
+
_context.next = 29;
|
|
14061
14054
|
break;
|
|
14062
|
-
case
|
|
14055
|
+
case 13:
|
|
14063
14056
|
if (!(
|
|
14064
14057
|
//开启了物流快照才会获取快照信息
|
|
14065
14058
|
hasSnapshot && JSON.stringify(initList) !== JSON.stringify(valueList) && JSON.stringify(changeList) !== JSON.stringify(valueList))) {
|
|
14066
|
-
_context.next =
|
|
14059
|
+
_context.next = 28;
|
|
14067
14060
|
break;
|
|
14068
14061
|
}
|
|
14069
14062
|
hasSave.current = false;
|
|
@@ -14072,7 +14065,7 @@ var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
|
|
|
14072
14065
|
});
|
|
14073
14066
|
listValue = cloneDeep(value);
|
|
14074
14067
|
if (!hasValue) {
|
|
14075
|
-
_context.next =
|
|
14068
|
+
_context.next = 23;
|
|
14076
14069
|
break;
|
|
14077
14070
|
}
|
|
14078
14071
|
requestList = valueList.map(function (item) {
|
|
@@ -14091,9 +14084,9 @@ var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
|
|
|
14091
14084
|
});
|
|
14092
14085
|
}
|
|
14093
14086
|
});
|
|
14094
|
-
_context.next =
|
|
14087
|
+
_context.next = 21;
|
|
14095
14088
|
return Promise.allSettled(requestList);
|
|
14096
|
-
case
|
|
14089
|
+
case 21:
|
|
14097
14090
|
requestValues = _context.sent;
|
|
14098
14091
|
listValue = cloneDeep(value).map(function (item, index) {
|
|
14099
14092
|
var _requestValues$index, _requestValues$index$, _requestValues$index$2;
|
|
@@ -14101,15 +14094,15 @@ var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
|
|
|
14101
14094
|
trajectorySnapshot: (_requestValues$index = requestValues[index]) === null || _requestValues$index === void 0 ? void 0 : (_requestValues$index$ = _requestValues$index.value) === null || _requestValues$index$ === void 0 ? void 0 : (_requestValues$index$2 = _requestValues$index$.data) === null || _requestValues$index$2 === void 0 ? void 0 : _requestValues$index$2.logisticsStatusDesc
|
|
14102
14095
|
});
|
|
14103
14096
|
});
|
|
14104
|
-
case
|
|
14097
|
+
case 23:
|
|
14105
14098
|
setChangeValue(listValue);
|
|
14106
14099
|
setNewValue(listValue);
|
|
14107
14100
|
onChange(listValue);
|
|
14108
|
-
_context.next =
|
|
14101
|
+
_context.next = 29;
|
|
14109
14102
|
break;
|
|
14110
|
-
case
|
|
14103
|
+
case 28:
|
|
14111
14104
|
setNewValue(value);
|
|
14112
|
-
case
|
|
14105
|
+
case 29:
|
|
14113
14106
|
case "end":
|
|
14114
14107
|
return _context.stop();
|
|
14115
14108
|
}
|
|
@@ -15069,12 +15062,8 @@ var jstColumns = [{
|
|
|
15069
15062
|
title: '商品图片',
|
|
15070
15063
|
width: 100,
|
|
15071
15064
|
render: function render(picUrl) {
|
|
15072
|
-
return /*#__PURE__*/React.createElement(
|
|
15073
|
-
|
|
15074
|
-
width: '30px',
|
|
15075
|
-
height: '30px',
|
|
15076
|
-
objectFit: 'contain'
|
|
15077
|
-
},
|
|
15065
|
+
return /*#__PURE__*/React.createElement(ApaasImage, {
|
|
15066
|
+
width: 30,
|
|
15078
15067
|
src: picUrl
|
|
15079
15068
|
});
|
|
15080
15069
|
}
|
|
@@ -16283,7 +16272,7 @@ var GoodList = function GoodList(props, ref) {
|
|
|
16283
16272
|
} else {
|
|
16284
16273
|
reject$1(res);
|
|
16285
16274
|
}
|
|
16286
|
-
}).catch(
|
|
16275
|
+
}).catch(function () {});
|
|
16287
16276
|
};
|
|
16288
16277
|
getMore();
|
|
16289
16278
|
};
|
|
@@ -18334,7 +18323,6 @@ var SearchHeader = function SearchHeader(_ref) {
|
|
|
18334
18323
|
timeOptions = _ref.timeOptions,
|
|
18335
18324
|
ShopList = _ref.ShopList,
|
|
18336
18325
|
onSubmit = _ref.onSubmit;
|
|
18337
|
-
console.log('allFields', allFields);
|
|
18338
18326
|
// const fixedFieldsOptions = useMemo(() => {
|
|
18339
18327
|
// return allFields.filter(item => fixedFields?.includes(item.id));
|
|
18340
18328
|
// }, [fixedFields, allFields]);
|
|
@@ -18590,9 +18578,7 @@ var WorkorderList = function WorkorderList(props, ref) {
|
|
|
18590
18578
|
loading: false
|
|
18591
18579
|
}));
|
|
18592
18580
|
setWorkOrderList(newDataSource);
|
|
18593
|
-
}).catch(function (error) {
|
|
18594
|
-
console.log('**** 获取表格数据错误', error);
|
|
18595
|
-
}));
|
|
18581
|
+
}).catch(function (error) {}));
|
|
18596
18582
|
case 19:
|
|
18597
18583
|
case "end":
|
|
18598
18584
|
return _context.stop();
|
|
@@ -22132,7 +22118,8 @@ var getColumns$5 = function getColumns() {
|
|
|
22132
22118
|
min: 0,
|
|
22133
22119
|
precision: 2,
|
|
22134
22120
|
onChange: function onChange(num) {
|
|
22135
|
-
|
|
22121
|
+
updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'salePrice');
|
|
22122
|
+
if ((num || num === 0) && (record.qty || record.qty === 0)) updateHandle(num * (record.qty || 0), index, 'saleAmount');
|
|
22136
22123
|
}
|
|
22137
22124
|
}) : /*#__PURE__*/React.createElement("span", null, val || val === 0 ? Number(val).toFixed(4).replace(/\.?0+$/, '') : '');
|
|
22138
22125
|
}
|
|
@@ -22164,7 +22151,8 @@ var getColumns$5 = function getColumns() {
|
|
|
22164
22151
|
min: 1,
|
|
22165
22152
|
precision: 0,
|
|
22166
22153
|
onChange: function onChange(num) {
|
|
22167
|
-
|
|
22154
|
+
updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'qty');
|
|
22155
|
+
if ((num || num === 0) && (record.salePrice || record.salePrice === 0)) updateHandle(num * (record.salePrice || 0), index, 'saleAmount');
|
|
22168
22156
|
}
|
|
22169
22157
|
}) : /*#__PURE__*/React.createElement("span", null, val);
|
|
22170
22158
|
}
|
|
@@ -22265,7 +22253,8 @@ var getColumns$5 = function getColumns() {
|
|
|
22265
22253
|
min: 0,
|
|
22266
22254
|
precision: 2,
|
|
22267
22255
|
onChange: function onChange(num) {
|
|
22268
|
-
|
|
22256
|
+
updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'salePrice');
|
|
22257
|
+
if ((num || num === 0) && (record.qty || record.qty === 0)) updateHandle(num * (record.qty || 0), index, 'saleAmount');
|
|
22269
22258
|
}
|
|
22270
22259
|
}) : /*#__PURE__*/React.createElement("span", null, val || val === 0 ? Number(val).toFixed(4).replace(/\.?0+$/, '') : '');
|
|
22271
22260
|
}
|
|
@@ -22295,16 +22284,39 @@ var getColumns$5 = function getColumns() {
|
|
|
22295
22284
|
min: 1,
|
|
22296
22285
|
precision: 0,
|
|
22297
22286
|
onChange: function onChange(num) {
|
|
22298
|
-
|
|
22287
|
+
updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'qty');
|
|
22288
|
+
if ((num || num === 0) && (record.salePrice || record.salePrice === 0)) updateHandle(num * (record.salePrice || 0), index, 'saleAmount');
|
|
22299
22289
|
}
|
|
22300
22290
|
}) : /*#__PURE__*/React.createElement("span", null, val);
|
|
22301
22291
|
}
|
|
22302
22292
|
}, {
|
|
22303
22293
|
dataIndex: 'saleAmount',
|
|
22304
22294
|
title: '总金额',
|
|
22305
|
-
|
|
22306
|
-
var
|
|
22307
|
-
|
|
22295
|
+
validator: function validator(_rule, value) {
|
|
22296
|
+
var goodsName = '';
|
|
22297
|
+
if (((value === null || value === void 0 ? void 0 : value.jstReturnGoods) || []).some(function (goods) {
|
|
22298
|
+
var v = toNum$3(goods === null || goods === void 0 ? void 0 : goods.saleAmount);
|
|
22299
|
+
var res = typeof v === 'number' ? v < 0 : true;
|
|
22300
|
+
if (res) {
|
|
22301
|
+
goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
|
|
22302
|
+
}
|
|
22303
|
+
return res;
|
|
22304
|
+
})) {
|
|
22305
|
+
return Promise.reject("".concat(goodsName, "\u603B\u91D1\u989D\u4E3A\u5927\u4E8E\u7B49\u4E8E0\u7684\u6570"));
|
|
22306
|
+
}
|
|
22307
|
+
},
|
|
22308
|
+
render: function render(val, record, index) {
|
|
22309
|
+
return !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
|
|
22310
|
+
style: {
|
|
22311
|
+
width: 130
|
|
22312
|
+
},
|
|
22313
|
+
value: val,
|
|
22314
|
+
min: 0,
|
|
22315
|
+
precision: 2,
|
|
22316
|
+
onChange: function onChange(num) {
|
|
22317
|
+
updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'saleAmount');
|
|
22318
|
+
}
|
|
22319
|
+
}) : /*#__PURE__*/React.createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
|
|
22308
22320
|
}
|
|
22309
22321
|
}, {
|
|
22310
22322
|
dataIndex: 'batchId',
|
|
@@ -22385,6 +22397,19 @@ var getColumns$5 = function getColumns() {
|
|
|
22385
22397
|
dataIndex: 'salePrice',
|
|
22386
22398
|
title: '单价',
|
|
22387
22399
|
width: 120,
|
|
22400
|
+
validator: function validator(_rule, value) {
|
|
22401
|
+
var goodsName = '';
|
|
22402
|
+
if (((value === null || value === void 0 ? void 0 : value.jstExchangeGoods) || []).some(function (goods) {
|
|
22403
|
+
var v = toNum$3(goods === null || goods === void 0 ? void 0 : goods.salePrice);
|
|
22404
|
+
var res = typeof v === 'number' ? v < 0 : true;
|
|
22405
|
+
if (res) {
|
|
22406
|
+
goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
|
|
22407
|
+
}
|
|
22408
|
+
return res;
|
|
22409
|
+
})) {
|
|
22410
|
+
return Promise.reject("".concat(goodsName, "\u5355\u4EF7\u4E3A\u5927\u4E8E\u7B49\u4E8E0\u7684\u6570"));
|
|
22411
|
+
}
|
|
22412
|
+
},
|
|
22388
22413
|
render: function render(val, record, index) {
|
|
22389
22414
|
return !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
|
|
22390
22415
|
style: {
|
|
@@ -22394,7 +22419,8 @@ var getColumns$5 = function getColumns() {
|
|
|
22394
22419
|
min: 0,
|
|
22395
22420
|
precision: 2,
|
|
22396
22421
|
onChange: function onChange(num) {
|
|
22397
|
-
|
|
22422
|
+
updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'salePrice');
|
|
22423
|
+
if ((num || num === 0) && (record.qty || record.qty === 0)) updateHandle(num * (record.qty || 0), index, 'saleAmount');
|
|
22398
22424
|
}
|
|
22399
22425
|
}) : /*#__PURE__*/React.createElement("span", null, val || val === 0 ? Number(val).toFixed(4).replace(/\.?0+$/, '') : '');
|
|
22400
22426
|
}
|
|
@@ -22402,6 +22428,19 @@ var getColumns$5 = function getColumns() {
|
|
|
22402
22428
|
dataIndex: 'qty',
|
|
22403
22429
|
title: '数量',
|
|
22404
22430
|
width: 100,
|
|
22431
|
+
validator: function validator(_rule, value) {
|
|
22432
|
+
var goodsName = '';
|
|
22433
|
+
if (((value === null || value === void 0 ? void 0 : value.jstExchangeGoods) || []).some(function (goods) {
|
|
22434
|
+
var qty = toNum$3(goods === null || goods === void 0 ? void 0 : goods.qty);
|
|
22435
|
+
var res = typeof qty === 'number' ? qty < 1 : true;
|
|
22436
|
+
if (res) {
|
|
22437
|
+
goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
|
|
22438
|
+
}
|
|
22439
|
+
return res;
|
|
22440
|
+
})) {
|
|
22441
|
+
return Promise.reject("".concat(goodsName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
|
|
22442
|
+
}
|
|
22443
|
+
},
|
|
22405
22444
|
render: function render(val, record, index) {
|
|
22406
22445
|
return !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
|
|
22407
22446
|
style: {
|
|
@@ -22411,16 +22450,39 @@ var getColumns$5 = function getColumns() {
|
|
|
22411
22450
|
min: 1,
|
|
22412
22451
|
precision: 0,
|
|
22413
22452
|
onChange: function onChange(num) {
|
|
22414
|
-
|
|
22453
|
+
updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'qty');
|
|
22454
|
+
if ((num || num === 0) && (record.salePrice || record.salePrice === 0)) updateHandle(num * (record.salePrice || 0), index, 'saleAmount');
|
|
22415
22455
|
}
|
|
22416
22456
|
}) : /*#__PURE__*/React.createElement("span", null, val);
|
|
22417
22457
|
}
|
|
22418
22458
|
}, {
|
|
22419
22459
|
dataIndex: 'saleAmount',
|
|
22420
22460
|
title: '总金额',
|
|
22421
|
-
|
|
22422
|
-
var
|
|
22423
|
-
|
|
22461
|
+
validator: function validator(_rule, value) {
|
|
22462
|
+
var goodsName = '';
|
|
22463
|
+
if (((value === null || value === void 0 ? void 0 : value.jstExchangeGoods) || []).some(function (goods) {
|
|
22464
|
+
var v = toNum$3(goods === null || goods === void 0 ? void 0 : goods.saleAmount);
|
|
22465
|
+
var res = typeof v === 'number' ? v < 0 : true;
|
|
22466
|
+
if (res) {
|
|
22467
|
+
goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
|
|
22468
|
+
}
|
|
22469
|
+
return res;
|
|
22470
|
+
})) {
|
|
22471
|
+
return Promise.reject("".concat(goodsName, "\u603B\u91D1\u989D\u4E3A\u5927\u4E8E\u7B49\u4E8E0\u7684\u6570"));
|
|
22472
|
+
}
|
|
22473
|
+
},
|
|
22474
|
+
render: function render(val, record, index) {
|
|
22475
|
+
return !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
|
|
22476
|
+
style: {
|
|
22477
|
+
width: 130
|
|
22478
|
+
},
|
|
22479
|
+
value: val,
|
|
22480
|
+
min: 0,
|
|
22481
|
+
precision: 2,
|
|
22482
|
+
onChange: function onChange(num) {
|
|
22483
|
+
updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'saleAmount');
|
|
22484
|
+
}
|
|
22485
|
+
}) : /*#__PURE__*/React.createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
|
|
22424
22486
|
}
|
|
22425
22487
|
}, {
|
|
22426
22488
|
dataIndex: 'isGift',
|
|
@@ -22835,7 +22897,6 @@ var getColumns$6 = function getColumns() {
|
|
|
22835
22897
|
title: "\u5B9E\u9645\u8865\u53D1\u6570\u91CF",
|
|
22836
22898
|
width: 100,
|
|
22837
22899
|
validator: function validator(_rule, value, extraParams) {
|
|
22838
|
-
console.log('实际补发数量-extraParams', extraParams);
|
|
22839
22900
|
if (!(extraParams === null || extraParams === void 0 ? void 0 : extraParams.quantityVerify)) return undefined;
|
|
22840
22901
|
var title = '';
|
|
22841
22902
|
if (((value === null || value === void 0 ? void 0 : value.kmReissueGoods) || []).some(function (goods) {
|
|
@@ -25031,6 +25092,8 @@ var systemOrderNoMap = {
|
|
|
25031
25092
|
KM_RETURN_GOODS: 'sid',
|
|
25032
25093
|
KM_EXCHANGE_GOODS: 'sid',
|
|
25033
25094
|
JST_REISSUE_GOODS: 'oId',
|
|
25095
|
+
JST_RETURN_GOODS: 'oId',
|
|
25096
|
+
JST_EXCHANGE_GOODS: 'oId',
|
|
25034
25097
|
GY_REISSUE_GOODS: 'code',
|
|
25035
25098
|
BS_E3_REISSUE_GOODS: 'orderSn',
|
|
25036
25099
|
WDT_REISSUE_GOODS: 'tradeNo'
|
|
@@ -25108,7 +25171,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
|
|
|
25108
25171
|
while (1) switch (_context2.prev = _context2.next) {
|
|
25109
25172
|
case 0:
|
|
25110
25173
|
if (!validSystemOrderFn) {
|
|
25111
|
-
_context2.next =
|
|
25174
|
+
_context2.next = 6;
|
|
25112
25175
|
break;
|
|
25113
25176
|
}
|
|
25114
25177
|
_context2.next = 3;
|
|
@@ -25116,39 +25179,38 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
|
|
|
25116
25179
|
case 3:
|
|
25117
25180
|
flag = _context2.sent;
|
|
25118
25181
|
if (!(flag === false)) {
|
|
25119
|
-
_context2.next =
|
|
25182
|
+
_context2.next = 6;
|
|
25120
25183
|
break;
|
|
25121
25184
|
}
|
|
25122
|
-
console.log('validSystemOrderFn校验不通过');
|
|
25123
25185
|
return _context2.abrupt("return");
|
|
25124
|
-
case
|
|
25186
|
+
case 6:
|
|
25125
25187
|
if (!validSystemOrder) {
|
|
25126
|
-
_context2.next =
|
|
25188
|
+
_context2.next = 9;
|
|
25127
25189
|
break;
|
|
25128
25190
|
}
|
|
25129
25191
|
message.warning('请选择补发系统单');
|
|
25130
25192
|
return _context2.abrupt("return");
|
|
25131
|
-
case
|
|
25193
|
+
case 9:
|
|
25132
25194
|
if (!(getDataSourceAsync && (!(dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) || isReloadSelectTable))) {
|
|
25133
|
-
_context2.next =
|
|
25195
|
+
_context2.next = 12;
|
|
25134
25196
|
break;
|
|
25135
25197
|
}
|
|
25136
|
-
_context2.next =
|
|
25198
|
+
_context2.next = 12;
|
|
25137
25199
|
return getDataSourceAsync();
|
|
25138
|
-
case
|
|
25200
|
+
case 12:
|
|
25139
25201
|
if (!['KM_GOODS', 'KM_REISSUE_GOODS', 'KM_RETURN_GOODS'].includes(type)) {
|
|
25140
|
-
_context2.next =
|
|
25202
|
+
_context2.next = 15;
|
|
25141
25203
|
break;
|
|
25142
25204
|
}
|
|
25143
|
-
_context2.next =
|
|
25205
|
+
_context2.next = 15;
|
|
25144
25206
|
return getKmSupplier(dataSource);
|
|
25145
|
-
case
|
|
25207
|
+
case 15:
|
|
25146
25208
|
setTradeGoodsVisible(true);
|
|
25147
25209
|
// 补发直接传入的是systemNo
|
|
25148
25210
|
if (isShowSelect && isReissueType) {
|
|
25149
25211
|
setSelectSystemNo(selectedSystemOrders || []);
|
|
25150
25212
|
}
|
|
25151
|
-
case
|
|
25213
|
+
case 17:
|
|
25152
25214
|
case "end":
|
|
25153
25215
|
return _context2.stop();
|
|
25154
25216
|
}
|
|
@@ -25343,13 +25405,13 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
25343
25405
|
var canDelete = ['JST_AFTERSALE_GOODS'].includes(type);
|
|
25344
25406
|
var uniqueKey = (tradeGoods === null || tradeGoods === void 0 ? void 0 : tradeGoods.uniqueKey) || 'uuid';
|
|
25345
25407
|
// 监听聚水潭退货商品
|
|
25346
|
-
|
|
25347
|
-
|
|
25408
|
+
// const jstReturnGoods = Form?.useWatch('3979edfd6d', form);
|
|
25409
|
+
// const isShowSelectTradeGoods =
|
|
25410
|
+
// type !== 'JST_EXCHANGE_GOODS' || jstReturnGoods?.jstSystemOrderNo;
|
|
25348
25411
|
// 判断是否为是否展示系统单筛选项
|
|
25349
|
-
var isShowSelect = type && ['WDT_GOODS', 'BS_E3_GOODS', 'GY_GOODS', 'JST_GOODS', 'WLN_GOODS', 'KM_GOODS', 'JY_GOODS', 'JY_REISSUE_GOODS', 'JKY_GOODS', 'JKY_REISSUE_GOODS', 'WLN_REISSUE_GOODS', 'GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'KM_RETURN_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS'].includes(type) || false;
|
|
25412
|
+
var isShowSelect = type && ['WDT_GOODS', 'BS_E3_GOODS', 'GY_GOODS', 'JST_GOODS', 'WLN_GOODS', 'KM_GOODS', 'JY_GOODS', 'JY_REISSUE_GOODS', 'JKY_GOODS', 'JKY_REISSUE_GOODS', 'WLN_REISSUE_GOODS', 'GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'KM_RETURN_GOODS', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS'].includes(type) || false;
|
|
25350
25413
|
var isReissueType = type && ['GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS', 'JY_REISSUE_GOODS', 'JKY_REISSUE_GOODS', 'WLN_REISSUE_GOODS'].includes(type) || false;
|
|
25351
25414
|
var refModal = useRef();
|
|
25352
|
-
console.debug('表格数据', value);
|
|
25353
25415
|
var handleDelete = function handleDelete(record, index) {
|
|
25354
25416
|
onDelete === null || onDelete === void 0 ? void 0 : onDelete(value[index]);
|
|
25355
25417
|
var newList = _toConsumableArray(value).filter(function (item, i) {
|
|
@@ -25640,7 +25702,7 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
25640
25702
|
}, showModeBtn && /*#__PURE__*/React.createElement(Checkbox, {
|
|
25641
25703
|
checked: isStrict,
|
|
25642
25704
|
onChange: handleCheckboxChange
|
|
25643
|
-
}, "\u5408\u5E76\u5355\uFF0C\u52FE\u9009\u540E\u53EA\u5C55\u793A\u5F53\u524D\u5E73\u53F0\u8BA2\u5355\u5546\u54C1"), !isEmpty(tradeGoods) &&
|
|
25705
|
+
}, "\u5408\u5E76\u5355\uFF0C\u52FE\u9009\u540E\u53EA\u5C55\u793A\u5F53\u524D\u5E73\u53F0\u8BA2\u5355\u5546\u54C1"), !isEmpty(tradeGoods) && /*#__PURE__*/React.createElement(SelectTradeGoods, {
|
|
25644
25706
|
isReloadSelectTable: isReloadSelectTable,
|
|
25645
25707
|
validSystemOrderFn: validSystemOrderFn,
|
|
25646
25708
|
validSystemOrder: validSystemOrder,
|
|
@@ -26130,7 +26192,6 @@ var BsReissue = function BsReissue(props) {
|
|
|
26130
26192
|
var _typeMap$type2;
|
|
26131
26193
|
pubsub.subscribe("".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type2 = typeMap[type]) === null || _typeMap$type2 === void 0 ? void 0 : _typeMap$type2.reissueSelectList), function (_, data) {
|
|
26132
26194
|
var _typeMap$type3;
|
|
26133
|
-
console.log('reissueSelectList', data);
|
|
26134
26195
|
if (disabled) return;
|
|
26135
26196
|
var newValue = _objectSpread2(_objectSpread2({}, data.goodValue), {}, {
|
|
26136
26197
|
shopCode: data === null || data === void 0 ? void 0 : data.shopCode
|
|
@@ -27936,7 +27997,6 @@ var OrderSubForm = function OrderSubForm(props) {
|
|
|
27936
27997
|
manual = props.manual,
|
|
27937
27998
|
correlationList = props.subConfig.correlationList,
|
|
27938
27999
|
effects = props.effects;
|
|
27939
|
-
console.log('effects', effects);
|
|
27940
28000
|
var valueRef = useRef(value);
|
|
27941
28001
|
useEffect(function () {
|
|
27942
28002
|
valueRef.current = value;
|
|
@@ -28133,7 +28193,7 @@ var OrderSubForm = function OrderSubForm(props) {
|
|
|
28133
28193
|
onChange(_objectSpread2(_objectSpread2({}, value), {}, {
|
|
28134
28194
|
allOrders: allOrders
|
|
28135
28195
|
}));
|
|
28136
|
-
}).catch(
|
|
28196
|
+
}).catch(function () {}) : Promise.resolve();
|
|
28137
28197
|
};
|
|
28138
28198
|
var getAllTradeGoodsDetails = function getAllTradeGoodsDetails() {
|
|
28139
28199
|
var goodDetails = (value === null || value === void 0 ? void 0 : value.allOrders) || [];
|
|
@@ -29191,10 +29251,11 @@ var componentMap$4 = {
|
|
|
29191
29251
|
systemOrderNo: 'jstSystemOrderNo',
|
|
29192
29252
|
oIdKey: 'oId',
|
|
29193
29253
|
goodDetailsKey: 'items',
|
|
29194
|
-
skuIdKey: 'skuId',
|
|
29195
29254
|
outerOiIdKey: '',
|
|
29196
29255
|
name: '聚水潭',
|
|
29197
29256
|
updateGoodsHandle: updateJstGoodsHandle,
|
|
29257
|
+
isShowSelectTradeGoods: true,
|
|
29258
|
+
mergeIdenticalGoods: jstMergeIdenticalGoods,
|
|
29198
29259
|
eventNameMap: {
|
|
29199
29260
|
// pubsub 事件
|
|
29200
29261
|
exchangeCopyGood: 'jstExchangeCopyGood',
|
|
@@ -29212,7 +29273,7 @@ var componentMap$4 = {
|
|
|
29212
29273
|
systemOrderNo: 'kmSystemOrderNo',
|
|
29213
29274
|
oIdKey: 'billNo',
|
|
29214
29275
|
goodDetailsKey: 'subOrders',
|
|
29215
|
-
|
|
29276
|
+
uniqueKey: 'skuId',
|
|
29216
29277
|
outerOiIdKey: '',
|
|
29217
29278
|
name: '快麦',
|
|
29218
29279
|
updateGoodsHandle: updateKmGoodsHandle,
|
|
@@ -29260,7 +29321,7 @@ var CommonExchangeGoods = function CommonExchangeGoods(props) {
|
|
|
29260
29321
|
disabled = props.disabled,
|
|
29261
29322
|
compType = props.type,
|
|
29262
29323
|
form = props.form;
|
|
29263
|
-
var uniqueKey = (componentMap$4 === null || componentMap$4 === void 0 ? void 0 : (_componentMap$compTyp = componentMap$4[compType]) === null || _componentMap$compTyp === void 0 ? void 0 : _componentMap$compTyp.
|
|
29324
|
+
var uniqueKey = (componentMap$4 === null || componentMap$4 === void 0 ? void 0 : (_componentMap$compTyp = componentMap$4[compType]) === null || _componentMap$compTyp === void 0 ? void 0 : _componentMap$compTyp.uniqueKey) || 'uuid';
|
|
29264
29325
|
var valueRef = useRef({});
|
|
29265
29326
|
// PS: 目前选择订单商品,只有聚水潭换出商品,而且聚水潭不用考虑合并单,所以这个值一直是 false
|
|
29266
29327
|
var _useState = useState(false),
|
|
@@ -29271,6 +29332,10 @@ var CommonExchangeGoods = function CommonExchangeGoods(props) {
|
|
|
29271
29332
|
_useState4 = _slicedToArray(_useState3, 2),
|
|
29272
29333
|
originDataSource = _useState4[0],
|
|
29273
29334
|
setOriginDataSource = _useState4[1];
|
|
29335
|
+
var _useState5 = useState([]),
|
|
29336
|
+
_useState6 = _slicedToArray(_useState5, 2),
|
|
29337
|
+
orders = _useState6[0],
|
|
29338
|
+
setOrders = _useState6[1];
|
|
29274
29339
|
useEffect(function () {
|
|
29275
29340
|
var subscription = componentMap$4[compType].eventNameMap.exchangeBackCopyGood && pubsub.subscribe(componentMap$4[compType].eventNameMap.exchangeBackCopyGood, function (_, data) {
|
|
29276
29341
|
if (disabled) return;
|
|
@@ -29330,11 +29395,13 @@ var CommonExchangeGoods = function CommonExchangeGoods(props) {
|
|
|
29330
29395
|
newValue[componentMap$4 === null || componentMap$4 === void 0 ? void 0 : (_componentMap$compTyp3 = componentMap$4[compType]) === null || _componentMap$compTyp3 === void 0 ? void 0 : _componentMap$compTyp3.valueKey] = (_uniqBy = uniqBy(originTradeGoodList.concat(currentSelectGoodList), uniqueKey)) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
|
|
29331
29396
|
return skuList.includes(item[uniqueKey]);
|
|
29332
29397
|
});
|
|
29333
|
-
onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
|
|
29398
|
+
onChange === null || onChange === void 0 ? void 0 : onChange(JSON.parse(JSON.stringify(newValue)));
|
|
29334
29399
|
}, [value === null || value === void 0 ? void 0 : value[componentMap$4 === null || componentMap$4 === void 0 ? void 0 : (_componentMap$compTyp4 = componentMap$4[compType]) === null || _componentMap$compTyp4 === void 0 ? void 0 : _componentMap$compTyp4.valueKey], isStrict, originDataSource]);
|
|
29335
29400
|
var getGoodDetails = function getGoodDetails(_ref) {
|
|
29336
|
-
var _componentMap$compTyp5, _componentMap$compTyp6,
|
|
29337
|
-
var
|
|
29401
|
+
var _componentMap$compTyp5, _componentMap$compTyp6, _componentMap$compTyp7, _componentMap$compTyp8;
|
|
29402
|
+
var _ref$isAllOrders = _ref.isAllOrders,
|
|
29403
|
+
isAllOrders = _ref$isAllOrders === void 0 ? false : _ref$isAllOrders,
|
|
29404
|
+
returnGoodsValue = _ref.returnGoodsValue,
|
|
29338
29405
|
mode = _ref.mode,
|
|
29339
29406
|
sysOrderNo = _ref.sysOrderNo;
|
|
29340
29407
|
var systemOrder = returnGoodsValue === null || returnGoodsValue === void 0 ? void 0 : returnGoodsValue[(_componentMap$compTyp5 = componentMap$4[compType]) === null || _componentMap$compTyp5 === void 0 ? void 0 : _componentMap$compTyp5.systemOrder];
|
|
@@ -29342,9 +29409,17 @@ var CommonExchangeGoods = function CommonExchangeGoods(props) {
|
|
|
29342
29409
|
var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
|
|
29343
29410
|
return order[componentMap$4[compType].oIdKey] === systemOrderNo;
|
|
29344
29411
|
});
|
|
29345
|
-
var
|
|
29412
|
+
var orders = isAllOrders ? (systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || [] : order ? [order] : [];
|
|
29413
|
+
setOrders(orders);
|
|
29414
|
+
var hasGoodDetails = orders === null || orders === void 0 ? void 0 : orders.some(function (order) {
|
|
29415
|
+
var _order$componentMap$c;
|
|
29416
|
+
return order === null || order === void 0 ? void 0 : (_order$componentMap$c = order[componentMap$4[compType].goodDetailsKey]) === null || _order$componentMap$c === void 0 ? void 0 : _order$componentMap$c.length;
|
|
29417
|
+
});
|
|
29418
|
+
var goodDetails = hasGoodDetails ? componentMap$4[compType].mergeIdenticalGoods ? componentMap$4[compType].mergeIdenticalGoods((_componentMap$compTyp7 = componentMap$4[compType]) === null || _componentMap$compTyp7 === void 0 ? void 0 : _componentMap$compTyp7.updateGoodsHandle(orders, {
|
|
29346
29419
|
canEdit: true
|
|
29347
|
-
}) : [])
|
|
29420
|
+
})) : (_componentMap$compTyp8 = componentMap$4[compType]) === null || _componentMap$compTyp8 === void 0 ? void 0 : _componentMap$compTyp8.updateGoodsHandle(orders, {
|
|
29421
|
+
canEdit: true
|
|
29422
|
+
}) : [];
|
|
29348
29423
|
var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
|
|
29349
29424
|
return mode ? goodDetails.filter(function (goodItem) {
|
|
29350
29425
|
return !orderNo || goodItem[componentMap$4[compType].outerOiIdKey] === orderNo;
|
|
@@ -29353,25 +29428,23 @@ var CommonExchangeGoods = function CommonExchangeGoods(props) {
|
|
|
29353
29428
|
var getDataSourceAsync = function getDataSourceAsync() {
|
|
29354
29429
|
return new Promise(function (resolve) {
|
|
29355
29430
|
pubsub.subscribeOnce(componentMap$4[compType].eventNameMap.returnGoodsSysorderBack, function (_, data) {
|
|
29431
|
+
var _componentMap$compTyp9;
|
|
29356
29432
|
resolve(data);
|
|
29357
|
-
console.log('getDataSourceAsync---111data--', data, getGoodDetails({
|
|
29358
|
-
returnGoodsValue: data,
|
|
29359
|
-
mode: isStrict
|
|
29360
|
-
}));
|
|
29361
29433
|
setOriginDataSource(getGoodDetails({
|
|
29362
29434
|
returnGoodsValue: data,
|
|
29435
|
+
isAllOrders: componentMap$4 === null || componentMap$4 === void 0 ? void 0 : (_componentMap$compTyp9 = componentMap$4[compType]) === null || _componentMap$compTyp9 === void 0 ? void 0 : _componentMap$compTyp9.isShowSelectTradeGoods,
|
|
29363
29436
|
mode: isStrict
|
|
29364
29437
|
}));
|
|
29365
29438
|
});
|
|
29366
29439
|
pubsub.publish(componentMap$4[compType].eventNameMap.returnGoodsSysorder, compType);
|
|
29367
29440
|
});
|
|
29368
29441
|
};
|
|
29369
|
-
console.log('aaa--', originDataSource);
|
|
29370
29442
|
return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(GoodItem$1, _objectSpread2(_objectSpread2({
|
|
29371
29443
|
key: componentMap$4[compType].type
|
|
29372
29444
|
}, props), {}, {
|
|
29373
29445
|
validSystemOrderFn: function validSystemOrderFn() {
|
|
29374
|
-
|
|
29446
|
+
var _componentMap$compTyp10, _componentMap$compTyp11;
|
|
29447
|
+
return (_componentMap$compTyp10 = (_componentMap$compTyp11 = componentMap$4[compType]).validSystemOrderFn) === null || _componentMap$compTyp10 === void 0 ? void 0 : _componentMap$compTyp10.call(_componentMap$compTyp11, form);
|
|
29375
29448
|
},
|
|
29376
29449
|
isReloadSelectTable: componentMap$4[compType].isReloadSelectTable,
|
|
29377
29450
|
disabled: disabled,
|
|
@@ -29380,6 +29453,7 @@ var CommonExchangeGoods = function CommonExchangeGoods(props) {
|
|
|
29380
29453
|
shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
|
|
29381
29454
|
value: value === null || value === void 0 ? void 0 : value[componentMap$4[compType].valueKey],
|
|
29382
29455
|
otherOperations: copyGoods(),
|
|
29456
|
+
systemOrders: orders,
|
|
29383
29457
|
tradeGoods: componentMap$4[compType].showChooseTradeGoodsBtn ? {
|
|
29384
29458
|
uniqueKey: uniqueKey,
|
|
29385
29459
|
originDataSource: originDataSource,
|
|
@@ -29674,7 +29748,7 @@ var typeMap$2 = {
|
|
|
29674
29748
|
typeName: 'jstReturnType',
|
|
29675
29749
|
systemOrder: 'jstSystemOrder',
|
|
29676
29750
|
systemOrderNo: 'jstSystemOrderNo',
|
|
29677
|
-
systemOrderBillType: 'jstSystemOrderBillType',
|
|
29751
|
+
// systemOrderBillType: 'jstSystemOrderBillType',
|
|
29678
29752
|
getOrderList: jstUtils.getJstOrderListSingleton,
|
|
29679
29753
|
updateGoodsHandle: updateJstGoodsHandle,
|
|
29680
29754
|
alwaysShowChooseErpGoodsBtn: true,
|
|
@@ -29684,6 +29758,8 @@ var typeMap$2 = {
|
|
|
29684
29758
|
goodDetailsKey: 'items',
|
|
29685
29759
|
mergeIdenticalGoods: jstMergeIdenticalGoods,
|
|
29686
29760
|
uniqueKey: 'uuid',
|
|
29761
|
+
hideSelectSysOrderId: true,
|
|
29762
|
+
isShowSelectTradeGoods: true,
|
|
29687
29763
|
eventNameMap: {
|
|
29688
29764
|
// pubsub 事件
|
|
29689
29765
|
exchangeCopyGood: 'jstExchangeCopyGood',
|
|
@@ -29787,7 +29863,7 @@ var typeMap$2 = {
|
|
|
29787
29863
|
}
|
|
29788
29864
|
};
|
|
29789
29865
|
var PublicReissue = function PublicReissue(props) {
|
|
29790
|
-
var _typeMap$type, _typeMap$type2, _typeMap$
|
|
29866
|
+
var _typeMap$type, _typeMap$type2, _typeMap$type21, _typeMap$type39, _typeMap$type45, _typeMap$type46, _typeMap$type47, _typeMap$type48, _typeMap$type49, _value$typeMap$type$s8, _typeMap$type50, _typeMap$type51, _typeMap$type52, _typeMap$type53, _typeMap$type54, _typeMap$type55, _typeMap$type56, _typeMap$type57, _value$typeMap$type$s9, _typeMap$type58, _typeMap$type59, _typeMap$type60, _typeMap$type61;
|
|
29791
29867
|
var value = props.value,
|
|
29792
29868
|
onChange = props.onChange,
|
|
29793
29869
|
_props$reasonList = props.reasonList,
|
|
@@ -29887,23 +29963,25 @@ var PublicReissue = function PublicReissue(props) {
|
|
|
29887
29963
|
var newValue = _objectSpread2({}, value);
|
|
29888
29964
|
newValue[(_typeMap$type15 = typeMap$2[type]) === null || _typeMap$type15 === void 0 ? void 0 : _typeMap$type15.typeName] = val;
|
|
29889
29965
|
if (typeName === '1') {
|
|
29890
|
-
var _typeMap$type16;
|
|
29966
|
+
var _typeMap$type16, _typeMap$type17;
|
|
29891
29967
|
newValue[(_typeMap$type16 = typeMap$2[type]) === null || _typeMap$type16 === void 0 ? void 0 : _typeMap$type16.key] = getGoodDetails({
|
|
29892
|
-
mode: isStrict
|
|
29968
|
+
mode: isStrict,
|
|
29969
|
+
// 如果没有选择系统单,拿平台单下所有商品
|
|
29970
|
+
isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type17 = typeMap$2[type]) === null || _typeMap$type17 === void 0 ? void 0 : _typeMap$type17.hideSelectSysOrderId
|
|
29893
29971
|
});
|
|
29894
29972
|
} else if (typeName === '2') {
|
|
29895
|
-
var _typeMap$
|
|
29973
|
+
var _typeMap$type18;
|
|
29896
29974
|
// 切换到非原单,清空列表
|
|
29897
|
-
newValue[(_typeMap$
|
|
29975
|
+
newValue[(_typeMap$type18 = typeMap$2[type]) === null || _typeMap$type18 === void 0 ? void 0 : _typeMap$type18.key] = [];
|
|
29898
29976
|
}
|
|
29899
29977
|
onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
|
|
29900
29978
|
};
|
|
29901
29979
|
var handleModeChange = function handleModeChange(mode) {
|
|
29902
|
-
var _value$typeMap$type$t, _typeMap$
|
|
29903
|
-
var isOriginalOrder = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$t = value[(_typeMap$
|
|
29980
|
+
var _value$typeMap$type$t, _typeMap$type19, _typeMap$type20;
|
|
29981
|
+
var isOriginalOrder = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$t = value[(_typeMap$type19 = typeMap$2[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.typeName]) === null || _value$typeMap$type$t === void 0 ? void 0 : _value$typeMap$type$t[0]) === '1';
|
|
29904
29982
|
setIsStrict(mode);
|
|
29905
29983
|
if (!isOriginalOrder) return;
|
|
29906
|
-
onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, (_typeMap$
|
|
29984
|
+
onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, (_typeMap$type20 = typeMap$2[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.key, getGoodDetails({
|
|
29907
29985
|
mode: mode
|
|
29908
29986
|
}))));
|
|
29909
29987
|
};
|
|
@@ -29920,7 +29998,7 @@ var PublicReissue = function PublicReissue(props) {
|
|
|
29920
29998
|
});
|
|
29921
29999
|
}
|
|
29922
30000
|
return map;
|
|
29923
|
-
}, [value === null || value === void 0 ? void 0 : value[(_typeMap$
|
|
30001
|
+
}, [value === null || value === void 0 ? void 0 : value[(_typeMap$type21 = typeMap$2[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.key]]);
|
|
29924
30002
|
// 用于跟踪已经处理过的 sysItemId,避免重复处理
|
|
29925
30003
|
var processedSysItemIdsRef = useRef(new Set());
|
|
29926
30004
|
useEffect(function () {
|
|
@@ -29992,13 +30070,13 @@ var PublicReissue = function PublicReissue(props) {
|
|
|
29992
30070
|
}
|
|
29993
30071
|
}, [sysItemIdMap]);
|
|
29994
30072
|
var getGoodDetails = function getGoodDetails(_ref5) {
|
|
29995
|
-
var _typeMap$
|
|
30073
|
+
var _typeMap$type22, _typeMap$type23, _value$typeMap$type$s6, _typeMap$type24, _typeMap$type25, _typeMap$type26, _typeMap$type27;
|
|
29996
30074
|
var mode = _ref5.mode,
|
|
29997
30075
|
sysOrderNo = _ref5.sysOrderNo,
|
|
29998
30076
|
_ref5$isAllOrders = _ref5.isAllOrders,
|
|
29999
30077
|
isAllOrders = _ref5$isAllOrders === void 0 ? false : _ref5$isAllOrders;
|
|
30000
|
-
var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$
|
|
30001
|
-
var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$
|
|
30078
|
+
var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type22 = typeMap$2[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.systemOrder];
|
|
30079
|
+
var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type23 = typeMap$2[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.systemOrderNo];
|
|
30002
30080
|
var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
|
|
30003
30081
|
return order[typeMap$2[type].oIdKey] === systemOrderNo;
|
|
30004
30082
|
});
|
|
@@ -30018,6 +30096,7 @@ var PublicReissue = function PublicReissue(props) {
|
|
|
30018
30096
|
};
|
|
30019
30097
|
} else if (['JKY_REISSUE_GOODS'].includes(type)) {
|
|
30020
30098
|
orderRest = {
|
|
30099
|
+
orderBackGoodsLevel: props.orderBackGoodsLevel,
|
|
30021
30100
|
canEdit: true
|
|
30022
30101
|
};
|
|
30023
30102
|
} else if (['WLN_REISSUE_GOODS'].includes(type)) {
|
|
@@ -30025,12 +30104,12 @@ var PublicReissue = function PublicReissue(props) {
|
|
|
30025
30104
|
canEdit: true
|
|
30026
30105
|
};
|
|
30027
30106
|
}
|
|
30028
|
-
var orders = isAllOrders ? (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s6 = value[(_typeMap$
|
|
30107
|
+
var orders = isAllOrders ? (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s6 = value[(_typeMap$type24 = typeMap$2[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.systemOrder]) === null || _value$typeMap$type$s6 === void 0 ? void 0 : _value$typeMap$type$s6.orders) || [] : order ? [order] : [];
|
|
30029
30108
|
var hasGoodDetails = orders === null || orders === void 0 ? void 0 : orders.some(function (order) {
|
|
30030
30109
|
var _order$typeMap$type$g;
|
|
30031
30110
|
return order === null || order === void 0 ? void 0 : (_order$typeMap$type$g = order[typeMap$2[type].goodDetailsKey]) === null || _order$typeMap$type$g === void 0 ? void 0 : _order$typeMap$type$g.length;
|
|
30032
30111
|
});
|
|
30033
|
-
var goodDetails = hasGoodDetails ? (!isAllOrders || ((_typeMap$
|
|
30112
|
+
var goodDetails = hasGoodDetails ? (!isAllOrders || ((_typeMap$type25 = typeMap$2[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.isSelectTradeGoodsMerge)) && typeMap$2[type].mergeIdenticalGoods ? typeMap$2[type].mergeIdenticalGoods((_typeMap$type26 = typeMap$2[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.updateGoodsHandle(orders, orderRest, type)) : (_typeMap$type27 = typeMap$2[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.updateGoodsHandle(orders, orderRest, type) : [];
|
|
30034
30113
|
var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
|
|
30035
30114
|
var list = mode && !isAllOrders ? goodDetails.filter(function (goodItem) {
|
|
30036
30115
|
return !orderNo || goodItem[typeMap$2[type].outerOiIdKey] === orderNo;
|
|
@@ -30038,30 +30117,30 @@ var PublicReissue = function PublicReissue(props) {
|
|
|
30038
30117
|
return list;
|
|
30039
30118
|
};
|
|
30040
30119
|
var changeGoodHandle = function changeGoodHandle(val) {
|
|
30041
|
-
var _typeMap$
|
|
30120
|
+
var _typeMap$type28;
|
|
30042
30121
|
var newValue = _objectSpread2({}, value);
|
|
30043
|
-
newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$
|
|
30122
|
+
newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type28 = typeMap$2[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.key)] = val || [];
|
|
30044
30123
|
onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
|
|
30045
30124
|
};
|
|
30046
30125
|
var changeSystemOrderHandle = function changeSystemOrderHandle(val) {
|
|
30047
|
-
var _typeMap$
|
|
30126
|
+
var _typeMap$type29, _typeMap$type30, _value$typeMap$type$t2, _typeMap$type35, _value$typeMap$type$t3, _typeMap$type37;
|
|
30048
30127
|
var newValue = _objectSpread2({}, value);
|
|
30049
|
-
newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$
|
|
30050
|
-
if (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$
|
|
30051
|
-
var _value$typeMap$type$s7, _typeMap$
|
|
30052
|
-
var orders = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s7 = value[(_typeMap$
|
|
30128
|
+
newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type29 = typeMap$2[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.systemOrderNo)] = val;
|
|
30129
|
+
if (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type30 = typeMap$2[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.systemOrderBillType) {
|
|
30130
|
+
var _value$typeMap$type$s7, _typeMap$type31, _typeMap$type33, _typeMap$type34;
|
|
30131
|
+
var orders = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s7 = value[(_typeMap$type31 = typeMap$2[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) || [];
|
|
30053
30132
|
var targetOrder = val && orders.find(function (oItem) {
|
|
30054
|
-
var _typeMap$
|
|
30055
|
-
return oItem[(_typeMap$
|
|
30133
|
+
var _typeMap$type32;
|
|
30134
|
+
return oItem[(_typeMap$type32 = typeMap$2[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.oIdKey] === val;
|
|
30056
30135
|
});
|
|
30057
|
-
newValue[(_typeMap$
|
|
30058
|
-
}
|
|
30059
|
-
if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$
|
|
30060
|
-
var _typeMap$
|
|
30061
|
-
newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$
|
|
30062
|
-
} else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$
|
|
30063
|
-
var _typeMap$
|
|
30064
|
-
newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$
|
|
30136
|
+
newValue[(_typeMap$type33 = typeMap$2[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.systemOrderBillType] = targetOrder === null || targetOrder === void 0 ? void 0 : targetOrder[(_typeMap$type34 = typeMap$2[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.orderTypeKey];
|
|
30137
|
+
}
|
|
30138
|
+
if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type35 = typeMap$2[type]) === null || _typeMap$type35 === void 0 ? void 0 : _typeMap$type35.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0])) {
|
|
30139
|
+
var _typeMap$type36;
|
|
30140
|
+
newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type36 = typeMap$2[type]) === null || _typeMap$type36 === void 0 ? void 0 : _typeMap$type36.key)] = [];
|
|
30141
|
+
} else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type37 = typeMap$2[type]) === null || _typeMap$type37 === void 0 ? void 0 : _typeMap$type37.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[0])) {
|
|
30142
|
+
var _typeMap$type38;
|
|
30143
|
+
newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type38 = typeMap$2[type]) === null || _typeMap$type38 === void 0 ? void 0 : _typeMap$type38.key)] = getGoodDetails({
|
|
30065
30144
|
mode: isStrict,
|
|
30066
30145
|
sysOrderNo: val
|
|
30067
30146
|
});
|
|
@@ -30069,28 +30148,28 @@ var PublicReissue = function PublicReissue(props) {
|
|
|
30069
30148
|
onChange === null || onChange === void 0 ? void 0 : onChange(newValue, 'systemOrder');
|
|
30070
30149
|
};
|
|
30071
30150
|
//显示选择商品按钮
|
|
30072
|
-
var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$
|
|
30151
|
+
var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type39 = typeMap$2[type]) === null || _typeMap$type39 === void 0 ? void 0 : _typeMap$type39.systemOrderNo]);
|
|
30073
30152
|
var selectedGoodsChange = useCallback(function (skuList) {
|
|
30074
|
-
var _typeMap$
|
|
30153
|
+
var _typeMap$type40, _typeMap$type41, _typeMap$type42, _uniqBy, _typeMap$type43;
|
|
30075
30154
|
var newValue = _objectSpread2({}, value);
|
|
30076
30155
|
// 原订单商品
|
|
30077
30156
|
var originTradeGoodList = getGoodDetails({
|
|
30078
30157
|
mode: isStrict,
|
|
30079
|
-
isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$
|
|
30158
|
+
isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type40 = typeMap$2[type]) === null || _typeMap$type40 === void 0 ? void 0 : _typeMap$type40.isShowSelectTradeGoods
|
|
30080
30159
|
}) || [];
|
|
30081
30160
|
// 当前选中的所有商品【包含了原订单+商品库】
|
|
30082
|
-
var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$
|
|
30083
|
-
newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$
|
|
30084
|
-
var _typeMap$
|
|
30085
|
-
return skuList.includes(item[(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$
|
|
30161
|
+
var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type41 = typeMap$2[type]) === null || _typeMap$type41 === void 0 ? void 0 : _typeMap$type41.key)]) || [];
|
|
30162
|
+
newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type42 = typeMap$2[type]) === null || _typeMap$type42 === void 0 ? void 0 : _typeMap$type42.key)] = (_uniqBy = uniqBy(originTradeGoodList.concat(currentSelectGoodList), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type43 = typeMap$2[type]) === null || _typeMap$type43 === void 0 ? void 0 : _typeMap$type43.uniqueKey) || 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
|
|
30163
|
+
var _typeMap$type44;
|
|
30164
|
+
return skuList.includes(item[(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type44 = typeMap$2[type]) === null || _typeMap$type44 === void 0 ? void 0 : _typeMap$type44.uniqueKey) || 'uuid']);
|
|
30086
30165
|
});
|
|
30087
30166
|
onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
|
|
30088
|
-
}, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$
|
|
30167
|
+
}, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type45 = typeMap$2[type]) === null || _typeMap$type45 === void 0 ? void 0 : _typeMap$type45.key)], value, isStrict]);
|
|
30089
30168
|
return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Row, {
|
|
30090
30169
|
gutter: 8,
|
|
30091
30170
|
wrap: true,
|
|
30092
|
-
id: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$
|
|
30093
|
-
}, /*#__PURE__*/React.createElement(Col, {
|
|
30171
|
+
id: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type46 = typeMap$2[type]) === null || _typeMap$type46 === void 0 ? void 0 : _typeMap$type46.key) || "".concat(Date.now())
|
|
30172
|
+
}, !(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type47 = typeMap$2[type]) === null || _typeMap$type47 === void 0 ? void 0 : _typeMap$type47.hideSelectSysOrderId) && /*#__PURE__*/React.createElement(Col, {
|
|
30094
30173
|
className: "gutter-row",
|
|
30095
30174
|
xs: {
|
|
30096
30175
|
span: 11
|
|
@@ -30105,12 +30184,12 @@ var PublicReissue = function PublicReissue(props) {
|
|
|
30105
30184
|
},
|
|
30106
30185
|
disabled: disabled,
|
|
30107
30186
|
allowClear: false,
|
|
30108
|
-
value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$
|
|
30187
|
+
value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type48 = typeMap$2[type]) === null || _typeMap$type48 === void 0 ? void 0 : _typeMap$type48.systemOrderNo)],
|
|
30109
30188
|
onChange: function onChange(val) {
|
|
30110
30189
|
return changeSystemOrderHandle(val);
|
|
30111
30190
|
},
|
|
30112
|
-
placeholder: "\u9009\u62E9".concat((typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$
|
|
30113
|
-
}, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s8 = value[(_typeMap$
|
|
30191
|
+
placeholder: "\u9009\u62E9".concat((typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type49 = typeMap$2[type]) === null || _typeMap$type49 === void 0 ? void 0 : _typeMap$type49.compType) || '', "\u7CFB\u7EDF\u5355")
|
|
30192
|
+
}, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s8 = value[(_typeMap$type50 = typeMap$2[type]) === null || _typeMap$type50 === void 0 ? void 0 : _typeMap$type50.systemOrder]) === null || _value$typeMap$type$s8 === void 0 ? void 0 : _value$typeMap$type$s8.showOrderInfo) || []).map(function (item) {
|
|
30114
30193
|
return /*#__PURE__*/React.createElement(Select.Option, {
|
|
30115
30194
|
key: item[typeMap$2[type].oIdKey],
|
|
30116
30195
|
value: item[typeMap$2[type].oIdKey],
|
|
@@ -30132,11 +30211,11 @@ var PublicReissue = function PublicReissue(props) {
|
|
|
30132
30211
|
disabled: isSettingConfig ? !isSettingConfig : disabled,
|
|
30133
30212
|
allowClear: false,
|
|
30134
30213
|
options: reasonList,
|
|
30135
|
-
value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$
|
|
30214
|
+
value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type51 = typeMap$2[type]) === null || _typeMap$type51 === void 0 ? void 0 : _typeMap$type51.typeName)],
|
|
30136
30215
|
onChange: function onChange(val) {
|
|
30137
30216
|
return changeTypeHandle(val);
|
|
30138
30217
|
}
|
|
30139
|
-
})), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$
|
|
30218
|
+
})), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type52 = typeMap$2[type]) === null || _typeMap$type52 === void 0 ? void 0 : _typeMap$type52.systemOrderBillType) && !isSettingConfig && /*#__PURE__*/React.createElement(Col, {
|
|
30140
30219
|
className: "gutter-row",
|
|
30141
30220
|
xs: {
|
|
30142
30221
|
span: 11
|
|
@@ -30145,7 +30224,7 @@ var PublicReissue = function PublicReissue(props) {
|
|
|
30145
30224
|
span: 6
|
|
30146
30225
|
}
|
|
30147
30226
|
}, /*#__PURE__*/React.createElement(Input, {
|
|
30148
|
-
value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$
|
|
30227
|
+
value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type53 = typeMap$2[type]) === null || _typeMap$type53 === void 0 ? void 0 : _typeMap$type53.systemOrderBillType)],
|
|
30149
30228
|
disabled: disabled,
|
|
30150
30229
|
readOnly: true
|
|
30151
30230
|
}))), /*#__PURE__*/React.createElement(GoodItem$1, _objectSpread2(_objectSpread2({
|
|
@@ -30156,25 +30235,25 @@ var PublicReissue = function PublicReissue(props) {
|
|
|
30156
30235
|
canUpdateNumber: showChangeBtn,
|
|
30157
30236
|
hasSelectedSystemOrder: showChangeBtn,
|
|
30158
30237
|
// showChangeBtn={showChangeBtn || typeMap?.[type]?.isShowSelectTradeGoods}
|
|
30159
|
-
alwaysShowChooseErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$
|
|
30160
|
-
showErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$
|
|
30238
|
+
alwaysShowChooseErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type54 = typeMap$2[type]) === null || _typeMap$type54 === void 0 ? void 0 : _typeMap$type54.alwaysShowChooseErpGoodsBtn,
|
|
30239
|
+
showErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type55 = typeMap$2[type]) === null || _typeMap$type55 === void 0 ? void 0 : _typeMap$type55.showErpGoodsBtn,
|
|
30161
30240
|
shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
|
|
30162
|
-
value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$
|
|
30241
|
+
value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type56 = typeMap$2[type]) === null || _typeMap$type56 === void 0 ? void 0 : _typeMap$type56.key)],
|
|
30163
30242
|
onChange: function onChange(val) {
|
|
30164
30243
|
return changeGoodHandle(val);
|
|
30165
30244
|
},
|
|
30166
30245
|
onModeChange: handleModeChange,
|
|
30167
30246
|
showModeBtn: showModeBtn,
|
|
30168
30247
|
isStrict: isStrict,
|
|
30169
|
-
isShowSelectTradeGoods: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$
|
|
30170
|
-
systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$
|
|
30171
|
-
selectedSystemOrders: showChangeBtn ? [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$
|
|
30248
|
+
isShowSelectTradeGoods: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type57 = typeMap$2[type]) === null || _typeMap$type57 === void 0 ? void 0 : _typeMap$type57.isShowSelectTradeGoods,
|
|
30249
|
+
systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$type58 = typeMap$2[type]) === null || _typeMap$type58 === void 0 ? void 0 : _typeMap$type58.systemOrder]) === null || _value$typeMap$type$s9 === void 0 ? void 0 : _value$typeMap$type$s9.orders,
|
|
30250
|
+
selectedSystemOrders: showChangeBtn ? [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type59 = typeMap$2[type]) === null || _typeMap$type59 === void 0 ? void 0 : _typeMap$type59.systemOrderNo)]] : [],
|
|
30172
30251
|
tradeGoods: {
|
|
30173
30252
|
originDataSource: getGoodDetails({
|
|
30174
30253
|
mode: isStrict,
|
|
30175
|
-
isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$
|
|
30254
|
+
isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type60 = typeMap$2[type]) === null || _typeMap$type60 === void 0 ? void 0 : _typeMap$type60.isShowSelectTradeGoods
|
|
30176
30255
|
}),
|
|
30177
|
-
uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$
|
|
30256
|
+
uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type61 = typeMap$2[type]) === null || _typeMap$type61 === void 0 ? void 0 : _typeMap$type61.uniqueKey) || 'uuid',
|
|
30178
30257
|
selectedGoodsChange: selectedGoodsChange
|
|
30179
30258
|
}
|
|
30180
30259
|
})));
|
|
@@ -32216,20 +32295,13 @@ var IdInputSelect = function IdInputSelect(props) {
|
|
|
32216
32295
|
tradeId = form.getFieldValue('m3ap1EvEyd');
|
|
32217
32296
|
skxReturnExpressCode = (_form$getFieldValue = form.getFieldValue('4487c6516b')) === null || _form$getFieldValue === void 0 ? void 0 : (_form$getFieldValue$ = _form$getFieldValue[0]) === null || _form$getFieldValue$ === void 0 ? void 0 : _form$getFieldValue$.logisticsCode;
|
|
32218
32297
|
blurFrom = form.getFieldValue('skx_return_billNo_blur_from');
|
|
32219
|
-
console.log('asyncQueryData---', {
|
|
32220
|
-
skxReturnExpressCode: skxReturnExpressCode,
|
|
32221
|
-
blurFrom: blurFrom,
|
|
32222
|
-
tradeId: tradeId,
|
|
32223
|
-
tradeIdRef: tradeIdRef.current,
|
|
32224
|
-
form: form
|
|
32225
|
-
});
|
|
32226
32298
|
if (!(type === 'SKX_OUTBOUND_NOTICE_NO' && !tradeId || type === 'SKX_RETURN_BILL_NO' && !tradeId && !skxReturnExpressCode)) {
|
|
32227
|
-
_context3.next =
|
|
32299
|
+
_context3.next = 6;
|
|
32228
32300
|
break;
|
|
32229
32301
|
}
|
|
32230
32302
|
setDataSource([]);
|
|
32231
32303
|
return _context3.abrupt("return");
|
|
32232
|
-
case
|
|
32304
|
+
case 6:
|
|
32233
32305
|
setSpinning(true);
|
|
32234
32306
|
// 判断是从哪个组件失焦,若是从[SKX]退换物流信息(TH)失焦,则根据物流单号查询,若是从订单号组件失焦,则根据订单号查询
|
|
32235
32307
|
typeMap$6[type].asyncGetData(type === 'SKX_RETURN_BILL_NO' && blurFrom === '4487c6516b' ? {
|
|
@@ -32243,7 +32315,7 @@ var IdInputSelect = function IdInputSelect(props) {
|
|
|
32243
32315
|
}).finally(function () {
|
|
32244
32316
|
setSpinning(false);
|
|
32245
32317
|
});
|
|
32246
|
-
case
|
|
32318
|
+
case 8:
|
|
32247
32319
|
case "end":
|
|
32248
32320
|
return _context3.stop();
|
|
32249
32321
|
}
|
|
@@ -32335,11 +32407,6 @@ var IdInputSelect = function IdInputSelect(props) {
|
|
|
32335
32407
|
}))));
|
|
32336
32408
|
};
|
|
32337
32409
|
var handleChange = function handleChange(val, isInput) {
|
|
32338
|
-
console.log('handleChange---', {
|
|
32339
|
-
val: val,
|
|
32340
|
-
value: value,
|
|
32341
|
-
isInput: isInput
|
|
32342
|
-
});
|
|
32343
32410
|
var isReturnBillNoChange = type === 'SKX_RETURN_BILL_NO' && form.getFieldValue('skx_return_billNo_blur_from') === '4487c6516b';
|
|
32344
32411
|
onChange === null || onChange === void 0 ? void 0 : onChange(val, value !== val && (!!isInput || isReturnBillNoChange));
|
|
32345
32412
|
// 如果类型是[SKX]退换货单号,则根据blurFrom判断是从[SKX]退换物流信息(TH)失焦,则调用onBlur
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/basic-components",
|
|
3
|
-
"version": "2.10.
|
|
3
|
+
"version": "2.10.5",
|
|
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.10.
|
|
23
|
+
"@kmkf-fe-packages/kmkf-utils": "2.10.5",
|
|
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": "bb8d17f40a7854b3d3a494c4c90233386a81c15c"
|
|
70
70
|
}
|