创建任务时,选择模板多传递参数(查询已启动的模板)

src/pages/supplierAnnualManage/supplierAnnualTaskManage/components/BasicInfoStep.tsx

@@ -43,7 +43,7 @@ const BasicInfoStepComponent = (props: BasicInfoStepProps) => {
   const fetchTemplates = async () => {
     setLoading(true);
     try {
-      const response = await getAllAnnualTemplates();
+      const response = await getAllAnnualTemplates({ status: '1' });
       if (response.success && response.data) {
         setTemplates(response.data);
       }

src/pages/supplierAnnualManage/supplierAnnualTaskManage/supplierAnnualTaskManageAdd.tsx

@@ -1,13 +1,13 @@
 import React, { useRef, useEffect } from 'react';
 import { Card, Steps, Button, message, Space, Row, Col, Modal } from 'antd';
-import { connect, ConnectProps, history, Dispatch } from 'umi';
+import { connect, history } from 'umi';
+import type { ConnectProps, Dispatch } from 'umi';
 import { ArrowLeftOutlined, SaveOutlined } from '@ant-design/icons';
 import BasicInfoStep from './components/BasicInfoStep';
 import SupplierSelectStep from './components/SupplierSelectStep';
 import EvaluatorSelectStep from './components/EvaluatorSelectStep';
 import styles from './supplierAnnualTaskManageAdd.less';
-import { TaskNotifyLowerUnits } from '@/dicts/supplierTaskDict';
-import { SupplierTaskModelState } from '@/models/supplierAnnualTaskManage';
+import type { SupplierTaskModelState } from '@/models/supplierAnnualTaskManage';
 
 const { Step } = Steps;
 

src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResult.tsx

@@ -179,12 +179,6 @@ const SupplierEvaluateResult: React.FC = () => {
     });
   };
 
-  // 获取状态标签
-  const getStatusTag = (status: string) => {
-    const color = TaskStatusColor[status as keyof typeof TaskStatusColor] || 'default';
-    const text = TaskStatusText[status as keyof typeof TaskStatusText] || '未知状态';
-    return <Tag color={color}>{text}</Tag>;
-  };
 
   const columns = [
     {
@@ -253,6 +247,12 @@ const SupplierEvaluateResult: React.FC = () => {
       key: 'statusName',
       width: 100,
     },
+    {
+      title: '审核状态',
+      dataIndex: 'approveName',
+      key: 'approveName',
+      width: 100,
+    },
     {
       title: '操作',
       key: 'action',

src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResultByZb.tsx

@@ -22,7 +22,7 @@ const SupplierEvaluateResultByZb: React.FC = () => {
   const [scoreRecord, setScoreRecord] = useState<SupplierEvaluateResult.EvaluateScoreIndicator | null>(null);
   const [parentRecord, setParentRecord] = useState<SupplierEvaluateResult.EvaluateTaskItem | null>(null);
   const [supplierRecord, setSupplierRecord] = useState<SupplierEvaluateResult.EvaluateSupplierItem | null>(null);
-  const [indicatorDetail, setIndicatorDetail] = useState<SupplierEvaluateResult.IndicatorDetailData | null>(null);
+  const [indicatorDetail, setIndicatorDetail] = useState<SupplierEvaluateResult.EvaluateScoreDetailData | null>(null);
 
   // 获取上级页面传递的数据
   useEffect(() => {

src/pages/supplierEvaluateManage/supplierTaskManage/components/BasicInfoStep.tsx

@@ -43,7 +43,7 @@ const BasicInfoStepComponent = (props: BasicInfoStepProps) => {
   const fetchTemplates = async () => {
     setLoading(true);
     try {
-      const response = await getAllTemplates();
+      const response = await getAllTemplates({ status: '1' });
       if (response.success && response.data) {
         setTemplates(response.data);
       }

src/servers/api/supplierAnnual.ts

@@ -18,9 +18,10 @@ export async function getAnnualTemplateList(params: supplierAnnualTemplateManage
  * 获取所有供应商年度模板列表
  * @returns Promise
  */
-export async function getAllAnnualTemplates() {
+export async function getAllAnnualTemplates(params?: {status: string}) {
   return request<supplierAnnualTemplateManage.AllTemplatesResponse>('/annualreview/template/getAllList', {
     method: 'GET',
+    params
   });
 }
 

src/servers/api/supplierEvaluate.ts

@@ -3,9 +3,10 @@ import request from '@/utils/request';
  * 获取所有模板列表
  * @returns 所有模板列表
  */
-export async function getAllTemplates() {
+export async function getAllTemplates(params?: {status: string}) {
   return request('/coscoEvaluate/template/getAllList', {
     method: 'GET',
+    params
   });
 }