@kmkf-fe-packages/kmkf-utils 1.3.0 → 1.4.0-rc.1

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
- 11122311
1
+ 11122311
@@ -77,6 +77,8 @@ declare enum TComponentType {
77
77
  WDT_LOGISTICS = "WDT_LOGISTICS",
78
78
  WDT_SEND_GOOD = "WDR_SEND_GOOD",
79
79
  WDT_SYSTEM_ORDER = "WDT_SYSTEM_ORDER",
80
+ WDT_RETURN_GOODS = "WDT_RETURN_GOODS",
81
+ WDT_EXCHANGE_GOODS = "WDT_EXCHANGE_GOODS",
80
82
  }
81
83
 
82
84
  declare enum PlatForm {
@@ -8,6 +8,7 @@ export declare const queryWdtWarehouseList: (pageNo: number, pageSize: number) =
8
8
  warehouses: {
9
9
  warehouseNo: string;
10
10
  name: string;
11
+ is_disabled: boolean;
11
12
  }[];
12
13
  totalCount?: number | undefined;
13
14
  }>>;
@@ -8,7 +8,7 @@ export { default as formatDisplayConfig } from "./formatDisplayConfig";
8
8
  export { default as orderBackFormValues } from "./orderBackFormValues";
9
9
  export { bsOrderBackFormValues, bsOrderTransform, } from "./bsOrderBackFormValues";
10
10
  export { wlnOrderBackFormValues, wlnOrderTransform, } from "./wlnOrderBackFormValues";
11
- export { wdtOrderBackFormValues, wdtOrderTransform, WDT_ORDER_TYPE_MAP } from "./wdtOrderBackFormValues";
11
+ export { wdtOrderBackFormValues, wdtOrderTransform, WDT_ORDER_TYPE_MAP, filterWdtOrders } from "./wdtOrderBackFormValues";
12
12
  export { default as jstOrderBackFormValues } from "./jstOrderBackFormValues";
13
13
  export { default as uuid } from "./getUUid";
14
14
  export * as filterFn from "./filterFn";
@@ -8,7 +8,7 @@ export { default as formatDisplayConfig } from "./formatDisplayConfig";
8
8
  export { default as orderBackFormValues } from "./orderBackFormValues";
9
9
  export { bsOrderBackFormValues, bsOrderTransform } from "./bsOrderBackFormValues";
10
10
  export { wlnOrderBackFormValues, wlnOrderTransform } from "./wlnOrderBackFormValues";
11
- export { wdtOrderBackFormValues, wdtOrderTransform, WDT_ORDER_TYPE_MAP } from "./wdtOrderBackFormValues";
11
+ export { wdtOrderBackFormValues, wdtOrderTransform, WDT_ORDER_TYPE_MAP, filterWdtOrders } from "./wdtOrderBackFormValues";
12
12
  export { default as jstOrderBackFormValues } from "./jstOrderBackFormValues";
13
13
  export { default as uuid } from "./getUUid";
14
14
  import * as _filterFn from "./filterFn";
@@ -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", "checkbox", "multSelect", "rate", "picture", "file", "wdtGoods", "wdtReissueType", "wdtSystemOrderNo", "wdtReissueGoods", "wdtSendGood", "wdtSendId", "wdtSendName", "wdtLogisticsCode", "wdtSystemShowOrder", "wdtSystemSelectIds", "wdtLogisticsCompany", "wdtLogisticsList", "bsSendGood", "bsSendId", "bsSendName", "bsGoods", "bsExchangeType", "bsExchangeReturnGoods", "bsExchangeSwapOutGoods", "bsExchangeGiftGoods", "bsReissueType", "bsReissueGoods", "bsReturnGoods", "bsReturnType", "bsLogisticsList", "bsLogisticsCompany", "bsLogisticsCode", "bsSystemShowOrder", "bsSystemSelectIds", "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", "reissueStatusValue", "reissueReason", "adjustWorkOrderStatusValue", "adjustWorkOrderReason", "msgStatusValues", "msgStatus4Search", "createStatusValue", "createReason", "invoiceStatusValue", "invoiceReason", "invoicingStatusValue", "invoicingReason", "trajectoryList", "trajectoryMoreCompany", "trajectoryMoreCode", "trajectoryMoreSnapshot", "logisticsInterceptList", "logisticsInterceptCompanyList", "logisticsInterceptCodeList", "logisticsInterceptTypeList", "logisticsInterceptStatusList", "logisticsInterceptSnapshotList", "label"].reduce(function (cur, nxt) {
2
+ return ["itemList", "itemId", "supplierName", "numIid", "aloneItemId", "aloneItemEncode", "jstItemList", "logisticsCompany", "logisticsCode", "supplyId", "supplyName", "sendId", "sendName", "dateTime", "basicMultSelect", "checkbox", "multSelect", "rate", "picture", "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", "bsSystemShowOrder", "bsSystemSelectIds", "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", "reissueStatusValue", "reissueReason", "adjustWorkOrderStatusValue", "adjustWorkOrderReason", "msgStatusValues", "msgStatus4Search", "createStatusValue", "createReason", "invoiceStatusValue", "invoiceReason", "invoicingStatusValue", "invoicingReason", "trajectoryList", "trajectoryMoreCompany", "trajectoryMoreCode", "trajectoryMoreSnapshot", "logisticsInterceptList", "logisticsInterceptCompanyList", "logisticsInterceptCodeList", "logisticsInterceptTypeList", "logisticsInterceptStatusList", "logisticsInterceptSnapshotList", "label", "kmSendGood", "kmSendId", "kmSendName"].reduce(function (cur, nxt) {
3
3
  return cur || (key === null || key === void 0 ? void 0 : key.includes(nxt));
4
4
  }, false);
5
5
  });
@@ -16,15 +16,17 @@ export declare const WDT_ORDER_TYPE_MAP: {
16
16
  107: string;
17
17
  108: string;
18
18
  };
19
+ export declare const filterWdtOrders: (detail: any, order_no?: string) => any;
19
20
  export declare const wdtOrderBackFormValues: (detail?: any, templateDetail?: any) => any;
20
- export declare const wdtOrderTransform: (detail: any, form: any) => {
21
+ export declare const wdtOrderTransform: (detail: any, form: any, order_no?: string) => {
21
22
  wdtSystemOrder: {
22
- orderNo: any;
23
+ orderNo: string | undefined;
23
24
  orders: any;
24
25
  selectIds: any;
25
26
  showOrderInfo: any;
26
27
  };
27
28
  wdtGoods: {
29
+ shopCode: any;
28
30
  wdtGoods: any;
29
31
  };
30
32
  wdtLogistics: any;
@@ -150,6 +150,24 @@ var updateWdtItemListByConfigHandle = function updateWdtItemListByConfigHandle(l
150
150
  return prv;
151
151
  }, []);
152
152
  };
153
+
154
+ // WDT根据订单号请求返回的srcTid会有多个订单号组合在一起的数据 排除其他的,返回当前订单号
155
+ export var filterWdtOrders = function filterWdtOrders(detail, order_no) {
156
+ var currentTrades = ((detail === null || detail === void 0 ? void 0 : detail.trades) || []).filter(function (item) {
157
+ return (item.srcTid || '').split(',').includes(order_no);
158
+ }).map(function (item) {
159
+ if (Array.isArray(item.goodDetails)) {
160
+ item.goodDetails = item.goodDetails.filter(function (good) {
161
+ return good.srcTid === order_no;
162
+ });
163
+ }
164
+ return item;
165
+ });
166
+ if (currentTrades.length) {
167
+ return currentTrades;
168
+ }
169
+ return [];
170
+ };
153
171
  export var wdtOrderBackFormValues = function wdtOrderBackFormValues() {
154
172
  var detail = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
155
173
  var templateDetail = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -211,26 +229,23 @@ export var wdtOrderBackFormValues = function wdtOrderBackFormValues() {
211
229
  }, {});
212
230
  };
213
231
  //wdt订单信息转换
214
- export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
215
- var _detail$trades, _detail$trades$find, _detail$trades2, _ref;
216
- // const advItem: any =
217
- // detail?.orders?.[0]?.advancedDistributionInfos?.[0] || {};
232
+ export var wdtOrderTransform = function wdtOrderTransform(detail, form, order_no) {
233
+ var _detail$trades, _currentTrades$find, _currentTrades$find$c;
234
+ var currentTrades = detail.trades || [];
218
235
  return {
219
236
  wdtSystemOrder: {
220
- orderNo: (detail === null || detail === void 0 ? void 0 : (_detail$trades = detail.trades) === null || _detail$trades === void 0 ? void 0 : (_detail$trades$find = _detail$trades.find(function (item) {
221
- return item.srcTid;
222
- })) === null || _detail$trades$find === void 0 ? void 0 : _detail$trades$find.srcTid) || '',
223
- orders: ((detail === null || detail === void 0 ? void 0 : detail.trades) || []).map(function (item) {
237
+ orderNo: order_no,
238
+ orders: currentTrades.map(function (item) {
224
239
  return _objectSpread(_objectSpread({}, item), {}, {
225
240
  billNo: item.tradeNo,
226
241
  billType: WDT_ORDER_TYPE_MAP[item.tradeType],
227
242
  billTag: item.tagName
228
243
  });
229
244
  }),
230
- selectIds: (detail === null || detail === void 0 ? void 0 : (_detail$trades2 = detail.trades) === null || _detail$trades2 === void 0 ? void 0 : _detail$trades2.length) === 1 ? detail === null || detail === void 0 ? void 0 : detail.trades.map(function (item) {
245
+ selectIds: (detail === null || detail === void 0 ? void 0 : (_detail$trades = detail.trades) === null || _detail$trades === void 0 ? void 0 : _detail$trades.length) === 1 ? currentTrades.map(function (item) {
231
246
  return item.tradeNo;
232
247
  }) : [],
233
- showOrderInfo: (_ref = (detail === null || detail === void 0 ? void 0 : detail.trades) || []) === null || _ref === void 0 ? void 0 : _ref.map(function (item) {
248
+ showOrderInfo: currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.map(function (item) {
234
249
  return {
235
250
  billNo: item.tradeNo,
236
251
  billType: WDT_ORDER_TYPE_MAP[item.tradeType],
@@ -239,11 +254,13 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
239
254
  })
240
255
  },
241
256
  wdtGoods: {
242
- // shopCode: detail?.shopCode,
243
- wdtGoods: updateWdtGoodsHandle(detail === null || detail === void 0 ? void 0 : detail.trades)
257
+ 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) {
258
+ return item.shopNo;
259
+ })) === null || _currentTrades$find$c === void 0 ? void 0 : _currentTrades$find$c.shopNo) || null,
260
+ wdtGoods: updateWdtGoodsHandle(currentTrades)
244
261
  },
245
- wdtLogistics: updateWdtItemListHandle(detail === null || detail === void 0 ? void 0 : detail.trades, "logistics", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
246
- wdtSendGood: updateWdtItemListHandle(detail === null || detail === void 0 ? void 0 : detail.trades, "send", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form)
262
+ wdtLogistics: updateWdtItemListHandle(currentTrades, "logistics", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
263
+ wdtSendGood: updateWdtItemListHandle(currentTrades, "send", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form)
247
264
  // wdtSingingTime: detail?.receiptDate,
248
265
  // wdtSendTime:
249
266
  // detail?.orders?.[0]?.advancedDistributionInfos?.[0]?.deliveryDate,
@@ -13,11 +13,14 @@ var getWarehouseDataAsync = function getWarehouseDataAsync() {
13
13
  var warehouses = (data === null || data === void 0 ? void 0 : data.warehouses) || [];
14
14
  warehouses.map(function (_ref) {
15
15
  var warehouseNo = _ref.warehouseNo,
16
- name = _ref.name;
17
- list.push({
18
- label: name,
19
- value: warehouseNo
20
- });
16
+ name = _ref.name,
17
+ is_disabled = _ref.is_disabled;
18
+ if (!is_disabled) {
19
+ list.push({
20
+ label: name,
21
+ value: warehouseNo
22
+ });
23
+ }
21
24
  });
22
25
  pageNo++;
23
26
  if (pageSize === warehouses.length) {
package/package.json CHANGED
@@ -1,12 +1,13 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/kmkf-utils",
3
- "version": "1.3.0",
3
+ "version": "1.4.0-rc.1",
4
4
  "module": "dist/esm/index.js",
5
5
  "typings": "dist/esm/index.d.ts",
6
6
  "files": [
7
7
  "dist"
8
8
  ],
9
9
  "scripts": {
10
+ "sync": "yarn build && yalc push",
10
11
  "build": "yarn run lint && father build",
11
12
  "jest:init": "jest --init",
12
13
  "lint": "eslint . --ext .ts",
@@ -40,7 +41,7 @@
40
41
  "publishConfig": {
41
42
  "access": "public"
42
43
  },
43
- "gitHead": "227e5e52ad4e85074c0486fea308033557d75a6e",
44
+ "gitHead": "669577d96ce4c32d0e9d13379234fbcde38399da",
44
45
  "gitHooks": {
45
46
  "pre-commit": "lint-staged"
46
47
  }