2022.5.18 11.20

fhKeeper/formulahousekeeper/timesheet/src/views/project/projectInside.vue

@@ -33,27 +33,27 @@
                                 <div slot="title">
                                 <span >{{item.name}}</span>
                                 <!-- <el-button size="mini" @click="test(item)">test</el-button> -->
-                                <el-dropdown trigger="click" style="float:right;margin-right:-10px;" :disabled="user.id != item.inchargerId && user.id != projectCreatorId && user.id != projectInchargerId && !permissions.projectManagement">
+                                <el-dropdown trigger="click" style="float:right;margin-right:-10px;" :disabled="!(user.id == item.inchargerId || user.id == projectCreatorId || user.id == projectInchargerId || permissions.projectManagement)">
                                     <i class="iconfont firerock-iconcaidan" ></i>
                                     <el-dropdown-menu slot="dropdown">
-                                        <el-dropdown-item @click.native="copyGroup(item)" v-if="projectCreatorId == user.id || projectInchargerId == user.id">
+                                        <el-dropdown-item @click.native="copyGroup(item)" :disabled="!(projectCreatorId == user.id || projectInchargerId == user.id || permissions.projectManagement)">
                                             <i class="el-icon-document-copy"></i>
                                             复制分组</el-dropdown-item>
-                                        <el-dropdown-item divided @click.native="renameGroup(item)" v-if="projectCreatorId == user.id || projectInchargerId == user.id">
+                                        <el-dropdown-item divided @click.native="renameGroup(item)" :disabled="!(projectCreatorId == user.id || projectInchargerId == user.id || permissions.projectManagement)">
                                             <i class="el-icon-edit"></i>
                                             修改组名</el-dropdown-item>
-                                        <el-dropdown-item divided @click.native="addToTemplate(item)" v-if="projectCreatorId == user.id || projectInchargerId == user.id">
+                                        <el-dropdown-item divided @click.native="addToTemplate(item)" :disabled="!(projectCreatorId == user.id || projectInchargerId == user.id || permissions.projectManagement)">
                                             <i class="el-icon-plus"></i>
                                             设为模板</el-dropdown-item>
                                         <el-dropdown-item divided @click.native="editIncharger(item)" 
-                                        v-if="projectCreatorId == user.id || projectInchargerId == user.id">
+                                        :disabled="!(projectCreatorId == user.id || projectInchargerId == user.id || permissions.projectManagement)">
                                             <i class="el-icon-user"></i>
                                             设负责人</el-dropdown-item>
                                         <el-dropdown-item divided @click.native="setupParticipants(item)" 
-                                        v-if="projectCreatorId == user.id || projectInchargerId == user.id || item.inchargerId == user.id">
+                                        :disabled="!(projectCreatorId == user.id || projectInchargerId == user.id || item.inchargerId == user.id || permissions.projectManagement)">
                                             <i class="iconfont firerock-iconusers"></i>
                                             设参与人</el-dropdown-item>
-                                        <el-dropdown-item divided @click.native="deleteGroup(item)" v-if="projectCreatorId == user.id || projectInchargerId == user.id">
+                                        <el-dropdown-item divided @click.native="deleteGroup(item)" :disabled="!(projectCreatorId == user.id || projectInchargerId == user.id || permissions.projectManagement)">
                                             <i class="el-icon-delete"></i>
                                             删除分组</el-dropdown-item>
                                             <!-- 设置参与人 0000 -->
@@ -2862,6 +2862,7 @@ import delete$ from 'dingtalk-jsapi/api/biz/cspace/delete';
                 );
             },
             getjurisdictionIds(pro){
+                console.log('pro',pro.creatorId);
                 this.projectCreatorId = pro.creatorId
                 this.projectInchargerId = pro.inchargerId
             }