@kmkf-fe-packages/kmkf-work-order-service-component 1.9.0 → 1.9.2-beta.0

package/README.md

@@ -63,4 +63,5 @@ const Text = ()=>{
 
 ```
 
-| 字段 | 说明 | 数据类型 | | ----------------- | ---------------- | ------------------------------------ | | platform | 平台 | TAOBAO =淘宝\|FXG=抖音\|PDD=拼多多\| | | shopId | 店铺 ID | number | | buyerNick | 买家昵称 | string | | buyerId | 买家 id | string | | orderNo | 订单 id | string | | onEmpowerCallback | 授权弹框点击回调 | function | 
+| 字段 | 说明 | 数据类型 | | ----------------- | ---------------- | ------------------------------------ | | platform | 平台 | TAOBAO =淘宝\|FXG=抖音\|PDD=拼多多\| | | shopId | 店铺 ID | number | | buyerNick | 买家昵称 | string | | buyerId | 买家 id | string | | orderNo | 订单 id | string | | onEmpowerCallback | 授权弹框点击回调 | function |  
+

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

@@ -28,7 +28,7 @@ import { get, some, set, every, cloneDeep, isEmpty, intersection, throttle, grou
 import 'moment/locale/zh-cn';
 import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME, EXCLUDE_REPLACE_TOP_COMPONENT,
 // 重复检验不需要展示在顶部的
-INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, wlnSystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo } from "../../../common/utils/tools";
+INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, wlnSystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo, COMPONENT_MAP } from "../../../common/utils/tools";
 import { replaceCheck, orderDetail, queryLabelByTradeId } from "../../../model/servers/api";
 import { factory } from '@kmkf-fe-packages/services-components';
 import { getExpression, formatDisplayConfig, isNull, LabelData } from '@kmkf-fe-packages/kmkf-utils';
@@ -194,7 +194,7 @@ var FormRender = function FormRender(props, ref) {
     var obj = {};
     Object.keys(params).forEach(function (key) {
       var _params$key;
-      if (params[key] && ((_params$key = params[key]) === null || _params$key === void 0 ? void 0 : _params$key.indexOf('*')) > -1) {
+      if (params[key] && typeof params[key] === 'string' && ((_params$key = params[key]) === null || _params$key === void 0 ? void 0 : _params$key.indexOf('*')) > -1) {
         obj[key] = 0;
       }
     });
@@ -460,8 +460,45 @@ var FormRender = function FormRender(props, ref) {
     (antFormEl === null || antFormEl === void 0 ? void 0 : antFormEl.length) > 0 && set(antFormEl, '0.scrollTop', 0);
     resetMappdingHideComponents();
   };
+  var repeatWarningDataSchema = function repeatWarningDataSchema(formValue, templateDetail) {
+    var getKeyByValue = function getKeyByValue(value) {
+      return Object.keys(COMPONENT_MAP).find(function (key) {
+        return COMPONENT_MAP[key] === value;
+      });
+    };
+    var needRepeatWarnComponent = Object.values(COMPONENT_MAP);
+    return templateDetail.componentDtoList.reduce(function (cur, nxt) {
+      if (needRepeatWarnComponent !== null && needRepeatWarnComponent !== void 0 && needRepeatWarnComponent.includes(nxt === null || nxt === void 0 ? void 0 : nxt.workOrderComponentType)) {
+        var instance = factory(nxt.workOrderComponentType, {
+          id: nxt.uniqueKey,
+          name: nxt.name,
+          componentConfig: nxt.componentConfig,
+          effects: {},
+          type: nxt.workOrderComponentType
+        });
+        var _id = instance === null || instance === void 0 ? void 0 : instance.id;
+        var value = formValue[_id];
+        var _key = getKeyByValue(nxt.workOrderComponentType);
+        // TODO: 如果是订单号组件, 将值设置为orderNo
+        if (nxt.workOrderComponentType === 'TRADE_ID_INPUT') {
+          _key = 'orderNo';
+        }
+        if (_key) {
+          cur[_key] = value;
+        }
+      }
+      return cur;
+    }, {});
+  };
   useEffect(function () {
-    if (isErpUse) return;
+    if (isErpUse && templateDetail) {
+      var formValue = form.getFieldsValue(true);
+      console.debug('表单内容值', formValue);
+      // TODO: 拼装需要重复提醒的组件数据格式
+      var value = repeatWarningDataSchema(formValue, templateDetail);
+      console.debug('重复提醒转换之后数据', value);
+      return orderBackReplace(value, templateDetail);
+    }
     queryDetail({
       workOrderId: workOrderId,
       shopId: shopId,
@@ -471,7 +508,7 @@ var FormRender = function FormRender(props, ref) {
       buyerId: buyerId,
       buyerNick: buyerNick
     });
-  }, [workOrderId, record, shopId, isErpUse]);
+  }, [workOrderId, record, shopId, isErpUse, templateDetail]);
 
   // 重置映射隐藏的组件, 目前只有单选、下拉组件可能会因为映射关系隐藏
   var resetMappdingHideComponents = function resetMappdingHideComponents() {
@@ -502,8 +539,8 @@ var FormRender = function FormRender(props, ref) {
 
   // 批量映射
   var batchFillByMapping = function batchFillByMapping(values) {
-    for (var _key in values) {
-      fillByMapping(_key, values[_key]);
+    for (var _key2 in values) {
+      fillByMapping(_key2, values[_key2]);
     }
   };
   // 组件映射
@@ -516,8 +553,8 @@ var FormRender = function FormRender(props, ref) {
       form.setFieldsValue(mapping === null || mapping === void 0 ? void 0 : mapping[triggerValue]);
     } else {
       var resetSet = new Set();
-      for (var _key2 in mapping) {
-        for (var uniqueKey in mapping[_key2]) {
+      for (var _key3 in mapping) {
+        for (var uniqueKey in mapping[_key3]) {
           resetSet.add(uniqueKey);
         }
       }

package/dist/esm/FlowTemplateDetail/index.js

@@ -24,6 +24,7 @@ import { useDispatch, useSelector, Provider, batch } from 'react-redux';
 import store from "../model/store";
 import zhCN from 'antd/es/locale/zh_CN';
 import { calcWorkOrderList, deleteCacheOrder } from "../common/utils/tools";
+import moment from 'moment';
 import { setPlat, fetchPanelInfo, fetchAllFlowOperateRecord, setAction, setVisibleRemarkList, setAddRemarkVisible, setLoading, setClearStore
 // setLabelList
 } from "../model/flowTemplateDetail";
@@ -45,8 +46,8 @@ import SubmitRemindModal from "./components/SubmitRemindModal";
 import { useSignal } from "../hooks/useSignal";
 import { verifyHandle, submitParams, FLOW_STATUS_V2, getTag, currentUserHasOperatorAuth, CANNOT_BACK_FILL } from "./common";
 import { saveWorkOrder, submitWorkOrder, addRemark, stopWorkOrder, closeWorkOrder, startWorkOrder, forwardWorkOrder, returnWorkOrder, withDrawWorkOrder, reminder, cancelReminder } from "../model/flowTemplateDetail/api";
-import { COMPONENT_MAP } from "../common/utils/tools";
 import RenderDetail from "./components/RenderDetail";
+import { COMPONENT_MAP } from "../common/utils/tools";
 import { orderDetail } from "../model/servers/api";
 import cache from "../common/cache";
 import "./index.less";
@@ -1053,7 +1054,25 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
       onClick: function onClick() {
         return handleFillWorkOrder(transData);
       }
-    }, "\u7ACB\u5373\u586B\u5145"), details.flowWorkOrderId, /*#__PURE__*/React.createElement(RenderDetail, {
+    }, "\u7ACB\u5373\u586B\u5145"), details.flowWorkOrderId, /*#__PURE__*/React.createElement("div", {
+      style: {
+        margin: '0 8px'
+      }
+    }, /*#__PURE__*/React.createElement("span", {
+      style: {
+        color: 'rgba(0,0,0,0.4)',
+        fontSize: '12px'
+      }
+    }, "\u63D0\u4EA4\u4EBA\uFF1A"), ' ', details.submitter), /*#__PURE__*/React.createElement("div", {
+      style: {
+        margin: '0 8px'
+      }
+    }, /*#__PURE__*/React.createElement("span", {
+      style: {
+        color: 'rgba(0,0,0,0.4)',
+        fontSize: '12px'
+      }
+    }, "\u63D0\u4EA4\u65F6\u95F4\uFF1A"), moment(details.created).format('YYYY-MM-DD HH:mm:ss')), /*#__PURE__*/React.createElement(RenderDetail, {
       workOrderTemplateInfo: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo,
       transData: transDataall,
       platform: plat.platform,

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

@@ -666,7 +666,7 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
         }).join(),
         name: item.name
       });
-    } else if (['REISSUE_STATUS', 'ADJUST_WORK_ORDER_STATUS', 'CREATE_STATUS', 'INVOICE_STATUS', 'INVOICING_STATUS'].includes(item.workOrderComponentType)) {
+    } else if (['REISSUE_STATUS', 'ADJUST_WORK_ORDER_STATUS', 'CREATE_STATUS', 'INVOICE_STATUS', 'INVOICING_STATUS', 'AGREE_REFUND_STATUS', 'REJECT_REFUND_STATUS'].includes(item.workOrderComponentType)) {
       var STATUS_MAP = {
         REISSUE_STATUS: {
           status: 'reissueStatusValue',
@@ -687,6 +687,14 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
         INVOICING_STATUS: {
           status: 'invoicingStatusValue',
           reason: 'invoicingReason'
+        },
+        AGREE_REFUND_STATUS: {
+          status: 'agreeRefundStatusValue',
+          reason: 'agreeRefundStatusReason'
+        },
+        REJECT_REFUND_STATUS: {
+          status: 'rejectRefundStatusValue',
+          reason: 'rejectRefundStatusReason'
         }
       };
       contentVoList.push({
@@ -1428,7 +1436,7 @@ var transDataSource = function transDataSource(templateColumns) {
           // { logisticsCompany: null, logisticsCode: null },
         ]);
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), _itemList6));
-      } else if (['REISSUE_STATUS', 'ADJUST_WORK_ORDER_STATUS', 'CREATE_STATUS', 'INVOICE_STATUS', 'INVOICING_STATUS'].includes(nex.workOrderComponentType)) {
+      } else if (['REISSUE_STATUS', 'ADJUST_WORK_ORDER_STATUS', 'CREATE_STATUS', 'INVOICE_STATUS', 'INVOICING_STATUS', 'AGREE_REFUND_STATUS', 'REJECT_REFUND_STATUS'].includes(nex.workOrderComponentType)) {
         var STATUS_MAP = {
           REISSUE_STATUS: {
             status: 'reissueStatusValue',
@@ -1449,6 +1457,14 @@ var transDataSource = function transDataSource(templateColumns) {
           INVOICING_STATUS: {
             status: 'invoicingStatusValue',
             reason: 'invoicingReason'
+          },
+          AGREE_REFUND_STATUS: {
+            status: 'agreeRefundStatusValue',
+            reason: 'agreeRefundStatusReason'
+          },
+          REJECT_REFUND_STATUS: {
+            status: 'rejectRefundStatusValue',
+            reason: 'rejectRefundStatusReason'
           }
         };
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {

package/dist/esm/index.d.ts

@@ -5,8 +5,8 @@ export { default as FormRender } from './FormRender';
 export { default as FormRenderTemplateId } from './FormRenderTemplateId';
 export { default as FlowWorkOrderDetail } from './FlowTemplateDetail';
 export { default as TradeList } from './TradeList';
-export { default as WdtTradeList } from './WdtTradeList';
 export { default as FlowFormRender } from './FlowTemplateDetail/components/FormRender';
+export { default as WdtTradeList } from './WdtTradeList';
 export * as utils from './common/utils/tools';
 export * as arithmetic from './common/utils/arithmetic';
 export * from './WorkOrder/types';

package/dist/esm/index.js

@@ -15,8 +15,8 @@ export { default as FormRender } from "./FormRender";
 export { default as FormRenderTemplateId } from "./FormRenderTemplateId";
 export { default as FlowWorkOrderDetail } from "./FlowTemplateDetail";
 export { default as TradeList } from "./TradeList";
-export { default as WdtTradeList } from "./WdtTradeList";
 export { default as FlowFormRender } from "./FlowTemplateDetail/components/FormRender";
+export { default as WdtTradeList } from "./WdtTradeList";
 import * as _utils from "./common/utils/tools";
 export { _utils as utils };
 import * as _arithmetic from "./common/utils/arithmetic";

package/package.json

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