From c7aece35a62b6e91fd98a625bf0e53f64bfbd18d Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期四, 17 八月 2023 16:22:15 +0800 Subject: [PATCH] 2023-08-17 --- src/tabviews/zshare/actionList/normalbutton/index.jsx | 59 +++++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 37 insertions(+), 22 deletions(-) diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx index 7ab6d6e..f07a1dd 100644 --- a/src/tabviews/zshare/actionList/normalbutton/index.jsx +++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx @@ -8,7 +8,6 @@ import Api from '@/api' import Utils, { getSysDefaultSql } from '@/utils/utils.js' -import options from '@/store/options.js' import asyncSpinComponent from '@/utils/asyncSpinComponent' import { updateForm } from '@/utils/utils-update.js' import MKEmitter from '@/utils/events.js' @@ -266,14 +265,6 @@ notification.warning({ top: 92, message: '璇烽�夋嫨鍗曡鏁版嵁锛�', - duration: 5 - }) - return - } else if (!['requiredSgl', 'notRequired', 'requiredOnce', 'required'].includes(btn.Ot)) { - // 鏁版嵁閫夋嫨绫诲瀷鏍¢獙 - notification.warning({ - top: 92, - message: '鎸夐挳琛岃缃敊璇紒', duration: 5 }) return @@ -1090,7 +1081,7 @@ }, 600) } - this.triggerNote(res) // 娑堟伅 + this.triggerNote(res, _param.ID) // 娑堟伅 this.execSuccess(res) } else { this.execError(res) @@ -1107,7 +1098,7 @@ setTimeout(() => { Api.genericInterface(param).then(res => { if (res.status) { - this.triggerNote(res) // 娑堟伅 + this.triggerNote(res, param.ID) // 娑堟伅 } resolve(res) }, (error) => { @@ -1235,7 +1226,13 @@ if (Array.isArray(res.mk_ex_data) && res.mk_ex_data.length > 0) { let pices = res.mk_ex_data.map(item => { item.$pice = true - item.$record = record + item.$record = {...record} + + if (item.hasOwnProperty('mk_api_key')) { + item.$record.mk_api_key = item.mk_api_key || record.mk_api_key || '' + + delete item.mk_api_key + } return item }) params = [...pices, ...params] @@ -1458,6 +1455,8 @@ Api.genericInterface(param).then(res => { if (res.status) { + this.triggerNote(res, param.ID) // 娑堟伅 + if (params.length === 0) { this.execSuccess(res) _resolve() @@ -1609,7 +1608,7 @@ sql = sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`) sql = sql.replace(/@typename@/ig, `'admin'`) - if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) { + if (window.GLOB.debugger === true) { console.info(sql.replace(/\n\s{8}/ig, '\n')) } @@ -1645,7 +1644,7 @@ Sort: index + 1 })) - if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) { + if (window.GLOB.debugger === true) { let sql = [...lineMap.values()].map(item => (` ${item.insert} ${item.selects.join(` union all @@ -1671,7 +1670,7 @@ Api.genericInterface(param).then(res => { if (res.status) { - this.triggerNote(res) // 娑堟伅 + this.triggerNote(res, param.ID) // 娑堟伅 if (params.length === 0) { this.execSuccess(res) @@ -1705,7 +1704,7 @@ Api.genericInterface(param).then(res => { if (res.status) { - this.triggerNote(res) // 娑堟伅 + this.triggerNote(res, param.ID) // 娑堟伅 if (params.length === 0) { this.execSuccess(res) @@ -1727,7 +1726,7 @@ return new Promise(resolve => { Api.genericInterface(unCheckParam).then(result => { if (result.status) { - _this.triggerNote(result) // 娑堟伅 + _this.triggerNote(result, param.ID) // 娑堟伅 if (params.length === 0) { _this.execSuccess(result) @@ -1835,8 +1834,8 @@ if (window.GLOB.mainSystemApi) { result.rduri = window.GLOB.mainSystemApi } - } else if (btn.sysInterface === 'true' && options.cloudServiceApi) { - result.rduri = options.cloudServiceApi + } else if (btn.sysInterface === 'true' && window.GLOB.cloudServiceApi) { + result.rduri = window.GLOB.cloudServiceApi result.userid = sessionStorage.getItem('CloudUserID') || '' result.LoginUID = sessionStorage.getItem('CloudLoginUID') || '' } else if (btn.sysInterface !== 'true') { @@ -1969,6 +1968,8 @@ Api.genericInterface(param).then(res => { if (res.status) { + this.triggerNote(res, param.ID) // 娑堟伅 + // 涓�娆¤姹傛垚鍔燂紝杩涜涓嬩竴椤硅姹� if (params.length === 0) { this.execSuccess(res) @@ -2219,15 +2220,19 @@ } } - triggerNote = (res) => { + triggerNote = (res, ID) => { const { btn } = this.props if (!btn.verify) return - if (btn.verify.noteEnable !== 'true' && btn.verify.wxNote !== 'true') return + if (btn.verify.noteEnable !== 'true' && btn.verify.wxNote !== 'true' && btn.verify.printEnable !== 'true') return let id = '' if (btn.output) { id = res.mk_b_id || res[btn.output] || '' + } + + if (btn.verify.printEnable === 'true') { + this.billPrint(id || ID) } if (!id) return @@ -2251,6 +2256,16 @@ } } + billPrint = (id) => { + const { btn } = this.props + + if (!id) return + + setTimeout(() => { + window.open('#/billprint/' + window.btoa(window.encodeURIComponent(JSON.stringify({ id: id, tempId: btn.verify.printTempId, pageId: btn.$MenuID || '', dataM: sessionStorage.getItem('dataM') })))) + }, 500) + } + sendWxMessage = (verify, id) => { if (!window.GLOB.nginx) { notification.warning({ @@ -2272,7 +2287,7 @@ let domain1 = '' let domain2 = '' - if (['8IFltwzyKcu15iA8fqSyb6m-pMa88a3ZTu0No3vDHgo', 'LOB-bbt9jVncGh7IOAUdESh1Sgzcbt62UwOqSqcK9ok'].includes(verify.wxTemplateId) && options.sysType !== 'cloud') { + if (['8IFltwzyKcu15iA8fqSyb6m-pMa88a3ZTu0No3vDHgo', 'LOB-bbt9jVncGh7IOAUdESh1Sgzcbt62UwOqSqcK9ok'].includes(verify.wxTemplateId) && window.GLOB.sysType !== 'cloud') { domain1 = 'https://cloud.mk9h.cn/' domain2 = 'https://cloud.mk9h.cn:8443/' } -- Gitblit v1.8.0