@kmkf-fe-packages/basic-components 2.10.7 → 2.10.9-beta.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.esm.js
CHANGED
|
@@ -9,7 +9,6 @@ import maxBy from 'lodash/maxBy';
|
|
|
9
9
|
import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, uniqBy, cloneDeep, difference, differenceWith, isBoolean, isEqual, takeRight, reject as reject$1, intersection, isEmpty } from 'lodash';
|
|
10
10
|
import { useUpdateEffect, useDebounceEffect, useAntdTable } from 'ahooks';
|
|
11
11
|
import zhCN from 'antd/lib/locale/zh_CN';
|
|
12
|
-
import Monitor from 'kmkf-monitor';
|
|
13
12
|
import pubsub from 'pubsub-js';
|
|
14
13
|
import { internals, useTablePipeline, features, BaseTable } from 'ali-react-table';
|
|
15
14
|
import zh_CN from 'antd/lib/locale-provider/zh_CN';
|
|
@@ -7864,6 +7863,7 @@ var ParseLogistics = function ParseLogistics(props) {
|
|
|
7864
7863
|
onChange === null || onChange === void 0 ? void 0 : onChange(data);
|
|
7865
7864
|
}).catch(function (e) {
|
|
7866
7865
|
handleAIIdentify(fullAddress);
|
|
7866
|
+
console.log(e);
|
|
7867
7867
|
}).finally(function () {
|
|
7868
7868
|
setLoading(false);
|
|
7869
7869
|
});
|
|
@@ -7887,6 +7887,7 @@ var ParseLogistics = function ParseLogistics(props) {
|
|
|
7887
7887
|
var data = res.data;
|
|
7888
7888
|
onChange === null || onChange === void 0 ? void 0 : onChange(data);
|
|
7889
7889
|
}).catch(function (e) {
|
|
7890
|
+
console.log(e);
|
|
7890
7891
|
message.error('识别失败,请输入正确的信息');
|
|
7891
7892
|
}).finally(function () {
|
|
7892
7893
|
setAiLoading(false);
|
|
@@ -8671,7 +8672,8 @@ var processSceneStatus = function processSceneStatus(getValue) {
|
|
|
8671
8672
|
WDT_WAREHOUSING_STATUS: 'wdtInStockStatusItemList',
|
|
8672
8673
|
JKY_WAREHOUSING_STATUS: 'jkyInStockStatusItemList',
|
|
8673
8674
|
JST_WAREHOUSING_STATUS: 'jstInStockStatusItemList',
|
|
8674
|
-
WLN_WAREHOUSING_STATUS: 'wlnInStockStatusItemList'
|
|
8675
|
+
WLN_WAREHOUSING_STATUS: 'wlnInStockStatusItemList',
|
|
8676
|
+
KM_WAREHOUSING_STATUS: 'kmInStockStatusItemList'
|
|
8675
8677
|
};
|
|
8676
8678
|
return _defineProperty({}, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(STATUS_LIST_MAP[nex.workOrderComponentType])), []));
|
|
8677
8679
|
};
|
|
@@ -9520,6 +9522,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
|
|
|
9520
9522
|
WDT_WAREHOUSING_STATUS: processSceneStatus,
|
|
9521
9523
|
WLN_WAREHOUSING_STATUS: processSceneStatus,
|
|
9522
9524
|
JKY_WAREHOUSING_STATUS: processSceneStatus,
|
|
9525
|
+
KM_WAREHOUSING_STATUS: processSceneStatus,
|
|
9523
9526
|
JST_WAREHOUSING_STATUS: processSceneStatus,
|
|
9524
9527
|
BS_LOGISTICS: processErpLogistics,
|
|
9525
9528
|
WLN_LOGISTICS: processErpLogistics,
|
|
@@ -11707,7 +11710,7 @@ var GoodsModal = function GoodsModal(props) {
|
|
|
11707
11710
|
key: item.value
|
|
11708
11711
|
}, item.label);
|
|
11709
11712
|
})), /*#__PURE__*/React.createElement(Search, {
|
|
11710
|
-
placeholder: searchParams.type !== 'orderProduct' ? platform === 'taobao' ? '
|
|
11713
|
+
placeholder: searchParams.type !== 'orderProduct' ? platform === 'taobao' ? '宝贝标题' : '商品ID' : '宝贝标题',
|
|
11711
11714
|
// enterButton="搜索"
|
|
11712
11715
|
className: "search",
|
|
11713
11716
|
value: platform === 'taobao' ? searchParams.title : searchParams.numIids,
|
|
@@ -12117,7 +12120,7 @@ var Goods = function Goods(props) {
|
|
|
12117
12120
|
return querySkus({
|
|
12118
12121
|
shopId: shopId,
|
|
12119
12122
|
numIids: numIid
|
|
12120
|
-
}).catch(
|
|
12123
|
+
}).catch(console.debug);
|
|
12121
12124
|
case 5:
|
|
12122
12125
|
res = _context3.sent;
|
|
12123
12126
|
data = (res === null || res === void 0 ? void 0 : res.success) && (res === null || res === void 0 ? void 0 : res.data);
|
|
@@ -12501,7 +12504,7 @@ var GoodItem = function GoodItem(props) {
|
|
|
12501
12504
|
return querySkus({
|
|
12502
12505
|
shopId: shopId,
|
|
12503
12506
|
numIids: numIid
|
|
12504
|
-
}).catch(
|
|
12507
|
+
}).catch(console.debug);
|
|
12505
12508
|
case 5:
|
|
12506
12509
|
res = _context3.sent;
|
|
12507
12510
|
data = (res === null || res === void 0 ? void 0 : res.success) && (res === null || res === void 0 ? void 0 : res.data);
|
|
@@ -13443,6 +13446,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
|
|
|
13443
13446
|
});
|
|
13444
13447
|
}
|
|
13445
13448
|
}
|
|
13449
|
+
console.log('newValue', newValue);
|
|
13446
13450
|
onChange === null || onChange === void 0 ? void 0 : onChange(newValue, type);
|
|
13447
13451
|
};
|
|
13448
13452
|
//智能识别回调
|
|
@@ -14025,14 +14029,21 @@ var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
|
|
|
14025
14029
|
}); // 1、初始值没有 传入值有请求快照
|
|
14026
14030
|
// 2、初始值有 传入值有 其中有不一样的请求快照
|
|
14027
14031
|
// 3、初始值有 传入值有 都一样的返回初始值
|
|
14032
|
+
console.log('list', initList, valueList, changeList);
|
|
14033
|
+
// console.log('old', initValue, value, changeValue);
|
|
14034
|
+
// console.log('一样', JSON.stringify(initList) !== JSON.stringify(valueList));
|
|
14035
|
+
// console.log(
|
|
14036
|
+
// '一样2',
|
|
14037
|
+
// JSON.stringify(changeList) !== JSON.stringify(valueList),
|
|
14038
|
+
// );
|
|
14028
14039
|
if (!(!initList.length && !valueList.length)) {
|
|
14029
|
-
_context.next =
|
|
14040
|
+
_context.next = 8;
|
|
14030
14041
|
break;
|
|
14031
14042
|
}
|
|
14032
14043
|
return _context.abrupt("return");
|
|
14033
|
-
case
|
|
14044
|
+
case 8:
|
|
14034
14045
|
if (!(JSON.stringify(initList) === JSON.stringify(valueList))) {
|
|
14035
|
-
_context.next =
|
|
14046
|
+
_context.next = 14;
|
|
14036
14047
|
break;
|
|
14037
14048
|
}
|
|
14038
14049
|
initSnapshotList = initValue.reduce(function (prv, next) {
|
|
@@ -14051,13 +14062,13 @@ var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
|
|
|
14051
14062
|
setNewValue(initValue);
|
|
14052
14063
|
onChange(initValue);
|
|
14053
14064
|
}
|
|
14054
|
-
_context.next =
|
|
14065
|
+
_context.next = 30;
|
|
14055
14066
|
break;
|
|
14056
|
-
case
|
|
14067
|
+
case 14:
|
|
14057
14068
|
if (!(
|
|
14058
14069
|
//开启了物流快照才会获取快照信息
|
|
14059
14070
|
hasSnapshot && JSON.stringify(initList) !== JSON.stringify(valueList) && JSON.stringify(changeList) !== JSON.stringify(valueList))) {
|
|
14060
|
-
_context.next =
|
|
14071
|
+
_context.next = 29;
|
|
14061
14072
|
break;
|
|
14062
14073
|
}
|
|
14063
14074
|
hasSave.current = false;
|
|
@@ -14066,7 +14077,7 @@ var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
|
|
|
14066
14077
|
});
|
|
14067
14078
|
listValue = cloneDeep(value);
|
|
14068
14079
|
if (!hasValue) {
|
|
14069
|
-
_context.next =
|
|
14080
|
+
_context.next = 24;
|
|
14070
14081
|
break;
|
|
14071
14082
|
}
|
|
14072
14083
|
requestList = valueList.map(function (item) {
|
|
@@ -14085,9 +14096,9 @@ var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
|
|
|
14085
14096
|
});
|
|
14086
14097
|
}
|
|
14087
14098
|
});
|
|
14088
|
-
_context.next =
|
|
14099
|
+
_context.next = 22;
|
|
14089
14100
|
return Promise.allSettled(requestList);
|
|
14090
|
-
case
|
|
14101
|
+
case 22:
|
|
14091
14102
|
requestValues = _context.sent;
|
|
14092
14103
|
listValue = cloneDeep(value).map(function (item, index) {
|
|
14093
14104
|
var _requestValues$index, _requestValues$index$, _requestValues$index$2;
|
|
@@ -14095,15 +14106,15 @@ var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
|
|
|
14095
14106
|
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
|
|
14096
14107
|
});
|
|
14097
14108
|
});
|
|
14098
|
-
case
|
|
14109
|
+
case 24:
|
|
14099
14110
|
setChangeValue(listValue);
|
|
14100
14111
|
setNewValue(listValue);
|
|
14101
14112
|
onChange(listValue);
|
|
14102
|
-
_context.next =
|
|
14113
|
+
_context.next = 30;
|
|
14103
14114
|
break;
|
|
14104
|
-
case 28:
|
|
14105
|
-
setNewValue(value);
|
|
14106
14115
|
case 29:
|
|
14116
|
+
setNewValue(value);
|
|
14117
|
+
case 30:
|
|
14107
14118
|
case "end":
|
|
14108
14119
|
return _context.stop();
|
|
14109
14120
|
}
|
|
@@ -14179,8 +14190,7 @@ var jstGoods = function jstGoods(props) {
|
|
|
14179
14190
|
_props$platformType = props.platformType,
|
|
14180
14191
|
platformType = _props$platformType === void 0 ? 'default' : _props$platformType,
|
|
14181
14192
|
onlyShowFieldSelect = props.onlyShowFieldSelect,
|
|
14182
|
-
logisticsCompanyFormType = props.logisticsCompanyFormType
|
|
14183
|
-
form = props.form;
|
|
14193
|
+
logisticsCompanyFormType = props.logisticsCompanyFormType;
|
|
14184
14194
|
var _useState = useState(0),
|
|
14185
14195
|
_useState2 = _slicedToArray(_useState, 2),
|
|
14186
14196
|
changeIndex = _useState2[0],
|
|
@@ -14195,26 +14205,6 @@ var jstGoods = function jstGoods(props) {
|
|
|
14195
14205
|
onChange === null || onChange === void 0 ? void 0 : onChange(typeInitValueMap[type]);
|
|
14196
14206
|
}
|
|
14197
14207
|
}, [value, type]);
|
|
14198
|
-
useEffect(function () {
|
|
14199
|
-
//丢失sendSnapshotName,未找到具体原因,兜底处理
|
|
14200
|
-
if (type === 3 && isSendGoodSavedId && value && value.length && value.some(function (item) {
|
|
14201
|
-
return !item.sendSnapshotName;
|
|
14202
|
-
}) && value.every(function (item) {
|
|
14203
|
-
return item.sendId;
|
|
14204
|
-
})) {
|
|
14205
|
-
var orderNo = form === null || form === void 0 ? void 0 : form.getFieldValue('m3ap1EvEyd');
|
|
14206
|
-
var newValue = cloneDeep(value).map(function (item) {
|
|
14207
|
-
if (item.sendSnapshotName || !item.sendId) return item;
|
|
14208
|
-
return _objectSpread2(_objectSpread2({}, item), {}, {
|
|
14209
|
-
sendSnapshotName: SendDataCenter.getInstance(platformType).getSendNameByCode(item.sendId)
|
|
14210
|
-
});
|
|
14211
|
-
});
|
|
14212
|
-
Monitor.automaticReport({
|
|
14213
|
-
message: "\u53D1\u8D27\u4ED3\u8D70\u515C\u5E95\u5904\u7406-".concat(orderNo || '', "-oldValue-").concat(JSON.stringify(cloneDeep(value)), ",newValue-").concat(JSON.stringify(cloneDeep(newValue)))
|
|
14214
|
-
});
|
|
14215
|
-
onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
|
|
14216
|
-
}
|
|
14217
|
-
}, [JSON.stringify(value || []), type]);
|
|
14218
14208
|
useEffect(function () {
|
|
14219
14209
|
if (changeIndex > (value === null || value === void 0 ? void 0 : value.length) - 1) {
|
|
14220
14210
|
setChangeIndex(0);
|
|
@@ -16294,7 +16284,7 @@ var GoodList = function GoodList(props, ref) {
|
|
|
16294
16284
|
} else {
|
|
16295
16285
|
reject$1(res);
|
|
16296
16286
|
}
|
|
16297
|
-
}).catch(
|
|
16287
|
+
}).catch(console.error);
|
|
16298
16288
|
};
|
|
16299
16289
|
getMore();
|
|
16300
16290
|
};
|
|
@@ -16361,30 +16351,33 @@ var GoodList = function GoodList(props, ref) {
|
|
|
16361
16351
|
selectedRowKeys: selectIds,
|
|
16362
16352
|
fixed: true,
|
|
16363
16353
|
onSelect: function onSelect(record, selected) {
|
|
16354
|
+
var uniqueKey = "".concat(record.goodNo, "-").concat(record.specNo);
|
|
16364
16355
|
if (selected) {
|
|
16365
|
-
setSelectIds([].concat(_toConsumableArray(selectIds), [
|
|
16356
|
+
setSelectIds([].concat(_toConsumableArray(selectIds), [uniqueKey]));
|
|
16366
16357
|
setSelect([].concat(_toConsumableArray(selectList), [record]));
|
|
16367
16358
|
} else {
|
|
16368
16359
|
setSelectIds(selectIds.filter(function (t) {
|
|
16369
|
-
return t !==
|
|
16360
|
+
return t !== uniqueKey;
|
|
16370
16361
|
}));
|
|
16371
16362
|
setSelect(selectList.filter(function (t) {
|
|
16372
|
-
return t.specNo !==
|
|
16363
|
+
return "".concat(t.goodNo, "-").concat(t.specNo) !== uniqueKey;
|
|
16373
16364
|
}));
|
|
16374
16365
|
}
|
|
16375
16366
|
},
|
|
16376
16367
|
onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
|
|
16377
16368
|
if (selected) {
|
|
16378
|
-
|
|
16379
|
-
return t.specNo;
|
|
16380
|
-
})
|
|
16369
|
+
var changeKeys = changeRows.map(function (t) {
|
|
16370
|
+
return "".concat(t.goodNo, "-").concat(t.specNo);
|
|
16371
|
+
});
|
|
16372
|
+
setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeKeys)));
|
|
16381
16373
|
setSelect([].concat(_toConsumableArray(selectList), _toConsumableArray(changeRows)));
|
|
16382
16374
|
} else {
|
|
16383
|
-
|
|
16384
|
-
return t.specNo;
|
|
16385
|
-
})
|
|
16375
|
+
var _changeKeys = changeRows.map(function (t) {
|
|
16376
|
+
return "".concat(t.goodNo, "-").concat(t.specNo);
|
|
16377
|
+
});
|
|
16378
|
+
setSelectIds(difference(selectIds, _changeKeys));
|
|
16386
16379
|
var list = differenceWith(selectList, changeRows, function (arrVal, othVal) {
|
|
16387
|
-
return arrVal.specNo !== othVal.specNo;
|
|
16380
|
+
return "".concat(arrVal.goodNo, "-").concat(arrVal.specNo) !== "".concat(othVal.goodNo, "-").concat(othVal.specNo);
|
|
16388
16381
|
});
|
|
16389
16382
|
setSelect(list);
|
|
16390
16383
|
}
|
|
@@ -16392,11 +16385,12 @@ var GoodList = function GoodList(props, ref) {
|
|
|
16392
16385
|
};
|
|
16393
16386
|
var showTable = function showTable() {
|
|
16394
16387
|
var handleDelete = function handleDelete(record) {
|
|
16388
|
+
var uniqueKey = "".concat(record.goodNo, "-").concat(record.specNo);
|
|
16395
16389
|
setSelectIds(selectIds.filter(function (t) {
|
|
16396
|
-
return t !==
|
|
16390
|
+
return t !== uniqueKey;
|
|
16397
16391
|
}));
|
|
16398
16392
|
setSelect(selectList.filter(function (t) {
|
|
16399
|
-
return t.specNo !==
|
|
16393
|
+
return "".concat(t.goodNo, "-").concat(t.specNo) !== uniqueKey;
|
|
16400
16394
|
}));
|
|
16401
16395
|
};
|
|
16402
16396
|
var showColumns = [{
|
|
@@ -16420,7 +16414,9 @@ var GoodList = function GoodList(props, ref) {
|
|
|
16420
16414
|
}
|
|
16421
16415
|
}, /*#__PURE__*/React.createElement(Table, {
|
|
16422
16416
|
columns: showColumns,
|
|
16423
|
-
rowKey:
|
|
16417
|
+
rowKey: function rowKey(record) {
|
|
16418
|
+
return "".concat(record.goodNo, "-").concat(record.specNo);
|
|
16419
|
+
},
|
|
16424
16420
|
dataSource: selectList,
|
|
16425
16421
|
scroll: {
|
|
16426
16422
|
x: '100%',
|
|
@@ -16450,7 +16446,9 @@ var GoodList = function GoodList(props, ref) {
|
|
|
16450
16446
|
}, /*#__PURE__*/React.createElement(Table, _objectSpread2(_objectSpread2({
|
|
16451
16447
|
className: "GoodModalColumns",
|
|
16452
16448
|
rowSelection: rowSelection,
|
|
16453
|
-
rowKey:
|
|
16449
|
+
rowKey: function rowKey(record) {
|
|
16450
|
+
return "".concat(record.goodNo, "-").concat(record.specNo);
|
|
16451
|
+
},
|
|
16454
16452
|
columns: columns,
|
|
16455
16453
|
scroll: {
|
|
16456
16454
|
x: '100%',
|
|
@@ -18345,6 +18343,7 @@ var SearchHeader = function SearchHeader(_ref) {
|
|
|
18345
18343
|
timeOptions = _ref.timeOptions,
|
|
18346
18344
|
ShopList = _ref.ShopList,
|
|
18347
18345
|
onSubmit = _ref.onSubmit;
|
|
18346
|
+
console.log('allFields', allFields);
|
|
18348
18347
|
// const fixedFieldsOptions = useMemo(() => {
|
|
18349
18348
|
// return allFields.filter(item => fixedFields?.includes(item.id));
|
|
18350
18349
|
// }, [fixedFields, allFields]);
|
|
@@ -18600,7 +18599,9 @@ var WorkorderList = function WorkorderList(props, ref) {
|
|
|
18600
18599
|
loading: false
|
|
18601
18600
|
}));
|
|
18602
18601
|
setWorkOrderList(newDataSource);
|
|
18603
|
-
}).catch(function (error) {
|
|
18602
|
+
}).catch(function (error) {
|
|
18603
|
+
console.log('**** 获取表格数据错误', error);
|
|
18604
|
+
}));
|
|
18604
18605
|
case 19:
|
|
18605
18606
|
case "end":
|
|
18606
18607
|
return _context.stop();
|
|
@@ -21017,9 +21018,20 @@ var getColumns$2 = function getColumns(_ref) {
|
|
|
21017
21018
|
};
|
|
21018
21019
|
|
|
21019
21020
|
var getYesOrNo$4 = function getYesOrNo(val) {
|
|
21020
|
-
|
|
21021
|
-
|
|
21021
|
+
switch (val) {
|
|
21022
|
+
case true:
|
|
21023
|
+
case '1':
|
|
21024
|
+
case 1:
|
|
21025
|
+
return '是';
|
|
21026
|
+
case false:
|
|
21027
|
+
case '0':
|
|
21028
|
+
case 0:
|
|
21029
|
+
return '否';
|
|
21030
|
+
default:
|
|
21031
|
+
return null;
|
|
21032
|
+
}
|
|
21022
21033
|
};
|
|
21034
|
+
|
|
21023
21035
|
function toNum$1(value) {
|
|
21024
21036
|
if (typeof value === 'string') {
|
|
21025
21037
|
return value ? +value : void 0;
|
|
@@ -21215,7 +21227,7 @@ var getColumns$3 = function getColumns(_ref) {
|
|
|
21215
21227
|
label: '非赠品',
|
|
21216
21228
|
value: 0
|
|
21217
21229
|
}]
|
|
21218
|
-
}) : /*#__PURE__*/React.createElement("span", null,
|
|
21230
|
+
}) : /*#__PURE__*/React.createElement("span", null, isNull(val) ? null : val ? '赠品' : '非赠品');
|
|
21219
21231
|
}
|
|
21220
21232
|
}, {
|
|
21221
21233
|
dataIndex: 'isPackage',
|
|
@@ -21447,7 +21459,7 @@ var getColumns$3 = function getColumns(_ref) {
|
|
|
21447
21459
|
label: '非赠品',
|
|
21448
21460
|
value: 0
|
|
21449
21461
|
}]
|
|
21450
|
-
}) : /*#__PURE__*/React.createElement("span", null,
|
|
21462
|
+
}) : /*#__PURE__*/React.createElement("span", null, isNull(val) ? null : val ? '赠品' : '非赠品');
|
|
21451
21463
|
}
|
|
21452
21464
|
}, {
|
|
21453
21465
|
dataIndex: 'isPackage',
|
|
@@ -21507,10 +21519,6 @@ var isNumberOrNumberString$1 = function isNumberOrNumberString(value) {
|
|
|
21507
21519
|
if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
|
|
21508
21520
|
return false;
|
|
21509
21521
|
};
|
|
21510
|
-
var getYesOrNo$5 = function getYesOrNo(val) {
|
|
21511
|
-
if (isNull(val)) return null;
|
|
21512
|
-
return val ? '是' : '否';
|
|
21513
|
-
};
|
|
21514
21522
|
function toNum$2(value) {
|
|
21515
21523
|
if (typeof value === 'string') {
|
|
21516
21524
|
return value ? +value : void 0;
|
|
@@ -21622,7 +21630,7 @@ var getColumns$4 = function getColumns(_ref) {
|
|
|
21622
21630
|
title: "\u662F\u5426\u53D6\u6D88",
|
|
21623
21631
|
width: 150,
|
|
21624
21632
|
render: function render(val) {
|
|
21625
|
-
return /*#__PURE__*/React.createElement("span", null, getYesOrNo$
|
|
21633
|
+
return /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
|
|
21626
21634
|
}
|
|
21627
21635
|
}, {
|
|
21628
21636
|
dataIndex: 'isGift',
|
|
@@ -21641,7 +21649,7 @@ var getColumns$4 = function getColumns(_ref) {
|
|
|
21641
21649
|
label: '否',
|
|
21642
21650
|
value: 0
|
|
21643
21651
|
}]
|
|
21644
|
-
}) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$
|
|
21652
|
+
}) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
|
|
21645
21653
|
}
|
|
21646
21654
|
}, {
|
|
21647
21655
|
dataIndex: 'skuNote',
|
|
@@ -21767,7 +21775,7 @@ var getColumns$4 = function getColumns(_ref) {
|
|
|
21767
21775
|
label: '否',
|
|
21768
21776
|
value: 0
|
|
21769
21777
|
}]
|
|
21770
|
-
}) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$
|
|
21778
|
+
}) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
|
|
21771
21779
|
}
|
|
21772
21780
|
}].map(function (item) {
|
|
21773
21781
|
return _objectSpread2(_objectSpread2({}, item), {}, {
|
|
@@ -21896,7 +21904,7 @@ var getColumns$4 = function getColumns(_ref) {
|
|
|
21896
21904
|
label: '否',
|
|
21897
21905
|
value: 0
|
|
21898
21906
|
}]
|
|
21899
|
-
}) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$
|
|
21907
|
+
}) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
|
|
21900
21908
|
}
|
|
21901
21909
|
}].map(function (item) {
|
|
21902
21910
|
return _objectSpread2(_objectSpread2({}, item), {}, {
|
|
@@ -22919,6 +22927,7 @@ var getColumns$6 = function getColumns() {
|
|
|
22919
22927
|
title: "\u5B9E\u9645\u8865\u53D1\u6570\u91CF",
|
|
22920
22928
|
width: 100,
|
|
22921
22929
|
validator: function validator(_rule, value, extraParams) {
|
|
22930
|
+
console.log('实际补发数量-extraParams', extraParams);
|
|
22922
22931
|
if (!(extraParams === null || extraParams === void 0 ? void 0 : extraParams.quantityVerify)) return undefined;
|
|
22923
22932
|
var title = '';
|
|
22924
22933
|
if (((value === null || value === void 0 ? void 0 : value.kmReissueGoods) || []).some(function (goods) {
|
|
@@ -25193,7 +25202,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
|
|
|
25193
25202
|
while (1) switch (_context2.prev = _context2.next) {
|
|
25194
25203
|
case 0:
|
|
25195
25204
|
if (!validSystemOrderFn) {
|
|
25196
|
-
_context2.next =
|
|
25205
|
+
_context2.next = 7;
|
|
25197
25206
|
break;
|
|
25198
25207
|
}
|
|
25199
25208
|
_context2.next = 3;
|
|
@@ -25201,38 +25210,39 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
|
|
|
25201
25210
|
case 3:
|
|
25202
25211
|
flag = _context2.sent;
|
|
25203
25212
|
if (!(flag === false)) {
|
|
25204
|
-
_context2.next =
|
|
25213
|
+
_context2.next = 7;
|
|
25205
25214
|
break;
|
|
25206
25215
|
}
|
|
25216
|
+
console.log('validSystemOrderFn校验不通过');
|
|
25207
25217
|
return _context2.abrupt("return");
|
|
25208
|
-
case
|
|
25218
|
+
case 7:
|
|
25209
25219
|
if (!validSystemOrder) {
|
|
25210
|
-
_context2.next =
|
|
25220
|
+
_context2.next = 10;
|
|
25211
25221
|
break;
|
|
25212
25222
|
}
|
|
25213
25223
|
message.warning('请选择补发系统单');
|
|
25214
25224
|
return _context2.abrupt("return");
|
|
25215
|
-
case
|
|
25225
|
+
case 10:
|
|
25216
25226
|
if (!(getDataSourceAsync && (!(dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) || isReloadSelectTable))) {
|
|
25217
|
-
_context2.next =
|
|
25227
|
+
_context2.next = 13;
|
|
25218
25228
|
break;
|
|
25219
25229
|
}
|
|
25220
|
-
_context2.next =
|
|
25230
|
+
_context2.next = 13;
|
|
25221
25231
|
return getDataSourceAsync();
|
|
25222
|
-
case
|
|
25232
|
+
case 13:
|
|
25223
25233
|
if (!['KM_GOODS', 'KM_REISSUE_GOODS', 'KM_RETURN_GOODS'].includes(type)) {
|
|
25224
|
-
_context2.next =
|
|
25234
|
+
_context2.next = 16;
|
|
25225
25235
|
break;
|
|
25226
25236
|
}
|
|
25227
|
-
_context2.next =
|
|
25237
|
+
_context2.next = 16;
|
|
25228
25238
|
return getKmSupplier(dataSource);
|
|
25229
|
-
case
|
|
25239
|
+
case 16:
|
|
25230
25240
|
setTradeGoodsVisible(true);
|
|
25231
25241
|
// 补发直接传入的是systemNo
|
|
25232
25242
|
if (isShowSelect && isReissueType) {
|
|
25233
25243
|
setSelectSystemNo(selectedSystemOrders || []);
|
|
25234
25244
|
}
|
|
25235
|
-
case
|
|
25245
|
+
case 18:
|
|
25236
25246
|
case "end":
|
|
25237
25247
|
return _context2.stop();
|
|
25238
25248
|
}
|
|
@@ -25434,6 +25444,7 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
25434
25444
|
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;
|
|
25435
25445
|
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;
|
|
25436
25446
|
var refModal = useRef();
|
|
25447
|
+
console.debug('表格数据', value);
|
|
25437
25448
|
var handleDelete = function handleDelete(record, index) {
|
|
25438
25449
|
onDelete === null || onDelete === void 0 ? void 0 : onDelete(value[index]);
|
|
25439
25450
|
var newList = _toConsumableArray(value).filter(function (item, i) {
|
|
@@ -26214,6 +26225,7 @@ var BsReissue = function BsReissue(props) {
|
|
|
26214
26225
|
var _typeMap$type2;
|
|
26215
26226
|
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) {
|
|
26216
26227
|
var _typeMap$type3;
|
|
26228
|
+
console.log('reissueSelectList', data);
|
|
26217
26229
|
if (disabled) return;
|
|
26218
26230
|
var newValue = _objectSpread2(_objectSpread2({}, data.goodValue), {}, {
|
|
26219
26231
|
shopCode: data === null || data === void 0 ? void 0 : data.shopCode
|
|
@@ -28019,6 +28031,7 @@ var OrderSubForm = function OrderSubForm(props) {
|
|
|
28019
28031
|
manual = props.manual,
|
|
28020
28032
|
correlationList = props.subConfig.correlationList,
|
|
28021
28033
|
effects = props.effects;
|
|
28034
|
+
console.log('effects', effects);
|
|
28022
28035
|
var valueRef = useRef(value);
|
|
28023
28036
|
useEffect(function () {
|
|
28024
28037
|
valueRef.current = value;
|
|
@@ -28215,7 +28228,7 @@ var OrderSubForm = function OrderSubForm(props) {
|
|
|
28215
28228
|
onChange(_objectSpread2(_objectSpread2({}, value), {}, {
|
|
28216
28229
|
allOrders: allOrders
|
|
28217
28230
|
}));
|
|
28218
|
-
}).catch(
|
|
28231
|
+
}).catch(console.debug) : Promise.resolve();
|
|
28219
28232
|
};
|
|
28220
28233
|
var getAllTradeGoodsDetails = function getAllTradeGoodsDetails() {
|
|
28221
28234
|
var goodDetails = (value === null || value === void 0 ? void 0 : value.allOrders) || [];
|
|
@@ -29450,23 +29463,29 @@ var CommonExchangeGoods = function CommonExchangeGoods(props) {
|
|
|
29450
29463
|
var getDataSourceAsync = function getDataSourceAsync() {
|
|
29451
29464
|
return new Promise(function (resolve) {
|
|
29452
29465
|
pubsub.subscribeOnce(componentMap$4[compType].eventNameMap.returnGoodsSysorderBack, function (_, data) {
|
|
29453
|
-
var _componentMap$compTyp9;
|
|
29466
|
+
var _componentMap$compTyp9, _componentMap$compTyp10;
|
|
29454
29467
|
resolve(data);
|
|
29468
|
+
console.log('getDataSourceAsync---111data--', data, getGoodDetails({
|
|
29469
|
+
returnGoodsValue: data,
|
|
29470
|
+
mode: isStrict,
|
|
29471
|
+
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
|
|
29472
|
+
}));
|
|
29455
29473
|
setOriginDataSource(getGoodDetails({
|
|
29456
29474
|
returnGoodsValue: data,
|
|
29457
|
-
isAllOrders: componentMap$4 === null || componentMap$4 === void 0 ? void 0 : (_componentMap$
|
|
29475
|
+
isAllOrders: componentMap$4 === null || componentMap$4 === void 0 ? void 0 : (_componentMap$compTyp10 = componentMap$4[compType]) === null || _componentMap$compTyp10 === void 0 ? void 0 : _componentMap$compTyp10.isShowSelectTradeGoods,
|
|
29458
29476
|
mode: isStrict
|
|
29459
29477
|
}));
|
|
29460
29478
|
});
|
|
29461
29479
|
pubsub.publish(componentMap$4[compType].eventNameMap.returnGoodsSysorder, compType);
|
|
29462
29480
|
});
|
|
29463
29481
|
};
|
|
29482
|
+
console.log('aaa--', originDataSource);
|
|
29464
29483
|
return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(GoodItem$1, _objectSpread2(_objectSpread2({
|
|
29465
29484
|
key: componentMap$4[compType].type
|
|
29466
29485
|
}, props), {}, {
|
|
29467
29486
|
validSystemOrderFn: function validSystemOrderFn() {
|
|
29468
|
-
var _componentMap$
|
|
29469
|
-
return (_componentMap$
|
|
29487
|
+
var _componentMap$compTyp11, _componentMap$compTyp12;
|
|
29488
|
+
return (_componentMap$compTyp11 = (_componentMap$compTyp12 = componentMap$4[compType]).validSystemOrderFn) === null || _componentMap$compTyp11 === void 0 ? void 0 : _componentMap$compTyp11.call(_componentMap$compTyp12, form);
|
|
29470
29489
|
},
|
|
29471
29490
|
isReloadSelectTable: componentMap$4[compType].isReloadSelectTable,
|
|
29472
29491
|
disabled: disabled,
|
|
@@ -30643,7 +30662,7 @@ var GoodsModal$5 = function GoodsModal(props) {
|
|
|
30643
30662
|
key: item.value
|
|
30644
30663
|
}, item.label);
|
|
30645
30664
|
})), /*#__PURE__*/React.createElement(Search$1, {
|
|
30646
|
-
placeholder: "\u5B9D\u8D1D\
|
|
30665
|
+
placeholder: "\u5B9D\u8D1D\u6807\u9898",
|
|
30647
30666
|
allowClear: true,
|
|
30648
30667
|
enterButton: "\u641C\u7D22",
|
|
30649
30668
|
style: {
|
|
@@ -32317,13 +32336,20 @@ var IdInputSelect = function IdInputSelect(props) {
|
|
|
32317
32336
|
tradeId = form.getFieldValue('m3ap1EvEyd');
|
|
32318
32337
|
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;
|
|
32319
32338
|
blurFrom = form.getFieldValue('skx_return_billNo_blur_from');
|
|
32339
|
+
console.log('asyncQueryData---', {
|
|
32340
|
+
skxReturnExpressCode: skxReturnExpressCode,
|
|
32341
|
+
blurFrom: blurFrom,
|
|
32342
|
+
tradeId: tradeId,
|
|
32343
|
+
tradeIdRef: tradeIdRef.current,
|
|
32344
|
+
form: form
|
|
32345
|
+
});
|
|
32320
32346
|
if (!(type === 'SKX_OUTBOUND_NOTICE_NO' && !tradeId || type === 'SKX_RETURN_BILL_NO' && !tradeId && !skxReturnExpressCode)) {
|
|
32321
|
-
_context3.next =
|
|
32347
|
+
_context3.next = 7;
|
|
32322
32348
|
break;
|
|
32323
32349
|
}
|
|
32324
32350
|
setDataSource([]);
|
|
32325
32351
|
return _context3.abrupt("return");
|
|
32326
|
-
case
|
|
32352
|
+
case 7:
|
|
32327
32353
|
setSpinning(true);
|
|
32328
32354
|
// 判断是从哪个组件失焦,若是从[SKX]退换物流信息(TH)失焦,则根据物流单号查询,若是从订单号组件失焦,则根据订单号查询
|
|
32329
32355
|
typeMap$6[type].asyncGetData(type === 'SKX_RETURN_BILL_NO' && blurFrom === '4487c6516b' ? {
|
|
@@ -32337,7 +32363,7 @@ var IdInputSelect = function IdInputSelect(props) {
|
|
|
32337
32363
|
}).finally(function () {
|
|
32338
32364
|
setSpinning(false);
|
|
32339
32365
|
});
|
|
32340
|
-
case
|
|
32366
|
+
case 9:
|
|
32341
32367
|
case "end":
|
|
32342
32368
|
return _context3.stop();
|
|
32343
32369
|
}
|
|
@@ -32429,6 +32455,11 @@ var IdInputSelect = function IdInputSelect(props) {
|
|
|
32429
32455
|
}))));
|
|
32430
32456
|
};
|
|
32431
32457
|
var handleChange = function handleChange(val, isInput) {
|
|
32458
|
+
console.log('handleChange---', {
|
|
32459
|
+
val: val,
|
|
32460
|
+
value: value,
|
|
32461
|
+
isInput: isInput
|
|
32462
|
+
});
|
|
32432
32463
|
var isReturnBillNoChange = type === 'SKX_RETURN_BILL_NO' && form.getFieldValue('skx_return_billNo_blur_from') === '4487c6516b';
|
|
32433
32464
|
onChange === null || onChange === void 0 ? void 0 : onChange(val, value !== val && (!!isInput || isReturnBillNoChange));
|
|
32434
32465
|
// 如果类型是[SKX]退换货单号,则根据blurFrom判断是从[SKX]退换物流信息(TH)失焦,则调用onBlur
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare const getYesOrNo: (val: boolean | string | number) => "是" | "否" | null;
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import { FormInstance } from 'antd';
|
|
3
2
|
import { ExpressData } from '@kmkf-fe-packages/kmkf-utils';
|
|
4
3
|
interface JstGoodsProps {
|
|
5
4
|
value: any[];
|
|
@@ -13,7 +12,6 @@ interface JstGoodsProps {
|
|
|
13
12
|
onlyShowFieldSelect: boolean;
|
|
14
13
|
expressDateInstance: InstanceType<typeof ExpressData>;
|
|
15
14
|
logisticsCompanyFormType?: string;
|
|
16
|
-
form?: FormInstance;
|
|
17
15
|
}
|
|
18
16
|
declare const jstGoods: (props: Partial<JstGoodsProps>) => React.JSX.Element;
|
|
19
17
|
export default jstGoods;
|
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.9-beta.0",
|
|
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.9-beta.0",
|
|
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": "2d04275db0bedc2fce5e120c012da38ad4adec99"
|
|
70
70
|
}
|