@kmkf-fe-packages/kmkf-work-order-service-component 0.26.1 → 0.26.2-rc.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/esm/FlowTemplateDetail/components/FormRender/index.js +1 -1
- package/dist/esm/FlowTemplateDetail/components/PreNodeRender/index.js +4 -1
- package/dist/esm/WorkOrder/components/PaymentWorkOrderList/components/PaymentWorkOrderCard/index.js +11 -3
- package/dist/esm/common/utils/tools.js +191 -80
- package/dist/esm/model/logicFlow/selector.d.ts +0 -3
- package/package.json +5 -5
|
@@ -84,7 +84,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
84
84
|
var logisticsMappingConfig = useMemo(function () {
|
|
85
85
|
return templateDetail.componentDtoList.filter(function (item) {
|
|
86
86
|
var _item$componentConfig;
|
|
87
|
-
return item.workOrderComponentType
|
|
87
|
+
return ['LOGISTICS_TRAJECTORY_MORE', 'LOGISTICS_INTERCEPTION_MORE'].includes(item.workOrderComponentType) && ((_item$componentConfig = item.componentConfig) === null || _item$componentConfig === void 0 ? void 0 : _item$componentConfig.isOpen);
|
|
88
88
|
});
|
|
89
89
|
}, [templateDetail]);
|
|
90
90
|
var finallyMappdingHideComponents = useRef(mappingConfig.hideComponents);
|
|
@@ -13,7 +13,10 @@ var PreNodeRender = function PreNodeRender(props) {
|
|
|
13
13
|
id: t.uniqueKey,
|
|
14
14
|
name: t.name,
|
|
15
15
|
componentConfig: t.componentConfig,
|
|
16
|
-
type: t.workOrderComponentType
|
|
16
|
+
type: t.workOrderComponentType,
|
|
17
|
+
effects: {
|
|
18
|
+
env: platform
|
|
19
|
+
}
|
|
17
20
|
});
|
|
18
21
|
// 淘宝端的买家昵称是需要亮灯展示的
|
|
19
22
|
if (platform === PlatForm.TB && ['ENTERPRISE_PAYMENT', 'BUYER_NICK_INPUT'].includes(t.workOrderComponentType)) {
|
package/dist/esm/WorkOrder/components/PaymentWorkOrderList/components/PaymentWorkOrderCard/index.js
CHANGED
|
@@ -125,7 +125,9 @@ function PaymentWorkOrderCard(props) {
|
|
|
125
125
|
accountNoMix = record.accountNoMix,
|
|
126
126
|
tidRepeatPaymentUks = record.tidRepeatPaymentUks,
|
|
127
127
|
remitTime = record.remitTime,
|
|
128
|
-
buyerOpenUid = record.buyerOpenUid
|
|
128
|
+
buyerOpenUid = record.buyerOpenUid,
|
|
129
|
+
alipayBillReceiptDetailId = record.alipayBillReceiptDetailId,
|
|
130
|
+
bizCode = record.bizCode;
|
|
129
131
|
var btnList = workPayStatusFuncMap[workPayStatus].map(function (id) {
|
|
130
132
|
return /*#__PURE__*/React.createElement("div", {
|
|
131
133
|
className: "orderItemOperate",
|
|
@@ -139,7 +141,7 @@ function PaymentWorkOrderCard(props) {
|
|
|
139
141
|
_useState2 = _slicedToArray(_useState, 2),
|
|
140
142
|
visible = _useState2[0],
|
|
141
143
|
setVisible = _useState2[1];
|
|
142
|
-
var _useState3 = useState(
|
|
144
|
+
var _useState3 = useState(''),
|
|
143
145
|
_useState4 = _slicedToArray(_useState3, 2),
|
|
144
146
|
msg = _useState4[0],
|
|
145
147
|
setMsg = _useState4[1];
|
|
@@ -320,7 +322,13 @@ function PaymentWorkOrderCard(props) {
|
|
|
320
322
|
label: "\u5DE5\u5355\u7F16\u53F7\uFF1A",
|
|
321
323
|
value: workOrderId || paymentOrderKey,
|
|
322
324
|
tidRepeatPaymentUks: tidRepeatPaymentUks
|
|
323
|
-
})
|
|
325
|
+
}), renderFormItem([{
|
|
326
|
+
label: '支付凭证编码:',
|
|
327
|
+
value: alipayBillReceiptDetailId
|
|
328
|
+
}, {
|
|
329
|
+
label: '业务订单号:',
|
|
330
|
+
value: bizCode
|
|
331
|
+
}])), /*#__PURE__*/React.createElement(Divider, {
|
|
324
332
|
dashed: true,
|
|
325
333
|
style: {
|
|
326
334
|
margin: '12px 0'
|
|
@@ -21,7 +21,7 @@ import { get, every, maxBy } from 'lodash';
|
|
|
21
21
|
import V from 'voca';
|
|
22
22
|
import { orderDetail, jstOrderDetail, bsOrderDetail, wlnOrderDetail, wdtOrderDetail } from "../../model/servers/api";
|
|
23
23
|
import moment from 'moment';
|
|
24
|
-
import { AddressData, ExpressData, orderBackFormValues, bsOrderBackFormValues, wlnOrderBackFormValues, wdtOrderBackFormValues, findLabelBySelectValue, request, isNull, bsOrderTransform, wlnOrderTransform, wdtOrderTransform, unTransField } from '@kmkf-fe-packages/kmkf-utils';
|
|
24
|
+
import { AddressData, ExpressData, ExpressInterceptData, orderBackFormValues, bsOrderBackFormValues, wlnOrderBackFormValues, wdtOrderBackFormValues, findLabelBySelectValue, request, isNull, bsOrderTransform, wlnOrderTransform, wdtOrderTransform, unTransField } from '@kmkf-fe-packages/kmkf-utils';
|
|
25
25
|
import { cloneDeep, isEqual, set } from 'lodash';
|
|
26
26
|
import Monitor from 'kmkf-monitor';
|
|
27
27
|
import { PlatForm } from "../../model/flowTemplateDetail/types";
|
|
@@ -30,6 +30,7 @@ import cache from "../cache";
|
|
|
30
30
|
// 淘宝商品组件信息处理
|
|
31
31
|
|
|
32
32
|
var ONLY_SHOW_COMPONENT_TYPE = ['RADIO', 'INPUT', 'TEXTAREA', 'CHECKBOX', 'SELECT', 'DATETIME', 'PICTURE', 'MULT_SELECT', 'ORDINARY_INVOICE'];
|
|
33
|
+
//表单提交单一字段映射
|
|
33
34
|
var workTypeKeys = {
|
|
34
35
|
SHOP_NAME_INPUT: 'shopName',
|
|
35
36
|
//店铺名称
|
|
@@ -49,7 +50,39 @@ var workTypeKeys = {
|
|
|
49
50
|
DATETIME: 'dateTime',
|
|
50
51
|
TEXTAREA: 'textarea',
|
|
51
52
|
SELECT: 'select',
|
|
52
|
-
SYSTEM_ORDER_NO: 'systemOrderNo'
|
|
53
|
+
SYSTEM_ORDER_NO: 'systemOrderNo',
|
|
54
|
+
NEW_PAYMENT_STATUS: 'newPaymentStatus',
|
|
55
|
+
BUSINESS_ORDER_NO: 'businessOrderNo',
|
|
56
|
+
PAYMENT_VOUCHER_CODE: 'paymentVoucherCode'
|
|
57
|
+
};
|
|
58
|
+
//表单获取组装数据单一字段映射
|
|
59
|
+
var updateWorkTypeKeys = {
|
|
60
|
+
BASIC_GRADE: 'basicGrade',
|
|
61
|
+
TRADE_ID_INPUT: 'tradeId',
|
|
62
|
+
SHOP_NAME_INPUT: 'shopName',
|
|
63
|
+
RECEIVER_NAME_INPUT: 'receiveName',
|
|
64
|
+
//收件人姓名
|
|
65
|
+
RECEIVER_MOBILE_INPUT: 'receiveMobile',
|
|
66
|
+
//收件人手机号
|
|
67
|
+
TRADE_CREATE_DATETIME: 'tradeCreateDateTime',
|
|
68
|
+
//下单时间
|
|
69
|
+
TRADE_PAYMENT_DATETIME: 'tradePaymentDateTime',
|
|
70
|
+
//付款时间
|
|
71
|
+
TRADE_DELIVERY_DATETIME: 'tradeDeliveryDateTime',
|
|
72
|
+
//发货时间
|
|
73
|
+
TRADE_CLOSING_DATETIME: 'tradeClosingDateTime',
|
|
74
|
+
//成交时间
|
|
75
|
+
ACTUAL_PAYMENT: 'actualPayment',
|
|
76
|
+
SYSTEM_ORDER_NO: 'systemOrderNo',
|
|
77
|
+
BS_SIGNING_TIME: 'bsSigningTime',
|
|
78
|
+
BS_SEND_TIME: 'bsSendTime',
|
|
79
|
+
BS_TRADE_PAYMENT_TIME: 'bsTradePaymentTime',
|
|
80
|
+
BS_NET_RECEIPTS: 'bsNetReceipts',
|
|
81
|
+
BS_PACKAGE_WEIGHT: 'bsPackageWeight',
|
|
82
|
+
BS_DEPOSIT: 'bsDeposit',
|
|
83
|
+
NEW_PAYMENT_STATUS: 'newPaymentStatus',
|
|
84
|
+
BUSINESS_ORDER_NO: 'businessOrderNo',
|
|
85
|
+
PAYMENT_VOUCHER_CODE: 'paymentVoucherCode'
|
|
53
86
|
};
|
|
54
87
|
var findNodeById = function findNodeById(tree) {
|
|
55
88
|
var actived = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
|
|
@@ -274,6 +307,53 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
|
|
|
274
307
|
content: get(nowData, "".concat(item.uniqueKey, ".interceptAddress[2]"), ''),
|
|
275
308
|
name: item.name
|
|
276
309
|
});
|
|
310
|
+
} else if (item.workOrderComponentType === 'LOGISTICS_INTERCEPTION_MORE') {
|
|
311
|
+
var logisticsInterceptionList = get(nowData, "".concat(item.uniqueKey), []);
|
|
312
|
+
contentVoList.push({
|
|
313
|
+
uniqueKey: "".concat(item.uniqueKey, "_logisticsInterceptList"),
|
|
314
|
+
content: logisticsInterceptionList,
|
|
315
|
+
name: item.name
|
|
316
|
+
}, {
|
|
317
|
+
uniqueKey: "".concat(item.uniqueKey, "_logisticsInterceptCompanyList"),
|
|
318
|
+
content: logisticsInterceptionList.filter(function (t) {
|
|
319
|
+
return t.interceptCompany;
|
|
320
|
+
}).map(function (t) {
|
|
321
|
+
return t.interceptCompany + '';
|
|
322
|
+
}),
|
|
323
|
+
name: item.name
|
|
324
|
+
}, {
|
|
325
|
+
uniqueKey: "".concat(item.uniqueKey, "_logisticsInterceptCodeList"),
|
|
326
|
+
content: logisticsInterceptionList.filter(function (t) {
|
|
327
|
+
return t.interceptCode;
|
|
328
|
+
}).map(function (t) {
|
|
329
|
+
return t.interceptCode + '';
|
|
330
|
+
}),
|
|
331
|
+
name: item.name
|
|
332
|
+
}, {
|
|
333
|
+
uniqueKey: "".concat(item.uniqueKey, "_logisticsInterceptTypeList"),
|
|
334
|
+
content: logisticsInterceptionList.filter(function (t) {
|
|
335
|
+
return t.interceptType;
|
|
336
|
+
}).map(function (t) {
|
|
337
|
+
return t.interceptType + '';
|
|
338
|
+
}),
|
|
339
|
+
name: item.name
|
|
340
|
+
}, {
|
|
341
|
+
uniqueKey: "".concat(item.uniqueKey, "_logisticsInterceptStatusList"),
|
|
342
|
+
content: logisticsInterceptionList.filter(function (t) {
|
|
343
|
+
return t.interceptLogisticsStatus;
|
|
344
|
+
}).map(function (t) {
|
|
345
|
+
return t.interceptLogisticsStatus + '';
|
|
346
|
+
}),
|
|
347
|
+
name: item.name
|
|
348
|
+
}, {
|
|
349
|
+
uniqueKey: "".concat(item.uniqueKey, "_logisticsInterceptSnapshotList"),
|
|
350
|
+
content: logisticsInterceptionList.filter(function (t) {
|
|
351
|
+
return t.interceptLogisticsSnapshot;
|
|
352
|
+
}).map(function (t) {
|
|
353
|
+
return t.interceptLogisticsSnapshot + '';
|
|
354
|
+
}),
|
|
355
|
+
name: item.name
|
|
356
|
+
});
|
|
277
357
|
} else if (item.workOrderComponentType === 'PICTURE') {
|
|
278
358
|
var _value$map;
|
|
279
359
|
var host = cache.getHost() || window.location.origin;
|
|
@@ -1082,6 +1162,9 @@ var transDataSource = function transDataSource(templateColumns) {
|
|
|
1082
1162
|
var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'edit';
|
|
1083
1163
|
return function (item) {
|
|
1084
1164
|
return templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.reduce(function (cur, nex) {
|
|
1165
|
+
if (updateWorkTypeKeys[nex.workOrderComponentType]) {
|
|
1166
|
+
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_").concat(updateWorkTypeKeys[nex.workOrderComponentType])]));
|
|
1167
|
+
}
|
|
1085
1168
|
//如果是初始化创建赋初始值 编辑不赋值
|
|
1086
1169
|
var config = type === 'init' ? nex.componentConfig : {};
|
|
1087
1170
|
if (nex.workOrderComponentType === 'RADIO') {
|
|
@@ -1098,8 +1181,6 @@ var transDataSource = function transDataSource(templateColumns) {
|
|
|
1098
1181
|
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_textarea")] || (config === null || config === void 0 ? void 0 : config.textarea)));
|
|
1099
1182
|
} else if (nex.workOrderComponentType === 'SELECT') {
|
|
1100
1183
|
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_select")] || (config === null || config === void 0 ? void 0 : config.select)));
|
|
1101
|
-
} else if (nex.workOrderComponentType === 'BASIC_GRADE') {
|
|
1102
|
-
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_basicGrade")]));
|
|
1103
1184
|
} else if (nex.workOrderComponentType === 'RATE') {
|
|
1104
1185
|
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_rate")], [])));
|
|
1105
1186
|
} else if (nex.workOrderComponentType === 'FILE') {
|
|
@@ -1121,35 +1202,17 @@ var transDataSource = function transDataSource(templateColumns) {
|
|
|
1121
1202
|
postingReceiverName: item.jsonMap["".concat(nex.uniqueKey, "_postingReceiverName")],
|
|
1122
1203
|
postingReceiverMobile: item.jsonMap["".concat(nex.uniqueKey, "_postingReceiverMobile")]
|
|
1123
1204
|
}));
|
|
1124
|
-
} else if (nex.workOrderComponentType === 'TRADE_ID_INPUT') {
|
|
1125
|
-
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_tradeId")]));
|
|
1126
1205
|
} else if (nex.workOrderComponentType === 'BUYER_NICK_INPUT') {
|
|
1127
1206
|
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
|
|
1128
1207
|
buyerNick: item.jsonMap["".concat(nex.uniqueKey, "_buyerNick")],
|
|
1129
1208
|
buyerOpenUid: item.jsonMap["".concat(nex.uniqueKey, "_buyerOpenUid")]
|
|
1130
1209
|
}));
|
|
1131
|
-
} else if (nex.workOrderComponentType === 'SHOP_NAME_INPUT') {
|
|
1132
|
-
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_shopName")]));
|
|
1133
|
-
} else if (nex.workOrderComponentType === 'RECEIVER_NAME_INPUT') {
|
|
1134
|
-
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_receiveName")]));
|
|
1135
|
-
} else if (nex.workOrderComponentType === 'RECEIVER_MOBILE_INPUT') {
|
|
1136
|
-
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_receiveMobile")]));
|
|
1137
|
-
} else if (nex.workOrderComponentType === 'TRADE_CREATE_DATETIME') {
|
|
1138
|
-
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_tradeCreateDateTime")]));
|
|
1139
|
-
} else if (nex.workOrderComponentType === 'TRADE_PAYMENT_DATETIME') {
|
|
1140
|
-
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_tradePaymentDateTime")]));
|
|
1141
|
-
} else if (nex.workOrderComponentType === 'TRADE_DELIVERY_DATETIME') {
|
|
1142
|
-
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_tradeDeliveryDateTime")]));
|
|
1143
|
-
} else if (nex.workOrderComponentType === 'TRADE_CLOSING_DATETIME') {
|
|
1144
|
-
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_tradeClosingDateTime")]));
|
|
1145
|
-
} else if (nex.workOrderComponentType === 'ACTUAL_PAYMENT') {
|
|
1146
|
-
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_actualPayment")]));
|
|
1147
1210
|
} else if (nex.workOrderComponentType === 'ALI_PAY_INPUT') {
|
|
1148
|
-
var
|
|
1149
|
-
return _objectSpread(_objectSpread({}, cur), {}, (
|
|
1211
|
+
var _objectSpread12;
|
|
1212
|
+
return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread12 = {}, _defineProperty(_objectSpread12, "".concat(nex.uniqueKey), {
|
|
1150
1213
|
name: item.jsonMap["".concat(nex.uniqueKey, "_alipayName")],
|
|
1151
1214
|
user: item.jsonMap["".concat(nex.uniqueKey, "_alipayAccount")]
|
|
1152
|
-
}), _defineProperty(
|
|
1215
|
+
}), _defineProperty(_objectSpread12, "".concat(nex.uniqueKey, "_alipayName"), item.jsonMap["".concat(nex.uniqueKey, "_alipayName")]), _defineProperty(_objectSpread12, "".concat(nex.uniqueKey, "_alipayAccount"), item.jsonMap["".concat(nex.uniqueKey, "_alipayAccount")]), _objectSpread12));
|
|
1153
1216
|
} else if (nex.workOrderComponentType === 'CHECKBOX') {
|
|
1154
1217
|
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
|
|
1155
1218
|
value: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_checkbox")], '') || (config === null || config === void 0 ? void 0 : config.checkbox) || [],
|
|
@@ -1184,35 +1247,35 @@ var transDataSource = function transDataSource(templateColumns) {
|
|
|
1184
1247
|
detail: item.jsonMap["".concat(nex.uniqueKey, "_address")]
|
|
1185
1248
|
}));
|
|
1186
1249
|
} else if (nex.workOrderComponentType === 'EXPRESS_LOGISTICS_SELECT') {
|
|
1187
|
-
var
|
|
1188
|
-
return _objectSpread(_objectSpread({}, cur), {}, (
|
|
1250
|
+
var _objectSpread20;
|
|
1251
|
+
return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread20 = {}, _defineProperty(_objectSpread20, "".concat(nex.uniqueKey), {
|
|
1189
1252
|
company: item.jsonMap["".concat(nex.uniqueKey, "_expressLogisticsCompany")],
|
|
1190
1253
|
order: item.jsonMap["".concat(nex.uniqueKey, "_expressLogisticsCode")]
|
|
1191
|
-
}), _defineProperty(
|
|
1254
|
+
}), _defineProperty(_objectSpread20, "".concat(nex.uniqueKey, "_expressLogisticsCompany"), item.jsonMap["".concat(nex.uniqueKey, "_expressLogisticsCompany")]), _defineProperty(_objectSpread20, "".concat(nex.uniqueKey, "_expressLogisticsCode"), item.jsonMap["".concat(nex.uniqueKey, "_expressLogisticsCode")]), _objectSpread20));
|
|
1192
1255
|
} else if (nex.workOrderComponentType === 'RETURN_LOGISTICS_SELECT') {
|
|
1193
|
-
var
|
|
1194
|
-
return _objectSpread(_objectSpread({}, cur), {}, (
|
|
1256
|
+
var _objectSpread21;
|
|
1257
|
+
return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread21 = {}, _defineProperty(_objectSpread21, "".concat(nex.uniqueKey), {
|
|
1195
1258
|
company: item.jsonMap["".concat(nex.uniqueKey, "_returnLogisticsCompany")],
|
|
1196
1259
|
order: item.jsonMap["".concat(nex.uniqueKey, "_returnLogisticsCode")]
|
|
1197
|
-
}), _defineProperty(
|
|
1260
|
+
}), _defineProperty(_objectSpread21, "".concat(nex.uniqueKey, "_returnLogisticsCompany"), item.jsonMap["".concat(nex.uniqueKey, "_returnLogisticsCompany")]), _defineProperty(_objectSpread21, "".concat(nex.uniqueKey, "_returnLogisticsCode"), item.jsonMap["".concat(nex.uniqueKey, "_returnLogisticsCode")]), _objectSpread21));
|
|
1198
1261
|
} else if (nex.workOrderComponentType === 'REMARK_INPUT') {
|
|
1199
1262
|
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
|
|
1200
1263
|
flag: item.jsonMap["".concat(nex.uniqueKey, "_flag")] ? +item.jsonMap["".concat(nex.uniqueKey, "_flag")] : config !== null && config !== void 0 && config.flag ? +(config === null || config === void 0 ? void 0 : config.flag) : '',
|
|
1201
1264
|
remark: item.jsonMap["".concat(nex.uniqueKey, "_remark")] || (config === null || config === void 0 ? void 0 : config.remark) || ''
|
|
1202
1265
|
}));
|
|
1203
1266
|
} else if (nex.workOrderComponentType === 'STATUS') {
|
|
1204
|
-
var
|
|
1205
|
-
return _objectSpread(_objectSpread({}, cur), {}, (
|
|
1267
|
+
var _objectSpread23;
|
|
1268
|
+
return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread23 = {}, _defineProperty(_objectSpread23, "".concat(nex.uniqueKey), {
|
|
1206
1269
|
status: item.jsonMap["".concat(nex.uniqueKey, "_status")] || (config === null || config === void 0 ? void 0 : config.status),
|
|
1207
1270
|
customerService: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_customerService")], item.jsonMap["".concat(nex.uniqueKey, "_customerService")])
|
|
1208
|
-
}), _defineProperty(
|
|
1271
|
+
}), _defineProperty(_objectSpread23, "".concat(nex.uniqueKey, "_processTime"), item.jsonMap['processTime']), _defineProperty(_objectSpread23, "".concat(nex.uniqueKey, "_lastProcessingTime"), item.jsonMap['lastProcessingTime']), _objectSpread23));
|
|
1209
1272
|
} else if (nex.workOrderComponentType === 'ORDINARY_INVOICE') {
|
|
1210
|
-
var
|
|
1211
|
-
return _objectSpread(_objectSpread({}, cur), {}, (
|
|
1273
|
+
var _objectSpread24;
|
|
1274
|
+
return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread24 = {}, _defineProperty(_objectSpread24, "".concat(nex.uniqueKey), {
|
|
1212
1275
|
ordinaryMoney: item.jsonMap["".concat(nex.uniqueKey, "_ordinaryMoney")],
|
|
1213
1276
|
ordinarySerial: item.jsonMap["".concat(nex.uniqueKey, "_ordinarySerial")],
|
|
1214
1277
|
ordinaryTaitou: item.jsonMap["".concat(nex.uniqueKey, "_ordinaryTaitou")]
|
|
1215
|
-
}), _defineProperty(
|
|
1278
|
+
}), _defineProperty(_objectSpread24, "".concat(nex.uniqueKey, "_ordinaryMoney"), item.jsonMap["".concat(nex.uniqueKey, "_ordinaryMoney")] ? Number(item.jsonMap["".concat(nex.uniqueKey, "_ordinaryMoney")]).toFixed(2) : null), _defineProperty(_objectSpread24, "".concat(nex.uniqueKey, "_ordinarySerial"), item.jsonMap["".concat(nex.uniqueKey, "_ordinarySerial")]), _defineProperty(_objectSpread24, "".concat(nex.uniqueKey, "_ordinaryTaitou"), item.jsonMap["".concat(nex.uniqueKey, "_ordinaryTaitou")]), _objectSpread24));
|
|
1216
1279
|
} else if (nex.workOrderComponentType === 'LOGISTICS_INTERCEPTION') {
|
|
1217
1280
|
var _address3 = [transTextToNumber(item.jsonMap["".concat(nex.uniqueKey, "_interceptProvince")]), transTextToNumber(item.jsonMap["".concat(nex.uniqueKey, "_interceptCity")])];
|
|
1218
1281
|
//兼容地址是只有省市的
|
|
@@ -1234,6 +1297,8 @@ var transDataSource = function transDataSource(templateColumns) {
|
|
|
1234
1297
|
interceptLogisticsStatusOther: item.jsonMap["".concat(nex.uniqueKey, "_interceptLogisticsStatusOther")],
|
|
1235
1298
|
interceptLogisticsSnapshot: item.jsonMap["".concat(nex.uniqueKey, "_interceptLogisticsSnapshot")]
|
|
1236
1299
|
}));
|
|
1300
|
+
} else if (nex.workOrderComponentType === 'LOGISTICS_INTERCEPTION_MORE') {
|
|
1301
|
+
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_logisticsInterceptList")], [{}])));
|
|
1237
1302
|
} else if (nex.workOrderComponentType === 'LOGISTICS_TRAJECTORY') {
|
|
1238
1303
|
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
|
|
1239
1304
|
trajectoryCompany: item.jsonMap["".concat(nex.uniqueKey, "_trajectoryCompany")],
|
|
@@ -1257,8 +1322,8 @@ var transDataSource = function transDataSource(templateColumns) {
|
|
|
1257
1322
|
});
|
|
1258
1323
|
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), _itemList));
|
|
1259
1324
|
} else if (nex.workOrderComponentType === 'ENTERPRISE_PAYMENT') {
|
|
1260
|
-
var
|
|
1261
|
-
return _objectSpread(_objectSpread({}, cur), {}, (
|
|
1325
|
+
var _objectSpread33;
|
|
1326
|
+
return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread33 = {}, _defineProperty(_objectSpread33, "".concat(nex.uniqueKey), {
|
|
1262
1327
|
enterprisePaymentAlipayNick: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick")],
|
|
1263
1328
|
enterprisePaymentAlipayNo: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo")],
|
|
1264
1329
|
enterprisePaymentBuyerNick: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick")],
|
|
@@ -1266,9 +1331,7 @@ var transDataSource = function transDataSource(templateColumns) {
|
|
|
1266
1331
|
enterprisePaymentRefundFee: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentRefundFee")],
|
|
1267
1332
|
enterprisePaymentStatus: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentStatus")],
|
|
1268
1333
|
enterprisePaymentTid: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentTid")]
|
|
1269
|
-
}), _defineProperty(
|
|
1270
|
-
} else if (nex.workOrderComponentType === 'SYSTEM_ORDER_NO') {
|
|
1271
|
-
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_systemOrderNo")]));
|
|
1334
|
+
}), _defineProperty(_objectSpread33, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick")]), _defineProperty(_objectSpread33, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo")]), _defineProperty(_objectSpread33, "".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick")]), _defineProperty(_objectSpread33, "".concat(nex.uniqueKey, "_enterprisePaymentRefundFee"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentRefundFee")]), _defineProperty(_objectSpread33, "".concat(nex.uniqueKey, "_enterprisePaymentStatus"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentStatus")]), _defineProperty(_objectSpread33, "".concat(nex.uniqueKey, "_enterprisePaymentTime"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentTime")]), _defineProperty(_objectSpread33, "".concat(nex.uniqueKey, "_enterprisePaymentTid"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentTid")]), _objectSpread33));
|
|
1272
1335
|
} else if (nex.workOrderComponentType === 'JST_LOGISTICS') {
|
|
1273
1336
|
var _itemList2 = jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_jstItemList")], [{
|
|
1274
1337
|
logisticsCompany: null,
|
|
@@ -1297,23 +1360,11 @@ var transDataSource = function transDataSource(templateColumns) {
|
|
|
1297
1360
|
sendName: '',
|
|
1298
1361
|
sendId: ''
|
|
1299
1362
|
}]));
|
|
1300
|
-
} else if (nex.workOrderComponentType === 'BS_SIGNING_TIME') {
|
|
1301
|
-
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_bsSigningTime")]));
|
|
1302
|
-
} else if (nex.workOrderComponentType === 'BS_SEND_TIME') {
|
|
1303
|
-
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_bsSendTime")]));
|
|
1304
|
-
} else if (nex.workOrderComponentType === 'BS_TRADE_PAYMENT_TIME') {
|
|
1305
|
-
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_bsTradePaymentTime")]));
|
|
1306
|
-
} else if (nex.workOrderComponentType === 'BS_NET_RECEIPTS') {
|
|
1307
|
-
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_bsNetReceipts")]));
|
|
1308
|
-
} else if (nex.workOrderComponentType === 'BS_PACKAGE_WEIGHT') {
|
|
1309
|
-
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_bsPackageWeight")]));
|
|
1310
1363
|
} else if (nex.workOrderComponentType === 'BS_MEMO') {
|
|
1311
1364
|
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
|
|
1312
1365
|
remark: item.jsonMap["".concat(nex.uniqueKey, "_bsRemark")],
|
|
1313
1366
|
flag: item.jsonMap["".concat(nex.uniqueKey, "_bsFlag")]
|
|
1314
1367
|
}));
|
|
1315
|
-
} else if (nex.workOrderComponentType === 'BS_DEPOSIT') {
|
|
1316
|
-
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_bsDeposit")]));
|
|
1317
1368
|
} else if (nex.workOrderComponentType === 'REISSUE_LOGISTICS') {
|
|
1318
1369
|
var _itemList6 = jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_reissueLogisticsList")], [{
|
|
1319
1370
|
logisticsCompany: null,
|
|
@@ -1570,7 +1621,7 @@ export var calcWorkOrderList = function calcWorkOrderList(source, templateColumn
|
|
|
1570
1621
|
//订单返填
|
|
1571
1622
|
export var orderBack = /*#__PURE__*/function () {
|
|
1572
1623
|
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
|
|
1573
|
-
var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, JOIN_SHOP, hasBs, hasWdt, hasWln, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, _data$value, _jstOrder$value, _jstOrder$value$data, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsOrders$orders, _wlnOrders$orders, promise, hasJst, _yield$Promise$allSet, _yield$Promise$allSet2, data, jstOrder, bsOrder, wlnOrder, wdtOrder, orderInfo, jstInfo, bsOrders, wlnOrders, wdtOrders, bsInfo, wlnInfo, wdtInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, values, _templateDetail$compo, paymentUniqueKey, cacheOrderInfo,
|
|
1624
|
+
var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, JOIN_SHOP, hasBs, hasWdt, hasWln, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, _data$value, _jstOrder$value, _jstOrder$value$data, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsOrders$orders, _wlnOrders$orders, promise, hasJst, _yield$Promise$allSet, _yield$Promise$allSet2, data, jstOrder, bsOrder, wlnOrder, wdtOrder, orderInfo, jstInfo, bsOrders, wlnOrders, wdtOrders, bsInfo, wlnInfo, wdtInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, values, _templateDetail$compo, paymentUniqueKey, cacheOrderInfo, _objectSpread55, _cacheOrderInfo;
|
|
1574
1625
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
1575
1626
|
while (1) switch (_context.prev = _context.next) {
|
|
1576
1627
|
case 0:
|
|
@@ -1804,7 +1855,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
1804
1855
|
sessionStorage.setItem('cacheOmsOrderInfo', JSON.stringify(_objectSpread(_objectSpread({}, cacheOrderInfo), {}, _defineProperty({}, "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId), _defineProperty({}, plat === null || plat === void 0 ? void 0 : plat.subOrderNo, _objectSpread(_objectSpread({}, formValue), values))))));
|
|
1805
1856
|
} else {
|
|
1806
1857
|
_cacheOrderInfo = JSON.parse(sessionStorage.getItem('cacheOrderInfo') || '{}');
|
|
1807
|
-
sessionStorage.setItem('cacheOrderInfo', JSON.stringify(_objectSpread(_objectSpread({}, _cacheOrderInfo), {}, (
|
|
1858
|
+
sessionStorage.setItem('cacheOrderInfo', JSON.stringify(_objectSpread(_objectSpread({}, _cacheOrderInfo), {}, (_objectSpread55 = {}, _defineProperty(_objectSpread55, order_no, values), _defineProperty(_objectSpread55, "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId), _defineProperty({}, order_no, _objectSpread(_objectSpread({}, formValue), values))), _objectSpread55))));
|
|
1808
1859
|
}
|
|
1809
1860
|
}
|
|
1810
1861
|
// console.log('orderback', values);
|
|
@@ -2185,7 +2236,7 @@ export var bsSystemOrderBackValues = function bsSystemOrderBackValues(_ref6) {
|
|
|
2185
2236
|
//如果没有选择的值不返填,会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
|
|
2186
2237
|
if (!(value !== null && value !== void 0 && value.selectedRows)) return;
|
|
2187
2238
|
var bsGoodsComponent = (_templateList$compone = templateList.componentDtoList) === null || _templateList$compone === void 0 ? void 0 : _templateList$compone.filter(function (item) {
|
|
2188
|
-
return ['BS_GOODS', 'BS_DELIVERY_NO', 'BS_SEND_GOOD', 'BS_LOGISTICS', 'LOGISTICS_TRAJECTORY_MORE'].includes(item.workOrderComponentType);
|
|
2239
|
+
return ['BS_GOODS', 'BS_DELIVERY_NO', 'BS_SEND_GOOD', 'BS_LOGISTICS', 'LOGISTICS_TRAJECTORY_MORE', 'LOGISTICS_INTERCEPTION_MORE'].includes(item.workOrderComponentType);
|
|
2189
2240
|
});
|
|
2190
2241
|
if (!(bsGoodsComponent !== null && bsGoodsComponent !== void 0 && bsGoodsComponent.length)) return;
|
|
2191
2242
|
var bsGoodsValue = form.getFieldValue(bsGoodsComponent[0].uniqueKey);
|
|
@@ -2196,7 +2247,6 @@ export var bsSystemOrderBackValues = function bsSystemOrderBackValues(_ref6) {
|
|
|
2196
2247
|
var values = bsOrderBackFormValues(orderInfo, {
|
|
2197
2248
|
componentDtoList: bsGoodsComponent
|
|
2198
2249
|
});
|
|
2199
|
-
console.log('bsSystemOrderBackValues', values);
|
|
2200
2250
|
form.setFieldsValue(values);
|
|
2201
2251
|
};
|
|
2202
2252
|
|
|
@@ -2335,31 +2385,92 @@ export var setLogisticsInfo = function setLogisticsInfo(_ref9) {
|
|
|
2335
2385
|
codeUniqueKey = _componentConfig$logi.codeUniqueKey,
|
|
2336
2386
|
codeType = _componentConfig$logi.codeType;
|
|
2337
2387
|
if (companyUniqueKey === uniqueKey && workOrderComponentType === companyType) {
|
|
2338
|
-
if (
|
|
2339
|
-
|
|
2340
|
-
|
|
2341
|
-
|
|
2342
|
-
|
|
2343
|
-
|
|
2344
|
-
|
|
2345
|
-
|
|
2346
|
-
|
|
2347
|
-
|
|
2348
|
-
|
|
2349
|
-
|
|
2350
|
-
|
|
2351
|
-
|
|
2352
|
-
|
|
2353
|
-
|
|
2354
|
-
|
|
2355
|
-
|
|
2388
|
+
if (next.workOrderComponentType === 'LOGISTICS_TRAJECTORY_MORE') {
|
|
2389
|
+
if (companyType === 'INPUT') {
|
|
2390
|
+
prv[next.uniqueKey] = [_objectSpread(_objectSpread({}, logisticsValues === null || logisticsValues === void 0 ? void 0 : logisticsValues[0]), {}, {
|
|
2391
|
+
trajectoryCompany: ExpressData.getInstance().getExpressCodeByName(value, true)
|
|
2392
|
+
})];
|
|
2393
|
+
} else if (companyType === 'EXPRESS_LOGISTICS_SELECT') {
|
|
2394
|
+
prv[next.uniqueKey] = [_objectSpread(_objectSpread({}, logisticsValues === null || logisticsValues === void 0 ? void 0 : logisticsValues[0]), {}, {
|
|
2395
|
+
trajectoryCompany: value.company,
|
|
2396
|
+
trajectoryCode: value.order
|
|
2397
|
+
})];
|
|
2398
|
+
} else if (companyType === 'BS_LOGISTICS') {
|
|
2399
|
+
prv[next.uniqueKey] = value.map(function (item) {
|
|
2400
|
+
return {
|
|
2401
|
+
trajectoryCompany: item.logisticsCompany,
|
|
2402
|
+
trajectoryCode: item.logisticsCode,
|
|
2403
|
+
trajectorySnapshot: '',
|
|
2404
|
+
trajectoryPhone: ''
|
|
2405
|
+
};
|
|
2406
|
+
});
|
|
2407
|
+
}
|
|
2408
|
+
} else if (next.workOrderComponentType === 'LOGISTICS_INTERCEPTION_MORE') {
|
|
2409
|
+
var expressInterceptData = ExpressInterceptData.getInstance().getExpressData();
|
|
2410
|
+
if (companyType === 'INPUT') {
|
|
2411
|
+
var interceptCompany = expressInterceptData.find(function (item) {
|
|
2412
|
+
return item.value === value;
|
|
2413
|
+
});
|
|
2414
|
+
var returnValue = ((interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.interceptionTypeList) || []).find(function (item) {
|
|
2415
|
+
var _item$config;
|
|
2416
|
+
return item === null || item === void 0 ? void 0 : (_item$config = item.config) === null || _item$config === void 0 ? void 0 : _item$config.isDefault;
|
|
2417
|
+
});
|
|
2418
|
+
prv[next.uniqueKey] = [_objectSpread(_objectSpread({}, logisticsValues === null || logisticsValues === void 0 ? void 0 : logisticsValues[0]), {}, {
|
|
2419
|
+
interceptCompany: ExpressData.getInstance().getExpressCodeByName(value, false),
|
|
2420
|
+
interceptType: returnValue === null || returnValue === void 0 ? void 0 : returnValue.value
|
|
2421
|
+
})];
|
|
2422
|
+
} else if (companyType === 'EXPRESS_LOGISTICS_SELECT') {
|
|
2423
|
+
var _interceptCompany = expressInterceptData.find(function (item) {
|
|
2424
|
+
return item.value === value;
|
|
2425
|
+
});
|
|
2426
|
+
var _returnValue = ((_interceptCompany === null || _interceptCompany === void 0 ? void 0 : _interceptCompany.interceptionTypeList) || []).find(function (item) {
|
|
2427
|
+
var _item$config2;
|
|
2428
|
+
return item === null || item === void 0 ? void 0 : (_item$config2 = item.config) === null || _item$config2 === void 0 ? void 0 : _item$config2.isDefault;
|
|
2429
|
+
});
|
|
2430
|
+
prv[next.uniqueKey] = [_objectSpread(_objectSpread({}, logisticsValues === null || logisticsValues === void 0 ? void 0 : logisticsValues[0]), {}, {
|
|
2431
|
+
interceptCompany: value.company,
|
|
2432
|
+
interceptCode: value.order,
|
|
2433
|
+
interceptType: _returnValue === null || _returnValue === void 0 ? void 0 : _returnValue.value
|
|
2434
|
+
})];
|
|
2435
|
+
} else if (companyType === 'BS_LOGISTICS') {
|
|
2436
|
+
prv[next.uniqueKey] = value.map(function (item) {
|
|
2437
|
+
var interceptCompany = expressInterceptData.find(function (t) {
|
|
2438
|
+
return item.logisticsCompany === t.value;
|
|
2439
|
+
});
|
|
2440
|
+
var returnValue = ((interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.interceptionTypeList) || []).find(function (t) {
|
|
2441
|
+
var _t$config;
|
|
2442
|
+
return t === null || t === void 0 ? void 0 : (_t$config = t.config) === null || _t$config === void 0 ? void 0 : _t$config.isDefault;
|
|
2443
|
+
});
|
|
2444
|
+
return {
|
|
2445
|
+
interceptCompany: item.logisticsCompany,
|
|
2446
|
+
interceptCode: item.logisticsCode,
|
|
2447
|
+
interceptType: returnValue === null || returnValue === void 0 ? void 0 : returnValue.value,
|
|
2448
|
+
interceptSenderMobile: undefined,
|
|
2449
|
+
interceptAddress: [],
|
|
2450
|
+
interceptDetail: undefined,
|
|
2451
|
+
interceptReceiverName: undefined,
|
|
2452
|
+
interceptReceiverMobile: undefined,
|
|
2453
|
+
interceptStatus: undefined,
|
|
2454
|
+
interceptOther: undefined,
|
|
2455
|
+
interceptLogisticsSnapshot: undefined
|
|
2456
|
+
};
|
|
2457
|
+
});
|
|
2458
|
+
}
|
|
2356
2459
|
}
|
|
2357
2460
|
}
|
|
2358
2461
|
if (codeUniqueKey === uniqueKey && workOrderComponentType === codeType) {
|
|
2359
|
-
if (
|
|
2360
|
-
|
|
2361
|
-
|
|
2362
|
-
|
|
2462
|
+
if (next.workOrderComponentType === 'LOGISTICS_TRAJECTORY_MORE') {
|
|
2463
|
+
if (companyType === 'INPUT') {
|
|
2464
|
+
prv[next.uniqueKey] = [_objectSpread(_objectSpread({}, logisticsValues === null || logisticsValues === void 0 ? void 0 : logisticsValues[0]), {}, {
|
|
2465
|
+
trajectoryCode: value
|
|
2466
|
+
})];
|
|
2467
|
+
}
|
|
2468
|
+
} else if (next.workOrderComponentType === 'LOGISTICS_INTERCEPTION_MORE') {
|
|
2469
|
+
if (companyType === 'INPUT') {
|
|
2470
|
+
prv[next.uniqueKey] = [_objectSpread(_objectSpread({}, logisticsValues === null || logisticsValues === void 0 ? void 0 : logisticsValues[0]), {}, {
|
|
2471
|
+
interceptCode: value
|
|
2472
|
+
})];
|
|
2473
|
+
}
|
|
2363
2474
|
}
|
|
2364
2475
|
}
|
|
2365
2476
|
return prv;
|
|
@@ -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
|
}> & {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/kmkf-work-order-service-component",
|
|
3
|
-
"version": "0.26.
|
|
3
|
+
"version": "0.26.2-rc.0",
|
|
4
4
|
"module": "dist/esm/index.js",
|
|
5
5
|
"typings": "dist/esm/index.d.ts",
|
|
6
6
|
"files": [
|
|
@@ -32,9 +32,9 @@
|
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
34
|
"@ant-design/icons": "^4.7.0",
|
|
35
|
-
"@kmkf-fe-packages/basic-components": "^0.26.
|
|
36
|
-
"@kmkf-fe-packages/kmkf-utils": "^0.26.
|
|
37
|
-
"@kmkf-fe-packages/services-components": "^0.26.
|
|
35
|
+
"@kmkf-fe-packages/basic-components": "^0.26.2-rc.0",
|
|
36
|
+
"@kmkf-fe-packages/kmkf-utils": "^0.26.2-rc.0",
|
|
37
|
+
"@kmkf-fe-packages/services-components": "^0.26.2-rc.0",
|
|
38
38
|
"@reduxjs/toolkit": "^1.8.5",
|
|
39
39
|
"ahooks": "^3.7.4",
|
|
40
40
|
"copy-to-clipboard": "^3.3.3",
|
|
@@ -73,7 +73,7 @@
|
|
|
73
73
|
"publishConfig": {
|
|
74
74
|
"access": "public"
|
|
75
75
|
},
|
|
76
|
-
"gitHead": "
|
|
76
|
+
"gitHead": "3302e318b34c0049dbfba98c3b0d3097c2a5d30b",
|
|
77
77
|
"gitHooks": {
|
|
78
78
|
"pre-commit": "lint-staged"
|
|
79
79
|
}
|