From 2bf0ec71f0b8bffdc6f8f326cec0cbb705c18860 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期二, 01 十月 2024 20:17:18 +0800
Subject: [PATCH] 优化排班和部分功能
---
src/views/console/base/CalenderTab.vue | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/views/console/base/CalenderTab.vue b/src/views/console/base/CalenderTab.vue
index b3ab3b5..6c7627d 100644
--- a/src/views/console/base/CalenderTab.vue
+++ b/src/views/console/base/CalenderTab.vue
@@ -1,8 +1,8 @@
<!--
* @Date: 2024-04-04 22:45:43
- * @LastEditors: gaosp
- * @LastEditTime: 2024-09-07 15:15:29
- * @FilePath: /mdc/Users/mache/Documents/demo/cps-web/src/views/console/base/CalenderTab.vue
+ * @LastEditors: gaoshp
+ * @LastEditTime: 2024-10-01 20:16:51
+ * @FilePath: /cps-web/src/views/console/base/CalenderTab.vue
-->
<template>
<el-container>
@@ -29,6 +29,9 @@
</el-popconfirm>
</el-header>
<el-main>
+ <el-row :gutter="12" v-show="shiftListName">
+ {{ shiftListName }}
+ </el-row>
<el-row>
<el-col :span="6" style="padding: 10px;" v-for="item in months" :key="item.month">
<Calendar :initial-page="{ month: item.month + 1, year: item.year }" :rows="1"
@@ -39,8 +42,9 @@
</el-main>
</el-container>
- <el-drawer v-model="drawer" size="80%" title="鐢熶骇鏃ュ巻" :direction="direction" :before-close="handleClose">
- <Add :shiftList="shiftList" @success="success"></Add>
+ <el-drawer v-if="drawer" v-model="drawer" size="80%" title="鐢熶骇鏃ュ巻" :direction="direction"
+ :before-close="handleClose">
+ <Add v-if="drawer" :shiftList="shiftList" @success="success"></Add>
</el-drawer>
<el-drawer v-model="raworkVisible" size="80%" title="鐢熶骇鏃ュ巻" :direction="direction" :before-close="handleClose">
<el-container v-if="raworkVisible">
@@ -71,6 +75,7 @@
data() {
return {
shiftList: [],
+ shiftListName: '',
selectInfo: {},
drawer: false,
months: [],
@@ -191,6 +196,14 @@
if (res.code === 200) {
console.log(res.data)
this.setDay(res.data)
+ let current = this.shiftList.find(v => v.id == res.data.calendarDayVOList[0].modelId)
+ console.log('////', this.shiftList, res.data.calendarDayVOList[0].id)
+ if (current) {
+ this.shiftListName = `${current.code}-${current.name}`
+ } else {
+ this.shiftListName = ''
+ }
+
}
})
},
--
Gitblit v1.9.3