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/HolidayManagementModalEdit.vue | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModalEdit.vue b/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModalEdit.vue
index d74bfd8..48c1e83 100644
--- a/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModalEdit.vue
+++ b/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModalEdit.vue
@@ -126,6 +126,22 @@
},
],
},
+ vacationDate:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨浼戝亣鏃堕棿"
+ },
+ ],
+ },
+ vacationType:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨鍋囨湡绫诲瀷"
+ },
+ ],
+ },
// mdcRepairType:{
// rules:[
// {
@@ -255,11 +271,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