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/3018.vue |  637 +++++++++++++++++++++++++++++----------------------------
 1 files changed, 321 insertions(+), 316 deletions(-)

diff --git a/pages/modal/3018.vue b/pages/modal/3018.vue
index 5701d19..6ce37fb 100644
--- a/pages/modal/3018.vue
+++ b/pages/modal/3018.vue
@@ -1706,61 +1706,62 @@
 							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')
-								});
-							}
-						}
-						try {
-							var actionlist = data.action || []
-							for (var j = 0; j < actionlist.length; j++) {
-								var action = actionlist[j];
-								var action_type = action.action_type;
-								var value = action.value;
-								if (action_type == 'set_dlg_attr') {
-									if (value) {
-										this.setFormValues(value)
-									}
-								}
-								if (action_type == 'open_select_userdlg') {
+							} else if (typeof data.result == 'string') {
+								if (data.result) {
 									uni.showModal({
-										title: this.translateSys('error') + " 2.2",
-										content: this.translateSys(
-												"quotation_mark_left") +
-											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')
 									});
 								}
-								// else if (action_type == 'tip_dlg') {
-
-								// }
 							}
+							try {
+								var actionlist = data.action || []
+								for (var j = 0; j < actionlist.length; j++) {
+									var action = actionlist[j];
+									var action_type = action.action_type;
+									var value = action.value;
+									if (action_type == 'set_dlg_attr') {
+										if (value) {
+											this.setFormValues(value)
+										}
+									}
+									if (action_type == 'open_select_userdlg') {
+										uni.showModal({
+											title: this.translateSys('error') + " 2.2",
+											content: this.translateSys(
+													"quotation_mark_left") +
+												action_type + this.translateSys(
+													"quotation_mark_right") + this
+												.translate(
+													"tip_action_unprocessed"),
+											showCancel: false,
+											confirmText: this.translateSys('close')
+										});
+									}
+									// else if (action_type == 'tip_dlg') {
 
-						} 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 => {
@@ -1877,74 +1878,75 @@
 							showCancel: false,
 							confirmText: this.translateSys('close')
 						});
-						if (data.result_type == 2) {
-							var result = data.result || []
-							for (var i = 0; i < result.length; i++) {
-								for (var c = 0; c < $this.classAttrList.length; c++) {
-									var attr = $this.classAttrList[c].Attr;
-									for (var j = 0; j < attr.length; j++) {
-										if (attr[j].Name == result[i].attr) {
-											attr[j].Value = result[i].value;
+						if ([0, 2, 3, 4, -1].includes(data.result_type)) {
+							if (data.result_type == 2) {
+								var result = data.result || []
+								for (var i = 0; i < result.length; i++) {
+									for (var c = 0; c < $this.classAttrList.length; c++) {
+										var attr = $this.classAttrList[c].Attr;
+										for (var j = 0; j < attr.length; j++) {
+											if (attr[j].Name == result[i].attr) {
+												attr[j].Value = result[i].value;
+											}
+										}
+									}
+									console.log($this.refdatastore)
+									var length = 0;
+									if (!$this.refdatastore.filter(function(s) {
+											return result[i].attr == s.attr
+										}).length) {
+										length = 1;
+										$this.refdatastore.push(result[i]);
+									}
+									if (length == 0) {
+										for (var j = 0; j < $this.refdatastore.length; j++) {
+											if ($this.refdatastore[j].attr == result[i]
+												.attr) {
+												$this.refdatastore[j].value = result[i]
+													.value;
+											}
 										}
 									}
 								}
-								console.log($this.refdatastore)
-								var length = 0;
-								if (!$this.refdatastore.filter(function(s) {
-										return result[i].attr == s.attr
-									}).length) {
-									length = 1;
-									$this.refdatastore.push(result[i]);
-								}
-								if (length == 0) {
-									for (var j = 0; j < $this.refdatastore.length; j++) {
-										if ($this.refdatastore[j].attr == result[i]
-											.attr) {
-											$this.refdatastore[j].value = result[i]
-												.value;
-										}
-									}
+
+							} 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) {
+							try {
+								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(action.value)
+										} else if (data.action[i].action_type == 'set_global_attr') {
+											$this.global_attr = data.action[i].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: data.result,
+									content: tip,
 									showCancel: false,
 									confirmText: this.translateSys('close')
 								});
+								console.log(ex)
+								return
 							}
 						}
-						try {
-							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(action.value)
-									} else if (data.action[i].action_type == 'set_global_attr') {
-										$this.global_attr = data.action[i].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
-						}
-
 					}
 
 				}).catch(ex => {
@@ -2070,40 +2072,42 @@
 								showCancel: false,
 								confirmText: this.translateSys('close')
 							});
-							if (data.result_type == 2) {
-								var result = data.result || [];
-								console.log(this.refdatastore)
-								for (var i = 0; i < result.length; i++) {
-									// self.class_attr_ele.find('.attr_field[data-field="' + result[i].attr + '"]').val(result[i].value).data('val', result[i].value);
-									var length = 0;
-									if (!this.refdatastore.filter(function(s) {
-											return result[i].attr == s.attr
-										}).length) {
-										length = 1;
-										this.refdatastore.push(result[i]);
-									}
-									if (length == 0) {
-										for (var j = 0; j < this.refdatastore.length; j++) {
-											if (this.refdatastore[j].attr == result[i].attr) {
-												this.refdatastore[j].value = result[i].value;
+							if ([0, 2, 3, 4, -1].includes(data.result_type)) {
+								if (data.result_type == 2) {
+									var result = data.result || [];
+									console.log(this.refdatastore)
+									for (var i = 0; i < result.length; i++) {
+										// self.class_attr_ele.find('.attr_field[data-field="' + result[i].attr + '"]').val(result[i].value).data('val', result[i].value);
+										var length = 0;
+										if (!this.refdatastore.filter(function(s) {
+												return result[i].attr == s.attr
+											}).length) {
+											length = 1;
+											this.refdatastore.push(result[i]);
+										}
+										if (length == 0) {
+											for (var j = 0; j < this.refdatastore.length; j++) {
+												if (this.refdatastore[j].attr == result[i].attr) {
+													this.refdatastore[j].value = result[i].value;
+												}
 											}
 										}
 									}
+
+								} 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')
-									});
-								}
+
+								this.add();
 							}
-
-
-							this.add();
 						}
 
 					}).catch(ex => {
@@ -2246,213 +2250,214 @@
 							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];
-								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];
+									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 $this = this;
-									var param = {
-										index: index,
-										iindex: iindex,
-										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.param
-														.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') {
-									var $this = this;
-									if (val.common_dlg_id == 'check_list') {
-										$this.check_list = val.config;
-										if (val.config.appear_style ==
-											'sideslip') //鍒ゆ柇鏄惁鏄晶婊�-											$this.popupType = 'right';
-										else
-											$this.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 $this = this;
+										var param = {
 											index: index,
 											iindex: iindex,
 											button_callback: button_callback,
 											req: req,
 											data_attr: data_attr
 										}
-										$this.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 $this = this;
-									var param_ = {
-										index: index,
-										iindex: iindex,
-										button_callback: button_callback,
-										req: req
-									}
-									uni.navigateTo({
-										url: '../selPrj/index?relation=' + priRel +
-											'&param=' +
-											JSON.stringify(param_),
-										events: {
-											AddPer(data, param) {
-												$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: "",
-														clsid: $this.$data
-															.param.clsid,
+														edtype: "0",
+														projectid: '',
+														rclsid: '',
+														robjid: '',
+														userlogin: '',
+														clsid: $this.param
+															.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') {
+										var $this = this;
+										if (val.common_dlg_id == 'check_list') {
+											$this.check_list = val.config;
+											if (val.config.appear_style ==
+												'sideslip') //鍒ゆ柇鏄惁鏄晶婊�+												$this.popupType = 'right';
+											else
+												$this.popupType = 'center'
+											// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
+											$this.$refs.popup.open($this.popupType);
+											var popupParam = {
+												index: index,
+												iindex: iindex,
+												button_callback: button_callback,
+												req: req,
+												data_attr: data_attr
+											}
+											$this.popupParam = popupParam;
 										}
-									});
-								} else {
-									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_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 $this = this;
+										var param_ = {
+											index: index,
+											iindex: iindex,
+											button_callback: button_callback,
+											req: req
+										}
+										uni.navigateTo({
+											url: '../selPrj/index?relation=' + priRel +
+												'&param=' +
+												JSON.stringify(param_),
+											events: {
+												AddPer(data, param) {
+													$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.$data
+																.param.clsid,
+															objid: "",
+															attr: param.req,
+															dataJson: [],
+														}
+
+														$this.DataObjRunCustomEvent(
+															info);
+													}
+												}
+											}
+										});
+									} else {
+										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();
+									}
 								}
+
+							} 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