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/3037_2.vue |  766 ++++++++++++++++++++++------------------------------------
 1 files changed, 286 insertions(+), 480 deletions(-)

diff --git a/pages/modal/3037_2.vue b/pages/modal/3037_2.vue
index 388c9b1..fe8ebab 100644
--- a/pages/modal/3037_2.vue
+++ b/pages/modal/3037_2.vue
@@ -118,13 +118,17 @@
 	} from '@/js/Base64.js';
 	import utils from "@/js/utils.js"
 	import {
+		showInfo,
+		showError
+	} from "@/js/Page.js"
+	import {
 		appGetInfo,
 		dictGetInfo
 	} from "@/api/mobox.js"
 	import {
 		getUIStyleInfo,
 		runCustomEvent,
-		dataObjCreate,
+
 		dataObjDel
 	} from "@/api/data.js"
 	import dayjs from "dayjs";
@@ -173,10 +177,18 @@
 			}); //璁剧疆椤堕儴鏍囬 
 			this.title = options.titlename;
 			this.param = JSON.parse(options.param);
-			this.loadData(options.paramValue)
+			const paramValue = options.paramValue ? JSON.parse(options.paramValue) : undefined
+			this.loadData(paramValue)
 
 			//椤甸潰鍒濆鍖栬幏鍙栫劍鐐� 			// this.focusMateria=true; 
+		},
+		initialEvent() {
+			let event = (this.head_styledef.event || []).find((e) => e.event_id == "initial");
+			return {
+				id: event?.scrip_id || "",
+				name: event?.scrip_name || "",
+			};
 		},
 		methods: {
 			setData: function(obj) {
@@ -206,31 +218,44 @@
 				await this.Head_UIStyleGetInfo(this.param.Master_Cls?.ID, this.param.Master_Cls?.UI_Style?.ID);
 				//浼犲叆鍙傛暟鍊� 				if (paramValue) {
-					const attrs = paramValue.attrs || [];
+					this.setFormValues(this.head_styledef, 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.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;
-										}
-									});
-								}
-							});
-						}
-					})
 				}
 
 				await this.Detail1_UIstyleGetInfo(this.param.Sub_Cls?.ID, this.param.Sub_Cls?.UI_Style?.ID);
+				await this.loadInitialEvent();
+			},
+			async loadInitialEvent() {
+				try {
+					if (this.initialEvent.id) {
+						this.onChange(this.initialEvent)
+					}
+				} catch (ex) {
+					showError(ex, this.translateSys('error'))
+
+
+				}
 			},
 			async Head_UIStyleGetInfo(class_id, style_id) { //鑾峰彇鑷畾涔夎〃鍗曟牱寮� 				var $this = this;
@@ -305,13 +330,7 @@
 					}
 				} catch (ex) {
 					// console.log(ex);
-					let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
-					uni.showModal({
-						title: this.translateSys("error") + "1.1",
-						content: tip,
-						showCancel: false,
-						confirmText: this.translateSys('close')
-					});
+					showError(ex, this.translateSys('error') + " 1.1")
 				}
 
 			},
@@ -366,12 +385,7 @@
 				} catch (ex) {
 					// console.log(ex);
 					let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
-					uni.showModal({
-						title: this.translateSys("error") + "2.1",
-						content: tip,
-						showCancel: false,
-						confirmText: this.translateSys('close')
-					});
+					showError(ex, this.translateSys('error') + " 2.1")
 				}
 
 
@@ -416,12 +430,7 @@
 
 				} catch (ex) {
 					// console.log(ex);
-					uni.showModal({
-						title: this.translateSys("error") + "1.3",
-						content: ex.errMsg,
-						showCancel: false,
-						confirmText: this.translateSys('close')
-					});
+					showError(ex, this.translateSys('error') + " 1.3")
 				}
 
 			},
@@ -440,49 +449,37 @@
 				runCustomEvent(dataInfo).then(data => {
 					console.log(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/>') : '';
+						var tip = data.info ? typeof data.info == 'string' ? data.info :
+							data.info.join('\n') : '';
 						tip = tip || data.err_info
-						if (tip) uni.showModal({
-							title: this.translateSys("tip"),
-							content: tip,
-							showCancel: false,
-							confirmText: this.translateSys('close')
-						});
+						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) {
 
 							} else if (typeof data.result == 'string') {
-								if (data.result) {
-									uni.showModal({
-										title: this.translateSys('tip'),
-										content: data.result,
-										showCancel: false,
-										confirmText: this.translateSys('close')
-									});
-								}
+								showInfo(data.result)
+
 							}
 							try {
 								var actionlist = data.action || []
@@ -490,84 +487,8 @@
 									var action = actionlist[i];
 									if (action.action_type == 'set_dlg_attr') {
 										var result = action.value;
-										for (var i = 0; i < result.length; i++) {
-											if (result[i].choice_list) {
-												for (var c = 0; c < styledef.form.items.length; c++) {
-													var attr = styledef.form.items[c];
-													if (attr.name != 'Layout') {
-														if (attr.fieldId == result[i].attr) {
-															var dictItemList = [];
-															for (var d in result[i].choice_list) {
-																var val = result[i].choice_list[d];
-																dictItemList.push({
-																	"CN_S_NAME": val,
-																	"CN_S_VALUE": val,
-																	"text": val,
-																	"value": val
-																});
-															}
-															attr.dict = dictItemList;
-														}
-													} else if (attr.name == 'Layout') {
-														attr.setting.colList.forEach(col => {
-															if (col) {
-																if (col.fieldId == result[i].attr) {
-																	var dictItemList = [];
-																	for (var d in result[i]
-																			.choice_list) {
-																		var val = result[i]
-																			.choice_list[d];
-																		dictItemList.push({
-																			"CN_S_NAME": val,
-																			"CN_S_VALUE": val,
-																			"text": val,
-																			"value": val
-																		});
-																	}
-																	col.dict = dictItemList;
-																}
-															}
-														});
-													}
+										$this.setFormValues(styledef, result)
 
-												}
-											}
-											for (var c = 0; c < styledef.form.items.length; c++) {
-												var attr = styledef.form.items[c];
-												// console.log(attr[j].Name+'=='+result[i].attr);
-												//鍒ゆ柇琛ㄥ崟閲屾槸鍚︽湁杩斿洖瀛楁锛屾病鏈夊氨瑁呰浇鍒癿odel閲岋紝鐐瑰嚮纭畾鎻愪氦鐨勬椂鍊欏甫涓婅繖浜涙暟鎹�-												if ($this.head_styledef.form.model[result[i].attr] ==
-													undefined) {
-													$this.head_styledef.form.model[result[i].attr] = result[i]
-														.value;
-												}
-												//鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�-												if (attr.name != 'Layout') {
-													if (attr.fieldId == result[i].attr) {
-														attr.value = '';
-														attr.oldvalue = '';
-														attr.value = result[i].value;
-														attr.oldvalue = result[i].value;
-														$this.head_styledef.form.model[attr.fieldId] = result[
-															i].value;
-													}
-												} else if (attr.name == 'Layout') {
-													attr.setting.colList.forEach(col => {
-														if (col) {
-															if (col.fieldId == result[i].attr) {
-																col.value = '';
-																col.oldvalue = '';
-																col.value = result[i].value;
-																col.oldvalue = result[i].value;
-																$this.head_styledef.form.model[col
-																	.fieldId] = result[i].value;
-															}
-														}
-													});
-												}
-											}
-
-										}
 									} else if (data.action[i].action_type == 'set_dlg_attr_show') {
 										var result = action.value;
 										if (type == 'head') {
@@ -606,18 +527,14 @@
 											// console.log($this.detail1_styledef);
 										}
 									} else {
-										uni.showModal({
-											title: this.translateSys("tip"),
-											content: this.translate('execute_init_event_failed') +
-												this.translateSys("full_stop") +
-												this.translate('reason') + this.translateSys("colon") +
-												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.translate('execute_init_event_failed') +
+											this.translateSys("full_stop") +
+											this.translate('reason') + this.translateSys("colon") +
+											this.translateSys("quotation_mark_left") + action
+											.action_type + this.translateSys(
+												"quotation_mark_right") + this
+											.translate('tip_action_unprocessed'))
+
 									}
 								}
 
@@ -625,13 +542,7 @@
 								let actionList = (data.action || []).map(a => a.action_type).join(';')
 								let tip = typeof ex == 'string' ? ex : ex.message
 								tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}`
-								uni.showModal({
-									title: this.translateSys('tip'),
-									content: tip,
-									showCancel: false,
-									confirmText: this.translateSys('close')
-								});
-								console.log(ex)
+								showError(tip, this.translateSys('tip'))
 								return
 							}
 						}
@@ -639,14 +550,7 @@
 
 				}).catch(ex => {
 					// console.log(ex);
-					uni.showModal({
-						title: this.translateSys("error") + "3.1",
-						content: this.translate('execute_init_event_failed') +
-							this.translateSys("full_stop") +
-							this.translate('reason') + this.translateSys("colon") + ex.errMsg,
-						showCancel: false,
-						confirmText: this.translateSys('close')
-					});
+					showError(ex, this.translateSys('error') + "3.1")
 				});
 			},
 
@@ -756,21 +660,12 @@
 				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'
@@ -854,54 +749,37 @@
 				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/>') : '';
+						var tip = data.info ? typeof data.info == 'string' ? data.info :
+							data.info.join('\n') : '';
 						tip = tip || data.err_info
-						if (tip) uni.showModal({
-							title: $this.translateSys("tip"),
-							content: tip,
-							showCancel: false,
-							confirmText: $this.translateSys('close')
-						});
+						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) {
 
 							} else if (typeof data.result == 'string') {
-								if (data.result) {
-									uni.showModal({
-										title: this.translateSys('tip'),
-										content: data.result,
-										showCancel: false,
-										confirmText: this.translateSys('close')
-									});
-								}
+								showInfo(data.result)
+
 							}
 							try {
 								var actions = data.action || []
@@ -1065,17 +943,13 @@
 											}
 										});
 									} 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"))
+
 									}
 								}
 
@@ -1083,13 +957,7 @@
 								let actionList = (data.action || []).map(a => a.action_type).join(';')
 								let tip = typeof ex == 'string' ? ex : ex.message
 								tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}`
-								uni.showModal({
-									title: this.translateSys('tip'),
-									content: tip,
-									showCancel: false,
-									confirmText: this.translateSys('close')
-								});
-								console.log(ex)
+								showError(tip, this.translateSys('tip'))
 								return
 							}
 						}
@@ -1098,16 +966,7 @@
 
 				}).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")
 				});
 			},
 
@@ -1296,22 +1155,13 @@
 						uni.hideLoading();
 
 						$this.subPanelList.splice(index, 1);
-						uni.showModal({
-							title: this.translateSys("tip"),
-							content: this.translate("delete_success"),
-							showCancel: false,
-							confirmText: this.translateSys('close')
-						});
+						showInfo(this.translate("delete_success"))
+
 
 					}).catch(ex => {
 						console.log(ex);
 						uni.hideLoading();
-						uni.showModal({
-							title: this.translateSys('tip') + "9.1",
-							content: ex.errMsg,
-							showCancel: false,
-							confirmText: this.translateSys('close')
-						});
+						showError(ex, this.translateSys("error") + "9.1")
 					});
 				}
 			},
@@ -1319,12 +1169,8 @@
 				var $this = this;
 				var Before_Select_Event = $this.param.Scan_Code.Before_Select_Event;
 				if (!Before_Select_Event) {
-					uni.showModal({
-						title: this.translateSys("tip"),
-						content: this.translate("before_select_event_empty"),
-						showCancel: false,
-						confirmText: this.translateSys('close')
-					});
+					showInfo(this.translate("before_select_event_empty"))
+
 					return;
 				}
 				var obj_attr = this.head_styledef.form.model;
@@ -1419,12 +1265,8 @@
 				var $this = this;
 				var After_Select_Event = $this.param.Scan_Code.After_Select_Event;
 				if (!After_Select_Event) {
-					uni.showModal({
-						title: this.translateSys("tip"),
-						content: this.translate("after_select_event_empty"),
-						showCancel: false,
-						confirmText: this.translateSys('close')
-					});
+					showInfo(this.translate("after_select_event_empty"))
+
 					return;
 				}
 				var items = $this.check_list.items;
@@ -1442,12 +1284,8 @@
 					}
 				}
 				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 obj_attr = this.head_styledef.form.model;
@@ -1551,37 +1389,31 @@
 				// return;
 				runCustomEvent(dataInfo).then(data => {
 					console.log(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/>') : '';
+						var tip = data.info ? typeof data.info == 'string' ? data.info :
+							data.info.join('\n') : '';
 						tip = tip || data.err_info
-						if (tip) uni.showModal({
-							title: this.translateSys("tip"),
-							content: tip,
-							showCancel: false,
-							confirmText: this.translateSys('close')
-						});
+						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) {
 								var result = data.result || []
@@ -1632,14 +1464,8 @@
 
 
 							} else if (typeof data.result == 'string') {
-								if (data.result) {
-									uni.showModal({
-										title: this.translateSys('tip'),
-										content: data.result,
-										showCancel: false,
-										confirmText: this.translateSys('close')
-									});
-								}
+								showInfo(data.result)
+
 							}
 							try {
 								var actionlist = data.action || []
@@ -1647,75 +1473,7 @@
 									var action = actionlist[i];
 									if (action.action_type == 'set_dlg_attr') {
 										var result = action.value;
-										for (var i = 0; i < result.length; i++) {
-											if (result[i].choice_list) {
-												for (var c = 0; c < $this.head_styledef.form.items.length; c++) {
-													var attr = $this.head_styledef.form.items[c];
-													if (attr.name != 'Layout') {
-														if (attr.fieldId == result[i].attr) {
-															var dictItemList = [];
-															for (var d in result[i].choice_list) {
-																var val = result[i].choice_list[d];
-																dictItemList.push({
-																	"CN_S_NAME": val,
-																	"CN_S_VALUE": val,
-																	"text": val,
-																	"value": val
-																});
-															}
-															attr.dict = dictItemList;
-														}
-													} else if (attr.name == 'Layout') {
-														attr.setting.colList.forEach(col => {
-															if (col) {
-																if (col.fieldId == result[i].attr) {
-																	var dictItemList = [];
-																	for (var d in result[i].choice_list) {
-																		var val = result[i].choice_list[d];
-																		dictItemList.push({
-																			"CN_S_NAME": val,
-																			"CN_S_VALUE": val,
-																			"text": val,
-																			"value": val
-																		});
-																	}
-																	col.dict = dictItemList;
-																}
-															}
-														});
-													}
-												}
-											}
-											for (var c = 0; c < $this.head_styledef.form.items.length; c++) {
-												var attr = $this.head_styledef.form.items[c];
-												// console.log(attr[j].Name+'=='+result[i].attr);
-												if (attr.name != 'Layout') {
-													if (attr.fieldId == result[i].attr) {
-														attr.value = '';
-														attr.oldvalue = '';
-														attr.value = result[i].value;
-														attr.oldvalue = result[i].value;
-														$this.head_styledef.form.model[attr.fieldId] = result[i]
-															.value;
-													}
-												} else if (attr.name == 'Layout') {
-													attr.setting.colList.forEach(col => {
-														if (col) {
-															if (col.fieldId == result[i].attr) {
-																col.value = '';
-																col.oldvalue = '';
-																col.value = result[i].value;
-																col.oldvalue = result[i].value;
-																$this.head_styledef.form.model[col
-																	.fieldId] = result[i].value;
-															}
-														}
-													});
-												}
-
-											}
-
-										}
+										$this.setFormValues($this.head_styledef, result)
 									} else if (action.action_type == 'set_dlg_attr_show') {
 										var data = action.value;
 										$this.setFormItemVisible(data)
@@ -1730,13 +1488,7 @@
 								let actionList = (data.action || []).map(a => a.action_type).join(';')
 								let tip = typeof ex == 'string' ? ex : ex.message
 								tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}`
-								uni.showModal({
-									title: this.translateSys('tip'),
-									content: tip,
-									showCancel: false,
-									confirmText: this.translateSys('close')
-								});
-								console.log(ex)
+								showError(tip, this.translateSys('tip'))
 								return
 							}
 						}
@@ -1744,13 +1496,91 @@
 
 				}).catch(ex => {
 					// console.log(ex);
-					uni.showModal({
-						title: this.translateSys("error") + "3.1",
-						content: ex.errMsg,
-						showCancel: false,
-						confirmText: this.translateSys('close')
-					});
+					showError(ex, this.translateSys("error") + "3.1")
 				});
+			},
+			setFormValues(styledef, attrs) {
+				if (!Array.isArray(attrs)) {
+					return
+				}
+				for (var i = 0; i < attrs.length; i++) {
+					if (attrs[i].choice_list) {
+						for (var c = 0; c < styledef.form.items.length; c++) {
+							var attr = styledef.form.items[c];
+							if (attr.name != 'Layout') {
+								if (attr.fieldId == attrs[i].attr) {
+									var dictItemList = [];
+									for (var d in attrs[i].choice_list) {
+										var val = attrs[i].choice_list[d];
+										dictItemList.push({
+											"CN_S_NAME": val,
+											"CN_S_VALUE": val,
+											"text": val,
+											"value": val
+										});
+									}
+									attr.dict = dictItemList;
+								}
+							} else if (attr.name == 'Layout') {
+								attr.setting.colList.forEach(col => {
+									if (col) {
+										if (col.fieldId == attrs[i].attr) {
+											var dictItemList = [];
+											for (var d in attrs[i]
+													.choice_list) {
+												var val = attrs[i]
+													.choice_list[d];
+												dictItemList.push({
+													"CN_S_NAME": val,
+													"CN_S_VALUE": val,
+													"text": val,
+													"value": val
+												});
+											}
+											col.dict = dictItemList;
+										}
+									}
+								});
+							}
+
+						}
+					}
+					for (var c = 0; c < styledef.form.items.length; c++) {
+						var attr = styledef.form.items[c];
+						// console.log(attr[j].Name+'=='+attrs[i].attr);
+						//鍒ゆ柇琛ㄥ崟閲屾槸鍚︽湁杩斿洖瀛楁锛屾病鏈夊氨瑁呰浇鍒癿odel閲岋紝鐐瑰嚮纭畾鎻愪氦鐨勬椂鍊欏甫涓婅繖浜涙暟鎹�+						if (styledef.form.model[attrs[i].attr] ==
+							undefined) {
+							styledef.form.model[attrs[i].attr] = attrs[i]
+								.value;
+						}
+						//鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�+						if (attr.name != 'Layout') {
+							if (attr.fieldId == attrs[i].attr) {
+								attr.value = '';
+								attr.oldvalue = '';
+								attr.value = attrs[i].value;
+								attr.oldvalue = attrs[i].value;
+								styledef.form.model[attr.fieldId] = attrs[
+									i].value;
+							}
+						} else if (attr.name == 'Layout') {
+							attr.setting.colList.forEach(col => {
+								if (col) {
+									if (col.fieldId == attrs[i].attr) {
+										col.value = '';
+										col.oldvalue = '';
+										col.value = attrs[i].value;
+										col.oldvalue = attrs[i].value;
+										styledef.form.model[col
+											.fieldId] = attrs[i].value;
+									}
+								}
+							});
+						}
+					}
+
+				}
 			},
 			setFormItemVisible(attrs) {
 				if (!Array.isArray(attrs)) {
@@ -1837,38 +1667,31 @@
 				runCustomEvent(dataInfo).then(data => {
 					console.log(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('comma') + this.translate('result') + this
-								.translateSys('colon') + 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/>') : '';
+						var tip = data.info ? typeof data.info == 'string' ? data.info :
+							data.info.join('\n') : '';
 						tip = tip || data.err_info
-						if (tip) uni.showModal({
-							title: this.translateSys("tip"),
-							content: tip,
-							showCancel: false,
-							confirmText: this.translateSys('close')
-						});
+						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.result) {
@@ -1933,14 +1756,8 @@
 								}
 
 							} else if (typeof data.result == 'string') {
-								if (data.result) {
-									uni.showModal({
-										title: this.translateSys('tip'),
-										content: data.result,
-										showCancel: false,
-										confirmText: this.translateSys('close')
-									});
-								}
+								showInfo(data.result)
+
 							}
 							try {
 								var actionlist = data.action || []
@@ -2076,15 +1893,11 @@
 											}
 										}
 									} 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"))
+
 									}
 								}
 
@@ -2093,13 +1906,7 @@
 								let actionList = (data.action || []).map(a => a.action_type).join(';')
 								let tip = typeof ex == 'string' ? ex : ex.message
 								tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}`
-								uni.showModal({
-									title: this.translateSys('tip'),
-									content: tip,
-									showCancel: false,
-									confirmText: this.translateSys('close')
-								});
-								console.log(ex)
+								showError(tip, this.translateSys('tip'))
 								return
 							}
 						}
@@ -2107,12 +1914,7 @@
 
 				}).catch(ex => {
 					// console.log(ex);
-					uni.showModal({
-						title: this.translateSys("error") + "7.1",
-						content: ex.errMsg,
-						showCancel: false,
-						confirmText: this.translateSys('close')
-					});
+					showError(ex, this.translateSys("error") + "7.1")
 				});
 			},
 			onSave() {
@@ -2212,39 +2014,48 @@
 				runCustomEvent(dataInfo).then(data => {
 					console.log(data);
 					uni.hideLoading();
-					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/>') : '';
+						var tip = data.info ? typeof data.info == 'string' ? data.info :
+							data.info.join('\n') : '';
 						tip = tip || data.err_info
-						if (tip) uni.showModal({
-							title: this.translateSys("tip"),
-							content: tip,
-							showCancel: false,
-							confirmText: this.translateSys('close')
-						});
+						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) {
 
+							} else if (typeof data.result == 'string') {
+								showInfo(data.result)
+							}
+							var actionlist = data.action || []
+							for (var i = 0; i < actionlist.length; i++) {
+								var action = actionlist[i];
+								if (action.action_type == "goback_to_pre_page") {
+									//杩斿洖涓婁竴椤�+									uni.navigateBack({
+										delta: 1, //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
+									});
+								}
+							}
+						}
 						// var result = data.result;
 						if (eventID != $this.param.After_OK_Event.ID)
 							$this.scan_OKDataObjRunCustomEvent($this.param.After_OK_Event.ID);
@@ -2262,12 +2073,7 @@
 					// console.log(ex);
 					this.saving = false
 					uni.hideLoading();
-					uni.showModal({
-						title: this.translateSys("error") + "8.1",
-						content: ex.errMsg,
-						showCancel: false,
-						confirmText: this.translateSys('close')
-					});
+					showError(ex, this.translateSys("error") + "8.1")
 				});
 			},
 

--
Gitblit v1.9.1