From 5e82b0ad1b94b8d2d9603fb9384346e6be60d5ab Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 08 八月 2023 14:03:34 +0800
Subject: [PATCH] 2023-08-08
---
public/options.json | 14 ++--
src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx | 2
src/templates/sharecomponent/actioncomponent/verifyexcelout/customscript/index.jsx | 2
src/templates/sharecomponent/settingcomponent/settingform/simplescript/index.jsx | 2
src/templates/zshare/verifycard/callbackcustomscript/index.jsx | 2
src/tabviews/zshare/actionList/normalbutton/index.jsx | 145 +++++++++++++++++++++++++++++++----------------
src/templates/zshare/verifycard/customscript/index.jsx | 2
7 files changed, 107 insertions(+), 62 deletions(-)
diff --git a/public/options.json b/public/options.json
index f031142..858e91f 100644
--- a/public/options.json
+++ b/public/options.json
@@ -1,16 +1,16 @@
{
- "appId": "202108312122504607B107A83F55B40C98CCF",
- "appkey": "20210831212235413F287EC3BF489424496C8",
+ "appId": "201912040924165801464FF1788654BC5AC73",
+ "appkey": "20191106103859640976D6E924E464D029CF0",
"mainSystemApi": "http://sso.mk9h.cn/cloud/webapi/dostars",
"systemType": "",
"externalDatabase": "",
"lineColor": "",
"filter": "false",
- "defaultApp": "mkindustry",
+ "defaultApp": "mk",
"defaultLang": "zh-CN",
- "WXAppID": "",
+ "WXAppID": "wx4d8a34c8d4494872",
"WXminiAppID": "",
- "WXNotice": "false",
+ "WXNotice": "true",
"nginx": "true",
"debugger": false,
"licenseKey": "",
@@ -18,6 +18,6 @@
"transfer": "false",
"keepPassword": "true",
"platforms": ["H5", "wechat", "android", "ios", "wxMiniProgram"],
- "host": "http://demo.mk9h.cn",
- "service": "erp_new/"
+ "host": "http://qingqiumarket.cn",
+ "service": "MKWMS/"
}
\ No newline at end of file
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 63c9d84..c07350f 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -2053,7 +2053,16 @@
*/
execSuccess = (res = {}) => {
const { btn } = this.props
- const { btnconfig, autoMatic } = this.state
+ const { autoMatic } = this.state
+
+ if (autoMatic) {
+ this.setState({
+ loading: false,
+ visible: false
+ })
+ MKEmitter.emit('autoExecOver', btn.uuid, 'success')
+ return
+ }
let sign = ''
if (/^@speak@/i.test(res.message)) {
@@ -2076,41 +2085,6 @@
res.message = res.message.replace(/@close_tab@|@close_popup@|@goback@|@no_target_menu@/i, '')
}
- if ((res.ErrCode === 'S' || !res.ErrCode) || autoMatic) { // 鎵ц鎴愬姛
- if (btn.formType !== 'counter' || res.message) {
- notification.success({
- top: 92,
- message: res.message || '鎵ц鎴愬姛锛�',
- duration: btn.verify && btn.verify.stime ? btn.verify.stime : 2
- })
- }
- } else if (res.ErrCode === 'Y') { // 鎵ц鎴愬姛
- Modal.success({
- title: res.message || '鎵ц鎴愬姛锛�'
- })
- } else if (res.ErrCode === '-1') { // 瀹屾垚鍚庝笉鎻愮ず
-
- }
-
- this.setState({
- loadingNumber: '',
- loadingTotal: '',
- })
-
- if (autoMatic) {
- this.setState({
- loading: false,
- visible: false
- })
- MKEmitter.emit('autoExecOver', btn.uuid, 'success')
- return
- } else if (btn.OpenType !== 'pop' || !btnconfig || btnconfig.setting.finish !== 'unclose') {
- this.setState({
- loading: false,
- visible: false
- })
- }
-
let id = ''
if (btn.output) {
id = res.mk_b_id || res[btn.output] || ''
@@ -2119,6 +2093,53 @@
if (res.mk_icon) {
sessionStorage.setItem('avatar', res.mk_icon)
}
+
+ res.ErrCode = res.ErrCode || 'S'
+
+ if (res.ErrCode === 'S') { // 鎵ц鎴愬姛
+ if (btn.formType !== 'counter' || res.message) {
+ notification.success({
+ top: 92,
+ message: res.message || '鎵ц鎴愬姛锛�',
+ duration: btn.verify && btn.verify.stime ? btn.verify.stime : 2
+ })
+ }
+ } else if (res.ErrCode === 'Y') { // 鎵ц鎴愬姛
+ let msg = res.message || '鎵ц鎴愬姛锛�'
+ if (/\n/.test(msg)) {
+ msg = msg.replace(/\n/ig, '<br/>')
+ msg = <span dangerouslySetInnerHTML={{__html: msg}}></span>
+ }
+ Modal.success({
+ title: msg,
+ onOk: () => {
+ this.successContinue(sign, id)
+ }
+ })
+ return
+ } else if (res.ErrCode === '-1') { // 瀹屾垚鍚庝笉鎻愮ず
+
+ }
+
+ this.successContinue(sign, id)
+ }
+
+ successContinue = (sign, id) => {
+ const { btn } = this.props
+ const { btnconfig } = this.state
+
+ this.setState({
+ loadingNumber: '',
+ loadingTotal: '',
+ })
+
+ if (btn.OpenType !== 'pop' || !btnconfig || btnconfig.setting.finish !== 'unclose') {
+ this.setState({
+ loading: false,
+ visible: false
+ })
+ }
+
let tabId = ''
if (btn.refreshTab && btn.refreshTab.length > 0) {
tabId = btn.refreshTab[btn.refreshTab.length - 1]
@@ -2513,7 +2534,24 @@
*/
execError = (res = {}) => {
const { btn } = this.props
- const { btnconfig, autoMatic } = this.state
+ const { autoMatic } = this.state
+
+ if (autoMatic) {
+ notification.error({
+ top: 92,
+ message: res.message || '鎵ц澶辫触锛�',
+ duration: 10
+ })
+
+ this.setState({
+ loading: false,
+ loadingNumber: '',
+ loadingTotal: '',
+ visible: false
+ })
+ MKEmitter.emit('autoExecOver', btn.uuid, 'error')
+ return
+ }
if (!['LoginError', 'C', '-2', 'E', 'N', 'F', 'NM'].includes(res.ErrCode)) {
res.ErrCode = 'E'
@@ -2540,11 +2578,20 @@
res.message = res.message.replace(/@close_tab@|@close_popup@|@goback@/i, '')
}
- if (res.ErrCode === 'E' && !autoMatic) {
+ if (res.ErrCode === 'E') {
+ let msg = res.message || '鎵ц澶辫触锛�'
+ if (/\n/.test(msg)) {
+ msg = msg.replace(/\n/ig, '<br/>')
+ msg = <span dangerouslySetInnerHTML={{__html: msg}}></span>
+ }
Modal.error({
- title: res.message || '鎵ц澶辫触锛�',
+ title: msg,
+ onOk: () => {
+ this.errorContinue(sign)
+ }
})
- } else if (res.ErrCode === 'N' || autoMatic) {
+ return
+ } else if (res.ErrCode === 'N') {
notification.error({
top: 92,
message: res.message || '鎵ц澶辫触锛�',
@@ -2561,16 +2608,14 @@
message.error(res.message || '鎵ц澶辫触锛�')
}
- if (autoMatic) {
- this.setState({
- loading: false,
- loadingNumber: '',
- loadingTotal: '',
- visible: false
- })
- MKEmitter.emit('autoExecOver', btn.uuid, 'error')
- return
- } else if (btn.OpenType !== 'pop' || !btnconfig || btnconfig.setting.finish !== 'unclose') {
+ this.errorContinue(sign)
+ }
+
+ errorContinue = (sign) => {
+ const { btn } = this.props
+ const { btnconfig } = this.state
+
+ if (btn.OpenType !== 'pop' || !btnconfig || btnconfig.setting.finish !== 'unclose') {
this.setState({
loading: false
})
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx
index 7a197af..f5726e6 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx
@@ -341,7 +341,7 @@
</Col> : null}
{!type ? <Col span={10}>
<Form.Item label={'鎶ラ敊瀛楁'} style={{margin: 0, whiteSpace: 'nowrap'}}>
- ErrorCode锛堝鍔犲悗缂�NT琛ㄧず鏁版嵁涓嶅洖婊氾紝濡侲NT銆丯NT銆丗NT銆丯MNT锛�, retmsg
+ ErrorCode锛堝鍔犲悗缂�NT琛ㄧず鏁版嵁涓嶅洖婊氾紝濡侲NT銆丯NT銆丗NT銆丯MNT銆丆NT銆�-2NT锛�, retmsg
</Form.Item>
</Col> : null}
{!type ? <Col span={24} className="sqlfield">
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/customscript/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/customscript/index.jsx
index 436dd7e..76aa845 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/customscript/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/customscript/index.jsx
@@ -266,7 +266,7 @@
</Col>
<Col span={10}>
<Form.Item label="鎶ラ敊瀛楁" style={{margin: 0, whiteSpace: 'nowrap'}}>
- ErrorCode锛堝鍔犲悗缂�NT琛ㄧず鏁版嵁涓嶅洖婊氾紝濡侲NT銆丯NT銆丗NT銆丯MNT锛�, retmsg
+ ErrorCode锛堝鍔犲悗缂�NT琛ㄧず鏁版嵁涓嶅洖婊氾紝濡侲NT銆丯NT銆丗NT銆丯MNT銆丆NT銆�-2NT锛�, retmsg
</Form.Item>
</Col>
<Col span={24} className="sqlfield">
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/simplescript/index.jsx b/src/templates/sharecomponent/settingcomponent/settingform/simplescript/index.jsx
index e34235a..4b274f6 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/simplescript/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/simplescript/index.jsx
@@ -446,7 +446,7 @@
</Col>
<Col span={20}>
<Form.Item labelCol={{span: 4}} wrapperCol={{span: 20}} label={'鎶ラ敊瀛楁'} style={{margin: 0}}>
- ErrorCode锛堝鍔犲悗缂�NT琛ㄧず鏁版嵁涓嶅洖婊氾紝濡侲NT銆丯NT銆丗NT銆丯MNT锛�, retmsg
+ ErrorCode锛堝鍔犲悗缂�NT琛ㄧず鏁版嵁涓嶅洖婊氾紝濡侲NT銆丯NT銆丗NT銆丯MNT銆丆NT銆�-2NT锛�, retmsg
</Form.Item>
</Col>
<Col span={24} className="sqlfield">
diff --git a/src/templates/zshare/verifycard/callbackcustomscript/index.jsx b/src/templates/zshare/verifycard/callbackcustomscript/index.jsx
index d484478..c0750c8 100644
--- a/src/templates/zshare/verifycard/callbackcustomscript/index.jsx
+++ b/src/templates/zshare/verifycard/callbackcustomscript/index.jsx
@@ -258,7 +258,7 @@
</Col>
<Col span={10}>
<Form.Item label={'鎶ラ敊瀛楁'} style={{margin: 0, whiteSpace: 'nowrap'}}>
- ErrorCode锛堝鍔犲悗缂�NT琛ㄧず鏁版嵁涓嶅洖婊氾紝濡侲NT銆丯NT銆丗NT銆丯MNT锛�, retmsg
+ ErrorCode锛堝鍔犲悗缂�NT琛ㄧず鏁版嵁涓嶅洖婊氾紝濡侲NT銆丯NT銆丗NT銆丯MNT銆丆NT銆�-2NT锛�, retmsg
</Form.Item>
</Col>
<Col span={24} className="sqlfield">
diff --git a/src/templates/zshare/verifycard/customscript/index.jsx b/src/templates/zshare/verifycard/customscript/index.jsx
index b176479..cb530d4 100644
--- a/src/templates/zshare/verifycard/customscript/index.jsx
+++ b/src/templates/zshare/verifycard/customscript/index.jsx
@@ -303,7 +303,7 @@
</Col> : null}
{!_type ? <Col span={10}>
<Form.Item label={'鎶ラ敊瀛楁'} style={{margin: 0, whiteSpace: 'nowrap'}}>
- ErrorCode锛堝鍔犲悗缂�NT琛ㄧず鏁版嵁涓嶅洖婊氾紝濡侲NT銆丯NT銆丗NT銆丯MNT锛�, retmsg
+ ErrorCode锛堝鍔犲悗缂�NT琛ㄧず鏁版嵁涓嶅洖婊氾紝濡侲NT銆丯NT銆丗NT銆丯MNT銆丆NT銆�-2NT锛�, retmsg
</Form.Item>
</Col> : null}
{!_type ? <Col span={24} className="sqlfield">
--
Gitblit v1.8.0