@kmkf-fe-packages/kmkf-work-order-service-component 1.8.0 → 1.8.1-beta.0

package/README.md

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

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

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

package/dist/esm/FlowTemplateDetail/index.js

@@ -45,8 +45,8 @@ import SubmitRemindModal from "./components/SubmitRemindModal";
 import { useSignal } from "../hooks/useSignal";
 import { verifyHandle, submitParams, FLOW_STATUS_V2, getTag, currentUserHasOperatorAuth, CANNOT_BACK_FILL } from "./common";
 import { saveWorkOrder, submitWorkOrder, addRemark, stopWorkOrder, closeWorkOrder, startWorkOrder, forwardWorkOrder, returnWorkOrder, withDrawWorkOrder, reminder, cancelReminder } from "../model/flowTemplateDetail/api";
-import { COMPONENT_MAP } from "../common/utils/tools";
 import RenderDetail from "./components/RenderDetail";
+import { COMPONENT_MAP } from "../common/utils/tools";
 import { orderDetail } from "../model/servers/api";
 import cache from "../common/cache";
 import "./index.less";

package/dist/esm/WorkOrder/components/PaymentWorkOrderList/components/DeletePaymentWorkOrderModal/index.js

@@ -2,6 +2,12 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 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 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; }
 /*
  * @Author: wangzhenggui jianjia.wzg@raycloud.com
  * @Date: 2022-11-03 16:01:49
@@ -12,36 +18,43 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
  *
  * Copyright (c) 2022 by wangzhenggui jianjia.wzg@raycloud.com, All Rights Reserved.
  */
-import React, { useCallback } from 'react';
-import { Modal, message } from 'antd';
+import React, { useEffect, useCallback, useState } from 'react';
+import { Modal, message, Input } from 'antd';
 import { useDispatch, useSelector } from 'react-redux';
 import { debounce } from 'lodash';
 import { setCurrentPaymentRecord, setDeletePaymentWorkOrderVisible } from "../../../../../model/paymentWorkOrder";
 import { selectDeletePaymentWorkOrderVisible, selectCurrentPaymentRecord } from "../../../../../model/paymentWorkOrder/selector";
-import { deletePaymentOrder } from "../../../../../model/servers/api";
+import { voidPaymentOrder } from "../../../../../model/servers/api";
 var DeletePaymentWorkOrderModal = function DeletePaymentWorkOrderModal(props) {
   var onSuccess = props.onSuccess;
   var dispatch = useDispatch();
+  var _useState = useState(''),
+    _useState2 = _slicedToArray(_useState, 2),
+    value = _useState2[0],
+    setValue = _useState2[1];
   var visible = useSelector(selectDeletePaymentWorkOrderVisible);
   var record = useSelector(selectCurrentPaymentRecord);
+  useEffect(function () {
+    setValue('');
+  }, [visible]);
   var handleCancel = function handleCancel() {
     dispatch(setCurrentPaymentRecord({}));
     dispatch(setDeletePaymentWorkOrderVisible(false));
   };
-  var fetchDeletePaymentOrder = /*#__PURE__*/function () {
+  var fetchVoidPaymentOrder = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
-      var _yield$deletePaymentO, success;
+      var _yield$voidPaymentOrd, success;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _context.prev = 0;
             _context.next = 3;
-            return deletePaymentOrder(params);
+            return voidPaymentOrder(params);
           case 3:
-            _yield$deletePaymentO = _context.sent;
-            success = _yield$deletePaymentO.success;
+            _yield$voidPaymentOrd = _context.sent;
+            success = _yield$voidPaymentOrd.success;
             if (success) {
-              message.success('删除成功');
+              message.success('作废成功');
               onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess();
               handleCancel();
             }
@@ -57,24 +70,36 @@ var DeletePaymentWorkOrderModal = function DeletePaymentWorkOrderModal(props) {
         }
       }, _callee, null, [[0, 8]]);
     }));
-    return function fetchDeletePaymentOrder(_x) {
+    return function fetchVoidPaymentOrder(_x2) {
       return _ref.apply(this, arguments);
     };
   }();
   var handleOk = useCallback(function () {
-    fetchDeletePaymentOrder({
-      ids: [record.id]
+    fetchVoidPaymentOrder({
+      ids: [record.id],
+      voidReason: value
     });
   }, [record]);
   return /*#__PURE__*/React.createElement(Modal, {
-    title: "\u5220\u9664\u6253\u6B3E\u5DE5\u5355",
+    title: "\u4F5C\u5E9F",
     open: visible,
     okText: "\u786E\u5B9A",
     cancelText: "\u53D6\u6D88",
     onOk: debounce(handleOk, 300),
     onCancel: handleCancel
-  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
-    className: "red"
-  }, "\u5220\u9664\u540E\u7684\u5DE5\u5355\u65E0\u6CD5\u6062\u590D"), "\uFF0C \u4F60\u8FD8\u8981\u7EE7\u7EED\u5417\uFF1F"));
+  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("p", {
+    style: {
+      color: 'red'
+    }
+  }, "\u6253\u6B3E\u5DE5\u5355\u5C06\u79FB\u9664\u5230\u6253\u6B3E\u5DE5\u5355\u56DE\u6536\u7AD9\uFF0C\u65E0\u6CD5\u6062\u590D\uFF01"), /*#__PURE__*/React.createElement(Input.TextArea, {
+    rows: 4,
+    maxLength: 200,
+    showCount: true,
+    placeholder: "\u8BF7\u8F93\u5165\u4F5C\u5E9F\u539F\u56E0",
+    value: value,
+    onChange: function onChange(e) {
+      return setValue(e.target.value);
+    }
+  })));
 };
 export default DeletePaymentWorkOrderModal;

package/dist/esm/WorkOrder/components/PaymentWorkOrderList/components/PaymentWorkOrderCard/index.js

@@ -22,18 +22,18 @@ import QnOpenWangWang from "../QnOpenWangWang";
 import "./index.less";
 var workPayStatusFuncMap = {
   WAITING_EXAMINE: ['examine', 'edit', 'deleteHandle', 'recordHandle'],
-  EXAMINED: ['waitingExamine', 'pay', 'recordHandle'],
+  EXAMINED: ['waitingExamine', 'pay', 'deleteHandle', 'recordHandle'],
   FLAG_PAID: ['recordHandle'],
   ALI_PAY_WAITING: ['recordHandle'],
   ALI_PAY_SUCCESS: ['recordHandle', 'voucher'],
-  ALI_PAY_FAIL: ['recordHandle'],
+  ALI_PAY_FAIL: ['deleteHandle', 'recordHandle'],
   ALI_PAY_CLOSE: ['recordHandle'],
   ALI_PAY_EXPIRED: ['recordHandle']
 };
 var payStatusMap = {
   examine: '审核',
   edit: '修改',
-  deleteHandle: '删除',
+  deleteHandle: '作废',
   recordHandle: '记录',
   waitingExamine: '取消审核',
   pay: '打款',
@@ -70,6 +70,10 @@ var PAY_STATUS = [{
   value: 'ALI_PAY_CLOSE',
   label: '打款关闭',
   color: 'rgba(156,156,156)'
+}, {
+  value: 'VOID',
+  label: '已作废',
+  color: 'rgba(156,156,156)'
 }];
 var PAY_STATUS_ICON = {
   WAITING_EXAMINE: '#FF4050',

package/dist/esm/index.d.ts

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

package/dist/esm/index.js

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

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

@@ -22,6 +22,7 @@ export declare const decodeAlipayInfo: (data: any) => Promise<any>;
 export declare const queryPaymentWorkOrderList: (data: any) => Promise<any>;
 export declare const examinePaymentOrder: (data: any) => Promise<any>;
 export declare const deletePaymentOrder: (data: any) => Promise<any>;
+export declare const voidPaymentOrder: (data: any) => Promise<any>;
 export declare const paymentOrder: (data: any) => Promise<any>;
 export declare const reportLogs: (data: any) => Promise<any>;
 export declare const editRemitOrder: (data: any) => Promise<any>;

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

@@ -150,6 +150,15 @@ export var deletePaymentOrder = function deletePaymentOrder(data) {
   });
 };
 
+//作废打款
+export var voidPaymentOrder = function voidPaymentOrder(data) {
+  return request({
+    url: '/qy/payment/paymentOrder/voidOpt',
+    method: 'post',
+    data: data
+  });
+};
+
 //
 export var paymentOrder = function paymentOrder(data) {
   return request({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "1.8.0",
+  "version": "1.8.1-beta.0",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -32,9 +32,9 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@kmkf-fe-packages/basic-components": "1.8.0",
-    "@kmkf-fe-packages/kmkf-utils": "1.8.0",
-    "@kmkf-fe-packages/services-components": "1.8.0",
+    "@kmkf-fe-packages/basic-components": "1.8.1-beta.0",
+    "@kmkf-fe-packages/kmkf-utils": "1.8.1-beta.0",
+    "@kmkf-fe-packages/services-components": "1.8.1-beta.0",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -73,7 +73,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d2228b5d77f9eb2ade4a0e56ccb2ce71bfbe8e62",
+  "gitHead": "7cab2017babab9a6e23fdd3e6f9fa238de78bddb",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }