From 090819b136cc0903bf2ac25845c9b275ddbcba89 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 01 八月 2025 17:32:29 +0800
Subject: [PATCH] dataobjcreat而返回处理

---
 pages/modal/3018_2.vue |  203 +++++++++++++++++++--------------
 pages/modal/3018.vue   |   81 +++++++------
 pages/modal/3037_2.vue |    2 
 pages/modal/3037.vue   |   65 ++++++----
 4 files changed, 199 insertions(+), 152 deletions(-)

diff --git a/pages/modal/3018.vue b/pages/modal/3018.vue
index 6ce37fb..c4285b8 100644
--- a/pages/modal/3018.vue
+++ b/pages/modal/3018.vue
@@ -1547,46 +1547,48 @@
 						console.log(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) 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')
-							});
-							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')
-							});
-							uni.showToast({
-								title: this.translate('create_success'),
-								icon: "success",
-								duration: 3000
-							});
+						if (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 == 801) 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')
+								});
+								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')
+								});
+								uni.showToast({
+									title: this.translate('create_success'),
+									icon: "success",
+									duration: 3000
+								});
+							}
+
+
+
 						}
-
-
-
-
 						//鍒锋柊
 						uni.redirectTo({
 							url: '../modal/3018?param=' + JSON.stringify(this.$data
@@ -2066,6 +2068,7 @@
 								.info
 								.join(
 									'<br/>') : '';
+							tip = tip || data.err_info
 							if (tip) uni.showModal({
 								title: this.translateSys('tip'),
 								content: tip,
diff --git a/pages/modal/3018_2.vue b/pages/modal/3018_2.vue
index 0895112..db401f7 100644
--- a/pages/modal/3018_2.vue
+++ b/pages/modal/3018_2.vue
@@ -1417,102 +1417,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) {
+							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
diff --git a/pages/modal/3037.vue b/pages/modal/3037.vue
index ebdda44..a811383 100644
--- a/pages/modal/3037.vue
+++ b/pages/modal/3037.vue
@@ -2475,32 +2475,47 @@
 				dataObjCreate(dataInfo).then(result => {
 					console.log(result);
 					uni.hideLoading();
-					if (success.result
-						.action) {
-						var action = JSON
-							.parse(success
-								.result.Action
-							);
-						if (action.ret ==
-							'0') {
-							if (action
-								.result_type ==
-								'0') {
-								uni.showToast({
-									title: action
-										.result,
-									icon: "success",
-									duration: 3000
-								});
-							}
-							// "{"ret":0, "result_type":0, "result":"鍒涘缓鎴愬姛123123123","info":""}"
+					let data = result.lua_result
+					if (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 == 801) 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')
+							});
+							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')
+							});
+							uni.showToast({
+								title: this.translate('create_success'),
+								icon: "success",
+								duration: 3000
+							});
 						}
-					} else
-						uni.showToast({
-							title: "鍒涘缓鎴愬姛锛�,
-							icon: "success",
-							duration: 3000
-						});
+
+					}
 					//鍒锋柊
 					uni.redirectTo({
 						url: '../modal/3037?param=' +
diff --git a/pages/modal/3037_2.vue b/pages/modal/3037_2.vue
index 388c9b1..3f49521 100644
--- a/pages/modal/3037_2.vue
+++ b/pages/modal/3037_2.vue
@@ -124,7 +124,7 @@
 	import {
 		getUIStyleInfo,
 		runCustomEvent,
-		dataObjCreate,
+
 		dataObjDel
 	} from "@/api/data.js"
 	import dayjs from "dayjs";

--
Gitblit v1.9.1