From 9cd0ce6647c48d73b37ba0d49290f1ebc305de41 Mon Sep 17 00:00:00 2001
From: Master <master@orzsoft.com>
Date: Tue, 16 Jul 2024 11:41:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=97=A5=E7=A8=8B?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/home/widgets/components/schedule.vue   |  2 +-
 .../home/widgets/components/scheduleEdit.vue     | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Web/src/views/home/widgets/components/schedule.vue b/Web/src/views/home/widgets/components/schedule.vue
index 48a0b14c..b2aeb018 100644
--- a/Web/src/views/home/widgets/components/schedule.vue
+++ b/Web/src/views/home/widgets/components/schedule.vue
@@ -111,7 +111,7 @@ const openAddSchedule = () => {
 // 打开编辑页面
 const openEditSchedule = async (row: any) => {
 	state.editTitle = '编辑日程';
-	editScheduleRef.value?.openDialog(row);
+	editScheduleRef.value?.openDialog(row, true);
 };
 
 // 点击日历中的日期
diff --git a/Web/src/views/home/widgets/components/scheduleEdit.vue b/Web/src/views/home/widgets/components/scheduleEdit.vue
index fd39757f..a22e3a13 100644
--- a/Web/src/views/home/widgets/components/scheduleEdit.vue
+++ b/Web/src/views/home/widgets/components/scheduleEdit.vue
@@ -23,6 +23,7 @@
 			</el-form>
 			<template #footer>
 				<span class="dialog-footer">
+					<el-button v-if="state.showRemove" @click="remove">删除</el-button>
 					<el-button @click="cancel">取 消</el-button>
 					<el-button type="primary" @click="submit">确 定</el-button>
 				</span>
@@ -47,6 +48,7 @@ const emits = defineEmits(['handleQuery']);
 const ruleFormRef = ref();
 const state = reactive({
 	isShowDialog: false,
+	showRemove: false,
 	ruleForm: {} as any,
 });
 
@@ -54,8 +56,9 @@ const state = reactive({
 onMounted(async () => {});
 
 // 打开弹窗
-const openDialog = (row: any) => {
+const openDialog = (row: any, showRemove: boolean = false) => {
 	ruleFormRef.value?.resetFields();
+	state.showRemove = showRemove;
 
 	state.ruleForm = JSON.parse(JSON.stringify(row));
 	state.ruleForm.scheduleTime = dayjs(state.ruleForm.scheduleTime ?? new Date()).format('YYYY-MM-DD HH:mm:ss');
@@ -88,6 +91,17 @@ const submit = () => {
 	});
 };
 
+// 删除
+const remove = () => {
+	console.log(JSON.stringify(state.ruleForm));
+
+	ruleFormRef.value.validate(async (valid: boolean) => {
+		await getAPI(SysScheduleApi).apiSysScheduleDeletePost(state.ruleForm);
+
+		closeDialog();
+	});
+};
+
 // 导出对象
 defineExpose({ openDialog });
 </script>

From d0c6fb5b72c4060e3d83b410ed14da47b1d227c9 Mon Sep 17 00:00:00 2001
From: Master <master@orzsoft.com>
Date: Tue, 16 Jul 2024 11:46:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=A5=E7=A8=8B?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../home/widgets/components/scheduleEdit.vue  | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/Web/src/views/home/widgets/components/scheduleEdit.vue b/Web/src/views/home/widgets/components/scheduleEdit.vue
index a22e3a13..29060a09 100644
--- a/Web/src/views/home/widgets/components/scheduleEdit.vue
+++ b/Web/src/views/home/widgets/components/scheduleEdit.vue
@@ -34,7 +34,7 @@
 
 <script lang="ts" setup name="editSchedule">
 import { onMounted, reactive, ref } from 'vue';
-import { dayjs, ElMessageBox, ElNotification } from 'element-plus';
+import { dayjs, ElMessageBox, ElMessage, ElNotification } from 'element-plus';
 
 import { getAPI } from '/@/utils/axios-utils';
 import { SysScheduleApi } from '/@/api-services/api';
@@ -93,13 +93,17 @@ const submit = () => {
 
 // 删除
 const remove = () => {
-	console.log(JSON.stringify(state.ruleForm));
-
-	ruleFormRef.value.validate(async (valid: boolean) => {
-		await getAPI(SysScheduleApi).apiSysScheduleDeletePost(state.ruleForm);
-
-		closeDialog();
-	});
+	ElMessageBox.confirm(`确定删除吗?`, '提示', {
+		confirmButtonText: '确定',
+		cancelButtonText: '取消',
+		type: 'warning',
+	})
+		.then(async () => {
+			await getAPI(SysScheduleApi).apiSysScheduleDeletePost(state.ruleForm);
+			closeDialog();
+			ElMessage.success('操作成功');
+		})
+		.catch(() => {});
 };
 
 // 导出对象