qinzhipeng_v 5 жил өмнө
parent
commit
36386bdb42

+ 33 - 15
src/views/projectManage/Drawer.vue

@@ -19,7 +19,6 @@
                   <span class="userName">{{ item.member }}</span>
                 </div>
               </span>
-              <!-- <span :class="[item.canDelete === 1 ? 'colorSty' : 'colorStyTow']" class="el-icon-delete" @click="deletePersonnel(item, 2)" /> -->
               <el-button class="el-icon-delete colorSty" :class="[item.canDelete === 1 ? ' ' : 'colorStyTow']" :disabled="item.canDelete === 1 " @click="deletePersonnel(item, 2)" />
             </div>
           </div>
@@ -122,8 +121,8 @@ import image_role from '@/assets/role@2x.png'
 export default {
   props: {
     delete: {
-      type: Number,
-      default: 0
+      type: Object,
+      required: true
     },
 
     types: {
@@ -174,6 +173,7 @@ export default {
   },
   data() {
     return {
+      delete1: null,
       image_url: image_url, // 默认团队(头像)
       image_role: image_role, // 默认成员 (头像)
       name: '', // 删除成员Name
@@ -189,6 +189,7 @@ export default {
       Gradient: true,
       role: true,
       TeamMembers: {},
+      SubmitData: {},
       form: {
         role: '',
         name: ''
@@ -218,12 +219,20 @@ export default {
       }
     }
   },
+  watch: {
+    delete: {
+      handler(newV, oldV) {
+        this.getRoleList()
+        this.delete1 = newV
+      },
+      deep: true
+    }
+  },
   mounted() {
     if (this.inner) {
       const box = this.$el.parentNode
       box.style.position = 'relative'
     }
-    this.getRoleList()
   },
   methods: {
     open() {
@@ -255,9 +264,9 @@ export default {
         members.push(obj)
       })
       const data = { 'members': members } // 人员列表
-      this.title === '项目成员' ? data.projectId = this.delete : ''
-      this.title === '需求成员' ? data.requireId = this.delete : ''
-      this.title === '任务成员' ? data.taskId = this.delete : ''
+      this.title === '项目成员' ? data.projectId = this.delete.id : ''
+      this.title === '需求成员' ? data.requireId = this.delete.id : ''
+      this.title === '任务成员' ? data.taskId = this.delete.id : ''
       projectAddMember(data).then(res => {
         this.getRoleList()
         this.dialogTableVisible = false
@@ -317,9 +326,9 @@ export default {
       const data = {}
       data.roleId = this.TeamMembers.roleId
       data.member = this.TeamMembers.memberInfoResponse.idap
-      this.title === '项目成员' ? data.projectId = this.delete : ''
-      this.title === '需求成员' ? data.requireId = this.delete : ''
-      this.title === '任务成员' ? data.taskId = this.delete : ''
+      this.title === '项目成员' ? data.projectId = this.delete.id : ''
+      this.title === '需求成员' ? data.requireId = this.delete.id : ''
+      this.title === '任务成员' ? data.taskId = this.delete.id : ''
       projectDeleteMember(data).then(res => {
         if (res.code === 200) {
           this.getRoleList()
@@ -389,11 +398,20 @@ export default {
       })
     },
     async getRoleList() { // 项目成员list
-      const data = {}
-      this.title === '项目成员' ? data.projectId = this.delete : ''
-      this.title === '需求成员' ? data.requireId = this.delete : ''
-      this.title === '任务成员' ? data.taskId = this.delete : ''
-      const MemberList = projectGetMemberList(data) // 获取抽屉主面板数据
+      this.SubmitData = {}
+      if (this.title === '项目成员') {
+        this.SubmitData.projectId = this.delete.id
+      }
+      if (this.title === '需求成员') {
+        this.SubmitData.requireId = this.delete.id
+        this.SubmitData.projectId = this.delete.belongingProject
+      }
+      if (this.title === '任务成员') {
+        this.SubmitData.taskId = this.delete.id
+        this.SubmitData.requireId = this.delete.requireId
+        this.SubmitData.projectId = this.delete.projectId
+      }
+      const MemberList = projectGetMemberList(this.SubmitData) // 获取抽屉主面板数据
       const RoleList = projectDetRoleList({}) // 获取角色数据
       const res1 = await MemberList
       const res2 = await RoleList

+ 1 - 1
src/views/projectManage/projectList/projectViewDetails.vue

@@ -574,7 +574,7 @@
       center
       :display.sync="display"
       width="28%"
-      :delete="Number(projectId[1])"
+      :delete="form_query"
       :types="false"
       :inner="true"
       :mask="false"

+ 1 - 1
src/views/projectManage/requirement/details/index.vue

@@ -250,7 +250,7 @@
         center
         :display.sync="display"
         width="28%"
-        :delete="Number(id)"
+        :delete="requirement"
         :types="false"
         :inner="true"
         :mask="false"

+ 1 - 3
src/views/projectManage/taskList/taskViewDetails.vue

@@ -446,7 +446,7 @@
       center
       :display.sync="display"
       width="28%"
-      :delete="Number(taskId)"
+      :delete="task_form"
       :types="true"
       :inner="true"
       :mask="false"
@@ -1127,7 +1127,6 @@ export default {
         this.bugReasonEnumList = resEnum.data.bugReasonEnumList
       }
       let params
-      this.curIndex = 1
       if (e === -1) {
         params = { taskId: this.taskId, pageSize: this.pageSize, curIndex: this.curIndex }
       } else {
@@ -1222,7 +1221,6 @@ export default {
           break
         case 3:
           data.taskIds = [Number(this.taskId)]
-          console.log(data, 'ssss')
           this.dialogVisible1 = true
           this.$nextTick(() => {
             this.$refs.TestReport.init(4, data)