@kmkf-fe-packages/kmkf-utils 2.10.2 → 2.10.3

package/dist/esm/baseAddressData/constants/gyAddressData.js

@@ -53,6 +53,7 @@ _defineProperty(GyAddressData, "initData", /*#__PURE__*/_asyncToGenerator( /*#__
         instance = GyAddressData.getInstance();
         if (!GyAddressData.initSingleton) {
           GyAddressData.initSingleton = queryGyAddressData().catch(function (e) {
+            console.warn("init gy data e", e);
             GyAddressData.initSingleton = null;
           });
         }

package/dist/esm/baseAddressData/constants/jkyAddressData.js

@@ -53,6 +53,7 @@ _defineProperty(JkyAddressData, "initData", /*#__PURE__*/_asyncToGenerator( /*#_
         instance = JkyAddressData.getInstance();
         if (!JkyAddressData.initSingleton) {
           JkyAddressData.initSingleton = queryJkyAddressData().catch(function (e) {
+            console.warn("init jst data e", e);
             JkyAddressData.initSingleton = null;
           });
         }

package/dist/esm/baseAddressData/constants/jstAddressData.js

@@ -53,6 +53,7 @@ _defineProperty(JstAddressData, "initData", /*#__PURE__*/_asyncToGenerator( /*#_
         instance = JstAddressData.getInstance();
         if (!JstAddressData.initSingleton) {
           JstAddressData.initSingleton = queryJstAddressData().catch(function (e) {
+            console.warn("init jst data e", e);
             JstAddressData.initSingleton = null;
           });
         }

package/dist/esm/baseAddressData/constants/wdtAddressData.js

@@ -53,6 +53,7 @@ _defineProperty(WdtAddressData, "initData", /*#__PURE__*/_asyncToGenerator( /*#_
         instance = WdtAddressData.getInstance();
         if (!WdtAddressData.initSingleton) {
           WdtAddressData.initSingleton = queryWdtAddressData().catch(function (e) {
+            console.warn("init wdt data e", e);
             WdtAddressData.initSingleton = null;
           });
         }

package/dist/esm/logisticsAddressData/index.js

@@ -20,7 +20,9 @@ var logisticsAddressData = /*#__PURE__*/function () {
       }).then(function (res) {
         var data = res.data;
         _this.addressData = data;
-      }).catch(function (e) {});
+      }).catch(function (e) {
+        console.log(e);
+      });
     });
     _defineProperty(this, "getAddressData", function () {
       var _this$addressData;

package/dist/esm/request/index.js

@@ -17,7 +17,9 @@ var showErrorMessage = function showErrorMessage(res, options) {
     message.warning(msg);
   } else if (infoLevel === "error") {
     message.error(msg);
-  } else {}
+  } else {
+    console.error(msg, res, options);
+  }
 };
 var requestApi = function requestApi(_ref) {
   var url = _ref.url,

package/dist/esm/servers/KM/supplierData.js

@@ -70,7 +70,9 @@ export var getSupplierSingleton = /*#__PURE__*/function () {
                   });
                 });
               }
-            }).catch(function (err) {});
+            }).catch(function (err) {
+              console.error(err);
+            });
           }));
         case 8:
           return _context.abrupt("return", supplierMap);

package/dist/esm/servers/orderSubForm/index.js

@@ -51,13 +51,14 @@ export var getOrderSubFormDataAsync = /*#__PURE__*/function () {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          _context.next = 2;
+          console.log("params", params);
+          _context.next = 3;
           return queryOrderSubFormList(params);
-        case 2:
+        case 3:
           result = _context.sent;
           orderSubFormList = (result === null || result === void 0 ? void 0 : result.data) || [];
           return _context.abrupt("return", orderSubFormList);
-        case 5:
+        case 6:
         case "end":
           return _context.stop();
       }

package/dist/esm/utils/SendData.js

@@ -22,6 +22,7 @@ var SendData = /*#__PURE__*/_createClass(function SendData(platform) {
         case 0:
           _context.next = 2;
           return (_this$service = _this.service) === null || _this$service === void 0 ? void 0 : _this$service.getWarehouseDataAsync().then(function (list) {
+            console.log("发货仓数据---", _this.platform, list);
             _this.sendData = list;
           });
         case 2:

package/dist/esm/utils/jkyOrderBackFormValues.js

@@ -281,6 +281,7 @@ var updateJkyItemListHandle = function updateJkyItemListHandle(list, type, comLi
         logisticCode: next === null || next === void 0 ? void 0 : next.logisticCode,
         logisticNo: next === null || next === void 0 ? void 0 : next.mainPostid
       }];
+      console.log("packageDetailList", next, next.logisticCode, packageDetailList);
       var packageDetails = (packageDetailList || []).map(function (t) {
         return {
           items: items,
@@ -289,6 +290,7 @@ var updateJkyItemListHandle = function updateJkyItemListHandle(list, type, comLi
           logisticsCode: t === null || t === void 0 ? void 0 : t.logisticNo
         };
       });
+      console.log("packageDetails", packageDetails);
       prv.push.apply(prv, _toConsumableArray(packageDetails));
     } else if (type === "send") {
       var params = {

package/dist/esm/utils/kmOrderBackFormValues.js

@@ -415,6 +415,10 @@ export var kmOrderTransform = function kmOrderTransform(detail, form) {
   var isStrict = kmGoodsCom ? (_form$getFieldValue = form.getFieldValue(kmGoodsCom.uniqueKey)) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.isStrict : false;
   var onlyOneSystemOrder = (trades === null || trades === void 0 ? void 0 : trades.length) === 1;
   var isReissueDefaultSelect = !!(kmReissueCom !== null && kmReissueCom !== void 0 && (_kmReissueCom$compone = kmReissueCom.componentConfig) !== null && _kmReissueCom$compone !== void 0 && _kmReissueCom$compone.showDefaultSelect);
+  console.log("kmOrderTransform---", {
+    detail: detail,
+    componentList: componentList
+  });
   var kmGoodsOrderBackGoodsLevel = (_componentList$find = componentList.find(function (item) {
     return item.workOrderComponentType === "KM_GOODS";
   })) === null || _componentList$find === void 0 ? void 0 : (_componentList$find$c = _componentList$find.componentConfig) === null || _componentList$find$c === void 0 ? void 0 : _componentList$find$c.orderBackGoodsLevel;
@@ -444,6 +448,7 @@ export var kmOrderTransform = function kmOrderTransform(detail, form) {
   var shouldOrderBackSelectedGoods = !!matchedSystemOrders.length || onlyOneSystemOrder;
   if (shouldOrderBackSelectedGoods && selectedSystemOrders.length && kmReissueGoodsComponent && kmReissueGoodsComponentInitReason === "1" && (postingComponent === null || postingComponent === void 0 ? void 0 : (_postingComponent$com = postingComponent.componentConfig) === null || _postingComponent$com === void 0 ? void 0 : _postingComponent$com.showField) === "km") {
     kmPosting = handleKmAddressIdentify(selectedSystemOrders[0]);
+    console.log("kmPosting", kmPosting);
   }
   return {
     kmSystemOrderNo: selectedSystemOrderNo,

package/dist/esm/utils/orderBackFormValues.js

@@ -290,6 +290,7 @@ export default (function (_ref) {
   var jyValues = detail["jyOrder"] ? jyOrderBackFormValues(detail["jyOrder"], templateDetail) : {};
   var gyValues = detail["gyOrder"] ? gyOrderBackFormValues(detail["gyOrder"], templateDetail) : {};
   var jkyValues = detail["jkyOrder"] ? jkyOrderBackFormValues(detail["jkyOrder"], templateDetail) : {};
+  console.log("jkyValues", detail, jkyValues);
   //不判断是否存在detail["skxOrder"]，不存在直接清空所有skx相关组件值
   var skxValues = detail["skxOrder"] ? skxOrderBackFormValues(detail["skxOrder"], templateDetail) : {};
   var skxReturnValues = detail["skxReturnOrder"] ? skxReturnOrderBackFormValues(detail["skxReturnOrder"], templateDetail) : {};

package/dist/esm/utils/wdtOrderBackFormValues.js

@@ -473,6 +473,7 @@ export var wdtOrderBackFormValues = function wdtOrderBackFormValues() {
       case "WDT_RETURN_BILL_NO":
         {
           if (config.orderBackRule === "platformOrderNumber") {
+            console.log("4343434");
             prv[uniqueKey] = (detail === null || detail === void 0 ? void 0 : detail.wdtReturnSystemOrder) || [];
           }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-utils",
-  "version": "2.10.2",
+  "version": "2.10.3",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "387ea03be973184576757f0edf49a85e9eae8ea4",
+  "gitHead": "9de8ccc40cd591ee7d1d8692497008cf8fc98db3",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }

package/dist/esm/utils/dist/gyOrderBackFormValues.js

@@ -1,284 +0,0 @@
-"use strict";
-
-var __assign = this && this.__assign || function () {
-  __assign = Object.assign || function (t) {
-    for (var s, i = 1, n = arguments.length; i < n; i++) {
-      s = arguments[i];
-      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-    }
-    return t;
-  };
-  return __assign.apply(this, arguments);
-};
-exports.__esModule = true;
-exports.filterGyOrders = exports.gyOrderBackFormValues = exports.gyOrderTransform = exports.updateGyGoodsHandle = exports.GY_SYSTEM_ORDER_CONFIG = void 0;
-var getUUid_1 = require("./getUUid");
-var deliveryStateMap = {
-  0: "未发货",
-  2: "全部发货"
-};
-exports.GY_SYSTEM_ORDER_CONFIG = {
-  key: "gySystemShowOrder",
-  name: "管易",
-  selectId: "gySystemSelectIds",
-  columns: [{
-    dataIndex: "billType",
-    title: "订单类型",
-    width: 150
-  }, {
-    dataIndex: "billNo",
-    title: "系统订单号",
-    width: 160
-  }, {
-    dataIndex: "tradeTagName",
-    title: "订单标记名称",
-    width: 150
-  }, {
-    dataIndex: "billTag",
-    title: "订单标签",
-    width: 150
-  }, {
-    dataIndex: "deliveryState",
-    title: "发货状态",
-    width: 150
-  }]
-};
-exports.updateGyGoodsHandle = function (orders) {
-  if (orders === void 0) {
-    orders = [];
-  }
-  return orders === null || orders === void 0 ? void 0 : orders.reduce(function (acc, cur) {
-    if (Array.isArray(cur.details)) {
-      acc.push.apply(acc, cur.details.map(function (item) {
-        var _a;
-        item.goodName = item.itemName;
-        item.goodShortName = item.itemSimpleName;
-        item.goodNo = item.itemCode;
-        item.specNo = item.skuCode;
-        item.specName = item.skuName;
-        item.canDelete = true;
-        item.uuid = (_a = item.uuid) !== null && _a !== void 0 ? _a : getUUid_1["default"]();
-        return item;
-      }));
-    }
-    return acc;
-  }, []);
-};
-var updateGyItemListHandle = function updateGyItemListHandle(list, type, comList, form) {
-  var _a, _b;
-  if (type === "logistics") {
-    //管易物流信息组件先不做
-    // const currentCom = comList?.find?.(
-    //   (item) => item.workOrderComponentType === "GY_LOGISTICS"
-    // );
-    // const notOrderBack = currentCom?.componentConfig?.notOrderBack || false;
-    // if (notOrderBack) {
-    //   let currentValue = form.getFieldValue(currentCom.uniqueKey);
-    //   currentValue = currentValue?.length
-    //     ? currentValue
-    //     : [{ logisticsCode: "", logisticsCompany: "" }];
-    //   return currentValue;
-    // }
-  } else if (type === "send") {
-    var currentCom = (_a = comList === null || comList === void 0 ? void 0 : comList.find) === null || _a === void 0 ? void 0 : _a.call(comList, function (item) {
-      return item.workOrderComponentType === "GY_SEND_GOOD";
-    });
-    var notOrderBack = ((_b = currentCom === null || currentCom === void 0 ? void 0 : currentCom.componentConfig) === null || _b === void 0 ? void 0 : _b.notOrderBack) || false;
-    if (notOrderBack) {
-      var currentValue = form.getFieldValue(currentCom.uniqueKey);
-      currentValue = (currentValue === null || currentValue === void 0 ? void 0 : currentValue.length) ? currentValue : [{
-        sendId: "",
-        sendName: ""
-      }];
-      return currentValue;
-    }
-  }
-  var newList = list === null || list === void 0 ? void 0 : list.reduce(function (prv, next) {
-    var items = ((next === null || next === void 0 ? void 0 : next.details) || []).map(function (t) {
-      return {
-        title: (t === null || t === void 0 ? void 0 : t.itemName) || "",
-        picUrl: (t === null || t === void 0 ? void 0 : t.picPath) || "",
-        platform: "gy",
-        skuId: (t === null || t === void 0 ? void 0 : t.itemCode) || ""
-      };
-    });
-    var params = {
-      items: items
-    };
-    if (type === "logistics") {
-      // params.logisticsCompany = next?.shippingCode;
-      // params.logisticsCode = next?.shippingSn;
-    } else if (type === "send") {
-      params.sendId = next === null || next === void 0 ? void 0 : next.warehouseCode;
-      //下拉框，取id
-      params.sendName = next === null || next === void 0 ? void 0 : next.warehouseCode;
-      params.sendSnapshotName = next === null || next === void 0 ? void 0 : next.warehouseName;
-    }
-    prv.push(params);
-    return prv;
-  }, []);
-  if (!(newList === null || newList === void 0 ? void 0 : newList.length)) {
-    switch (type) {
-      case "logistics":
-        newList = [{
-          logisticsCode: ""
-        }];
-        break;
-      case "supply":
-        newList = [{
-          supplyId: ""
-        }];
-        break;
-      case "send":
-        newList = [{
-          sendId: "",
-          sendName: ""
-        }];
-        break;
-    }
-  }
-  return newList;
-};
-//管易订单信息转换
-exports.gyOrderTransform = function (detail, form) {
-  var _a, _b, _c, _d, _e, _f;
-  var orderNo = detail.orderNo,
-    _g = detail.trades,
-    currentTrades = _g === void 0 ? [] : _g,
-    componentList = detail.componentList;
-  var gyGoodsCom = (componentList || []).find(function (com) {
-    return com.workOrderComponentType === "GY_GOODS";
-  });
-  var isStrict = gyGoodsCom ? (_a = form.getFieldValue(gyGoodsCom.uniqueKey)) === null || _a === void 0 ? void 0 : _a.isStrict : false;
-  var onlyOneSystemOrder = (currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.length) === 1;
-  return {
-    gySystemOrder: {
-      orderNo: orderNo,
-      isTest: 4,
-      orders: currentTrades.map(function (item) {
-        return __assign(__assign({}, item), {
-          billNo: item.code,
-          billType: item.orderTypeName,
-          billTag: item.tagName,
-          tradeTagName: item.tradeTagName,
-          deliveryState: deliveryStateMap[item.deliveryState]
-        });
-      }),
-      selectIds: onlyOneSystemOrder ? currentTrades.map(function (item) {
-        return item.code;
-      }) : [],
-      showOrderInfo: currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.map(function (item) {
-        return __assign(__assign({}, item), {
-          billNo: item.code,
-          billType: item.orderTypeName,
-          billTag: item.tagName,
-          tradeTagName: item.tradeTagName,
-          deliveryState: deliveryStateMap[item.deliveryState]
-        });
-      })
-    },
-    gySystemOrderNo: onlyOneSystemOrder ? (_b = currentTrades[0]) === null || _b === void 0 ? void 0 : _b.code : undefined,
-    gyReissueGoods: onlyOneSystemOrder ? exports.updateGyGoodsHandle([currentTrades[0]]).filter(function (good) {
-      return !isStrict || !orderNo || good.platformCode === orderNo;
-    }) : [],
-    gyGoods: {
-      // 订单反填，要清空orders，存的是当前系统订单号勾选上的 订单
-      orders: currentTrades,
-      orderNo: orderNo,
-      shopCode: ((_d = (_c = currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.find) === null || _c === void 0 ? void 0 : _c.call(currentTrades, function (item) {
-        return item.shopCode;
-      })) === null || _d === void 0 ? void 0 : _d.shopCode) || null,
-      vipCode: ((_f = (_e = currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.find) === null || _e === void 0 ? void 0 : _e.call(currentTrades, function (item) {
-        return item.vipCode;
-      })) === null || _f === void 0 ? void 0 : _f.vipCode) || null,
-      gyGoods: exports.updateGyGoodsHandle(currentTrades).filter(function (good) {
-        return !isStrict || !orderNo || good.platformCode === orderNo;
-      })
-    },
-    // gyLogistics: updateGyItemListHandle(
-    //   currentTrades,
-    //   "logistics",
-    //   componentList || [],
-    //   form
-    // ),
-    gySendGood: updateGyItemListHandle(currentTrades, "send", componentList || [], form)
-  };
-};
-exports.gyOrderBackFormValues = function (detail, templateDetail) {
-  if (detail === void 0) {
-    detail = {};
-  }
-  if (templateDetail === void 0) {
-    templateDetail = {};
-  }
-  return ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
-    var _a, _b;
-    var uniqueKey = next.uniqueKey;
-    var config = next.componentConfig;
-    switch (next.workOrderComponentType) {
-      case "GY_SYSTEM_ORDER":
-        prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.gySystemOrder;
-        break;
-      case "GY_GOODS":
-        prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.gyGoods;
-        break;
-      case "GY_REISSUE_GOODS":
-        prv[uniqueKey] = {
-          gySystemOrder: detail === null || detail === void 0 ? void 0 : detail.gySystemOrder,
-          gyReissueGoods: detail === null || detail === void 0 ? void 0 : detail.gyReissueGoods,
-          gySystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.gySystemOrderNo,
-          gyReissueType: ["1"],
-          shopCode: (_a = detail === null || detail === void 0 ? void 0 : detail.gyGoods) === null || _a === void 0 ? void 0 : _a.shopCode,
-          vipCode: (_b = detail === null || detail === void 0 ? void 0 : detail.gyGoods) === null || _b === void 0 ? void 0 : _b.vipCode
-        };
-        break;
-      case "GY_LOGISTICS":
-        prv[uniqueKey] = updateGyItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.gyLogistics, "logistics", config);
-        break;
-      case "GY_SEND_GOOD":
-        prv[uniqueKey] = updateGyItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.gySendGood, "send", config);
-    }
-    return prv;
-  }, {});
-};
-var updateGyItemListByConfigHandle = function updateGyItemListByConfigHandle(list, type, config) {
-  if (config === void 0) {
-    config = {};
-  }
-  var showField = config.showField,
-    _a = config.notOrderBack,
-    notOrderBack = _a === void 0 ? false : _a;
-  if (notOrderBack) {
-    return list;
-  }
-  return list === null || list === void 0 ? void 0 : list.reduce(function (prv, next) {
-    if (type === "logistics") {
-      if (!["logisticsCompany", ""].includes(showField || "")) {
-        next.logisticsCompany = undefined;
-      }
-      if (!["logisticsCode", ""].includes(showField || "")) {
-        next.logisticsCode = undefined;
-      }
-    } else if (type === "send") {
-      if (!["sendId", "all"].includes(showField || "")) {
-        next.sendId = undefined;
-      }
-      if (!["sendName", "all"].includes(showField || "")) {
-        next.sendName = undefined;
-        next.sendSnapshotName = undefined;
-      }
-    }
-    prv.push(next);
-    return prv;
-  }, []);
-};
-// 管易根据订单号请求返回的platformCode会有多个订单号组合在一起的数据 排除其他的，返回当前订单号
-exports.filterGyOrders = function (trades, order_no) {
-  var currentTrades = (trades || []).filter(function (item) {
-    return (item.platformCode || "").split(",").includes(order_no);
-  });
-  if (currentTrades.length) {
-    return currentTrades;
-  }
-  return [];
-};