kmkf-work-order-service-component 0.2.4 → 0.3.0-alpha.2

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

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+declare const DealerSelectModal: () => JSX.Element;
+export default DealerSelectModal;

package/dist/esm/WorkOrder/components/{TransferOrderModal → DealerSelectModal}/index.js

@@ -6,88 +6,74 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+import React, { useEffect } from 'react';
+import { Modal, Select, message } from 'antd';
+import { useSelector, useDispatch } from 'react-redux';
+import { setSelectedUserList, setDealerModalVisible } from "../../../model/selectDealer";
+import { selectorDealerModalVisible, selectorCompanyUserList, selectorSelectedCompanyUserList } from "../../../model/selectDealer/selector";
+import { useAppSelector } from "../../../model/hooks";
+import { selectCurrentRecord, fetchQueryWorkOrder } from "../../../model/workOrder";
+import { appointTo } from "../../../model/servers/api";
+import { jsx as _jsx } from "react/jsx-runtime";
 
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+var DealerSelectModal = function DealerSelectModal() {
+  var visible = useSelector(selectorDealerModalVisible);
+  var companyUserList = useSelector(selectorCompanyUserList);
+  var record = useAppSelector(selectCurrentRecord);
+  useEffect(function () {
+    var _record$handlerList;
+
+    var currentUserList = record === null || record === void 0 ? void 0 : (_record$handlerList = record.handlerList) === null || _record$handlerList === void 0 ? void 0 : _record$handlerList.map(function (item) {
+      return item === null || item === void 0 ? void 0 : item.userKey;
+    });
+    dispatch(setSelectedUserList(currentUserList));
+  }, [record]);
+  var selectedCompanyUserList = useSelector(selectorSelectedCompanyUserList);
+  var dispatch = useDispatch();
+
+  var handleChange = function handleChange(checkedValues) {
+    dispatch(setSelectedUserList(checkedValues));
+  };
 
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+  var handleCancel = function handleCancel() {
+    dispatch({
+      type: 'workOrder/setCurrentCustomizeRecord',
+      payload: {}
+    });
+    dispatch(setDealerModalVisible(false));
+    dispatch(setSelectedUserList([]));
+  }; // 指定处理人
 
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
 
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+  var handleAppointTo = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _yield$appointTo, success, errMsg;
 
-/*
- * @Description:
- * @Author: litian
- * @Date: 2022-09-15 10:51:44
- * @LastEditors: litian
- * @LastEditTime: 2022-11-24 14:13:49
- */
-import React, { useState, useImperativeHandle, forwardRef } from 'react';
-import { Modal, Form, Select } from 'antd';
-import { get } from 'lodash';
-import { querySubUsers } from "../../../model/servers/api";
-import { jsx as _jsx } from "react/jsx-runtime";
-
-var TransCustomerModal = function TransCustomerModal(props, ref) {
-  var _useState = useState(false),
-      _useState2 = _slicedToArray(_useState, 2),
-      visible = _useState2[0],
-      setVisible = _useState2[1];
-
-  var _useState3 = useState([]),
-      _useState4 = _slicedToArray(_useState3, 2),
-      options = _useState4[0],
-      setOptions = _useState4[1];
-
-  var _useState5 = useState({}),
-      _useState6 = _slicedToArray(_useState5, 2),
-      record = _useState6[0],
-      setRecord = _useState6[1];
-
-  var _useState7 = useState([]),
-      _useState8 = _slicedToArray(_useState7, 2),
-      currentCustomer = _useState8[0],
-      setCurrentCustomer = _useState8[1];
-
-  useImperativeHandle(ref, function () {
-    return {
-      openModal: function openModal(result) {
-        setVisible(true);
-        setRecord(result);
-        queryOptions(result.shopId);
-      },
-      closeModal: closeModal,
-      getValue: function getValue() {
-        return currentCustomer;
-      }
-    };
-  }, [currentCustomer]);
-
-  var queryOptions = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(shopId) {
-      var res;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
               _context.next = 2;
-              return querySubUsers({
-                shopId: shopId
+              return appointTo({
+                workOrderUniqueKeys: [record === null || record === void 0 ? void 0 : record.id],
+                companyUserKeys: selectedCompanyUserList
               });
 
             case 2:
-              res = _context.sent;
-              setOptions(get(res, 'data', []).map(function (item) {
-                return {
-                  label: item.subUserName,
-                  value: item.subUserName
-                };
-              }));
-
-            case 4:
+              _yield$appointTo = _context.sent;
+              success = _yield$appointTo.success;
+              errMsg = _yield$appointTo.message;
+
+              if (success) {
+                message.success('转交成功');
+                dispatch(setDealerModalVisible(false));
+                dispatch(setSelectedUserList([]));
+                dispatch(fetchQueryWorkOrder());
+              } else {
+                message.error(errMsg);
+              }
+
+            case 6:
             case "end":
               return _context.stop();
           }
@@ -95,44 +81,30 @@ var TransCustomerModal = function TransCustomerModal(props, ref) {
       }, _callee);
     }));
 
-    return function queryOptions(_x) {
+    return function handleAppointTo() {
       return _ref.apply(this, arguments);
     };
   }();
 
-  var closeModal = function closeModal() {
-    setVisible(false);
-    setOptions([]);
-    setRecord({});
-    setCurrentCustomer([]);
-  };
-
-  var handleTransCustomer = function handleTransCustomer() {
-    if (typeof (props === null || props === void 0 ? void 0 : props.handleTransCustomer) === 'function') {
-      props.handleTransCustomer(record, currentCustomer);
-    }
-  };
-
   return /*#__PURE__*/_jsx(Modal, {
-    title: "\u8F6C\u4EA4\u5BA2\u670D",
-    centered: true,
-    open: visible,
-    width: 400,
+    title: "\u5DE5\u5355\u6307\u6D3E",
+    visible: visible,
     okText: "\u786E\u5B9A",
     cancelText: "\u53D6\u6D88",
-    onCancel: closeModal,
-    onOk: handleTransCustomer,
-    children: /*#__PURE__*/_jsx(Form.Item, {
-      label: "\u8BF7\u9009\u62E9\u8F6C\u4EA4\u5BA2\u670D",
-      children: /*#__PURE__*/_jsx(Select, {
-        mode: "multiple",
-        options: options,
-        value: currentCustomer,
-        onChange: setCurrentCustomer,
-        placeholder: "\u8BF7\u9009\u62E9"
-      })
+    onCancel: handleCancel,
+    onOk: handleAppointTo,
+    children: /*#__PURE__*/_jsx(Select, {
+      mode: "multiple",
+      allowClear: true,
+      style: {
+        width: '100%'
+      },
+      placeholder: "\u8BF7\u9009\u62E9\u5904\u7406\u4EBA",
+      onChange: handleChange,
+      value: selectedCompanyUserList,
+      options: companyUserList
     })
   });
 };
 
-export default /*#__PURE__*/forwardRef(TransCustomerModal);
+export default DealerSelectModal;

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

@@ -30,15 +30,18 @@ import { calcWorkOrderList } from "../../../common/utils/tools";
 import { Divider } from 'antd';
 import moment from 'moment';
 import { isEmpty } from 'lodash';
+import { WORK_ORDER_STATUS, WAITING, HANDLING, STOPPING } from "../../../common/constant";
+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";
 
 function ListOrderItem(props) {
+  var _WORK_ORDER_STATUS$it, _item$jsonMap, _item$handlerList, _item$handlerList$map;
+
   var item = props.item,
       onEdit = props.onEdit,
-      onLog = props.onLog,
-      onTransfer = props.onTransfer;
+      onLog = props.onLog;
   var dispatch = useAppDispatch();
   var componentDtoList = item.templateDetailDto.componentDtoList;
 
@@ -48,6 +51,8 @@ function ListOrderItem(props) {
 
 
   var ItemHeader = function ItemHeader() {
+    var _WORK_ORDER_STATUS, _WORK_ORDER_STATUS2;
+
     // 获取工单状态组件自定义文案
     var showStatusText = function showStatusText(componentDtoList) {
       var status = '';
@@ -66,25 +71,6 @@ function ListOrderItem(props) {
       }
 
       return status;
-    }; // 处理工单状态
-
-
-    var showTextButton = function showTextButton(jsonMap, status) {
-      var msg = '';
-
-      for (var key in jsonMap) {
-        if (jsonMap.hasOwnProperty(key)) {
-          if (~key.indexOf('_status')) {
-            if (jsonMap[key] === '0') {
-              msg = '未' + status;
-            } else if (jsonMap[key] === '1') {
-              msg = '已' + status;
-            }
-          }
-        }
-      }
-
-      return msg;
     };
 
     var id = item.id,
@@ -92,7 +78,6 @@ function ListOrderItem(props) {
         jsonMap = item.jsonMap;
     var componentDtoList = templateDetailDto ? templateDetailDto.componentDtoList : [];
     var status = showStatusText(componentDtoList);
-    var showMsg = showTextButton(jsonMap, status);
     return /*#__PURE__*/_jsx("div", {
       className: styles.orderItem,
       children: /*#__PURE__*/_jsx("div", {
@@ -103,9 +88,12 @@ function ListOrderItem(props) {
             className: styles.orderItemLeftIcon
           }), /*#__PURE__*/_jsxs("div", {
             className: styles.orderItemLeftName,
-            children: [templateDetailDto ? templateDetailDto.name : '', showMsg.length > 1 && /*#__PURE__*/_jsx("div", {
-              className: "".concat(styles.orderItemStatus, " ").concat(showMsg.includes('已') ? styles.done : styles.undo),
-              children: showMsg
+            children: [templateDetailDto ? templateDetailDto.name : '', (jsonMap === null || jsonMap === void 0 ? void 0 : jsonMap.flowStatus) && /*#__PURE__*/_jsx("span", {
+              className: styles.status,
+              style: {
+                background: (_WORK_ORDER_STATUS = WORK_ORDER_STATUS[jsonMap === null || jsonMap === void 0 ? void 0 : jsonMap.flowStatus]) === null || _WORK_ORDER_STATUS === void 0 ? void 0 : _WORK_ORDER_STATUS.bgColor
+              },
+              children: (_WORK_ORDER_STATUS2 = WORK_ORDER_STATUS[jsonMap === null || jsonMap === void 0 ? void 0 : jsonMap.flowStatus]) === null || _WORK_ORDER_STATUS2 === void 0 ? void 0 : _WORK_ORDER_STATUS2.label
             })]
           })]
         })
@@ -114,40 +102,7 @@ function ListOrderItem(props) {
   };
 
   var ItemActions = function ItemActions() {
-    // 获取工单状态组件自定义文案
-    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$componentConfig2 = obj.componentConfig,
-              customStatusText = _obj$componentConfig2.customStatusText,
-              isUseCustomStatus = _obj$componentConfig2.isUseCustomStatus;
-          status = isUseCustomStatus ? customStatusText : '处理';
-          break;
-        }
-      }
-
-      return status;
-    }; // 判断是否存在工单状态组件，并且未处理
-
-
-    var showStatusButton = function showStatusButton(jsonMap) {
-      for (var key in jsonMap) {
-        if (jsonMap.hasOwnProperty(key)) {
-          if (~key.indexOf('_status')) {
-            if (jsonMap[key] === '0') {
-              return true;
-            }
-          }
-        }
-      }
-    }; // 售后打款组件
-
-
+    // 售后打款组件
     var isAfterSalePayment = function isAfterSalePayment(componentDtoList) {
       var len = componentDtoList.length;
 
@@ -160,71 +115,65 @@ function ListOrderItem(props) {
       }
 
       return false;
-    }; //处理工单
-
+    };
 
-    var upDateState = function upDateState(item, status) {
+    var deleteHandle = function deleteHandle(record) {
       dispatch({
         type: 'workOrder/setCurrentCustomizeRecord',
-        payload: item
+        payload: record
       });
       dispatch({
-        type: 'workOrder/setDealCustomizeWorkOrderModalVisible',
+        type: 'workOrder/setDeleteCustomizeWorkOrderModalVisible',
         payload: true
       });
-      dispatch({
-        type: 'workOrder/setCurrentStatusText',
-        payload: status
-      });
-    };
+    }; //转交
 
-    var deleteHandle = function deleteHandle(record) {
+
+    var transferOrder = function transferOrder(record) {
       dispatch({
         type: 'workOrder/setCurrentCustomizeRecord',
         payload: record
       });
       dispatch({
-        type: 'workOrder/setDeleteCustomizeWorkOrderModalVisible',
+        type: 'selectDealer/setDealerModalVisible',
         payload: true
       });
-    }; //转交
-
+    };
 
-    var transferOrder = function transferOrder(item) {
-      onTransfer === null || onTransfer === void 0 ? void 0 : onTransfer(item);
+    var handleChangeStatus = function handleChangeStatus(record) {
+      dispatch({
+        type: 'workOrder/setCurrentCustomizeRecord',
+        payload: record
+      });
+      dispatch(setModalVisible(true));
     };
 
     var templateDetailDto = item.templateDetailDto,
         jsonMap = item.jsonMap;
     var componentDtoList = templateDetailDto ? templateDetailDto.componentDtoList : [];
-    var status = showStatusText(componentDtoList);
-    var hasStatus = showStatusButton(jsonMap);
-    var showEditorBtn = isAfterSalePayment(componentDtoList);
+    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: [hasStatus ? /*#__PURE__*/_jsx("div", {
-        children: /*#__PURE__*/_jsx("span", {
-          className: styles.orderItemOperate,
-          onClick: function onClick() {
-            return upDateState(item, status);
-          },
-          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", {
+      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"
-      }), /*#__PURE__*/_jsx("span", {
+      }), unCompletedStatus && /*#__PURE__*/_jsx("span", {
         className: styles.orderItemOperate,
         onClick: function onClick() {
           return deleteHandle(item);
@@ -266,6 +215,16 @@ function ListOrderItem(props) {
       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: '处理客服',
+      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, {
       dashed: true,
       style: {

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

@@ -36,6 +36,14 @@
         // width: 115px;
         line-height: 16px;
       }
+
+      .status {
+        margin-left: 8px;
+        padding: 2px 4px;
+        font-size: 12px;
+        line-height: 16px;
+        border-radius: 4px;
+      }
     }
 
     .orderItemStatus {

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

@@ -50,7 +50,9 @@ var custom_word = {
   DELETE: '删除',
   DEAL: '处理',
   TRANSFER: '转移工单',
-  ENABLED: '启用/禁用工单'
+  ENABLED: '启用/禁用工单',
+  'QY-CHANGE_QY_WORK_ORDER_HANDLER_LIST': '指定处理人',
+  'QY-CHANGE_QY_WORK_ORDER_FLOW_STATUS': '状态更新'
 };
 
 var RecordLog = function RecordLog(props, ref) {
@@ -197,7 +199,6 @@ var RecordLog = function RecordLog(props, ref) {
               componentConfig: item.componentConfig
             });
             var subColumns = instance.getColumns();
-            console.group('record-log');
 
             if (subColumns !== null && subColumns !== void 0 && subColumns.children) {
               return _toConsumableArray(subColumns.children).map(function (child) {

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

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+declare const StatusSelectModal: () => JSX.Element;
+export default StatusSelectModal;