@kmkf-fe-packages/kmkf-utils 2.7.2 → 2.7.3-beta.3

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/README.md CHANGED
@@ -1 +1 @@
1
- 112311112
1
+ 112311112311
@@ -124,7 +124,7 @@ export var SYMBOL = {
124
124
  BETWEEN: "between",
125
125
  EQ: "eq"
126
126
  };
127
- export var hasAddNullComponent = ["RADIO", "SELECT", "CHECKBOX", "BASIC_MULT_SELECT", "FLOW_TAG", "WAREHOUSING_STATUS", "BS_E3_WAREHOUSING_STATUS", "ADJUST_WORK_ORDER_STATUS", "ERP_REMARK", "REISSUE_STATUS", "INVOICE_STATUS", "INVOICING_STATUS", "MSG_STATUS", "AGREE_REFUND_STATUS", "REPAIR_ORDER_STATUS", "ERP_AFTER_SALE_STATUS", "REJECT_REFUND_STATUS", "LOGISTICS_INTERCEPTION", "AGREE_RETURN_GOODS_STATUS", "REJECT_RETURN_GOODS_STATUS", "RETURN_EXCHANGE_GOODS_REVIEW_STATUS", "GY_PAYMENT_METHOD"];
127
+ export var hasAddNullComponent = ["RADIO", "SELECT", "CHECKBOX", "BASIC_MULT_SELECT", "FLOW_TAG", "WAREHOUSING_STATUS", "BS_E3_WAREHOUSING_STATUS", "ADJUST_WORK_ORDER_STATUS", "ERP_REMARK", "REISSUE_STATUS", "INVOICE_STATUS", "INVOICING_STATUS", "MSG_STATUS", "AGREE_REFUND_STATUS", "REPAIR_ORDER_STATUS", "ERP_AFTER_SALE_STATUS", "ERP_AFTER_SALES_ORDER_REVIEW_STATUS", "REJECT_REFUND_STATUS", "LOGISTICS_INTERCEPTION", "AGREE_RETURN_GOODS_STATUS", "REJECT_RETURN_GOODS_STATUS", "RETURN_EXCHANGE_GOODS_REVIEW_STATUS", "GY_PAYMENT_METHOD"];
128
128
  export var SelectInputComponent = ["INPUT", "TEXTAREA", "SHOP_NAME_INPUT", "BUYER_NICK_INPUT", "RECEIVER_NAME_INPUT", "REMARK_INPUT", "RETURN_GOODS_STATUS", "EXCHANGE_STATUS", "BS_LOGISTICS", "WLN_LOGISTICS", "WDT_LOGISTICS", "KM_LOGISTICS", "GY_LOGISTICS", "JST_LOGISTICS", "AFTER_SALES_ORDER_ID"];
129
129
 
130
130
  // 表单默认值
@@ -21,6 +21,7 @@ var msgTypeCh = {
21
21
  logistics: "中通/圆通/申通售后群消息",
22
22
  negotiate: "协商售后",
23
23
  QN_LOGISTICS_INTERCEPTION: "物流拦截(平台)",
24
- GET_SYS_ORDER_INFO: "聚水潭同步系统订单信息"
24
+ GET_SYS_ORDER_INFO: "聚水潭同步系统订单信息",
25
+ JST_ADD_MANUAL_ORDER: "聚水潭新增手工订单"
25
26
  };
26
27
  export default msgTypeCh;
@@ -1 +1,2 @@
1
1
  export * from './logisticsData';
2
+ export * from './warehouseData';
@@ -1 +1,2 @@
1
- export * from "./logisticsData";
1
+ export * from "./logisticsData";
2
+ export * from "./warehouseData";
@@ -0,0 +1,7 @@
1
+ declare type WarehouseType = {
2
+ disabled: boolean;
3
+ label: string;
4
+ value: string;
5
+ };
6
+ export declare const getWarehouseDataAsync: () => Promise<WarehouseType[]>;
7
+ export default getWarehouseDataAsync;
@@ -0,0 +1,32 @@
1
+ import { fetchAll } from "../../utils";
2
+ import request from "../../request";
3
+ var queryWarehouseList = function queryWarehouseList(_ref) {
4
+ var pageNo = _ref.pageNo,
5
+ pageSize = _ref.pageSize;
6
+ return request({
7
+ url: "/qy/gdfw/wln/erp/warehouse/list",
8
+ method: "post",
9
+ data: {
10
+ pageNo: pageNo,
11
+ pageSize: pageSize
12
+ }
13
+ });
14
+ };
15
+ export var getWarehouseDataAsync = function getWarehouseDataAsync() {
16
+ return fetchAll("WLN_WAREHOUSE_DATA", queryWarehouseList, function (data) {
17
+ var list = [];
18
+ var warehouses = data || [];
19
+ warehouses.map(function (_ref2) {
20
+ var storageCode = _ref2.storageCode,
21
+ storageName = _ref2.storageName,
22
+ status = _ref2.status;
23
+ list.push({
24
+ label: storageName,
25
+ value: storageCode,
26
+ disabled: [0, 2].includes(status)
27
+ });
28
+ });
29
+ return list;
30
+ });
31
+ };
32
+ export default getWarehouseDataAsync;
@@ -8,7 +8,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
8
8
  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; }
9
9
  function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
10
10
  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); }
11
- import { BSE3, WDT, KM, GY, JST, JY, JKY } from "../servers/index";
11
+ import { BSE3, WDT, KM, GY, JST, JY, JKY, WLN } from "../servers/index";
12
12
  var SendData = /*#__PURE__*/_createClass(function SendData(platform) {
13
13
  var _this = this;
14
14
  _classCallCheck(this, SendData);
@@ -22,8 +22,7 @@ var SendData = /*#__PURE__*/_createClass(function SendData(platform) {
22
22
  case 0:
23
23
  _context.next = 2;
24
24
  return (_this$service = _this.service) === null || _this$service === void 0 ? void 0 : _this$service.getWarehouseDataAsync().then(function (list) {
25
- // console.log("发货仓数据---", this.platform, list);
26
-
25
+ console.log("发货仓数据---", _this.platform, list);
27
26
  _this.sendData = list;
28
27
  });
29
28
  case 2:
@@ -72,7 +71,8 @@ var SendData = /*#__PURE__*/_createClass(function SendData(platform) {
72
71
  gy: GY,
73
72
  jst: JST,
74
73
  jy: JY,
75
- jky: JKY
74
+ jky: JKY,
75
+ wln: WLN
76
76
  }[this.platform];
77
77
  });
78
78
  export var SendDataCenter = /*#__PURE__*/function () {
@@ -0,0 +1,285 @@
1
+ "use strict";
2
+
3
+ var __assign = this && this.__assign || function () {
4
+ __assign = Object.assign || function (t) {
5
+ for (var s, i = 1, n = arguments.length; i < n; i++) {
6
+ s = arguments[i];
7
+ for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
8
+ }
9
+ return t;
10
+ };
11
+ return __assign.apply(this, arguments);
12
+ };
13
+ exports.__esModule = true;
14
+ exports.filterGyOrders = exports.gyOrderBackFormValues = exports.gyOrderTransform = exports.updateGyGoodsHandle = exports.GY_SYSTEM_ORDER_CONFIG = void 0;
15
+ var getUUid_1 = require("./getUUid");
16
+ var deliveryStateMap = {
17
+ 0: "未发货",
18
+ 2: "全部发货"
19
+ };
20
+ exports.GY_SYSTEM_ORDER_CONFIG = {
21
+ key: "gySystemShowOrder",
22
+ name: "管易",
23
+ selectId: "gySystemSelectIds",
24
+ columns: [{
25
+ dataIndex: "billType",
26
+ title: "订单类型",
27
+ width: 150
28
+ }, {
29
+ dataIndex: "billNo",
30
+ title: "系统订单号",
31
+ width: 160
32
+ }, {
33
+ dataIndex: "tradeTagName",
34
+ title: "订单标记名称",
35
+ width: 150
36
+ }, {
37
+ dataIndex: "billTag",
38
+ title: "订单标签",
39
+ width: 150
40
+ }, {
41
+ dataIndex: "deliveryState",
42
+ title: "发货状态",
43
+ width: 150
44
+ }]
45
+ };
46
+ exports.updateGyGoodsHandle = function (orders) {
47
+ if (orders === void 0) {
48
+ orders = [];
49
+ }
50
+ return orders === null || orders === void 0 ? void 0 : orders.reduce(function (acc, cur) {
51
+ if (Array.isArray(cur.details)) {
52
+ acc.push.apply(acc, cur.details.map(function (item) {
53
+ var _a;
54
+ item.goodName = item.itemName;
55
+ item.goodShortName = item.itemSimpleName;
56
+ item.goodNo = item.itemCode;
57
+ item.specNo = item.skuCode;
58
+ item.specName = item.skuName;
59
+ item.canDelete = true;
60
+ item.uuid = (_a = item.uuid) !== null && _a !== void 0 ? _a : getUUid_1["default"]();
61
+ return item;
62
+ }));
63
+ }
64
+ return acc;
65
+ }, []);
66
+ };
67
+ var updateGyItemListHandle = function updateGyItemListHandle(list, type, comList, form) {
68
+ var _a, _b;
69
+ if (type === "logistics") {
70
+ //管易物流信息组件先不做
71
+ // const currentCom = comList?.find?.(
72
+ // (item) => item.workOrderComponentType === "GY_LOGISTICS"
73
+ // );
74
+ // const notOrderBack = currentCom?.componentConfig?.notOrderBack || false;
75
+ // if (notOrderBack) {
76
+ // let currentValue = form.getFieldValue(currentCom.uniqueKey);
77
+ // currentValue = currentValue?.length
78
+ // ? currentValue
79
+ // : [{ logisticsCode: "", logisticsCompany: "" }];
80
+ // return currentValue;
81
+ // }
82
+ } else if (type === "send") {
83
+ var currentCom = (_a = comList === null || comList === void 0 ? void 0 : comList.find) === null || _a === void 0 ? void 0 : _a.call(comList, function (item) {
84
+ return item.workOrderComponentType === "GY_SEND_GOOD";
85
+ });
86
+ var notOrderBack = ((_b = currentCom === null || currentCom === void 0 ? void 0 : currentCom.componentConfig) === null || _b === void 0 ? void 0 : _b.notOrderBack) || false;
87
+ if (notOrderBack) {
88
+ var currentValue = form.getFieldValue(currentCom.uniqueKey);
89
+ currentValue = (currentValue === null || currentValue === void 0 ? void 0 : currentValue.length) ? currentValue : [{
90
+ sendId: "",
91
+ sendName: ""
92
+ }];
93
+ return currentValue;
94
+ }
95
+ }
96
+ var newList = list === null || list === void 0 ? void 0 : list.reduce(function (prv, next) {
97
+ var items = ((next === null || next === void 0 ? void 0 : next.details) || []).map(function (t) {
98
+ return {
99
+ title: (t === null || t === void 0 ? void 0 : t.itemName) || "",
100
+ picUrl: (t === null || t === void 0 ? void 0 : t.picPath) || "",
101
+ platform: "gy",
102
+ skuId: (t === null || t === void 0 ? void 0 : t.itemCode) || ""
103
+ };
104
+ });
105
+ var params = {
106
+ items: items
107
+ };
108
+ if (type === "logistics") {
109
+ // params.logisticsCompany = next?.shippingCode;
110
+ // params.logisticsCode = next?.shippingSn;
111
+ } else if (type === "send") {
112
+ params.sendId = next === null || next === void 0 ? void 0 : next.warehouseCode;
113
+ //下拉框,取id
114
+ params.sendName = next === null || next === void 0 ? void 0 : next.warehouseCode;
115
+ params.sendSnapshotName = next === null || next === void 0 ? void 0 : next.warehouseName;
116
+ }
117
+ prv.push(params);
118
+ return prv;
119
+ }, []);
120
+ if (!(newList === null || newList === void 0 ? void 0 : newList.length)) {
121
+ switch (type) {
122
+ case "logistics":
123
+ newList = [{
124
+ logisticsCode: ""
125
+ }];
126
+ break;
127
+ case "supply":
128
+ newList = [{
129
+ supplyId: ""
130
+ }];
131
+ break;
132
+ case "send":
133
+ newList = [{
134
+ sendId: "",
135
+ sendName: ""
136
+ }];
137
+ break;
138
+ }
139
+ }
140
+ return newList;
141
+ };
142
+ //管易订单信息转换
143
+ exports.gyOrderTransform = function (detail, form) {
144
+ var _a, _b, _c, _d, _e, _f;
145
+ var orderNo = detail.orderNo,
146
+ _g = detail.trades,
147
+ currentTrades = _g === void 0 ? [] : _g,
148
+ componentList = detail.componentList;
149
+ var gyGoodsCom = (componentList || []).find(function (com) {
150
+ return com.workOrderComponentType === "GY_GOODS";
151
+ });
152
+ var isStrict = gyGoodsCom ? (_a = form.getFieldValue(gyGoodsCom.uniqueKey)) === null || _a === void 0 ? void 0 : _a.isStrict : false;
153
+ var onlyOneSystemOrder = (currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.length) === 1;
154
+ console.log("触发---getGyOrderList--4");
155
+ return {
156
+ gySystemOrder: {
157
+ orderNo: orderNo,
158
+ isTest: 4,
159
+ orders: currentTrades.map(function (item) {
160
+ return __assign(__assign({}, item), {
161
+ billNo: item.code,
162
+ billType: item.orderTypeName,
163
+ billTag: item.tagName,
164
+ tradeTagName: item.tradeTagName,
165
+ deliveryState: deliveryStateMap[item.deliveryState]
166
+ });
167
+ }),
168
+ selectIds: onlyOneSystemOrder ? currentTrades.map(function (item) {
169
+ return item.code;
170
+ }) : [],
171
+ showOrderInfo: currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.map(function (item) {
172
+ return __assign(__assign({}, item), {
173
+ billNo: item.code,
174
+ billType: item.orderTypeName,
175
+ billTag: item.tagName,
176
+ tradeTagName: item.tradeTagName,
177
+ deliveryState: deliveryStateMap[item.deliveryState]
178
+ });
179
+ })
180
+ },
181
+ gySystemOrderNo: onlyOneSystemOrder ? (_b = currentTrades[0]) === null || _b === void 0 ? void 0 : _b.code : undefined,
182
+ gyReissueGoods: onlyOneSystemOrder ? exports.updateGyGoodsHandle([currentTrades[0]]).filter(function (good) {
183
+ return !isStrict || !orderNo || good.platformCode === orderNo;
184
+ }) : [],
185
+ gyGoods: {
186
+ // 订单反填,要清空orders,存的是当前系统订单号勾选上的 订单
187
+ orders: currentTrades,
188
+ orderNo: orderNo,
189
+ shopCode: ((_d = (_c = currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.find) === null || _c === void 0 ? void 0 : _c.call(currentTrades, function (item) {
190
+ return item.shopCode;
191
+ })) === null || _d === void 0 ? void 0 : _d.shopCode) || null,
192
+ vipCode: ((_f = (_e = currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.find) === null || _e === void 0 ? void 0 : _e.call(currentTrades, function (item) {
193
+ return item.vipCode;
194
+ })) === null || _f === void 0 ? void 0 : _f.vipCode) || null,
195
+ gyGoods: exports.updateGyGoodsHandle(currentTrades).filter(function (good) {
196
+ return !isStrict || !orderNo || good.platformCode === orderNo;
197
+ })
198
+ },
199
+ // gyLogistics: updateGyItemListHandle(
200
+ // currentTrades,
201
+ // "logistics",
202
+ // componentList || [],
203
+ // form
204
+ // ),
205
+ gySendGood: updateGyItemListHandle(currentTrades, "send", componentList || [], form)
206
+ };
207
+ };
208
+ exports.gyOrderBackFormValues = function (detail, templateDetail) {
209
+ if (detail === void 0) {
210
+ detail = {};
211
+ }
212
+ if (templateDetail === void 0) {
213
+ templateDetail = {};
214
+ }
215
+ return ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
216
+ var _a, _b;
217
+ var uniqueKey = next.uniqueKey;
218
+ var config = next.componentConfig;
219
+ switch (next.workOrderComponentType) {
220
+ case "GY_SYSTEM_ORDER":
221
+ prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.gySystemOrder;
222
+ break;
223
+ case "GY_GOODS":
224
+ prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.gyGoods;
225
+ break;
226
+ case "GY_REISSUE_GOODS":
227
+ prv[uniqueKey] = {
228
+ gySystemOrder: detail === null || detail === void 0 ? void 0 : detail.gySystemOrder,
229
+ gyReissueGoods: detail === null || detail === void 0 ? void 0 : detail.gyReissueGoods,
230
+ gySystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.gySystemOrderNo,
231
+ gyReissueType: ["1"],
232
+ shopCode: (_a = detail === null || detail === void 0 ? void 0 : detail.gyGoods) === null || _a === void 0 ? void 0 : _a.shopCode,
233
+ vipCode: (_b = detail === null || detail === void 0 ? void 0 : detail.gyGoods) === null || _b === void 0 ? void 0 : _b.vipCode
234
+ };
235
+ break;
236
+ case "GY_LOGISTICS":
237
+ prv[uniqueKey] = updateGyItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.gyLogistics, "logistics", config);
238
+ break;
239
+ case "GY_SEND_GOOD":
240
+ prv[uniqueKey] = updateGyItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.gySendGood, "send", config);
241
+ }
242
+ return prv;
243
+ }, {});
244
+ };
245
+ var updateGyItemListByConfigHandle = function updateGyItemListByConfigHandle(list, type, config) {
246
+ if (config === void 0) {
247
+ config = {};
248
+ }
249
+ var showField = config.showField,
250
+ _a = config.notOrderBack,
251
+ notOrderBack = _a === void 0 ? false : _a;
252
+ if (notOrderBack) {
253
+ return list;
254
+ }
255
+ return list === null || list === void 0 ? void 0 : list.reduce(function (prv, next) {
256
+ if (type === "logistics") {
257
+ if (!["logisticsCompany", ""].includes(showField || "")) {
258
+ next.logisticsCompany = undefined;
259
+ }
260
+ if (!["logisticsCode", ""].includes(showField || "")) {
261
+ next.logisticsCode = undefined;
262
+ }
263
+ } else if (type === "send") {
264
+ if (!["sendId", "all"].includes(showField || "")) {
265
+ next.sendId = undefined;
266
+ }
267
+ if (!["sendName", "all"].includes(showField || "")) {
268
+ next.sendName = undefined;
269
+ next.sendSnapshotName = undefined;
270
+ }
271
+ }
272
+ prv.push(next);
273
+ return prv;
274
+ }, []);
275
+ };
276
+ // 管易根据订单号请求返回的platformCode会有多个订单号组合在一起的数据 排除其他的,返回当前订单号
277
+ exports.filterGyOrders = function (trades, order_no) {
278
+ var currentTrades = (trades || []).filter(function (item) {
279
+ return (item.platformCode || "").split(",").includes(order_no);
280
+ });
281
+ if (currentTrades.length) {
282
+ return currentTrades;
283
+ }
284
+ return [];
285
+ };
@@ -17,9 +17,10 @@ interface OrderBackFormValuesI {
17
17
  formValue?: Record<string, unknown>;
18
18
  order_no?: string | null;
19
19
  detail: Record<string, unknown>;
20
- fromQNCreateWorkOrderByOrderNo: boolean;
20
+ fromQNCreateWorkOrderByOrderNo?: boolean;
21
+ skipOrderBackUniqueKeys?: string[];
21
22
  _get_order_fail_?: boolean;
22
23
  shopId?: string;
23
24
  }
24
- declare const _default: ({ shopId, _get_order_fail_, detail, order_no, formValue, templateDetail, type, fromQNCreateWorkOrderByOrderNo, }: OrderBackFormValuesI) => any;
25
+ declare const _default: ({ shopId, _get_order_fail_, detail, order_no, formValue, templateDetail, type, fromQNCreateWorkOrderByOrderNo, skipOrderBackUniqueKeys, }: OrderBackFormValuesI) => any;
25
26
  export default _default;
@@ -86,7 +86,9 @@ export default (function (_ref) {
86
86
  _ref$type = _ref.type,
87
87
  type = _ref$type === void 0 ? "add" : _ref$type,
88
88
  _ref$fromQNCreateWork = _ref.fromQNCreateWorkOrderByOrderNo,
89
- fromQNCreateWorkOrderByOrderNo = _ref$fromQNCreateWork === void 0 ? false : _ref$fromQNCreateWork;
89
+ fromQNCreateWorkOrderByOrderNo = _ref$fromQNCreateWork === void 0 ? false : _ref$fromQNCreateWork,
90
+ _ref$skipOrderBackUni = _ref.skipOrderBackUniqueKeys,
91
+ skipOrderBackUniqueKeys = _ref$skipOrderBackUni === void 0 ? [] : _ref$skipOrderBackUni;
90
92
  var orderValues = !_get_order_fail_ ? ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
91
93
  var _next$componentConfig, _ref2, _detail$expressLogist, _detail$returnLogisti, _next$componentConfig2, _next$componentConfig3, _next$componentConfig4;
92
94
  var uniqueKey = next.uniqueKey;
@@ -94,7 +96,7 @@ export default (function (_ref) {
94
96
  var city = null,
95
97
  town = null;
96
98
  // console.log("--订单返填数据重组", next.workOrderComponentType);
97
-
99
+ if (skipOrderBackUniqueKeys.includes(uniqueKey)) return prv;
98
100
  switch (next.workOrderComponentType) {
99
101
  case "TRADE_ID_INPUT":
100
102
  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"];
@@ -521,7 +521,8 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
521
521
  _detail$allOrders = detail.allOrders,
522
522
  allOrders = _detail$allOrders === void 0 ? [] : _detail$allOrders,
523
523
  _detail$wdtReturnOrde = detail.wdtReturnOrders,
524
- wdtReturnOrders = _detail$wdtReturnOrde === void 0 ? [] : _detail$wdtReturnOrde;
524
+ wdtReturnOrders = _detail$wdtReturnOrde === void 0 ? [] : _detail$wdtReturnOrde,
525
+ matchLogisticsNo = detail.matchLogisticsNo;
525
526
  var wdtGoodsCom = (componentList || []).find(function (com) {
526
527
  return com.workOrderComponentType === "WDT_GOODS";
527
528
  });
@@ -532,6 +533,11 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
532
533
  var isStrict = wdtGoodsCom ? (_form$getFieldValue = form.getFieldValue(wdtGoodsCom.uniqueKey)) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.isStrict : false;
533
534
  var onlyOneSystemOrder = (detail === null || detail === void 0 ? void 0 : (_detail$trades2 = detail.trades) === null || _detail$trades2 === void 0 ? void 0 : _detail$trades2.length) === 1;
534
535
  var defaultOrder = currentTrades !== null && currentTrades !== void 0 && currentTrades[0] ? [currentTrades[0]] : [];
536
+ var matchedSystemOrderIds = matchLogisticsNo ? currentTrades.filter(function (item) {
537
+ return "".concat((item === null || item === void 0 ? void 0 : item.logisticsNo) || "").trim() === "".concat(matchLogisticsNo).trim();
538
+ }).map(function (item) {
539
+ return item.tradeNo;
540
+ }) : [];
535
541
  return {
536
542
  wdtSystemOrder: {
537
543
  //标记通过请求获取的值
@@ -546,7 +552,7 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
546
552
  logisticsName: ExpressData.getInstance("wdt").getExpressNameByCode(item === null || item === void 0 ? void 0 : item.logisticsCode, false) || (item === null || item === void 0 ? void 0 : item.logisticsName)
547
553
  });
548
554
  }),
549
- selectIds: onlyOneSystemOrder ? currentTrades.map(function (item) {
555
+ selectIds: matchedSystemOrderIds.length ? matchedSystemOrderIds : onlyOneSystemOrder ? currentTrades.map(function (item) {
550
556
  return item.tradeNo;
551
557
  }) : [],
552
558
  showOrderInfo: currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.map(function (item) {
@@ -11,7 +11,7 @@ export declare const WLN_SYSTEM_ORDER_CONFIG: {
11
11
  };
12
12
  export declare const updateWlnGoodsHandle: (orders?: any[]) => any;
13
13
  export declare const wlnOrderBackFormValues: (detail?: any, templateDetail?: any) => any;
14
- export declare const wlnOrderTransform: (detail: any) => {
14
+ export declare const wlnOrderTransform: (detail: any, form: any) => {
15
15
  wlnSystemOrder: {
16
16
  orderNo: any;
17
17
  orders: any;
@@ -32,6 +32,54 @@ export var WLN_SYSTEM_ORDER_CONFIG = {
32
32
  title: "标记",
33
33
  dataIndex: "billTag",
34
34
  width: 150
35
+ }, {
36
+ title: "是否拆分订单",
37
+ dataIndex: "splitTrade",
38
+ width: 150
39
+ }, {
40
+ title: "是否售后订单",
41
+ dataIndex: "exchangeTrade",
42
+ width: 150
43
+ }, {
44
+ title: "是否有退款",
45
+ dataIndex: "hasRefund",
46
+ width: 150
47
+ }, {
48
+ title: "是否预售订单",
49
+ dataIndex: "preSale",
50
+ width: 150
51
+ }, {
52
+ title: "合并前系统单号",
53
+ dataIndex: "mergeUids",
54
+ width: 150
55
+ }, {
56
+ title: "快递公司名称",
57
+ dataIndex: "logisticName",
58
+ width: 150
59
+ }, {
60
+ title: "快递公司编码",
61
+ dataIndex: "logisticCode",
62
+ width: 150
63
+ }, {
64
+ title: "快递单号",
65
+ dataIndex: "expressCode",
66
+ width: 150
67
+ }, {
68
+ title: "发货仓名称",
69
+ dataIndex: "storageName",
70
+ width: 150
71
+ }, {
72
+ title: "发货仓编码",
73
+ dataIndex: "storageCode",
74
+ width: 150
75
+ }, {
76
+ title: "单据处理状态",
77
+ dataIndex: "processStatus",
78
+ width: 150
79
+ }, {
80
+ title: "线上单号",
81
+ dataIndex: "tpTid",
82
+ width: 150
35
83
  }]
36
84
  };
37
85
  export var updateWlnGoodsHandle = function updateWlnGoodsHandle() {
@@ -68,8 +116,39 @@ export var updateWlnGoodsHandle = function updateWlnGoodsHandle() {
68
116
  }, []);
69
117
  return list;
70
118
  };
71
- var updateWlnItemListHandle = function updateWlnItemListHandle(list, type) {
119
+ var updateWlnItemListHandle = function updateWlnItemListHandle(list, type, comList, form) {
72
120
  var _newList;
121
+ if (type === "logistics") {
122
+ var _comList$find, _currentCom$component;
123
+ 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) {
124
+ return item.workOrderComponentType === "WLN_LOGISTICS";
125
+ });
126
+ var notOrderBack = (currentCom === null || currentCom === void 0 ? void 0 : (_currentCom$component = currentCom.componentConfig) === null || _currentCom$component === void 0 ? void 0 : _currentCom$component.notOrderBack) || false;
127
+ if (notOrderBack) {
128
+ var _currentValue;
129
+ var currentValue = form.getFieldValue(currentCom.uniqueKey);
130
+ currentValue = (_currentValue = currentValue) !== null && _currentValue !== void 0 && _currentValue.length ? currentValue : [{
131
+ logisticsCode: "",
132
+ logisticsCompany: ""
133
+ }];
134
+ return currentValue;
135
+ }
136
+ } else if (type === "send") {
137
+ var _comList$find2, _currentCom$component2;
138
+ 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) {
139
+ return item.workOrderComponentType === "WLN_SEND_GOOD";
140
+ });
141
+ var _notOrderBack = (_currentCom === null || _currentCom === void 0 ? void 0 : (_currentCom$component2 = _currentCom.componentConfig) === null || _currentCom$component2 === void 0 ? void 0 : _currentCom$component2.notOrderBack) || false;
142
+ if (_notOrderBack) {
143
+ var _currentValue3;
144
+ var _currentValue2 = form.getFieldValue(_currentCom.uniqueKey);
145
+ _currentValue2 = (_currentValue3 = _currentValue2) !== null && _currentValue3 !== void 0 && _currentValue3.length ? _currentValue2 : [{
146
+ sendId: "",
147
+ sendName: ""
148
+ }];
149
+ return _currentValue2;
150
+ }
151
+ }
73
152
  var newList = list === null || list === void 0 ? void 0 : list.reduce(function (prv, next) {
74
153
  var items = (next.items || []).map(function (t) {
75
154
  return {
@@ -161,8 +240,36 @@ export var wlnOrderBackFormValues = function wlnOrderBackFormValues() {
161
240
  }, {});
162
241
  };
163
242
  //wln订单信息转换
164
- export var wlnOrderTransform = function wlnOrderTransform(detail) {
165
- var _detail$orders, _ref, _detail$orders2, _detail$orders2$;
243
+ export var wlnOrderTransform = function wlnOrderTransform(detail, form) {
244
+ var _form$getFieldValue, _wlnReissueCom$compon, _wlnGoodsCom$componen, _wlnReissueCom$compon2, _detail$orders, _ref, _detail$orders2, _detail$orders2$;
245
+ console.log("\uD83D\uDE80 ~ wlnOrderBackFormValues.ts:265 ~ wlnOrderTransform ~ detail:", detail);
246
+ var _detail$allOrders = detail.allOrders,
247
+ allOrders = _detail$allOrders === void 0 ? [] : _detail$allOrders,
248
+ orderNo = detail.orderNo,
249
+ _detail$trades = detail.trades,
250
+ currentTrades = _detail$trades === void 0 ? [] : _detail$trades,
251
+ componentList = detail.componentList;
252
+ var filterCurrentTrades = currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.filter(function (trade) {
253
+ return !trade.cancel;
254
+ });
255
+ var wlnGoodsCom = (componentList || []).find(function (com) {
256
+ return com.workOrderComponentType === "WLN_GOODS";
257
+ });
258
+ var wlnReissueCom = (componentList || []).find(function (com) {
259
+ return com.workOrderComponentType === "WLN_REISSUE_GOODS";
260
+ });
261
+ var isStrict = wlnGoodsCom ? (_form$getFieldValue = form.getFieldValue(wlnGoodsCom.uniqueKey)) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.isStrict : false;
262
+ var onlyOneSystemOrder = (filterCurrentTrades === null || filterCurrentTrades === void 0 ? void 0 : filterCurrentTrades.length) === 1;
263
+ var isReissueDefaultSelect = !!(wlnReissueCom !== null && wlnReissueCom !== void 0 && (_wlnReissueCom$compon = wlnReissueCom.componentConfig) !== null && _wlnReissueCom$compon !== void 0 && _wlnReissueCom$compon.showDefaultSelect);
264
+ var wlnGoodsOrderBackGoodsLevel = wlnGoodsCom === null || wlnGoodsCom === void 0 ? void 0 : (_wlnGoodsCom$componen = wlnGoodsCom.componentConfig) === null || _wlnGoodsCom$componen === void 0 ? void 0 : _wlnGoodsCom$componen.orderBackGoodsLevel;
265
+ var wlnReissueGoodsOrderBackGoodsLevel = wlnReissueCom === null || wlnReissueCom === void 0 ? void 0 : (_wlnReissueCom$compon2 = wlnReissueCom.componentConfig) === null || _wlnReissueCom$compon2 === void 0 ? void 0 : _wlnReissueCom$compon2.orderBackGoodsLevel;
266
+ console.log('**** ', {
267
+ isStrict: isStrict,
268
+ onlyOneSystemOrder: onlyOneSystemOrder,
269
+ isReissueDefaultSelect: isReissueDefaultSelect,
270
+ wlnGoodsOrderBackGoodsLevel: wlnGoodsOrderBackGoodsLevel,
271
+ wlnReissueGoodsOrderBackGoodsLevel: wlnReissueGoodsOrderBackGoodsLevel
272
+ });
166
273
  return {
167
274
  wlnSystemOrder: {
168
275
  orderNo: detail === null || detail === void 0 ? void 0 : detail.tradeNo,
@@ -189,7 +296,7 @@ export var wlnOrderTransform = function wlnOrderTransform(detail) {
189
296
  wlnGoods: updateWlnGoodsHandle(detail === null || detail === void 0 ? void 0 : detail.orders),
190
297
  allOrders: detail === null || detail === void 0 ? void 0 : detail.allOrders
191
298
  },
192
- wlnLogistics: updateWlnItemListHandle(detail === null || detail === void 0 ? void 0 : detail.orders, "logistics"),
193
- wlnSendGood: updateWlnItemListHandle(detail === null || detail === void 0 ? void 0 : detail.orders, "send")
299
+ wlnLogistics: updateWlnItemListHandle(detail === null || detail === void 0 ? void 0 : detail.orders, "logistics", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
300
+ wlnSendGood: updateWlnItemListHandle(detail === null || detail === void 0 ? void 0 : detail.orders, "send", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form)
194
301
  };
195
302
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/kmkf-utils",
3
- "version": "2.7.2",
3
+ "version": "2.7.3-beta.3",
4
4
  "module": "dist/esm/index.js",
5
5
  "typings": "dist/esm/index.d.ts",
6
6
  "files": [
@@ -41,7 +41,7 @@
41
41
  "publishConfig": {
42
42
  "access": "public"
43
43
  },
44
- "gitHead": "0935ddda3b736925b7e9cf3d6df86c85ef2f8048",
44
+ "gitHead": "17c3e4f893ab465e7dd65db2541ce63d9d9f984d",
45
45
  "gitHooks": {
46
46
  "pre-commit": "lint-staged"
47
47
  }