twt %!s(int64=3) %!d(string=hai) anos
pai
achega
e105466eb4

+ 2 - 2
operatingCompany/pages/entryReport/opinion.vue

@@ -148,7 +148,7 @@
 					 		delta:2
 					 	}) */
 						uni.navigateTo({
-							url:'../reportManage/reportDetail?id='+that.sheetID
+							url:'../reportManage/reportDetail?id='+that.sheetID+'&type=4'
 						})
 					 },1000)
 					
@@ -222,7 +222,7 @@
 								delta:2
 							}) */
 							uni.navigateTo({
-								url:'../reportManage/reportDetail?id='+that.sheetID
+								url:'../reportManage/reportDetail?id='+that.sheetID+'&type=4'
 							})
 						}
 					},1000)

+ 15 - 3
operatingCompany/pages/reportManage/reportDetail.vue

@@ -225,6 +225,7 @@
 				 userInfoId:'',
 				 mEvaluateLook:'',
 				 lookShow:true,
+				 backType:'',
 			}
 		},
 		onLoad(opt) {
@@ -238,6 +239,10 @@
 			console.log('this.loginType=='+this.loginType)
 		    this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
 			this.id=opt.id;
+			if(opt.type){
+			  this.backType=opt.type
+			}
+		
 			//this.getSuperCheckSheetInfo();
 			uni.getLocation({
 				success(res) {
@@ -281,9 +286,16 @@
 				});
 			},
 			back(){
-				uni.navigateBack({
-					delta:1
-				})
+				if(this.backType==4){
+					uni.navigateTo({
+						url:'../entryReport/entryReport'
+					})
+				}else{
+					uni.navigateBack({
+						delta:1
+					})
+				}
+				
 			},
 			goremarks2(){
 				uni.navigateTo({