优化

src/views/projectManage/iteration/components/requiredTable.vue

@@ -160,7 +160,7 @@
         </template>
       </el-table-column>
       <el-table-column label="交付日期" min-width="200" align="center">
-        <template slot-scope="scope">{{ scope.row.optionsObject === null? '' :scope.row.optionsObject.endTime }}</template>
+        <template slot-scope="scope">{{ scope.row.optionsObject ? scope.row.optionsObject.endTime: '' }}</template>
       </el-table-column>
       <el-table-column label="任务数量" min-width="100" align="center">
         <template slot-scope="scope">{{ scope.row.taskCount }}</template>

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

@@ -67,7 +67,7 @@
 
     </el-table>
     <div class="bottom-detail">
-      <el-row>交付日期：{{ scheduleDetail.options.endTime }}</el-row>
+      <el-row>交付日期：{{ scheduleDetail.endTime }}</el-row>
       <el-row>排期：{{ scheduleDetail.startTime | handlerDate }} ~ {{ scheduleDetail.endTime | handlerDate }}</el-row>
       <el-row v-if="scheduleDetail.preOnlineVersion && scheduleDetail.preOnlineVersion.length>0">
         <el-col :span="2">预计上线版本：</el-col>

src/views/projectManage/projectList/components/taskList.vue

@@ -94,7 +94,7 @@
         <template slot-scope="scope">{{ scope.row.involveAppString || '无' }}</template>
       </el-table-column>
       <el-table-column label="交付日期" width="250" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">{{ scope.row.options ? scope.row.options.endTime : '' }}</template>
+        <template slot-scope="scope">{{ scope.row.optionsObject ? scope.row.optionsObject.endTime : '' }}</template>
       </el-table-column>
       <el-table-column label="缺陷数量" width="250" align="center" show-overflow-tooltip>
         <template slot-scope="scope">{{ scope.row.bugCount }}</template>

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

@@ -41,7 +41,7 @@
 
     </el-table>
     <div class="bottom-detail">
-      <el-row>交付日期：{{ scheduleDetail.options.endTime }}</el-row>
+      <el-row>交付日期：{{ scheduleDetail.endTime }}</el-row>
       <el-row>排期：{{ scheduleDetail.startTime | handlerDate }} ~ {{ scheduleDetail.endTime | handlerDate }}</el-row>
       <el-row v-if="scheduleDetail.preOnlineVersion && scheduleDetail.preOnlineVersion.length>0">
         <el-col :span="2" style="width: 100px">预计上线版本：</el-col>

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

@@ -95,7 +95,7 @@
         <template slot-scope="scope">{{ scope.row.involveAppString || '无' }}</template>
       </el-table-column>
       <el-table-column label="交付日期" width="250" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">{{ scope.row.options ? scope.row.options.endTime : '' }}</template>
+        <template slot-scope="scope">{{ scope.row.optionsObject ? scope.row.optionsObject.endTime : '' }}</template>
       </el-table-column>
       <el-table-column label="缺陷数量" width="250" align="center" show-overflow-tooltip>
         <template slot-scope="scope">{{ scope.row.bugCount }}</template>
@@ -109,7 +109,7 @@
     <TestReport v-if="dialogTestReport" ref="TestReport" />
     <DailyReport v-if="dialogDailyReport" ref="DailyReport" />
     <ReleaseReport v-if="dialogClientReport" ref="ClientReport" />
-    <task-dialog v-if="showTaskDialog" :show.sync="showTaskDialog" :task-id="taskId.id" :status-name="taskId.statusString" @getList="get_allTask" />
+    <task-dialog v-if="showTaskDialog" :show.sync="showTaskDialog" :task-id="taskId.id" :status-name="taskId.statusString" @getList="get_allTask" @changeStatusAll="changeStatusAll" />
     <!-- 批量排期 -->
     <modify-schedule
       v-if="visibleSchedule"
@@ -220,10 +220,14 @@ export default {
         const taskInfoDO = e
         const resTask = await taskUpdate({ taskInfoDO, user })
         if (resTask.code === 200) {
+          this.$emit('update')
           this.$message({ message: '修改成功', type: 'success', offset: 150 })
         }
       }
     },
+    changeStatusAll() {
+      this.$emit('update')
+    },
     async confirmStatus() { // 确认更改状态
       const user = {
         name: localStorage.getItem('username'),

src/views/projectManage/requirement/requirementDetail.vue

@@ -241,7 +241,7 @@
       <!-- 任务 -->
       <el-container v-if="activeName === '2'" class="is-vertical">
         <section class="main-section contain">
-          <tasks-list ref="tasks-list" />
+          <tasks-list ref="tasks-list" @update="getRequirementById" />
         </section>
       </el-container>
       <!-- 任务 -->
@@ -464,7 +464,15 @@ export default {
       this.BackToTheLatest = true
     },
     changeSchedule() { // 修改锁定状态
-      this.scheduleVisble = true
+      if (this.isScheduleLocked === 1) {
+        if (this.form_query.pmMemberInfoResponse.idap === localStorage.getItem('username')) {
+          this.scheduleVisble = true
+        } else {
+          this.$message({ message: '没有权限，请联系PM执行解锁！', type: 'error', duration: 1000, offset: 150 })
+        }
+      } else {
+        this.scheduleVisble = true
+      }
     },
     // clickBackToTheLatest() {
     //   this.$refs.ScheduleEvent.rowDrop()
@@ -570,6 +578,7 @@ export default {
       }
     },
     async getRequirementById() { // 获取需求详情
+      alert(1)
       const res = await getRequirementById({ id: this.$route.query.id })
       if (res.code === 200) {
         this.form_query = res.data

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

@@ -72,7 +72,7 @@
 
     </el-table>
     <div class="bottom-detail">
-      <el-row>交付日期：{{ scheduleDetail.options ? scheduleDetail.options.endTime : '' }}</el-row>
+      <el-row>交付日期：{{ scheduleDetail.endTime }}</el-row>
       <el-row>排期：{{ scheduleDetail.startTime | handlerDate }} ~ {{ scheduleDetail.endTime | handlerDate }}</el-row>
       <el-row v-if="scheduleDetail.preOnlineVersion && scheduleDetail.preOnlineVersion.length>0">
         <el-col :span="2">预计上线版本：</el-col>

src/views/projectManage/taskList/dialog/taskDialog.vue

@@ -111,6 +111,7 @@ export default {
         if (res.code === 200) {
           this.$emit('update:show', false)
           this.$emit('getList')
+          this.$emit('changeStatusAll')
           this.$message({ message: res.msg, type: 'success' })
         }
       })

src/views/projectManage/taskList/taskIndex.vue

@@ -139,7 +139,7 @@
             <span style="font-size: 12px;color: rgba(167,174,188,1);">
               {{ scope.row.taskIdSting }}
               <span
-                v-if="scope.row.tagNotification !== null"
+                v-if="scope.row.tagNotification !== null && scope.row.status !== -2"
                 :class="{
                   'tagNotification': scope.row.tagType === 0,
                   'tagNotification1': scope.row.tagType === 1
@@ -147,6 +147,7 @@
               >
                 {{ scope.row.tagNotification }}
               </span>
+              <span v-if="scope.row.status === -2" class="tagNotification1"> {{ 'hold' }} </span>
             </span><br>
             <span class="stylus-hover" @click="link_task(scope.row.id)">{{ scope.row.name }}</span>
           </template>

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

@@ -70,7 +70,7 @@
 
     </el-table>
     <div class="bottom-detail">
-      <el-row>交付日期：{{ scheduleDetail.options.endTime }}</el-row>
+      <el-row>交付日期：{{ scheduleDetail.endTime }}</el-row>
       <el-row>排期：{{ scheduleDetail.startTime | handlerDate }} ~ {{ scheduleDetail.endTime | handlerDate }}</el-row>
       <el-row v-if="scheduleDetail.preOnlineVersion && scheduleDetail.preOnlineVersion.length>0">
         <el-col :span="2">预计上线版本：</el-col>

src/views/projectManage/version/components/taskList.vue

@@ -84,7 +84,7 @@
         <template slot-scope="scope">{{ scope.row.involveAppString || '无' }}</template>
       </el-table-column>
       <el-table-column label="交付日期" width="250" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">{{ scope.row.options ? scope.row.options.endTime : '' }}</template>
+        <template slot-scope="scope">{{ scope.row.optionsObject ? scope.row.optionsObject.endTime : '' }}</template>
       </el-table-column>
       <el-table-column label="缺陷数量" width="250" align="center" show-overflow-tooltip>
         <template slot-scope="scope">{{ scope.row.bugCount }}</template>
@@ -109,7 +109,7 @@
     </div>
     <TestReport v-if="dialogTestReport" ref="TestReport" />
     <DailyReport v-if="dialogDailyReport" ref="DailyReport" />
-    <ClientReport v-if="dialogClientReport" ref="ClientReport" />
+    <ReleaseReport v-if="dialogClientReport" ref="ClientReport" />
     <taskDialog v-if="showTaskDialog" :show.sync="showTaskDialog" :task-id="taskId.id" :status-name="taskId.statusString" @getList="get_allTask" />
     <!-- 批量排期 -->
     <modify-schedule
@@ -124,9 +124,9 @@
 <script>
 import imgUrl from '@/assets/建立档案@2x.png'
 import '@/styles/PublicStyle/index.scss'
-import TestReport from '@/views/Platform/presentation/Templates/TestReport' // 提测
+import TestReport from '@/views/reportManagement/components/TestingReport' // 提测
 import DailyReport from '@/views/reportManagement/components/DailyReport' // 日报
-import ClientReport from '@/views/Platform/presentation/Templates/ClientReport' // 准出
+import ReleaseReport from '@/views/reportManagement/components/ReleaseReport' // 准出
 import { taskUpdate } from '@/api/projectViewDetails'
 import { configShowTaskEnum, configShowTaskStatusEnum } from '@/api/taskIndex'
 import scheduleList from './scheduleList'
@@ -137,7 +137,7 @@ export default {
   components: {
     TestReport,
     DailyReport,
-    ClientReport,
+    ReleaseReport,
     scheduleList,
     taskDialog,
     modifySchedule

src/views/reportManagement/testPresentation.vue

@@ -400,6 +400,9 @@ export default {
     },
 
     createPresentation(vel) {
+      console.log(vel, '查看报告')
+      const data = this.restaurants.filter(item => { return item.id === vel })
+      console.log(data, '查看报告2')
       if (vel !== '') {
         if (this.title === '测试日报') {
           this.dialogDaily = true

src/views/workbench/team/components/taskList.vue

@@ -90,7 +90,7 @@
         <template slot-scope="scope">{{ scope.row.involveAppString || '无' }}</template>
       </el-table-column>
       <el-table-column label="交付日期" width="250" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">{{ scope.row.options ? scope.row.options.endTime : '' }}</template>
+        <template slot-scope="scope">{{ scope.row.optionsObject ? scope.row.optionsObject.endTime : '' }}</template>
       </el-table-column>
       <el-table-column label="缺陷数量" width="250" align="center" show-overflow-tooltip>
         <template slot-scope="scope">{{ scope.row.bugCount }}</template>
@@ -332,23 +332,61 @@ export default {
       this.visibleSchedule = true
       this.selectTaskList = this.curcentList
     },
+
     filtrateTest() { // 提测筛选
-      this.dialogTestReport = true
-      this.$nextTick(() => {
-        this.$refs.TestReport.init(7, this.curcentList.map(item => { return item.id }))
+      const data = this.curcentList.filter(item => { return item.id })
+      const res = []
+      data.map(item => {
+        if (item.statusString !== '开发中') {
+          res.push(item.id)
+        }
       })
+      if (res.length > 0) {
+        this.$message({ message: `任务${res}的状态不是【开发中】，无法批量提测，请检查！”`, type: 'warning', offset: 150 })
+      } else {
+        this.dialogTestReport = true
+        this.$nextTick(() => {
+          this.$refs.TestReport.init(7, this.curcentList.map(item => { return item.id }))
+        })
+      }
     },
+
     filtrateAllow() { // 准出筛选
-      this.dialogClientReport = true
-      this.$nextTick(() => {
-        this.$refs.ClientReport.init(7, this.curcentList.map(item => { return item.id }))
+      const data = this.curcentList.filter(item => { return item.id })
+      console.log(data, '查看1')
+      const res = []
+      data.map(item => {
+        if (item.statusString !== '测试中') {
+          res.push(item.id)
+        }
       })
+      console.log(res, '查看')
+      if (res.length > 0) {
+        this.$message({ message: `任务${res}的状态不是【测试中】，无法批量准出，请检查！”`, type: 'warning', offset: 150 })
+      } else {
+        this.dialogClientReport = true
+        this.$nextTick(() => {
+          this.$refs.ClientReport.init(7, this.curcentList.map(item => { return item.id }))
+        })
+      }
     },
+
     filtrateDaily() { // 建立日报
-      this.dialogDailyReport = true
-      this.$nextTick(() => {
-        this.$refs.DailyReport.init(7, this.curcentList.map(item => { return item.id }))
+      const data = this.curcentList.filter(item => { return item.id })
+      const res = []
+      data.map(item => {
+        if (item.statusString !== '测试中') {
+          res.push(item.id)
+        }
       })
+      if (res.length > 0) {
+        this.$message({ message: `任务${res}的状态不是【测试中】，无法批量建立测试日报，请检查！”`, type: 'warning', offset: 150 })
+      } else {
+        this.dialogDailyReport = true
+        this.$nextTick(() => {
+          this.$refs.DailyReport.init(7, this.curcentList.map(item => { return item.id }))
+        })
+      }
     },
     link_task(id) { // 跳转到任务详情页
       this.$router.push({ name: '任务详情', query: { id: id }})