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

Sign up to get free protection for your applications and to get access to all the features.
Files changed (49) hide show
  1. package/dist/esm/FormRender/index.js +42 -7
  2. package/dist/esm/FormRender/index.less +1 -1
  3. package/dist/esm/SingleShopWorkOrder/components/Card/index.less +1 -1
  4. package/dist/esm/SingleShopWorkOrder/components/CustomizeFormModal/index.js +4 -4
  5. package/dist/esm/SingleShopWorkOrder/components/CustomizeFormModal/index.less +1 -1
  6. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/CustomizeWorkOrderCard/index.js +40 -3
  7. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/CustomizeWorkOrderCard/index.less +1 -1
  8. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/RecordLog/index.js +2 -2
  9. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/RepeatWorkOrderListModal/index.d.ts +4 -0
  10. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/RepeatWorkOrderListModal/index.js +168 -0
  11. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/RepeatWorkOrderListModal/index.less +30 -0
  12. package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/index.js +9 -3
  13. package/dist/esm/WorkOrder/components/PaymentWorkOrderList/components/PaymentWorkOrderCard/index.js +38 -5
  14. package/dist/esm/WorkOrder/components/PaymentWorkOrderList/components/PaymentWorkOrderCard/index.less +5 -0
  15. package/dist/esm/WorkOrder/components/PaymentWorkOrderList/components/RepeatWorkOrderListModal/index.d.ts +4 -0
  16. package/dist/esm/WorkOrder/components/PaymentWorkOrderList/components/RepeatWorkOrderListModal/index.js +49 -0
  17. package/dist/esm/WorkOrder/components/PaymentWorkOrderList/components/RepeatWorkOrderListModal/index.less +21 -0
  18. package/dist/esm/WorkOrder/components/PaymentWorkOrderList/index.js +4 -2
  19. package/dist/esm/WorkOrder/components/Widget/common/formItemWrap.d.ts +3 -1
  20. package/dist/esm/WorkOrder/components/Widget/common/formItemWrap.js +48 -10
  21. package/dist/esm/WorkOrder/components/Widget/index.d.ts +5 -1
  22. package/dist/esm/WorkOrder/components/Widget/index.js +16 -0
  23. package/dist/esm/WorkOrder/components/Widget/jst/JstItemSelect/index.d.ts +17 -0
  24. package/dist/esm/WorkOrder/components/Widget/jst/JstItemSelect/index.js +129 -0
  25. package/dist/esm/WorkOrder/components/Widget/jst/JstLogistics/index.d.ts +14 -0
  26. package/dist/esm/WorkOrder/components/Widget/jst/JstLogistics/index.js +121 -0
  27. package/dist/esm/WorkOrder/components/Widget/jst/JstSendGood/index.d.ts +14 -0
  28. package/dist/esm/WorkOrder/components/Widget/jst/JstSendGood/index.js +129 -0
  29. package/dist/esm/WorkOrder/components/Widget/jst/JstSupply/index.d.ts +14 -0
  30. package/dist/esm/WorkOrder/components/Widget/jst/JstSupply/index.js +117 -0
  31. package/dist/esm/assets/repeat.png +0 -0
  32. package/dist/esm/common/utils/express.d.ts +1 -0
  33. package/dist/esm/common/utils/express.js +7 -1
  34. package/dist/esm/common/utils/tools.d.ts +5 -1
  35. package/dist/esm/common/utils/tools.js +431 -181
  36. package/dist/esm/model/customizeWorkOrder/index.d.ts +2 -2
  37. package/dist/esm/model/customizeWorkOrder/index.js +18 -5
  38. package/dist/esm/model/customizeWorkOrder/selector.d.ts +24 -0
  39. package/dist/esm/model/customizeWorkOrder/selector.js +6 -0
  40. package/dist/esm/model/customizeWorkOrder/types.d.ts +11 -0
  41. package/dist/esm/model/paymentWorkOrder/index.d.ts +1 -1
  42. package/dist/esm/model/paymentWorkOrder/index.js +16 -3
  43. package/dist/esm/model/paymentWorkOrder/selector.d.ts +31 -0
  44. package/dist/esm/model/paymentWorkOrder/selector.js +6 -0
  45. package/dist/esm/model/paymentWorkOrder/types.d.ts +2 -0
  46. package/dist/esm/model/servers/api.d.ts +2 -0
  47. package/dist/esm/model/servers/api.js +16 -0
  48. package/dist/esm/model/workOrder.js +5 -4
  49. package/package.json +2 -2
@@ -297,7 +297,8 @@ var FormRender = function FormRender(props, ref) {
297
297
  };
298
298
  }
299
299
 
300
- console.debug('增加数据参数', _params);
300
+ console.debug('增加数据参数', _params); // return;
301
+
301
302
  _context.next = 33;
302
303
  return addWorkOrder(_params);
303
304
 
@@ -432,14 +433,14 @@ var FormRender = function FormRender(props, ref) {
432
433
 
433
434
 
434
435
  var orderBackReplace = function orderBackReplace(value, templateDetail) {
435
- var tradeId = value.tradeId,
436
- buyer = value.buyer,
436
+ var orderNo = value.orderNo,
437
+ buyerNick = value.buyerNick,
437
438
  receiveMobile = value.receiveMobile,
438
439
  alipayAccount = value.alipayAccount,
439
440
  expressLogisticsCode = value.expressLogisticsCode;
440
441
  queryReplaceCount({
441
- tradeId: tradeId,
442
- buyerNick: buyer === null || buyer === void 0 ? void 0 : buyer.buyerNick,
442
+ tradeId: orderNo,
443
+ buyerNick: buyerNick,
443
444
  receiveMobile: receiveMobile,
444
445
  alipayAccount: alipayAccount,
445
446
  expressLogisticsCode: expressLogisticsCode
@@ -650,13 +651,47 @@ var FormRender = function FormRender(props, ref) {
650
651
  setShopId(val); // 清空表单字段
651
652
 
652
653
  var needClearFormFields = get(templateDetail, 'componentDtoList', []).reduce(function (cur, nxt) {
653
- if (['ITEM_SELECT_THIRD', 'STATUS', 'ITEM_SELECT', 'ITEM_ID', 'ITEM_ENCODE'].includes(nxt === null || nxt === void 0 ? void 0 : nxt.workOrderComponentType)) {
654
+ 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)) {
654
655
  cur.push(nxt === null || nxt === void 0 ? void 0 : nxt.uniqueKey);
655
656
  }
656
657
 
657
658
  return cur;
658
659
  }, []);
659
- form.resetFields(needClearFormFields); //切换店铺时,判断是否有订单号 有订单号自动订单返填
660
+ form.resetFields(needClearFormFields); //如果有聚水潭组件 设置成初始值
661
+
662
+ var hasJst = get(templateDetail, 'componentDtoList', []).some(function (item) {
663
+ return ['JST_LOGISTICS', 'JST_SUPPLY', 'JST_SEND_GOOD'].includes(item.workOrderComponentType);
664
+ });
665
+
666
+ if (hasJst) {
667
+ var jstValue = get(templateDetail, 'componentDtoList', []).reduce(function (prv, next) {
668
+ switch (next.workOrderComponentType) {
669
+ case 'JST_LOGISTICS':
670
+ prv[next.uniqueKey] = [{
671
+ logisticsCompany: null,
672
+ logisticsCode: null
673
+ }];
674
+ break;
675
+
676
+ case 'JST_SUPPLY':
677
+ prv[next.uniqueKey] = [{
678
+ supplyId: null
679
+ }];
680
+ break;
681
+
682
+ case 'JST_SEND_GOOD':
683
+ prv[next.uniqueKey] = [{
684
+ sendName: '',
685
+ sendId: ''
686
+ }];
687
+ break;
688
+ }
689
+
690
+ return prv;
691
+ }, {});
692
+ form.setFieldsValue(jstValue);
693
+ } //切换店铺时,判断是否有订单号 有订单号自动订单返填
694
+
660
695
 
661
696
  var allValue = form.getFieldsValue();
662
697
  var tradeIdUniqueKey = templateDetail === null || templateDetail === void 0 ? void 0 : (_templateDetail$compo3 = templateDetail.componentDtoList.find(function (item) {
@@ -134,7 +134,7 @@
134
134
  .tipBox {
135
135
  position: sticky;
136
136
  top: -24px;
137
- z-index: 1;
137
+ z-index: 10;
138
138
  color: #e99d42;
139
139
  background-color: #fff;
140
140
  }
@@ -108,7 +108,7 @@
108
108
  margin: 6px 0;
109
109
 
110
110
  .itemViewLeft {
111
- min-width: 48px;
111
+ max-width: 58px;
112
112
  margin-right: 8px;
113
113
  color: rgba(0, 0, 0, 0.4);
114
114
  font-weight: normal;
@@ -463,14 +463,14 @@ var CustomizeFormModal = function CustomizeFormModal(props) {
463
463
 
464
464
 
465
465
  var orderBackReplace = function orderBackReplace(value) {
466
- var tradeId = value.tradeId,
467
- buyer = value.buyer,
466
+ var orderNo = value.orderNo,
467
+ buyerNick = value.buyerNick,
468
468
  receiveMobile = value.receiveMobile,
469
469
  alipayAccount = value.alipayAccount,
470
470
  expressLogisticsCode = value.expressLogisticsCode;
471
471
  queryReplaceCount({
472
- tradeId: tradeId,
473
- buyerNick: buyer === null || buyer === void 0 ? void 0 : buyer.buyerNick,
472
+ tradeId: orderNo,
473
+ buyerNick: buyerNick,
474
474
  receiveMobile: receiveMobile,
475
475
  alipayAccount: alipayAccount,
476
476
  expressLogisticsCode: expressLogisticsCode
@@ -128,7 +128,7 @@
128
128
  .tipBox {
129
129
  position: sticky;
130
130
  top: -24px;
131
- z-index: 1;
131
+ z-index: 10;
132
132
  color: #e99d42;
133
133
  background-color: #fff;
134
134
  }
@@ -27,14 +27,50 @@ import React from 'react';
27
27
  import { Divider } from 'antd';
28
28
  import moment from 'moment';
29
29
  import { get } from 'lodash';
30
+ import { useDispatch } from 'react-redux';
30
31
  import { useAppDispatch, useAppSelector } from "../../../../../model/hooks";
31
32
  import { factory } from "../../../Widget";
32
33
  import { calcWorkOrderList, isNull } from "../../../../../common/utils/tools";
33
34
  import { WORK_ORDER_STATUS, WAITING, HANDLING, STOPPING } from "../../../../../common/constant";
34
- import { setStatusSelectModalVisible, setLogModalVisible, setFormModalVisible, setTemplateId, setCustomizeFormShopId, setCurrentCustomizeRecord } from "../../../../../model/customizeWorkOrder";
35
+ import { setStatusSelectModalVisible, setLogModalVisible, setFormModalVisible, setTemplateId, setCustomizeFormShopId, setCurrentCustomizeRecord, setRepeatModalVisible, setRepeatWorkOrderConditions } from "../../../../../model/customizeWorkOrder";
36
+ import repeatPng from "../../../../../assets/repeat.png";
35
37
  import { selectorAllTemplateList } from "../../../../../model/customizeWorkOrder/selector";
36
38
  import "./index.less";
37
39
 
40
+ var WorkOrderId = function WorkOrderId(props) {
41
+ var _props$repeatValueLis;
42
+
43
+ var dispatch = useDispatch();
44
+
45
+ var handleOpenRepeatModal = function handleOpenRepeatModal(conditions) {
46
+ dispatch(setRepeatModalVisible(true));
47
+ dispatch(setRepeatWorkOrderConditions(conditions));
48
+ };
49
+
50
+ return /*#__PURE__*/React.createElement("div", {
51
+ className: "orderItemView"
52
+ }, /*#__PURE__*/React.createElement("span", {
53
+ className: "itemViewLeft"
54
+ }, props.label), /*#__PURE__*/React.createElement("span", {
55
+ className: "itemViewRight"
56
+ }, ((_props$repeatValueLis = props.repeatValueList) === null || _props$repeatValueLis === void 0 ? void 0 : _props$repeatValueLis.length) > 0 && /*#__PURE__*/React.createElement("img", {
57
+ src: repeatPng,
58
+ style: {
59
+ width: '16px'
60
+ },
61
+ alt: "",
62
+ onClick: function onClick() {
63
+ var _props$record, _props$record2;
64
+
65
+ return handleOpenRepeatModal({
66
+ templateId: (_props$record = props.record) === null || _props$record === void 0 ? void 0 : _props$record.templateId,
67
+ workOrderUniqueKey: (_props$record2 = props.record) === null || _props$record2 === void 0 ? void 0 : _props$record2.id,
68
+ fieldList: props.repeatValueList
69
+ });
70
+ }
71
+ }), props.value));
72
+ };
73
+
38
74
  function CustomizeWorkOrderCard(props) {
39
75
  var _item$handlerList, _item$handlerList$map;
40
76
 
@@ -186,10 +222,11 @@ function CustomizeWorkOrderCard(props) {
186
222
  return i.account;
187
223
  })) === null || _item$handlerList$map === void 0 ? void 0 : _item$handlerList$map.join('、'),
188
224
  key: "handleList"
189
- }), /*#__PURE__*/React.createElement(ItemView, {
225
+ }), /*#__PURE__*/React.createElement(WorkOrderId, {
190
226
  label: "\u5DE5\u5355\u7F16\u53F7",
191
227
  value: transData.id,
192
- key: "id"
228
+ record: item,
229
+ repeatValueList: transData.repeatValueList
193
230
  }), /*#__PURE__*/React.createElement(Divider, {
194
231
  dashed: true,
195
232
  style: {
@@ -108,7 +108,7 @@
108
108
  margin: 6px 0;
109
109
 
110
110
  .itemViewLeft {
111
- min-width: 48px;
111
+ max-width: 58px;
112
112
  margin-right: 8px;
113
113
  color: rgba(0, 0, 0, 0.4);
114
114
  font-weight: normal;
@@ -195,7 +195,7 @@ var RecordLog = function RecordLog(props) {
195
195
  }
196
196
  }, /*#__PURE__*/React.createElement("span", {
197
197
  style: {
198
- minWidth: '70px',
198
+ maxWidth: '66px',
199
199
  flexShrink: 1
200
200
  }
201
201
  }, child === null || child === void 0 ? void 0 : child.title, ":"), /*#__PURE__*/React.createElement("span", {
@@ -212,7 +212,7 @@ var RecordLog = function RecordLog(props) {
212
212
  }
213
213
  }, /*#__PURE__*/React.createElement("span", {
214
214
  style: {
215
- minWidth: '70px',
215
+ maxWidth: '66px',
216
216
  flexShrink: 1
217
217
  }
218
218
  }, item === null || item === void 0 ? void 0 : item.name, ":"), /*#__PURE__*/React.createElement("span", {
@@ -0,0 +1,4 @@
1
+ /// <reference types="react" />
2
+ import './index.less';
3
+ declare const RepeatWorkOrderListModal: () => JSX.Element;
4
+ export default RepeatWorkOrderListModal;
@@ -0,0 +1,168 @@
1
+ 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); }
2
+
3
+ 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; }
4
+
5
+ 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); } }
6
+
7
+ 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); }); }; }
8
+
9
+ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
10
+
11
+ 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."); }
12
+
13
+ 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); }
14
+
15
+ 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; }
16
+
17
+ 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; }
18
+
19
+ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
20
+
21
+ import React, { useEffect, useState } from 'react';
22
+ import { Modal, message, Button, Spin } from 'antd';
23
+ import { useDispatch, useSelector } from 'react-redux';
24
+ import isEmpty from 'lodash/isEmpty';
25
+ import copy from 'copy-to-clipboard';
26
+ import { getRepeatWorkOrderList } from "../../../../../model/servers/api";
27
+ import { setRepeatModalVisible, setRepeatWorkOrderConditions } from "../../../../../model/customizeWorkOrder/index";
28
+ import { selectRepeatVisible, selectRepeatWorkOrderConditions } from "../../../../../model/customizeWorkOrder/selector";
29
+ import "./index.less";
30
+
31
+ var RepeatWorkOrder = function RepeatWorkOrder(_ref) {
32
+ var title = _ref.title,
33
+ repeatWorkOrderList = _ref.repeatWorkOrderList;
34
+
35
+ var copyHandle = function copyHandle(text) {
36
+ copy(text);
37
+ message.success('复制成功');
38
+ };
39
+
40
+ return /*#__PURE__*/React.createElement("section", {
41
+ className: "item-wrap"
42
+ }, /*#__PURE__*/React.createElement("div", {
43
+ className: "item-main-item"
44
+ }, title), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("ol", {
45
+ className: "customize-repeat-workOrder"
46
+ }, repeatWorkOrderList === null || repeatWorkOrderList === void 0 ? void 0 : repeatWorkOrderList.map(function (item) {
47
+ return /*#__PURE__*/React.createElement("li", null, /*#__PURE__*/React.createElement("span", {
48
+ className: "workOrderId"
49
+ }, item), /*#__PURE__*/React.createElement(Button, {
50
+ type: "link",
51
+ onClick: function onClick() {
52
+ return copyHandle(item);
53
+ }
54
+ }, "\u590D\u5236"));
55
+ }))));
56
+ };
57
+
58
+ var RepeatWorkOrderListModal = function RepeatWorkOrderListModal() {
59
+ var _useState = useState(false),
60
+ _useState2 = _slicedToArray(_useState, 2),
61
+ loading = _useState2[0],
62
+ setLoading = _useState2[1];
63
+
64
+ var _useState3 = useState([]),
65
+ _useState4 = _slicedToArray(_useState3, 2),
66
+ repeatWorkOrderList = _useState4[0],
67
+ setRepeatWorkOrderList = _useState4[1];
68
+
69
+ var dispatch = useDispatch();
70
+ var visible = useSelector(selectRepeatVisible);
71
+ var repeatWorkOrderConditions = useSelector(selectRepeatWorkOrderConditions);
72
+
73
+ var getWorkOrderList = /*#__PURE__*/function () {
74
+ var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(conditions) {
75
+ var _yield$getRepeatWorkO, data;
76
+
77
+ return _regeneratorRuntime().wrap(function _callee$(_context) {
78
+ while (1) {
79
+ switch (_context.prev = _context.next) {
80
+ case 0:
81
+ _context.prev = 0;
82
+ setLoading(true);
83
+ _context.next = 4;
84
+ return getRepeatWorkOrderList(conditions);
85
+
86
+ case 4:
87
+ _yield$getRepeatWorkO = _context.sent;
88
+ data = _yield$getRepeatWorkO.data;
89
+ setRepeatWorkOrderList(data);
90
+
91
+ case 7:
92
+ _context.prev = 7;
93
+ setLoading(false);
94
+ return _context.finish(7);
95
+
96
+ case 10:
97
+ case "end":
98
+ return _context.stop();
99
+ }
100
+ }
101
+ }, _callee, null, [[0,, 7, 10]]);
102
+ }));
103
+
104
+ return function getWorkOrderList(_x) {
105
+ return _ref2.apply(this, arguments);
106
+ };
107
+ }();
108
+
109
+ useEffect(function () {
110
+ if (visible && !isEmpty(repeatWorkOrderConditions)) {
111
+ getWorkOrderList(repeatWorkOrderConditions);
112
+ } else {
113
+ setRepeatWorkOrderList([]);
114
+ }
115
+ }, [visible, repeatWorkOrderConditions]);
116
+
117
+ var handleCancel = function handleCancel() {
118
+ dispatch(setRepeatModalVisible(false));
119
+ dispatch(setRepeatWorkOrderConditions({}));
120
+ };
121
+
122
+ var copyHandle = function copyHandle(text) {
123
+ copy(text);
124
+ message.success('复制成功');
125
+ };
126
+
127
+ return /*#__PURE__*/React.createElement(Modal, {
128
+ title: "\u91CD\u590D\u63D0\u4EA4\u5DE5\u5355\u7F16\u53F7",
129
+ visible: visible,
130
+ onCancel: handleCancel,
131
+ footer: null,
132
+ bodyStyle: {
133
+ maxHeight: '300px',
134
+ overflowY: 'auto'
135
+ }
136
+ }, /*#__PURE__*/React.createElement(Spin, {
137
+ spinning: loading
138
+ }, /*#__PURE__*/React.createElement("div", {
139
+ style: {
140
+ background: '#f0f0f0'
141
+ }
142
+ }, repeatWorkOrderList === null || repeatWorkOrderList === void 0 ? void 0 : repeatWorkOrderList.map(function (item) {
143
+ var _item$repeatField, _item$repeatField2, _item$repeatField3;
144
+
145
+ if (item !== null && item !== void 0 && (_item$repeatField = item.repeatField) !== null && _item$repeatField !== void 0 && _item$repeatField.endsWith('_tradeId')) {
146
+ return /*#__PURE__*/React.createElement(RepeatWorkOrder, {
147
+ title: "\u8BA2\u5355\u91CD\u590D",
148
+ repeatWorkOrderList: item.workOrderIds
149
+ });
150
+ }
151
+
152
+ if (item !== null && item !== void 0 && (_item$repeatField2 = item.repeatField) !== null && _item$repeatField2 !== void 0 && _item$repeatField2.endsWith('_buyerNick')) {
153
+ return /*#__PURE__*/React.createElement(RepeatWorkOrder, {
154
+ title: "\u4E70\u5BB6\u6635\u79F0\u91CD\u590D",
155
+ repeatWorkOrderList: item.workOrderIds
156
+ });
157
+ }
158
+
159
+ if (item !== null && item !== void 0 && (_item$repeatField3 = item.repeatField) !== null && _item$repeatField3 !== void 0 && _item$repeatField3.endsWith('_expressLogisticsCode')) {
160
+ return /*#__PURE__*/React.createElement(RepeatWorkOrder, {
161
+ title: "\u7269\u6D41\u5355\u53F7\u91CD\u590D",
162
+ repeatWorkOrderList: item.workOrderIds
163
+ });
164
+ }
165
+ }))));
166
+ };
167
+
168
+ export default RepeatWorkOrderListModal;
@@ -0,0 +1,30 @@
1
+ .item-wrap {
2
+ display: flex;
3
+ flex-direction: row;
4
+ margin-bottom: 4px;
5
+ background: #fff;
6
+ .item-main-item {
7
+ flex-basis: 100px;
8
+ font-weight: 600;
9
+ font-size: 14px;
10
+ line-height: 32px;
11
+ }
12
+ }
13
+ .customize-repeat-workOrder {
14
+ padding-left: 16px;
15
+ li {
16
+ margin-bottom: 4px;
17
+ list-style: decimal;
18
+ .workOrderId {
19
+ display: inline-flex;
20
+ width: 260px;
21
+ margin-right: 16px;
22
+ overflow: hidden;
23
+ white-space: nowrap;
24
+ text-overflow: ellipsis;
25
+ }
26
+ .text-repeat {
27
+ cursor: pointer;
28
+ }
29
+ }
30
+ }
@@ -32,6 +32,7 @@ import CustomizeWorkOrderCard from "./components/CustomizeWorkOrderCard";
32
32
  import DeleteCustomizeOrderModal from "./components/DeleteCustomizeOrderModal";
33
33
  import DealerSelectModal from "./components/DealerSelectModal";
34
34
  import StatusSelectModal from "./components/StatusSelectModal";
35
+ import RepeatWorkOrderListModal from "./components/RepeatWorkOrderListModal";
35
36
  import RecordLog from "./components/RecordLog";
36
37
  import emptyImg from "../../../common/imgs/empty.png";
37
38
  import { PlatForm } from "../../types";
@@ -119,7 +120,8 @@ var getTableData = function getTableData(_ref) {
119
120
 
120
121
  return queryAllWorkOrderList(URL_MAPPING[type], _objectSpread(_objectSpread({}, params), {}, {
121
122
  pageSize: pageSize,
122
- pageNo: current
123
+ pageNo: current,
124
+ needReturnRepeatValue: true
123
125
  })).then(function (res) {
124
126
  var _res$data, _res$data2;
125
127
 
@@ -363,6 +365,7 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
363
365
  }), /*#__PURE__*/React.createElement("p", null, "\u6682\u65E0\u6570\u636E")))), (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) > 0 && /*#__PURE__*/React.createElement("div", {
364
366
  className: "custom_box_page"
365
367
  }, /*#__PURE__*/React.createElement(Pagination, _extends({
368
+ size: "small",
366
369
  onChange: function onChange(page, pageSize) {
367
370
  return _onChange({
368
371
  current: page,
@@ -370,7 +373,10 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
370
373
  });
371
374
  }
372
375
  }, pagination, {
373
- total: total
376
+ total: total,
377
+ showTotal: function showTotal(total) {
378
+ return "\u5171".concat(total, "\u6761");
379
+ }
374
380
  }))), /*#__PURE__*/React.createElement(DeleteCustomizeOrderModal, {
375
381
  submit: submit
376
382
  }), /*#__PURE__*/React.createElement(DealerSelectModal, {
@@ -379,7 +385,7 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
379
385
  onSuccess: submit
380
386
  }), /*#__PURE__*/React.createElement(RecordLog, {
381
387
  width: platform === PlatForm.XIAOZHI ? '100%' : '90%'
382
- }), /*#__PURE__*/React.createElement(Drawer, {
388
+ }), /*#__PURE__*/React.createElement(RepeatWorkOrderListModal, null), /*#__PURE__*/React.createElement(Drawer, {
383
389
  closeIcon: /*#__PURE__*/React.createElement(LeftOutlined, null),
384
390
  title: (record === null || record === void 0 ? void 0 : record.templateName) || title,
385
391
  width: platform === PlatForm.XIAOZHI ? '100%' : '90%',
@@ -11,8 +11,10 @@ import { Divider, Modal, Button, message } from 'antd';
11
11
  import moment from 'moment';
12
12
  import copy from 'copy-to-clipboard';
13
13
  import { useAppSelector, useAppDispatch } from "../../../../../model/hooks";
14
- import { setPaymentWorkOrderExamineModalVisible, setCurrentPaymentRecord, setPaymentWorkOrderUnExamineModalVisible, setDeletePaymentWorkOrderVisible, setFlagPayModalVisible, setLogModalVisible, setPaymentFormModalVisible } from "../../../../../model/paymentWorkOrder";
14
+ import { useDispatch } from 'react-redux';
15
+ import { setPaymentWorkOrderExamineModalVisible, setCurrentPaymentRecord, setPaymentWorkOrderUnExamineModalVisible, setDeletePaymentWorkOrderVisible, setFlagPayModalVisible, setLogModalVisible, setPaymentFormModalVisible, setRepeatModalVisible, setRepeatWorkOrderList } from "../../../../../model/paymentWorkOrder";
15
16
  import { getAlipayBillReceipt } from "../../../../../model/servers/api";
17
+ import repeatPng from "../../../../../assets/repeat.png";
16
18
  import "./index.less";
17
19
  var workPayStatusFuncMap = {
18
20
  WAITING_EXAMINE: ['examine', 'edit', 'deleteHandle', 'recordHandle'],
@@ -70,6 +72,34 @@ var PAY_STATUS_ICON = {
70
72
  EXAMINED: '#43BF0A'
71
73
  };
72
74
 
75
+ var WorkOrderId = function WorkOrderId(props) {
76
+ var _props$tidRepeatPayme;
77
+
78
+ var dispatch = useDispatch();
79
+
80
+ var handleOpenRepeatModal = function handleOpenRepeatModal(list) {
81
+ dispatch(setRepeatModalVisible(true));
82
+ dispatch(setRepeatWorkOrderList(list));
83
+ };
84
+
85
+ return /*#__PURE__*/React.createElement("div", {
86
+ className: "orderItemView"
87
+ }, /*#__PURE__*/React.createElement("span", {
88
+ className: "itemViewLeft"
89
+ }, props.label), /*#__PURE__*/React.createElement("span", {
90
+ className: "itemViewRight"
91
+ }, ((_props$tidRepeatPayme = props.tidRepeatPaymentUks) === null || _props$tidRepeatPayme === void 0 ? void 0 : _props$tidRepeatPayme.length) > 1 && /*#__PURE__*/React.createElement("img", {
92
+ src: repeatPng,
93
+ style: {
94
+ width: '16px'
95
+ },
96
+ alt: "",
97
+ onClick: function onClick() {
98
+ return handleOpenRepeatModal(props.tidRepeatPaymentUks);
99
+ }
100
+ }), props.value));
101
+ };
102
+
73
103
  function PaymentWorkOrderCard(props) {
74
104
  var _props$record = props.record,
75
105
  record = _props$record === void 0 ? {} : _props$record;
@@ -82,12 +112,14 @@ function PaymentWorkOrderCard(props) {
82
112
  operateTime = record.operateTime,
83
113
  operateNick = record.operateNick,
84
114
  paymentOrderKey = record.paymentOrderKey,
115
+ workOrderId = record.workOrderId,
85
116
  workPayFee = record.workPayFee,
86
117
  shopName = record.shopName,
87
118
  buyerNick = record.buyerNick,
88
119
  tid = record.tid,
89
120
  accountNickMix = record.accountNickMix,
90
121
  accountNoMix = record.accountNoMix,
122
+ tidRepeatPaymentUks = record.tidRepeatPaymentUks,
91
123
  remitTime = record.remitTime;
92
124
  var btnList = workPayStatusFuncMap[workPayStatus].map(function (id) {
93
125
  return /*#__PURE__*/React.createElement("div", {
@@ -297,10 +329,11 @@ function PaymentWorkOrderCard(props) {
297
329
  }, {
298
330
  label: '支付宝账号:',
299
331
  value: accountNoMix
300
- }, {
301
- label: '工单编号:',
302
- value: paymentOrderKey
303
- }])), /*#__PURE__*/React.createElement(Divider, {
332
+ }]), /*#__PURE__*/React.createElement(WorkOrderId, {
333
+ label: "\u5DE5\u5355\u7F16\u53F7\uFF1A",
334
+ value: workOrderId || paymentOrderKey,
335
+ tidRepeatPaymentUks: tidRepeatPaymentUks
336
+ })), /*#__PURE__*/React.createElement(Divider, {
304
337
  dashed: true,
305
338
  style: {
306
339
  margin: '12px 0'
@@ -116,9 +116,14 @@
116
116
  }
117
117
 
118
118
  .itemViewRight {
119
+ display: flex;
119
120
  flex-grow: 1;
121
+ align-items: center;
120
122
  min-width: 0;
121
123
  color: rgba(0, 0, 0, 0.85);
122
124
  word-break: break-all;
125
+ img {
126
+ margin-right: 8px;
127
+ }
123
128
  }
124
129
  }
@@ -0,0 +1,4 @@
1
+ /// <reference types="react" />
2
+ import './index.less';
3
+ declare const RepeatWorkOrderListModal: () => JSX.Element;
4
+ export default RepeatWorkOrderListModal;
@@ -0,0 +1,49 @@
1
+ import React from 'react';
2
+ import { Modal, message, Button } from 'antd';
3
+ import { useDispatch, useSelector } from 'react-redux';
4
+ import copy from 'copy-to-clipboard';
5
+ import { setRepeatModalVisible, setRepeatWorkOrderList } from "../../../../../model/paymentWorkOrder/index";
6
+ import { selectRepeatVisible, selectRepeatWorkOrderList } from "../../../../../model/paymentWorkOrder/selector";
7
+ import "./index.less";
8
+
9
+ var RepeatWorkOrderListModal = function RepeatWorkOrderListModal() {
10
+ var dispatch = useDispatch();
11
+ var visible = useSelector(selectRepeatVisible);
12
+ var repeatWorkOrderList = useSelector(selectRepeatWorkOrderList);
13
+
14
+ var handleCancel = function handleCancel() {
15
+ dispatch(setRepeatModalVisible(false));
16
+ dispatch(setRepeatWorkOrderList([]));
17
+ };
18
+
19
+ var copyHandle = function copyHandle(text) {
20
+ copy(text);
21
+ message.success('复制成功');
22
+ };
23
+
24
+ return /*#__PURE__*/React.createElement(Modal, {
25
+ title: "\u91CD\u590D\u63D0\u4EA4\u5DE5\u5355\u7F16\u53F7",
26
+ visible: visible,
27
+ onCancel: handleCancel,
28
+ footer: null,
29
+ bodyStyle: {
30
+ maxHeight: '500px',
31
+ overflowY: 'auto'
32
+ }
33
+ }, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
34
+ className: "repeat-trade-id"
35
+ }, "\u8BA2\u5355\u53F7\u91CD\u590D"), /*#__PURE__*/React.createElement("ol", {
36
+ className: "repeat-workOrder"
37
+ }, repeatWorkOrderList === null || repeatWorkOrderList === void 0 ? void 0 : repeatWorkOrderList.map(function (item) {
38
+ return /*#__PURE__*/React.createElement("li", null, /*#__PURE__*/React.createElement("span", {
39
+ className: "workOrderId"
40
+ }, item), /*#__PURE__*/React.createElement(Button, {
41
+ type: "link",
42
+ onClick: function onClick() {
43
+ return copyHandle(item);
44
+ }
45
+ }, "\u590D\u5236"));
46
+ }))));
47
+ };
48
+
49
+ export default RepeatWorkOrderListModal;