kmkf-work-order-service-component 0.1.12-alpha.1 → 0.1.13

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

@@ -60,5 +60,5 @@ export interface WorkOrderDetail {
 }
 export declare const formatPictures: (pictures: any) => any;
 export declare const calcWorkOrderList: (source: Partial<WorkOrderDetail>[], templateColumns: TemplateColumnConfig[], type?: string) => any[];
-export declare const orderBack: ({ order_no, form, shopId, shopList, templateDetail }: any) => Promise<void>;
+export declare const orderBack: ({ order_no, form, shopId, shopList, templateDetail, type, }: any) => Promise<void>;
 export declare const imgResize: (url: string, w?: number, h?: number) => string;

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

@@ -1,5 +1,17 @@
 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 _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; }
+
 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); }); }; }
@@ -14,7 +26,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 
 import { get, isEmpty, find, keys, every } from 'lodash';
 import V from 'voca';
-import { orderDetail } from "../../model/servers/api";
+import { orderDetail, getThirdOpenUidByOrderNo } from "../../model/servers/api";
 import moment from 'moment';
 import express from "./express";
 import cache from "../cache";
@@ -619,39 +631,47 @@ export var orderBack = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
     var _shopList$find;
 
-    var order_no, form, shopId, shopList, templateDetail, shopSourceStr, _yield$orderDetail, data, orderNo, provinceCode, cityCode, townCode, orderCreateDateTime, orderPaymentDateTime, orderDeliveryDateTime, orderClosingDateTime, itemList, transField, finalResponse, formValue, detail, componentsParams, detailsValue;
+    var order_no, form, shopId, shopList, templateDetail, _ref$type, type, shopSourceStr, _shopList$find2, _data$value, _buyer$value, taobaoId, promise, _yield$Promise$allSet, _yield$Promise$allSet2, data, buyer, orderInfo, buyerInfo, _ref3, orderNo, provinceCode, cityCode, townCode, orderCreateDateTime, orderPaymentDateTime, orderDeliveryDateTime, orderClosingDateTime, itemList, transField, finalResponse, formValue, detail, componentsParams, detailsValue, _templateDetail$compo, paymentUniqueKey;
 
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            order_no = _ref.order_no, form = _ref.form, shopId = _ref.shopId, shopList = _ref.shopList, templateDetail = _ref.templateDetail;
-            console.log(order_no, form, shopId, shopList, templateDetail);
+            order_no = _ref.order_no, form = _ref.form, shopId = _ref.shopId, shopList = _ref.shopList, templateDetail = _ref.templateDetail, _ref$type = _ref.type, type = _ref$type === void 0 ? 'add' : _ref$type;
             shopSourceStr = (_shopList$find = shopList.find(function (item) {
               return item.shopId == shopId;
             })) === null || _shopList$find === void 0 ? void 0 : _shopList$find.shopSourceStr;
-            _context.next = 5;
-            return orderDetail({
+            _context.prev = 2;
+            taobaoId = (_shopList$find2 = shopList.find(function (item) {
+              return item.shopSourceStr === 'TAOBAO' && item.shopId == shopId;
+            })) === null || _shopList$find2 === void 0 ? void 0 : _shopList$find2.taobaoId;
+            promise = [orderDetail({
               shopId: shopId,
               //店铺id
               orderNo: order_no //订单id
 
-            });
-
-          case 5:
-            _yield$orderDetail = _context.sent;
-            data = _yield$orderDetail.data;
-
-            if (data) {
-              _context.next = 9;
-              break;
-            }
-
-            return _context.abrupt("return");
-
-          case 9:
-            orderNo = data.orderNo, provinceCode = data.provinceCode, cityCode = data.cityCode, townCode = data.townCode, orderCreateDateTime = data.orderCreateDateTime, orderPaymentDateTime = data.orderPaymentDateTime, orderDeliveryDateTime = data.orderDeliveryDateTime, orderClosingDateTime = data.orderClosingDateTime, itemList = data.itemList;
-            transField = {
+            })];
+            taobaoId ? promise.push(getThirdOpenUidByOrderNo({
+              orderNo: order_no,
+              toAppKey: '21819818',
+              platform: 'tb',
+              taobaoId: taobaoId
+            })) : promise.push(new Promise(function (resolve) {
+              resolve({});
+            }));
+            _context.next = 8;
+            return Promise.allSettled(promise);
+
+          case 8:
+            _yield$Promise$allSet = _context.sent;
+            _yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet, 2);
+            data = _yield$Promise$allSet2[0];
+            buyer = _yield$Promise$allSet2[1];
+            // console.log(data, buyer);
+            orderInfo = data === null || data === void 0 ? void 0 : (_data$value = data.value) === null || _data$value === void 0 ? void 0 : _data$value.data;
+            buyerInfo = buyer === null || buyer === void 0 ? void 0 : (_buyer$value = buyer.value) === null || _buyer$value === void 0 ? void 0 : _buyer$value.data;
+            _ref3 = orderInfo || {}, orderNo = _ref3.orderNo, provinceCode = _ref3.provinceCode, cityCode = _ref3.cityCode, townCode = _ref3.townCode, orderCreateDateTime = _ref3.orderCreateDateTime, orderPaymentDateTime = _ref3.orderPaymentDateTime, orderDeliveryDateTime = _ref3.orderDeliveryDateTime, orderClosingDateTime = _ref3.orderClosingDateTime, itemList = _ref3.itemList;
+            transField = orderInfo ? {
               tradeId: orderNo,
               province: provinceCode,
               city: cityCode,
@@ -662,8 +682,20 @@ export var orderBack = /*#__PURE__*/function () {
               tradeClosingDateTime: orderClosingDateTime,
               goodId: itemList,
               goodSerial: itemList
-            };
-            finalResponse = _objectSpread(_objectSpread({}, data), transField); //获取当前表单字段
+            } : {};
+            finalResponse = {};
+
+            if (orderInfo) {
+              finalResponse = _objectSpread(_objectSpread({}, orderInfo || {}), transField);
+            }
+
+            if (buyerInfo) {
+              finalResponse = _objectSpread(_objectSpread({}, finalResponse), {}, {
+                buyer: buyerInfo || {},
+                payBuyer: buyerInfo || {}
+              });
+            } //获取当前表单字段
+
 
             formValue = form.getFieldsValue();
             detail = finalResponse || {}; //抖音数据
@@ -675,6 +707,8 @@ export var orderBack = /*#__PURE__*/function () {
             componentsParams = getComponentsValue((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []); //获取详情映射表单字段
 
             detailsValue = Object.keys(componentsParams).reduce(function (prv, next) {
+              var _detail$buyer, _detail$buyer2;
+
               var key = componentsParams[next].key;
               var uniqueKey = componentsParams[next].uniqueKey;
 
@@ -721,6 +755,18 @@ export var orderBack = /*#__PURE__*/function () {
                     prv[uniqueKey] = detail['itemList'];
                     break;
 
+                  case 'payBuyer':
+                    if (type === 'edit') break;
+                    prv[uniqueKey] = {
+                      enterprisePaymentTid: '',
+                      enterprisePaymentRefundFee: '',
+                      enterprisePaymentBuyerNick: (_detail$buyer = detail['buyer']) === null || _detail$buyer === void 0 ? void 0 : _detail$buyer.buyerNick,
+                      enterprisePaymentBuyerOpenUid: (_detail$buyer2 = detail['buyer']) === null || _detail$buyer2 === void 0 ? void 0 : _detail$buyer2.buyerOpenUid,
+                      enterprisePaymentAlipayNick: '',
+                      enterprisePaymentAlipayNo: ''
+                    };
+                    break;
+
                   default:
                     prv["".concat(uniqueKey)] = detail[key];
                     break;
@@ -728,16 +774,35 @@ export var orderBack = /*#__PURE__*/function () {
               }
 
               return prv;
-            }, {}); // console.log('detailsValue++', formValue, detailsValue);
+            }, {}); //打款组件
+
+            if (type !== 'edit') {
+              paymentUniqueKey = templateDetail === null || templateDetail === void 0 ? void 0 : (_templateDetail$compo = templateDetail.componentDtoList.find(function (item) {
+                return item.workOrderComponentType === 'ENTERPRISE_PAYMENT';
+              })) === null || _templateDetail$compo === void 0 ? void 0 : _templateDetail$compo.uniqueKey;
+
+              if (paymentUniqueKey && orderInfo) {
+                detailsValue[paymentUniqueKey] = _objectSpread(_objectSpread(_objectSpread({}, formValue[paymentUniqueKey]), detailsValue[paymentUniqueKey]), {}, {
+                  enterprisePaymentTid: order_no
+                });
+              }
+            }
 
+            console.log('detailsValue++', formValue, detailsValue);
             form.setFieldsValue(_objectSpread(_objectSpread({}, formValue), detailsValue));
+            _context.next = 31;
+            break;
+
+          case 29:
+            _context.prev = 29;
+            _context.t0 = _context["catch"](2);
 
-          case 18:
+          case 31:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee);
+    }, _callee, null, [[2, 29]]);
   }));
 
   return function orderBack(_x) {

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

@@ -34,6 +34,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React, { useState, useImperativeHandle, forwardRef, useMemo, useCallback } from 'react';
 import { Drawer, Form, Spin, ConfigProvider, Button, message, Space } from 'antd';
+import { LeftOutlined } from '@ant-design/icons';
 import { get, find, some, set } from 'lodash';
 import zhCN from 'antd/es/locale/zh_CN';
 import moment from 'moment';
@@ -103,7 +104,7 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
 
   var asyncDoSave = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(workOrderDetail, templateDetail) {
-      var data, params, submitData, _yield$updateWorkOrde, success, result, _params, hasEnterPrisePayment, getEnterPrisePaymentData, uniqueKey, componentConfig, _yield$addWorkOrder, _success, _result;
+      var data, res, params, submitData, _yield$updateWorkOrde, success, result, _params, hasEnterPrisePayment, getEnterPrisePaymentData, uniqueKey, componentConfig, _yield$addWorkOrder, _success, _result;
 
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) {
@@ -118,9 +119,19 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
               data = _context.sent;
               console.debug('表单内容', data);
               console.debug('templateDetail内容', templateDetail);
+              res = verifyHandle(data, templateDetail);
 
+              if (res.success) {
+                _context.next = 11;
+                break;
+              }
+
+              message.error(res.message);
+              return _context.abrupt("return");
+
+            case 11:
               if (!workOrderId) {
-                _context.next = 19;
+                _context.next = 23;
                 break;
               }
 
@@ -140,10 +151,10 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
               params.workOrderUpdateKeyVos.workOrderUpdateKeySupVos = submitData.reduce(function (nex, cur) {
                 return nex.concat(cur === null || cur === void 0 ? void 0 : cur.contentVoList);
               }, []);
-              _context.next = 13;
+              _context.next = 17;
               return updateWorkOrder(params);
 
-            case 13:
+            case 17:
               _yield$updateWorkOrde = _context.sent;
               success = _yield$updateWorkOrde.success;
               result = _yield$updateWorkOrde.data;
@@ -159,10 +170,10 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
                 });
               }
 
-              _context.next = 31;
+              _context.next = 35;
               break;
 
-            case 19:
+            case 23:
               _params = {
                 apiName: 'addWorkOrder',
                 shopId: currentShopId,
@@ -198,10 +209,10 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
 
               console.debug('增加数据参数', _params); // return;
 
-              _context.next = 27;
+              _context.next = 31;
               return addWorkOrder(_params);
 
-            case 27:
+            case 31:
               _yield$addWorkOrder = _context.sent;
               _success = _yield$addWorkOrder.success;
               _result = _yield$addWorkOrder.data;
@@ -216,13 +227,13 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
                 });
               }
 
-            case 31:
+            case 35:
               console.groupEnd();
-              _context.next = 37;
+              _context.next = 41;
               break;
 
-            case 34:
-              _context.prev = 34;
+            case 38:
+              _context.prev = 38;
               _context.t0 = _context["catch"](0);
 
               // 表单校验失败错误时，将错误第一项滚动到可视区域
@@ -238,18 +249,41 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
                 }, 0);
               }
 
-            case 37:
+            case 41:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[0, 34]]);
+      }, _callee, null, [[0, 38]]);
     }));
 
     return function asyncDoSave(_x, _x2) {
       return _ref.apply(this, arguments);
     };
-  }();
+  }(); //表单额外校验
+
+
+  var verifyHandle = function verifyHandle(data, templateDetail) {
+    var _templateDetail$compo, _templateDetail$compo2, _data$paymentUniqueKe, _data$paymentUniqueKe2;
+
+    var res = {
+      success: true,
+      message: ''
+    };
+    var tradeIdUniqueKey = (_templateDetail$compo = templateDetail.componentDtoList.find(function (item) {
+      return item.workOrderComponentType === 'TRADE_ID_INPUT';
+    })) === null || _templateDetail$compo === void 0 ? void 0 : _templateDetail$compo.uniqueKey;
+    var paymentUniqueKey = (_templateDetail$compo2 = templateDetail.componentDtoList.find(function (item) {
+      return item.workOrderComponentType === 'ENTERPRISE_PAYMENT';
+    })) === null || _templateDetail$compo2 === void 0 ? void 0 : _templateDetail$compo2.uniqueKey;
+
+    if (tradeIdUniqueKey && paymentUniqueKey && data[tradeIdUniqueKey] && (_data$paymentUniqueKe = data[paymentUniqueKey]) !== null && _data$paymentUniqueKe !== void 0 && _data$paymentUniqueKe.enterprisePaymentTid && data[tradeIdUniqueKey] != ((_data$paymentUniqueKe2 = data[paymentUniqueKey]) === null || _data$paymentUniqueKe2 === void 0 ? void 0 : _data$paymentUniqueKe2.enterprisePaymentTid)) {
+      res.success = false;
+      res.message = '订单组件和打款组件的订单号必须一致';
+    }
+
+    return res;
+  };
 
   var handleSubmit = useCallback(function () {
     return asyncDoSave(workOrderDetail, templateDetail);
@@ -350,6 +384,7 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
                   }
 
                   if (next.workOrderComponentType === 'ENTERPRISE_PAYMENT') {
+                    prv["".concat(next.uniqueKey, "_enterprisePaymentTid")] = orderNo || '';
                     prv["".concat(next.uniqueKey, "_enterprisePaymentBuyerOpenUid")] = buyerId;
                     prv["".concat(next.uniqueKey, "_enterprisePaymentBuyerNick")] = buyerNick;
                   }
@@ -472,6 +507,7 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
   };
 
   return /*#__PURE__*/_jsx(Drawer, {
+    closeIcon: /*#__PURE__*/_jsx(LeftOutlined, {}),
     title: (templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.name) || '工单录入',
     width: width,
     open: visible,

package/dist/esm/WorkOrder/components/PayListOrderItem/ModifyModal.js

@@ -32,6 +32,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React, { useState, useImperativeHandle, forwardRef } from 'react';
 import { Drawer, Form, Spin, Input, Space, Button, message } from 'antd';
+import { LeftOutlined } from '@ant-design/icons';
 import { get } from 'lodash';
 import { decodeAlipayInfo, editRemitOrder, addPaymentOrder } from "../../model/servers/api";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -137,7 +138,7 @@ function ModifyModal(props, ref) {
                 if (success) {
                   message.success('保存成功');
                   form.resetFields();
-                  afterSuccessUpdateWorkOrder && afterSuccessUpdateWorkOrder(1); // 重新查询表格
+                  afterSuccessUpdateWorkOrder && afterSuccessUpdateWorkOrder(type); // 重新查询表格
 
                   setVisible(false);
                 }
@@ -216,7 +217,12 @@ function ModifyModal(props, ref) {
     };
   }();
 
+  var TidChangeHandle = function TidChangeHandle(e) {
+    console.log(e.target.value);
+  };
+
   return /*#__PURE__*/_jsx(Drawer, {
+    closeIcon: /*#__PURE__*/_jsx(LeftOutlined, {}),
     open: visible,
     width: width,
     onClose: function onClose() {
@@ -287,7 +293,9 @@ function ModifyModal(props, ref) {
             pattern: /^[0-9a-zA-Z_-]{1,}$/,
             message: '请输入正确的订单编号'
           }],
-          children: /*#__PURE__*/_jsx(Input, {})
+          children: /*#__PURE__*/_jsx(Input, {
+            onChange: TidChangeHandle
+          })
         }), /*#__PURE__*/_jsx(Form.Item, {
           label: "\u652F\u4ED8\u5B9D\u59D3\u540D",
           name: "accountNick",

package/dist/esm/WorkOrder/components/PayListOrderItem/RecordModal.js

@@ -22,11 +22,12 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  * @Description:
  * @Author: litian
  * @Date: 2022-09-09 16:58:00
- * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
- * @LastEditTime: 2022-11-04 14:28:42
+ * @LastEditors: litian
+ * @LastEditTime: 2022-11-07 16:10:03
  */
 import React, { useImperativeHandle, forwardRef, useState } from 'react';
 import { Drawer } from 'antd';
+import { LeftOutlined } from '@ant-design/icons';
 import moment from 'moment';
 import { reportLogs } from "../../model/servers/api";
 import styles from "./record.module.less";
@@ -106,6 +107,7 @@ function RecordModal(props, ref) {
 
   return /*#__PURE__*/_jsx(Drawer, {
     title: "\u8BB0\u5F55",
+    closeIcon: /*#__PURE__*/_jsx(LeftOutlined, {}),
     width: props === null || props === void 0 ? void 0 : props.width,
     open: visible,
     onClose: function onClose() {

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

@@ -35,14 +35,15 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React from 'react';
 import { useState, useImperativeHandle, forwardRef } from 'react';
 import { Drawer } from 'antd';
+import { LeftOutlined } from '@ant-design/icons';
 import moment from 'moment';
 import { get } from 'lodash';
 import { factory } from "../Widget";
 import { calcWorkOrderList, jsonParseSecurity } from "../../common/utils/tools";
 import { reportLogs } from "../../model/servers/api";
 import styles from "./index.module.less";
-import { jsxs as _jsxs } from "react/jsx-runtime";
 import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 var custom_word = {
   ADD: '添加',
   UPDATE: '更新',
@@ -120,6 +121,7 @@ var RecordLog = function RecordLog(props, ref) {
 
   return /*#__PURE__*/_jsx(Drawer, {
     open: visible,
+    closeIcon: /*#__PURE__*/_jsx(LeftOutlined, {}),
     width: props === null || props === void 0 ? void 0 : props.width,
     title: "\u64CD\u4F5C\u8BB0\u5F55",
     onClose: function onClose() {

package/dist/esm/WorkOrder/components/Widget/electricity/ETradeId/index.d.ts

@@ -8,10 +8,6 @@ declare class ETradeId extends Input {
     componentConfig: any;
     time: any;
     constructor(options: any);
-    searchHandle(val: {
-        buyerNick: any;
-        buyerOpenUid: any;
-    }): void;
     changeHandle(order_no: string): Promise<void>;
     editRender: (value: any) => JSX.Element;
 }

package/dist/esm/WorkOrder/components/Widget/electricity/ETradeId/index.js

@@ -37,7 +37,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * @Author: litian
  * @Date: 2022-06-30 17:30:05
  * @LastEditors: litian
- * @LastEditTime: 2022-10-12 10:40:23
+ * @LastEditTime: 2022-11-10 10:08:12
  */
 import React from 'react';
 import Input from "../../basic/Input";
@@ -82,9 +82,6 @@ var ETradeId = /*#__PURE__*/function (_Input) {
         required: (_this$componentConfig = _this.componentConfig) === null || _this$componentConfig === void 0 ? void 0 : _this$componentConfig.required,
         component: /*#__PURE__*/_jsx(TradeId, _objectSpread(_objectSpread({}, _this.componentConfig), {}, {
           placeholder: "\u8BF7\u8F93\u5165".concat(_this.name),
-          onSearch: function onSearch(val) {
-            return _this.searchHandle(val);
-          },
           onChange: function onChange(e) {
             return _this.changeHandle(e.target.value);
           }
@@ -102,30 +99,15 @@ var ETradeId = /*#__PURE__*/function (_Input) {
     });
     _this.time = null;
     return _this;
-  }
+  } //订单返填
 
-  _createClass(ETradeId, [{
-    key: "searchHandle",
-    value: function searchHandle(val) {
-      var form = this.effects.form;
-      var values = form.getFieldsValue();
-      Object.keys(values).forEach(function (k) {
-        if (Object.prototype.toString.call(values[k]) === '[object Object]') {
-          if (values[k].hasOwnProperty('buyerNick')) {
-            values[k] = _objectSpread(_objectSpread({}, values[k]), {}, {
-              buyerNick: val.buyerNick,
-              buyerOpenUid: val.buyerOpenUid
-            });
-          }
-        }
-      });
-      form.setFieldsValue(values);
-    } //订单返填
 
-  }, {
+  _createClass(ETradeId, [{
     key: "changeHandle",
     value: function () {
       var _changeHandle = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(order_no) {
+        var _this2 = this;
+
         var _this$effects, form, shopId, shopList, templateDetail;
 
         return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -152,7 +134,8 @@ var ETradeId = /*#__PURE__*/function (_Input) {
                     form: form,
                     shopId: shopId,
                     shopList: shopList,
-                    templateDetail: templateDetail
+                    templateDetail: templateDetail,
+                    type: _this2.effects.isEditing ? 'edit' : 'add'
                   });
                 }, 1000);
 

package/dist/esm/WorkOrder/components/Widget/third/Payment/index.d.ts

@@ -17,11 +17,9 @@ declare class Payment extends BasicComponent {
     paymentTid: PaymentTid;
     alipayNo: AlipayNo;
     payTime: PayTime;
+    time: number | null | undefined;
     constructor(options: any);
-    searchHandle(val: {
-        buyerNick: any;
-        buyerOpenUid: any;
-    }): void;
+    changeHandle(order_no: string): Promise<void>;
     customRules: (config: {
         required: any;
         zhiFubaoRequired: any;

package/dist/esm/WorkOrder/components/Widget/third/Payment/index.js

@@ -1,5 +1,11 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
+function _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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -38,6 +44,7 @@ import BuyerOpenUid from "./BuyerOpenUid";
 import PaymentTid from "./PaymentTid";
 import AlipayNo from "./AlipayNo";
 import PayTime from "./PayTime";
+import { orderBack } from "../../../../common/utils/tools";
 import { jsx as _jsx } from "react/jsx-runtime";
 
 var Payment = /*#__PURE__*/function (_BasicComponent) {
@@ -70,6 +77,8 @@ var Payment = /*#__PURE__*/function (_BasicComponent) {
 
     _defineProperty(_assertThisInitialized(_this), "payTime", void 0);
 
+    _defineProperty(_assertThisInitialized(_this), "time", void 0);
+
     _defineProperty(_assertThisInitialized(_this), "customRules", function (config) {
       return [{
         validator: function validator(_, value) {
@@ -128,8 +137,8 @@ var Payment = /*#__PURE__*/function (_BasicComponent) {
         rules: _this.customRules(_this.componentConfig),
         required: (_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.required,
         component: /*#__PURE__*/_jsx(ApaasPayment, _objectSpread(_objectSpread({}, _this.componentConfig), {}, {
-          onSearch: function onSearch(val) {
-            return _this.searchHandle(val);
+          onSearch: function onSearch(e) {
+            return _this.changeHandle(e.target.value);
           }
         }))
       }, value));
@@ -175,26 +184,59 @@ var Payment = /*#__PURE__*/function (_BasicComponent) {
       shopList: options === null || options === void 0 ? void 0 : (_options$effects = options.effects) === null || _options$effects === void 0 ? void 0 : _options$effects.shopList,
       shopId: options === null || options === void 0 ? void 0 : (_options$effects2 = options.effects) === null || _options$effects2 === void 0 ? void 0 : _options$effects2.shopId
     });
+    _this.time = null;
     return _this;
-  }
+  } //订单返填
+
 
   _createClass(Payment, [{
-    key: "searchHandle",
-    value: function searchHandle(val) {
-      var form = this.effects.form;
-      var values = form.getFieldsValue();
-      Object.keys(values).forEach(function (k) {
-        if (Object.prototype.toString.call(values[k]) === '[object Object]') {
-          if (values[k].hasOwnProperty('enterprisePaymentBuyerNick')) {
-            values[k] = _objectSpread(_objectSpread({}, values[k]), {}, {
-              enterprisePaymentBuyerNick: val.buyerNick,
-              enterprisePaymentBuyerOpenUid: val.buyerOpenUid
-            });
+    key: "changeHandle",
+    value: function () {
+      var _changeHandle = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(order_no) {
+        var _this$effects2, form, shopId, shopList, templateDetail;
+
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                if (order_no) {
+                  _context.next = 2;
+                  break;
+                }
+
+                return _context.abrupt("return");
+
+              case 2:
+                _this$effects2 = this.effects, form = _this$effects2.form, shopId = _this$effects2.shopId, shopList = _this$effects2.shopList, templateDetail = _this$effects2.templateDetail;
+
+                if (this.time) {
+                  clearTimeout(this.time);
+                }
+
+                this.time = setTimeout(function () {
+                  orderBack({
+                    order_no: order_no,
+                    form: form,
+                    shopId: shopId,
+                    shopList: shopList,
+                    templateDetail: templateDetail
+                  });
+                }, 1000);
+
+              case 5:
+              case "end":
+                return _context.stop();
+            }
           }
-        }
-      });
-      form.setFieldsValue(values);
-    } //自定义规则
+        }, _callee, this);
+      }));
+
+      function changeHandle(_x) {
+        return _changeHandle.apply(this, arguments);
+      }
+
+      return changeHandle;
+    }() //自定义规则
 
   }]);
 

package/dist/esm/WorkOrder/index.d.ts

@@ -5,6 +5,7 @@ export declare enum PlatForm {
     FXG = "fxg",
     KS = "ks",
     PDD = "pdd",
+    JD = "jd",
     XIAOZHI = "xiaozhi"
 }
 interface WorkOrderProps {

package/dist/esm/WorkOrder/index.js

@@ -27,8 +27,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 /*
  * @Author: wangzhenggui jianjia.wzg@raycloud.com
  * @Date: 2022-09-16 11:19:43
- * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
- * @LastEditTime: 2022-11-04 14:26:13
+ * @LastEditors: litian
+ * @LastEditTime: 2022-11-07 16:09:48
  * @FilePath: /kmkf-work-order-service-component/src/WorkOrder/index.tsx
  * @Description:
  *
@@ -72,6 +72,7 @@ export var PlatForm;
   PlatForm["FXG"] = "fxg";
   PlatForm["KS"] = "ks";
   PlatForm["PDD"] = "pdd";
+  PlatForm["JD"] = "jd";
   PlatForm["XIAOZHI"] = "xiaozhi";
 })(PlatForm || (PlatForm = {}));
 
@@ -611,6 +612,7 @@ var PayOrderList = function PayOrderList(_ref4) {
               buyerNick: platformInfo.buyerNick,
               buyerOpenUid: platformInfo.buyerId,
               shopId: platformInfo.shopId,
+              tid: platformInfo.orderNo,
               shopName: (_shopList$find = shopList.find(function (item) {
                 return item.shopId == platformInfo.shopId;
               })) === null || _shopList$find === void 0 ? void 0 : _shopList$find.shopName,
@@ -727,7 +729,20 @@ var PayOrderList = function PayOrderList(_ref4) {
       width: platform === PlatForm.XIAOZHI ? '100%' : '90%'
     }), /*#__PURE__*/_jsx(PayOrderModal, {
       ref: payOrderRef,
-      afterSuccessUpdateWorkOrder: onSearch,
+      afterSuccessUpdateWorkOrder: function afterSuccessUpdateWorkOrder(type) {
+        if (type === 'add') {
+          dispatch({
+            type: 'global/setState',
+            payload: {
+              platformInfo: _objectSpread(_objectSpread({}, platformInfo), {}, {
+                orderNo: ''
+              })
+            }
+          });
+        }
+
+        onSearch();
+      },
       width: platform === PlatForm.XIAOZHI ? '100%' : '90%'
     }), /*#__PURE__*/_jsx(ExamineModal, {}), /*#__PURE__*/_jsx(UnExamineModal, {}), /*#__PURE__*/_jsx(DeletePaymentWorkOrderModal, {}), /*#__PURE__*/_jsx(FlagPayModal, {})]
   });

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

@@ -36,3 +36,4 @@ export declare type LoginParams = {
 export declare const login: (data: LoginParams) => Promise<any>;
 export declare const queryShopList: () => Promise<any>;
 export declare const deleteWorkOrder: (data: any) => Promise<any>;
+export declare const getThirdOpenUidByOrderNo: (data: any) => Promise<any>;

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

@@ -2,8 +2,8 @@
  * @Description:
  * @Author: litian
  * @Date: 2022-09-06 10:28:04
- * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
- * @LastEditTime: 2022-10-19 19:04:54
+ * @LastEditors: litian
+ * @LastEditTime: 2022-11-08 13:58:05
  */
 import request from "./request";
 //获取灰度白名
@@ -191,6 +191,7 @@ export var transferWorkOrder = function transferWorkOrder(data) {
     data: data
   });
 };
+//获取灰度名单列表
 export var grayWhiteListApi = function grayWhiteListApi(data) {
   return request({
     url: '/qy/grayWhiteList/names',
@@ -198,13 +199,15 @@ export var grayWhiteListApi = function grayWhiteListApi(data) {
     data: data
   });
 };
+//登陆
 export var login = function login(data) {
   return request({
     url: '/qy/gdfw/company/login',
     method: 'post',
     data: data
   });
-};
+}; //获取店铺列表
+
 export var queryShopList = function queryShopList() {
   return request({
     url: '/qy/gdfw/company/queryShop',
@@ -218,4 +221,12 @@ export var deleteWorkOrder = function deleteWorkOrder(data) {
     method: 'post',
     data: data
   });
+}; // 通过订单号获取三方用户openUid - 目前只用于淘宝
+
+export var getThirdOpenUidByOrderNo = function getThirdOpenUidByOrderNo(data) {
+  return request({
+    url: '/shop/getThirdOpenUidByOrderNo',
+    method: 'post',
+    data: data
+  });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kmkf-work-order-service-component",
-  "version": "0.1.12-alpha.1",
+  "version": "0.1.13",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -38,7 +38,8 @@
     "react-dom": "^17.0.2"
   },
   "dependencies": {
-    "@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.0.23",
+    "@ant-design/icons": "^4.7.0",
+    "@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.0.24",
     "@reduxjs/toolkit": "^1.8.5",
     "react-redux": "^7.2.8",
     "store2": "^2.14.2",