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

---
 pages/modal/3018_2.vue |  265 ++++++++++++++++++++++++++++++----------------------
 1 files changed, 151 insertions(+), 114 deletions(-)

diff --git a/pages/modal/3018_2.vue b/pages/modal/3018_2.vue
index 0895112..626ea5c 100644
--- a/pages/modal/3018_2.vue
+++ b/pages/modal/3018_2.vue
@@ -180,7 +180,8 @@
 			this.title = this.param.Add_BtnName ? this.param.Add_BtnName : options
 				.titlename; //璁剧疆鎸夐挳鏂囧瓧
 			this.btnName = this.param.Add_BtnName || ""
-			this.loadData(options.paramValue)
+			const paramValue = options.paramValue ? JSON.parse(options.paramValue) : undefined
+			this.loadData(paramValue)
 		},
 		computed: {
 			dropdownBtns() {
@@ -218,27 +219,30 @@
 				await this.Head_UIStyleGetInfo(this.param.DataCls?.id, this.param.UI_Style?.ID);
 				//浼犲叆鍙傛暟鍊� 				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)
+						// 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;
+				// 						}
+				// 					});
+				// 				}
+				// 			});
+				// 		}
+				// 	})
+				
 				}
 
 
@@ -441,7 +445,7 @@
 					};
 					console.log(dataInfo);
 					var data = await runCustomEvent(dataInfo)
-					if (data.ret != 0) {
+					if (data.ret != 0 && data.ret != 1) {
 						var tip = data.err_info ? typeof data.err_info == 'string' ? data
 							.err_info : data
 							.err_info.join('<br/>') : '';
@@ -900,7 +904,7 @@
 				console.log(dataInfo);
 				// return;
 				runCustomEvent(dataInfo).then(data => {
-					if (data.ret != 0) {
+					if (data.ret != 0 && data.ret != 1) {
 						var tip = data.err_info ? typeof data.err_info == 'string' ? data
 							.err_info :
 							data
@@ -1091,7 +1095,7 @@
 				console.log(dataInfo);
 				// return;
 				runCustomEvent(dataInfo).then(data => {
-					if (data.ret != 0) {
+					if (data.ret != 0 && data.ret != 1) {
 						var tip = data.err_info ? typeof data.err_info == 'string' ? data
 							.err_info :
 							data
@@ -1417,102 +1421,131 @@
 				dataObjCreate(dataInfo).then(res => {
 					uni.hideLoading();
 					let data = res.lua_result
-					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 == 801) {
-							if (this.param.Only_Script_Error) {
-								let pos = tip.indexOf("锛�);
-								if (pos > -1) tip = tip.substring(pos + 1);
-							}
-							uni.showModal({
+					if (data) {
+						if (data.ret != 0 && ret.ret != 1) {
+							var tip = data.err_info ? typeof data.err_info == 'string' ? data
+								.err_info :
+								data
+								.err_info.join('<br/>') : '';
+							if (data.ret == 801) {
+								if (this.param.Only_Script_Error) {
+									let pos = tip.indexOf("锛�);
+									if (pos > -1) tip = tip.substring(pos + 1);
+								}
+								if (tip) {
+									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')
+							});
+							this.saving = false
+							return false
+						} else {
+							var tip = data.info ? typeof data.info == 'string' ? data.info :
+								data
+								.info
+								.join(
+									'<br/>') : '';
+							tip = tip || data.err_info
+							if (tip) 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')
-						});
-						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')
-						});
-						else {
+							else {
 
-							uni.showToast({
-								title: this.translate('create_success'),
-								icon: "success",
-								duration: 3000
-							});
-						}
-
-
-						if (!this.param.After_Btn_Not_Refresh) {
-							//鍒锋柊
-							uni.redirectTo({
-								url: '../modal/3018_2?param=' + JSON.stringify(this
-										.$data
-										.param) +
-									"&titlename=" + this.title
-							});
-						} else {
-							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') {
-										$this.setFormValues(action.value)
-									} else if (action.action_type == 'set_dlg_attr_show') {
-										var result = action.value;
-										$this.hideFormItems(result)
-									} else if (action.action_type ==
-										"set_dlg_current_edit_attr"
-									) {
-										if ($this
-											.focusOldFieldId ==
-											action.value) {
-											$this.setData({
-												focusFieldId: ""
-											})
-										} else {
-											$this.setData({
-												focusFieldId: $this
-													.focusOldFieldId
-											})
-										}
-										$this.$nextTick(() => {
-											$this.setData({
-												focusFieldId: action
-													.value
-											})
-										});
-									}
-								}
+								uni.showToast({
+									title: this.translate('create_success'),
+									icon: "success",
+									duration: 3000
+								});
 							}
 
-						}
-					}
-					// this.class_attr_init();
 
+							if (!this.param.After_Btn_Not_Refresh) {
+								//鍒锋柊
+								uni.redirectTo({
+									url: '../modal/3018_2?param=' + JSON.stringify(this
+											.$data
+											.param) +
+										"&titlename=" + this.title
+								});
+							} else {
+								if ([0, 2, 3, 4, -1].includes(data.result_type)) {
+									if (data.result_type == 2) {
+										$this.setFormValues(data.result || [])
+									} else if (typeof data.result == 'string') {
+										if (data.result) {
+											uni.showModal({
+												title: this.translateSys('tip'),
+												content: data.result,
+												showCancel: false,
+												confirmText: this.translateSys('close')
+											});
+										}
+									}
+									try {
+										var actionlist = data.action || []
+										for (var i = 0; i < actionlist.length; i++) {
+											var action = actionlist[i];
+											if (action.action_type == 'set_dlg_attr') {
+												$this.setFormValues(action.value)
+											} else if (action.action_type == 'set_dlg_attr_show') {
+												var result = action.value;
+												$this.hideFormItems(result)
+											} else if (action.action_type ==
+												"set_dlg_current_edit_attr"
+											) {
+												if ($this
+													.focusOldFieldId ==
+													action.value) {
+													$this.setData({
+														focusFieldId: ""
+													})
+												} else {
+													$this.setData({
+														focusFieldId: $this
+															.focusOldFieldId
+													})
+												}
+												$this.$nextTick(() => {
+													$this.setData({
+														focusFieldId: action
+															.value
+													})
+												});
+											}
+										}
+
+									} catch (ex) {
+										let actionList = (data.action || []).map(a => a.action_type).join(';')
+										let tip = typeof ex == 'string' ? ex : ex.message
+										tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}`
+										uni.showModal({
+											title: this.translateSys('tip'),
+											content: tip,
+											showCancel: false,
+											confirmText: this.translateSys('close')
+										});
+										console.log(ex)
+										return
+									}
+								}
+
+							}
+						}
+						// this.class_attr_init();
+					}
 					this.saving = false
 				}).catch(ex => {
 					this.saving = false
@@ -1533,6 +1566,10 @@
 			setFormValues(data) {
 				const $this = this
 				const head_styledef = this.head_styledef
+				if( !Array.isArray(data))
+				{
+					return
+				}
 				for (var i = 0; i < data.length; i++) {
 					const attr = data[i]
 					if (attr.choice_list) {
@@ -1685,7 +1722,7 @@
 				// return;
 				runCustomEvent(dataInfo).then(data => {
 
-					if (data.ret != 0) {
+					if (data.ret != 0 && data.ret != 1) {
 						var tip = data.err_info ? typeof data.err_info == 'string' ? data
 							.err_info :
 							data
@@ -1888,7 +1925,7 @@
 				};
 				console.log(dataInfo);
 				// return;
-				runCustomEvent(dataInfo).then(data => {
+				runCustomEvent(dataInfo && data.ret != 1).then(data => {
 					if (data.ret != 0) {
 						var tip = data.err_info ? typeof data.err_info == 'string' ? data
 							.err_info :

--
Gitblit v1.9.1