@kmkf-fe-packages/kmkf-work-order-service-component 2.0.4 → 2.0.10

package/README.md

@@ -40,7 +40,7 @@ Build library via `father`,
 $ npm run build
 ```
 
-111222
+1112221111
 
 ## 企业工单工单项目抽离模块
 

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

@@ -832,7 +832,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_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'].includes(item.workOrderComponentType);
     });
     if (hasBs) {
       var bsValue = get(templateDetail, 'componentDtoList', []).reduce(function (prv, next) {
@@ -840,6 +840,7 @@ var FormRender = function FormRender(props, ref) {
           case 'BS_LOGISTICS':
           case 'WLN_LOGISTICS':
           case 'WDT_LOGISTICS':
+          case 'KM_LOGISTICS':
           case 'BS_E3_LOGISTICS':
             prv[next.uniqueKey] = [{
               logisticsCompany: 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', 'BS_E3_SYSTEM_ORDER', 'BS_E3_REISSUE_GOODS', 'GY_SYSTEM_ORDER', 'GY_SEND_GOOD', 'GY_GOODS', 'GY_REISSUE_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', 'BS_E3_REISSUE_GOODS', 'GY_SYSTEM_ORDER', 'GY_SEND_GOOD', 'GY_GOODS', 'GY_REISSUE_GOODS'];

package/dist/esm/WorkOrder/index.js

@@ -164,7 +164,9 @@ var WorkOrder = function WorkOrder(props) {
     }
     return opt;
   }, [isShowPayment, isShowWdt]);
-  return /*#__PURE__*/React.createElement(Global, null, /*#__PURE__*/React.createElement(Spin, {
+  return /*#__PURE__*/React.createElement(Global, {
+    notJudgedErp: false
+  }, /*#__PURE__*/React.createElement(Spin, {
     spinning: loading
   }, (otherInfo === null || otherInfo === void 0 ? void 0 : otherInfo.platform) == 6 && (otherInfo === null || otherInfo === void 0 ? void 0 : otherInfo.shopType) == 1 && /*#__PURE__*/React.createElement(Alert, {
     message: "\u5F53\u524D\u5E97\u94FA\uFF1A".concat(otherInfo === null || otherInfo === void 0 ? void 0 : otherInfo.shopName),

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

@@ -121,6 +121,14 @@ export var SUBMIT_COMPONENT_STATUS_MAP = {
   REJECT_REFUND_STATUS: {
     status: 'rejectRefundStatusValue',
     reason: 'rejectRefundStatusReason'
+  },
+  AGREE_RETURN_GOODS_STATUS: {
+    status: 'agreeReturnGoodsStatusValue',
+    reason: 'agreeReturnGoodsStatusReason'
+  },
+  REJECT_RETURN_GOODS_STATUS: {
+    status: 'rejectReturnGoodsStatusValue',
+    reason: 'rejectReturnGoodsStatusReason'
   }
 };
 export var SUBMIT_COMPONENT_GOOD_STATUS_MAP = {
@@ -160,6 +168,11 @@ export var SUBMIT_COMPONENT_ERP_LOGISTICS_MAP = {
     list: 'wdtLogisticsList',
     company: 'wdtLogisticsCompany',
     code: 'wdtLogisticsCode'
+  },
+  KM_LOGISTICS: {
+    list: 'kmLogisticsList',
+    company: 'kmLogisticsCompany',
+    code: 'kmLogisticsCode'
   }
 };
 export var SUBMIT_COMPONENT_SEND_GOOD_MAP = {

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

@@ -703,6 +703,8 @@ var processComponent = function processComponent(_ref50) {
       case 'INVOICING_STATUS':
       case 'AGREE_REFUND_STATUS':
       case 'REJECT_REFUND_STATUS':
+      case 'AGREE_RETURN_GOODS_STATUS':
+      case 'REJECT_RETURN_GOODS_STATUS':
         wrapFn(handleStatusField);
         break;
       case 'RETURN_GOODS_STATUS':
@@ -784,6 +786,7 @@ var processComponent = function processComponent(_ref50) {
       case 'BS_LOGISTICS':
       case 'WLN_LOGISTICS':
       case 'WDT_LOGISTICS':
+      case 'KM_LOGISTICS':
         wrapFn(handleErpLogistics);
         break;
       case 'BS_SEND_GOOD':

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

@@ -932,7 +932,7 @@ export var kmSystemOrderBackValues = function kmSystemOrderBackValues(_ref9) {
   //如果没有选择的值不返填，会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
   if (!(value !== null && value !== void 0 && value.selectedRows)) return;
   var kmGoodsComponent = (_templateList$compone5 = templateList.componentDtoList) === null || _templateList$compone5 === void 0 ? void 0 : _templateList$compone5.filter(function (item) {
-    return ['KM_SEND_GOOD'].includes(item.workOrderComponentType) && !item.notOrderBack;
+    return ['KM_SEND_GOOD', 'KM_LOGISTICS'].includes(item.workOrderComponentType) && !item.notOrderBack;
   });
   if (!(kmGoodsComponent !== null && kmGoodsComponent !== void 0 && kmGoodsComponent.length)) return;
   var tIdCom = (_templateList$compone6 = templateList.componentDtoList) === null || _templateList$compone6 === void 0 ? void 0 : _templateList$compone6.find(function (item) {

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

@@ -3,7 +3,7 @@ import { jstOrderDetail, bsOrderDetail, wlnOrderDetail, wdtOrderDetail, bsE3Orde
 var orderBackKeyListMap = {
   hasJst: ['JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD'],
   hasBs: ['BS_SIGNING_TIME', 'BS_SEND_TIME', 'BS_TRADE_PAYMENT_TIME', 'BS_NET_RECEIPTS', 'BS_PACKAGE_WEIGHT', 'BS_GOODS', 'BS_DEPOSIT', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_POSTING', 'BS_SYSTEM_ORDER', 'BS_DELIVERY_NO'],
-  hasKm: ['KM_SYSTEM_ORDER'],
+  hasKm: ['KM_SYSTEM_ORDER', 'KM_LOGISTICS'],
   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'],

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

@@ -377,6 +377,14 @@ var processCallBackStatus = function processCallBackStatus(getValue) {
       REJECT_REFUND_STATUS: {
         status: 'rejectRefundStatusValue',
         reason: 'rejectRefundStatusReason'
+      },
+      AGREE_RETURN_GOODS_STATUS: {
+        status: 'agreeReturnGoodsStatusValue',
+        reason: 'agreeReturnGoodsStatusReason'
+      },
+      REJECT_RETURN_GOODS_STATUS: {
+        status: 'rejectReturnGoodsStatusValue',
+        reason: 'rejectReturnGoodsStatusReason'
       }
     };
     return _defineProperty({}, nex.uniqueKey, {
@@ -411,6 +419,9 @@ var processErpLogistics = function processErpLogistics(getValue) {
       },
       BS_E3_LOGISTICS: {
         listKey: 'bsE3LogisticsList'
+      },
+      KM_LOGISTICS: {
+        listKey: 'kmLogisticsList'
       }
     };
     var initValue = [{
@@ -853,6 +864,8 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       INVOICING_STATUS: processCallBackStatus,
       AGREE_REFUND_STATUS: processCallBackStatus,
       REJECT_REFUND_STATUS: processCallBackStatus,
+      AGREE_RETURN_GOODS_STATUS: processCallBackStatus,
+      REJECT_RETURN_GOODS_STATUS: processCallBackStatus,
       RETURN_GOODS_STATUS: processSceneStatus,
       EXCHANGE_STATUS: processSceneStatus,
       WAREHOUSING_STATUS: processSceneStatus,
@@ -862,6 +875,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       WLN_LOGISTICS: processErpLogistics,
       WDT_LOGISTICS: processErpLogistics,
       BS_E3_LOGISTICS: processErpLogistics,
+      KM_LOGISTICS: processErpLogistics,
       BS_SEND_GOOD: processErpSendGood,
       WLN_SEND_GOOD: processErpSendGood,
       WDT_SEND_GOOD: processErpSendGood,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "2.0.4",
+  "version": "2.0.10",
   "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.4",
-    "@kmkf-fe-packages/kmkf-utils": "2.0.4",
-    "@kmkf-fe-packages/services-components": "2.0.4",
+    "@kmkf-fe-packages/basic-components": "2.0.10",
+    "@kmkf-fe-packages/kmkf-utils": "2.0.10",
+    "@kmkf-fe-packages/services-components": "2.0.10",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -73,7 +73,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "aadc3f4d645351ebbe34f1b6275cad7d7e5129e3",
+  "gitHead": "42a45bf6cf7ad6c18efff13c5827a6ada877299b",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }