From cabb1d314fd0d59a747331512b8ac3ecf1ef7cd3 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 25 一月 2024 16:01:38 +0800
Subject: [PATCH] 2024-01-25
---
src/utils/utils.js | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index f4dc5e3..f2a7e49 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -264,7 +264,38 @@
item.initval = item.initval ? moment().subtract(item.initval, 'days').format(format) : ''
} else if (item.type === 'datemonth') {
item.format = 'YYYY-MM'
- item.initval = item.initval ? moment().subtract(item.initval, 'month').format('YYYY-MM') : ''
+
+ if (item.initval) {
+ if (!item.dateShift) {
+ item.initval = moment().subtract(item.initval, 'month').format('YYYY-MM')
+ } else {
+ item.$initval = item.initval
+ item.$supId = config.$pageId
+ if (config.setting && config.setting.supModule) {
+ item.$supId = config.setting.supModule
+
+ config.checkBid = true
+ config.setting.checkBid = true
+ item.checkShift = true
+ }
+
+ item.initval = ''
+
+ let d = ''
+ if (window.GLOB.CacheData.has(item.$supId)) {
+ d = window.GLOB.CacheData.get(item.$supId)
+ d = d[item.dateShift] || ''
+ if (d) {
+ d = moment(d).format('YYYY-MM-DD')
+ d = d === 'Invalid date' ? '' : d
+ }
+ }
+
+ if (d) {
+ item.initval = moment(d).subtract(item.initval, 'month').format('YYYY-MM')
+ }
+ }
+ }
} else if (item.type === 'dateweek') {
item.format = 'YYYY-MM-DD'
item.initval = item.initval ? moment().subtract(item.initval * 7, 'days').format('YYYY-MM-DD') : ''
@@ -304,11 +335,12 @@
item.$supId = config.$pageId
if (config.setting && config.setting.supModule) {
item.$supId = config.setting.supModule
+
+ config.checkBid = true
+ config.setting.checkBid = true
+ item.checkShift = true
}
- config.checkBid = true
- config.setting.checkBid = true
- item.checkShift = true
item.initval = ''
let d = ''
@@ -2342,7 +2374,7 @@
z_debug_end: select @ErrorCode='E',@retmsg='debug_end' goto aaa`
}
- if (retmsg) {
+ if (retmsg || btn.returnValue === 'true') {
_sql += `
aaa: if @ErrorCode!=''
insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@`
--
Gitblit v1.8.0