From d9adb3db1ed417b4a0c555c2cfafbe8f6b267f28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=88=B1=7E=E6=B5=B7=7E=E7=88=B1=E6=B5=B7=E7=88=B1?= =?UTF-8?q?=E6=B5=B7=7E=E5=8F=B3?= <1828712314@qq.com> Date: Thu, 20 Mar 2025 17:12:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=92=8C=E9=80=BB=E8=BE=91=EF=BC=8C=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F=E5=8F=8A=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/jobinfo/index.ts | 2 +- src/utils/formatTime.ts | 2 +- src/views/system/jobinfo/JobInfoForm.vue | 107 +++++++++---- src/views/system/jobinfo/index.vue | 182 ++++++++++------------- 4 files changed, 160 insertions(+), 133 deletions(-) diff --git a/src/api/system/jobinfo/index.ts b/src/api/system/jobinfo/index.ts index 4bbb26f..bf27728 100644 --- a/src/api/system/jobinfo/index.ts +++ b/src/api/system/jobinfo/index.ts @@ -37,7 +37,7 @@ export const JobInfoApi = { }, // 删除工作汇报 - deleteJobInfo: async (id: number) => { + deleteJobInfo: async (id) => { return await request.delete({ url: `/system/job-info/delete?id=` + id }) }, diff --git a/src/utils/formatTime.ts b/src/utils/formatTime.ts index 234b3d3..66decf6 100644 --- a/src/utils/formatTime.ts +++ b/src/utils/formatTime.ts @@ -199,7 +199,7 @@ export function formatPast2(ms: number): string { * @param cellValue 字段值 */ export function dateFormatter(_row: any, _column: TableColumnCtx, cellValue: any): string { - return cellValue ? formatDate(cellValue, 'YYYY年MM月DD日 A') : '' + return cellValue ? formatDate(cellValue, 'YYYY年MM月DD日 AHH时mm分') : '' } /** diff --git a/src/views/system/jobinfo/JobInfoForm.vue b/src/views/system/jobinfo/JobInfoForm.vue index c471f03..5b9fefd 100644 --- a/src/views/system/jobinfo/JobInfoForm.vue +++ b/src/views/system/jobinfo/JobInfoForm.vue @@ -1,36 +1,45 @@ @@ -45,23 +54,51 @@ const message = useMessage() // 消息弹窗 const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 -const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用 +const formLoading = ref(false) // 表单加载中：1）修改时的数据加载；2）提交的按钮禁用 const formType = ref('') // 表单的类型：create - 新增；update - 修改 const formData = ref({ id: undefined, title: undefined, content: undefined, jobDate: undefined, - jobName: undefined, + jobName: undefined }) const formRules = reactive({ + title: [ + { + required: true, + message: '请输入汇报标题', + trigger: 'blur' + } + ], + jobDate: [ + { + required: true, + message: '请选择汇报日期', + trigger: 'blur' + } + ], + jobName: [ + { + required: true, + message: '请输入汇报人姓名', + trigger: 'blur' + } + ], + content: [ + { + required: true, + message: '请输入汇报内容', + trigger: 'blur' + } + ] }) const formRef = ref() // 表单 Ref /** 打开弹窗 */ const open = async (type: string, id?: number) => { dialogVisible.value = true - dialogTitle.value = t('action.' + type) + dialogTitle.value = type == 'create' ? '新增工作汇报' : '修改工作汇报' formType.value = type resetForm() // 修改时，设置数据 @@ -107,8 +144,24 @@ const resetForm = () => { title: undefined, content: undefined, jobDate: undefined, - jobName: undefined, + jobName: undefined } formRef.value?.resetFields() } - \ No newline at end of file + +const deleteReport = () => { + JobInfoApi.deleteJobInfo(formData.value.id).then(() => { + message.success(t('common.delSuccess')) + dialogVisible.value = false + emit('success') + }) +} + + + diff --git a/src/views/system/jobinfo/index.vue b/src/views/system/jobinfo/index.vue index 6aef2a4..791d8f6 100644 --- a/src/views/system/jobinfo/index.vue +++ b/src/views/system/jobinfo/index.vue @@ -1,110 +1,85 @@ \ No newline at end of file + From 149a074b2845b1d0c8cafc1a582b0948b445ea53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=88=B1=7E=E6=B5=B7=7E=E7=88=B1=E6=B5=B7=E7=88=B1?= =?UTF-8?q?=E6=B5=B7=7E=E5=8F=B3?= <1828712314@qq.com> Date: Fri, 21 Mar 2025 08:53:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=B9=E8=AF=9D?= =?UTF-8?q?=E6=A1=86=E5=92=8C=E7=BC=96=E8=BE=91=E5=99=A8=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=EF=BC=8C=E8=B0=83=E6=95=B4=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8F=8A=E8=A1=A8=E5=8D=95=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Dialog/src/Dialog.vue | 6 +++--- src/components/Editor/src/Editor.vue | 2 +- src/utils/formatTime.ts | 14 +++++++------- src/views/system/jobinfo/JobInfoForm.vue | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/components/Dialog/src/Dialog.vue b/src/components/Dialog/src/Dialog.vue index 2c17995..13c5091 100644 --- a/src/components/Dialog/src/Dialog.vue +++ b/src/components/Dialog/src/Dialog.vue @@ -68,12 +68,12 @@ const dialogStyle = computed(() => { :top="top" >