优化

src/views/projectManage/Drawer.vue

@@ -15,11 +15,11 @@
               <span style="display: flex">
                 <el-avatar style="background: #FFF;" class="phoneUrl" :src="item.memberInfoResponse.phoneUrl !== '' ? item.memberInfoResponse.phoneUrl : image_role " />
                 <div style="display: flex; flex-direction: column">
-                  <span class="titName">{{ item.memberInfoResponse.name }} </span>
+                  <span class="titName">{{ item.memberInfoResponse.name }}<span v-if="item.isLeader === 1 ? true : false" class="responsibility">负责人</span></span>
                   <span class="userName">{{ item.member }}</span>
                 </div>
               </span>
-              <span :class="[item.canDelete === 0 ? 'colorSty' : 'colorStyTow']" class="el-icon-delete" @click="deletePersonnel(item, 2)" />
+              <span :class="[item.canDelete === 1 ? 'colorSty' : 'colorStyTow']" class="el-icon-delete" @click="deletePersonnel(item, 2)" />
             </div>
           </div>
           <div v-if="Gradient" :class="{'Gradient1':types === true , 'Gradient2' : types === false}" />
@@ -102,7 +102,7 @@
     <el-dialog title="删除确认" class="dialog_end" :visible.sync="dialogVisible" width="30%" :close-on-click-modal="false" :destroy-on-close="true">
       <div style="position: absolute; top: 23px; left: 12px;width:4px;height:17px;background:#409EFF;border-radius:1px;" />
       <div align="center">
-        <span>是否删除项目成员: <span> {{ name }} </span> ?</span>
+        <span>是否删除项目成员: {{ name }} ?</span>
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
@@ -180,7 +180,7 @@ export default {
       name: '',
       btn: false,
       MemberList: {},
-      group: [],
+      group: [], // 角色下拉数据
       gridData2: [],
       dialogVisible: false,
       dialogTableVisible: false,
@@ -255,9 +255,7 @@ export default {
         obj.member = item.idap
         members.push(obj)
       })
-      const data = {
-        'members': members // 人员列表
-      }
+      const data = { 'members': members } // 人员列表
       this.title === '项目成员' ? data.projectId = this.delete : ''
       this.title === '需求成员' ? data.requireId = this.delete : ''
       this.title === '任务成员' ? data.taskId = this.delete : ''
@@ -271,7 +269,7 @@ export default {
         })
       })
     },
-    getTeamId(e) {
+    getTeamId(e) { // 点击项目组， 获取teamId的成员
       teamQueryTeamInfoExtra(e.teamId).then(res => {
         const objs = {}
         const data = res.data.teamLeaderRelateInfoResponseList.concat(res.data.teamMemberRelateInfoResponseList)
@@ -292,7 +290,7 @@ export default {
       })
     },
 
-    getoptions(val) {
+    getoptions(val) { // 添加角色判断重复人员是否为相同角色
       this.group.map(item => {
         this.form.role === item.id ? val.roleName = item.name : ''
       })
@@ -337,6 +335,7 @@ export default {
     },
 
     deletePersonnel(e, index) { // 删除diolag
+      console.log(e, 'cdscsc')
       switch (index) {
         case 1:
           this.gridData2 = this.gridData2.filter(item => {
@@ -344,8 +343,8 @@ export default {
           })
           break
         case 2:
-          if (e.canDelete === 0) {
-            this.$message.warning('不可删除')
+          if (e.canDelete === 1) {
+            return false
           } else {
             this.TeamMembers = e
             this.name = e.memberInfoResponse.name
@@ -363,7 +362,7 @@ export default {
         this.Gradient = true
       }
     },
-    closeByButton() {
+    closeByButton() { // 关闭dialog
       this.$emit('update:display', false)
     },
     remoteMethod1(query) { // 人员查询
@@ -387,22 +386,22 @@ export default {
       return item.idap
     },
     MemberInfoList(vel) {
-      teamQueryTeamAndMemberInfoList({ 'teamName': vel }).then(res => {
+      teamQueryTeamAndMemberInfoList({ 'teamName': vel }).then(res => { // 按团队搜索
         this.teamOptions = res.data
       })
     },
-    getRoleList() {
+    async getRoleList() {
       const data = {}
       this.title === '项目成员' ? data.projectId = this.delete : ''
       this.title === '需求成员' ? data.requireId = this.delete : ''
       this.title === '任务成员' ? data.taskId = this.delete : ''
-      projectGetMemberList(data).then(res => {
-        this.MemberList = res.data
-      })
-      projectDetRoleList({}).then(res => {
-        this.group = res.data
-        this.$set(this.form, 'role', this.group[0].id)
-      })
+      const MemberList = projectGetMemberList(data) // 获取抽屉主面板数据
+      const RoleList = projectDetRoleList({}) // 获取角色数据
+      const res1 = await MemberList
+      const res2 = await RoleList
+      this.MemberList = res1.data
+      this.group = res2.data
+      this.$set(this.form, 'role', this.group[0].id) // 添加角色默认值
     }
   }
 }
@@ -586,7 +585,6 @@ export default {
   }
 
   .colorSty {
-    cursor: pointer;
     color: #DDDDDD;
   }
 
@@ -646,6 +644,16 @@ export default {
     color: #333333;
     height: 50%;
   }
-}
 
+  .responsibility {
+    width:30px;
+    height:16px;
+    font-size:12px;
+    font-weight:400;
+    line-height:14px;
+    color:rgba(64,158,255,1);
+    opacity:1;
+    margin-left: 10px;
+  }
+}
 </style>