@kmkf-fe-packages/kmkf-utils 2.3.0-rc.4 → 2.3.5
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/baseAddressData/baseAddressData.d.ts +1 -1
- package/dist/esm/baseAddressData/baseAddressData.js +19 -22
- package/dist/esm/baseAddressData/constants/jkyAddressData.d.ts +12 -0
- package/dist/esm/baseAddressData/constants/jkyAddressData.js +83 -0
- package/dist/esm/baseAddressData/constants/jstAddressData.d.ts +13 -0
- package/dist/esm/baseAddressData/constants/jstAddressData.js +83 -0
- package/dist/esm/baseAddressData/index.d.ts +2 -0
- package/dist/esm/baseAddressData/index.js +3 -1
- package/dist/esm/constants/constant.d.ts +5 -1
- package/dist/esm/constants/constant.js +140 -136
- package/dist/esm/constants/msgTypeMapping.js +2 -1
- package/dist/esm/hooks/index.d.ts +1 -0
- package/dist/esm/hooks/index.js +2 -1
- package/dist/esm/hooks/useWindowSize.d.ts +4 -0
- package/dist/esm/hooks/useWindowSize.js +30 -0
- package/dist/esm/servers/JKY/index.d.ts +2 -0
- package/dist/esm/servers/JKY/index.js +2 -0
- package/dist/esm/servers/JKY/logisticsData.d.ts +6 -0
- package/dist/esm/servers/JKY/logisticsData.js +39 -0
- package/dist/esm/servers/JKY/warehouseData.d.ts +7 -0
- package/dist/esm/servers/JKY/warehouseData.js +41 -0
- package/dist/esm/servers/JST/orderDetailWrap.js +10 -1
- package/dist/esm/servers/JST/warehouseData.d.ts +1 -0
- package/dist/esm/servers/JST/warehouseData.js +2 -1
- package/dist/esm/servers/JY/index.d.ts +2 -0
- package/dist/esm/servers/JY/index.js +2 -0
- package/dist/esm/servers/JY/logisticsData.d.ts +6 -0
- package/dist/esm/servers/JY/logisticsData.js +43 -0
- package/dist/esm/servers/JY/warehouseData.d.ts +6 -0
- package/dist/esm/servers/JY/warehouseData.js +39 -0
- package/dist/esm/servers/KM/index.d.ts +1 -0
- package/dist/esm/servers/KM/index.js +2 -1
- package/dist/esm/servers/KM/supplierData.d.ts +6 -0
- package/dist/esm/servers/KM/supplierData.js +89 -0
- package/dist/esm/servers/WDT/index.d.ts +1 -0
- package/dist/esm/servers/WDT/index.js +2 -1
- package/dist/esm/servers/WDT/returnBillNo.d.ts +11 -0
- package/dist/esm/servers/WDT/returnBillNo.js +19 -0
- package/dist/esm/servers/index.d.ts +5 -1
- package/dist/esm/servers/index.js +37 -1
- package/dist/esm/utils/SendData.d.ts +4 -0
- package/dist/esm/utils/SendData.js +18 -2
- package/dist/esm/utils/bsOrderBackFormValues.js +34 -3
- package/dist/esm/utils/getSystemShowHead.d.ts +10 -0
- package/dist/esm/utils/getSystemShowHead.js +25 -0
- package/dist/esm/utils/index.d.ts +6 -3
- package/dist/esm/utils/index.js +7 -4
- package/dist/esm/utils/jkyOrderBackFormValues.d.ts +133 -0
- package/dist/esm/utils/jkyOrderBackFormValues.js +511 -0
- package/dist/esm/utils/jstOrderBackFormValues.d.ts +1 -0
- package/dist/esm/utils/jstOrderBackFormValues.js +3 -3
- package/dist/esm/utils/jyOrderBackFormValues.d.ts +58 -0
- package/dist/esm/utils/jyOrderBackFormValues.js +342 -0
- package/dist/esm/utils/kmOrderBackFormValues.d.ts +36 -0
- package/dist/esm/utils/kmOrderBackFormValues.js +38 -1
- package/dist/esm/utils/orderBackFormValues.js +11 -6
- package/dist/esm/utils/skxOrderBackFormValues.d.ts +2 -0
- package/dist/esm/utils/skxOrderBackFormValues.js +14 -2
- package/dist/esm/utils/skxReturnOrderBackFormValues.js +5 -1
- package/dist/esm/utils/transformList.js +66 -60
- package/dist/esm/utils/unTransField.js +1 -1
- package/dist/esm/utils/wdtOrderBackFormValues.d.ts +34 -0
- package/dist/esm/utils/wdtOrderBackFormValues.js +223 -17
- package/package.json +2 -2
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
export declare const JY_SYSTEM_ORDER_CONFIG: {
|
|
2
|
+
key: string;
|
|
3
|
+
name: string;
|
|
4
|
+
selectId: string;
|
|
5
|
+
columns: {
|
|
6
|
+
dataIndex: string;
|
|
7
|
+
title: string;
|
|
8
|
+
width: number;
|
|
9
|
+
}[];
|
|
10
|
+
};
|
|
11
|
+
export declare const JY_ORDER_TYPE_MAP: {
|
|
12
|
+
SALES: string;
|
|
13
|
+
EXPENSE: string;
|
|
14
|
+
SUBSCRIBES: string;
|
|
15
|
+
EXCHANGE: string;
|
|
16
|
+
REISSUE: string;
|
|
17
|
+
INVOICE: string;
|
|
18
|
+
WELFARE: string;
|
|
19
|
+
OTHERS: string;
|
|
20
|
+
};
|
|
21
|
+
export declare const JY_ORDER_STATUS_MAP: {
|
|
22
|
+
CREATED: string;
|
|
23
|
+
AUDITED_ABNORMAL: string;
|
|
24
|
+
AUDITED: string;
|
|
25
|
+
DISPATCHED_ABNORMAL: string;
|
|
26
|
+
DISPATCHED: string;
|
|
27
|
+
DELIVERY_ABNORMAL: string;
|
|
28
|
+
DELIVERED: string;
|
|
29
|
+
INVALID: string;
|
|
30
|
+
};
|
|
31
|
+
export declare const getIsPlatformCodesIncludeOrderNos: (platformCodes: string, orderNos: string) => boolean;
|
|
32
|
+
export declare const updateJyGoodsHandle: (orders?: any[], config?: {
|
|
33
|
+
canEdit?: boolean;
|
|
34
|
+
}) => any[];
|
|
35
|
+
export declare const jyOrderTransform: (detail: any, form: any) => {
|
|
36
|
+
jySystemOrder: {
|
|
37
|
+
orderNo: any;
|
|
38
|
+
orders: any;
|
|
39
|
+
selectIds: any;
|
|
40
|
+
showOrderInfo: any;
|
|
41
|
+
};
|
|
42
|
+
jyReturnSystemOrderNo: any;
|
|
43
|
+
jySystemOrderNo: any;
|
|
44
|
+
jyReissueGoods: any[];
|
|
45
|
+
jyReturnGoods: any[];
|
|
46
|
+
jyGoods: {
|
|
47
|
+
allOrders: any;
|
|
48
|
+
orders: any;
|
|
49
|
+
orderNo: any;
|
|
50
|
+
shopCode: any;
|
|
51
|
+
jyGoods: any[];
|
|
52
|
+
};
|
|
53
|
+
shopCode: any;
|
|
54
|
+
jyLogistics: any;
|
|
55
|
+
jySendGood: any;
|
|
56
|
+
};
|
|
57
|
+
export declare const jyOrderBackFormValues: (detail?: any, templateDetail?: any) => any;
|
|
58
|
+
export declare const filterJyOrders: (trades: any, order_no: string) => any;
|
|
@@ -0,0 +1,342 @@
|
|
|
1
|
+
function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
|
|
2
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
3
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
4
|
+
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
5
|
+
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
|
|
6
|
+
function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
7
|
+
import uuid from "./getUUid";
|
|
8
|
+
import isNull from "./isNull";
|
|
9
|
+
export var JY_SYSTEM_ORDER_CONFIG = {
|
|
10
|
+
key: "jySystemShowOrder",
|
|
11
|
+
name: "巨益",
|
|
12
|
+
selectId: "jySystemSelectIds",
|
|
13
|
+
columns: [{
|
|
14
|
+
dataIndex: "tradeNo",
|
|
15
|
+
title: "系统订单号",
|
|
16
|
+
width: 160
|
|
17
|
+
}, {
|
|
18
|
+
dataIndex: "tradeType",
|
|
19
|
+
title: "订单类型",
|
|
20
|
+
width: 150
|
|
21
|
+
}, {
|
|
22
|
+
dataIndex: "tradeStatus",
|
|
23
|
+
title: "订单状态",
|
|
24
|
+
width: 100
|
|
25
|
+
}, {
|
|
26
|
+
dataIndex: "sourcePlatformName",
|
|
27
|
+
title: "来源平台",
|
|
28
|
+
width: 150
|
|
29
|
+
}]
|
|
30
|
+
};
|
|
31
|
+
export var JY_ORDER_TYPE_MAP = {
|
|
32
|
+
SALES: "销售订单",
|
|
33
|
+
EXPENSE: "费用订单",
|
|
34
|
+
SUBSCRIBES: "预订订单",
|
|
35
|
+
EXCHANGE: "换货订单",
|
|
36
|
+
REISSUE: "补发订单",
|
|
37
|
+
INVOICE: "补发票订单",
|
|
38
|
+
WELFARE: "福利订单",
|
|
39
|
+
OTHERS: "其他订单"
|
|
40
|
+
};
|
|
41
|
+
export var JY_ORDER_STATUS_MAP = {
|
|
42
|
+
CREATED: "新建",
|
|
43
|
+
AUDITED_ABNORMAL: "审核失败",
|
|
44
|
+
AUDITED: "已审核",
|
|
45
|
+
DISPATCHED_ABNORMAL: "配货异常",
|
|
46
|
+
DISPATCHED: "已配货",
|
|
47
|
+
DELIVERY_ABNORMAL: "平台发货异常",
|
|
48
|
+
DELIVERED: "已发货",
|
|
49
|
+
INVALID: "作废"
|
|
50
|
+
};
|
|
51
|
+
export var getIsPlatformCodesIncludeOrderNos = function getIsPlatformCodesIncludeOrderNos(platformCodes, orderNos) {
|
|
52
|
+
var getSortedList = function getSortedList(str) {
|
|
53
|
+
try {
|
|
54
|
+
var parts = str.split(";");
|
|
55
|
+
var bigInts = parts.map(BigInt);
|
|
56
|
+
var sortedBigInts = bigInts.sort(function (a, b) {
|
|
57
|
+
if (a < b) return -1;
|
|
58
|
+
if (a > b) return 1;
|
|
59
|
+
return 0;
|
|
60
|
+
});
|
|
61
|
+
return sortedBigInts.map(String).join(";");
|
|
62
|
+
} catch (error) {
|
|
63
|
+
return "";
|
|
64
|
+
}
|
|
65
|
+
};
|
|
66
|
+
var platformCodesSortStr = getSortedList(platformCodes || "");
|
|
67
|
+
var orderNosSortStr = getSortedList(orderNos || "");
|
|
68
|
+
return platformCodesSortStr.includes(orderNosSortStr);
|
|
69
|
+
};
|
|
70
|
+
export var updateJyGoodsHandle = function updateJyGoodsHandle() {
|
|
71
|
+
var orders = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
|
|
72
|
+
var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
73
|
+
var mappingGoodsItem = function mappingGoodsItem(list) {
|
|
74
|
+
return (list || []).map(function (item) {
|
|
75
|
+
var _item$uuid, _config$canEdit;
|
|
76
|
+
item.uuid = (_item$uuid = item.uuid) !== null && _item$uuid !== void 0 ? _item$uuid : uuid();
|
|
77
|
+
return _objectSpread(_objectSpread({}, item), {}, {
|
|
78
|
+
canDelete: true,
|
|
79
|
+
canEdit: (_config$canEdit = config === null || config === void 0 ? void 0 : config.canEdit) !== null && _config$canEdit !== void 0 ? _config$canEdit : false,
|
|
80
|
+
divideOrderFee: Number(item.divideOrderFee).toFixed(2),
|
|
81
|
+
sellTotal: Number(item.sellTotal).toFixed(2),
|
|
82
|
+
sellPrice: Number(item.sellPrice).toFixed(2),
|
|
83
|
+
settlementPrice: Number(item.settlementPrice).toFixed(2),
|
|
84
|
+
mallSellingPrice: Number(item.mallSellingPrice).toFixed(2)
|
|
85
|
+
});
|
|
86
|
+
});
|
|
87
|
+
};
|
|
88
|
+
return mappingGoodsItem((orders || []).reduce(function (prv, next) {
|
|
89
|
+
if (next.subOrderDetails && next.subOrderDetails.length) {
|
|
90
|
+
next.subOrderDetails.forEach(function (subItem) {
|
|
91
|
+
subItem.systemOrderNo = next === null || next === void 0 ? void 0 : next.tradeNo;
|
|
92
|
+
prv.push(subItem);
|
|
93
|
+
});
|
|
94
|
+
}
|
|
95
|
+
return prv;
|
|
96
|
+
}, []));
|
|
97
|
+
};
|
|
98
|
+
var updateJyItemListHandle = function updateJyItemListHandle(list, type, comList, form) {
|
|
99
|
+
var _newList;
|
|
100
|
+
if (type === "logistics") {
|
|
101
|
+
var _comList$find, _currentCom$component;
|
|
102
|
+
//巨益物流信息组件
|
|
103
|
+
var currentCom = comList === null || comList === void 0 ? void 0 : (_comList$find = comList.find) === null || _comList$find === void 0 ? void 0 : _comList$find.call(comList, function (item) {
|
|
104
|
+
return item.workOrderComponentType === "JY_LOGISTICS";
|
|
105
|
+
});
|
|
106
|
+
var notOrderBack = (currentCom === null || currentCom === void 0 ? void 0 : (_currentCom$component = currentCom.componentConfig) === null || _currentCom$component === void 0 ? void 0 : _currentCom$component.notOrderBack) || false;
|
|
107
|
+
if (notOrderBack) {
|
|
108
|
+
var _currentValue;
|
|
109
|
+
var currentValue = form.getFieldValue(currentCom.uniqueKey);
|
|
110
|
+
currentValue = (_currentValue = currentValue) !== null && _currentValue !== void 0 && _currentValue.length ? currentValue : [{
|
|
111
|
+
logisticsCode: "",
|
|
112
|
+
logisticsCompany: ""
|
|
113
|
+
}];
|
|
114
|
+
return currentValue;
|
|
115
|
+
}
|
|
116
|
+
} else if (type === "send") {
|
|
117
|
+
var _comList$find2, _currentCom$component2;
|
|
118
|
+
var _currentCom = comList === null || comList === void 0 ? void 0 : (_comList$find2 = comList.find) === null || _comList$find2 === void 0 ? void 0 : _comList$find2.call(comList, function (item) {
|
|
119
|
+
return item.workOrderComponentType === "JY_SEND_GOOD";
|
|
120
|
+
});
|
|
121
|
+
var _notOrderBack = (_currentCom === null || _currentCom === void 0 ? void 0 : (_currentCom$component2 = _currentCom.componentConfig) === null || _currentCom$component2 === void 0 ? void 0 : _currentCom$component2.notOrderBack) || false;
|
|
122
|
+
if (_notOrderBack) {
|
|
123
|
+
var _currentValue3;
|
|
124
|
+
var _currentValue2 = form.getFieldValue(_currentCom.uniqueKey);
|
|
125
|
+
_currentValue2 = (_currentValue3 = _currentValue2) !== null && _currentValue3 !== void 0 && _currentValue3.length ? _currentValue2 : [{
|
|
126
|
+
sendId: "",
|
|
127
|
+
sendName: ""
|
|
128
|
+
}];
|
|
129
|
+
return _currentValue2;
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
var newList = list === null || list === void 0 ? void 0 : list.reduce(function (prv, next) {
|
|
133
|
+
var items = ((next === null || next === void 0 ? void 0 : next.subOrderDetails) || []).map(function (t) {
|
|
134
|
+
return {
|
|
135
|
+
title: (t === null || t === void 0 ? void 0 : t.productName) || "",
|
|
136
|
+
picUrl: (t === null || t === void 0 ? void 0 : t.imageUrl) || "",
|
|
137
|
+
platform: "jy",
|
|
138
|
+
skuId: (t === null || t === void 0 ? void 0 : t.productCode) || ""
|
|
139
|
+
};
|
|
140
|
+
});
|
|
141
|
+
var params = {
|
|
142
|
+
items: items
|
|
143
|
+
};
|
|
144
|
+
if (type === "logistics") {
|
|
145
|
+
params.logisticsCompanyName = next === null || next === void 0 ? void 0 : next.logistName;
|
|
146
|
+
params.logisticsCompany = next === null || next === void 0 ? void 0 : next.logisticId;
|
|
147
|
+
params.logisticsCode = next === null || next === void 0 ? void 0 : next.logisticNo;
|
|
148
|
+
prv.push(params);
|
|
149
|
+
} else if (type === "send") {
|
|
150
|
+
params.sendId = next === null || next === void 0 ? void 0 : next.warehouseId;
|
|
151
|
+
//下拉框,取id
|
|
152
|
+
params.sendName = next === null || next === void 0 ? void 0 : next.warehouseId;
|
|
153
|
+
params.sendSnapshotName = next === null || next === void 0 ? void 0 : next.warehouseName;
|
|
154
|
+
prv.push(params);
|
|
155
|
+
}
|
|
156
|
+
return prv;
|
|
157
|
+
}, []);
|
|
158
|
+
if (!((_newList = newList) !== null && _newList !== void 0 && _newList.length)) {
|
|
159
|
+
switch (type) {
|
|
160
|
+
case "logistics":
|
|
161
|
+
newList = [{
|
|
162
|
+
logisticsCode: ""
|
|
163
|
+
}];
|
|
164
|
+
break;
|
|
165
|
+
case "supply":
|
|
166
|
+
newList = [{
|
|
167
|
+
supplyId: ""
|
|
168
|
+
}];
|
|
169
|
+
break;
|
|
170
|
+
case "send":
|
|
171
|
+
newList = [{
|
|
172
|
+
sendId: "",
|
|
173
|
+
sendName: ""
|
|
174
|
+
}];
|
|
175
|
+
break;
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
return newList;
|
|
179
|
+
};
|
|
180
|
+
|
|
181
|
+
//巨益订单信息转换
|
|
182
|
+
export var jyOrderTransform = function jyOrderTransform(detail, form) {
|
|
183
|
+
var _form$getFieldValue, _jyReissueCom$compone, _jyReturnCom$componen, _filterCurrentTrades$, _filterCurrentTrades$2, _currentTrades$find, _currentTrades$find$c, _currentTrades$find2, _currentTrades$find2$;
|
|
184
|
+
var _detail$allOrders = detail.allOrders,
|
|
185
|
+
allOrders = _detail$allOrders === void 0 ? [] : _detail$allOrders,
|
|
186
|
+
orderNo = detail.orderNo,
|
|
187
|
+
_detail$trades = detail.trades,
|
|
188
|
+
currentTrades = _detail$trades === void 0 ? [] : _detail$trades,
|
|
189
|
+
componentList = detail.componentList;
|
|
190
|
+
var filterCurrentTrades = currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.filter(function (trade) {
|
|
191
|
+
return !trade.cancel;
|
|
192
|
+
});
|
|
193
|
+
var jyGoodsCom = (componentList || []).find(function (com) {
|
|
194
|
+
return com.workOrderComponentType === "JY_GOODS";
|
|
195
|
+
});
|
|
196
|
+
var jyReissueCom = (componentList || []).find(function (com) {
|
|
197
|
+
return com.workOrderComponentType === "JY_REISSUE_GOODS";
|
|
198
|
+
});
|
|
199
|
+
var jyReturnCom = (componentList || []).find(function (com) {
|
|
200
|
+
return com.workOrderComponentType === "JY_RETURN_GOODS";
|
|
201
|
+
});
|
|
202
|
+
var isStrict = jyGoodsCom ? (_form$getFieldValue = form.getFieldValue(jyGoodsCom.uniqueKey)) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.isStrict : false;
|
|
203
|
+
var onlyOneSystemOrder = (filterCurrentTrades === null || filterCurrentTrades === void 0 ? void 0 : filterCurrentTrades.length) === 1;
|
|
204
|
+
var isReissueDefaultSelect = !!(jyReissueCom !== null && jyReissueCom !== void 0 && (_jyReissueCom$compone = jyReissueCom.componentConfig) !== null && _jyReissueCom$compone !== void 0 && _jyReissueCom$compone.showDefaultSelect);
|
|
205
|
+
var isReturnDefaultSelect = !!(jyReturnCom !== null && jyReturnCom !== void 0 && (_jyReturnCom$componen = jyReturnCom.componentConfig) !== null && _jyReturnCom$componen !== void 0 && _jyReturnCom$componen.showDefaultSelect);
|
|
206
|
+
var defaultOrder = filterCurrentTrades !== null && filterCurrentTrades !== void 0 && filterCurrentTrades[0] ? [filterCurrentTrades[0]] : [];
|
|
207
|
+
var orders = currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.map(function (item) {
|
|
208
|
+
return _objectSpread(_objectSpread({}, item), {}, {
|
|
209
|
+
tradeType: JY_ORDER_TYPE_MAP[item.tradeType],
|
|
210
|
+
tradeStatus: JY_ORDER_STATUS_MAP[item.tradeStatus]
|
|
211
|
+
});
|
|
212
|
+
});
|
|
213
|
+
return {
|
|
214
|
+
jySystemOrder: {
|
|
215
|
+
orderNo: orderNo,
|
|
216
|
+
orders: orders,
|
|
217
|
+
selectIds: onlyOneSystemOrder ? currentTrades.map(function (item) {
|
|
218
|
+
return item.tradeNo;
|
|
219
|
+
}) : [],
|
|
220
|
+
showOrderInfo: orders
|
|
221
|
+
},
|
|
222
|
+
jyReturnSystemOrderNo: onlyOneSystemOrder || isReturnDefaultSelect ? (_filterCurrentTrades$ = filterCurrentTrades[0]) === null || _filterCurrentTrades$ === void 0 ? void 0 : _filterCurrentTrades$.tradeNo : undefined,
|
|
223
|
+
jySystemOrderNo: onlyOneSystemOrder || isReissueDefaultSelect ? (_filterCurrentTrades$2 = filterCurrentTrades[0]) === null || _filterCurrentTrades$2 === void 0 ? void 0 : _filterCurrentTrades$2.tradeNo : undefined,
|
|
224
|
+
jyReissueGoods: onlyOneSystemOrder || isReissueDefaultSelect ? updateJyGoodsHandle(defaultOrder, {
|
|
225
|
+
canEdit: true
|
|
226
|
+
}).filter(function (good) {
|
|
227
|
+
return !isStrict || !orderNo || getIsPlatformCodesIncludeOrderNos(good.platformCode, orderNo);
|
|
228
|
+
}) : [],
|
|
229
|
+
jyReturnGoods: onlyOneSystemOrder || isReturnDefaultSelect ? updateJyGoodsHandle(defaultOrder, {
|
|
230
|
+
canEdit: true
|
|
231
|
+
}).filter(function (good) {
|
|
232
|
+
return !isStrict || !orderNo || getIsPlatformCodesIncludeOrderNos(good.platformCode, orderNo);
|
|
233
|
+
}) : [],
|
|
234
|
+
jyGoods: {
|
|
235
|
+
// allOrders用于选择订单商品,代入该订单的所有商品
|
|
236
|
+
allOrders: allOrders,
|
|
237
|
+
// 订单反填,要清空orders,存的是当前系统订单号勾选上的 订单
|
|
238
|
+
orders: currentTrades,
|
|
239
|
+
orderNo: orderNo,
|
|
240
|
+
shopCode: (currentTrades === null || currentTrades === void 0 ? void 0 : (_currentTrades$find = currentTrades.find) === null || _currentTrades$find === void 0 ? void 0 : (_currentTrades$find$c = _currentTrades$find.call(currentTrades, function (item) {
|
|
241
|
+
return item.shopCode;
|
|
242
|
+
})) === null || _currentTrades$find$c === void 0 ? void 0 : _currentTrades$find$c.shopCode) || null,
|
|
243
|
+
jyGoods: updateJyGoodsHandle(currentTrades).filter(function (good) {
|
|
244
|
+
return !isStrict || !orderNo;
|
|
245
|
+
})
|
|
246
|
+
},
|
|
247
|
+
shopCode: (currentTrades === null || currentTrades === void 0 ? void 0 : (_currentTrades$find2 = currentTrades.find) === null || _currentTrades$find2 === void 0 ? void 0 : (_currentTrades$find2$ = _currentTrades$find2.call(currentTrades, function (item) {
|
|
248
|
+
return item.shopCode;
|
|
249
|
+
})) === null || _currentTrades$find2$ === void 0 ? void 0 : _currentTrades$find2$.shopCode) || null,
|
|
250
|
+
jyLogistics: updateJyItemListHandle(currentTrades, "logistics", componentList || [], form),
|
|
251
|
+
jySendGood: updateJyItemListHandle(currentTrades, "send", componentList || [], form)
|
|
252
|
+
};
|
|
253
|
+
};
|
|
254
|
+
export var jyOrderBackFormValues = function jyOrderBackFormValues() {
|
|
255
|
+
var detail = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
256
|
+
var templateDetail = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
257
|
+
return ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
|
|
258
|
+
var uniqueKey = next.uniqueKey;
|
|
259
|
+
var config = next.componentConfig;
|
|
260
|
+
switch (next.workOrderComponentType) {
|
|
261
|
+
case "JY_SYSTEM_ORDER":
|
|
262
|
+
prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.jySystemOrder;
|
|
263
|
+
break;
|
|
264
|
+
case "JY_GOODS":
|
|
265
|
+
prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.jyGoods;
|
|
266
|
+
break;
|
|
267
|
+
case "JY_REISSUE_GOODS":
|
|
268
|
+
{
|
|
269
|
+
var _detail$jyGoods, _detail$jySystemOrder, _detail$jySystemOrder2, _detail$jySystemOrder3, _detail$jySystemOrder4, _detail$jySystemOrder5, _detail$jySystemOrder6;
|
|
270
|
+
var initReason = !isNull(config === null || config === void 0 ? void 0 : config.initReason) ? config.initReason : "1";
|
|
271
|
+
prv[uniqueKey] = {
|
|
272
|
+
jySystemOrder: detail === null || detail === void 0 ? void 0 : detail.jySystemOrder,
|
|
273
|
+
jyReissueGoods: initReason === "2" ? [] : detail === null || detail === void 0 ? void 0 : detail.jyReissueGoods,
|
|
274
|
+
jySystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.jySystemOrderNo,
|
|
275
|
+
jyReissueType: [initReason],
|
|
276
|
+
shopCode: (detail === null || detail === void 0 ? void 0 : (_detail$jyGoods = detail.jyGoods) === null || _detail$jyGoods === void 0 ? void 0 : _detail$jyGoods.shopCode) || (detail === null || detail === void 0 ? void 0 : detail.shopCode) || (detail === null || detail === void 0 ? void 0 : (_detail$jySystemOrder = detail.jySystemOrder) === null || _detail$jySystemOrder === void 0 ? void 0 : (_detail$jySystemOrder2 = _detail$jySystemOrder.orders) === null || _detail$jySystemOrder2 === void 0 ? void 0 : (_detail$jySystemOrder3 = _detail$jySystemOrder2[0]) === null || _detail$jySystemOrder3 === void 0 ? void 0 : _detail$jySystemOrder3.shopCode) || (detail === null || detail === void 0 ? void 0 : (_detail$jySystemOrder4 = detail.jySystemOrder) === null || _detail$jySystemOrder4 === void 0 ? void 0 : (_detail$jySystemOrder5 = _detail$jySystemOrder4.showOrderInfo) === null || _detail$jySystemOrder5 === void 0 ? void 0 : (_detail$jySystemOrder6 = _detail$jySystemOrder5[0]) === null || _detail$jySystemOrder6 === void 0 ? void 0 : _detail$jySystemOrder6.shopCode)
|
|
277
|
+
};
|
|
278
|
+
}
|
|
279
|
+
break;
|
|
280
|
+
case "JY_LOGISTICS":
|
|
281
|
+
prv[uniqueKey] = updateJyItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.jyLogistics, "logistics", config);
|
|
282
|
+
break;
|
|
283
|
+
case "JY_SEND_GOOD":
|
|
284
|
+
prv[uniqueKey] = updateJyItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.jySendGood, "send", config);
|
|
285
|
+
break;
|
|
286
|
+
case "JY_RETURN_GOODS":
|
|
287
|
+
{
|
|
288
|
+
var _detail$jyGoods2, _detail$jySystemOrder7, _detail$jySystemOrder8, _detail$jySystemOrder9, _detail$jySystemOrder10, _detail$jySystemOrder11, _detail$jySystemOrder12;
|
|
289
|
+
var _initReason = !isNull(config === null || config === void 0 ? void 0 : config.initReason) ? config.initReason : "1";
|
|
290
|
+
prv[uniqueKey] = {
|
|
291
|
+
jySystemOrder: detail === null || detail === void 0 ? void 0 : detail.jySystemOrder,
|
|
292
|
+
jyReturnGoods: _initReason === "2" ? [] : detail === null || detail === void 0 ? void 0 : detail.jyReturnGoods,
|
|
293
|
+
jySystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.jyReturnSystemOrderNo,
|
|
294
|
+
shopCode: (detail === null || detail === void 0 ? void 0 : (_detail$jyGoods2 = detail.jyGoods) === null || _detail$jyGoods2 === void 0 ? void 0 : _detail$jyGoods2.shopCode) || (detail === null || detail === void 0 ? void 0 : detail.shopCode) || (detail === null || detail === void 0 ? void 0 : (_detail$jySystemOrder7 = detail.jySystemOrder) === null || _detail$jySystemOrder7 === void 0 ? void 0 : (_detail$jySystemOrder8 = _detail$jySystemOrder7.orders) === null || _detail$jySystemOrder8 === void 0 ? void 0 : (_detail$jySystemOrder9 = _detail$jySystemOrder8[0]) === null || _detail$jySystemOrder9 === void 0 ? void 0 : _detail$jySystemOrder9.shopCode) || (detail === null || detail === void 0 ? void 0 : (_detail$jySystemOrder10 = detail.jySystemOrder) === null || _detail$jySystemOrder10 === void 0 ? void 0 : (_detail$jySystemOrder11 = _detail$jySystemOrder10.showOrderInfo) === null || _detail$jySystemOrder11 === void 0 ? void 0 : (_detail$jySystemOrder12 = _detail$jySystemOrder11[0]) === null || _detail$jySystemOrder12 === void 0 ? void 0 : _detail$jySystemOrder12.shopCode),
|
|
295
|
+
gyReturnType: [_initReason]
|
|
296
|
+
};
|
|
297
|
+
}
|
|
298
|
+
break;
|
|
299
|
+
}
|
|
300
|
+
return prv;
|
|
301
|
+
}, {});
|
|
302
|
+
};
|
|
303
|
+
var updateJyItemListByConfigHandle = function updateJyItemListByConfigHandle(list, type) {
|
|
304
|
+
var config = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
|
|
305
|
+
var showField = config.showField,
|
|
306
|
+
_config$notOrderBack = config.notOrderBack,
|
|
307
|
+
notOrderBack = _config$notOrderBack === void 0 ? false : _config$notOrderBack;
|
|
308
|
+
if (notOrderBack) {
|
|
309
|
+
return list;
|
|
310
|
+
}
|
|
311
|
+
return list === null || list === void 0 ? void 0 : list.reduce(function (prv, next) {
|
|
312
|
+
if (type === "logistics") {
|
|
313
|
+
if (!["logisticsCompany", ""].includes(showField || "")) {
|
|
314
|
+
next.logisticsCompany = undefined;
|
|
315
|
+
}
|
|
316
|
+
if (!["logisticsCode", ""].includes(showField || "")) {
|
|
317
|
+
next.logisticsCode = undefined;
|
|
318
|
+
}
|
|
319
|
+
} else if (type === "send") {
|
|
320
|
+
if (!["sendId", "all"].includes(showField || "")) {
|
|
321
|
+
next.sendId = undefined;
|
|
322
|
+
}
|
|
323
|
+
if (!["sendName", "all"].includes(showField || "")) {
|
|
324
|
+
next.sendName = undefined;
|
|
325
|
+
next.sendSnapshotName = undefined;
|
|
326
|
+
}
|
|
327
|
+
}
|
|
328
|
+
prv.push(next);
|
|
329
|
+
return prv;
|
|
330
|
+
}, []);
|
|
331
|
+
};
|
|
332
|
+
|
|
333
|
+
// 巨益根据订单号请求返回的platformCode会有多个订单号组合在一起的数据 排除其他的,返回当前订单号
|
|
334
|
+
export var filterJyOrders = function filterJyOrders(trades, order_no) {
|
|
335
|
+
var currentTrades = (trades || []).filter(function (item) {
|
|
336
|
+
return getIsPlatformCodesIncludeOrderNos(item.tradeId, order_no);
|
|
337
|
+
});
|
|
338
|
+
if (currentTrades.length) {
|
|
339
|
+
return currentTrades;
|
|
340
|
+
}
|
|
341
|
+
return [];
|
|
342
|
+
};
|
|
@@ -1,10 +1,18 @@
|
|
|
1
|
+
export declare const kmSkuTypeMap: {
|
|
2
|
+
0: string;
|
|
3
|
+
1: string;
|
|
4
|
+
2: string;
|
|
5
|
+
3: string;
|
|
6
|
+
};
|
|
1
7
|
export declare const handleKmAddressIdentify: (data: any) => any;
|
|
2
8
|
export declare const kmOrderBackFormValues: (detail?: any, templateDetail?: any) => any;
|
|
3
9
|
declare const KM_ORDER_TYPE_MAP: {
|
|
4
10
|
"0": string;
|
|
5
11
|
"1": string;
|
|
12
|
+
"2": string;
|
|
6
13
|
"3": string;
|
|
7
14
|
"4": string;
|
|
15
|
+
"5": string;
|
|
8
16
|
"6": string;
|
|
9
17
|
"7": string;
|
|
10
18
|
"8": string;
|
|
@@ -14,6 +22,7 @@ declare const KM_ORDER_TYPE_MAP: {
|
|
|
14
22
|
"12": string;
|
|
15
23
|
"13": string;
|
|
16
24
|
"14": string;
|
|
25
|
+
"15": string;
|
|
17
26
|
"16": string;
|
|
18
27
|
"17": string;
|
|
19
28
|
"18": string;
|
|
@@ -24,10 +33,23 @@ declare const KM_ORDER_TYPE_MAP: {
|
|
|
24
33
|
"23": string;
|
|
25
34
|
"24": string;
|
|
26
35
|
"25": string;
|
|
36
|
+
"26": string;
|
|
37
|
+
"27": string;
|
|
38
|
+
"28": string;
|
|
39
|
+
"29": string;
|
|
40
|
+
"30": string;
|
|
41
|
+
"31": string;
|
|
42
|
+
"32": string;
|
|
27
43
|
"33": string;
|
|
28
44
|
"34": string;
|
|
29
45
|
"35": string;
|
|
30
46
|
"36": string;
|
|
47
|
+
"37": string;
|
|
48
|
+
"38": string;
|
|
49
|
+
"39": string;
|
|
50
|
+
"46": string;
|
|
51
|
+
"48": string;
|
|
52
|
+
"49": string;
|
|
31
53
|
"50": string;
|
|
32
54
|
"51": string;
|
|
33
55
|
"53": string;
|
|
@@ -39,7 +61,20 @@ declare const KM_ORDER_TYPE_MAP: {
|
|
|
39
61
|
"60": string;
|
|
40
62
|
"61": string;
|
|
41
63
|
"62": string;
|
|
64
|
+
"63": string;
|
|
65
|
+
"65": string;
|
|
42
66
|
"66": string;
|
|
67
|
+
"69": string;
|
|
68
|
+
"70": string;
|
|
69
|
+
"72": string;
|
|
70
|
+
"73": string;
|
|
71
|
+
"74": string;
|
|
72
|
+
"75": string;
|
|
73
|
+
"76": string;
|
|
74
|
+
"77": string;
|
|
75
|
+
"78": string;
|
|
76
|
+
"79": string;
|
|
77
|
+
"80": string;
|
|
43
78
|
"99": string;
|
|
44
79
|
};
|
|
45
80
|
export declare const updateKmGoodsHandle: (orders?: any[], config?: {
|
|
@@ -48,6 +83,7 @@ export declare const updateKmGoodsHandle: (orders?: any[], config?: {
|
|
|
48
83
|
}) => any[];
|
|
49
84
|
export declare const getKmOrderTypeValue: (key: keyof typeof KM_ORDER_TYPE_MAP) => string;
|
|
50
85
|
declare const KM_ORDER_STATUS: {
|
|
86
|
+
WAIT_BUYER_PAY: string;
|
|
51
87
|
WAIT_AUDIT: string;
|
|
52
88
|
WAIT_FINANCE_AUDIT: string;
|
|
53
89
|
WAIT_MANUAL_AUDIT: string;
|
|
@@ -13,6 +13,12 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
|
|
|
13
13
|
import uuid from "./getUUid";
|
|
14
14
|
import isNull from "./isNull";
|
|
15
15
|
import { AddressData } from "@kmkf-fe-packages/kmkf-utils";
|
|
16
|
+
export var kmSkuTypeMap = {
|
|
17
|
+
0: "普通",
|
|
18
|
+
1: "sku套件",
|
|
19
|
+
2: "纯套件",
|
|
20
|
+
3: "包材商品"
|
|
21
|
+
};
|
|
16
22
|
export var handleKmAddressIdentify = function handleKmAddressIdentify(data) {
|
|
17
23
|
//除省市区外信息都已加密,暂不返填
|
|
18
24
|
var params = {
|
|
@@ -97,8 +103,10 @@ export var kmOrderBackFormValues = function kmOrderBackFormValues() {
|
|
|
97
103
|
var KM_ORDER_TYPE_MAP = {
|
|
98
104
|
"0": "普通订单",
|
|
99
105
|
"1": "货到付款",
|
|
106
|
+
"2": "纯平台订单(包含平台单拆出去的手工单)",
|
|
100
107
|
"3": "平台订单",
|
|
101
108
|
"4": "线下订单",
|
|
109
|
+
"5": "纯系统手工单(不包含平台单拆出去的手工单)",
|
|
102
110
|
"6": "预售订单",
|
|
103
111
|
"7": "合并订单",
|
|
104
112
|
"8": "拆分订单",
|
|
@@ -108,6 +116,7 @@ var KM_ORDER_TYPE_MAP = {
|
|
|
108
116
|
"12": "门店订单",
|
|
109
117
|
"13": "换货订单",
|
|
110
118
|
"14": "补发订单",
|
|
119
|
+
"15": "跨境订单",
|
|
111
120
|
"16": "海外仓订单",
|
|
112
121
|
"17": "Lazada",
|
|
113
122
|
"18": "报损单",
|
|
@@ -118,10 +127,23 @@ var KM_ORDER_TYPE_MAP = {
|
|
|
118
127
|
"23": "平台预售",
|
|
119
128
|
"24": "京东直发",
|
|
120
129
|
"25": "京东供销",
|
|
130
|
+
"26": "天猫当日发货",
|
|
131
|
+
"27": "天猫24小时发货",
|
|
132
|
+
"28": "天猫当日达",
|
|
133
|
+
"29": "天猫次日达",
|
|
134
|
+
"30": "天猫三日达",
|
|
135
|
+
"31": "天猫四日达",
|
|
136
|
+
"32": "天猫五日达",
|
|
121
137
|
"33": "分销订单",
|
|
122
138
|
"34": "供销订单",
|
|
123
139
|
"35": "京配订单",
|
|
124
140
|
"36": "平台分销",
|
|
141
|
+
"37": "唯品会订单JIT",
|
|
142
|
+
"38": "唯品会订单",
|
|
143
|
+
"39": "BIC订单",
|
|
144
|
+
"46": "档口订单",
|
|
145
|
+
"48": "多级分销",
|
|
146
|
+
"49": "拼多多工厂代发",
|
|
125
147
|
"50": "天猫淘宝店铺预售",
|
|
126
148
|
"51": "抖音厂商代发",
|
|
127
149
|
"53": "亚马逊FBA",
|
|
@@ -133,7 +155,20 @@ var KM_ORDER_TYPE_MAP = {
|
|
|
133
155
|
"60": "全款预售",
|
|
134
156
|
"61": "得物直发订单",
|
|
135
157
|
"62": "Lazada-FBL",
|
|
158
|
+
"63": "淘宝厂商代发订单",
|
|
159
|
+
"65": "BTAS订单",
|
|
136
160
|
"66": "平台拆单",
|
|
161
|
+
"69": "阿里代销",
|
|
162
|
+
"70": "花城农夫帮卖订单",
|
|
163
|
+
"72": "快麦通代发",
|
|
164
|
+
"73": "1688分销小站",
|
|
165
|
+
"74": "速卖通全托管",
|
|
166
|
+
"75": "分销订单(明确供销商)",
|
|
167
|
+
"76": "含拆单标记的订单",
|
|
168
|
+
"77": "1688分销小站(分销)",
|
|
169
|
+
"78": "o2o订单",
|
|
170
|
+
"79": "TEMU",
|
|
171
|
+
"80": "希音",
|
|
137
172
|
"99": "出库单"
|
|
138
173
|
};
|
|
139
174
|
export var updateKmGoodsHandle = function updateKmGoodsHandle() {
|
|
@@ -149,7 +184,7 @@ export var updateKmGoodsHandle = function updateKmGoodsHandle() {
|
|
|
149
184
|
num: item.itemNum || item.num,
|
|
150
185
|
realNum: item.itemNum || item.num,
|
|
151
186
|
desiredNum: item.itemNum || item.num,
|
|
152
|
-
type: item.
|
|
187
|
+
type: item.type || (kmSkuTypeMap === null || kmSkuTypeMap === void 0 ? void 0 : kmSkuTypeMap[item === null || item === void 0 ? void 0 : item.skuType]),
|
|
153
188
|
itemSysId: item.sysItemId,
|
|
154
189
|
skuSysId: item.sysSkuId,
|
|
155
190
|
sysPicPath: item.picUrl,
|
|
@@ -164,6 +199,7 @@ export var updateKmGoodsHandle = function updateKmGoodsHandle() {
|
|
|
164
199
|
if (config.orderBackGoodsLevel !== "2" && subItem.suits && subItem.suits.length) {
|
|
165
200
|
subItem.suits.forEach(function (suit) {
|
|
166
201
|
suit.systemOrderNo = next === null || next === void 0 ? void 0 : next.sid;
|
|
202
|
+
suit.outerSkuId = suit === null || suit === void 0 ? void 0 : suit.outerId;
|
|
167
203
|
});
|
|
168
204
|
prv.push.apply(prv, _toConsumableArray(subItem.suits));
|
|
169
205
|
} else {
|
|
@@ -179,6 +215,7 @@ export var getKmOrderTypeValue = function getKmOrderTypeValue(key) {
|
|
|
179
215
|
return KM_ORDER_TYPE_MAP[key] || key;
|
|
180
216
|
};
|
|
181
217
|
var KM_ORDER_STATUS = {
|
|
218
|
+
WAIT_BUYER_PAY: "待付款",
|
|
182
219
|
WAIT_AUDIT: "待审核",
|
|
183
220
|
WAIT_FINANCE_AUDIT: "等待财审",
|
|
184
221
|
WAIT_MANUAL_AUDIT: "等待人工审核",
|
|
@@ -16,8 +16,10 @@ import { jstOrderBackFormValues } from "./jstOrderBackFormValues";
|
|
|
16
16
|
import { wdtOrderBackFormValues } from "./wdtOrderBackFormValues";
|
|
17
17
|
import { bsE3OrderBackFormValues } from "./bsE3OrderBackFormValues";
|
|
18
18
|
import { gyOrderBackFormValues } from "./gyOrderBackFormValues";
|
|
19
|
+
import { jyOrderBackFormValues } from "./jyOrderBackFormValues";
|
|
19
20
|
import { skxOrderBackFormValues } from "./skxOrderBackFormValues";
|
|
20
21
|
import { skxReturnOrderBackFormValues } from "./skxReturnOrderBackFormValues";
|
|
22
|
+
import { jkyOrderBackFormValues } from "./jkyOrderBackFormValues";
|
|
21
23
|
import { pushGyLog } from "../utils";
|
|
22
24
|
|
|
23
25
|
// 淘宝商品组件信息处理
|
|
@@ -84,7 +86,7 @@ export default (function (_ref) {
|
|
|
84
86
|
_ref$fromQNCreateWork = _ref.fromQNCreateWorkOrderByOrderNo,
|
|
85
87
|
fromQNCreateWorkOrderByOrderNo = _ref$fromQNCreateWork === void 0 ? false : _ref$fromQNCreateWork;
|
|
86
88
|
var orderValues = !_get_order_fail_ ? ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
|
|
87
|
-
var _next$componentConfig, _next$componentConfig2, _next$componentConfig3;
|
|
89
|
+
var _next$componentConfig, _ref2, _detail$expressLogist, _detail$returnLogisti, _next$componentConfig2, _next$componentConfig3, _next$componentConfig4;
|
|
88
90
|
var uniqueKey = next.uniqueKey;
|
|
89
91
|
var config = next.componentConfig;
|
|
90
92
|
var city = null,
|
|
@@ -93,7 +95,7 @@ export default (function (_ref) {
|
|
|
93
95
|
|
|
94
96
|
switch (next.workOrderComponentType) {
|
|
95
97
|
case "TRADE_ID_INPUT":
|
|
96
|
-
prv[uniqueKey] = order_no || detail["orderNo"];
|
|
98
|
+
prv[uniqueKey] = (_next$componentConfig = next.componentConfig) !== null && _next$componentConfig !== void 0 && _next$componentConfig.toUpperCase ? (_ref2 = order_no || detail["orderNo"]) === null || _ref2 === void 0 ? void 0 : _ref2.toUpperCase() : order_no || detail["orderNo"];
|
|
97
99
|
break;
|
|
98
100
|
case "BUYER_NICK_INPUT":
|
|
99
101
|
prv[uniqueKey] = {
|
|
@@ -142,13 +144,13 @@ export default (function (_ref) {
|
|
|
142
144
|
case "EXPRESS_LOGISTICS_SELECT":
|
|
143
145
|
prv[uniqueKey] = {
|
|
144
146
|
company: config.isSingle && config.showField === "EXPRESS_COMPANY" || !config.isSingle ? ExpressData.getInstance().getExpressCodeByName(detail["expressLogisticsCompany"]) : "",
|
|
145
|
-
order: config.isSingle && config.showField === "EXPRESS_WAYBILL_CODE" || !config.isSingle ? detail["expressLogisticsCode"] : ""
|
|
147
|
+
order: config.isSingle && config.showField === "EXPRESS_WAYBILL_CODE" || !config.isSingle ? config !== null && config !== void 0 && config.toUpperCase ? (_detail$expressLogist = detail["expressLogisticsCode"]) === null || _detail$expressLogist === void 0 ? void 0 : _detail$expressLogist.toUpperCase() : detail["expressLogisticsCode"] : ""
|
|
146
148
|
};
|
|
147
149
|
break;
|
|
148
150
|
case "RETURN_LOGISTICS_SELECT":
|
|
149
151
|
prv[uniqueKey] = {
|
|
150
152
|
company: ExpressData.getInstance().getExpressCodeByName(detail["returnLogisticsCompany"]),
|
|
151
|
-
order: detail["returnLogisticsCode"]
|
|
153
|
+
order: config !== null && config !== void 0 && config.toUpperCase ? (_detail$returnLogisti = detail["returnLogisticsCode"]) === null || _detail$returnLogisti === void 0 ? void 0 : _detail$returnLogisti.toUpperCase() : detail["returnLogisticsCode"]
|
|
152
154
|
};
|
|
153
155
|
break;
|
|
154
156
|
case "ALI_PAY_INPUT":
|
|
@@ -165,7 +167,7 @@ export default (function (_ref) {
|
|
|
165
167
|
break;
|
|
166
168
|
case "REMARK_INPUT":
|
|
167
169
|
// 淘宝平台的备注信息如果设置了默认值 初始化的时候不需要订单反填
|
|
168
|
-
if (!fromQNCreateWorkOrderByOrderNo || !((_next$
|
|
170
|
+
if (!fromQNCreateWorkOrderByOrderNo || !((_next$componentConfig2 = next.componentConfig) !== null && _next$componentConfig2 !== void 0 && _next$componentConfig2.flag || ((_next$componentConfig3 = next.componentConfig) === null || _next$componentConfig3 === void 0 ? void 0 : _next$componentConfig3.flag) === 0 || (_next$componentConfig4 = next.componentConfig) !== null && _next$componentConfig4 !== void 0 && _next$componentConfig4.remark)) {
|
|
169
171
|
prv[uniqueKey] = {
|
|
170
172
|
remark: detail["remark"] || "",
|
|
171
173
|
flag: detail["flag"] ? Number(detail["flag"]) : detail["flag"]
|
|
@@ -249,12 +251,15 @@ export default (function (_ref) {
|
|
|
249
251
|
var wdtValues = detail["wdtOrder"] ? wdtOrderBackFormValues(detail["wdtOrder"], templateDetail) : {};
|
|
250
252
|
var bsE3Values = detail["bsE3Order"] ? bsE3OrderBackFormValues(detail["bsE3Order"], templateDetail) : {};
|
|
251
253
|
var kmValues = detail["kmOrder"] ? kmOrderBackFormValues(detail["kmOrder"], templateDetail) : {};
|
|
254
|
+
var jyValues = detail["jyOrder"] ? jyOrderBackFormValues(detail["jyOrder"], templateDetail) : {};
|
|
252
255
|
var gyValues = detail["gyOrder"] ? gyOrderBackFormValues(detail["gyOrder"], templateDetail) : {};
|
|
256
|
+
var jkyValues = detail["jkyOrder"] ? jkyOrderBackFormValues(detail["jkyOrder"], templateDetail) : {};
|
|
257
|
+
console.log("jkyValues", detail, jkyValues);
|
|
253
258
|
//不判断是否存在detail["skxOrder"],不存在直接清空所有skx相关组件值
|
|
254
259
|
var skxValues = detail["skxOrder"] ? skxOrderBackFormValues(detail["skxOrder"], templateDetail) : {};
|
|
255
260
|
var skxReturnValues = detail["skxReturnOrder"] ? skxReturnOrderBackFormValues(detail["skxReturnOrder"], templateDetail) : {};
|
|
256
261
|
pushGyLog("gyValues", gyValues);
|
|
257
262
|
// console.log("bsE3Values", bsE3Values);
|
|
258
263
|
|
|
259
|
-
return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, orderValues), jstValues), bsValues), wlnValues), wdtValues), bsE3Values), kmValues), gyValues), skxValues), skxReturnValues);
|
|
264
|
+
return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, orderValues), jstValues), bsValues), wlnValues), wdtValues), bsE3Values), kmValues), gyValues), jyValues), skxValues), skxReturnValues), jkyValues);
|
|
260
265
|
});
|