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