From 7662665a4f88da0f8afa804bd4a34dfbefc1fb56 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 29 八月 2025 15:17:59 +0800
Subject: [PATCH] get_pre_page_subtable_next_row

---
 pages/modal/5601.vue | 3140 ++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 2,049 insertions(+), 1,091 deletions(-)

diff --git a/pages/modal/5601.vue b/pages/modal/5601.vue
index d22290d..2fe2da4 100644
--- a/pages/modal/5601.vue
+++ b/pages/modal/5601.vue
@@ -1,7 +1,8 @@
 <template>
-	<view class="uni-page-modal-5601">
+	<view class="uni-page-modal-5601" :class="largeMode?'large-mode':''">
 		<!-- 琛ㄥご鏍峰紡 -->
-		<OIForm ref="refBaseForm" class="v-headStyle" :form="head_styledef.form" :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>
 
@@ -10,25 +11,26 @@
 			<view v-if="param.Show_Welcom_Page==false" class="uni-panel-content">
 				<!-- 椤电 -->
 				<view class="dv-tab">
-					<uni-segmented-control :current="current" :values="tabs" @clickItem="onClickItem"
-						styleType="button">
+					<uni-segmented-control :current="current" :values="tabs" @clickItem="onClickItem" styleType="text">
 					</uni-segmented-control>
 				</view>
 				<swiper class="view-tabpage" :current="current" @change="changeSwiper">
 					<!-- 瀛愮晫闈�-->
 					<swiper-item v-for="(pageData, pageIndex) in pageDetail" :key="pageIndex">
-						<view class="uni-panel-content">
+						<view class="tab-content">
 							<view class="view-tab-content" :id="'tabpanel' + pageData.Name">
 								<image class="logo" v-if="pageData.DefList.length==0"
 									src="../../images/mobox_log_200x40.png">
 								</image>
 								<checkbox-group @change="checkboxChange">
 									<div class="dv-panel" v-for="(style,ii) in pageData.DefList" :key="ii"
-									<div class="dv-panel" v-for="(style,ii) in pageData.DefList" :key="ii"
 										@tap="onPanelClick(ii,style.form.htmlobjId)"
 										:id="'dvpanel'+style.form.htmlobjId"
 										:class="style.form.htmlobjId==active_id?'bk-active':''">
-										<OIForm class="dv-panel-form" :form="style.form" viewMode></OIForm>
+										<OIForm class="dv-panel-form" :form="style.form"
+											:hiddenIds="style.hiddenIds ?style.hiddenIds :[] " viewMode @on-change="(item2)=>{
+												onDetailEnterChange(item2,style,pageIndex)
+											}"></OIForm>
 										<div class="dv-panel-button"
 											v-if="pageData.Select_Button==true || pageData.Row_Button.length > 0">
 
@@ -41,8 +43,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>
 
@@ -57,8 +59,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)">
@@ -106,6 +108,7 @@
 				</view>
 			</uni-popup>
 		</view>
+		
 	</view>
 </template>
 
@@ -114,7 +117,12 @@
 		Base64
 	} from '@/js/Base64.js';
 	import {
-		dictGetInfo
+		showInfo,
+		showError
+	} from "@/js/Page.js"
+	import {
+		dictGetInfo,
+		appGetInfo,
 	} from "@/api/mobox.js"
 	import {
 		getUIStyleInfo,
@@ -140,6 +148,7 @@
 
 		data() {
 			return {
+				largeMode: getApp().globalData.largeMode || false,
 				title: this.translateSys("inventory"),
 				ClsID: '',
 				param: {},
@@ -171,6 +180,13 @@
 
 
 			},
+			initialEvent() {
+				let event = (this.head_styledef.event || []).find((e) => e.event_id == "initial");
+				return {
+					id: event?.scrip_id || "",
+					name: event?.scrip_name || "",
+				};
+			},
 		},
 		onLoad(options) {
 			uni.setNavigationBarTitle({
@@ -181,15 +197,17 @@
 			//鑾峰彇涓绘暟鎹被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"),
-					content: this.translate("tip_no_master_class"),
-					showCancel: false,
-					confirmText: this.translateSys('close')
-				});
+				showInfo(this.translate('tip_no_master_class'))
 			}
+			const $this = this
+			const eventChannel = this.getOpenerEventChannel();
+			eventChannel.on('nextRow', function(data) {
+				console.log("nextRow", data)
+				$this.setFormValues(data)
+			})
 		},
 		//椤甸潰鍒濆鍖栬幏鍙栫劍鐐� 		methods: {
@@ -220,28 +238,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) {
@@ -291,9 +290,19 @@
 				this.setData({
 					pageDetail: pageList
 				})
-
+				await this.loadInitialEvent();
 				console.log(this.pageDetail);
 			},
+			async loadInitialEvent() {
+				try {
+					if (this.initialEvent.id) {
+						this.onChange(this.initialEvent)
+					}
+				} catch (ex) {
+					showError(ex, this.translateSys('error'))
+				}
+			},
+
 			changeSwiper(evt) {
 				let index = evt.target.current || evt.detail.current;
 				this.setData({
@@ -366,21 +375,18 @@
 								Name: page.After_Delete?.Name
 							};
 						}
-
-						if (evt.ID) {
-							return [{
-								Cls_Name: this.param?.master_cls?.name || "",
-								Cls_ID: this.param?.master_cls?.id || "",
-								FunCode: "Delete",
-								ShowName: this.$t("sys.delete"),
-								Style: "text",
-								Prompt: false,
-								NotTriggerSYSEvent: false,
-								DataStateVerify: false,
-								AttrVerify: false,
-								AfterProcess_Event: evt,
-							}];
-						}
+						return [{
+							Cls_Name: this.param?.master_cls?.name || "",
+							Cls_ID: this.param?.master_cls?.id || "",
+							FunCode: "Delete",
+							ShowName: this.$t("sys.delete"),
+							Style: "text",
+							Prompt: false,
+							NotTriggerSYSEvent: false,
+							DataStateVerify: false,
+							AttrVerify: false,
+							AfterProcess_Event: evt,
+						}];
 					}
 					return [];
 				}
@@ -448,8 +454,8 @@
 								}
 
 								if ($this.focusFieldId == "") {
-									if (ele.name == 'Input' || ele.name ==
-										'InputNumber') {
+									if (!ele.disabled && (ele.name == 'Input' ||
+											ele.name == 'InputNumber' || ele.name == 'Textarea')) {
 										$this.setData({
 											focusFieldId: ele.fieldId
 										})
@@ -494,7 +500,25 @@
 								}
 							}
 						}
-
+						const app = getApp()
+						if (app.globalData.bindClasses) {
+							styledefHead.form.items.push({
+								name: "Input",
+								label: this.translate("classes"),
+								labelWidth: 100,
+								disabled: true,
+								value: app.globalData.classes,
+								setting: {
+									width: 100,
+									height: 50,
+								},
+								bind: {
+									attr: "",
+								},
+								fieldId: "S_CLASSES",
+							})
+							styledefHead.form.model["S_CLASSES"] = app.globalData.classes
+						}
 					}
 					this.setData({
 						head_styledef: styledefHead
@@ -503,12 +527,7 @@
 
 				} catch (ex) {
 					// console.log(ex);
-					uni.showModal({
-						title: this.translateSys("error") + "1",
-						content: ex.errMsg,
-						showCancel: false,
-						confirmText: this.translateSys('close')
-					});
+					showError(ex, this.translateSys('error') + "1")
 					return {}
 				}
 
@@ -571,13 +590,8 @@
 					console.log("Detail_UIstyleGetInfo", detailstyledef);
 					return detailstyledef
 				} catch (ex) {
-					// console.log(ex);
-					uni.showModal({
-						title: this.translateSys("error") + "2",
-						content: ex.errMsg,
-						showCancel: false,
-						confirmText: this.translateSys('close')
-					});
+					console.log(ex);
+					showError(ex, this.translateSys('error') + "2")
 					return {}
 				}
 
@@ -610,13 +624,7 @@
 					}
 					formItem.dict = list;
 				} catch (ex) {
-					// console.log(ex);
-					uni.showModal({
-						title: this.translateSys("error") + "3",
-						content: ex.errMsg,
-						showCancel: false,
-						confirmText: this.translateSys('close')
-					});
+					showError(ex, this.translateSys('error') + "3")
 				}
 
 			},
@@ -628,9 +636,9 @@
 				// var $ele = e;
 				//console.log(e.target)
 				this.focusOldFieldId = item.fieldId
-				getApp().onScan((result) => {
-					console.log(result.decodedata);
-					item.value = result.decodedata;
+				getApp().onScan(async (result) => {
+					console.log(result);
+					item.value = result;
 					var $this = this;
 					let newVal = item.value.trim()
 					if (newVal) {
@@ -638,16 +646,14 @@
 						var attr = item.fieldId;
 						this.head_styledef.form.model[attr] = newVal;
 						var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�-						var onSuffixClickCallbackEvent = item.bind
-							.onSuffixClickCallbackEvent; //鍚庡浘鏍囩偣鍑讳簨浠�-						var onSuffixClickEvent = item.bind
-							.onSuffixClickEvent; //鍚庡浘鏍囩偣鍑诲洖璋� 						var isflag = false;
-
+						if (item.changeEventRunding)
+							return
+						item.changeEventRunding = true
 						if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠�-							$this.onChange(onChangeEvent);
+							await this.onChange(onChangeEvent);
 						}
-
+						item.changeEventRunding = false
 						//鍒濆鍖栵紝涓嬩釜杈撳叆妗唂ocus灞炴�
 						var findd = false
 						for (let i in $this.head_styledef.form.items) {
@@ -717,7 +723,7 @@
 				})
 			},
 
-			onEnterChange(item) { //鍥炶溅锛岀偣鍑绘寜閽紝鍙栨秷鑺傜偣浜嬩欢
+			async onEnterChange(item) { //鍥炶溅锛岀偣鍑绘寜閽紝鍙栨秷鑺傜偣浜嬩欢
 				console.log(item);
 				let newVal = item.value
 				if (typeof item.value == "string") {
@@ -736,42 +742,165 @@
 					this.head_styledef.form.model[attr] = newVal;
 					var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠� 					if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠�-						this.onChange(onChangeEvent);
+						await this.onChange(onChangeEvent);
 					}
 
 				}
 			},
 
+
 			classAttr_extButton(item) {
-				var onSuffixClickCallbackEvent = item.bind.onSuffixClickCallbackEvent; //鍚庡浘鏍囩偣鍑讳簨浠�+				var onSuffixClickCallbackEvent = item.bind
+					.onSuffixClickCallbackEvent; //鍚庡浘鏍囩偣鍑讳簨浠� 				var onSuffixClickEvent = item.bind.onSuffixClickEvent; //鍚庡浘鏍囩偣鍑诲洖璋� 
 				if (!onSuffixClickCallbackEvent.id) {
-					uni.showModal({
-						title: this.translateSys("tip"),
-						content: this.translate('icon_click_callback_empty'),
-						showCancel: false,
-						confirmText: this.translateSys('close')
-					});
+
+					showInfo(this.translate('icon_click_callback_empty'))
 					return;
 				}
 				if (!onSuffixClickEvent.id) {
-					uni.showModal({
-						title: this.translateSys("tip"),
-						content: this.translate('icon_click_event_empty'),
-						showCancel: false,
-						confirmText: this.translateSys('close')
-					});
+					showInfo(this.translate('icon_click_event_empty'))
+
 					return;
 				}
 				this.popupType = 'right'
 				// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
 				this.$refs.popup.open(this.popupType);
 
-				this.dataObjRunCustomEvent_Return(onSuffixClickEvent.id, '', onSuffixClickCallbackEvent.id,
+				this.dataObjRunCustomEvent_Return(onSuffixClickEvent.id, '',
+					onSuffixClickCallbackEvent.id,
 					item);
 			},
+			onDetailEnterChange(item, style, pageIndex) {
+				let newVal = item.value
+				if (typeof item.value == "string") {
+					newVal = item.value.trim()
+					if (!newVal) {
+						item.oldvalue = newVal;
+						var attr = item.fieldId;
+						style.form.model[attr] = newVal;
+						return
+					}
+				}
+				if (item.oldvalue != newVal) {
+					item.oldvalue = newVal;
+					var attr = item.fieldId;
+					style.form.model[attr] = newVal;
+					var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�+					if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠�+						this.runDetailChangeEvent(onChangeEvent, style, pageIndex)
+					}
+				}
+			},
+			async runDetailChangeEvent(event, style, pageIndex) {
+				try {
+					const detail_attr = {}
 
+					style.form.items.forEach(item2 => {
+						if (item2.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�+							item2.setting.colList.forEach(col => {
+								if (col != null) detail_attr[col
+									.fieldId] = col.value;
+							});
+						} else
+							detail_attr[item2.fieldId] = item2.value;
+					});
+					var obj_attr = detail_attr
+					var input_param = Base64.encode(
+						JSON.stringify(
+							Object.keys(detail_attr).map((a) => ({
+								attr: a,
+								value: detail_attr[a] || "",
+							}))
+						)
+					);
+					var dataInfo = {
+						ed_type: 0,
+						start_transaction: true,
+						class_id: style.form.clsId,
+						class_name: '',
+						event_id: event.id,
+						event_name: '',
+						data_obj_id: '',
+						obj_attr: obj_attr,
+						prj_id: '',
+						ref_cls_id: '',
+						rel_obj_id: '',
+						user_login: '',
+						data_json: '',
+						compose_info: '',
+						ext_info: '',
+						global_attr: '',
+						input_param: input_param,
+					};
+					const result = await runCustomEvent(dataInfo)
+					console.log(result)
+					if (result.ret != 0 && result.ret != 1) {
+						let cls_name = result.event_info?.cls_name
+						let event_name = result.event_info?.event_name
+						tip = result.err_info ? typeof result.err_info == 'string' ? result.err_info : result.err_info
+							.join('\n') : ''
+						if (result.ret == 801) {
+							if (this.param.Only_Script_Error) {
+								let pos = tip.indexOf("锛�);
+								if (pos > -1) tip = tip.substring(pos + 1);
+							}
+						}
+						if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+						if (result.ret == 801) showInfo(tip)
+						else showError(`${tip}锛屾彁绀猴細${result.ret}`, this.translateSys('tip'))
+						this.saving = false
+						return false
+					} else {
+						var tip = result.info ? typeof result.info == 'string' ? result.info :
+							result.info.join('\n') : '';
+						tip = tip || result.err_info
+						let time = result.info_time || 0
+						if (time)
+							showError(tip, this.translateSys('tip'))
+						else
+						showInfo(tip)
+						if ([0, 2, 3, 4, -1].includes(result.result_type)) {
+							if (result.result_type == 2) {
+
+							} else if (typeof result.result == 'string') {
+								showInfo(result.result)
+
+							}
+							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}`
+								showError(tip, this.translateSys('tip'))
+								return
+							}
+						}
+
+					}
+
+				} catch (ex) {
+					console.log(ex)
+					showError(ex, this.translateSys('error') + "6.1")
+				}
+
+			},
 			getDetailAttrList(pageData) {
 				const detailAttrList = [];
 				console.log(pageData)
@@ -781,8 +910,10 @@
 						style.form.items.forEach(item => {
 							if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮� 								item.setting.colList.forEach(col => {
-									if (col != null) detail_attr[col
-										.fieldId] = col.value;
+									if (col != null)
+										detail_attr[col
+											.fieldId] = col
+										.value;
 								});
 							} else
 								detail_attr[item.fieldId] = item.value;
@@ -800,17 +931,21 @@
 					pageData.DefList.forEach(style => {
 						style.form.attrs.forEach(attr => {
 							for (var key in detailAttrList) {
-								if (style.form.objId == detailAttrList[key][
+								if (style.form.objId == detailAttrList[
+										key][
 										'id'
 									]) {
-									var keys = Object.keys(detailAttrList[key]);
+									var keys = Object.keys(
+										detailAttrList[key]);
 									var isflag = true;
 									keys.forEach((ele) => {
-										if (ele == attr.attr) isflag =
+										if (ele == attr.attr)
+											isflag =
 											false;
 									});
 									if (isflag) {
-										detailAttrList[attr.attr] = attr.value;
+										detailAttrList[attr.attr] =
+											attr.value;
 									}
 								}
 							}
@@ -864,7 +999,8 @@
 
 							jsonList.push({
 								page_name: page.Name,
-								item_list: $this.getDetailAttrList(page),
+								item_list: $this.getDetailAttrList(
+									page),
 								ext_data: page.ExtData || {}
 							})
 
@@ -892,200 +1028,249 @@
 							global_attr: '',
 							input_param: input_param,
 						};
-						runCustomEvent(dataInfo).then(result => {
-							console.log(result);
-							if (result.ret != 0) {
-								var tip = result.err_info ? typeof result
-									.err_info == 'string' ? result
-									.err_info : result.err_info.join('<br/>') :
-									'';
-								if (result.ret == 801) {
-									if (this.param.Only_Script_Error) {
-										let pos = tip.indexOf("锛�);
-										if (pos > -1) tip = tip.substring(pos +
-											1);
-									}
-									uni.showModal({
-										title: this.translateSys(
-											"tip"),
-										content: tip,
-										showCancel: false,
-										confirmText: this.translateSys(
-											'close')
-									});
-								} else uni.showModal({
-									title: this.translateSys('tip'),
-									content: tip + ',' + this
-										.translateSys('tip') + ':' +
-										result
-										.ret,
-									showCancel: false,
-									confirmText: this.translateSys(
-										'close')
-								});
-								return false;
-							} else {
-								var tip = result.info ? typeof result.info ==
-									'string' ? result.info :
-									result.info.join('<br/>') : '';
-								if (tip) uni.showModal({
-									title: this.translateSys('tip'),
-									content: tip,
-									showCancel: false,
-									confirmText: this.translateSys(
-										'close')
-								});
+						const result = await runCustomEvent(dataInfo)
+						console.log(result);
+						if (result.ret != 0 && result.ret != 1) {
+							let cls_name = result.event_info?.cls_name
+							let event_name = result.event_info?.event_name
+							tip = result.err_info ? typeof result.err_info == 'string' ? result.err_info : result
+								.err_info
+								.join('\n') : ''
+							if (result.ret == 801) {
+								if (this.param.Only_Script_Error) {
+									let pos = tip.indexOf("锛�);
+									if (pos > -1) tip = tip.substring(pos + 1);
+								}
+							}
+							if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+							if (result.ret == 801) showInfo(tip)
+							else showError(`${tip}锛屾彁绀猴細${result.ret}`, this.translateSys('tip'))
+							this.saving = false
+							return false
+						} else {
+							var tip = result.info ? typeof result.info == 'string' ? result.info :
+								result.info.join('\n') : '';
+							tip = tip || result.err_info
+							let time = result.info_time || 0
+							if (time)
+								showError(tip, this.translateSys('tip'))
+							else
+							showInfo(tip)
+							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 == "insert_subtable_page_row") { //鐮佺洏涓�-											$this.param.Show_Welcom_Page = false;
+								} else if (typeof result.result == 'string') {
+									showInfo(result.result)
+
+								}
+								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;
+											"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
+											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);
+													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);
+												$this.viewAceionContent(
+													value);
 											}
-										} else if (item.action_type == "select_subtable_page") {
+										} else if (item.action_type ==
+											"select_subtable_page") {
 											var value = item.value;
-											const pageIndex = $this.pageDetail.findIndex((page) => {
-												return value.page_name == page.Name;
-											});
+											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") {
+										} else if (item.action_type ==
+											"select_subtable_page_row") {
 											// value = {"page_name":"鐮佺洏涓�, "row":{"id":"xx"}}
 											var value = item.value;
-											$this.viewActionSelectRow(value)
+											$this.viewActionSelectRow(
+												value)
 										} else if (item.action_type ==
-											"remove_subtable_page_row") { //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�+											"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)
+											$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") {
+										} 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;
-											});
+											const pageData = $this
+												.pageDetail.find((
+													page) => {
+													return value
+														.page_name ==
+														page.Name;
+												});
 											if (pageData)
-												pageData.ExtData = value.ext_data
+												pageData.ExtData = value
+												.ext_data
 
-										} else if (item.action_type == "clear_subpage_rows") {
+										} else if (item.action_type ==
+											"clear_subpage_rows") {
 											var value = item.value;
-											const pageIndex = $this.pageDetail.findIndex((page) => {
-												return value.page_name == page.Name;
-											});
+											const pageIndex = $this
+												.pageDetail.findIndex((
+													page) => {
+													return value
+														.page_name ==
+														page.Name;
+												});
 											if (pageIndex > -1) {
-												const pageData = $this.pageDetail[pageIndex]
+												const pageData = $this
+													.pageDetail[pageIndex]
 												pageData.DefList = []
 												pageData.ExtData = {}
 
-												$this.$set(this.pageDetail, pageIndex, pageData)
+												$this.$set(this.pageDetail,
+													pageIndex, pageData
+												)
 											}
 
-										} else if (item.action_type == "set_dlg_current_edit_attr") {
+										} else if (item.action_type ==
+											"set_dlg_current_edit_attr") {
 
-											if ($this.focusOldFieldId == item.value) {
+											if ($this.focusOldFieldId ==
+												item.value) {
 												$this.setData({
 													focusFieldId: ""
 												})
 											} else {
 												$this.setData({
-													focusFieldId: $this.focusOldFieldId
+													focusFieldId: $this
+														.focusOldFieldId
 												})
 											}
 											$this.$nextTick(() => {
 												$this.setData({
-													focusFieldId: item.value
+													focusFieldId: item
+														.value
 												})
 											});
-										} else if (item.action_type == "set_dlg_attr") {
+										} 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 (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}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+									showError(tip, this.translateSys('tip'))
+									return
 								}
-
 							}
 
-						}).catch(ex => {
-							// console.log(ex);
-							let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
-							uni.showModal({
-								title: this.translateSys("error") + "4.1",
-								content: tip,
-								showCancel: false,
-								confirmText: this.translateSys('close')
-							});
-						});
+						}
+
 					}
 				} catch (ex) {
-					var tip = typeof ex == "string" ? ex : ex.message;
-					uni.showModal({
-						title: this.translateSys("error") + "4.2",
-						content: this.translate(
-								'execute_after_change_event_failed') + this
-							.translateSys(
-								"comma") +
-							this.translate('reason') + this.translateSys("colon") +
-							tip,
-						showCancel: false,
-						confirmText: this.translateSys('close')
-					});
+					console.log(ex);
+					showError(ex, this.translateSys('error') + "4.2")
 				}
 			},
 			operationNumber(value1, value2, operation) {
@@ -1107,13 +1292,16 @@
 				} else if (operation == "/") {
 					if (number2) return number1 / number2;
 					else {
-						throw new Error(`${this.translate("illegal_dividend")}'${value2}'`);
+						throw new Error(
+							`${this.translate("illegal_dividend")}'${value2}'`);
 						return 0;
 					}
 				} else if (operation == "=") {
 					return value2;
 				} else {
-					throw new Error(`${this.translate("unrecognized_operator")}'${operation}'`);
+					throw new Error(
+						`${this.translate("unrecognized_operator")}'${operation}'`
+					);
 					return 0;
 				}
 			},
@@ -1125,7 +1313,8 @@
 				if (pageData?.DefList) {
 					const detailStyleDefList = pageData.DefList || []
 					let bFindRow = false;
-					for (let index = 0; index < detailStyleDefList.length; index++) {
+					for (let index = 0; index < detailStyleDefList
+						.length; index++) {
 						const ele = detailStyleDefList[index]
 
 						if (value.row.id) {
@@ -1135,7 +1324,8 @@
 						} else {
 							const conditions = row.condition || [];
 							if (conditions.length > 0) {
-								for (let index = 0; index < detailStyleDefList.length; index++) {
+								for (let index = 0; index < detailStyleDefList
+									.length; index++) {
 									const ele = detailStyleDefList[index]
 									let bFindCondition = true;
 									for (let i in conditions) {
@@ -1144,18 +1334,23 @@
 										for (let i2 in ele.form.items) {
 											const ele2 = ele.form.items[i2];
 											if (ele2.name != "Layout") {
-												if (ele2.fieldId == condition.attr) {
-													if (condition.value == ele2.value) {
+												if (ele2.fieldId == condition
+													.attr) {
+													if (condition.value == ele2
+														.value) {
 														bFind = true;
 													}
 													break;
 												}
 											} else {
-												const colList = ele2.setting.colList || [];
+												const colList = ele2.setting
+													.colList || [];
 												for (let i3 in colList) {
 													const col = colList[i3];
-													if (col.fieldId == condition.attr) {
-														if (condition.value == col.value) {
+													if (col.fieldId == condition
+														.attr) {
+														if (condition.value == col
+															.value) {
 															bFind = true;
 														}
 														break;
@@ -1179,13 +1374,17 @@
 							ele.SelBut_Checked = true;
 							this.active_id = ele.form.htmlobjId;
 							//鑷姩婊氬姩鍒版寚瀹氬厓绱�-							uni.createSelectorQuery().select("#tabpanel" + value.page_name) //瀵瑰簲澶栧眰鑺傜偣
+							uni.createSelectorQuery().select("#tabpanel" + value
+									.page_name) //瀵瑰簲澶栧眰鑺傜偣
 								.boundingClientRect((container) => {
 									uni.createSelectorQuery()
-										.select("#dvpanel" + ele.form.htmlobjId) //鐩爣鑺傜偣
+										.select("#dvpanel" + ele.form
+											.htmlobjId) //鐩爣鑺傜偣
 										.boundingClientRect((target) => {
 											uni.pageScrollTo({
-												scrollTop: target.top - container
+												scrollTop: target
+													.top -
+													container
 													.top, //婊氬姩鍒板疄闄呰窛绂绘槸鍏冪礌璺濈椤堕儴鐨勮窛绂诲噺鍘绘渶澶栧眰鐩掑瓙鐨勬粴鍔ㄨ窛绂� 											});
 										}).exec();
@@ -1201,7 +1400,8 @@
 				if (JSON.stringify(value.row) == '{}') {
 					return;
 				}
-				const pageIndex = this.pageDetail.findIndex((page, index2, arr) => {
+				const pageIndex = this.pageDetail.findIndex((page, index2,
+					arr) => {
 					return value.page_name == page.Name;
 				})
 				if (pageIndex < 0)
@@ -1212,7 +1412,8 @@
 					const detailStyleDefList = pageData.DefList || []
 					value.row.forEach((row) => {
 						if (row.id) {
-							for (let index = 0; index < detailStyleDefList.length; index++) {
+							for (let index = 0; index < detailStyleDefList
+								.length; index++) {
 								const ele = detailStyleDefList[index]
 								if (ele.form.objId == row.id) {
 									detailStyleDefList.splice(index, 1);
@@ -1223,27 +1424,36 @@
 						} else {
 							const conditions = row.condition || [];
 							if (conditions.length > 0) {
-								for (let index = 0; index < detailStyleDefList.length; index++) {
+								for (let index = 0; index <
+									detailStyleDefList.length; index++) {
 									const ele = detailStyleDefList[index]
 									let bFindCondition = true;
 									for (let i in conditions) {
 										const condition = conditions[i];
 										let bFind = false;
 										for (let i2 in ele.form.items) {
-											const ele2 = ele.form.items[i2];
+											const ele2 = ele.form.items[
+												i2];
 											if (ele2.name != "Layout") {
-												if (ele2.fieldId == condition.attr) {
-													if (condition.value == ele2.value) {
+												if (ele2.fieldId ==
+													condition.attr) {
+													if (condition.value ==
+														ele2.value) {
 														bFind = true;
 													}
 													break;
 												}
 											} else {
-												const colList = ele2.setting.colList || [];
+												const colList = ele2
+													.setting.colList || [];
 												for (let i3 in colList) {
-													const col = colList[i3];
-													if (col.fieldId == condition.attr) {
-														if (condition.value == col.value) {
+													const col = colList[
+														i3];
+													if (col.fieldId ==
+														condition.attr) {
+														if (condition
+															.value == col
+															.value) {
 															bFind = true;
 														}
 														break;
@@ -1258,7 +1468,8 @@
 										}
 									}
 									if (bFindCondition) {
-										detailStyleDefList.splice(index, 1);
+										detailStyleDefList.splice(index,
+											1);
 
 									}
 								}
@@ -1272,7 +1483,8 @@
 			//鏇存柊鍒嗛〉绛句腑鐨勫垪琛ㄩ」鍐呭
 			viewActionSetRow(value) {
 				const $this = this
-				const pageIndex = $this.pageDetail.findIndex((page, index2, arr) => {
+				const pageIndex = $this.pageDetail.findIndex((page, index2,
+					arr) => {
 					return value.page_name == page.Name;
 				})
 				if (pageIndex < 0)
@@ -1284,116 +1496,169 @@
 						if (rowData.id) {
 							if (ele.form.objId == rowData.id) {
 								rowData.attrs.forEach(attr => {
-									ele.form.items.forEach(ele2 => {
-										if (ele2.name != 'Layout') {
-											if (ele2.fieldId == attr.attr) {
-												ele2.value = $this.operationNumber(
-													ele2.value,
-													attr.value,
-													attr.operation
-												)
-										if (ele2.name != 'Layout') {
-											if (ele2.fieldId == attr.attr) {
-												ele2.value = $this.operationNumber(
-													ele2.value,
-													attr.value,
-													attr.operation
-												)
-											}
-										} else if (ele2.name == 'Layout') {
-											ele2.setting.colList.forEach(col => {
-												if (col) {
-													if (col.fieldId == attr
-														.attr) {
-														col.value = $this
-															.operationNumber(
-																col.value,
-																attr.value,
-																attr
-																.operation
-															)
-													}
+									ele.form.items.forEach(
+										ele2 => {
+											if (ele2
+												.name !=
+												'Layout'
+											) {
+												if (ele2
+													.fieldId ==
+													attr
+													.attr
+												) {
+													ele2.value =
+														$this
+														.operationNumber(
+															ele2
+															.value,
+															attr
+															.value,
+															attr
+															.operation
+														)
 												}
-											})
-										}
-									});
+											} else if (
+												ele2
+												.name ==
+												'Layout'
+											) {
+												ele2.setting
+													.colList
+													.forEach(
+														col => {
+															if (
+																col) {
+																if (col
+																	.fieldId ==
+																	attr
+																	.attr
+																) {
+																	col.value =
+																		$this
+																		.operationNumber(
+																			col
+																			.value,
+																			attr
+																			.value,
+																			attr
+																			.operation
+																		)
+																}
+															}
+														}
+													)
+											}
+										});
 								});
 							}
 						} else if (rowData.condition) {
-							const conditions = rowData.condition || [];
-							if (conditions.length > 0) {
-								let bFindCondition = true;
-								for (let i in conditions) {
-									const condition = conditions[i];
-									let bFind = false;
-									for (let i2 in ele.form.items) {
-										const ele2 = ele.form.items[i2];
-										if (ele2.name != "Layout") {
-											if (ele2.fieldId == condition.attr) {
-												if (condition.value == ele2.value) {
+							const conditions = rowData.condition
+							let bFindCondition = true;
+							for (let i in conditions) {
+								const condition = conditions[i];
+								let bFind = false;
+								for (let i2 in ele.form.items) {
+									const ele2 = ele.form.items[
+										i2];
+									if (ele2.name != "Layout") {
+										if (ele2.fieldId ==
+											condition.attr) {
+											if (condition.value ==
+												ele2.value) {
+												bFind = true;
+											}
+											break;
+										}
+									} else {
+										const colList = ele2
+											.setting.colList || [];
+										for (let i3 in colList) {
+											const col = colList[
+												i3];
+											if (col.fieldId ==
+												condition.attr) {
+												if (condition
+													.value == col
+													.value) {
 													bFind = true;
 												}
 												break;
 											}
-										} else {
-											const colList = ele2.setting.colList || [];
-											for (let i3 in colList) {
-												const col = colList[i3];
-												if (col.fieldId == condition.attr) {
-													if (condition.value == col.value) {
-														bFind = true;
-													}
-													break;
-												}
-											}
-											if (bFind) break;
 										}
-									}
-									if (!bFind) {
-										bFindCondition = false;
-										break;
+										if (bFind) break;
 									}
 								}
-								if (bFindCondition) {
-									rowData.attrs.forEach(attr => {
-										ele.form.items.forEach(ele2 => {
-											if (ele2.name != 'Layout') {
-												if (ele2.fieldId == attr.attr) {
-													ele2.value =
-														$this.operationNumber(
-															ele2.value,
-															attr.value,
-															attr.operation
-														)
-												}
-											} else if (ele2.name == 'Layout') {
-												ele2.setting.colList.forEach(col => {
-													if (col) {
-														if (col.fieldId == attr
-															.attr) {
-															col.value =
-																$this
-																.operationNumber(
-																	col.value,
-																	attr
-																	.value,
-																	attr
-																	.operation)
-														}
-													}
-												})
-											}
-										});
-									});
-
+								if (!bFind) {
+									bFindCondition = false;
+									break;
 								}
 							}
+							if (bFindCondition) {
+								rowData.attrs.forEach(attr => {
+									ele.form.items.forEach(
+										ele2 => {
+											if (ele2
+												.name !=
+												'Layout'
+											) {
+												if (ele2
+													.fieldId ==
+													attr
+													.attr
+												) {
+													ele2.value =
+														$this
+														.operationNumber(
+															ele2
+															.value,
+															attr
+															.value,
+															attr
+															.operation
+														)
+												}
+											} else if (
+												ele2
+												.name ==
+												'Layout'
+											) {
+												ele2.setting
+													.colList
+													.forEach(
+														col => {
+															if (
+																col) {
+																if (col
+																	.fieldId ==
+																	attr
+																	.attr
+																) {
+																	col.value =
+																		$this
+																		.operationNumber(
+																			col
+																			.value,
+																			attr
+																			.value,
+																			attr
+																			.operation
+																		)
+																}
+															}
+														}
+													)
+											}
+										});
+								});
+
+							}
+
 						}
 					})
 				});
 				pageData.DefList = detailStyleDefList
 				$this.$set(this.pageDetail, pageIndex, pageData)
-
 			},
 			//鍔犺浇姝ｅ湪鐮佺洏鍐呭
 			viewAceionRow(data) {
@@ -1415,30 +1680,34 @@
 					data.row.forEach(row => {
 						detailStyle = JSON.parse(styleStr);
 						detailStyle.form.objId = row.id;
-						detailStyle.form.htmlobjId = row.id ? row.id.replace(/-/g, '').replace('{', '')
+						detailStyle.form.htmlobjId = row.id ? row.id
+							.replace(/-/g, '').replace('{', '')
 							.replace(
 								'}', '') : 'null';
 						detailStyle.form.attrs = row.attrs;
 						row.attrs.forEach(attr => {
 							detailStyle.form.items.forEach(ele => {
 								if (ele.name != 'Layout') {
-									if (ele.fieldId == attr.attr)
-										ele.value = attr.value;
-									if (ele.fieldId == attr.attr)
-										ele.value = attr.value;
-								} else if (ele.name == 'Layout') {
-									ele.setting.colList.forEach(col => {
-										if (col) {
-											if (col.fieldId == attr.attr)
-												col.value = attr.value;
-										}
-									});
-									ele.setting.colList.forEach(col => {
-										if (col) {
-											if (col.fieldId == attr.attr)
-												col.value = attr.value;
-										}
-									});
+									if (ele.fieldId == attr
+										.attr)
+										ele.value = attr
+										.value;
+								} else if (ele.name ==
+									'Layout') {
+									ele.setting.colList
+										.forEach(col => {
+											if (col) {
+												if (col
+													.fieldId ==
+													attr
+													.attr
+												)
+													col
+													.value =
+													attr
+													.value;
+											}
+										});
 								}
 							});
 						});
@@ -1466,14 +1735,15 @@
 					return;
 				}
 				var styleStr = JSON.stringify(pageData.StyleDef);
-				var detailStyle = JSON.parse(styleStr);
-				if (detailStyle.form) {
-					data.content.forEach(cont => {
-						detailStyle = JSON.parse(styleStr);
-						detailStyle.SelBut_Checked = data.checkbox ?? true;
+
+				data.content.forEach(cont => {
+					var detailStyle = JSON.parse(styleStr);
+					if (detailStyle.form) {
+						//	detailStyle.SelBut_Checked = data.checkbox ?? true;
 
 						detailStyle.form.objId = cont.id;
-						detailStyle.form.htmlobjId = cont.id ? cont.id.replace(/-/g,
+						detailStyle.form.htmlobjId = cont.id ? cont.id
+							.replace(/-/g,
 								'')
 							.replace('{', '').replace('}',
 								'') : 'null';
@@ -1481,17 +1751,27 @@
 						cont.attrs.forEach(attr => {
 							detailStyle.form.items.forEach(ele => {
 								if (ele.name != 'Layout') {
-									if (ele.fieldId == attr.attr)
-										ele.value = attr.value;
-								} else if (ele.name == 'Layout') {
-									ele.setting.colList.forEach(
-										col => {
-											if (col) {
-												if (col.fieldId ==
-													attr.attr)
-													col.value = attr.value;
-											}
-										});
+									if (ele.fieldId == attr
+										.attr)
+										ele.value = attr
+										.value;
+								} else if (ele.name ==
+									'Layout') {
+									ele.setting.colList
+										.forEach(
+											col => {
+												if (col) {
+													if (col
+														.fieldId ==
+														attr
+														.attr
+													)
+														col
+														.value =
+														attr
+														.value;
+												}
+											});
 								}
 							});
 						});
@@ -1499,96 +1779,210 @@
 						if (data.clear == false) {
 							var isflag = true;
 							pageData.DefList.forEach((style, index) => {
-								if (style.form.objId == detailStyle.form.objId) {
-								if (style.form.objId == detailStyle.form.objId) {
+								if (style.form.objId == detailStyle
+									.form.objId) {
 									cont.attrs.forEach(attr => {
-										style.form.items.forEach(ele => {
-											if (ele.name != 'Layout') {
-												if (ele.fieldId == attr.attr)
-													ele.value = attr.value;
-											} else if (ele.name == 'Layout') {
-												ele.setting.colList.forEach(
-													col => {
-														if (col) {
-															if (col.fieldId ==
-																attr
-																.attr)
-																col.value =
-																attr.value;
-														}
-													});
-											}
-										});
+										style.form.items
+											.forEach(
+												ele => {
+													if (ele
+														.name !=
+														'Layout'
+													) {
+														if (ele
+															.fieldId ==
+															attr
+															.attr
+														)
+															ele
+															.value =
+															attr
+															.value;
+													} else if (
+														ele
+														.name ==
+														'Layout'
+													) {
+														ele.setting
+															.colList
+															.forEach(
+																col => {
+																	if (
+																		col) {
+																		if (col
+																			.fieldId ==
+																			attr
+																			.attr
+																		)
+																			col
+																			.value =
+																			attr
+																			.value;
+																	}
+																}
+															);
+													}
+												});
 									});
 									isflag = false;
 								}
 							});
-							if (isflag) pageData.DefList.push(detailStyle); //寰呭垎鎷�+							if (isflag) pageData.DefList.push(
+								detailStyle); //寰呭垎鎷� 						} else {
 							pageData.DefList.push(detailStyle); //寰呭垎鎷� 						}
 						// $this.setData({pageDetail:pageD})
 						$this.$set(this.pageDetail, pageIndex, pageData)
+					}
+				});
 
-					});
-				}
 				$this.$set(this.pageDetail, pageIndex, pageData)
+			},
+			setFormItemVisible(attrs) {
+				if (!Array.isArray(attrs)) {
+					return
+				}
+				const head_styledef = this.head_styledef
+				if (!head_styledef.hiddenIds) {
+					head_styledef.hiddenIds = []
+				}
+				attrs.forEach((attr) => {
+					let index = head_styledef.hiddenIds.findIndex((id) =>
+						id == attr.attr);
+					if (attr.show) {
+						if (index > -1) head_styledef.hiddenIds.splice(
+							index, 1);
+					} else {
+						if (index == -1) head_styledef.hiddenIds.push(attr
+							.attr);
+					}
+				});
+
+				this.setData({
+					head_styledef: head_styledef
+				})
 			},
 			setFormValues(attrs) {
 				const head_styledef = this.head_styledef
-				if (JSON.stringify(attrs) == '{}') {
-					return;
+				if (!Array.isArray(attrs)) {
+					return
 				}
 				console.log(attrs)
 				attrs.forEach(async (attr, key) => {
 					if (attr.choice_list) {
 						var dictItemList = [];
-						attr.choice_list.forEach(async (val, index) => {
+						attr.choice_list.forEach(async (val,
+							index) => {
 							dictItemList.push({
 								text: val,
 								value: val
 							});
 						});
 
-						head_styledef.form.items.forEach(async (attr_item, index) => {
-							if (attr_item.name != "Layout") {
-								if (attr_item.fieldId == attr.attr) {
-									if (attr_item.useDict) {
-										attr_item.dict = dictItemList;
+						head_styledef.form.items.forEach(async (
+							attr_item, index) => {
+							if (attr_item.name !=
+								"Layout") {
+								if (attr_item.fieldId ==
+									attr.attr) {
+									if (attr_item
+										.useDict) {
+										attr_item.dict =
+											dictItemList;
 									} else {
-										attr_item.selections = dictItemList;
+										attr_item
+											.selections =
+											dictItemList;
 									}
 								}
-							} else if (attr_item.name == "Layout") {
-								attr_item.setting.colList.forEach((col) => {
-									if (col) {
-										if (col.fieldId == attr.attr) {
-											if (col.useDict) {
-												col.dict = dictItemList;
-											} else {
-												col.selections = dictItemList;
+							} else if (attr_item.name ==
+								"Layout") {
+								attr_item.setting.colList
+									.forEach((col) => {
+										if (col) {
+											if (col
+												.fieldId ==
+												attr
+												.attr
+											) {
+												if (col
+													.useDict
+												) {
+													col.dict =
+														dictItemList;
+												} else {
+													col.selections =
+														dictItemList;
+												}
 											}
 										}
-									}
-								});
+									});
 							}
 						});
 					}
 					if (!head_styledef.form.model[attr.attr]) {
-						head_styledef.form.model[attr.attr] = attr.value;
+						head_styledef.form.model[attr.attr] = attr
+							.value;
 					}
 					head_styledef.form.items.forEach(async (ele) => {
 						if (ele.name != "Layout") {
 							if (ele.fieldId == attr.attr) {
 								ele.value = attr.value;
 								ele.oldvalue = attr.value;
+								if (ele.name == "Input") {
+									if (attr.prompt) ele
+										.placeholder = attr
+										.prompt;
+								}
+								if (attr.enable !==
+									undefined) {
+									if (attr.enable) ele
+										.disabled = false;
+									else ele.disabled =
+										true;
+								}
 							}
 						} else if (ele.name == "Layout") {
-							ele.setting.colList.forEach((col) => {
+							ele.setting.colList.forEach((
+								col) => {
 								if (col) {
-									if (col.fieldId == attr.attr) {
-										col.value = attr.value;
-										col.oldvalue = attr.value;
+									if (col
+										.fieldId ==
+										attr.attr
+									) {
+										col.value =
+											attr
+											.value;
+										col.oldvalue =
+											attr
+											.value;
+										if (col
+											.name ==
+											"Input"
+										) {
+											if (attr
+												.prompt
+											)
+												col
+												.placeholder =
+												attr
+												.prompt;
+										}
+										if (attr
+											.enable !==
+											undefined
+										) {
+											if (attr
+												.enable
+											)
+												col
+												.disabled =
+												false;
+											else col
+												.disabled =
+												true;
+										}
 									}
 								}
 							});
@@ -1602,20 +1996,172 @@
 					head_styledef: head_styledef
 				})
 			},
+			setDetailFormItemVisible(attrs, style, pageIndex) {
+				if (pageIndex < 0)
+					return
+				if (!Array.isArray(attrs)) {
+					return
+				}
+				const pageData = this.pageDetail[pageIndex]
+				if (!style.hiddenIds) {
+					style.hiddenIds = []
+				}
+				attrs.forEach((attr) => {
+					let index = style.hiddenIds.findIndex((id) => id ==
+						attr.attr);
+					if (attr.show) {
+						if (index > -1) style.hiddenIds.splice(index, 1);
+					} else {
+						if (index == -1) style.hiddenIds.push(attr.attr);
+					}
+				});
+				this.$set(this.pageDetail, pageIndex, pageData)
+			},
+			setDetailFormValues(attrs, style, pageIndex) {
+				if (pageIndex < 0)
+					return
+				if (!Array.isArray(attrs)) {
+					return
+				}
+
+				const pageData = this.pageDetail[pageIndex]
+				attrs.forEach(async (attr, key) => {
+					if (attr.choice_list) {
+						var dictItemList = [];
+						attr.choice_list.forEach(async (val,
+							index) => {
+							dictItemList.push({
+								text: val,
+								value: val
+							});
+						});
+
+						style.form.items.forEach(async (attr_item,
+							index) => {
+							if (attr_item.name !=
+								"Layout") {
+								if (attr_item.fieldId ==
+									attr.attr) {
+									if (attr_item
+										.useDict) {
+										attr_item.dict =
+											dictItemList;
+									} else {
+										attr_item
+											.selections =
+											dictItemList;
+									}
+								}
+							} else if (attr_item.name ==
+								"Layout") {
+								attr_item.setting.colList
+									.forEach((col) => {
+										if (col) {
+											if (col
+												.fieldId ==
+												attr
+												.attr
+											) {
+												if (col
+													.useDict
+												) {
+													col.dict =
+														dictItemList;
+												} else {
+													col.selections =
+														dictItemList;
+												}
+											}
+										}
+									});
+							}
+						});
+					}
+					if (!style.form.model[attr.attr]) {
+						style.form.model[attr.attr] = attr.value;
+					}
+					style.form.items.forEach(async (ele) => {
+						if (ele.name != "Layout") {
+							if (ele.fieldId == attr.attr) {
+								ele.value = attr.value;
+								ele.oldvalue = attr.value;
+								if (ele.name == "Input") {
+									if (attr.prompt) ele
+										.placeholder = attr
+										.prompt;
+								}
+								if (attr.enable !==
+									undefined) {
+									if (attr.enable) ele
+										.disabled = false;
+									else ele.disabled =
+										true;
+								}
+							}
+						} else if (ele.name == "Layout") {
+							ele.setting.colList.forEach((
+								col) => {
+								if (col) {
+									if (col
+										.fieldId ==
+										attr.attr
+									) {
+										col.value =
+											attr
+											.value;
+										col.oldvalue =
+											attr
+											.value;
+										if (col
+											.name ==
+											"Input"
+										) {
+											if (attr
+												.prompt
+											)
+												col
+												.placeholder =
+												attr
+												.prompt;
+										}
+										if (attr
+											.enable !==
+											undefined
+										) {
+											if (attr
+												.enable
+											)
+												col
+												.disabled =
+												false;
+											else col
+												.disabled =
+												true;
+										}
+									}
+								}
+							});
+						}
+
+					})
+					//鍒ゆ柇琛ㄥ崟閲屾槸鍚︽湁杩斿洖瀛楁锛屾病鏈夊氨瑁呰浇鍒癿odel閲岋紝鐐瑰嚮纭畾鎻愪氦鐨勬椂鍊欏甫涓婅繖浜涙暟鎹�+				})
+				this.$set(this.pageDetail, pageIndex, pageData)
+			},
+
 			onClickItem(e) { //閫夋嫨椤电
 				// console.log(e);
 				this.current = e.currentIndex
 			},
-			onDetail1EnterChange(item) { //鐮佺洏涓牱寮忓洖杞︿簨浠�-				console.log(item);
-			},
+
 			async del(pageData, style, event) {
 				//鑾峰彇琛ㄥご灞炴�
 				var head_attr = {};
 				this.head_styledef.form.items.forEach(item => {
 					if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮� 						item.setting.colList.forEach(col => {
-							if (col != null) head_attr[col.fieldId] =
+							if (col != null) head_attr[col
+									.fieldId] =
 								col.value;
 						});
 					} else
@@ -1647,11 +2193,15 @@
 				//鑾峰彇姝ｅ湪鍒嗘嫞閲屾病鏈夋樉绀虹殑瀛楁
 				style.form.attrs.forEach(attr => {
 					for (var key in detailAttrList) {
-						if (style.form.objId == detailAttrList[key]['id']) {
-							var keys = Object.keys(detailAttrList[key]);
+						if (style.form.objId == detailAttrList[key][
+								'id'
+							]) {
+							var keys = Object.keys(detailAttrList[
+								key]);
 							var isflag = true;
 							keys.forEach((ele) => {
-								if (ele == attr.attr) isflag = false;
+								if (ele == attr.attr) isflag =
+									false;
 							});
 							if (isflag) {
 								detailAttrList[attr.attr] = attr.value;
@@ -1680,12 +2230,8 @@
 					});
 				});
 				if (jsonlist.length == 0) {
-					uni.showModal({
-						title: this.translateSys("tip"),
-						content: this.translate("tip_no_select_data"),
-						showCancel: false,
-						confirmText: this.translateSys('close')
-					});
+					showInfo(this.translate("tip_no_select_data"))
+
 					return;
 				}
 				// console.log(jsonlist);
@@ -1736,21 +2282,13 @@
 					}
 				}
 				if (!$this.popupParam) {
-					uni.showModal({
-						title: this.translateSys("tip"),
-						content: "popupParam涓虹┖锛�,
-						showCancel: false,
-						confirmText: this.translateSys('close')
-					});
+					showInfo("popupParam涓虹┖锛�)
+
 					return;
 				}
 				if (data.length == 0) {
-					uni.showModal({
-						title: this.translateSys("tip"),
-						content: this.translate("tip_no_select_data"),
-						showCancel: false,
-						confirmText: this.translateSys('close')
-					});
+					showInfo(this.translate("tip_no_select_data"))
+
 					return;
 				}
 				var callback_eventid = $this.popupParam.button_callback.trim();
@@ -1778,7 +2316,8 @@
 					'button': 'top', // top/bottom
 					button_name: this.translateSys('add2'),
 					master: {
-						cls_id: this.ClsID, // button=bottom鏃�master鐨刢ls_id
+						cls_id: this
+							.ClsID, // button=bottom鏃�master鐨刢ls_id
 						//obj_id: ''  // button=bottom鏃�master鐨刼bj_id
 					}
 				};
@@ -1795,20 +2334,26 @@
 							type: data_attr.Type, //瀛楁绫诲瀷
 							readonly: data_attr.ReadOnly, //鏄惁鍙
 							button_img: data_attr.button_img, //寮曠敤鎸夐挳鐨勫浘鏍�-							button_tooltip: data_attr.button_tooltip //寮曠敤鎸夐挳鐨則ooltip
+							button_tooltip: data_attr
+								.button_tooltip //寮曠敤鎸夐挳鐨則ooltip
 						}
 					}
 				}
-				enviroment = Base64.encode(JSON.stringify(enviroment)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
-				var input_param = Base64.encode(JSON.stringify(info.attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
-				var global_attr = Base64.encode(JSON.stringify(this.global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+				enviroment = Base64.encode(JSON.stringify(
+					enviroment)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+				var input_param = Base64.encode(JSON.stringify(info
+					.attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+				var global_attr = Base64.encode(JSON.stringify(this
+					.global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
 				if (info.dataJson)
-					info.dataJson = Base64.encode(JSON.stringify(info.dataJson)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+					info.dataJson = Base64.encode(JSON.stringify(info
+						.dataJson)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
 				var obj_attr = {};
 				info.attr.forEach(item => {
 					obj_attr[item.attr] = item.value;
 				});
-				if (!info.eventid.includes('{')) info.eventid = '{' + info.eventid + '}';
+				if (!info.eventid.includes('{')) info.eventid = '{' + info
+					.eventid + '}';
 				var dataInfo = {
 					ed_type: info.edtype,
 					start_transaction: true,
@@ -1831,127 +2376,102 @@
 				console.log(dataInfo);
 				// return;
 				runCustomEvent(dataInfo).then(data => {
-					if (data.ret != 0) {
-						var tip = data.err_info ? typeof data.err_info == 'string' ? data
-							.err_info :
-							data
-							.err_info.join('<br/>') : '';
+					if (data.ret != 0 && data.ret != 1) {
+						let cls_name = data.event_info?.cls_name
+						let event_name = data.event_info?.event_name
+						tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data.err_info
+							.join('\n') : ''
 						if (data.ret == 801) {
 							if (this.param.Only_Script_Error) {
 								let pos = tip.indexOf("锛�);
 								if (pos > -1) tip = tip.substring(pos + 1);
 							}
-							uni.showModal({
-								title: this.translateSys("tip"),
-								content: tip,
-								showCancel: false,
-								confirmText: this.translateSys('close')
-							});
-						} else uni.showModal({
-							title: this.translateSys("tip"),
-							content: tip + ',' + this.translateSys('tip') + ':' + data
-								.ret,
-							showCancel: false,
-							confirmText: this.translateSys('close')
-						});
+						}
+						if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+						if (data.ret == 801) showInfo(tip)
+						else showError(`${tip}锛屾彁绀猴細${data.ret}`, this.translateSys('tip'))
+						this.saving = false
 						return false
 					} else {
-						var tip = data.info ? typeof data.info == 'string' ? data.info : data
-							.info
-							.join(
-								'<br/>') : '';
-						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(result)
-								} else if (action.action_type == 'set_dlg_attr_show') {
-									var result = action.value;
-									result.forEach(async (attr, key) => {
-										$this.head_styledef.form.items.forEach(async (
-											ele,
-											index) => {
-											//鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�-											if (ele.name != 'Layout') {
-												if (ele.fieldId == attr
-													.attr) {
-													ele.show = attr.show;
-												}
-											} else if (ele.name ==
-												'Layout') {
-												ele.setting.colList
-													.forEach((col) => {
-														if (col) {
-															if (col
-																.fieldId ==
-																attr
-																.attr
-															) {
-																col.show =
-																	attr
-																	.show;
-															}
-														}
-													});
-											}
-										});
-									});
-									var head_styledef = JSON.parse(JSON.stringify($this.$data
-										.head_styledef));
-									$this.head_styledef = [];
-									$this.head_styledef = head_styledef;
-									// 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')
-									});
-								}
+						var tip = data.info ? typeof data.info == 'string' ? data.info :
+							data.info.join('\n') : '';
+						tip = tip || data.err_info
+						let time = data.info_time || 0
+						if (time)
+							showError(tip, this.translateSys('tip'))
+						else
+						showInfo(tip)
+						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') {
+								showInfo(data.result)
 							}
-						}
-						console.log($this.head_styledef);
-						if (data.result) {
-							var result = data.result;
-							$this.setFormValues(result)
+							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 {
+										showInfo(this
+											.translateSys(
+												"quotation_mark_left"
+											) +
+											action
+											.action_type +
+											this
+											.translateSys(
+												"quotation_mark_right"
+											) +
+											this
+											.translate(
+												"tip_action_unprocessed"
+											))
+
+									}
+								}
+
+
+							} catch (ex) {
+								let actionList = (data.action || []).map(a => a.action_type)
+									.join(';')
+								let tip = typeof ex == 'string' ?
+									ex : ex.message
+								tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+								showError(tip, this.translateSys('tip'))
+								return
+							}
 						}
 					}
 
 				}).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") + "3.1",
-						content: exStr,
-						showCancel: false,
-						confirmText: this.translateSys('close')
-					});
+					showError(ex, this.translateSys("error") + "3.1")
 				});
 			},
-			dataObjRunCustomEvent_Return(eventid, data_attr, button_callback, item) {
-				console.log("dataObjRunCustomEvent_Return", eventid, data_attr, button_callback)
+			dataObjRunCustomEvent_Return(eventid, data_attr,
+				button_callback, item) {
+				console.log("dataObjRunCustomEvent_Return", eventid,
+					data_attr, button_callback)
 				const $this = this
 				var enviroment = {
 					'function': '3000', // 鍔熻兘鐐圭紪鍙�@@ -1959,7 +2479,8 @@
 					'button': 'top', // top/bottom
 					button_name: $this.translateSys('add2'),
 					master: {
-						cls_id: $this.ClsID, // button=bottom鏃�master鐨刢ls_id
+						cls_id: $this
+							.ClsID, // button=bottom鏃�master鐨刢ls_id
 						//obj_id: ''  // button=bottom鏃�master鐨刼bj_id
 					}
 				};
@@ -1975,8 +2496,10 @@
 					type: 'small', //灏忕獥鍙� 					class_id: $this.ClsID, //褰撳墠鏁版嵁绫籭d
 				}
-				extinfo = Base64.encode(JSON.stringify(extinfo)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
-				var global_attr = Base64.encode(JSON.stringify($this.global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+				extinfo = Base64.encode(JSON.stringify(
+					extinfo)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+				var global_attr = Base64.encode(JSON.stringify($this
+					.global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
 				var obj_attr = {};
 				req.forEach(item2 => {
 					obj_attr[item2.attr] = item2.value;
@@ -2013,65 +2536,75 @@
 				console.log(dataInfo);
 				// return;
 				runCustomEvent(dataInfo).then(data => {
-					if (data.ret != 0) {
-						var tip = data.err_info ? typeof data.err_info == 'string' ? data
-							.err_info :
-							data
-							.err_info.join('<br/>') : '';
+					if (data.ret != 0 && data.ret != 1) {
+						let cls_name = data.event_info?.cls_name
+						let event_name = data.event_info?.event_name
+						tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data.err_info
+							.join('\n') : ''
 						if (data.ret == 801) {
-							if ($this.param.Only_Script_Error) {
+							if (this.param.Only_Script_Error) {
 								let pos = tip.indexOf("锛�);
 								if (pos > -1) tip = tip.substring(pos + 1);
 							}
-							uni.showModal({
-								title: $this.translateSys("tip"),
-								content: tip,
-								showCancel: false,
-								confirmText: $this.translateSys('close')
-							});
-						} else uni.showModal({
-							title: $this.translateSys("tip"),
-							content: tip + ',' + $this.translateSys('tip') + ':' + data
-								.ret,
-							showCancel: false,
-							confirmText: $this.translateSys('close')
-						});
+						}
+						if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+						if (data.ret == 801) showInfo(tip)
+						else showError(`${tip}锛屾彁绀猴細${data.ret}`, this.translateSys('tip'))
+						this.saving = false
 						return false
 					} else {
-						var tip = data.info ? typeof data.info == 'string' ? data.info : data
-							.info
-							.join(
-								'<br/>') : '';
-						if (tip) uni.showModal({
-							title: $this.translateSys("tip"),
-							content: tip,
-							showCancel: false,
-							confirmText: $this.translateSys('close')
-						});
+						var tip = data.info ? typeof data.info == 'string' ? data.info :
+							data.info.join('\n') : '';
+						tip = tip || data.err_info
+						let time = data.info_time || 0
+						if (time)
+							showError(tip, this.translateSys('tip'))
+						else
+							showInfo(tip)
+						if ([0, 2, 3, 4, -1].includes(data
+								.result_type)) {
+							if (data.result_type == 2) {
 
-						if (data != "") {
-							var actions = data.action;
-							if (actions) {
-								for (var i = 0; i < actions.length; i++) {
+							} else if (typeof data.result ==
+								'string') {
+								showInfo(data.result)
+							}
+							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);
+									var enviroment = JSON
+										.stringify(enviroment);
 
-									if (action.action_type == 'open_panel') {
+									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") +
+												$this
+												.translateSys(
+													"tip"),
+											content: $this
+												.translateSys(
+													"quotation_mark_left"
+												) +
 												action
-												.action_type + $this.translateSys(
-													"quotation_mark_right") + $this
+												.action_type +
+												$this
+												.translateSys(
+													"quotation_mark_right"
+												) +
+												$this
 												.translate(
-													"tip_action_unprocessed")
+													"tip_action_unprocessed"
+												)
 										});
 										d.show();
-									} else if (action.action_type == 'open_select_userdlg') {
+									} else if (action
+										.action_type ==
+										'open_select_userdlg') {
 										var style = val.style;
 										// style == 'user' ? '閫夋嫨浜哄憳' : style == 'department' ? '閫夋嫨閮ㄩ棬' : style == 'role' ? '閫夋嫨瑙掕壊' : ''
 										var param = {
@@ -2086,10 +2619,17 @@
 												.stringify(
 													param),
 											events: {
-												AddPer(data, param) {
+												AddPer(
+													data,
+													param
+												) {
 													// console.log(param);
-													console.log(data);
-													var callback_eventid = param
+													console
+														.log(
+															data
+														);
+													var callback_eventid =
+														param
 														.button_callback
 														.trim();
 													var info = {
@@ -2099,41 +2639,65 @@
 														rclsid: '',
 														robjid: '',
 														userlogin: '',
-														clsid: $this.param
+														clsid: $this
+															.param
 															.DataCls
 															.id,
 														objid: "",
-														attr: param.req,
+														attr: param
+															.req,
 														inputparameter: data,
 														dataJson: [],
 													}
-													$this.DataObjRunCustomEvent(info,
-														param
-														.data_attr);
+													$this
+														.DataObjRunCustomEvent(
+															info,
+															param
+															.data_attr
+														);
 												}
 											}
 										});
-									} else if (action.action_type == 'open_data_query_dlg') {
+									} 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") +
+												$this
+												.translateSys(
+													"tip"),
+											content: $this
+												.translateSys(
+													"quotation_mark_left"
+												) +
 												action
-												.action_type + $this.translateSys(
-													"quotation_mark_right") + $this
+												.action_type +
+												$this
+												.translateSys(
+													"quotation_mark_right"
+												) +
+												$this
 												.translate(
-													"tip_action_unprocessed")
+													"tip_action_unprocessed"
+												)
 										});
 										d.show();
-									} else if (action.action_type == 'open_common_dlg') {
+									} else if (action
+										.action_type ==
+										'open_common_dlg') {
 
-										if (val.common_dlg_id == 'check_list') {
+										if (val.common_dlg_id ==
+											'check_list') {
 											$this.setData({
-												check_list: val.config
+												check_list: val
+													.config
 											})
-											console.log($this.check_list)
-											if (val.config.appear_style == 'sideslip') //鍒ゆ柇鏄惁鏄晶婊�+											console.log($this
+												.check_list)
+											if (val.config
+												.appear_style ==
+												'sideslip'
+											) //鍒ゆ柇鏄惁鏄晶婊� 												$this.setData({
 													popupType: "right"
 												})
@@ -2142,7 +2706,9 @@
 													popupType: "center"
 												})
 											// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
-											$this.$refs.popup.open($this.popupType);
+											$this.$refs.popup.open(
+												$this.popupType
+											);
 											var popupParam = {
 												item: item,
 												button_callback: button_callback,
@@ -2153,23 +2719,38 @@
 												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';
-										if (action.value.select_range == '鍏ㄩ儴鐩稿叧')
+										if (action.value
+											.select_range == '鍏ㄩ儴鐩稿叧'
+										)
 											priRel = '0';
-										else if (action.value.select_range == '鎴戣礋璐ｇ殑椤圭洰')
+										else if (action.value
+											.select_range ==
+											'鎴戣礋璐ｇ殑椤圭洰')
 											priRel = '1';
-										else if (action.value.select_range == '鎴戝垱寤虹殑')
+										else if (action.value
+											.select_range == '鎴戝垱寤虹殑'
+										)
 											priRel = '2';
-										else if (action.value.select_range == '鎴戝弬涓庣殑' || action
+										else if (action.value
+											.select_range ==
+											'鎴戝弬涓庣殑' || action
 											.value
-											.select_range == '鎴戝弬鍔犵殑')
+											.select_range == '鎴戝弬鍔犵殑'
+										)
 											priRel = '3';
-										else if (action.value.select_range == '鎴戝叧娉ㄧ殑')
+										else if (action.value
+											.select_range == '鎴戝叧娉ㄧ殑'
+										)
 											priRel = '4';
-										else if (action.value.select_range == '鎴戜笅灞炵殑椤圭洰')
+										else if (action.value
+											.select_range ==
+											'鎴戜笅灞炵殑椤圭洰')
 											priRel = '5';
 										var param_ = {
 											item: item,
@@ -2177,84 +2758,108 @@
 											req: req
 										}
 										uni.navigateTo({
-											url: '../selPrj/index?relation=' + priRel +
+											url: '../selPrj/index?relation=' +
+												priRel +
 												'&param=' +
-												JSON.stringify(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;
+												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
+													var callback_eventid =
+														param
 														.button_callback
 														.trim();
-													if (callback_eventid) {
+													if (
+														callback_eventid) {
 														var info = {
 															eventid: callback_eventid,
 															edtype: "2",
-															projectid: data[0].ID,
+															projectid: data[
+																	0
+																]
+																.ID,
 															rclsid: "",
 															robjid: "",
 															userlogin: "",
-															clsid: $this.$data
+															clsid: $this
+																.$data
 																.param
-																.DataCls.id,
+																.DataCls
+																.id,
 															objid: "",
-															attr: param.req,
+															attr: param
+																.req,
 															dataJson: [],
 														}
 
-														$this.DataObjRunCustomEvent(
-															info);
+														$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')
-										});
+										showInfo($this
+											.translateSys(
+												"quotation_mark_left"
+											) +
+											action
+											.action_type +
+											$this
+											.translateSys(
+												"quotation_mark_right"
+											) +
+											$this
+											.translate(
+												"tip_action_unprocessed"
+											))
+
 									}
 								}
+
+							} catch (ex) {
+								let actionList = (data.action || []).map(a => a.action_type)
+									.join(';')
+								let tip = typeof ex == 'string' ? ex : ex.message
+								tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+								showError(tip, this.translateSys('tip'))
+								return
 							}
-						} else {
-							uni.showModal({
-								title: $this.translateSys('tip') + "5.2",
-								content: $this.translateSys("quotation_mark_left") +
-									"before_click_button" + $this.translateSys(
-										"quotation_mark_right") + $this.translateSys(
-										"comma") + 'event_id' + eventid,
-								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('tip') + "5.1",
-						content: exStr,
-						showCancel: false,
-						confirmText: $this.translateSys('close')
-					});
+					showError(ex, this.translateSys("error") + "5.1")
 				});
 			},
 
@@ -2285,16 +2890,19 @@
 			onBtnClick(btn, pageData) {
 				const $this = this
 				if (btn.Prompt) {
-					const sContent = btn.PromptContent || this.translate("confirm")
+					const sContent = btn.PromptContent || this.translate(
+						"confirm")
 
 					uni.showModal({
 						title: this.translateSys("tip"),
-						content: btn.PromptContent || this.translate("confirm"),
+						content: btn.PromptContent || this
+							.translate("confirm"),
 						cancelText: this.translateSys('ok'),
 						confirmText: this.translateSys('cancel'),
 						success: function(res) {
 							if (res.cancel) {
-								$this.onButtonClicked(btn, pageData, -1);
+								$this.onButtonClicked(btn,
+									pageData, -1);
 							}
 
 						},
@@ -2313,15 +2921,18 @@
 			onRowBtnClick(btn, pageData, index) {
 				const $this = this
 				if (btn.Prompt) {
-					const sContent = btn.PromptContent || this.translate("confirm")
+					const sContent = btn.PromptContent || this.translate(
+						"confirm")
 					uni.showModal({
 						title: this.translateSys("tip"),
-						content: btn.PromptContent || this.translate("confirm"),
+						content: btn.PromptContent || this
+							.translate("confirm"),
 						cancelText: this.translateSys('ok'),
 						confirmText: this.translateSys('cancel'),
 						success: function(res) {
 							if (res.cancel) {
-								$this.onButtonClicked(btn, pageData, index);
+								$this.onButtonClicked(btn,
+									pageData, index);
 							}
 
 						},
@@ -2360,29 +2971,194 @@
 						const style = pageData.DefList[index];
 						//鍒犻櫎鐮佺洏涓牱寮忛潰鏉� 						pageData.DefList.splice(index, 1);
-						this.del(pageData, style, btn.AfterProcess_Event);
+						if (btn.AfterProcess_Event.ID)
+							this.del(pageData, style, btn
+								.AfterProcess_Event);
 						this.$set(this.pageDetail, pageIndex, pageData)
 					}
 				} else if (btn.FunCode == "Modify") {
 					if (index > -1) {
 						const style = pageData.DefList[index];
 						if (btn.Edit_dlg.Model == "small") {
-							this.showSmallDialog(btn, style, enviroment, pageData);
+							this.showSmallDialog(btn, style, enviroment,
+								pageData);
 						} else if (btn.Edit_dlg.Model == "form") {
-							this.showFormDialog(btn, style, enviroment, pageData);
+							this.showFormDialog(btn, style, enviroment,
+								pageData);
 						} else {
-							uni.showModal({
-								title: this.translateSys("tip"),
-								content: this.translateSys("unrealized"),
-								showCancel: false,
-								confirmText: this.translateSys('close')
-							});
+							showInfo(this.translateSys(
+								"unrealized"))
+
 						}
 					}
 
+				} 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) {
+								showInfo(this.translate(
+									'tip_no_app_param'
+								))
+
+								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 || ""
+									})
+							});
+							var eventChannelTemp
+							uni.navigateTo({
+								url: '../modal/' + name +
+									'?param=' +
+									param + "&titlename=" +
+									appName +
+									"&type=relatedFunction&paramValue=" +
+									JSON.stringify(attrValues),
+								events: {
+									get_pre_page_subtable_next_row: function(param) {
+										//	console.log("get_pre_page_subtable_next_row", eventChannelTemp)
+										const attrVals = $this.getRowNextRow(param)
+										console.log(attrVals)
+										if (eventChannelTemp) {
+											eventChannelTemp.emit('nextRow', {
+												data: attrVals
+											})
+										}
+									},
+									remove_pre_page_subtable_row: function(param) {
+										$this.viewActionRemoveRow(param)
+									}
+								},
+								success: function(res) {
+									// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�鏁版嵁
+									eventChannelTemp = res.eventChannel
+								}
+
+							});
+
+						} else {
+							showInfo(this.translate("function_not_exist"))
+
+						}
+
+					} else {
+						showInfo(this.translate("cannot_related_function"))
+
+
+					}
+				} catch (ex) {
+					showError(ex, this.translateSys('error'))
+					return undefined
+				}
+			},
+			getRowNextRow(value) {
+				const pageIndex = this.pageDetail.findIndex((page, index2,
+					arr) => {
+					return value.page_name == page.Name;
+				})
+				if (pageIndex < 0)
+					return []
+				const rowId = value.cur_row?.id;
+				if (!rowId)
+					return []
+				const pageData = this.pageDetail[pageIndex]
+				const detailStyleDefList = pageData?.DefList || []
+
+				const curIndex = detailStyleDefList.findIndex(
+					(ele) => ele.form.objId == rowId
+				);
+				if (curIndex > -1) {
+					if (curIndex + 1 >= detailStyleDefList.length) {
+						const style = detailStyleDefList[curIndex + 1];
+						const attrVals = [];
+						style.form.items.forEach((item) => {
+							if (item.name == "Layout") {
+								item.setting.colList.forEach((col) => {
+									if (col) {
+										attrVals.push({
+											attr: col.fieldId,
+											value: col.value || ""
+										});
+									}
+								});
+							} else {
+								attrVals.push({
+									item: col.fieldId,
+									value: item.value || ""
+								});
+							}
+						});
+						return attrVals
+					}
+				}
+				return []
 			},
 			//淇敼灏忕獥鍙ｆ暟鎹� 			showSmallDialog(btn, row, enviroment, pageData) {
@@ -2398,8 +3174,10 @@
 				row.form.items.forEach(item => {
 					if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮� 						item.setting.colList.forEach(col => {
-							if (col != null) objAttr[col
-								.fieldId] = col.value;
+							if (col != null) objAttr[
+									col
+									.fieldId] = col
+								.value;
 						});
 					} else
 						objAttr[item.fieldId] = item.value;
@@ -2413,31 +3191,56 @@
 					events: {
 						// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�鍒板綋鍓嶉〉闈㈢殑鏁版嵁
 						updateDataObj: function(formData) {
-							const pageIndex = $this.pageDetail.findIndex((
-								page) => {
-								return pageData.Name == page.Name;
-							})
+							const pageIndex = $this
+								.pageDetail.findIndex((
+									page) => {
+									return pageData
+										.Name == page
+										.Name;
+								})
 							if (pageIndex < 0)
 								return
-							Object.assign(row.form.model, formData);
-							row.form.items.forEach(async (ele, index) => {
-								if (ele.name != "Layout") {
-									let value = formData[ele.fieldId]
+							Object.assign(row.form.model,
+								formData);
+							row.form.items.forEach(async (
+								ele, index
+							) => {
+								if (ele.name !=
+									"Layout") {
+									let value =
+										formData[
+											ele
+											.fieldId
+										]
 									if (value)
-										ele.value = value
+										ele
+										.value =
+										value
 
 								} else {
-									ele.setting.colList.forEach(async (col) => {
-										if (col) {
-											let value = formData[col
-												.fieldId]
-											if (value)
-												col.value = value
-										}
-									});
+									ele.setting
+										.colList
+										.forEach(
+											async (
+												col) => {
+												if (
+													col) {
+													let value =
+														formData[
+															col
+															.fieldId
+														]
+													if (
+														value)
+														col
+														.value =
+														value
+												}
+											});
 								}
 							})
-							$this.$set($this.pageDetail, pageIndex, pageData)
+							$this.$set($this.pageDetail,
+								pageIndex, pageData)
 						},
 
 					}
@@ -2450,7 +3253,9 @@
 				row.form.items.forEach(item => {
 					if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮� 						item.setting.colList.forEach(col => {
-							if (col != null) objAttr[col.fieldId] = col.value;
+							if (col != null) objAttr[
+									col.fieldId] = col
+								.value;
 						});
 					} else
 						objAttr[item.fieldId] = item.value;
@@ -2464,31 +3269,55 @@
 					events: {
 						// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�鍒板綋鍓嶉〉闈㈢殑鏁版嵁
 						updateDataObj: function(formData) {
-							const pageIndex = $this.pageDetail.findIndex((
-								page) => {
-								return pageData.Name == page.Name;
-							})
+							const pageIndex = $this
+								.pageDetail.findIndex((
+									page) => {
+									return pageData
+										.Name == page
+										.Name;
+								})
 							if (pageIndex < 0)
 								return
-							Object.assign(row.form.model, formData);
-							row.form.items.forEach(async (ele) => {
-								if (ele.name != "Layout") {
-									let value = formData[ele.fieldId]
+							Object.assign(row.form.model,
+								formData);
+							row.form.items.forEach(async (
+								ele) => {
+								if (ele.name !=
+									"Layout") {
+									let value =
+										formData[
+											ele
+											.fieldId
+										]
 									if (value)
-										ele.value = value
+										ele
+										.value =
+										value
 
 								} else {
-									ele.setting.colList.forEach(async (col) => {
-										if (col) {
-											let value = formData[col
-												.fieldId]
-											if (value)
-												col.value = value
-										}
-									});
+									ele.setting
+										.colList
+										.forEach(
+											async (
+												col) => {
+												if (
+													col) {
+													let value =
+														formData[
+															col
+															.fieldId
+														]
+													if (
+														value)
+														col
+														.value =
+														value
+												}
+											});
 								}
 							})
-							$this.$set($this.pageDetail, pageIndex, pageData)
+							$this.$set($this.pageDetail,
+								pageIndex, pageData)
 							console.log($this.pageDetail)
 
 						},
@@ -2501,35 +3330,38 @@
 				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({
-						title: this.translateSys("tip"),
-						content: this.translate(
-								"tip_no_data_first") +
-							this.translateSys(
-								"quotation_mark_left") + pageData.Name + this
-							.translateSys(
-								"quotation_mark_right") +
-							this.translate(
-								"tip_no_data_last"),
-						showCancel: false,
-						confirmText: this.translateSys('close')
-					});
-					return false;
-				}
+				// if (pageData.DefList.length == 0) {
+				// 	uni.showModal({
+				// 		title: this.translateSys("tip"),
+				// 		content: this.translate(
+				// 				"tip_no_data_first") +
+				// 			this.translateSys(
+				// 				"quotation_mark_left") + pageData.Name + this
+				// 			.translateSys(
+				// 				"quotation_mark_right") +
+				// 			this.translate(
+				// 				"tip_no_data_last"),
+				// 		showCancel: false,
+				// 		confirmText: this.translateSys('close')
+				// 	});
+				// 	return false;
+				// }
 				//鑾峰彇琛ㄥご灞炴�
 				var head_attr = {};
 				this.head_styledef.form.items.forEach(item => {
 					if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮� 						item.setting.colList.forEach(col => {
-							if (col != null) head_attr[col.fieldId] =
+							if (col != null) head_attr[
+									col.fieldId] =
 								col.value;
 						});
 					} else
@@ -2541,13 +3373,21 @@
 				pageData.DefList.forEach(style => {
 					var detail_attr = {};
 					style.form.items.forEach(item => {
-						if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�-							item.setting.colList.forEach(col => {
-								if (col != null)
-									detail_attr[col.fieldId] = col.value;
-							});
+						if (item.name ==
+							"Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�+							item.setting.colList
+								.forEach(col => {
+									if (col !=
+										null)
+										detail_attr[
+											col
+											.fieldId
+										] = col
+										.value;
+								});
 						} else
-							detail_attr[item.fieldId] = item.value;
+							detail_attr[item.fieldId] =
+							item.value;
 					});
 
 					detail_attr['id'] = style.form.objId;
@@ -2562,21 +3402,28 @@
 				//鑾峰彇姝ｅ湪鐮佺洏閲屾病鏈夋樉绀虹殑瀛楁
 				pageData.DefList.forEach(style => {
 					style.form.attrs.forEach(attr => {
-						for (var key in detailAttrList) {
-							if (style.form.objId == detailAttrList[key]
+						for (var key in
+								detailAttrList) {
+							if (style.form.objId ==
+								detailAttrList[key]
 								[
 									'id'
 								]) {
-								var keys = Object.keys(detailAttrList[
-									key]);
+								var keys = Object.keys(
+									detailAttrList[
+										key]);
 								var isflag = true;
 								keys.forEach((ele) => {
-									if (ele == attr.attr)
+									if (ele ==
+										attr
+										.attr)
 										isflag =
 										false;
 								});
 								if (isflag) {
-									detailAttrList[attr.attr] = attr
+									detailAttrList[attr
+											.attr] =
+										attr
 										.value;
 								}
 							}
@@ -2597,35 +3444,36 @@
 				detailAttrList.forEach(attr => {
 					jsonlist.push({
 						id: attr["id"] || "",
-						attrs: Object.keys(attr).map((a) => ({
+						attrs: Object.keys(attr).map((
+							a) => ({
 							attr: a,
-							value: attr[a] || "",
+							value: attr[
+								a] || "",
 						}))
 					});
 				});
-				if (jsonlist.length == 0) {
-					uni.showModal({
-						title: this.translateSys("tip"),
-						content: this.translate("tip_no_select_data"),
-						showCancel: false,
-						confirmText: this.translateSys('close')
-					});
-					return;
-				}
+				// if (jsonlist.length == 0) {
+				// 	showInfo(this.translate(
+				// 		"tip_no_select_data"))
+
+				// 	return;
+				// }
 				const list = []
 				list.push({
 					page_name: pageData.Name,
 					item_list: jsonlist,
 					ext_data: pageData.ExtData
 				})
-				// console.log(jsonlist);
-				$this.runCustomEvent(pageData, event, input_param, list);
+
+				$this.runCustomEvent(pageData, event, input_param,
+					list);
 				// jsonlist.forEach(async (json,key)=>{
 				// 	await $this.runCustomEvent(event,input_param,json,'1');
 				// });
 			},
 			//鎵ц纭畾鑴氭湰
-			async runCustomEvent(pageParam, event, input_param, json, type) {
+			async runCustomEvent(pageParam, event, input_param, json,
+				type) {
 				var $this = this;
 				var data_json = Base64.encode(
 					JSON.stringify(json)
@@ -2649,240 +3497,407 @@
 					global_attr: '',
 					input_param: input_param,
 				};
+				console.log(dataInfo);
 				runCustomEvent(dataInfo).then(result => {
 					console.log(result);
-					if (result.ret != 0) {
-						var tip = result.err_info ? typeof result
-							.err_info == 'string' ? result.err_info :
-							result.err_info.join('<br/>') : '';
+					if (result.ret != 0 && result.ret != 1) {
+						let cls_name = result.event_info?.cls_name
+						let event_name = result.event_info?.event_name
+						tip = result.err_info ? typeof result.err_info == 'string' ? result.err_info : result
+							.err_info
+							.join('\n') : ''
 						if (result.ret == 801) {
 							if (this.param.Only_Script_Error) {
 								let pos = tip.indexOf("锛�);
-								if (pos > -1) tip = tip.substring(pos +
-									1);
+								if (pos > -1) tip = tip.substring(pos + 1);
 							}
-							uni.showModal({
-								title: this.translateSys(
-									"tip"),
-								content: tip,
-								showCancel: false,
-								confirmText: this.translateSys(
-									'close')
-							});
-						} else uni.showModal({
-							title: this.translateSys('tip'),
-							content: tip + ',' + this
-								.translateSys('tip') + ':' +
-								result.ret,
-							showCancel: false,
-							confirmText: this.translateSys(
-								'close')
-						});
-						return false;
+						}
+						if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+						if (result.ret == 801) showInfo(tip)
+						else showError(`${tip}锛屾彁绀猴細${result.ret}`, this.translateSys('tip'))
+						this.saving = false
+						return false
 					} else {
-						var tip = result.info ? typeof result.info ==
-							'string' ? result.info : result.info
-							.join('<br/>') : '';
-						if (tip) uni.showModal({
-							title: this.translateSys('tip'),
-							content: tip,
-							showCancel: false,
-							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")});
+						var tip = result.info ? typeof result.info == 'string' ? result.info :
+							result.info.join('\n') : '';
+						tip = tip || result.err_info
+						let time = result.info_time || 0
+						if (time)
+							showError(tip, this.translateSys('tip'))
+						else
+						showInfo(tip)
+						if ([0, 2, 3, 4, -1].includes(
+								result.result_type)) {
+							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] = '';
-											}
-										});
+							} else if (typeof result
+								.result == 'string') {
+								showInfo(result.result)
+							}
+							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
+																] =
+																'';
+														}
+													});
+											showInfo($this
+												.translate(
+													'execute_event_success'
+												))
 
-										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 = [];
+										} 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
-															.viewAceionContent(
-																value);
-													} else if (res
-														.confirm) {
-														if (pageData)
-															pageData
-															.DefList = [];
+														.translateSys(
+															"quotation_mark_left"
+														) +
+														value
+														.page_name +
 														$this
-															.viewAceionContent(
-																value);
+														.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
+												});
+											} 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_dlg_attr") {
-										// value = {"attr":"xxx", "value":"xxx"}
-										var data = item.value;
-										$this.setFormValues(data)
-									}
+												)
+										} 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 ($this.After_OK_Event.ID != event.ID) { //鍒ゆ柇褰撳墠浜嬩欢鏄惁鏄‘瀹氬悗浜嬩欢
-									$this.sava(pageParam, $this.After_OK_Event); //鎵ц纭畾鍚庝簨浠�+										} 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 (item.action_type == 'get_pre_page_subtable_next_row') {
+											var data = item.value;
+											const eventChannel = this.getOpenerEventChannel();
+											eventChannel.emit('get_pre_page_subtable_next_row', data);
+										} else if (item.action_type == 'remove_pre_page_subtable_row') {
+											var data = item.value;
+											const eventChannel = this.getOpenerEventChannel();
+											eventChannel.emit('remove_pre_page_subtable_row', data);
+										}
+										else if (item.action_type == "goback_to_pre_page") {
+											//杩斿洖涓婁竴椤�+											uni.navigateBack({
+												delta: 1, //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
+											});
+										}
+									});
+
+								if ($this.After_OK_Event
+									?.ID && $this
+									.After_OK_Event.ID !=
+									event
+									.ID) { //鍒ゆ柇褰撳墠浜嬩欢鏄惁鏄‘瀹氬悗浜嬩欢
+									$this.sava(pageParam,
+										$this
+										.After_OK_Event
+									); //鎵ц纭畾鍚庝簨浠� 
 								}
-							}
-						} 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}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+								showError(tip, this.translateSys('tip'))
+								return
 							}
 						}
 					}
 
 				}).catch(ex => {
-					console.log(ex);
-					let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
-					uni.showModal({
-						title: this.translateSys("error") + "8.1",
-						content: this.translate("execute_after_ok_event_failed") +
-							this.translateSys("comma") + tip,
-						showCancel: false,
-						confirmText: this.translateSys('close')
-					});
+					showError(ex, this.translateSys("error") + "8.1")
+
+
 				});
 			},
 
@@ -2892,11 +3907,13 @@
 				});
 			},
 			translate(t) {
-				if (typeof this.$t == "function") return this.$t(`page.${t}`)
+				if (typeof this.$t == "function") return this.$t(
+					`page.${t}`)
 				else return t;
 			},
 			translateSys(t) {
-				if (typeof this.$t == "function") return this.$t(`sys.${t}`)
+				if (typeof this.$t == "function") return this.$t(
+					`sys.${t}`)
 				else return t;
 			},
 		},
@@ -2928,38 +3945,6 @@
 			flex-direction: column;
 		}
 
-		.v-head-style {
-			width: 98%;
-
-			.uni-forms-item {
-				margin-bottom: 11rpx;
-			}
-
-			.input-wrapper {
-				border: 1px solid #d5d5d5;
-				width: 100%;
-				display: flex;
-				flex-direction: row;
-
-				.uni-input {
-					flex: 1;
-					padding: 12rpx 8rpx;
-					color: #2d8cf0;
-					// height: 40rpx;
-					// line-height: 40rpx;
-				}
-
-				.uni-icon {
-					padding: 10rpx 5rpx;
-					font-size: 32rpx;
-					color: rgb(192, 196, 204);
-				}
-			}
-
-			.input-wrapper:hover {
-				border: 1px solid rgb(41, 121, 255);
-			}
-		}
 
 		.view-content {
 			display: flex;
@@ -2996,6 +3981,12 @@
 			flex-direction: column !important;
 		}
 
+		.tab-content {
+			display: flex;
+			width: 100%;
+			height: 100%;
+			flex-direction: column !important;
+		}
 
 		.view-bottom {
 			display: flex;
@@ -3011,7 +4002,6 @@
 			.btn-left {
 				padding: 20rpx;
 				line-height: 1.5;
-				font-size: 38rpx;
 				font-weight: bold;
 				float: left;
 				display: inline-block;
@@ -3021,7 +4011,6 @@
 			.btn-one {
 				padding: 20rpx;
 				line-height: 1.5;
-				font-size: 38rpx;
 				font-weight: bold;
 				float: left;
 				display: inline-block;
@@ -3032,7 +4021,6 @@
 			.btn-right {
 				padding: 20rpx;
 				line-height: 1.5;
-				font-size: 38rpx;
 				font-weight: bold;
 				float: right;
 				display: inline-block;
@@ -3102,7 +4090,6 @@
 				padding: 0px;
 				margin: 0;
 
-
 				.uni-forms-item {
 					padding-bottom: 5rpx;
 					margin-bottom: 0;
@@ -3111,35 +4098,14 @@
 						height: 20px !important;
 						padding: 0 10rpx 0 0 !important;
 					}
-
-					.uni-input {
-						width: calc(100% - 12rpx);
-						padding: 5rpx;
-						border: 1px solid #d5d5d5;
-						color: #2d8cf0;
-						height: 20px;
-						background: #FFF;
-						line-height: 20px;
-						border-radius: 6px !important;
-						font-size: 14px;
-						font-family: inherit;
-						box-shadow: none !important;
-						transition-duration: 0.1s;
-						vertical-align: middle;
-					}
-
-					.uni-input:hover {
-						border: 1px solid rgb(41, 121, 255);
-					}
 				}
-
 
 			}
 
 			.dv-panel-button {
 				width: 100%;
 				text-align: left;
-				min-height: 30rpx;
+				min-height: 16px;
 				padding-bottom: 10rpx;
 
 				checkbox {
@@ -3149,9 +4115,9 @@
 
 				button {
 					text-align: left;
-					line-height: 1.5;
+					line-height: 1.6;
 					border: none;
-					font-size: 30rpx;
+
 					margin-right: 10rpx;
 					display: inline-block;
 					float: right;
@@ -3211,7 +4177,6 @@
 			background: #94D5EF;
 			display: block;
 			width: 100%;
-			font-size: 36rpx;
 			line-height: 80rpx;
 			font-weight: 500;
 		}
@@ -3230,8 +4195,6 @@
 			background: #FFF;
 			border-radius: 0 !important;
 			color: #2d8cf0;
-			/* padding: 10rpx 8rpx 12rpx; */
-			font-size: 34rpx;
 			font-family: inherit;
 			box-shadow: none !important;
 			transition-duration: 0.1s;
@@ -3254,14 +4217,6 @@
 		.input-disabled {
 			background-color: #f3f3f3 !important;
 		}
-
-		// ::v-deep .uni-row {
-		// 	margin-bottom: 0px;
-		// }
-
-		// .view-tabpage ::v-deep .uni-row {
-		// 	margin-bottom: 5px;
-		// }
 
 		.demo-uni-col {
 			height: 36px;
@@ -3293,7 +4248,6 @@
 		}
 
 		.popup-header {
-			font-size: 42rpx;
 			font-weight: bold;
 			margin: 20rpx 20rpx 0px 20rpx;
 		}
@@ -3318,7 +4272,6 @@
 			background: #27A6E1;
 			border: none;
 			color: #fff;
-			font-size: 38rpx;
 			font-weight: bold;
 			/* float: left; */
 			display: inline-block;
@@ -3334,7 +4287,6 @@
 			// color: #fff;
 			background: #fff;
 			color: #000;
-			font-size: 38rpx;
 			font-weight: bold;
 			/* float: right; */
 			display: inline-block;
@@ -3342,4 +4294,10 @@
 
 
 	}
+
+	.uni-page-modal-5601.large-mode {
+		.dv-panel-button {
+			min-height: 32px !important;
+		}
+	}
 </style>
\ No newline at end of file

--
Gitblit v1.9.1