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

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 {
@@ -338,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,
@@ -364,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), {}, {
@@ -387,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/package.json

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