@kmkf-fe-packages/kmkf-work-order-service-component 2.0.79-beta.85 → 2.0.79-beta.87
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/components/FormRender/index.js +31 -10
- package/dist/esm/FlowTemplateDetailV2/components/FormRender/onBlur.d.ts +6 -0
- package/dist/esm/FlowTemplateDetailV2/components/FormRender/onBlur.js +112 -44
- package/dist/esm/FlowTemplateDetailV2/constant.js +9 -1
- package/dist/esm/common/utils/constant.d.ts +3 -0
- package/dist/esm/common/utils/constant.js +10 -1
- package/dist/esm/common/utils/submitDataTransOldFormat.js +78 -65
- package/dist/esm/common/utils/tools.js +58 -38
- package/dist/esm/common/utils/tools_constants.js +12 -2
- package/dist/esm/common/utils/transformWorkOrderData.js +18 -5
- package/dist/esm/model/logicFlow/selector.d.ts +0 -3
- package/dist/esm/model/paymentWorkOrder/selector.d.ts +0 -9
- package/dist/esm/model/servers/api.d.ts +1 -0
- package/dist/esm/model/servers/api.js +11 -3
- package/dist/esm/model/singleShopWorkOrder/selector.d.ts +0 -5
- package/package.json +5 -5
|
@@ -43,7 +43,7 @@ import { jsonParseSecurity, findComponentUniqueKeyByType } from "../../../common
|
|
|
43
43
|
import { NEED_CLEAR_FIELDS_WHEN_SHOP_ID_CHANGE } from "../../constant";
|
|
44
44
|
import { Context } from "../../context";
|
|
45
45
|
import { orderBackKmAddress } from "./constants";
|
|
46
|
-
import { onBlurExpressLogisticsCode, onBlurErpAfterSaleTradeId, onBlurSkxOutboundNoticeNo } from "./onBlur";
|
|
46
|
+
import { onBlurExpressLogisticsCode, onBlurErpAfterSaleTradeId, onBlurSkxOutboundNoticeNo, onBlurSkxReturnBillNo } from "./onBlur";
|
|
47
47
|
// 记录显隐触发隐藏的组件。显示后,重新出发一遍映射规则
|
|
48
48
|
// TODO: 用useState会有bug, 不确定是哪里导致的
|
|
49
49
|
var hideByXYComponentsMap = {};
|
|
@@ -866,7 +866,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
866
866
|
setKmLoading: setKmLoading
|
|
867
867
|
});
|
|
868
868
|
case 3:
|
|
869
|
-
_context5.next =
|
|
869
|
+
_context5.next = 33;
|
|
870
870
|
break;
|
|
871
871
|
case 5:
|
|
872
872
|
if (!(type === 'expressLogisticsCode')) {
|
|
@@ -882,7 +882,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
882
882
|
componentOnBlur: componentOnBlur
|
|
883
883
|
});
|
|
884
884
|
case 8:
|
|
885
|
-
_context5.next =
|
|
885
|
+
_context5.next = 33;
|
|
886
886
|
break;
|
|
887
887
|
case 10:
|
|
888
888
|
if (!(type === 'skxOutboundNoticeNo')) {
|
|
@@ -899,9 +899,24 @@ var FormRender = function FormRender(props, ref) {
|
|
|
899
899
|
componentOnBlur: componentOnBlur
|
|
900
900
|
});
|
|
901
901
|
case 14:
|
|
902
|
-
_context5.next =
|
|
902
|
+
_context5.next = 33;
|
|
903
903
|
break;
|
|
904
904
|
case 16:
|
|
905
|
+
if (!(type === 'skxReturnBillNo')) {
|
|
906
|
+
_context5.next = 21;
|
|
907
|
+
break;
|
|
908
|
+
}
|
|
909
|
+
_context5.next = 19;
|
|
910
|
+
return onBlurSkxReturnBillNo({
|
|
911
|
+
form: form,
|
|
912
|
+
value: value,
|
|
913
|
+
templateDetail: templateDetail,
|
|
914
|
+
componentOnBlur: componentOnBlur
|
|
915
|
+
});
|
|
916
|
+
case 19:
|
|
917
|
+
_context5.next = 33;
|
|
918
|
+
break;
|
|
919
|
+
case 21:
|
|
905
920
|
// 收集所有需要执行的异步操作
|
|
906
921
|
promises = [];
|
|
907
922
|
if (type === 'tradeId') {
|
|
@@ -913,7 +928,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
913
928
|
promises.push(handleChangeTradeId(value));
|
|
914
929
|
}
|
|
915
930
|
if (value) {
|
|
916
|
-
_context5.next =
|
|
931
|
+
_context5.next = 28;
|
|
917
932
|
break;
|
|
918
933
|
}
|
|
919
934
|
setReplaceValue(function (prev) {
|
|
@@ -921,18 +936,18 @@ var FormRender = function FormRender(props, ref) {
|
|
|
921
936
|
});
|
|
922
937
|
replaceValueRef.current = _objectSpread(_objectSpread({}, replaceValue), {}, _defineProperty({}, type, 0));
|
|
923
938
|
return _context5.abrupt("return");
|
|
924
|
-
case
|
|
939
|
+
case 28:
|
|
925
940
|
promises.push(queryReplaceCount(_defineProperty({}, type, value), templateDetail));
|
|
926
941
|
// TODO: ERP不走订单反弹逻辑
|
|
927
942
|
if ((type === 'tradeId' || type === 'enterprisePaymentTid') && !isErpUse) {
|
|
928
943
|
promises.push(changeHandle(value));
|
|
929
944
|
}
|
|
930
945
|
// 等待所有异步操作完成
|
|
931
|
-
_context5.next =
|
|
946
|
+
_context5.next = 32;
|
|
932
947
|
return Promise.all(promises);
|
|
933
|
-
case
|
|
948
|
+
case 32:
|
|
934
949
|
return _context5.abrupt("return", Promise.resolve());
|
|
935
|
-
case
|
|
950
|
+
case 33:
|
|
936
951
|
case "end":
|
|
937
952
|
return _context5.stop();
|
|
938
953
|
}
|
|
@@ -987,7 +1002,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
987
1002
|
}
|
|
988
1003
|
//如果有bs组件 设置成初始值
|
|
989
1004
|
var hasBs = get(templateDetail, 'componentDtoList', []).some(function (item) {
|
|
990
|
-
return ['BS_LOGISTICS', 'BS_E3_LOGISTICS', 'BS_SEND_GOOD', 'BS_E3_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'KM_LOGISTICS', 'KM_SEND_GOOD', 'GY_SEND_GOOD', 'GY_LOGISTICS', 'JY_SEND_GOOD', 'JY_LOGISTICS', 'SKX_LOGISTICS'].includes(item.workOrderComponentType);
|
|
1005
|
+
return ['BS_LOGISTICS', 'BS_E3_LOGISTICS', 'BS_SEND_GOOD', 'BS_E3_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'KM_LOGISTICS', 'KM_SEND_GOOD', 'GY_SEND_GOOD', 'GY_LOGISTICS', 'JY_SEND_GOOD', 'JY_LOGISTICS', 'SKX_LOGISTICS', 'SKX_RETURN_LOGISTICS'].includes(item.workOrderComponentType);
|
|
991
1006
|
});
|
|
992
1007
|
if (hasBs) {
|
|
993
1008
|
var bsValue = get(templateDetail, 'componentDtoList', []).reduce(function (prv, next) {
|
|
@@ -1005,6 +1020,12 @@ var FormRender = function FormRender(props, ref) {
|
|
|
1005
1020
|
logisticsCode: null
|
|
1006
1021
|
}];
|
|
1007
1022
|
break;
|
|
1023
|
+
case 'SKX_RETURN_LOGISTICS':
|
|
1024
|
+
prv[next.uniqueKey] = [{
|
|
1025
|
+
skxReturnLogisticsCompany: null,
|
|
1026
|
+
skxReturnLogisticsCode: null
|
|
1027
|
+
}];
|
|
1028
|
+
break;
|
|
1008
1029
|
case 'BS_SEND_GOOD':
|
|
1009
1030
|
case 'BS_E3_SEND_GOOD':
|
|
1010
1031
|
case 'WLN_SEND_GOOD':
|
|
@@ -18,3 +18,9 @@ export declare const onBlurSkxOutboundNoticeNo: ({ form, value, templateDetail,
|
|
|
18
18
|
templateDetail: any;
|
|
19
19
|
componentOnBlur: (value: any, type: string) => Promise<void>;
|
|
20
20
|
}) => Promise<void>;
|
|
21
|
+
export declare const onBlurSkxReturnBillNo: ({ form, value, templateDetail, componentOnBlur, }: {
|
|
22
|
+
form: FormInstance;
|
|
23
|
+
value: string;
|
|
24
|
+
templateDetail: any;
|
|
25
|
+
componentOnBlur: (value: any, type: string) => Promise<void>;
|
|
26
|
+
}) => Promise<void>;
|
|
@@ -8,9 +8,9 @@ function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyri
|
|
|
8
8
|
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
|
|
9
9
|
function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
|
|
10
10
|
import { orderBackKmVideoByLogisticsCode } from "../../../common/utils/orderBackKm";
|
|
11
|
-
import { isNull, skxSystemOrderBackValues } from '@kmkf-fe-packages/kmkf-utils';
|
|
11
|
+
import { isNull, skxSystemOrderBackValues, skxReturnSystemOrderBackValues } from '@kmkf-fe-packages/kmkf-utils';
|
|
12
12
|
import { queryTidByOutSid } from "../../../model/servers/api";
|
|
13
|
-
import {
|
|
13
|
+
import { servers } from '@kmkf-fe-packages/kmkf-utils';
|
|
14
14
|
export var onBlurErpAfterSaleTradeId = /*#__PURE__*/function () {
|
|
15
15
|
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
|
|
16
16
|
var _kmErpVideoComponent$;
|
|
@@ -72,7 +72,7 @@ export var onBlurExpressLogisticsCode = /*#__PURE__*/function () {
|
|
|
72
72
|
});
|
|
73
73
|
case 6:
|
|
74
74
|
if (!hasTradeIdComponent) {
|
|
75
|
-
_context2.next =
|
|
75
|
+
_context2.next = 23;
|
|
76
76
|
break;
|
|
77
77
|
}
|
|
78
78
|
hasKm = false;
|
|
@@ -127,11 +127,10 @@ export var onBlurExpressLogisticsCode = /*#__PURE__*/function () {
|
|
|
127
127
|
return blurPromise;
|
|
128
128
|
case 22:
|
|
129
129
|
// 所有异步操作完成后执行
|
|
130
|
-
console.log('[组件失焦事件]---set', oldValue);
|
|
131
130
|
form.setFieldsValue({
|
|
132
131
|
'0eVTfMGEyd': oldValue
|
|
133
132
|
});
|
|
134
|
-
case
|
|
133
|
+
case 23:
|
|
135
134
|
case "end":
|
|
136
135
|
return _context2.stop();
|
|
137
136
|
}
|
|
@@ -142,55 +141,124 @@ export var onBlurExpressLogisticsCode = /*#__PURE__*/function () {
|
|
|
142
141
|
};
|
|
143
142
|
}();
|
|
144
143
|
export var onBlurSkxOutboundNoticeNo = /*#__PURE__*/function () {
|
|
145
|
-
var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function
|
|
146
|
-
var form, value, templateDetail, componentOnBlur
|
|
147
|
-
return _regeneratorRuntime().wrap(function
|
|
148
|
-
while (1) switch (
|
|
144
|
+
var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref5) {
|
|
145
|
+
var form, value, templateDetail, componentOnBlur;
|
|
146
|
+
return _regeneratorRuntime().wrap(function _callee4$(_context4) {
|
|
147
|
+
while (1) switch (_context4.prev = _context4.next) {
|
|
149
148
|
case 0:
|
|
150
149
|
form = _ref5.form, value = _ref5.value, templateDetail = _ref5.templateDetail, componentOnBlur = _ref5.componentOnBlur;
|
|
151
|
-
console.log('onBlurSkxOutboundNoticeNo', {
|
|
152
|
-
form: form,
|
|
153
|
-
value: value,
|
|
154
|
-
templateDetail: templateDetail
|
|
155
|
-
});
|
|
156
150
|
if (value) {
|
|
157
|
-
|
|
151
|
+
_context4.next = 3;
|
|
158
152
|
break;
|
|
159
153
|
}
|
|
160
|
-
return
|
|
161
|
-
case
|
|
162
|
-
|
|
163
|
-
return
|
|
154
|
+
return _context4.abrupt("return");
|
|
155
|
+
case 3:
|
|
156
|
+
_context4.next = 5;
|
|
157
|
+
return servers.SKX.querySkxOrderDetailSingleton({
|
|
164
158
|
onBillNo: value
|
|
165
|
-
})
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
159
|
+
}).then( /*#__PURE__*/function () {
|
|
160
|
+
var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(res) {
|
|
161
|
+
var data, tradeId, blurPromise, values;
|
|
162
|
+
return _regeneratorRuntime().wrap(function _callee3$(_context3) {
|
|
163
|
+
while (1) switch (_context3.prev = _context3.next) {
|
|
164
|
+
case 0:
|
|
165
|
+
data = res.data;
|
|
166
|
+
tradeId = data === null || data === void 0 ? void 0 : data.tid; // 创建一个异步操作的Promise
|
|
167
|
+
blurPromise = componentOnBlur(tradeId, 'tradeId'); // 等待异步操作完成后再执行setTimeout
|
|
168
|
+
_context3.next = 5;
|
|
169
|
+
return blurPromise;
|
|
170
|
+
case 5:
|
|
171
|
+
// 所有异步操作完成后执行
|
|
172
|
+
values = skxSystemOrderBackValues({
|
|
173
|
+
templateList: templateDetail,
|
|
174
|
+
value: {
|
|
175
|
+
allOrders: (data === null || data === void 0 ? void 0 : data.orderDetailInfoList) || []
|
|
176
|
+
},
|
|
177
|
+
form: form,
|
|
178
|
+
isReverseFilling: false
|
|
179
|
+
});
|
|
180
|
+
form.setFieldsValue(_objectSpread(_objectSpread({}, values || {}), {}, {
|
|
181
|
+
m3ap1EvEyd: tradeId,
|
|
182
|
+
'78CADF2951': value
|
|
183
|
+
}));
|
|
184
|
+
case 7:
|
|
185
|
+
case "end":
|
|
186
|
+
return _context3.stop();
|
|
187
|
+
}
|
|
188
|
+
}, _callee3);
|
|
189
|
+
}));
|
|
190
|
+
return function (_x4) {
|
|
191
|
+
return _ref7.apply(this, arguments);
|
|
192
|
+
};
|
|
193
|
+
}()).catch(console.debug);
|
|
194
|
+
case 5:
|
|
188
195
|
case "end":
|
|
189
|
-
return
|
|
196
|
+
return _context4.stop();
|
|
190
197
|
}
|
|
191
|
-
},
|
|
198
|
+
}, _callee4);
|
|
192
199
|
}));
|
|
193
200
|
return function onBlurSkxOutboundNoticeNo(_x3) {
|
|
194
201
|
return _ref6.apply(this, arguments);
|
|
195
202
|
};
|
|
203
|
+
}();
|
|
204
|
+
export var onBlurSkxReturnBillNo = /*#__PURE__*/function () {
|
|
205
|
+
var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_ref8) {
|
|
206
|
+
var form, value, templateDetail, componentOnBlur;
|
|
207
|
+
return _regeneratorRuntime().wrap(function _callee6$(_context6) {
|
|
208
|
+
while (1) switch (_context6.prev = _context6.next) {
|
|
209
|
+
case 0:
|
|
210
|
+
form = _ref8.form, value = _ref8.value, templateDetail = _ref8.templateDetail, componentOnBlur = _ref8.componentOnBlur;
|
|
211
|
+
if (value) {
|
|
212
|
+
_context6.next = 3;
|
|
213
|
+
break;
|
|
214
|
+
}
|
|
215
|
+
return _context6.abrupt("return");
|
|
216
|
+
case 3:
|
|
217
|
+
_context6.next = 5;
|
|
218
|
+
return servers.SKX.queryReturnOrderDetailSingleton({
|
|
219
|
+
returnBillNo: value
|
|
220
|
+
}).then( /*#__PURE__*/function () {
|
|
221
|
+
var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(res) {
|
|
222
|
+
var data, tradeId, blurPromise, values;
|
|
223
|
+
return _regeneratorRuntime().wrap(function _callee5$(_context5) {
|
|
224
|
+
while (1) switch (_context5.prev = _context5.next) {
|
|
225
|
+
case 0:
|
|
226
|
+
data = res.data;
|
|
227
|
+
tradeId = data === null || data === void 0 ? void 0 : data.tid; // 创建一个异步操作的Promise
|
|
228
|
+
blurPromise = componentOnBlur(tradeId, 'tradeId'); // 等待异步操作完成后再执行setTimeout
|
|
229
|
+
_context5.next = 5;
|
|
230
|
+
return blurPromise;
|
|
231
|
+
case 5:
|
|
232
|
+
// 所有异步操作完成后执行
|
|
233
|
+
values = skxReturnSystemOrderBackValues({
|
|
234
|
+
templateList: templateDetail,
|
|
235
|
+
value: {
|
|
236
|
+
allOrders: (data === null || data === void 0 ? void 0 : data.skqReturnOrderDetailInfoDtos) || []
|
|
237
|
+
},
|
|
238
|
+
form: form,
|
|
239
|
+
isReverseFilling: false
|
|
240
|
+
});
|
|
241
|
+
form.setFieldsValue(_objectSpread(_objectSpread({}, values || {}), {}, {
|
|
242
|
+
m3ap1EvEyd: tradeId,
|
|
243
|
+
fe10d6f36b: value
|
|
244
|
+
}));
|
|
245
|
+
case 7:
|
|
246
|
+
case "end":
|
|
247
|
+
return _context5.stop();
|
|
248
|
+
}
|
|
249
|
+
}, _callee5);
|
|
250
|
+
}));
|
|
251
|
+
return function (_x6) {
|
|
252
|
+
return _ref10.apply(this, arguments);
|
|
253
|
+
};
|
|
254
|
+
}()).catch(console.debug);
|
|
255
|
+
case 5:
|
|
256
|
+
case "end":
|
|
257
|
+
return _context6.stop();
|
|
258
|
+
}
|
|
259
|
+
}, _callee6);
|
|
260
|
+
}));
|
|
261
|
+
return function onBlurSkxReturnBillNo(_x5) {
|
|
262
|
+
return _ref9.apply(this, arguments);
|
|
263
|
+
};
|
|
196
264
|
}();
|
|
@@ -1,2 +1,10 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* @Author: flyingMonkey 760958607@qq.com
|
|
3
|
+
* @Date: 2025-09-02 09:45:49
|
|
4
|
+
* @LastEditors: flyingMonkey 760958607@qq.com
|
|
5
|
+
* @LastEditTime: 2025-09-03 10:53:53
|
|
6
|
+
* @FilePath: /kmkf-fe-packages/packages/kmkf-work-order-service-component/src/FlowTemplateDetailV2/constant.ts
|
|
7
|
+
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
|
8
|
+
*/
|
|
1
9
|
// 切换当前店铺时,以下组件字段需要清空
|
|
2
|
-
export var NEED_CLEAR_FIELDS_WHEN_SHOP_ID_CHANGE = ['BS_E3_LOGISTICS', 'BS_E3_SEND_GOOD', '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', 'WDT_RETURN_GOODS', 'WDT_SHOP', 'WDT_EXCHANGE_GOODS', 'KM_SYSTEM_ORDER', 'KM_SEND_GOOD', 'KM_LOGISTICS', 'KM_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_SYSTEM_ORDER', 'JST_SYSTEM_ORDER', 'JST_GOODS', 'JST_REISSUE_GOODS', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS', 'BS_E3_REISSUE_GOODS', 'GY_SYSTEM_ORDER', 'GY_SEND_GOOD', 'GY_GOODS', 'GY_REISSUE_GOODS', 'GY_RETURN_GOODS', 'GY_LOGISTICS', 'JY_SYSTEM_ORDER', 'JY_SEND_GOOD', 'JY_GOODS', 'JY_REISSUE_GOODS', 'JY_RETURN_GOODS', 'JY_LOGISTICS', 'SKX_OUTBOUND_NOTICE_NO', 'SKX_SHOP_NAME', 'SKX_WAREHOUSE', 'SKX_LOGISTICS', 'SKX_GOODS', 'SKX_ORDER_TYPE', 'SKX_ORDER_STATUS', 'SKX_CREATE_TIME'];
|
|
10
|
+
export var NEED_CLEAR_FIELDS_WHEN_SHOP_ID_CHANGE = ['BS_E3_LOGISTICS', 'BS_E3_SEND_GOOD', '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', 'WDT_RETURN_GOODS', 'WDT_SHOP', 'WDT_EXCHANGE_GOODS', 'KM_SYSTEM_ORDER', 'KM_SEND_GOOD', 'KM_LOGISTICS', 'KM_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_SYSTEM_ORDER', 'JST_SYSTEM_ORDER', 'JST_GOODS', 'JST_REISSUE_GOODS', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS', 'BS_E3_REISSUE_GOODS', 'GY_SYSTEM_ORDER', 'GY_SEND_GOOD', 'GY_GOODS', 'GY_REISSUE_GOODS', 'GY_RETURN_GOODS', 'GY_LOGISTICS', 'JY_SYSTEM_ORDER', 'JY_SEND_GOOD', 'JY_GOODS', 'JY_REISSUE_GOODS', 'JY_RETURN_GOODS', 'JY_LOGISTICS', 'SKX_OUTBOUND_NOTICE_NO', 'SKX_RETURN_BILL_NO', 'SKX_REFUND_BILL_NO', 'SKX_SHOP_NAME', 'SKX_WAREHOUSE', 'SKX_LOGISTICS', 'SKX_RETURN_LOGISTICS', 'SKX_GOODS', 'SKX_RETURN_GOODS', 'SKX_ORDER_TYPE', 'SKX_RETURN_ORDER_STATUS', 'SKX_ORDER_STATUS', 'SKX_CREATE_TIME'];
|
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
export declare const updateWorkTypeKeys: any;
|
|
2
2
|
export declare const processSingleFieldTypeMapping: {
|
|
3
3
|
SKX_OUTBOUND_NOTICE_NO: string;
|
|
4
|
+
SKX_RETURN_BILL_NO: string;
|
|
5
|
+
SKX_REFUND_BILL_NO: string;
|
|
4
6
|
SKX_SHOP_NAME: string;
|
|
5
7
|
SKX_WAREHOUSE: string;
|
|
6
8
|
SKX_ORDER_TYPE: string;
|
|
9
|
+
SKX_RETURN_ORDER_STATUS: string;
|
|
7
10
|
SKX_ORDER_STATUS: string;
|
|
8
11
|
SKX_CREATE_TIME: string;
|
|
9
12
|
};
|
|
@@ -34,9 +34,12 @@ export var updateWorkTypeKeys = {
|
|
|
34
34
|
//直接将key component 添加到 transformWorkOrderData中的componentProcessors
|
|
35
35
|
export var processSingleFieldTypeMapping = {
|
|
36
36
|
SKX_OUTBOUND_NOTICE_NO: 'skxOutboundNoticeNo',
|
|
37
|
+
SKX_RETURN_BILL_NO: 'skxReturnBillNo',
|
|
38
|
+
SKX_REFUND_BILL_NO: 'skxRefundBillNo',
|
|
37
39
|
SKX_SHOP_NAME: 'skxShopName',
|
|
38
40
|
SKX_WAREHOUSE: 'skxWarehouse',
|
|
39
41
|
SKX_ORDER_TYPE: 'skxOrderType',
|
|
42
|
+
SKX_RETURN_ORDER_STATUS: 'skxReturnOrderStatus',
|
|
40
43
|
SKX_ORDER_STATUS: 'skxOrderStatus',
|
|
41
44
|
SKX_CREATE_TIME: 'dateTime'
|
|
42
45
|
};
|
|
@@ -113,7 +116,8 @@ export var DEFAULT_STRING_COMPONENT_TYPE_FIELD_MAPPING = {
|
|
|
113
116
|
EXECUTE_ACTION_TYPE: 'executeActionType',
|
|
114
117
|
ERP_ORDER_STATUS: 'erpOrderStatus',
|
|
115
118
|
SKX_CREATE_TIME: 'dateTime',
|
|
116
|
-
SKX_OUTBOUND_NOTICE_NO: 'skxOutboundNoticeNo'
|
|
119
|
+
SKX_OUTBOUND_NOTICE_NO: 'skxOutboundNoticeNo',
|
|
120
|
+
SKX_RETURN_BILL_NO: 'skxReturnBillNo'
|
|
117
121
|
};
|
|
118
122
|
export var DEFAULT_ARRAY_COMPONENT_TYPE_FIELD_MAPPING = {
|
|
119
123
|
RATE: 'rate',
|
|
@@ -237,6 +241,11 @@ export var SUBMIT_COMPONENT_ERP_LOGISTICS_MAP = {
|
|
|
237
241
|
list: 'skxLogisticsList',
|
|
238
242
|
company: 'skxLogisticsCompany',
|
|
239
243
|
code: 'skxLogisticsCode'
|
|
244
|
+
},
|
|
245
|
+
SKX_RETURN_LOGISTICS: {
|
|
246
|
+
list: 'skxReturnLogistics',
|
|
247
|
+
company: 'skxReturnLogisticsCompany',
|
|
248
|
+
code: 'skxReturnLogisticsCode'
|
|
240
249
|
}
|
|
241
250
|
};
|
|
242
251
|
export var SUBMIT_COMPONENT_SEND_GOOD_MAP = {
|
|
@@ -481,17 +481,25 @@ var handleSkxGoods = function handleSkxGoods(_ref37) {
|
|
|
481
481
|
addContent('skxGoods', goods === null || goods === void 0 ? void 0 : goods.skxGoods);
|
|
482
482
|
};
|
|
483
483
|
};
|
|
484
|
-
var
|
|
484
|
+
var handleSkxReturnGoods = function handleSkxReturnGoods(_ref38) {
|
|
485
485
|
var addContent = _ref38.addContent,
|
|
486
486
|
getNowData = _ref38.getNowData;
|
|
487
487
|
return function (item) {
|
|
488
|
-
var
|
|
489
|
-
addContent('
|
|
488
|
+
var goods = getNowData(item.uniqueKey, {});
|
|
489
|
+
addContent('skxReturnGoods', goods === null || goods === void 0 ? void 0 : goods.skxReturnGoods);
|
|
490
490
|
};
|
|
491
491
|
};
|
|
492
|
-
var
|
|
492
|
+
var handleOrderSubForm = function handleOrderSubForm(_ref39) {
|
|
493
493
|
var addContent = _ref39.addContent,
|
|
494
494
|
getNowData = _ref39.getNowData;
|
|
495
|
+
return function (item) {
|
|
496
|
+
var orderSubForm = getNowData(item.uniqueKey, {});
|
|
497
|
+
addContent('subOrderList', orderSubForm === null || orderSubForm === void 0 ? void 0 : orderSubForm.subOrderList);
|
|
498
|
+
};
|
|
499
|
+
};
|
|
500
|
+
var handleBsExchangeGoods = function handleBsExchangeGoods(_ref40) {
|
|
501
|
+
var addContent = _ref40.addContent,
|
|
502
|
+
getNowData = _ref40.getNowData;
|
|
495
503
|
return function (item) {
|
|
496
504
|
var _bsExchange$bsExchang;
|
|
497
505
|
var bsExchange = getNowData(item.uniqueKey, {});
|
|
@@ -516,27 +524,27 @@ var handleBsExchangeGoods = function handleBsExchangeGoods(_ref39) {
|
|
|
516
524
|
}
|
|
517
525
|
};
|
|
518
526
|
};
|
|
519
|
-
var handleWdtExchangeGoods = function handleWdtExchangeGoods(
|
|
520
|
-
var addContent =
|
|
521
|
-
getNowData =
|
|
527
|
+
var handleWdtExchangeGoods = function handleWdtExchangeGoods(_ref41) {
|
|
528
|
+
var addContent = _ref41.addContent,
|
|
529
|
+
getNowData = _ref41.getNowData;
|
|
522
530
|
return function (item) {
|
|
523
531
|
var wdtExchange = getNowData(item.uniqueKey, {});
|
|
524
532
|
addContent('wdtExchangeGoods', wdtExchange === null || wdtExchange === void 0 ? void 0 : wdtExchange.wdtExchangeGoods);
|
|
525
533
|
addContent('shopCode', (wdtExchange === null || wdtExchange === void 0 ? void 0 : wdtExchange.shopCode) || '');
|
|
526
534
|
};
|
|
527
535
|
};
|
|
528
|
-
var handleJstExchangeGoods = function handleJstExchangeGoods(
|
|
529
|
-
var addContent =
|
|
530
|
-
getNowData =
|
|
536
|
+
var handleJstExchangeGoods = function handleJstExchangeGoods(_ref42) {
|
|
537
|
+
var addContent = _ref42.addContent,
|
|
538
|
+
getNowData = _ref42.getNowData;
|
|
531
539
|
return function (item) {
|
|
532
540
|
var jstExchange = getNowData(item.uniqueKey, {});
|
|
533
541
|
addContent('jstExchangeGoods', jstExchange === null || jstExchange === void 0 ? void 0 : jstExchange.jstExchangeGoods);
|
|
534
542
|
addContent('shopCode', (jstExchange === null || jstExchange === void 0 ? void 0 : jstExchange.shopCode) || '');
|
|
535
543
|
};
|
|
536
544
|
};
|
|
537
|
-
var handleBsOrWdtReissueGoods = function handleBsOrWdtReissueGoods(
|
|
538
|
-
var addContent =
|
|
539
|
-
getNowData =
|
|
545
|
+
var handleBsOrWdtReissueGoods = function handleBsOrWdtReissueGoods(_ref43) {
|
|
546
|
+
var addContent = _ref43.addContent,
|
|
547
|
+
getNowData = _ref43.getNowData;
|
|
540
548
|
return function (item) {
|
|
541
549
|
var reissue = getNowData(item.uniqueKey, {});
|
|
542
550
|
addContent(SUBMIT_COMPONENT_REISSUE_MAP[item.workOrderComponentType].type, reissue === null || reissue === void 0 ? void 0 : reissue[SUBMIT_COMPONENT_REISSUE_MAP[item.workOrderComponentType].type]);
|
|
@@ -590,9 +598,9 @@ var handleBsOrWdtReissueGoods = function handleBsOrWdtReissueGoods(_ref42) {
|
|
|
590
598
|
}
|
|
591
599
|
};
|
|
592
600
|
};
|
|
593
|
-
var handleBsOrWdtReturnGoods = function handleBsOrWdtReturnGoods(
|
|
594
|
-
var addContent =
|
|
595
|
-
getNowData =
|
|
601
|
+
var handleBsOrWdtReturnGoods = function handleBsOrWdtReturnGoods(_ref44) {
|
|
602
|
+
var addContent = _ref44.addContent,
|
|
603
|
+
getNowData = _ref44.getNowData;
|
|
596
604
|
return function (item) {
|
|
597
605
|
var currentReturn = getNowData(item.uniqueKey, {});
|
|
598
606
|
var compType = item.workOrderComponentType;
|
|
@@ -601,9 +609,9 @@ var handleBsOrWdtReturnGoods = function handleBsOrWdtReturnGoods(_ref43) {
|
|
|
601
609
|
addContent(SUBMIT_COMPONENT_RETURN_GOODS_MAP[compType].shopCodeKey, (currentReturn === null || currentReturn === void 0 ? void 0 : currentReturn[SUBMIT_COMPONENT_RETURN_GOODS_MAP[compType].shopCodeKey]) || '');
|
|
602
610
|
};
|
|
603
611
|
};
|
|
604
|
-
var handleGYReturnGoods = function handleGYReturnGoods(
|
|
605
|
-
var addContent =
|
|
606
|
-
getNowData =
|
|
612
|
+
var handleGYReturnGoods = function handleGYReturnGoods(_ref45) {
|
|
613
|
+
var addContent = _ref45.addContent,
|
|
614
|
+
getNowData = _ref45.getNowData;
|
|
607
615
|
return function (item) {
|
|
608
616
|
var currentReturn = getNowData(item.uniqueKey, {});
|
|
609
617
|
var compType = item.workOrderComponentType;
|
|
@@ -613,9 +621,9 @@ var handleGYReturnGoods = function handleGYReturnGoods(_ref44) {
|
|
|
613
621
|
addContent(SUBMIT_COMPONENT_RETURN_GOODS_MAP[compType].shopCodeKey, (currentReturn === null || currentReturn === void 0 ? void 0 : currentReturn[SUBMIT_COMPONENT_RETURN_GOODS_MAP[compType].shopCodeKey]) || '');
|
|
614
622
|
};
|
|
615
623
|
};
|
|
616
|
-
var handleBsPosting = function handleBsPosting(
|
|
617
|
-
var addContent =
|
|
618
|
-
getNowData =
|
|
624
|
+
var handleBsPosting = function handleBsPosting(_ref46) {
|
|
625
|
+
var addContent = _ref46.addContent,
|
|
626
|
+
getNowData = _ref46.getNowData;
|
|
619
627
|
return function (item) {
|
|
620
628
|
['bsPostingProvince', 'bsPostingCity', 'bsPostingDistrict'].map(function (key, index) {
|
|
621
629
|
addContent(key, getNowData("".concat(item.uniqueKey, ".postingAddress[").concat(index, "]"), ''));
|
|
@@ -625,9 +633,9 @@ var handleBsPosting = function handleBsPosting(_ref45) {
|
|
|
625
633
|
addContent('bsPostingReceiverMobile', getNowData("".concat(item.uniqueKey, ".postingReceiverMobile"), ''));
|
|
626
634
|
};
|
|
627
635
|
};
|
|
628
|
-
var handleSystemOrder = function handleSystemOrder(
|
|
629
|
-
var addContent =
|
|
630
|
-
getNowData =
|
|
636
|
+
var handleSystemOrder = function handleSystemOrder(_ref47) {
|
|
637
|
+
var addContent = _ref47.addContent,
|
|
638
|
+
getNowData = _ref47.getNowData;
|
|
631
639
|
return function (item) {
|
|
632
640
|
var selectIds = getNowData("".concat(item.uniqueKey, ".selectIds"), '');
|
|
633
641
|
var showOrderInfo = getNowData("".concat(item.uniqueKey, ".showOrderInfo"), []);
|
|
@@ -641,16 +649,16 @@ var handleSystemOrder = function handleSystemOrder(_ref46) {
|
|
|
641
649
|
}));
|
|
642
650
|
};
|
|
643
651
|
};
|
|
644
|
-
var handleBuyerMessageNotice = function handleBuyerMessageNotice(
|
|
645
|
-
var addContent =
|
|
646
|
-
getNowData =
|
|
652
|
+
var handleBuyerMessageNotice = function handleBuyerMessageNotice(_ref48) {
|
|
653
|
+
var addContent = _ref48.addContent,
|
|
654
|
+
getNowData = _ref48.getNowData;
|
|
647
655
|
return function (item) {
|
|
648
656
|
addContent('buyerMessageNotice', getNowData(item.uniqueKey, '未通知'));
|
|
649
657
|
};
|
|
650
658
|
};
|
|
651
|
-
var handleBsDeliveryNo = function handleBsDeliveryNo(
|
|
652
|
-
var addContent =
|
|
653
|
-
getNowData =
|
|
659
|
+
var handleBsDeliveryNo = function handleBsDeliveryNo(_ref49) {
|
|
660
|
+
var addContent = _ref49.addContent,
|
|
661
|
+
getNowData = _ref49.getNowData;
|
|
654
662
|
return function (item) {
|
|
655
663
|
var deliveryNoList = getNowData(item.uniqueKey, []);
|
|
656
664
|
addContent('deliveryNoList', deliveryNoList);
|
|
@@ -659,9 +667,9 @@ var handleBsDeliveryNo = function handleBsDeliveryNo(_ref48) {
|
|
|
659
667
|
}));
|
|
660
668
|
};
|
|
661
669
|
};
|
|
662
|
-
var handleReturnGoodsTradeId = function handleReturnGoodsTradeId(
|
|
663
|
-
var addContent =
|
|
664
|
-
getNowData =
|
|
670
|
+
var handleReturnGoodsTradeId = function handleReturnGoodsTradeId(_ref50) {
|
|
671
|
+
var addContent = _ref50.addContent,
|
|
672
|
+
getNowData = _ref50.getNowData;
|
|
665
673
|
return function (item) {
|
|
666
674
|
var returnGoodsTradeItemList = getNowData(item.uniqueKey, []);
|
|
667
675
|
addContent('returnGoodsTradeItemList', returnGoodsTradeItemList);
|
|
@@ -670,9 +678,9 @@ var handleReturnGoodsTradeId = function handleReturnGoodsTradeId(_ref49) {
|
|
|
670
678
|
}));
|
|
671
679
|
};
|
|
672
680
|
};
|
|
673
|
-
var handleErpTradeId = function handleErpTradeId(
|
|
674
|
-
var addContent =
|
|
675
|
-
getNowData =
|
|
681
|
+
var handleErpTradeId = function handleErpTradeId(_ref51) {
|
|
682
|
+
var addContent = _ref51.addContent,
|
|
683
|
+
getNowData = _ref51.getNowData;
|
|
676
684
|
return function (item) {
|
|
677
685
|
var tradeItemList = getNowData(item.uniqueKey, []);
|
|
678
686
|
addContent('tradeItemList', tradeItemList);
|
|
@@ -681,9 +689,9 @@ var handleErpTradeId = function handleErpTradeId(_ref50) {
|
|
|
681
689
|
}));
|
|
682
690
|
};
|
|
683
691
|
};
|
|
684
|
-
var handleErpAfterSelfTradeId = function handleErpAfterSelfTradeId(
|
|
685
|
-
var addContent =
|
|
686
|
-
getNowData =
|
|
692
|
+
var handleErpAfterSelfTradeId = function handleErpAfterSelfTradeId(_ref52) {
|
|
693
|
+
var addContent = _ref52.addContent,
|
|
694
|
+
getNowData = _ref52.getNowData;
|
|
687
695
|
return function (item) {
|
|
688
696
|
var tradeItemList = getNowData(item.uniqueKey, []);
|
|
689
697
|
addContent('erpAfterSaleTradeItemList', tradeItemList);
|
|
@@ -692,18 +700,18 @@ var handleErpAfterSelfTradeId = function handleErpAfterSelfTradeId(_ref51) {
|
|
|
692
700
|
}));
|
|
693
701
|
};
|
|
694
702
|
};
|
|
695
|
-
var handleWlnGoods = function handleWlnGoods(
|
|
696
|
-
var addContent =
|
|
697
|
-
getNowData =
|
|
703
|
+
var handleWlnGoods = function handleWlnGoods(_ref53) {
|
|
704
|
+
var addContent = _ref53.addContent,
|
|
705
|
+
getNowData = _ref53.getNowData;
|
|
698
706
|
return function (item) {
|
|
699
707
|
var wlnGoods = getNowData(item.uniqueKey, {});
|
|
700
708
|
addContent('wlnGoods', wlnGoods.wlnGoods);
|
|
701
709
|
addContent('shopCode', (wlnGoods === null || wlnGoods === void 0 ? void 0 : wlnGoods.shopCode) || '');
|
|
702
710
|
};
|
|
703
711
|
};
|
|
704
|
-
var handleBsE3ReissueGoods = function handleBsE3ReissueGoods(
|
|
705
|
-
var addContent =
|
|
706
|
-
getNowData =
|
|
712
|
+
var handleBsE3ReissueGoods = function handleBsE3ReissueGoods(_ref54) {
|
|
713
|
+
var addContent = _ref54.addContent,
|
|
714
|
+
getNowData = _ref54.getNowData;
|
|
707
715
|
return function (item) {
|
|
708
716
|
['bsE3SystemOrderNo', 'bsE3ReissueType', 'bsE3ReissueMemo', 'bsE3ReissueGoods'].map(function (key) {
|
|
709
717
|
if (key === 'bsE3ReissueGoods') {
|
|
@@ -714,33 +722,33 @@ var handleBsE3ReissueGoods = function handleBsE3ReissueGoods(_ref53) {
|
|
|
714
722
|
});
|
|
715
723
|
};
|
|
716
724
|
};
|
|
717
|
-
var handleWdtShopSelect = function handleWdtShopSelect(
|
|
718
|
-
var addContent =
|
|
719
|
-
getNowData =
|
|
725
|
+
var handleWdtShopSelect = function handleWdtShopSelect(_ref55) {
|
|
726
|
+
var addContent = _ref55.addContent,
|
|
727
|
+
getNowData = _ref55.getNowData;
|
|
720
728
|
return function (item) {
|
|
721
729
|
['shopCode'].map(function (key) {
|
|
722
730
|
addContent(key, getNowData("".concat(item.uniqueKey), ''));
|
|
723
731
|
});
|
|
724
732
|
};
|
|
725
733
|
};
|
|
726
|
-
var handleDefault = function handleDefault(
|
|
727
|
-
var addContent =
|
|
728
|
-
getNowData =
|
|
734
|
+
var handleDefault = function handleDefault(_ref56) {
|
|
735
|
+
var addContent = _ref56.addContent,
|
|
736
|
+
getNowData = _ref56.getNowData;
|
|
729
737
|
return function (item) {
|
|
730
738
|
addContent(V.camelCase(item.workOrderComponentType), getNowData(item.uniqueKey, ''));
|
|
731
739
|
};
|
|
732
740
|
};
|
|
733
|
-
var handleStatusField = function handleStatusField(
|
|
734
|
-
var addContent =
|
|
735
|
-
getNowData =
|
|
741
|
+
var handleStatusField = function handleStatusField(_ref57) {
|
|
742
|
+
var addContent = _ref57.addContent,
|
|
743
|
+
getNowData = _ref57.getNowData;
|
|
736
744
|
return function (item) {
|
|
737
745
|
addContent(SUBMIT_COMPONENT_STATUS_MAP[item.workOrderComponentType].status, getNowData("".concat(item.uniqueKey, ".status"), ''));
|
|
738
746
|
addContent(SUBMIT_COMPONENT_STATUS_MAP[item.workOrderComponentType].reason, getNowData("".concat(item.uniqueKey, ".reason"), ''));
|
|
739
747
|
};
|
|
740
748
|
};
|
|
741
|
-
var handleGoodStatus = function handleGoodStatus(
|
|
742
|
-
var addContent =
|
|
743
|
-
getNowData =
|
|
749
|
+
var handleGoodStatus = function handleGoodStatus(_ref58) {
|
|
750
|
+
var addContent = _ref58.addContent,
|
|
751
|
+
getNowData = _ref58.getNowData;
|
|
744
752
|
return function (item) {
|
|
745
753
|
addContent(SUBMIT_COMPONENT_GOOD_STATUS_MAP[item.workOrderComponentType].list, getNowData("".concat(item.uniqueKey), []));
|
|
746
754
|
addContent(SUBMIT_COMPONENT_GOOD_STATUS_MAP[item.workOrderComponentType].status, getNowData("".concat(item.uniqueKey), []).map(function (item) {
|
|
@@ -748,13 +756,13 @@ var handleGoodStatus = function handleGoodStatus(_ref57) {
|
|
|
748
756
|
}));
|
|
749
757
|
};
|
|
750
758
|
};
|
|
751
|
-
var processComponent = function processComponent(
|
|
752
|
-
var params =
|
|
753
|
-
nowData =
|
|
754
|
-
updateFlag =
|
|
755
|
-
detail =
|
|
756
|
-
accountName =
|
|
757
|
-
getValueByField =
|
|
759
|
+
var processComponent = function processComponent(_ref59) {
|
|
760
|
+
var params = _ref59.params,
|
|
761
|
+
nowData = _ref59.nowData,
|
|
762
|
+
updateFlag = _ref59.updateFlag,
|
|
763
|
+
detail = _ref59.detail,
|
|
764
|
+
accountName = _ref59.accountName,
|
|
765
|
+
getValueByField = _ref59.getValueByField;
|
|
758
766
|
return function (item) {
|
|
759
767
|
var contentVoList = [];
|
|
760
768
|
var uniqueKeyPrefix = "".concat(item.uniqueKey, "_");
|
|
@@ -808,6 +816,7 @@ var processComponent = function processComponent(_ref58) {
|
|
|
808
816
|
case 'ERP_ORDER_STATUS':
|
|
809
817
|
case 'SKX_CREATE_TIME':
|
|
810
818
|
case 'SKX_OUTBOUND_NOTICE_NO':
|
|
819
|
+
case 'SKX_RETURN_BILL_NO':
|
|
811
820
|
wrapFn(handleOnlyAddContent);
|
|
812
821
|
break;
|
|
813
822
|
case 'RATE':
|
|
@@ -917,6 +926,7 @@ var processComponent = function processComponent(_ref58) {
|
|
|
917
926
|
case 'GY_LOGISTICS':
|
|
918
927
|
case 'JY_LOGISTICS':
|
|
919
928
|
case 'SKX_LOGISTICS':
|
|
929
|
+
case 'SKX_RETURN_LOGISTICS':
|
|
920
930
|
wrapFn(handleErpLogistics);
|
|
921
931
|
break;
|
|
922
932
|
case 'BS_SEND_GOOD':
|
|
@@ -954,6 +964,9 @@ var processComponent = function processComponent(_ref58) {
|
|
|
954
964
|
case 'ORDER_SUBFORM':
|
|
955
965
|
wrapFn(handleOrderSubForm);
|
|
956
966
|
break;
|
|
967
|
+
case 'SKX_RETURN_GOODS':
|
|
968
|
+
wrapFn(handleSkxReturnGoods);
|
|
969
|
+
break;
|
|
957
970
|
case 'BS_EXCHANGE_GOODS':
|
|
958
971
|
wrapFn(handleBsExchangeGoods);
|
|
959
972
|
break;
|
|
@@ -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, filterJyOrders, setSessionStorage, jyOrderTransform, jyOrderBackFormValues, skxOrderTransform, orderSubFormOrderTransform } 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";
|
|
@@ -140,7 +140,7 @@ var getBasicsOrderInfo = function getBasicsOrderInfo(orderInfo, xiaozhiOrder) {
|
|
|
140
140
|
//订单返填
|
|
141
141
|
export var orderBack = /*#__PURE__*/function () {
|
|
142
142
|
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, shopInfo, _res$data3, _res$data4, _res$data5, JOIN_SHOP, hasFlagMap, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, thirdShopMainType, _kmVideoComponent$com, _data$value, _data$value3, _data$value4, _jstOrder$value, _jstOrder$value2, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsE3Order$value, _kmOrder$value, _gyOrder$value, _jyOrder$value, _skxOrder$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, kmVideoOrder, orderSubFormOrder, _data$value2, orderInfo, jstOrders, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, gyOrders, jyOrders, skxOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, orderSubFormInfo, gyInfo, jyInfo, jstInfo, skxInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, hasSigningDatetime, _signDatetime$data, signDatetime, values, paymentUniqueKey;
|
|
143
|
+
var order_no, form, propsShopid, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, callbackShopId, setLoading, callKey, shopId, _res$data, res, shopInfo, _res$data3, _res$data4, _res$data5, JOIN_SHOP, hasFlagMap, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, thirdShopMainType, _kmVideoComponent$com, _data$value, _data$value3, _data$value4, _jstOrder$value, _jstOrder$value2, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsE3Order$value, _kmOrder$value, _gyOrder$value, _jyOrder$value, _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
144
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
145
145
|
while (1) switch (_context.prev = _context.next) {
|
|
146
146
|
case 0:
|
|
@@ -277,7 +277,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
277
277
|
return Promise.allSettled(promise);
|
|
278
278
|
case 36:
|
|
279
279
|
_yield$Promise$allSet = _context.sent;
|
|
280
|
-
_yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet,
|
|
280
|
+
_yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet, 14);
|
|
281
281
|
data = _yield$Promise$allSet2[0];
|
|
282
282
|
xiaozhiOrder = _yield$Promise$allSet2[1];
|
|
283
283
|
jstOrder = _yield$Promise$allSet2[2];
|
|
@@ -289,8 +289,9 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
289
289
|
gyOrder = _yield$Promise$allSet2[8];
|
|
290
290
|
jyOrder = _yield$Promise$allSet2[9];
|
|
291
291
|
skxOrder = _yield$Promise$allSet2[10];
|
|
292
|
-
|
|
293
|
-
|
|
292
|
+
skxReturnOrder = _yield$Promise$allSet2[11];
|
|
293
|
+
kmVideoOrder = _yield$Promise$allSet2[12];
|
|
294
|
+
orderSubFormOrder = _yield$Promise$allSet2[13];
|
|
294
295
|
// TODO: 针对订单支付方式是微信还是支付宝,后端接口返回一个message用来提示使用
|
|
295
296
|
console.log('--订单反填数据--', {
|
|
296
297
|
data: data,
|
|
@@ -304,6 +305,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
304
305
|
gyOrder: gyOrder,
|
|
305
306
|
jyOrder: jyOrder,
|
|
306
307
|
skxOrder: skxOrder,
|
|
308
|
+
skxReturnOrder: skxReturnOrder,
|
|
307
309
|
kmVideoOrder: kmVideoOrder,
|
|
308
310
|
orderSubFormOrder: orderSubFormOrder
|
|
309
311
|
});
|
|
@@ -326,6 +328,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
326
328
|
gyOrders = gyOrder === null || gyOrder === void 0 ? void 0 : (_gyOrder$value = gyOrder.value) === null || _gyOrder$value === void 0 ? void 0 : _gyOrder$value.data;
|
|
327
329
|
jyOrders = jyOrder === null || jyOrder === void 0 ? void 0 : (_jyOrder$value = jyOrder.value) === null || _jyOrder$value === void 0 ? void 0 : _jyOrder$value.data;
|
|
328
330
|
skxOrders = skxOrder === null || skxOrder === void 0 ? void 0 : (_skxOrder$value = skxOrder.value) === null || _skxOrder$value === void 0 ? void 0 : _skxOrder$value.data;
|
|
331
|
+
skxReturnOrders = skxReturnOrder === null || skxReturnOrder === void 0 ? void 0 : (_skxReturnOrder$value = skxReturnOrder.value) === null || _skxReturnOrder$value === void 0 ? void 0 : _skxReturnOrder$value.data;
|
|
329
332
|
console.log('skxOrders', {
|
|
330
333
|
skxOrders: skxOrders,
|
|
331
334
|
skxOrder: skxOrder
|
|
@@ -337,9 +340,10 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
337
340
|
if (jstOrders) jstOrders.trades = filterJstOrders(jstOrders, order_no);
|
|
338
341
|
if (jyOrders) jyOrders.trades = filterJyOrders(jyOrders, order_no);
|
|
339
342
|
if (skxOrders) skxOrders.trades = (skxOrders === null || skxOrders === void 0 ? void 0 : skxOrders.orderDetailInfoList) || []; //需要看实际接口返回字段
|
|
343
|
+
if (skxReturnOrders) skxReturnOrders.trades = (skxReturnOrders === null || skxReturnOrders === void 0 ? void 0 : skxReturnOrders.skqReturnOrderDetailInfoDtos) || [];
|
|
340
344
|
pushGyLog('gyOrders', gyOrders);
|
|
341
345
|
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 \u7BA1\u6613\u4FE1\u606F:").concat(JSON.stringify(gyOrders || []), "\n \u5DE8\u76CA\u4FE1\u606F:").concat(JSON.stringify(jyOrders || []), "\n ")
|
|
346
|
+
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
347
|
});
|
|
344
348
|
if (bsOrders && plat !== null && plat !== void 0 && plat.subOrderNo) {
|
|
345
349
|
bsOrders.orders = bsOrders.orders.filter(function (item) {
|
|
@@ -397,6 +401,11 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
397
401
|
orderNo: order_no,
|
|
398
402
|
allOrders: (skxOrders === null || skxOrders === void 0 ? void 0 : skxOrders.trades) || []
|
|
399
403
|
}), form);
|
|
404
|
+
skxReturnInfo = skxReturnOrders && skxReturnOrderTransform(_objectSpread(_objectSpread({}, skxReturnOrders), {}, {
|
|
405
|
+
componentList: templateDetail.componentDtoList,
|
|
406
|
+
orderNo: order_no,
|
|
407
|
+
allOrders: (skxReturnOrders === null || skxReturnOrders === void 0 ? void 0 : skxReturnOrders.trades) || []
|
|
408
|
+
}), form);
|
|
400
409
|
if ((bsOrders === null || bsOrders === void 0 ? void 0 : (_bsOrders$orders = bsOrders.orders) === null || _bsOrders$orders === void 0 ? void 0 : _bsOrders$orders.length) > 1) {
|
|
401
410
|
bsInfo.bsGoods = _objectSpread(_objectSpread({}, bsInfo.bsGoods), {}, {
|
|
402
411
|
bsGoods: []
|
|
@@ -518,6 +527,13 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
518
527
|
logisticsCode: ''
|
|
519
528
|
}];
|
|
520
529
|
}
|
|
530
|
+
// if (skxReturnOrders?.trades && skxReturnOrders.trades.length > 1) {
|
|
531
|
+
// skxReturnInfo.skxReturnGoods = {
|
|
532
|
+
// ...skxReturnInfo.skxReturnGoods,
|
|
533
|
+
// skxReturnGoods: [],
|
|
534
|
+
// };
|
|
535
|
+
// skxReturnInfo.skxLogistics = [{ logisticsCompany: null, logisticsCode: '' }];
|
|
536
|
+
// }
|
|
521
537
|
|
|
522
538
|
//获取当前表单字段
|
|
523
539
|
formValue = form.getFieldsValue();
|
|
@@ -531,12 +547,13 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
531
547
|
gyOrder: gyInfo,
|
|
532
548
|
jyOrder: jyInfo,
|
|
533
549
|
skxOrder: skxInfo,
|
|
534
|
-
orderSubFormOrder: orderSubFormInfo
|
|
550
|
+
orderSubFormOrder: orderSubFormInfo,
|
|
551
|
+
skxReturnOrder: skxReturnInfo
|
|
535
552
|
});
|
|
536
553
|
pushGyLog('detail', detail);
|
|
537
554
|
//抖音数据特殊处理
|
|
538
555
|
if (!orderInfo) {
|
|
539
|
-
_context.next =
|
|
556
|
+
_context.next = 137;
|
|
540
557
|
break;
|
|
541
558
|
}
|
|
542
559
|
if (shopSourceStr === 'FXG') {
|
|
@@ -548,7 +565,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
548
565
|
hasSelectItem = HasErpItemSelectHandle(templateDetail);
|
|
549
566
|
erpPromiseList = [];
|
|
550
567
|
if (!(shopSourceStr === 'TAOBAO' && hasSelectItem)) {
|
|
551
|
-
_context.next =
|
|
568
|
+
_context.next = 121;
|
|
552
569
|
break;
|
|
553
570
|
}
|
|
554
571
|
list = detail['itemList'];
|
|
@@ -566,10 +583,10 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
566
583
|
resolve({});
|
|
567
584
|
});
|
|
568
585
|
});
|
|
569
|
-
_context.prev =
|
|
570
|
-
_context.next =
|
|
586
|
+
_context.prev = 111;
|
|
587
|
+
_context.next = 114;
|
|
571
588
|
return Promise.all(promises);
|
|
572
|
-
case
|
|
589
|
+
case 114:
|
|
573
590
|
erpPromiseList = _context.sent;
|
|
574
591
|
detail['itemList'] = (_detail$itemList = detail['itemList']) === null || _detail$itemList === void 0 ? void 0 : _detail$itemList.map(function (item, index) {
|
|
575
592
|
return _objectSpread(_objectSpread({}, item), {}, {
|
|
@@ -579,25 +596,25 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
579
596
|
})
|
|
580
597
|
});
|
|
581
598
|
});
|
|
582
|
-
_context.next =
|
|
599
|
+
_context.next = 121;
|
|
583
600
|
break;
|
|
584
|
-
case
|
|
585
|
-
_context.prev =
|
|
586
|
-
_context.t1 = _context["catch"](
|
|
601
|
+
case 118:
|
|
602
|
+
_context.prev = 118;
|
|
603
|
+
_context.t1 = _context["catch"](111);
|
|
587
604
|
console.error('调用erp获取宝贝编码错误', _context.t1);
|
|
588
|
-
case
|
|
605
|
+
case 121:
|
|
589
606
|
// 判断是否存在签收时间组件
|
|
590
607
|
hasSigningDatetime = HasTradeSigningDatetime(templateDetail); // 如存在签收时间组件且订单也有返回相应物流单号跟物流公司编码,则调用接口获取签收时间
|
|
591
608
|
if (!hasSigningDatetime) {
|
|
592
|
-
_context.next =
|
|
609
|
+
_context.next = 137;
|
|
593
610
|
break;
|
|
594
611
|
}
|
|
595
612
|
if (!(orderInfo !== null && orderInfo !== void 0 && orderInfo.expressLogisticsCompany && orderInfo !== null && orderInfo !== void 0 && orderInfo.expressLogisticsCode)) {
|
|
596
|
-
_context.next =
|
|
613
|
+
_context.next = 136;
|
|
597
614
|
break;
|
|
598
615
|
}
|
|
599
|
-
_context.prev =
|
|
600
|
-
_context.next =
|
|
616
|
+
_context.prev = 124;
|
|
617
|
+
_context.next = 127;
|
|
601
618
|
return request({
|
|
602
619
|
url: '/qy/logistics/logisticsSignTime',
|
|
603
620
|
method: 'post',
|
|
@@ -607,21 +624,21 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
607
624
|
mailNo: orderInfo.expressLogisticsCode
|
|
608
625
|
}
|
|
609
626
|
});
|
|
610
|
-
case
|
|
627
|
+
case 127:
|
|
611
628
|
signDatetime = _context.sent;
|
|
612
629
|
detail['tradeSigningDateTime'] = signDatetime === null || signDatetime === void 0 ? void 0 : (_signDatetime$data = signDatetime.data) === null || _signDatetime$data === void 0 ? void 0 : _signDatetime$data.signTime;
|
|
613
|
-
_context.next =
|
|
630
|
+
_context.next = 134;
|
|
614
631
|
break;
|
|
615
|
-
case
|
|
616
|
-
_context.prev =
|
|
617
|
-
_context.t2 = _context["catch"](
|
|
632
|
+
case 131:
|
|
633
|
+
_context.prev = 131;
|
|
634
|
+
_context.t2 = _context["catch"](124);
|
|
618
635
|
console.error('调用签收时间错误', _context.t2);
|
|
619
|
-
case
|
|
620
|
-
_context.next =
|
|
636
|
+
case 134:
|
|
637
|
+
_context.next = 137;
|
|
621
638
|
break;
|
|
622
|
-
case
|
|
639
|
+
case 136:
|
|
623
640
|
detail['tradeSigningDateTime'] = '';
|
|
624
|
-
case
|
|
641
|
+
case 137:
|
|
625
642
|
values = orderBackFormValues({
|
|
626
643
|
detail: detail,
|
|
627
644
|
_get_order_fail_: !orderInfo,
|
|
@@ -666,21 +683,21 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
666
683
|
shopId: shopId
|
|
667
684
|
}));
|
|
668
685
|
callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
|
|
669
|
-
_context.next =
|
|
686
|
+
_context.next = 148;
|
|
670
687
|
break;
|
|
671
|
-
case
|
|
672
|
-
_context.prev =
|
|
688
|
+
case 145:
|
|
689
|
+
_context.prev = 145;
|
|
673
690
|
_context.t3 = _context["catch"](25);
|
|
674
691
|
console.error(_context.t3);
|
|
675
|
-
case
|
|
676
|
-
_context.prev =
|
|
692
|
+
case 148:
|
|
693
|
+
_context.prev = 148;
|
|
677
694
|
setLoading === null || setLoading === void 0 ? void 0 : setLoading(false);
|
|
678
|
-
return _context.finish(
|
|
679
|
-
case
|
|
695
|
+
return _context.finish(148);
|
|
696
|
+
case 151:
|
|
680
697
|
case "end":
|
|
681
698
|
return _context.stop();
|
|
682
699
|
}
|
|
683
|
-
}, _callee, null, [[5, 12, 15, 18], [25,
|
|
700
|
+
}, _callee, null, [[5, 12, 15, 18], [25, 145, 148, 151], [111, 118], [124, 131]]);
|
|
684
701
|
}));
|
|
685
702
|
return function orderBack(_x) {
|
|
686
703
|
return _ref2.apply(this, arguments);
|
|
@@ -1051,6 +1068,9 @@ export var reversalFormValues = function reversalFormValues() {
|
|
|
1051
1068
|
case 'SKX_GOODS':
|
|
1052
1069
|
prv["".concat(next.uniqueKey, "_skxGoods")] = JSON.stringify(values[next.uniqueKey]['_skxGoods']);
|
|
1053
1070
|
break;
|
|
1071
|
+
case 'SKX_RETURN_GOODS':
|
|
1072
|
+
prv["".concat(next.uniqueKey, "_skxReturnGoods")] = JSON.stringify(values[next.uniqueKey]['_skxReturnGoods']);
|
|
1073
|
+
break;
|
|
1054
1074
|
}
|
|
1055
1075
|
return prv;
|
|
1056
1076
|
}, {});
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { HasFilterHandle } from "./tools";
|
|
2
|
-
import { bsOrderDetail, wlnOrderDetail, wdtOrderDetail, bsE3OrderDetail, kmOrderDetail, gyOrderDetail, skxOrderDetail, jyOrderDetail } from "../../model/servers/api";
|
|
2
|
+
import { bsOrderDetail, wlnOrderDetail, wdtOrderDetail, bsE3OrderDetail, kmOrderDetail, gyOrderDetail, skxOrderDetail, jyOrderDetail, skxReturnOrderDetail } from "../../model/servers/api";
|
|
3
3
|
import { servers } from '@kmkf-fe-packages/kmkf-utils';
|
|
4
4
|
var orderBackKeyListMap = {
|
|
5
5
|
hasJst: ['JST_SYSTEM_ORDER', 'JST_GOODS', 'JST_REISSUE_GOODS', 'JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD'],
|
|
@@ -10,7 +10,8 @@ var orderBackKeyListMap = {
|
|
|
10
10
|
hasWln: ['WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD'],
|
|
11
11
|
hasGy: ['GY_SYSTEM_ORDER', 'GY_SEND_GOOD', 'GY_GOODS', 'GY_REISSUE_GOODS', 'GY_RETURN_GOODS', 'GY_LOGISTICS'],
|
|
12
12
|
hasJy: ['JY_SYSTEM_ORDER', 'JY_SEND_GOOD', 'JY_GOODS', 'JY_REISSUE_GOODS', 'JY_RETURN_GOODS', 'JY_LOGISTICS'],
|
|
13
|
-
hasSkx: ['SKX_OUTBOUND_NOTICE_NO']
|
|
13
|
+
hasSkx: ['SKX_OUTBOUND_NOTICE_NO'],
|
|
14
|
+
hasSkxReturn: ['SKX_RETURN_BILL_NO']
|
|
14
15
|
};
|
|
15
16
|
export var orderBackMap = function orderBackMap(_ref) {
|
|
16
17
|
var templateDetail = _ref.templateDetail,
|
|
@@ -93,6 +94,15 @@ export var orderBackMap = function orderBackMap(_ref) {
|
|
|
93
94
|
tid: order_no
|
|
94
95
|
});
|
|
95
96
|
}
|
|
97
|
+
},
|
|
98
|
+
// 根据系统订单号反填,所以只要判断是否有系统订单号就行
|
|
99
|
+
hasSkxReturn: {
|
|
100
|
+
flag: HasFilterHandle(templateDetail, orderBackKeyListMap.hasSkxReturn),
|
|
101
|
+
promiseRequest: function promiseRequest() {
|
|
102
|
+
return skxReturnOrderDetail({
|
|
103
|
+
tid: order_no
|
|
104
|
+
});
|
|
105
|
+
}
|
|
96
106
|
}
|
|
97
107
|
};
|
|
98
108
|
};
|
|
@@ -487,6 +487,9 @@ var processErpLogistics = function processErpLogistics(getValue) {
|
|
|
487
487
|
},
|
|
488
488
|
SKX_LOGISTICS: {
|
|
489
489
|
listKey: 'skxLogisticsList'
|
|
490
|
+
},
|
|
491
|
+
SKX_RETURN_LOGISTICS: {
|
|
492
|
+
listKey: 'skxReturnLogistics'
|
|
490
493
|
}
|
|
491
494
|
};
|
|
492
495
|
var initValue = [{
|
|
@@ -726,6 +729,14 @@ var processJyGoods = function processJyGoods(templateColumns) {
|
|
|
726
729
|
};
|
|
727
730
|
};
|
|
728
731
|
};
|
|
732
|
+
var processSkxReturnGoods = function processSkxReturnGoods(getValue) {
|
|
733
|
+
return function (nex, config) {
|
|
734
|
+
var _values = {
|
|
735
|
+
skxReturnGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_skxReturnGoods")), [])
|
|
736
|
+
};
|
|
737
|
+
return _defineProperty({}, nex.uniqueKey, _values);
|
|
738
|
+
};
|
|
739
|
+
};
|
|
729
740
|
var processBsReissueGoods = function processBsReissueGoods(getValue) {
|
|
730
741
|
return function (nex, config) {
|
|
731
742
|
return _defineProperty({}, nex.uniqueKey, {
|
|
@@ -1087,14 +1098,14 @@ var processJstReturnGoods = function processJstReturnGoods(templateColumns) {
|
|
|
1087
1098
|
};
|
|
1088
1099
|
var processLabel = function processLabel(getValue) {
|
|
1089
1100
|
return function (nex, config) {
|
|
1090
|
-
var
|
|
1091
|
-
return
|
|
1101
|
+
var _ref76;
|
|
1102
|
+
return _ref76 = {}, _defineProperty(_ref76, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref76, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref76;
|
|
1092
1103
|
};
|
|
1093
1104
|
};
|
|
1094
1105
|
var processMemberLevel = function processMemberLevel(getValue) {
|
|
1095
1106
|
return function (nex, config) {
|
|
1096
|
-
var
|
|
1097
|
-
return
|
|
1107
|
+
var _ref77;
|
|
1108
|
+
return _ref77 = {}, _defineProperty(_ref77, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref77, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref77;
|
|
1098
1109
|
};
|
|
1099
1110
|
};
|
|
1100
1111
|
var processAfterSalesOrderId = function processAfterSalesOrderId(getValue) {
|
|
@@ -1281,7 +1292,9 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
|
|
|
1281
1292
|
WDT_TAGS: wdtTags,
|
|
1282
1293
|
EXECUTE_ACTION_TYPE: processExecuteActionType,
|
|
1283
1294
|
SKX_GOODS: processSkxGoods,
|
|
1284
|
-
|
|
1295
|
+
SKX_RETURN_GOODS: processSkxReturnGoods,
|
|
1296
|
+
SKX_LOGISTICS: processErpLogistics,
|
|
1297
|
+
SKX_RETURN_LOGISTICS: processErpLogistics
|
|
1285
1298
|
}, Object.keys(processSingleFieldTypeMapping).reduce(function (acc, key) {
|
|
1286
1299
|
acc[key] = processSingleFieldByKey(processSingleFieldTypeMapping[key]);
|
|
1287
1300
|
return acc;
|
|
@@ -6,7 +6,6 @@ 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;
|
|
10
9
|
}) => import("./types").LogicFlow[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").LogicFlow[], {
|
|
11
10
|
clearCache: () => void;
|
|
12
11
|
}> & {
|
|
@@ -20,7 +19,6 @@ export declare const selectGroupFlowList: ((state: {
|
|
|
20
19
|
paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
|
|
21
20
|
singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
|
|
22
21
|
logicFlow: import("./types").LogicFlowState;
|
|
23
|
-
flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
|
|
24
22
|
}) => import("./types").Option[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").Option[], {
|
|
25
23
|
clearCache: () => void;
|
|
26
24
|
}> & {
|
|
@@ -34,7 +32,6 @@ export declare const selectFlowTemplateGroupWorkOrderTemplateList: ((state: {
|
|
|
34
32
|
paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
|
|
35
33
|
singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
|
|
36
34
|
logicFlow: import("./types").LogicFlowState;
|
|
37
|
-
flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
|
|
38
35
|
}) => import("./types").Option[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").Option[], {
|
|
39
36
|
clearCache: () => void;
|
|
40
37
|
}> & {
|
|
@@ -6,7 +6,6 @@ export declare const selectPaymentWorkOrderExamineModalVisible: ((state: {
|
|
|
6
6
|
paymentWorkOrder: import("./types").PaymentWorkOrderState;
|
|
7
7
|
singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
|
|
8
8
|
logicFlow: import("../logicFlow/types").LogicFlowState;
|
|
9
|
-
flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
|
|
10
9
|
}) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
|
|
11
10
|
clearCache: () => void;
|
|
12
11
|
}> & {
|
|
@@ -20,7 +19,6 @@ export declare const selectCurrentPaymentRecord: ((state: {
|
|
|
20
19
|
paymentWorkOrder: import("./types").PaymentWorkOrderState;
|
|
21
20
|
singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
|
|
22
21
|
logicFlow: import("../logicFlow/types").LogicFlowState;
|
|
23
|
-
flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
|
|
24
22
|
}) => any) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => any, {
|
|
25
23
|
clearCache: () => void;
|
|
26
24
|
}> & {
|
|
@@ -34,7 +32,6 @@ export declare const selectPaymentWorkOrderUnExamineModalVisible: ((state: {
|
|
|
34
32
|
paymentWorkOrder: import("./types").PaymentWorkOrderState;
|
|
35
33
|
singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
|
|
36
34
|
logicFlow: import("../logicFlow/types").LogicFlowState;
|
|
37
|
-
flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
|
|
38
35
|
}) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
|
|
39
36
|
clearCache: () => void;
|
|
40
37
|
}> & {
|
|
@@ -48,7 +45,6 @@ export declare const selectDeletePaymentWorkOrderVisible: ((state: {
|
|
|
48
45
|
paymentWorkOrder: import("./types").PaymentWorkOrderState;
|
|
49
46
|
singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
|
|
50
47
|
logicFlow: import("../logicFlow/types").LogicFlowState;
|
|
51
|
-
flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
|
|
52
48
|
}) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
|
|
53
49
|
clearCache: () => void;
|
|
54
50
|
}> & {
|
|
@@ -62,7 +58,6 @@ export declare const selectFlagPayModalVisible: ((state: {
|
|
|
62
58
|
paymentWorkOrder: import("./types").PaymentWorkOrderState;
|
|
63
59
|
singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
|
|
64
60
|
logicFlow: import("../logicFlow/types").LogicFlowState;
|
|
65
|
-
flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
|
|
66
61
|
}) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
|
|
67
62
|
clearCache: () => void;
|
|
68
63
|
}> & {
|
|
@@ -76,7 +71,6 @@ export declare const selectLogModalVisible: ((state: {
|
|
|
76
71
|
paymentWorkOrder: import("./types").PaymentWorkOrderState;
|
|
77
72
|
singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
|
|
78
73
|
logicFlow: import("../logicFlow/types").LogicFlowState;
|
|
79
|
-
flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
|
|
80
74
|
}) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
|
|
81
75
|
clearCache: () => void;
|
|
82
76
|
}> & {
|
|
@@ -90,7 +84,6 @@ export declare const selectPaymentFormModalVisible: ((state: {
|
|
|
90
84
|
paymentWorkOrder: import("./types").PaymentWorkOrderState;
|
|
91
85
|
singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
|
|
92
86
|
logicFlow: import("../logicFlow/types").LogicFlowState;
|
|
93
|
-
flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
|
|
94
87
|
}) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
|
|
95
88
|
clearCache: () => void;
|
|
96
89
|
}> & {
|
|
@@ -104,7 +97,6 @@ export declare const selectRepeatVisible: ((state: {
|
|
|
104
97
|
paymentWorkOrder: import("./types").PaymentWorkOrderState;
|
|
105
98
|
singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
|
|
106
99
|
logicFlow: import("../logicFlow/types").LogicFlowState;
|
|
107
|
-
flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
|
|
108
100
|
}) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
|
|
109
101
|
clearCache: () => void;
|
|
110
102
|
}> & {
|
|
@@ -118,7 +110,6 @@ export declare const selectRepeatWorkOrderList: ((state: {
|
|
|
118
110
|
paymentWorkOrder: import("./types").PaymentWorkOrderState;
|
|
119
111
|
singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
|
|
120
112
|
logicFlow: import("../logicFlow/types").LogicFlowState;
|
|
121
|
-
flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
|
|
122
113
|
}) => string[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => string[], {
|
|
123
114
|
clearCache: () => void;
|
|
124
115
|
}> & {
|
|
@@ -82,6 +82,7 @@ export declare const bsE3OrderDetail: (data: any) => Promise<any>;
|
|
|
82
82
|
export declare const kmOrderDetail: (data: any) => Promise<serverProps<any>>;
|
|
83
83
|
export declare const gyOrderDetail: (data: any) => Promise<any>;
|
|
84
84
|
export declare const skxOrderDetail: (data: any) => Promise<any>;
|
|
85
|
+
export declare const skxReturnOrderDetail: (data: any) => Promise<any>;
|
|
85
86
|
export declare const getRepeatWorkOrderList: (data: any) => Promise<any>;
|
|
86
87
|
export declare const logisticsInterceptCancel: (data: any) => Promise<any>;
|
|
87
88
|
export declare const queryLogisticsTrack: (data: any) => Promise<any>;
|
|
@@ -8,8 +8,8 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
|
|
|
8
8
|
* @Description:
|
|
9
9
|
* @Author: litian
|
|
10
10
|
* @Date: 2022-09-06 10:28:04
|
|
11
|
-
* @LastEditors:
|
|
12
|
-
* @LastEditTime:
|
|
11
|
+
* @LastEditors: flyingMonkey 760958607@qq.com
|
|
12
|
+
* @LastEditTime: 2025-09-03 16:43:05
|
|
13
13
|
*/
|
|
14
14
|
import request from "./request";
|
|
15
15
|
import { tradeStatusMap } from '@kmkf-fe-packages/kmkf-utils';
|
|
@@ -470,7 +470,15 @@ export var skxOrderDetail = function skxOrderDetail(data) {
|
|
|
470
470
|
infoLevel: 'warning'
|
|
471
471
|
});
|
|
472
472
|
};
|
|
473
|
-
|
|
473
|
+
// 斯凯奇退货订单详情
|
|
474
|
+
export var skxReturnOrderDetail = function skxReturnOrderDetail(data) {
|
|
475
|
+
return request({
|
|
476
|
+
url: '/qy/gdfw/order/skxReturnOrderDetail',
|
|
477
|
+
method: 'post',
|
|
478
|
+
data: data,
|
|
479
|
+
infoLevel: 'warning'
|
|
480
|
+
});
|
|
481
|
+
};
|
|
474
482
|
// 获取重复详情
|
|
475
483
|
export var getRepeatWorkOrderList = function getRepeatWorkOrderList(data) {
|
|
476
484
|
return request({
|
|
@@ -6,7 +6,6 @@ export declare const selectorSingleTemplateList: ((state: {
|
|
|
6
6
|
paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
|
|
7
7
|
singleWorkOrder: import("./types").SingleWorkOrderState;
|
|
8
8
|
logicFlow: import("../logicFlow/types").LogicFlowState;
|
|
9
|
-
flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
|
|
10
9
|
}) => import("./types").SelectI[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => import("./types").SelectI[], {
|
|
11
10
|
clearCache: () => void;
|
|
12
11
|
}> & {
|
|
@@ -20,7 +19,6 @@ export declare const selectDeleteCustomizeWorkOrderModalVisible: ((state: {
|
|
|
20
19
|
paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
|
|
21
20
|
singleWorkOrder: import("./types").SingleWorkOrderState;
|
|
22
21
|
logicFlow: import("../logicFlow/types").LogicFlowState;
|
|
23
|
-
flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
|
|
24
22
|
}) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => boolean, {
|
|
25
23
|
clearCache: () => void;
|
|
26
24
|
}> & {
|
|
@@ -34,7 +32,6 @@ export declare const selectorCurrentCustomizeRecord: ((state: {
|
|
|
34
32
|
paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
|
|
35
33
|
singleWorkOrder: import("./types").SingleWorkOrderState;
|
|
36
34
|
logicFlow: import("../logicFlow/types").LogicFlowState;
|
|
37
|
-
flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
|
|
38
35
|
}) => any) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => any, {
|
|
39
36
|
clearCache: () => void;
|
|
40
37
|
}> & {
|
|
@@ -48,7 +45,6 @@ export declare const selectorTemplateId: ((state: {
|
|
|
48
45
|
paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
|
|
49
46
|
singleWorkOrder: import("./types").SingleWorkOrderState;
|
|
50
47
|
logicFlow: import("../logicFlow/types").LogicFlowState;
|
|
51
|
-
flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
|
|
52
48
|
}) => string) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => string, {
|
|
53
49
|
clearCache: () => void;
|
|
54
50
|
}> & {
|
|
@@ -62,7 +58,6 @@ export declare const selectorFormModalVisible: ((state: {
|
|
|
62
58
|
paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
|
|
63
59
|
singleWorkOrder: import("./types").SingleWorkOrderState;
|
|
64
60
|
logicFlow: import("../logicFlow/types").LogicFlowState;
|
|
65
|
-
flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
|
|
66
61
|
}) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => boolean, {
|
|
67
62
|
clearCache: () => void;
|
|
68
63
|
}> & {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/kmkf-work-order-service-component",
|
|
3
|
-
"version": "2.0.79-beta.
|
|
3
|
+
"version": "2.0.79-beta.87",
|
|
4
4
|
"module": "dist/esm/index.js",
|
|
5
5
|
"typings": "dist/esm/index.d.ts",
|
|
6
6
|
"files": [
|
|
@@ -32,9 +32,9 @@
|
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
34
|
"@ant-design/icons": "^4.7.0",
|
|
35
|
-
"@kmkf-fe-packages/basic-components": "2.0.79-beta.
|
|
36
|
-
"@kmkf-fe-packages/kmkf-utils": "2.0.79-beta.
|
|
37
|
-
"@kmkf-fe-packages/services-components": "2.0.79-beta.
|
|
35
|
+
"@kmkf-fe-packages/basic-components": "2.0.79-beta.87",
|
|
36
|
+
"@kmkf-fe-packages/kmkf-utils": "2.0.79-beta.87",
|
|
37
|
+
"@kmkf-fe-packages/services-components": "2.0.79-beta.87",
|
|
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": "57ff0160e642956e47c7f730cbe835dad37a6ca5",
|
|
77
77
|
"gitHooks": {
|
|
78
78
|
"pre-commit": "lint-staged"
|
|
79
79
|
}
|