+
{item?.file_name}
- 下载
+
+ 下载
+
+ {
+ archivesStore.deleteItem(item.id)
+ getFileList()
+ }}
+ onCancel={() => {}}
+ okText="Yes"
+ cancelText="No"
+ >
+
+
);
diff --git a/src/pages/emergency/em_column.tsx b/src/pages/emergency/em_column.tsx
index bd427b7..e14e951 100644
--- a/src/pages/emergency/em_column.tsx
+++ b/src/pages/emergency/em_column.tsx
@@ -31,9 +31,16 @@ export const EmConfig = (userList) => [
{
type: FormType.cehckboxGroup,
label: "参与队伍",
- name: "user_id",
+ name: "team_id",
value: [],
checkboxData: userList,
rules: [{ required: true, message: "参与队伍不能为空!" }],
},
+ {
+ type: FormType.treeVideo,
+ label: "视频地址",
+ name: "task_video",
+ value: [],
+ rules: [{ required: true, message: "请选择视频地址!" }],
+ },
];
diff --git a/src/pages/emergency/index.tsx b/src/pages/emergency/index.tsx
index b6d966c..54dc3b7 100644
--- a/src/pages/emergency/index.tsx
+++ b/src/pages/emergency/index.tsx
@@ -147,10 +147,10 @@ const Emergency = (props: Store) => {
};
useEffect(() => {
emergencyStore.getlist();
- baseHttp.get("/user/list", null).then((res) => {
+ baseHttp.get("/team/list", null).then((res) => {
let data = res.data?.record ?? [];
data.forEach((item) => {
- item.label = item.user_name;
+ item.label = item.name;
item.value = item.identity;
});
setUserList(data ?? []);
diff --git a/src/pages/exce_compet/index.tsx b/src/pages/exce_compet/index.tsx
index 4437953..763c58d 100644
--- a/src/pages/exce_compet/index.tsx
+++ b/src/pages/exce_compet/index.tsx
@@ -1,13 +1,18 @@
import BTable from "@/components/b_table";
import { UserDataType } from "@/model/userModel";
-import { Button } from "antd";
+import { Button, message, Modal, Space } from "antd";
import { Store } from "antd/es/form/interface";
+import TextArea from "antd/lib/input/TextArea";
import { ColumnsType } from "antd/lib/table";
+import dayjs from "dayjs";
import { inject, observer } from "mobx-react";
-import { useEffect } from "react";
+import { useEffect, useState } from "react";
const ExceCompet = (props: Store) => {
const { exceCompetStore } = props;
+ const [isModalOpen, setIsModalOpen] = useState(false);
+ const [value, setValue] = useState('');
+ const [id, setId] = useState('');
useEffect(() => {
exceCompetStore.getlist();
}, [exceCompetStore]);
@@ -17,29 +22,73 @@ const ExceCompet = (props: Store) => {
{
title: "评优申请人",
dataIndex: "users",
- render: (users) =>
{users?.user_name}
+ render: (users) =>
{users?.user_name},
},
{ title: "申请积分", dataIndex: "reviewer_score" },
- { title: "申请时间", dataIndex: "created_at" },
- { title: "描述", dataIndex: "desc" },
- { title: "审核状态", dataIndex: "status" },
- { title: "审核人", dataIndex: "reviewer_identity" },
{
- title: "操作",
- dataIndex: "id",
- render: (any, record) => (
-
+ title: "申请时间",
+ dataIndex: "created_at",
+ render: (created_at) => (
+
{dayjs(created_at).format("YYYY-MM-DD")}
),
},
+ { title: "描述", dataIndex: "desc" },
+ {
+ title: "审核状态",
+ dataIndex: "status",
+ render: (status) =>
+ status === 1 ? "已通过" : status === 2 ? "驳回" : "未审核",
+ width: 200,
+ },
+ {
+ title: "审核人",
+ dataIndex: "reviewer_users",
+ render: (reviewer_users) =>
{reviewer_users?.user_name},
+ },
+ {
+ title: "操作",
+ dataIndex: "identity",
+ render: (any, record) =>
+ record.status === 0 ? (
+
+
+
+
+ ) : null,
+ },
];
+
+
+ const handleOk = () => {
+ if (!value) {
+ message.error("请输入驳回理由")
+ return;
+ }
+ exceCompetStore.audit(id, {status: 2,remark:value});
+ setIsModalOpen(false);
+ };
+
+ const handleCancel = () => {
+ setIsModalOpen(false);
+ };
+
return (
{
columns={columns}
dataSource={exceCompetStore.list}
/>
+
+