From eef1ef0be935d4a3d8fc691b2666f41796b2d4a5 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期一, 04 十一月 2024 19:57:08 +0800
Subject: [PATCH] 增加列表显示
---
src/views/console/base/Add.vue | 316 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 258 insertions(+), 58 deletions(-)
diff --git a/src/views/console/base/Add.vue b/src/views/console/base/Add.vue
index 7af35ce..8d02c26 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-01 20:21:11
+ * @LastEditTime: 2024-10-09 23:30:14
* @FilePath: /cps-web/src/views/console/base/Add.vue
-->
<template>
@@ -13,17 +13,20 @@
<el-row>
<el-col :span="8">
<el-form-item label="鐢熶骇鏃ュ巻缂栧彿" prop="code">
- <el-input v-model="form.code" placeholder="璇疯緭鍏ョ敓浜ф棩鍘嗙紪鍙�" clearable></el-input>
+ <el-input :disabled="disabled" v-model="form.code" placeholder="璇疯緭鍏ョ敓浜ф棩鍘嗙紪鍙�"
+ clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="鐢熶骇鏃ュ巻鍚嶇О" prop="name">
- <el-input v-model="form.name" placeholder="璇疯緭鍏ョ敓浜ф棩鍘嗗悕绉�" clearable></el-input>
+ <el-input :disabled="disabled" v-model="form.name" placeholder="璇疯緭鍏ョ敓浜ф棩鍘嗗悕绉�"
+ clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="搴旂敤骞翠唤" prop="year">
- <el-select v-model="form.year" placeholder="" size="" @change="changeYear">
+ <el-select :disabled="disabled" v-model="form.year" placeholder="" size=""
+ @change="changeYear">
<el-option v-for="item in options" :key="item.value" :label="item.label"
:value="item.value" />
</el-select>
@@ -32,17 +35,17 @@
<el-col :span="8">
<el-form-item label="搴旂敤鏃ユ湡" prop="date">
<el-date-picker v-model="form.date" type="daterange" value-format="YYYY-MM-DD"
- start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" />
+ start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" @change="changeDate" />
</el-form-item>
</el-col>
<el-col :span="8" :offset="1">
- <el-button-group>
+ <!-- <el-button-group>
<el-button :type="activeBtn == 0 ? 'primary' : ''"
@click="activeBtn = 0">鎸夎寰嬮�変腑鏃ユ湡</el-button>
<el-button :type="activeBtn == 1 ? 'primary' : ''" @click="activeBtn = 1">
鎸夐棿闅旈�変腑鏃ユ湡
</el-button>
- </el-button-group>
+ </el-button-group> -->
</el-col>
<el-col :offset="1">
<el-radio-group v-model="holiday">
@@ -95,7 +98,7 @@
褰撳墠鎺掔彮浼樺厛
</el-col>
<el-col :span="4">
- <el-switch v-model="isHighPriority" active-text="浼樺厛" inactive-text="涓嶄紭鍏�" />
+ <el-switch v-model="isHighPriority" @change="changeHigh" active-text="浼樺厛" inactive-text="涓嶄紭鍏�" />
</el-col>
<el-col :span="2">
<el-button type="primary" @click="plan">鎺掔彮</el-button>
@@ -116,6 +119,7 @@
<script>
import moment from 'moment'
import { Calendar, DatePicker } from 'v-calendar';
+import color from '@/utils/color'
export default {
components: {
Calendar,
@@ -127,10 +131,19 @@
default: () => {
return []
}
- }
+ },
+ drawerInfo: {
+ type: Object,
+ default: () => {
+ return {}
+ }
+ },
},
data() {
return {
+ currentDate: '',
+ currentDateItem: null,
+ disabled: false,
modelId: '',
isHighPriority: false,
dateDTOList: [],
@@ -203,16 +216,6 @@
checkboxGroup1() {
this.setDay()
},
- dateDTOList(val) {
- this.months.forEach(month => {
- if (val.length > 0) {
- month.attributes[1].highlight = 'yellow'
- } else {
- month.attributes[1].highlight = true
- }
-
- })
- },
'form.year'(val) {
this.months = []
let currentYear = moment(val, 'YYYY').format('YYYY') - 0
@@ -222,7 +225,7 @@
this.form.date[0] = moment().format('YYYY-MM-DD')
}
// console.log(this.months)
- this.$HTTP.post('/api/blade-cps/shift-off-day/list', {
+ this.$HTTP.post('/api/smis/shift-off-day/list', {
year: currentYear,
startOffDay: `${currentYear}-01-01`,
endOffDay: `${currentYear}-12-31`
@@ -260,7 +263,6 @@
})
}
- console.log(this.months, '?/')
})
},
shiftList() {
@@ -268,23 +270,50 @@
}
},
created() {
-
this.init()
},
methods: {
init() {
- let len = 15
- let currentYear = moment().format('YYYY') - 0
- this.form.year = currentYear
+ if (!this.drawerInfo.id) {
+ let len = 15
+ let currentYear = moment().format('YYYY') - 0
+ this.form.year = currentYear
+ for (let i = 0; i < len; i++) {
+ this.options.push({
+ label: currentYear + i,
+ value: currentYear + i
+ })
+ }
+ this.form.date = [moment().format('YYYY-MM-DD'), moment(`${currentYear}-12-31`).format('YYYY-MM-DD')]
+ } else {
+ this.disabled = true
+ this.form.code = this.drawerInfo.code
+ this.form.name = this.drawerInfo.name
+ this.form.year = moment(this.drawerInfo.calendarDayVOList[0].calendarDate, 'YYYY-MM-DD').format('YYYY') - 0
+ setTimeout(() => {
+ let currentYear = moment().format('YYYY') - 0
+ this.form.date = [`${currentYear}-01-01`, `${currentYear}-12-31`]
+ if (currentYear == this.form.year) {
+ this.form.date[0] = moment().format('YYYY-MM-DD')
+ }
+ [...new Set(this.drawerInfo.calendarDayVOList.map(v => v.modelId))].forEach(item => {
+ let list = this.drawerInfo.calendarDayVOList.filter(v => v.modelId === item)
+ let ext = {
+ modelId: item,
+ // isHighPriority: list[0].isHighPriority,
+ }
+ this.setDayRange(list, ext)
+ })
+ }, 1000)
- for (let i = 0; i < len; i++) {
- this.options.push({
- label: currentYear + i,
- value: currentYear + i
- })
}
- this.form.date = [moment().format('YYYY-MM-DD'), moment(`${currentYear}-12-31`).format('YYYY-MM-DD')]
- // console.log(this.form)
+ },
+ changeDate() {
+ if (this.checkboxGroup1.length > 0) {
+ this.setDay()
+ } else {
+
+ }
},
change(val) {
this.checkboxGroup1 = []
@@ -301,7 +330,6 @@
let start = moment(`${currentYear}-${i + 1}-01`)
let end = i == 11 ? moment(`${currentYear + 1}-${i + 1}-01`) : moment(`${currentYear}-${i + 2}-01`)
let dates = []
- console.log(start.format('YYYY-MM-DD'), start.unix() >= moment(this.form.date[0]).unix() && start.unix() <= moment(this.form.date[1]).unix())
while (start.unix() < end.unix()) {
if (this.checkboxGroup1.includes(start.day()) && this.holiday === 0) {
this.pushDate(start) && dates.push(start.format('YYYY-MM-DD'))
@@ -317,8 +345,58 @@
start.add(1, 'd')
}
this.months[i].attributes[1].dates = dates
- console.log(this.months, 'jieguo')
})
+ console.log(this.months, 'rll')
+ },
+ setDayRange(list, ext) {
+ let currentYear = moment(this.form.year, 'YYYY').format('YYYY') - 0
+ this.months.forEach((item, i) => {
+ let start = moment(`${currentYear}-${i + 1}-01`)
+ let end = i == 11 ? moment(`${currentYear + 1}-${i + 1}-01`) : moment(`${currentYear}-${i + 2}-01`)
+ let dates = []
+ list.forEach(v => {
+ if (moment(v.calendarDate).unix() >= start.unix() && moment(v.calendarDate).unix() < end.unix()) {
+ dates.push(v)
+ }
+ })
+ 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: {
+ style: {
+ 'background-color': ban.colour
+ }
+ },
+ popover: {
+ label: `${ban?.code}-${ban?.name}`
+ },
+ })
+ // 浼樺厛
+ console.log('------------->>>>', dates)
+ let hiIndex = this.months[i].attributes.findIndex(v => v.bar)
+ if (hiIndex > -1) {
+ this.months[i].attributes[hiIndex].dates.push(...dates.filter(v => v.isHighPriority === 1).map(v => v.calendarDate))
+ } else {
+ this.months[i].attributes.push({
+ dates: dates.filter(v => v.isHighPriority === 1).map(v => v.calendarDate),
+ bar: {
+ style: {
+ backgroundColor: 'red',
+ }
+ },
+ })
+ }
+
+ this.months[i].attributes[1] = {
+ highlight: true,
+ dates: []
+ }
+ }
+ })
+ console.log(this.months, 'rllllllll')
},
pushDate(start) {
if (start.unix() >= moment(this.form.date[0]).unix() && start.unix() <= moment(this.form.date[1]).unix()) {
@@ -326,33 +404,125 @@
}
return false
},
- dayclick(day, item) {
+ changeHigh(val) {
+ console.log('------------changeHigh')
+ if (this.currentDateItem) {
+ // 璁剧疆浼樺厛
+ let index = this.currentDateItem.attributes.findIndex(item => !!item.bar)
+ if (val) {
+ if (index === -1) {
+ this.currentDateItem.attributes.push({
+ bar: {
+ style: {
+ backgroundColor: 'red',
+ }
+ },
+ dates: [this.currentDate]
+ })
+ } else {
+ this.currentDateItem.attributes[index].dates.push(this.currentDate)
+ }
+ } else {
+ let i = this.currentDateItem.attributes[index].dates.findIndex(v => v === this.currentDate)
+ this.currentDateItem.attributes[index].dates.splice(i, 1)
+ }
+ } else {
+ this.isHighPriority = false
+ }
+ console.log(this.months)
+ },
+ dayclick(day, item) {
let index = item.attributes[1].dates.findIndex(v => v === day.id)
- console.log(index)
if (index >= 0) {
item.attributes[1].dates.splice(index, 1)
} else {
item.attributes[1].dates.push(day.id)
}
- console.log(index, item.attributes[1].dates)
+ let list = this.getPlanDate()
+ let highDates = this.getHighDate()
+ this.currentDate = day.id
+ if (list.find(v => v.calendarDate === day.id)) {
+ this.currentDateItem = item
+ if (highDates.indexOf(this.currentDate) > -1) {
+ this.isHighPriority = true
+ } else {
+ this.isHighPriority = false
+ }
+ } else {
+ this.currentDateItem = null
+ this.isHighPriority = false
+ }
+
+ console.log('------currentDate', this.currentDate, item, highDates)
+ },
+ getHighDate() {
+ let list = []
+ this.months.forEach(item => {
+ item.attributes.forEach((v, i) => {
+ if (i > 1 && v.bar) {
+ v.dates.forEach(child => {
+ list.push(child)
+ })
+
+ }
+ })
+ })
+ return list
+ },
+ getPlanDate() {
+ // 浼樺厛绾�
+ let list = []
+ this.months.forEach(item => {
+ item.attributes.forEach((v, i) => {
+ if (i > 1 && v.modelId) {
+
+ v.dates.forEach(child => {
+ // 閲嶅鎺掔彮鍘婚噸
+ let repeatIndex = list.findIndex(v => v.calendarDate === child)
+ if (repeatIndex > -1) {
+ list.splice(repeatIndex, 1, {
+ modelId: v.modelId,
+ // isHighPriority: v.isHighPriority,
+ calendarDate: child,
+ ...this.setOffDay(child)
+ })
+ } else {
+ list.push({
+ modelId: v.modelId,
+ // isHighPriority: v.isHighPriority,
+ calendarDate: child,
+ ...this.setOffDay(child)
+ })
+ }
+
+ })
+
+ }
+ })
+ })
+ return list
},
plan() {
if (!this.modelId) {
return this.$message.warning('璇烽�夋嫨鐝鏂规');
}
let dateDTOList = this.months.map(item => item.attributes[1].dates)
- console.log(this.months, '>>>>>>>>>>', dateDTOList.flat(2))
+ console.log('------plan', dateDTOList)
let list = dateDTOList.flat(2).map(v => {
return {
modelId: this.modelId,
- isHighPriority: this.isHighPriority ? 1 : 0,
+ // isHighPriority: this.isHighPriority ? 1 : 0,
calendarDate: v,
...this.setOffDay(v)
}
})
- console.log(list)
- this.dateDTOList = list
+ let ext = {
+ modelId: this.modelId,
+ // isHighPriority: this.isHighPriority ? 1 : 0,
+ }
+
+ this.setDayRange(list, ext)
},
setOffDay(time) {
let { id: offDayId } = this.offDays.find(v => moment(time).unix() >= moment(v.startOffDay).unix() && moment(time).unix() <= moment(v.endOffDay).unix()) || {}
@@ -363,30 +533,60 @@
}
},
planCancel() {
- this.dateDTOList = []
+ this.months.forEach((item, i) => {
+ item.attributes = item.attributes.slice(0, 2)
+ })
},
save() {
+ let highDates = this.getHighDate()
+ let list = this.getPlanDate().map(v => {
+ if (highDates.indexOf(v.calendarDate) > -1) {
+ return {
+ ...v,
+ isHighPriority: 1
+ }
+ } else {
+ return {
+ ...v,
+ isHighPriority: 0
+ }
+ }
+ })
this.$refs.dialogForm.validate(async (valid) => {
if (valid) {
- if (this.dateDTOList.length == 0) {
+ if (list.length == 0) {
return this.$message.warning('鏈帓鐝�');
}
- let data = {
- codeRuleId: '',
- code: this.form.code,
- name: this.form.name,
- year: this.form.year,
- status: 1,
- dateDTOList: this.dateDTOList
- }
- this.$HTTP.post('/api/blade-cps/calendar', data).then(res => {
- if (res.code === 200) {
- this.$emit('success')
- } else {
- this.$message.warning(res.msg);
+ if (!this.drawerInfo.id) {
+ let data = {
+ codeRuleId: '',
+ code: this.form.code,
+ name: this.form.name,
+ year: this.form.year,
+ status: 1,
+ dateDTOList: list
}
- })
- console.log(this.form, this.dateDTOList)
+ this.$HTTP.post('/api/smis/calendar', data).then(res => {
+ if (res.code === 200) {
+ this.$emit('success')
+ } else {
+ this.$message.warning(res.msg);
+ }
+ })
+ } else {
+ let data = {
+ id: this.drawerInfo.id,
+ dateDTOList: list
+ }
+ this.$HTTP.put('/api/smis/calendar', data).then(res => {
+ if (res.code === 200) {
+ this.$emit('success')
+ } else {
+ this.$message.warning(res.msg);
+ }
+ })
+ }
+
} else {
this.$message.warning('璇锋鏌ュ繀濉」');
}
--
Gitblit v1.9.3