@kmkf-fe-packages/kmkf-work-order-service-component 2.0.56 → 2.0.58

package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.js

@@ -880,7 +880,7 @@ var FormRender = function FormRender(props, ref) {
     }
     //如果有bs组件 设置成初始值
     var hasBs = get(templateDetail, 'componentDtoList', []).some(function (item) {
-      return ['BS_LOGISTICS', 'BS_E3_LOGISTICS', 'BS_SEND_GOOD', 'BS_E3_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'KM_LOGISTICS', 'KM_SEND_GOOD', 'GY_SEND_GOOD'].includes(item.workOrderComponentType);
+      return ['BS_LOGISTICS', 'BS_E3_LOGISTICS', 'BS_SEND_GOOD', 'BS_E3_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'KM_LOGISTICS', 'KM_SEND_GOOD', 'GY_SEND_GOOD', 'GY_LOGISTICS'].includes(item.workOrderComponentType);
     });
     if (hasBs) {
       var bsValue = get(templateDetail, 'componentDtoList', []).reduce(function (prv, next) {
@@ -890,6 +890,7 @@ var FormRender = function FormRender(props, ref) {
           case 'WDT_LOGISTICS':
           case 'KM_LOGISTICS':
           case 'BS_E3_LOGISTICS':
+          case 'GY_LOGISTICS':
             prv[next.uniqueKey] = [{
               logisticsCompany: null,
               logisticsCode: null

package/dist/esm/FlowTemplateDetailV2/constant.js

@@ -1,2 +1,2 @@
 // 切换当前店铺时，以下组件字段需要清空
-export var NEED_CLEAR_FIELDS_WHEN_SHOP_ID_CHANGE = ['BS_E3_LOGISTICS', 'BS_E3_SEND_GOOD', 'ITEM_SELECT_THIRD', 'STATUS', 'ITEM_SELECT', 'ITEM_ID', 'ITEM_ENCODE', 'JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD', 'BS_GOODS', 'BS_EXCHANGE_GOODS', 'BS_REISSUE_GOODS', 'BS_RETURN_GOODS', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WDT_SYSTEM_ORDER', 'WDT_REISSUE_GOODS', 'WDT_RETURN_GOODS', 'WDT_EXCHANGE_GOODS', 'KM_SYSTEM_ORDER', 'KM_SEND_GOOD', 'KM_LOGISTICS', 'BS_E3_SYSTEM_ORDER', 'JST_SYSTEM_ORDER', 'JST_GOODS', 'JST_REISSUE_GOODS', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS', 'BS_E3_REISSUE_GOODS', 'GY_SYSTEM_ORDER', 'GY_SEND_GOOD', 'GY_GOODS', 'GY_REISSUE_GOODS', 'GY_RETURN_GOODS'];
+export var NEED_CLEAR_FIELDS_WHEN_SHOP_ID_CHANGE = ['BS_E3_LOGISTICS', 'BS_E3_SEND_GOOD', 'ITEM_SELECT_THIRD', 'STATUS', 'ITEM_SELECT', 'ITEM_ID', 'ITEM_ENCODE', 'JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD', 'BS_GOODS', 'BS_EXCHANGE_GOODS', 'BS_REISSUE_GOODS', 'BS_RETURN_GOODS', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WDT_SYSTEM_ORDER', 'WDT_REISSUE_GOODS', 'WDT_RETURN_GOODS', 'WDT_EXCHANGE_GOODS', 'KM_SYSTEM_ORDER', 'KM_SEND_GOOD', 'KM_LOGISTICS', 'BS_E3_SYSTEM_ORDER', 'JST_SYSTEM_ORDER', 'JST_GOODS', 'JST_REISSUE_GOODS', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS', 'BS_E3_REISSUE_GOODS', 'GY_SYSTEM_ORDER', 'GY_SEND_GOOD', 'GY_GOODS', 'GY_REISSUE_GOODS', 'GY_RETURN_GOODS', 'GY_LOGISTICS'];

package/dist/esm/common/utils/constant.js

@@ -197,6 +197,11 @@ export var SUBMIT_COMPONENT_ERP_LOGISTICS_MAP = {
     list: 'jstItemList',
     company: 'logisticsCompany',
     code: 'logisticsCode'
+  },
+  GY_LOGISTICS: {
+    list: 'gyLogisticsList',
+    company: 'gyLogisticsCompany',
+    code: 'gyLogisticsCode'
   }
 };
 export var SUBMIT_COMPONENT_SEND_GOOD_MAP = {

package/dist/esm/common/utils/submitDataTransOldFormat.js

@@ -848,6 +848,7 @@ var processComponent = function processComponent(_ref52) {
       case 'WLN_LOGISTICS':
       case 'WDT_LOGISTICS':
       case 'KM_LOGISTICS':
+      case 'GY_LOGISTICS':
         wrapFn(handleErpLogistics);
         break;
       case 'BS_SEND_GOOD':

package/dist/esm/common/utils/tools.js

@@ -385,7 +385,10 @@ export var orderBack = /*#__PURE__*/function () {
               gyGoods: [],
               orders: []
             });
-            // gyInfo.gyLogistics = [{ logisticsCompany: null, logisticsCode: '' }];
+            gyInfo.gyLogistics = [{
+              logisticsCompany: null,
+              logisticsCode: ''
+            }];
             gyInfo.gySendGood = [{
               sendId: '',
               sendName: ''
@@ -1107,7 +1110,7 @@ export var gySystemOrderBackValues = function gySystemOrderBackValues(_ref11) {
   //如果没有选择的值不返填，会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
   if (!(value !== null && value !== void 0 && value.selectedRows)) return;
   var gyGoodsComponent = (_templateList$compone9 = templateList.componentDtoList) === null || _templateList$compone9 === void 0 ? void 0 : _templateList$compone9.filter(function (item) {
-    return ['GY_GOODS', 'GY_SEND_GOOD'].includes(item.workOrderComponentType) && !item.notOrderBack;
+    return ['GY_GOODS', 'GY_SEND_GOOD', 'GY_LOGISTICS'].includes(item.workOrderComponentType) && !item.notOrderBack;
   });
   if (!(gyGoodsComponent !== null && gyGoodsComponent !== void 0 && gyGoodsComponent.length)) return;
   var tIdCom = (_templateList$compone10 = templateList.componentDtoList) === null || _templateList$compone10 === void 0 ? void 0 : _templateList$compone10.find(function (item) {

package/dist/esm/common/utils/tools_constants.js

@@ -8,7 +8,7 @@ var orderBackKeyListMap = {
   hasWdt: ['WDT_SYSTEM_ORDER', 'WDT_GOODS', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WDT_REISSUE_GOODS'],
   hasBsE3: ['BS_E3_SYSTEM_ORDER', 'BS_E3_GOODS', 'BS_E3_REISSUE_GOODS', 'BS_E3_LOGISTICS', 'BS_E3_SEND_GOOD'],
   hasWln: ['WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD'],
-  hasGy: ['GY_SYSTEM_ORDER', 'GY_SEND_GOOD', 'GY_GOODS', 'GY_REISSUE_GOODS', 'GY_RETURN_GOODS']
+  hasGy: ['GY_SYSTEM_ORDER', 'GY_SEND_GOOD', 'GY_GOODS', 'GY_REISSUE_GOODS', 'GY_RETURN_GOODS', 'GY_LOGISTICS']
 };
 export var orderBackMap = function orderBackMap(_ref) {
   var templateDetail = _ref.templateDetail,

package/dist/esm/common/utils/transformWorkOrderData.js

@@ -443,6 +443,9 @@ var processErpLogistics = function processErpLogistics(getValue) {
       },
       KM_LOGISTICS: {
         listKey: 'kmLogisticsList'
+      },
+      GY_LOGISTICS: {
+        listKey: 'gyLogisticsList'
       }
     };
     var initValue = [{
@@ -1031,6 +1034,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       BS_LOGISTICS: processErpLogistics,
       WLN_LOGISTICS: processErpLogistics,
       WDT_LOGISTICS: processErpLogistics,
+      GY_LOGISTICS: processErpLogistics,
       BS_E3_LOGISTICS: processErpLogistics,
       KM_LOGISTICS: processErpLogistics,
       BS_SEND_GOOD: processErpSendGood,

package/dist/esm/model/servers/api.js

@@ -1,3 +1,9 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 /*
  * @Description:
  * @Author: litian
@@ -6,6 +12,8 @@
  * @LastEditTime: 2022-11-08 13:58:05
  */
 import request from "./request";
+import { tradeStatusMap } from '@kmkf-fe-packages/kmkf-utils';
+
 //获取灰度白名
 export var grayWhiteList = function grayWhiteList() {
   return request({
@@ -396,6 +404,19 @@ export var wdtOrderDetail = function wdtOrderDetail(data) {
     method: 'post',
     data: data,
     infoLevel: 'warning'
+  }).then(function (res) {
+    if (res !== null && res !== void 0 && res.success) {
+      var _res$data, _res$data$trades;
+      if (res !== null && res !== void 0 && (_res$data = res.data) !== null && _res$data !== void 0 && (_res$data$trades = _res$data.trades) !== null && _res$data$trades !== void 0 && _res$data$trades.length) {
+        res.data.trades = res.data.trades.map(function (item) {
+          var _tradeStatusMap$res$d;
+          return _objectSpread(_objectSpread({}, item), {}, {
+            tradeStatusValue: tradeStatusMap === null || tradeStatusMap === void 0 ? void 0 : (_tradeStatusMap$res$d = tradeStatusMap[res.data.version]) === null || _tradeStatusMap$res$d === void 0 ? void 0 : _tradeStatusMap$res$d[item.tradeStatus]
+          });
+        });
+      }
+    }
+    return res;
   });
 };
 // 百胜E3订单详情

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "2.0.56",
+  "version": "2.0.58",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -32,9 +32,9 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@kmkf-fe-packages/basic-components": "2.0.56",
-    "@kmkf-fe-packages/kmkf-utils": "2.0.56",
-    "@kmkf-fe-packages/services-components": "2.0.56",
+    "@kmkf-fe-packages/basic-components": "2.0.58",
+    "@kmkf-fe-packages/kmkf-utils": "2.0.58",
+    "@kmkf-fe-packages/services-components": "2.0.58",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -73,7 +73,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "cc90a2328d7efea5866745a63d88e2b5107c6ef5",
+  "gitHead": "5a517395de7da7ba6f8549f5cbd199ba4a7c05fa",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }