kmkf-work-order-service-component 0.4.11 → 0.4.13-alpha.1

package/dist/esm/FormRender/index.js

@@ -297,7 +297,8 @@ var FormRender = function FormRender(props, ref) {
                 };
               }
 
-              console.debug('增加数据参数', _params);
+              console.debug('增加数据参数', _params); // return;
+
               _context.next = 33;
               return addWorkOrder(_params);
 
@@ -432,14 +433,14 @@ var FormRender = function FormRender(props, ref) {
 
 
   var orderBackReplace = function orderBackReplace(value, templateDetail) {
-    var tradeId = value.tradeId,
-        buyer = value.buyer,
+    var orderNo = value.orderNo,
+        buyerNick = value.buyerNick,
         receiveMobile = value.receiveMobile,
         alipayAccount = value.alipayAccount,
         expressLogisticsCode = value.expressLogisticsCode;
     queryReplaceCount({
-      tradeId: tradeId,
-      buyerNick: buyer === null || buyer === void 0 ? void 0 : buyer.buyerNick,
+      tradeId: orderNo,
+      buyerNick: buyerNick,
       receiveMobile: receiveMobile,
       alipayAccount: alipayAccount,
       expressLogisticsCode: expressLogisticsCode
@@ -650,13 +651,47 @@ var FormRender = function FormRender(props, ref) {
     setShopId(val); // 清空表单字段
 
     var needClearFormFields = get(templateDetail, 'componentDtoList', []).reduce(function (cur, nxt) {
-      if (['ITEM_SELECT_THIRD', 'STATUS', 'ITEM_SELECT', 'ITEM_ID', 'ITEM_ENCODE'].includes(nxt === null || nxt === void 0 ? void 0 : nxt.workOrderComponentType)) {
+      if (['ITEM_SELECT_THIRD', 'STATUS', 'ITEM_SELECT', 'ITEM_ID', 'ITEM_ENCODE', 'JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD'].includes(nxt === null || nxt === void 0 ? void 0 : nxt.workOrderComponentType)) {
         cur.push(nxt === null || nxt === void 0 ? void 0 : nxt.uniqueKey);
       }
 
       return cur;
     }, []);
-    form.resetFields(needClearFormFields); //切换店铺时，判断是否有订单号 有订单号自动订单返填
+    form.resetFields(needClearFormFields); //如果有聚水潭组件 设置成初始值
+
+    var hasJst = get(templateDetail, 'componentDtoList', []).some(function (item) {
+      return ['JST_LOGISTICS', 'JST_SUPPLY', 'JST_SEND_GOOD'].includes(item.workOrderComponentType);
+    });
+
+    if (hasJst) {
+      var jstValue = get(templateDetail, 'componentDtoList', []).reduce(function (prv, next) {
+        switch (next.workOrderComponentType) {
+          case 'JST_LOGISTICS':
+            prv[next.uniqueKey] = [{
+              logisticsCompany: null,
+              logisticsCode: null
+            }];
+            break;
+
+          case 'JST_SUPPLY':
+            prv[next.uniqueKey] = [{
+              supplyId: null
+            }];
+            break;
+
+          case 'JST_SEND_GOOD':
+            prv[next.uniqueKey] = [{
+              sendName: '',
+              sendId: ''
+            }];
+            break;
+        }
+
+        return prv;
+      }, {});
+      form.setFieldsValue(jstValue);
+    } //切换店铺时，判断是否有订单号 有订单号自动订单返填
+
 
     var allValue = form.getFieldsValue();
     var tradeIdUniqueKey = templateDetail === null || templateDetail === void 0 ? void 0 : (_templateDetail$compo3 = templateDetail.componentDtoList.find(function (item) {

package/dist/esm/FormRender/index.less

@@ -134,7 +134,7 @@
 .tipBox {
   position: sticky;
   top: -24px;
-  z-index: 1;
+  z-index: 10;
   color: #e99d42;
   background-color: #fff;
 }

package/dist/esm/SingleShopWorkOrder/components/Card/index.less

@@ -108,7 +108,7 @@
   margin: 6px 0;
 
   .itemViewLeft {
-    min-width: 48px;
+    max-width: 58px;
     margin-right: 8px;
     color: rgba(0, 0, 0, 0.4);
     font-weight: normal;

package/dist/esm/SingleShopWorkOrder/components/CustomizeFormModal/index.js

@@ -463,14 +463,14 @@ var CustomizeFormModal = function CustomizeFormModal(props) {
 
 
   var orderBackReplace = function orderBackReplace(value) {
-    var tradeId = value.tradeId,
-        buyer = value.buyer,
+    var orderNo = value.orderNo,
+        buyerNick = value.buyerNick,
         receiveMobile = value.receiveMobile,
         alipayAccount = value.alipayAccount,
         expressLogisticsCode = value.expressLogisticsCode;
     queryReplaceCount({
-      tradeId: tradeId,
-      buyerNick: buyer === null || buyer === void 0 ? void 0 : buyer.buyerNick,
+      tradeId: orderNo,
+      buyerNick: buyerNick,
       receiveMobile: receiveMobile,
       alipayAccount: alipayAccount,
       expressLogisticsCode: expressLogisticsCode

package/dist/esm/SingleShopWorkOrder/components/CustomizeFormModal/index.less

@@ -128,7 +128,7 @@
 .tipBox {
   position: sticky;
   top: -24px;
-  z-index: 1;
+  z-index: 10;
   color: #e99d42;
   background-color: #fff;
 }

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

@@ -27,14 +27,50 @@ import React from 'react';
 import { Divider } from 'antd';
 import moment from 'moment';
 import { get } from 'lodash';
+import { useDispatch } from 'react-redux';
 import { useAppDispatch, useAppSelector } from "../../../../../model/hooks";
 import { factory } from "../../../Widget";
 import { calcWorkOrderList, isNull } from "../../../../../common/utils/tools";
 import { WORK_ORDER_STATUS, WAITING, HANDLING, STOPPING } from "../../../../../common/constant";
-import { setStatusSelectModalVisible, setLogModalVisible, setFormModalVisible, setTemplateId, setCustomizeFormShopId, setCurrentCustomizeRecord } from "../../../../../model/customizeWorkOrder";
+import { setStatusSelectModalVisible, setLogModalVisible, setFormModalVisible, setTemplateId, setCustomizeFormShopId, setCurrentCustomizeRecord, setRepeatModalVisible, setRepeatWorkOrderConditions } from "../../../../../model/customizeWorkOrder";
+import repeatPng from "../../../../../assets/repeat.png";
 import { selectorAllTemplateList } from "../../../../../model/customizeWorkOrder/selector";
 import "./index.less";
 
+var WorkOrderId = function WorkOrderId(props) {
+  var _props$repeatValueLis;
+
+  var dispatch = useDispatch();
+
+  var handleOpenRepeatModal = function handleOpenRepeatModal(conditions) {
+    dispatch(setRepeatModalVisible(true));
+    dispatch(setRepeatWorkOrderConditions(conditions));
+  };
+
+  return /*#__PURE__*/React.createElement("div", {
+    className: "orderItemView"
+  }, /*#__PURE__*/React.createElement("span", {
+    className: "itemViewLeft"
+  }, props.label), /*#__PURE__*/React.createElement("span", {
+    className: "itemViewRight"
+  }, ((_props$repeatValueLis = props.repeatValueList) === null || _props$repeatValueLis === void 0 ? void 0 : _props$repeatValueLis.length) > 0 && /*#__PURE__*/React.createElement("img", {
+    src: repeatPng,
+    style: {
+      width: '16px'
+    },
+    alt: "",
+    onClick: function onClick() {
+      var _props$record, _props$record2;
+
+      return handleOpenRepeatModal({
+        templateId: (_props$record = props.record) === null || _props$record === void 0 ? void 0 : _props$record.templateId,
+        workOrderUniqueKey: (_props$record2 = props.record) === null || _props$record2 === void 0 ? void 0 : _props$record2.id,
+        fieldList: props.repeatValueList
+      });
+    }
+  }), props.value));
+};
+
 function CustomizeWorkOrderCard(props) {
   var _item$handlerList, _item$handlerList$map;
 
@@ -186,10 +222,11 @@ function CustomizeWorkOrderCard(props) {
       return i.account;
     })) === null || _item$handlerList$map === void 0 ? void 0 : _item$handlerList$map.join('、'),
     key: "handleList"
-  }), /*#__PURE__*/React.createElement(ItemView, {
+  }), /*#__PURE__*/React.createElement(WorkOrderId, {
     label: "\u5DE5\u5355\u7F16\u53F7",
     value: transData.id,
-    key: "id"
+    record: item,
+    repeatValueList: transData.repeatValueList
   }), /*#__PURE__*/React.createElement(Divider, {
     dashed: true,
     style: {

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

@@ -108,7 +108,7 @@
   margin: 6px 0;
 
   .itemViewLeft {
-    min-width: 48px;
+    max-width: 58px;
     margin-right: 8px;
     color: rgba(0, 0, 0, 0.4);
     font-weight: normal;

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

@@ -195,7 +195,7 @@ var RecordLog = function RecordLog(props) {
                 }
               }, /*#__PURE__*/React.createElement("span", {
                 style: {
-                  minWidth: '70px',
+                  maxWidth: '66px',
                   flexShrink: 1
                 }
               }, child === null || child === void 0 ? void 0 : child.title, ":"), /*#__PURE__*/React.createElement("span", {
@@ -212,7 +212,7 @@ var RecordLog = function RecordLog(props) {
             }
           }, /*#__PURE__*/React.createElement("span", {
             style: {
-              minWidth: '70px',
+              maxWidth: '66px',
               flexShrink: 1
             }
           }, item === null || item === void 0 ? void 0 : item.name, ":"), /*#__PURE__*/React.createElement("span", {

package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/RepeatWorkOrderListModal/index.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="react" />
+import './index.less';
+declare const RepeatWorkOrderListModal: () => JSX.Element;
+export default RepeatWorkOrderListModal;

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

@@ -0,0 +1,168 @@
+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, $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 generator._invoke = function (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); } }; }(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; this._invoke = function (method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); }; } function maybeInvokeDelegate(delegate, context) { var method = delegate.iterator[context.method]; if (undefined === method) { if (context.delegate = null, "throw" === context.method) { if (delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel; context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method"); } return 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, define(Gp, "constructor", GeneratorFunctionPrototype), define(GeneratorFunctionPrototype, "constructor", GeneratorFunction), 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 (object) { var 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 = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+import React, { useEffect, useState } from 'react';
+import { Modal, message, Button, Spin } from 'antd';
+import { useDispatch, useSelector } from 'react-redux';
+import isEmpty from 'lodash/isEmpty';
+import copy from 'copy-to-clipboard';
+import { getRepeatWorkOrderList } from "../../../../../model/servers/api";
+import { setRepeatModalVisible, setRepeatWorkOrderConditions } from "../../../../../model/customizeWorkOrder/index";
+import { selectRepeatVisible, selectRepeatWorkOrderConditions } from "../../../../../model/customizeWorkOrder/selector";
+import "./index.less";
+
+var RepeatWorkOrder = function RepeatWorkOrder(_ref) {
+  var title = _ref.title,
+      repeatWorkOrderList = _ref.repeatWorkOrderList;
+
+  var copyHandle = function copyHandle(text) {
+    copy(text);
+    message.success('复制成功');
+  };
+
+  return /*#__PURE__*/React.createElement("section", {
+    className: "item-wrap"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "item-main-item"
+  }, title), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("ol", {
+    className: "customize-repeat-workOrder"
+  }, repeatWorkOrderList === null || repeatWorkOrderList === void 0 ? void 0 : repeatWorkOrderList.map(function (item) {
+    return /*#__PURE__*/React.createElement("li", null, /*#__PURE__*/React.createElement("span", {
+      className: "workOrderId"
+    }, item), /*#__PURE__*/React.createElement(Button, {
+      type: "link",
+      onClick: function onClick() {
+        return copyHandle(item);
+      }
+    }, "\u590D\u5236"));
+  }))));
+};
+
+var RepeatWorkOrderListModal = function RepeatWorkOrderListModal() {
+  var _useState = useState(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      loading = _useState2[0],
+      setLoading = _useState2[1];
+
+  var _useState3 = useState([]),
+      _useState4 = _slicedToArray(_useState3, 2),
+      repeatWorkOrderList = _useState4[0],
+      setRepeatWorkOrderList = _useState4[1];
+
+  var dispatch = useDispatch();
+  var visible = useSelector(selectRepeatVisible);
+  var repeatWorkOrderConditions = useSelector(selectRepeatWorkOrderConditions);
+
+  var getWorkOrderList = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(conditions) {
+      var _yield$getRepeatWorkO, data;
+
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              _context.prev = 0;
+              setLoading(true);
+              _context.next = 4;
+              return getRepeatWorkOrderList(conditions);
+
+            case 4:
+              _yield$getRepeatWorkO = _context.sent;
+              data = _yield$getRepeatWorkO.data;
+              setRepeatWorkOrderList(data);
+
+            case 7:
+              _context.prev = 7;
+              setLoading(false);
+              return _context.finish(7);
+
+            case 10:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee, null, [[0,, 7, 10]]);
+    }));
+
+    return function getWorkOrderList(_x) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+
+  useEffect(function () {
+    if (visible && !isEmpty(repeatWorkOrderConditions)) {
+      getWorkOrderList(repeatWorkOrderConditions);
+    } else {
+      setRepeatWorkOrderList([]);
+    }
+  }, [visible, repeatWorkOrderConditions]);
+
+  var handleCancel = function handleCancel() {
+    dispatch(setRepeatModalVisible(false));
+    dispatch(setRepeatWorkOrderConditions({}));
+  };
+
+  var copyHandle = function copyHandle(text) {
+    copy(text);
+    message.success('复制成功');
+  };
+
+  return /*#__PURE__*/React.createElement(Modal, {
+    title: "\u91CD\u590D\u63D0\u4EA4\u5DE5\u5355\u7F16\u53F7",
+    visible: visible,
+    onCancel: handleCancel,
+    footer: null,
+    bodyStyle: {
+      maxHeight: '300px',
+      overflowY: 'auto'
+    }
+  }, /*#__PURE__*/React.createElement(Spin, {
+    spinning: loading
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      background: '#f0f0f0'
+    }
+  }, repeatWorkOrderList === null || repeatWorkOrderList === void 0 ? void 0 : repeatWorkOrderList.map(function (item) {
+    var _item$repeatField, _item$repeatField2, _item$repeatField3;
+
+    if (item !== null && item !== void 0 && (_item$repeatField = item.repeatField) !== null && _item$repeatField !== void 0 && _item$repeatField.endsWith('_tradeId')) {
+      return /*#__PURE__*/React.createElement(RepeatWorkOrder, {
+        title: "\u8BA2\u5355\u91CD\u590D",
+        repeatWorkOrderList: item.workOrderIds
+      });
+    }
+
+    if (item !== null && item !== void 0 && (_item$repeatField2 = item.repeatField) !== null && _item$repeatField2 !== void 0 && _item$repeatField2.endsWith('_buyerNick')) {
+      return /*#__PURE__*/React.createElement(RepeatWorkOrder, {
+        title: "\u4E70\u5BB6\u6635\u79F0\u91CD\u590D",
+        repeatWorkOrderList: item.workOrderIds
+      });
+    }
+
+    if (item !== null && item !== void 0 && (_item$repeatField3 = item.repeatField) !== null && _item$repeatField3 !== void 0 && _item$repeatField3.endsWith('_expressLogisticsCode')) {
+      return /*#__PURE__*/React.createElement(RepeatWorkOrder, {
+        title: "\u7269\u6D41\u5355\u53F7\u91CD\u590D",
+        repeatWorkOrderList: item.workOrderIds
+      });
+    }
+  }))));
+};
+
+export default RepeatWorkOrderListModal;

package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/RepeatWorkOrderListModal/index.less

@@ -0,0 +1,30 @@
+.item-wrap {
+  display: flex;
+  flex-direction: row;
+  margin-bottom: 4px;
+  background: #fff;
+  .item-main-item {
+    flex-basis: 100px;
+    font-weight: 600;
+    font-size: 14px;
+    line-height: 32px;
+  }
+}
+.customize-repeat-workOrder {
+  padding-left: 16px;
+  li {
+    margin-bottom: 4px;
+    list-style: decimal;
+    .workOrderId {
+      display: inline-flex;
+      width: 260px;
+      margin-right: 16px;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+    .text-repeat {
+      cursor: pointer;
+    }
+  }
+}

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

@@ -32,6 +32,7 @@ import CustomizeWorkOrderCard from "./components/CustomizeWorkOrderCard";
 import DeleteCustomizeOrderModal from "./components/DeleteCustomizeOrderModal";
 import DealerSelectModal from "./components/DealerSelectModal";
 import StatusSelectModal from "./components/StatusSelectModal";
+import RepeatWorkOrderListModal from "./components/RepeatWorkOrderListModal";
 import RecordLog from "./components/RecordLog";
 import emptyImg from "../../../common/imgs/empty.png";
 import { PlatForm } from "../../types";
@@ -119,7 +120,8 @@ var getTableData = function getTableData(_ref) {
 
     return queryAllWorkOrderList(URL_MAPPING[type], _objectSpread(_objectSpread({}, params), {}, {
       pageSize: pageSize,
-      pageNo: current
+      pageNo: current,
+      needReturnRepeatValue: true
     })).then(function (res) {
       var _res$data, _res$data2;
 
@@ -363,6 +365,7 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
   }), /*#__PURE__*/React.createElement("p", null, "\u6682\u65E0\u6570\u636E")))), (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) > 0 && /*#__PURE__*/React.createElement("div", {
     className: "custom_box_page"
   }, /*#__PURE__*/React.createElement(Pagination, _extends({
+    size: "small",
     onChange: function onChange(page, pageSize) {
       return _onChange({
         current: page,
@@ -370,7 +373,10 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
       });
     }
   }, pagination, {
-    total: total
+    total: total,
+    showTotal: function showTotal(total) {
+      return "\u5171".concat(total, "\u6761");
+    }
   }))), /*#__PURE__*/React.createElement(DeleteCustomizeOrderModal, {
     submit: submit
   }), /*#__PURE__*/React.createElement(DealerSelectModal, {
@@ -379,7 +385,7 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
     onSuccess: submit
   }), /*#__PURE__*/React.createElement(RecordLog, {
     width: platform === PlatForm.XIAOZHI ? '100%' : '90%'
-  }), /*#__PURE__*/React.createElement(Drawer, {
+  }), /*#__PURE__*/React.createElement(RepeatWorkOrderListModal, null), /*#__PURE__*/React.createElement(Drawer, {
     closeIcon: /*#__PURE__*/React.createElement(LeftOutlined, null),
     title: (record === null || record === void 0 ? void 0 : record.templateName) || title,
     width: platform === PlatForm.XIAOZHI ? '100%' : '90%',

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

@@ -7,11 +7,14 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 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); }); }; }
 
 import React from 'react';
-import { Divider, Modal } from 'antd';
+import { Divider, Modal, Button, message } from 'antd';
 import moment from 'moment';
-import { useAppDispatch } from "../../../../../model/hooks";
-import { setPaymentWorkOrderExamineModalVisible, setCurrentPaymentRecord, setPaymentWorkOrderUnExamineModalVisible, setDeletePaymentWorkOrderVisible, setFlagPayModalVisible, setLogModalVisible, setPaymentFormModalVisible } from "../../../../../model/paymentWorkOrder";
+import copy from 'copy-to-clipboard';
+import { useAppSelector, useAppDispatch } from "../../../../../model/hooks";
+import { useDispatch } from 'react-redux';
+import { setPaymentWorkOrderExamineModalVisible, setCurrentPaymentRecord, setPaymentWorkOrderUnExamineModalVisible, setDeletePaymentWorkOrderVisible, setFlagPayModalVisible, setLogModalVisible, setPaymentFormModalVisible, setRepeatModalVisible, setRepeatWorkOrderList } from "../../../../../model/paymentWorkOrder";
 import { getAlipayBillReceipt } from "../../../../../model/servers/api";
+import repeatPng from "../../../../../assets/repeat.png";
 import "./index.less";
 var workPayStatusFuncMap = {
   WAITING_EXAMINE: ['examine', 'edit', 'deleteHandle', 'recordHandle'],
@@ -69,21 +72,54 @@ var PAY_STATUS_ICON = {
   EXAMINED: '#43BF0A'
 };
 
+var WorkOrderId = function WorkOrderId(props) {
+  var _props$tidRepeatPayme;
+
+  var dispatch = useDispatch();
+
+  var handleOpenRepeatModal = function handleOpenRepeatModal(list) {
+    dispatch(setRepeatModalVisible(true));
+    dispatch(setRepeatWorkOrderList(list));
+  };
+
+  return /*#__PURE__*/React.createElement("div", {
+    className: "orderItemView"
+  }, /*#__PURE__*/React.createElement("span", {
+    className: "itemViewLeft"
+  }, props.label), /*#__PURE__*/React.createElement("span", {
+    className: "itemViewRight"
+  }, ((_props$tidRepeatPayme = props.tidRepeatPaymentUks) === null || _props$tidRepeatPayme === void 0 ? void 0 : _props$tidRepeatPayme.length) > 1 && /*#__PURE__*/React.createElement("img", {
+    src: repeatPng,
+    style: {
+      width: '16px'
+    },
+    alt: "",
+    onClick: function onClick() {
+      return handleOpenRepeatModal(props.tidRepeatPaymentUks);
+    }
+  }), props.value));
+};
+
 function PaymentWorkOrderCard(props) {
   var _props$record = props.record,
       record = _props$record === void 0 ? {} : _props$record;
   var dispatch = useAppDispatch();
+  var platformInfo = useAppSelector(function (state) {
+    return state.global.platformInfo;
+  });
   var workPayStatusDesc = record.workPayStatusDesc,
       workPayStatus = record.workPayStatus,
       operateTime = record.operateTime,
       operateNick = record.operateNick,
       paymentOrderKey = record.paymentOrderKey,
+      workOrderId = record.workOrderId,
       workPayFee = record.workPayFee,
       shopName = record.shopName,
       buyerNick = record.buyerNick,
       tid = record.tid,
       accountNickMix = record.accountNickMix,
       accountNoMix = record.accountNoMix,
+      tidRepeatPaymentUks = record.tidRepeatPaymentUks,
       remitTime = record.remitTime;
   var btnList = workPayStatusFuncMap[workPayStatus].map(function (id) {
     return /*#__PURE__*/React.createElement("div", {
@@ -164,7 +200,7 @@ function PaymentWorkOrderCard(props) {
 
   var voucherHandle = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(record) {
-      var params, res, data, message;
+      var params, res, data, msg;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -178,19 +214,31 @@ function PaymentWorkOrderCard(props) {
 
             case 3:
               res = _context.sent;
-              console.log(res);
-              data = res.data, message = res.message;
+              data = res.data, msg = res.message;
 
               if (data) {
-                window.open(data);
+                if (['fxg'].includes(platformInfo === null || platformInfo === void 0 ? void 0 : platformInfo.platform)) {
+                  Modal.info({
+                    title: '付款凭证',
+                    content: /*#__PURE__*/React.createElement("div", null, "\u8BF7\u590D\u5236\u94FE\u63A5\u5728\u6D4F\u89C8\u5668\u4E0A\u6253\u5F00\uFF0C\u94FE\u63A5\uFF1A".concat(data), ' ', /*#__PURE__*/React.createElement(Button, {
+                      type: "primary",
+                      onClick: function onClick() {
+                        copy(data);
+                        message.success('复制成功');
+                      }
+                    }, "\u70B9\u51FB\u590D\u5236"))
+                  });
+                } else {
+                  window.open(data);
+                }
               } else {
                 Modal.info({
                   title: '付款凭证',
-                  content: message
+                  content: msg
                 });
               }
 
-            case 7:
+            case 6:
             case "end":
               return _context.stop();
           }
@@ -281,10 +329,11 @@ function PaymentWorkOrderCard(props) {
   }, {
     label: '支付宝账号：',
     value: accountNoMix
-  }, {
-    label: '工单编号：',
-    value: paymentOrderKey
-  }])), /*#__PURE__*/React.createElement(Divider, {
+  }]), /*#__PURE__*/React.createElement(WorkOrderId, {
+    label: "\u5DE5\u5355\u7F16\u53F7\uFF1A",
+    value: workOrderId || paymentOrderKey,
+    tidRepeatPaymentUks: tidRepeatPaymentUks
+  })), /*#__PURE__*/React.createElement(Divider, {
     dashed: true,
     style: {
       margin: '12px 0'

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

@@ -116,9 +116,14 @@
   }
 
   .itemViewRight {
+    display: flex;
     flex-grow: 1;
+    align-items: center;
     min-width: 0;
     color: rgba(0, 0, 0, 0.85);
     word-break: break-all;
+    img {
+      margin-right: 8px;
+    }
   }
 }

package/dist/esm/WorkOrder/components/PaymentWorkOrderList/components/RepeatWorkOrderListModal/index.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="react" />
+import './index.less';
+declare const RepeatWorkOrderListModal: () => JSX.Element;
+export default RepeatWorkOrderListModal;