From 2ffd3fc56f81f08ec3dcfb50076e54542685725b Mon Sep 17 00:00:00 2001
From: jt <jt@activesoft.com.cn>
Date: 星期一, 29 一月 2024 09:18:14 +0800
Subject: [PATCH] Mobox3PDA-3037调试错误改进

---
 pages/modal/3018.vue |  603 +++++++++++++++++++++++++++++-------------------------
 1 files changed, 320 insertions(+), 283 deletions(-)

diff --git a/pages/modal/3018.vue b/pages/modal/3018.vue
index 7823902..b4b8747 100644
--- a/pages/modal/3018.vue
+++ b/pages/modal/3018.vue
@@ -1469,64 +1469,73 @@
 					console.log(success);
 					if (success.err_code == 0) {
 						var data = success.result;
-						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) {
-											console.log(value);
-											for (var i = 0; i < value.length; i++) {
-												for (var a = 0; a < this.$data.classAttrList.length; a++) {
-													for (var l = 0; l < this.$data.classAttrList[a].Attr.length; l++) {
-														var ca = this.$data.classAttrList[a].Attr[l];
-														if (value[i].attr  == ca.Name) {
-															if(ca.Type=='瀛楀吀' || ca.Type=='瀛楀吀-瀛楃涓� || ca.Type=='瀛楀吀-鏁存暟'){
-																var dictItemList=[];
-																for(var d in value[i].choice_list){
-																	var list_val =value[i].choice_list[d];
-																	dictItemList.push({"CN_S_NAME":list_val,"Name":list_val,"label":list_val,"value":list_val});
-																	
+						if (data.ret != 0) {
+						    var tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data.err_info.join('<br/>') : '';
+						    if (data.ret == 801) uni.showModal({title:'鎻愮ず',content:tip,showCancel:false,confirmText:"鍙栨秷"});
+						    else uni.showModal({title:'鎻愮ず',content:tip+',鎻愮ず:'+data.ret,showCancel:false,confirmText:"鍙栨秷"});
+							return false
+						}else{
+							let tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join('<br/>') : '';
+							if (tip) uni.showModal({title:'鎻愮ず',content:tip,showCancel:false,confirmText:"鍙栨秷"});
+						
+							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) {
+												console.log(value);
+												for (var i = 0; i < value.length; i++) {
+													for (var a = 0; a < this.$data.classAttrList.length; a++) {
+														for (var l = 0; l < this.$data.classAttrList[a].Attr.length; l++) {
+															var ca = this.$data.classAttrList[a].Attr[l];
+															if (value[i].attr  == ca.Name) {
+																if(ca.Type=='瀛楀吀' || ca.Type=='瀛楀吀-瀛楃涓� || ca.Type=='瀛楀吀-鏁存暟'){
+																	var dictItemList=[];
+																	for(var d in value[i].choice_list){
+																		var list_val =value[i].choice_list[d];
+																		dictItemList.push({"CN_S_NAME":list_val,"Name":list_val,"label":list_val,"value":list_val});
+																		
+																	}
+																	ca.dictitem = dictItemList;
+																	// attr[j].dictitem = val[i].choice_list;
+																}else{
+																	ca.Value = value[i].value;
 																}
-																ca.dictitem = dictItemList;
-																// attr[j].dictitem = val[i].choice_list;
-															}else{
-																ca.Value = value[i].value;
 															}
 														}
 													}
-												}
-						
-												var length = 0;
-												if (!this.$data.refdatastore.filter(function (s) {
-													return value[i].attr == s.attr
-												}).length) {
-													length = 1;
-													this.$data.refdatastore.push(value[i]);
-												}
-												if (length == 0) {
-													for (var j = 0; j < this.$data.refdatastore.length; j++) {
-														if (this.$data.refdatastore[j].attr == value[i].attr) {
-															this.$data.refdatastore[j].value = value[i].value;
+							
+													var length = 0;
+													if (!this.$data.refdatastore.filter(function (s) {
+														return value[i].attr == s.attr
+													}).length) {
+														length = 1;
+														this.$data.refdatastore.push(value[i]);
+													}
+													if (length == 0) {
+														for (var j = 0; j < this.$data.refdatastore.length; j++) {
+															if (this.$data.refdatastore[j].attr == value[i].attr) {
+																this.$data.refdatastore[j].value = value[i].value;
+															}
 														}
 													}
 												}
 											}
 										}
+										if (action_type == 'open_select_userdlg') {
+											uni.showModal({title:"閿欒2.2",content:"open_select_userdlg杩欎釜action_type杩樻湭澶勭悊锛�,showCancel:false,confirmText:"鍙栨秷"});
+										}
+										// else if (action_type == 'tip_dlg') {
+											
+										// }
 									}
-									if (action_type == 'open_select_userdlg') {
-										uni.showModal({title:"閿欒2.2",content:"open_select_userdlg杩欎釜action_type杩樻湭澶勭悊锛�,showCancel:false,confirmText:"鍙栨秷"});
-									}
-									// else if (action_type == 'tip_dlg') {
-										
-									// }
 								}
 							}
 						}
-						
 					}else{
 						uni.showModal({title:"閿欒2",content:success.err_msg,showCancel:false,confirmText:"鍙栨秷"});
 					}
@@ -1605,92 +1614,101 @@
 		    		console.log(success);
 		    		if (success.err_code == 0) {
 		    			var data = success.result;
-		    			var actionlist = data.action;
-									
-		    			if (actionlist) {
-							console.log(actionlist);
-		    			    for (var i = 0; i < actionlist.length; i++) {
-		    			        var action = actionlist[i];
-		    			        if (action.action_type == 'set_dlg_attr') {
-		    			            var result = action.value;
-		    			            for (var i = 0; i < result.length; i++) {
-										if (result[i].choice_list) {
-											for (var c = 0; c < $this.$data.classAttrList.length; c++) {
-												var attr = $this.$data.classAttrList[c].Attr;
-												for (var j = 0; j < attr.length; j++) {
-													if(attr[j].Name==result[i].attr){
-														if(attr[j].Type=='瀛楀吀' || attr[j].Type=='瀛楀吀-瀛楃涓� || attr[j].Type=='瀛楀吀-鏁存暟'){
-															var dictItemList=[];
-															for(var d in result[i].choice_list){
-																var val =result[i].choice_list[d];
-																dictItemList.push({"CN_S_NAME":val,"Name":val,"label":val,"value":val});
+						if (data.ret != 0) {
+						    var tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data.err_info.join('<br/>') : '';
+						    if (data.ret == 801) uni.showModal({title:'鎻愮ず',content:tip,showCancel:false,confirmText:"鍙栨秷"});
+						    else uni.showModal({title:'鎻愮ず',content:tip+',鎻愮ず:'+data.ret,showCancel:false,confirmText:"鍙栨秷"});
+							return false
+						}else{
+							let tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join('<br/>') : '';
+							if (tip) uni.showModal({title:'鎻愮ず',content:tip,showCancel:false,confirmText:"鍙栨秷"});
+						
+							var actionlist = data.action;
+							if (actionlist) {
+								console.log(actionlist);
+								for (var i = 0; i < actionlist.length; i++) {
+									var action = actionlist[i];
+									if (action.action_type == 'set_dlg_attr') {
+										var result = action.value;
+										for (var i = 0; i < result.length; i++) {
+											if (result[i].choice_list) {
+												for (var c = 0; c < $this.$data.classAttrList.length; c++) {
+													var attr = $this.$data.classAttrList[c].Attr;
+													for (var j = 0; j < attr.length; j++) {
+														if(attr[j].Name==result[i].attr){
+															if(attr[j].Type=='瀛楀吀' || attr[j].Type=='瀛楀吀-瀛楃涓� || attr[j].Type=='瀛楀吀-鏁存暟'){
+																var dictItemList=[];
+																for(var d in result[i].choice_list){
+																	var val =result[i].choice_list[d];
+																	dictItemList.push({"CN_S_NAME":val,"Name":val,"label":val,"value":val});
+																}
+																attr[j].dictitem = dictItemList;
+																// attr[j].dictitem = result[i].choice_list;
 															}
-															attr[j].dictitem = dictItemList;
-															// attr[j].dictitem = result[i].choice_list;
 														}
 													}
 												}
 											}
-		    			                }
-		    			                for (var c = 0; c < $this.$data.classAttrList.length; c++) {
-		    			                	var attr = $this.$data.classAttrList[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.$data.refdatastore.filter(function (s) {
-		    			                    return result[i].attr == s.attr
-		    			                }).length) {
-		    			                    length = 1;
-		    			                    $this.$data.refdatastore.push(result[i]);
-		    			                }
-		    			                if (length == 0) {
-		    			                    for (var j = 0; j < $this.$data.refdatastore.length; j++) {
-		    			                        if ($this.$data.refdatastore[j].attr == result[i].attr) {
-		    			                            $this.$data.refdatastore[j].value = result[i].value;
-		    			                        }
-		    			                    }
-		    			                }
-		    			            }
-		    			        } else if (data.action[i].action_type == 'set_global_attr') {
-						            $this.$data.global_attr = data.action[i].value || [];
-						        }
-		    			    }
-		    			}
-		    			
-		    			if (data.result) {
-		    			    var result = data.result;
-		    			    for (var i = 0; i < result.length; i++) {
-		    			        for (var c = 0; c < $this.$data.classAttrList.length; c++) {
-		    			        	var attr = $this.$data.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.$data.refdatastore.filter(function (s) {
-		    			            return result[i].attr == s.attr
-		    			        }).length) {
-		    			            length = 1;
-		    			            $this.$data.refdatastore.push(result[i]);
-		    			        }
-		    			        if (length == 0) {
-		    			            for (var j = 0; j < $this.$data.refdatastore.length; j++) {
-		    			                if ($this.$data.refdatastore[j].attr == result[i].attr) {
-		    			                    $this.$data.refdatastore[j].value = result[i].value;
-		    			                }
-		    			            }
-		    			        }
-		    			    }
-		    			}
-		    		}else{
+											for (var c = 0; c < $this.$data.classAttrList.length; c++) {
+												var attr = $this.$data.classAttrList[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.$data.refdatastore.filter(function (s) {
+												return result[i].attr == s.attr
+											}).length) {
+												length = 1;
+												$this.$data.refdatastore.push(result[i]);
+											}
+											if (length == 0) {
+												for (var j = 0; j < $this.$data.refdatastore.length; j++) {
+													if ($this.$data.refdatastore[j].attr == result[i].attr) {
+														$this.$data.refdatastore[j].value = result[i].value;
+													}
+												}
+											}
+										}
+									} else if (data.action[i].action_type == 'set_global_attr') {
+										$this.$data.global_attr = data.action[i].value || [];
+									}
+								}
+							}
+							
+							if (data.result) {
+								var result = data.result;
+								for (var i = 0; i < result.length; i++) {
+									for (var c = 0; c < $this.$data.classAttrList.length; c++) {
+										var attr = $this.$data.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.$data.refdatastore.filter(function (s) {
+										return result[i].attr == s.attr
+									}).length) {
+										length = 1;
+										$this.$data.refdatastore.push(result[i]);
+									}
+									if (length == 0) {
+										for (var j = 0; j < $this.$data.refdatastore.length; j++) {
+											if ($this.$data.refdatastore[j].attr == result[i].attr) {
+												$this.$data.refdatastore[j].value = result[i].value;
+											}
+										}
+									}
+								}
+							}
+						}
+					}else{
 		    			uni.showModal({title:"閿欒3",content:success.err_msg,showCancel:false,confirmText:"鍙栨秷"});
 		    		}
 		    	}).catch(ex=>{
@@ -1785,27 +1803,37 @@
 		    	this.$store.dispatch('runCustomEvent',dataInfo).then(success=>{
 		    		console.log(success);
 		    		if (success.err_code == 0) {
-		    			var data = success.result;	
-		    			var result = data.result;
-		    			for (var i = 0; i < result.length; i++) {
-		    			    // self.class_attr_ele.find('.attr_field[data-field="' + result[i].attr + '"]').val(result[i].value).data('val', result[i].value);
-		    			    var length = 0;
-		    			    if (!this.$data.refdatastore.filter(function (s) {
-		    			        return result[i].attr == s.attr
-		    			    }).length) {
-		    			        length = 1;
-		    			        this.$data.refdatastore.push(result[i]);
-		    			    }
-		    			    if (length == 0) {
-		    			        for (var j = 0; j < this.$data.refdatastore.length; j++) {
-		    			            if (this.$data.refdatastore[j].attr == result[i].attr) {
-		    			                this.$data.refdatastore[j].value = result[i].value;
-		    			            }
-		    			        }
-		    			    }
-		    			}
+		    			var data = success.result;
+						if (data.ret != 0) {
+						    var tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data.err_info.join('<br/>') : '';
+						    if (data.ret == 801) uni.showModal({title:'鎻愮ず',content:tip,showCancel:false,confirmText:"鍙栨秷"});
+						    else uni.showModal({title:'鎻愮ず',content:tip+',鎻愮ず:'+data.ret,showCancel:false,confirmText:"鍙栨秷"});
+							return false
+						}else{
+							let tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join('<br/>') : '';
+							if (tip) uni.showModal({title:'鎻愮ず',content:tip,showCancel:false,confirmText:"鍙栨秷"});
 						
-						this.add();
+							var result = data.result;
+							for (var i = 0; i < result.length; i++) {
+								// self.class_attr_ele.find('.attr_field[data-field="' + result[i].attr + '"]').val(result[i].value).data('val', result[i].value);
+								var length = 0;
+								if (!this.$data.refdatastore.filter(function (s) {
+									return result[i].attr == s.attr
+								}).length) {
+									length = 1;
+									this.$data.refdatastore.push(result[i]);
+								}
+								if (length == 0) {
+									for (var j = 0; j < this.$data.refdatastore.length; j++) {
+										if (this.$data.refdatastore[j].attr == result[i].attr) {
+											this.$data.refdatastore[j].value = result[i].value;
+										}
+									}
+								}
+							}
+							
+							this.add();
+						}
 		    		}else{
 		    			uni.showModal({title:"閿欒4",content:success.err_msg,showCancel:false,confirmText:"鍙栨秷"});
 		    		}
@@ -1903,148 +1931,157 @@
 				this.$store.dispatch('runCustomEvent',dataInfo).then(success=>{
 					console.log(success);
 					if (success.err_code == 0) {
-						var data = success.result;	
-						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);
-						        
-						        if (action.action_type == 'open_panel') {
-						           var d = dialog({
-						               title: '<i class="ace-icon fa fa-info-circle"></i> ' + '鎻愮ず',
-						               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
+						var data = success.result;
+						if (data.ret != 0) {
+						    var tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data.err_info.join('<br/>') : '';
+						    if (data.ret == 801) uni.showModal({title:'鎻愮ず',content:tip,showCancel:false,confirmText:"鍙栨秷"});
+						    else uni.showModal({title:'鎻愮ず',content:tip+',鎻愮ず:'+data.ret,showCancel:false,confirmText:"鍙栨秷"});
+							return false
+						}else{
+							let tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join('<br/>') : '';
+							if (tip) uni.showModal({title:'鎻愮ず',content:tip,showCancel:false,confirmText:"鍙栨秷"});
+						
+							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);
+									
+									if (action.action_type == 'open_panel') {
+									   var d = dialog({
+										   title: '<i class="ace-icon fa fa-info-circle"></i> ' + '鎻愮ず',
+										   content: action.action_type + '姝ction灏氭湭澶勭悊锛�
+									   });
+									   d.show();
 									}
-									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.$data.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> ' + '鎻愮ず',
-						                content: action.action_type + '姝ction灏氭湭澶勭悊锛�
-						            });
-						            d.show();
-						        }
-						        else if (action.action_type == 'open_common_dlg') {
-									var $this = this;
-						            if(val.common_dlg_id == 'check_list'){
-									   $this.$data.check_list= val.config;
-									   if(val.config.appear_style == 'sideslip') //鍒ゆ柇鏄惁鏄晶婊�-											$this.$data.popupType = 'right';
-									   else
-											$this.$data.popupType = 'center'
-									   // open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
-									   $this.$refs.popup.open($this.$data.popupType);
-									   var popupParam={
-									   	index: index,
-									   	iindex:iindex,
-									   	button_callback:button_callback,
-									   	req:req,
-									   	data_attr:data_attr
-									   }
-									   $this.$data.popupParam= popupParam;
-								    }
-						        }
-						        else if (action.action_type == 'open_project_query_dlg') {
-						            //console.log(action.value.select_range);
-						            //console.log(action.value.mulit_select);
-						            var priRel = '-1';
-						            if (action.value.select_range == '鍏ㄩ儴鐩稿叧')
-						                priRel = '0';
-						            else if (action.value.select_range == '鎴戣礋璐g殑椤圭洰')
-						                priRel = '1';
-						            else if (action.value.select_range == '鎴戝垱寤虹殑')
-						                priRel = '2';
-						            else if (action.value.select_range == '鎴戝弬涓庣殑' || action.value.select_range == '鎴戝弬鍔犵殑')
-						                priRel = '3';
-						            else if (action.value.select_range == '鎴戝叧娉ㄧ殑')
-						                priRel = '4';
-						            else if (action.value.select_range == '鎴戜笅灞炵殑椤圭洰')
-										priRel = '5';
-										
-									var $this = this;
-									var param_={
-										index: index,
-										iindex:iindex,
-										button_callback:button_callback,
-										req:req
-									}
-									uni.navigateTo({
-										url:'../selPrj/index?relation='+priRel+'&param='+JSON.stringify(param_),
-										events:{
-											AddPer(data,param){ 
-												$this.$data.classAttrList[param.index].Attr[param.iindex].Value=data[0].Name;
-												$this.$data.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,
+									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.$data.param.clsid,
+														objid: "",
+														attr: param.req,
+														inputparameter: data,
 														dataJson:[],
-												    }
-													
-												    $this.DataObjRunCustomEvent(info);
+													}
+													$this.DataObjRunCustomEvent(info, param.data_attr);
 												}
 											}
+										});	
+									}
+									else if (action.action_type == 'open_data_query_dlg') {
+										var d = dialog({
+											title: '<i class="ace-icon fa fa-info-circle"></i> ' + '鎻愮ず',
+											content: action.action_type + '姝ction灏氭湭澶勭悊锛�
+										});
+										d.show();
+									}
+									else if (action.action_type == 'open_common_dlg') {
+										var $this = this;
+										if(val.common_dlg_id == 'check_list'){
+										   $this.$data.check_list= val.config;
+										   if(val.config.appear_style == 'sideslip') //鍒ゆ柇鏄惁鏄晶婊�+												$this.$data.popupType = 'right';
+										   else
+												$this.$data.popupType = 'center'
+										   // open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
+										   $this.$refs.popup.open($this.$data.popupType);
+										   var popupParam={
+											index: index,
+											iindex:iindex,
+											button_callback:button_callback,
+											req:req,
+											data_attr:data_attr
+										   }
+										   $this.$data.popupParam= popupParam;
 										}
-									});
-						        } else {
-						            var d = dialog({
-						                title: '<i class="ace-icon fa fa-info-circle"></i> ' + '鎻愮ず',
-						                content: action.action_type + '姝ction灏氭湭澶勭悊锛�
-						            });
-						            d.show();
-						        }
-						    }
-						}
-						}else{
-							uni.showModal({title:"鎻愮ず5.2",content: '璋冪敤 before_click_button 鑴氭湰杩斿洖绌猴紝event_id' + eventid,showCancel:false,confirmText:"鍙栨秷"});
+									}
+									else if (action.action_type == 'open_project_query_dlg') {
+										//console.log(action.value.select_range);
+										//console.log(action.value.mulit_select);
+										var priRel = '-1';
+										if (action.value.select_range == '鍏ㄩ儴鐩稿叧')
+											priRel = '0';
+										else if (action.value.select_range == '鎴戣礋璐g殑椤圭洰')
+											priRel = '1';
+										else if (action.value.select_range == '鎴戝垱寤虹殑')
+											priRel = '2';
+										else if (action.value.select_range == '鎴戝弬涓庣殑' || action.value.select_range == '鎴戝弬鍔犵殑')
+											priRel = '3';
+										else if (action.value.select_range == '鎴戝叧娉ㄧ殑')
+											priRel = '4';
+										else if (action.value.select_range == '鎴戜笅灞炵殑椤圭洰')
+											priRel = '5';
+											
+										var $this = this;
+										var param_={
+											index: index,
+											iindex:iindex,
+											button_callback:button_callback,
+											req:req
+										}
+										uni.navigateTo({
+											url:'../selPrj/index?relation='+priRel+'&param='+JSON.stringify(param_),
+											events:{
+												AddPer(data,param){ 
+													$this.$data.classAttrList[param.index].Attr[param.iindex].Value=data[0].Name;
+													$this.$data.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> ' + '鎻愮ず',
+											content: action.action_type + '姝ction灏氭湭澶勭悊锛�
+										});
+										d.show();
+									}
+								}
+							}
+							}else{
+								uni.showModal({title:"鎻愮ず5.2",content: '璋冪敤 before_click_button 鑴氭湰杩斿洖绌猴紝event_id' + eventid,showCancel:false,confirmText:"鍙栨秷"});
+							}
 						}
 					}else{
 						uni.showModal({title:"閿欒5",content:success.err_msg,showCancel:false,confirmText:"鍙栨秷"});

--
Gitblit v1.9.1