@kmkf-fe-packages/kmkf-work-order-service-component 0.25.3-alpha.2 → 0.25.3-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/esm/FlowTemplateDetail/components/FormRender/index.js +26 -5
- package/dist/esm/FlowTemplateDetail/components/PreNodeRender/index.js +1 -4
- package/dist/esm/FlowTemplateDetail/index.js +2 -1
- package/dist/esm/WorkOrder/components/PaymentWorkOrderList/components/PaymentWorkOrderCard/index.js +3 -11
- package/dist/esm/WorkOrder/index.js +2 -1
- package/dist/esm/common/utils/tools.d.ts +1 -0
- package/dist/esm/common/utils/tools.js +240 -117
- package/dist/esm/model/logicFlow/selector.d.ts +3 -0
- package/dist/esm/model/servers/api.d.ts +1 -0
- package/dist/esm/model/servers/api.js +10 -0
- package/package.json +5 -5
|
@@ -28,10 +28,10 @@ import { get, some, set, every, cloneDeep, isEmpty, intersection, throttle } fro
|
|
|
28
28
|
import 'moment/locale/zh-cn';
|
|
29
29
|
import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME, EXCLUDE_REPLACE_TOP_COMPONENT,
|
|
30
30
|
// 重复检验不需要展示在顶部的
|
|
31
|
-
INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, wlnSystemOrderBackValues, getMappingConfigByTemplateDetail, setLogisticsInfo } from "../../../common/utils/tools";
|
|
31
|
+
INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, wlnSystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo } from "../../../common/utils/tools";
|
|
32
32
|
import { replaceCheck, orderDetail } from "../../../model/servers/api";
|
|
33
33
|
import { factory } from '@kmkf-fe-packages/services-components';
|
|
34
|
-
import { AddressData, ExpressData, ExpressInterceptData, PlatData, LogisticsAddressData, getExpression, formatDisplayConfig, BsAddressData } from '@kmkf-fe-packages/kmkf-utils';
|
|
34
|
+
import { AddressData, ExpressData, ExpressInterceptData, PlatData, LogisticsAddressData, getExpression, formatDisplayConfig, BsAddressData, WdtAddressData } from '@kmkf-fe-packages/kmkf-utils';
|
|
35
35
|
import ShopName from "../ShopName";
|
|
36
36
|
import { PlatForm } from "../../../model/flowTemplateDetail/types";
|
|
37
37
|
import { groupByPreNode, getCurrentNodeModifiedShowHideRule } from "./common";
|
|
@@ -117,6 +117,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
117
117
|
PlatData.getInstance();
|
|
118
118
|
LogisticsAddressData.getInstance();
|
|
119
119
|
BsAddressData.getInstance();
|
|
120
|
+
WdtAddressData.getInstance();
|
|
120
121
|
var _Form$useForm = Form.useForm(),
|
|
121
122
|
_Form$useForm2 = _slicedToArray(_Form$useForm, 1),
|
|
122
123
|
preNodeForm = _Form$useForm2[0];
|
|
@@ -132,7 +133,17 @@ var FormRender = function FormRender(props, ref) {
|
|
|
132
133
|
// TODO: 前置节点form单独设置指
|
|
133
134
|
useEffect(function () {
|
|
134
135
|
if (!isEmpty(record)) {
|
|
135
|
-
var
|
|
136
|
+
var preNodeComponentDtoList = cloneDeep((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList) || []);
|
|
137
|
+
var componentTemplateConfigVos = cloneDeep((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentTemplateConfigVos) || []);
|
|
138
|
+
preNodeComponentDtoList.forEach(function (item) {
|
|
139
|
+
var currentConfig = componentTemplateConfigVos.find(function (configItem) {
|
|
140
|
+
return configItem.componentUniqueKey === item.uniqueKey;
|
|
141
|
+
});
|
|
142
|
+
if (currentConfig !== null && currentConfig !== void 0 && currentConfig.config) {
|
|
143
|
+
item.componentConfig = currentConfig.config;
|
|
144
|
+
}
|
|
145
|
+
});
|
|
146
|
+
var transData = calcWorkOrderList([record], preNodeComponentDtoList);
|
|
136
147
|
preNodeForm.setFieldsValue(_objectSpread({}, get(transData, '0', {})));
|
|
137
148
|
fillByShopId(get(transData, '0', {}).shopId);
|
|
138
149
|
}
|
|
@@ -515,6 +526,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
515
526
|
//订单返填
|
|
516
527
|
var changeHandle = function changeHandle(order_no) {
|
|
517
528
|
if (!order_no) return;
|
|
529
|
+
console.log('[订单返填 changeHandle order_no ] >', order_no);
|
|
518
530
|
orderBack({
|
|
519
531
|
order_no: order_no,
|
|
520
532
|
form: form,
|
|
@@ -547,6 +559,13 @@ var FormRender = function FormRender(props, ref) {
|
|
|
547
559
|
form: form
|
|
548
560
|
});
|
|
549
561
|
}
|
|
562
|
+
if (workOrderComponentType === 'WDT_SYSTEM_ORDER') {
|
|
563
|
+
wdtSystemOrderBackValues({
|
|
564
|
+
templateList: templateDetail,
|
|
565
|
+
value: value,
|
|
566
|
+
form: form
|
|
567
|
+
});
|
|
568
|
+
}
|
|
550
569
|
if (logisticsMappingConfig && ['INPUT', 'EXPRESS_LOGISTICS_SELECT', 'BS_LOGISTICS'].includes(workOrderComponentType)) {
|
|
551
570
|
setLogisticsInfo({
|
|
552
571
|
logisticsMappingConfig: logisticsMappingConfig,
|
|
@@ -596,7 +615,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
596
615
|
setShopId(val);
|
|
597
616
|
// 清空表单字段
|
|
598
617
|
var needClearFormFields = get(templateDetail, 'componentDtoList', []).reduce(function (cur, nxt) {
|
|
599
|
-
if (['ITEM_SELECT_THIRD', 'STATUS', 'ITEM_SELECT', 'ITEM_ID', 'ITEM_ENCODE', 'JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD', 'BS_GOODS', 'BS_EXCHANGE_GOODS', 'BS_REISSUE_GOODS', 'BS_RETURN_GOODS', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD'].includes(nxt === null || nxt === void 0 ? void 0 : nxt.workOrderComponentType)) {
|
|
618
|
+
if (['ITEM_SELECT_THIRD', 'STATUS', 'ITEM_SELECT', 'ITEM_ID', 'ITEM_ENCODE', 'JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD', 'BS_GOODS', 'BS_EXCHANGE_GOODS', 'BS_REISSUE_GOODS', 'BS_RETURN_GOODS', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WDT_SYSTEM_ORDER', 'WDT_REISSUE_GOODS'].includes(nxt === null || nxt === void 0 ? void 0 : nxt.workOrderComponentType)) {
|
|
600
619
|
cur.push(nxt === null || nxt === void 0 ? void 0 : nxt.uniqueKey);
|
|
601
620
|
}
|
|
602
621
|
return cur;
|
|
@@ -634,13 +653,14 @@ var FormRender = function FormRender(props, ref) {
|
|
|
634
653
|
}
|
|
635
654
|
//如果有bs组件 设置成初始值
|
|
636
655
|
var hasBs = get(templateDetail, 'componentDtoList', []).some(function (item) {
|
|
637
|
-
return ['BS_LOGISTICS', 'BS_SEND_GOOD', 'WLN_LOGISTICS', 'WLN_SEND_GOOD'].includes(item.workOrderComponentType);
|
|
656
|
+
return ['BS_LOGISTICS', 'BS_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WLN_LOGISTICS', 'WLN_SEND_GOOD'].includes(item.workOrderComponentType);
|
|
638
657
|
});
|
|
639
658
|
if (hasBs) {
|
|
640
659
|
var bsValue = get(templateDetail, 'componentDtoList', []).reduce(function (prv, next) {
|
|
641
660
|
switch (next.workOrderComponentType) {
|
|
642
661
|
case 'BS_LOGISTICS':
|
|
643
662
|
case 'WLN_LOGISTICS':
|
|
663
|
+
case 'WDT_LOGISTICS':
|
|
644
664
|
prv[next.uniqueKey] = [{
|
|
645
665
|
logisticsCompany: null,
|
|
646
666
|
logisticsCode: null
|
|
@@ -648,6 +668,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
648
668
|
break;
|
|
649
669
|
case 'BS_SEND_GOOD':
|
|
650
670
|
case 'WLN_SEND_GOOD':
|
|
671
|
+
case 'WDT_SEND_GOOD':
|
|
651
672
|
prv[next.uniqueKey] = [{
|
|
652
673
|
sendName: '',
|
|
653
674
|
sendId: ''
|
|
@@ -13,10 +13,7 @@ var PreNodeRender = function PreNodeRender(props) {
|
|
|
13
13
|
id: t.uniqueKey,
|
|
14
14
|
name: t.name,
|
|
15
15
|
componentConfig: t.componentConfig,
|
|
16
|
-
type: t.workOrderComponentType
|
|
17
|
-
effects: {
|
|
18
|
-
env: platform
|
|
19
|
-
}
|
|
16
|
+
type: t.workOrderComponentType
|
|
20
17
|
});
|
|
21
18
|
// 淘宝端的买家昵称是需要亮灯展示的
|
|
22
19
|
if (platform === PlatForm.TB && ['ENTERPRISE_PAYMENT', 'BUYER_NICK_INPUT'].includes(t.workOrderComponentType)) {
|
|
@@ -20,7 +20,7 @@ import { get, find, isEmpty } from 'lodash';
|
|
|
20
20
|
import { useDispatch, useSelector, Provider, batch } from 'react-redux';
|
|
21
21
|
import store from "../model/store";
|
|
22
22
|
import zhCN from 'antd/es/locale/zh_CN';
|
|
23
|
-
import { AddressData, ExpressData, ExpressInterceptData, PlatData, BsAddressData } from '@kmkf-fe-packages/kmkf-utils';
|
|
23
|
+
import { AddressData, ExpressData, ExpressInterceptData, PlatData, BsAddressData, WdtAddressData } from '@kmkf-fe-packages/kmkf-utils';
|
|
24
24
|
import { calcWorkOrderList, deleteCacheOrder } from "../common/utils/tools";
|
|
25
25
|
import { setPlat, fetchPanelInfo, fetchAllFlowOperateRecord, setAction, setVisibleRemarkList, setAddRemarkVisible, setLoading, setClearStore } from "../model/flowTemplateDetail";
|
|
26
26
|
import { selectFlowRecordList, selectRemarkRecordList, selectCurrentNodeDetail, selectTid, selectShopUniqueKey, selectOperateParams, selectFlowStatus, selectCurrentTradeIdWOrkOrderNumber, selectFlowTemplateId, selectLoading, selectWithDrawOrder, selectNodeAssistantMap, selectFlowTemplateType } from "../model/flowTemplateDetail/selector";
|
|
@@ -144,6 +144,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
144
144
|
ExpressInterceptData.getInstance();
|
|
145
145
|
PlatData.getInstance();
|
|
146
146
|
BsAddressData.getInstance();
|
|
147
|
+
WdtAddressData.getInstance();
|
|
147
148
|
};
|
|
148
149
|
var onUpdateRemark = function onUpdateRemark(remark) {
|
|
149
150
|
var flag = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
|
package/dist/esm/WorkOrder/components/PaymentWorkOrderList/components/PaymentWorkOrderCard/index.js
CHANGED
|
@@ -125,9 +125,7 @@ function PaymentWorkOrderCard(props) {
|
|
|
125
125
|
accountNoMix = record.accountNoMix,
|
|
126
126
|
tidRepeatPaymentUks = record.tidRepeatPaymentUks,
|
|
127
127
|
remitTime = record.remitTime,
|
|
128
|
-
buyerOpenUid = record.buyerOpenUid
|
|
129
|
-
alipayBillReceiptDetailId = record.alipayBillReceiptDetailId,
|
|
130
|
-
bizCode = record.bizCode;
|
|
128
|
+
buyerOpenUid = record.buyerOpenUid;
|
|
131
129
|
var btnList = workPayStatusFuncMap[workPayStatus].map(function (id) {
|
|
132
130
|
return /*#__PURE__*/React.createElement("div", {
|
|
133
131
|
className: "orderItemOperate",
|
|
@@ -141,7 +139,7 @@ function PaymentWorkOrderCard(props) {
|
|
|
141
139
|
_useState2 = _slicedToArray(_useState, 2),
|
|
142
140
|
visible = _useState2[0],
|
|
143
141
|
setVisible = _useState2[1];
|
|
144
|
-
var _useState3 = useState(
|
|
142
|
+
var _useState3 = useState(""),
|
|
145
143
|
_useState4 = _slicedToArray(_useState3, 2),
|
|
146
144
|
msg = _useState4[0],
|
|
147
145
|
setMsg = _useState4[1];
|
|
@@ -322,13 +320,7 @@ function PaymentWorkOrderCard(props) {
|
|
|
322
320
|
label: "\u5DE5\u5355\u7F16\u53F7\uFF1A",
|
|
323
321
|
value: workOrderId || paymentOrderKey,
|
|
324
322
|
tidRepeatPaymentUks: tidRepeatPaymentUks
|
|
325
|
-
}),
|
|
326
|
-
label: '支付凭证编码:',
|
|
327
|
-
value: alipayBillReceiptDetailId
|
|
328
|
-
}, {
|
|
329
|
-
label: '业务订单号:',
|
|
330
|
-
value: bizCode
|
|
331
|
-
}])), /*#__PURE__*/React.createElement(Divider, {
|
|
323
|
+
})), /*#__PURE__*/React.createElement(Divider, {
|
|
332
324
|
dashed: true,
|
|
333
325
|
style: {
|
|
334
326
|
margin: '12px 0'
|
|
@@ -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 { AddressData, BsAddressData } from '@kmkf-fe-packages/kmkf-utils';
|
|
25
|
+
import { AddressData, BsAddressData, WdtAddressData } from '@kmkf-fe-packages/kmkf-utils';
|
|
26
26
|
import OrderList from "./components/WorkOrderList";
|
|
27
27
|
import Reminder from "./components/Reminder";
|
|
28
28
|
import PaymentWorkOrderList from "./components/PaymentWorkOrderList";
|
|
@@ -113,6 +113,7 @@ var WorkOrder = function WorkOrder(props) {
|
|
|
113
113
|
// ExpressData.getInstance();
|
|
114
114
|
AddressData.getInstance().initData();
|
|
115
115
|
BsAddressData.getInstance().initData();
|
|
116
|
+
WdtAddressData.getInstance().initData();
|
|
116
117
|
// ExpressInterceptData.getInstance();
|
|
117
118
|
};
|
|
118
119
|
//判断是否店铺是否授权
|
|
@@ -103,6 +103,7 @@ export declare const deleteCacheOrder: ({ templateList, values, nodeId, flowTemp
|
|
|
103
103
|
}) => void;
|
|
104
104
|
export declare const bsSystemOrderBackValues: ({ templateList, value, form }: any) => void;
|
|
105
105
|
export declare const wlnSystemOrderBackValues: ({ templateList, value, form }: any) => void;
|
|
106
|
+
export declare const wdtSystemOrderBackValues: ({ templateList, value, form }: any) => void;
|
|
106
107
|
export declare const getMappingConfigByTemplateDetail: (templateDetail: {
|
|
107
108
|
componentDtoList: any;
|
|
108
109
|
uniqueKey: string;
|
|
@@ -19,9 +19,9 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
|
|
|
19
19
|
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
|
|
20
20
|
import { get, every, maxBy } from 'lodash';
|
|
21
21
|
import V from 'voca';
|
|
22
|
-
import { orderDetail, jstOrderDetail, bsOrderDetail, wlnOrderDetail } from "../../model/servers/api";
|
|
22
|
+
import { orderDetail, jstOrderDetail, bsOrderDetail, wlnOrderDetail, wdtOrderDetail } from "../../model/servers/api";
|
|
23
23
|
import moment from 'moment';
|
|
24
|
-
import { AddressData, ExpressData, orderBackFormValues, bsOrderBackFormValues, wlnOrderBackFormValues, findLabelBySelectValue, request, isNull, bsOrderTransform, wlnOrderTransform, unTransField } from '@kmkf-fe-packages/kmkf-utils';
|
|
24
|
+
import { AddressData, ExpressData, orderBackFormValues, bsOrderBackFormValues, wlnOrderBackFormValues, wdtOrderBackFormValues, findLabelBySelectValue, request, isNull, bsOrderTransform, wlnOrderTransform, wdtOrderTransform, unTransField } from '@kmkf-fe-packages/kmkf-utils';
|
|
25
25
|
import { cloneDeep, isEqual, set } from 'lodash';
|
|
26
26
|
import Monitor from 'kmkf-monitor';
|
|
27
27
|
import { PlatForm } from "../../model/flowTemplateDetail/types";
|
|
@@ -30,7 +30,6 @@ import cache from "../cache";
|
|
|
30
30
|
// 淘宝商品组件信息处理
|
|
31
31
|
|
|
32
32
|
var ONLY_SHOW_COMPONENT_TYPE = ['RADIO', 'INPUT', 'TEXTAREA', 'CHECKBOX', 'SELECT', 'DATETIME', 'PICTURE', 'MULT_SELECT', 'ORDINARY_INVOICE'];
|
|
33
|
-
//表单提交单一字段映射
|
|
34
33
|
var workTypeKeys = {
|
|
35
34
|
SHOP_NAME_INPUT: 'shopName',
|
|
36
35
|
//店铺名称
|
|
@@ -50,39 +49,7 @@ var workTypeKeys = {
|
|
|
50
49
|
DATETIME: 'dateTime',
|
|
51
50
|
TEXTAREA: 'textarea',
|
|
52
51
|
SELECT: 'select',
|
|
53
|
-
SYSTEM_ORDER_NO: 'systemOrderNo'
|
|
54
|
-
NEW_PAYMENT_STATUS: 'newPaymentStatus',
|
|
55
|
-
BUSINESS_ORDER_NO: 'businessOrderNo',
|
|
56
|
-
PAYMENT_VOUCHER_CODE: 'paymentVoucherCode'
|
|
57
|
-
};
|
|
58
|
-
//表单获取组装数据单一字段映射
|
|
59
|
-
var updateWorkTypeKeys = {
|
|
60
|
-
BASIC_GRADE: 'basicGrade',
|
|
61
|
-
TRADE_ID_INPUT: 'tradeId',
|
|
62
|
-
SHOP_NAME_INPUT: 'shopName',
|
|
63
|
-
RECEIVER_NAME_INPUT: 'receiveName',
|
|
64
|
-
//收件人姓名
|
|
65
|
-
RECEIVER_MOBILE_INPUT: 'receiveMobile',
|
|
66
|
-
//收件人手机号
|
|
67
|
-
TRADE_CREATE_DATETIME: 'tradeCreateDateTime',
|
|
68
|
-
//下单时间
|
|
69
|
-
TRADE_PAYMENT_DATETIME: 'tradePaymentDateTime',
|
|
70
|
-
//付款时间
|
|
71
|
-
TRADE_DELIVERY_DATETIME: 'tradeDeliveryDateTime',
|
|
72
|
-
//发货时间
|
|
73
|
-
TRADE_CLOSING_DATETIME: 'tradeClosingDateTime',
|
|
74
|
-
//成交时间
|
|
75
|
-
ACTUAL_PAYMENT: 'actualPayment',
|
|
76
|
-
SYSTEM_ORDER_NO: 'systemOrderNo',
|
|
77
|
-
BS_SIGNING_TIME: 'bsSigningTime',
|
|
78
|
-
BS_SEND_TIME: 'bsSendTime',
|
|
79
|
-
BS_TRADE_PAYMENT_TIME: 'bsTradePaymentTime',
|
|
80
|
-
BS_NET_RECEIPTS: 'bsNetReceipts',
|
|
81
|
-
BS_PACKAGE_WEIGHT: 'bsPackageWeight',
|
|
82
|
-
BS_DEPOSIT: 'bsDeposit',
|
|
83
|
-
NEW_PAYMENT_STATUS: 'newPaymentStatus',
|
|
84
|
-
BUSINESS_ORDER_NO: 'businessOrderNo',
|
|
85
|
-
PAYMENT_VOUCHER_CODE: 'paymentVoucherCode'
|
|
52
|
+
SYSTEM_ORDER_NO: 'systemOrderNo'
|
|
86
53
|
};
|
|
87
54
|
var findNodeById = function findNodeById(tree) {
|
|
88
55
|
var actived = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
|
|
@@ -677,7 +644,7 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
|
|
|
677
644
|
}),
|
|
678
645
|
name: item.name
|
|
679
646
|
});
|
|
680
|
-
} else if (['BS_LOGISTICS', 'WLN_LOGISTICS'].includes(item.workOrderComponentType)) {
|
|
647
|
+
} else if (['BS_LOGISTICS', 'WLN_LOGISTICS', 'WDT_LOGISTICS'].includes(item.workOrderComponentType)) {
|
|
681
648
|
var logisticsMap = {
|
|
682
649
|
BS_LOGISTICS: {
|
|
683
650
|
list: 'bsLogisticsList',
|
|
@@ -688,6 +655,11 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
|
|
|
688
655
|
list: 'wlnLogisticsList',
|
|
689
656
|
company: 'wlnLogisticsCompany',
|
|
690
657
|
code: 'wlnLogisticsCode'
|
|
658
|
+
},
|
|
659
|
+
WDT_LOGISTICS: {
|
|
660
|
+
list: 'wdtLogisticsList',
|
|
661
|
+
company: 'wdtLogisticsCompany',
|
|
662
|
+
code: 'wdtLogisticsCode'
|
|
691
663
|
}
|
|
692
664
|
};
|
|
693
665
|
var bsLogisticsList = get(nowData, "".concat(item.uniqueKey), []);
|
|
@@ -723,7 +695,7 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
|
|
|
723
695
|
}),
|
|
724
696
|
name: item.name
|
|
725
697
|
});
|
|
726
|
-
} else if (['BS_SEND_GOOD', 'WLN_SEND_GOOD'].includes(item.workOrderComponentType)) {
|
|
698
|
+
} else if (['BS_SEND_GOOD', 'WLN_SEND_GOOD', 'WDT_SEND_GOOD'].includes(item.workOrderComponentType)) {
|
|
727
699
|
var sendGoodMap = {
|
|
728
700
|
BS_SEND_GOOD: {
|
|
729
701
|
list: 'bsSendGood',
|
|
@@ -734,6 +706,11 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
|
|
|
734
706
|
list: 'wlnSendGood',
|
|
735
707
|
id: 'wlnSendId',
|
|
736
708
|
name: 'wlnSendName'
|
|
709
|
+
},
|
|
710
|
+
WDT_SEND_GOOD: {
|
|
711
|
+
list: 'wdtSendGood',
|
|
712
|
+
id: 'wdtSendId',
|
|
713
|
+
name: 'wdtSendName'
|
|
737
714
|
}
|
|
738
715
|
};
|
|
739
716
|
var bsSendList = get(nowData, "".concat(item.uniqueKey), []);
|
|
@@ -797,16 +774,26 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
|
|
|
797
774
|
}),
|
|
798
775
|
name: item.name
|
|
799
776
|
});
|
|
800
|
-
} else if (item.workOrderComponentType
|
|
801
|
-
var
|
|
777
|
+
} else if (['BS_GOODS', 'WDT_GOODS'].includes(item.workOrderComponentType)) {
|
|
778
|
+
var gooodsMap = {
|
|
779
|
+
BS_GOODS: {
|
|
780
|
+
type: 'bsGoods',
|
|
781
|
+
shopCode: 'shopCode'
|
|
782
|
+
},
|
|
783
|
+
WDT_GOODS: {
|
|
784
|
+
type: 'wdtGoods',
|
|
785
|
+
shopCode: 'shopCode'
|
|
786
|
+
}
|
|
787
|
+
};
|
|
788
|
+
var goods = get(nowData, "".concat(item.uniqueKey), {});
|
|
802
789
|
contentVoList.push({
|
|
803
|
-
uniqueKey: "".concat(item.uniqueKey, "
|
|
804
|
-
content:
|
|
790
|
+
uniqueKey: "".concat(item.uniqueKey, "_").concat(gooodsMap[item.workOrderComponentType].type),
|
|
791
|
+
content: goods === null || goods === void 0 ? void 0 : goods[gooodsMap[item.workOrderComponentType].type],
|
|
805
792
|
name: item.name
|
|
806
793
|
});
|
|
807
794
|
contentVoList.push({
|
|
808
|
-
uniqueKey: "".concat(item.uniqueKey, "
|
|
809
|
-
content: (
|
|
795
|
+
uniqueKey: "".concat(item.uniqueKey, "_").concat(gooodsMap[item.workOrderComponentType].shopCode),
|
|
796
|
+
content: (goods === null || goods === void 0 ? void 0 : goods[gooodsMap[item.workOrderComponentType].shopCode]) || '',
|
|
810
797
|
name: item.name
|
|
811
798
|
});
|
|
812
799
|
} else if (item.workOrderComponentType === 'BS_EXCHANGE_GOODS') {
|
|
@@ -859,21 +846,33 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
|
|
|
859
846
|
name: item.name
|
|
860
847
|
});
|
|
861
848
|
}
|
|
862
|
-
} else if (item.workOrderComponentType
|
|
863
|
-
var
|
|
849
|
+
} else if (['BS_REISSUE_GOODS', 'WDT_REISSUE_GOODS'].includes(item.workOrderComponentType)) {
|
|
850
|
+
var reissueMap = {
|
|
851
|
+
BS_REISSUE_GOODS: {
|
|
852
|
+
type: 'bsReissueType',
|
|
853
|
+
goods: 'bsReissueGoods',
|
|
854
|
+
shopCode: 'shopCode'
|
|
855
|
+
},
|
|
856
|
+
WDT_REISSUE_GOODS: {
|
|
857
|
+
type: 'wdtReissueType',
|
|
858
|
+
goods: 'wdtReissueGoods',
|
|
859
|
+
shopCode: 'shopCode'
|
|
860
|
+
}
|
|
861
|
+
};
|
|
862
|
+
var reissue = get(nowData, "".concat(item.uniqueKey), {});
|
|
864
863
|
contentVoList.push({
|
|
865
|
-
uniqueKey: "".concat(item.uniqueKey, "
|
|
866
|
-
content:
|
|
864
|
+
uniqueKey: "".concat(item.uniqueKey, "_").concat(reissueMap[item.workOrderComponentType].type),
|
|
865
|
+
content: reissue === null || reissue === void 0 ? void 0 : reissue[reissueMap[item.workOrderComponentType].type],
|
|
867
866
|
name: item.name
|
|
868
867
|
});
|
|
869
868
|
contentVoList.push({
|
|
870
|
-
uniqueKey: "".concat(item.uniqueKey, "
|
|
871
|
-
content:
|
|
869
|
+
uniqueKey: "".concat(item.uniqueKey, "_").concat(reissueMap[item.workOrderComponentType].goods),
|
|
870
|
+
content: reissue === null || reissue === void 0 ? void 0 : reissue[reissueMap[item.workOrderComponentType].goods],
|
|
872
871
|
name: item.name
|
|
873
872
|
});
|
|
874
873
|
contentVoList.push({
|
|
875
|
-
uniqueKey: "".concat(item.uniqueKey, "
|
|
876
|
-
content: (
|
|
874
|
+
uniqueKey: "".concat(item.uniqueKey, "_").concat(reissueMap[item.workOrderComponentType].shopCode),
|
|
875
|
+
content: (reissue === null || reissue === void 0 ? void 0 : reissue.shopCode) || '',
|
|
877
876
|
name: item.name
|
|
878
877
|
});
|
|
879
878
|
} else if (item.workOrderComponentType === 'BS_RETURN_GOODS') {
|
|
@@ -919,7 +918,7 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
|
|
|
919
918
|
content: get(nowData, "".concat(item.uniqueKey, ".postingReceiverMobile"), ''),
|
|
920
919
|
name: item.name
|
|
921
920
|
});
|
|
922
|
-
} else if (['BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER'].includes(item.workOrderComponentType)) {
|
|
921
|
+
} else if (['BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WDT_SYSTEM_ORDER'].includes(item.workOrderComponentType)) {
|
|
923
922
|
var systemOrderMap = {
|
|
924
923
|
BS_SYSTEM_ORDER: {
|
|
925
924
|
no: 'bsSystemOrderNo',
|
|
@@ -930,6 +929,11 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
|
|
|
930
929
|
no: 'wlnSystemOrderNo',
|
|
931
930
|
ids: 'wlnSystemSelectIds',
|
|
932
931
|
order: 'wlnSystemShowOrder'
|
|
932
|
+
},
|
|
933
|
+
WDT_SYSTEM_ORDER: {
|
|
934
|
+
no: 'wdtSystemOrderNo',
|
|
935
|
+
ids: 'wdtSystemSelectIds',
|
|
936
|
+
order: 'wdtSystemShowOrder'
|
|
933
937
|
}
|
|
934
938
|
};
|
|
935
939
|
var selectIds = get(nowData, "".concat(item.uniqueKey, ".selectIds"), '');
|
|
@@ -1078,9 +1082,6 @@ var transDataSource = function transDataSource(templateColumns) {
|
|
|
1078
1082
|
var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'edit';
|
|
1079
1083
|
return function (item) {
|
|
1080
1084
|
return templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.reduce(function (cur, nex) {
|
|
1081
|
-
if (updateWorkTypeKeys[nex.workOrderComponentType]) {
|
|
1082
|
-
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_").concat(updateWorkTypeKeys[nex.workOrderComponentType])]));
|
|
1083
|
-
}
|
|
1084
1085
|
//如果是初始化创建赋初始值 编辑不赋值
|
|
1085
1086
|
var config = type === 'init' ? nex.componentConfig : {};
|
|
1086
1087
|
if (nex.workOrderComponentType === 'RADIO') {
|
|
@@ -1097,14 +1098,19 @@ var transDataSource = function transDataSource(templateColumns) {
|
|
|
1097
1098
|
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_textarea")] || (config === null || config === void 0 ? void 0 : config.textarea)));
|
|
1098
1099
|
} else if (nex.workOrderComponentType === 'SELECT') {
|
|
1099
1100
|
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_select")] || (config === null || config === void 0 ? void 0 : config.select)));
|
|
1101
|
+
} else if (nex.workOrderComponentType === 'BASIC_GRADE') {
|
|
1102
|
+
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_basicGrade")]));
|
|
1100
1103
|
} else if (nex.workOrderComponentType === 'RATE') {
|
|
1101
1104
|
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_rate")], [])));
|
|
1102
1105
|
} else if (nex.workOrderComponentType === 'FILE') {
|
|
1103
1106
|
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_file")], [])));
|
|
1104
1107
|
} else if (nex.workOrderComponentType === 'POSTING') {
|
|
1105
|
-
|
|
1108
|
+
// PS: 旺店通收寄地址和其他的统一用code, 所以固定需要转,代码先保留
|
|
1109
|
+
var needTrans = true;
|
|
1110
|
+
// const needTrans = nex.componentConfig?.showField !== 'wdt'
|
|
1111
|
+
var address = [needTrans ? transTextToNumber(item.jsonMap["".concat(nex.uniqueKey, "_postingProvince")]) : item.jsonMap["".concat(nex.uniqueKey, "_postingProvince")], needTrans ? transTextToNumber(item.jsonMap["".concat(nex.uniqueKey, "_postingCity")]) : item.jsonMap["".concat(nex.uniqueKey, "_postingCity")]];
|
|
1106
1112
|
//兼容地址是只有省市的
|
|
1107
|
-
var interceptDistrict = transTextToNumber(item.jsonMap["".concat(nex.uniqueKey, "_postingDistrict")]);
|
|
1113
|
+
var interceptDistrict = needTrans ? transTextToNumber(item.jsonMap["".concat(nex.uniqueKey, "_postingDistrict")]) : item.jsonMap["".concat(nex.uniqueKey, "_postingDistrict")];
|
|
1108
1114
|
interceptDistrict && address.push(interceptDistrict);
|
|
1109
1115
|
address = every(address, function (item) {
|
|
1110
1116
|
return !item;
|
|
@@ -1115,17 +1121,35 @@ var transDataSource = function transDataSource(templateColumns) {
|
|
|
1115
1121
|
postingReceiverName: item.jsonMap["".concat(nex.uniqueKey, "_postingReceiverName")],
|
|
1116
1122
|
postingReceiverMobile: item.jsonMap["".concat(nex.uniqueKey, "_postingReceiverMobile")]
|
|
1117
1123
|
}));
|
|
1124
|
+
} else if (nex.workOrderComponentType === 'TRADE_ID_INPUT') {
|
|
1125
|
+
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_tradeId")]));
|
|
1118
1126
|
} else if (nex.workOrderComponentType === 'BUYER_NICK_INPUT') {
|
|
1119
1127
|
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
|
|
1120
1128
|
buyerNick: item.jsonMap["".concat(nex.uniqueKey, "_buyerNick")],
|
|
1121
1129
|
buyerOpenUid: item.jsonMap["".concat(nex.uniqueKey, "_buyerOpenUid")]
|
|
1122
1130
|
}));
|
|
1131
|
+
} else if (nex.workOrderComponentType === 'SHOP_NAME_INPUT') {
|
|
1132
|
+
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_shopName")]));
|
|
1133
|
+
} else if (nex.workOrderComponentType === 'RECEIVER_NAME_INPUT') {
|
|
1134
|
+
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_receiveName")]));
|
|
1135
|
+
} else if (nex.workOrderComponentType === 'RECEIVER_MOBILE_INPUT') {
|
|
1136
|
+
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_receiveMobile")]));
|
|
1137
|
+
} else if (nex.workOrderComponentType === 'TRADE_CREATE_DATETIME') {
|
|
1138
|
+
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_tradeCreateDateTime")]));
|
|
1139
|
+
} else if (nex.workOrderComponentType === 'TRADE_PAYMENT_DATETIME') {
|
|
1140
|
+
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_tradePaymentDateTime")]));
|
|
1141
|
+
} else if (nex.workOrderComponentType === 'TRADE_DELIVERY_DATETIME') {
|
|
1142
|
+
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_tradeDeliveryDateTime")]));
|
|
1143
|
+
} else if (nex.workOrderComponentType === 'TRADE_CLOSING_DATETIME') {
|
|
1144
|
+
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_tradeClosingDateTime")]));
|
|
1145
|
+
} else if (nex.workOrderComponentType === 'ACTUAL_PAYMENT') {
|
|
1146
|
+
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_actualPayment")]));
|
|
1123
1147
|
} else if (nex.workOrderComponentType === 'ALI_PAY_INPUT') {
|
|
1124
|
-
var
|
|
1125
|
-
return _objectSpread(_objectSpread({}, cur), {}, (
|
|
1148
|
+
var _objectSpread21;
|
|
1149
|
+
return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread21 = {}, _defineProperty(_objectSpread21, "".concat(nex.uniqueKey), {
|
|
1126
1150
|
name: item.jsonMap["".concat(nex.uniqueKey, "_alipayName")],
|
|
1127
1151
|
user: item.jsonMap["".concat(nex.uniqueKey, "_alipayAccount")]
|
|
1128
|
-
}), _defineProperty(
|
|
1152
|
+
}), _defineProperty(_objectSpread21, "".concat(nex.uniqueKey, "_alipayName"), item.jsonMap["".concat(nex.uniqueKey, "_alipayName")]), _defineProperty(_objectSpread21, "".concat(nex.uniqueKey, "_alipayAccount"), item.jsonMap["".concat(nex.uniqueKey, "_alipayAccount")]), _objectSpread21));
|
|
1129
1153
|
} else if (nex.workOrderComponentType === 'CHECKBOX') {
|
|
1130
1154
|
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
|
|
1131
1155
|
value: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_checkbox")], '') || (config === null || config === void 0 ? void 0 : config.checkbox) || [],
|
|
@@ -1160,35 +1184,35 @@ var transDataSource = function transDataSource(templateColumns) {
|
|
|
1160
1184
|
detail: item.jsonMap["".concat(nex.uniqueKey, "_address")]
|
|
1161
1185
|
}));
|
|
1162
1186
|
} else if (nex.workOrderComponentType === 'EXPRESS_LOGISTICS_SELECT') {
|
|
1163
|
-
var
|
|
1164
|
-
return _objectSpread(_objectSpread({}, cur), {}, (
|
|
1187
|
+
var _objectSpread29;
|
|
1188
|
+
return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread29 = {}, _defineProperty(_objectSpread29, "".concat(nex.uniqueKey), {
|
|
1165
1189
|
company: item.jsonMap["".concat(nex.uniqueKey, "_expressLogisticsCompany")],
|
|
1166
1190
|
order: item.jsonMap["".concat(nex.uniqueKey, "_expressLogisticsCode")]
|
|
1167
|
-
}), _defineProperty(
|
|
1191
|
+
}), _defineProperty(_objectSpread29, "".concat(nex.uniqueKey, "_expressLogisticsCompany"), item.jsonMap["".concat(nex.uniqueKey, "_expressLogisticsCompany")]), _defineProperty(_objectSpread29, "".concat(nex.uniqueKey, "_expressLogisticsCode"), item.jsonMap["".concat(nex.uniqueKey, "_expressLogisticsCode")]), _objectSpread29));
|
|
1168
1192
|
} else if (nex.workOrderComponentType === 'RETURN_LOGISTICS_SELECT') {
|
|
1169
|
-
var
|
|
1170
|
-
return _objectSpread(_objectSpread({}, cur), {}, (
|
|
1193
|
+
var _objectSpread30;
|
|
1194
|
+
return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread30 = {}, _defineProperty(_objectSpread30, "".concat(nex.uniqueKey), {
|
|
1171
1195
|
company: item.jsonMap["".concat(nex.uniqueKey, "_returnLogisticsCompany")],
|
|
1172
1196
|
order: item.jsonMap["".concat(nex.uniqueKey, "_returnLogisticsCode")]
|
|
1173
|
-
}), _defineProperty(
|
|
1197
|
+
}), _defineProperty(_objectSpread30, "".concat(nex.uniqueKey, "_returnLogisticsCompany"), item.jsonMap["".concat(nex.uniqueKey, "_returnLogisticsCompany")]), _defineProperty(_objectSpread30, "".concat(nex.uniqueKey, "_returnLogisticsCode"), item.jsonMap["".concat(nex.uniqueKey, "_returnLogisticsCode")]), _objectSpread30));
|
|
1174
1198
|
} else if (nex.workOrderComponentType === 'REMARK_INPUT') {
|
|
1175
1199
|
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
|
|
1176
1200
|
flag: item.jsonMap["".concat(nex.uniqueKey, "_flag")] ? +item.jsonMap["".concat(nex.uniqueKey, "_flag")] : config !== null && config !== void 0 && config.flag ? +(config === null || config === void 0 ? void 0 : config.flag) : '',
|
|
1177
1201
|
remark: item.jsonMap["".concat(nex.uniqueKey, "_remark")] || (config === null || config === void 0 ? void 0 : config.remark) || ''
|
|
1178
1202
|
}));
|
|
1179
1203
|
} else if (nex.workOrderComponentType === 'STATUS') {
|
|
1180
|
-
var
|
|
1181
|
-
return _objectSpread(_objectSpread({}, cur), {}, (
|
|
1204
|
+
var _objectSpread32;
|
|
1205
|
+
return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread32 = {}, _defineProperty(_objectSpread32, "".concat(nex.uniqueKey), {
|
|
1182
1206
|
status: item.jsonMap["".concat(nex.uniqueKey, "_status")] || (config === null || config === void 0 ? void 0 : config.status),
|
|
1183
1207
|
customerService: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_customerService")], item.jsonMap["".concat(nex.uniqueKey, "_customerService")])
|
|
1184
|
-
}), _defineProperty(
|
|
1208
|
+
}), _defineProperty(_objectSpread32, "".concat(nex.uniqueKey, "_processTime"), item.jsonMap['processTime']), _defineProperty(_objectSpread32, "".concat(nex.uniqueKey, "_lastProcessingTime"), item.jsonMap['lastProcessingTime']), _objectSpread32));
|
|
1185
1209
|
} else if (nex.workOrderComponentType === 'ORDINARY_INVOICE') {
|
|
1186
|
-
var
|
|
1187
|
-
return _objectSpread(_objectSpread({}, cur), {}, (
|
|
1210
|
+
var _objectSpread33;
|
|
1211
|
+
return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread33 = {}, _defineProperty(_objectSpread33, "".concat(nex.uniqueKey), {
|
|
1188
1212
|
ordinaryMoney: item.jsonMap["".concat(nex.uniqueKey, "_ordinaryMoney")],
|
|
1189
1213
|
ordinarySerial: item.jsonMap["".concat(nex.uniqueKey, "_ordinarySerial")],
|
|
1190
1214
|
ordinaryTaitou: item.jsonMap["".concat(nex.uniqueKey, "_ordinaryTaitou")]
|
|
1191
|
-
}), _defineProperty(
|
|
1215
|
+
}), _defineProperty(_objectSpread33, "".concat(nex.uniqueKey, "_ordinaryMoney"), item.jsonMap["".concat(nex.uniqueKey, "_ordinaryMoney")] ? Number(item.jsonMap["".concat(nex.uniqueKey, "_ordinaryMoney")]).toFixed(2) : null), _defineProperty(_objectSpread33, "".concat(nex.uniqueKey, "_ordinarySerial"), item.jsonMap["".concat(nex.uniqueKey, "_ordinarySerial")]), _defineProperty(_objectSpread33, "".concat(nex.uniqueKey, "_ordinaryTaitou"), item.jsonMap["".concat(nex.uniqueKey, "_ordinaryTaitou")]), _objectSpread33));
|
|
1192
1216
|
} else if (nex.workOrderComponentType === 'LOGISTICS_INTERCEPTION') {
|
|
1193
1217
|
var _address3 = [transTextToNumber(item.jsonMap["".concat(nex.uniqueKey, "_interceptProvince")]), transTextToNumber(item.jsonMap["".concat(nex.uniqueKey, "_interceptCity")])];
|
|
1194
1218
|
//兼容地址是只有省市的
|
|
@@ -1233,8 +1257,8 @@ var transDataSource = function transDataSource(templateColumns) {
|
|
|
1233
1257
|
});
|
|
1234
1258
|
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), _itemList));
|
|
1235
1259
|
} else if (nex.workOrderComponentType === 'ENTERPRISE_PAYMENT') {
|
|
1236
|
-
var
|
|
1237
|
-
return _objectSpread(_objectSpread({}, cur), {}, (
|
|
1260
|
+
var _objectSpread41;
|
|
1261
|
+
return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread41 = {}, _defineProperty(_objectSpread41, "".concat(nex.uniqueKey), {
|
|
1238
1262
|
enterprisePaymentAlipayNick: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick")],
|
|
1239
1263
|
enterprisePaymentAlipayNo: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo")],
|
|
1240
1264
|
enterprisePaymentBuyerNick: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick")],
|
|
@@ -1242,7 +1266,9 @@ var transDataSource = function transDataSource(templateColumns) {
|
|
|
1242
1266
|
enterprisePaymentRefundFee: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentRefundFee")],
|
|
1243
1267
|
enterprisePaymentStatus: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentStatus")],
|
|
1244
1268
|
enterprisePaymentTid: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentTid")]
|
|
1245
|
-
}), _defineProperty(
|
|
1269
|
+
}), _defineProperty(_objectSpread41, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick")]), _defineProperty(_objectSpread41, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo")]), _defineProperty(_objectSpread41, "".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick")]), _defineProperty(_objectSpread41, "".concat(nex.uniqueKey, "_enterprisePaymentRefundFee"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentRefundFee")]), _defineProperty(_objectSpread41, "".concat(nex.uniqueKey, "_enterprisePaymentStatus"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentStatus")]), _defineProperty(_objectSpread41, "".concat(nex.uniqueKey, "_enterprisePaymentTime"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentTime")]), _defineProperty(_objectSpread41, "".concat(nex.uniqueKey, "_enterprisePaymentTid"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentTid")]), _objectSpread41));
|
|
1270
|
+
} else if (nex.workOrderComponentType === 'SYSTEM_ORDER_NO') {
|
|
1271
|
+
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_systemOrderNo")]));
|
|
1246
1272
|
} else if (nex.workOrderComponentType === 'JST_LOGISTICS') {
|
|
1247
1273
|
var _itemList2 = jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_jstItemList")], [{
|
|
1248
1274
|
logisticsCompany: null,
|
|
@@ -1271,11 +1297,23 @@ var transDataSource = function transDataSource(templateColumns) {
|
|
|
1271
1297
|
sendName: '',
|
|
1272
1298
|
sendId: ''
|
|
1273
1299
|
}]));
|
|
1300
|
+
} else if (nex.workOrderComponentType === 'BS_SIGNING_TIME') {
|
|
1301
|
+
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_bsSigningTime")]));
|
|
1302
|
+
} else if (nex.workOrderComponentType === 'BS_SEND_TIME') {
|
|
1303
|
+
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_bsSendTime")]));
|
|
1304
|
+
} else if (nex.workOrderComponentType === 'BS_TRADE_PAYMENT_TIME') {
|
|
1305
|
+
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_bsTradePaymentTime")]));
|
|
1306
|
+
} else if (nex.workOrderComponentType === 'BS_NET_RECEIPTS') {
|
|
1307
|
+
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_bsNetReceipts")]));
|
|
1308
|
+
} else if (nex.workOrderComponentType === 'BS_PACKAGE_WEIGHT') {
|
|
1309
|
+
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_bsPackageWeight")]));
|
|
1274
1310
|
} else if (nex.workOrderComponentType === 'BS_MEMO') {
|
|
1275
1311
|
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
|
|
1276
1312
|
remark: item.jsonMap["".concat(nex.uniqueKey, "_bsRemark")],
|
|
1277
1313
|
flag: item.jsonMap["".concat(nex.uniqueKey, "_bsFlag")]
|
|
1278
1314
|
}));
|
|
1315
|
+
} else if (nex.workOrderComponentType === 'BS_DEPOSIT') {
|
|
1316
|
+
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_bsDeposit")]));
|
|
1279
1317
|
} else if (nex.workOrderComponentType === 'REISSUE_LOGISTICS') {
|
|
1280
1318
|
var _itemList6 = jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_reissueLogisticsList")], [{
|
|
1281
1319
|
logisticsCompany: null,
|
|
@@ -1321,13 +1359,16 @@ var transDataSource = function transDataSource(templateColumns) {
|
|
|
1321
1359
|
reason: '',
|
|
1322
1360
|
systemOrderId: ''
|
|
1323
1361
|
}])));
|
|
1324
|
-
} else if (['BS_LOGISTICS', 'WLN_LOGISTICS'].includes(nex.workOrderComponentType)) {
|
|
1362
|
+
} else if (['BS_LOGISTICS', 'WLN_LOGISTICS', 'WDT_LOGISTICS'].includes(nex.workOrderComponentType)) {
|
|
1325
1363
|
var LogisticsMap = {
|
|
1326
1364
|
BS_LOGISTICS: {
|
|
1327
1365
|
listKey: 'bsLogisticsList'
|
|
1328
1366
|
},
|
|
1329
1367
|
WLN_LOGISTICS: {
|
|
1330
1368
|
listKey: 'wlnLogisticsList'
|
|
1369
|
+
},
|
|
1370
|
+
WDT_LOGISTICS: {
|
|
1371
|
+
listKey: 'wdtLogisticsList'
|
|
1331
1372
|
}
|
|
1332
1373
|
};
|
|
1333
1374
|
var _itemList7 = jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(LogisticsMap[nex.workOrderComponentType].listKey)], [{
|
|
@@ -1338,13 +1379,16 @@ var transDataSource = function transDataSource(templateColumns) {
|
|
|
1338
1379
|
logisticsCompany: null,
|
|
1339
1380
|
logisticsCode: null
|
|
1340
1381
|
}]));
|
|
1341
|
-
} else if (['BS_SEND_GOOD', 'WLN_SEND_GOOD'].includes(nex.workOrderComponentType)) {
|
|
1382
|
+
} else if (['BS_SEND_GOOD', 'WLN_SEND_GOOD', 'WDT_SEND_GOOD'].includes(nex.workOrderComponentType)) {
|
|
1342
1383
|
var sendGoodMap = {
|
|
1343
1384
|
BS_SEND_GOOD: {
|
|
1344
1385
|
list: 'bsSendGood'
|
|
1345
1386
|
},
|
|
1346
1387
|
WLN_SEND_GOOD: {
|
|
1347
1388
|
list: 'wlnSendGood'
|
|
1389
|
+
},
|
|
1390
|
+
WDT_SEND_GOOD: {
|
|
1391
|
+
list: 'wdtSendGood'
|
|
1348
1392
|
}
|
|
1349
1393
|
};
|
|
1350
1394
|
var _itemList8 = jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(sendGoodMap[nex.workOrderComponentType].list)], [{
|
|
@@ -1369,11 +1413,19 @@ var transDataSource = function transDataSource(templateColumns) {
|
|
|
1369
1413
|
postingReceiverName: item.jsonMap["".concat(nex.uniqueKey, "_bsPostingReceiverName")],
|
|
1370
1414
|
postingReceiverMobile: item.jsonMap["".concat(nex.uniqueKey, "_bsPostingReceiverMobile")]
|
|
1371
1415
|
}));
|
|
1372
|
-
} else if (nex.workOrderComponentType
|
|
1373
|
-
|
|
1374
|
-
|
|
1375
|
-
|
|
1376
|
-
|
|
1416
|
+
} else if (['BS_GOODS', 'WDT_GOODS'].includes(nex.workOrderComponentType)) {
|
|
1417
|
+
var _$concat;
|
|
1418
|
+
var gooodsMap = {
|
|
1419
|
+
BS_GOODS: {
|
|
1420
|
+
type: 'bsGoods',
|
|
1421
|
+
shopCode: 'shopCode'
|
|
1422
|
+
},
|
|
1423
|
+
WDT_GOODS: {
|
|
1424
|
+
type: 'wdtGoods',
|
|
1425
|
+
shopCode: 'shopCode'
|
|
1426
|
+
}
|
|
1427
|
+
};
|
|
1428
|
+
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), (_$concat = {}, _defineProperty(_$concat, gooodsMap[nex.workOrderComponentType].type, jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(gooodsMap[nex.workOrderComponentType].type)], [])), _defineProperty(_$concat, gooodsMap[nex.workOrderComponentType].shopCode, item.jsonMap["".concat(nex.uniqueKey, "_").concat(gooodsMap[nex.workOrderComponentType].shopCode)]), _$concat)));
|
|
1377
1429
|
} else if (nex.workOrderComponentType === 'BS_REISSUE_GOODS') {
|
|
1378
1430
|
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
|
|
1379
1431
|
bsReissueType: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_bsReissueType")], []),
|
|
@@ -1428,7 +1480,7 @@ var transDataSource = function transDataSource(templateColumns) {
|
|
|
1428
1480
|
bsReturnGoods: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_bsReturnGoods")], []),
|
|
1429
1481
|
shopCode: item.jsonMap["".concat(nex.uniqueKey, "_shopCode")]
|
|
1430
1482
|
}));
|
|
1431
|
-
} else if (['BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER'].includes(nex.workOrderComponentType)) {
|
|
1483
|
+
} else if (['BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WDT_SYSTEM_ORDER'].includes(nex.workOrderComponentType)) {
|
|
1432
1484
|
var systemOrderMap = {
|
|
1433
1485
|
BS_SYSTEM_ORDER: {
|
|
1434
1486
|
no: 'bsSystemOrderNo',
|
|
@@ -1439,6 +1491,11 @@ var transDataSource = function transDataSource(templateColumns) {
|
|
|
1439
1491
|
no: 'wlnSystemOrderNo',
|
|
1440
1492
|
ids: 'wlnSystemSelectIds',
|
|
1441
1493
|
order: 'wlnSystemShowOrder'
|
|
1494
|
+
},
|
|
1495
|
+
WDT_SYSTEM_ORDER: {
|
|
1496
|
+
no: 'wdtSystemOrderNo',
|
|
1497
|
+
ids: 'wdtSystemSelectIds',
|
|
1498
|
+
order: 'wdtSystemShowOrder'
|
|
1442
1499
|
}
|
|
1443
1500
|
};
|
|
1444
1501
|
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
|
|
@@ -1486,6 +1543,12 @@ var transDataSource = function transDataSource(templateColumns) {
|
|
|
1486
1543
|
wlnGoods: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_wlnGoods")], []),
|
|
1487
1544
|
shopCode: item.jsonMap["".concat(nex.uniqueKey, "_shopCode")]
|
|
1488
1545
|
}));
|
|
1546
|
+
} else if (nex.workOrderComponentType === 'WDT_REISSUE_GOODS') {
|
|
1547
|
+
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
|
|
1548
|
+
wdtReissueType: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_wdtReissueType")], []),
|
|
1549
|
+
wdtReissueGoods: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_wdtReissueGoods")], []),
|
|
1550
|
+
shopCode: item.jsonMap["".concat(nex.uniqueKey, "_shopCode")]
|
|
1551
|
+
}));
|
|
1489
1552
|
}
|
|
1490
1553
|
}, {});
|
|
1491
1554
|
};
|
|
@@ -1507,7 +1570,7 @@ export var calcWorkOrderList = function calcWorkOrderList(source, templateColumn
|
|
|
1507
1570
|
//订单返填
|
|
1508
1571
|
export var orderBack = /*#__PURE__*/function () {
|
|
1509
1572
|
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
|
|
1510
|
-
var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, JOIN_SHOP, hasBs, hasWln, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, _data$value, _jstOrder$value, _jstOrder$value$data, _bsOrder$value, _wlnOrder$value, _bsOrders$orders, _wlnOrders$orders, promise, hasJst, _yield$Promise$allSet, _yield$Promise$allSet2, data, jstOrder, bsOrder, wlnOrder, orderInfo, jstInfo, bsOrders, wlnOrders, bsInfo, wlnInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, values, _templateDetail$compo, paymentUniqueKey, cacheOrderInfo,
|
|
1573
|
+
var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, JOIN_SHOP, hasBs, hasWdt, hasWln, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, _data$value, _jstOrder$value, _jstOrder$value$data, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsOrders$orders, _wlnOrders$orders, promise, hasJst, _yield$Promise$allSet, _yield$Promise$allSet2, data, jstOrder, bsOrder, wlnOrder, wdtOrder, orderInfo, jstInfo, bsOrders, wlnOrders, wdtOrders, bsInfo, wlnInfo, wdtInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, values, _templateDetail$compo, paymentUniqueKey, cacheOrderInfo, _objectSpread70, _cacheOrderInfo;
|
|
1511
1574
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
1512
1575
|
while (1) switch (_context.prev = _context.next) {
|
|
1513
1576
|
case 0:
|
|
@@ -1516,18 +1579,28 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
1516
1579
|
JOIN_SHOP = shopList.find(function (item) {
|
|
1517
1580
|
return !item.notJoin && item.shopId == shopId;
|
|
1518
1581
|
}); //判断是否有百胜组件 有就请求bs订单接口
|
|
1519
|
-
hasBs = HasFilterHandle(templateDetail, ['BS_SIGNING_TIME', 'BS_SEND_TIME', 'BS_TRADE_PAYMENT_TIME', 'BS_NET_RECEIPTS', 'BS_PACKAGE_WEIGHT', 'BS_GOODS', 'BS_DEPOSIT', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_POSTING', 'BS_SYSTEM_ORDER', 'BS_DELIVERY_NO']);
|
|
1582
|
+
hasBs = HasFilterHandle(templateDetail, ['BS_SIGNING_TIME', 'BS_SEND_TIME', 'BS_TRADE_PAYMENT_TIME', 'BS_NET_RECEIPTS', 'BS_PACKAGE_WEIGHT', 'BS_GOODS', 'BS_DEPOSIT', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_POSTING', 'BS_SYSTEM_ORDER', 'BS_DELIVERY_NO']); //判断是否有旺店通组件 有就请求wdt订单接口
|
|
1583
|
+
hasWdt = HasFilterHandle(templateDetail, ['WDT_SYSTEM_ORDER', 'WDT_GOODS', 'WDT_LOGISTICS', 'WDT_SEND_GOOD'
|
|
1584
|
+
// 'WDT_SIGNING_TIME',
|
|
1585
|
+
// 'WDT_SEND_TIME',
|
|
1586
|
+
// 'WDT_TRADE_PAYMENT_TIME',
|
|
1587
|
+
// 'WDT_NET_RECEIPTS',
|
|
1588
|
+
// 'WDT_PACKAGE_WEIGHT',
|
|
1589
|
+
// 'WDT_DEPOSIT',
|
|
1590
|
+
// 'WDT_POSTING',
|
|
1591
|
+
// 'WDT_DELIVERY_NO',
|
|
1592
|
+
]); //判断是否有万里牛组件 有就请求wln订单接口
|
|
1520
1593
|
hasWln = HasFilterHandle(templateDetail, ['WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD']); //如果不是对接店铺且百胜组件都没有
|
|
1521
|
-
if (!(!JOIN_SHOP && !hasBs && !hasWln)) {
|
|
1522
|
-
_context.next =
|
|
1594
|
+
if (!(!JOIN_SHOP && !hasBs && !hasWln && !hasWdt)) {
|
|
1595
|
+
_context.next = 7;
|
|
1523
1596
|
break;
|
|
1524
1597
|
}
|
|
1525
1598
|
return _context.abrupt("return");
|
|
1526
|
-
case
|
|
1599
|
+
case 7:
|
|
1527
1600
|
_ref3 = shopList.find(function (item) {
|
|
1528
1601
|
return item.shopId == shopId;
|
|
1529
1602
|
}) || {}, shopSourceStr = _ref3.shopSourceStr, _ref3$thirdUserNick = _ref3.thirdUserNick, thirdUserNick = _ref3$thirdUserNick === void 0 ? '' : _ref3$thirdUserNick;
|
|
1530
|
-
_context.prev =
|
|
1603
|
+
_context.prev = 8;
|
|
1531
1604
|
promise = [];
|
|
1532
1605
|
if (!JOIN_SHOP) {
|
|
1533
1606
|
promise.push(new Promise(function (resolve) {
|
|
@@ -1578,21 +1651,32 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
1578
1651
|
resolve({});
|
|
1579
1652
|
}));
|
|
1580
1653
|
}
|
|
1581
|
-
|
|
1654
|
+
if (hasWdt) {
|
|
1655
|
+
promise.push(wdtOrderDetail({
|
|
1656
|
+
billNo: order_no
|
|
1657
|
+
}));
|
|
1658
|
+
} else {
|
|
1659
|
+
promise.push(new Promise(function (resolve) {
|
|
1660
|
+
resolve([]);
|
|
1661
|
+
}));
|
|
1662
|
+
}
|
|
1663
|
+
_context.next = 18;
|
|
1582
1664
|
return Promise.allSettled(promise);
|
|
1583
|
-
case
|
|
1665
|
+
case 18:
|
|
1584
1666
|
_yield$Promise$allSet = _context.sent;
|
|
1585
|
-
_yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet,
|
|
1667
|
+
_yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet, 5);
|
|
1586
1668
|
data = _yield$Promise$allSet2[0];
|
|
1587
1669
|
jstOrder = _yield$Promise$allSet2[1];
|
|
1588
1670
|
bsOrder = _yield$Promise$allSet2[2];
|
|
1589
1671
|
wlnOrder = _yield$Promise$allSet2[3];
|
|
1672
|
+
wdtOrder = _yield$Promise$allSet2[4];
|
|
1590
1673
|
orderInfo = (data === null || data === void 0 ? void 0 : (_data$value = data.value) === null || _data$value === void 0 ? void 0 : _data$value.data) || {};
|
|
1591
1674
|
jstInfo = (jstOrder === null || jstOrder === void 0 ? void 0 : (_jstOrder$value = jstOrder.value) === null || _jstOrder$value === void 0 ? void 0 : (_jstOrder$value$data = _jstOrder$value.data) === null || _jstOrder$value$data === void 0 ? void 0 : _jstOrder$value$data.orders) || [];
|
|
1592
1675
|
bsOrders = (bsOrder === null || bsOrder === void 0 ? void 0 : (_bsOrder$value = bsOrder.value) === null || _bsOrder$value === void 0 ? void 0 : _bsOrder$value.data) || {};
|
|
1593
1676
|
wlnOrders = (wlnOrder === null || wlnOrder === void 0 ? void 0 : (_wlnOrder$value = wlnOrder.value) === null || _wlnOrder$value === void 0 ? void 0 : _wlnOrder$value.data) || {};
|
|
1677
|
+
wdtOrders = (wdtOrder === null || wdtOrder === void 0 ? void 0 : (_wdtOrder$value = wdtOrder.value) === null || _wdtOrder$value === void 0 ? void 0 : _wdtOrder$value.data) || {};
|
|
1594
1678
|
Monitor.automaticReport({
|
|
1595
|
-
message: "orderBack:\u8BA2\u5355\u53F7:".concat(order_no, ",\u5E97\u94FAid:").concat(shopId, ", \u8BA2\u5355\u4FE1\u606F\uFF1A").concat(JSON.stringify(orderInfo), ",jst\u4FE1\u606F:").concat(JSON.stringify(jstInfo), ",bs\u4FE1\u606F:").concat(JSON.stringify(bsOrders), ",wln\u4FE1\u606F:").concat(JSON.stringify(wlnOrders))
|
|
1679
|
+
message: "orderBack:\u8BA2\u5355\u53F7:".concat(order_no, ",\u5E97\u94FAid:").concat(shopId, ", \u8BA2\u5355\u4FE1\u606F\uFF1A").concat(JSON.stringify(orderInfo), ",jst\u4FE1\u606F:").concat(JSON.stringify(jstInfo), ",bs\u4FE1\u606F:").concat(JSON.stringify(bsOrders), ",wln\u4FE1\u606F:").concat(JSON.stringify(wlnOrders), ",wdt\u4FE1\u606F:").concat(JSON.stringify(wdtOrders))
|
|
1596
1680
|
});
|
|
1597
1681
|
if (plat !== null && plat !== void 0 && plat.subOrderNo) {
|
|
1598
1682
|
bsOrders.orders = bsOrders.orders.filter(function (item) {
|
|
@@ -1601,6 +1685,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
1601
1685
|
}
|
|
1602
1686
|
bsInfo = bsOrderTransform(bsOrders || {});
|
|
1603
1687
|
wlnInfo = wlnOrderTransform(wlnOrders || {});
|
|
1688
|
+
wdtInfo = wdtOrderTransform(wdtOrders || {});
|
|
1604
1689
|
if ((bsOrders === null || bsOrders === void 0 ? void 0 : (_bsOrders$orders = bsOrders.orders) === null || _bsOrders$orders === void 0 ? void 0 : _bsOrders$orders.length) > 1) {
|
|
1605
1690
|
bsInfo.bsGoods = _objectSpread(_objectSpread({}, bsInfo.bsGoods), {}, {
|
|
1606
1691
|
bsGoods: []
|
|
@@ -1630,13 +1715,23 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
1630
1715
|
sendName: ''
|
|
1631
1716
|
}];
|
|
1632
1717
|
}
|
|
1718
|
+
// if (wdtOrders?.orders?.length > 1) {
|
|
1719
|
+
// wdtInfo.bsGoods = {
|
|
1720
|
+
// ...wdtInfo.bsGoods,
|
|
1721
|
+
// bsGoods: [],
|
|
1722
|
+
// };
|
|
1723
|
+
// wdtInfo.bsLogistics = [{ logisticsCompany: null, logisticsCode: '' }];
|
|
1724
|
+
// wdtInfo.bsSendGood = [{ sendId: '', sendName: '' }];
|
|
1725
|
+
// wdtInfo.bsDeliveryNo = [{ deliveryNo: '' }];
|
|
1726
|
+
// }
|
|
1633
1727
|
|
|
1634
1728
|
//获取当前表单字段
|
|
1635
1729
|
formValue = form.getFieldsValue();
|
|
1636
1730
|
detail = _objectSpread(_objectSpread({}, orderInfo), {}, {
|
|
1637
1731
|
jstItemList: jstInfo,
|
|
1638
1732
|
bsOrder: bsInfo,
|
|
1639
|
-
wlnOrder: wlnInfo
|
|
1733
|
+
wlnOrder: wlnInfo,
|
|
1734
|
+
wdtOrder: wdtInfo
|
|
1640
1735
|
}); //抖音数据特殊处理
|
|
1641
1736
|
if (shopSourceStr === 'FXG') {
|
|
1642
1737
|
detail = updateDYDetails(detail);
|
|
@@ -1647,7 +1742,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
1647
1742
|
hasSelectItem = HasErpItemSelectHandle(templateDetail);
|
|
1648
1743
|
erpPromiseList = [];
|
|
1649
1744
|
if (!(shopSourceStr === 'TAOBAO' && hasSelectItem)) {
|
|
1650
|
-
_context.next =
|
|
1745
|
+
_context.next = 55;
|
|
1651
1746
|
break;
|
|
1652
1747
|
}
|
|
1653
1748
|
list = detail['itemList'];
|
|
@@ -1665,10 +1760,10 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
1665
1760
|
resolve({});
|
|
1666
1761
|
});
|
|
1667
1762
|
});
|
|
1668
|
-
_context.prev =
|
|
1669
|
-
_context.next =
|
|
1763
|
+
_context.prev = 45;
|
|
1764
|
+
_context.next = 48;
|
|
1670
1765
|
return Promise.all(promises);
|
|
1671
|
-
case
|
|
1766
|
+
case 48:
|
|
1672
1767
|
erpPromiseList = _context.sent;
|
|
1673
1768
|
detail['itemList'] = (_detail$itemList = detail['itemList']) === null || _detail$itemList === void 0 ? void 0 : _detail$itemList.map(function (item, index) {
|
|
1674
1769
|
return _objectSpread(_objectSpread({}, item), {}, {
|
|
@@ -1678,13 +1773,13 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
1678
1773
|
})
|
|
1679
1774
|
});
|
|
1680
1775
|
});
|
|
1681
|
-
_context.next =
|
|
1776
|
+
_context.next = 55;
|
|
1682
1777
|
break;
|
|
1683
|
-
case
|
|
1684
|
-
_context.prev =
|
|
1685
|
-
_context.t0 = _context["catch"](
|
|
1778
|
+
case 52:
|
|
1779
|
+
_context.prev = 52;
|
|
1780
|
+
_context.t0 = _context["catch"](45);
|
|
1686
1781
|
console.error('调用erp获取宝贝编码错误', _context.t0);
|
|
1687
|
-
case
|
|
1782
|
+
case 55:
|
|
1688
1783
|
// console.log('detail', detail);
|
|
1689
1784
|
values = orderBackFormValues({
|
|
1690
1785
|
detail: detail,
|
|
@@ -1709,23 +1804,23 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
1709
1804
|
sessionStorage.setItem('cacheOmsOrderInfo', JSON.stringify(_objectSpread(_objectSpread({}, cacheOrderInfo), {}, _defineProperty({}, "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId), _defineProperty({}, plat === null || plat === void 0 ? void 0 : plat.subOrderNo, _objectSpread(_objectSpread({}, formValue), values))))));
|
|
1710
1805
|
} else {
|
|
1711
1806
|
_cacheOrderInfo = JSON.parse(sessionStorage.getItem('cacheOrderInfo') || '{}');
|
|
1712
|
-
sessionStorage.setItem('cacheOrderInfo', JSON.stringify(_objectSpread(_objectSpread({}, _cacheOrderInfo), {}, (
|
|
1807
|
+
sessionStorage.setItem('cacheOrderInfo', JSON.stringify(_objectSpread(_objectSpread({}, _cacheOrderInfo), {}, (_objectSpread70 = {}, _defineProperty(_objectSpread70, order_no, values), _defineProperty(_objectSpread70, "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId), _defineProperty({}, order_no, _objectSpread(_objectSpread({}, formValue), values))), _objectSpread70))));
|
|
1713
1808
|
}
|
|
1714
1809
|
}
|
|
1715
1810
|
// console.log('orderback', values);
|
|
1716
1811
|
form.setFieldsValue(_objectSpread(_objectSpread({}, formValue), values));
|
|
1717
1812
|
callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
|
|
1718
|
-
_context.next =
|
|
1813
|
+
_context.next = 64;
|
|
1719
1814
|
break;
|
|
1720
|
-
case
|
|
1721
|
-
_context.prev =
|
|
1722
|
-
_context.t1 = _context["catch"](
|
|
1815
|
+
case 61:
|
|
1816
|
+
_context.prev = 61;
|
|
1817
|
+
_context.t1 = _context["catch"](8);
|
|
1723
1818
|
console.error(_context.t1);
|
|
1724
|
-
case
|
|
1819
|
+
case 64:
|
|
1725
1820
|
case "end":
|
|
1726
1821
|
return _context.stop();
|
|
1727
1822
|
}
|
|
1728
|
-
}, _callee, null, [[
|
|
1823
|
+
}, _callee, null, [[8, 61], [45, 52]]);
|
|
1729
1824
|
}));
|
|
1730
1825
|
return function orderBack(_x) {
|
|
1731
1826
|
return _ref2.apply(this, arguments);
|
|
@@ -2029,6 +2124,7 @@ export var reversalFormValues = function reversalFormValues() {
|
|
|
2029
2124
|
case 'BS_REISSUE_GOODS':
|
|
2030
2125
|
case 'BS_EXCHANGE_GOODS':
|
|
2031
2126
|
case 'BS_RETURN_GOODS':
|
|
2127
|
+
case 'WDT_REISSUE_GOODS':
|
|
2032
2128
|
prv["".concat(next.uniqueKey, "_shopCode")] = values[next.uniqueKey]['shopCode'];
|
|
2033
2129
|
break;
|
|
2034
2130
|
case 'BS_DELIVERY_NO':
|
|
@@ -2043,6 +2139,10 @@ export var reversalFormValues = function reversalFormValues() {
|
|
|
2043
2139
|
case 'EXCHANGE_TRADE_ID':
|
|
2044
2140
|
prv["".concat(next.uniqueKey, "_tradeItemList")] = JSON.stringify(values[next.uniqueKey] || []);
|
|
2045
2141
|
break;
|
|
2142
|
+
case 'WDT_GOODS':
|
|
2143
|
+
prv["".concat(next.uniqueKey, "_wdtGoods")] = JSON.stringify(values[next.uniqueKey]['wdtGoods']);
|
|
2144
|
+
prv["".concat(next.uniqueKey, "_shopCode")] = values[next.uniqueKey]['shopCode'];
|
|
2145
|
+
break;
|
|
2046
2146
|
}
|
|
2047
2147
|
return prv;
|
|
2048
2148
|
}, {});
|
|
@@ -2123,6 +2223,29 @@ export var wlnSystemOrderBackValues = function wlnSystemOrderBackValues(_ref7) {
|
|
|
2123
2223
|
form.setFieldsValue(values);
|
|
2124
2224
|
};
|
|
2125
2225
|
|
|
2226
|
+
// wdt商品信息返填
|
|
2227
|
+
export var wdtSystemOrderBackValues = function wdtSystemOrderBackValues(_ref8) {
|
|
2228
|
+
var _templateList$compone3;
|
|
2229
|
+
var templateList = _ref8.templateList,
|
|
2230
|
+
value = _ref8.value,
|
|
2231
|
+
form = _ref8.form;
|
|
2232
|
+
//如果没有选择的值不返填,会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
|
|
2233
|
+
if (!(value !== null && value !== void 0 && value.selectedRows)) return;
|
|
2234
|
+
var wdtGoodsComponent = (_templateList$compone3 = templateList.componentDtoList) === null || _templateList$compone3 === void 0 ? void 0 : _templateList$compone3.filter(function (item) {
|
|
2235
|
+
return ['WDT_GOODS', 'WDT_DELIVERY_NO', 'WDT_SEND_GOOD', 'WDT_LOGISTICS'].includes(item.workOrderComponentType);
|
|
2236
|
+
});
|
|
2237
|
+
if (!(wdtGoodsComponent !== null && wdtGoodsComponent !== void 0 && wdtGoodsComponent.length)) return;
|
|
2238
|
+
var wdtGoodsValue = form.getFieldValue(wdtGoodsComponent[0].uniqueKey);
|
|
2239
|
+
var orderInfo = wdtOrderTransform({
|
|
2240
|
+
trades: value.selectedRows,
|
|
2241
|
+
shopCode: wdtGoodsValue.shopCode
|
|
2242
|
+
});
|
|
2243
|
+
var values = wdtOrderBackFormValues(orderInfo, {
|
|
2244
|
+
componentDtoList: wdtGoodsComponent
|
|
2245
|
+
});
|
|
2246
|
+
form.setFieldsValue(values);
|
|
2247
|
+
};
|
|
2248
|
+
|
|
2126
2249
|
// 获取映射关系
|
|
2127
2250
|
export var getMappingConfigByTemplateDetail = function getMappingConfigByTemplateDetail(templateDetail) {
|
|
2128
2251
|
var readonlyComponents = {};
|
|
@@ -2197,12 +2320,12 @@ export var transformWorkOrderDetail = function transformWorkOrderDetail(detail)
|
|
|
2197
2320
|
};
|
|
2198
2321
|
|
|
2199
2322
|
// 返填物流轨迹信息
|
|
2200
|
-
export var setLogisticsInfo = function setLogisticsInfo(
|
|
2201
|
-
var logisticsMappingConfig =
|
|
2202
|
-
uniqueKey =
|
|
2203
|
-
workOrderComponentType =
|
|
2204
|
-
value =
|
|
2205
|
-
form =
|
|
2323
|
+
export var setLogisticsInfo = function setLogisticsInfo(_ref9) {
|
|
2324
|
+
var logisticsMappingConfig = _ref9.logisticsMappingConfig,
|
|
2325
|
+
uniqueKey = _ref9.uniqueKey,
|
|
2326
|
+
workOrderComponentType = _ref9.workOrderComponentType,
|
|
2327
|
+
value = _ref9.value,
|
|
2328
|
+
form = _ref9.form;
|
|
2206
2329
|
var values = logisticsMappingConfig.reduce(function (prv, next) {
|
|
2207
2330
|
var logisticsValues = form.getFieldValue(next.uniqueKey);
|
|
2208
2331
|
var componentConfig = next.componentConfig;
|
|
@@ -6,6 +6,7 @@ export declare const selectFlowList: ((state: {
|
|
|
6
6
|
paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
|
|
7
7
|
singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
|
|
8
8
|
logicFlow: import("./types").LogicFlowState;
|
|
9
|
+
flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
|
|
9
10
|
}) => import("./types").LogicFlow[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").LogicFlow[], {
|
|
10
11
|
clearCache: () => void;
|
|
11
12
|
}> & {
|
|
@@ -19,6 +20,7 @@ export declare const selectGroupFlowList: ((state: {
|
|
|
19
20
|
paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
|
|
20
21
|
singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
|
|
21
22
|
logicFlow: import("./types").LogicFlowState;
|
|
23
|
+
flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
|
|
22
24
|
}) => import("./types").Option[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").Option[], {
|
|
23
25
|
clearCache: () => void;
|
|
24
26
|
}> & {
|
|
@@ -32,6 +34,7 @@ export declare const selectFlowTemplateGroupWorkOrderTemplateList: ((state: {
|
|
|
32
34
|
paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
|
|
33
35
|
singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
|
|
34
36
|
logicFlow: import("./types").LogicFlowState;
|
|
37
|
+
flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
|
|
35
38
|
}) => import("./types").Option[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").Option[], {
|
|
36
39
|
clearCache: () => void;
|
|
37
40
|
}> & {
|
|
@@ -59,6 +59,7 @@ export declare const queryAllWorkOrderList: (s: string, data: any) => Promise<an
|
|
|
59
59
|
export declare const getAlipayBillReceipt: (data: any) => Promise<any>;
|
|
60
60
|
export declare const jstOrderDetail: (data: any) => Promise<any>;
|
|
61
61
|
export declare const bsOrderDetail: (data: any) => Promise<any>;
|
|
62
|
+
export declare const wdtOrderDetail: (data: any) => Promise<any>;
|
|
62
63
|
export declare const getRepeatWorkOrderList: (data: any) => Promise<any>;
|
|
63
64
|
export declare const logisticsInterceptCancel: (data: any) => Promise<any>;
|
|
64
65
|
export declare const queryLogisticsTrack: (data: any) => Promise<any>;
|
|
@@ -370,6 +370,16 @@ export var bsOrderDetail = function bsOrderDetail(data) {
|
|
|
370
370
|
});
|
|
371
371
|
};
|
|
372
372
|
|
|
373
|
+
// wdt订单详情
|
|
374
|
+
export var wdtOrderDetail = function wdtOrderDetail(data) {
|
|
375
|
+
return request({
|
|
376
|
+
url: '/qy/gdfw/order/wdtOrderDetail',
|
|
377
|
+
method: 'post',
|
|
378
|
+
data: data,
|
|
379
|
+
infoLevel: 'warning'
|
|
380
|
+
});
|
|
381
|
+
};
|
|
382
|
+
|
|
373
383
|
// 获取重复详情
|
|
374
384
|
export var getRepeatWorkOrderList = function getRepeatWorkOrderList(data) {
|
|
375
385
|
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": "0.25.3-
|
|
3
|
+
"version": "0.25.3-beta.0",
|
|
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": "^0.25.3-
|
|
36
|
-
"@kmkf-fe-packages/kmkf-utils": "^0.25.3-
|
|
37
|
-
"@kmkf-fe-packages/services-components": "^0.25.3-
|
|
35
|
+
"@kmkf-fe-packages/basic-components": "^0.25.3-beta.0",
|
|
36
|
+
"@kmkf-fe-packages/kmkf-utils": "^0.25.3-beta.0",
|
|
37
|
+
"@kmkf-fe-packages/services-components": "^0.25.3-beta.0",
|
|
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": "faddfa7118f1c64694d536f2bc04162916c9ac82",
|
|
77
77
|
"gitHooks": {
|
|
78
78
|
"pre-commit": "lint-staged"
|
|
79
79
|
}
|