@kmkf-fe-packages/kmkf-work-order-service-component 2.2.13 → 2.2.14-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/FlowTemplateDetailV2/common.d.ts +3 -2
- package/dist/esm/FlowTemplateDetailV2/common.js +15 -4
- package/dist/esm/FlowTemplateDetailV2/components/CurrentNode/index.js +28 -21
- package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.d.ts +1 -0
- package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.js +50 -4
- package/dist/esm/FlowTemplateDetailV2/components/Item/index.d.ts +1 -0
- package/dist/esm/FlowTemplateDetailV2/components/Item/index.js +61 -30
- package/dist/esm/FlowTemplateDetailV2/components/RemarkListModal/index.d.ts +1 -0
- package/dist/esm/FlowTemplateDetailV2/components/RemarkListModal/index.js +19 -11
- package/dist/esm/FlowTemplateDetailV2/components/ShareLinkModal/index.js +13 -9
- package/dist/esm/FlowTemplateDetailV2/constant.js +1 -1
- package/dist/esm/FlowTemplateDetailV2/index.js +94 -66
- package/dist/esm/FlowTemplateDetailV2/store/reducers.d.ts +6 -0
- package/dist/esm/FlowTemplateDetailV2/store/reducers.js +123 -78
- package/dist/esm/FlowTemplateDetailV2/store/selector.d.ts +3 -0
- package/dist/esm/FlowTemplateDetailV2/store/selector.js +3 -0
- package/dist/esm/Login/index.d.ts +1 -0
- package/dist/esm/Login/index.js +3 -1
- package/dist/esm/LoginNew/index.d.ts +8 -0
- package/dist/esm/{WorkOrder/components/CustomizeWorkOrderList/components/RepeatWorkOrderListModal → LoginNew}/index.js +243 -114
- package/dist/esm/LoginNew/index.module.less +45 -0
- package/dist/esm/WorkOrder/components/WorkOrderList/components/LogicFlowList/index.d.ts +3 -1
- package/dist/esm/WorkOrder/components/WorkOrderList/components/LogicFlowList/index.js +15 -4
- package/dist/esm/WorkOrder/components/WorkOrderList/components/LogicFlowList/index.less +18 -7
- package/dist/esm/WorkOrder/components/WorkOrderList/index.d.ts +1 -1
- package/dist/esm/WorkOrder/components/WorkOrderList/index.js +80 -22
- package/dist/esm/common/utils/constant.js +29 -2
- package/dist/esm/common/utils/submitDataTransOldFormat.js +113 -87
- package/dist/esm/common/utils/tools.d.ts +2 -1
- package/dist/esm/common/utils/tools.js +230 -137
- package/dist/esm/common/utils/tools_constants.js +10 -1
- package/dist/esm/common/utils/transformWorkOrderData.js +75 -4
- package/dist/esm/common/utils/xzSDK.js +3 -1
- package/dist/esm/index.d.ts +1 -0
- package/dist/esm/index.js +1 -0
- package/dist/esm/model/flowTemplateDetail/api.d.ts +3 -0
- package/dist/esm/model/flowTemplateDetail/api.js +7 -0
- package/dist/esm/model/flowTemplateDetail/types.d.ts +3 -0
- package/dist/esm/model/login.d.ts +10 -0
- package/dist/esm/model/login.js +66 -45
- package/dist/esm/model/servers/api.d.ts +4 -0
- package/dist/esm/model/servers/api.js +25 -0
- package/package.json +5 -5
- package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/CancelInterceptionModal/index.d.ts +0 -5
- package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/CancelInterceptionModal/index.js +0 -58
- package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/CustomizeWorkOrderCard/index.d.ts +0 -4
- package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/CustomizeWorkOrderCard/index.js +0 -297
- package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/CustomizeWorkOrderCard/index.less +0 -137
- package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/DealerSelectModal/index.d.ts +0 -5
- package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/DealerSelectModal/index.js +0 -95
- package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/DeleteCustomizeOrderModal/index.d.ts +0 -5
- package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/DeleteCustomizeOrderModal/index.js +0 -71
- package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/LogicFlowList/index.d.ts +0 -12
- package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/LogicFlowList/index.js +0 -22
- package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/LogicFlowList/index.less +0 -20
- package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/RecordLog/index.d.ts +0 -7
- package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/RecordLog/index.js +0 -96
- package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/RecordLog/index.less +0 -7
- package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/RepeatWorkOrderListModal/index.d.ts +0 -4
- package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/RepeatWorkOrderListModal/index.less +0 -34
- package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/StatusSelectModal/index.d.ts +0 -5
- package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/StatusSelectModal/index.js +0 -157
- package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/TemplateList/index.d.ts +0 -11
- package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/TemplateList/index.js +0 -19
- package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/TemplateList/index.less +0 -17
- package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/index.d.ts +0 -8
- package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/index.js +0 -454
- package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/index.less +0 -284
|
@@ -21,7 +21,7 @@ import { message } from 'antd';
|
|
|
21
21
|
import { get, last, cloneDeep, isEqual, set } from 'lodash';
|
|
22
22
|
import { orderDetail, queryShopByTid } from "../../model/servers/api";
|
|
23
23
|
import moment from 'moment';
|
|
24
|
-
import { AddressData, ExpressData, ExpressInterceptData, orderBackFormValues, bsOrderBackFormValues, kmOrderBackFormValues, bsE3OrderBackFormValues, wlnOrderBackFormValues, wdtOrderBackFormValues, jstOrderBackFormValues, request, isNull, bsOrderTransform, bsE3OrderTransform, jstOrderTransform, filterJstOrders, wlnOrderTransform, wdtOrderTransform, kmOrderTransform, filterBsE3Orders, filterWdtOrders, filterKmOrders, unTransField, transMultSelectOptions, gyOrderBackFormValues, gyOrderTransform, filterGyOrders, setSessionStorage, skxOrderTransform, orderSubFormOrderTransform, skxReturnOrderTransform } from '@kmkf-fe-packages/kmkf-utils';
|
|
24
|
+
import { AddressData, ExpressData, ExpressInterceptData, orderBackFormValues, bsOrderBackFormValues, kmOrderBackFormValues, bsE3OrderBackFormValues, wlnOrderBackFormValues, wdtOrderBackFormValues, jstOrderBackFormValues, request, isNull, bsOrderTransform, bsE3OrderTransform, jstOrderTransform, filterJstOrders, wlnOrderTransform, wdtOrderTransform, kmOrderTransform, filterBsE3Orders, filterWdtOrders, filterKmOrders, unTransField, transMultSelectOptions, gyOrderBackFormValues, gyOrderTransform, filterGyOrders, filterJyOrders, setSessionStorage, jyOrderTransform, jyOrderBackFormValues, skxOrderTransform, orderSubFormOrderTransform, skxReturnOrderTransform } from '@kmkf-fe-packages/kmkf-utils';
|
|
25
25
|
import Monitor from 'kmkf-monitor';
|
|
26
26
|
import { PlatForm } from "../../model/flowTemplateDetail/types";
|
|
27
27
|
import transformWorkOrderData from "./transformWorkOrderData";
|
|
@@ -64,7 +64,8 @@ var workTypeKeys = {
|
|
|
64
64
|
BUSINESS_ORDER_NO: 'businessOrderNo',
|
|
65
65
|
PAYMENT_VOUCHER_CODE: 'paymentVoucherCode',
|
|
66
66
|
EXECUTE_ACTION_TYPE: 'executeActionType',
|
|
67
|
-
ERP_ORDER_STATUS: 'erpOrderStatus'
|
|
67
|
+
ERP_ORDER_STATUS: 'erpOrderStatus',
|
|
68
|
+
JST_OUTBOUND_STATUS: 'jstOutboundStatus'
|
|
68
69
|
};
|
|
69
70
|
|
|
70
71
|
// 根据组件类型获取组件的UniqueKey
|
|
@@ -140,52 +141,72 @@ var getBasicsOrderInfo = function getBasicsOrderInfo(orderInfo, xiaozhiOrder) {
|
|
|
140
141
|
//订单返填
|
|
141
142
|
export var orderBack = /*#__PURE__*/function () {
|
|
142
143
|
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
|
|
143
|
-
var order_no, form, propsShopid, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, callbackShopId, setLoading, callKey, shopId, _res$data, res,
|
|
144
|
+
var companyKey, order_no, form, propsShopid, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, callbackShopId, setLoading, callKey, shopId, trySetShopId, _res$data, res, _res$data2, _res$data3, JOIN_SHOP, hasFlagMap, _ref4, shopSourceStr, _ref4$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, _jyOrder$value, _jyOrder$value$data, _skxOrder$value, _skxReturnOrder$value, _bsOrders$orders, _bsE3Orders$orderList, _wlnOrders$orders, _wdtOrders$trades, _gyOrders$trades, _jyOrders$trades, _kmOrders$orderDetail, promise, kmVideoComponent, OrderSubFormComponent, _yield$Promise$allSet, _yield$Promise$allSet2, data, xiaozhiOrder, jstOrder, bsOrder, wlnOrder, wdtOrder, bsE3Order, kmOrder, gyOrder, jyOrder, skxOrder, skxReturnOrder, kmVideoOrder, orderSubFormOrder, _data$value2, orderInfo, jstOrders, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, gyOrders, jyOrders, skxOrders, skxReturnOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, orderSubFormInfo, gyInfo, jyInfo, jstInfo, skxInfo, skxReturnInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, hasSigningDatetime, _signDatetime$data, signDatetime, values, paymentUniqueKey;
|
|
144
145
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
145
146
|
while (1) switch (_context.prev = _context.next) {
|
|
146
147
|
case 0:
|
|
147
|
-
order_no = _ref.order_no, form = _ref.form, propsShopid = _ref.shopId, shopList = _ref.shopList, templateDetail = _ref.templateDetail, _ref$type = _ref.type, type = _ref$type === void 0 ? 'add' : _ref$type, callback = _ref.callback, fromQNCreateWorkOrderByOrderNo = _ref.fromQNCreateWorkOrderByOrderNo, _ref$plat = _ref.plat, plat = _ref$plat === void 0 ? {} : _ref$plat, callbackShopId = _ref.callbackShopId, setLoading = _ref.setLoading, callKey = _ref.callKey;
|
|
148
|
-
console.log('orderBack-run--', callKey);
|
|
148
|
+
companyKey = _ref.companyKey, order_no = _ref.order_no, form = _ref.form, propsShopid = _ref.shopId, shopList = _ref.shopList, templateDetail = _ref.templateDetail, _ref$type = _ref.type, type = _ref$type === void 0 ? 'add' : _ref$type, callback = _ref.callback, fromQNCreateWorkOrderByOrderNo = _ref.fromQNCreateWorkOrderByOrderNo, _ref$plat = _ref.plat, plat = _ref$plat === void 0 ? {} : _ref$plat, callbackShopId = _ref.callbackShopId, setLoading = _ref.setLoading, callKey = _ref.callKey;
|
|
149
|
+
console.log('orderBack-run--', callKey, templateDetail);
|
|
149
150
|
shopId = propsShopid; //如果是pc平台且没有shopId的情况下 获取shopId
|
|
150
|
-
|
|
151
|
-
|
|
151
|
+
trySetShopId = function trySetShopId(_ref3) {
|
|
152
|
+
var theShopId = _ref3.theShopId,
|
|
153
|
+
theShopUniqueKey = _ref3.theShopUniqueKey,
|
|
154
|
+
theShopName = _ref3.theShopName,
|
|
155
|
+
erpShopName = _ref3.erpShopName;
|
|
156
|
+
var shopInfo = shopList.find(function (item) {
|
|
157
|
+
return theShopId && item.shopId === theShopId || theShopUniqueKey && item.uniqueKey === theShopUniqueKey;
|
|
158
|
+
});
|
|
159
|
+
if (!shopInfo) {
|
|
160
|
+
message.error(erpShopName ? "\u5339\u914D\u5E97\u94FA\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5\u662F\u5426\u914D\u7F6E".concat(erpShopName, "\u6620\u5C04\uFF0C\u6216\u5BF9\u5E94\u5E97\u94FA\u662F\u5426\u6709\u6743\u9650") : "\u5339\u914D\u5E97\u94FA\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5\u662F\u5426\u6709".concat(theShopName, "\u5E97\u94FA\u6743\u9650"));
|
|
161
|
+
} else {
|
|
162
|
+
if (!shopInfo.auditStatus) {
|
|
163
|
+
message.error("\u5339\u914D\u5E97\u94FA\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5".concat(theShopName, "\u6388\u6743\u662F\u5426\u6B63\u5E38"));
|
|
164
|
+
} else {
|
|
165
|
+
shopId = shopInfo.shopId;
|
|
166
|
+
callbackShopId === null || callbackShopId === void 0 ? void 0 : callbackShopId(shopId);
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
};
|
|
170
|
+
console.log('*** ', companyKey, ['SZF4ZGWZSNW6PYXMCIFEWBXT',
|
|
171
|
+
//test 测马奔腾
|
|
172
|
+
'6O47IBXFR26FJF4HUQ7WGO4H',
|
|
173
|
+
//prod 陈健企业工单
|
|
174
|
+
'TR3E2FYXFZCFANVG6O6AALSM' //prod 斯凯奇
|
|
175
|
+
].includes(companyKey));
|
|
176
|
+
if (!(order_no && [PlatForm.PC, PlatForm.WEB].includes(plat.platform) && (!!(plat !== null && plat !== void 0 && plat.bindERP) || ['SZF4ZGWZSNW6PYXMCIFEWBXT',
|
|
177
|
+
//test 测马奔腾
|
|
178
|
+
'6O47IBXFR26FJF4HUQ7WGO4H',
|
|
179
|
+
//prod 陈健企业工单
|
|
180
|
+
'TR3E2FYXFZCFANVG6O6AALSM' //prod 斯凯奇
|
|
181
|
+
].includes(companyKey)) && type === 'add')) {
|
|
182
|
+
_context.next = 20;
|
|
152
183
|
break;
|
|
153
184
|
}
|
|
154
185
|
setLoading === null || setLoading === void 0 ? void 0 : setLoading(true);
|
|
155
|
-
_context.prev =
|
|
156
|
-
_context.next =
|
|
186
|
+
_context.prev = 7;
|
|
187
|
+
_context.next = 10;
|
|
157
188
|
return queryShopByTid({
|
|
158
189
|
tid: order_no
|
|
159
190
|
});
|
|
160
|
-
case
|
|
191
|
+
case 10:
|
|
161
192
|
res = _context.sent;
|
|
162
193
|
if (res !== null && res !== void 0 && (_res$data = res.data) !== null && _res$data !== void 0 && _res$data.shopId) {
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
194
|
+
trySetShopId({
|
|
195
|
+
theShopName: res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.shopName,
|
|
196
|
+
theShopId: res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.shopId
|
|
166
197
|
});
|
|
167
|
-
if (!shopInfo) {
|
|
168
|
-
message.error("\u5339\u914D\u5E97\u94FA\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5\u662F\u5426\u6709".concat(res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.shopName, "\u5E97\u94FA\u6743\u9650"));
|
|
169
|
-
} else {
|
|
170
|
-
if (!shopInfo.auditStatus) {
|
|
171
|
-
message.error("\u5339\u914D\u5E97\u94FA\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5".concat(res === null || res === void 0 ? void 0 : (_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.shopName, "\u6388\u6743\u662F\u5426\u6B63\u5E38"));
|
|
172
|
-
} else {
|
|
173
|
-
shopId = res === null || res === void 0 ? void 0 : (_res$data5 = res.data) === null || _res$data5 === void 0 ? void 0 : _res$data5.shopId;
|
|
174
|
-
callbackShopId === null || callbackShopId === void 0 ? void 0 : callbackShopId(shopId);
|
|
175
|
-
}
|
|
176
|
-
}
|
|
177
198
|
}
|
|
178
|
-
_context.next =
|
|
199
|
+
_context.next = 17;
|
|
179
200
|
break;
|
|
180
|
-
case
|
|
181
|
-
_context.prev =
|
|
182
|
-
_context.t0 = _context["catch"](
|
|
201
|
+
case 14:
|
|
202
|
+
_context.prev = 14;
|
|
203
|
+
_context.t0 = _context["catch"](7);
|
|
183
204
|
console.error(_context.t0);
|
|
184
|
-
case
|
|
185
|
-
_context.prev =
|
|
205
|
+
case 17:
|
|
206
|
+
_context.prev = 17;
|
|
186
207
|
setLoading === null || setLoading === void 0 ? void 0 : setLoading(false);
|
|
187
|
-
return _context.finish(
|
|
188
|
-
case
|
|
208
|
+
return _context.finish(17);
|
|
209
|
+
case 20:
|
|
189
210
|
//是否是对接平台,只有对接平台才能返填订单号
|
|
190
211
|
JOIN_SHOP = shopList.find(function (item) {
|
|
191
212
|
return !item.notJoin && item.shopId == shopId;
|
|
@@ -201,7 +222,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
201
222
|
}).every(function (item) {
|
|
202
223
|
return item === false;
|
|
203
224
|
}))) {
|
|
204
|
-
_context.next =
|
|
225
|
+
_context.next = 25;
|
|
205
226
|
break;
|
|
206
227
|
}
|
|
207
228
|
//处理店铺映射存在店铺信息却没有返填的问题
|
|
@@ -211,12 +232,12 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
211
232
|
});
|
|
212
233
|
}
|
|
213
234
|
return _context.abrupt("return");
|
|
214
|
-
case
|
|
215
|
-
|
|
235
|
+
case 25:
|
|
236
|
+
_ref4 = shopList.find(function (item) {
|
|
216
237
|
return item.shopId == shopId;
|
|
217
|
-
}) || {}, shopSourceStr =
|
|
238
|
+
}) || {}, shopSourceStr = _ref4.shopSourceStr, _ref4$thirdUserNick = _ref4.thirdUserNick, thirdUserNick = _ref4$thirdUserNick === void 0 ? '' : _ref4$thirdUserNick, thirdShopMainType = _ref4.thirdShopMainType;
|
|
218
239
|
setLoading === null || setLoading === void 0 ? void 0 : setLoading(true);
|
|
219
|
-
_context.prev =
|
|
240
|
+
_context.prev = 27;
|
|
220
241
|
promise = [];
|
|
221
242
|
if (!JOIN_SHOP || thirdShopMainType === '1' && shopSourceStr === 'JD') {
|
|
222
243
|
promise.push(Promise.resolve([]));
|
|
@@ -230,10 +251,10 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
230
251
|
}));
|
|
231
252
|
}
|
|
232
253
|
|
|
233
|
-
//
|
|
254
|
+
// 京东自营/pdd订单数据获取
|
|
234
255
|
promise.push(
|
|
235
256
|
// thirdShopSubType === 1 && shopSourceStr === 'JD' && window.invokerSDK
|
|
236
|
-
|
|
257
|
+
['JD', 'PDD'].includes(shopSourceStr) && window.invokerSDK ? xzSDK.getActiveUserTardeInfo(order_no) : Promise.reject());
|
|
237
258
|
Object.keys(hasFlagMap).forEach(function (key) {
|
|
238
259
|
var _hasFlagMap$key = hasFlagMap[key],
|
|
239
260
|
flag = _hasFlagMap$key.flag,
|
|
@@ -273,11 +294,11 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
273
294
|
}
|
|
274
295
|
|
|
275
296
|
//需按照orderBackMap中的顺序结构
|
|
276
|
-
_context.next =
|
|
297
|
+
_context.next = 38;
|
|
277
298
|
return Promise.allSettled(promise);
|
|
278
|
-
case
|
|
299
|
+
case 38:
|
|
279
300
|
_yield$Promise$allSet = _context.sent;
|
|
280
|
-
_yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet,
|
|
301
|
+
_yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet, 14);
|
|
281
302
|
data = _yield$Promise$allSet2[0];
|
|
282
303
|
xiaozhiOrder = _yield$Promise$allSet2[1];
|
|
283
304
|
jstOrder = _yield$Promise$allSet2[2];
|
|
@@ -287,10 +308,11 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
287
308
|
bsE3Order = _yield$Promise$allSet2[6];
|
|
288
309
|
kmOrder = _yield$Promise$allSet2[7];
|
|
289
310
|
gyOrder = _yield$Promise$allSet2[8];
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
311
|
+
jyOrder = _yield$Promise$allSet2[9];
|
|
312
|
+
skxOrder = _yield$Promise$allSet2[10];
|
|
313
|
+
skxReturnOrder = _yield$Promise$allSet2[11];
|
|
314
|
+
kmVideoOrder = _yield$Promise$allSet2[12];
|
|
315
|
+
orderSubFormOrder = _yield$Promise$allSet2[13];
|
|
294
316
|
// TODO: 针对订单支付方式是微信还是支付宝,后端接口返回一个message用来提示使用
|
|
295
317
|
console.log('--订单反填数据--', {
|
|
296
318
|
data: data,
|
|
@@ -302,6 +324,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
302
324
|
bsE3Order: bsE3Order,
|
|
303
325
|
kmOrder: kmOrder,
|
|
304
326
|
gyOrder: gyOrder,
|
|
327
|
+
jyOrder: jyOrder,
|
|
305
328
|
skxOrder: skxOrder,
|
|
306
329
|
skxReturnOrder: skxReturnOrder,
|
|
307
330
|
kmVideoOrder: kmVideoOrder,
|
|
@@ -324,6 +347,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
324
347
|
bsE3Orders = bsE3Order === null || bsE3Order === void 0 ? void 0 : (_bsE3Order$value = bsE3Order.value) === null || _bsE3Order$value === void 0 ? void 0 : _bsE3Order$value.data;
|
|
325
348
|
kmOrders = kmOrder === null || kmOrder === void 0 ? void 0 : (_kmOrder$value = kmOrder.value) === null || _kmOrder$value === void 0 ? void 0 : _kmOrder$value.data;
|
|
326
349
|
gyOrders = gyOrder === null || gyOrder === void 0 ? void 0 : (_gyOrder$value = gyOrder.value) === null || _gyOrder$value === void 0 ? void 0 : _gyOrder$value.data;
|
|
350
|
+
jyOrders = jyOrder === null || jyOrder === void 0 ? void 0 : (_jyOrder$value = jyOrder.value) === null || _jyOrder$value === void 0 ? void 0 : (_jyOrder$value$data = _jyOrder$value.data) === null || _jyOrder$value$data === void 0 ? void 0 : _jyOrder$value$data.tradeOrderDetails;
|
|
327
351
|
skxOrders = skxOrder === null || skxOrder === void 0 ? void 0 : (_skxOrder$value = skxOrder.value) === null || _skxOrder$value === void 0 ? void 0 : _skxOrder$value.data;
|
|
328
352
|
skxReturnOrders = skxReturnOrder === null || skxReturnOrder === void 0 ? void 0 : (_skxReturnOrder$value = skxReturnOrder.value) === null || _skxReturnOrder$value === void 0 ? void 0 : _skxReturnOrder$value.data;
|
|
329
353
|
console.log('skxOrders', {
|
|
@@ -335,11 +359,12 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
335
359
|
if (kmOrders) kmOrders.orderDetailDtoList = filterKmOrders(kmOrders, order_no);
|
|
336
360
|
if (gyOrders) gyOrders.trades = filterGyOrders(gyOrders, order_no);
|
|
337
361
|
if (jstOrders) jstOrders.trades = filterJstOrders(jstOrders, order_no);
|
|
362
|
+
if (jyOrders) jyOrders.trades = filterJyOrders(jyOrders, order_no);
|
|
338
363
|
if (skxOrders) skxOrders.trades = (skxOrders === null || skxOrders === void 0 ? void 0 : skxOrders.orderDetailInfoList) || []; //需要看实际接口返回字段
|
|
339
364
|
if (skxReturnOrders) skxReturnOrders.trades = (skxReturnOrders === null || skxReturnOrders === void 0 ? void 0 : skxReturnOrders.skqReturnOrderDetailInfoDtos) || [];
|
|
340
365
|
pushGyLog('gyOrders', gyOrders);
|
|
341
366
|
Monitor.automaticReport({
|
|
342
|
-
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 skxReturn\u4FE1\u606F:").concat(JSON.stringify(skxReturnOrders || {}), ",\n \u7BA1\u6613\u4FE1\u606F:").concat(JSON.stringify(gyOrders || []), "\n ")
|
|
367
|
+
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 skxReturn\u4FE1\u606F:").concat(JSON.stringify(skxReturnOrders || {}), ",\n \u7BA1\u6613\u4FE1\u606F:").concat(JSON.stringify(gyOrders || []), "\n \u5DE8\u76CA\u4FE1\u606F:").concat(JSON.stringify(jyOrders || []), "\n ")
|
|
343
368
|
});
|
|
344
369
|
if (bsOrders && plat !== null && plat !== void 0 && plat.subOrderNo) {
|
|
345
370
|
bsOrders.orders = bsOrders.orders.filter(function (item) {
|
|
@@ -382,6 +407,11 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
382
407
|
orderNo: order_no
|
|
383
408
|
}), form);
|
|
384
409
|
pushGyLog('gyInfo', gyInfo);
|
|
410
|
+
jyInfo = jyOrders && jyOrderTransform(_objectSpread(_objectSpread({}, jyOrders), {}, {
|
|
411
|
+
allOrders: jyOrders === null || jyOrders === void 0 ? void 0 : jyOrders.trades,
|
|
412
|
+
componentList: templateDetail.componentDtoList,
|
|
413
|
+
orderNo: order_no
|
|
414
|
+
}), form);
|
|
385
415
|
jstInfo = jstOrders && jstOrderTransform(_objectSpread(_objectSpread({}, jstOrders), {}, {
|
|
386
416
|
componentList: templateDetail.componentDtoList,
|
|
387
417
|
orderNo: order_no,
|
|
@@ -467,6 +497,20 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
467
497
|
}];
|
|
468
498
|
pushGyLog('gyInfo_after', gyInfo);
|
|
469
499
|
}
|
|
500
|
+
if ((jyOrders === null || jyOrders === void 0 ? void 0 : (_jyOrders$trades = jyOrders.trades) === null || _jyOrders$trades === void 0 ? void 0 : _jyOrders$trades.length) > 1) {
|
|
501
|
+
jyInfo.jyGoods = _objectSpread(_objectSpread({}, jyInfo.jyGoods), {}, {
|
|
502
|
+
jyGoods: [],
|
|
503
|
+
orders: []
|
|
504
|
+
});
|
|
505
|
+
jyInfo.jyLogistics = [{
|
|
506
|
+
logisticsCompany: null,
|
|
507
|
+
logisticsCode: ''
|
|
508
|
+
}];
|
|
509
|
+
jyInfo.jySendGood = [{
|
|
510
|
+
sendId: '',
|
|
511
|
+
sendName: ''
|
|
512
|
+
}];
|
|
513
|
+
}
|
|
470
514
|
if ((kmOrders === null || kmOrders === void 0 ? void 0 : (_kmOrders$orderDetail = kmOrders.orderDetailDtoList) === null || _kmOrders$orderDetail === void 0 ? void 0 : _kmOrders$orderDetail.length) > 1) {
|
|
471
515
|
kmInfo.kmSendGood = [{
|
|
472
516
|
sendId: '',
|
|
@@ -522,6 +566,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
522
566
|
bsE3Order: bsE3Info,
|
|
523
567
|
kmOrder: kmInfo,
|
|
524
568
|
gyOrder: gyInfo,
|
|
569
|
+
jyOrder: jyInfo,
|
|
525
570
|
skxOrder: skxInfo,
|
|
526
571
|
orderSubFormOrder: orderSubFormInfo,
|
|
527
572
|
skxReturnOrder: skxReturnInfo
|
|
@@ -529,7 +574,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
529
574
|
pushGyLog('detail', detail);
|
|
530
575
|
//抖音数据特殊处理
|
|
531
576
|
if (!orderInfo) {
|
|
532
|
-
_context.next =
|
|
577
|
+
_context.next = 139;
|
|
533
578
|
break;
|
|
534
579
|
}
|
|
535
580
|
if (shopSourceStr === 'FXG') {
|
|
@@ -541,7 +586,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
541
586
|
hasSelectItem = HasErpItemSelectHandle(templateDetail);
|
|
542
587
|
erpPromiseList = [];
|
|
543
588
|
if (!(shopSourceStr === 'TAOBAO' && hasSelectItem)) {
|
|
544
|
-
_context.next =
|
|
589
|
+
_context.next = 123;
|
|
545
590
|
break;
|
|
546
591
|
}
|
|
547
592
|
list = detail['itemList'];
|
|
@@ -559,10 +604,10 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
559
604
|
resolve({});
|
|
560
605
|
});
|
|
561
606
|
});
|
|
562
|
-
_context.prev =
|
|
563
|
-
_context.next =
|
|
607
|
+
_context.prev = 113;
|
|
608
|
+
_context.next = 116;
|
|
564
609
|
return Promise.all(promises);
|
|
565
|
-
case
|
|
610
|
+
case 116:
|
|
566
611
|
erpPromiseList = _context.sent;
|
|
567
612
|
detail['itemList'] = (_detail$itemList = detail['itemList']) === null || _detail$itemList === void 0 ? void 0 : _detail$itemList.map(function (item, index) {
|
|
568
613
|
return _objectSpread(_objectSpread({}, item), {}, {
|
|
@@ -572,25 +617,25 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
572
617
|
})
|
|
573
618
|
});
|
|
574
619
|
});
|
|
575
|
-
_context.next =
|
|
620
|
+
_context.next = 123;
|
|
576
621
|
break;
|
|
577
|
-
case
|
|
578
|
-
_context.prev =
|
|
579
|
-
_context.t1 = _context["catch"](
|
|
622
|
+
case 120:
|
|
623
|
+
_context.prev = 120;
|
|
624
|
+
_context.t1 = _context["catch"](113);
|
|
580
625
|
console.error('调用erp获取宝贝编码错误', _context.t1);
|
|
581
|
-
case
|
|
626
|
+
case 123:
|
|
582
627
|
// 判断是否存在签收时间组件
|
|
583
628
|
hasSigningDatetime = HasTradeSigningDatetime(templateDetail); // 如存在签收时间组件且订单也有返回相应物流单号跟物流公司编码,则调用接口获取签收时间
|
|
584
629
|
if (!hasSigningDatetime) {
|
|
585
|
-
_context.next =
|
|
630
|
+
_context.next = 139;
|
|
586
631
|
break;
|
|
587
632
|
}
|
|
588
633
|
if (!(orderInfo !== null && orderInfo !== void 0 && orderInfo.expressLogisticsCompany && orderInfo !== null && orderInfo !== void 0 && orderInfo.expressLogisticsCode)) {
|
|
589
|
-
_context.next =
|
|
634
|
+
_context.next = 138;
|
|
590
635
|
break;
|
|
591
636
|
}
|
|
592
|
-
_context.prev =
|
|
593
|
-
_context.next =
|
|
637
|
+
_context.prev = 126;
|
|
638
|
+
_context.next = 129;
|
|
594
639
|
return request({
|
|
595
640
|
url: '/qy/logistics/logisticsSignTime',
|
|
596
641
|
method: 'post',
|
|
@@ -600,21 +645,21 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
600
645
|
mailNo: orderInfo.expressLogisticsCode
|
|
601
646
|
}
|
|
602
647
|
});
|
|
603
|
-
case
|
|
648
|
+
case 129:
|
|
604
649
|
signDatetime = _context.sent;
|
|
605
650
|
detail['tradeSigningDateTime'] = signDatetime === null || signDatetime === void 0 ? void 0 : (_signDatetime$data = signDatetime.data) === null || _signDatetime$data === void 0 ? void 0 : _signDatetime$data.signTime;
|
|
606
|
-
_context.next =
|
|
651
|
+
_context.next = 136;
|
|
607
652
|
break;
|
|
608
|
-
case
|
|
609
|
-
_context.prev =
|
|
610
|
-
_context.t2 = _context["catch"](
|
|
653
|
+
case 133:
|
|
654
|
+
_context.prev = 133;
|
|
655
|
+
_context.t2 = _context["catch"](126);
|
|
611
656
|
console.error('调用签收时间错误', _context.t2);
|
|
612
|
-
case
|
|
613
|
-
_context.next =
|
|
657
|
+
case 136:
|
|
658
|
+
_context.next = 139;
|
|
614
659
|
break;
|
|
615
|
-
case
|
|
660
|
+
case 138:
|
|
616
661
|
detail['tradeSigningDateTime'] = '';
|
|
617
|
-
case
|
|
662
|
+
case 139:
|
|
618
663
|
values = orderBackFormValues({
|
|
619
664
|
detail: detail,
|
|
620
665
|
_get_order_fail_: !orderInfo,
|
|
@@ -650,6 +695,14 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
650
695
|
}
|
|
651
696
|
}
|
|
652
697
|
// console.log('orderback', values);
|
|
698
|
+
if (values.shopUniqueKey) {
|
|
699
|
+
trySetShopId({
|
|
700
|
+
theShopUniqueKey: values.shopUniqueKey,
|
|
701
|
+
erpShopName: values.erpShopName
|
|
702
|
+
});
|
|
703
|
+
delete values.shopUniqueKey;
|
|
704
|
+
delete values.erpShopName;
|
|
705
|
+
}
|
|
653
706
|
form.setFieldsValue(_objectSpread(_objectSpread(_objectSpread({}, formValue), values), {}, {
|
|
654
707
|
fixed_field_buyerOpenUid: orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.buyerOpenUid,
|
|
655
708
|
shopId: shopId
|
|
@@ -659,21 +712,21 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
659
712
|
shopId: shopId
|
|
660
713
|
}));
|
|
661
714
|
callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
|
|
662
|
-
_context.next =
|
|
715
|
+
_context.next = 151;
|
|
663
716
|
break;
|
|
664
|
-
case
|
|
665
|
-
_context.prev =
|
|
666
|
-
_context.t3 = _context["catch"](
|
|
717
|
+
case 148:
|
|
718
|
+
_context.prev = 148;
|
|
719
|
+
_context.t3 = _context["catch"](27);
|
|
667
720
|
console.error(_context.t3);
|
|
668
|
-
case
|
|
669
|
-
_context.prev =
|
|
721
|
+
case 151:
|
|
722
|
+
_context.prev = 151;
|
|
670
723
|
setLoading === null || setLoading === void 0 ? void 0 : setLoading(false);
|
|
671
|
-
return _context.finish(
|
|
672
|
-
case
|
|
724
|
+
return _context.finish(151);
|
|
725
|
+
case 154:
|
|
673
726
|
case "end":
|
|
674
727
|
return _context.stop();
|
|
675
728
|
}
|
|
676
|
-
}, _callee, null, [[
|
|
729
|
+
}, _callee, null, [[7, 14, 17, 20], [27, 148, 151, 154], [113, 120], [126, 133]]);
|
|
677
730
|
}));
|
|
678
731
|
return function orderBack(_x) {
|
|
679
732
|
return _ref2.apply(this, arguments);
|
|
@@ -809,14 +862,14 @@ export var HasTradeSigningDatetime = function HasTradeSigningDatetime() {
|
|
|
809
862
|
return ['TRADE_SIGNING_DATETIME'].includes(item.workOrderComponentType);
|
|
810
863
|
});
|
|
811
864
|
};
|
|
812
|
-
export var submitParams = function submitParams(
|
|
865
|
+
export var submitParams = function submitParams(_ref5) {
|
|
813
866
|
var _currentNodeDetail$no;
|
|
814
|
-
var update =
|
|
815
|
-
formData =
|
|
816
|
-
currentNodeDetail =
|
|
817
|
-
plat =
|
|
818
|
-
operateParams =
|
|
819
|
-
shopUniqueKey =
|
|
867
|
+
var update = _ref5.update,
|
|
868
|
+
formData = _ref5.formData,
|
|
869
|
+
currentNodeDetail = _ref5.currentNodeDetail,
|
|
870
|
+
plat = _ref5.plat,
|
|
871
|
+
operateParams = _ref5.operateParams,
|
|
872
|
+
shopUniqueKey = _ref5.shopUniqueKey;
|
|
820
873
|
var newTemplateDetail = cloneDeep(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo) || {};
|
|
821
874
|
var params = {
|
|
822
875
|
isAdd: !update,
|
|
@@ -825,7 +878,7 @@ export var submitParams = function submitParams(_ref4) {
|
|
|
825
878
|
}, operateParams)
|
|
826
879
|
};
|
|
827
880
|
if (update) {
|
|
828
|
-
var _currentNodeDetail$wo, _currentNodeDetail$wo2, _currentNodeDetail$wo3, _currentNodeDetail$wo4, _currentNodeDetail$wo5, _currentNodeDetail$wo6, _currentNodeDetail$wo7;
|
|
881
|
+
var _currentNodeDetail$wo, _currentNodeDetail$wo2, _currentNodeDetail$wo3, _currentNodeDetail$wo4, _currentNodeDetail$wo5, _currentNodeDetail$wo6, _currentNodeDetail$wo7, _currentNodeDetail$wo8;
|
|
829
882
|
params.updateInfo = {
|
|
830
883
|
templateId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo === void 0 ? void 0 : _currentNodeDetail$wo.templateId,
|
|
831
884
|
workOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo2 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo2 === void 0 ? void 0 : _currentNodeDetail$wo2.id,
|
|
@@ -877,25 +930,33 @@ export var submitParams = function submitParams(_ref4) {
|
|
|
877
930
|
dataValue: false
|
|
878
931
|
});
|
|
879
932
|
}
|
|
933
|
+
if (shopUniqueKey !== (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo8 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo8 === void 0 ? void 0 : _currentNodeDetail$wo8.shopUniqueKey)) {
|
|
934
|
+
var _currentNodeDetail$wo9;
|
|
935
|
+
updateList.push({
|
|
936
|
+
dataKey: 'userId',
|
|
937
|
+
oldValue: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo9 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo9 === void 0 ? void 0 : _currentNodeDetail$wo9.shopUniqueKey,
|
|
938
|
+
dataValue: shopUniqueKey
|
|
939
|
+
});
|
|
940
|
+
}
|
|
880
941
|
params.updateInfo.updateList = updateList;
|
|
881
942
|
params.updateInfo.needTransForm = params.needTransForm;
|
|
882
943
|
delete params.workOrderUpdateKeyVos;
|
|
883
944
|
delete params.needTransForm;
|
|
884
945
|
} else {
|
|
885
|
-
var _Object$keys, _currentNodeDetail$
|
|
946
|
+
var _Object$keys, _currentNodeDetail$wo10, _currentNodeDetail$wo11, _currentNodeDetail$wo12, _currentNodeDetail$wo13, _currentNodeDetail$wo14, _currentNodeDetail$wo15, _currentNodeDetail$wo16, _currentNodeDetail$wo17, _currentNodeDetail$wo18, _currentNodeDetail$wo19, _currentNodeDetail$wo20;
|
|
886
947
|
// TODO: 新保存工单
|
|
887
948
|
// 获取当前表单中非空字段
|
|
888
949
|
var finalComponentList = (_Object$keys = Object.keys(formData)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.filter(function (i) {
|
|
889
950
|
return !isNull(formData[i]);
|
|
890
951
|
});
|
|
891
952
|
// 获取非空字段对应的组件
|
|
892
|
-
var finalDtoList = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
953
|
+
var finalDtoList = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo10 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo10 === void 0 ? void 0 : (_currentNodeDetail$wo11 = _currentNodeDetail$wo10.componentDtoList) === null || _currentNodeDetail$wo11 === void 0 ? void 0 : _currentNodeDetail$wo11.filter(function (item) {
|
|
893
954
|
return finalComponentList.includes(item.uniqueKey) || item.workOrderComponentType === 'BUYER_MESSAGE_NOTICE';
|
|
894
955
|
});
|
|
895
956
|
set(newTemplateDetail, 'componentDtoList', finalDtoList);
|
|
896
957
|
params.workOrder = {
|
|
897
|
-
templateId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
898
|
-
handleWorkOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
958
|
+
templateId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo12 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo12 === void 0 ? void 0 : _currentNodeDetail$wo12.uniqueKey,
|
|
959
|
+
handleWorkOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo13 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo13 === void 0 ? void 0 : _currentNodeDetail$wo13.id,
|
|
899
960
|
buyerNick: plat === null || plat === void 0 ? void 0 : plat.buyerNick,
|
|
900
961
|
buyerOpenUid: plat === null || plat === void 0 ? void 0 : plat.buyerId,
|
|
901
962
|
shopUniqueKey: shopUniqueKey,
|
|
@@ -905,13 +966,13 @@ export var submitParams = function submitParams(_ref4) {
|
|
|
905
966
|
};
|
|
906
967
|
|
|
907
968
|
// 判断是否有订单号组建,订单号数据需要特殊处理
|
|
908
|
-
var tradeIdUniqueKey = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
969
|
+
var tradeIdUniqueKey = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo14 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo14 === void 0 ? void 0 : (_currentNodeDetail$wo15 = _currentNodeDetail$wo14.componentDtoList) === null || _currentNodeDetail$wo15 === void 0 ? void 0 : (_currentNodeDetail$wo16 = _currentNodeDetail$wo15.find(function (item) {
|
|
909
970
|
return item.workOrderComponentType === 'TRADE_ID_INPUT';
|
|
910
|
-
})) === null || _currentNodeDetail$
|
|
971
|
+
})) === null || _currentNodeDetail$wo16 === void 0 ? void 0 : _currentNodeDetail$wo16.uniqueKey;
|
|
911
972
|
// 判断是否有订单号组建,订单号数据需要特殊处理
|
|
912
|
-
var paymentTradeIdUniqueKey = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$
|
|
973
|
+
var paymentTradeIdUniqueKey = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo17 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo17 === void 0 ? void 0 : (_currentNodeDetail$wo18 = _currentNodeDetail$wo17.componentDtoList) === null || _currentNodeDetail$wo18 === void 0 ? void 0 : (_currentNodeDetail$wo19 = _currentNodeDetail$wo18.find(function (item) {
|
|
913
974
|
return item.workOrderComponentType === 'ENTERPRISE_PAYMENT';
|
|
914
|
-
})) === null || _currentNodeDetail$
|
|
975
|
+
})) === null || _currentNodeDetail$wo19 === void 0 ? void 0 : _currentNodeDetail$wo19.uniqueKey;
|
|
915
976
|
if (paymentTradeIdUniqueKey) {
|
|
916
977
|
var _formData;
|
|
917
978
|
params.workOrder.tid = formData === null || formData === void 0 ? void 0 : (_formData = formData["".concat(paymentTradeIdUniqueKey)]) === null || _formData === void 0 ? void 0 : _formData.enterprisePaymentTid;
|
|
@@ -922,7 +983,7 @@ export var submitParams = function submitParams(_ref4) {
|
|
|
922
983
|
if (formData !== null && formData !== void 0 && formData['fixed_field_buyerOpenUid']) {
|
|
923
984
|
params.workOrder.buyerOpenUid = formData === null || formData === void 0 ? void 0 : formData['fixed_field_buyerOpenUid'];
|
|
924
985
|
}
|
|
925
|
-
params.workOrder.workOrderComponents = submitDataTransOldFormat(formData, newTemplateDetail, !!(currentNodeDetail !== null && currentNodeDetail !== void 0 && (_currentNodeDetail$
|
|
986
|
+
params.workOrder.workOrderComponents = submitDataTransOldFormat(formData, newTemplateDetail, !!(currentNodeDetail !== null && currentNodeDetail !== void 0 && (_currentNodeDetail$wo20 = currentNodeDetail.workOrder) !== null && _currentNodeDetail$wo20 !== void 0 && _currentNodeDetail$wo20.id), currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrder, params.workOrder, (plat === null || plat === void 0 ? void 0 : plat.accountName) || '');
|
|
926
987
|
//端上有买家id 就返填当前买家 即使不是当前买家的订单
|
|
927
988
|
if (plat.platform !== PlatForm.PC && plat !== null && plat !== void 0 && plat.buyerId) {
|
|
928
989
|
params.workOrder.buyerOpenUid = plat === null || plat === void 0 ? void 0 : plat.buyerId;
|
|
@@ -1007,6 +1068,7 @@ export var reversalFormValues = function reversalFormValues() {
|
|
|
1007
1068
|
case 'JST_REISSUE_GOODS':
|
|
1008
1069
|
case 'JST_RETURN_GOODS':
|
|
1009
1070
|
case 'KM_REISSUE_GOODS':
|
|
1071
|
+
case 'JY_REISSUE_GOODS':
|
|
1010
1072
|
prv["".concat(next.uniqueKey, "_shopCode")] = values[next.uniqueKey]['shopCode'];
|
|
1011
1073
|
break;
|
|
1012
1074
|
case 'BS_DELIVERY_NO':
|
|
@@ -1034,6 +1096,10 @@ export var reversalFormValues = function reversalFormValues() {
|
|
|
1034
1096
|
prv["".concat(next.uniqueKey, "_gyGoods")] = JSON.stringify(values[next.uniqueKey]['_gyGoods']);
|
|
1035
1097
|
prv["".concat(next.uniqueKey, "_shopCode")] = values[next.uniqueKey]['shopCode'];
|
|
1036
1098
|
break;
|
|
1099
|
+
case 'JY_GOODS':
|
|
1100
|
+
prv["".concat(next.uniqueKey, "_jyGoods")] = JSON.stringify(values[next.uniqueKey]['_jyGoods']);
|
|
1101
|
+
prv["".concat(next.uniqueKey, "_shopCode")] = values[next.uniqueKey]['shopCode'];
|
|
1102
|
+
break;
|
|
1037
1103
|
case 'JST_GOODS':
|
|
1038
1104
|
prv["".concat(next.uniqueKey, "_jstGoods")] = JSON.stringify(values[next.uniqueKey]['_jstGoods']);
|
|
1039
1105
|
prv["".concat(next.uniqueKey, "_shopCode")] = values[next.uniqueKey]['shopCode'];
|
|
@@ -1057,14 +1123,14 @@ export var reversalFormValues = function reversalFormValues() {
|
|
|
1057
1123
|
};
|
|
1058
1124
|
|
|
1059
1125
|
//删除缓存数据
|
|
1060
|
-
export var deleteCacheOrder = function deleteCacheOrder(
|
|
1061
|
-
var
|
|
1062
|
-
templateList =
|
|
1063
|
-
values =
|
|
1064
|
-
nodeId =
|
|
1065
|
-
flowTemplateId =
|
|
1066
|
-
plat =
|
|
1067
|
-
unDeleteOrderInfo =
|
|
1126
|
+
export var deleteCacheOrder = function deleteCacheOrder(_ref6) {
|
|
1127
|
+
var _ref6$templateList = _ref6.templateList,
|
|
1128
|
+
templateList = _ref6$templateList === void 0 ? [] : _ref6$templateList,
|
|
1129
|
+
values = _ref6.values,
|
|
1130
|
+
nodeId = _ref6.nodeId,
|
|
1131
|
+
flowTemplateId = _ref6.flowTemplateId,
|
|
1132
|
+
plat = _ref6.plat,
|
|
1133
|
+
unDeleteOrderInfo = _ref6.unDeleteOrderInfo;
|
|
1068
1134
|
if (plat !== null && plat !== void 0 && plat.subOrderNo) {
|
|
1069
1135
|
var getCacheInfo = JSON.parse(sessionStorage.getItem('cacheOmsOrderInfo') || '{}');
|
|
1070
1136
|
// !unDeleteOrderInfo && delete getCacheInfo[plat?.subOrderNo];
|
|
@@ -1085,11 +1151,11 @@ export var deleteCacheOrder = function deleteCacheOrder(_ref5) {
|
|
|
1085
1151
|
}
|
|
1086
1152
|
};
|
|
1087
1153
|
//bs商品信息返填
|
|
1088
|
-
export var bsSystemOrderBackValues = function bsSystemOrderBackValues(
|
|
1154
|
+
export var bsSystemOrderBackValues = function bsSystemOrderBackValues(_ref7) {
|
|
1089
1155
|
var _templateList$compone;
|
|
1090
|
-
var templateList =
|
|
1091
|
-
value =
|
|
1092
|
-
form =
|
|
1156
|
+
var templateList = _ref7.templateList,
|
|
1157
|
+
value = _ref7.value,
|
|
1158
|
+
form = _ref7.form;
|
|
1093
1159
|
//如果没有选择的值不返填,会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
|
|
1094
1160
|
if (!(value !== null && value !== void 0 && value.selectedRows)) return;
|
|
1095
1161
|
var bsGoodsComponent = (_templateList$compone = templateList.componentDtoList) === null || _templateList$compone === void 0 ? void 0 : _templateList$compone.filter(function (item) {
|
|
@@ -1109,11 +1175,11 @@ export var bsSystemOrderBackValues = function bsSystemOrderBackValues(_ref6) {
|
|
|
1109
1175
|
form.setFieldsValue(values);
|
|
1110
1176
|
};
|
|
1111
1177
|
// bs e3商品信息返填
|
|
1112
|
-
export var bsE3SystemOrderBackValues = function bsE3SystemOrderBackValues(
|
|
1178
|
+
export var bsE3SystemOrderBackValues = function bsE3SystemOrderBackValues(_ref8) {
|
|
1113
1179
|
var _templateList$compone2, _templateList$compone3;
|
|
1114
|
-
var templateList =
|
|
1115
|
-
value =
|
|
1116
|
-
form =
|
|
1180
|
+
var templateList = _ref8.templateList,
|
|
1181
|
+
value = _ref8.value,
|
|
1182
|
+
form = _ref8.form;
|
|
1117
1183
|
//如果没有选择的值不返填,会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
|
|
1118
1184
|
if (!(value !== null && value !== void 0 && value.selectedRows)) return;
|
|
1119
1185
|
var bsE3GoodsComponent = (_templateList$compone2 = templateList.componentDtoList) === null || _templateList$compone2 === void 0 ? void 0 : _templateList$compone2.filter(function (item) {
|
|
@@ -1137,11 +1203,11 @@ export var bsE3SystemOrderBackValues = function bsE3SystemOrderBackValues(_ref7)
|
|
|
1137
1203
|
};
|
|
1138
1204
|
|
|
1139
1205
|
//wln商品信息返填
|
|
1140
|
-
export var wlnSystemOrderBackValues = function wlnSystemOrderBackValues(
|
|
1206
|
+
export var wlnSystemOrderBackValues = function wlnSystemOrderBackValues(_ref9) {
|
|
1141
1207
|
var _templateList$compone4;
|
|
1142
|
-
var templateList =
|
|
1143
|
-
value =
|
|
1144
|
-
form =
|
|
1208
|
+
var templateList = _ref9.templateList,
|
|
1209
|
+
value = _ref9.value,
|
|
1210
|
+
form = _ref9.form;
|
|
1145
1211
|
//如果没有选择的值不返填,会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
|
|
1146
1212
|
if (!(value !== null && value !== void 0 && value.selectedRows)) return;
|
|
1147
1213
|
var bsGoodsComponent = (_templateList$compone4 = templateList.componentDtoList) === null || _templateList$compone4 === void 0 ? void 0 : _templateList$compone4.filter(function (item) {
|
|
@@ -1161,11 +1227,11 @@ export var wlnSystemOrderBackValues = function wlnSystemOrderBackValues(_ref8) {
|
|
|
1161
1227
|
};
|
|
1162
1228
|
|
|
1163
1229
|
// km 商品信息返填
|
|
1164
|
-
export var kmSystemOrderBackValues = function kmSystemOrderBackValues(
|
|
1230
|
+
export var kmSystemOrderBackValues = function kmSystemOrderBackValues(_ref10) {
|
|
1165
1231
|
var _templateList$compone5, _templateList$compone6;
|
|
1166
|
-
var templateList =
|
|
1167
|
-
value =
|
|
1168
|
-
form =
|
|
1232
|
+
var templateList = _ref10.templateList,
|
|
1233
|
+
value = _ref10.value,
|
|
1234
|
+
form = _ref10.form;
|
|
1169
1235
|
//如果没有选择的值不返填,会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
|
|
1170
1236
|
if (!(value !== null && value !== void 0 && value.selectedRows)) return;
|
|
1171
1237
|
var kmGoodsComponent = (_templateList$compone5 = templateList.componentDtoList) === null || _templateList$compone5 === void 0 ? void 0 : _templateList$compone5.filter(function (item) {
|
|
@@ -1189,11 +1255,11 @@ export var kmSystemOrderBackValues = function kmSystemOrderBackValues(_ref9) {
|
|
|
1189
1255
|
};
|
|
1190
1256
|
|
|
1191
1257
|
// wdt商品信息返填
|
|
1192
|
-
export var wdtSystemOrderBackValues = function wdtSystemOrderBackValues(
|
|
1258
|
+
export var wdtSystemOrderBackValues = function wdtSystemOrderBackValues(_ref11) {
|
|
1193
1259
|
var _templateList$compone7, _templateList$compone8;
|
|
1194
|
-
var templateList =
|
|
1195
|
-
value =
|
|
1196
|
-
form =
|
|
1260
|
+
var templateList = _ref11.templateList,
|
|
1261
|
+
value = _ref11.value,
|
|
1262
|
+
form = _ref11.form;
|
|
1197
1263
|
//如果没有选择的值不返填,会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
|
|
1198
1264
|
if (!(value !== null && value !== void 0 && value.selectedRows)) return;
|
|
1199
1265
|
var wdtGoodsComponent = (_templateList$compone7 = templateList.componentDtoList) === null || _templateList$compone7 === void 0 ? void 0 : _templateList$compone7.filter(function (item) {
|
|
@@ -1222,11 +1288,11 @@ export var wdtSystemOrderBackValues = function wdtSystemOrderBackValues(_ref10)
|
|
|
1222
1288
|
};
|
|
1223
1289
|
|
|
1224
1290
|
//gy商品信息返填
|
|
1225
|
-
export var gySystemOrderBackValues = function gySystemOrderBackValues(
|
|
1291
|
+
export var gySystemOrderBackValues = function gySystemOrderBackValues(_ref12) {
|
|
1226
1292
|
var _templateList$compone9, _templateList$compone10;
|
|
1227
|
-
var templateList =
|
|
1228
|
-
value =
|
|
1229
|
-
form =
|
|
1293
|
+
var templateList = _ref12.templateList,
|
|
1294
|
+
value = _ref12.value,
|
|
1295
|
+
form = _ref12.form;
|
|
1230
1296
|
//如果没有选择的值不返填,会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
|
|
1231
1297
|
if (!(value !== null && value !== void 0 && value.selectedRows)) return;
|
|
1232
1298
|
var gyGoodsComponent = (_templateList$compone9 = templateList.componentDtoList) === null || _templateList$compone9 === void 0 ? void 0 : _templateList$compone9.filter(function (item) {
|
|
@@ -1250,11 +1316,11 @@ export var gySystemOrderBackValues = function gySystemOrderBackValues(_ref11) {
|
|
|
1250
1316
|
};
|
|
1251
1317
|
|
|
1252
1318
|
//聚水潭商品信息返填
|
|
1253
|
-
export var jstSystemOrderBackValues = function jstSystemOrderBackValues(
|
|
1319
|
+
export var jstSystemOrderBackValues = function jstSystemOrderBackValues(_ref13) {
|
|
1254
1320
|
var _templateList$compone11, _templateList$compone12;
|
|
1255
|
-
var templateList =
|
|
1256
|
-
value =
|
|
1257
|
-
form =
|
|
1321
|
+
var templateList = _ref13.templateList,
|
|
1322
|
+
value = _ref13.value,
|
|
1323
|
+
form = _ref13.form;
|
|
1258
1324
|
//如果没有选择的值不返填,会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
|
|
1259
1325
|
if (!(value !== null && value !== void 0 && value.selectedRows)) return;
|
|
1260
1326
|
var jstGoodsComponent = (_templateList$compone11 = templateList.componentDtoList) === null || _templateList$compone11 === void 0 ? void 0 : _templateList$compone11.filter(function (item) {
|
|
@@ -1276,6 +1342,33 @@ export var jstSystemOrderBackValues = function jstSystemOrderBackValues(_ref12)
|
|
|
1276
1342
|
});
|
|
1277
1343
|
form.setFieldsValue(values);
|
|
1278
1344
|
};
|
|
1345
|
+
// 巨益商品信息反填
|
|
1346
|
+
export var jySystemOrderBackValues = function jySystemOrderBackValues(_ref14) {
|
|
1347
|
+
var _templateList$compone13, _templateList$compone14;
|
|
1348
|
+
var templateList = _ref14.templateList,
|
|
1349
|
+
value = _ref14.value,
|
|
1350
|
+
form = _ref14.form;
|
|
1351
|
+
//如果没有选择的值不返填,会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
|
|
1352
|
+
if (!(value !== null && value !== void 0 && value.selectedRows)) return;
|
|
1353
|
+
var jyGoodsComponent = (_templateList$compone13 = templateList.componentDtoList) === null || _templateList$compone13 === void 0 ? void 0 : _templateList$compone13.filter(function (item) {
|
|
1354
|
+
return ['JY_GOODS', 'JY_SEND_GOOD', 'JY_LOGISTICS'].includes(item.workOrderComponentType) && !item.notOrderBack;
|
|
1355
|
+
});
|
|
1356
|
+
if (!(jyGoodsComponent !== null && jyGoodsComponent !== void 0 && jyGoodsComponent.length)) return;
|
|
1357
|
+
var tIdCom = (_templateList$compone14 = templateList.componentDtoList) === null || _templateList$compone14 === void 0 ? void 0 : _templateList$compone14.find(function (item) {
|
|
1358
|
+
return item.workOrderComponentType === 'TRADE_ID_INPUT';
|
|
1359
|
+
});
|
|
1360
|
+
var orderNo = tIdCom !== null && tIdCom !== void 0 && tIdCom.uniqueKey ? form.getFieldValue(tIdCom.uniqueKey) : null;
|
|
1361
|
+
var orderInfo = jyOrderTransform({
|
|
1362
|
+
trades: value.selectedRows,
|
|
1363
|
+
componentList: templateList.componentDtoList,
|
|
1364
|
+
orderNo: orderNo,
|
|
1365
|
+
allOrders: value.orders
|
|
1366
|
+
}, form);
|
|
1367
|
+
var values = jyOrderBackFormValues(orderInfo, {
|
|
1368
|
+
componentDtoList: jyGoodsComponent
|
|
1369
|
+
});
|
|
1370
|
+
form.setFieldsValue(values);
|
|
1371
|
+
};
|
|
1279
1372
|
|
|
1280
1373
|
//获取多级下拉最后的值
|
|
1281
1374
|
var getChildValue = function getChildValue() {
|
|
@@ -1436,12 +1529,12 @@ export var transformWorkOrderDetail = function transformWorkOrderDetail(detail)
|
|
|
1436
1529
|
};
|
|
1437
1530
|
|
|
1438
1531
|
// 返填物流轨迹信息
|
|
1439
|
-
export var setLogisticsInfo = function setLogisticsInfo(
|
|
1440
|
-
var logisticsMappingConfig =
|
|
1441
|
-
uniqueKey =
|
|
1442
|
-
workOrderComponentType =
|
|
1443
|
-
value =
|
|
1444
|
-
form =
|
|
1532
|
+
export var setLogisticsInfo = function setLogisticsInfo(_ref15) {
|
|
1533
|
+
var logisticsMappingConfig = _ref15.logisticsMappingConfig,
|
|
1534
|
+
uniqueKey = _ref15.uniqueKey,
|
|
1535
|
+
workOrderComponentType = _ref15.workOrderComponentType,
|
|
1536
|
+
value = _ref15.value,
|
|
1537
|
+
form = _ref15.form;
|
|
1445
1538
|
var values = logisticsMappingConfig.reduce(function (prv, next) {
|
|
1446
1539
|
var logisticsValues = form.getFieldValue(next.uniqueKey);
|
|
1447
1540
|
var componentConfig = next.componentConfig;
|