From fe10cf437b17a2ea0ef63373cae2e5790ebc3930 Mon Sep 17 00:00:00 2001 From: cuiqian2004 <cuiqian2004@163.com> Date: 星期四, 31 七月 2025 18:22:52 +0800 Subject: [PATCH] action 处理 --- pages/modal/3018.vue | 60 ++ pages/modal/3200_view.vue | 34 + pages/modal/5602.vue | 3 pages/modal/5601.vue | 467 +++++++++++++----------- pages/modal/3202.vue | 127 ++++-- pages/modal/3037.vue | 29 + pages/modal/3200.vue | 126 ++++-- manifest.json | 4 pages/modal/3202_view.vue | 44 + pages/modal/form/index.vue | 155 +++++-- pages/modal/3201.vue | 51 + 11 files changed, 685 insertions(+), 415 deletions(-) diff --git a/manifest.json b/manifest.json index 76e8bc6..5213ad7 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "MoboxPDA", "appid" : "__UNI__56D451E", "description" : "", - "versionName" : "1.1.62", - "versionCode" : 1162, + "versionName" : "1.1.63", + "versionCode" : 1163, "transformPx" : false, /* 5+App鐗规湁鐩稿叧 */ "app-plus" : { diff --git a/pages/modal/3018.vue b/pages/modal/3018.vue index b6cb0e0..b365f5b 100644 --- a/pages/modal/3018.vue +++ b/pages/modal/3018.vue @@ -1002,7 +1002,7 @@ //console.log(e.target) getApp().onScan((result) => { console.log(result); - this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value =result; + this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value = result; uni.hideKeyboard(); this.onevent($ele, result); }) @@ -1845,29 +1845,15 @@ .info .join( '<br/>') : ''; + tip = tip || result.err_info if (tip) uni.showModal({ title: this.translateSys('tip'), content: tip, showCancel: false, confirmText: this.translateSys('close') }); - - var actionlist = data.action; - if (actionlist) { - console.log(actionlist); - for (var i = 0; i < actionlist.length; i++) { - var action = actionlist[i]; - if (action.action_type == 'set_dlg_attr') { - var result = action.value; - this.setFormValues(action.value) - } else if (data.action[i].action_type == 'set_global_attr') { - $this.global_attr = data.action[i].value || []; - } - } - } - - if (data.result_type == 2 && data.result) { - var result = data.result; + if (data.result_type == 2) { + var result = data.result || [] for (var i = 0; i < result.length; i++) { for (var c = 0; c < $this.classAttrList.length; c++) { var attr = $this.classAttrList[c].Attr; @@ -1895,7 +1881,45 @@ } } } + + } else if (typeof data.result == 'string') { + if (data.result) { + uni.showModal({ + title: this.translateSys('tip'), + content: data.result, + showCancel: false, + confirmText: this.translateSys('close') + }); + } } + try { + var actionlist = data.action || []; + if (actionlist) { + console.log(actionlist); + for (var i = 0; i < actionlist.length; i++) { + var action = actionlist[i]; + if (action.action_type == 'set_dlg_attr') { + var result = action.value; + this.setFormValues(action.value) + } else if (data.action[i].action_type == 'set_global_attr') { + $this.global_attr = data.action[i].value || []; + } + } + } + } catch (ex) { + let actionList = (data.action || []).map(a => a.action_type).join(';') + let tip = typeof ex == 'string' ? ex : ex.message + tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}` + uni.showModal({ + title: this.translateSys('tip'), + content: tip, + showCancel: false, + confirmText: this.translateSys('close') + }); + console.log(ex) + return + } + } }).catch(ex => { diff --git a/pages/modal/3037.vue b/pages/modal/3037.vue index b576fd2..74b983c 100644 --- a/pages/modal/3037.vue +++ b/pages/modal/3037.vue @@ -679,7 +679,7 @@ }, data() { return { - largeMode: getApp().globalData.largeMode || false, + largeMode: getApp().globalData.largeMode || false, title: '鏂板', param: {}, classAttrList: [], @@ -2627,10 +2627,21 @@ showCancel: false, confirmText: this.translateSys('close') }); + if (data.result_type == 2) { - if (data.action) { + } else if (typeof data.result == 'string') { + if (data.result) { + uni.showModal({ + title: this.translateSys('tip'), + content: data.result, + showCancel: false, + confirmText: this.translateSys('close') + }); + } + } + try { var actionlist = - data.action; + data.action || [] if (actionlist) { for (var j = 0; j < @@ -2750,6 +2761,18 @@ } } } + } catch (ex) { + let actionList = (data.action || []).map(a => a.action_type).join(';') + let tip = typeof ex == 'string' ? ex : ex.message + tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}` + uni.showModal({ + title: this.translateSys('tip'), + content: tip, + showCancel: false, + confirmText: this.translateSys('close') + }); + console.log(ex) + return } } diff --git a/pages/modal/3200.vue b/pages/modal/3200.vue index 7f2c728..dd162d9 100644 --- a/pages/modal/3200.vue +++ b/pages/modal/3200.vue @@ -533,15 +533,28 @@ } else { var tip = result.info ? typeof result.info == 'string' ? result.info : result.info.join('<br/>') : ''; + tip = tip || result.err_info if (tip) uni.showModal({ title: this.translateSys("tip"), content: tip, showCancel: false, confirmText: this.translateSys('close') }); + if (result.result_type == 2) { - if (result.result_type == 0 && result.action) { - result.action.forEach(item => { + } else if (typeof result.result == 'string') { + if (result.result) { + uni.showModal({ + title: this.translateSys('tip'), + content: result.result, + showCancel: false, + confirmText: this.translateSys('close') + }); + } + } + try { + var actionList = result.action || [] + actionList.forEach(item => { if (item.action_type == "set_query_condition") { var value = item.value; $this.wheres = value.condition; @@ -554,16 +567,20 @@ } }); - } else { - if (result.info) { - uni.showModal({ - title: this.translateSys("tip"), - content: result.info, - showCancel: false, - confirmText: this.translateSys('close') - }); - } + } catch (ex) { + let actionList = (result.action || []).map(a => a.action_type).join(';') + let tip = typeof ex == 'string' ? ex : ex.message + tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}` + uni.showModal({ + title: this.translateSys('tip'), + content: tip, + showCancel: false, + confirmText: this.translateSys('close') + }); + console.log(ex) + return } + } } } catch (ex) { @@ -1373,6 +1390,7 @@ .info == 'string' ? result .info : result.info.join('<br/>') : ''; + tip = tip || result.err_info if (tip) uni.showModal({ title: this.translateSys( "tip"), @@ -1381,9 +1399,20 @@ confirmText: this.translateSys( 'close') }); + if (result.result_type == 2) { - if (result.result_type == 0 && result.action) { - var actionlist = result.action; + } else if (typeof result.result == 'string') { + if (result.result) { + uni.showModal({ + title: this.translateSys('tip'), + content: result.result, + showCancel: false, + confirmText: this.translateSys('close') + }); + } + } + try { + var actionlist = result.action || [] for (var j = 0; j < actionlist.length; j++) { var action = actionlist[j]; var action_type = action.action_type; @@ -1418,20 +1447,18 @@ } } - // value = {"attr":"xxx", "value":"xxx"} - } else { - if (result.info) { - uni.showModal({ - title: this - .translateSys( - "tip"), - content: result.info, - showCancel: false, - confirmText: this - .translateSys( - 'close') - }); - } + } catch (ex) { + let actionList = (result.action || []).map(a => a.action_type).join(';') + let tip = typeof ex == 'string' ? ex : ex.message + tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}` + uni.showModal({ + title: this.translateSys('tip'), + content: tip, + showCancel: false, + confirmText: this.translateSys('close') + }); + console.log(ex) + return } } @@ -1675,6 +1702,7 @@ .info == 'string' ? result .info : result .info.join('<br/>') : ''; + tip = tip || result.err_info if (tip) uni.showModal({ title: this.translateSys( "tip"), @@ -1683,10 +1711,21 @@ confirmText: this.translateSys( 'close') }); + if (result.result_type == 2) { - if (result.result_type == 0 && result - .action) { - result.action.forEach(item => { + } else if (typeof result.result == 'string') { + if (result.result) { + uni.showModal({ + title: this.translateSys('tip'), + content: result.result, + showCancel: false, + confirmText: this.translateSys('close') + }); + } + } + try { + var actionList = result.action || [] + actionList.forEach(item => { if (item.action_type == "goback_to_pre_page" ) { //杩斿洖涓婁竴椤�@@ -1762,20 +1801,21 @@ }); } }); - } else { - if (result.info) { - uni.showModal({ - title: this - .translateSys( - "tip"), - content: result.info, - showCancel: false, - confirmText: this - .translateSys( - 'close') - }); - } + + } catch (ex) { + let actionList = (result.action || []).map(a => a.action_type).join(';') + let tip = typeof ex == 'string' ? ex : ex.message + tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}` + uni.showModal({ + title: this.translateSys('tip'), + content: tip, + showCancel: false, + confirmText: this.translateSys('close') + }); + console.log(ex) + return } + } diff --git a/pages/modal/3200_view.vue b/pages/modal/3200_view.vue index 8eb16dd..28c8e74 100644 --- a/pages/modal/3200_view.vue +++ b/pages/modal/3200_view.vue @@ -67,7 +67,7 @@ }, data() { return { - largeMode: getApp().globalData.largeMode || false, + largeMode: getApp().globalData.largeMode || false, title: this.translateSys('add2'), param: {}, styleDef: { @@ -485,15 +485,28 @@ } else { var tip = result.info ? typeof result.info == 'string' ? result.info : result .info.join('<br/>') : ''; + tip = tip || result.err_info if (tip) uni.showModal({ title: this.translateSys("tip"), content: tip, showCancel: false, confirmText: this.translateSys('close') }); + if (result.result_type == 2) { - if (result.result_type == 0 && result.action) { - result.action.forEach(item => { + } else if (typeof result.result == 'string') { + if (result.result) { + uni.showModal({ + title: this.translateSys('tip'), + content: result.result, + showCancel: false, + confirmText: this.translateSys('close') + }); + } + } + try { + var actionList = result.action || [] + actionList.forEach(item => { if (item.action_type == "goback_to_pre_page") { //杩斿洖涓婁竴椤� var value = item.value; // const eventChannel = this.getOpenerEventChannel(); @@ -519,16 +532,21 @@ } }); - } else { - var tip = result.info ? typeof result.info == 'string' ? result.info : - result.info.join('<br/>') : ''; - if (tip) uni.showModal({ - title: this.translateSys("tip"), + + } catch (ex) { + let actionList = (result.action || []).map(a => a.action_type).join(';') + let tip = typeof ex == 'string' ? ex : ex.message + tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}` + uni.showModal({ + title: this.translateSys('tip'), content: tip, showCancel: false, confirmText: this.translateSys('close') }); + console.log(ex) + return } + } } catch (ex) { diff --git a/pages/modal/3201.vue b/pages/modal/3201.vue index 5e6160a..cd3e95b 100644 --- a/pages/modal/3201.vue +++ b/pages/modal/3201.vue @@ -33,7 +33,7 @@ <script> import { Base64 - } from '@/js/Base64.js'; + } from '@/js/Base64.js'; import classUtils from "@/js/utils.js" import { appGetInfo, @@ -46,12 +46,12 @@ } from "@/api/data.js" import buttonClickMixin from '@/mixins/button-click.js'; - + export default { mixins: [buttonClickMixin], data() { return { - largeMode: getApp().globalData.largeMode || false, + largeMode: getApp().globalData.largeMode || false, title: '3201棣栭〉', param: {}, show: true, @@ -122,7 +122,7 @@ let that = this; let keys = []; let val, data; - + Object.keys(obj).forEach(function(key) { keys = key.split("."); val = obj[key]; @@ -139,7 +139,7 @@ }); }); }, - + //鑾峰彇鍔熻兘鐐逛俊鎭� async appGetInfo(appid, index) { try { @@ -241,15 +241,28 @@ } else { var tip = result.info ? typeof result.info == 'string' ? result.info : result.info.join('<br/>') : ''; + tip = tip || result.err_info if (tip) uni.showModal({ title: this.translateSys("tip"), content: tip, showCancel: false, confirmText: this.translateSys('close') }); + if (result.result_type == 2) { - if (result.result_type == 0 && result.action) { - result.action.forEach(item => { + } else if (typeof result.result == 'string') { + if (result.result) { + uni.showModal({ + title: this.translateSys('tip'), + content: result.result, + showCancel: false, + confirmText: this.translateSys('close') + }); + } + } + try { + var actionList = result.action || [] + actionList.forEach(item => { if (item.action_type == "set_query_condition") { var value = item.value; $this.wheres = value.condition; @@ -259,19 +272,21 @@ } }); - } else { - // this.detail2StyleDefList=[]; - if (result.info) { - uni.showModal({ - title: this.translateSys("tip"), - content: result.info, - showCancel: false, - confirmText: this.translateSys('close') - }); - } + } catch (ex) { + let actionList = (result.action || []).map(a => a.action_type).join(';') + let tip = typeof ex == 'string' ? ex : ex.message + tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}` + uni.showModal({ + title: this.translateSys('tip'), + content: tip, + showCancel: false, + confirmText: this.translateSys('close') + }); + console.log(ex) + return } - } + } }).catch(ex => { // console.log(ex); diff --git a/pages/modal/3202.vue b/pages/modal/3202.vue index 3aa01ce..8b09391 100644 --- a/pages/modal/3202.vue +++ b/pages/modal/3202.vue @@ -528,6 +528,7 @@ .info == 'string' ? result .info : result.info.join('<br/>') : ''; + tip = tip || result.err_info if (tip) uni.showModal({ title: this.translateSys( "tip"), @@ -536,9 +537,21 @@ confirmText: this.translateSys( 'close') }); + if (result.result_type == 2) { - if (result.result_type == 0 && result.action) { - result.action.forEach(item => { + } else if (typeof result.result == 'string') { + if (result.result) { + uni.showModal({ + title: this.translateSys('tip'), + content: result.result, + showCancel: false, + confirmText: this.translateSys('close') + }); + } + } + try { + var actionList = result.action || [] + actionList.forEach(item => { if (item.action_type == "jump_pda_page") { // value = {"attr":"xxx", "value":"xxx"} var data = item.value; @@ -554,20 +567,20 @@ }); } }) - } else { - if (result.info) { - uni.showModal({ - title: this - .translateSys( - "tip"), - content: result.info, - showCancel: false, - confirmText: this - .translateSys( - 'close') - }); - } + } catch (ex) { + let actionList = (result.action || []).map(a => a.action_type).join(';') + let tip = typeof ex == 'string' ? ex : ex.message + tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}` + uni.showModal({ + title: this.translateSys('tip'), + content: tip, + showCancel: false, + confirmText: this.translateSys('close') + }); + console.log(ex) + return } + } @@ -731,6 +744,7 @@ .info == 'string' ? result .info : result.info.join('<br/>') : ''; + tip = tip || result.err_info if (tip) uni.showModal({ title: this.translateSys( "tip"), @@ -739,8 +753,20 @@ confirmText: this.translateSys( 'close') }); + if (result.result_type == 2) { - if (result.result_type == 0 && result.action) { + } else if (typeof result.result == 'string') { + if (result.result) { + uni.showModal({ + title: this.translateSys('tip'), + content: result.result, + showCancel: false, + confirmText: this.translateSys('close') + }); + } + } + try { + var actionlist = result.action || [] for (var j = 0; j < actionlist.length; j++) { var action = actionlist[j]; var action_type = action.action_type; @@ -778,20 +804,20 @@ } } - } else { - if (result.info) { - uni.showModal({ - title: this - .translateSys( - "tip"), - content: result.info, - showCancel: false, - confirmText: this - .translateSys( - 'close') - }); - } + } catch (ex) { + let actionList = (result.action || []).map(a => a.action_type).join(';') + let tip = typeof ex == 'string' ? ex : ex.message + tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}` + uni.showModal({ + title: this.translateSys('tip'), + content: tip, + showCancel: false, + confirmText: this.translateSys('close') + }); + console.log(ex) + return } + } @@ -1040,6 +1066,7 @@ .info == 'string' ? result .info : result .info.join('<br/>') : ''; + tip = tip || result.err_info if (tip) uni.showModal({ title: this.translateSys( "tip"), @@ -1048,9 +1075,21 @@ confirmText: this.translateSys( 'close') }); + if (result.result_type == 2) { - if (result.result_type == 0 && result.action) { - result.action.forEach(item => { + } else if (typeof result.result == 'string') { + if (result.result) { + uni.showModal({ + title: this.translateSys('tip'), + content: result.result, + showCancel: false, + confirmText: this.translateSys('close') + }); + } + } + try { + var actionList = result.action || [] + actionList.forEach(item => { if (item.action_type == "goback_to_pre_page") { //杩斿洖涓婁竴椤� var value = item.value; @@ -1085,20 +1124,20 @@ }); } }); - } else { - if (result.info) { - uni.showModal({ - title: this - .translateSys( - "tip"), - content: result.info, - showCancel: false, - confirmText: this - .translateSys( - 'close') - }); - } + } catch (ex) { + let actionList = (result.action || []).map(a => a.action_type).join(';') + let tip = typeof ex == 'string' ? ex : ex.message + tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}` + uni.showModal({ + title: this.translateSys('tip'), + content: tip, + showCancel: false, + confirmText: this.translateSys('close') + }); + console.log(ex) + return } + } }).catch(ex => { // console.log(ex); diff --git a/pages/modal/3202_view.vue b/pages/modal/3202_view.vue index f2a9904..bb1e2f7 100644 --- a/pages/modal/3202_view.vue +++ b/pages/modal/3202_view.vue @@ -446,6 +446,7 @@ .info == 'string' ? result .info : result .info.join('<br/>') : ''; + tip = tip || result.err_info if (tip) uni.showModal({ title: this.translateSys( "tip"), @@ -454,9 +455,21 @@ confirmText: this.translateSys( 'close') }); + if (result.result_type == 2) { - if (result.result_type == 0 && result.action) { - result.action.forEach(item => { + } else if (typeof result.result == 'string') { + if (result.result) { + uni.showModal({ + title: this.translateSys('tip'), + content: result.result, + showCancel: false, + confirmText: this.translateSys('close') + }); + } + } + try { + var actionList = result.action || [] + actionList.forEach(item => { if (item.action_type == "goback_to_pre_page") { //杩斿洖涓婁竴椤� var value = item.value; uni.navigateBack({ @@ -490,20 +503,21 @@ }); } }); - } else { - if (result.info) { - uni.showModal({ - title: this - .translateSys( - "tip"), - content: result.info, - showCancel: false, - confirmText: this - .translateSys( - 'close') - }); - } + + } catch (ex) { + let actionList = (result.action || []).map(a => a.action_type).join(';') + let tip = typeof ex == 'string' ? ex : ex.message + tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}` + uni.showModal({ + title: this.translateSys('tip'), + content: tip, + showCancel: false, + confirmText: this.translateSys('close') + }); + console.log(ex) + return } + } }).catch(ex => { console.log(ex); diff --git a/pages/modal/5601.vue b/pages/modal/5601.vue index eaa6aa5..934899f 100644 --- a/pages/modal/5601.vue +++ b/pages/modal/5601.vue @@ -1,7 +1,8 @@ <template> <view class="uni-page-modal-5601" :class="largeMode?'large-mode':''"> <!-- 琛ㄥご鏍峰紡 --> - <OIForm ref="refBaseForm" class="v-headStyle" :form="head_styledef.form" :hiddenIds="head_styledef.hiddenIds ?head_styledef.hiddenIds :[] " :focusId="focusFieldId" + <OIForm ref="refBaseForm" class="v-headStyle" :form="head_styledef.form" + :hiddenIds="head_styledef.hiddenIds ?head_styledef.hiddenIds :[] " :focusId="focusFieldId" @on-click="onClick" @on-focus="ontap" @on-change="onEnterChange" @on-click-prefix="classAttr_extButton" @on-click-suffix="classAttr_extButton"></OIForm> @@ -886,15 +887,28 @@ var tip = result.info ? typeof result.info == 'string' ? result.info : result.info.join('<br/>') : ''; + tip = tip || result.err_info if (tip) uni.showModal({ title: this.translateSys('tip'), content: tip, showCancel: false, confirmText: this.translateSys('close') }); + if (result.result_type == 2) { - if (result.result_type == 0 && result.action) { - result.action.forEach(item => { + } else if (typeof result.result == 'string') { + if (result.result) { + uni.showModal({ + title: this.translateSys('tip'), + content: result.result, + showCancel: false, + confirmText: this.translateSys('close') + }); + } + } + try { + var actionList = result.action || [] + actionList.forEach(item => { if (item.action_type == "set_dlg_attr") { // value = {"attr":"xxx", "value":"xxx"} var data = item.value; @@ -904,19 +918,20 @@ this.setDetailFormItemVisible(data, style, pageIndex) } }); - } else { - - if (result.info) { - uni.showModal({ - title: this.translateSys( - "error") + "6.3", - content: result.info, - showCancel: false, - confirmText: this - .translateSys('close') - }); - } + } catch (ex) { + let actionList = (result.action || []).map(a => a.action_type).join(';') + let tip = typeof ex == 'string' ? ex : ex.message + tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}` + uni.showModal({ + title: this.translateSys('tip'), + content: tip, + showCancel: false, + confirmText: this.translateSys('close') + }); + console.log(ex) + return } + } @@ -1093,6 +1108,7 @@ var tip = result.info ? typeof result.info == 'string' ? result.info : result.info.join('<br/>') : ''; + tip = tip || result.err_info if (tip) uni.showModal({ title: this.translateSys('tip'), content: tip, @@ -1100,9 +1116,21 @@ confirmText: this.translateSys( 'close') }); + if (result.result_type == 2) { - if (result.result_type == 0 && result.action) { - result.action.forEach(item => { + } else if (typeof result.result == 'string') { + if (result.result) { + uni.showModal({ + title: this.translateSys('tip'), + content: result.result, + showCancel: false, + confirmText: this.translateSys('close') + }); + } + } + try { + let actionList = result.action || [] + actionList.forEach(item => { if (item.action_type == "insert_subtable_page_row") { //鐮佺洏涓� $this.param.Show_Welcom_Page = false; var value = item.value; @@ -1209,25 +1237,26 @@ // value = {"attr":"xxx", "value":"xxx"} var data = item.value; $this.setFormValues(data) - } - else if (item.action_type == 'set_dlg_attr_show') { + } else if (item.action_type == 'set_dlg_attr_show') { var data = item.value; $this.setFormItemVisible(data) } }); - } else { - if (result.info) { - uni.showModal({ - title: this.translateSys( - "error") + "4.3", - content: result.info, - showCancel: false, - confirmText: this - .translateSys('close') - }); - } + } catch (ex) { + let actionList = (result.action || []).map(a => a.action_type).join(';') + let tip = typeof ex == 'string' ? ex : ex.message + tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}` + uni.showModal({ + title: this.translateSys('tip'), + content: tip, + showCancel: false, + confirmText: this.translateSys('close') + }); + console.log(ex) + return } + } @@ -1606,7 +1635,7 @@ data.content.forEach(cont => { var detailStyle = JSON.parse(styleStr); if (detailStyle.form) { - // detailStyle.SelBut_Checked = data.checkbox ?? true; + // detailStyle.SelBut_Checked = data.checkbox ?? true; detailStyle.form.objId = cont.id; detailStyle.form.htmlobjId = cont.id ? cont.id.replace(/-/g, @@ -1685,7 +1714,7 @@ if (index == -1) head_styledef.hiddenIds.push(attr.attr); } }); - + this.setData({ head_styledef: head_styledef }) @@ -2741,12 +2770,14 @@ this.After_OK_Event = pageData.After_ok; // console.log(this.Before_OK_Event); // console.log(this.After_OK_Event); + console.log("ok"); if (this.Before_OK_Event.ID) //鏄惁鏈夌‘瀹氬墠浜嬩欢 this.sava(pageData, this.Before_OK_Event); else if (this.After_OK_Event.ID) //鏄惁鏈夌‘瀹氬悗浜嬩欢 this.sava(pageData, this.After_OK_Event); }, sava(pageData, event) { + var $this = this; // if (pageData.DefList.length == 0) { // uni.showModal({ @@ -2858,7 +2889,7 @@ item_list: jsonlist, ext_data: pageData.ExtData }) - // console.log(jsonlist); + $this.runCustomEvent(pageData, event, input_param, list); // jsonlist.forEach(async (json,key)=>{ // await $this.runCustomEvent(event,input_param,json,'1'); @@ -2889,6 +2920,7 @@ global_attr: '', input_param: input_param, }; + console.log(dataInfo); runCustomEvent(dataInfo).then(result => { console.log(result); if (result.ret != 0) { @@ -2923,6 +2955,7 @@ var tip = result.info ? typeof result.info == 'string' ? result.info : result.info .join('<br/>') : ''; + tip = tip || result.err_info if (tip) uni.showModal({ title: this.translateSys('tip'), content: tip, @@ -2930,191 +2963,203 @@ confirmText: this.translateSys( 'close') }); - if (result.result_type == 0) { - if (result.action) { - // uni.showModal({title:this.translateSys("tip"),content:JSON.stringify(result.action),showCancel:false,confirmText:this.translateSys("cancel")}); + if (result.result_type == 2) { - result.action.forEach(item => { - if (item.action_type == - "insert_subtable_page_row") { //鐮佺洏涓�- var value = item.value; - //鍔犺浇宸茬粡鐮佺洏鏁版嵁 - $this.viewAceionRow(value); - //娓呯┖鏉$爜鍐呭 - $this.head_styledef.form.items.forEach((item, - index) => { - if (item.fieldId != - "S_CNTR_CODE") { - item.value = ''; - item.oldvalue = ''; - $this.head_styledef.form.model[ - item - .fieldId] = ''; - } - }); - - uni.showModal({ - title: $this.translateSys("tip"), - content: $this.translate( - 'execute_event_success'), - showCancel: false, - confirmText: $this.translateSys( - 'close') - }); - } else if (item.action_type == - "set_subtable_page_content" - ) { //宸茬爜鐩�- $this.param.Show_Welcom_Page = false; - var value = item.value; - const pageData = $this.pageDetail.find(( - page) => { - return value.page_name == page - .Name; - }); - if (value.clear_confirm != false && value - .clear == true && - pageData && pageData.DefList.length > 0 - ) { //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,姝e湪鐮佺洏鏄惁鏈夋暟鎹�- uni.showModal({ - title: $this.translateSys( - 'tip'), - content: $this.translate( - "are_you_sure_clear_first" - ) + - $this.translateSys( - "quotation_mark_left" - ) + - value.page_name + - $this.translateSys( - "quotation_mark_right" - ) + - $this.translate( - "are_you_sure_clear_last" - ), - cancelText: $this.translateSys( - 'ok'), - confirmText: $this - .translateSys('cancel'), - success: function(res) { - if (res.cancel) { - if (pageData) - pageData - .DefList = []; - $this - .viewAceionContent( - value); - } else if (res - .confirm) { - if (pageData) - pageData - .DefList = []; - $this - .viewAceionContent( - value); - } - } - }); - } else { - if (pageData) - pageData.DefList = []; - $this.viewAceionContent(value); - } - } else if (item.action_type == - "select_subtable_page") { - var value = item.value; - const pageIndex = $this.pageDetail.findIndex(( - page) => { - return value.page_name == page - .Name; - }); - if (pageIndex > -1) { - $this.setData({ - current: pageIndex - }) - } - } else if (item.action_type == - "remove_subtable_page_row") { //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�- let value = item.value; - $this.viewActionRemoveRow(value) - } else if (item.action_type == - "set_subtable_page_row") { - $this.viewActionSetRow(item.value) - } else if (item.action_type == - "set_subtable_page_ext_data") { - let value = item.value; - const pageData = $this.pageDetail.find(( - page) => { - return value.page_name == page - .Name; - }); - if (pageData) { - pageData.ExtData = value.ext_data - } - - } else if (item.action_type == - "clear_subpage_rows") { - var value = item.value; - const pageIndex = $this.pageDetail.findIndex(( - page) => { - return value.page_name == page - .Name; - }); - if (pageIndex > -1) { - const pageData = $this.pageDetail[ - pageIndex] - pageData.DefList = [] - pageData.ExtData = {} - - $this.$set(this.pageDetail, pageIndex, - pageData) - } - } else if (item.action_type == - "set_dlg_current_edit_attr") { - if ($this.focusOldFieldId == item.value) - $this.setData({ - focusFieldId: "" - }) - else { - $this.setData({ - focusFieldId: $this - .focusOldFieldId - }) - } - $this.$nextTick(() => { - $this.setData({ - focusFieldId: item - .value - }) - }); - } else if (item.action_type == - "set_dlg_attr") { - // value = {"attr":"xxx", "value":"xxx"} - var data = item.value; - $this.setFormValues(data) - } - else if (item.action_type == 'set_dlg_attr_show') { - var data = item.value; - $this.setFormItemVisible(data) - } - - }); - } else { - if ($this.After_OK_Event.ID != event.ID) { //鍒ゆ柇褰撳墠浜嬩欢鏄惁鏄‘瀹氬悗浜嬩欢 - $this.sava(pageParam, $this.After_OK_Event); //鎵ц纭畾鍚庝簨浠�- - } - } - } else { - - if (result.info) { + } else if (typeof result.result == 'string') { + if (result.result) { uni.showModal({ - title: this.translateSys("tip"), - content: result.info, + title: this.translateSys('tip'), + content: result.result, showCancel: false, confirmText: this.translateSys('close') }); } } + try { + let actionList = result.action || [] + actionList.forEach(item => { + if (item.action_type == + "insert_subtable_page_row") { //鐮佺洏涓�+ var value = item.value; + //鍔犺浇宸茬粡鐮佺洏鏁版嵁 + $this.viewAceionRow(value); + //娓呯┖鏉$爜鍐呭 + $this.head_styledef.form.items.forEach((item, + index) => { + if (item.fieldId != + "S_CNTR_CODE") { + item.value = ''; + item.oldvalue = ''; + $this.head_styledef.form.model[ + item + .fieldId] = ''; + } + }); + + uni.showModal({ + title: $this.translateSys("tip"), + content: $this.translate( + 'execute_event_success'), + showCancel: false, + confirmText: $this.translateSys( + 'close') + }); + } else if (item.action_type == + "set_subtable_page_content" + ) { //宸茬爜鐩�+ $this.param.Show_Welcom_Page = false; + var value = item.value; + const pageData = $this.pageDetail.find(( + page) => { + return value.page_name == page + .Name; + }); + if (value.clear_confirm != false && value + .clear == true && + pageData && pageData.DefList.length > 0 + ) { //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,姝e湪鐮佺洏鏄惁鏈夋暟鎹�+ uni.showModal({ + title: $this.translateSys( + 'tip'), + content: $this.translate( + "are_you_sure_clear_first" + ) + + $this.translateSys( + "quotation_mark_left" + ) + + value.page_name + + $this.translateSys( + "quotation_mark_right" + ) + + $this.translate( + "are_you_sure_clear_last" + ), + cancelText: $this.translateSys( + 'ok'), + confirmText: $this + .translateSys('cancel'), + success: function(res) { + if (res.cancel) { + if (pageData) + pageData + .DefList = []; + $this + .viewAceionContent( + value); + } else if (res + .confirm) { + if (pageData) + pageData + .DefList = []; + $this + .viewAceionContent( + value); + } + } + }); + } else { + if (pageData) + pageData.DefList = []; + $this.viewAceionContent(value); + } + } else if (item.action_type == + "select_subtable_page") { + var value = item.value; + const pageIndex = $this.pageDetail.findIndex(( + page) => { + return value.page_name == page + .Name; + }); + if (pageIndex > -1) { + $this.setData({ + current: pageIndex + }) + } + } else if (item.action_type == + "remove_subtable_page_row") { //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�+ let value = item.value; + $this.viewActionRemoveRow(value) + } else if (item.action_type == + "set_subtable_page_row") { + $this.viewActionSetRow(item.value) + } else if (item.action_type == + "set_subtable_page_ext_data") { + let value = item.value; + const pageData = $this.pageDetail.find(( + page) => { + return value.page_name == page + .Name; + }); + if (pageData) { + pageData.ExtData = value.ext_data + } + + } else if (item.action_type == + "clear_subpage_rows") { + var value = item.value; + const pageIndex = $this.pageDetail.findIndex(( + page) => { + return value.page_name == page + .Name; + }); + if (pageIndex > -1) { + const pageData = $this.pageDetail[ + pageIndex] + pageData.DefList = [] + pageData.ExtData = {} + + $this.$set(this.pageDetail, pageIndex, + pageData) + } + } else if (item.action_type == + "set_dlg_current_edit_attr") { + if ($this.focusOldFieldId == item.value) + $this.setData({ + focusFieldId: "" + }) + else { + $this.setData({ + focusFieldId: $this + .focusOldFieldId + }) + } + $this.$nextTick(() => { + $this.setData({ + focusFieldId: item + .value + }) + }); + } else if (item.action_type == + "set_dlg_attr") { + // value = {"attr":"xxx", "value":"xxx"} + var data = item.value; + $this.setFormValues(data) + } else if (item.action_type == 'set_dlg_attr_show') { + var data = item.value; + $this.setFormItemVisible(data) + } + + }); + + if ($this.After_OK_Event?.ID && $this.After_OK_Event.ID != event + .ID) { //鍒ゆ柇褰撳墠浜嬩欢鏄惁鏄‘瀹氬悗浜嬩欢 + $this.sava(pageParam, $this.After_OK_Event); //鎵ц纭畾鍚庝簨浠�+ + } + } catch (ex) { + let actionList = (result.action || []).map(a => a.action_type).join(';') + let tip = typeof ex == 'string' ? ex : ex.message + tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}` + uni.showModal({ + title: this.translateSys('tip'), + content: tip, + showCancel: false, + confirmText: this.translateSys('close') + }); + console.log(ex) + return + } + } }).catch(ex => { diff --git a/pages/modal/5602.vue b/pages/modal/5602.vue index 7212542..0b0223a 100644 --- a/pages/modal/5602.vue +++ b/pages/modal/5602.vue @@ -844,6 +844,8 @@ } else { var tip = result.info ? typeof result.info == 'string' ? result.info : result.info.join('<br/>') : ''; + tip = tip || result.err_info + if (tip) uni.showModal({ title: this.translateSys("tip"), content: tip, @@ -2515,6 +2517,7 @@ } else { var tip = result.info ? typeof result.info == 'string' ? result.info : result.info .join('<br/>') : ''; + tip = tip || result.err_info if (tip) uni.showModal({ title: this.translateSys("tip"), content: tip, diff --git a/pages/modal/form/index.vue b/pages/modal/form/index.vue index 876b3b5..a49833b 100644 --- a/pages/modal/form/index.vue +++ b/pages/modal/form/index.vue @@ -2,7 +2,8 @@ <view class="uni-page-modal-form" :class="largeMode?'large-mode':''"> <view class="view-content"> <!-- 琛ㄥご鏍峰紡 --> - <OIForm ref="refBaseForm" class="v-head-style" :form="head_styledef.form" :hiddenIds="head_styledef.hiddenIds ?head_styledef.hiddenIds :[] " :focusId="focusFieldId" + <OIForm ref="refBaseForm" class="v-head-style" :form="head_styledef.form" + :hiddenIds="head_styledef.hiddenIds ?head_styledef.hiddenIds :[] " :focusId="focusFieldId" @on-click="onClick" @on-focus="ontap" @on-change="onEnterChange" @on-click-prefix="classAttr_extButton" @on-click-suffix="classAttr_extButton"></OIForm> </view> @@ -471,6 +472,7 @@ var tip = result.info ? typeof result.info == 'string' ? result.info : result.info.join('<br/>') : ''; + tip = tip || result.err_info if (tip) uni.showModal({ title: this.translateSys('tip'), content: tip, @@ -478,9 +480,21 @@ confirmText: this.translateSys( 'close') }); + if (result.result_type == 2) { - if (result.result_type == 0 && result.action) { - result.action.forEach(item => { + } else if (typeof result.result == 'string') { + if (result.result) { + uni.showModal({ + title: this.translateSys('tip'), + content: result.result, + showCancel: false, + confirmText: this.translateSys('close') + }); + } + } + try { + var actionList = result.action || [] + actionList.forEach(item => { if (item.action_type == "set_dlg_current_edit_attr" @@ -515,20 +529,20 @@ $this.setFormItemVisible(data) } }); - } else { - if (result.info) { - uni.showModal({ - title: this.translateSys( - "error") + "4.3", - content: result.info, - showCancel: false, - confirmText: this - .translateSys('close') - }); - } + } catch (ex) { + let actionList = (result.action || []).map(a => a.action_type).join(';') + let tip = typeof ex == 'string' ? ex : ex.message + tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}` + uni.showModal({ + title: this.translateSys('tip'), + content: tip, + showCancel: false, + confirmText: this.translateSys('close') + }); + console.log(ex) + return } - } } @@ -780,6 +794,7 @@ var tip = result.info ? typeof result.info == 'string' ? result.info : result.info.join('<br/>') : ''; + tip = tip || result.err_info if (tip) uni.showModal({ title: this.translateSys('tip'), content: tip, @@ -787,9 +802,21 @@ confirmText: this.translateSys( 'close') }); + if (result.result_type == 2) { - if (result.result_type == 0 && result.action) { - result.action.forEach(item => { + } else if (typeof result.result == 'string') { + if (result.result) { + uni.showModal({ + title: this.translateSys('tip'), + content: result.result, + showCancel: false, + confirmText: this.translateSys('close') + }); + } + } + try { + var actionList = result.action || [] + actionList.forEach(item => { if (item.action_type == "set_dlg_current_edit_attr" @@ -818,26 +845,29 @@ // value = {"attr":"xxx", "value":"xxx"} var data = item.value; $this.setFormValues(data) - } - else if (action.action_type == 'set_dlg_attr_show') { + } else if (action.action_type == + 'set_dlg_attr_show') { var data = action.value; - + $this.setFormItemVisible(data) } }); - } else { - if (result.info) { - uni.showModal({ - title: this.translateSys( - "error") + "4.3", - content: result.info, - showCancel: false, - confirmText: this - .translateSys('close') - }); - } + } catch (ex) { + let actionList = (result.action || []).map(a => a.action_type) + .join(';') + let tip = typeof ex == 'string' ? ex : ex.message + tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}` + uni.showModal({ + title: this.translateSys('tip'), + content: tip, + showCancel: false, + confirmText: this.translateSys('close') + }); + console.log(ex) + return } + } @@ -899,7 +929,8 @@ if (col.useDict) { col.dict = dictItemList; } else { - col.selections = dictItemList; + col.selections = + dictItemList; } } } @@ -1352,7 +1383,8 @@ $this.setData({ check_list: val.config }) - if (val.config.appear_style == 'sideslip') //鍒ゆ柇鏄惁鏄晶婊�+ if (val.config.appear_style == + 'sideslip') //鍒ゆ柇鏄惁鏄晶婊� $this.setData({ popupType: "right" }) @@ -1372,7 +1404,8 @@ popupParam: popupParam }) } - } else if (action.action_type == 'open_project_query_dlg') { + } else if (action.action_type == + 'open_project_query_dlg') { //console.log(action.value.select_range); //console.log(action.value.mulit_select); var priRel = '-1'; @@ -1437,7 +1470,8 @@ title: $this.translateSys("tip"), content: $this.translateSys( "quotation_mark_left") + - action.action_type + $this.translateSys( + action.action_type + $this + .translateSys( "quotation_mark_right") + $this .translate( "tip_action_unprocessed"), @@ -1661,8 +1695,10 @@ value: obj_attr[a], })), }; - let global_attr = Base64.encode(JSON.stringify(this.global_attr)) - let data_json = Base64.encode(JSON.stringify(this.data_json)) + let global_attr = Base64.encode(JSON.stringify(this + .global_attr)) + let data_json = Base64.encode(JSON.stringify(this + .data_json)) let ext_info = Base64.encode(JSON.stringify(this.ext_info)) var dataInfo = { ed_type: "0", @@ -1681,7 +1717,8 @@ data_json, ext_info, compose_info: '', - input_param: Base64.encode(JSON.stringify(input_param)), + input_param: Base64.encode(JSON.stringify( + input_param)), }; await runCustomEvent(dataInfo) return true @@ -1739,7 +1776,8 @@ .global_attr)) let data_json = Base64.encode(JSON.stringify(this .data_json)) - let ext_info = Base64.encode(JSON.stringify(this.ext_info)) + let ext_info = Base64.encode(JSON.stringify(this + .ext_info)) await runCustomEvent({ ed_type: 0, @@ -1758,9 +1796,11 @@ let exStr = JSON.stringify(ex) if (exStr == "{}") exStr = ex - let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr + let tip = typeof ex.errMsg == "string" ? ex + .errMsg : exStr uni.showModal({ - title: this.translateSys("tip") + "8.1", + title: this.translateSys("tip") + + "8.1", content: tip, showCancel: false, confirmText: this.translateSys('close') @@ -1774,18 +1814,22 @@ var obj_attr = this.head_styledef.form.model; let inputParam = { id: "", - attrs: Object.keys(obj_attr).map((a) => ({ - attr: a, - value: obj_attr[a], - })), + attrs: Object.keys(obj_attr).map((a) => + ({ + attr: a, + value: obj_attr[a], + })), }; let input_param = Base64.encode(JSON.stringify( inputParam)); - let global_attr = Base64.encode(JSON.stringify(this + let global_attr = Base64.encode(JSON.stringify( + this .global_attr)) - let data_json = Base64.encode(JSON.stringify(this + let data_json = Base64.encode(JSON.stringify( + this .data_json)) - let ext_info = Base64.encode(JSON.stringify(this + let ext_info = Base64.encode(JSON.stringify( + this .ext_info)) await runCustomEvent({ @@ -1805,13 +1849,16 @@ let exStr = JSON.stringify(ex) if (exStr == "{}") exStr = ex - let tip = typeof ex.errMsg == "string" ? ex.errMsg : + let tip = typeof ex.errMsg == "string" ? ex + .errMsg : exStr uni.showModal({ - title: this.translateSys("tip") + "8.2", + title: this.translateSys("tip") + + "8.2", content: tip, showCancel: false, - confirmText: this.translateSys('close') + confirmText: this.translateSys( + 'close') }); return false } @@ -1819,9 +1866,11 @@ showError(ex) { uni.showModal({ title: this.translateSys('error'), - content: typeof ex == "string" ? ex : typeof ex.errMsg == "string" ? ex.errMsg : "", + content: typeof ex == "string" ? ex : typeof ex.errMsg == "string" ? ex + .errMsg : "", showCancel: false, - confirmText: this.translateSys('cancel') + confirmText: this.translateSys( + 'cancel') }) }, translate(t) { -- Gitblit v1.9.1