权限修改

src/views/innovatecompany/lreleaseproject/viewproject.vue

@@ -592,9 +592,9 @@
             </el-row>
             <el-row style="padding: 15px 0; text-align: center; width:calc(100% - 210px);z-index: 99;position: fixed;bottom: 0px;right: 0px;background:rgba(255,255,255,1);box-shadow:0px -5px 10px 0px rgba(0,0,0,0.1);" v-if="intentionIf">
                 <el-button v-if="state" type="primary" style="width: 180px;height: 42px" @click="editData" :disabled="authenticationState=='AS02'">{{$t('listproject.editproject')}}</el-button>
-                <el-button v-if="!state" type="warning" style="width: 180px;height: 42px" :disabled="iscommunicated" @click="communicate">{{communicatedName}}</el-button>
-                <el-button type="primary" v-if="!isbtn&&isbtntype" style="width: 180px;height: 42px" @click="collection" plain>{{$t('listproject.collection')}}</el-button>
-                <el-button v-if="isbtn&&isbtntype" style="width: 180px;height: 42px" @click="alreadycollection">{{$t('listproject.alreadycollection')}}</el-button>
+                <el-button v-if="!state&&!publicFun.isgetUserRoleFunc(2)&&!publicFun.isgetUserRoleFunc(5)" type="warning" style="width: 180px;height: 42px" :disabled="iscommunicated" @click="communicate">{{communicatedName}}</el-button>
+                <el-button type="primary" v-if="!isbtn&&!publicFun.isgetUserRoleFunc(2)&&!publicFun.isgetUserRoleFunc(5)" style="width: 180px;height: 42px" @click="collection" plain>{{$t('listproject.collection')}}</el-button>
+                <el-button v-if="isbtn&&!publicFun.isgetUserRoleFunc(2)&&!publicFun.isgetUserRoleFunc(5)" style="width: 180px;height: 42px" @click="alreadycollection">{{$t('listproject.alreadycollection')}}</el-button>
                 <el-button @click="handleOpreation" type="primary" style="width: 180px;height: 42px;position: relative;padding-left: 55px" plain :disabled="authenticationState!='AS03'"><i style="position:absolute;top: 10px;left: 45px;font-size: 20px" class="iconfont icon-wechat"></i>{{$t('listproject.shareit')}}</el-button>
                 <el-button type="primary" style="width: 180px;height: 42px" @click="$router.push({path:pathfrom})" plain>{{$t('listproject.returngo')}}</el-button>
                 <el-button type="primary" style="width: 180px;height: 42px" @click="translate" plain>{{istranslate?$t("mobile.translateTitle"):$t("mobile.showOldActicle")}}</el-button>

src/views/innovatecompany/registeruser/aggregatetab.vue

@@ -63,7 +63,7 @@
                 }else if(vm.pathfrom == '/bigBusiness/detail'){
                     vm.activeName = 'fourth'
                     vm.activeIf = 1;
-                    vm.getUserInfodata();
+                    vm.getUserInfodata(1);
                 }else{
                     vm.activeIf = 0;
                 }
@@ -78,7 +78,7 @@
                 }else if(tab.label == this.$t('usermanagement.Relateditems')){
                     this.getUserInfodata();
                 }else if(tab.label == this.$t('usermanagement.Relatedneeds')){
-                    this.getUserInfodata();
+                    this.getUserInfodata(1);
                 }
             },
             fatherMethod(){
@@ -107,7 +107,7 @@
                         return false;
                     });
             },
-            getUserInfodata(){
+            getUserInfodata(state){
                 api.userRelatedBusiness(this.$route.query.empId).then(response => {
                     if(response.code == 0) {
                         this.projectlist = response.result.projectList;
@@ -130,19 +130,19 @@
                         }else{
                             this.successIf = true;
                         }
-
-                        if(response.result.businessId){
-                            this.businessIf = false;
-                            if(this.activeIf == 1){
-                                this.activeName = 'first';
-                                this.activeIf = 0;
+                        if(state == 1){
+                            if(response.result.businessId){
+                                this.businessIf = false;
+                                if(this.activeIf == 1){
+                                    this.activeName = 'first';
+                                    this.activeIf = 0;
+                                }else{
+                                    this.$router.push({path:"/bigBusiness/detail",query:{id:response.result.businessId,flag:1,oM:1}});
+                                }
                             }else{
-                                this.$router.push({path:"/bigBusiness/detail",query:{id:response.result.businessId,flag:1,oM:1}});
+                                this.businessIf = true;
                             }
-                        }else{
-                            this.businessIf = true;
                         }
-
                     } else {
                         this.$message.error(response.msgCode);
                     }

src/views/innovatecompany/submitprojects/submitfive.vue

@@ -33,7 +33,7 @@
             <el-form-item :label="$t('saleManage.companyEmail')+'：'" prop="companyEmail">
                 <el-input :disabled="checkif" v-model="formData.companyEmail" style="width: 450px;" :placeholder="$t('saleManage.placeholderEmail')" autocomplete maxlength="36"></el-input>
             </el-form-item>
-            <el-form-item :label="$t('saleManage.contactForm.businessCard')+'：'" ref="formimg" style="width: 100%;">
+            <el-form-item :label="$t('saleManage.contactForm.businessCard')+'：'" :prop="empTypeIf?'':'empCardUrl'" ref="formimg" style="width: 100%;">
                 <p class="imgTitle">{{$t('releasejson.companyLogoUrltext')}}</p>
                 <div class="uploadImg">
                     <el-upload