From 609477f87ab12645b26793467f8edea8b398507e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 13 五月 2025 11:19:26 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/index.js | 2 +-
src/tabviews/custom/components/module/voucher/voucherTable/index.jsx | 2 +-
src/api/index.js | 4 ++--
src/tabviews/custom/components/module/voucher/index.jsx | 4 ++--
src/tabviews/rolemanage/index.jsx | 6 ++++--
5 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index d15f06b..96572c2 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -62,8 +62,8 @@
return Promise.reject(response.data)
} else {
if (response.data.ErrCode === 'E') {
- if (/姝婚攣/.test(response.data.message)) {
- response.data.message = window.GLOB.dict['server_busy'] || '鏈嶅姟鍣ㄧ箒蹇欙紝璇风◢鍚庨噸璇曪紒'
+ if (/姝婚攣|灏氭湭浠庢睜涓幏鍙栬繛鎺�/.test(response.data.message)) {
+ response.data.message = (window.GLOB.dict['server_busy'] || '鏈嶅姟鍣ㄧ箒蹇欙紝璇风◢鍚庨噸璇曪紒') + (/姝婚攣/.test(response.data.message) ? '01' : '02')
response.data.ErrMesg = response.data.message
} else if (/鏃犳硶鎵撳紑鐧诲綍鎵�璇锋眰鐨勬暟鎹簱|鍦ㄤ笌\s*SQL\s+Server\s*寤虹珛杩炴帴鏃跺嚭鐜�/.test(response.data.message)) {
response.data.message = '鏈嶅姟鍣ㄩ摼鎺ヤ笉鍙敤锛岃鍏抽棴娴忚鍣ㄩ噸鏂版墦寮�锛�'
diff --git a/src/index.js b/src/index.js
index ec35269..a1b3e25 100644
--- a/src/index.js
+++ b/src/index.js
@@ -221,7 +221,7 @@
GLOB.appkey = config.mainkey
}
- let lang = localStorage.getItem(window.location.href.split('#')[0] + 'lang') || GLOB.defLang || 'zh-CN'
+ let lang = sessionStorage.getItem('lang') || localStorage.getItem(window.location.href.split('#')[0] + 'lang') || GLOB.defLang || 'zh-CN'
sessionStorage.setItem('lang', lang)
GLOB.sysSign = GLOB.service + 'admin/' + lang + '/'
diff --git a/src/tabviews/custom/components/module/voucher/index.jsx b/src/tabviews/custom/components/module/voucher/index.jsx
index 6e9f250..fb67d1d 100644
--- a/src/tabviews/custom/components/module/voucher/index.jsx
+++ b/src/tabviews/custom/components/module/voucher/index.jsx
@@ -567,7 +567,7 @@
let sup_data = []
let voucherMap = new Map()
let supMap = new Map()
- let extract = localStorage.getItem(window.GLOB.host + '_voucher_extract')
+ let extract = localStorage.getItem(window.GLOB.sysSign + '_voucher_extract')
extract = extract ? JSON.parse(extract) : []
data.forEach(item => {
@@ -621,7 +621,7 @@
if (extract.length > 20) {
extract.length = 20
}
- localStorage.setItem(window.GLOB.host + '_voucher_extract', JSON.stringify(extract))
+ localStorage.setItem(window.GLOB.sysSign + '_voucher_extract', JSON.stringify(extract))
}
voucherMap.forEach(item => {
diff --git a/src/tabviews/custom/components/module/voucher/voucherTable/index.jsx b/src/tabviews/custom/components/module/voucher/voucherTable/index.jsx
index 6edc5b7..0c5af4a 100644
--- a/src/tabviews/custom/components/module/voucher/voucherTable/index.jsx
+++ b/src/tabviews/custom/components/module/voucher/voucherTable/index.jsx
@@ -718,7 +718,7 @@
extra = <PlusOutlined onClick={this.plusLine}/>
if (editing) {
- let options = localStorage.getItem(window.GLOB.host + '_voucher_extract')
+ let options = localStorage.getItem(window.GLOB.sysSign + '_voucher_extract')
options = options ? JSON.parse(options) : []
children = <AutoComplete
diff --git a/src/tabviews/rolemanage/index.jsx b/src/tabviews/rolemanage/index.jsx
index 7e80fd8..8ecdb80 100644
--- a/src/tabviews/rolemanage/index.jsx
+++ b/src/tabviews/rolemanage/index.jsx
@@ -208,7 +208,8 @@
let param = {
func: 's_rolemenu_get_Menulist',
- RoleID: selectRoleId
+ RoleID: selectRoleId,
+ version: 1
}
this.setState({
@@ -279,7 +280,8 @@
RoleID: selectRoleId,
TypeCharOne: selectApp.kei_no,
typename: selectSubApp.typename,
- lang: selectSubApp.lang
+ lang: selectSubApp.lang,
+ version: 1
}
this.setState({
--
Gitblit v1.8.0