kmkf-work-order-service-component 0.0.1-alpha.9 → 0.0.1

package/README.md

@@ -3,7 +3,7 @@
  * @Author: litian
  * @Date: 2022-09-21 09:16:51
  * @LastEditors: litian
- * @LastEditTime: 2022-09-22 11:27:58
+ * @LastEditTime: 2022-10-10 16:17:49
 -->
 
 # kmkf-work-order-service-component
@@ -52,7 +52,7 @@ link 方式 https://cloud.tencent.com/developer/article/1842631
 ```
 import { WorkOrder } from 'kmkf-work-order-service-component'
 
-cosnt Text = ()=>{
+const Text = ()=>{
   return <WorkOrder platform="FXG"
         shopId={shopId}
         buyerNick={buyerNick}

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

@@ -13,7 +13,7 @@ export declare const findLabelBySelectValue: (vales: any[], options: {
  * 多级下拉框数据转换成aPaas数据结构
  * @param {*} sourceOptions
  */
-export declare const transMultSelectOptions: (sourceOptions: any[]) => any[];
+export declare const transMultSelectOptions: (sourceOptions: any[]) => any;
 /**
  * @param {*} nowData
  * @param {*} sourceTemplateDetail

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

@@ -95,7 +95,8 @@ var findNodeById = function findNodeById(tree) {
 
 export var transMultSelectOptions = function transMultSelectOptions(sourceOptions) {
   var tree = [];
-  sourceOptions.map(function (item) {
+  var newOptions = JSON.parse(JSON.stringify(sourceOptions));
+  newOptions.map(function (item) {
     if (tree.length === 0) {
       return tree = tree.concat(get(item, 'list.1', []));
     }
@@ -103,9 +104,7 @@ export var transMultSelectOptions = function transMultSelectOptions(sourceOption
     Object.keys(item.list).map(function (l) {
       // 在树中找到l对应的节点，将当前数组放到children里面
       var result = findNodeById(tree, l);
-      result && (result = _objectSpread(_objectSpread({}, result), {}, {
-        children: item.list[l]
-      }));
+      result && (result.children = item.list[l]);
     });
   });
   return tree;
@@ -554,7 +553,7 @@ var transDataSource = function transDataSource(templateColumns) {
       } else if (nex.workOrderComponentType === 'REMARK_INPUT') {
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
           flag: item.jsonMap["".concat(nex.uniqueKey, "_flag")] ? +item.jsonMap["".concat(nex.uniqueKey, "_flag")] : config !== null && config !== void 0 && config.flag ? +(config === null || config === void 0 ? void 0 : config.flag) : '',
-          remark: item.jsonMap["".concat(nex.uniqueKey, "_remark")] || (config === null || config === void 0 ? void 0 : config.remark)
+          remark: item.jsonMap["".concat(nex.uniqueKey, "_remark")] || (config === null || config === void 0 ? void 0 : config.remark) || ''
         }));
       } else if (nex.workOrderComponentType === 'STATUS') {
         var _objectSpread28;
@@ -622,7 +621,7 @@ 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, productId, productCode, transField, finalResponse, formValue, detail, componentsParams, detailsValue, newData;
+    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;
 
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
@@ -653,7 +652,7 @@ export var orderBack = /*#__PURE__*/function () {
             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, productId = data.productId, productCode = data.productCode;
+            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 = {
               tradeId: orderNo,
               province: provinceCode,
@@ -663,8 +662,8 @@ export var orderBack = /*#__PURE__*/function () {
               tradePaymentDateTime: orderPaymentDateTime,
               tradeDeliveryDateTime: orderDeliveryDateTime,
               tradeClosingDateTime: orderClosingDateTime,
-              goodId: productId,
-              goodSerial: productCode
+              goodId: itemList,
+              goodSerial: itemList
             };
             finalResponse = _objectSpread(_objectSpread({}, data), transField); //获取当前表单字段
 
@@ -684,55 +683,58 @@ export var orderBack = /*#__PURE__*/function () {
               if (detail[next]) {
                 switch (next) {
                   case 'province':
-                    prv[uniqueKey + '_province'] = detail['province'];
-                    prv[uniqueKey + '_city'] = detail['city'] || '';
-                    prv[uniqueKey + '_district'] = detail['district'] || '';
-                    prv[uniqueKey + '_address'] = detail['address'] || '';
+                    prv[uniqueKey] = {
+                      address: [+detail['province'], +detail['city'], +detail['district']],
+                      detail: detail['address'] || ''
+                    };
                     break;
 
                   case 'expressLogisticsCompany':
-                    prv[uniqueKey + '_expressLogisticsCompany'] = detail['expressLogisticsCompany'];
-                    prv[uniqueKey + '_expressLogisticsCode'] = detail['expressLogisticsCode'];
+                    prv[uniqueKey] = {
+                      company: detail['expressLogisticsCompany'],
+                      order: detail['expressLogisticsCode']
+                    };
                     break;
 
                   case 'alipayName':
-                    prv[uniqueKey + '_alipayName'] = detail['alipayName'];
-                    prv[uniqueKey + '_alipayAccount'] = detail['alipayAccount'];
+                    prv[uniqueKey] = {
+                      name: detail['alipayName'],
+                      user: detail['alipayAccount']
+                    };
                     break;
 
                   case 'tradePaymentDateTime':
                   case 'tradeCreateDateTime':
                   case 'tradeClosingDateTime':
                   case 'tradeDeliveryDateTime':
-                    prv["".concat(uniqueKey, "_").concat(key)] = detail[key] ? moment(detail[key]).format('YYYY-MM-DD HH:mm:ss') : '';
+                    prv[uniqueKey] = detail[key] ? moment(detail[key]).format('YYYY-MM-DD HH:mm:ss') : '';
+                    break;
+
+                  case 'remark':
+                    prv[uniqueKey] = {
+                      remark: detail['remark'] || '',
+                      flag: detail['flag']
+                    };
+                    break;
+
+                  case 'goodId':
+                  case 'goodSerial':
+                  case 'itemList':
+                    prv[uniqueKey] = detail['itemList'];
                     break;
 
                   default:
-                    prv["".concat(uniqueKey, "_").concat(key)] = detail[key];
+                    prv["".concat(uniqueKey)] = detail[key];
                     break;
                 }
               }
 
               return prv;
-            }, {}); //有打款组件返填订单编号
+            }, {}); // console.log('detailsValue++', formValue, detailsValue);
 
-            ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).forEach(function (item) {
-              if (item.workOrderComponentType === 'ENTERPRISE_PAYMENT') {
-                detailsValue["".concat(item.uniqueKey, "_enterprisePaymentTid")] = detail['tradeId'];
-                detailsValue["".concat(item.uniqueKey, "_enterprisePaymentBuyerOpenUid")] = formValue[item.uniqueKey]['buyerOpenUid'];
-              }
-
-              if (item.workOrderComponentType === 'BUYER_NICK_INPUT') {
-                detailsValue["".concat(item.uniqueKey, "_buyerOpenUid")] = formValue[item.uniqueKey]['buyerOpenUid'];
-              }
-            });
-            newData = calcWorkOrderList([{
-              jsonMap: detailsValue
-            }], templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'init');
-            console.log('detailsValue++', formValue, newData[0]);
-            form.setFieldsValue(_objectSpread({}, newData[0]));
+            form.setFieldsValue(_objectSpread(_objectSpread({}, formValue), detailsValue));
 
-          case 21:
+          case 18:
           case "end":
             return _context.stop();
         }

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

@@ -149,6 +149,7 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
 
               if (success && typeof onSuccess === 'function') {
                 closeModal();
+                form.resetFields();
                 message.success('编辑成功');
                 onSuccess({
                   type: 'EDIT',
@@ -206,6 +207,7 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
 
               if (_success && typeof onSuccess === 'function') {
                 closeModal();
+                form.resetFields();
                 message.success('添加成功');
                 onSuccess({
                   type: 'ADD',
@@ -221,7 +223,19 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
             case 34:
               _context.prev = 34;
               _context.t0 = _context["catch"](0);
-              console.error(_context.t0);
+
+              // 表单校验失败错误时，将错误第一项滚动到可视区域
+              if (get(_context.t0, 'errorFields.length') > 0) {
+                setTimeout(function () {
+                  var _get;
+
+                  var errorList = document.querySelectorAll('.ant-form-item-has-error');
+                  (_get = get(errorList, '0')) === null || _get === void 0 ? void 0 : _get.scrollIntoView({
+                    block: 'center',
+                    behavior: 'smooth'
+                  });
+                }, 0);
+              }
 
             case 37:
             case "end":
@@ -278,13 +292,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, orderNo, buyerId, _workOrderDetail2, _workOrderDetail2$dat, _workOrderDetail2$dat2, _workOrderDetail, _templateDetail, _workOrderDetail3, _templateDetail$data, transData, _templateDetail$data2, _templateDetail$data3, jsonMap, _transData;
+      var templateId, workOrderId, shopId, record, orderNo, buyerId, buyerNick, _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, orderNo = _ref2.orderNo, buyerId = _ref2.buyerId;
+              templateId = _ref2.templateId, workOrderId = _ref2.workOrderId, shopId = _ref2.shopId, record = _ref2.record, orderNo = _ref2.orderNo, buyerId = _ref2.buyerId, buyerNick = _ref2.buyerNick;
               form.resetFields();
               _context2.prev = 2;
               setLoading(true);
@@ -317,8 +331,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,
@@ -329,14 +343,14 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
               } 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) {
-                  console.log(next, next.workOrderComponentType);
-
                   if (next.workOrderComponentType === 'BUYER_NICK_INPUT') {
                     prv["".concat(next.uniqueKey, "_buyerOpenUid")] = buyerId;
+                    prv["".concat(next.uniqueKey, "_buyerNick")] = buyerNick;
                   }
 
                   if (next.workOrderComponentType === 'ENTERPRISE_PAYMENT') {
                     prv["".concat(next.uniqueKey, "_enterprisePaymentBuyerOpenUid")] = buyerId;
+                    prv["".concat(next.uniqueKey, "_enterprisePaymentBuyerNick")] = buyerNick;
                   }
 
                   return prv;
@@ -387,7 +401,8 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
   }();
 
   var closeModal = function closeModal() {
-    return setVisible(false);
+    setVisible(false);
+    form.resetFields();
   };
 
   var openModal = function openModal(_ref4) {
@@ -397,8 +412,8 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
         _ref4$record = _ref4.record,
         record = _ref4$record === void 0 ? {} : _ref4$record,
         orderNo = _ref4.orderNo,
-        buyerId = _ref4.buyerId;
-    // console.log('openModal---------', templateId, shopId, workOrderId, (record = {}));
+        buyerId = _ref4.buyerId,
+        buyerNick = _ref4.buyerNick;
     setVisible(true);
     setTemplateId(templateId);
     setWorkOrderId(workOrderId);
@@ -409,7 +424,8 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
       shopId: shopId,
       record: record,
       orderNo: orderNo,
-      buyerId: buyerId
+      buyerId: buyerId,
+      buyerNick: buyerNick
     });
   };
 
@@ -454,10 +470,11 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
 
   return /*#__PURE__*/_jsx(Drawer, {
     title: (templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.name) || '工单录入',
-    width: '100%',
+    width: '90%',
     open: visible,
     onClose: closeModal,
     footer: renderFooter(),
+    destroyOnClose: true,
     children: /*#__PURE__*/_jsx(Spin, {
       spinning: loading,
       children: /*#__PURE__*/_jsx(ConfigProvider, {

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

@@ -73,7 +73,7 @@
 
   :global(.ant-form-item-label) {
     position: relative;
-    max-width: 72px;
+    max-width: 100px;
     overflow: initial;
     color: rgba(0, 0, 0, 0.55);
     // font-weight: bold;

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

@@ -21,7 +21,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  * @Author: litian
  * @Date: 2022-09-07 17:04:02
  * @LastEditors: litian
- * @LastEditTime: 2022-09-27 18:57:14
+ * @LastEditTime: 2022-09-29 16:19:54
  */
 import React from 'react';
 import { factory } from "../Widget";
@@ -29,6 +29,7 @@ import { calcWorkOrderList } from "../../common/utils/tools";
 import { Modal, Divider } from 'antd';
 import moment from 'moment';
 import { dealWorkOrder } from "../../model/servers/api";
+import { isEmpty } from 'lodash';
 import styles from "./index.module.less";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -277,16 +278,16 @@ function ListOrderItem(props) {
       var subColumns = instance.getColumns(); // 复合组件存在多个字段展示
 
       return subColumns !== null && subColumns !== void 0 && subColumns.children ? subColumns.children.map(function (item) {
-        return ItemView({
+        return !isEmpty(transData[(item === null || item === void 0 ? void 0 : item.dataIndex) || '']) ? ItemView({
           label: item.title,
           value: item.render(transData[(item === null || item === void 0 ? void 0 : item.dataIndex) || ''], transData),
           key: item.dataIndex
-        });
-      }) : ItemView({
+        }) : null;
+      }) : !isEmpty(transData[(subColumns === null || subColumns === void 0 ? void 0 : subColumns.dataIndex) || '']) ? ItemView({
         label: t.name,
         value: instance.render(transData[(subColumns === null || subColumns === void 0 ? void 0 : subColumns.dataIndex) || ''], transData),
         key: t.uniqueKey
-      });
+      }) : null;
     })]
   });
 }

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;
@@ -32,7 +32,7 @@
       }
 
       .orderItemLeftName {
-        width: 115px;
+        // width: 115px;
         line-height: 16px;
       }
     }

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 { get } from 'lodash';
 import { decodeAlipayInfo, editRemitOrder, addPaymentOrder } from "../../model/servers/api";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -134,6 +135,7 @@ function ModifyModal(props, ref) {
 
                 if (success) {
                   message.success('保存成功');
+                  form.resetFields();
                   afterSuccessUpdateWorkOrder && afterSuccessUpdateWorkOrder(1); // 重新查询表格
 
                   setVisible(false);
@@ -151,7 +153,17 @@ function ModifyModal(props, ref) {
         return _ref.apply(this, arguments);
       };
     }()).catch(function (err) {
-      console.log(err);
+      if (get(err, 'errorFields.length') > 0) {
+        setTimeout(function () {
+          var _get;
+
+          var errorList = document.querySelectorAll('.ant-form-item-has-error');
+          (_get = get(errorList, '0')) === null || _get === void 0 ? void 0 : _get.scrollIntoView({
+            block: 'center',
+            behavior: 'smooth'
+          });
+        }, 0);
+      }
     });
   };
 
@@ -207,9 +219,11 @@ function ModifyModal(props, ref) {
     visible: visible,
     width: '90%',
     onClose: function onClose() {
-      return setVisible(false);
+      form.resetFields();
+      setVisible(false);
     },
     title: "\u5F55\u5165\u5DE5\u5355",
+    destroyOnClose: true,
     footer: /*#__PURE__*/_jsxs(Space, {
       style: {
         float: 'right'

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: litian
- * @LastEditTime: 2022-09-22 16:37:15
+ * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
+ * @LastEditTime: 2022-10-09 10:03:00
  */
 import React, { useImperativeHandle, forwardRef, useState } from 'react';
 import { Drawer } from 'antd';
@@ -106,6 +106,7 @@ function RecordModal(props, ref) {
 
   return /*#__PURE__*/_jsx(Drawer, {
     title: "\u8BB0\u5F55",
+    width: '90%',
     visible: visible,
     onClose: function onClose() {
       return setVisible(false);

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

@@ -418,6 +418,7 @@ function PayListOrderItem(props) {
               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/RecordLog/index.js

@@ -120,6 +120,7 @@ var RecordLog = function RecordLog(props, ref) {
 
   return /*#__PURE__*/_jsx(Drawer, {
     visible: visible,
+    width: '90%',
     title: "\u64CD\u4F5C\u8BB0\u5F55",
     onClose: function onClose() {
       return setVisible(false);

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

@@ -22,8 +22,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  * @Description:
  * @Author: litian
  * @Date: 2022-09-15 10:51:44
- * @LastEditors: litian
- * @LastEditTime: 2022-09-28 13:55:39
+ * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
+ * @LastEditTime: 2022-10-11 17:53:02
  */
 import React, { useState, useImperativeHandle, forwardRef } from 'react';
 import { Modal, Form, Select } from 'antd';
@@ -118,6 +118,8 @@ var TransCustomerModal = function TransCustomerModal(props, ref) {
     centered: true,
     visible: visible,
     width: 400,
+    okText: "\u786E\u5B9A",
+    cancelText: "\u53D6\u6D88",
     onCancel: closeModal,
     onOk: handleTransCustomer,
     children: /*#__PURE__*/_jsx(Form.Item, {

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-28 14:37:28
+ * @LastEditTime: 2022-10-10 17:21:00
  */
 import React from 'react';
 import BasicComponent from "../../BasicComponent";

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

@@ -35,7 +35,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * @Author: litian
  * @Date: 2022-08-15 14:37:33
  * @LastEditors: litian
- * @LastEditTime: 2022-09-27 10:55:47
+ * @LastEditTime: 2022-10-12 13:50:58
  */
 import React from 'react';
 import BasicComponent from "../../BasicComponent";
@@ -59,7 +59,7 @@ var EItemSelect = /*#__PURE__*/function (_BasicComponent) {
       return [{
         required: true,
         validator: function validator(_, value) {
-          if (!value) {
+          if (!value || !value.length) {
             return Promise.reject(new Error('请选择宝贝'));
           }
 

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

@@ -35,7 +35,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * @Author: litian
  * @Date: 2022-08-15 14:37:33
  * @LastEditors: litian
- * @LastEditTime: 2022-09-27 16:15:00
+ * @LastEditTime: 2022-10-12 13:51:07
  */
 import React from 'react';
 import BasicComponent from "../../BasicComponent";
@@ -59,7 +59,7 @@ var EItemId = /*#__PURE__*/function (_BasicComponent) {
       return [{
         required: true,
         validator: function validator(_, value) {
-          if (!value) {
+          if (!value || !value.length) {
             return Promise.reject(new Error('请选择宝贝'));
           }
 

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-09-20 09:24:55
+ * @LastEditTime: 2022-10-12 10:40:23
  */
 import React from 'react';
 import Input from "../../basic/Input";
@@ -132,6 +132,14 @@ var ETradeId = /*#__PURE__*/function (_Input) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
+                if (order_no) {
+                  _context.next = 2;
+                  break;
+                }
+
+                return _context.abrupt("return");
+
+              case 2:
                 _this$effects = this.effects, form = _this$effects.form, shopId = _this$effects.shopId, shopList = _this$effects.shopList, templateDetail = _this$effects.templateDetail;
 
                 if (this.time) {
@@ -148,7 +156,7 @@ var ETradeId = /*#__PURE__*/function (_Input) {
                   });
                 }, 1000);
 
-              case 3:
+              case 5:
               case "end":
                 return _context.stop();
             }

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

@@ -35,7 +35,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * @Author: litian
  * @Date: 2022-08-15 14:37:33
  * @LastEditors: litian
- * @LastEditTime: 2022-09-27 10:56:05
+ * @LastEditTime: 2022-10-12 13:50:50
  */
 import React from 'react';
 import BasicComponent from "../../BasicComponent";
@@ -67,7 +67,7 @@ var ItemSelectThird = /*#__PURE__*/function (_BasicComponent) {
       return [{
         required: true,
         validator: function validator(_, value) {
-          if (!value) {
+          if (!value || !value.length) {
             return Promise.reject(new Error('请选择宝贝'));
           }
 

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

@@ -1,4 +1,5 @@
 /// <reference types="react" />
+import './index.less';
 interface WorkOrderProps {
     platform: string;
     shopId?: string;