Merge remote-tracking branch 'origin/master'

src/views/announce/pages/list.vue

@@ -149,39 +149,45 @@
                     messageIds:data.messageId
                 };
                 api.setHasReadAxios(params).then((res)=>{
-                    if(this.userInfo.empType==0){
+
+                    //  普通用户
+                    if(this.publicFun.getUserDetailRoleFunc()==1){
                         if(data.requirementPurposeId>0){
-                            this.$router.push({path:"/recommenddetail",query:{purposeId:data.requirementPurposeId}})
+                            if(data.toUserId==this.userInfo.empId){
+                                this.$router.push({path:"/bigBusiness/selfdetail",query:{id:data.requirementPurposeId}})
+                            }
+                            if(data.fromUserId==this.userInfo.empId){
+
+                                this.$router.push({path:"/recommenddetail",query:{purposeId:data.requirementPurposeId}})
+                            }
                         }
                         if(data.projectPurposeId>0){
-                            this.$router.push({path:"/contentdetarl",query:{purposeId:data.projectPurposeId}})
+                            if(data.toUserId==this.userInfo.empId){
+                                this.$router.push({path:"/contentdetarl",query:{purposeId:data.projectPurposeId}})
+                            }
+                            if(data.fromUserId==this.userInfo.empId){
+                                this.$router.push({path:"/bigBusiness/intentiondetail",query:{id:data.projectPurposeId}})
+                            }
                         }
                     }
-                    else if(this.userInfo.empType==1){
+
+
+                    //销售运营
+                    if(this.publicFun.isgetUserRoleFunc(2)){
                         if(data.requirementPurposeId>0){
-                            this.$router.push({path:"/bigBusiness/selfdetail",query:{id:data.requirementPurposeId}})
+                            this.$router.push({path:"/projectinside",query:{purposeId:data.requirementPurposeId,type:0}})
                         }
                         if(data.projectPurposeId>0){
-                            this.$router.push({path:"/bigBusiness/intentiondetail",query:{id:data.projectPurposeId}})
+                            this.$router.push({path:"/projectinside",query:{purposeId:data.projectPurposeId,type:1}})
                         }
                     }
-                    else{
-                        if(this.userInfo.roleList[0].roleType==2){
-                            if(data.requirementPurposeId>0){
-                                this.$router.push({path:"/projectinside",query:{purposeId:data.requirementPurposeId,type:0}})
-                            }
-                            if(data.projectPurposeId>0){
-                                this.$router.push({path:"/projectinside",query:{purposeId:data.projectPurposeId,type:1}})
-                            }
-                        }else if(this.userInfo.roleList[0].roleType==5){
-                            if(data.requirementPurposeId>0){
-                                this.$router.push({path:"/saleproject/active",query:{id:data.requirementPurposeId,type:0}})
-                            }
-                            if(data.projectPurposeId>0){
-                                this.$router.push({path:"/saleproject/active",query:{id:data.projectPurposeId,type:1}})
-                            }
+                    if(this.publicFun.isgetUserRoleFunc(5)){
+                        if(data.requirementPurposeId>0){
+                            this.$router.push({path:"/saleproject/active",query:{id:data.requirementPurposeId,type:0}})
+                        }
+                        if(data.projectPurposeId>0){
+                            this.$router.push({path:"/saleproject/active",query:{id:data.projectPurposeId,type:1}})
                         }
-
                     }
                 })
 

src/views/bigbusiness/pages/searchRecord.vue

@@ -64,8 +64,7 @@
                     if(this.$store.state.searchResult.has(this.$route.path)) {
                         this.currentIndex=this.$store.state.searchResult.get(this.$route.path);
                     }else{
-                        if(this.userInfo.empType==0) this.currentIndex = 2;
-                        else this.currentIndex = 1;
+                        this.currentIndex = 1;
                     }
 
                 }