From c547c75fce3c2d9badcb496da7d8e5443e22dbfc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 03 八月 2024 17:10:41 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/utils/utils.js | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 1fa8b28..35fb3a8 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -916,6 +916,7 @@
sql = sql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
sql = sql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
sql = sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
+ sql = sql.replace(/@lang@/ig, `'${sessionStorage.getItem('lang')}'`)
return {
sql: sql,
@@ -1094,6 +1095,7 @@
{reg: /@SessionUid@/ig, value: `'${localStorage.getItem('SessionUid') || ''}'`},
{reg: /@UserID@/ig, value: `'${sessionStorage.getItem('UserID') || ''}'`},
{reg: /@Appkey@/ig, value: `'${window.GLOB.appkey || ''}'`},
+ {reg: /@lang@/ig, value: `'${sessionStorage.getItem('lang')}'`},
{reg: /@typename@/ig, value: `'admin'`},
{reg: /\$@/ig, value: isDM ? '/*' : ''},
{reg: /@\$/ig, value: isDM ? '*/' : ''},
@@ -1338,8 +1340,8 @@
sql = sql.replace(/\n\s{6}/ig, '\n')
if (window.GLOB.debugger === true) {
- console.info('%c' + item.logLabel, 'color: blue')
- console.info(sql)
+ window.mkInfo('%c' + item.logLabel, 'color: blue')
+ window.mkInfo(sql)
}
} else {
for(let i = 0; i < _Ltext.length; i += 20) {
@@ -1425,6 +1427,7 @@
{reg: /@SessionUid@/ig, value: `'${localStorage.getItem('SessionUid') || ''}'`},
{reg: /@UserID@/ig, value: `'${sessionStorage.getItem('UserID') || ''}'`},
{reg: /@Appkey@/ig, value: `'${window.GLOB.appkey || ''}'`},
+ {reg: /@lang@/ig, value: `'${sessionStorage.getItem('lang')}'`},
{reg: /@typename@/ig, value: `'admin'`},
{reg: /\$@/ig, value: isDM ? '/*' : ''},
{reg: /@\$/ig, value: isDM ? '*/' : ''},
@@ -1582,8 +1585,8 @@
sql = sql.replace(/\n\s{6}/ig, '\n')
if (window.GLOB.debugger === true) {
- console.info('%c' + btn.logLabel, 'color: blue')
- console.info(sql)
+ window.mkInfo('%c' + btn.logLabel, 'color: blue')
+ window.mkInfo(sql)
}
} else {
for(let i = 0; i < _Ltext.length; i += 20) {
@@ -2563,15 +2566,29 @@
begin
select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and userid=@userid@
- if @retmsg !=''
+ if @retmsg !=''
begin
select @ErrorCode='E', @retmsg='褰撳墠鍗曟嵁宸插鏍革紝璇峰埛鏂板悗閲嶈瘯'
- goto aaa
+ goto aaa
+ end
+
+ if @dataM@ !=''
+ begin
+ set @retmsg =''
+ select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0
+
+ if @retmsg != ''
+ begin
+ goto goto_mk
+ end
end
select @retmsg='椤甸潰鏁版嵁宸叉洿鏂帮紝鎴栨病鏈夊綋鍓嶅崟鎹殑瀹℃壒鏉冮檺'
goto aaa
- end
+ end
+
+ goto_mk:
+
set @retmsg=''
update s_my_works_flow set status=@status@,statusname=@statusname@,works_flow_param=@works_flow_param@,works_flow_detail_id=@works_flow_detail_id@,modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname${verify.flowRemark ? ',remark=@' + verify.flowRemark : ''}
@@ -2670,6 +2687,7 @@
_sql = _sql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
_sql = _sql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
_sql = _sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
+ _sql = _sql.replace(/@lang@/ig, `'${sessionStorage.getItem('lang')}'`)
_sql = _sql.replace(/@typename@/ig, `'admin'`)
if (window.GLOB.externalDatabase !== null) {
@@ -2683,8 +2701,8 @@
}
if (window.GLOB.debugger === true) {
- console.info('%c' + btn.logLabel, 'color: blue')
- console.info(_sql)
+ window.mkInfo('%c' + btn.logLabel, 'color: blue')
+ window.mkInfo(_sql)
}
if (retmsg) {
--
Gitblit v1.8.0