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

package/dist/esm/FlowTemplateDetail/common.js

@@ -1,17 +1,11 @@
 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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 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); }
 import { cloneDeep, isEqual, set, get } from 'lodash';
-import { isNull, unTransField } from '@kmkf-fe-packages/kmkf-utils';
+import { isNull } from '@kmkf-fe-packages/kmkf-utils';
 import { submitDataTransOldFormat } from "../common/utils/tools";
 import { NodeType, PlatForm } from "../model/flowTemplateDetail/types";
 export var getTag = function getTag(item) {
@@ -104,25 +98,7 @@ export var submitParams = function submitParams(_ref) {
     var updateList = submitData === null || submitData === void 0 ? void 0 : submitData.reduce(function (cur, nxt) {
       var _nxt$contentList;
       nxt === null || nxt === void 0 ? void 0 : (_nxt$contentList = nxt.contentList) === null || _nxt$contentList === void 0 ? void 0 : _nxt$contentList.map(function (item) {
-        var newOldContent = cloneDeep(item.oldContent);
-        if (unTransField(item.uniqueKey)) {
-          try {
-            newOldContent = JSON.parse(newOldContent);
-            var _item$uniqueKey$split = item.uniqueKey.split('_'),
-              _item$uniqueKey$split2 = _slicedToArray(_item$uniqueKey$split, 2),
-              uniqueKey = _item$uniqueKey$split2[0],
-              key = _item$uniqueKey$split2[1];
-            if (['itemId', 'supplierName', 'numIid', 'aloneItemId', 'aloneItemEncode'].includes(key)) {
-              newOldContent = newOldContent.join();
-            }
-          } catch (e) {
-            console.error('error');
-          }
-        }
-        if (isNull(newOldContent) && isNull(item.content)) return;
-        if (newOldContent == item.content) return;
-        if (!isEqual(newOldContent, item.content)) {
-          // console.log(item.name, item.uniqueKey, newOldContent, item.content);
+        if (!isEqual(item.oldContent, 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, fetchReminder, fetchCancelReminder } from "../../../model/flowTemplateDetail";
+import { setCurrentTradeIdWOrkOrderNumber, fetchCurrentTradeIdLinkWorkOrder, setAction, setWithdrawWorkOrderDetail } 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$no19, _currentNodeDetail$no20, _currentNodeDetail$wo12;
+  var _currentNodeDetail$no, _currentNodeDetail$no2, _currentNodeDetail$no3, _currentNodeDetail$no4, _currentNodeDetail$wo8, _currentNodeDetail$wo9, _currentNodeDetail$wo10, _currentNodeDetail$wo11, _currentNodeDetail$no17, _currentNodeDetail$no18, _currentNodeDetail$wo12;
   var shopList = props.shopList,
     form = props.form,
     onOpenWangWang = props.onOpenWangWang,
@@ -121,24 +121,6 @@ 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,
@@ -146,18 +128,16 @@ 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,
-    handleReminder: handleReminder,
-    handleCancelReminder: handleCancelReminder
+    handleWithdraw: handleWithdraw
   }), /*#__PURE__*/React.createElement("div", {
     className: styles.formRenderContainer
-  }, [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, {
+  }, [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, {
     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$no20 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no20 === void 0 ? void 0 : _currentNodeDetail$no20.nodeType) && PlatForm.PC === plat.platform,
+    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,
     plat: plat,
     templateDetail: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo,
     shopList: shopList,

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

@@ -639,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;
       }

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

@@ -10,13 +10,10 @@ 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,8 +1,7 @@
 import React from 'react';
-import { Button, Spin, Tooltip, Typography } from 'antd';
+import { Button, Spin, Tooltip } 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,
@@ -14,8 +13,6 @@ 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,
@@ -24,8 +21,7 @@ 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,
-    isReminder = props.isReminder;
+    handler = props.handler;
   return /*#__PURE__*/React.createElement("div", {
     className: styles.wrap
   }, (NODE_TYPE === null || NODE_TYPE === void 0 ? void 0 : NODE_TYPE[tag]) && /*#__PURE__*/React.createElement("div", {
@@ -62,18 +58,6 @@ var Header = function Header(props) {
     onClick: function onClick() {
       return typeof handleLook === 'function' && handleLook();
     }
-  }, "\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")))));
+  }, "\u8BE6\u60C5"))));
 };
 export default Header;

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

@@ -1,35 +1,15 @@
-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 _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useEffect, useState } from 'react';
+import React from 'react';
 import { Modal, Timeline } from 'antd';
 import { useSelector, useDispatch } from 'react-redux';
-import { cloneDeep } from 'lodash';
 import { selectVisibleRemarkList, selectRemarkRecordList } from "../../../model/flowTemplateDetail/selector";
 import { setVisibleRemarkList } from "../../../model/flowTemplateDetail";
-import { listTemplateDetail } from "../../../model/servers/api";
 import { getFlowOperate } from "../../common";
-import { OperationLog } from '@kmkf-fe-packages/services-components';
 import styles from "./index.module.less";
 var Record = function Record(props) {
   var time = props.time,
     operator = props.operator,
     context = props.context,
-    operatorType = props.operatorType,
-    nodeName = props.nodeName,
-    workOrderUpdateLog = props.workOrderUpdateLog,
-    componentDtoList = props.componentDtoList;
+    operatorType = props.operatorType;
   return /*#__PURE__*/React.createElement("div", {
     className: styles.remarkContext
   }, /*#__PURE__*/React.createElement("div", {
@@ -40,81 +20,17 @@ var Record = function Record(props) {
     className: styles.operator
   }, operator), operatorType && /*#__PURE__*/React.createElement("span", {
     className: styles.tag
-  }, getFlowOperate === null || getFlowOperate === void 0 ? void 0 : getFlowOperate[operatorType]))), /*#__PURE__*/React.createElement("div", null, "\u8282\u70B9\uFF1A", nodeName), /*#__PURE__*/React.createElement("div", {
+  }, getFlowOperate === null || getFlowOperate === void 0 ? void 0 : getFlowOperate[operatorType]))), /*#__PURE__*/React.createElement("div", {
     className: styles.context
-  }, context), workOrderUpdateLog ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(OperationLog, {
-    content: workOrderUpdateLog.content,
-    operation: workOrderUpdateLog.operation,
-    componentDtoList: componentDtoList
-  })) : null);
+  }, context));
 };
 var RemarkListModal = function RemarkListModal() {
   var visible = useSelector(selectVisibleRemarkList);
   var list = useSelector(selectRemarkRecordList);
-  var _useState = useState([]),
-    _useState2 = _slicedToArray(_useState, 2),
-    remarkList = _useState2[0],
-    setRemarkList = _useState2[1];
   var dispatch = useDispatch();
   var closeModal = function closeModal() {
     dispatch(setVisibleRemarkList(false));
   };
-  useEffect(function () {
-    if (visible && list !== null && list !== void 0 && list.length) {
-      getTemplateList(list);
-    }
-  }, [visible, list]);
-  var getTemplateList = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(list) {
-      var newList, templateUniqueKeyList, _yield$listTemplateDe, data;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            newList = cloneDeep(list);
-            templateUniqueKeyList = list.reduce(function (prv, next) {
-              var _next$workOrderUpdate;
-              if (next !== null && next !== void 0 && (_next$workOrderUpdate = next.workOrderUpdateLog) !== null && _next$workOrderUpdate !== void 0 && _next$workOrderUpdate.templateId) {
-                var _next$workOrderUpdate2;
-                prv.push(next === null || next === void 0 ? void 0 : (_next$workOrderUpdate2 = next.workOrderUpdateLog) === null || _next$workOrderUpdate2 === void 0 ? void 0 : _next$workOrderUpdate2.templateId);
-              }
-              return prv;
-            }, []);
-            if (!templateUniqueKeyList.length) {
-              _context.next = 8;
-              break;
-            }
-            _context.next = 5;
-            return listTemplateDetail({
-              templateUniqueKeyList: templateUniqueKeyList
-            });
-          case 5:
-            _yield$listTemplateDe = _context.sent;
-            data = _yield$listTemplateDe.data;
-            newList.forEach(function (item) {
-              var tempItem = data.find(function (t) {
-                var _item$workOrderUpdate;
-                return (item === null || item === void 0 ? void 0 : (_item$workOrderUpdate = item.workOrderUpdateLog) === null || _item$workOrderUpdate === void 0 ? void 0 : _item$workOrderUpdate.templateId) === t.uniqueKey;
-              });
-              if (tempItem) {
-                item.componentDtoList = [].concat(_toConsumableArray(tempItem.componentDtoList), [{
-                  name: '标记',
-                  workOrderComponentType: 'FLOW_MARK_SELECT',
-                  uniqueKey: 'markFlag'
-                }]);
-              }
-            });
-          case 8:
-            setRemarkList(newList);
-          case 9:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function getTemplateList(_x2) {
-      return _ref.apply(this, arguments);
-    };
-  }();
   return /*#__PURE__*/React.createElement(Modal, {
     title: "\u8BB0\u5F55",
     visible: visible,
@@ -124,7 +40,7 @@ var RemarkListModal = function RemarkListModal() {
       maxHeight: '500px',
       overflow: 'auto'
     }
-  }, /*#__PURE__*/React.createElement(Timeline, null, remarkList === null || remarkList === void 0 ? void 0 : remarkList.map(function (flowRecord) {
+  }, /*#__PURE__*/React.createElement(Timeline, null, list === null || list === void 0 ? void 0 : list.map(function (flowRecord) {
     return /*#__PURE__*/React.createElement(Timeline.Item, null, /*#__PURE__*/React.createElement(Record, flowRecord));
   })));
 };

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

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

package/dist/esm/common/utils/tools.d.ts

@@ -126,5 +126,4 @@ export declare const getMappingConfigByTemplateDetail: (templateDetail: {
     };
     hideComponents: string[];
 };
-export declare const transformWorkOrderDetail: (detail: any) => any;
 export {};

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

@@ -21,7 +21,7 @@ import { get, every, maxBy } from 'lodash';
 import V from 'voca';
 import { orderDetail, jstOrderDetail, bsOrderDetail, wlnOrderDetail } from "../../model/servers/api";
 import moment from 'moment';
-import { AddressData, ExpressData, orderBackFormValues, bsOrderBackFormValues, wlnOrderBackFormValues, findLabelBySelectValue, request, isNull, bsOrderTransform, wlnOrderTransform, unTransField } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, ExpressData, orderBackFormValues, bsOrderBackFormValues, wlnOrderBackFormValues, findLabelBySelectValue, request, isNull, bsOrderTransform, wlnOrderTransform } from '@kmkf-fe-packages/kmkf-utils';
 import { cloneDeep, isEqual, set } from 'lodash';
 import { PlatForm } from "../../model/flowTemplateDetail/types";
 import cache from "../cache";
@@ -295,7 +295,7 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
     } else if (item.workOrderComponentType === 'RADIO') {
       var _item$componentConfig4;
       var _value = nowData[item.uniqueKey]; // { value: '', other: '' }
-      // console.debug('value', value);
+      console.debug('value', _value);
       contentVoList.push({
         content: (_value === null || _value === void 0 ? void 0 : _value.value) || '',
         name: item.name,
@@ -609,8 +609,8 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
           status: 'returnGoodsStatusValue'
         },
         EXCHANGE_STATUS: {
-          list: 'bsExchangeReason',
-          status: 'bsExchangeStatusValue'
+          list: 'exchangeReason',
+          status: 'exchangeReason'
         },
         WAREHOUSING_STATUS: {
           list: 'inStockStatusItemList',
@@ -722,7 +722,7 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
       });
       contentVoList.push({
         uniqueKey: "".concat(item.uniqueKey, "_shopCode"),
-        content: (bsGoods === null || bsGoods === void 0 ? void 0 : bsGoods.shopCode) || '',
+        content: bsGoods === null || bsGoods === void 0 ? void 0 : bsGoods.shopCode,
         name: item.name
       });
     } else if (item.workOrderComponentType === 'BS_EXCHANGE_GOODS') {
@@ -740,7 +740,7 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
       });
       contentVoList.push({
         uniqueKey: "".concat(item.uniqueKey, "_shopCode"),
-        content: (bsExchange === null || bsExchange === void 0 ? void 0 : bsExchange.shopCode) || '',
+        content: bsExchange === null || bsExchange === void 0 ? void 0 : bsExchange.shopCode,
         name: item.name
       });
       if (['2', '4'].includes(bsExchange === null || bsExchange === void 0 ? void 0 : (_bsExchange$bsExchang = bsExchange.bsExchangeType) === null || _bsExchange$bsExchang === void 0 ? void 0 : _bsExchange$bsExchang[0])) {
@@ -789,7 +789,7 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
       });
       contentVoList.push({
         uniqueKey: "".concat(item.uniqueKey, "_shopCode"),
-        content: (bsReissue === null || bsReissue === void 0 ? void 0 : bsReissue.shopCode) || '',
+        content: bsReissue === null || bsReissue === void 0 ? void 0 : bsReissue.shopCode,
         name: item.name
       });
     } else if (item.workOrderComponentType === 'BS_RETURN_GOODS') {
@@ -806,7 +806,7 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
       });
       contentVoList.push({
         uniqueKey: "".concat(item.uniqueKey, "_shopCode"),
-        content: (bsReturn === null || bsReturn === void 0 ? void 0 : bsReturn.shopCode) || '',
+        content: bsReturn === null || bsReturn === void 0 ? void 0 : bsReturn.shopCode,
         name: item.name
       });
     } else if (item.workOrderComponentType === 'BS_POSTING') {
@@ -897,13 +897,17 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
         name: item.name
       });
     } else if (['REISSUE_TRADE_ID', 'EXCHANGE_TRADE_ID'].includes(item.workOrderComponentType)) {
-      var TRADE_ID_MAP = {
-        REISSUE_TRADE_ID: 'reissueTradeId',
-        EXCHANGE_TRADE_ID: 'exchangeTradeId'
-      };
+      var tradeItemList = get(nowData, "".concat(item.uniqueKey), []);
       contentVoList.push({
-        uniqueKey: "".concat(item.uniqueKey, "_").concat(TRADE_ID_MAP[item.workOrderComponentType]),
-        content: get(nowData, "".concat(item.uniqueKey), ''),
+        uniqueKey: "".concat(item.uniqueKey, "_tradeItemList"),
+        content: tradeItemList,
+        name: item.name
+      });
+      contentVoList.push({
+        uniqueKey: "".concat(item.uniqueKey, "_tradeIdList"),
+        content: tradeItemList.map(function (item) {
+          return item.billNo + '';
+        }),
         name: item.name
       });
     } else if (item.workOrderComponentType === 'WLN_LOGISTICS') {
@@ -945,7 +949,7 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
       });
       contentVoList.push({
         uniqueKey: "".concat(item.uniqueKey, "_shopCode"),
-        content: (wlnGoods === null || wlnGoods === void 0 ? void 0 : wlnGoods.shopCode) || '',
+        content: wlnGoods === null || wlnGoods === void 0 ? void 0 : wlnGoods.shopCode,
         name: item.name
       });
     } else {
@@ -1248,12 +1252,6 @@ 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: {
@@ -1280,7 +1278,7 @@ var transDataSource = function transDataSource(templateColumns) {
       } else if (['RETURN_GOODS_STATUS', 'EXCHANGE_STATUS', 'WAREHOUSING_STATUS'].includes(nex.workOrderComponentType)) {
         var STATUS_LIST_MAP = {
           RETURN_GOODS_STATUS: 'returnGoodsStatusList',
-          EXCHANGE_STATUS: 'bsExchangeReason',
+          EXCHANGE_STATUS: 'exchangeReason',
           WAREHOUSING_STATUS: 'inStockStatusItemList'
         };
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(STATUS_LIST_MAP[nex.workOrderComponentType])], nex.workOrderComponentType === 'WAREHOUSING_STATUS' ? [] : [{
@@ -1416,9 +1414,7 @@ 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',
@@ -1476,7 +1472,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, _objectSpread69, _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, _objectSpread68, _cacheOrderInfo;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -1675,7 +1671,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), {}, (_objectSpread69 = {}, _defineProperty(_objectSpread69, order_no, values), _defineProperty(_objectSpread69, "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId), _defineProperty({}, order_no, _objectSpread(_objectSpread({}, formValue), values))), _objectSpread69))));
+              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))));
             }
           }
           // console.log('orderback', values);
@@ -1999,6 +1995,9 @@ 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;
@@ -2137,19 +2136,4 @@ export var getMappingConfigByTemplateDetail = function getMappingConfigByTemplat
     readonlyComponents: readonlyComponents,
     hideComponents: hideComponents
   };
-};
-//转换表单信息基本数据
-export var transformWorkOrderDetail = function transformWorkOrderDetail(detail) {
-  return Object.keys(detail).reduce(function (prv, key) {
-    if (unTransField(key)) {
-      try {
-        prv[key] = JSON.parse(detail[key]);
-      } catch (e) {
-        prv[key] = detail[key];
-      }
-    } else {
-      prv[key] = detail[key];
-    }
-    return prv;
-  }, {});
 };

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

@@ -78,11 +78,3 @@ 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,21 +147,4 @@ 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,8 +3,6 @@ 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<{
@@ -12,6 +10,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">, setReminderType: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, "flowTemplateDetail/setReminderType">;
+}, "flowTemplateDetail/setWithdrawWorkOrderDetail">;
 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, reminder, cancelReminder } from "./api";
+import { queryPanelInfo, queryAllFlowOperateRecord, currentTradeIdJoinWorkOrder, queryMultiNodeAssistantInfo } from "./api";
 export var initialState = {
   loading: false,
   flowList: [],
@@ -152,12 +152,12 @@ export var fetchAllFlowOperateRecord = function fetchAllFlowOperateRecord(params
             res = _context2.sent;
             if (res.success) {
               list = res === null || res === void 0 ? void 0 : (_res$data16 = res.data) === null || _res$data16 === void 0 ? void 0 : _res$data16.map(function (item) {
-                return _objectSpread(_objectSpread({}, item), {}, {
+                return {
                   time: (item === null || item === void 0 ? void 0 : item.created) || '',
                   operator: (item === null || item === void 0 ? void 0 : item.operator) || '',
                   context: (item === null || item === void 0 ? void 0 : item.remark) || '',
                   operatorType: (item === null || item === void 0 ? void 0 : item.flowOperateType) || ''
-                });
+                };
               });
               dispatch(setRemarkList(list || []));
             }
@@ -224,166 +224,88 @@ 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, _ref6) {
-      var payload = _ref6.payload;
+    setNodeAssistantInfo: function setNodeAssistantInfo(state, _ref4) {
+      var payload = _ref4.payload;
       state.assistantMap = _objectSpread(_objectSpread({}, state.assistantMap), payload);
     },
-    setLoading: function setLoading(state, _ref7) {
-      var payload = _ref7.payload;
+    setLoading: function setLoading(state, _ref5) {
+      var payload = _ref5.payload;
       state.loading = payload;
     },
-    setFlowList: function setFlowList(state, _ref8) {
-      var payload = _ref8.payload;
+    setFlowList: function setFlowList(state, _ref6) {
+      var payload = _ref6.payload;
       state.flowList = payload;
     },
-    setTid: function setTid(state, _ref9) {
-      var payload = _ref9.payload;
+    setTid: function setTid(state, _ref7) {
+      var payload = _ref7.payload;
       state.tid = payload;
     },
-    setShopUniqueKey: function setShopUniqueKey(state, _ref10) {
-      var payload = _ref10.payload;
+    setShopUniqueKey: function setShopUniqueKey(state, _ref8) {
+      var payload = _ref8.payload;
       state.shopUniqueKey = payload;
     },
-    setRemarkList: function setRemarkList(state, _ref11) {
-      var payload = _ref11.payload;
+    setRemarkList: function setRemarkList(state, _ref9) {
+      var payload = _ref9.payload;
       state.remarkList = payload;
     },
-    setCurrentNode: function setCurrentNode(state, _ref12) {
-      var payload = _ref12.payload;
+    setCurrentNode: function setCurrentNode(state, _ref10) {
+      var payload = _ref10.payload;
       state.currentNode = payload;
     },
-    setAction: function setAction(state, _ref13) {
-      var payload = _ref13.payload;
+    setAction: function setAction(state, _ref11) {
+      var payload = _ref11.payload;
       state.action = payload;
     },
-    setVisibleRemarkList: function setVisibleRemarkList(state, _ref14) {
-      var payload = _ref14.payload;
+    setVisibleRemarkList: function setVisibleRemarkList(state, _ref12) {
+      var payload = _ref12.payload;
       state.visibleRemarkList = payload;
     },
-    setPlat: function setPlat(state, _ref15) {
-      var payload = _ref15.payload;
+    setPlat: function setPlat(state, _ref13) {
+      var payload = _ref13.payload;
       state.plat = payload;
     },
-    setOperateParams: function setOperateParams(state, _ref16) {
-      var payload = _ref16.payload;
+    setOperateParams: function setOperateParams(state, _ref14) {
+      var payload = _ref14.payload;
       state.operateParams = payload;
     },
-    setAddRemarkVisible: function setAddRemarkVisible(state, _ref17) {
-      var payload = _ref17.payload;
+    setAddRemarkVisible: function setAddRemarkVisible(state, _ref15) {
+      var payload = _ref15.payload;
       state.addRemarkVisible = payload;
     },
-    setFlowStatus: function setFlowStatus(state, _ref18) {
-      var payload = _ref18.payload;
+    setFlowStatus: function setFlowStatus(state, _ref16) {
+      var payload = _ref16.payload;
       state.flowStatus = payload;
     },
-    setFlowTemplateId: function setFlowTemplateId(state, _ref19) {
-      var payload = _ref19.payload;
+    setFlowTemplateId: function setFlowTemplateId(state, _ref17) {
+      var payload = _ref17.payload;
       state.flowTemplateId = payload;
     },
-    setCurrentTradeIdWOrkOrderNumber: function setCurrentTradeIdWOrkOrderNumber(state, _ref20) {
-      var payload = _ref20.payload;
+    setCurrentTradeIdWOrkOrderNumber: function setCurrentTradeIdWOrkOrderNumber(state, _ref18) {
+      var payload = _ref18.payload;
       state.currentTradeIdLinkWorkOrder = payload;
     },
-    setCurrentFlowAllShowHideRules: function setCurrentFlowAllShowHideRules(state, _ref21) {
-      var payload = _ref21.payload;
+    setCurrentFlowAllShowHideRules: function setCurrentFlowAllShowHideRules(state, _ref19) {
+      var payload = _ref19.payload;
       state.currentFlowAllShowHideRules = payload;
     },
-    setWithdrawWorkOrderDetail: function setWithdrawWorkOrderDetail(state, _ref22) {
-      var payload = _ref22.payload;
+    setWithdrawWorkOrderDetail: function setWithdrawWorkOrderDetail(state, _ref20) {
+      var payload = _ref20.payload;
       state.withdrawWorkOrderDetail = payload;
     },
-    setClearStore: function setClearStore(state, _ref23) {
+    setClearStore: function setClearStore(state, _ref21) {
       var _Object$keys;
-      var payload = _ref23.payload;
+      var payload = _ref21.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,
@@ -402,7 +324,6 @@ var _slice$actions = slice.actions,
   setLoading = _slice$actions.setLoading,
   setCurrentFlowAllShowHideRules = _slice$actions.setCurrentFlowAllShowHideRules,
   setClearStore = _slice$actions.setClearStore,
-  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 };
+  setWithdrawWorkOrderDetail = _slice$actions.setWithdrawWorkOrderDetail;
+export { setFlowList, setNodeAssistantInfo, setTid, setShopUniqueKey, setRemarkList, setCurrentNode, setAction, setVisibleRemarkList, setPlat, setOperateParams, setAddRemarkVisible, setFlowStatus, setCurrentTradeIdWOrkOrderNumber, setFlowTemplateId, setLoading, setCurrentFlowAllShowHideRules, setClearStore, setWithdrawWorkOrderDetail };
 export default slice.reducer;

package/dist/esm/model/logicFlow/selector.d.ts

@@ -6,6 +6,7 @@ export declare const selectFlowList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("./types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").LogicFlow[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").LogicFlow[], {
     clearCache: () => void;
 }> & {
@@ -19,6 +20,7 @@ export declare const selectGroupFlowList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("./types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").Option[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").Option[], {
     clearCache: () => void;
 }> & {
@@ -32,6 +34,7 @@ export declare const selectFlowTemplateGroupWorkOrderTemplateList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("./types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").Option[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").Option[], {
     clearCache: () => void;
 }> & {

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

@@ -11,9 +11,6 @@ export declare const queryWorkOrder: (data: QueryWorkOrderParams) => Promise<any
 export declare const queryTemplateDetail: (data: {
     uniqueKey: string;
 }) => Promise<any>;
-export declare const listTemplateDetail: (data: {
-    templateUniqueKeyList: string[];
-}) => Promise<any>;
 export declare const addWorkOrder: (data: any) => Promise<any>;
 export declare const queryWorkOrderDetail: (data: any) => Promise<any>;
 export declare const updateWorkOrder: (data: any) => Promise<any>;

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

@@ -72,14 +72,6 @@ export var queryTemplateDetail = function queryTemplateDetail(data) {
     data: data
   });
 };
-//查询模板详情列表
-export var listTemplateDetail = function listTemplateDetail(data) {
-  return request({
-    url: '/qy/gdfw/template/listTemplateDetail',
-    method: 'post',
-    data: data
-  });
-};
 //添加工单
 export var addWorkOrder = function addWorkOrder(data) {
   return request({

package/package.json

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