kmkf-work-order-service-component 0.0.1-alpha.1 → 0.0.1-alpha.11

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

@@ -38,7 +38,7 @@ import { get, find, some } from 'lodash';
 import zhCN from 'antd/es/locale/zh_CN';
 import moment from 'moment';
 import 'moment/locale/zh-cn';
-import { calcWorkOrderList, submitDataTransOldFormat } from "../../common/utils/tools";
+import { calcWorkOrderList, submitDataTransOldFormat, orderBack } from "../../common/utils/tools";
 import { factory } from "../Widget";
 import { queryTemplateDetail, addWorkOrder, queryWorkOrderDetail, updateWorkOrder } from "../../model/servers/api";
 import styles from "./index.module.less";
@@ -278,13 +278,13 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
 
   var queryDetail = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
-      var templateId, workOrderId, shopId, record, _workOrderDetail2, _workOrderDetail2$dat, _workOrderDetail2$dat2, _workOrderDetail, _templateDetail, _workOrderDetail3, _templateDetail$data, transData, _templateDetail$data2, _transData;
+      var templateId, workOrderId, shopId, record, orderNo, buyerId, _workOrderDetail2, _workOrderDetail2$dat, _workOrderDetail2$dat2, _workOrderDetail, _templateDetail, _workOrderDetail3, _templateDetail$data, transData, _templateDetail$data2, _templateDetail$data3, jsonMap, _transData;
 
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
-              templateId = _ref2.templateId, workOrderId = _ref2.workOrderId, shopId = _ref2.shopId, record = _ref2.record;
+              templateId = _ref2.templateId, workOrderId = _ref2.workOrderId, shopId = _ref2.shopId, record = _ref2.record, orderNo = _ref2.orderNo, buyerId = _ref2.buyerId;
               form.resetFields();
               _context2.prev = 2;
               setLoading(true);
@@ -317,8 +317,8 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
               setWorkOrderDetail(_workOrderDetail.data);
 
               if (workOrderId) {
-                transData = calcWorkOrderList([(_workOrderDetail3 = _workOrderDetail) === null || _workOrderDetail3 === void 0 ? void 0 : _workOrderDetail3.data], _templateDetail === null || _templateDetail === void 0 ? void 0 : (_templateDetail$data = _templateDetail.data) === null || _templateDetail$data === void 0 ? void 0 : _templateDetail$data.componentDtoList);
-                console.log(transData);
+                transData = calcWorkOrderList([(_workOrderDetail3 = _workOrderDetail) === null || _workOrderDetail3 === void 0 ? void 0 : _workOrderDetail3.data], _templateDetail === null || _templateDetail === void 0 ? void 0 : (_templateDetail$data = _templateDetail.data) === null || _templateDetail$data === void 0 ? void 0 : _templateDetail$data.componentDtoList); // console.log(transData);
+
                 form.setFieldsValue(_objectSpread(_objectSpread({}, get(transData, '0', {})), {}, {
                   shopId: shopId,
                   shopName: record.shopName,
@@ -327,32 +327,56 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
                   processTime: record.processTime
                 }));
               } else {
+                //获取一些默认数据
+                jsonMap = _templateDetail === null || _templateDetail === void 0 ? void 0 : (_templateDetail$data2 = _templateDetail.data) === null || _templateDetail$data2 === void 0 ? void 0 : _templateDetail$data2.componentDtoList.reduce(function (prv, next) {
+                  if (next.workOrderComponentType === 'BUYER_NICK_INPUT') {
+                    prv["".concat(next.uniqueKey, "_buyerOpenUid")] = buyerId;
+                  }
+
+                  if (next.workOrderComponentType === 'ENTERPRISE_PAYMENT') {
+                    prv["".concat(next.uniqueKey, "_enterprisePaymentBuyerOpenUid")] = buyerId;
+                  }
+
+                  return prv;
+                }, {});
                 _transData = calcWorkOrderList([{
-                  jsonMap: {}
-                }], _templateDetail === null || _templateDetail === void 0 ? void 0 : (_templateDetail$data2 = _templateDetail.data) === null || _templateDetail$data2 === void 0 ? void 0 : _templateDetail$data2.componentDtoList, 'init');
+                  jsonMap: jsonMap
+                }], _templateDetail === null || _templateDetail === void 0 ? void 0 : (_templateDetail$data3 = _templateDetail.data) === null || _templateDetail$data3 === void 0 ? void 0 : _templateDetail$data3.componentDtoList, 'init');
                 form.setFieldsValue(_objectSpread({}, get(_transData, '0', {})));
+              } //如果有订单号 订单返填
+              // console.log(orderNo);
+
+
+              if (orderNo) {
+                orderBack({
+                  order_no: orderNo,
+                  form: form,
+                  shopId: shopId,
+                  shopList: shopList,
+                  templateDetail: _templateDetail === null || _templateDetail === void 0 ? void 0 : _templateDetail.data
+                });
               }
 
               document.getElementsByClassName('ant-form')[0].scrollTop = 0;
-              _context2.next = 21;
+              _context2.next = 22;
               break;
 
-            case 18:
-              _context2.prev = 18;
+            case 19:
+              _context2.prev = 19;
               _context2.t0 = _context2["catch"](2);
               console.error('获取模板信息错误', _context2.t0);
 
-            case 21:
-              _context2.prev = 21;
+            case 22:
+              _context2.prev = 22;
               setLoading(false);
-              return _context2.finish(21);
+              return _context2.finish(22);
 
-            case 24:
+            case 25:
             case "end":
               return _context2.stop();
           }
         }
-      }, _callee2, null, [[2, 18, 21, 24]]);
+      }, _callee2, null, [[2, 19, 22, 25]]);
     }));
 
     return function queryDetail(_x3) {
@@ -369,8 +393,10 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
         shopId = _ref4.shopId,
         workOrderId = _ref4.workOrderId,
         _ref4$record = _ref4.record,
-        record = _ref4$record === void 0 ? {} : _ref4$record;
-    console.log('openModal---------', templateId, shopId, workOrderId, record = {});
+        record = _ref4$record === void 0 ? {} : _ref4$record,
+        orderNo = _ref4.orderNo,
+        buyerId = _ref4.buyerId;
+    // console.log('openModal---------', templateId, shopId, workOrderId, (record = {}));
     setVisible(true);
     setTemplateId(templateId);
     setWorkOrderId(workOrderId);
@@ -379,7 +405,9 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
       templateId: templateId,
       workOrderId: workOrderId,
       shopId: shopId,
-      record: record
+      record: record,
+      orderNo: orderNo,
+      buyerId: buyerId
     });
   };
 
@@ -388,6 +416,9 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
 
     if (look) {
       btnGroup = /*#__PURE__*/_jsx(Space, {
+        style: {
+          float: 'right'
+        },
         children: /*#__PURE__*/_jsx(Button, {
           type: "primary",
           onClick: function onClick() {
@@ -398,6 +429,9 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
       });
     } else {
       btnGroup = /*#__PURE__*/_jsxs(Space, {
+        style: {
+          float: 'right'
+        },
         children: [/*#__PURE__*/_jsx(Button, {
           onClick: function onClick() {
             return closeModal();
@@ -417,8 +451,8 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
   };
 
   return /*#__PURE__*/_jsx(Drawer, {
-    title: title || '工单录入',
-    width: 400,
+    title: (templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.name) || '工单录入',
+    width: '100%',
     open: visible,
     onClose: closeModal,
     footer: renderFooter(),
@@ -428,7 +462,12 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
         locale: zhCN,
         children: /*#__PURE__*/_jsx(Form, {
           form: form,
-          layout: "vertical",
+          labelCol: {
+            span: 6
+          },
+          wrapperCol: {
+            span: 18
+          },
           className: styles.customizeFormModalClassName,
           style: {
             maxHeight: '500px'

package/dist/esm/WorkOrder/components/CustomizeFormModal/index.module.less

@@ -32,8 +32,8 @@
 
 .customizeFormModalClassName {
   :global(.goods-uploaded-state) {
-    margin: -5px 0 5px 0;
-    padding-left: 23px;
+    margin: 6px 0 5px 0;
+    padding-left: 7px;
     font-size: 12px;
   }
 
@@ -67,21 +67,31 @@
     }
   }
 
+  :global(.ant-form-item) {
+    margin-bottom: 20px;
+  }
+
   :global(.ant-form-item-label) {
     position: relative;
-    font-weight: bold;
+    max-width: 100px;
+    overflow: initial;
+    color: rgba(0, 0, 0, 0.55);
+    // font-weight: bold;
     font-size: 14px;
+    white-space: normal;
+    text-align: left;
   }
 
   :global(.form-item-label--index .ant-form-item-label label) {
-    padding-left: 23px;
-    font-family: 'PingFangSC-Semibold';
-
-    &[title='处理客服'] {
-      padding-left: 0;
-      font-weight: lighter;
-      font-family: 'PingFangSC-Regular';
-    }
+    // padding-left: 23px;
+    text-align: left;
+    // font-family: 'PingFangSC-Semibold';
+
+    // &[title='处理客服'] {
+    //   padding-left: 0;
+    //   font-weight: lighter;
+    //   font-family: 'PingFangSC-Regular';
+    // }
   }
 
   :global(.label-title--index) {

package/dist/esm/WorkOrder/components/CustomizeFormModal/wrap.d.ts

@@ -1,5 +1,5 @@
 declare const openCustomizeWOrkOrder: (prefixParams: {
-    shopList?: [];
-    onSuccess?: () => void;
+    shopList?: [] | undefined;
+    onSuccess?: ((val?: any) => void) | undefined;
 }) => (params: any) => void;
 export default openCustomizeWOrkOrder;

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

@@ -8,7 +8,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * @Author: wangzhenggui jianjia.wzg@raycloud.com
  * @Date: 2022-09-13 14:30:28
  * @LastEditors: litian
- * @LastEditTime: 2022-09-14 16:15:37
+ * @LastEditTime: 2022-09-19 10:01:49
  * @FilePath: /dy-work-order/src/components/CustomizeFormModal/wrap.tsx
  * @Description:
  *
@@ -31,9 +31,9 @@ var openCustomizeWOrkOrder = function openCustomizeWOrkOrder(prefixParams) {
     function render() {
       reactRender( /*#__PURE__*/_jsx(CustomizeFormModal, {
         ref: ref,
-        onSuccess: function onSuccess() {
+        onSuccess: function onSuccess(val) {
           if (typeof (prefixParams === null || prefixParams === void 0 ? void 0 : prefixParams.onSuccess) === 'function') {
-            return prefixParams === null || prefixParams === void 0 ? void 0 : prefixParams.onSuccess();
+            return prefixParams === null || prefixParams === void 0 ? void 0 : prefixParams.onSuccess(val);
           }
 
           destroy();

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

@@ -20,8 +20,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  * @Description:
  * @Author: litian
  * @Date: 2022-09-07 17:04:02
- * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
- * @LastEditTime: 2022-09-16 13:37:12
+ * @LastEditors: litian
+ * @LastEditTime: 2022-09-27 18:57:14
  */
 import React from 'react';
 import { factory } from "../Widget";
@@ -43,8 +43,9 @@ function ListOrderItem(props) {
 
   var _calcWorkOrderList = calcWorkOrderList([_objectSpread({}, item)], componentDtoList),
       _calcWorkOrderList2 = _slicedToArray(_calcWorkOrderList, 1),
-      transData = _calcWorkOrderList2[0]; //列表头部
+      transData = _calcWorkOrderList2[0];
 
+  console.log('transData', transData); //列表头部
 
   var ItemHeader = function ItemHeader() {
     // 获取工单状态组件自定义文案
@@ -183,17 +184,20 @@ function ListOrderItem(props) {
     var showEditorBtn = isAfterSalePayment(componentDtoList);
     return /*#__PURE__*/_jsxs("div", {
       className: styles.orderItem,
-      children: [/*#__PURE__*/_jsxs("div", {
+      children: [/*#__PURE__*/_jsx("div", {
         className: styles.orderItemLeft,
-        children: [/*#__PURE__*/_jsxs("div", {
+        children: /*#__PURE__*/_jsxs("div", {
           className: styles.orderItemType,
           children: [/*#__PURE__*/_jsx("div", {
             className: styles.orderItemLeftIcon
-          }), templateDetailDto ? templateDetailDto.name : '']
-        }), showMsg.length > 1 && /*#__PURE__*/_jsx("div", {
-          className: "".concat(styles.orderItemStatus, " ").concat(showMsg.includes('已') ? styles.done : styles.undo),
-          children: showMsg
-        })]
+          }), /*#__PURE__*/_jsxs("div", {
+            className: styles.orderItemLeftName,
+            children: [templateDetailDto ? templateDetailDto.name : '', showMsg.length > 1 && /*#__PURE__*/_jsx("div", {
+              className: "".concat(styles.orderItemStatus, " ").concat(showMsg.includes('已') ? styles.done : styles.undo),
+              children: showMsg
+            })]
+          })]
+        })
       }), /*#__PURE__*/_jsxs("div", {
         className: styles.orderItemRight,
         children: [hasStatus ? /*#__PURE__*/_jsx("div", {
@@ -204,6 +208,14 @@ function ListOrderItem(props) {
             },
             children: status
           })
+        }) : null, hasStatus ? /*#__PURE__*/_jsx("div", {
+          children: /*#__PURE__*/_jsx("span", {
+            className: styles.orderItemOperate,
+            onClick: function onClick() {
+              return transferOrder(item);
+            },
+            children: "\u8F6C\u4EA4"
+          })
         }) : null, showEditorBtn ? null : /*#__PURE__*/_jsx("span", {
           className: styles.orderItemOperate,
           onClick: function onClick() {
@@ -252,6 +264,10 @@ function ListOrderItem(props) {
       style: {
         margin: '8px 0'
       }
+    }), ItemView({
+      label: '店铺名称',
+      value: transData.shopName,
+      key: 'shopName'
     }), componentDtoList.map(function (t) {
       var instance = factory(t.workOrderComponentType, {
         id: t.uniqueKey,

package/dist/esm/WorkOrder/components/ListOrderItem/index.module.less

@@ -18,7 +18,7 @@
 
     .orderItemType {
       display: flex;
-      align-items: center;
+      // align-items: center;
       color: rgba(0, 0, 0, 0.85);
       font-weight: normal;
       font-size: 14px;
@@ -30,16 +30,23 @@
         margin-right: 8px;
         background: #1966ff;
       }
+
+      .orderItemLeftName {
+        width: 115px;
+        line-height: 16px;
+      }
     }
 
     .orderItemStatus {
-      display: flex;
-      align-items: center;
-      justify-content: center;
+      display: inline-block;
       box-sizing: border-box;
       height: 24px;
-      margin-left: 12px;
       padding: 0px 4px;
+      line-height: 23px;
+      white-space: nowrap;
+      // align-items: center;
+      // justify-content: center;
+      text-align: center;
       border-radius: 2px;
     }
 
@@ -67,10 +74,13 @@
   align-items: center;
   justify-content: center;
   box-sizing: border-box;
+  height: 24px;
   margin: 0 4px;
-  padding: 3px 16px;
+  // width: 48px;
+  padding: 0 8px;
   color: #1966ff;
   font-weight: normal;
+  white-space: nowrap;
   border: 1px solid #1966ff;
   border-radius: 4px;
   cursor: pointer;
@@ -88,6 +98,7 @@
   margin: 6px 0;
 
   .itemViewLeft {
+    min-width: 48px;
     margin-right: 8px;
     color: rgba(0, 0, 0, 0.4);
     font-weight: normal;
@@ -97,5 +108,6 @@
   .itemViewRight {
     flex-grow: 1;
     color: rgba(0, 0, 0, 0.85);
+    word-break: break-all;
   }
 }

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

@@ -1,6 +1,6 @@
 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); }
 
-var _excluded = ["shopId", "shopName"];
+var _excluded = ["shopId", "shopName", "shopList"];
 
 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; }
 
@@ -32,7 +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 { decodeAlipayInfo, editRemitOrder } from "../../model/servers/api";
+import { decodeAlipayInfo, editRemitOrder, addPaymentOrder } from "../../model/servers/api";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 
@@ -43,8 +43,13 @@ function ModifyModal(props, ref) {
       openModal: function openModal(val, type) {
         setRecord(val);
         setType(type);
-        type === 'edit' && form.setFieldsValue(val);
+        setShopList(val === null || val === void 0 ? void 0 : val.shopList);
+        form.setFieldsValue(val);
         type === 'edit' && decodeAlipayInfoHandle(val);
+        type === 'add' && setShopInfo({
+          shopId: val === null || val === void 0 ? void 0 : val.shopId,
+          shopName: val === null || val === void 0 ? void 0 : val.shopName
+        });
         setVisible(true);
       }
     };
@@ -70,6 +75,16 @@ function ModifyModal(props, ref) {
       type = _useState8[0],
       setType = _useState8[1];
 
+  var _useState9 = useState({}),
+      _useState10 = _slicedToArray(_useState9, 2),
+      shopInfo = _useState10[0],
+      setShopInfo = _useState10[1];
+
+  var _useState11 = useState([]),
+      _useState12 = _slicedToArray(_useState11, 2),
+      shopList = _useState12[0],
+      setShopList = _useState12[1];
+
   var _Form$useForm = Form.useForm(),
       _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
       form = _Form$useForm2[0];
@@ -77,25 +92,45 @@ function ModifyModal(props, ref) {
   var handleOk = function handleOk() {
     form.validateFields().then( /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(values) {
-        var shopId, shopName, other, newValue, _yield$editRemitOrder, success;
+        var _shopList$find;
+
+        var id, shopSourceStr, newValue, api, shopId, shopName, _shopList, other, _yield$api, success;
 
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                if (!(type === 'edit')) {
-                  _context.next = 10;
+                //非淘宝账户支付宝姓名和支付宝账号必填
+                id = type === 'edit' ? record.shopId : shopInfo.shopId;
+                shopSourceStr = ((_shopList$find = shopList.find(function (item) {
+                  return item.shopId == id;
+                })) === null || _shopList$find === void 0 ? void 0 : _shopList$find.shopSourceStr) || '';
+
+                if (!(shopSourceStr !== 'TAOBAO' && (!values.accountNick || !values.accountNo))) {
+                  _context.next = 5;
                   break;
                 }
 
-                shopId = record.shopId, shopName = record.shopName, other = _objectWithoutProperties(record, _excluded);
-                newValue = _objectSpread(_objectSpread({}, other), values);
-                _context.next = 5;
-                return editRemitOrder(newValue);
+                message.error('请输入支付宝姓名和支付宝账号');
+                return _context.abrupt("return");
 
               case 5:
-                _yield$editRemitOrder = _context.sent;
-                success = _yield$editRemitOrder.success;
+                newValue = {};
+                api = type === 'edit' ? editRemitOrder : addPaymentOrder;
+
+                if (type === 'edit') {
+                  shopId = record.shopId, shopName = record.shopName, _shopList = record.shopList, other = _objectWithoutProperties(record, _excluded);
+                  newValue = _objectSpread(_objectSpread({}, other), values);
+                } else {
+                  newValue = _objectSpread(_objectSpread({}, values), shopInfo);
+                }
+
+                _context.next = 10;
+                return api(newValue);
+
+              case 10:
+                _yield$api = _context.sent;
+                success = _yield$api.success;
 
                 if (success) {
                   message.success('保存成功');
@@ -104,10 +139,7 @@ function ModifyModal(props, ref) {
                   setVisible(false);
                 }
 
-                _context.next = 10;
-                break;
-
-              case 10:
+              case 13:
               case "end":
                 return _context.stop();
             }
@@ -173,11 +205,15 @@ function ModifyModal(props, ref) {
 
   return /*#__PURE__*/_jsx(Drawer, {
     visible: visible,
+    width: '90%',
     onClose: function onClose() {
       return setVisible(false);
     },
     title: "\u5F55\u5165\u5DE5\u5355",
     footer: /*#__PURE__*/_jsxs(Space, {
+      style: {
+        float: 'right'
+      },
       children: [/*#__PURE__*/_jsx(Button, {
         onClick: function onClick() {
           return setVisible(false);
@@ -193,6 +229,12 @@ function ModifyModal(props, ref) {
       spinning: loading,
       children: /*#__PURE__*/_jsxs(Form, {
         form: form,
+        labelCol: {
+          span: 6
+        },
+        wrapperCol: {
+          span: 18
+        },
         children: [/*#__PURE__*/_jsx(Form.Item, {
           label: "\u6253\u6B3E\u91D1\u989D",
           name: "workPayFee",

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

@@ -22,8 +22,8 @@ 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-09-16 13:37:30
+ * @LastEditors: litian
+ * @LastEditTime: 2022-09-22 16:37:15
  */
 import React, { useImperativeHandle, forwardRef, useState } from 'react';
 import { Drawer } from 'antd';
@@ -89,10 +89,9 @@ function RecordModal(props, ref) {
             case 2:
               _yield$reportLogs = _context.sent;
               result = _yield$reportLogs.data.result;
-              console.log(result);
               setLogList(result);
 
-            case 6:
+            case 5:
             case "end":
               return _context.stop();
           }
@@ -122,6 +121,7 @@ function RecordModal(props, ref) {
               className: styles.dot
             }), map[item.operation]]
           }), /*#__PURE__*/_jsx("div", {
+            className: styles.content,
             children: item.content
           }), /*#__PURE__*/_jsxs("div", {
             children: [item.created ? moment(item.created).format('YYYY-MM-DD HH:mm:ss') : '', ' ', item.operationName]

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

@@ -64,9 +64,12 @@ var PAY_STATUS = [{
   label: '打款关闭',
   color: 'rgba(156,156,156)'
 }];
+var PAY_STATUS_ICON = {
+  WAITING_EXAMINE: '#FF4050',
+  EXAMINED: '#43BF0A'
+};
 
 function PayListOrderItem(props) {
-  console.log(props);
   var _props$record = props.record,
       record = _props$record === void 0 ? {} : _props$record,
       onRefresh = props.onRefresh,
@@ -315,7 +318,7 @@ function PayListOrderItem(props) {
       content: /*#__PURE__*/_jsxs("div", {
         children: [/*#__PURE__*/_jsx("span", {
           className: styles.red,
-          children: "\u53D6\u6D88\u5BA1\u6838\u540E\uFF0C\u5DE5\u5355\u72B6\u6001\u53D8\u66F4\u4E3A\u672A\u6253\u6B3E\u72B6\u6001\uFF0C"
+          children: "\u53D6\u6D88\u5BA1\u6838\u540E\uFF0C\u5DE5\u5355\u72B6\u6001\u53D8\u66F4\u4E3A\u672A\u6253\u6B3E\u72B6\u6001"
         }), "\uFF0C \u4F60\u8FD8\u8981\u7EE7\u7EED\u5417\uFF1F"]
       }),
       okText: '确认',
@@ -380,7 +383,6 @@ function PayListOrderItem(props) {
   };
 
   var getColor = function getColor(flag) {
-    console.log('flag------------', flag);
     var currentObj = PAY_STATUS.find(function (item) {
       return item.value === flag;
     });
@@ -411,8 +413,12 @@ function PayListOrderItem(props) {
         children: /*#__PURE__*/_jsxs("div", {
           className: styles.orderItemType,
           children: [/*#__PURE__*/_jsx("div", {
-            className: styles.orderItemLeftIcon
+            className: styles.orderItemLeftIcon,
+            style: {
+              backgroundColor: PAY_STATUS_ICON[workPayStatus] ? PAY_STATUS_ICON[workPayStatus] : '#1966FF'
+            }
           }), /*#__PURE__*/_jsx("span", {
+            className: styles.orderItemLeftName,
             style: {
               color: getColor(workPayStatus) || 'rgba(156,156,156)'
             },

package/dist/esm/WorkOrder/components/PayListOrderItem/record.module.less

@@ -17,6 +17,12 @@
     border-radius: 50%;
   }
 
+  .content {
+    width: 100%;
+    word-wrap: break-word;
+    word-break: break-all;
+  }
+
   .title {
     display: flex;
     align-items: center;