From 6ca7b57cb3e251fa292d4a4900f23b83563ac94c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 01 八月 2023 17:10:15 +0800
Subject: [PATCH] Merge branch 'positec' into bms
---
src/utils/utils-datamanage.js | 13 ++++---------
src/views/login/loginform.jsx | 2 --
src/tabviews/zshare/actionList/printbutton/index.jsx | 4 ++--
3 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/src/tabviews/zshare/actionList/printbutton/index.jsx b/src/tabviews/zshare/actionList/printbutton/index.jsx
index 53e51e0..93bf150 100644
--- a/src/tabviews/zshare/actionList/printbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/printbutton/index.jsx
@@ -1137,13 +1137,13 @@
LText = `${LText}
aaa:
if @ErrorCode!=''
- insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@
+ insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,'${sessionStorage.getItem('UserID') || ''}'
`
} else {
_customScript = `${_customScript}
aaa:
if @ErrorCode!=''
- insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@
+ insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,'${sessionStorage.getItem('UserID') || ''}'
`
}
} else {
diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index 32bc369..6550fe8 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -244,13 +244,13 @@
LText = `${LText}
aaa:
if @ErrorCode!=''
- insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@
+ insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,'${sessionStorage.getItem('UserID') || ''}'
`
} else {
_customScript = `${_customScript}
aaa:
if @ErrorCode!=''
- insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@
+ insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,'${sessionStorage.getItem('UserID') || ''}'
`
}
} else {
@@ -389,13 +389,8 @@
regoptions.forEach(item => {
_dataresource = _dataresource.replace(item.reg, item.value)
+ _customScript = _customScript.replace(item.reg, item.value)
})
-
- if (_customScript) {
- regoptions.forEach(item => {
- _customScript = _customScript.replace(item.reg, item.value)
- })
- }
let _search = ''
@@ -412,7 +407,7 @@
LText = `${LText}
aaa:
if @ErrorCode!=''
- insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@
+ insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,'${sessionStorage.getItem('UserID') || ''}'
`
} else {
LText = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100)
diff --git a/src/views/login/loginform.jsx b/src/views/login/loginform.jsx
index 228330c..1645257 100644
--- a/src/views/login/loginform.jsx
+++ b/src/views/login/loginform.jsx
@@ -396,8 +396,6 @@
if (input) {
input.focus()
}
- } else {
- this.handleSubmit()
}
}
--
Gitblit v1.8.0