Commit 5729b028 authored by anxixi's avatar anxixi

人脉圈

parent 0d39b1cc
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
if(valid) { if(valid) {
api.submit(this.formData).then(response => { api.submit(this.formData).then(response => {
if(response.code == 0) { if(response.code == 0) {
this.formData = {}; this.$refs['formData'].resetFields();
this.$message.success(this.$t('Otherjson.harder')); this.$message.success(this.$t('Otherjson.harder'));
} else { } else {
this.$message.error(response.msg); this.$message.error(response.msg);
......
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
<!-- basetype 1默认页--> <!-- basetype 1默认页-->
<introductionbar v-if="basetype == 1" @fatherChange="fatherChange" :workList="userInfoData.workList" :educationList="userInfoData.educationList" :id="$route.query.id"></introductionbar> <introductionbar v-if="basetype == 1" @fatherChange="fatherChange" :workList="userInfoData.workList" :educationList="userInfoData.educationList" :id="$route.query.id"></introductionbar>
<!-- 2tab切换个人信息--> <!-- 2tab切换个人信息-->
<tabsbar @empConcernCount="empConcernCount" @empFriendCount="empFriendCount" :activeNames="activeName" v-if="basetype == 2" :id="$route.query.id"></tabsbar> <tabsbar @empConcernCount="empConcernCount" ref="tabsChange" @empFriendCount="empFriendCount" :activeNames="activeName" v-if="basetype == 2" :id="$route.query.id"></tabsbar>
<!-- 3勋章页--> <!-- 3勋章页-->
<mineMedal v-if="basetype == 3"></mineMedal> <mineMedal v-if="basetype == 3"></mineMedal>
<!-- 4关注我的页--> <!-- 4关注我的页-->
...@@ -441,6 +441,11 @@ ...@@ -441,6 +441,11 @@
if(routers == '/peoplehome/commonWork')this.mustNotType = 3; if(routers == '/peoplehome/commonWork')this.mustNotType = 3;
else if(routers == '/peoplehome/commonSchool')this.mustNotType = 2; else if(routers == '/peoplehome/commonSchool')this.mustNotType = 2;
else this.mustNotType = null; else this.mustNotType = null;
if(routers == '/peoplehome/tabs/ticeCount'){
if(this.$refs.tabsChange){
this.$refs.tabsChange.tabAttentions();
}
};
}, },
//查看联系方式 //查看联系方式
empContact(){ empContact(){
......
...@@ -136,6 +136,11 @@ ...@@ -136,6 +136,11 @@
tohome(row){ tohome(row){
this.$router.push({path:"/peoplehome",query:{id:row.empId}}); this.$router.push({path:"/peoplehome",query:{id:row.empId}});
}, },
//初始化
initialConcerns(){
this.cur_page = 1;
this.getEmpConcern();
},
}, },
mounted() { mounted() {
this.getEmpConcern(); this.getEmpConcern();
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
</p> </p>
<p v-if="item.messageType == 3"><i @click="tohome(item)">{{item.empName}}</i>关注了您</p> <p v-if="item.messageType == 3"><i @click="tohome(item)">{{item.empName}}</i>关注了您</p>
<p v-if="item.messageType == 4"> <p v-if="item.messageType == 4">
<span v-if="userInfo.empId == item.empId"> <span v-if="item.createdBy == item.empId">
我不同意添加<i @click="tohome(item)">{{item.empName}}</i>为联系人 我不同意添加<i @click="tohome(item)">{{item.empName}}</i>为联系人
</span> </span>
<span v-else> <span v-else>
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
</p> </p>
<p v-if="item.messageType == 5"><i @click="tohome(item)">{{item.empName}}</i>赞了您的评论</p> <p v-if="item.messageType == 5"><i @click="tohome(item)">{{item.empName}}</i>赞了您的评论</p>
<p v-if="item.messageType == 6"> <p v-if="item.messageType == 6">
<span v-if="userInfo.empId == item.empId"> <span v-if="item.createdBy == item.empId">
我同意添加<i @click="tohome(item)">{{item.empName}}</i>为联系人 我同意添加<i @click="tohome(item)">{{item.empName}}</i>为联系人
</span> </span>
<span v-else> <span v-else>
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<!-- 评论--> <!-- 评论-->
<tabCommentbar :id="id" v-if="activeName == 'comment'"></tabCommentbar> <tabCommentbar :id="id" v-if="activeName == 'comment'"></tabCommentbar>
<!-- 关注--> <!-- 关注-->
<tabAttentionbar @newempConcern="newempConcern" :id="id" v-if="activeName == 'attention'"></tabAttentionbar> <tabAttentionbar ref="tabAttention" @newempConcern="newempConcern" :id="id" v-if="activeName == 'attention'"></tabAttentionbar>
<!-- 话题--> <!-- 话题-->
<tabTopicbar :id="id" v-if="activeName == 'topic'"></tabTopicbar> <tabTopicbar :id="id" v-if="activeName == 'topic'"></tabTopicbar>
<!-- 消息--> <!-- 消息-->
...@@ -76,6 +76,10 @@ ...@@ -76,6 +76,10 @@
this.$router.push({path:urls}); this.$router.push({path:urls});
} }
}, },
//关注初始化
tabAttentions(){
this.$refs.tabAttention.initialConcerns();
},
newempConcern(row){ newempConcern(row){
this.$emit('empConcernCount',row); this.$emit('empConcernCount',row);
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment