@kmkf-fe-packages/kmkf-utils 2.2.13-beta.3 → 2.2.13-beta.31

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,2 +1,2 @@
1
1
  1123111
2
- 30
2
+ 30111
@@ -5,13 +5,14 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
5
5
  import request from "../../request";
6
6
  var queryJYLogisticsList = function queryJYLogisticsList() {
7
7
  return request({
8
- url: "/qy/gdfw/jy/erp/getLogisticsList",
8
+ url: "/qy/gdfw/jy/erp/logistics/jyList",
9
9
  method: "post",
10
10
  data: {}
11
11
  });
12
12
  };
13
13
  export var getLogisticsDataAsync = /*#__PURE__*/function () {
14
14
  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
15
+ var _result$data;
15
16
  var result, list, logisticsList;
16
17
  return _regeneratorRuntime().wrap(function _callee$(_context) {
17
18
  while (1) switch (_context.prev = _context.next) {
@@ -21,11 +22,11 @@ export var getLogisticsDataAsync = /*#__PURE__*/function () {
21
22
  case 2:
22
23
  result = _context.sent;
23
24
  list = [];
24
- logisticsList = (result === null || result === void 0 ? void 0 : result.data) || [];
25
+ logisticsList = (result === null || result === void 0 ? void 0 : (_result$data = result.data) === null || _result$data === void 0 ? void 0 : _result$data.logisticsList) || [];
25
26
  logisticsList === null || logisticsList === void 0 ? void 0 : logisticsList.map(function (item) {
26
27
  list.push({
27
- label: item.logisticsName,
28
- value: item.logisticsCode
28
+ label: item.globalExpressName,
29
+ value: item.globalExpressCode
29
30
  });
30
31
  });
31
32
  return _context.abrupt("return", list);
@@ -1,5 +1,4 @@
1
1
  declare type WarehouseType = {
2
- disabled: boolean;
3
2
  label: string;
4
3
  value: string;
5
4
  };
@@ -4,7 +4,7 @@ var queryWarehouseList = function queryWarehouseList(_ref) {
4
4
  var pageNo = _ref.pageNo,
5
5
  pageSize = _ref.pageSize;
6
6
  return request({
7
- url: "/qy/gdfw/jy/erp/getWarehouseList",
7
+ url: "/qy/gdfw/jy/erp/warehouse/jyList",
8
8
  method: "post",
9
9
  data: {
10
10
  pageNo: pageNo,
@@ -16,15 +16,13 @@ var queryWarehouseList = function queryWarehouseList(_ref) {
16
16
  export var getWarehouseDataAsync = function getWarehouseDataAsync() {
17
17
  return fetchAll("JY_WAREHOUSE_DATA", queryWarehouseList, function (data) {
18
18
  var list = [];
19
- var warehouses = data || [];
19
+ var warehouses = (data === null || data === void 0 ? void 0 : data.warehouseInfoList) || [];
20
20
  warehouses.map(function (_ref2) {
21
- var code = _ref2.code,
22
- name = _ref2.name,
23
- isDeleted = _ref2.isDeleted;
21
+ var warehouseCode = _ref2.warehouseCode,
22
+ warehouseName = _ref2.warehouseName;
24
23
  list.push({
25
- label: name,
26
- value: code,
27
- disabled: isDeleted
24
+ label: warehouseName,
25
+ value: warehouseCode
28
26
  });
29
27
  });
30
28
  var valueMap = {};
@@ -33,6 +31,9 @@ export var getWarehouseDataAsync = function getWarehouseDataAsync() {
33
31
  });
34
32
 
35
33
  return Object.values(valueMap);
34
+ }, {
35
+ pageNo: 1,
36
+ pageSize: 100
36
37
  });
37
38
  };
38
39
  export default getWarehouseDataAsync;
@@ -16,7 +16,7 @@ export { WDT_SYSTEM_ORDER_CONFIG, wdtOrderBackFormValues, wdtOrderTransform, WDT
16
16
  export * from "./jstOrderBackFormValues";
17
17
  export { kmOrderBackFormValues, kmOrderTransform, KM_SYSTEM_ORDER_CONFIG, filterKmOrders, updateKmGoodsHandle, handleKmAddressIdentify, } from "./kmOrderBackFormValues";
18
18
  export { getIsPlatformCodesIncludeOrderNos, GY_DELIVERY_STATE_MAPPING, GY_SYSTEM_ORDER_CONFIG, updateGyGoodsHandle, gyOrderTransform, gyOrderBackFormValues, filterGyOrders, } from "./gyOrderBackFormValues";
19
- export { filterJyOrders, jyOrderBackFormValues, jyOrderTransform, updateJyGoodsHandle, JY_SYSTEM_ORDER_CONFIG, } from "./jyOrderBackFormValues";
19
+ export { filterJyOrders, jyOrderBackFormValues, jyOrderTransform, updateJyGoodsHandle, JY_SYSTEM_ORDER_CONFIG, JY_ORDER_TYPE_MAP, JY_ORDER_STATUS_MAP, } from "./jyOrderBackFormValues";
20
20
  export { formatTrade, skxOrderBackFormValues, updateSkxGoodsHandle, skxOrderTransform, skxSystemOrderBackValues, } from "./skxOrderBackFormValues";
21
21
  export { updateOrderSubFormGoodsHandle, orderSubFormOrderBackFormValues, orderSubFormOrderTransform, } from "./orderSubFormOrderBackFormValues";
22
22
  export { formatReturnTrade, skxReturnOrderBackFormValues, updateSkxReturnGoodsHandle, skxReturnOrderTransform, skxReturnSystemOrderBackValues, } from "./skxReturnOrderBackFormValues";
@@ -17,7 +17,7 @@ export { WDT_SYSTEM_ORDER_CONFIG, wdtOrderBackFormValues, wdtOrderTransform, WDT
17
17
  export * from "./jstOrderBackFormValues";
18
18
  export { kmOrderBackFormValues, kmOrderTransform, KM_SYSTEM_ORDER_CONFIG, filterKmOrders, updateKmGoodsHandle, handleKmAddressIdentify } from "./kmOrderBackFormValues";
19
19
  export { getIsPlatformCodesIncludeOrderNos, GY_DELIVERY_STATE_MAPPING, GY_SYSTEM_ORDER_CONFIG, updateGyGoodsHandle, gyOrderTransform, gyOrderBackFormValues, filterGyOrders } from "./gyOrderBackFormValues";
20
- export { filterJyOrders, jyOrderBackFormValues, jyOrderTransform, updateJyGoodsHandle, JY_SYSTEM_ORDER_CONFIG } from "./jyOrderBackFormValues";
20
+ export { filterJyOrders, jyOrderBackFormValues, jyOrderTransform, updateJyGoodsHandle, JY_SYSTEM_ORDER_CONFIG, JY_ORDER_TYPE_MAP, JY_ORDER_STATUS_MAP } from "./jyOrderBackFormValues";
21
21
  export { formatTrade, skxOrderBackFormValues, updateSkxGoodsHandle, skxOrderTransform, skxSystemOrderBackValues } from "./skxOrderBackFormValues";
22
22
  export { updateOrderSubFormGoodsHandle, orderSubFormOrderBackFormValues, orderSubFormOrderTransform } from "./orderSubFormOrderBackFormValues";
23
23
  export { formatReturnTrade, skxReturnOrderBackFormValues, updateSkxReturnGoodsHandle, skxReturnOrderTransform, skxReturnSystemOrderBackValues } from "./skxReturnOrderBackFormValues";
@@ -8,8 +8,30 @@ export declare const JY_SYSTEM_ORDER_CONFIG: {
8
8
  width: number;
9
9
  }[];
10
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
+ };
11
31
  export declare const getIsPlatformCodesIncludeOrderNos: (platformCodes: string, orderNos: string) => boolean;
12
- export declare const updateJyGoodsHandle: (orders?: any[]) => any;
32
+ export declare const updateJyGoodsHandle: (orders?: any[], config?: {
33
+ canEdit?: boolean;
34
+ }) => any[];
13
35
  export declare const jyOrderTransform: (detail: any, form: any) => {
14
36
  jySystemOrder: {
15
37
  orderNo: any;
@@ -19,14 +41,14 @@ export declare const jyOrderTransform: (detail: any, form: any) => {
19
41
  };
20
42
  jyReturnSystemOrderNo: any;
21
43
  jySystemOrderNo: any;
22
- jyReissueGoods: any;
23
- jyReturnGoods: any;
44
+ jyReissueGoods: any[];
45
+ jyReturnGoods: any[];
24
46
  jyGoods: {
25
47
  allOrders: any;
26
48
  orders: any;
27
49
  orderNo: any;
28
50
  shopCode: any;
29
- jyGoods: any;
51
+ jyGoods: any[];
30
52
  };
31
53
  shopCode: any;
32
54
  jyLogistics: any;
@@ -1,9 +1,9 @@
1
- function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
2
- function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
3
- function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
4
- function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
5
- function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
6
- function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
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
7
  import uuid from "./getUUid";
8
8
  import isNull from "./isNull";
9
9
  export var JY_SYSTEM_ORDER_CONFIG = {
@@ -28,6 +28,26 @@ export var JY_SYSTEM_ORDER_CONFIG = {
28
28
  width: 150
29
29
  }]
30
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
+ };
31
51
  export var getIsPlatformCodesIncludeOrderNos = function getIsPlatformCodesIncludeOrderNos(platformCodes, orderNos) {
32
52
  var getSortedList = function getSortedList(str) {
33
53
  try {
@@ -49,18 +69,36 @@ export var getIsPlatformCodesIncludeOrderNos = function getIsPlatformCodesInclud
49
69
  };
50
70
  export var updateJyGoodsHandle = function updateJyGoodsHandle() {
51
71
  var orders = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
52
- return orders === null || orders === void 0 ? void 0 : orders.reduce(function (acc, cur) {
53
- if (Array.isArray(cur.details)) {
54
- acc.push.apply(acc, _toConsumableArray(cur.details.map(function (item) {
55
- var _item$uuid;
56
- item.canDelete = true;
57
- item.uuid = (_item$uuid = item.uuid) !== null && _item$uuid !== void 0 ? _item$uuid : uuid();
58
- item.systemOrderNo = cur === null || cur === void 0 ? void 0 : cur.tradeNo;
59
- return item;
60
- })));
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
+ subItem.divideOrderFee = Number(subItem.divideOrderFee).toFixed(2);
93
+ subItem.sellTotal = Number(subItem.sellTotal).toFixed(2);
94
+ subItem.sellPrice = Number(subItem.sellPrice).toFixed(2);
95
+ subItem.settlementPrice = Number(subItem.settlementPrice).toFixed(2);
96
+ subItem.mallSellingPrice = Number(subItem.mallSellingPrice).toFixed(2);
97
+ prv.push(subItem);
98
+ });
61
99
  }
62
- return acc;
63
- }, []);
100
+ return prv;
101
+ }, []));
64
102
  };
65
103
  var updateJyItemListHandle = function updateJyItemListHandle(list, type, comList, form) {
66
104
  var _newList;
@@ -97,34 +135,26 @@ var updateJyItemListHandle = function updateJyItemListHandle(list, type, comList
97
135
  }
98
136
  }
99
137
  var newList = list === null || list === void 0 ? void 0 : list.reduce(function (prv, next) {
100
- var items = ((next === null || next === void 0 ? void 0 : next.details) || []).map(function (t) {
138
+ var items = ((next === null || next === void 0 ? void 0 : next.subOrderDetails) || []).map(function (t) {
101
139
  return {
102
- title: (t === null || t === void 0 ? void 0 : t.itemName) || "",
103
- picUrl: (t === null || t === void 0 ? void 0 : t.picPath) || "",
140
+ title: (t === null || t === void 0 ? void 0 : t.productName) || "",
141
+ picUrl: (t === null || t === void 0 ? void 0 : t.imageUrl) || "",
104
142
  platform: "jy",
105
- skuId: (t === null || t === void 0 ? void 0 : t.itemCode) || ""
143
+ skuId: (t === null || t === void 0 ? void 0 : t.productCode) || ""
106
144
  };
107
145
  });
146
+ var params = {
147
+ items: items
148
+ };
108
149
  if (type === "logistics") {
109
- // 巨益的单个系统子订单存在拆单,会包含多个物流信息
110
- var deliveryList = ((next === null || next === void 0 ? void 0 : next.deliveryList) || []).map(function (t) {
111
- return {
112
- items: items,
113
- logisticsCompanyName: t === null || t === void 0 ? void 0 : t.expressName,
114
- logisticsCompany: t === null || t === void 0 ? void 0 : t.expressCode,
115
- logisticsCode: t === null || t === void 0 ? void 0 : t.mailNo
116
- };
117
- });
118
- prv.push.apply(prv, _toConsumableArray(deliveryList));
119
- // params.logisticsCompany = next?.expressName;
120
- // params.logisticsCode = next?.mailNo;
150
+ params.logisticsCompanyName = next === null || next === void 0 ? void 0 : next.logistName;
151
+ params.logisticsCompany = next === null || next === void 0 ? void 0 : next.logisticId;
152
+ params.logisticsCode = next === null || next === void 0 ? void 0 : next.logisticNo;
153
+ prv.push(params);
121
154
  } else if (type === "send") {
122
- var params = {
123
- items: items
124
- };
125
- params.sendId = next === null || next === void 0 ? void 0 : next.warehouseCode;
155
+ params.sendId = next === null || next === void 0 ? void 0 : next.warehouseId;
126
156
  //下拉框,取id
127
- params.sendName = next === null || next === void 0 ? void 0 : next.warehouseCode;
157
+ params.sendName = next === null || next === void 0 ? void 0 : next.warehouseId;
128
158
  params.sendSnapshotName = next === null || next === void 0 ? void 0 : next.warehouseName;
129
159
  prv.push(params);
130
160
  }
@@ -179,21 +209,31 @@ export var jyOrderTransform = function jyOrderTransform(detail, form) {
179
209
  var isReissueDefaultSelect = !!(jyReissueCom !== null && jyReissueCom !== void 0 && (_jyReissueCom$compone = jyReissueCom.componentConfig) !== null && _jyReissueCom$compone !== void 0 && _jyReissueCom$compone.showDefaultSelect);
180
210
  var isReturnDefaultSelect = !!(jyReturnCom !== null && jyReturnCom !== void 0 && (_jyReturnCom$componen = jyReturnCom.componentConfig) !== null && _jyReturnCom$componen !== void 0 && _jyReturnCom$componen.showDefaultSelect);
181
211
  var defaultOrder = filterCurrentTrades !== null && filterCurrentTrades !== void 0 && filterCurrentTrades[0] ? [filterCurrentTrades[0]] : [];
212
+ var orders = currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.map(function (item) {
213
+ return _objectSpread(_objectSpread({}, item), {}, {
214
+ tradeType: JY_ORDER_TYPE_MAP[item.tradeType],
215
+ tradeStatus: JY_ORDER_STATUS_MAP[item.tradeStatus]
216
+ });
217
+ });
182
218
  return {
183
219
  jySystemOrder: {
184
220
  orderNo: orderNo,
185
- orders: currentTrades,
221
+ orders: orders,
186
222
  selectIds: onlyOneSystemOrder ? currentTrades.map(function (item) {
187
223
  return item.tradeNo;
188
224
  }) : [],
189
- showOrderInfo: currentTrades
225
+ showOrderInfo: orders
190
226
  },
191
227
  jyReturnSystemOrderNo: onlyOneSystemOrder || isReturnDefaultSelect ? (_filterCurrentTrades$ = filterCurrentTrades[0]) === null || _filterCurrentTrades$ === void 0 ? void 0 : _filterCurrentTrades$.tradeNo : undefined,
192
228
  jySystemOrderNo: onlyOneSystemOrder || isReissueDefaultSelect ? (_filterCurrentTrades$2 = filterCurrentTrades[0]) === null || _filterCurrentTrades$2 === void 0 ? void 0 : _filterCurrentTrades$2.tradeNo : undefined,
193
- jyReissueGoods: onlyOneSystemOrder || isReissueDefaultSelect ? updateJyGoodsHandle(defaultOrder).filter(function (good) {
229
+ jyReissueGoods: onlyOneSystemOrder || isReissueDefaultSelect ? updateJyGoodsHandle(defaultOrder, {
230
+ canEdit: true
231
+ }).filter(function (good) {
194
232
  return !isStrict || !orderNo || getIsPlatformCodesIncludeOrderNos(good.platformCode, orderNo);
195
233
  }) : [],
196
- jyReturnGoods: onlyOneSystemOrder || isReturnDefaultSelect ? updateJyGoodsHandle(defaultOrder).filter(function (good) {
234
+ jyReturnGoods: onlyOneSystemOrder || isReturnDefaultSelect ? updateJyGoodsHandle(defaultOrder, {
235
+ canEdit: true
236
+ }).filter(function (good) {
197
237
  return !isStrict || !orderNo || getIsPlatformCodesIncludeOrderNos(good.platformCode, orderNo);
198
238
  }) : [],
199
239
  jyGoods: {
@@ -206,7 +246,7 @@ export var jyOrderTransform = function jyOrderTransform(detail, form) {
206
246
  return item.shopCode;
207
247
  })) === null || _currentTrades$find$c === void 0 ? void 0 : _currentTrades$find$c.shopCode) || null,
208
248
  jyGoods: updateJyGoodsHandle(currentTrades).filter(function (good) {
209
- return !isStrict || !orderNo || getIsPlatformCodesIncludeOrderNos(good.platformCode, orderNo);
249
+ return !isStrict || !orderNo;
210
250
  })
211
251
  },
212
252
  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) {
@@ -298,7 +338,7 @@ var updateJyItemListByConfigHandle = function updateJyItemListByConfigHandle(lis
298
338
  // 巨益根据订单号请求返回的platformCode会有多个订单号组合在一起的数据 排除其他的,返回当前订单号
299
339
  export var filterJyOrders = function filterJyOrders(trades, order_no) {
300
340
  var currentTrades = (trades || []).filter(function (item) {
301
- return getIsPlatformCodesIncludeOrderNos(item.platformCode, order_no);
341
+ return getIsPlatformCodesIncludeOrderNos(item.tradeId, order_no);
302
342
  });
303
343
  if (currentTrades.length) {
304
344
  return currentTrades;
@@ -9,6 +9,8 @@ export declare const updateSkxGoodsHandle: (orders?: any[]) => {
9
9
  uuid: any;
10
10
  }[];
11
11
  export declare const skxOrderTransform: (detail: any, form: any) => {
12
+ shopId: any;
13
+ shopName: any;
12
14
  onBillNo: any;
13
15
  skxGoods: {
14
16
  allGoods: {
@@ -30,6 +30,11 @@ export var skxSystemOrderBackValues = function skxSystemOrderBackValues(_ref) {
30
30
  export var skxOrderBackFormValues = function skxOrderBackFormValues() {
31
31
  var detail = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
32
32
  var templateDetail = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
33
+ var initValue = {};
34
+ if (detail !== null && detail !== void 0 && detail.shopId) {
35
+ initValue.shopId = detail === null || detail === void 0 ? void 0 : detail.shopId;
36
+ initValue.shopName = detail === null || detail === void 0 ? void 0 : detail.shopName;
37
+ }
33
38
  return ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
34
39
  var uniqueKey = next.uniqueKey;
35
40
  var config = next.componentConfig;
@@ -63,7 +68,7 @@ export var skxOrderBackFormValues = function skxOrderBackFormValues() {
63
68
  break;
64
69
  }
65
70
  return prv;
66
- }, {});
71
+ }, initValue);
67
72
  };
68
73
  export var formatTrade = function formatTrade(trade) {
69
74
  return trade.subOrderList.map(function (item) {
@@ -147,12 +152,15 @@ var updateSkxItemListByConfigHandle = function updateSkxItemListByConfigHandle(l
147
152
 
148
153
  //斯凯奇订单信息转换
149
154
  export var skxOrderTransform = function skxOrderTransform(detail, form) {
155
+ var _trades$, _trades$2;
150
156
  var trades = (detail === null || detail === void 0 ? void 0 : detail.allOrders) || [];
151
157
  var onlyOne = (trades === null || trades === void 0 ? void 0 : trades.length) === 1;
152
158
  var allGoodsList = onlyOne ? formatTrade(trades[0]) : [];
153
159
  var skxGoods = updateSkxGoodsHandle(allGoodsList);
154
160
  var data = onlyOne ? trades[0] : {};
155
161
  return {
162
+ shopId: trades === null || trades === void 0 ? void 0 : (_trades$ = trades[0]) === null || _trades$ === void 0 ? void 0 : _trades$.shopUniqueKey,
163
+ shopName: trades === null || trades === void 0 ? void 0 : (_trades$2 = trades[0]) === null || _trades$2 === void 0 ? void 0 : _trades$2.shopTitle,
156
164
  onBillNo: data === null || data === void 0 ? void 0 : data.onBillNo,
157
165
  skxGoods: {
158
166
  allGoods: skxGoods,
@@ -1,5 +1,5 @@
1
1
  export default (function (key) {
2
- return ["itemList", "itemId", "supplierName", "numIid", "aloneItemId", "aloneItemEncode", "jstItemList", "logisticsCompany", "logisticsCode", "supplyId", "supplyName", "sendId", "sendName", "dateTime", "basicMultSelect", "memberLevel", "erpOrderType", "erpOrderStatus", "orderRefundType", "executeActionType", "checkbox", "multSelect", "rate", "picture", "pictureProList", "file", "wdtGoods", "wdtReissueType", "wdtSystemOrderNo", "wdtReissueGoods", "wdtSendGood", "wdtSendId", "wdtSendName", "wdtLogisticsCode", "wdtSystemShowOrder", "wdtSystemSelectIds", "wdtLogisticsCompany", "wdtLogisticsList", "wdtReturnGoods", "wdtReturnType", "wdtExchangeGoods", "bsSendGood", "bsSendId", "bsSendName", "bsGoods", "bsExchangeType", "bsExchangeReturnGoods", "bsExchangeSwapOutGoods", "bsExchangeGiftGoods", "bsReissueType", "bsReissueGoods", "bsReturnGoods", "bsReturnType", "bsLogisticsList", "bsLogisticsCompany", "bsLogisticsCode", "kmSystemShowOrder", "bsSystemShowOrder", "bsSystemSelectIds", "bsE3SystemOrderNo", "bsE3SystemShowOrder", "bsE3SystemSelectIds", "bsE3Goods", "bsE3ReissueGoods", "bsE3ReissueType", "reissueLogisticsList", "reissueLogisticsCompany", "reissueLogisticsCode", "deliveryNoList", "deliveryNoIds", "returnGoodsStatusList", "returnGoodsTradeIdList", "returnGoodsTradeItemList", "tradeIdList", "tradeItemList", "wlnLogisticsList", "wlnLogisticsCompany", "wlnLogisticsCode", "wlnSystemShowOrder", "wlnSystemSelectIds", "wlnGoods", "wlnSendGood", "wlnSendId", "wlnSendName", "exchangeReason", "flowTag", "returnGoodsStatusList", "returnGoodsStatusValue", "exchangeReason", "exchangeStatusValue", "inStockStatusItemList", "inStockStatusList", "bsE3InStockStatusItemList", "bsE3InStockStatusList", "wdtInStockStatusItemList", "wdtInStockStatusList", "reissueStatusValue", "reissueReason", "adjustWorkOrderStatusValue", "adjustWorkOrderReason", "msgStatusValues", "msgStatus4Search", "createStatusValue", "createReason", "invoiceStatusValue", "invoiceReason", "invoicingStatusValue", "invoicingReason", "trajectoryList", "trajectoryMoreCompany", "trajectoryMoreCode", "trajectoryMoreSnapshot", "logisticsInterceptList", "logisticsInterceptCompanyList", "logisticsInterceptCodeList", "logisticsInterceptTypeList", "logisticsInterceptStatusList", "logisticsInterceptApiStatusList", "interceptLogisticsApiStatus", "logisticsInterceptSnapshotList", "productList", "subOrderList", "label", "kmSendGood", "kmSendId", "kmSendName", "kmGoods", "gyGoods", "gyReissueType", "gySystemOrderNo", "gyReissueGoods", "gySendGood", "gySendId", "gySendName", "gyLogisticsCode", "gySystemShowOrder", "gySystemSelectIds", "gyLogisticsCompany", "gyLogisticsList", "gyReturnGoods", "gyReturnType", "gyExchangeGoods", "jyGoods", "jySystemOrderNo", "jySystemShowOrder", "jySystemSelectIds", "jySendGood", "jySendId", "jySendName", "jyLogisticsList", "jyLogisticsCompany", "jyLogisticsCode", "kmLogisticsList", "jstGoods", "jstSendGood", "jstReissueType", "jstReissueGoods", "jstSystemOrderNo", "jstLogisticsList", "jstSystemShowOrder", "jstSystemSelectIds", "jstReturnGoods", "jstReturnType", "jstExchangeGoods", "trajectoryApiStatus", "kmReissueGoods", "kmReissueType", "kmReturnGoods", "kmReturnType", "kmVideo", "wdtTags", "skxGoods", "skxReturnGoods", "skxLogisticsList", "skxReturnLogistics"].reduce(function (cur, nxt) {
2
+ return ["itemList", "itemId", "supplierName", "numIid", "aloneItemId", "aloneItemEncode", "jstItemList", "logisticsCompany", "logisticsCode", "supplyId", "supplyName", "sendId", "sendName", "dateTime", "basicMultSelect", "memberLevel", "erpOrderType", "erpOrderStatus", "orderRefundType", "executeActionType", "checkbox", "multSelect", "rate", "picture", "pictureProList", "file", "wdtGoods", "wdtReissueType", "wdtSystemOrderNo", "wdtReissueGoods", "wdtSendGood", "wdtSendId", "wdtSendName", "wdtLogisticsCode", "wdtSystemShowOrder", "wdtSystemSelectIds", "wdtLogisticsCompany", "wdtLogisticsList", "wdtReturnGoods", "wdtReturnType", "wdtExchangeGoods", "bsSendGood", "bsSendId", "bsSendName", "bsGoods", "bsExchangeType", "bsExchangeReturnGoods", "bsExchangeSwapOutGoods", "bsExchangeGiftGoods", "bsReissueType", "bsReissueGoods", "bsReturnGoods", "bsReturnType", "bsLogisticsList", "bsLogisticsCompany", "bsLogisticsCode", "kmSystemShowOrder", "bsSystemShowOrder", "bsSystemSelectIds", "bsE3SystemOrderNo", "bsE3SystemShowOrder", "bsE3SystemSelectIds", "bsE3Goods", "bsE3ReissueGoods", "bsE3ReissueType", "reissueLogisticsList", "reissueLogisticsCompany", "reissueLogisticsCode", "deliveryNoList", "deliveryNoIds", "returnGoodsStatusList", "returnGoodsTradeIdList", "returnGoodsTradeItemList", "tradeIdList", "tradeItemList", "wlnLogisticsList", "wlnLogisticsCompany", "wlnLogisticsCode", "wlnSystemShowOrder", "wlnSystemSelectIds", "wlnGoods", "wlnSendGood", "wlnSendId", "wlnSendName", "exchangeReason", "flowTag", "returnGoodsStatusList", "returnGoodsStatusValue", "exchangeReason", "exchangeStatusValue", "inStockStatusItemList", "inStockStatusList", "bsE3InStockStatusItemList", "bsE3InStockStatusList", "wdtInStockStatusItemList", "wdtInStockStatusList", "reissueStatusValue", "reissueReason", "adjustWorkOrderStatusValue", "adjustWorkOrderReason", "msgStatusValues", "msgStatus4Search", "createStatusValue", "createReason", "invoiceStatusValue", "invoiceReason", "invoicingStatusValue", "invoicingReason", "trajectoryList", "trajectoryMoreCompany", "trajectoryMoreCode", "trajectoryMoreSnapshot", "logisticsInterceptList", "logisticsInterceptCompanyList", "logisticsInterceptCodeList", "logisticsInterceptTypeList", "logisticsInterceptStatusList", "logisticsInterceptApiStatusList", "interceptLogisticsApiStatus", "logisticsInterceptSnapshotList", "productList", "subOrderList", "label", "kmSendGood", "kmSendId", "kmSendName", "kmGoods", "gyGoods", "gyReissueType", "gySystemOrderNo", "gyReissueGoods", "gySendGood", "gySendId", "gySendName", "gyLogisticsCode", "gySystemShowOrder", "gySystemSelectIds", "gyLogisticsCompany", "gyLogisticsList", "gyReturnGoods", "gyReturnType", "gyExchangeGoods", "jyGoods", "jySystemOrderNo", "jySystemShowOrder", "jySystemSelectIds", "jySendGood", "jySendId", "jySendName", "jyLogisticsList", "jyLogisticsCompany", "jyLogisticsCode", "kmLogisticsList", "jstGoods", "jstSendGood", "jstReissueType", "jstReissueGoods", "jstSystemOrderNo", "jstLogisticsList", "jstSystemShowOrder", "jstSystemSelectIds", "jstReturnGoods", "jstReturnType", "jstExchangeGoods", "trajectoryApiStatus", "kmReissueGoods", "kmReissueType", "kmReturnGoods", "kmReturnType", "kmVideo", "wdtTags", "skxGoods", "skxReturnGoods", "skxLogisticsList", "skxReturnLogistics", "jyReissueGoods", "jyReissueType"].reduce(function (cur, nxt) {
3
3
  return cur || (key === null || key === void 0 ? void 0 : key.includes(nxt));
4
4
  }, false);
5
5
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/kmkf-utils",
3
- "version": "2.2.13-beta.3",
3
+ "version": "2.2.13-beta.31",
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": "f6e15008ac1484435d84ed89424fc28a68d7e899",
44
+ "gitHead": "95ce877aed30ef604316f40df926437dfc42d7a9",
45
45
  "gitHooks": {
46
46
  "pre-commit": "lint-staged"
47
47
  }