From fa73abee6209cd6f7c62c61c271826f7d413035d Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 01 八月 2025 11:32:17 +0800
Subject: [PATCH] event result_type

---
 pages/modal/3202_view.vue |  114 +++++++++++++++++++++++++++++++++------------------------
 1 files changed, 66 insertions(+), 48 deletions(-)

diff --git a/pages/modal/3202_view.vue b/pages/modal/3202_view.vue
index 2fd3cfb..2c8d702 100644
--- a/pages/modal/3202_view.vue
+++ b/pages/modal/3202_view.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="uni-page-modal-3202-view">
+	<view class="uni-page-modal-3202-view" :class="largeMode?'large-mode':''">
 		<view class="v-content">
 			<!-- 琛ㄥご鏍峰紡 -->
 			<OIForm ref="refBaseForm" class="v-headStyle" :form="head_styledef.form" viewMode></OIForm>
@@ -55,6 +55,7 @@
 		},
 		data() {
 			return {
+				largeMode: getApp().globalData.largeMode || false,
 				title: this.translateSys('add2'),
 				param: {},
 				styledef: {},
@@ -321,9 +322,10 @@
 					return;
 				}
 				let styleStr = JSON.stringify(this.detail1_styledef); //宸茬爜鐩�-				let detailStyle = JSON.parse(styleStr);
+
 				list.forEach((cont) => {
 					let attrs = [];
+					let detailStyle = JSON.parse(styleStr);
 					Object.keys(cont).forEach((a) => {
 						attrs.push({
 							attr: a,
@@ -402,7 +404,7 @@
 			async runCustomEvent(dataInfo) {
 				try {
 					var $this = this;
-				
+
 					runCustomEvent(dataInfo).then(result => {
 						console.log(result);
 
@@ -444,6 +446,7 @@
 								.info == 'string' ? result
 								.info : result
 								.info.join('<br/>') : '';
+							tip = tip || result.err_info
 							if (tip) uni.showModal({
 								title: this.translateSys(
 									"tip"),
@@ -452,56 +455,71 @@
 								confirmText: this.translateSys(
 									'close')
 							});
+							if ([0, 2, 3, 4, -1].includes(result.result_type)) {
+								if (result.result_type == 2) {
 
-							if (result.result_type == 0 && result.action) {
-								result.action.forEach(item => {
-									if (item.action_type == "goback_to_pre_page") { //杩斿洖涓婁竴椤�-										var value = item.value;
-										uni.navigateBack({
-											delta: 1, //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
-										});
-									} else {
+								} else if (typeof result.result == 'string') {
+									if (result.result) {
 										uni.showModal({
-											title: this
-												.translateSys(
-													"tip"
-												),
-											content: this
-												.translateSys(
-													"quotation_mark_left"
-												) +
-												item
-												.action_type +
-												this
-												.translateSys(
-													"quotation_mark_right"
-												) +
-												this
-												.translate(
-													"tip_action_unprocessed"
-												),
+											title: this.translateSys('tip'),
+											content: result.result,
 											showCancel: false,
-											confirmText: this
-												.translateSys(
-													'close'
-												)
+											confirmText: this.translateSys('close')
 										});
 									}
-								});
-							} else {
-								if (result.info) {
-									uni.showModal({
-										title: this
-											.translateSys(
-												"tip"),
-										content: result.info,
-										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({
+												delta: 1, //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
+											});
+										} else {
+											uni.showModal({
+												title: this
+													.translateSys(
+														"tip"
+													),
+												content: this
+													.translateSys(
+														"quotation_mark_left"
+													) +
+													item
+													.action_type +
+													this
+													.translateSys(
+														"quotation_mark_right"
+													) +
+													this
+													.translate(
+														"tip_action_unprocessed"
+													),
+												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);
@@ -547,7 +565,7 @@
 				})
 			},
 			onButtonClicked(btn) {
-				
+
 				let enviroment = {
 					button: "top",
 					button_name: btn.ShowName,
@@ -560,12 +578,12 @@
 				} else {
 					this.$Message.warning(this.$t("sys.unrealized"));
 				}
-				
+
 			},
 			async onTriggerEvent(btn, enviroment) {
 				let data_json = [];
 				let jsonlist = [];
-				
+
 				let detailStyleList = this.detail1StyleDefList;
 				detailStyleList.forEach((style) => {
 					let detail_attr = {};

--
Gitblit v1.9.1