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

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

@@ -53,7 +53,6 @@ _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,7 +53,6 @@ _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,7 +53,6 @@ _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,7 +53,6 @@ _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,9 +20,7 @@ var logisticsAddressData = /*#__PURE__*/function () {
       }).then(function (res) {
         var data = res.data;
         _this.addressData = data;
-      }).catch(function (e) {
-        console.log(e);
-      });
+      }).catch(function (e) {});
     });
     _defineProperty(this, "getAddressData", function () {
       var _this$addressData;

package/dist/esm/request/index.js

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

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

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

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

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

package/dist/esm/utils/SendData.js

@@ -22,7 +22,6 @@ 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/dist/gyOrderBackFormValues.js

@@ -0,0 +1,284 @@
+"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 [];
+};

package/dist/esm/utils/jkyOrderBackFormValues.js

@@ -196,6 +196,7 @@ export var updateJkyGoodsHandle = function updateJkyGoodsHandle() {
     var productDates = [];
     var expireDates = [];
     if (config.orderBackGoodsLevel !== "2" && next.tradeOrderAssemblyGoodsDtoList && next.tradeOrderAssemblyGoodsDtoList.length) {
+      var goodsList = next.goodsDetail;
       next.tradeOrderAssemblyGoodsDtoList.forEach(function (subItem) {
         var _next$assemblyGoodsDe;
         subItem.systemOrderNo = next === null || next === void 0 ? void 0 : next.tradeNo;
@@ -207,6 +208,10 @@ export var updateJkyGoodsHandle = function updateJkyGoodsHandle() {
         subItem.batchNo = batchNos.join(",");
         subItem.productDate = productDates.join(",");
         subItem.expireDate = expireDates.join(",");
+        var goodsItem = goodsList.find(function (goodItem) {
+          return goodItem.subTradeId === subItem.subTradeId;
+        });
+        subItem.sourceSubtradeNo = goodsItem.sourceSubtradeNo;
         prv.push(subItem);
       });
     } else {
@@ -281,7 +286,6 @@ 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,
@@ -290,7 +294,6 @@ 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 = {
@@ -340,7 +343,7 @@ export var getJkyLogisticInfo = function getJkyLogisticInfo(item, typeKey) {
 };
 //吉客云订单信息转换
 export var jkyOrderTransform = function jkyOrderTransform(detail, form) {
-  var _form$getFieldValue, _jkyReissueCom$compon, _jkyReturnCom$compone, _componentList$find, _componentList$find$c, _filterCurrentTrades$, _filterCurrentTrades$2, _currentTrades$find, _currentTrades$find$c, _currentTrades$find2, _currentTrades$find2$;
+  var _form$getFieldValue, _jkyReissueCom$compon, _jkyReturnCom$compone, _componentList$find, _componentList$find$c, _jkyReissueCom$compon2, _filterCurrentTrades$, _filterCurrentTrades$2, _currentTrades$find, _currentTrades$find$c, _currentTrades$find2, _currentTrades$find2$;
   var _detail$allOrders = detail.allOrders,
     allOrders = _detail$allOrders === void 0 ? [] : _detail$allOrders,
     orderNo = detail.orderNo,
@@ -366,6 +369,7 @@ export var jkyOrderTransform = function jkyOrderTransform(detail, form) {
   var jkyGoodsOrderBackGoodsLevel = (_componentList$find = componentList.find(function (item) {
     return item.workOrderComponentType === "JKY_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;
+  var jkyReissueGoodsOrderBackGoodsLevel = jkyReissueCom === null || jkyReissueCom === void 0 ? void 0 : (_jkyReissueCom$compon2 = jkyReissueCom.componentConfig) === null || _jkyReissueCom$compon2 === void 0 ? void 0 : _jkyReissueCom$compon2.orderBackGoodsLevel;
   var defaultOrder = filterCurrentTrades !== null && filterCurrentTrades !== void 0 && filterCurrentTrades[0] ? [filterCurrentTrades[0]] : [];
   var orders = currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.map(function (item) {
     return _objectSpread(_objectSpread({}, item), {}, {
@@ -389,7 +393,8 @@ export var jkyOrderTransform = function jkyOrderTransform(detail, form) {
     jkyReturnSystemOrderNo: onlyOneSystemOrder || isReturnDefaultSelect ? (_filterCurrentTrades$ = filterCurrentTrades[0]) === null || _filterCurrentTrades$ === void 0 ? void 0 : _filterCurrentTrades$.tradeNo : undefined,
     jkySystemOrderNo: onlyOneSystemOrder || isReissueDefaultSelect ? (_filterCurrentTrades$2 = filterCurrentTrades[0]) === null || _filterCurrentTrades$2 === void 0 ? void 0 : _filterCurrentTrades$2.tradeNo : undefined,
     jkyReissueGoods: onlyOneSystemOrder || isReissueDefaultSelect ? updateJkyGoodsHandle(defaultOrder, {
-      canEdit: true
+      canEdit: true,
+      orderBackGoodsLevel: jkyReissueGoodsOrderBackGoodsLevel
     }).filter(function (good) {
       return !isStrict || !orderNo || getIsPlatformCodesIncludeOrderNos(good.platformCode, orderNo);
     }) : [],

package/dist/esm/utils/jstOrderBackFormValues.d.ts

@@ -33,7 +33,7 @@ export declare const jstOrderTransform: (detail: any, form: any) => {
     jstReissueGoods: any;
     jstReturnGoods: any;
     jstSystemOrderBillType: any;
-    jstReturnSystemOrderBillType: any;
+    shopCode: any;
     jstGoods: {
         isRequest: boolean;
         allOrders: any;

package/dist/esm/utils/jstOrderBackFormValues.js

@@ -54,6 +54,7 @@ export var updateJstGoodsHandle = function updateJstGoodsHandle() {
     item.canEdit = !!options.canEdit;
     item.uuid = (_item$uuid = item.uuid) !== null && _item$uuid !== void 0 ? _item$uuid : uuid();
     item.systemOrderNo = systemOrderNo;
+    item.saleAmount = ((item.qty || 0) * (item.salePrice || 0)).toFixed(2);
     return _objectSpread({}, item);
   };
   var list = orders.reduce(function (prv, next) {
@@ -237,7 +238,7 @@ export var jstMergeIdenticalGoods = function jstMergeIdenticalGoods() {
 export var jstOrderBackFormValues = function jstOrderBackFormValues() {
   var detail = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var templateDetail = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  return ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
+  var res = ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
     var uniqueKey = next.uniqueKey;
     var config = next.componentConfig;
     switch (next.workOrderComponentType) {
@@ -266,10 +267,13 @@ export var jstOrderBackFormValues = function jstOrderBackFormValues() {
             jstSystemOrder: detail === null || detail === void 0 ? void 0 : detail.jstSystemOrder,
             jstSystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.jstReturnSystemOrderNo,
             jstReturnType: [_initReason],
-            jstReturnGoods: _initReason === "2" ? [] : jstMergeIdenticalGoods((detail === null || detail === void 0 ? void 0 : detail.jstReturnGoods) || []),
-            jstSystemOrderBillType: (detail === null || detail === void 0 ? void 0 : detail.jstReturnSystemOrderBillType) || ""
+            shopCode: detail === null || detail === void 0 ? void 0 : detail.shopCode,
+            jstReturnGoods: _initReason === "2" ? [] : jstMergeIdenticalGoods((detail === null || detail === void 0 ? void 0 : detail.jstReturnGoods) || [])
+            // jstSystemOrderBillType:
+            //   detail?.jstReturnSystemOrderBillType || "",
           };
         }
+
         break;
       case "JST_ITEM_SELECT_THIRD":
         prv[uniqueKey] = updateJstItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.jstItemSelectThird, "itemList", config);
@@ -286,10 +290,11 @@ export var jstOrderBackFormValues = function jstOrderBackFormValues() {
     }
     return prv;
   }, {});
+  return res;
 };
 //jst订单信息转换
 export var jstOrderTransform = function jstOrderTransform(detail, form) {
-  var _form$getFieldValue, _jstReissueCom$compon, _jstReturnCom$compone, _newOrderList$, _newOrderList$2, _jstReissueCom$compon2, _newOrderList$3, _newOrderList$4, _orderList$find, _orderList$find$call, _jstGoodsCom$componen;
+  var _form$getFieldValue, _jstReissueCom$compon, _newOrderList$, _newOrderList$2, _jstReissueCom$compon2, _jstReturnCom$compone, _newOrderList$3, _orderList$find, _orderList$find$call, _orderList$find2, _orderList$find2$call, _jstGoodsCom$componen;
   var orderNo = detail.orderNo,
     _detail$orderList = detail.orderList,
     orderList = _detail$orderList === void 0 ? [] : _detail$orderList,
@@ -311,7 +316,8 @@ export var jstOrderTransform = function jstOrderTransform(detail, form) {
   });
   var onlyOneSystemOrder = (newOrderList === null || newOrderList === void 0 ? void 0 : newOrderList.length) === 1;
   var isReissueDefaultSelect = !!(jstReissueCom !== null && jstReissueCom !== void 0 && (_jstReissueCom$compon = jstReissueCom.componentConfig) !== null && _jstReissueCom$compon !== void 0 && _jstReissueCom$compon.showDefaultSelect);
-  var isReturnDefaultSelect = !!(jstReturnCom !== null && jstReturnCom !== void 0 && (_jstReturnCom$compone = jstReturnCom.componentConfig) !== null && _jstReturnCom$compone !== void 0 && _jstReturnCom$compone.showDefaultSelect);
+  // 退货商品不用选择系统订单号，所以当做固定选中默认值
+  var isReturnDefaultSelect = true;
   var defaultOrder = newOrderList !== null && newOrderList !== void 0 && newOrderList[0] ? [newOrderList[0]] : [];
   return {
     jstSystemOrder: {
@@ -334,12 +340,19 @@ export var jstOrderTransform = function jstOrderTransform(detail, form) {
       return !isStrict || !orderNo || good.originalDealCode === orderNo;
     }) : [],
     jstReturnGoods: onlyOneSystemOrder || isReturnDefaultSelect ? updateJstGoodsHandle(defaultOrder, {
+      orderBackGoodsLevel: jstReturnCom === null || jstReturnCom === void 0 ? void 0 : (_jstReturnCom$compone = jstReturnCom.componentConfig) === null || _jstReturnCom$compone === void 0 ? void 0 : _jstReturnCom$compone.orderBackGoodsLevel,
       canEdit: true
     }).filter(function (good) {
       return !isStrict || !orderNo || good.originalDealCode === orderNo;
     }) : [],
     jstSystemOrderBillType: onlyOneSystemOrder || isReissueDefaultSelect ? (_newOrderList$3 = newOrderList[0]) === null || _newOrderList$3 === void 0 ? void 0 : _newOrderList$3.orderType : "",
-    jstReturnSystemOrderBillType: onlyOneSystemOrder || isReturnDefaultSelect ? (_newOrderList$4 = newOrderList[0]) === null || _newOrderList$4 === void 0 ? void 0 : _newOrderList$4.orderType : "",
+    // jstReturnSystemOrderBillType:
+    //   onlyOneSystemOrder || isReturnDefaultSelect
+    //     ? newOrderList[0]?.orderType
+    //     : "",
+    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) {
+      return item.shopId;
+    })) === null || _orderList$find$call === void 0 ? void 0 : _orderList$find$call.shopId) || null,
     jstGoods: {
       //标记通过请求获取的值
       isRequest: true,
@@ -347,9 +360,9 @@ export var jstOrderTransform = function jstOrderTransform(detail, form) {
       // 订单反填，要清空orders，存的是当前系统订单号勾选上的 订单
       orders: orderList || [],
       orderNo: orderNo,
-      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) {
-        return item.sdCode;
-      })) === null || _orderList$find$call === void 0 ? void 0 : _orderList$find$call.sdCode) || null,
+      shopCode: (orderList === null || orderList === void 0 ? void 0 : (_orderList$find2 = orderList.find) === null || _orderList$find2 === void 0 ? void 0 : (_orderList$find2$call = _orderList$find2.call(orderList, function (item) {
+        return item.shopId;
+      })) === null || _orderList$find2$call === void 0 ? void 0 : _orderList$find2$call.shopId) || null,
       jstGoods: updateJstGoodsHandle(orderList, {
         orderBackGoodsLevel: jstGoodsCom === null || jstGoodsCom === void 0 ? void 0 : (_jstGoodsCom$componen = jstGoodsCom.componentConfig) === null || _jstGoodsCom$componen === void 0 ? void 0 : _jstGoodsCom$componen.orderBackGoodsLevel
       }).filter(function (good) {

package/dist/esm/utils/kmOrderBackFormValues.js

@@ -415,10 +415,6 @@ 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;
@@ -448,7 +444,6 @@ 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,7 +290,6 @@ 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,7 +473,6 @@ 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.3",
+  "version": "2.10.4",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9de8ccc40cd591ee7d1d8692497008cf8fc98db3",
+  "gitHead": "545af3d105d59a2b0b8f92cb0dd8804f4e5631f6",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }