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

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-23 10:06:53
  */
 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() {
     // 获取工单状态组件自定义文案
@@ -204,6 +205,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() {

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

@@ -67,10 +67,12 @@
   align-items: center;
   justify-content: center;
   box-sizing: border-box;
+  width: 48px;
+  height: 24px;
   margin: 0 4px;
-  padding: 3px 16px;
   color: #1966ff;
   font-weight: normal;
+  white-space: nowrap;
   border: 1px solid #1966ff;
   border-radius: 4px;
   cursor: pointer;
@@ -88,6 +90,7 @@
   margin: 6px 0;
 
   .itemViewLeft {
+    min-width: 48px;
     margin-right: 8px;
     color: rgba(0, 0, 0, 0.4);
     font-weight: normal;
@@ -97,5 +100,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

@@ -66,7 +66,6 @@ var PAY_STATUS = [{
 }];
 
 function PayListOrderItem(props) {
-  console.log(props);
   var _props$record = props.record,
       record = _props$record === void 0 ? {} : _props$record,
       onRefresh = props.onRefresh,
@@ -380,7 +379,6 @@ function PayListOrderItem(props) {
   };
 
   var getColor = function getColor(flag) {
-    console.log('flag------------', flag);
     var currentObj = PAY_STATUS.find(function (item) {
       return item.value === flag;
     });

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;

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

@@ -102,11 +102,10 @@ var RecordLog = function RecordLog(props, ref) {
             case 2:
               _yield$reportLogs = _context.sent;
               result = _yield$reportLogs.data.result;
-              console.log(result);
               setLogList(result);
               setVisible(true);
 
-            case 7:
+            case 6:
             case "end":
               return _context.stop();
           }
@@ -121,7 +120,6 @@ var RecordLog = function RecordLog(props, ref) {
 
   return /*#__PURE__*/_jsx(Drawer, {
     visible: visible,
-    width: 370,
     title: "\u64CD\u4F5C\u8BB0\u5F55",
     onClose: function onClose() {
       return setVisible(false);
@@ -203,8 +201,8 @@ var RecordLog = function RecordLog(props, ref) {
                 var _record$operation;
 
                 var newContent = get(calcContent, "0.".concat(child === null || child === void 0 ? void 0 : child.dataIndex));
-                var oldContent = get(oldCalcContent, "0.".concat(child === null || child === void 0 ? void 0 : child.dataIndex));
-                console.log(newContent, oldContent, calcContent);
+                var oldContent = get(oldCalcContent, "0.".concat(child === null || child === void 0 ? void 0 : child.dataIndex)); // console.log(newContent, oldContent, calcContent);
+
                 return newContent || oldContent ? /*#__PURE__*/_jsxs("span", {
                   style: {
                     display: 'flex'

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

@@ -1,5 +1,7 @@
 .log_item {
   padding: 8px 0;
   color: rgba(0, 0, 0, 0.55);
+  word-wrap: break-word;
+  word-break: break-all;
   border-bottom: 1px dashed rgba(0, 0, 0, 0.15);
 }

package/dist/esm/WorkOrder/components/Widget/basic/Address/index.js

@@ -34,8 +34,8 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * @Description:
  * @Author: litian
  * @Date: 2022-09-07 17:58:35
- * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
- * @LastEditTime: 2022-09-16 16:39:26
+ * @LastEditors: litian
+ * @LastEditTime: 2022-09-21 10:35:08
  */
 import React from 'react';
 import BasicComponent from "../../BasicComponent";

package/dist/esm/WorkOrder/components/Widget/basic/Checkbox/index.js

@@ -34,8 +34,8 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * @Description:
  * @Author: litian
  * @Date: 2022-09-07 17:58:35
- * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
- * @LastEditTime: 2022-09-16 16:40:08
+ * @LastEditors: litian
+ * @LastEditTime: 2022-09-20 18:01:46
  */
 import React from 'react';
 import BasicComponent from "../../BasicComponent";
@@ -69,8 +69,6 @@ var BasicCheckBox = /*#__PURE__*/function (_BasicComponent) {
         validator: function validator(_, value) {
           var _value$value2;
 
-          console.log(value);
-
           if (!(value !== null && value !== void 0 && (_value$value2 = value.value) !== null && _value$value2 !== void 0 && _value$value2.length)) {
             return Promise.reject(new Error('请选择'));
           }

package/dist/esm/WorkOrder/components/Widget/basic/Picture/index.js

@@ -31,7 +31,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * @Author: litian
  * @Date: 2022-09-07 17:58:35
  * @LastEditors: litian
- * @LastEditTime: 2022-09-15 17:10:14
+ * @LastEditTime: 2022-09-19 16:30:01
  */
 import React from 'react';
 import BasicComponent from "../../BasicComponent";
@@ -53,7 +53,6 @@ var BasicPicture = /*#__PURE__*/function (_BasicComponent) {
     _this = _super.call(this, options);
 
     _defineProperty(_assertThisInitialized(_this), "render", function (value) {
-      // const host = localStorage.getItem('kmkf_kmgd_host') || 'https://kefu.kuaimai.com'
       return value === null || value === void 0 ? void 0 : value.map(function (pic) {
         return /*#__PURE__*/_jsx("div", {
           style: {

package/dist/esm/WorkOrder/components/Widget/common/formItemWrap.js

@@ -46,21 +46,18 @@ export var getFormItem = function getFormItem(_ref) {
     }
   }
 
-  return /*#__PURE__*/_jsxs("div", {
+  return /*#__PURE__*/_jsx("div", {
     className: "form-item--wrap",
     style: {
       position: 'relative'
     },
-    children: [/*#__PURE__*/_jsx("span", {
-      className: "label-title--index",
-      children: indexLabel
-    }), /*#__PURE__*/_jsx(Form.Item, {
+    children: /*#__PURE__*/_jsx(Form.Item, {
       name: name,
       label: title,
       rules: newRules,
       className: formIndexClassName,
       children: component
-    })]
+    })
   });
 }; //图片展示
 

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

@@ -43,7 +43,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * @Author: litian
  * @Date: 2022-08-01 09:36:35
  * @LastEditors: litian
- * @LastEditTime: 2022-09-07 19:21:13
+ * @LastEditTime: 2022-09-20 18:02:06
  */
 import React from 'react';
 import BasicComponent from "../../BasicComponent";
@@ -68,7 +68,6 @@ var EBuyerName = /*#__PURE__*/function (_BasicComponent) {
     _this = _super.call(this, options);
 
     _defineProperty(_assertThisInitialized(_this), "render", function (value, record) {
-      console.log(value, record);
       var buyerOpenUid = Object.keys(record).reduce(function (prv, next) {
         var _next$split = next.split('_'),
             _next$split2 = _slicedToArray(_next$split, 2),
@@ -80,8 +79,8 @@ var EBuyerName = /*#__PURE__*/function (_BasicComponent) {
         }
 
         return prv;
-      }, '');
-      console.log('buyername', value);
+      }, ''); // console.log('buyername', value);
+
       return /*#__PURE__*/_jsx("span", {
         children: value
       });

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

@@ -30,8 +30,8 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * @Description:
  * @Author: litian
  * @Date: 2022-06-30 17:30:05
- * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
- * @LastEditTime: 2022-09-16 16:40:28
+ * @LastEditors: litian
+ * @LastEditTime: 2022-09-20 18:02:16
  */
 import React from 'react';
 import { BuyerNick } from '@raycloud-apaas-fe-setup/apaas-react-basics-widgets';
@@ -99,7 +99,6 @@ var EBuyerNick = /*#__PURE__*/function (_BasicComponent) {
     });
 
     _defineProperty(_assertThisInitialized(_this), "getColumns", function () {
-      console.log('this.buyerOpenUid', _this.buyerOpenUid);
       return {
         title: _this.name,
         children: [_this.buyerNick.getColumns(), _this.buyerOpenUid.getColumns()],

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

@@ -34,8 +34,8 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * @Description:
  * @Author: litian
  * @Date: 2022-08-15 14:37:33
- * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
- * @LastEditTime: 2022-09-16 16:40:32
+ * @LastEditors: litian
+ * @LastEditTime: 2022-09-19 14:08:03
  */
 import React from 'react';
 import BasicComponent from "../../BasicComponent";
@@ -94,7 +94,8 @@ var EItemSelect = /*#__PURE__*/function (_BasicComponent) {
         required: false,
         component: /*#__PURE__*/_jsx(ItemEncode, _objectSpread(_objectSpread({}, _this.componentConfig), {}, {
           shopId: (_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.shopId,
-          shopList: (_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : _this$effects2.shopList
+          shopList: (_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : _this$effects2.shopList,
+          width: "80%"
         }))
       }, value));
     });

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

@@ -34,8 +34,8 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * @Description:
  * @Author: litian
  * @Date: 2022-08-15 14:37:33
- * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
- * @LastEditTime: 2022-09-16 16:40:37
+ * @LastEditors: litian
+ * @LastEditTime: 2022-09-19 14:07:31
  */
 import React from 'react';
 import BasicComponent from "../../BasicComponent";
@@ -94,7 +94,8 @@ var EItemId = /*#__PURE__*/function (_BasicComponent) {
         required: false,
         component: /*#__PURE__*/_jsx(ItemId, _objectSpread(_objectSpread({}, _this.componentConfig), {}, {
           shopId: (_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.shopId,
-          shopList: (_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : _this$effects2.shopList
+          shopList: (_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : _this$effects2.shopList,
+          width: "80%"
         }))
       }, value));
     });

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

@@ -34,8 +34,8 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * @Description: 选择宝贝
  * @Author: litian
  * @Date: 2022-08-15 14:37:33
- * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
- * @LastEditTime: 2022-09-16 16:42:36
+ * @LastEditors: litian
+ * @LastEditTime: 2022-09-19 14:07:38
  */
 import React from 'react';
 import BasicComponent from "../../BasicComponent";
@@ -71,7 +71,8 @@ var EItemSelect = /*#__PURE__*/function (_BasicComponent) {
         required: (_this$componentConfig = _this.componentConfig) === null || _this$componentConfig === void 0 ? void 0 : _this$componentConfig.required,
         component: /*#__PURE__*/_jsx(ItemSelect, _objectSpread(_objectSpread({}, _this.componentConfig), {}, {
           shopId: (_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.shopId,
-          shopList: (_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : _this$effects2.shopList
+          shopList: (_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : _this$effects2.shopList,
+          width: "80%"
         }))
       }, value));
     });

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

@@ -34,8 +34,8 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * @Description:
  * @Author: litian
  * @Date: 2022-09-07 17:58:35
- * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
- * @LastEditTime: 2022-09-16 16:40:45
+ * @LastEditors: litian
+ * @LastEditTime: 2022-09-21 13:35:19
  */
 import React from 'react';
 import BasicComponent from "../../BasicComponent";
@@ -109,8 +109,7 @@ var ReceiverAddress = /*#__PURE__*/function (_BasicComponent) {
       validator: function validator(_, value) {
         var _value$address3;
 
-        console.log('address', value);
-
+        // console.log('address', value);
         if (!(value !== null && value !== void 0 && (_value$address3 = value.address) !== null && _value$address3 !== void 0 && _value$address3.length)) {
           return Promise.reject(new Error('请选择地址'));
         }

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

@@ -6,6 +6,7 @@ declare class ETradeId extends Input {
     rules: never[];
     effects: any;
     componentConfig: any;
+    time: any;
     constructor(options: any);
     searchHandle(val: {
         buyerNick: any;

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

@@ -36,8 +36,8 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * @Description:
  * @Author: litian
  * @Date: 2022-06-30 17:30:05
- * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
- * @LastEditTime: 2022-09-16 13:40:06
+ * @LastEditors: litian
+ * @LastEditTime: 2022-09-20 09:24:55
  */
 import React from 'react';
 import Input from "../../basic/Input";
@@ -70,6 +70,8 @@ var ETradeId = /*#__PURE__*/function (_Input) {
 
     _defineProperty(_assertThisInitialized(_this), "componentConfig", void 0);
 
+    _defineProperty(_assertThisInitialized(_this), "time", void 0);
+
     _defineProperty(_assertThisInitialized(_this), "editRender", function (value) {
       var _this$componentConfig;
 
@@ -98,7 +100,7 @@ var ETradeId = /*#__PURE__*/function (_Input) {
       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
     });
-    console.log('tradeid--------', options);
+    _this.time = null;
     return _this;
   }
 
@@ -131,15 +133,22 @@ var ETradeId = /*#__PURE__*/function (_Input) {
             switch (_context.prev = _context.next) {
               case 0:
                 _this$effects = this.effects, form = _this$effects.form, shopId = _this$effects.shopId, shopList = _this$effects.shopList, templateDetail = _this$effects.templateDetail;
-                orderBack({
-                  order_no: order_no,
-                  form: form,
-                  shopId: shopId,
-                  shopList: shopList,
-                  templateDetail: templateDetail
-                });
-
-              case 2:
+
+                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 3:
               case "end":
                 return _context.stop();
             }

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

@@ -35,7 +35,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * @Author: litian
  * @Date: 2022-06-21 21:20:47
  * @LastEditors: litian
- * @LastEditTime: 2022-09-07 19:41:29
+ * @LastEditTime: 2022-09-20 18:02:27
  */
 import React from 'react';
 import BasicComponent from "../../BasicComponent";
@@ -57,7 +57,6 @@ var Express = /*#__PURE__*/function (_BasicComponent) {
     _this = _super.call(this, options);
 
     _defineProperty(_assertThisInitialized(_this), "render", function (value, record) {
-      console.log('express.getExpressNameByCode(value)', express.getExpressNameByCode(value));
       return /*#__PURE__*/_jsx("span", {
         children: express.getExpressNameByCode(value)
       });