PrinceLee 5 жил өмнө
parent
commit
fd8b824a0a

+ 36 - 10
src/views/projectManage/taskList/taskViewDetail.vue

@@ -39,7 +39,7 @@
           <div class="line" />
           <span style="vertical-align: bottom; cursor: pointer; color: #6F7C93;" @click.stop="setChild(), display = true"><img style="width: 24px; display: inline-block;" :src="image_url">&nbsp; {{ num }} &nbsp;</span>
           <div class="line" />
-          <i class="el-icon-setting icon-delete" @click="updateVisible = true" />
+          <i class="el-icon-setting icon-delete" @click="open_created" />
           <div class="line" />
           <i class="el-icon-delete icon-delete" @click="deleteVisible = true" />
         </div>
@@ -54,10 +54,18 @@
           <div class="detail-info">
             <el-form :inline="true" :model="form_query" class="demo-form-inline" label-position="right" label-width="100px">
               <el-form-item label="所属项目:">
-                <el-select v-model="form_query.belongingProject" placeholder="请选择">
+                <el-select v-model="form_query.projectId" placeholder="请选择" @change="changeArea">
                   <el-option v-for="(item,index) in belongProjectList" :key="item.name + index" :label="item.name" :value="item.id" />
                 </el-select>
               </el-form-item>
+              <el-form-item label="所属需求:">
+                <el-select v-model="form_query.requireId" placeholder="请选择" @change="changeArea">
+                  <el-option v-for="(item,index) in requireList" :key="item.name + index" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="所属模块:">
+                {{ form_query.moduleInfoName }}
+              </el-form-item>
             </el-form>
             <el-form :inline="true" :model="form_query" class="demo-form-inline" label-position="right" label-width="100px" />
             <el-form :inline="true" :model="form_query" class="demo-form-inline" label-position="right" label-width="100px" />
@@ -116,9 +124,11 @@
         <section class="main-section" />
       </el-container>
       <!-- 统计 -->
-      <!-- 新建 -->
+      <!-- 新建(bug) -->
+      <createdBug v-if="updateVisible" ref="createdBug" />
       <!-- 新建 -->
       <!-- 编辑 -->
+      <open-dialog v-if="updateVisible" ref="task_createdUpdata" />
       <!-- 编辑 -->
       <!-- 删除 -->
       <el-dialog :visible.sync="deleteVisible" width="30%" center :close-on-click-modal="false">
@@ -135,7 +145,6 @@
           <el-date-picker v-model="changeStatusDate" type="date" style="width:100%;" placeholder="选择日期" format="yyyy-MM-dd HH:mm:ss" />
         </div>
       </normal-dialog>
-      <createdBug v-if="bug_open" ref="createdBug" />
       <drawer
         ref="drawer"
         title="项目成员"
@@ -160,7 +169,8 @@ import {
   tasktaskDelete,
   taskUpdate,
   commentCreate,
-  commentList
+  commentList,
+  configShowRequirementVersionEnum
 } from '@/api/taskIndex'
 import { projectListProject } from '@/api/requirement.js'
 import searchPeople from '@/components/select/searchPeople'
@@ -169,13 +179,15 @@ import drawer from '@/views/projectManage/Drawer'
 import image_url from '@/assets/home_images/home_u.png'
 import createdBug from '@/views/projectManage/bugList/file/createdBug'
 import normalDialog from '@/components/dialog/normalDialog'
+import openDialog from '@/views/projectManage/dialog_vue'
 export default {
   components: {
     searchPeople,
     normalDialog,
     textArea,
     drawer,
-    createdBug
+    createdBug,
+    openDialog
   },
   filters: {
     ellipsis(value, num) {
@@ -194,17 +206,17 @@ export default {
       textarea: '', // 评论
       taskId: this.$route.query.id, // 任务id
       allStatus: [], // 任务所有状态
+      belongProjectList: [], // 所属项目列表
+      requireList: [], // 所属需求列表
       statusDialog: false, // 修改状态弹框
       changeStatusDate: null, // 状态改变时间
       form_query: {},
       display: false, // 设置成员弹框
       num: 0, // 成员数量
       image_url: image_url, // 成员icon
-      createVisible: false, // 新建任务弹框
       updateVisible: false, // 编辑任务弹框
       deleteVisible: false, // 删除任务弹框
       bug_open: false, // 新建缺陷弹框
-      belongProjectList: [], // 所属项目列表
       iterationList: [], // 所属迭代列表
       commentContent: null, // 评论内容
       comments: [] // 评论列表
@@ -219,6 +231,7 @@ export default {
     this.taskGet()
     this.getTaskStatus()
     this.getBelongProject()
+    this.getRequireList()
     this.getCommentList()
     this.$store.state.data.status = true
     this.$store.state.data.bizId = true
@@ -244,7 +257,13 @@ export default {
     async getBelongProject() { // 获取所属项目列表
       const res = await projectListProject({ bizId: Number(localStorage.getItem('bizId')) })
       if (res.code === 200) {
-        this.belongProjectList = res.data.filter(item => item.id !== -1)
+        this.belongProjectList = res.data
+      }
+    },
+    async getRequireList() { // 获取所属需求列表
+      const res = await configShowRequirementVersionEnum({ bizId: Number(localStorage.getItem('bizId')) })
+      if (res.code === 200) {
+        this.requireList = res.data
       }
     },
     async getTaskStatus() { // 获取任务状态列表
@@ -306,7 +325,14 @@ export default {
     setChild() { // 设置成员
       this.$refs.drawer.getRoleList()
     },
-    async taskDelete() { // 删除需求
+    open_created() { // 编辑任务
+      // 打开弹窗
+      this.updateVisible = true
+      this.$nextTick(() => {
+        this.$refs.task_createdUpdata.init(3, [null, this.taskId])
+      })
+    },
+    async taskDelete() { // 删除任务
       const user = { name: this.userNames, ename: this.userInformation, id: '' }
       const res = await tasktaskDelete(user, this.taskId)
       if (res.code === 200) {