Merge remote-tracking branch 'origin/master'

src/views/findeventpage/eventlive.vue

@@ -147,7 +147,7 @@
             // this.userHistory(1);
             var that = this;
             if(this.isVisibleTimer){
-                clearInterval(that.isVisibleTimerOut);
+                clearInterval(that.isVisibleTimer);
                 this.isVisibleTimer = null;
             }
             document.getElementsByTagName("body")[0].style.overflow = "auto";

src/views/innovatecompany/lreleaseproject/litemlist.vue

@@ -14,7 +14,7 @@
                             <el-table-column :label="$t('litemlistjson.projectName')" width="330" >
                                 <template slot-scope="scope">
                                     <p @click="setDatalist(scope.row)" class="projectNamep">{{scope.row.projectName}}</p>
-                                    <span class="stateclass">{{scope.row.authenticationState=='AS02'?$t('operationjson.pendingreview'):scope.row.authenticationState=='AS03'?$t('operationjson.audited'):scope.row.authenticationState=='AS04'?$t('operationjson.dismissed'):scope.row.authenticationState=='AS05'?(publicFun.isgetUserRoleFunc(5)?'验收通过不展示':$t('operationjson.audited')):scope.row.authenticationState=='AS06'?(publicFun.isgetUserRoleFunc(5)?'验收不通过展示':$t('operationjson.audited')):''}}</span>
+                                    <span class="stateclass">{{scope.row.authenticationState=='AS02'?$t('operationjson.pendingreview'):scope.row.authenticationState=='AS03'?(publicFun.isgetUserRoleFunc(5)?'验收通过展示':$t('operationjson.audited')):scope.row.authenticationState=='AS04'?$t('operationjson.dismissed'):scope.row.authenticationState=='AS05'?(publicFun.isgetUserRoleFunc(5)?'验收通过不展示':$t('operationjson.audited')):scope.row.authenticationState=='AS06'?(publicFun.isgetUserRoleFunc(5)?'验收不通过展示':$t('operationjson.audited')):''}}</span>
                                 </template>
                             </el-table-column>
                             <el-table-column prop="projectModel" :label="$t('litemlistjson.projectModel')" align='center'>

src/views/innovatecompany/submitprojects/submittwo.vue

@@ -442,6 +442,10 @@
                 }else{
                     this.isShowErrorText = false;
                 }
+                if((!this.formData.projectBpUrl||this.formData.projectBpUrl.length==0)&&this.publicFun.isgetUserRoleFunc(5)){
+                    this.$message.error('请上传项目BP');
+                    return
+                }
                 this.formData.projectId = this.formId;
                 this.$refs.formData.validate((valid) => {
 		                    if(valid) {

src/views/kolExpert/addkolExpert.vue

@@ -12,7 +12,7 @@
                     <div style="margin-top: 20px;">
                         <el-form label-position="right" :model="expertData" :rules="rules" ref="expertData" label-width="200px" class="contnetform180" >
                             <el-form-item label="绑定账号：" prop="empAccount">
-                                <el-input :disabled="expertData.canUpdateAccount?false:true" style="width: 500px;" @blur="isempAccountblur" placeholder="请输入账号" v-model="expertData.empAccount"></el-input>
+                                <el-input @input="$forceUpdate()" :disabled="expertData.canUpdateAccount?false:true" style="width: 500px;" @blur="isempAccountblur" placeholder="请输入账号" v-model="expertData.empAccount"></el-input>
                             </el-form-item>
                             <el-form-item label="专家姓名：" prop="empName">
                                 <el-input style="width: 500px;" maxlength="36" placeholder="请输入专家姓名" v-model="expertData.empName"></el-input>
@@ -97,6 +97,7 @@
                 expertData:{
                     dataList:[],
                     remarks:'',
+                    canUpdateAccount:true,
                 },
                 //校验
                 rules: {
@@ -129,6 +130,7 @@
                                 }else{
                                     this.expertData = {
                                         dataList:[],
+                                        canUpdateAccount:true,
                                     };
                                     this.expertData.empLogo = '';
                                     this.expertData.empAccount = empAccount;