@kmkf-fe-packages/kmkf-work-order-service-component 2.0.69 → 2.0.70

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

@@ -34,7 +34,6 @@ import { replaceCheck, orderDetail, queryLabelByTradeId, queryMemberLevel, query
 import { factory } from '@kmkf-fe-packages/services-components';
 import { getExpression, formatDisplayConfig, isNull, LabelData, setSessionStorage } from '@kmkf-fe-packages/kmkf-utils';
 import ShopName from "../ShopName";
-import { PlatForm } from "../../../model/flowTemplateDetail/types";
 import { groupByPreNode, getCurrentNodeModifiedShowHideRule } from "./common";
 import { getCalculationComponentValue } from "../../../common/utils/arithmetic";
 import "./index.less";
@@ -135,7 +134,9 @@ var FormRender = function FormRender(props, ref) {
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     preNodeForm = _Form$useForm2[0];
   // TODO: 千牛端淘宝备注信息，不需要订单反填逻辑
-  var fromQNCreateWorkOrderByOrderNo = !!orderNo && platform === PlatForm.TB;
+  // const fromQNCreateWorkOrderByOrderNo = !!orderNo && platform === PlatForm.TB;
+  // 去除千牛端上的特殊处理
+  var fromQNCreateWorkOrderByOrderNo = false;
   useEffect(function () {
     setShopId(currentShopId);
   }, [currentShopId]);

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_SHOP', 'WDT_EXCHANGE_GOODS', 'KM_SYSTEM_ORDER', 'KM_SEND_GOOD', 'KM_LOGISTICS', 'KM_GOODS', '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'];
+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_SHOP', 'WDT_EXCHANGE_GOODS', 'KM_SYSTEM_ORDER', 'KM_SEND_GOOD', 'KM_LOGISTICS', 'KM_GOODS', 'KM_REISSUE_GOODS', '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/FormRender/index.js

@@ -31,7 +31,6 @@ import submitDataTransOldFormat from "../common/utils/submitDataTransOldFormat";
 import { queryTemplateDetail, addLogicFlowWorkOrder, queryWorkOrderDetail, updateWorkOrder, replaceCheck, queryTemplateIdByFlowId } from "../model/servers/api";
 import { factory, ShopList } from '@kmkf-fe-packages/services-components';
 import { getExpression, formatDisplayConfig, isNull } from '@kmkf-fe-packages/kmkf-utils';
-import { PlatForm } from "../WorkOrder/types";
 import "./index.less";
 import { CHILD_FIELD_TYPE, CHILD_FIELD_VALUE } from "../common/constant";
 var ShopName = function ShopName(_ref) {
@@ -107,7 +106,9 @@ var FormRender = function FormRender(props, ref) {
     shopId = _useState12[0],
     setShopId = _useState12[1];
   // TODO: 千牛端淘宝备注信息，不需要订单反填逻辑
-  var fromQNCreateWorkOrderByOrderNo = !!orderNo && platform === PlatForm.TB;
+  // const fromQNCreateWorkOrderByOrderNo = !!orderNo && platform === PlatForm.TB;
+  // 去除千牛端上的特殊处理
+  var fromQNCreateWorkOrderByOrderNo = false;
   useEffect(function () {
     setShopId(currentShopId);
   }, [currentShopId]);

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

@@ -280,6 +280,12 @@ export var SUBMIT_COMPONENT_REISSUE_MAP = {
     shopCode: 'shopCode',
     systemOrderNo: 'jstSystemOrderNo',
     systemOrderBillType: 'jstSystemOrderBillType'
+  },
+  KM_REISSUE_GOODS: {
+    type: 'kmReissueType',
+    goods: 'kmReissueGoods',
+    shopCode: 'shopCode',
+    systemOrderNo: 'kmSystemOrderNo'
   }
 };
 export var SUBMIT_COMPONENT_RETURN_GOODS_MAP = {

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

@@ -503,7 +503,7 @@ var handleBsOrWdtReissueGoods = function handleBsOrWdtReissueGoods(_ref38) {
     if (item.workOrderComponentType !== 'GY_REISSUE_GOODS') {
       addContent(SUBMIT_COMPONENT_REISSUE_MAP[item.workOrderComponentType].shopCode, (reissue === null || reissue === void 0 ? void 0 : reissue.shopCode) || '');
     }
-    if (item.workOrderComponentType === 'WDT_REISSUE_GOODS' || item.workOrderComponentType === 'JST_REISSUE_GOODS' || item.workOrderComponentType === 'JST_RETURN_GOODS' || item.workOrderComponentType === 'GY_REISSUE_GOODS') {
+    if (item.workOrderComponentType === 'WDT_REISSUE_GOODS' || item.workOrderComponentType === 'JST_REISSUE_GOODS' || item.workOrderComponentType === 'JST_RETURN_GOODS' || item.workOrderComponentType === 'GY_REISSUE_GOODS' || item.workOrderComponentType === 'KM_REISSUE_GOODS') {
       addContent(SUBMIT_COMPONENT_REISSUE_MAP[item.workOrderComponentType].systemOrderNo, (reissue === null || reissue === void 0 ? void 0 : reissue[SUBMIT_COMPONENT_REISSUE_MAP[item.workOrderComponentType].systemOrderNo]) || '');
     }
     // 管易补发商品信息vipCode/shopCode未复现出丢失情况，兜底措施
@@ -899,6 +899,7 @@ var processComponent = function processComponent(_ref53) {
       case 'GY_REISSUE_GOODS':
       case 'JST_REISSUE_GOODS':
       case 'JST_RETURN_GOODS':
+      case 'KM_REISSUE_GOODS':
         wrapFn(handleBsOrWdtReissueGoods);
         break;
       case 'BS_RETURN_GOODS':

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

@@ -912,6 +912,7 @@ export var reversalFormValues = function reversalFormValues() {
       case 'GY_RETURN_GOODS':
       case 'JST_REISSUE_GOODS':
       case 'JST_RETURN_GOODS':
+      case 'KM_REISSUE_GOODS':
         prv["".concat(next.uniqueKey, "_shopCode")] = values[next.uniqueKey]['shopCode'];
         break;
       case 'BS_DELIVERY_NO':

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

@@ -4,7 +4,7 @@ import { servers } from '@kmkf-fe-packages/kmkf-utils';
 var orderBackKeyListMap = {
   hasJst: ['JST_SYSTEM_ORDER', 'JST_GOODS', 'JST_REISSUE_GOODS', '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', 'KM_LOGISTICS', 'KM_GOODS'],
+  hasKm: ['KM_SYSTEM_ORDER', 'KM_LOGISTICS', 'KM_GOODS', 'KM_REISSUE_GOODS'],
   hasWdt: ['WDT_SYSTEM_ORDER', 'WDT_GOODS', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WDT_REISSUE_GOODS', 'WDT_SHOP'],
   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

@@ -874,6 +874,28 @@ var processWdtReturnGoods = function processWdtReturnGoods(templateColumns) {
     };
   };
 };
+var processKmReissueGoods = function processKmReissueGoods(templateColumns) {
+  return function (getValue) {
+    return function (nex, config) {
+      var orderNo = '';
+      var tradeId = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
+        return col.workOrderComponentType === 'TRADE_ID_INPUT';
+      });
+      if (tradeId) {
+        orderNo = getValue("".concat(tradeId.uniqueKey, "_").concat(updateWorkTypeKeys[tradeId.workOrderComponentType]));
+      }
+      return _defineProperty({}, nex.uniqueKey, {
+        kmSystemOrder: {
+          orderNo: orderNo
+        },
+        kmReissueType: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_kmReissueType")), !isNull(config === null || config === void 0 ? void 0 : config.initReason) ? [config.initReason] : ['1']),
+        kmReissueGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_kmReissueGoods")), []),
+        shopCode: getValue("".concat(nex.uniqueKey, "_shopCode")),
+        kmSystemOrderNo: getValue("".concat(nex.uniqueKey, "_kmSystemOrderNo"))
+      });
+    };
+  };
+};
 var processGyReissueGoods = function processGyReissueGoods(templateColumns) {
   return function (getValue) {
     return function (nex, config) {
@@ -967,14 +989,14 @@ var processJstReturnGoods = function processJstReturnGoods(templateColumns) {
 };
 var processLabel = function processLabel(getValue) {
   return function (nex, config) {
-    var _ref67;
-    return _ref67 = {}, _defineProperty(_ref67, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref67, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref67;
+    var _ref68;
+    return _ref68 = {}, _defineProperty(_ref68, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref68, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref68;
   };
 };
 var processMemberLevel = function processMemberLevel(getValue) {
   return function (nex, config) {
-    var _ref68;
-    return _ref68 = {}, _defineProperty(_ref68, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref68, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref68;
+    var _ref69;
+    return _ref69 = {}, _defineProperty(_ref69, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref69, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref69;
   };
 };
 var processAfterSalesOrderId = function processAfterSalesOrderId(getValue) {
@@ -1087,6 +1109,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       BS_E3_GOODS: processBsE3Goods(templateColumns),
       GY_GOODS: processGyGoods(templateColumns),
       KM_GOODS: processKmGoods(templateColumns),
+      KM_REISSUE_GOODS: processKmReissueGoods(templateColumns),
       JST_GOODS: processJstGoods(templateColumns),
       BS_REISSUE_GOODS: processBsReissueGoods,
       BS_EXCHANGE_GOODS: processBsExchangeGoods,

package/package.json

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