@kmkf-fe-packages/kmkf-utils 1.22.1-beta.49 → 1.22.1-beta.50

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.
Files changed (5) hide show
  1. package/dist/esm/utils/gyOrderBackFormValues.d.ts +2 -1
  2. package/dist/esm/utils/gyOrderBackFormValues.js +131 -57
  3. package/dist/esm/utils/orderBackFormValues.js +4 -1
  4. package/dist/esm/utils/wdtOrderBackFormValues.js +0 -9
  5. package/package.json +2 -2
package/dist/esm/utils/gyOrderBackFormValues.d.ts CHANGED
@@ -22,9 +22,10 @@ export declare const gyOrderTransform: (detail: any, form: any) => {
22
22
  orders: any;
23
23
  orderNo: any;
24
24
  shopCode: any;
25
+ vipCode: any;
25
26
  gyGoods: any;
26
27
  };
27
28
  gySendGood: any;
28
29
  };
29
30
  export declare const gyOrderBackFormValues: (detail?: any, templateDetail?: any) => any;
30
- export declare const filterGyOrders: (detail: any, order_no: string) => any;
31
+ export declare const filterGyOrders: (trades: any, order_no: string) => any;
package/dist/esm/utils/gyOrderBackFormValues.js CHANGED
@@ -11,6 +11,10 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
11
11
  function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
12
12
  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; }
13
13
  import uuid from "./getUUid";
14
+ var deliveryStateMap = {
15
+ 0: "未发货",
16
+ 2: "全部发货"
17
+ };
14
18
  export var GY_SYSTEM_ORDER_CONFIG = {
15
19
  key: "gySystemShowOrder",
16
20
  name: "管易",
@@ -24,7 +28,7 @@ export var GY_SYSTEM_ORDER_CONFIG = {
24
28
  title: "系统订单号",
25
29
  width: 160
26
30
  }, {
27
- dataIndex: "billTagName",
31
+ dataIndex: "tradeTagName",
28
32
  title: "订单标记名称",
29
33
  width: 150
30
34
  }, {
@@ -32,33 +36,29 @@ export var GY_SYSTEM_ORDER_CONFIG = {
32
36
  title: "订单标签",
33
37
  width: 150
34
38
  }, {
35
- dataIndex: "billShippingStatus",
39
+ dataIndex: "deliveryState",
36
40
  title: "发货状态",
37
41
  width: 150
38
42
  }]
39
43
  };
40
44
  export var updateGyGoodsHandle = function updateGyGoodsHandle() {
41
45
  var orders = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
42
- var list = orders.reduce(function (prv, next) {
43
- var _next$orderDetailGets;
44
- var goods = next === null || next === void 0 ? void 0 : (_next$orderDetailGets = next.orderDetailGets) === null || _next$orderDetailGets === void 0 ? void 0 : _next$orderDetailGets.map(function (item) {
45
- var _item$uuid;
46
- item.mark = "是";
47
- item.canDelete = true;
48
- item.uuid = (_item$uuid = item.uuid) !== null && _item$uuid !== void 0 ? _item$uuid : uuid();
49
- return item;
50
- });
51
- prv.push.apply(prv, _toConsumableArray(goods));
52
- return prv;
46
+ return orders === null || orders === void 0 ? void 0 : orders.reduce(function (acc, cur) {
47
+ if (Array.isArray(cur.details)) {
48
+ acc.push.apply(acc, _toConsumableArray(cur.details.map(function (item) {
49
+ var _item$uuid;
50
+ item.goodName = item.itemName;
51
+ item.goodShortName = item.itemSimpleName;
52
+ item.goodNo = item.itemCode;
53
+ item.specNo = item.skuCode;
54
+ item.specName = item.skuName;
55
+ item.canDelete = true;
56
+ item.uuid = (_item$uuid = item.uuid) !== null && _item$uuid !== void 0 ? _item$uuid : uuid();
57
+ return item;
58
+ })));
59
+ }
60
+ return acc;
53
61
  }, []);
54
- //如果数量大于1 商品标记为否
55
- if (list.length > 1) {
56
- list = list.map(function (item) {
57
- item.mark = "否";
58
- return item;
59
- });
60
- }
61
- return list;
62
62
  };
63
63
  var updateGyItemListHandle = function updateGyItemListHandle(list, type, comList, form) {
64
64
  var _newList;
@@ -92,23 +92,24 @@ var updateGyItemListHandle = function updateGyItemListHandle(list, type, comList
92
92
  }
93
93
  }
94
94
  var newList = list === null || list === void 0 ? void 0 : list.reduce(function (prv, next) {
95
- var items = ((next === null || next === void 0 ? void 0 : next.orderDetailGets) || []).map(function (t) {
95
+ var items = ((next === null || next === void 0 ? void 0 : next.details) || []).map(function (t) {
96
96
  return {
97
- title: (t === null || t === void 0 ? void 0 : t.goodsName) || "",
97
+ title: (t === null || t === void 0 ? void 0 : t.itemName) || "",
98
98
  picUrl: (t === null || t === void 0 ? void 0 : t.picPath) || "",
99
- platform: "bse3",
100
- skuId: (t === null || t === void 0 ? void 0 : t.goodsSn) || ""
99
+ platform: "gy",
100
+ skuId: (t === null || t === void 0 ? void 0 : t.itemCode) || ""
101
101
  };
102
102
  });
103
103
  var params = {
104
104
  items: items
105
105
  };
106
106
  if (type === "logistics") {
107
- params.logisticsCompany = next === null || next === void 0 ? void 0 : next.shippingCode;
108
- params.logisticsCode = next === null || next === void 0 ? void 0 : next.shippingSn;
107
+ // params.logisticsCompany = next?.shippingCode;
108
+ // params.logisticsCode = next?.shippingSn;
109
109
  } else if (type === "send") {
110
- params.sendId = next === null || next === void 0 ? void 0 : next.fhck;
111
- params.sendName = next === null || next === void 0 ? void 0 : next.fhck;
110
+ params.sendId = next === null || next === void 0 ? void 0 : next.warehouseNo;
111
+ //下拉框，取id
112
+ params.sendName = next === null || next === void 0 ? void 0 : next.warehouseNo;
112
113
  }
113
114
  prv.push(params);
114
115
  return prv;
@@ -138,72 +139,145 @@ var updateGyItemListHandle = function updateGyItemListHandle(list, type, comList
138
139
 
139
140
  //管易订单信息转换
140
141
  export var gyOrderTransform = function gyOrderTransform(detail, form) {
141
- var _form$getFieldValue, _newOrderList$, _orderList$find, _orderList$find$call;
142
+ var _form$getFieldValue, _currentTrades$, _currentTrades$find, _currentTrades$find$c, _currentTrades$find2, _currentTrades$find2$;
142
143
  var orderNo = detail.orderNo,
143
- _detail$orderList = detail.orderList,
144
- orderList = _detail$orderList === void 0 ? [] : _detail$orderList,
144
+ _detail$trades = detail.trades,
145
+ currentTrades = _detail$trades === void 0 ? [] : _detail$trades,
145
146
  componentList = detail.componentList;
147
+ console.log("管易订单信息转换---new--", {
148
+ orderNo: orderNo,
149
+ currentTrades: currentTrades,
150
+ componentList: componentList
151
+ });
146
152
  var gyGoodsCom = (componentList || []).find(function (com) {
147
153
  return com.workOrderComponentType === "GY_GOODS";
148
154
  });
149
155
  var isStrict = gyGoodsCom ? (_form$getFieldValue = form.getFieldValue(gyGoodsCom.uniqueKey)) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.isStrict : false;
150
- var newOrderList = orderList === null || orderList === void 0 ? void 0 : orderList.map(function (item) {
151
- return _objectSpread({}, item);
152
- });
153
- var onlyOneSystemOrder = (newOrderList === null || newOrderList === void 0 ? void 0 : newOrderList.length) === 1;
156
+ var onlyOneSystemOrder = (currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.length) === 1;
154
157
  return {
155
158
  gySystemOrder: {
156
159
  orderNo: orderNo,
157
- orders: newOrderList,
158
- selectIds: onlyOneSystemOrder ? orderList.map(function (item) {
159
- return item.billNo;
160
+ orders: currentTrades.map(function (item) {
161
+ return _objectSpread(_objectSpread({}, item), {}, {
162
+ billNo: item.code,
163
+ billType: item.orderTypeName,
164
+ billTag: item.tagName,
165
+ tradeTagName: item.tradeTagName,
166
+ deliveryState: deliveryStateMap[item.deliveryState]
167
+ });
168
+ }),
169
+ selectIds: onlyOneSystemOrder ? currentTrades.map(function (item) {
170
+ return item.code;
160
171
  }) : [],
161
- showOrderInfo: newOrderList
172
+ showOrderInfo: currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.map(function (item) {
173
+ return _objectSpread(_objectSpread({}, item), {}, {
174
+ billNo: item.code,
175
+ billType: item.orderTypeName,
176
+ billTag: item.tagName,
177
+ tradeTagName: item.tradeTagName,
178
+ deliveryState: deliveryStateMap[item.deliveryState]
179
+ });
180
+ })
162
181
  },
163
- // TODO: 当只有一条系统单时默认选中该系统单
164
- gySystemOrderNo: onlyOneSystemOrder ? (_newOrderList$ = newOrderList[0]) === null || _newOrderList$ === void 0 ? void 0 : _newOrderList$.billNo : undefined,
165
- gyReissueGoods: onlyOneSystemOrder ? updateGyGoodsHandle([newOrderList[0]]).filter(function (good) {
166
- return !isStrict || !orderNo || good.originalDealCode === orderNo;
182
+ gySystemOrderNo: onlyOneSystemOrder ? (_currentTrades$ = currentTrades[0]) === null || _currentTrades$ === void 0 ? void 0 : _currentTrades$.code : undefined,
183
+ gyReissueGoods: onlyOneSystemOrder ? updateGyGoodsHandle([currentTrades[0]]).filter(function (good) {
184
+ return !isStrict || !orderNo || good.platformCode === orderNo;
167
185
  }) : [],
168
186
  gyGoods: {
169
187
  // 订单反填，要清空orders，存的是当前系统订单号勾选上的 订单
170
- orders: orderList || [],
188
+ orders: currentTrades,
171
189
  orderNo: orderNo,
172
- shopCode: (orderList === null || orderList === void 0 ? void 0 : (_orderList$find = orderList.find) === null || _orderList$find === void 0 ? void 0 : (_orderList$find$call = _orderList$find.call(orderList, function (item) {
173
- return item.sdCode;
174
- })) === null || _orderList$find$call === void 0 ? void 0 : _orderList$find$call.sdCode) || null,
175
- gyGoods: updateGyGoodsHandle(orderList).filter(function (good) {
176
- return !isStrict || !orderNo || good.originalDealCode === orderNo;
190
+ shopCode: (currentTrades === null || currentTrades === void 0 ? void 0 : (_currentTrades$find = currentTrades.find) === null || _currentTrades$find === void 0 ? void 0 : (_currentTrades$find$c = _currentTrades$find.call(currentTrades, function (item) {
191
+ return item.shopCode;
192
+ })) === null || _currentTrades$find$c === void 0 ? void 0 : _currentTrades$find$c.shopCode) || null,
193
+ vipCode: (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) {
194
+ return item.vipCode;
195
+ })) === null || _currentTrades$find2$ === void 0 ? void 0 : _currentTrades$find2$.vipCode) || null,
196
+ gyGoods: updateGyGoodsHandle(currentTrades).filter(function (good) {
197
+ return !isStrict || !orderNo || good.platformCode === orderNo;
177
198
  })
178
199
  },
179
200
  // gyLogistics: updateGyItemListHandle(
180
- // detail?.orderList,
201
+ // currentTrades,
181
202
  // "logistics",
182
- // detail?.componentList || [],
203
+ // componentList || [],
183
204
  // form
184
205
  // ),
185
- gySendGood: updateGyItemListHandle(detail === null || detail === void 0 ? void 0 : detail.orderList, "send", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form)
206
+ gySendGood: updateGyItemListHandle(currentTrades, "send", componentList || [], form)
186
207
  };
187
208
  };
188
209
  export var gyOrderBackFormValues = function gyOrderBackFormValues() {
189
210
  var detail = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
190
211
  var templateDetail = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
191
212
  return ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
213
+ var _detail$gyGoods, _detail$gyGoods2;
192
214
  var uniqueKey = next.uniqueKey;
193
215
  var config = next.componentConfig;
216
+ console.log("----触发--gyOrderBackFormValues--1", {
217
+ prv: prv,
218
+ uniqueKey: uniqueKey,
219
+ detail: detail
220
+ });
194
221
  switch (next.workOrderComponentType) {
222
+ case "GY_SYSTEM_ORDER":
223
+ prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.gySystemOrder;
224
+ break;
195
225
  case "GY_GOODS":
196
226
  prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.gyGoods;
197
227
  break;
228
+ case "GY_REISSUE_GOODS":
229
+ prv[uniqueKey] = {
230
+ gySystemOrder: detail === null || detail === void 0 ? void 0 : detail.gySystemOrder,
231
+ gyReissueGoods: detail === null || detail === void 0 ? void 0 : detail.gyReissueGoods,
232
+ gySystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.gySystemOrderNo,
233
+ gyReissueType: ["1"],
234
+ shopCode: detail === null || detail === void 0 ? void 0 : (_detail$gyGoods = detail.gyGoods) === null || _detail$gyGoods === void 0 ? void 0 : _detail$gyGoods.shopCode,
235
+ vipCode: detail === null || detail === void 0 ? void 0 : (_detail$gyGoods2 = detail.gyGoods) === null || _detail$gyGoods2 === void 0 ? void 0 : _detail$gyGoods2.vipCode
236
+ };
237
+ break;
238
+ case "GY_LOGISTICS":
239
+ prv[uniqueKey] = updateGyItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.gyLogistics, "logistics", config);
240
+ break;
241
+ case "GY_SEND_GOOD":
242
+ prv[uniqueKey] = updateGyItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.gySendGood, "send", config);
198
243
  }
199
244
  return prv;
200
245
  }, {});
201
246
  };
247
+ var updateGyItemListByConfigHandle = function updateGyItemListByConfigHandle(list, type) {
248
+ var config = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
249
+ var showField = config.showField,
250
+ _config$notOrderBack = config.notOrderBack,
251
+ notOrderBack = _config$notOrderBack === void 0 ? false : _config$notOrderBack;
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
+ };
202
276
 
203
- // WDT根据订单号请求返回的srcTid会有多个订单号组合在一起的数据 排除其他的，返回当前订单号
204
- export var filterGyOrders = function filterGyOrders(detail, order_no) {
205
- var currentTrades = ((detail === null || detail === void 0 ? void 0 : detail.orderList) || []).filter(function (item) {
206
- return (item === null || item === void 0 ? void 0 : item.dealCode) === order_no;
277
+ // 管易根据订单号请求返回的platformCode会有多个订单号组合在一起的数据 排除其他的，返回当前订单号
278
+ export var filterGyOrders = function filterGyOrders(trades, order_no) {
279
+ var currentTrades = (trades || []).filter(function (item) {
280
+ return (item.platformCode || "").split(",").includes(order_no);
207
281
  });
208
282
  if (currentTrades.length) {
209
283
  return currentTrades;
package/dist/esm/utils/orderBackFormValues.js CHANGED
@@ -15,6 +15,7 @@ import { wlnOrderBackFormValues } from "./wlnOrderBackFormValues";
15
15
  import jstOrderBackFormValues from "./jstOrderBackFormValues";
16
16
  import { wdtOrderBackFormValues } from "./wdtOrderBackFormValues";
17
17
  import { bsE3OrderBackFormValues } from "./bsE3OrderBackFormValues";
18
+ import { gyOrderBackFormValues } from "./gyOrderBackFormValues";
18
19
 
19
20
  // 淘宝商品组件信息处理
20
21
 
@@ -82,6 +83,7 @@ export default (function (_ref) {
82
83
  var config = next.componentConfig;
83
84
  var city = null,
84
85
  town = null;
86
+ console.log("--订单返填数据重组", next.workOrderComponentType);
85
87
  switch (next.workOrderComponentType) {
86
88
  case "TRADE_ID_INPUT":
87
89
  prv[uniqueKey] = order_no || detail["orderNo"];
@@ -231,6 +233,7 @@ export default (function (_ref) {
231
233
  var wdtValues = wdtOrderBackFormValues(detail["wdtOrder"], templateDetail);
232
234
  var bsE3Values = bsE3OrderBackFormValues(detail["bsE3Order"], templateDetail);
233
235
  var kmValues = kmOrderBackFormValues(detail["kmOrder"], templateDetail);
236
+ var gyValues = gyOrderBackFormValues(detail["gyOrder"], templateDetail);
234
237
  console.log("bsE3Values", bsE3Values);
235
- return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, orderValues), jstValues), bsValues), wlnValues), wdtValues), bsE3Values), kmValues);
238
+ return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, orderValues), jstValues), bsValues), wlnValues), wdtValues), bsE3Values), kmValues), gyValues);
236
239
  });
package/dist/esm/utils/wdtOrderBackFormValues.js CHANGED
@@ -192,19 +192,10 @@ export var wdtOrderBackFormValues = function wdtOrderBackFormValues() {
192
192
  wdtReissueType: ["1"]
193
193
  };
194
194
  break;
195
- case "GY_REISSUE_GOODS":
196
- prv[uniqueKey] = {
197
- gySystemOrder: detail === null || detail === void 0 ? void 0 : detail.gySystemOrder,
198
- gyReissueGoods: detail === null || detail === void 0 ? void 0 : detail.gyReissueGoods,
199
- gySystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.gySystemOrderNo,
200
- gyReissueType: ["1"]
201
- };
202
- break;
203
195
  case "WDT_LOGISTICS":
204
196
  prv[uniqueKey] = updateWdtItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.wdtLogistics, "logistics", config);
205
197
  break;
206
198
  case "WDT_SEND_GOOD":
207
- case "GY_SEND_GOOD":
208
199
  prv[uniqueKey] = updateWdtItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.wdtSendGood, "send", config);
209
200
  // case "WDT_SIGNING_TIME":
210
201
  // prv[uniqueKey] = detail?.wdtSingingTime;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/kmkf-utils",
3
- "version": "1.22.1-beta.49",
3
+ "version": "1.22.1-beta.50",
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": "e42ad29847184a154f4a15b93a1ab818316c62ca",
44
+ "gitHead": "b658ec85d5bf6c907966e2a2f66cfb9888ab63e4",
45
45
  "gitHooks": {
46
46
  "pre-commit": "lint-staged"
47
47
  }