From fa73abee6209cd6f7c62c61c271826f7d413035d Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 01 八月 2025 11:32:17 +0800
Subject: [PATCH] event result_type

---
 pages/modal/form/index.vue |  690 +++++++++++++++++++++++++++++----------------------------
 1 files changed, 348 insertions(+), 342 deletions(-)

diff --git a/pages/modal/form/index.vue b/pages/modal/form/index.vue
index efb6e0c..18eb702 100644
--- a/pages/modal/form/index.vue
+++ b/pages/modal/form/index.vue
@@ -480,68 +480,70 @@
 								confirmText: this.translateSys(
 									'close')
 							});
-							if (result.result_type == 2) {
+							if ([0, 2, 3, 4, -1].includes(result.result_type)) {
+								if (result.result_type == 2) {
 
-							} else if (typeof result.result == 'string') {
-								if (result.result) {
+								} else if (typeof result.result == 'string') {
+									if (result.result) {
+										uni.showModal({
+											title: this.translateSys('tip'),
+											content: result.result,
+											showCancel: false,
+											confirmText: this.translateSys('close')
+										});
+									}
+								}
+								try {
+									var actionList = result.action || []
+									actionList.forEach(item => {
+
+										if (item.action_type ==
+											"set_dlg_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 (action.action_type == 'set_dlg_attr_show') {
+											var data = action.value;
+
+											$this.setFormItemVisible(data)
+										}
+									});
+
+								} catch (ex) {
+									let actionList = (result.action || []).map(a => a.action_type).join(';')
+									let tip = typeof ex == 'string' ? ex : ex.message
+									tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}`
 									uni.showModal({
 										title: this.translateSys('tip'),
-										content: result.result,
+										content: tip,
 										showCancel: false,
 										confirmText: this.translateSys('close')
 									});
+									console.log(ex)
+									return
 								}
-							}
-							try {
-								var actionList = result.action || []
-								actionList.forEach(item => {
-
-									if (item.action_type ==
-										"set_dlg_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 (action.action_type == 'set_dlg_attr_show') {
-										var data = action.value;
-
-										$this.setFormItemVisible(data)
-									}
-								});
-
-							} catch (ex) {
-								let actionList = (result.action || []).map(a => a.action_type).join(';')
-								let tip = typeof ex == 'string' ? ex : ex.message
-								tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}`
-								uni.showModal({
-									title: this.translateSys('tip'),
-									content: tip,
-									showCancel: false,
-									confirmText: this.translateSys('close')
-								});
-								console.log(ex)
-								return
 							}
 						}
 
@@ -802,72 +804,73 @@
 									confirmText: this.translateSys(
 										'close')
 								});
-								if (result.result_type == 2) {
+								if ([0, 2, 3, 4, -1].includes(result.result_type)) {
+									if (result.result_type == 2) {
 
-								} else if (typeof result.result == 'string') {
-									if (result.result) {
+									} else if (typeof result.result == 'string') {
+										if (result.result) {
+											uni.showModal({
+												title: this.translateSys('tip'),
+												content: result.result,
+												showCancel: false,
+												confirmText: this.translateSys('close')
+											});
+										}
+									}
+									try {
+										var actionList = result.action || []
+										actionList.forEach(item => {
+
+											if (item.action_type ==
+												"set_dlg_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 (action.action_type ==
+												'set_dlg_attr_show') {
+												var data = action.value;
+
+												$this.setFormItemVisible(data)
+											}
+										});
+
+									} catch (ex) {
+										let actionList = (result.action || []).map(a => a.action_type)
+											.join(';')
+										let tip = typeof ex == 'string' ? ex : ex.message
+										tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}`
 										uni.showModal({
 											title: this.translateSys('tip'),
-											content: result.result,
+											content: tip,
 											showCancel: false,
 											confirmText: this.translateSys('close')
 										});
+										console.log(ex)
+										return
 									}
 								}
-								try {
-									var actionList = result.action || []
-									actionList.forEach(item => {
-
-										if (item.action_type ==
-											"set_dlg_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 (action.action_type ==
-											'set_dlg_attr_show') {
-											var data = action.value;
-
-											$this.setFormItemVisible(data)
-										}
-									});
-
-								} catch (ex) {
-									let actionList = (result.action || []).map(a => a.action_type)
-										.join(';')
-									let tip = typeof ex == 'string' ? ex : ex.message
-									tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}`
-									uni.showModal({
-										title: this.translateSys('tip'),
-										content: tip,
-										showCancel: false,
-										confirmText: this.translateSys('close')
-									});
-									console.log(ex)
-									return
-								}
-
 
 							}
 
@@ -1158,59 +1161,61 @@
 							showCancel: false,
 							confirmText: this.translateSys('close')
 						});
-						if (data.result_type == 2) {
-							$this.setFormValues(data.result || [])
-						} else if (typeof data.result == 'string') {
-							if (data.result) {
-								uni.showModal({
-									title: this.translateSys('tip'),
-									content: data.result,
-									showCancel: false,
-									confirmText: this.translateSys('close')
-								});
-							}
-						}
-						try {
-							var actionlist = data.action || []
-							for (var i = 0; i < actionlist.length; i++) {
-								var action = actionlist[i];
-								if (action.action_type == 'set_dlg_attr') {
-									var result = action.value;
-									$this.setFormValues(result)
-								} else if (action.action_type == 'set_dlg_attr_show') {
-									var result = action.value;
-
-									$this.setFormItemVisible(result)
-								} else if (action.action_type == 'set_global_attr') {
-									$this.global_attr = action.value || [];
-								} else {
+						if ([0, 2, 3, 4, -1].includes(data.result_type)) {
+							if (data.result_type == 2) {
+								$this.setFormValues(data.result || [])
+							} else if (typeof data.result == 'string') {
+								if (data.result) {
 									uni.showModal({
-										title: this.translateSys("tip"),
-										content: this.translateSys(
-												"quotation_mark_left") +
-											action
-											.action_type + this.translateSys(
-												"quotation_mark_right") + this
-											.translate(
-												"tip_action_unprocessed"),
+										title: this.translateSys('tip'),
+										content: data.result,
 										showCancel: false,
 										confirmText: this.translateSys('close')
 									});
 								}
 							}
+							try {
+								var actionlist = data.action || []
+								for (var i = 0; i < actionlist.length; i++) {
+									var action = actionlist[i];
+									if (action.action_type == 'set_dlg_attr') {
+										var result = action.value;
+										$this.setFormValues(result)
+									} else if (action.action_type == 'set_dlg_attr_show') {
+										var result = action.value;
 
-						} 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.setFormItemVisible(result)
+									} else if (action.action_type == 'set_global_attr') {
+										$this.global_attr = action.value || [];
+									} else {
+										uni.showModal({
+											title: this.translateSys("tip"),
+											content: this.translateSys(
+													"quotation_mark_left") +
+												action
+												.action_type + this.translateSys(
+													"quotation_mark_right") + this
+												.translate(
+													"tip_action_unprocessed"),
+											showCancel: false,
+											confirmText: this.translateSys('close')
+										});
+									}
+								}
+
+							} catch (ex) {
+								let actionList = (data.action || []).map(a => a.action_type).join(';')
+								let tip = typeof ex == 'string' ? ex : ex.message
+								tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}`
+								uni.showModal({
+									title: this.translateSys('tip'),
+									content: tip,
+									showCancel: false,
+									confirmText: this.translateSys('close')
+								});
+								console.log(ex)
+								return
+							}
 						}
 
 
@@ -1324,210 +1329,211 @@
 							showCancel: false,
 							confirmText: $this.translateSys('close')
 						});
-						if (data.result_type == 2) {
+						if ([0, 2, 3, 4, -1].includes(data.result_type)) {
+							if (data.result_type == 2) {
 
-						} else if (typeof data.result == 'string') {
-							if (data.result) {
-								uni.showModal({
-									title: this.translateSys('tip'),
-									content: data.result,
-									showCancel: false,
-									confirmText: this.translateSys('close')
-								});
+							} else if (typeof data.result == 'string') {
+								if (data.result) {
+									uni.showModal({
+										title: this.translateSys('tip'),
+										content: data.result,
+										showCancel: false,
+										confirmText: this.translateSys('close')
+									});
+								}
 							}
-						}
-						try {
-							var actions = data.action || []
-							for (var i = 0; i < actions.length; i++) {
-								var action = actions[i];
-								console.log(action)
-								var val = action.value;
-								var enviroment = JSON.stringify(enviroment);
+							try {
+								var actions = data.action || []
+								for (var i = 0; i < actions.length; i++) {
+									var action = actions[i];
+									console.log(action)
+									var val = action.value;
+									var enviroment = JSON.stringify(enviroment);
 
-								if (action.action_type == 'open_panel') {
-									var d = dialog({
-										title: '<i class="ace-icon fa fa-info-circle"></i> ' +
-											$this.translateSys("tip"),
-										content: $this.translateSys(
-												"quotation_mark_left") +
-											action
-											.action_type + $this.translateSys(
-												"quotation_mark_right") + $this
-											.translate(
-												"tip_action_unprocessed")
-									});
-									d.show();
-								} else if (action.action_type == 'open_select_userdlg') {
-									var style = val.style;
-									// style == 'user' ? '閫夋嫨浜哄憳' : style == 'department' ? '閫夋嫨閮ㄩ棬' : style == 'role' ? '閫夋嫨瑙掕壊' : ''
-									var param = {
-										item: item,
-										button_callback: button_callback,
-										req: req,
-										data_attr: data_attr
-									}
-									uni.navigateTo({
-										url: '../selpsn/index?mulit=false&param=' +
-											JSON
-											.stringify(
-												param),
-										events: {
-											AddPer(data, param) {
-												// console.log(param);
-												console.log(data);
-												var callback_eventid = param
-													.button_callback
-													.trim();
-												var info = {
-													eventid: callback_eventid,
-													edtype: "0",
-													projectid: '',
-													rclsid: '',
-													robjid: '',
-													userlogin: '',
-													clsid: $this.clsId,
-													objid: "",
-													attr: param.req,
-													inputparameter: data,
-													dataJson: [],
-												}
-												$this.DataObjRunCustomEvent(info,
-													param
-													.data_attr);
-											}
-										}
-									});
-								} else if (action.action_type == 'open_data_query_dlg') {
-									var d = dialog({
-										title: '<i class="ace-icon fa fa-info-circle"></i> ' +
-											$this.translateSys("tip"),
-										content: $this.translateSys(
-												"quotation_mark_left") +
-											action
-											.action_type + $this.translateSys(
-												"quotation_mark_right") + $this
-											.translate(
-												"tip_action_unprocessed")
-									});
-									d.show();
-								} else if (action.action_type == 'open_common_dlg') {
-
-									if (val.common_dlg_id == 'check_list') {
-										$this.setData({
-											check_list: val.config
-										})
-										if (val.config.appear_style ==
-											'sideslip') //鍒ゆ柇鏄惁鏄晶婊�-											$this.setData({
-												popupType: "right"
-											})
-										else
-											$this.setData({
-												popupType: "center"
-											})
-										// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
-										$this.$refs.popup.open($this.popupType);
-										var popupParam = {
+									if (action.action_type == 'open_panel') {
+										var d = dialog({
+											title: '<i class="ace-icon fa fa-info-circle"></i> ' +
+												$this.translateSys("tip"),
+											content: $this.translateSys(
+													"quotation_mark_left") +
+												action
+												.action_type + $this.translateSys(
+													"quotation_mark_right") + $this
+												.translate(
+													"tip_action_unprocessed")
+										});
+										d.show();
+									} else if (action.action_type == 'open_select_userdlg') {
+										var style = val.style;
+										// style == 'user' ? '閫夋嫨浜哄憳' : style == 'department' ? '閫夋嫨閮ㄩ棬' : style == 'role' ? '閫夋嫨瑙掕壊' : ''
+										var param = {
 											item: item,
 											button_callback: button_callback,
 											req: req,
 											data_attr: data_attr
 										}
-										$this.setData({
-											popupParam: popupParam
-										})
-									}
-								} else if (action.action_type ==
-									'open_project_query_dlg') {
-									//console.log(action.value.select_range);
-									//console.log(action.value.mulit_select);
-									var priRel = '-1';
-									if (action.value.select_range == '鍏ㄩ儴鐩稿叧')
-										priRel = '0';
-									else if (action.value.select_range == '鎴戣礋璐g殑椤圭洰')
-										priRel = '1';
-									else if (action.value.select_range == '鎴戝垱寤虹殑')
-										priRel = '2';
-									else if (action.value.select_range == '鎴戝弬涓庣殑' || action
-										.value
-										.select_range == '鎴戝弬鍔犵殑')
-										priRel = '3';
-									else if (action.value.select_range == '鎴戝叧娉ㄧ殑')
-										priRel = '4';
-									else if (action.value.select_range == '鎴戜笅灞炵殑椤圭洰')
-										priRel = '5';
-									var param_ = {
-										item: item,
-										button_callback: button_callback,
-										req: req
-									}
-									uni.navigateTo({
-										url: '../selPrj/index?relation=' + priRel +
-											'&param=' +
-											JSON.stringify(param_),
-										events: {
-											AddPer(data, param) {
-												var attr = param.item.fieldId;
-												$this.head_styledef.form.model[
-														attr] =
-													data[0].ID +
-													';' + data[0].Name;
-
-												// $this.classAttrList[param.index].Attr[param.iindex].Value=data[0].Name;
-												// $this.classAttrList[param.index].Attr[param.iindex].ValID=data[0].ID+';'+data[0].Name;
-												var callback_eventid = param
-													.button_callback
-													.trim();
-												if (callback_eventid) {
+										uni.navigateTo({
+											url: '../selpsn/index?mulit=false&param=' +
+												JSON
+												.stringify(
+													param),
+											events: {
+												AddPer(data, param) {
+													// console.log(param);
+													console.log(data);
+													var callback_eventid = param
+														.button_callback
+														.trim();
 													var info = {
 														eventid: callback_eventid,
-														edtype: "2",
-														projectid: data[0].ID,
-														rclsid: "",
-														robjid: "",
-														userlogin: "",
+														edtype: "0",
+														projectid: '',
+														rclsid: '',
+														robjid: '',
+														userlogin: '',
 														clsid: $this.clsId,
 														objid: "",
 														attr: param.req,
+														inputparameter: data,
 														dataJson: [],
 													}
-
-													$this.DataObjRunCustomEvent(
-														info);
+													$this.DataObjRunCustomEvent(info,
+														param
+														.data_attr);
 												}
 											}
+										});
+									} else if (action.action_type == 'open_data_query_dlg') {
+										var d = dialog({
+											title: '<i class="ace-icon fa fa-info-circle"></i> ' +
+												$this.translateSys("tip"),
+											content: $this.translateSys(
+													"quotation_mark_left") +
+												action
+												.action_type + $this.translateSys(
+													"quotation_mark_right") + $this
+												.translate(
+													"tip_action_unprocessed")
+										});
+										d.show();
+									} else if (action.action_type == 'open_common_dlg') {
+
+										if (val.common_dlg_id == 'check_list') {
+											$this.setData({
+												check_list: val.config
+											})
+											if (val.config.appear_style ==
+												'sideslip') //鍒ゆ柇鏄惁鏄晶婊�+												$this.setData({
+													popupType: "right"
+												})
+											else
+												$this.setData({
+													popupType: "center"
+												})
+											// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
+											$this.$refs.popup.open($this.popupType);
+											var popupParam = {
+												item: item,
+												button_callback: button_callback,
+												req: req,
+												data_attr: data_attr
+											}
+											$this.setData({
+												popupParam: popupParam
+											})
 										}
-									});
-								} else {
-									uni.showModal({
-										title: $this.translateSys("tip"),
-										content: $this.translateSys(
-												"quotation_mark_left") +
-											action.action_type + $this
-											.translateSys(
-												"quotation_mark_right") + $this
-											.translate(
-												"tip_action_unprocessed"),
-										showCancel: false,
-										confirmText: $this.translateSys('close')
-									});
+									} else if (action.action_type ==
+										'open_project_query_dlg') {
+										//console.log(action.value.select_range);
+										//console.log(action.value.mulit_select);
+										var priRel = '-1';
+										if (action.value.select_range == '鍏ㄩ儴鐩稿叧')
+											priRel = '0';
+										else if (action.value.select_range == '鎴戣礋璐g殑椤圭洰')
+											priRel = '1';
+										else if (action.value.select_range == '鎴戝垱寤虹殑')
+											priRel = '2';
+										else if (action.value.select_range == '鎴戝弬涓庣殑' || action
+											.value
+											.select_range == '鎴戝弬鍔犵殑')
+											priRel = '3';
+										else if (action.value.select_range == '鎴戝叧娉ㄧ殑')
+											priRel = '4';
+										else if (action.value.select_range == '鎴戜笅灞炵殑椤圭洰')
+											priRel = '5';
+										var param_ = {
+											item: item,
+											button_callback: button_callback,
+											req: req
+										}
+										uni.navigateTo({
+											url: '../selPrj/index?relation=' + priRel +
+												'&param=' +
+												JSON.stringify(param_),
+											events: {
+												AddPer(data, param) {
+													var attr = param.item.fieldId;
+													$this.head_styledef.form.model[
+															attr] =
+														data[0].ID +
+														';' + data[0].Name;
+
+													// $this.classAttrList[param.index].Attr[param.iindex].Value=data[0].Name;
+													// $this.classAttrList[param.index].Attr[param.iindex].ValID=data[0].ID+';'+data[0].Name;
+													var callback_eventid = param
+														.button_callback
+														.trim();
+													if (callback_eventid) {
+														var info = {
+															eventid: callback_eventid,
+															edtype: "2",
+															projectid: data[0].ID,
+															rclsid: "",
+															robjid: "",
+															userlogin: "",
+															clsid: $this.clsId,
+															objid: "",
+															attr: param.req,
+															dataJson: [],
+														}
+
+														$this.DataObjRunCustomEvent(
+															info);
+													}
+												}
+											}
+										});
+									} else {
+										uni.showModal({
+											title: $this.translateSys("tip"),
+											content: $this.translateSys(
+													"quotation_mark_left") +
+												action.action_type + $this
+												.translateSys(
+													"quotation_mark_right") + $this
+												.translate(
+													"tip_action_unprocessed"),
+											showCancel: false,
+											confirmText: $this.translateSys('close')
+										});
+									}
 								}
+
+							} catch (ex) {
+								let actionList = (data.action || []).map(a => a.action_type).join(';')
+								let tip = typeof ex == 'string' ? ex : ex.message
+								tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}`
+								uni.showModal({
+									title: this.translateSys('tip'),
+									content: tip,
+									showCancel: false,
+									confirmText: this.translateSys('close')
+								});
+								console.log(ex)
+								return
 							}
-
-						} catch (ex) {
-							let actionList = (data.action || []).map(a => a.action_type).join(';')
-							let tip = typeof ex == 'string' ? ex : ex.message
-							tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}`
-							uni.showModal({
-								title: this.translateSys('tip'),
-								content: tip,
-								showCancel: false,
-								confirmText: this.translateSys('close')
-							});
-							console.log(ex)
-							return
 						}
-
 					}
 
 				}).catch(ex => {

--
Gitblit v1.9.1