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