From 46c6adeffbf1c0345cffb201461a47971efdfde6 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期一, 07 十月 2024 18:04:18 +0800
Subject: [PATCH] update 班制
---
src/views/console/base/Add.vue | 8 ++++++--
src/views/console/base/Dialog.vue | 2 +-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/views/console/base/Add.vue b/src/views/console/base/Add.vue
index 196d6a2..7140003 100644
--- a/src/views/console/base/Add.vue
+++ b/src/views/console/base/Add.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-05-04 16:37:48
* @LastEditors: gaoshp
- * @LastEditTime: 2024-10-02 17:15:08
+ * @LastEditTime: 2024-10-07 18:01:39
* @FilePath: /cps-web/src/views/console/base/Add.vue
-->
<template>
@@ -361,10 +361,14 @@
}
})
if (dates.length > 0) {
+ let ban = this.shiftList.find(v => v.id === ext.modelId)
this.months[i].attributes.push({
dates: dates.map(v => v.calendarDate),
...ext,
- highlight: color.stringToColor(ext.modelId)
+ highlight: color.stringToColor(ext.modelId),
+ popover: {
+ label: `${ban?.code}-${ban?.name}`
+ },
})
this.months[i].attributes[1] = {
highlight: true,
diff --git a/src/views/console/base/Dialog.vue b/src/views/console/base/Dialog.vue
index 0e4953c..bc0adff 100644
--- a/src/views/console/base/Dialog.vue
+++ b/src/views/console/base/Dialog.vue
@@ -313,7 +313,7 @@
this.visible = false;
this.$message.success("鎿嶄綔鎴愬姛")
} else {
- this.$alert(res.message, "鎻愮ず", { type: 'error' })
+ this.$alert(res.msg, "鎻愮ず", { type: 'error' })
}
} else {
return false;
--
Gitblit v1.9.3