From 1086953400ff7d23bf3b2b75c5960bca2dc184a7 Mon Sep 17 00:00:00 2001 From: zhuzhuanzhuan Date: 星期四, 09 十一月 2023 15:22:18 +0800 Subject: [PATCH] 1、优化首页布局 2、班次班制管理页面表格数据新增增加表单项验证 3、班次班制管理页面新增班次时如果并未选择开始与结束休息时间,应默认为空,而不是当前时间 4、班次班制管理页面新增或修改班次时如果选择跨天,则时间请求参数会混乱,应与不跨天时保持一致 --- src/views/mdc/base/modules/HolidayManagement/HolidayManagementModal.vue | 29 ++++++++++++++++++++++++++--- 1 files changed, 26 insertions(+), 3 deletions(-) diff --git a/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModal.vue b/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModal.vue index 7656871..4e0393b 100644 --- a/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModal.vue +++ b/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModal.vue @@ -112,6 +112,22 @@ }, ], }, + vacationDate:{ + rules:[ + { + required:true, + message: "璇烽�夋嫨浼戝亣鏃堕棿" + }, + ], + }, + vacationType:{ + rules:[ + { + required:true, + message: "璇烽�夋嫨鍋囨湡绫诲瀷" + }, + ], + }, }, url: { @@ -126,7 +142,6 @@ }, created() { }, - methods: { // disabledDate(current){ // //Can not slect days before today and today @@ -247,11 +262,19 @@ } obj.then((res) => { if (res.success) { - that.$message.success("娣诲姞鎴愬姛") + // that.$message.success("娣诲姞鎴愬姛") + that.$notification.success({ + message:'娑堟伅', + description:"娣诲姞鎴愬姛" + }); // that.$message.success(res.message) that.$emit('ok', res.result) } else { - that.$message.warning(res.message) + // that.$message.warning(res.message) + that.$notification.warning({ + message:'娑堟伅', + description:res.message + }); } }).finally(() => { that.confirmLoading = false -- Gitblit v1.9.3