From 8f1880cf13440b9cb57d15520ebc3b785f3dabb1 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 01 八月 2025 11:17:49 +0800
Subject: [PATCH] lua action处理

---
 pages/modal/3018_2.vue     |  516 +++++---
 pages/modal/3018.vue       |  462 ++++---
 pages/modal/5601.vue       |  395 +++--
 pages/modal/3037_2.vue     |  652 ++++++----
 pages/modal/3037.vue       | 1233 ++++++++++---------
 pages/modal/3200.vue       |    1 
 manifest.json              |    4 
 pages/modal/form/index.vue |  388 +++--
 8 files changed, 2,022 insertions(+), 1,629 deletions(-)

diff --git a/manifest.json b/manifest.json
index 5213ad7..2799e26 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "MoboxPDA",
     "appid" : "__UNI__56D451E",
     "description" : "",
-    "versionName" : "1.1.63",
-    "versionCode" : 1163,
+    "versionName" : "1.1.65",
+    "versionCode" : 1165,
     "transformPx" : false,
     /* 5+App鐗规湁鐩稿叧 */
     "app-plus" : {
diff --git a/pages/modal/3018.vue b/pages/modal/3018.vue
index b365f5b..5701d19 100644
--- a/pages/modal/3018.vue
+++ b/pages/modal/3018.vue
@@ -1680,6 +1680,7 @@
 							.err_info :
 							data
 							.err_info.join('<br/>') : '';
+						tip = tip || data.err_info
 						if (data.ret == 801) uni.showModal({
 							title: this.translateSys('tip'),
 							content: tip,
@@ -1705,38 +1706,61 @@
 							showCancel: false,
 							confirmText: this.translateSys('close')
 						});
+						if (data.result_type == 2) {
 
-						if (data.action) {
-							var actionlist = data.action;
-							if (actionlist) {
-								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') {
-
-									// }
-								}
+						} 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') {
+									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}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+							uni.showModal({
+								title: this.translateSys('tip'),
+								content: tip,
+								showCancel: false,
+								confirmText: this.translateSys('close')
+							});
+							console.log(ex)
+							return
+						}
+
 					}
 
 				}).catch(ex => {
@@ -1826,6 +1850,7 @@
 							.err_info :
 							data
 							.err_info.join('<br/>') : '';
+						tip = tip || data.err_info
 						if (data.ret == 801) uni.showModal({
 							title: this.translateSys('tip'),
 							content: tip,
@@ -1884,12 +1909,12 @@
 
 						} else if (typeof data.result == 'string') {
 							if (data.result) {
-							uni.showModal({
-								title: this.translateSys('tip'),
-								content: data.result,
-								showCancel: false,
-								confirmText: this.translateSys('close')
-							});
+								uni.showModal({
+									title: this.translateSys('tip'),
+									content: data.result,
+									showCancel: false,
+									confirmText: this.translateSys('close')
+								});
 							}
 						}
 						try {
@@ -2019,6 +2044,7 @@
 								.err_info :
 								data
 								.err_info.join('<br/>') : '';
+							tip = tip || data.err_info
 							if (data.ret == 801) uni.showModal({
 								title: this.translateSys('tip'),
 								content: tip,
@@ -2044,8 +2070,8 @@
 								showCancel: false,
 								confirmText: this.translateSys('close')
 							});
-							if (data.result) {
-								var result = data.result;
+							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);
@@ -2065,7 +2091,17 @@
 									}
 								}
 
+							} 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();
 						}
@@ -2203,204 +2239,220 @@
 							.info
 							.join(
 								'<br/>') : '';
+						tip = tip || data.err_info
 						if (tip) uni.showModal({
 							title: this.translateSys('tip'),
 							content: tip,
 							showCancel: false,
 							confirmText: this.translateSys('close')
 						});
+						if (data.result_type == 2) {
 
-						if (data != "") {
-							var actions = data.action;
-							console.log(actions);
-							if (actions) {
-								for (var i = 0; i < actions.length; i++) {
-									var action = actions[i];
-									var val = action.value;
-									var enviroment = JSON.stringify(enviroment);
+						} 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);
 
-									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 = {
+								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 = {
 											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();
+										$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 == '鎴戣礋璐ｇ殑椤圭洰')
+										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: "0",
-														projectid: '',
-														rclsid: '',
-														robjid: '',
-														userlogin: '',
-														clsid: $this.param
-															.clsid,
+														edtype: "2",
+														projectid: data[0].ID,
+														rclsid: "",
+														robjid: "",
+														userlogin: "",
+														clsid: $this.$data
+															.param.clsid,
 														objid: "",
 														attr: param.req,
-														inputparameter: data,
 														dataJson: [],
 													}
-													$this.DataObjRunCustomEvent(info,
-														param
-														.data_attr);
+
+													$this.DataObjRunCustomEvent(
+														info);
 												}
 											}
-										});
-									} 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 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 == '鎴戣礋璐ｇ殑椤圭洰')
-											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();
-									}
+									});
+								} 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 {
+
+						} catch (ex) {
+							let actionList = (data.action || []).map(a => a.action_type).join(';')
+							let tip = typeof ex == 'string' ? ex : ex.message
+							tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
 							uni.showModal({
-								title: this.translateSys('tip') + "5.2",
-								content: this.translate("execute_script_return_empty"),
+								title: this.translateSys('tip'),
+								content: tip,
 								showCancel: false,
 								confirmText: this.translateSys('close')
 							});
+							console.log(ex)
+							return
 						}
+
 					}
 
 				}).catch(ex => {
diff --git a/pages/modal/3018_2.vue b/pages/modal/3018_2.vue
index c888cad..31b8b2e 100644
--- a/pages/modal/3018_2.vue
+++ b/pages/modal/3018_2.vue
@@ -467,16 +467,27 @@
 					} 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')
 						});
+						if (data.result_type == 2) {
 
-						var actionlist = data.action;
-						if (actionlist) {
-							console.log(actionlist);
+						} 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') {
@@ -524,7 +535,21 @@
 									});
 								}
 							}
+
+						} catch (ex) {
+							let actionList = (data.action || []).map(a => a.action_type).join(';')
+							let tip = typeof ex == 'string' ? ex : ex.message
+							tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+							uni.showModal({
+								title: this.translateSys('tip'),
+								content: tip,
+								showCancel: false,
+								confirmText: this.translateSys('close')
+							});
+							console.log(ex)
+							return
 						}
+
 					}
 				} catch (ex) {
 					// console.log(ex);
@@ -904,16 +929,27 @@
 							.info
 							.join(
 								'<br/>') : '';
+						tip = tip || data.err_info
 						if (tip) uni.showModal({
 							title: this.translateSys("tip"),
 							content: tip,
 							showCancel: false,
 							confirmText: this.translateSys('close')
 						});
-
-						var actionlist = data.action;
-						if (actionlist) {
-							console.log(actionlist);
+						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') {
@@ -957,15 +993,22 @@
 									});
 								}
 							}
-						}
-						// var head_styledef = JSON.parse(JSON.stringify($this.head_styledef));
-						// $this.head_styledef=[];
-						// $this.head_styledef = head_styledef;
-						console.log($this.head_styledef);
 
-						if (data.result) {
-							$this.setFormValues(data.result)
+						} catch (ex) {
+							let actionList = (data.action || []).map(a => a.action_type).join(';')
+							let tip = typeof ex == 'string' ? ex : ex.message
+							tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+							uni.showModal({
+								title: this.translateSys('tip'),
+								content: tip,
+								showCancel: false,
+								confirmText: this.translateSys('close')
+							});
+							console.log(ex)
+							return
 						}
+
+
 					}
 
 				}).catch(ex => {
@@ -1076,218 +1119,230 @@
 							.info
 							.join(
 								'<br/>') : '';
+						tip = tip || data.err_info
 						if (tip) uni.showModal({
 							title: $this.translateSys("tip"),
 							content: tip,
 							showCancel: false,
 							confirmText: $this.translateSys('close')
 						});
+						if (data.result_type == 2) {
 
-						if (data != "") {
-							var actions = data.action;
-							if (actions) {
-								for (var i = 0; i < actions.length; i++) {
-									var action = actions[i];
-									console.log(action)
-									var val = action.value;
-									var enviroment = JSON.stringify(enviroment);
+						} 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);
 
-									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 = {
+								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.param
+														.DataCls
+														.id,
+													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 = {
 											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();
+										$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 == '鎴戣礋璐ｇ殑椤圭洰')
+										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: "0",
-														projectid: '',
-														rclsid: '',
-														robjid: '',
-														userlogin: '',
-														clsid: $this.param
-															.DataCls
-															.id,
+														edtype: "2",
+														projectid: data[0]
+															.ID,
+														rclsid: "",
+														robjid: "",
+														userlogin: "",
+														clsid: $this.$data
+															.param
+															.DataCls.id,
 														objid: "",
 														attr: param.req,
-														inputparameter: data,
 														dataJson: [],
 													}
-													$this.DataObjRunCustomEvent(
-														info,
-														param
-														.data_attr);
+
+													$this
+														.DataObjRunCustomEvent(
+															info);
 												}
 											}
-										});
-									} 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 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 == '鎴戣礋璐ｇ殑椤圭洰')
-											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.$data
-																.param
-																.DataCls.id,
-															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')
-										});
-									}
+									});
+								} 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 {
+
+						} catch (ex) {
+							let actionList = (data.action || []).map(a => a.action_type).join(';')
+							let tip = typeof ex == 'string' ? ex : ex.message
+							tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
 							uni.showModal({
-								title: $this.translateSys('tip') + "5.2",
-								content: $this.translateSys(
-										"quotation_mark_left") +
-									"before_click_button" + $this.translateSys(
-										"quotation_mark_right") + $this
-									.translateSys(
-										"comma") + 'event_id' + eventid,
+								title: this.translateSys('tip'),
+								content: tip,
 								showCancel: false,
-								confirmText: $this.translateSys('close')
+								confirmText: this.translateSys('close')
 							});
+							console.log(ex)
+							return
 						}
+
 					}
 
 				}).catch(ex => {
@@ -1658,6 +1713,7 @@
 							.info
 							.join(
 								'<br/>') : '';
+						tip = tip || data.err_info
 						if (tip) uni.showModal({
 							title: this.translateSys("tip"),
 							content: tip,
@@ -1673,9 +1729,20 @@
 									"&titlename=" + this.title
 							});
 						} else {
-							var actionlist = data.action;
-							if (actionlist) {
-								console.log(actionlist);
+							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 i = 0; i < actionlist.length; i++) {
 									var action = actionlist[i];
 									if (action.action_type == 'set_dlg_attr') {
@@ -1707,7 +1774,21 @@
 									}
 
 								}
+
+							} catch (ex) {
+								let actionList = (data.action || []).map(a => a.action_type).join(';')
+								let tip = typeof ex == 'string' ? ex : ex.message
+								tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+								uni.showModal({
+									title: this.translateSys('tip'),
+									content: tip,
+									showCancel: false,
+									confirmText: this.translateSys('close')
+								});
+								console.log(ex)
+								return
 							}
+
 						}
 					}
 
@@ -1833,6 +1914,7 @@
 							.info
 							.join(
 								'<br/>') : '';
+						tip = tip || data.err_info
 						if (tip) uni.showModal({
 							title: this.translateSys("tip"),
 							content: tip,
@@ -1848,9 +1930,20 @@
 									"&titlename=" + this.title
 							});
 						} else {
-							var actionlist = data.action;
-							if (actionlist) {
-								console.log(actionlist);
+							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 i = 0; i < actionlist.length; i++) {
 									var action = actionlist[i];
 									if (action.action_type == 'set_dlg_attr') {
@@ -1882,7 +1975,22 @@
 									}
 
 								}
+
+
+							} catch (ex) {
+								let actionList = (data.action || []).map(a => a.action_type).join(';')
+								let tip = typeof ex == 'string' ? ex : ex.message
+								tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+								uni.showModal({
+									title: this.translateSys('tip'),
+									content: tip,
+									showCancel: false,
+									confirmText: this.translateSys('close')
+								});
+								console.log(ex)
+								return
 							}
+
 						}
 					}
 
diff --git a/pages/modal/3037.vue b/pages/modal/3037.vue
index 74b983c..bb8df8a 100644
--- a/pages/modal/3037.vue
+++ b/pages/modal/3037.vue
@@ -2620,6 +2620,7 @@
 							.info : data.info
 							.join('<br/>') :
 							'';
+						tip = tip || data.err_info
 						if (tip) uni
 							.showModal({
 								title: this.translateSys('tip'),
@@ -2907,12 +2908,114 @@
 								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;
+										}
+									}
+								}
 
-						var actionlist = data
-							.action;
-						if (actionlist) {
-							console.log(
-								actionlist);
+								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')
+								});
+							}
+						}
+						try {
+							var actionlist = data.action || []
 							for (var i = 0; i <
 								actionlist
 								.length; i++) {
@@ -3119,104 +3222,22 @@
 										.value || [];
 								}
 							}
+
+						} catch (ex) {
+							let actionList = (data.action || []).map(a => a.action_type).join(';')
+							let tip = typeof ex == 'string' ? ex : ex.message
+							tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+							uni.showModal({
+								title: this.translateSys('tip'),
+								content: tip,
+								showCancel: false,
+								confirmText: this.translateSys('close')
+							});
+							console.log(ex)
+							return
 						}
 
-						if (data.result) {
-							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;
-										}
-									}
-								}
 
-								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;
-										}
-									}
-								}
-							}
-						}
 					}
 
 				}).catch(ex => {
@@ -3360,16 +3381,16 @@
 							.info : data.info
 							.join('<br/>') :
 							'';
-						if (tip) uni
-							.showModal({
+						tip = tip || data.err_info
+						if (tip)
+							uni.showModal({
 								title: this.translateSys('tip'),
 								content: tip,
 								showCancel: false,
 								confirmText: this.translateSys('close')
 							});
-						if (data.result) {
-							var result = data
-								.result;
+						if (data.result_type == 2) {
+							var result = data.result || []
 							for (var i = 0; i <
 								result.length; i++
 							) {
@@ -3421,7 +3442,18 @@
 							}
 
 							this.add();
+
+						} else if (typeof data.result == 'string') {
+							if (data.result) {
+								uni.showModal({
+									title: this.translateSys('tip'),
+									content: data.result,
+									showCancel: false,
+									confirmText: this.translateSys('close')
+								});
+							}
 						}
+
 					}
 
 				}).catch(ex => {
@@ -3570,6 +3602,7 @@
 							.info : data.info
 							.join('<br/>') :
 							'';
+						tip = tip || data.err_info
 						if (tip) uni
 							.showModal({
 								title: this.translateSys('tip'),
@@ -3577,89 +3610,269 @@
 								showCancel: false,
 								confirmText: this.translateSys('close')
 							});
+						if (data.result_type == 2) {
 
-						if (data != "") {
-							var actions = data
-								.action;
-							console.log(
-								actions);
-							if (actions) {
-								for (var i =
-										0; i <
-									actions
-									.length; i++
+						} 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
+									);
+
+								if (action
+									.action_type ==
+									'open_panel'
 								) {
-									var action =
-										actions[
-											i];
-									var val =
+									var d =
+										dialog({
+											title: '<i class="ace-icon fa fa-info-circle"></i> ' +
+												this.translateSys('tip'),
+											content: action
+												.action_type +
+												'姝ction灏氭湭澶勭悊锛�
+										});
+									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
+														.Master_Cls
+														.ID,
+													objid: "",
+													attr: param
+														.req,
+													inputparameter: data
+												}
+												$this
+													.DataObjRunCustomEvent(
+														info,
+														param
+														.data_attr
+													);
+											}
+										}
+									});
+								} else if (
+									action
+									.action_type ==
+									'open_data_query_dlg'
+								) {
+
+								} else if (
+									action
+									.action_type ==
+									'open_common_dlg'
+								) {
+									var value =
 										action
 										.value;
-									var enviroment =
-										JSON
-										.stringify(
-											enviroment
-										);
-
+									var d =
+										dialog({
+											title: '<i class="ace-icon fa fa-info-circle"></i> ' +
+												this.translateSys('tip'),
+											content: action
+												.action_type +
+												'姝ction灏氭湭澶勭悊锛�
+										});
+									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
-										.action_type ==
-										'open_panel'
-									) {
-										var d =
-											dialog({
-												title: '<i class="ace-icon fa fa-info-circle"></i> ' +
-													this.translateSys('tip'),
-												content: action
-													.action_type +
-													'姝ction灏氭湭澶勭悊锛�
-											});
-										d
-											.show();
-									} else if (
+										.value
+										.select_range ==
+										'鍏ㄩ儴鐩稿叧'
+									)
+										priRel =
+										'0';
+									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 =
+										.value
+										.select_range ==
+										'鎴戣礋璐ｇ殑椤圭洰'
+									)
+										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
-														.button_callback
-														.trim();
+														.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: "0",
-														projectid: '',
-														rclsid: '',
-														robjid: '',
-														userlogin: '',
+														edtype: "2",
+														projectid: data[
+																0
+															]
+															.ID,
+														rclsid: "",
+														robjid: "",
+														userlogin: "",
 														clsid: $this
 															.param
 															.Master_Cls
@@ -3667,212 +3880,44 @@
 														objid: "",
 														attr: param
 															.req,
-														inputparameter: data
 													}
+
 													$this
 														.DataObjRunCustomEvent(
-															info,
-															param
-															.data_attr
+															info
 														);
 												}
 											}
-										});
-									} else if (
-										action
-										.action_type ==
-										'open_data_query_dlg'
-									) {
-
-									} else if (
-										action
-										.action_type ==
-										'open_common_dlg'
-									) {
-										var value =
-											action
-											.value;
-										var d =
-											dialog({
-												title: '<i class="ace-icon fa fa-info-circle"></i> ' +
-													this.translateSys('tip'),
-												content: action
-													.action_type +
-													'姝ction灏氭湭澶勭悊锛�
-											});
-										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 ==
-											'鎴戣礋璐ｇ殑椤圭洰'
-										)
-											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
-																.param
-																.Master_Cls
-																.ID,
-															objid: "",
-															attr: param
-																.req,
-														}
-
-														$this
-															.DataObjRunCustomEvent(
-																info
-															);
-													}
-												}
-											}
+									});
+								} else {
+									var d =
+										dialog({
+											title: '<i class="ace-icon fa fa-info-circle"></i> ' +
+												this.translateSys('tip'),
+											content: action
+												.action_type +
+												'姝ction灏氭湭澶勭悊锛�
 										});
-									} else {
-										var d =
-											dialog({
-												title: '<i class="ace-icon fa fa-info-circle"></i> ' +
-													this.translateSys('tip'),
-												content: action
-													.action_type +
-													'姝ction灏氭湭澶勭悊锛�
-											});
-										d
-											.show();
-									}
+									d
+										.show();
 								}
 							}
-						} else {
+
+						} catch (ex) {
+							let actionList = (data.action || []).map(a => a.action_type).join(';')
+							let tip = typeof ex == 'string' ? ex : ex.message
+							tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
 							uni.showModal({
-								title: this.translateSys('tip') + "5.2",
-								content: '璋冪敤 before_click_button 鑴氭湰杩斿洖绌猴紝event_id' +
-									eventid,
+								title: this.translateSys('tip'),
+								content: tip,
 								showCancel: false,
 								confirmText: this.translateSys('close')
 							});
+							console.log(ex)
+							return
 						}
+
 					}
 
 				}).catch(ex => {
@@ -3980,6 +4025,7 @@
 								.info : data.info
 								.join('<br/>') :
 								'';
+							tip = tip || data.err_info
 							if (tip) uni
 								.showModal({
 									title: this.translateSys('tip'),
@@ -3987,25 +4033,25 @@
 									showCancel: false,
 									confirmText: this.translateSys('close')
 								});
+							if (data.result_type == 2) {
 
-							var actionlist = data
-								.action;
-							if (actionlist) {
-								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'
-									) {
+							} 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) {
 											var val = value;
 											if (typeof value == 'string') {
@@ -4041,17 +4087,20 @@
 										}
 									}
 								}
-								if (action_type ==
-									'open_select_userdlg'
-								) {
-									uni.showModal({
-										title: this.translateSys('error') + " 6.2",
-										content: "open_select_userdlg杩欎釜action_type杩樻湭澶勭悊锛�,
-										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}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+								uni.showModal({
+									title: this.translateSys('tip'),
+									content: tip,
+									showCancel: false,
+									confirmText: this.translateSys('close')
+								});
+								console.log(ex)
+								return
 							}
+
 						}
 					}
 
@@ -4170,19 +4219,200 @@
 						.info : data.info
 						.join('<br/>') :
 						'';
-					if (tip) uni
-						.showModal({
+					tip = tip || data.err_info
+					if (tip)
+						uni.showModal({
 							title: this.translateSys('tip'),
 							content: tip,
 							showCancel: false,
 							confirmText: this.translateSys('close')
 						});
+					if (data.result_type == 2) {
+						if (data.result) {
+							var list_1 = JSON
+								.parse(JSON
+									.stringify(
+										this.subClassAttrList
+									));
+							var scanCodeVal =
+								$this.scanCodeVal;
+							var rand = '';
+							for (var i = 0; i <
+								5; i++
+							) { //鐢熸垚5浣嶉殢鏈烘暟
+								rand += Math
+									.floor(Math
+										.random() *
+										10);
+							}
+							if (inputParamter[
+									0].attr) {
+								if (inputParamter[
+										0]
+									.attr ==
+									"mast_input_3037"
+								) //鍒ゆ柇鏄富鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�+									scanCodeVal =
+									"mast_input_3037-" +
+									rand;
+							}
+							if (info.attr[0]
+								.attr) {
+								if (info.attr[
+										0]
+									.attr ==
+									"mast_input_3037"
+								) //鍒ゆ柇鏄富鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�+									scanCodeVal =
+									"mast_input_3037-" +
+									rand;
+							}
+							$this.subPanelList
+								.push({
+									scanCodeVal: scanCodeVal,
+									subClassAttr: list_1
+								});
+							var result = data
+								.result;
+							for (var i = 0; i <
+								result
+								.length; i++) {
+								for (var s =
+										0; s <
+									$this.subPanelList
+									.length; s++
+								) {
+									if ($this.subPanelList[
+											s]
+										.scanCodeVal ==
+										scanCodeVal
+									) {
+										if (result[
+												i
+											]
+											.attr ==
+											"S_ID"
+										)
+											$this.subPanelList[
+												s
+											]
+											.ObjID =
+											result[
+												i
+											]
+											.value;
+										var _subClassAttr =
+											$this.subPanelList[
+												s
+											]
+											.subClassAttr;
+										for (
+											var c =
+												0; c <
+											_subClassAttr
+											.length; c++
+										) {
+											var attr =
+												_subClassAttr[
+													c
+												]
+												.Attr;
+											for (
+												var j =
+													0; j <
+												attr
+												.length; j++
+											) {
+												// console.log(attr[j].Name+'=='+result[i].attr);
+												if (attr[
+														j
+													]
+													.Name ==
+													result[
+														i
+													]
+													.attr
+												) {
+													attr[
+															j]
+														.Value =
+														result[
+															i
+														]
+														.value;
+												}
+											}
+										}
+									}
+								}
 
-					var actionlist = data
-						.action;
-					if (actionlist) {
-						console.log(
-							actionlist);
+								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')
+							});
+						}
+					}
+					try {
+						var actionlist = data.action || []
 						for (var ii =
 								0; ii <
 							actionlist
@@ -4595,180 +4825,21 @@
 								}
 							}
 						}
+
+					} catch (ex) {
+						let actionList = (data.action || []).map(a => a.action_type).join(';')
+						let tip = typeof ex == 'string' ? ex : ex.message
+						tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+						uni.showModal({
+							title: this.translateSys('tip'),
+							content: tip,
+							showCancel: false,
+							confirmText: this.translateSys('close')
+						});
+						console.log(ex)
+						return
 					}
 
-					if (data.result) {
-						var list_1 = JSON
-							.parse(JSON
-								.stringify(
-									this.subClassAttrList
-								));
-						var scanCodeVal =
-							$this.scanCodeVal;
-						var rand = '';
-						for (var i = 0; i <
-							5; i++
-						) { //鐢熸垚5浣嶉殢鏈烘暟
-							rand += Math
-								.floor(Math
-									.random() *
-									10);
-						}
-						if (inputParamter[
-								0].attr) {
-							if (inputParamter[
-									0]
-								.attr ==
-								"mast_input_3037"
-							) //鍒ゆ柇鏄富鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�-								scanCodeVal =
-								"mast_input_3037-" +
-								rand;
-						}
-						if (info.attr[0]
-							.attr) {
-							if (info.attr[
-									0]
-								.attr ==
-								"mast_input_3037"
-							) //鍒ゆ柇鏄富鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�-								scanCodeVal =
-								"mast_input_3037-" +
-								rand;
-						}
-						$this.subPanelList
-							.push({
-								scanCodeVal: scanCodeVal,
-								subClassAttr: list_1
-							});
-						var result = data
-							.result;
-						for (var i = 0; i <
-							result
-							.length; i++) {
-							for (var s =
-									0; s <
-								$this.subPanelList
-								.length; s++
-							) {
-								if ($this.subPanelList[
-										s]
-									.scanCodeVal ==
-									scanCodeVal
-								) {
-									if (result[
-											i
-										]
-										.attr ==
-										"S_ID"
-									)
-										$this.subPanelList[
-											s
-										]
-										.ObjID =
-										result[
-											i
-										]
-										.value;
-									var _subClassAttr =
-										$this.subPanelList[
-											s
-										]
-										.subClassAttr;
-									for (
-										var c =
-											0; c <
-										_subClassAttr
-										.length; c++
-									) {
-										var attr =
-											_subClassAttr[
-												c
-											]
-											.Attr;
-										for (
-											var j =
-												0; j <
-											attr
-											.length; j++
-										) {
-											// console.log(attr[j].Name+'=='+result[i].attr);
-											if (attr[
-													j
-												]
-												.Name ==
-												result[
-													i
-												]
-												.attr
-											) {
-												attr[
-														j]
-													.Value =
-													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;
-									}
-								}
-							}
-						}
-					}
 				}
 
 			}).catch(ex => {
@@ -4981,16 +5052,16 @@
 						.info : data.info
 						.join('<br/>') :
 						'';
-					if (tip) uni
-						.showModal({
+					tip = tip || data.err_info
+					if (tip)
+						uni.showModal({
 							title: this.translateSys('tip'),
 							content: tip,
 							showCancel: false,
 							confirmText: this.translateSys('close')
 						});
 
-					var result = data
-						.result;
+					//	var result = data.result;
 					if (eventID != $this.param.After_OK_Event.ID)
 						$this.scan_OKDataObjRunCustomEvent(
 							$this.param
diff --git a/pages/modal/3037_2.vue b/pages/modal/3037_2.vue
index e0896b0..34e9a39 100644
--- a/pages/modal/3037_2.vue
+++ b/pages/modal/3037_2.vue
@@ -1,7 +1,8 @@
 <template>
 	<view class="uni-page-modal-3017-2" :class="largeMode?'large-mode':''">
 		<!-- 琛ㄥご鏍峰紡 -->
-		<OIForm ref="refBaseForm" class="v-headStyle" :form="head_styledef.form" :hiddenIds="head_styledef.hiddenIds ?head_styledef.hiddenIds :[] " @on-focus="ontap"
+		<OIForm ref="refBaseForm" class="v-headStyle" :form="head_styledef.form"
+			:hiddenIds="head_styledef.hiddenIds ?head_styledef.hiddenIds :[] " @on-focus="ontap"
 			@on-change="onEnterChange" @on-click-prefix="classAttr_extButton" @on-click-suffix="classAttr_extButton">
 		</OIForm>
 		<!-- 浠庢暟鎹�-->
@@ -463,16 +464,27 @@
 					} 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')
 						});
+						if (data.result_type == 2) {
 
-						var actionlist = data.action;
-						if (actionlist) {
-							console.log(actionlist);
+						} 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') {
@@ -604,7 +616,21 @@
 									});
 								}
 							}
+
+						} catch (ex) {
+							let actionList = (data.action || []).map(a => a.action_type).join(';')
+							let tip = typeof ex == 'string' ? ex : ex.message
+							tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+							uni.showModal({
+								title: this.translateSys('tip'),
+								content: tip,
+								showCancel: false,
+								confirmText: this.translateSys('close')
+							});
+							console.log(ex)
+							return
 						}
+
 					}
 
 				}).catch(ex => {
@@ -853,201 +879,215 @@
 							.info
 							.join(
 								'<br/>') : '';
+						tip = tip || data.err_info
 						if (tip) uni.showModal({
 							title: $this.translateSys("tip"),
 							content: tip,
 							showCancel: false,
 							confirmText: $this.translateSys('close')
 						});
+						if (data.result_type == 2) {
 
-						if (data != "") {
-							var actions = data.action;
-							if (actions) {
-								for (var i = 0; i < actions.length; i++) {
-									var action = actions[i];
-									console.log(action)
-									var val = action.value;
-									var enviroment = JSON.stringify(enviroment);
+						} 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);
 
-									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 = {
+								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.param
+														.DataCls
+														.id,
+													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 = {
 											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();
+										$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 == '鎴戣礋璐ｇ殑椤圭洰')
+										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: "0",
-														projectid: '',
-														rclsid: '',
-														robjid: '',
-														userlogin: '',
+														edtype: "2",
+														projectid: data[0].ID,
+														rclsid: "",
+														robjid: "",
+														userlogin: "",
 														clsid: $this.param
-															.DataCls
-															.id,
+															.DataCls.id,
 														objid: "",
 														attr: param.req,
-														inputparameter: data,
 														dataJson: [],
 													}
-													$this.DataObjRunCustomEvent(info,
-														param
-														.data_attr);
+
+													$this.DataObjRunCustomEvent(
+														info);
 												}
 											}
-										});
-									} 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 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 == '鎴戣礋璐ｇ殑椤圭洰')
-											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.param
-																.DataCls.id,
-															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')
-										});
-									}
+									});
+								} 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 {
+
+						} catch (ex) {
+							let actionList = (data.action || []).map(a => a.action_type).join(';')
+							let tip = typeof ex == 'string' ? ex : ex.message
+							tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
 							uni.showModal({
-								title: $this.translateSys('tip') + "5.2",
-								content: $this.translateSys("quotation_mark_left") +
-									"before_click_button" + $this.translateSys(
-										"quotation_mark_right") + $this.translateSys(
-										"comma") + 'event_id' + eventid,
+								title: this.translateSys('tip'),
+								content: tip,
 								showCancel: false,
-								confirmText: $this.translateSys('close')
+								confirmText: this.translateSys('close')
 							});
+							console.log(ex)
+							return
 						}
+
 					}
 
 				}).catch(ex => {
@@ -1529,16 +1569,73 @@
 					} 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')
 						});
+						if (data.result_type == 2) {
+							var result = data.result || []
 
-						var actionlist = data.action;
-						if (actionlist) {
-							console.log(actionlist);
+							for (var i = 0; i < result.length; i++) {
+								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) {
+											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;
+												}
+											}
+										});
+									}
+
+								}
+
+								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')
+								});
+							}
+						}
+						try {
+							var actionlist = data.action || []
 							for (var i = 0; i < actionlist.length; i++) {
 								var action = actionlist[i];
 								if (action.action_type == 'set_dlg_attr') {
@@ -1621,54 +1718,21 @@
 								}
 
 							}
+
+						} catch (ex) {
+							let actionList = (data.action || []).map(a => a.action_type).join(';')
+							let tip = typeof ex == 'string' ? ex : ex.message
+							tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+							uni.showModal({
+								title: this.translateSys('tip'),
+								content: tip,
+								showCancel: false,
+								confirmText: this.translateSys('close')
+							});
+							console.log(ex)
+							return
 						}
 
-						if (data.result) {
-							var result = data.result;
-							for (var i = 0; i < result.length; i++) {
-								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) {
-											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;
-												}
-											}
-										});
-									}
-
-								}
-
-								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;
-										}
-									}
-								}
-							}
-						}
 					}
 
 				}).catch(ex => {
@@ -1791,16 +1855,87 @@
 					} 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')
 						});
+						if (data.result_type == 2) {
+							if (data.result) {
 
-						var actionlist = data.action;
-						if (actionlist) {
-							console.log(actionlist);
+								var list_1 = JSON.parse(JSON.stringify(this.detail1_styledef));
+								var scanCodeVal = $this.scanCodeVal;
+								var rand = '';
+								for (var i = 0; i < 5; i++) { //鐢熸垚5浣嶉殢鏈烘暟
+									rand += Math.floor(Math.random() * 10);
+								}
+								if (inputParamter[0].attr) {
+									if (inputParamter[0].attr == "mast_input_3037") //鍒ゆ柇鏄富鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�+										scanCodeVal = "mast_input_3037-" + rand;
+								}
+								if (info.attr[0].attr) {
+									if (info.attr[0].attr == "mast_input_3037") //鍒ゆ柇鏄富鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�+										scanCodeVal = "mast_input_3037-" + rand;
+								}
+								$this.subPanelList.push({
+									scanCodeVal: scanCodeVal,
+									subClassAttr: list_1
+								});
+								var result = data.result || []
+								for (var i = 0; i < result.length; i++) {
+									for (var s = 0; s < $this.subPanelList.length; s++) {
+										if ($this.subPanelList[s].scanCodeVal == scanCodeVal) {
+											if (result[i].attr == "S_ID")
+												$this.subPanelList[s].ObjID = result[i].value;
+											var _subClassAttr = $this.subPanelList[s].subClassAttr.form
+												.items;
+											for (var c = 0; c < _subClassAttr.length; c++) {
+												if (_subClassAttr[c].name != 'Layout') {
+													if (_subClassAttr[c].fieldId == result[i].attr)
+														_subClassAttr[c].value = result[i].value;
+												} else if (_subClassAttr[c].name == 'Layout') {
+													_subClassAttr[c].setting.colList.forEach(col => {
+														if (col) {
+															if (col.fieldId == result[i].attr)
+																col.value = 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')
+								});
+							}
+						}
+						try {
+							var actionlist = data.action || []
 							for (var ii = 0; ii < actionlist.length; ii++) {
 								var action = actionlist[ii];
 								if (action.action_type == 'set_dlg_attr') {
@@ -1944,66 +2079,20 @@
 									});
 								}
 							}
-						}
 
-						if (data.result) {
-							var list_1 = JSON.parse(JSON.stringify(this.detail1_styledef));
-							var scanCodeVal = $this.scanCodeVal;
-							var rand = '';
-							for (var i = 0; i < 5; i++) { //鐢熸垚5浣嶉殢鏈烘暟
-								rand += Math.floor(Math.random() * 10);
-							}
-							if (inputParamter[0].attr) {
-								if (inputParamter[0].attr == "mast_input_3037") //鍒ゆ柇鏄富鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�-									scanCodeVal = "mast_input_3037-" + rand;
-							}
-							if (info.attr[0].attr) {
-								if (info.attr[0].attr == "mast_input_3037") //鍒ゆ柇鏄富鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�-									scanCodeVal = "mast_input_3037-" + rand;
-							}
-							$this.subPanelList.push({
-								scanCodeVal: scanCodeVal,
-								subClassAttr: list_1
+
+						} catch (ex) {
+							let actionList = (data.action || []).map(a => a.action_type).join(';')
+							let tip = typeof ex == 'string' ? ex : ex.message
+							tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+							uni.showModal({
+								title: this.translateSys('tip'),
+								content: tip,
+								showCancel: false,
+								confirmText: this.translateSys('close')
 							});
-							var result = data.result;
-							for (var i = 0; i < result.length; i++) {
-								for (var s = 0; s < $this.subPanelList.length; s++) {
-									if ($this.subPanelList[s].scanCodeVal == scanCodeVal) {
-										if (result[i].attr == "S_ID")
-											$this.subPanelList[s].ObjID = result[i].value;
-										var _subClassAttr = $this.subPanelList[s].subClassAttr.form
-											.items;
-										for (var c = 0; c < _subClassAttr.length; c++) {
-											if (_subClassAttr[c].name != 'Layout') {
-												if (_subClassAttr[c].fieldId == result[i].attr)
-													_subClassAttr[c].value = result[i].value;
-											} else if (_subClassAttr[c].name == 'Layout') {
-												_subClassAttr[c].setting.colList.forEach(col => {
-													if (col) {
-														if (col.fieldId == result[i].attr)
-															col.value = 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;
-										}
-									}
-								}
-							}
+							console.log(ex)
+							return
 						}
 					}
 
@@ -2139,6 +2228,7 @@
 					} 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,
@@ -2146,7 +2236,7 @@
 							confirmText: this.translateSys('close')
 						});
 
-						var result = data.result;
+						// var result = data.result;
 						if (eventID != $this.param.After_OK_Event.ID)
 							$this.scan_OKDataObjRunCustomEvent($this.param.After_OK_Event.ID);
 						else {
diff --git a/pages/modal/3200.vue b/pages/modal/3200.vue
index dd162d9..78e4726 100644
--- a/pages/modal/3200.vue
+++ b/pages/modal/3200.vue
@@ -1093,6 +1093,7 @@
 							result
 							.info :
 							result.info.join('<br/>') : '';
+						tip = tip || result.err_info
 						if (tip) uni.showModal({
 							title: this.translateSys("tip"),
 							content: tip,
diff --git a/pages/modal/5601.vue b/pages/modal/5601.vue
index 934899f..2d5a5eb 100644
--- a/pages/modal/5601.vue
+++ b/pages/modal/5601.vue
@@ -2159,16 +2159,27 @@
 							.info
 							.join(
 								'<br/>') : '';
+						tip = tip || data.err_info
 						if (tip) uni.showModal({
 							title: this.translateSys("tip"),
 							content: tip,
 							showCancel: false,
 							confirmText: this.translateSys('close')
 						});
-
-						var actionlist = data.action;
-						if (actionlist) {
-							console.log(actionlist);
+						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') {
@@ -2196,12 +2207,22 @@
 									});
 								}
 							}
+
+
+						} catch (ex) {
+							let actionList = (data.action || []).map(a => a.action_type).join(';')
+							let tip = typeof ex == 'string' ? ex : ex.message
+							tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+							uni.showModal({
+								title: this.translateSys('tip'),
+								content: tip,
+								showCancel: false,
+								confirmText: this.translateSys('close')
+							});
+							console.log(ex)
+							return
 						}
-						console.log($this.head_styledef);
-						if (data.result) {
-							var result = data.result;
-							$this.setFormValues(result)
-						}
+
 					}
 
 				}).catch(ex => {
@@ -2310,205 +2331,219 @@
 							.info
 							.join(
 								'<br/>') : '';
+						tip = tip || data.err_info
 						if (tip) uni.showModal({
 							title: $this.translateSys("tip"),
 							content: tip,
 							showCancel: false,
 							confirmText: $this.translateSys('close')
 						});
+						if (data.result_type == 2) {
 
-						if (data != "") {
-							var actions = data.action;
-							if (actions) {
-								for (var i = 0; i < actions.length; i++) {
-									var action = actions[i];
-									console.log(action)
-									var val = action.value;
-									var enviroment = JSON.stringify(enviroment);
+						} 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);
 
-									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 = {
+								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.param
+														.DataCls
+														.id,
+													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
+										})
+										console.log($this.check_list)
+										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
 										}
-										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();
+										$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 == '鎴戣礋璐ｇ殑椤圭洰')
+										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: "0",
-														projectid: '',
-														rclsid: '',
-														robjid: '',
-														userlogin: '',
-														clsid: $this.param
-															.DataCls
-															.id,
+														edtype: "2",
+														projectid: data[0].ID,
+														rclsid: "",
+														robjid: "",
+														userlogin: "",
+														clsid: $this.$data
+															.param
+															.DataCls.id,
 														objid: "",
 														attr: param.req,
-														inputparameter: data,
 														dataJson: [],
 													}
-													$this.DataObjRunCustomEvent(info,
-														param
-														.data_attr);
+
+													$this.DataObjRunCustomEvent(
+														info);
 												}
 											}
-										});
-									} 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
-											})
-											console.log($this.check_list)
-											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 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 == '鎴戣礋璐ｇ殑椤圭洰')
-											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.$data
-																.param
-																.DataCls.id,
-															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')
-										});
-									}
+									});
+								} 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 {
+
+						} catch (ex) {
+							let actionList = (data.action || []).map(a => a.action_type).join(';')
+							let tip = typeof ex == 'string' ? ex : ex.message
+							tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
 							uni.showModal({
-								title: $this.translateSys('tip') + "5.2",
-								content: $this.translateSys("quotation_mark_left") +
-									"before_click_button" + $this.translateSys(
-										"quotation_mark_right") + $this.translateSys(
-										"comma") + 'event_id' + eventid,
+								title: this.translateSys('tip'),
+								content: tip,
 								showCancel: false,
-								confirmText: $this.translateSys('close')
+								confirmText: this.translateSys('close')
 							});
+							console.log(ex)
+							return
 						}
+
 					}
 
 				}).catch(ex => {
diff --git a/pages/modal/form/index.vue b/pages/modal/form/index.vue
index a49833b..efb6e0c 100644
--- a/pages/modal/form/index.vue
+++ b/pages/modal/form/index.vue
@@ -1151,16 +1151,27 @@
 							.info
 							.join(
 								'<br/>') : '';
+						tip = tip || data.err_info
 						if (tip) uni.showModal({
 							title: this.translateSys("tip"),
 							content: tip,
 							showCancel: false,
 							confirmText: this.translateSys('close')
 						});
-
-						var actionlist = data.action;
-						if (actionlist) {
-							console.log(actionlist);
+						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') {
@@ -1187,11 +1198,22 @@
 									});
 								}
 							}
+
+						} catch (ex) {
+							let actionList = (data.action || []).map(a => a.action_type).join(';')
+							let tip = typeof ex == 'string' ? ex : ex.message
+							tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+							uni.showModal({
+								title: this.translateSys('tip'),
+								content: tip,
+								showCancel: false,
+								confirmText: this.translateSys('close')
+							});
+							console.log(ex)
+							return
 						}
-						console.log($this.head_styledef);
-						if (data.result) {
-							$this.setFormValues(data.result)
-						}
+
+
 					}
 
 				}).catch(ex => {
@@ -1295,203 +1317,217 @@
 							.info
 							.join(
 								'<br/>') : '';
+						tip = tip || data.err_info
 						if (tip) uni.showModal({
 							title: $this.translateSys("tip"),
 							content: tip,
 							showCancel: false,
 							confirmText: $this.translateSys('close')
 						});
+						if (data.result_type == 2) {
 
-						if (data != "") {
-							var actions = data.action;
-							if (actions) {
-								for (var i = 0; i < actions.length; i++) {
-									var action = actions[i];
-									console.log(action)
-									var val = action.value;
-									var enviroment = JSON.stringify(enviroment);
+						} 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);
 
-									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 = {
+								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 = {
 											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();
+										$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 == '鎴戣礋璐ｇ殑椤圭洰')
+										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: "0",
-														projectid: '',
-														rclsid: '',
-														robjid: '',
-														userlogin: '',
+														edtype: "2",
+														projectid: data[0].ID,
+														rclsid: "",
+														robjid: "",
+														userlogin: "",
 														clsid: $this.clsId,
 														objid: "",
 														attr: param.req,
-														inputparameter: data,
 														dataJson: [],
 													}
-													$this.DataObjRunCustomEvent(info,
-														param
-														.data_attr);
+
+													$this.DataObjRunCustomEvent(
+														info);
 												}
 											}
-										});
-									} 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 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 == '鎴戣礋璐ｇ殑椤圭洰')
-											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')
-										});
-									}
+									});
+								} 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 {
+
+						} catch (ex) {
+							let actionList = (data.action || []).map(a => a.action_type).join(';')
+							let tip = typeof ex == 'string' ? ex : ex.message
+							tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
 							uni.showModal({
-								title: $this.translateSys('tip') + "5.2",
-								content: $this.translateSys("quotation_mark_left") +
-									"before_click_button" + $this.translateSys(
-										"quotation_mark_right") + $this.translateSys(
-										"comma") + 'event_id' + eventid,
+								title: this.translateSys('tip'),
+								content: tip,
 								showCancel: false,
-								confirmText: $this.translateSys('close')
+								confirmText: this.translateSys('close')
 							});
+							console.log(ex)
+							return
 						}
+
 					}
 
 				}).catch(ex => {

--
Gitblit v1.9.1