From e540e5b44f56ce8e8edc377dfa4c5b343b1a9eef Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期四, 14 八月 2025 16:12:15 +0800
Subject: [PATCH] paramvalue

---
 pages/modal/5601.vue | 1378 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 750 insertions(+), 628 deletions(-)

diff --git a/pages/modal/5601.vue b/pages/modal/5601.vue
index 2d5a5eb..4a71e24 100644
--- a/pages/modal/5601.vue
+++ b/pages/modal/5601.vue
@@ -44,8 +44,8 @@
 												:class="btn.FunCode == 'Delete' ? 'btn-warn' : 'btn-primary'"
 												@click="onRowBtnClick(btn, pageData,ii)">
 												<text v-if="btn.Style == 'img' || btn.Style == 'img_text'"
-													class="Img"></text>
-												{{(btn.Style == 'text'|| btn.Style == 'img_text') ? btn.ShowName :""}}
+													class="img"></text>
+												{{btn.ShowName ||"" }}
 											</button>
 										</div>
 
@@ -60,8 +60,8 @@
 										'btn-left':(btnIndex < pageData.Button.length - 1),
 										'btn-right': btnIndex > 0 && btnIndex == pageData.Button.length - 1 ,
 										'width-50':(pageData.Button.length == 2),'width-32':(pageData.Button.length == 3),'width-30':(pageData.DropDownButton.length> 0)}" @click="onBtnClick(btn, pageData)">
-									<text v-if="btn.Style == 'img' || btn.Style == 'img_text'" class="Img"></text>
-									{{(btn.Style == 'text'|| btn.Style == 'img_text') ? btn.ShowName :""}}
+									<text v-if="btn.Style == 'img' || btn.Style == 'img_text'" class="img"></text>
+									{{btn.ShowName ||""}}
 								</button>
 								<view class="btn-right" v-if="pageData.DropDownButton.length >0 ">
 									<a @click="clickDropdownBtns(pageData)">
@@ -117,7 +117,8 @@
 		Base64
 	} from '@/js/Base64.js';
 	import {
-		dictGetInfo
+		dictGetInfo,
+		appGetInfo,
 	} from "@/api/mobox.js"
 	import {
 		getUIStyleInfo,
@@ -185,7 +186,8 @@
 			//鑾峰彇涓绘暟鎹被ID
 			this.ClsID = this.param.master_cls?.id;
 			if (this.ClsID) {
-				this.loadData(options.paramValue)
+				const paramValue = options.paramValue ? JSON.parse(options.paramValue) : undefined
+				this.loadData(paramValue)
 			} else {
 				uni.showModal({
 					title: this.translateSys("error"),
@@ -224,28 +226,9 @@
 				//鑾峰彇鏁版嵁绫荤殑鑷畾涔夎〃鍗曞弬鏁� 				await this.Head_UIStyleGetInfo(this.ClsID, this.param.Input_UI_Style.ID);
 				//浼犲叆鍙傛暟鍊�+				console.log(paramValue)
 				if (paramValue) {
-					const attrs = paramValue.attrs || [];
-					(this.head_styledef?.form?.items || []).forEach(async (ele, index) => {
-						if (ele.name != "Layout") {
-							attrs.forEach(async (ele2, index2) => {
-								if (ele.fieldId == ele2.name) {
-									ele.value = ele2.value;
-								}
-							});
-						} else {
-							ele.setting.colList.forEach(async (col) => {
-								if (col) {
-									attrs.forEach(async (ele2,
-										index2) => {
-										if (col.fieldId == ele2.name) {
-											col.value = ele2.value;
-										}
-									});
-								}
-							});
-						}
-					})
+					this.setFormValues(paramValue)
 				}
 				//鍔犺浇鍒濆鐣岄潰
 				if (this.param.Show_Welcom_Page) {
@@ -522,9 +505,13 @@
 
 				} catch (ex) {
 					// console.log(ex);
+					let exStr = JSON.stringify(ex)
+					if (exStr == "{}")
+						exStr = ex
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
 					uni.showModal({
 						title: this.translateSys("error") + "1",
-						content: ex.errMsg,
+						content: tip,
 						showCancel: false,
 						confirmText: this.translateSys('close')
 					});
@@ -590,10 +577,14 @@
 					console.log("Detail_UIstyleGetInfo", detailstyledef);
 					return detailstyledef
 				} catch (ex) {
-					// console.log(ex);
+					console.log(ex);
+					let exStr = JSON.stringify(ex)
+					if (exStr == "{}")
+						exStr = ex
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
 					uni.showModal({
 						title: this.translateSys("error") + "2",
-						content: ex.errMsg,
+						content: tip,
 						showCancel: false,
 						confirmText: this.translateSys('close')
 					});
@@ -629,10 +620,14 @@
 					}
 					formItem.dict = list;
 				} catch (ex) {
-					// console.log(ex);
+					console.log(ex);
+					let exStr = JSON.stringify(ex)
+					if (exStr == "{}")
+						exStr = ex
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
 					uni.showModal({
 						title: this.translateSys("error") + "3",
-						content: ex.errMsg,
+						content: tip,
 						showCancel: false,
 						confirmText: this.translateSys('close')
 					});
@@ -853,7 +848,7 @@
 					};
 					const result = await runCustomEvent(dataInfo)
 					console.log(result)
-					if (result.ret != 0) {
+					if (result.ret != 0 && result.ret != 1) {
 						var tip = result.err_info ? typeof result
 							.err_info == 'string' ? result
 							.err_info : result.err_info.join('<br/>') :
@@ -894,50 +889,54 @@
 							showCancel: false,
 							confirmText: this.translateSys('close')
 						});
-						if (result.result_type == 2) {
+						if ([0, 2, 3, 4, -1].includes(result.result_type)) {
+							if (result.result_type == 2) {
 
-						} else if (typeof result.result == 'string') {
-							if (result.result) {
+							} 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;
+										this.setDetailFormValues(data, style, pageIndex)
+									} else if (item.action_type == 'set_dlg_attr_show') {
+										var data = item.value;
+										this.setDetailFormItemVisible(data, style, pageIndex)
+									}
+								});
+							} catch (ex) {
+								let actionList = (result.action || []).map(a => a.action_type).join(';')
+								let tip = typeof ex == 'string' ? ex : ex.message
+								tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
 								uni.showModal({
 									title: this.translateSys('tip'),
-									content: result.result,
+									content: tip,
 									showCancel: false,
 									confirmText: this.translateSys('close')
 								});
+								console.log(ex)
+								return
 							}
 						}
-						try {
-							var actionList = result.action || []
-							actionList.forEach(item => {
-								if (item.action_type == "set_dlg_attr") {
-									// value = {"attr":"xxx", "value":"xxx"}
-									var data = item.value;
-									this.setDetailFormValues(data, style, pageIndex)
-								} else if (item.action_type == 'set_dlg_attr_show') {
-									var data = item.value;
-									this.setDetailFormItemVisible(data, style, pageIndex)
-								}
-							});
-						} catch (ex) {
-							let actionList = (result.action || []).map(a => a.action_type).join(';')
-							let tip = typeof ex == 'string' ? ex : ex.message
-							tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
-							uni.showModal({
-								title: this.translateSys('tip'),
-								content: tip,
-								showCancel: false,
-								confirmText: this.translateSys('close')
-							});
-							console.log(ex)
-							return
-						}
-
 
 					}
 
 				} catch (ex) {
 					console.log(ex)
-					var tip = typeof ex == "string" ? ex : ex.message;
+					let exStr = JSON.stringify(ex)
+					if (exStr == "{}")
+						exStr = ex
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
 					uni.showModal({
 						title: this.translateSys("error") + "6.1",
 						content: this.translate(
@@ -1074,7 +1073,7 @@
 						};
 						const result = await runCustomEvent(dataInfo)
 						console.log(result);
-						if (result.ret != 0) {
+						if (result.ret != 0 && result.ret != 1) {
 							var tip = result.err_info ? typeof result
 								.err_info == 'string' ? result
 								.err_info : result.err_info.join('<br/>') :
@@ -1116,153 +1115,158 @@
 								confirmText: this.translateSys(
 									'close')
 							});
-							if (result.result_type == 2) {
+							if ([0, 2, 3, 4, -1].includes(result.result_type)) {
+								if (result.result_type == 2) {
 
-							} else if (typeof result.result == 'string') {
-								if (result.result) {
+								} 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;
+											$this.viewAceionRow(value);
+										} 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
+											) { //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,姝ｅ湪鐮佺洏鏄惁鏈夋暟鎹�+												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 == "select_subtable_page_row") {
+											// value = {"page_name":"鐮佺洏涓�, "row":{"id":"xx"}}
+											var value = item.value;
+											$this.viewActionSelectRow(value)
+										} else if (item.action_type ==
+											"remove_subtable_page_row") { //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�+											var 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") {
+											var 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)
+										}
+									});
+
+								} catch (ex) {
+									let actionList = (result.action || []).map(a => a.action_type).join(';')
+									let tip = typeof ex == 'string' ? ex : ex.message
+									tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
 									uni.showModal({
 										title: this.translateSys('tip'),
-										content: result.result,
+										content: tip,
 										showCancel: false,
 										confirmText: this.translateSys('close')
 									});
+									console.log(ex)
+									return
 								}
 							}
-							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;
-										$this.viewAceionRow(value);
-									} 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
-										) { //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,姝ｅ湪鐮佺洏鏄惁鏈夋暟鎹�-											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 == "select_subtable_page_row") {
-										// value = {"page_name":"鐮佺洏涓�, "row":{"id":"xx"}}
-										var value = item.value;
-										$this.viewActionSelectRow(value)
-									} else if (item.action_type ==
-										"remove_subtable_page_row") { //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�-										var 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") {
-										var 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)
-									}
-								});
-
-							} catch (ex) {
-								let actionList = (result.action || []).map(a => a.action_type).join(';')
-								let tip = typeof ex == 'string' ? ex : ex.message
-								tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
-								uni.showModal({
-									title: this.translateSys('tip'),
-									content: tip,
-									showCancel: false,
-									confirmText: this.translateSys('close')
-								});
-								console.log(ex)
-								return
-							}
-
 
 						}
 
 					}
 				} catch (ex) {
-					var tip = typeof ex == "string" ? ex : ex.message;
+					console.log(ex);
+					let exStr = JSON.stringify(ex)
+					if (exStr == "{}")
+						exStr = ex
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
 					uni.showModal({
 						title: this.translateSys("error") + "4.2",
 						content: this.translate(
@@ -2130,7 +2134,7 @@
 				console.log(dataInfo);
 				// return;
 				runCustomEvent(dataInfo).then(data => {
-					if (data.ret != 0) {
+					if (data.ret != 0 && data.ret != 1) {
 						var tip = data.err_info ? typeof data.err_info == 'string' ? data
 							.err_info :
 							data
@@ -2166,63 +2170,64 @@
 							showCancel: false,
 							confirmText: this.translateSys('close')
 						});
-						if (data.result_type == 2) {
-							$this.setFormValues(data.result || [])
-						} 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 || []
-							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(result)
-								} else if (action.action_type == 'set_dlg_attr_show') {
-									var result = action.value;
-									$this.setFormItemVisible(result)
-
-									// console.log($this.head_styledef);
-								} else if (action.action_type == 'set_global_attr') {
-									$this.global_attr = action.value || [];
-								} else {
+						if ([0, 2, 3, 4, -1].includes(data.result_type)) {
+							if (data.result_type == 2) {
+								$this.setFormValues(data.result || [])
+							} else if (typeof data.result == 'string') {
+								if (data.result) {
 									uni.showModal({
-										title: this.translateSys("tip"),
-										content: this.translateSys(
-												"quotation_mark_left") +
-											action
-											.action_type + this.translateSys(
-												"quotation_mark_right") + this
-											.translate(
-												"tip_action_unprocessed"),
+										title: this.translateSys('tip'),
+										content: data.result,
 										showCancel: false,
 										confirmText: this.translateSys('close')
 									});
 								}
 							}
+							try {
+								var actionlist = data.action || []
+								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(result)
+									} else if (action.action_type == 'set_dlg_attr_show') {
+										var result = action.value;
+										$this.setFormItemVisible(result)
+
+										// console.log($this.head_styledef);
+									} else if (action.action_type == 'set_global_attr') {
+										$this.global_attr = action.value || [];
+									} else {
+										uni.showModal({
+											title: this.translateSys("tip"),
+											content: this.translateSys(
+													"quotation_mark_left") +
+												action
+												.action_type + this.translateSys(
+													"quotation_mark_right") + this
+												.translate(
+													"tip_action_unprocessed"),
+											showCancel: false,
+											confirmText: this.translateSys('close')
+										});
+									}
+								}
 
 
-						} catch (ex) {
-							let actionList = (data.action || []).map(a => a.action_type).join(';')
-							let tip = typeof ex == 'string' ? ex : ex.message
-							tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
-							uni.showModal({
-								title: this.translateSys('tip'),
-								content: tip,
-								showCancel: false,
-								confirmText: this.translateSys('close')
-							});
-							console.log(ex)
-							return
+							} catch (ex) {
+								let actionList = (data.action || []).map(a => a.action_type).join(';')
+								let tip = typeof ex == 'string' ? ex : ex.message
+								tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+								uni.showModal({
+									title: this.translateSys('tip'),
+									content: tip,
+									showCancel: false,
+									confirmText: this.translateSys('close')
+								});
+								console.log(ex)
+								return
+							}
 						}
-
 					}
 
 				}).catch(ex => {
@@ -2302,7 +2307,7 @@
 				console.log(dataInfo);
 				// return;
 				runCustomEvent(dataInfo).then(data => {
-					if (data.ret != 0) {
+					if (data.ret != 0 && data.ret != 1) {
 						var tip = data.err_info ? typeof data.err_info == 'string' ? data
 							.err_info :
 							data
@@ -2338,210 +2343,212 @@
 							showCancel: false,
 							confirmText: $this.translateSys('close')
 						});
-						if (data.result_type == 2) {
+						if ([0, 2, 3, 4, -1].includes(data.result_type)) {
+							if (data.result_type == 2) {
 
-						} else if (typeof data.result == 'string') {
-							if (data.result) {
-								uni.showModal({
-									title: this.translateSys('tip'),
-									content: data.result,
-									showCancel: false,
-									confirmText: this.translateSys('close')
-								});
+							} 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 actions = data.action || []
-							for (var i = 0; i < actions.length; i++) {
-								var action = actions[i];
-								console.log(action)
-								var val = action.value;
-								var enviroment = JSON.stringify(enviroment);
+							try {
+								var actions = data.action || []
+								for (var i = 0; i < actions.length; i++) {
+									var action = actions[i];
+									console.log(action)
+									var val = action.value;
+									var enviroment = JSON.stringify(enviroment);
 
-								if (action.action_type == 'open_panel') {
-									var d = dialog({
-										title: '<i class="ace-icon fa fa-info-circle"></i> ' +
-											$this.translateSys("tip"),
-										content: $this.translateSys(
-												"quotation_mark_left") +
-											action
-											.action_type + $this.translateSys(
-												"quotation_mark_right") + $this
-											.translate(
-												"tip_action_unprocessed")
-									});
-									d.show();
-								} else if (action.action_type == 'open_select_userdlg') {
-									var style = val.style;
-									// style == 'user' ? '閫夋嫨浜哄憳' : style == 'department' ? '閫夋嫨閮ㄩ棬' : style == 'role' ? '閫夋嫨瑙掕壊' : ''
-									var param = {
-										item: item,
-										button_callback: button_callback,
-										req: req,
-										data_attr: data_attr
-									}
-									uni.navigateTo({
-										url: '../selpsn/index?mulit=false&param=' +
-											JSON
-											.stringify(
-												param),
-										events: {
-											AddPer(data, param) {
-												// console.log(param);
-												console.log(data);
-												var callback_eventid = param
-													.button_callback
-													.trim();
-												var info = {
-													eventid: callback_eventid,
-													edtype: "0",
-													projectid: '',
-													rclsid: '',
-													robjid: '',
-													userlogin: '',
-													clsid: $this.param
-														.DataCls
-														.id,
-													objid: "",
-													attr: param.req,
-													inputparameter: data,
-													dataJson: [],
-												}
-												$this.DataObjRunCustomEvent(info,
-													param
-													.data_attr);
-											}
-										}
-									});
-								} else if (action.action_type == 'open_data_query_dlg') {
-									var d = dialog({
-										title: '<i class="ace-icon fa fa-info-circle"></i> ' +
-											$this.translateSys("tip"),
-										content: $this.translateSys(
-												"quotation_mark_left") +
-											action
-											.action_type + $this.translateSys(
-												"quotation_mark_right") + $this
-											.translate(
-												"tip_action_unprocessed")
-									});
-									d.show();
-								} else if (action.action_type == 'open_common_dlg') {
-
-									if (val.common_dlg_id == 'check_list') {
-										$this.setData({
-											check_list: val.config
-										})
-										console.log($this.check_list)
-										if (val.config.appear_style == 'sideslip') //鍒ゆ柇鏄惁鏄晶婊�-											$this.setData({
-												popupType: "right"
-											})
-										else
-											$this.setData({
-												popupType: "center"
-											})
-										// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
-										$this.$refs.popup.open($this.popupType);
-										var popupParam = {
+									if (action.action_type == 'open_panel') {
+										var d = dialog({
+											title: '<i class="ace-icon fa fa-info-circle"></i> ' +
+												$this.translateSys("tip"),
+											content: $this.translateSys(
+													"quotation_mark_left") +
+												action
+												.action_type + $this.translateSys(
+													"quotation_mark_right") + $this
+												.translate(
+													"tip_action_unprocessed")
+										});
+										d.show();
+									} else if (action.action_type == 'open_select_userdlg') {
+										var style = val.style;
+										// style == 'user' ? '閫夋嫨浜哄憳' : style == 'department' ? '閫夋嫨閮ㄩ棬' : style == 'role' ? '閫夋嫨瑙掕壊' : ''
+										var param = {
 											item: item,
 											button_callback: button_callback,
 											req: req,
 											data_attr: data_attr
 										}
-										$this.setData({
-											popupParam: popupParam
-										})
-									}
-								} else if (action.action_type == 'open_project_query_dlg') {
-									//console.log(action.value.select_range);
-									//console.log(action.value.mulit_select);
-									var priRel = '-1';
-									if (action.value.select_range == '鍏ㄩ儴鐩稿叧')
-										priRel = '0';
-									else if (action.value.select_range == '鎴戣礋璐ｇ殑椤圭洰')
-										priRel = '1';
-									else if (action.value.select_range == '鎴戝垱寤虹殑')
-										priRel = '2';
-									else if (action.value.select_range == '鎴戝弬涓庣殑' || action
-										.value
-										.select_range == '鎴戝弬鍔犵殑')
-										priRel = '3';
-									else if (action.value.select_range == '鎴戝叧娉ㄧ殑')
-										priRel = '4';
-									else if (action.value.select_range == '鎴戜笅灞炵殑椤圭洰')
-										priRel = '5';
-									var param_ = {
-										item: item,
-										button_callback: button_callback,
-										req: req
-									}
-									uni.navigateTo({
-										url: '../selPrj/index?relation=' + priRel +
-											'&param=' +
-											JSON.stringify(param_),
-										events: {
-											AddPer(data, param) {
-												var attr = param.item.fieldId;
-												$this.head_styledef.form.model[
-														attr] =
-													data[0].ID +
-													';' + data[0].Name;
-
-												// $this.classAttrList[param.index].Attr[param.iindex].Value=data[0].Name;
-												// $this.classAttrList[param.index].Attr[param.iindex].ValID=data[0].ID+';'+data[0].Name;
-												var callback_eventid = param
-													.button_callback
-													.trim();
-												if (callback_eventid) {
+										uni.navigateTo({
+											url: '../selpsn/index?mulit=false&param=' +
+												JSON
+												.stringify(
+													param),
+											events: {
+												AddPer(data, param) {
+													// console.log(param);
+													console.log(data);
+													var callback_eventid = param
+														.button_callback
+														.trim();
 													var info = {
 														eventid: callback_eventid,
-														edtype: "2",
-														projectid: data[0].ID,
-														rclsid: "",
-														robjid: "",
-														userlogin: "",
-														clsid: $this.$data
-															.param
-															.DataCls.id,
+														edtype: "0",
+														projectid: '',
+														rclsid: '',
+														robjid: '',
+														userlogin: '',
+														clsid: $this.param
+															.DataCls
+															.id,
 														objid: "",
 														attr: param.req,
+														inputparameter: data,
 														dataJson: [],
 													}
-
-													$this.DataObjRunCustomEvent(
-														info);
+													$this.DataObjRunCustomEvent(info,
+														param
+														.data_attr);
 												}
 											}
-										}
-									});
-								} else {
-									uni.showModal({
-										title: $this.translateSys("tip"),
-										content: $this.translateSys(
-												"quotation_mark_left") +
-											action.action_type + $this.translateSys(
-												"quotation_mark_right") + $this
-											.translate(
-												"tip_action_unprocessed"),
-										showCancel: false,
-										confirmText: $this.translateSys('close')
-									});
-								}
-							}
+										});
+									} else if (action.action_type == 'open_data_query_dlg') {
+										var d = dialog({
+											title: '<i class="ace-icon fa fa-info-circle"></i> ' +
+												$this.translateSys("tip"),
+											content: $this.translateSys(
+													"quotation_mark_left") +
+												action
+												.action_type + $this.translateSys(
+													"quotation_mark_right") + $this
+												.translate(
+													"tip_action_unprocessed")
+										});
+										d.show();
+									} else if (action.action_type == 'open_common_dlg') {
 
-						} catch (ex) {
-							let actionList = (data.action || []).map(a => a.action_type).join(';')
-							let tip = typeof ex == 'string' ? ex : ex.message
-							tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
-							uni.showModal({
-								title: this.translateSys('tip'),
-								content: tip,
-								showCancel: false,
-								confirmText: this.translateSys('close')
-							});
-							console.log(ex)
-							return
+										if (val.common_dlg_id == 'check_list') {
+											$this.setData({
+												check_list: val.config
+											})
+											console.log($this.check_list)
+											if (val.config.appear_style == 'sideslip') //鍒ゆ柇鏄惁鏄晶婊�+												$this.setData({
+													popupType: "right"
+												})
+											else
+												$this.setData({
+													popupType: "center"
+												})
+											// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
+											$this.$refs.popup.open($this.popupType);
+											var popupParam = {
+												item: item,
+												button_callback: button_callback,
+												req: req,
+												data_attr: data_attr
+											}
+											$this.setData({
+												popupParam: popupParam
+											})
+										}
+									} else if (action.action_type == 'open_project_query_dlg') {
+										//console.log(action.value.select_range);
+										//console.log(action.value.mulit_select);
+										var priRel = '-1';
+										if (action.value.select_range == '鍏ㄩ儴鐩稿叧')
+											priRel = '0';
+										else if (action.value.select_range == '鎴戣礋璐ｇ殑椤圭洰')
+											priRel = '1';
+										else if (action.value.select_range == '鎴戝垱寤虹殑')
+											priRel = '2';
+										else if (action.value.select_range == '鎴戝弬涓庣殑' || action
+											.value
+											.select_range == '鎴戝弬鍔犵殑')
+											priRel = '3';
+										else if (action.value.select_range == '鎴戝叧娉ㄧ殑')
+											priRel = '4';
+										else if (action.value.select_range == '鎴戜笅灞炵殑椤圭洰')
+											priRel = '5';
+										var param_ = {
+											item: item,
+											button_callback: button_callback,
+											req: req
+										}
+										uni.navigateTo({
+											url: '../selPrj/index?relation=' + priRel +
+												'&param=' +
+												JSON.stringify(param_),
+											events: {
+												AddPer(data, param) {
+													var attr = param.item.fieldId;
+													$this.head_styledef.form.model[
+															attr] =
+														data[0].ID +
+														';' + data[0].Name;
+
+													// $this.classAttrList[param.index].Attr[param.iindex].Value=data[0].Name;
+													// $this.classAttrList[param.index].Attr[param.iindex].ValID=data[0].ID+';'+data[0].Name;
+													var callback_eventid = param
+														.button_callback
+														.trim();
+													if (callback_eventid) {
+														var info = {
+															eventid: callback_eventid,
+															edtype: "2",
+															projectid: data[0].ID,
+															rclsid: "",
+															robjid: "",
+															userlogin: "",
+															clsid: $this.$data
+																.param
+																.DataCls.id,
+															objid: "",
+															attr: param.req,
+															dataJson: [],
+														}
+
+														$this.DataObjRunCustomEvent(
+															info);
+													}
+												}
+											}
+										});
+									} else {
+										uni.showModal({
+											title: $this.translateSys("tip"),
+											content: $this.translateSys(
+													"quotation_mark_left") +
+												action.action_type + $this.translateSys(
+													"quotation_mark_right") + $this
+												.translate(
+													"tip_action_unprocessed"),
+											showCancel: false,
+											confirmText: $this.translateSys('close')
+										});
+									}
+								}
+
+							} catch (ex) {
+								let actionList = (data.action || []).map(a => a.action_type).join(';')
+								let tip = typeof ex == 'string' ? ex : ex.message
+								tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+								uni.showModal({
+									title: this.translateSys('tip'),
+									content: tip,
+									showCancel: false,
+									confirmText: this.translateSys('close')
+								});
+								console.log(ex)
+								return
+							}
 						}
 
 					}
@@ -2684,10 +2691,121 @@
 						}
 					}
 
+				} else if (btn.FunCode == "RelatedFunction") {
+					if (index > -1) {
+						const style = pageData.DefList[index];
+						this.relatedFunction(btn, style, enviroment, pageData);
+					}
 				} else {
 					this.$Message.warning(this.$t("sys.unrealized"));
 				}
 			},
+			async relatedFunction(btn, style, enviroment, pageData) {
+				//璺宠浆鍔熻兘鐐�+				try {
+					const defCode = btn.Related_Function?.Def_Code
+					var $this = this;
+					if (
+						defCode == "3018" ||
+						defCode == "3037" ||
+						defCode == "3200" ||
+						defCode == "3201" ||
+						defCode == "3202" ||
+						defCode == "5600" ||
+						defCode == "5601" ||
+						defCode == "5602"
+					) {
+
+						let name = defCode
+						if (defCode == "3018" || defCode == "3037")
+							name = defCode + "_2"
+						var json = {
+							app_id: [btn.Related_Function.ID],
+						};
+						const result = await appGetInfo(json)
+						if ((result || []).length > 0) {
+							var app = result[0];
+							var param = "";
+							var appName = app.list_name || app.name
+								.Name;
+							var paramStr = app.param
+							if (paramStr) {
+								//mobox2鐨刾aram鏄痡son瀛楃涓�+								param = paramStr.replace(/\\/g, "");
+								//mobox3鐨刾aram鏄痓ase64瀛楃涓�+								if (!paramStr.includes('"')) param = Base64.decode(
+									paramStr);
+							}
+							if (!param) {
+								uni.showModal({
+									title: this.translateSys("tip"),
+									content: this.translate(
+										'tip_no_app_param'),
+									showCancel: false,
+									confirmText: this.translateSys(
+										'close')
+								});
+								return;
+							}
+							const attrValues = []
+
+							style.form.items.forEach(item => {
+								if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�+									item.setting.colList.forEach(col => {
+										if (col != null) {
+											attrValues.push({
+												attr: col.fieldId,
+												value: col.value || ""
+											})
+										}
+
+									});
+								} else
+									attrValues.push({
+										attr: item.fieldId,
+										value: item.value || ""
+									})
+							});
+							uni.navigateTo({
+								url: '../modal/' + name + '?param=' +
+									param + "&titlename=" + appName +
+									"&type=relatedFunction&paramValue=" + JSON.stringify(attrValues),
+							});
+						} else {
+							uni.showModal({
+								title: this.translateSys("error"),
+								content: this.translate(
+									"function_not_exist"),
+								showCancel: false,
+								confirmText: this.translateSys('close')
+							});
+						}
+
+					} else {
+						uni.showModal({
+							title: this.translateSys("error"),
+							content: this.translate("cannot_related_function"),
+							showCancel: false,
+							confirmText: this.translateSys('close')
+						});
+
+					}
+				} catch (ex) {
+					console.log(ex);
+					let exStr = JSON.stringify(ex)
+					if (exStr == "{}")
+						exStr = ex
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
+					uni.showModal({
+						title: this.translateSys("error"),
+						content: tip,
+						showCancel: false,
+						confirmText: this.translateSys('close')
+					});
+					return undefined
+				}
+			},
+
 			//淇敼灏忕獥鍙ｆ暟鎹� 			showSmallDialog(btn, row, enviroment, pageData) {
 				var data = {
@@ -2958,7 +3076,7 @@
 				console.log(dataInfo);
 				runCustomEvent(dataInfo).then(result => {
 					console.log(result);
-					if (result.ret != 0) {
+					if (result.ret != 0 && result.ret != 1) {
 						var tip = result.err_info ? typeof result
 							.err_info == 'string' ? result.err_info :
 							result.err_info.join('<br/>') : '';
@@ -2998,208 +3116,212 @@
 							confirmText: this.translateSys(
 								'close')
 						});
-						if (result.result_type == 2) {
+						if ([0, 2, 3, 4, -1].includes(result.result_type)) {
+							if (result.result_type == 2) {
 
-						} else if (typeof result.result == 'string') {
-							if (result.result) {
+							} 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") { //鐮佺洏涓�+										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
+										) { //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,姝ｅ湪鐮佺洏鏄惁鏈夋暟鎹�+											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}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
 								uni.showModal({
 									title: this.translateSys('tip'),
-									content: result.result,
+									content: tip,
 									showCancel: false,
 									confirmText: this.translateSys('close')
 								});
+								console.log(ex)
+								return
 							}
 						}
-						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
-									) { //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,姝ｅ湪鐮佺洏鏄惁鏈夋暟鎹�-										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}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
-							uni.showModal({
-								title: this.translateSys('tip'),
-								content: tip,
-								showCancel: false,
-								confirmText: this.translateSys('close')
-							});
-							console.log(ex)
-							return
-						}
-
 					}
 
 				}).catch(ex => {
 					console.log(ex);
-					let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
+					let exStr = JSON.stringify(ex)
+					if (exStr == "{}")
+						exStr = ex
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
 					uni.showModal({
 						title: this.translateSys("error") + "8.1",
 						content: this.translate("execute_after_ok_event_failed") +
@@ -3422,7 +3544,7 @@
 
 				button {
 					text-align: left;
-					line-height: 1.5;
+					line-height: 1.6;
 					border: none;
 
 					margin-right: 10rpx;

--
Gitblit v1.9.1