kmkf-work-order-service-component 0.0.1 → 0.1.1-alpha.2

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

@@ -20,13 +20,13 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  * @Description:
  * @Author: litian
  * @Date: 2022-09-07 17:04:02
- * @LastEditors: litian
- * @LastEditTime: 2022-09-29 16:19:54
+ * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
+ * @LastEditTime: 2022-10-19 18:58:21
  */
 import React from 'react';
 import { factory } from "../Widget";
 import { calcWorkOrderList } from "../../common/utils/tools";
-import { Modal, Divider } from 'antd';
+import { Modal, Divider, Popconfirm } from 'antd';
 import moment from 'moment';
 import { dealWorkOrder } from "../../model/servers/api";
 import { isEmpty } from 'lodash';
@@ -39,7 +39,8 @@ function ListOrderItem(props) {
       onEdit = props.onEdit,
       onLog = props.onLog,
       onRefresh = props.onRefresh,
-      onTransfer = props.onTransfer;
+      onTransfer = props.onTransfer,
+      onDelete = props.onDelete;
   var componentDtoList = item.templateDetailDto.componentDtoList;
 
   var _calcWorkOrderList = calcWorkOrderList([_objectSpread({}, item)], componentDtoList),
@@ -223,6 +224,17 @@ function ListOrderItem(props) {
             return onEdit(item);
           },
           children: "\u4FEE\u6539"
+        }), /*#__PURE__*/_jsx(Popconfirm, {
+          title: "\u5220\u9664\u5DE5\u5355\u540E\u5C06\u65E0\u6CD5\u6062\u590D\uFF0C\u786E\u8BA4\u8981\u5220\u9664\u8BE5\u6761\u6570\u636E\u5417\uFF1F",
+          onConfirm: function onConfirm() {
+            return onDelete(item);
+          },
+          okText: "\u786E\u5B9A",
+          cancelText: "\u53D6\u6D88",
+          children: /*#__PURE__*/_jsx("span", {
+            className: styles.orderItemOperate,
+            children: "\u5220\u9664"
+          })
         }), /*#__PURE__*/_jsx("span", {
           className: styles.orderItemOperate,
           onClick: function onClick() {

package/dist/esm/WorkOrder/index.js

@@ -27,8 +27,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 /*
  * @Author: wangzhenggui jianjia.wzg@raycloud.com
  * @Date: 2022-09-16 11:19:43
- * @LastEditors: litian
- * @LastEditTime: 2022-10-12 17:04:02
+ * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
+ * @LastEditTime: 2022-10-20 14:56:08
  * @FilePath: /kmkf-work-order-service-component/src/WorkOrder/index.tsx
  * @Description:
  *
@@ -38,7 +38,7 @@ import React, { useState, useEffect, useRef } from 'react';
 import Wrapper from "./components/Wrapper";
 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";
+import { fetchQueryGroupCustomTemplate, fetchQueryWorkOrder, fetchQueryCurrentCompanyUser, fetchQueryPaymentWorkOrderList, fetchDeleteWorkOrder } from "./model/workOrder";
 import CustomizeFormModal from "./components/CustomizeFormModal";
 import PayOrderModal from "./components/PayListOrderItem/ModifyModal";
 import express from "./common/utils/express";
@@ -258,18 +258,70 @@ var OrderList = function OrderList(tabActive) {
     recordLogRef.current.open(item);
   };
 
+  var onDelete = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(item) {
+      var _item$templateDetailD;
+
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              _context.prev = 0;
+              _context.next = 3;
+              return dispatch(fetchDeleteWorkOrder({
+                uniqueKey: item === null || item === void 0 ? void 0 : (_item$templateDetailD = item.templateDetailDto) === null || _item$templateDetailD === void 0 ? void 0 : _item$templateDetailD.uniqueKey,
+                workOrderId: item === null || item === void 0 ? void 0 : item.id
+              })).unwrap();
+
+            case 3:
+              _context.next = 5;
+              return dispatch({
+                type: 'workOrder/setState',
+                payload: {
+                  customSearch: _objectSpread(_objectSpread({}, customSearch), {}, {
+                    pageNo: 1
+                  })
+                }
+              });
+
+            case 5:
+              _context.next = 7;
+              return dispatch(fetchQueryWorkOrder());
+
+            case 7:
+              _context.next = 12;
+              break;
+
+            case 9:
+              _context.prev = 9;
+              _context.t0 = _context["catch"](0);
+              console.log('e', _context.t0);
+
+            case 12:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee, null, [[0, 9]]);
+    }));
+
+    return function onDelete(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+
   var onTransfer = function onTransfer(item) {
     transferRef.current.openModal(item);
   }; //转交客服
 
 
   var transCustomer = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, currentCustomer) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(record, currentCustomer) {
       var id, jsonMap, _record$templateDetai, componentDtoList, uniqueKey, params, workOrderStatusKey;
 
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) {
-          switch (_context.prev = _context.next) {
+          switch (_context2.prev = _context2.next) {
             case 0:
               id = record.id, jsonMap = record.jsonMap, _record$templateDetai = record.templateDetailDto, componentDtoList = _record$templateDetai.componentDtoList, uniqueKey = _record$templateDetai.uniqueKey;
               params = {};
@@ -299,14 +351,14 @@ var OrderList = function OrderList(tabActive) {
 
             case 6:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
         }
-      }, _callee);
+      }, _callee2);
     }));
 
-    return function transCustomer(_x, _x2) {
-      return _ref.apply(this, arguments);
+    return function transCustomer(_x2, _x3) {
+      return _ref2.apply(this, arguments);
     };
   }();
 
@@ -407,7 +459,8 @@ var OrderList = function OrderList(tabActive) {
           onEdit: onEdit,
           onLog: onLog,
           onRefresh: onSearch,
-          onTransfer: onTransfer
+          onTransfer: onTransfer,
+          onDelete: onDelete
         });
       }) : /*#__PURE__*/_jsx("div", {
         className: "custom_box_main_empty",
@@ -441,8 +494,8 @@ var OrderList = function OrderList(tabActive) {
     }), /*#__PURE__*/_jsx(CustomizeFormModal, {
       ref: customizeFormRef,
       shopList: shopList,
-      onSuccess: function onSuccess(_ref2) {
-        var type = _ref2.type;
+      onSuccess: function onSuccess(_ref3) {
+        var type = _ref3.type;
         onSearch();
 
         if (type === 'ADD') {

package/dist/esm/WorkOrder/model/servers/api.d.ts

@@ -35,3 +35,4 @@ export declare type LoginParams = {
 };
 export declare const login: (data: LoginParams) => Promise<any>;
 export declare const queryShopList: () => Promise<any>;
+export declare const deleteWorkOrder: (data: any) => Promise<any>;

package/dist/esm/WorkOrder/model/servers/api.js

@@ -2,8 +2,8 @@
  * @Description:
  * @Author: litian
  * @Date: 2022-09-06 10:28:04
- * @LastEditors: litian
- * @LastEditTime: 2022-09-19 15:53:38
+ * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
+ * @LastEditTime: 2022-10-19 19:04:54
  */
 import request from "./request";
 //获取灰度白名
@@ -211,4 +211,11 @@ export var queryShopList = function queryShopList() {
     method: 'get',
     data: {}
   });
+};
+export var deleteWorkOrder = function deleteWorkOrder(data) {
+  return request({
+    url: '/qy/gdfw/workOrder/deleteWorkOrder',
+    method: 'post',
+    data: data
+  });
 };

package/dist/esm/WorkOrder/model/servers/request.js

@@ -8,8 +8,8 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * @Description:
  * @Author: litian
  * @Date: 2022-09-06 09:29:34
- * @LastEditors: litian
- * @LastEditTime: 2022-09-27 15:46:05
+ * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
+ * @LastEditTime: 2022-10-19 19:17:36
  */
 import { extend } from 'umi-request';
 import { message } from 'antd';
@@ -50,6 +50,7 @@ var requestApi = function requestApi(_ref) {
         message.destroy();
         var msg = "".concat(url, "\u5931\u8D25\uFF1B").concat((res === null || res === void 0 ? void 0 : res.message) || '');
         message.error(msg);
+        reject();
       }
     }).catch(function (e) {
       reject(e);

package/dist/esm/WorkOrder/model/workOrder.d.ts

@@ -16,6 +16,7 @@ export declare const fetchQueryCurrentCompanyUser: any;
 export declare const fetchQueryGroupCustomTemplate: any;
 export declare const fetchQueryWorkOrder: any;
 export declare const fetchQueryPaymentWorkOrderList: any;
+export declare const fetchDeleteWorkOrder: any;
 export declare const workOrderSlice: import("@reduxjs/toolkit").Slice<any, {
     setState: (state: import("immer/dist/internal").WritableDraft<WorkOrderState>, action: {
         payload: any;

package/dist/esm/WorkOrder/model/workOrder.js

@@ -29,10 +29,10 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
  * @Author: litian
  * @Date: 2022-09-06 17:44:56
  * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
- * @LastEditTime: 2022-10-11 16:40:30
+ * @LastEditTime: 2022-10-19 19:28:44
  */
 import { createSlice, createAsyncThunk } from '@reduxjs/toolkit';
-import { queryGroupCustomTemplate, queryWorkOrder, queryCurrentCompanyUser, queryPaymentWorkOrderList } from "../model/servers/api";
+import { queryGroupCustomTemplate, queryWorkOrder, queryCurrentCompanyUser, queryPaymentWorkOrderList, deleteWorkOrder } from "../model/servers/api";
 import moment from 'moment';
 var initialState = {
   groupAllList: [],
@@ -223,6 +223,31 @@ export var fetchQueryPaymentWorkOrderList = createAsyncThunk('workOrder/queryPay
   return function (_x3, _x4) {
     return _ref4.apply(this, arguments);
   };
+}()); // 删除工单
+
+export var fetchDeleteWorkOrder = createAsyncThunk('workOrder/deleteWorkOrder', /*#__PURE__*/function () {
+  var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(params, action) {
+    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+      while (1) {
+        switch (_context5.prev = _context5.next) {
+          case 0:
+            _context5.next = 2;
+            return deleteWorkOrder(params);
+
+          case 2:
+            return _context5.abrupt("return", _context5.sent);
+
+          case 3:
+          case "end":
+            return _context5.stop();
+        }
+      }
+    }, _callee5);
+  }));
+
+  return function (_x5, _x6) {
+    return _ref5.apply(this, arguments);
+  };
 }());
 export var workOrderSlice = createSlice({
   name: 'workOrder',
@@ -292,6 +317,12 @@ export var workOrderSlice = createSlice({
       state.loading = false;
     }).addCase(fetchQueryPaymentWorkOrderList.rejected, function (state) {
       state.loading = false;
+    }), builder.addCase(fetchDeleteWorkOrder.pending, function (state) {
+      state.loading = true;
+    }).addCase(fetchDeleteWorkOrder.fulfilled, function (state, action) {
+      state.loading = false;
+    }).addCase(fetchDeleteWorkOrder.rejected, function (state) {
+      state.loading = false;
     }), builder.addCase(fetchQueryCurrentCompanyUser.fulfilled, function (state, action) {
       var newData = action.payload;
       newData.shopList.forEach(function (item) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kmkf-work-order-service-component",
-  "version": "0.0.1",
+  "version": "0.1.1-alpha.2",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",