From 831cfa4c439c6d073d706a82d2a439f8b1818498 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 18 十一月 2025 16:59:50 +0800
Subject: [PATCH] Merge branch 'new' of http://www.beijingsoft.cn:9090/r/smart-web into new
---
src/views/console/base/Add.vue | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/views/console/base/Add.vue b/src/views/console/base/Add.vue
index 8027a4e..8e244b1 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-09 23:30:14
+ * @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`
@@ -533,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() {
@@ -566,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 {
@@ -578,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 {
--
Gitblit v1.9.3