@kmkf-fe-packages/kmkf-work-order-service-component 0.13.0-alpha.0 → 0.13.0-alpha.2

package/dist/esm/FlowTemplateDetail/common.js

@@ -106,7 +106,8 @@ export var submitParams = function submitParams(_ref) {
             console.error('error');
           }
         }
-        if (!isEqual(newOldContent, item.content) && !isNull(newOldContent) && !isNull(item.content)) {
+        if (isNull(newOldContent) && isNull(item.content)) return;
+        if (!isEqual(newOldContent, item.content)) {
           cur.push({
             dataKey: item.uniqueKey,
             name: item.name,

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

@@ -12,7 +12,7 @@ import React, { useEffect, useMemo } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import { calcWorkOrderList } from "../../../common/utils/tools";
 import { selectCurrentNodeDetail, selectTid, selectPlatInfo, selectFlowStatus, selectOperateParams, selectCurrentFlowAllShowHideRules, selectNodeAssistantMap } from "../../../model/flowTemplateDetail/selector";
-import { setCurrentTradeIdWOrkOrderNumber, fetchCurrentTradeIdLinkWorkOrder, setAction, setWithdrawWorkOrderDetail } from "../../../model/flowTemplateDetail";
+import { setCurrentTradeIdWOrkOrderNumber, fetchCurrentTradeIdLinkWorkOrder, setAction, setWithdrawWorkOrderDetail, fetchReminder, fetchCancelReminder } from "../../../model/flowTemplateDetail";
 import { FlowStatus, NodeType } from "../../../model/flowTemplateDetail/types";
 import Header from "../Header";
 import FormRender from "../FormRender";
@@ -21,7 +21,7 @@ import { getTag, currentUserHasOperatorAuth } from "../../common";
 import styles from "./index.module.less";
 import { PlatForm } from "../../../WorkOrder/types";
 var CurrentNode = function CurrentNode(props) {
-  var _currentNodeDetail$no, _currentNodeDetail$no2, _currentNodeDetail$no3, _currentNodeDetail$no4, _currentNodeDetail$wo8, _currentNodeDetail$wo9, _currentNodeDetail$wo10, _currentNodeDetail$wo11, _currentNodeDetail$no17, _currentNodeDetail$no18, _currentNodeDetail$wo12;
+  var _currentNodeDetail$no, _currentNodeDetail$no2, _currentNodeDetail$no3, _currentNodeDetail$no4, _currentNodeDetail$wo8, _currentNodeDetail$wo9, _currentNodeDetail$wo10, _currentNodeDetail$wo11, _currentNodeDetail$no19, _currentNodeDetail$no20, _currentNodeDetail$wo12;
   var shopList = props.shopList,
     form = props.form,
     onOpenWangWang = props.onOpenWangWang,
@@ -121,6 +121,24 @@ var CurrentNode = function CurrentNode(props) {
     }));
     dispatch(setAction('withdraw'));
   };
+  //催单
+  var handleReminder = function handleReminder() {
+    var _currentNodeDetail$no17;
+    console.log('催单');
+    dispatch(fetchReminder({
+      flowWorkOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no17 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no17 === void 0 ? void 0 : _currentNodeDetail$no17.id,
+      flowTemplateKey: operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowTemplateKey
+    }));
+  };
+  //取消催单
+  var handleCancelReminder = function handleCancelReminder() {
+    var _currentNodeDetail$no18;
+    console.log('取消催单');
+    dispatch(fetchCancelReminder({
+      flowWorkOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no18 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no18 === void 0 ? void 0 : _currentNodeDetail$no18.id,
+      flowTemplateKey: operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowTemplateKey
+    }));
+  };
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Header, {
     tag: tag,
     nodeName: nodeName,
@@ -128,16 +146,18 @@ var CurrentNode = function CurrentNode(props) {
     showLook: false,
     handler: tag === 'artificial' ? currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo8 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo8 === void 0 ? void 0 : (_currentNodeDetail$wo9 = _currentNodeDetail$wo8.handlerList) === null || _currentNodeDetail$wo9 === void 0 ? void 0 : (_currentNodeDetail$wo10 = _currentNodeDetail$wo9[0]) === null || _currentNodeDetail$wo10 === void 0 ? void 0 : _currentNodeDetail$wo10.account : '',
     showWithdraw: tag === 'artificial' && (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo11 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo11 === void 0 ? void 0 : _currentNodeDetail$wo11.flowStatus) === FlowStatus.COMPLETED && isCurrentNodeHandler,
-    handleWithdraw: handleWithdraw
+    handleWithdraw: handleWithdraw,
+    handleReminder: handleReminder,
+    handleCancelReminder: handleCancelReminder
   }), /*#__PURE__*/React.createElement("div", {
     className: styles.formRenderContainer
-  }, [NodeType.START_NODE, NodeType.EXECUTE_NODE].includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no17 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no17 === void 0 ? void 0 : _currentNodeDetail$no17.nodeType) && (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo) && (flowStatus === FlowStatus.COMPLETED ? /*#__PURE__*/React.createElement(RenderDetail, {
+  }, [NodeType.START_NODE, NodeType.EXECUTE_NODE].includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no19 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no19 === void 0 ? void 0 : _currentNodeDetail$no19.nodeType) && (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo) && (flowStatus === FlowStatus.COMPLETED ? /*#__PURE__*/React.createElement(RenderDetail, {
     workOrderTemplateInfo: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo,
     transData: transData,
     platform: plat.platform,
     onOpenWangWang: onOpenWangWang
   }) : /*#__PURE__*/React.createElement(FormRender, {
-    isShowShopList: NodeType.START_NODE === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no18 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no18 === void 0 ? void 0 : _currentNodeDetail$no18.nodeType) && PlatForm.PC === plat.platform,
+    isShowShopList: NodeType.START_NODE === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no20 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no20 === void 0 ? void 0 : _currentNodeDetail$no20.nodeType) && PlatForm.PC === plat.platform,
     plat: plat,
     templateDetail: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo,
     shopList: shopList,

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

@@ -178,7 +178,7 @@ export var getCalculationComponentValue = function getCalculationComponentValue(
             type: nxt.componentType
           });
           // 如果当前计算组件是隐藏的时候,直接返回0
-          if (!componentShowMap[innerComponentInstance === null || innerComponentInstance === void 0 ? void 0 : innerComponentInstance.id]) return '0';
+          if (!componentShowMap[innerComponentInstance === null || innerComponentInstance === void 0 ? void 0 : innerComponentInstance.id]) return "".concat(cur, "0");
           return "".concat(cur).concat(Number(get(allValues, innerComponentInstance === null || innerComponentInstance === void 0 ? void 0 : innerComponentInstance.id, 0)));
         }
         return "".concat(cur).concat(nxt === null || nxt === void 0 ? void 0 : nxt.label);

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

@@ -109,7 +109,10 @@ var FormRender = function FormRender(props) {
   useEffect(function () {
     setShopId(currentShopId);
   }, [currentShopId]);
+  // TODO: 显影依赖
   var currentComponentDisplayStatus = useRef({});
+  // TODO：所有组件显影标志
+  var currentTemplateAllComponentsDisplay = useRef({});
   // TODO: 前置节点form单独设置指
   useEffect(function () {
     if (!isEmpty(record)) {
@@ -636,9 +639,9 @@ var FormRender = function FormRender(props) {
       var newComponentConfig = _objectSpread(_objectSpread({}, componentConfig), {}, {
         disabled: disabled
       });
-      if (workOrderComponentType === 'PICTURE') {
-        newComponentConfig['canPreview'] = disabled;
-      }
+      // if (workOrderComponentType === 'PICTURE') {
+      //   newComponentConfig['canPreview'] = disabled;
+      // }
       if (workOrderComponentType === 'ENTERPRISE_PAYMENT') {
         newComponentConfig['disabled'] = disabled || !canModifyPayment;
       }
@@ -664,6 +667,7 @@ var FormRender = function FormRender(props) {
         }),
         type: workOrderComponentType
       });
+      currentTemplateAllComponentsDisplay.current[instance === null || instance === void 0 ? void 0 : instance.id] = true;
       if (Reflect.has(idConditionListMap, instance.id)) {
         var currentIdDependenceOtherFields = idConditionListMap[instance.id];
         // 当前组件显隐依赖组件id列表
@@ -731,12 +735,12 @@ var FormRender = function FormRender(props) {
               return getExpression((_item$compareSymbol2 = item.compareSymbol) === null || _item$compareSymbol2 === void 0 ? void 0 : _item$compareSymbol2.toUpperCase(), leftValue, item.rightValue);
             });
           }, false);
-          // TODO: 当组件从显示变成隐藏的时候，我们将当前表单中这个字段值清空；否则对计算组件会存在影响
+          // TODO: 当组件的显影状态发生变化
           // TODO: 为什么不直接使用form.setFieldsValue这个API呢？handleWatchFormValueChange这个方法只会在UI层面的onChange才会促发，这里需要手动在调用一次
-          if (currentComponentDisplayStatus.current[instance === null || instance === void 0 ? void 0 : instance.id] && !show) {
+          if (currentTemplateAllComponentsDisplay.current[instance === null || instance === void 0 ? void 0 : instance.id] !== show) {
             // 发现组件从显示变成隐藏后，立即将其变成隐藏状态，执行计算组件逻辑的时候会使用到这个标示
-            currentComponentDisplayStatus.current[instance === null || instance === void 0 ? void 0 : instance.id] = show;
-            var formData = form.getFieldsValue();
+            currentTemplateAllComponentsDisplay.current[instance === null || instance === void 0 ? void 0 : instance.id] = show;
+            var formData = form.getFieldsValue(true); // 获取所有表单值，包括组件隐藏的数据
             handleWatchFormValueChange(undefined, formData);
           }
           currentComponentDisplayStatus.current[instance === null || instance === void 0 ? void 0 : instance.id] = show;
@@ -805,7 +809,7 @@ var FormRender = function FormRender(props) {
   }, [templateDetail]);
   var handleWatchFormValueChange = function handleWatchFormValueChange(changedValues) {
     var allValues = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    var componentShowMap = currentComponentDisplayStatus.current;
+    var componentShowMap = currentTemplateAllComponentsDisplay.current;
     var formValue = getCalculationComponentValue({
       calculationTypeComponentList: calculationTypeComponentList,
       allValues: allValues,
@@ -881,23 +885,7 @@ var FormRender = function FormRender(props) {
       })));
     });
     return preNodeItems;
-    // const preNodeItems = preNodeComponentDtoList.map(
-    //     newRenderColumnItem({
-    //       form: form,
-    //       shopList: shopList,
-    //       shopId,
-    //       isEditing: !!workOrderId,
-    //       workOrderDetail: record,
-    //       templateDetail: templateDetail,
-    //       disabled: true,
-    //       displayConfig: [],
-    //     }),
-    //   );
-    // return preNodeItems;
   }, [templateDetail, shopList, shopId, record, mappdingHideComponents, currentShopId, look, handleChangeTradeId]);
-  // const renderPreNodeFormItems = preNodeFormItems.map(items => {
-  //   return items.filter((item: any) => !mappdingHideComponents.includes(item.props?.name))
-  // })
   return /*#__PURE__*/React.createElement(ConfigProvider, {
     locale: zhCN
   }, /*#__PURE__*/React.createElement("div", {

package/dist/esm/FlowTemplateDetail/components/Header/index.d.ts

@@ -10,10 +10,13 @@ interface HeaderProps {
     handleEdit?: () => void;
     handlePackUp?: () => void;
     handleWithdraw?: () => void;
+    handleReminder?: () => void;
+    handleCancelReminder?: () => void;
     loading?: boolean;
     editing?: boolean;
     opening?: boolean;
     handler?: string;
+    isReminder?: string;
 }
 declare const Header: (props: HeaderProps) => React.JSX.Element;
 export default Header;

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

@@ -1,7 +1,8 @@
 import React from 'react';
-import { Button, Spin, Tooltip } from 'antd';
+import { Button, Spin, Tooltip, Typography } from 'antd';
 import { NODE_TYPE } from "../../../common/constant";
 import styles from "./index.module.less";
+var Text = Typography.Text;
 var Header = function Header(props) {
   var _NODE_TYPE$tag, _NODE_TYPE$tag2;
   var tag = props.tag,
@@ -13,6 +14,8 @@ var Header = function Header(props) {
     handleSave = props.handleSave,
     handlePackUp = props.handlePackUp,
     handleWithdraw = props.handleWithdraw,
+    handleReminder = props.handleReminder,
+    handleCancelReminder = props.handleCancelReminder,
     _props$loading = props.loading,
     loading = _props$loading === void 0 ? false : _props$loading,
     _props$editing = props.editing,
@@ -21,7 +24,8 @@ var Header = function Header(props) {
     opening = _props$opening === void 0 ? false : _props$opening,
     _props$showWithdraw = props.showWithdraw,
     showWithdraw = _props$showWithdraw === void 0 ? false : _props$showWithdraw,
-    handler = props.handler;
+    handler = props.handler,
+    isReminder = props.isReminder;
   return /*#__PURE__*/React.createElement("div", {
     className: styles.wrap
   }, (NODE_TYPE === null || NODE_TYPE === void 0 ? void 0 : NODE_TYPE[tag]) && /*#__PURE__*/React.createElement("div", {
@@ -58,6 +62,18 @@ var Header = function Header(props) {
     onClick: function onClick() {
       return typeof handleLook === 'function' && handleLook();
     }
-  }, "\u8BE6\u60C5"))));
+  }, "\u8BE6\u60C5")), !showEdit && !showLook && /*#__PURE__*/React.createElement(React.Fragment, null, isReminder ? /*#__PURE__*/React.createElement(Button, {
+    type: "link",
+    onClick: function onClick() {
+      return typeof handleReminder === 'function' && handleReminder();
+    }
+  }, "\u50AC\u5355") : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Text, {
+    type: "success"
+  }, "\u5DF2\u50AC\u5355"), /*#__PURE__*/React.createElement(Button, {
+    type: "link",
+    onClick: function onClick() {
+      return typeof handleCancelReminder === 'function' && handleCancelReminder();
+    }
+  }, "\u53D6\u6D88")))));
 };
 export default Header;

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

@@ -10,7 +10,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useState } from 'react';
 import { debounce } from 'lodash';
-import { Button, Modal, Form, Input, Radio, message, Space, Checkbox } from 'antd';
+import { Button, Modal, Form, Input, Radio, message, Space, Checkbox, Popconfirm } from 'antd';
 import { DownOutlined, UpOutlined } from '@ant-design/icons';
 import moment from 'moment';
 var TextArea = Input.TextArea;
@@ -247,9 +247,13 @@ var OrderRemark = function OrderRemark(props) {
   }, "\u63D0\u4EA4\u4EBA"), /*#__PURE__*/React.createElement(Checkbox, {
     disabled: true,
     checked: !!(memoConfig !== null && memoConfig !== void 0 && memoConfig.submitTime)
-  }, "\u63D0\u4EA4\u65F6\u95F4:", timeMap[memoConfig === null || memoConfig === void 0 ? void 0 : memoConfig.submitTimeFormat]), (plat === null || plat === void 0 ? void 0 : plat.platform) === 'pc' ? /*#__PURE__*/React.createElement(Button, {
-    type: "link",
-    onClick: onClick
-  }, "\u8BBE\u7F6E") : null))));
+  }, "\u63D0\u4EA4\u65F6\u95F4:", timeMap[memoConfig === null || memoConfig === void 0 ? void 0 : memoConfig.submitTimeFormat]), (plat === null || plat === void 0 ? void 0 : plat.platform) === 'pc' ? /*#__PURE__*/React.createElement(Popconfirm, {
+    title: "\u786E\u8BA4\u8DF3\u8F6C\u65B0\u9875\u9762\u5B8C\u6210\u5907\u6CE8\u89C4\u5219\u8BBE\u7F6E?",
+    onConfirm: onClick,
+    okText: "\u786E\u5B9A",
+    cancelText: "\u53D6\u6D88"
+  }, /*#__PURE__*/React.createElement(Button, {
+    type: "link"
+  }, "\u8BBE\u7F6E")) : null))));
 };
 export default OrderRemark;

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

@@ -23,6 +23,7 @@ var Record = function Record(props) {
     operator = props.operator,
     context = props.context,
     operatorType = props.operatorType,
+    nodeName = props.nodeName,
     workOrderUpdateLog = props.workOrderUpdateLog,
     componentDtoList = props.componentDtoList;
   return /*#__PURE__*/React.createElement("div", {
@@ -37,11 +38,11 @@ var Record = function Record(props) {
     className: styles.tag
   }, getFlowOperate === null || getFlowOperate === void 0 ? void 0 : getFlowOperate[operatorType]))), /*#__PURE__*/React.createElement("div", {
     className: styles.context
-  }, context), workOrderUpdateLog ? /*#__PURE__*/React.createElement(OperationLog, {
+  }, context), workOrderUpdateLog ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, "\u8282\u70B9\uFF1A", nodeName), /*#__PURE__*/React.createElement(OperationLog, {
     content: workOrderUpdateLog.content,
     operation: workOrderUpdateLog.operation,
     componentDtoList: componentDtoList
-  }) : null);
+  })) : null);
 };
 var RemarkListModal = function RemarkListModal() {
   var visible = useSelector(selectVisibleRemarkList);

package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/CustomizeWorkOrderCard/index.js

@@ -86,6 +86,8 @@ function CustomizeWorkOrderCard(props) {
     // 工单状态
     'FLOW_MARK_SELECT',
     //工单标记
+    'FLOW_TAG',
+    //工单标签
     'HANDLER_INPUT',
     // 处理人
     'OPERATOR_INPUT',

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

@@ -897,17 +897,13 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
         name: item.name
       });
     } else if (['REISSUE_TRADE_ID', 'EXCHANGE_TRADE_ID'].includes(item.workOrderComponentType)) {
-      var tradeItemList = get(nowData, "".concat(item.uniqueKey), []);
-      contentVoList.push({
-        uniqueKey: "".concat(item.uniqueKey, "_tradeItemList"),
-        content: tradeItemList,
-        name: item.name
-      });
+      var TRADE_ID_MAP = {
+        REISSUE_TRADE_ID: 'reissueTradeId',
+        EXCHANGE_TRADE_ID: 'exchangeTradeId'
+      };
       contentVoList.push({
-        uniqueKey: "".concat(item.uniqueKey, "_tradeIdList"),
-        content: tradeItemList.map(function (item) {
-          return item.billNo + '';
-        }),
+        uniqueKey: "".concat(item.uniqueKey, "_").concat(TRADE_ID_MAP[item.workOrderComponentType]),
+        content: get(nowData, "".concat(item.uniqueKey), ''),
         name: item.name
       });
     } else if (item.workOrderComponentType === 'WLN_LOGISTICS') {
@@ -1252,6 +1248,12 @@ var transDataSource = function transDataSource(templateColumns) {
           logisticsCode: null
         }]);
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), _itemList6));
+      } else if (['REISSUE_TRADE_ID'].includes(nex.workOrderComponentType)) {
+        var TRADE_ID_MAP = {
+          REISSUE_TRADE_ID: 'reissueTradeId',
+          EXCHANGE_TRADE_ID: 'exchangeTradeId'
+        };
+        return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_").concat(TRADE_ID_MAP[nex.workOrderComponentType])]));
       } else if (['REISSUE_STATUS', 'ADJUST_WORK_ORDER_STATUS', 'CREATE_STATUS', 'INVOICE_STATUS'].includes(nex.workOrderComponentType)) {
         var STATUS_MAP = {
           REISSUE_STATUS: {
@@ -1414,7 +1416,9 @@ var transDataSource = function transDataSource(templateColumns) {
         }));
       } else if (nex.workOrderComponentType === 'BUYER_MESSAGE_NOTICE') {
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_buyerMessageNotice")] || (config === null || config === void 0 ? void 0 : config.select)));
-      } else if (['RETURN_GOODS_TRADE_ID', 'BS_DELIVERY_NO', 'REISSUE_TRADE_ID', 'EXCHANGE_TRADE_ID'].includes(nex.workOrderComponentType)) {
+      } else if (['RETURN_GOODS_TRADE_ID', 'BS_DELIVERY_NO',
+      // 'REISSUE_TRADE_ID',
+      'EXCHANGE_TRADE_ID'].includes(nex.workOrderComponentType)) {
         var SYSTEM_ORDER_MAP = {
           BS_DELIVERY_NO: {
             key: 'deliveryNoList',
@@ -1472,7 +1476,7 @@ export var calcWorkOrderList = function calcWorkOrderList(source, templateColumn
 //订单返填
 export var orderBack = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-    var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, JOIN_SHOP, hasBs, hasWln, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, _data$value, _jstOrder$value, _jstOrder$value$data, _bsOrder$value, _wlnOrder$value, _bsOrders$orders, _wlnOrders$orders, promise, hasJst, _yield$Promise$allSet, _yield$Promise$allSet2, data, jstOrder, bsOrder, wlnOrder, orderInfo, jstInfo, bsOrders, wlnOrders, bsInfo, wlnInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, values, _templateDetail$compo, paymentUniqueKey, cacheOrderInfo, _objectSpread68, _cacheOrderInfo;
+    var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, JOIN_SHOP, hasBs, hasWln, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, _data$value, _jstOrder$value, _jstOrder$value$data, _bsOrder$value, _wlnOrder$value, _bsOrders$orders, _wlnOrders$orders, promise, hasJst, _yield$Promise$allSet, _yield$Promise$allSet2, data, jstOrder, bsOrder, wlnOrder, orderInfo, jstInfo, bsOrders, wlnOrders, bsInfo, wlnInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, values, _templateDetail$compo, paymentUniqueKey, cacheOrderInfo, _objectSpread69, _cacheOrderInfo;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -1671,7 +1675,7 @@ export var orderBack = /*#__PURE__*/function () {
               sessionStorage.setItem('cacheOmsOrderInfo', JSON.stringify(_objectSpread(_objectSpread({}, cacheOrderInfo), {}, _defineProperty({}, "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId), _defineProperty({}, plat === null || plat === void 0 ? void 0 : plat.subOrderNo, _objectSpread(_objectSpread({}, formValue), values))))));
             } else {
               _cacheOrderInfo = JSON.parse(sessionStorage.getItem('cacheOrderInfo') || '{}');
-              sessionStorage.setItem('cacheOrderInfo', JSON.stringify(_objectSpread(_objectSpread({}, _cacheOrderInfo), {}, (_objectSpread68 = {}, _defineProperty(_objectSpread68, order_no, values), _defineProperty(_objectSpread68, "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId), _defineProperty({}, order_no, _objectSpread(_objectSpread({}, formValue), values))), _objectSpread68))));
+              sessionStorage.setItem('cacheOrderInfo', JSON.stringify(_objectSpread(_objectSpread({}, _cacheOrderInfo), {}, (_objectSpread69 = {}, _defineProperty(_objectSpread69, order_no, values), _defineProperty(_objectSpread69, "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId), _defineProperty({}, order_no, _objectSpread(_objectSpread({}, formValue), values))), _objectSpread69))));
             }
           }
           // console.log('orderback', values);
@@ -1995,9 +1999,6 @@ export var reversalFormValues = function reversalFormValues() {
       case 'RETURN_GOODS_TRADE_ID':
         prv["".concat(next.uniqueKey, "_returnGoodsTradeItemList")] = JSON.stringify(values[next.uniqueKey] || []);
         break;
-      case 'REISSUE_TRADE_ID':
-        prv["".concat(next.uniqueKey, "_tradeItemList")] = JSON.stringify(values[next.uniqueKey] || []);
-        break;
       case 'EXCHANGE_TRADE_ID':
         prv["".concat(next.uniqueKey, "_tradeItemList")] = JSON.stringify(values[next.uniqueKey] || []);
         break;

package/dist/esm/model/flowTemplateDetail/api.d.ts

@@ -78,3 +78,11 @@ export declare const batchQueryNodeDetail: (data: any) => Promise<serverProps<Ar
     nodeId: string;
     workOrderTemplateInfo: FlowTemplateNodeDetailT;
 }>>>;
+export declare const reminder: (data: any) => Promise<serverProps<{
+    total: number;
+    list: Array<any>;
+}>>;
+export declare const cancelReminder: (data: any) => Promise<serverProps<{
+    total: number;
+    list: Array<any>;
+}>>;

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

@@ -147,4 +147,21 @@ export var batchQueryNodeDetail = function batchQueryNodeDetail(data) {
     method: 'post',
     data: data
   });
+};
+
+// 催单
+export var reminder = function reminder(data) {
+  return request({
+    url: '/qy/view/workOrderList',
+    method: 'post',
+    data: data
+  });
+};
+//取消催单
+export var cancelReminder = function cancelReminder(data) {
+  return request({
+    url: '/qy/view/workOrderList',
+    method: 'post',
+    data: data
+  });
 };

package/dist/esm/model/flowTemplateDetail/index.d.ts

@@ -3,6 +3,8 @@ export declare const initialState: FlowTemplateDetailState;
 export declare const fetchPanelInfo: (params: QyFlowPanelInfoRequest, options: any) => (dispatch: any) => Promise<void>;
 export declare const fetchAllFlowOperateRecord: (params: QueryAllFlowOperateRecordRequest) => (dispatch: any) => Promise<void>;
 export declare const fetchCurrentTradeIdLinkWorkOrder: (params: any) => (dispatch: any) => Promise<void>;
+export declare const fetchReminder: (params: any) => (dispatch: any) => Promise<void>;
+export declare const fetchCancelReminder: (params: any) => (dispatch: any) => Promise<void>;
 export declare const setFlowList: import("@reduxjs/toolkit").ActionCreatorWithPayload<Line[], "flowTemplateDetail/setFlowList">, setNodeAssistantInfo: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     [nodeId: string]: Assistant[];
 }, "flowTemplateDetail/setNodeAssistantInfo">, setTid: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "flowTemplateDetail/setTid">, setShopUniqueKey: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "flowTemplateDetail/setShopUniqueKey">, setRemarkList: import("@reduxjs/toolkit").ActionCreatorWithPayload<Remark[], "flowTemplateDetail/setRemarkList">, setCurrentNode: import("@reduxjs/toolkit").ActionCreatorWithPayload<CurrentNodeDetail, "flowTemplateDetail/setCurrentNode">, setAction: import("@reduxjs/toolkit").ActionCreatorWithOptionalPayload<ActionType, "flowTemplateDetail/setAction">, setVisibleRemarkList: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, "flowTemplateDetail/setVisibleRemarkList">, setPlat: import("@reduxjs/toolkit").ActionCreatorWithPayload<PlatFormInfo, "flowTemplateDetail/setPlat">, setOperateParams: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "flowTemplateDetail/setOperateParams">, setAddRemarkVisible: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, "flowTemplateDetail/setAddRemarkVisible">, setFlowStatus: import("@reduxjs/toolkit").ActionCreatorWithPayload<FlowStatus, "flowTemplateDetail/setFlowStatus">, setCurrentTradeIdWOrkOrderNumber: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
@@ -10,6 +12,6 @@ export declare const setFlowList: import("@reduxjs/toolkit").ActionCreatorWithPa
     lastWorkOrderDetail: any;
 }, "flowTemplateDetail/setCurrentTradeIdWOrkOrderNumber">, setFlowTemplateId: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "flowTemplateDetail/setFlowTemplateId">, setLoading: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, "flowTemplateDetail/setLoading">, setCurrentFlowAllShowHideRules: import("@reduxjs/toolkit").ActionCreatorWithPayload<CurrentFlowShowHideRules, "flowTemplateDetail/setCurrentFlowAllShowHideRules">, setClearStore: import("@reduxjs/toolkit").ActionCreatorWithOptionalPayload<undefined, "flowTemplateDetail/setClearStore">, setWithdrawWorkOrderDetail: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     nodeId: string;
-}, "flowTemplateDetail/setWithdrawWorkOrderDetail">;
+}, "flowTemplateDetail/setWithdrawWorkOrderDetail">, setReminderType: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, "flowTemplateDetail/setReminderType">;
 declare const _default: import("redux").Reducer<FlowTemplateDetailState, import("redux").AnyAction>;
 export default _default;

package/dist/esm/model/flowTemplateDetail/index.js

@@ -10,7 +10,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 import { createSlice } from '@reduxjs/toolkit';
 import { last } from 'lodash';
 import { NodeType, PlatForm } from "./types";
-import { queryPanelInfo, queryAllFlowOperateRecord, currentTradeIdJoinWorkOrder, queryMultiNodeAssistantInfo } from "./api";
+import { queryPanelInfo, queryAllFlowOperateRecord, currentTradeIdJoinWorkOrder, queryMultiNodeAssistantInfo, reminder, cancelReminder } from "./api";
 export var initialState = {
   loading: false,
   flowList: [],
@@ -224,88 +224,166 @@ export var fetchCurrentTradeIdLinkWorkOrder = function fetchCurrentTradeIdLinkWo
     };
   }();
 };
+export var fetchReminder = function fetchReminder(params) {
+  return /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(dispatch) {
+      var res;
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            _context4.prev = 0;
+            dispatch(setLoading(true));
+            _context4.next = 4;
+            return reminder(params);
+          case 4:
+            res = _context4.sent;
+            if (res.success) {
+              dispatch(setReminderType(true));
+            }
+            _context4.next = 11;
+            break;
+          case 8:
+            _context4.prev = 8;
+            _context4.t0 = _context4["catch"](0);
+            console.error(_context4.t0);
+          case 11:
+            _context4.prev = 11;
+            dispatch(setLoading(false));
+            return _context4.finish(11);
+          case 14:
+          case "end":
+            return _context4.stop();
+        }
+      }, _callee4, null, [[0, 8, 11, 14]]);
+    }));
+    return function (_x4) {
+      return _ref4.apply(this, arguments);
+    };
+  }();
+};
+export var fetchCancelReminder = function fetchCancelReminder(params) {
+  return /*#__PURE__*/function () {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(dispatch) {
+      var res;
+      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
+          case 0:
+            _context5.prev = 0;
+            dispatch(setLoading(true));
+            _context5.next = 4;
+            return cancelReminder(params);
+          case 4:
+            res = _context5.sent;
+            if (res.success) {
+              dispatch(setReminderType(false));
+            }
+            _context5.next = 11;
+            break;
+          case 8:
+            _context5.prev = 8;
+            _context5.t0 = _context5["catch"](0);
+            console.error(_context5.t0);
+          case 11:
+            _context5.prev = 11;
+            dispatch(setLoading(false));
+            return _context5.finish(11);
+          case 14:
+          case "end":
+            return _context5.stop();
+        }
+      }, _callee5, null, [[0, 8, 11, 14]]);
+    }));
+    return function (_x5) {
+      return _ref5.apply(this, arguments);
+    };
+  }();
+};
 var slice = createSlice({
   name: 'flowTemplateDetail',
   initialState: initialState,
   reducers: {
-    setNodeAssistantInfo: function setNodeAssistantInfo(state, _ref4) {
-      var payload = _ref4.payload;
+    setNodeAssistantInfo: function setNodeAssistantInfo(state, _ref6) {
+      var payload = _ref6.payload;
       state.assistantMap = _objectSpread(_objectSpread({}, state.assistantMap), payload);
     },
-    setLoading: function setLoading(state, _ref5) {
-      var payload = _ref5.payload;
+    setLoading: function setLoading(state, _ref7) {
+      var payload = _ref7.payload;
       state.loading = payload;
     },
-    setFlowList: function setFlowList(state, _ref6) {
-      var payload = _ref6.payload;
+    setFlowList: function setFlowList(state, _ref8) {
+      var payload = _ref8.payload;
       state.flowList = payload;
     },
-    setTid: function setTid(state, _ref7) {
-      var payload = _ref7.payload;
+    setTid: function setTid(state, _ref9) {
+      var payload = _ref9.payload;
       state.tid = payload;
     },
-    setShopUniqueKey: function setShopUniqueKey(state, _ref8) {
-      var payload = _ref8.payload;
+    setShopUniqueKey: function setShopUniqueKey(state, _ref10) {
+      var payload = _ref10.payload;
       state.shopUniqueKey = payload;
     },
-    setRemarkList: function setRemarkList(state, _ref9) {
-      var payload = _ref9.payload;
+    setRemarkList: function setRemarkList(state, _ref11) {
+      var payload = _ref11.payload;
       state.remarkList = payload;
     },
-    setCurrentNode: function setCurrentNode(state, _ref10) {
-      var payload = _ref10.payload;
+    setCurrentNode: function setCurrentNode(state, _ref12) {
+      var payload = _ref12.payload;
       state.currentNode = payload;
     },
-    setAction: function setAction(state, _ref11) {
-      var payload = _ref11.payload;
+    setAction: function setAction(state, _ref13) {
+      var payload = _ref13.payload;
       state.action = payload;
     },
-    setVisibleRemarkList: function setVisibleRemarkList(state, _ref12) {
-      var payload = _ref12.payload;
+    setVisibleRemarkList: function setVisibleRemarkList(state, _ref14) {
+      var payload = _ref14.payload;
       state.visibleRemarkList = payload;
     },
-    setPlat: function setPlat(state, _ref13) {
-      var payload = _ref13.payload;
+    setPlat: function setPlat(state, _ref15) {
+      var payload = _ref15.payload;
       state.plat = payload;
     },
-    setOperateParams: function setOperateParams(state, _ref14) {
-      var payload = _ref14.payload;
+    setOperateParams: function setOperateParams(state, _ref16) {
+      var payload = _ref16.payload;
       state.operateParams = payload;
     },
-    setAddRemarkVisible: function setAddRemarkVisible(state, _ref15) {
-      var payload = _ref15.payload;
+    setAddRemarkVisible: function setAddRemarkVisible(state, _ref17) {
+      var payload = _ref17.payload;
       state.addRemarkVisible = payload;
     },
-    setFlowStatus: function setFlowStatus(state, _ref16) {
-      var payload = _ref16.payload;
+    setFlowStatus: function setFlowStatus(state, _ref18) {
+      var payload = _ref18.payload;
       state.flowStatus = payload;
     },
-    setFlowTemplateId: function setFlowTemplateId(state, _ref17) {
-      var payload = _ref17.payload;
+    setFlowTemplateId: function setFlowTemplateId(state, _ref19) {
+      var payload = _ref19.payload;
       state.flowTemplateId = payload;
     },
-    setCurrentTradeIdWOrkOrderNumber: function setCurrentTradeIdWOrkOrderNumber(state, _ref18) {
-      var payload = _ref18.payload;
+    setCurrentTradeIdWOrkOrderNumber: function setCurrentTradeIdWOrkOrderNumber(state, _ref20) {
+      var payload = _ref20.payload;
       state.currentTradeIdLinkWorkOrder = payload;
     },
-    setCurrentFlowAllShowHideRules: function setCurrentFlowAllShowHideRules(state, _ref19) {
-      var payload = _ref19.payload;
+    setCurrentFlowAllShowHideRules: function setCurrentFlowAllShowHideRules(state, _ref21) {
+      var payload = _ref21.payload;
       state.currentFlowAllShowHideRules = payload;
     },
-    setWithdrawWorkOrderDetail: function setWithdrawWorkOrderDetail(state, _ref20) {
-      var payload = _ref20.payload;
+    setWithdrawWorkOrderDetail: function setWithdrawWorkOrderDetail(state, _ref22) {
+      var payload = _ref22.payload;
       state.withdrawWorkOrderDetail = payload;
     },
-    setClearStore: function setClearStore(state, _ref21) {
+    setClearStore: function setClearStore(state, _ref23) {
       var _Object$keys;
-      var payload = _ref21.payload;
+      var payload = _ref23.payload;
       (_Object$keys = Object.keys(initialState)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.map(function (key) {
         // @ts-ignore
         state[key] = initialState[key];
       });
-    }
+    },
+    setReminderType: function setReminderType(state, _ref24) {
+      var payload = _ref24.payload;
+    } // state.withdrawWorkOrderDetail = payload;
   }
 });
+
 var _slice$actions = slice.actions,
   setFlowList = _slice$actions.setFlowList,
   setNodeAssistantInfo = _slice$actions.setNodeAssistantInfo,
@@ -324,6 +402,7 @@ var _slice$actions = slice.actions,
   setLoading = _slice$actions.setLoading,
   setCurrentFlowAllShowHideRules = _slice$actions.setCurrentFlowAllShowHideRules,
   setClearStore = _slice$actions.setClearStore,
-  setWithdrawWorkOrderDetail = _slice$actions.setWithdrawWorkOrderDetail;
-export { setFlowList, setNodeAssistantInfo, setTid, setShopUniqueKey, setRemarkList, setCurrentNode, setAction, setVisibleRemarkList, setPlat, setOperateParams, setAddRemarkVisible, setFlowStatus, setCurrentTradeIdWOrkOrderNumber, setFlowTemplateId, setLoading, setCurrentFlowAllShowHideRules, setClearStore, setWithdrawWorkOrderDetail };
+  setWithdrawWorkOrderDetail = _slice$actions.setWithdrawWorkOrderDetail,
+  setReminderType = _slice$actions.setReminderType;
+export { setFlowList, setNodeAssistantInfo, setTid, setShopUniqueKey, setRemarkList, setCurrentNode, setAction, setVisibleRemarkList, setPlat, setOperateParams, setAddRemarkVisible, setFlowStatus, setCurrentTradeIdWOrkOrderNumber, setFlowTemplateId, setLoading, setCurrentFlowAllShowHideRules, setClearStore, setWithdrawWorkOrderDetail, setReminderType };
 export default slice.reducer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "0.13.0-alpha.0",
+  "version": "0.13.0-alpha.2",
   "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": "^0.13.0-alpha.0",
-    "@kmkf-fe-packages/kmkf-utils": "^0.13.0-alpha.0",
-    "@kmkf-fe-packages/services-components": "^0.13.0-alpha.0",
+    "@kmkf-fe-packages/basic-components": "^0.13.0-alpha.2",
+    "@kmkf-fe-packages/kmkf-utils": "^0.13.0-alpha.2",
+    "@kmkf-fe-packages/services-components": "^0.13.0-alpha.2",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -72,7 +72,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b10ec118b9c02c87dfea2c7f18da3086fe0e8274",
+  "gitHead": "28fcac29b9d97a98033d60ab0b100ede3186f1e6",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }