kmkf-work-order-service-component 0.3.0-alpha.1 → 0.3.0-alpha.3

package/README.md

@@ -63,10 +63,11 @@ const Text = ()=>{
 
 ```
 
-| 字段      | 说明     | 数据类型                             |
-| --------- | -------- | ------------------------------------ |
-| platform  | 平台     | TAOBAO =淘宝\|FXG=抖音\|PDD=拼多多\| |
-| shopId    | 店铺 ID  | number                               |
-| buyerNick | 买家昵称 | string                               |
-| buyerId   | 买家 id  | string                               |
-| orderNo   | 订单 id  | string                               |
+| 字段              | 说明             | 数据类型                             |
+| ----------------- | ---------------- | ------------------------------------ |
+| platform          | 平台             | TAOBAO =淘宝\|FXG=抖音\|PDD=拼多多\| |
+| shopId            | 店铺 ID          | number                               |
+| buyerNick         | 买家昵称         | string                               |
+| buyerId           | 买家 id          | string                               |
+| orderNo           | 订单 id          | string                               |
+| onEmpowerCallback | 授权弹框点击回调 | function                             |

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

@@ -42,6 +42,7 @@ import 'moment/locale/zh-cn';
 import { calcWorkOrderList, submitDataTransOldFormat, orderBack } from "../../../common/utils/tools";
 import { factory } from "../Widget";
 import { queryTemplateDetail, addWorkOrder, queryWorkOrderDetail, updateWorkOrder } from "../../../model/servers/api";
+import { useAppSelector } from "../../../model/hooks";
 import styles from "./index.module.less";
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -91,6 +92,10 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
       setCurrentShopId = _useState14[1]; // 有些组件对于shopId有依赖
 
 
+  var platformInfo = useAppSelector(function (state) {
+    return state.global.platformInfo;
+  });
+
   var _Form$useForm = Form.useForm(),
       _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
       form = _Form$useForm2[0];
@@ -104,7 +109,7 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
 
   var asyncDoSave = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(workOrderDetail, templateDetail) {
-      var data, res, params, submitData, _yield$updateWorkOrde, success, result, _params, hasEnterPrisePayment, getEnterPrisePaymentData, uniqueKey, componentConfig, _yield$addWorkOrder, _success, _result;
+      var data, res, params, submitData, _yield$updateWorkOrde, success, result, platformMap, _params, hasEnterPrisePayment, getEnterPrisePaymentData, uniqueKey, componentConfig, _yield$addWorkOrder, _success, _result;
 
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) {
@@ -170,10 +175,18 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
                 });
               }
 
-              _context.next = 35;
+              _context.next = 36;
               break;
 
             case 23:
+              platformMap = {
+                tb: '淘宝',
+                fxg: '抖音',
+                ks: '快手',
+                pdd: '拼多多',
+                jd: '京东',
+                xiaozhi: '小智'
+              };
               _params = {
                 apiName: 'addWorkOrder',
                 shopId: currentShopId,
@@ -181,7 +194,8 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
                 workOrderComponentVos: [],
                 accessToken: get(find(shopList, function (s) {
                   return s.shopId === currentShopId;
-                }), 'accessToken', '')
+                }), 'accessToken', ''),
+                source: platformMap[platformInfo.platform] || '工单通'
               };
               _params.workOrderComponentVos = submitDataTransOldFormat(data, templateDetail, !!workOrderId, workOrderDetail, _params);
               hasEnterPrisePayment = some(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, function (item) {
@@ -207,12 +221,11 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
                 };
               }
 
-              console.debug('增加数据参数', _params); // return;
-
-              _context.next = 31;
+              console.debug('增加数据参数', _params);
+              _context.next = 32;
               return addWorkOrder(_params);
 
-            case 31:
+            case 32:
               _yield$addWorkOrder = _context.sent;
               _success = _yield$addWorkOrder.success;
               _result = _yield$addWorkOrder.data;
@@ -227,13 +240,13 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
                 });
               }
 
-            case 35:
+            case 36:
               console.groupEnd();
-              _context.next = 41;
+              _context.next = 42;
               break;
 
-            case 38:
-              _context.prev = 38;
+            case 39:
+              _context.prev = 39;
               _context.t0 = _context["catch"](0);
 
               // 表单校验失败错误时，将错误第一项滚动到可视区域
@@ -249,12 +262,12 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
                 }, 0);
               }
 
-            case 41:
+            case 42:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[0, 38]]);
+      }, _callee, null, [[0, 39]]);
     }));
 
     return function asyncDoSave(_x, _x2) {

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

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

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

@@ -7,8 +7,8 @@ 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: wangzhenggui jianjia.wzg@raycloud.com
- * @LastEditTime: 2022-10-26 15:00:58
+ * @LastEditors: litian
+ * @LastEditTime: 2022-12-01 16:30:15
  * @FilePath: /kmkf-work-order-service-component/src/WorkOrder/components/CustomizeFormModal/wrap.tsx
  * @Description:
  *
@@ -19,7 +19,7 @@ import { render as reactRender, unmount as reactUnmount } from 'rc-util/lib/Reac
 import CustomizeFormModal from "./index";
 import { jsx as _jsx } from "react/jsx-runtime";
 
-var openCustomizeWOrkOrder = function openCustomizeWOrkOrder(prefixParams) {
+var openCustomizeWorkOrder = function openCustomizeWorkOrder(prefixParams) {
   return function (params) {
     var container = document.createDocumentFragment();
     var ref = /*#__PURE__*/createRef();
@@ -50,4 +50,4 @@ var openCustomizeWOrkOrder = function openCustomizeWOrkOrder(prefixParams) {
   };
 };
 
-export default openCustomizeWOrkOrder;
+export default openCustomizeWorkOrder;

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

@@ -53,13 +53,22 @@ var DealerSelectModal = function DealerSelectModal() {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              _context.next = 2;
+              if (!((selectedCompanyUserList === null || selectedCompanyUserList === void 0 ? void 0 : selectedCompanyUserList.length) === 0)) {
+                _context.next = 3;
+                break;
+              }
+
+              message.error('指定处理人不能为空');
+              return _context.abrupt("return");
+
+            case 3:
+              _context.next = 5;
               return appointTo({
                 workOrderUniqueKeys: [record === null || record === void 0 ? void 0 : record.id],
                 companyUserKeys: selectedCompanyUserList
               });
 
-            case 2:
+            case 5:
               _yield$appointTo = _context.sent;
               success = _yield$appointTo.success;
               errMsg = _yield$appointTo.message;
@@ -73,7 +82,7 @@ var DealerSelectModal = function DealerSelectModal() {
                 message.error(errMsg);
               }
 
-            case 6:
+            case 9:
             case "end":
               return _context.stop();
           }

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

@@ -35,6 +35,7 @@ import { setModalVisible } from "../../../model/statusSelect";
 import styles from "./index.module.less";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 
 function ListOrderItem(props) {
   var _WORK_ORDER_STATUS$it, _item$jsonMap, _item$handlerList, _item$handlerList$map;
@@ -53,31 +54,8 @@ function ListOrderItem(props) {
   var ItemHeader = function ItemHeader() {
     var _WORK_ORDER_STATUS, _WORK_ORDER_STATUS2;
 
-    // 获取工单状态组件自定义文案
-    var showStatusText = function showStatusText(componentDtoList) {
-      var status = '';
-      var len = componentDtoList.length;
-
-      for (var i = 0; i < len; i++) {
-        var obj = componentDtoList[i];
-
-        if (obj.workOrderComponentType === 'STATUS') {
-          var _obj$componentConfig = obj.componentConfig,
-              customStatusText = _obj$componentConfig.customStatusText,
-              isUseCustomStatus = _obj$componentConfig.isUseCustomStatus;
-          status = isUseCustomStatus ? customStatusText : '处理';
-          break;
-        }
-      }
-
-      return status;
-    };
-
-    var id = item.id,
-        templateDetailDto = item.templateDetailDto,
+    var templateDetailDto = item.templateDetailDto,
         jsonMap = item.jsonMap;
-    var componentDtoList = templateDetailDto ? templateDetailDto.componentDtoList : [];
-    var status = showStatusText(componentDtoList);
     return /*#__PURE__*/_jsx("div", {
       className: styles.orderItem,
       children: /*#__PURE__*/_jsx("div", {
@@ -102,21 +80,6 @@ function ListOrderItem(props) {
   };
 
   var ItemActions = function ItemActions() {
-    // 售后打款组件
-    var isAfterSalePayment = function isAfterSalePayment(componentDtoList) {
-      var len = componentDtoList.length;
-
-      for (var i = 0; i < len; i++) {
-        var obj = componentDtoList[i];
-
-        if (obj.workOrderComponentType === 'AFTER_SALE_PAYMENT') {
-          return true;
-        }
-      }
-
-      return false;
-    };
-
     var deleteHandle = function deleteHandle(record) {
       dispatch({
         type: 'workOrder/setCurrentCustomizeRecord',
@@ -148,37 +111,36 @@ function ListOrderItem(props) {
       dispatch(setModalVisible(true));
     };
 
-    var templateDetailDto = item.templateDetailDto,
-        jsonMap = item.jsonMap;
-    var componentDtoList = templateDetailDto ? templateDetailDto.componentDtoList : [];
+    var jsonMap = item.jsonMap;
     var unCompletedStatus = [WAITING, HANDLING, STOPPING].includes(jsonMap === null || jsonMap === void 0 ? void 0 : jsonMap.flowStatus);
-    var editBtnShow = !isAfterSalePayment(componentDtoList) && unCompletedStatus;
     return /*#__PURE__*/_jsxs("div", {
       className: styles.orderItemRight,
-      children: [/*#__PURE__*/_jsx("span", {
-        className: styles.orderItemOperate,
-        onClick: function onClick() {
-          return handleChangeStatus(item);
-        },
-        children: "\u5904\u7406"
-      }), /*#__PURE__*/_jsx("span", {
-        className: styles.orderItemOperate,
-        onClick: function onClick() {
-          return transferOrder(item);
-        },
-        children: "\u8F6C\u4EA4"
-      }), editBtnShow && /*#__PURE__*/_jsx("span", {
-        className: styles.orderItemOperate,
-        onClick: function onClick() {
-          return onEdit(item);
-        },
-        children: "\u4FEE\u6539"
-      }), unCompletedStatus && /*#__PURE__*/_jsx("span", {
-        className: styles.orderItemOperate,
-        onClick: function onClick() {
-          return deleteHandle(item);
-        },
-        children: "\u5220\u9664"
+      children: [unCompletedStatus && /*#__PURE__*/_jsxs(_Fragment, {
+        children: [/*#__PURE__*/_jsx("span", {
+          className: styles.orderItemOperate,
+          onClick: function onClick() {
+            return handleChangeStatus(item);
+          },
+          children: "\u5904\u7406"
+        }), /*#__PURE__*/_jsx("span", {
+          className: styles.orderItemOperate,
+          onClick: function onClick() {
+            return transferOrder(item);
+          },
+          children: "\u8F6C\u4EA4"
+        }), /*#__PURE__*/_jsx("span", {
+          className: styles.orderItemOperate,
+          onClick: function onClick() {
+            return onEdit(item);
+          },
+          children: "\u4FEE\u6539"
+        }), /*#__PURE__*/_jsx("span", {
+          className: styles.orderItemOperate,
+          onClick: function onClick() {
+            return deleteHandle(item);
+          },
+          children: "\u5220\u9664"
+        })]
       }), /*#__PURE__*/_jsx("span", {
         className: styles.orderItemOperate,
         onClick: function onClick() {
@@ -207,34 +169,29 @@ function ListOrderItem(props) {
 
   return /*#__PURE__*/_jsxs("div", {
     className: styles.listOrderItemBox,
-    children: [/*#__PURE__*/_jsx(ItemHeader, {}), ItemView({
-      label: '提交时间',
-      value: moment(transData.created).format('YYYY-MM-DD HH:mm:ss'),
-      key: 'created'
-    }), ItemView({
-      label: '提交客服',
-      value: transData.submitter,
-      key: 'submitter'
-    }), ItemView({
-      label: '工单状态',
-      value: (_WORK_ORDER_STATUS$it = WORK_ORDER_STATUS[item === null || item === void 0 ? void 0 : (_item$jsonMap = item.jsonMap) === null || _item$jsonMap === void 0 ? void 0 : _item$jsonMap.flowStatus]) === null || _WORK_ORDER_STATUS$it === void 0 ? void 0 : _WORK_ORDER_STATUS$it.label,
-      key: 'flowStatus'
-    }), ItemView({
-      label: '处理客服',
+    children: [/*#__PURE__*/_jsx(ItemHeader, {}), /*#__PURE__*/_jsx(ItemView, {
+      label: "\u63D0\u4EA4\u65F6\u95F4",
+      value: moment(transData.created).format('YYYY-MM-DD HH:mm:ss')
+    }, "created"), /*#__PURE__*/_jsx(ItemView, {
+      label: "\u63D0\u4EA4\u5BA2\u670D",
+      value: transData.submitter
+    }, "submitter"), /*#__PURE__*/_jsx(ItemView, {
+      label: "\u5DE5\u5355\u72B6\u6001",
+      value: (_WORK_ORDER_STATUS$it = WORK_ORDER_STATUS[item === null || item === void 0 ? void 0 : (_item$jsonMap = item.jsonMap) === null || _item$jsonMap === void 0 ? void 0 : _item$jsonMap.flowStatus]) === null || _WORK_ORDER_STATUS$it === void 0 ? void 0 : _WORK_ORDER_STATUS$it.label
+    }, "flowStatus"), /*#__PURE__*/_jsx(ItemView, {
+      label: "\u5904\u7406\u5BA2\u670D",
       value: item === null || item === void 0 ? void 0 : (_item$handlerList = item.handlerList) === null || _item$handlerList === void 0 ? void 0 : (_item$handlerList$map = _item$handlerList.map(function (i) {
         return i.account;
-      })) === null || _item$handlerList$map === void 0 ? void 0 : _item$handlerList$map.join('、'),
-      key: 'handleList'
-    }), /*#__PURE__*/_jsx(Divider, {
+      })) === null || _item$handlerList$map === void 0 ? void 0 : _item$handlerList$map.join('、')
+    }, "handleList"), /*#__PURE__*/_jsx(Divider, {
       dashed: true,
       style: {
         margin: '8px 0'
       }
-    }), ItemView({
-      label: '店铺名称',
-      value: transData.shopName,
-      key: 'shopName'
-    }), componentDtoList.map(function (t) {
+    }), /*#__PURE__*/_jsx(ItemView, {
+      label: "\u5E97\u94FA\u540D\u79F0",
+      value: transData.shopName
+    }, "shopName"), componentDtoList.map(function (t) {
       var instance = factory(t.workOrderComponentType, {
         id: t.uniqueKey,
         name: t.name,
@@ -243,16 +200,14 @@ function ListOrderItem(props) {
       var subColumns = instance.getColumns(); // 复合组件存在多个字段展示
 
       return subColumns !== null && subColumns !== void 0 && subColumns.children ? subColumns.children.map(function (item) {
-        return !isEmpty(transData[(item === null || item === void 0 ? void 0 : item.dataIndex) || '']) ? ItemView({
+        return !isEmpty(transData[(item === null || item === void 0 ? void 0 : item.dataIndex) || '']) ? /*#__PURE__*/_jsx(ItemView, {
           label: item.title,
-          value: item.render(transData[(item === null || item === void 0 ? void 0 : item.dataIndex) || ''], transData),
-          key: item.dataIndex
-        }) : null;
-      }) : !isEmpty(transData[(subColumns === null || subColumns === void 0 ? void 0 : subColumns.dataIndex) || '']) ? ItemView({
+          value: item.render(transData[(item === null || item === void 0 ? void 0 : item.dataIndex) || ''], transData)
+        }, item.dataIndex) : null;
+      }) : !isEmpty(transData[(subColumns === null || subColumns === void 0 ? void 0 : subColumns.dataIndex) || '']) ? /*#__PURE__*/_jsx(ItemView, {
         label: t.name,
-        value: instance.render(transData[(subColumns === null || subColumns === void 0 ? void 0 : subColumns.dataIndex) || ''], transData),
-        key: t.uniqueKey
-      }) : null;
+        value: instance.render(transData[(subColumns === null || subColumns === void 0 ? void 0 : subColumns.dataIndex) || ''], transData)
+      }, t.uniqueKey) : null;
     }), /*#__PURE__*/_jsx(Divider, {
       dashed: true,
       style: {

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

@@ -101,9 +101,7 @@ function ModifyModal(props, ref) {
   var handleOk = function handleOk() {
     form.validateFields().then( /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(values) {
-        var _shopList$find;
-
-        var id, shopSourceStr, newValue, api, shopId, shopName, _shopList, other, _yield$api, success;
+        var id, newValue, api, shopId, shopName, _shopList, other, _yield$api, success;
 
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) {
@@ -111,16 +109,18 @@ function ModifyModal(props, ref) {
               case 0:
                 //非淘宝账户支付宝姓名和支付宝账号必填
                 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))) {
+                if (!(values !== null && values !== void 0 && values.accountNick || values !== null && values !== void 0 && values.accountNo)) {
+                  _context.next = 5;
+                  break;
+                }
+
+                if (values !== null && values !== void 0 && values.accountNick && values !== null && values !== void 0 && values.accountNo) {
                   _context.next = 5;
                   break;
                 }
 
-                message.error('请输入支付宝姓名和支付宝账号');
+                message.error('支付宝姓名/账号都要填写');
                 return _context.abrupt("return");
 
               case 5:
@@ -131,7 +131,9 @@ function ModifyModal(props, ref) {
                   shopId = record.shopId, shopName = record.shopName, _shopList = record.shopList, other = _objectWithoutProperties(record, _excluded);
                   newValue = _objectSpread(_objectSpread({}, other), values);
                 } else {
-                  newValue = _objectSpread(_objectSpread({}, values), shopInfo);
+                  newValue = _objectSpread(_objectSpread(_objectSpread({}, values), shopInfo), {}, {
+                    buyerOpenUid: record.buyerOpenUid
+                  });
                 }
 
                 _context.next = 10;
@@ -224,12 +226,12 @@ function ModifyModal(props, ref) {
   }();
 
   var TidChangeHandle = function TidChangeHandle(e) {
-    var _shopList$find2;
+    var _shopList$find;
 
     var order_no = e.target.value;
-    var taobaoId = (_shopList$find2 = shopList.find(function (item) {
+    var taobaoId = (_shopList$find = shopList.find(function (item) {
       return item.shopSourceStr === 'TAOBAO' && item.shopId == platformInfo.shopId;
-    })) === null || _shopList$find2 === void 0 ? void 0 : _shopList$find2.taobaoId; //淘宝订单买家id返填
+    })) === null || _shopList$find === void 0 ? void 0 : _shopList$find.taobaoId; //淘宝订单买家id返填
 
     if (taobaoId) {
       clearTimeout(time.current);
@@ -330,18 +332,10 @@ function ModifyModal(props, ref) {
           label: "\u4E70\u5BB6\u6635\u79F0",
           name: "buyerNick",
           rules: [{
-            required: true,
+            required: false,
             message: '请输入买家昵称'
           }],
           children: /*#__PURE__*/_jsx(Input, {})
-        }), /*#__PURE__*/_jsx(Form.Item, {
-          label: "\u4E70\u5BB6\u6635\u79F0id",
-          name: "buyerOpenUid",
-          rules: [{
-            required: true,
-            message: '请输入买家昵称id'
-          }],
-          children: /*#__PURE__*/_jsx(Input, {})
         }), /*#__PURE__*/_jsx(Form.Item, {
           label: "\u8BA2\u5355\u7F16\u53F7",
           name: "tid",

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

@@ -0,0 +1,6 @@
+/// <reference types="react" />
+interface ReminderProps {
+    callback?: () => void;
+}
+declare function Reminder(props: ReminderProps): JSX.Element;
+export default Reminder;

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

@@ -0,0 +1,71 @@
+/*
+ * @Description:
+ * @Author: litian
+ * @Date: 2022-09-15 15:00:37
+ * @LastEditors: litian
+ * @LastEditTime: 2022-09-29 09:13:26
+ */
+import React from 'react';
+import { message, Button } from 'antd';
+import styles from "./index.module.less";
+import copy from 'copy-to-clipboard';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+
+function Reminder(props) {
+  var callback = props.callback;
+
+  var copyHandle = function copyHandle() {
+    copy('https://kefu.kuaimai.com/qiye/enterprise.html#/main/shopManage');
+    message.success('工单授权页复制链接成功');
+    callback === null || callback === void 0 ? void 0 : callback();
+  };
+
+  return /*#__PURE__*/_jsx("div", {
+    className: styles.reminder,
+    children: /*#__PURE__*/_jsxs("div", {
+      className: styles.reminder_box,
+      children: [/*#__PURE__*/_jsx("div", {
+        className: styles.tip_error,
+        children: "\u5F02\u5E38\u63D0\u9192"
+      }), /*#__PURE__*/_jsxs("div", {
+        className: "".concat(styles.color_565960, " ").concat(styles.mb_16),
+        children: ["\u5E97\u94FA", /*#__PURE__*/_jsx("span", {
+          className: styles.color_F40500,
+          children: "\u672A\u6388\u6743"
+        }), "\u6216", /*#__PURE__*/_jsx("span", {
+          className: styles.color_F40500,
+          children: "\u6388\u6743\u5931\u6548"
+        }), "\u6216", /*#__PURE__*/_jsx("span", {
+          className: styles.color_F40500,
+          children: "\u6CA1\u6709\u5E97\u94FA\u6743\u9650"
+        })]
+      }), /*#__PURE__*/_jsx("div", {
+        className: styles.title,
+        children: "\u672A\u6388\u6743\u6D41\u7A0B"
+      }), /*#__PURE__*/_jsxs("div", {
+        className: styles.mb_8,
+        children: ["1.\u767B\u5F55\u4F01\u4E1A\u5DE5\u5355", /*#__PURE__*/_jsx("br", {}), "2.\u8FDB\u5165\u7CFB\u7EDF\u8BBE\u7F6E-\u5E97\u94FA\u7BA1\u7406-\u3010\u70B9\u51FB\u6DFB\u52A0\u5E97\u94FA\u3011"]
+      }), /*#__PURE__*/_jsx("div", {
+        className: styles.title,
+        children: "\u6388\u6743\u5931\u6548\u6D41\u7A0B"
+      }), /*#__PURE__*/_jsxs("div", {
+        children: ["1.\u767B\u5F55\u4F01\u4E1A\u5DE5\u5355", /*#__PURE__*/_jsx("br", {}), "2.\u8FDB\u5165\u7CFB\u7EDF\u8BBE\u7F6E-\u5E97\u94FA\u7BA1\u7406-\u627E\u5230\u5BF9\u5E94\u7684\u5E97\u94FA-\u70B9\u51FB\u3010\u91CD\u65B0\u6388\u6743\u3011"]
+      }), /*#__PURE__*/_jsx("br", {}), /*#__PURE__*/_jsx("div", {
+        className: styles.title,
+        children: "\u6CA1\u6709\u5E97\u94FA\u6743\u9650\u6D41\u7A0B"
+      }), /*#__PURE__*/_jsxs("div", {
+        children: ["1.\u767B\u5F55\u4F01\u4E1A\u5DE5\u5355", /*#__PURE__*/_jsx("br", {}), "2.\u8FDB\u5165\u7CFB\u7EDF\u8BBE\u7F6E-\u5458\u5DE5\u6743\u9650-\u3010\u7F16\u8F91\u3011-\u4FEE\u6539\u5E97\u94FA\u6743\u9650"]
+      }), /*#__PURE__*/_jsx("div", {
+        className: styles.reminder_footer,
+        children: /*#__PURE__*/_jsx(Button, {
+          type: "primary",
+          onClick: copyHandle,
+          children: "\u7ACB\u5373\u6388\u6743"
+        })
+      })]
+    })
+  });
+}
+
+export default Reminder;

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

@@ -0,0 +1,57 @@
+.reminder {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 10;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: rgba(0, 0, 0, 0.3);
+}
+
+.reminder_box {
+  width: 320px;
+  padding: 24px;
+  color: rgba(86, 89, 96, 0.65);
+  font-size: 14px;
+  background-color: #fff;
+  border-radius: 4px;
+}
+
+.tip_error {
+  margin-bottom: 16px;
+  color: rgba(0, 0, 0, 0.85);
+  font-size: 16px;
+}
+
+.color_565960 {
+  color: #565960;
+}
+
+.color_F40500 {
+  color: #f40500;
+}
+
+.title {
+  margin-bottom: 8px;
+  color: rgba(0, 0, 0, 0.65);
+}
+
+.mb_8 {
+  margin-bottom: 8px;
+}
+
+.mb_16 {
+  margin-bottom: 16px;
+}
+
+.reminder_footer {
+  margin-top: 24px;
+  text-align: center;
+}
+
+.ant-modal-confirm .ant-modal-confirm-btns {
+  text-align: center !important;
+}

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

@@ -87,7 +87,7 @@ var StatusSelectModal = function StatusSelectModal() {
       return message.warn('当前工单不可以设置为暂停中状态');
     }
 
-    if (val === WAITING && !(existStatusWorkOrder(record === null || record === void 0 ? void 0 : record.jsonMap, HANDLING) || enterprisePaymentStatus && checkPaymentStatus(['未打款'])([record], enterprisePaymentStatus))) {
+    if (val === WAITING && !(existStatusWorkOrder(record === null || record === void 0 ? void 0 : record.jsonMap, HANDLING) || existStatusWorkOrder(record === null || record === void 0 ? void 0 : record.jsonMap, STOPPING) || enterprisePaymentStatus && checkPaymentStatus(['未打款'])([record], enterprisePaymentStatus))) {
       return message.warn('当前工单不可以设置为待处理状态');
     }
 

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

@@ -1,10 +1,6 @@
 /// <reference types="react" />
 import BasicComponent from '../../BasicComponent';
-import EBuyerName from '../EBuyerName';
-import EBuyerOpenUid from '../EBuyerOpenUid';
 declare class EBuyerNick extends BasicComponent {
-    buyerNick: EBuyerName;
-    buyerOpenUid: EBuyerOpenUid;
     constructor(options: any);
     customRules: (config: any) => {
         validator: (_: any, value: {
@@ -12,8 +8,7 @@ declare class EBuyerNick extends BasicComponent {
             buyerOpenUid: any;
         }) => Promise<void>;
     }[];
-    render: () => null;
+    render: (value: any, record: any) => JSX.Element;
     editRender: (value: any) => JSX.Element;
-    getColumns: () => any;
 }
 export default EBuyerNick;

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

@@ -31,13 +31,11 @@ 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 18:02:16
+ * @LastEditTime: 2022-11-30 14:34:16
  */
 import React from 'react';
 import { BuyerNick } from '@raycloud-apaas-fe-setup/apaas-react-basics-widgets';
 import BasicComponent from "../../BasicComponent";
-import EBuyerName from "../EBuyerName";
-import EBuyerOpenUid from "../EBuyerOpenUid";
 import { getFormItem } from "../../common/formItemWrap";
 import { jsx as _jsx } from "react/jsx-runtime";
 
@@ -55,10 +53,6 @@ var EBuyerNick = /*#__PURE__*/function (_BasicComponent) {
 
     _this = _super.call(this, options);
 
-    _defineProperty(_assertThisInitialized(_this), "buyerNick", void 0);
-
-    _defineProperty(_assertThisInitialized(_this), "buyerOpenUid", void 0);
-
     _defineProperty(_assertThisInitialized(_this), "customRules", function (config) {
       return [{
         validator: function validator(_, value) {
@@ -66,53 +60,30 @@ var EBuyerNick = /*#__PURE__*/function (_BasicComponent) {
             return Promise.reject(new Error('请输入买家旺旺'));
           }
 
-          var _this$componentConfig = _this.componentConfig,
-              shopList = _this$componentConfig.shopList,
-              shopId = _this$componentConfig.shopId;
-          var isTaoBao = shopList.some(function (item) {
-            return item.shopId === shopId && item.shopSourceStr === 'TAOBAO';
-          });
-
-          if (isTaoBao && !(value !== null && value !== void 0 && value.buyerOpenUid)) {
-            return Promise.reject(new Error('请输入买家旺旺id'));
-          }
-
           return Promise.resolve();
         }
       }];
     });
 
-    _defineProperty(_assertThisInitialized(_this), "render", function () {
-      return null;
+    _defineProperty(_assertThisInitialized(_this), "render", function (value, record) {
+      return /*#__PURE__*/_jsx("span", {
+        children: value === null || value === void 0 ? void 0 : value.buyerNick
+      });
     });
 
     _defineProperty(_assertThisInitialized(_this), "editRender", function (value) {
-      var _this$componentConfig2, _this$componentConfig3;
+      var _this$componentConfig, _this$componentConfig2;
 
       return getFormItem(_objectSpread({
         title: _this.name,
         name: _this.id,
-        rules: (_this$componentConfig2 = _this.componentConfig) !== null && _this$componentConfig2 !== void 0 && _this$componentConfig2.required ? _this.customRules(_this.componentConfig) : [],
-        required: (_this$componentConfig3 = _this.componentConfig) === null || _this$componentConfig3 === void 0 ? void 0 : _this$componentConfig3.required,
+        rules: (_this$componentConfig = _this.componentConfig) !== null && _this$componentConfig !== void 0 && _this$componentConfig.required ? _this.customRules(_this.componentConfig) : [],
+        required: (_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.required,
         component: /*#__PURE__*/_jsx(BuyerNick, _objectSpread({}, _this.componentConfig))
       }, value));
     });
 
-    _defineProperty(_assertThisInitialized(_this), "getColumns", function () {
-      return {
-        title: _this.name,
-        children: [_this.buyerNick.getColumns(), _this.buyerOpenUid.getColumns()],
-        canHidden: _this.canHidden,
-        dataIndex: _this.id
-      };
-    });
-
-    _this.buyerNick = new EBuyerName(_objectSpread(_objectSpread({}, options), {}, {
-      name: '买家旺旺'
-    }));
-    _this.buyerOpenUid = new EBuyerOpenUid(_objectSpread(_objectSpread({}, options), {}, {
-      name: '买家旺旺id'
-    }));
+    _this.canFilter = true;
     _this.canHidden = true;
     _this.effects = options.effects;
     _this.componentConfig = _objectSpread(_objectSpread({}, options.componentConfig), {}, {

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

@@ -4,7 +4,6 @@ import AlipayNick from './AlipayNick';
 import PaymentStatus from './PaymentStatus';
 import PaymentAmount from './PaymentAmount';
 import BuyerNick from './BuyerNick';
-import BuyerOpenUid from './BuyerOpenUid';
 import PaymentTid from './PaymentTid';
 import AlipayNo from './AlipayNo';
 import PayTime from './PayTime';
@@ -13,7 +12,6 @@ declare class Payment extends BasicComponent {
     paymentStatus: PaymentStatus;
     paymentAmount: PaymentAmount;
     buyerNick: BuyerNick;
-    buyerOpenUid: BuyerOpenUid;
     paymentTid: PaymentTid;
     alipayNo: AlipayNo;
     payTime: PayTime;

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

@@ -40,7 +40,6 @@ import AlipayNick from "./AlipayNick";
 import PaymentStatus from "./PaymentStatus";
 import PaymentAmount from "./PaymentAmount";
 import BuyerNick from "./BuyerNick";
-import BuyerOpenUid from "./BuyerOpenUid";
 import PaymentTid from "./PaymentTid";
 import AlipayNo from "./AlipayNo";
 import PayTime from "./PayTime";
@@ -69,8 +68,6 @@ var Payment = /*#__PURE__*/function (_BasicComponent) {
 
     _defineProperty(_assertThisInitialized(_this), "buyerNick", void 0);
 
-    _defineProperty(_assertThisInitialized(_this), "buyerOpenUid", void 0);
-
     _defineProperty(_assertThisInitialized(_this), "paymentTid", void 0);
 
     _defineProperty(_assertThisInitialized(_this), "alipayNo", void 0);
@@ -88,21 +85,6 @@ var Payment = /*#__PURE__*/function (_BasicComponent) {
             return Promise.reject(new Error('打款金额最多2位小数'));
           }
 
-          if (config.required && !(value !== null && value !== void 0 && value.enterprisePaymentBuyerNick)) {
-            return Promise.reject(new Error('请输入买家昵称'));
-          }
-
-          var _this$componentConfig = _this.componentConfig,
-              shopList = _this$componentConfig.shopList,
-              shopId = _this$componentConfig.shopId;
-          var isTaoBao = shopList.some(function (item) {
-            return item.shopId === shopId && item.shopSourceStr === 'TAOBAO';
-          });
-
-          if (config.required && isTaoBao && !(value !== null && value !== void 0 && value.enterprisePaymentBuyerOpenUid)) {
-            return Promise.reject(new Error('请输入买家昵称id'));
-          }
-
           if (config.required && !(value !== null && value !== void 0 && value.enterprisePaymentTid)) {
             return Promise.reject(new Error('请输入订单编号'));
           } else if (value.enterprisePaymentTid && !/^[0-9a-zA-Z_-]{1,}$/.test(value.enterprisePaymentTid)) {
@@ -117,6 +99,13 @@ var Payment = /*#__PURE__*/function (_BasicComponent) {
             return Promise.reject(new Error('请输入支付宝账号'));
           } else if (value.enterprisePaymentAlipayNo && !/^(?:1[3-9]\d{9}|[a-zA-Z\d._-]*\@[a-zA-Z\d.-]{1,10}\.[a-zA-Z\d]{1,20})$/.test(value.enterprisePaymentAlipayNo)) {
             return Promise.reject(new Error('请输入正确的支付宝账号格式'));
+          } //支付宝信息不能只填一个，否则不能打款
+
+
+          if (value !== null && value !== void 0 && value.enterprisePaymentAlipayNick || value !== null && value !== void 0 && value.enterprisePaymentAlipayNo) {
+            if (!(value !== null && value !== void 0 && value.enterprisePaymentAlipayNick && value !== null && value !== void 0 && value.enterprisePaymentAlipayNo)) {
+              return Promise.reject(new Error('支付宝姓名/账号都要填写'));
+            }
           }
 
           return Promise.resolve();
@@ -129,13 +118,13 @@ var Payment = /*#__PURE__*/function (_BasicComponent) {
     });
 
     _defineProperty(_assertThisInitialized(_this), "editRender", function (value) {
-      var _this$componentConfig2;
+      var _this$componentConfig;
 
       return getFormItem(_objectSpread({
         title: _this.name,
         name: _this.id,
         rules: _this.customRules(_this.componentConfig),
-        required: (_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.required,
+        required: (_this$componentConfig = _this.componentConfig) === null || _this$componentConfig === void 0 ? void 0 : _this$componentConfig.required,
         component: /*#__PURE__*/_jsx(ApaasPayment, _objectSpread(_objectSpread({}, _this.componentConfig), {}, {
           onSearch: function onSearch(e) {
             return _this.changeHandle(e.target.value);
@@ -147,7 +136,8 @@ var Payment = /*#__PURE__*/function (_BasicComponent) {
     _defineProperty(_assertThisInitialized(_this), "getColumns", function () {
       return {
         title: _this.name,
-        children: [_this.paymentTid.getColumns(), _this.paymentStatus.getColumns(), _this.paymentAmount.getColumns(), _this.buyerNick.getColumns(), _this.buyerOpenUid.getColumns(), _this.alipayNick.getColumns(), _this.alipayNo.getColumns(), _this.payTime.getColumns()],
+        children: [_this.paymentTid.getColumns(), _this.paymentStatus.getColumns(), _this.paymentAmount.getColumns(), _this.buyerNick.getColumns(), // this.buyerOpenUid.getColumns(),
+        _this.alipayNick.getColumns(), _this.alipayNo.getColumns(), _this.payTime.getColumns()],
         canHidden: _this.canHidden,
         dataIndex: _this.id
       };
@@ -162,9 +152,6 @@ var Payment = /*#__PURE__*/function (_BasicComponent) {
     _this.buyerNick = new BuyerNick(_objectSpread(_objectSpread({}, options), {}, {
       name: '买家昵称'
     }));
-    _this.buyerOpenUid = new BuyerOpenUid(_objectSpread(_objectSpread({}, options), {}, {
-      name: '买家昵称id'
-    }));
     _this.paymentTid = new PaymentTid(_objectSpread(_objectSpread({}, options), {}, {
       name: '订单编号'
     }));

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

@@ -14,6 +14,7 @@ interface WorkOrderProps {
     buyerNick?: string;
     buyerId?: string;
     orderNo?: string;
+    onEmpowerCallback?: () => void;
 }
 declare const ProviderWrap: (props: WorkOrderProps) => JSX.Element;
 export default ProviderWrap;

package/dist/esm/WorkOrder/index.js

@@ -26,7 +26,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  *
  * Copyright (c) 2022 by wangzhenggui jianjia.wzg@raycloud.com, All Rights Reserved.
  */
-import React, { useState, useEffect, useRef, useLayoutEffect } from 'react';
+import React, { useState, useEffect, useRef, useLayoutEffect, useMemo } from 'react';
 import { Tabs, Select, Pagination, Cascader, DatePicker, Space, Checkbox, Spin, message } from 'antd';
 import { useAppSelector, useAppDispatch } from "../model/hooks";
 import { fetchQueryGroupCustomTemplate, fetchQueryWorkOrder, fetchQueryCurrentCompanyUser, fetchQueryPaymentWorkOrderList } from "../model/workOrder";
@@ -46,6 +46,7 @@ import UnExamineModal from "./components/UnExamineModal";
 import DeletePaymentWorkOrderModal from "./components/DeletePaymentWorkOrderModal";
 import FlagPayModal from "./components/FlagPayModal";
 import RecordLog from "./components/RecordLog";
+import Reminder from "./components/Reminder";
 import store from "../model/store";
 import { Provider } from 'react-redux';
 import refreshImg from "../common/imgs/refresh.png";
@@ -54,6 +55,7 @@ import moment from 'moment';
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 var Option = Select.Option;
 var RangePicker = DatePicker.RangePicker;
 export var PlatForm;
@@ -72,13 +74,17 @@ var WorkOrder = function WorkOrder(props) {
       shopId = props.shopId,
       buyerNick = props.buyerNick,
       buyerId = props.buyerId,
-      orderNo = props.orderNo;
+      orderNo = props.orderNo,
+      onEmpowerCallback = props.onEmpowerCallback;
   var dispatch = useAppDispatch();
   var loading = useAppSelector(function (state) {
     var _state$workOrder;
 
     return (_state$workOrder = state.workOrder) === null || _state$workOrder === void 0 ? void 0 : _state$workOrder.loading;
   });
+  var shopList = useAppSelector(function (state) {
+    return state.workOrder.userInfo.shopList;
+  });
 
   var _useState = useState('custom'),
       _useState2 = _slicedToArray(_useState, 2),
@@ -131,37 +137,48 @@ var WorkOrder = function WorkOrder(props) {
     dispatch(fetchQueryCurrentCompanyUser());
     express.initData();
     formatAddrData.initData();
-  };
+  }; //判断是否店铺是否授权
 
-  return /*#__PURE__*/_jsx(Spin, {
-    spinning: loading,
-    children: /*#__PURE__*/_jsxs("div", {
-      id: "customize-work-order-component",
-      className: "order_container ".concat(platform === PlatForm.FXG ? '' : 'order_container_padding_bottom'),
-      children: [/*#__PURE__*/_jsx("header", {
-        className: "order_header",
-        children: /*#__PURE__*/_jsxs("div", {
-          className: "order_header_tabs",
-          children: [/*#__PURE__*/_jsx("div", {
-            className: "order_header_tabs_button ".concat(tabActive === 'custom' ? 'active' : ''),
-            onClick: function onClick() {
-              return setTabActive('custom');
-            },
-            children: "\u81EA\u5B9A\u4E49\u5DE5\u5355"
-          }), /*#__PURE__*/_jsx("div", {
-            className: "order_header_tabs_button border_left ".concat(tabActive === 'payment' ? 'active' : ''),
-            onClick: function onClick() {
-              return setTabActive('payment');
-            },
-            children: "\u6253\u6B3E\u5DE5\u5355"
-          })]
-        })
-      }), /*#__PURE__*/_jsx(OrderList, {
-        tabActive: tabActive
-      }), /*#__PURE__*/_jsx(PayOrderList, {
-        tabActive: tabActive
-      })]
-    })
+
+  var isEmpower = useMemo(function () {
+    console.log(shopList);
+    return (shopList || []).some(function (item) {
+      return item.shopId == shopId;
+    });
+  }, [shopList]);
+  return /*#__PURE__*/_jsxs(_Fragment, {
+    children: [/*#__PURE__*/_jsx(Spin, {
+      spinning: loading,
+      children: /*#__PURE__*/_jsxs("div", {
+        id: "customize-work-order-component",
+        className: "order_container ".concat(platform === PlatForm.FXG ? '' : 'order_container_padding_bottom'),
+        children: [/*#__PURE__*/_jsx("header", {
+          className: "order_header",
+          children: /*#__PURE__*/_jsxs("div", {
+            className: "order_header_tabs",
+            children: [/*#__PURE__*/_jsx("div", {
+              className: "order_header_tabs_button ".concat(tabActive === 'custom' ? 'active' : ''),
+              onClick: function onClick() {
+                return setTabActive('custom');
+              },
+              children: "\u81EA\u5B9A\u4E49\u5DE5\u5355"
+            }), /*#__PURE__*/_jsx("div", {
+              className: "order_header_tabs_button border_left ".concat(tabActive === 'payment' ? 'active' : ''),
+              onClick: function onClick() {
+                return setTabActive('payment');
+              },
+              children: "\u6253\u6B3E\u5DE5\u5355"
+            })]
+          })
+        }), /*#__PURE__*/_jsx(OrderList, {
+          tabActive: tabActive
+        }), /*#__PURE__*/_jsx(PayOrderList, {
+          tabActive: tabActive
+        })]
+      })
+    }), !isEmpower && Reminder({
+      callback: onEmpowerCallback
+    })]
   });
 };
 

package/dist/esm/model/workOrder.js

@@ -294,31 +294,35 @@ export var workOrderSlice = createSlice({
       var list = action.payload;
       var groupList = [];
       var tempList = [];
-      var groupAllList = list.map(function (item) {
-        var groupId = item.groupId,
-            groupName = item.groupName,
-            rankNum = item.rankNum;
-        groupList.push({
-          groupId: groupId,
-          groupName: groupName,
-          rankNum: rankNum
-        });
-        var children = item.workOrderTemplates.filter(function (t) {
-          t.label = t.name;
-          t.value = t.uniqueKey;
-
-          if (t.enabled) {
-            tempList.push(t);
-          }
-
-          return !item.enabled;
-        });
-        return {
-          label: item.groupName,
-          value: item.groupId,
-          children: children
-        };
-      });
+      var groupAllList = list.reduce(function (prv, item) {
+        if (item.workOrderTemplates.length) {
+          var groupId = item.groupId,
+              groupName = item.groupName,
+              rankNum = item.rankNum;
+          groupList.push({
+            groupId: groupId,
+            groupName: groupName,
+            rankNum: rankNum
+          });
+          var children = item.workOrderTemplates.filter(function (t) {
+            t.label = t.name;
+            t.value = t.uniqueKey;
+
+            if (t.enabled) {
+              tempList.push(t);
+            }
+
+            return !item.enabled;
+          });
+          prv.push({
+            label: item.groupName,
+            value: item.groupId,
+            children: children
+          });
+        }
+
+        return prv;
+      }, []);
       state.groupAllList = groupAllList;
       state.customSearch.tempSelect = (groupAllList === null || groupAllList === void 0 ? void 0 : groupAllList.length) && [(_groupAllList$ = groupAllList[0]) === null || _groupAllList$ === void 0 ? void 0 : _groupAllList$.value, (_groupAllList$2 = groupAllList[0]) === null || _groupAllList$2 === void 0 ? void 0 : (_groupAllList$2$child = _groupAllList$2.children[0]) === null || _groupAllList$2$child === void 0 ? void 0 : _groupAllList$2$child.value];
     }), builder.addCase(fetchQueryWorkOrder.pending, function (state) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kmkf-work-order-service-component",
-  "version": "0.3.0-alpha.1",
+  "version": "0.3.0-alpha.3",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -39,8 +39,9 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.0.27-alpha.1",
+    "@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.0.28-alpha.3",
     "@reduxjs/toolkit": "^1.8.5",
+    "copy-to-clipboard": "^3.3.3",
     "js-md5": "^0.7.3",
     "react-redux": "^7.2.8",
     "store2": "^2.14.2",