Merge remote-tracking branch 'origin/master'

src/common/lang/en.js

@@ -1847,6 +1847,7 @@ module.exports = {
         cover:'Cover',
         video:'video',
         information:'personal information',
+        projectdocking:'Project Docking',
     },
 
     wechatLogin:{

src/common/lang/zh.js

@@ -1944,6 +1944,7 @@ module.exports = {
         cover: '封面',
         video: '视频',
         information: '个人信息',
+        projectdocking:'项目对接',
     },
 
     wechatLogin: {

src/views/indexAccepting/expertAccepting.vue

@@ -9,10 +9,10 @@
         <div class="projectTabadd">
             <el-tabs v-model="activeName" @tab-click="handleClick">
                 <el-tab-pane  label="优质项目" name="first">
-                    <router-view v-if="activeName=='first'"></router-view>
+                    <router-view ref="child1" v-if="activeName=='first'"></router-view>
                 </el-tab-pane>
                 <el-tab-pane  label="KOL专家" name="second">
-                    <router-view name="secondStage" v-if="activeName=='second'"></router-view>
+                    <router-view ref="child2" name="secondStage" v-if="activeName=='second'"></router-view>
                 </el-tab-pane>
                 <el-tab-pane  label="合作伙伴" name="third">
                     <router-view name="thirdStage" v-if="activeName=='third'"></router-view>
@@ -38,8 +38,17 @@
             handleClick(tab, event) {
                 if(tab.name == 'first'){
                     this.$router.push({path:"/expertAccepting",query:{tab:1}})
+                    let _this = this;
+                    setTimeout(function () {
+                        _this.$refs.child1.getAcceptanceAxios();
+                    },500)
+
                 }else if(tab.name == 'second'){
                     this.$router.push({path:"/expertAccepting",query:{tab:2}})
+                    let _this = this;
+                    setTimeout(function () {
+                        _this.$refs.child2.getCheckProfessorsAxios();
+                    },500)
                 }else if(tab.name == 'third'){
                     this.$router.push({path:"/expertAccepting",query:{tab:3}})
 

src/views/indexAccepting/kolProfessorsManage.vue

@@ -167,11 +167,11 @@
                         vm.checkStateIds.push(vm.search.checkState)
                     }
                     vm.cur_page = vm.search.cur_page;
-                    vm.getAcceptanceAxios();
+                    vm.getCheckProfessorsAxios();
                 }else{
                     vm.publicFun.removeCookie("kolProfessorsSearch")
                     vm.cur_page = 1;
-                    vm.getAcceptanceAxios();
+                    vm.getCheckProfessorsAxios();
                 }
             })
         },
@@ -181,6 +181,7 @@
                 this.searchCik();
             },
             handdetail(val){
+                this.search.cur_page = this.cur_page;
                 this.publicFun.setUserInfoCookie("kolProfessorsSearch",JSON.stringify(this.search))
                 this.$router.push({path:"/kolProfessorsDetail",query:{id:val.professorId,state:val.checkState}});
             },
@@ -307,7 +308,7 @@
         },
         mounted() {
             this.getselectAreaList();
-            this.getCheckProfessorsAxios();
+            // this.getCheckProfessorsAxios();
             this.getselectFieldList();
         },
     }

src/views/indexAccepting/projectManage.vue

@@ -201,9 +201,22 @@
                     });
             },
             handdetail(val){
+                if(val.userAuthState != 2){
+                    this.$confirm('请先进行个人认证审核', {
+                        cancelButtonText: this.$t('releasejson.cancel'),
+                        confirmButtonText: this.$t('operationjson.determine'),
+                        type: '',
+                        customClass: 'deleteConfirm'
+                    }).then(() => {
+
+                    }).catch(() => {
+
+                    });
+                }else{
                     this.search.cur_page = this.cur_page;
                     this.publicFun.setUserInfoCookie("projectSearch",JSON.stringify(this.search))
                     this.$router.push({path:"/auditinside",query:{projectId:val.projectId,state:val.authenticationState,type:true,}});
+                }
             },
             //条件查询
             searchCik(){
@@ -282,7 +295,7 @@
         },
         mounted() {
             this.getselectAreaList();
-            this.getAcceptanceAxios();
+            // this.getAcceptanceAxios();
             this.getselectFieldList();
         },
     }

src/views/innovatecompany/lreleaseproject/viewproject.vue

@@ -198,7 +198,7 @@
                                         <video :src="addData.videoUrl" controls="controls" style="width: 500px;height: 280px;"></video>
                                     </div>
                                 </el-form-item>
-                                <el-form-item v-if="addData.projectCreatedBy||publicFun.isgetUserRoleFunc(2)||publicFun.isgetUserRoleFunc(5)" label="项目对接人：" style="width: 100%;">
+                                <el-form-item v-if="addData.projectCreatedBy||publicFun.isgetUserRoleFunc(2)||publicFun.isgetUserRoleFunc(5)" :label="$t('newprojecttext.projectdocking')+'：'" style="width: 100%;">
                                     <span>{{addData.linkSalesOrgName}} {{addData.linkSalesName}}</span>
                                 </el-form-item>
                             </el-form>