From 3d9988d5f19da5e86c1678bf812ac9f7bcfcdfd4 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期二, 10 六月 2025 17:28:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/mdc/base/HolidayManagement.vue | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/views/mdc/base/HolidayManagement.vue b/src/views/mdc/base/HolidayManagement.vue
index 9b3c858..f996a39 100644
--- a/src/views/mdc/base/HolidayManagement.vue
+++ b/src/views/mdc/base/HolidayManagement.vue
@@ -2,7 +2,7 @@
<div style="width: 100%; height: 100%;">
<a-card :bordered="false">
<a-row type="flex" :gutter="16">
- <a-col :md="4">
+ <a-col :md="5">
<a-tabs :activeKey="activeKey" @change="tabChange">
<a-tab-pane key="1" tab="杞﹂棿灞傜骇" force-render>
<base-tree @getCurrSelected="changeSelectionNode"></base-tree>
@@ -12,7 +12,7 @@
</a-tab-pane>
</a-tabs>
</a-col>
- <a-col :md="20">
+ <a-col :md="19">
<holiday-management-list ref="HolidayManagementList" :nodePeople='selectPeople' :nodeTree = 'selectEquement' :Type="slectTypeTree"></holiday-management-list>
</a-col>
</a-row>
@@ -66,7 +66,11 @@
if (res.success) {
this.isDepartType = res.result[0].value
} else {
- this.$message.warn(res.message)
+ // this.$message.warn(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() =>{
})
--
Gitblit v1.9.3