Merge branch 'new' of http://www.beijingsoft.cn:9090/r/smart-web into new

yangys

2025-11-18 831cfa4c439c6d073d706a82d2a439f8b1818498

 src/views/console/base/Add.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-05-04 16:37:48
 * @LastEditors: gaoshp
 * @LastEditTime: 2024-10-09 22:50:13
 * @LastEditTime: 2024-11-07 21:45:28
 * @FilePath: /cps-web/src/views/console/base/Add.vue
-->
<template>
@@ -225,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`
@@ -375,14 +375,21 @@
                        },
                    })
                    // 优先
                    this.months[i].attributes.push({
                        dates: dates.filter(v => v.isHighPriority === 1).map(v => v.calendarDate),
                        bar: {
                            style: {
                                backgroundColor: 'red',
                            }
                        },
                    })
                    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: []
@@ -398,6 +405,7 @@
            return false
        },
        changeHigh(val) {
            console.log('------------changeHigh')
            if (this.currentDateItem) {
                // 设置优先
                let index = this.currentDateItem.attributes.findIndex(item => !!item.bar)
@@ -525,8 +533,20 @@
            }
        },
        planCancel() {
            // 取消排班只能取消当前时间之后的排班
            let now = moment(moment().format('YYYY-MM-DD')).valueOf()
            this.months.forEach((item, i) => {
                item.attributes = item.attributes.slice(0, 2)
                // item.attributes = item.attributes.slice(0, 2)
                item.attributes = item.attributes.map((v, i) => {
                    if (i > 1) {
                        v.dates = v.dates.filter(c => {
                            if (moment(c).valueOf() <= now) {
                                return true
                            }
                        })
                    }
                    return v
                })
            })
        },
        save() {
@@ -558,7 +578,7 @@
                            status: 1,
                            dateDTOList: list
                        }
                        this.$HTTP.post('/api/blade-cps/calendar', data).then(res => {
                        this.$HTTP.post('/api/smis/calendar', data).then(res => {
                            if (res.code === 200) {
                                this.$emit('success')
                            } else {
@@ -570,7 +590,7 @@
                            id: this.drawerInfo.id,
                            dateDTOList: list
                        }
                        this.$HTTP.put('/api/blade-cps/calendar', data).then(res => {
                        this.$HTTP.put('/api/smis/calendar', data).then(res => {
                            if (res.code === 200) {
                                this.$emit('success')
                            } else {