Merge remote-tracking branch 'origin/bug_fix' into ehr

王强
2 parents deb451b3 75c5d104
Showing 2 changed files with 51 additions and 57 deletions
src/pages/ehr/ProgramOfStudy/QuestionBank/api.ts
src/pages/ehr/ProgramOfStudy/QuestionBank/components/QuestionBankList/components/DraftList/index.tsx
-import request from "@/utils/request";
-import { ABILITY_HOST } from "@/utils/host";
-import { http } from "@/typing/http";
+import request from '@/utils/request';
+import { ABILITY_HOST } from '@/utils/host';
+import type { http } from '@/typing/http';
  
 /** 获取题库列表 */
-export function getQuestionBankListApi(
-  params: QuestionBank.QueryParams
-): http.PromisePageResp<QuestionBank.List> {
+export function getQuestionBankListApi(params: QuestionBank.QueryParams): http.PromisePageResp<QuestionBank.List> {
   return request.get(`${ABILITY_HOST}/erp/question/factory/list`, { params });
 }
  
@@ -22,9 +20,7 @@ export function deleteQuestionBankApi(id: number) {
 }
  
 /** 获取题目列表 */
-export function getQuestionListApi(params: {
-  factoryId: number;
-}): http.PromisePageResp<QuestionBank.Question> {
+export function getQuestionListApi(params: { factoryId: number }): http.PromisePageResp<QuestionBank.Question> {
   return request.get(`${ABILITY_HOST}/erp/question/info/list`, { params });
 }
  
@@ -45,11 +41,7 @@ export function deleteQuestionApi(id: number) {
  * @param {QuestionBank.ImportQuestionParams} params
  */
 export function importQuestionApi(params: QuestionBank.ImportQuestionParams) {
-  return request.post<string>(
-    `${ABILITY_HOST}/erp/question/import/excel`,
-    params,
-    { contentType: "form-data" }
-  );
+  return request.post<string>(`${ABILITY_HOST}/erp/question/import/excel`, params, { contentType: 'form-data' });
 }
  
 /**
@@ -57,9 +49,7 @@ export function importQuestionApi(params: QuestionBank.ImportQuestionParams) {
  * @param {QuestionBank.QueryParams} params
  * @return {http.PromisePageResp<QuestionBank.List>}
  */
-export function getDraftListApi(
-  params: QuestionBank.QueryParams
-): http.PromisePageResp<QuestionBank.List> {
+export function getDraftListApi(params: QuestionBank.QueryParams): http.PromisePageResp<QuestionBank.List> {
   return request.get(`${ABILITY_HOST}/erp/draft/page`, { params });
 }
  
@@ -68,9 +58,7 @@ export function getDraftListApi(
  * @param {QuestionBank.List} params
  * @return {http.PromiseResp<string>}
  */
-export function saveDraftApi(
-  params: QuestionBank.List
-): http.PromiseResp<string> {
+export function saveDraftApi(params: QuestionBank.List): http.PromiseResp<string> {
   return request.post(`${ABILITY_HOST}/erp/draft/save`, params);
 }
  
@@ -79,9 +67,7 @@ export function saveDraftApi(
  * @param {number} factoryId
  * @return {http.PromiseResp<QuestionBank.List>}
  */
-export function getDraftByFactoryIdApi(
-  factoryId: number
-): http.PromiseResp<QuestionBank.List> {
+export function getDraftByFactoryIdApi(factoryId: number): http.PromiseResp<QuestionBank.List> {
   return request.get(`${ABILITY_HOST}/erp/draft/by/factory`, {
     params: { factoryId },
   });
@@ -103,9 +89,7 @@ export function deleteDraftApi(draftId: number): http.PromiseResp&lt;string&gt; {
  * @param {QuestionBank.DraftQuestionParams} params
  * @return {http.PromiseRespA<QuestionBank.Question>}
  */
-export function getQuestionListByDraftApi(
-  params: QuestionBank.DraftQuestionParams
-): http.PromiseRespA<QuestionBank.Question> {
+export function getQuestionListByDraftApi(params: QuestionBank.DraftQuestionParams): http.PromiseRespA<QuestionBank.Question> {
   return request.get(`${ABILITY_HOST}/erp/draft/question/list`, {
     params,
   });
@@ -116,9 +100,7 @@ export function getQuestionListByDraftApi(
  * @param {QuestionBank.Question} params
  * @return {http.PromiseResp<number>}
  */
-export function saveDraftQuestionApi(
-  params: QuestionBank.Question
-): http.PromiseResp<number> {
+export function saveDraftQuestionApi(params: QuestionBank.Question): http.PromiseResp<number> {
   return request.post(`${ABILITY_HOST}/erp/draft/question/save`, params);
 }
  
@@ -127,9 +109,7 @@ export function saveDraftQuestionApi(
  * @param {QuestionBank.DeleteDraftQuestionParams} params
  * @return {http.PromiseResp<string>}
  */
-export function deleteDraftQuestionApi(
-  params: QuestionBank.DeleteDraftQuestionParams
-): http.PromiseResp<string> {
+export function deleteDraftQuestionApi(params: QuestionBank.DeleteDraftQuestionParams): http.PromiseResp<string> {
   return request.post(`${ABILITY_HOST}/erp/draft/question/remove`, params);
 }
  
@@ -138,13 +118,8 @@ export function deleteDraftQuestionApi(
  * @param {QuestionBank.BatchDeleteDraftQuestionParams} params
  * @return {http.PromiseResp<string>}
  */
-export function batchDeleteDraftQuestionApi(
-  params: QuestionBank.BatchDeleteDraftQuestionParams
-): http.PromiseResp<string> {
-  return request.post(
-    `${ABILITY_HOST}/erp/draft/question/batch/remove`,
-    params
-  );
+export function batchDeleteDraftQuestionApi(params: QuestionBank.BatchDeleteDraftQuestionParams): http.PromiseResp<string> {
+  return request.post(`${ABILITY_HOST}/erp/draft/question/batch/remove`, params);
 }
  
 /**
@@ -152,9 +127,7 @@ export function batchDeleteDraftQuestionApi(
  * @param {number} draftId
  * @return {http.PromiseResp<string>}
  */
-export function deleteAllDraftQuestionApi(
-  draftId: number
-): http.PromiseResp<string> {
+export function deleteAllDraftQuestionApi(draftId: number): http.PromiseResp<string> {
   return request.get(`${ABILITY_HOST}/erp/draft/question/all/remove`, {
     params: { draftId },
   });
@@ -166,11 +139,7 @@ export function deleteAllDraftQuestionApi(
  * @return {http.PromiseResp<string>}
  */
 export function approvalDraftApi(draftId: number): http.PromiseResp<string> {
-  return request.post(
-    `${ABILITY_HOST}/erp/draft/submit`,
-    { draftId },
-    { contentType: "form-data" }
-  );
+  return request.post(`${ABILITY_HOST}/erp/draft/submit`, { draftId }, { contentType: 'form-data' });
 }
  
 /**
@@ -178,9 +147,7 @@ export function approvalDraftApi(draftId: number): http.PromiseResp&lt;string&gt; {
  * @param {number} factoryId
  * @return {*}
  */
-export function exportQuestionBankApi(
-  factoryId: number
-): http.PromiseResp<BlobPart> {
+export function exportQuestionBankApi(factoryId: number): http.PromiseResp<BlobPart> {
   return request.get(`${ABILITY_HOST}/erp/question/export/question`, {
     params: { factoryId },
   });
@@ -202,10 +169,17 @@ export function exportDraftApi(draftId: number): http.PromiseResp&lt;BlobPart&gt; {
  * @param {QuestionBank.ImportQuestionParams} params
  * @return {http.PromiseResp<string>}
  */
-export function importDraftQuestionApi(
-  params: QuestionBank.ImportQuestionParams
-): http.PromiseResp<string> {
+export function importDraftQuestionApi(params: QuestionBank.ImportQuestionParams): http.PromiseResp<string> {
   return request.post(`${ABILITY_HOST}/erp/draft/import/excel`, params, {
-    contentType: "form-data",
+    contentType: 'form-data',
   });
 }
+
+/**
+ * @description: 撤销草稿审批
+ * @param {string} auditNo
+ * @return {http.PromiseResp<string>}
+ */
+export function cancelDraftApprovalApi(auditNo: string): http.PromiseResp<string> {
+  return request.get(`${ABILITY_HOST}/erp/draft/cancel/audit`, { params: { auditNo } });
+}
 /*
  * @Date: 2021-07-26 17:19:45
  * @LastEditors: wangqiang@feewee.cn
- * @LastEditTime: 2023-09-02 15:51:55
+ * @LastEditTime: 2024-03-29 16:46:18
  */
 import React, { useEffect } from 'react';
 import { useStore } from '../../../../index';
-import { deleteDraftApi, approvalDraftApi } from '../../../../api';
+import { deleteDraftApi, approvalDraftApi, cancelDraftApprovalApi } from '../../../../api';
 import { Badge, Button, Divider, Input, message, Modal, Popconfirm, Row, Table } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
 import QuestionBankModal from '../../QuestionBankModal';
@@ -92,6 +92,19 @@ export default function DraftList() {
         message.error(error.message);
       });
   };
+  const cancelApprovalDraft = (auditNo: string) => {
+    const hide = message.loading('撤销中，请稍后...', 0);
+    cancelDraftApprovalApi(auditNo)
+      .then((res) => {
+        hide();
+        message.success(res.result);
+        setLoading(true);
+      })
+      .catch((error) => {
+        hide();
+        message.error(error.message);
+      });
+  };
  
   return (
     <>
@@ -210,7 +223,14 @@ export default function DraftList() {
                   <Divider type="vertical" />
                 </>
               ) : null}
-              {record.status === StatusText.审批中 ? null : (
+              {record.status === StatusText.审批中 ? (
+                <>
+                  <Popconfirm title={`确定撤销【${record.name}】审批？`} onConfirm={() => cancelApprovalDraft(record.auditNo ?? '')}>
+                    <a style={{ color: 'red' }}>撤销审批</a>
+                  </Popconfirm>
+                  <Divider type="vertical" />
+                </>
+              ) : (
                 <>
                   <a
                     onClick={() => {