From a2de8c1c61775913dbfd8ab6a7961580bcfb52b7 Mon Sep 17 00:00:00 2001
From: jt <jt@activesoft.com.cn>
Date: 星期二, 27 二月 2024 17:28:51 +0800
Subject: [PATCH] 3018,3037功能点样式改为自定义表单和3200功能点新增

---
 pages/modal/3018.vue |   29 +++++++++++++++++++++++------
 1 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/pages/modal/3018.vue b/pages/modal/3018.vue
index 896c1a8..f67fd74 100644
--- a/pages/modal/3018.vue
+++ b/pages/modal/3018.vue
@@ -525,10 +525,19 @@
 		components: {
             pickerAddress
         },
+	    onBackPress(e){
+		  // console.log("鐩戝惉杩斿洖鎸夐挳浜嬩欢",e);
+		  if(this.type){
+		  	var eventChannel = this.$scope.eventChannel;
+		  	// const eventChannel = this.getOpenerEventChannel();
+		  	eventChannel.emit(this.type,"");
+		  }
+	    },	
 		data() {
 			return {
 				title: '鏂板',
 				param:{},
+				type:'',
 				classAttrList:[],
 				classGridStyle:[],
 				edit_inital_event:"",  //寮圭獥鍒濆鍖栦簨浠禝D
@@ -548,7 +557,10 @@
 			uni.setNavigationBarTitle({ title: options.titlename}); //璁剧疆椤堕儴鏍囬 
 			var param = JSON.parse(options.param);
 			this.$data.title = param.Add_BtnName?param.Add_BtnName:options.titlename; //璁剧疆鎸夐挳鏂囧瓧
-			// console.log(param);
+			if(options.type){
+				this.$data.type = options.type;
+			}
+			console.log(param);
 			if(!param.EditDlgMode){
 				uni.showModal({title:"鎻愮ず",content:"璇ュ姛鑳界偣鏈厤缃紪杈戠獥鍙o紝璇烽噸鏂伴厤缃紒",showCancel:false,confirmText:"鍙栨秷"});
 				return;
@@ -973,6 +985,11 @@
 				this.$refs.popup.close();
 			},
 			cancel(e){
+				if(this.type){
+					var eventChannel = this.$scope.eventChannel;
+					// const eventChannel = this.getOpenerEventChannel();
+					eventChannel.emit(this.type,"");
+				}
 				uni.navigateBack({
 					delta:1 //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
 				});
@@ -1403,7 +1420,7 @@
 						uni.redirectTo({
 							url:'../modal/3018?param='+JSON.stringify(this.$data.param)+"&titlename="+this.$data.title
 						});
-						// this.class_attr_init();
+						// this.cancel();
 					}else{
 						uni.showModal({title:"閿欒",content:success.err_msg,showCancel:false,confirmText:"鍙栨秷"});
 					}
@@ -1475,7 +1492,7 @@
 						    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/>') : '';
+							var 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){
@@ -1620,7 +1637,7 @@
 						    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/>') : '';
+							var 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;
@@ -1810,7 +1827,7 @@
 						    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/>') : '';
+							var tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join('<br/>') : '';
 							if (tip) uni.showModal({title:'鎻愮ず',content:tip,showCancel:false,confirmText:"鍙栨秷"});
 						
 							var result = data.result;
@@ -1938,7 +1955,7 @@
 						    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/>') : '';
+							var 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 != "") {

--
Gitblit v1.9.1