wangziqian 5 年之前
父节点
当前提交
afd7911cde

+ 0 - 8
src/api/requirement.js

@@ -90,14 +90,6 @@ export function getBugStatusMapInfo(data) {
   })
 }
 
-export function getTaskByRequireId(data) {
-  return request({
-    url: requestIp + '/task/listByRequireId',
-    method: 'get',
-    params: data
-  })
-}
-
 export function getCommentList(data) {
   return request({
     url: requestIp + '/comment/list',

+ 1 - 1
src/styles/detail-pages.scss

@@ -113,7 +113,7 @@
       border-radius: 1px;
     }
     .title-left-name {
-      width: 100px;
+      width: auto;
       height: 20px;
       font-size: 16px;
       font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","\5FAE\8F6F\96C5\9ED1",Arial,sans-serif;

+ 3 - 4
src/views/projectManage/iteration/components/modifySchedule.vue

@@ -91,8 +91,7 @@ const _ = require('lodash')
 import searchPeople from '@/components/select/searchPeople'
 import normalDialog from '@/components/dialog/normalDialog'
 import selDatePicker from '@/components/picker/SelDatePicker'
-// import { taskList } from '@/api/projectIndex'
-import { getTaskByRequireId } from '@/api/requirement'
+import { taskList } from '@/api/projectIndex'
 import { taskList as allTaskList, configShowTaskEnum } from '@/api/taskIndex'
 import { getSeprateDayInfo, scheduleCreate, scheduleGet, scheduleUpdate, scheduleDelete } from '@/api/projectViewDetails'
 import danger from '@/assets/感叹@2x.png'
@@ -220,8 +219,8 @@ export default {
       }
     },
     async getNowTask() { // 获取当前需求下任务
-      const res = await getTaskByRequireId({
-        id: this.$route.query.id
+      const res = await taskList({
+        requireId: this.$route.query.id
       })
       if (res.code === 200) {
         this.tasksOptions = res.data

+ 19 - 3
src/views/projectManage/projectList/projectViewDetails.vue

@@ -121,7 +121,7 @@
       <!-- 需求 -->
       <el-container v-if="activeName === '2'">
         <section class="main-section contain">
-          <needs-list />
+          <needs-list ref="needs-list" />
         </section>
       </el-container>
       <!-- 需求 -->
@@ -155,8 +155,8 @@
         </span>
       </el-dialog>
       <!-- 弹窗 -->
-      <openDialog v-if="task_open" ref="task_createdUpdata" />
-      <createdBug v-if="bug_open" ref="createdBug" />
+      <openDialog v-if="task_open" ref="task_createdUpdata" :no-jump="true" @change="reloadList" />
+      <createdBug v-if="bug_open" ref="createdBug" @reloadList="reloadList" />
       <requirement-create
         class="diologPadding"
         title="新建需求"
@@ -294,6 +294,7 @@ export default {
       this.need_open = false
       this.get_list()
       this.initRequirementCreateDialog()
+      this.reloadList()
     },
     async get_list() {
       // 获取项目ID(查询)
@@ -357,6 +358,21 @@ export default {
       this.$nextTick(() => {
         this.$refs.task_createdUpdata.init(2)
       })
+    },
+    reloadList() {
+      this.get_project_detail()
+      if (this.$refs['bugTableDialog']) {
+        this.$refs['bugTableDialog'].bugGetTableList()
+      }
+      if (this.$refs['data-statistics']) {
+        this.$refs['data-statistics'].getRequireSumData()
+      }
+      if (this.$refs['tasks-list']) {
+        this.$refs['tasks-list'].get_allTask()
+      }
+      if (this.$refs['needs-list']) {
+        this.$refs['needs-list'].getNeedsList()
+      }
     }
   }
 }

+ 4 - 4
src/views/projectManage/requirement/components/modifySchedule.vue

@@ -91,7 +91,7 @@ const _ = require('lodash')
 import searchPeople from '@/components/select/searchPeople'
 import normalDialog from '@/components/dialog/normalDialog'
 import selDatePicker from '@/components/picker/SelDatePicker'
-import { getTaskByRequireId } from '@/api/requirement'
+import { taskList } from '@/api/projectIndex'
 import { taskList as allTaskList, configShowTaskEnum } from '@/api/taskIndex'
 import { getSeprateDayInfo, scheduleCreate, scheduleGet, scheduleUpdate, scheduleDelete } from '@/api/projectViewDetails'
 import danger from '@/assets/感叹@2x.png'
@@ -232,9 +232,9 @@ export default {
         this.taskScheduleEvent = resEnum.data.taskScheduleEvent
       }
     },
-    async getNowTask() { // 获取当前项目下任务
-      const res = await getTaskByRequireId({
-        id: this.$route.query.id
+    async getNowTask() { // 获取当前需求下任务
+      const res = await taskList({
+        requireId: this.$route.query.id
       })
       if (res.code === 200) {
         this.tasksOptions = res.data.taskDetails

+ 15 - 1
src/views/projectManage/requirement/requirementDetail.vue

@@ -114,7 +114,12 @@
         <section class="main-section">
           <div class="el-main-title">
             <div class="title-left-icon" />
-            <div class="title-left-name">需求计划</div>
+            <div class="title-left-name">
+              <div class="require-plan">
+                需求计划
+                <span><i class="el-icon-warning-outline" />每个任务仅支持一次提测和一次准出,请合理拆解后任务再排期</span>
+              </div>
+            </div>
           </div>
           <div>
             <schedule-list
@@ -459,6 +464,15 @@ export default {
 }
 .main-section {
   @include main-section;
+  .require-plan {
+    display: flex;
+    align-items: center;
+    span {
+      margin-left: 20px;
+      color: #E6A23C;
+      font-size: 12px;
+    }
+  }
   .detail-info {
     padding: 0 34px 20px 34px;
     /deep/.el-input__inner{

+ 15 - 1
src/views/projectManage/taskList/taskViewDetail.vue

@@ -111,7 +111,12 @@
         <section class="main-section">
           <div class="el-main-title">
             <div class="title-left-icon" />
-            <div class="title-left-name">任务计划</div>
+            <div class="title-left-name">
+              <div class="require-plan">
+                任务计划
+                <span><i class="el-icon-warning-outline" />每个任务仅支持一次提测和一次准出,请合理拆解后任务再排期</span>
+              </div>
+            </div>
           </div>
           <div>
             <schedule-list
@@ -492,6 +497,15 @@ export default {
 }
 .main-section {
   @include main-section;
+  .require-plan {
+    display: flex;
+    align-items: center;
+    span {
+      margin-left: 20px;
+      color: #E6A23C;
+      font-size: 12px;
+    }
+  }
   .detail-info {
     padding: 0 34px 20px 34px;
     /deep/.el-input__inner{