优化需求计划

src/api/iteration.js

@@ -110,7 +110,7 @@ export function requirementUpdateRequirement(data) {
 // 迭代下的单个需求下的排期列表
 export function scheduleListByRequire(id) {
   return request({
-    url: TeamManagement + `/schedule/listByRequire?id=` + id,
+    url: TeamManagement + `/schedule/listByRequireAll?id=` + id,
     method: 'get'
   })
 }

src/views/projectManage/components/demand.vue

@@ -4,12 +4,12 @@
     <el-table v-if="tableHeader === false" max-height="38px" :data="datas" class="tableHeader" border size="mini" :header-cell-style="{ background: 'rgba(247,247,247,1)', color: 'rgb(74, 74, 74)', fontSize: '14px', fontWeight: '500'}" @selection-change="changeCheckout(1)">
       <el-table-column v-if="locking" type="selection" width="50" align="center" />
       <el-table-column prop="date" label="任务" width="300" />
-      <el-table-column prop="type" label="类型" min-width="100" />
+      <el-table-column prop="type" label="类型" min-width="70" />
       <el-table-column prop="desc" label="描述" min-width="150" />
-      <el-table-column prop="seperateDaysNoHoliday" label="排期" min-width="200" />
+      <el-table-column prop="seperateDaysNoHoliday" label="排期" min-width="160" />
       <el-table-column prop="dayLength" label="时长" min-width="50" />
       <el-table-column prop="peopleList" label="参与人员" min-width="150" />
-      <el-table-column label="操作" width="200" />
+      <el-table-column label="操作" width="120" />
     </el-table>
     <div v-if="tableHeader === true" class="Layout_space_between" style="height: 40px;;border: 1px solid #EBEEF5;">
       <div class="Layout_flex_start" style="width: 90%">
@@ -52,7 +52,7 @@
       <el-table-column label="任" style="padding: 20px;">
         <template slot-scope="scope">
           <!-- <schedule-list :id="requirementId" ref="ScheduleEvent" :showunlock="showunlock" :type-list="taskScheduleEvent" :required-list="taskScheduleLists(scope.row.id)" class-name="white" :all="true" :no-move="false" /> -->
-          <schedule-list :id="requirementId" ref="taskSchedule" :select-task-list="taskList" :required-list="taskScheduleLists(scope.row.id)" @listByTask="listByTask(requirementId)" />
+          <schedule-list :id="scope.row.id" ref="taskSchedule" :select-task-list="taskList" :required-list="taskScheduleLists(scope.row.id)" @listByTask="listByTask(requirementId)" />
         </template>
       </el-table-column>
     </el-table>
@@ -118,6 +118,7 @@ export default {
       dataList: {}, // 排期
       taskScheduleEvent: [], // 排期类型
       locking: true, // 查看历史记录锁定能
+      const: 0,
       isDelete: false // 删除排期操作
     }
   },
@@ -152,11 +153,11 @@ export default {
       this.taskList = []
       this.scheduleVisble = false
       const res = await listByRequire(id)
+      console.log(this.const++)
       if (res.code === 200) {
         this.$nextTick(() => {
           this.tableData = res.data.taskDetailList // 任务list
           this.dataList = res.data // 排期
-          this.$emit('isScheduleLockeds', this.dataList.isScheduleLocked)
           this.scheduleList = res.data.scheduleDetailRespons || []
           this.scheduleDetail = res.data.timeInfos // 用例/开发/提测/测试/准出/上线
           this.preOnlineVersion = res.data.preOnlineVersion // 预计上线版本
@@ -171,7 +172,6 @@ export default {
     },
 
     addClass({ row, column, rowIndex, columnIndex }) {
-      // console.log(row, column, rowIndex, columnIndex, 'cdjscnsdjknj')
       if (columnIndex === 2) {
         return 'cell-grey'
       }
@@ -313,6 +313,8 @@ export default {
   opacity:1;
   padding: 0 10px;
   border-radius:20px;
+  display: flex;
+  justify-content: space-between;
 }
 .tableHeader {
   >>> .el-table__empty-block{

src/views/projectManage/requirement/components/scheduleList.vue

@@ -11,17 +11,17 @@
       style="min-height: 90px;"
       size="mini"
     >
-      <el-table-column prop="type" label="类型" min-width="100">
+      <el-table-column prop="type" label="类型" min-width="70">
         <template slot-scope="scope">
           {{ scope.row.name }}
           <div :class="scope.row.isScheduleLocked === 1 ? 'el-icon-lock' : 'el-icon-unlock'" />
         </template>
       </el-table-column>
       <el-table-column prop="desc" label="描述" min-width="150" align="left" show-overflow-tooltip />
-      <el-table-column prop="seperateDaysNoHoliday" label="排期" min-width="200" show-overflow-tooltip />
+      <el-table-column prop="seperateDaysNoHoliday" label="排期" min-width="160" show-overflow-tooltip />
       <el-table-column prop="dayLength" label="时长" min-width="50" />
       <el-table-column prop="peopleList" label="参与人员" min-width="150" show-overflow-tooltip />
-      <el-table-column label="操作" width="200">
+      <el-table-column label="操作" width="120">
         <template slot-scope="scope">
           <div class="btn-style">
             <el-button v-if="scope.row.isScheduleLocked === 0" type="text" size="small" @click="editSchedule(scope.row)">编辑</el-button>
@@ -85,12 +85,12 @@ export default {
     }
   },
   watch: {
-    id: {
-      handler(newV, oldV) {
-        this.listByTask(newV)
-      },
-      immediate: true
-    },
+    // id: {
+    //   handler(newV, oldV) {
+    //     this.listByTask(newV)
+    //   },
+    //   immediate: true
+    // },
     requiredList: {
       handler(newV, oldV) {
         this.scheduleList = newV

src/views/projectManage/requirement/requirementDetail.vue

@@ -314,6 +314,7 @@ import {
   iterationList,
   getCommentList,
   addComment,
+  listByRequire,
   requirementHold,
   requirementUnhold,
   configShowRequireStatusEnum,
@@ -442,6 +443,8 @@ export default {
     async GetRequireScheduleHistory() {
       this.scheduleVisble = false
       const res = await scheduleGetRequireScheduleHistory(this.requirementId)
+      const res1 = await listByRequire(this.requirementId)
+      this.isScheduleLocked = res1.data.isScheduleLocked
       this.SchedulingContent = res.data
       this.BackToTheLatest = false // 回到最新
       this.Latest = true
@@ -452,9 +455,6 @@ export default {
       this.$refs.ScheduleEvent.lockingchange()
       this.getRequirementById()
     },
-    isScheduleLockeds(data) {
-      this.isScheduleLocked = data // 锁定状态1锁定0未锁定
-    },
     async clickScheduling(ele) {
       this.showunlock = false
       this.Latest = false