@kmkf-fe-packages/kmkf-utils 2.0.73 → 2.0.75

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.
@@ -376,7 +376,7 @@ export var bsE3OrderBackFormValues = function bsE3OrderBackFormValues() {
376
376
  };
377
377
  //bsE3订单信息转换
378
378
  export var bsE3OrderTransform = function bsE3OrderTransform(detail, form) {
379
- var _form$getFieldValue, _newOrderList$, _orderList$find, _orderList$find$call;
379
+ var _form$getFieldValue, _bsE3ReissueCom$compo, _newOrderList$, _orderList$find, _orderList$find$call;
380
380
  var orderNo = detail.orderNo,
381
381
  _detail$orderList = detail.orderList,
382
382
  orderList = _detail$orderList === void 0 ? [] : _detail$orderList,
@@ -384,6 +384,9 @@ export var bsE3OrderTransform = function bsE3OrderTransform(detail, form) {
384
384
  var bsE3GoodsCom = (componentList || []).find(function (com) {
385
385
  return com.workOrderComponentType === "BS_E3_GOODS";
386
386
  });
387
+ var bsE3ReissueCom = (componentList || []).find(function (com) {
388
+ return com.workOrderComponentType === "BS_E3_REISSUE_GOODS";
389
+ });
387
390
  var isStrict = bsE3GoodsCom ? (_form$getFieldValue = form.getFieldValue(bsE3GoodsCom.uniqueKey)) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.isStrict : false;
388
391
  var newOrderList = orderList === null || orderList === void 0 ? void 0 : orderList.map(function (item) {
389
392
  return _objectSpread(_objectSpread({}, item), {}, {
@@ -391,6 +394,8 @@ export var bsE3OrderTransform = function bsE3OrderTransform(detail, form) {
391
394
  });
392
395
  });
393
396
  var onlyOneSystemOrder = (newOrderList === null || newOrderList === void 0 ? void 0 : newOrderList.length) === 1;
397
+ var isReissueDefaultSelect = !!(bsE3ReissueCom !== null && bsE3ReissueCom !== void 0 && (_bsE3ReissueCom$compo = bsE3ReissueCom.componentConfig) !== null && _bsE3ReissueCom$compo !== void 0 && _bsE3ReissueCom$compo.showDefaultSelect);
398
+ var defaultOrder = newOrderList !== null && newOrderList !== void 0 && newOrderList[0] ? [newOrderList[0]] : [];
394
399
  return {
395
400
  bsE3SystemOrder: {
396
401
  orderNo: orderNo,
@@ -401,8 +406,8 @@ export var bsE3OrderTransform = function bsE3OrderTransform(detail, form) {
401
406
  showOrderInfo: newOrderList
402
407
  },
403
408
  // TODO: 当只有一条系统单时默认选中该系统单
404
- bsE3SystemOrderNo: onlyOneSystemOrder ? (_newOrderList$ = newOrderList[0]) === null || _newOrderList$ === void 0 ? void 0 : _newOrderList$.billNo : undefined,
405
- bsE3ReissueGoods: onlyOneSystemOrder ? updateBsE3GoodsHandle([newOrderList[0]], "sharePrice").filter(function (good) {
409
+ bsE3SystemOrderNo: onlyOneSystemOrder || isReissueDefaultSelect ? (_newOrderList$ = newOrderList[0]) === null || _newOrderList$ === void 0 ? void 0 : _newOrderList$.billNo : undefined,
410
+ bsE3ReissueGoods: onlyOneSystemOrder || isReissueDefaultSelect ? updateBsE3GoodsHandle(defaultOrder, "sharePrice").filter(function (good) {
406
411
  return !isStrict || !orderNo || good.originalDealCode === orderNo;
407
412
  }) : [],
408
413
  bsE3Goods: {
@@ -9,9 +9,7 @@ export declare const BS_SYSTEM_ORDER_CONFIG: {
9
9
  }[];
10
10
  };
11
11
  export declare const bsOrderBackFormValues: (detail?: any, templateDetail?: any) => any;
12
- export declare const specialCascader = "8MIqJOso1j";
13
- export declare const hasQualityValue: (value: any[], uniqueKey: string, componentConfig: Record<any, string>) => boolean;
14
- export declare const bsOrderTransform: ({ detail, componentDtoList, form }: any) => {
12
+ export declare const bsOrderTransform: ({ detail }: any) => {
15
13
  bsSystemOrder: {
16
14
  orderNo: any;
17
15
  orders: any;
@@ -7,7 +7,6 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
7
7
  import ExpressData from "../expressData";
8
8
  import ExpressInterceptData from "../expressInterceptData";
9
9
  import uuid from "./getUUid";
10
- import { findLabelBySelectValue } from "./index";
11
10
  export var BS_SYSTEM_ORDER_CONFIG = {
12
11
  key: "bsSystemShowOrder",
13
12
  name: "百胜",
@@ -43,7 +42,6 @@ export var BS_SYSTEM_ORDER_CONFIG = {
43
42
 
44
43
  var updateBsGoodsHandle = function updateBsGoodsHandle() {
45
44
  var orders = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
46
- var hasQuality = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
47
45
  var list = orders.reduce(function (prv, next) {
48
46
  var goods = next.items.map(function (item) {
49
47
  var id = item.id,
@@ -82,7 +80,7 @@ var updateBsGoodsHandle = function updateBsGoodsHandle() {
82
80
  return prv;
83
81
  }, []);
84
82
  //如果数量大于1 商品标记为否
85
- if (list.length > 1 && !hasQuality) {
83
+ if (list.length > 1) {
86
84
  list = list.map(function (item) {
87
85
  item.mark = "否";
88
86
  return item;
@@ -284,36 +282,12 @@ export var bsOrderBackFormValues = function bsOrderBackFormValues() {
284
282
  return prv;
285
283
  }, {});
286
284
  };
287
- // 花西子特定自定义组件 写死
288
- export var specialCascader = "8MIqJOso1j";
289
- // 花西子定制需求对应的问题场景自定义多级下拉组件uniqueKey
290
285
 
291
- export var hasQualityValue = function hasQualityValue(value, uniqueKey, componentConfig) {
292
- if (specialCascader === uniqueKey) {
293
- var _findLabelBySelectVal, _findLabelBySelectVal2;
294
- var label = (_findLabelBySelectVal = findLabelBySelectValue(value, componentConfig === null || componentConfig === void 0 ? void 0 : componentConfig.options)) === null || _findLabelBySelectVal === void 0 ? void 0 : (_findLabelBySelectVal2 = _findLabelBySelectVal.map(function (item) {
295
- return item.label;
296
- })) === null || _findLabelBySelectVal2 === void 0 ? void 0 : _findLabelBySelectVal2[0];
297
- return label === "质量类";
298
- }
299
- return false;
300
- };
301
286
  //bs订单信息转换
302
287
  export var bsOrderTransform = function bsOrderTransform(_ref) {
303
288
  var _detail$orders, _detail$orders$, _detail$orders$$advan, _detail$orders2, _ref2, _detail$orders3, _detail$orders3$, _detail$orders3$$adva, _detail$orders3$$adva2;
304
- var detail = _ref.detail,
305
- componentDtoList = _ref.componentDtoList,
306
- form = _ref.form;
289
+ var detail = _ref.detail;
307
290
  var advItem = (detail === null || detail === void 0 ? void 0 : (_detail$orders = detail.orders) === null || _detail$orders === void 0 ? void 0 : (_detail$orders$ = _detail$orders[0]) === null || _detail$orders$ === void 0 ? void 0 : (_detail$orders$$advan = _detail$orders$.advancedDistributionInfos) === null || _detail$orders$$advan === void 0 ? void 0 : _detail$orders$$advan[0]) || {};
308
- // 花西子定制的问题场景自定义组件,判断改组件的值是否为质量类
309
- var cascader = componentDtoList === null || componentDtoList === void 0 ? void 0 : componentDtoList.find(function (item) {
310
- return specialCascader === (item === null || item === void 0 ? void 0 : item.uniqueKey);
311
- });
312
- var hasQuality = false;
313
- if (cascader !== null && cascader !== void 0 && cascader.componentConfig) {
314
- var v = form.getFieldValue(specialCascader);
315
- hasQuality = hasQualityValue(v, cascader.uniqueKey, cascader === null || cascader === void 0 ? void 0 : cascader.componentConfig);
316
- }
317
291
  return {
318
292
  bsSystemOrder: {
319
293
  orderNo: detail === null || detail === void 0 ? void 0 : detail.sourceBillNo,
@@ -348,7 +322,7 @@ export var bsOrderTransform = function bsOrderTransform(_ref) {
348
322
  }, 0) || null,
349
323
  bsGoods: {
350
324
  shopCode: detail === null || detail === void 0 ? void 0 : detail.shopCode,
351
- bsGoods: updateBsGoodsHandle(detail === null || detail === void 0 ? void 0 : detail.orders, hasQuality)
325
+ bsGoods: updateBsGoodsHandle(detail === null || detail === void 0 ? void 0 : detail.orders)
352
326
  },
353
327
  bsExchangeGoods: {
354
328
  shopCode: detail === null || detail === void 0 ? void 0 : detail.shopCode,
@@ -20,6 +20,7 @@ export declare const gyOrderTransform: (detail: any, form: any) => {
20
20
  selectIds: any;
21
21
  showOrderInfo: any;
22
22
  };
23
+ gyReturnSystemOrderNo: any;
23
24
  gySystemOrderNo: any;
24
25
  gyReissueGoods: any;
25
26
  gyReturnGoods: any;
@@ -178,16 +178,28 @@ var updateGyItemListHandle = function updateGyItemListHandle(list, type, comList
178
178
 
179
179
  //管易订单信息转换
180
180
  export var gyOrderTransform = function gyOrderTransform(detail, form) {
181
- var _form$getFieldValue, _currentTrades$, _currentTrades$find, _currentTrades$find$c, _currentTrades$find2, _currentTrades$find2$, _currentTrades$find3, _currentTrades$find3$, _currentTrades$find4, _currentTrades$find4$;
181
+ var _form$getFieldValue, _gyReissueCom$compone, _gyReturnCom$componen, _filterCurrentTrades$, _filterCurrentTrades$2, _currentTrades$find, _currentTrades$find$c, _currentTrades$find2, _currentTrades$find2$, _currentTrades$find3, _currentTrades$find3$, _currentTrades$find4, _currentTrades$find4$;
182
182
  var orderNo = detail.orderNo,
183
183
  _detail$trades = detail.trades,
184
184
  currentTrades = _detail$trades === void 0 ? [] : _detail$trades,
185
185
  componentList = detail.componentList;
186
+ var filterCurrentTrades = currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.filter(function (trade) {
187
+ return !trade.cancel;
188
+ });
186
189
  var gyGoodsCom = (componentList || []).find(function (com) {
187
190
  return com.workOrderComponentType === "GY_GOODS";
188
191
  });
192
+ var gyReissueCom = (componentList || []).find(function (com) {
193
+ return com.workOrderComponentType === "GY_REISSUE_GOODS";
194
+ });
195
+ var gyReturnCom = (componentList || []).find(function (com) {
196
+ return com.workOrderComponentType === "GY_RETURN_GOODS";
197
+ });
189
198
  var isStrict = gyGoodsCom ? (_form$getFieldValue = form.getFieldValue(gyGoodsCom.uniqueKey)) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.isStrict : false;
190
- var onlyOneSystemOrder = (currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.length) === 1;
199
+ var onlyOneSystemOrder = (filterCurrentTrades === null || filterCurrentTrades === void 0 ? void 0 : filterCurrentTrades.length) === 1;
200
+ var isReissueDefaultSelect = !!(gyReissueCom !== null && gyReissueCom !== void 0 && (_gyReissueCom$compone = gyReissueCom.componentConfig) !== null && _gyReissueCom$compone !== void 0 && _gyReissueCom$compone.showDefaultSelect);
201
+ var isReturnDefaultSelect = !!(gyReturnCom !== null && gyReturnCom !== void 0 && (_gyReturnCom$componen = gyReturnCom.componentConfig) !== null && _gyReturnCom$componen !== void 0 && _gyReturnCom$componen.showDefaultSelect);
202
+ var defaultOrder = filterCurrentTrades !== null && filterCurrentTrades !== void 0 && filterCurrentTrades[0] ? [filterCurrentTrades[0]] : [];
191
203
  return {
192
204
  gySystemOrder: {
193
205
  orderNo: orderNo,
@@ -221,11 +233,12 @@ export var gyOrderTransform = function gyOrderTransform(detail, form) {
221
233
  });
222
234
  })
223
235
  },
224
- gySystemOrderNo: onlyOneSystemOrder ? (_currentTrades$ = currentTrades[0]) === null || _currentTrades$ === void 0 ? void 0 : _currentTrades$.code : undefined,
225
- gyReissueGoods: onlyOneSystemOrder ? updateGyGoodsHandle([currentTrades[0]]).filter(function (good) {
236
+ gyReturnSystemOrderNo: onlyOneSystemOrder || isReturnDefaultSelect ? (_filterCurrentTrades$ = filterCurrentTrades[0]) === null || _filterCurrentTrades$ === void 0 ? void 0 : _filterCurrentTrades$.code : undefined,
237
+ gySystemOrderNo: onlyOneSystemOrder || isReissueDefaultSelect ? (_filterCurrentTrades$2 = filterCurrentTrades[0]) === null || _filterCurrentTrades$2 === void 0 ? void 0 : _filterCurrentTrades$2.code : undefined,
238
+ gyReissueGoods: onlyOneSystemOrder || isReissueDefaultSelect ? updateGyGoodsHandle(defaultOrder).filter(function (good) {
226
239
  return !isStrict || !orderNo || getIsPlatformCodesIncludeOrderNos(good.platformCode, orderNo);
227
240
  }) : [],
228
- gyReturnGoods: onlyOneSystemOrder ? updateGyGoodsHandle([currentTrades[0]]).filter(function (good) {
241
+ gyReturnGoods: onlyOneSystemOrder || isReturnDefaultSelect ? updateGyGoodsHandle(defaultOrder).filter(function (good) {
229
242
  return !isStrict || !orderNo || getIsPlatformCodesIncludeOrderNos(good.platformCode, orderNo);
230
243
  }) : [],
231
244
  gyGoods: {
@@ -302,7 +315,7 @@ export var gyOrderBackFormValues = function gyOrderBackFormValues() {
302
315
  prv[uniqueKey] = {
303
316
  gySystemOrder: detail === null || detail === void 0 ? void 0 : detail.gySystemOrder,
304
317
  gyReturnGoods: _initReason === "2" ? [] : detail === null || detail === void 0 ? void 0 : detail.gyReturnGoods,
305
- gySystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.gySystemOrderNo,
318
+ gySystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.gyReturnSystemOrderNo,
306
319
  shopCode: (detail === null || detail === void 0 ? void 0 : (_detail$gyGoods3 = detail.gyGoods) === null || _detail$gyGoods3 === void 0 ? void 0 : _detail$gyGoods3.shopCode) || (detail === null || detail === void 0 ? void 0 : detail.shopCode) || (detail === null || detail === void 0 ? void 0 : (_detail$gySystemOrder13 = detail.gySystemOrder) === null || _detail$gySystemOrder13 === void 0 ? void 0 : (_detail$gySystemOrder14 = _detail$gySystemOrder13.orders) === null || _detail$gySystemOrder14 === void 0 ? void 0 : (_detail$gySystemOrder15 = _detail$gySystemOrder14[0]) === null || _detail$gySystemOrder15 === void 0 ? void 0 : _detail$gySystemOrder15.shopCode) || (detail === null || detail === void 0 ? void 0 : (_detail$gySystemOrder16 = detail.gySystemOrder) === null || _detail$gySystemOrder16 === void 0 ? void 0 : (_detail$gySystemOrder17 = _detail$gySystemOrder16.showOrderInfo) === null || _detail$gySystemOrder17 === void 0 ? void 0 : (_detail$gySystemOrder18 = _detail$gySystemOrder17[0]) === null || _detail$gySystemOrder18 === void 0 ? void 0 : _detail$gySystemOrder18.shopCode),
307
320
  gyReturnType: [_initReason]
308
321
  };
@@ -7,7 +7,7 @@ export { default as getExpression } from "./getExpression";
7
7
  export { default as formatDisplayConfig } from "./formatDisplayConfig";
8
8
  export { default as orderBackFormValues } from "./orderBackFormValues";
9
9
  export { default as pushGyLog } from "./pushGyLog";
10
- export { BS_SYSTEM_ORDER_CONFIG, bsOrderBackFormValues, bsOrderTransform, hasQualityValue, } from "./bsOrderBackFormValues";
10
+ export { BS_SYSTEM_ORDER_CONFIG, bsOrderBackFormValues, bsOrderTransform, } from "./bsOrderBackFormValues";
11
11
  export { bsE3OrderBackFormValues, bsE3OrderTransform, updateBsE3GoodsHandle, filterBsE3Orders, BS_E3_ORDER_STATUS_MAP, BS_E3_BOOLEAN_STATUS_MAP, BS_E3_SYSTEM_ORDER_CONFIG, } from "./bsE3OrderBackFormValues";
12
12
  export { WLN_SYSTEM_ORDER_CONFIG, wlnOrderBackFormValues, wlnOrderTransform, } from "./wlnOrderBackFormValues";
13
13
  export { WDT_SYSTEM_ORDER_CONFIG, wdtOrderBackFormValues, wdtOrderTransform, WDT_ORDER_TYPE_MAP, filterWdtOrders, updateWdtGoodsHandle, tradeStatusMap, } from "./wdtOrderBackFormValues";
@@ -7,7 +7,7 @@ export { default as getExpression } from "./getExpression";
7
7
  export { default as formatDisplayConfig } from "./formatDisplayConfig";
8
8
  export { default as orderBackFormValues } from "./orderBackFormValues";
9
9
  export { default as pushGyLog } from "./pushGyLog";
10
- export { BS_SYSTEM_ORDER_CONFIG, bsOrderBackFormValues, bsOrderTransform, hasQualityValue } from "./bsOrderBackFormValues";
10
+ export { BS_SYSTEM_ORDER_CONFIG, bsOrderBackFormValues, bsOrderTransform } from "./bsOrderBackFormValues";
11
11
  export { bsE3OrderBackFormValues, bsE3OrderTransform, updateBsE3GoodsHandle, filterBsE3Orders, BS_E3_ORDER_STATUS_MAP, BS_E3_BOOLEAN_STATUS_MAP, BS_E3_SYSTEM_ORDER_CONFIG } from "./bsE3OrderBackFormValues";
12
12
  export { WLN_SYSTEM_ORDER_CONFIG, wlnOrderBackFormValues, wlnOrderTransform } from "./wlnOrderBackFormValues";
13
13
  export { WDT_SYSTEM_ORDER_CONFIG, wdtOrderBackFormValues, wdtOrderTransform, WDT_ORDER_TYPE_MAP, filterWdtOrders, updateWdtGoodsHandle, tradeStatusMap } from "./wdtOrderBackFormValues";
@@ -22,10 +22,12 @@ export declare const jstOrderTransform: (detail: any, form: any) => {
22
22
  selectIds: any;
23
23
  showOrderInfo: any;
24
24
  };
25
+ jstReturnSystemOrderNo: any;
25
26
  jstSystemOrderNo: any;
26
27
  jstReissueGoods: any;
27
28
  jstReturnGoods: any;
28
29
  jstSystemOrderBillType: any;
30
+ jstReturnSystemOrderBillType: any;
29
31
  jstGoods: {
30
32
  orders: any;
31
33
  orderNo: any;
@@ -237,10 +237,10 @@ export var jstOrderBackFormValues = function jstOrderBackFormValues() {
237
237
  var _initReason = !isNull(config === null || config === void 0 ? void 0 : config.initReason) ? config.initReason : "1";
238
238
  prv[uniqueKey] = {
239
239
  jstSystemOrder: detail === null || detail === void 0 ? void 0 : detail.jstSystemOrder,
240
- jstSystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.jstSystemOrderNo,
240
+ jstSystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.jstReturnSystemOrderNo,
241
241
  jstReturnType: [_initReason],
242
242
  jstReturnGoods: _initReason === "2" ? [] : jstMergeIdenticalGoods((detail === null || detail === void 0 ? void 0 : detail.jstReturnGoods) || []),
243
- jstSystemOrderBillType: (detail === null || detail === void 0 ? void 0 : detail.jstSystemOrderBillType) || ""
243
+ jstSystemOrderBillType: (detail === null || detail === void 0 ? void 0 : detail.jstReturnSystemOrderBillType) || ""
244
244
  };
245
245
  }
246
246
  break;
@@ -262,7 +262,7 @@ export var jstOrderBackFormValues = function jstOrderBackFormValues() {
262
262
  };
263
263
  //jst订单信息转换
264
264
  export var jstOrderTransform = function jstOrderTransform(detail, form) {
265
- var _form$getFieldValue, _newOrderList$, _newOrderList$2, _orderList$find, _orderList$find$call;
265
+ var _form$getFieldValue, _jstReissueCom$compon, _jstReturnCom$compone, _newOrderList$, _newOrderList$2, _newOrderList$3, _newOrderList$4, _orderList$find, _orderList$find$call;
266
266
  var orderNo = detail.orderNo,
267
267
  _detail$orderList = detail.orderList,
268
268
  orderList = _detail$orderList === void 0 ? [] : _detail$orderList,
@@ -270,11 +270,20 @@ export var jstOrderTransform = function jstOrderTransform(detail, form) {
270
270
  var jstGoodsCom = (componentList || []).find(function (com) {
271
271
  return com.workOrderComponentType === "JST_GOODS";
272
272
  });
273
+ var jstReissueCom = (componentList || []).find(function (com) {
274
+ return com.workOrderComponentType === "JST_REISSUE_GOODS";
275
+ });
276
+ var jstReturnCom = (componentList || []).find(function (com) {
277
+ return com.workOrderComponentType === "JST_RETURN_GOODS";
278
+ });
273
279
  var isStrict = jstGoodsCom ? (_form$getFieldValue = form.getFieldValue(jstGoodsCom.uniqueKey)) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.isStrict : false;
274
280
  var newOrderList = orderList === null || orderList === void 0 ? void 0 : orderList.map(function (item) {
275
281
  return _objectSpread({}, item);
276
282
  });
277
283
  var onlyOneSystemOrder = (newOrderList === null || newOrderList === void 0 ? void 0 : newOrderList.length) === 1;
284
+ var isReissueDefaultSelect = !!(jstReissueCom !== null && jstReissueCom !== void 0 && (_jstReissueCom$compon = jstReissueCom.componentConfig) !== null && _jstReissueCom$compon !== void 0 && _jstReissueCom$compon.showDefaultSelect);
285
+ var isReturnDefaultSelect = !!(jstReturnCom !== null && jstReturnCom !== void 0 && (_jstReturnCom$compone = jstReturnCom.componentConfig) !== null && _jstReturnCom$compone !== void 0 && _jstReturnCom$compone.showDefaultSelect);
286
+ var defaultOrder = newOrderList !== null && newOrderList !== void 0 && newOrderList[0] ? [newOrderList[0]] : [];
278
287
  return {
279
288
  jstSystemOrder: {
280
289
  orderNo: orderNo,
@@ -284,15 +293,17 @@ export var jstOrderTransform = function jstOrderTransform(detail, form) {
284
293
  }) : [],
285
294
  showOrderInfo: newOrderList
286
295
  },
296
+ jstReturnSystemOrderNo: onlyOneSystemOrder || isReturnDefaultSelect ? (_newOrderList$ = newOrderList[0]) === null || _newOrderList$ === void 0 ? void 0 : _newOrderList$.oId : undefined,
287
297
  // TODO: 当只有一条系统单时默认选中该系统单
288
- jstSystemOrderNo: onlyOneSystemOrder ? (_newOrderList$ = newOrderList[0]) === null || _newOrderList$ === void 0 ? void 0 : _newOrderList$.oId : undefined,
289
- jstReissueGoods: onlyOneSystemOrder ? updateJstGoodsHandle([newOrderList[0]], true).filter(function (good) {
298
+ jstSystemOrderNo: onlyOneSystemOrder || isReissueDefaultSelect ? (_newOrderList$2 = newOrderList[0]) === null || _newOrderList$2 === void 0 ? void 0 : _newOrderList$2.oId : undefined,
299
+ jstReissueGoods: onlyOneSystemOrder || isReissueDefaultSelect ? updateJstGoodsHandle(defaultOrder, true).filter(function (good) {
290
300
  return !isStrict || !orderNo || good.originalDealCode === orderNo;
291
301
  }) : [],
292
- jstReturnGoods: onlyOneSystemOrder ? updateJstGoodsHandle([newOrderList[0]], true).filter(function (good) {
302
+ jstReturnGoods: onlyOneSystemOrder || isReturnDefaultSelect ? updateJstGoodsHandle(defaultOrder, true).filter(function (good) {
293
303
  return !isStrict || !orderNo || good.originalDealCode === orderNo;
294
304
  }) : [],
295
- jstSystemOrderBillType: onlyOneSystemOrder ? (_newOrderList$2 = newOrderList[0]) === null || _newOrderList$2 === void 0 ? void 0 : _newOrderList$2.orderType : "",
305
+ jstSystemOrderBillType: onlyOneSystemOrder || isReissueDefaultSelect ? (_newOrderList$3 = newOrderList[0]) === null || _newOrderList$3 === void 0 ? void 0 : _newOrderList$3.orderType : "",
306
+ jstReturnSystemOrderBillType: onlyOneSystemOrder || isReturnDefaultSelect ? (_newOrderList$4 = newOrderList[0]) === null || _newOrderList$4 === void 0 ? void 0 : _newOrderList$4.orderType : "",
296
307
  jstGoods: {
297
308
  // 订单反填,要清空orders,存的是当前系统订单号勾选上的 订单
298
309
  orders: orderList || [],
@@ -344,7 +344,7 @@ export var filterKmOrders = function filterKmOrders(detail, order_no) {
344
344
 
345
345
  //km订单信息转换
346
346
  export var kmOrderTransform = function kmOrderTransform(detail, form) {
347
- var _form$getFieldValue, _componentList$find, _componentList$find$c, _kmReissueGoodsCompon, _componentList$find2, _componentList$find2$, _kmReissueGoodsCompon2, _postingComponent$com, _trades$, _trades$find, _trades$find$call;
347
+ var _form$getFieldValue, _kmReissueCom$compone, _componentList$find, _componentList$find$c, _kmReissueGoodsCompon, _componentList$find2, _componentList$find2$, _kmReissueGoodsCompon2, _postingComponent$com, _trades$, _trades$find, _trades$find$call;
348
348
  var trades = (detail === null || detail === void 0 ? void 0 : detail.orderDetailDtoList) || (detail === null || detail === void 0 ? void 0 : detail.trades) || [];
349
349
  var _ref = detail || {},
350
350
  orderNo = _ref.orderNo,
@@ -352,8 +352,12 @@ export var kmOrderTransform = function kmOrderTransform(detail, form) {
352
352
  var kmGoodsCom = (componentList || []).find(function (com) {
353
353
  return com.workOrderComponentType === "KM_GOODS";
354
354
  });
355
+ var kmReissueCom = (componentList || []).find(function (com) {
356
+ return com.workOrderComponentType === "KM_REISSUE_GOODS";
357
+ });
355
358
  var isStrict = kmGoodsCom ? (_form$getFieldValue = form.getFieldValue(kmGoodsCom.uniqueKey)) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.isStrict : false;
356
359
  var onlyOneSystemOrder = (trades === null || trades === void 0 ? void 0 : trades.length) === 1;
360
+ var isReissueDefaultSelect = !!(kmReissueCom !== null && kmReissueCom !== void 0 && (_kmReissueCom$compone = kmReissueCom.componentConfig) !== null && _kmReissueCom$compone !== void 0 && _kmReissueCom$compone.showDefaultSelect);
357
361
  console.log("kmOrderTransform---", {
358
362
  detail: detail,
359
363
  componentList: componentList
@@ -377,8 +381,9 @@ export var kmOrderTransform = function kmOrderTransform(detail, form) {
377
381
  kmPosting = handleKmAddressIdentify(trades[0]);
378
382
  console.log("kmPosting", kmPosting);
379
383
  }
384
+ var defaultOrder = trades !== null && trades !== void 0 && trades[0] ? [trades[0]] : [];
380
385
  return {
381
- kmSystemOrderNo: onlyOneSystemOrder ? (_trades$ = trades[0]) === null || _trades$ === void 0 ? void 0 : _trades$.sid : undefined,
386
+ kmSystemOrderNo: onlyOneSystemOrder || isReissueDefaultSelect ? (_trades$ = trades[0]) === null || _trades$ === void 0 ? void 0 : _trades$.sid : undefined,
382
387
  kmSystemOrder: {
383
388
  orderNo: detail === null || detail === void 0 ? void 0 : detail.order_no,
384
389
  orders: trades.map(function (item) {
@@ -414,13 +419,13 @@ export var kmOrderTransform = function kmOrderTransform(detail, form) {
414
419
  orderBackGoodsLevel: kmGoodsOrderBackGoodsLevel
415
420
  })
416
421
  },
417
- kmReissueGoods: onlyOneSystemOrder ? updateKmGoodsHandle([trades[0]], {
422
+ kmReissueGoods: onlyOneSystemOrder || isReissueDefaultSelect ? updateKmGoodsHandle(defaultOrder, {
418
423
  orderBackGoodsLevel: kmReissueGoodsOrderBackGoodsLevel,
419
424
  canEdit: true
420
425
  }).filter(function (good) {
421
426
  return !isStrict || !orderNo || good.sid === orderNo;
422
427
  }) : [],
423
- kmReturnGoods: onlyOneSystemOrder ? updateKmGoodsHandle([trades[0]], {
428
+ kmReturnGoods: onlyOneSystemOrder ? updateKmGoodsHandle(defaultOrder, {
424
429
  orderBackGoodsLevel: kmReturnGoodsOrderBackGoodsLevel,
425
430
  canEdit: true
426
431
  }).filter(function (good) {
@@ -108,7 +108,7 @@ export var WDT_ORDER_TYPE_MAP = {
108
108
  export var updateWdtGoodsHandle = function updateWdtGoodsHandle() {
109
109
  var orders = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
110
110
  return orders === null || orders === void 0 ? void 0 : orders.reduce(function (acc, cur) {
111
- if (Array.isArray(cur.goodDetails)) {
111
+ if (Array.isArray(cur === null || cur === void 0 ? void 0 : cur.goodDetails)) {
112
112
  acc.push.apply(acc, _toConsumableArray(cur.goodDetails.map(function (item) {
113
113
  var _item$uuid;
114
114
  item.goodId = item.goodsId;
@@ -326,7 +326,7 @@ export var wdtOrderBackFormValues = function wdtOrderBackFormValues() {
326
326
  };
327
327
  //wdt订单信息转换
328
328
  export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
329
- var _form$getFieldValue, _detail$trades2, _currentTrades$, _currentTrades$find, _currentTrades$find$c, _currentTrades$2;
329
+ var _wdtReissueCom$compon, _form$getFieldValue, _detail$trades2, _currentTrades$, _currentTrades$find, _currentTrades$find$c, _currentTrades$2;
330
330
  var orderNo = detail.orderNo,
331
331
  _detail$trades = detail.trades,
332
332
  currentTrades = _detail$trades === void 0 ? [] : _detail$trades,
@@ -334,8 +334,13 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
334
334
  var wdtGoodsCom = (componentList || []).find(function (com) {
335
335
  return com.workOrderComponentType === "WDT_GOODS";
336
336
  });
337
+ var wdtReissueCom = (componentList || []).find(function (com) {
338
+ return com.workOrderComponentType === "WDT_REISSUE_GOODS";
339
+ });
340
+ var isReissueDefaultSelect = !!(wdtReissueCom !== null && wdtReissueCom !== void 0 && (_wdtReissueCom$compon = wdtReissueCom.componentConfig) !== null && _wdtReissueCom$compon !== void 0 && _wdtReissueCom$compon.showDefaultSelect);
337
341
  var isStrict = wdtGoodsCom ? (_form$getFieldValue = form.getFieldValue(wdtGoodsCom.uniqueKey)) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.isStrict : false;
338
342
  var onlyOneSystemOrder = (detail === null || detail === void 0 ? void 0 : (_detail$trades2 = detail.trades) === null || _detail$trades2 === void 0 ? void 0 : _detail$trades2.length) === 1;
343
+ var defaultOrder = currentTrades !== null && currentTrades !== void 0 && currentTrades[0] ? [currentTrades[0]] : [];
339
344
  return {
340
345
  wdtSystemOrder: {
341
346
  orderNo: orderNo,
@@ -358,8 +363,8 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
358
363
  };
359
364
  })
360
365
  },
361
- wdtSystemOrderNo: onlyOneSystemOrder ? (_currentTrades$ = currentTrades[0]) === null || _currentTrades$ === void 0 ? void 0 : _currentTrades$.tradeNo : undefined,
362
- wdtReissueGoods: onlyOneSystemOrder ? updateWdtGoodsHandle([currentTrades[0]]).filter(function (good) {
366
+ wdtSystemOrderNo: onlyOneSystemOrder || isReissueDefaultSelect ? currentTrades === null || currentTrades === void 0 ? void 0 : (_currentTrades$ = currentTrades[0]) === null || _currentTrades$ === void 0 ? void 0 : _currentTrades$.tradeNo : undefined,
367
+ wdtReissueGoods: onlyOneSystemOrder || isReissueDefaultSelect ? updateWdtGoodsHandle(defaultOrder).filter(function (good) {
363
368
  return !isStrict || !orderNo || good.srcTid === orderNo;
364
369
  }) : [],
365
370
  wdtGoods: {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/kmkf-utils",
3
- "version": "2.0.73",
3
+ "version": "2.0.75",
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": "6f08fe153ffd7f8eb5fcb19b5b9e3fd5cd82b959",
44
+ "gitHead": "8a0ed6b8116ac64f521ac9472d5e979e8ba73c18",
45
45
  "gitHooks": {
46
46
  "pre-commit": "lint-staged"
47
47
  }
@@ -1,285 +0,0 @@
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
- };