From 3a8223b71d18205d40b894fd0b4c0fa1ca773e86 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 13 十一月 2023 10:44:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdc-test' into mdc-test
---
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