@kmkf-fe-packages/kmkf-work-order-service-component 2.0.77 → 2.0.78
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/esm/FlowTemplateDetailV2/store/selector.d.ts +14 -0
- package/dist/esm/WorkOrder/index.js +21 -7
- package/dist/esm/common/utils/tools.js +64 -57
- package/dist/esm/common/utils/transformWorkOrderData.js +25 -19
- package/dist/esm/model/login.js +2 -2
- package/dist/esm/model/servers/api.d.ts +0 -1
- package/dist/esm/model/servers/api.js +0 -10
- package/package.json +5 -5
|
@@ -216,6 +216,20 @@ export declare const selectCurrentNodeDetail: (state: FlowTemplateDetailState) =
|
|
|
216
216
|
deleted?: boolean | undefined;
|
|
217
217
|
}[] | undefined;
|
|
218
218
|
};
|
|
219
|
+
flowEventData?: {
|
|
220
|
+
eventData?: {
|
|
221
|
+
businessStatus?: {
|
|
222
|
+
businessKey: string;
|
|
223
|
+
businessStatus: number;
|
|
224
|
+
businessStatusDesc: string;
|
|
225
|
+
remark: string;
|
|
226
|
+
}[] | undefined;
|
|
227
|
+
otherBusinessData?: {
|
|
228
|
+
ruleName?: string | undefined;
|
|
229
|
+
passConditionList?: string[] | undefined;
|
|
230
|
+
} | undefined;
|
|
231
|
+
} | undefined;
|
|
232
|
+
} | undefined;
|
|
219
233
|
} | undefined;
|
|
220
234
|
export declare const selectTid: (state: FlowTemplateDetailState) => string;
|
|
221
235
|
export declare const selectShopUniqueKey: (state: FlowTemplateDetailState) => string;
|
|
@@ -22,7 +22,7 @@ import { fetchQueryCurrentCompanyUser } from "../model/workOrder";
|
|
|
22
22
|
import { fetchLogicFlowList } from "../model/logicFlow";
|
|
23
23
|
import { setCurrentBuyerChecked, showPayment } from "../model/customizeWorkOrder";
|
|
24
24
|
import store from "../model/store";
|
|
25
|
-
import {
|
|
25
|
+
import { fetchxzLogOut } from "../model/login";
|
|
26
26
|
import { Global } from '@kmkf-fe-packages/services-components';
|
|
27
27
|
import moment from 'moment';
|
|
28
28
|
import { LogoutOutlined } from '@ant-design/icons';
|
|
@@ -189,19 +189,33 @@ var WorkOrder = function WorkOrder(props) {
|
|
|
189
189
|
cancelText: '取消',
|
|
190
190
|
onOk: function onOk() {
|
|
191
191
|
var parsed = getHashParams();
|
|
192
|
-
//
|
|
193
|
-
|
|
192
|
+
// if (platform === PlatForm.XIAOZHI) {
|
|
193
|
+
dispatch(fetchxzLogOut({
|
|
194
194
|
thirdUserId: parsed === null || parsed === void 0 ? void 0 : parsed.thirdUserId,
|
|
195
195
|
platform: parsed === null || parsed === void 0 ? void 0 : parsed.platform,
|
|
196
196
|
taobaoNick: parsed === null || parsed === void 0 ? void 0 : parsed.taobaoNick,
|
|
197
197
|
subUserNick: parsed === null || parsed === void 0 ? void 0 : parsed.subUserNick
|
|
198
|
-
}))
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
198
|
+
})).unwrap().then(function (res) {
|
|
199
|
+
var success = res.success;
|
|
200
|
+
if (success) {
|
|
201
|
+
console.log('xzlogOut3');
|
|
202
|
+
onEmpowerCallback === null || onEmpowerCallback === void 0 ? void 0 : onEmpowerCallback();
|
|
203
|
+
}
|
|
204
|
+
});
|
|
205
|
+
// } else {
|
|
206
|
+
// dispatch(fetchLogOut())
|
|
207
|
+
// .unwrap()
|
|
208
|
+
// .then((res: { success: boolean }) => {
|
|
209
|
+
// const { success } = res;
|
|
210
|
+
// if (success) {
|
|
211
|
+
// onEmpowerCallback?.();
|
|
212
|
+
// }
|
|
213
|
+
// });
|
|
214
|
+
// }
|
|
202
215
|
}
|
|
203
216
|
});
|
|
204
217
|
};
|
|
218
|
+
|
|
205
219
|
return /*#__PURE__*/React.createElement("div", {
|
|
206
220
|
className: "userInfo"
|
|
207
221
|
}, /*#__PURE__*/React.createElement("div", {
|
|
@@ -137,7 +137,7 @@ var getBasicsOrderInfo = function getBasicsOrderInfo(orderInfo, xiaozhiOrder) {
|
|
|
137
137
|
//订单返填
|
|
138
138
|
export var orderBack = /*#__PURE__*/function () {
|
|
139
139
|
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
|
|
140
|
-
var order_no, form, propsShopid, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, callbackShopId, setLoading, callKey, shopId, _res$data, res, shopInfo, _res$data3, _res$data4, _res$data5, JOIN_SHOP, hasFlagMap, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, thirdShopMainType, _kmVideoComponent$com, _data$value, _data$value3, _jstOrder$value, _jstOrder$value2, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsE3Order$value, _kmOrder$value, _gyOrder$value, _bsOrders$orders, _bsE3Orders$orderList, _wlnOrders$orders, _wdtOrders$trades, _gyOrders$trades, _kmOrders$orderDetail, promise, kmVideoComponent, _yield$Promise$allSet, _yield$Promise$allSet2, data, xiaozhiOrder, jstOrder, bsOrder, wlnOrder, wdtOrder, bsE3Order, kmOrder, gyOrder, kmVideoOrder, _data$value2, orderInfo, jstOrders, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, gyOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, gyInfo, jstInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, hasSigningDatetime, _signDatetime$data, signDatetime, values, paymentUniqueKey;
|
|
140
|
+
var order_no, form, propsShopid, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, callbackShopId, setLoading, callKey, shopId, _res$data, res, shopInfo, _res$data3, _res$data4, _res$data5, JOIN_SHOP, hasFlagMap, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, thirdShopMainType, _kmVideoComponent$com, _data$value, _data$value3, _data$value4, _jstOrder$value, _jstOrder$value2, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsE3Order$value, _kmOrder$value, _gyOrder$value, _bsOrders$orders, _bsE3Orders$orderList, _wlnOrders$orders, _wdtOrders$trades, _gyOrders$trades, _kmOrders$orderDetail, promise, kmVideoComponent, _yield$Promise$allSet, _yield$Promise$allSet2, data, xiaozhiOrder, jstOrder, bsOrder, wlnOrder, wdtOrder, bsE3Order, kmOrder, gyOrder, kmVideoOrder, _data$value2, orderInfo, jstOrders, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, gyOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, gyInfo, jstInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, hasSigningDatetime, _signDatetime$data, signDatetime, values, paymentUniqueKey;
|
|
141
141
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
142
142
|
while (1) switch (_context.prev = _context.next) {
|
|
143
143
|
case 0:
|
|
@@ -290,56 +290,58 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
290
290
|
if (data !== null && data !== void 0 && (_data$value = data.value) !== null && _data$value !== void 0 && _data$value.message) {
|
|
291
291
|
message.warning(data === null || data === void 0 ? void 0 : (_data$value2 = data.value) === null || _data$value2 === void 0 ? void 0 : _data$value2.message);
|
|
292
292
|
}
|
|
293
|
-
orderInfo =
|
|
294
|
-
if ([PlatForm.TB].includes(plat.platform)) {
|
|
293
|
+
orderInfo = ((data === null || data === void 0 ? void 0 : (_data$value3 = data.value) === null || _data$value3 === void 0 ? void 0 : _data$value3.data) || (xiaozhiOrder === null || xiaozhiOrder === void 0 ? void 0 : xiaozhiOrder.value)) && getBasicsOrderInfo(data === null || data === void 0 ? void 0 : (_data$value4 = data.value) === null || _data$value4 === void 0 ? void 0 : _data$value4.data, xiaozhiOrder === null || xiaozhiOrder === void 0 ? void 0 : xiaozhiOrder.value); //千牛端优先获取端上买家昵称
|
|
294
|
+
if ([PlatForm.TB].includes(plat.platform) && orderInfo) {
|
|
295
295
|
orderInfo.buyerNick = (plat === null || plat === void 0 ? void 0 : plat.buyerNick) || (orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.buyerNick);
|
|
296
296
|
}
|
|
297
|
-
jstOrders = jstOrder
|
|
297
|
+
jstOrders = (jstOrder === null || jstOrder === void 0 ? void 0 : (_jstOrder$value = jstOrder.value) === null || _jstOrder$value === void 0 ? void 0 : _jstOrder$value.data) && {
|
|
298
298
|
orderList: jstOrder === null || jstOrder === void 0 ? void 0 : (_jstOrder$value2 = jstOrder.value) === null || _jstOrder$value2 === void 0 ? void 0 : _jstOrder$value2.data
|
|
299
|
-
}
|
|
300
|
-
bsOrders =
|
|
301
|
-
wlnOrders =
|
|
302
|
-
wdtOrders =
|
|
303
|
-
bsE3Orders =
|
|
304
|
-
kmOrders =
|
|
305
|
-
gyOrders =
|
|
306
|
-
bsE3Orders.orderList = filterBsE3Orders(bsE3Orders, order_no);
|
|
307
|
-
wdtOrders.trades = filterWdtOrders(wdtOrders, order_no);
|
|
308
|
-
kmOrders.orderDetailDtoList = filterKmOrders(kmOrders, order_no);
|
|
309
|
-
gyOrders.trades = filterGyOrders(gyOrders, order_no);
|
|
310
|
-
jstOrders.trades = filterJstOrders(jstOrders, order_no);
|
|
299
|
+
} || null;
|
|
300
|
+
bsOrders = bsOrder === null || bsOrder === void 0 ? void 0 : (_bsOrder$value = bsOrder.value) === null || _bsOrder$value === void 0 ? void 0 : _bsOrder$value.data;
|
|
301
|
+
wlnOrders = wlnOrder === null || wlnOrder === void 0 ? void 0 : (_wlnOrder$value = wlnOrder.value) === null || _wlnOrder$value === void 0 ? void 0 : _wlnOrder$value.data;
|
|
302
|
+
wdtOrders = wdtOrder === null || wdtOrder === void 0 ? void 0 : (_wdtOrder$value = wdtOrder.value) === null || _wdtOrder$value === void 0 ? void 0 : _wdtOrder$value.data;
|
|
303
|
+
bsE3Orders = bsE3Order === null || bsE3Order === void 0 ? void 0 : (_bsE3Order$value = bsE3Order.value) === null || _bsE3Order$value === void 0 ? void 0 : _bsE3Order$value.data;
|
|
304
|
+
kmOrders = kmOrder === null || kmOrder === void 0 ? void 0 : (_kmOrder$value = kmOrder.value) === null || _kmOrder$value === void 0 ? void 0 : _kmOrder$value.data;
|
|
305
|
+
gyOrders = gyOrder === null || gyOrder === void 0 ? void 0 : (_gyOrder$value = gyOrder.value) === null || _gyOrder$value === void 0 ? void 0 : _gyOrder$value.data;
|
|
306
|
+
if (bsE3Orders) bsE3Orders.orderList = filterBsE3Orders(bsE3Orders, order_no);
|
|
307
|
+
if (wdtOrders) wdtOrders.trades = filterWdtOrders(wdtOrders, order_no);
|
|
308
|
+
if (kmOrders) kmOrders.orderDetailDtoList = filterKmOrders(kmOrders, order_no);
|
|
309
|
+
if (gyOrders) gyOrders.trades = filterGyOrders(gyOrders, order_no);
|
|
310
|
+
if (jstOrders) jstOrders.trades = filterJstOrders(jstOrders, order_no);
|
|
311
311
|
pushGyLog('gyOrders', gyOrders);
|
|
312
312
|
Monitor.automaticReport({
|
|
313
|
-
message: "orderBack:\u8BA2\u5355\u53F7:".concat(order_no, ",\u5E97\u94FAid:").concat(shopId, "
|
|
313
|
+
message: "orderBack:\u8BA2\u5355\u53F7:".concat(order_no, ",\n \u5E97\u94FAid:").concat(shopId, ",\n \u8BA2\u5355\u4FE1\u606F\uFF1A").concat(JSON.stringify(orderInfo || {}), ",\n jst\u4FE1\u606F:").concat(JSON.stringify(jstOrders || {}), ",\n bs\u4FE1\u606F:").concat(JSON.stringify(bsOrders || {}), ",\n wln\u4FE1\u606F:").concat(JSON.stringify(wlnOrders || {}), ",\n wdt\u4FE1\u606F:").concat(JSON.stringify(wdtOrders || {}), ",\n bsE3\u4FE1\u606F:").concat(JSON.stringify(bsE3Orders || {}), ",\n km\u4FE1\u606F:").concat(JSON.stringify(kmOrders || {}), ",\n \u7BA1\u6613\u4FE1\u606F:").concat(JSON.stringify(gyOrders || []), "\n ")
|
|
314
314
|
});
|
|
315
|
-
if (plat !== null && plat !== void 0 && plat.subOrderNo) {
|
|
315
|
+
if (bsOrders && plat !== null && plat !== void 0 && plat.subOrderNo) {
|
|
316
316
|
bsOrders.orders = bsOrders.orders.filter(function (item) {
|
|
317
317
|
return item.billNo === plat.subOrderNo;
|
|
318
318
|
});
|
|
319
319
|
}
|
|
320
|
-
bsInfo = bsOrderTransform({
|
|
320
|
+
bsInfo = bsOrders && bsOrderTransform({
|
|
321
321
|
detail: bsOrders || {}
|
|
322
322
|
});
|
|
323
|
-
wlnInfo = wlnOrderTransform(wlnOrders || {});
|
|
324
|
-
bsE3Info = bsE3OrderTransform(_objectSpread(_objectSpread({}, bsE3Orders), {}, {
|
|
323
|
+
wlnInfo = wlnOrders && wlnOrderTransform(wlnOrders || {});
|
|
324
|
+
bsE3Info = bsE3Orders && bsE3OrderTransform(_objectSpread(_objectSpread({}, bsE3Orders), {}, {
|
|
325
325
|
componentList: templateDetail.componentDtoList,
|
|
326
326
|
orderNo: order_no
|
|
327
327
|
}), form);
|
|
328
|
-
wdtInfo = wdtOrderTransform(_objectSpread(_objectSpread({}, wdtOrders), {}, {
|
|
328
|
+
wdtInfo = wdtOrders && wdtOrderTransform(_objectSpread(_objectSpread({}, wdtOrders), {}, {
|
|
329
329
|
componentList: templateDetail.componentDtoList,
|
|
330
330
|
orderNo: order_no
|
|
331
331
|
}), form);
|
|
332
|
-
kmInfo = kmOrderTransform(_objectSpread(_objectSpread({}, kmOrders), {}, {
|
|
332
|
+
kmInfo = kmOrders && kmOrderTransform(_objectSpread(_objectSpread({}, kmOrders), {}, {
|
|
333
333
|
order_no: order_no,
|
|
334
334
|
componentList: templateDetail.componentDtoList
|
|
335
335
|
}), form);
|
|
336
|
-
kmInfo
|
|
337
|
-
|
|
336
|
+
if (kmInfo) {
|
|
337
|
+
kmInfo.kmVideo = kmVideoOrder === null || kmVideoOrder === void 0 ? void 0 : kmVideoOrder.value;
|
|
338
|
+
}
|
|
339
|
+
gyInfo = gyOrders && gyOrderTransform(_objectSpread(_objectSpread({}, gyOrders), {}, {
|
|
338
340
|
componentList: templateDetail.componentDtoList,
|
|
339
341
|
orderNo: order_no
|
|
340
342
|
}), form);
|
|
341
343
|
pushGyLog('gyInfo', gyInfo);
|
|
342
|
-
jstInfo = jstOrderTransform(_objectSpread(_objectSpread({}, jstOrders), {}, {
|
|
344
|
+
jstInfo = jstOrders && jstOrderTransform(_objectSpread(_objectSpread({}, jstOrders), {}, {
|
|
343
345
|
componentList: templateDetail.componentDtoList,
|
|
344
346
|
orderNo: order_no
|
|
345
347
|
}), form);
|
|
@@ -443,7 +445,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
443
445
|
|
|
444
446
|
//获取当前表单字段
|
|
445
447
|
formValue = form.getFieldsValue();
|
|
446
|
-
detail = _objectSpread(_objectSpread({}, orderInfo), {}, {
|
|
448
|
+
detail = _objectSpread(_objectSpread({}, orderInfo || {}), {}, {
|
|
447
449
|
jstOrder: jstInfo,
|
|
448
450
|
bsOrder: bsInfo,
|
|
449
451
|
wlnOrder: wlnInfo,
|
|
@@ -454,6 +456,10 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
454
456
|
});
|
|
455
457
|
pushGyLog('detail', detail);
|
|
456
458
|
//抖音数据特殊处理
|
|
459
|
+
if (!orderInfo) {
|
|
460
|
+
_context.next = 118;
|
|
461
|
+
break;
|
|
462
|
+
}
|
|
457
463
|
if (shopSourceStr === 'FXG') {
|
|
458
464
|
detail = updateDYDetails(detail);
|
|
459
465
|
} else if (shopSourceStr === 'SPH' || shopSourceStr === 'WXXD') {
|
|
@@ -463,7 +469,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
463
469
|
hasSelectItem = HasErpItemSelectHandle(templateDetail);
|
|
464
470
|
erpPromiseList = [];
|
|
465
471
|
if (!(shopSourceStr === 'TAOBAO' && hasSelectItem)) {
|
|
466
|
-
_context.next =
|
|
472
|
+
_context.next = 102;
|
|
467
473
|
break;
|
|
468
474
|
}
|
|
469
475
|
list = detail['itemList'];
|
|
@@ -481,10 +487,10 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
481
487
|
resolve({});
|
|
482
488
|
});
|
|
483
489
|
});
|
|
484
|
-
_context.prev =
|
|
485
|
-
_context.next =
|
|
490
|
+
_context.prev = 92;
|
|
491
|
+
_context.next = 95;
|
|
486
492
|
return Promise.all(promises);
|
|
487
|
-
case
|
|
493
|
+
case 95:
|
|
488
494
|
erpPromiseList = _context.sent;
|
|
489
495
|
detail['itemList'] = (_detail$itemList = detail['itemList']) === null || _detail$itemList === void 0 ? void 0 : _detail$itemList.map(function (item, index) {
|
|
490
496
|
return _objectSpread(_objectSpread({}, item), {}, {
|
|
@@ -494,25 +500,25 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
494
500
|
})
|
|
495
501
|
});
|
|
496
502
|
});
|
|
497
|
-
_context.next =
|
|
503
|
+
_context.next = 102;
|
|
498
504
|
break;
|
|
499
|
-
case
|
|
500
|
-
_context.prev =
|
|
501
|
-
_context.t1 = _context["catch"](
|
|
505
|
+
case 99:
|
|
506
|
+
_context.prev = 99;
|
|
507
|
+
_context.t1 = _context["catch"](92);
|
|
502
508
|
console.error('调用erp获取宝贝编码错误', _context.t1);
|
|
503
|
-
case
|
|
509
|
+
case 102:
|
|
504
510
|
// 判断是否存在签收时间组件
|
|
505
511
|
hasSigningDatetime = HasTradeSigningDatetime(templateDetail); // 如存在签收时间组件且订单也有返回相应物流单号跟物流公司编码,则调用接口获取签收时间
|
|
506
512
|
if (!hasSigningDatetime) {
|
|
507
|
-
_context.next =
|
|
513
|
+
_context.next = 118;
|
|
508
514
|
break;
|
|
509
515
|
}
|
|
510
516
|
if (!(orderInfo !== null && orderInfo !== void 0 && orderInfo.expressLogisticsCompany && orderInfo !== null && orderInfo !== void 0 && orderInfo.expressLogisticsCode)) {
|
|
511
|
-
_context.next =
|
|
517
|
+
_context.next = 117;
|
|
512
518
|
break;
|
|
513
519
|
}
|
|
514
|
-
_context.prev =
|
|
515
|
-
_context.next =
|
|
520
|
+
_context.prev = 105;
|
|
521
|
+
_context.next = 108;
|
|
516
522
|
return request({
|
|
517
523
|
url: '/qy/logistics/logisticsSignTime',
|
|
518
524
|
method: 'post',
|
|
@@ -522,23 +528,24 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
522
528
|
mailNo: orderInfo.expressLogisticsCode
|
|
523
529
|
}
|
|
524
530
|
});
|
|
525
|
-
case
|
|
531
|
+
case 108:
|
|
526
532
|
signDatetime = _context.sent;
|
|
527
533
|
detail['tradeSigningDateTime'] = signDatetime === null || signDatetime === void 0 ? void 0 : (_signDatetime$data = signDatetime.data) === null || _signDatetime$data === void 0 ? void 0 : _signDatetime$data.signTime;
|
|
528
|
-
_context.next =
|
|
534
|
+
_context.next = 115;
|
|
529
535
|
break;
|
|
530
|
-
case
|
|
531
|
-
_context.prev =
|
|
532
|
-
_context.t2 = _context["catch"](
|
|
536
|
+
case 112:
|
|
537
|
+
_context.prev = 112;
|
|
538
|
+
_context.t2 = _context["catch"](105);
|
|
533
539
|
console.error('调用签收时间错误', _context.t2);
|
|
534
|
-
case
|
|
535
|
-
_context.next =
|
|
540
|
+
case 115:
|
|
541
|
+
_context.next = 118;
|
|
536
542
|
break;
|
|
537
|
-
case 116:
|
|
538
|
-
detail['tradeSigningDateTime'] = '';
|
|
539
543
|
case 117:
|
|
544
|
+
detail['tradeSigningDateTime'] = '';
|
|
545
|
+
case 118:
|
|
540
546
|
values = orderBackFormValues({
|
|
541
547
|
detail: detail,
|
|
548
|
+
_get_order_fail_: !orderInfo,
|
|
542
549
|
order_no: order_no,
|
|
543
550
|
formValue: formValue,
|
|
544
551
|
templateDetail: templateDetail,
|
|
@@ -580,21 +587,21 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
580
587
|
shopId: shopId
|
|
581
588
|
}));
|
|
582
589
|
callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
|
|
583
|
-
_context.next =
|
|
590
|
+
_context.next = 129;
|
|
584
591
|
break;
|
|
585
|
-
case
|
|
586
|
-
_context.prev =
|
|
592
|
+
case 126:
|
|
593
|
+
_context.prev = 126;
|
|
587
594
|
_context.t3 = _context["catch"](25);
|
|
588
595
|
console.error(_context.t3);
|
|
589
|
-
case
|
|
590
|
-
_context.prev =
|
|
596
|
+
case 129:
|
|
597
|
+
_context.prev = 129;
|
|
591
598
|
setLoading === null || setLoading === void 0 ? void 0 : setLoading(false);
|
|
592
|
-
return _context.finish(
|
|
593
|
-
case
|
|
599
|
+
return _context.finish(129);
|
|
600
|
+
case 132:
|
|
594
601
|
case "end":
|
|
595
602
|
return _context.stop();
|
|
596
603
|
}
|
|
597
|
-
}, _callee, null, [[5, 12, 15, 18], [25,
|
|
604
|
+
}, _callee, null, [[5, 12, 15, 18], [25, 126, 129, 132], [92, 99], [105, 112]]);
|
|
598
605
|
}));
|
|
599
606
|
return function orderBack(_x) {
|
|
600
607
|
return _ref2.apply(this, arguments);
|
|
@@ -160,6 +160,11 @@ var processPicturePro = function processPicturePro(getValue) {
|
|
|
160
160
|
}) : (config === null || config === void 0 ? void 0 : config.pictureProList) || []);
|
|
161
161
|
};
|
|
162
162
|
};
|
|
163
|
+
var wdtTags = function wdtTags(getValue) {
|
|
164
|
+
return function (nex, config) {
|
|
165
|
+
return _defineProperty({}, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_wdtTags")), []));
|
|
166
|
+
};
|
|
167
|
+
};
|
|
163
168
|
var processBasicMultSelect = function processBasicMultSelect(getValue) {
|
|
164
169
|
return function (nex, config) {
|
|
165
170
|
var v = getValue("".concat(nex.uniqueKey, "_basicMultSelect"));
|
|
@@ -210,20 +215,20 @@ var processSubForm = function processSubForm(getValue) {
|
|
|
210
215
|
};
|
|
211
216
|
var processExpressLogisticsSelect = function processExpressLogisticsSelect(getValue) {
|
|
212
217
|
return function (nex, config) {
|
|
213
|
-
var
|
|
214
|
-
return
|
|
218
|
+
var _ref23;
|
|
219
|
+
return _ref23 = {}, _defineProperty(_ref23, nex.uniqueKey, {
|
|
215
220
|
company: getValue("".concat(nex.uniqueKey, "_expressLogisticsCompany")),
|
|
216
221
|
order: getValue("".concat(nex.uniqueKey, "_expressLogisticsCode"))
|
|
217
|
-
}), _defineProperty(
|
|
222
|
+
}), _defineProperty(_ref23, "".concat(nex.uniqueKey, "_expressLogisticsCompany"), getValue("".concat(nex.uniqueKey, "_expressLogisticsCompany"))), _defineProperty(_ref23, "".concat(nex.uniqueKey, "_expressLogisticsCode"), getValue("".concat(nex.uniqueKey, "_expressLogisticsCode"))), _ref23;
|
|
218
223
|
};
|
|
219
224
|
};
|
|
220
225
|
var processReturnLogisticsSelect = function processReturnLogisticsSelect(getValue) {
|
|
221
226
|
return function (nex, config) {
|
|
222
|
-
var
|
|
223
|
-
return
|
|
227
|
+
var _ref24;
|
|
228
|
+
return _ref24 = {}, _defineProperty(_ref24, nex.uniqueKey, {
|
|
224
229
|
company: getValue("".concat(nex.uniqueKey, "_returnLogisticsCompany")),
|
|
225
230
|
order: getValue("".concat(nex.uniqueKey, "_returnLogisticsCode"))
|
|
226
|
-
}), _defineProperty(
|
|
231
|
+
}), _defineProperty(_ref24, "".concat(nex.uniqueKey, "_returnLogisticsCompany"), getValue("".concat(nex.uniqueKey, "_returnLogisticsCompany"))), _defineProperty(_ref24, "".concat(nex.uniqueKey, "_returnLogisticsCode"), getValue("".concat(nex.uniqueKey, "_returnLogisticsCode"))), _ref24;
|
|
227
232
|
};
|
|
228
233
|
};
|
|
229
234
|
var processRemarkInput = function processRemarkInput(getValue) {
|
|
@@ -238,25 +243,25 @@ var processRemarkInput = function processRemarkInput(getValue) {
|
|
|
238
243
|
};
|
|
239
244
|
var processStatus = function processStatus(getValue) {
|
|
240
245
|
return function (nex, config) {
|
|
241
|
-
var
|
|
246
|
+
var _ref26;
|
|
242
247
|
var customerService = getValue("".concat(nex.uniqueKey, "_customerService"));
|
|
243
|
-
return
|
|
248
|
+
return _ref26 = {}, _defineProperty(_ref26, nex.uniqueKey, {
|
|
244
249
|
status: getValue("".concat(nex.uniqueKey, "_status")) || (config === null || config === void 0 ? void 0 : config.status),
|
|
245
250
|
customerService: jsonParseSecurity(customerService, customerService)
|
|
246
|
-
}), _defineProperty(
|
|
251
|
+
}), _defineProperty(_ref26, "".concat(nex.uniqueKey, "_processTime"), getValue('processTime')), _defineProperty(_ref26, "".concat(nex.uniqueKey, "_lastProcessingTime"), getValue('lastProcessingTime')), _ref26;
|
|
247
252
|
};
|
|
248
253
|
};
|
|
249
254
|
var processOrdinaryInvoice = function processOrdinaryInvoice(getValue) {
|
|
250
255
|
return function (nex, config) {
|
|
251
|
-
var
|
|
256
|
+
var _ref27;
|
|
252
257
|
var ordinaryMoney = getValue("".concat(nex.uniqueKey, "_ordinaryMoney"));
|
|
253
258
|
var ordinarySerial = getValue("".concat(nex.uniqueKey, "_ordinarySerial"));
|
|
254
259
|
var ordinaryTaitou = getValue("".concat(nex.uniqueKey, "_ordinaryTaitou"));
|
|
255
|
-
return
|
|
260
|
+
return _ref27 = {}, _defineProperty(_ref27, nex.uniqueKey, {
|
|
256
261
|
ordinaryMoney: ordinaryMoney,
|
|
257
262
|
ordinarySerial: ordinarySerial,
|
|
258
263
|
ordinaryTaitou: ordinaryTaitou
|
|
259
|
-
}), _defineProperty(
|
|
264
|
+
}), _defineProperty(_ref27, "".concat(nex.uniqueKey, "_ordinaryMoney"), ordinaryMoney ? Number(ordinaryMoney).toFixed(2) : null), _defineProperty(_ref27, "".concat(nex.uniqueKey, "_ordinarySerial"), ordinarySerial), _defineProperty(_ref27, "".concat(nex.uniqueKey, "_ordinaryTaitou"), ordinaryTaitou), _ref27;
|
|
260
265
|
};
|
|
261
266
|
};
|
|
262
267
|
var processLogisticsInterception = function processLogisticsInterception(getValue) {
|
|
@@ -313,12 +318,12 @@ var processItemSelectThird = function processItemSelectThird(getValue) {
|
|
|
313
318
|
};
|
|
314
319
|
var processEnterPrisePayment = function processEnterPrisePayment(getValue) {
|
|
315
320
|
return function (nex, config) {
|
|
316
|
-
var
|
|
321
|
+
var _ref34;
|
|
317
322
|
var subFields = ['enterprisePaymentAlipayNick', 'enterprisePaymentAlipayNo', 'enterprisePaymentBuyerNick', 'enterprisePaymentBuyerOpenUid', 'enterprisePaymentRefundFee', 'enterprisePaymentStatus', 'enterprisePaymentTid'];
|
|
318
323
|
var map = subFields.reduce(function (cur, nxt) {
|
|
319
324
|
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, nxt, getValue("".concat(nex.uniqueKey, "_").concat(nxt))));
|
|
320
325
|
}, {});
|
|
321
|
-
return
|
|
326
|
+
return _ref34 = {}, _defineProperty(_ref34, nex.uniqueKey, map), _defineProperty(_ref34, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick"))), _defineProperty(_ref34, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo"))), _defineProperty(_ref34, "".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick"))), _defineProperty(_ref34, "".concat(nex.uniqueKey, "_enterprisePaymentRefundFee"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentRefundFee"))), _defineProperty(_ref34, "".concat(nex.uniqueKey, "_enterprisePaymentStatus"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentStatus"))), _defineProperty(_ref34, "".concat(nex.uniqueKey, "_enterprisePaymentTime"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentTime"))), _defineProperty(_ref34, "".concat(nex.uniqueKey, "_enterprisePaymentTid"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentTid"))), _ref34;
|
|
322
327
|
};
|
|
323
328
|
};
|
|
324
329
|
var processJstLogistics = function processJstLogistics(getValue) {
|
|
@@ -994,14 +999,14 @@ var processJstReturnGoods = function processJstReturnGoods(templateColumns) {
|
|
|
994
999
|
};
|
|
995
1000
|
var processLabel = function processLabel(getValue) {
|
|
996
1001
|
return function (nex, config) {
|
|
997
|
-
var
|
|
998
|
-
return
|
|
1002
|
+
var _ref70;
|
|
1003
|
+
return _ref70 = {}, _defineProperty(_ref70, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref70, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref70;
|
|
999
1004
|
};
|
|
1000
1005
|
};
|
|
1001
1006
|
var processMemberLevel = function processMemberLevel(getValue) {
|
|
1002
1007
|
return function (nex, config) {
|
|
1003
|
-
var
|
|
1004
|
-
return
|
|
1008
|
+
var _ref71;
|
|
1009
|
+
return _ref71 = {}, _defineProperty(_ref71, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref71, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref71;
|
|
1005
1010
|
};
|
|
1006
1011
|
};
|
|
1007
1012
|
var processAfterSalesOrderId = function processAfterSalesOrderId(getValue) {
|
|
@@ -1170,7 +1175,8 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
|
|
|
1170
1175
|
BS_E3_REISSUE_GOODS: processBsE3ReissueGoods(templateColumns),
|
|
1171
1176
|
ACTUAL_RECEIPT_PAYMENT: processSingleField,
|
|
1172
1177
|
WDT_SHOP: processSingleField,
|
|
1173
|
-
KM_VIDEO: processKmVideo
|
|
1178
|
+
KM_VIDEO: processKmVideo,
|
|
1179
|
+
WDT_TAGS: wdtTags
|
|
1174
1180
|
};
|
|
1175
1181
|
return templateColumns.reduce(function (cur, nex) {
|
|
1176
1182
|
var _componentProcessors;
|
package/dist/esm/model/login.js
CHANGED
|
@@ -102,7 +102,7 @@ export var fetchLogOut = createAsyncThunk('login/logOut', /*#__PURE__*/_asyncToG
|
|
|
102
102
|
return logOut();
|
|
103
103
|
case 2:
|
|
104
104
|
response = _context4.sent;
|
|
105
|
-
return _context4.abrupt("return", response
|
|
105
|
+
return _context4.abrupt("return", response);
|
|
106
106
|
case 4:
|
|
107
107
|
case "end":
|
|
108
108
|
return _context4.stop();
|
|
@@ -142,7 +142,7 @@ export var fetchxzLogOut = createAsyncThunk('login/xzlogOut', /*#__PURE__*/funct
|
|
|
142
142
|
case 3:
|
|
143
143
|
response = _context6.sent;
|
|
144
144
|
console.log('xzlogOut2');
|
|
145
|
-
return _context6.abrupt("return", response
|
|
145
|
+
return _context6.abrupt("return", response);
|
|
146
146
|
case 6:
|
|
147
147
|
case "end":
|
|
148
148
|
return _context6.stop();
|
|
@@ -74,7 +74,6 @@ export declare const addLogicFlowWorkOrder: (data: any) => Promise<any>;
|
|
|
74
74
|
export declare const queryAllWorkOrderList: (s: string, data: any) => Promise<any>;
|
|
75
75
|
export declare const getAlipayBillReceipt: (data: any) => Promise<any>;
|
|
76
76
|
export declare const jstOrderDetail: (data: any) => Promise<any>;
|
|
77
|
-
export declare const jstOrderOutList: (data: any) => Promise<any>;
|
|
78
77
|
export declare const bsOrderDetail: (data: any) => Promise<any>;
|
|
79
78
|
export declare const wdtOrderDetail: (data: any) => Promise<any>;
|
|
80
79
|
export declare const bsE3OrderDetail: (data: any) => Promise<any>;
|
|
@@ -393,16 +393,6 @@ export var jstOrderDetail = function jstOrderDetail(data) {
|
|
|
393
393
|
});
|
|
394
394
|
};
|
|
395
395
|
|
|
396
|
-
// jst订单详情
|
|
397
|
-
export var jstOrderOutList = function jstOrderOutList(data) {
|
|
398
|
-
return request({
|
|
399
|
-
url: '/qy/gdfw/jst/erp/orderOut/list',
|
|
400
|
-
method: 'post',
|
|
401
|
-
data: data,
|
|
402
|
-
infoLevel: 'warning'
|
|
403
|
-
});
|
|
404
|
-
};
|
|
405
|
-
|
|
406
396
|
// bs订单详情
|
|
407
397
|
export var bsOrderDetail = function bsOrderDetail(data) {
|
|
408
398
|
return request({
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/kmkf-work-order-service-component",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.78",
|
|
4
4
|
"module": "dist/esm/index.js",
|
|
5
5
|
"typings": "dist/esm/index.d.ts",
|
|
6
6
|
"files": [
|
|
@@ -32,9 +32,9 @@
|
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
34
|
"@ant-design/icons": "^4.7.0",
|
|
35
|
-
"@kmkf-fe-packages/basic-components": "2.0.
|
|
36
|
-
"@kmkf-fe-packages/kmkf-utils": "2.0.
|
|
37
|
-
"@kmkf-fe-packages/services-components": "2.0.
|
|
35
|
+
"@kmkf-fe-packages/basic-components": "2.0.78",
|
|
36
|
+
"@kmkf-fe-packages/kmkf-utils": "2.0.78",
|
|
37
|
+
"@kmkf-fe-packages/services-components": "2.0.78",
|
|
38
38
|
"@reduxjs/toolkit": "^1.8.5",
|
|
39
39
|
"ahooks": "^3.7.4",
|
|
40
40
|
"copy-to-clipboard": "^3.3.3",
|
|
@@ -73,7 +73,7 @@
|
|
|
73
73
|
"publishConfig": {
|
|
74
74
|
"access": "public"
|
|
75
75
|
},
|
|
76
|
-
"gitHead": "
|
|
76
|
+
"gitHead": "029c929112eda38ed0d433cdc122bcf9f687bdf3",
|
|
77
77
|
"gitHooks": {
|
|
78
78
|
"pre-commit": "lint-staged"
|
|
79
79
|
}
|