优化提测

src/views/projectManage/taskList/taskViewDetail.vue

@@ -359,7 +359,7 @@ import schedule from '@/views/projectManage/schedule' // 排期锁定弹窗
 import download from '@/views/projectManage/components/export.vue'
 import record from '@/views/projectManage/components/record.vue'
 import timeLine from '@/views/projectManage/components/timeLine.vue'
-import { dailyReportCheckStatus, reportreleaseCheckStatus } from '@/api/reportTemplate'
+import { dailyReportCheckStatus, reportreleaseCheckStatus, reportdelivertestCheckStatus } from '@/api/reportTemplate'
 export default {
   components: {
     searchPeople,
@@ -673,8 +673,13 @@ export default {
     createReport(e, ele) { // 创建报告
       switch (e) {
         case 1: // 提测
-          this.dialogTest = true
-          this.$nextTick(() => { this.$refs.TestReport.init(7, [this.taskId]) })
+          reportdelivertestCheckStatus([this.taskId]).then(res => {
+            if (res.code === 200) {
+              this.dialogTest = true
+              this.$nextTick(() => { this.$refs.TestReport.init(7, [this.taskId]) })
+            }
+          })
+
           break
         case 2: // 日报
           dailyReportCheckStatus([this.taskId]).then(res => {

src/views/reportManagement/Testing/TestingPreview.vue

@@ -30,10 +30,10 @@
 
       <el-row>
         <el-col :span="12" class="Layout_space_between">
-          <span class="parent-style">计划开发时间：{{ fromCreateData.devPlanTimeStart + '至' + fromCreateData.devPlanTimeEnd }}</span>
+          <span class="parent-style">计划开发时间：{{ fromCreateData.devPlanTimeStart !== null ? fromCreateData.devPlanTimeStart + '至' + fromCreateData.devPlanTimeEnd : '' }}</span>
         </el-col>
         <el-col :span="12" class="Layout_space_between">
-          <span class="parent-style">实际开发时间：{{ fromCreateData.devActualTimeStart + '至' + fromCreateData.devActualTimeEnd }}</span>
+          <span class="parent-style">实际开发时间：{{ fromCreateData.devActualTimeStart !== null ? fromCreateData.devActualTimeStart + '至' + fromCreateData.devActualTimeEnd : '' }}</span>
         </el-col>
       </el-row>
 
@@ -41,7 +41,7 @@
         <el-col :span="12" class="Layout_space_between">
           <span class="parent-style">是否跟版：{{ fromCreateData.followVersion === 2 ? '否' : '是' }} </span>
         </el-col>
-        <el-col :span="12" class="Layout_space_between">
+        <el-col v-if="fromCreateData.followVersion === 1" :span="12" class="Layout_space_between">
           <span class="parent-style">跟版客户端：{{ fromCreateData.involveAppString }}</span>
         </el-col>
       </el-row>
@@ -50,7 +50,7 @@
         <el-col :span="12" class="Layout_space_between">
           <span class="parent-style">CodeReview：{{ fromCreateData.isCodeReview === 0 ? '否' : '是' }}</span>
         </el-col>
-        <el-col :span="12" class="Layout_space_between">
+        <el-col v-if="fromCreateData.isCodeReview === 1" :span="12" class="Layout_space_between">
           <span class="parent-style">执行人：{{ fromCreateData.codeReviewExecutor }}</span>
         </el-col>
       </el-row>

src/views/reportManagement/Testing/components/deliverDetails.vue

@@ -139,21 +139,21 @@
         <el-button type="danger" size="mini" @click="dialog_testData = false">取 消</el-button>
       </span>
     </el-dialog>
-    <TestingReport v-if="dialogDaily" ref="DailyReport" @getList="reportreleaseGetReportById(reportId)" />
+    <TestingReport v-if="dialogDaily" ref="DailyReport" @getList="reportdelivertestGetReportById(reportId)" />
   </el-container>
 </template>
 
 <script>
 import '@/styles/PublicStyle/index.scss'
 import { reportdelivertestGetReportById, reportreleaseDelete, reportdelivertestGetRequiresByTaskIds, reportdelivertestUpdate } from '@/api/reportTemplate'
-import TestingReport from '@/views/reportManagement/components/TestingReport' // 准出
+import TestingReport from '@/views/reportManagement/components/TestingReport' // 提测
 export default {
   components: {
     TestingReport
   },
   data() {
     return {
-      dialogDaily: false, // 准出报告弹窗
+      dialogDaily: false, // 提测报告弹窗
       dialog_testData: false, // 操作弹窗
       tableData: [],
       AsTp: '',
@@ -165,7 +165,7 @@ export default {
     this.reportdelivertestGetReportById(this.reportId)
   },
   methods: {
-    async reportdelivertestGetReportById(e) { // 获取准出报告data
+    async reportdelivertestGetReportById(e) { // 获取提测报告data
       const res = await reportdelivertestGetReportById(e)
       if (res.code === 200) {
         this.details = res.data
@@ -180,14 +180,14 @@ export default {
       }
     },
 
-    report_click(e, data) { // 准出报告
+    report_click(e, data) { // 提测报告
       this.report_data = data
       this.dialogDaily = true
       this.$nextTick(() => {
         this.$refs.DailyReport.init(e, data)
       })
     },
-    async deleteDaily() { // 删除准出报告
+    async deleteDaily() { // 删除提测报告
       if (this.AsTp === '打回' || this.AsTp === '通过') {
         const data = {
           id: this.details.id,

src/views/reportManagement/Testing/newTestingTemplate.vue

@@ -137,13 +137,12 @@ export default {
   watch: {
     templateId: {
       handler(newV) {
-        console.log(newV, '更新')
         if (newV === '新建模版') {
           this.releaseType = true
         } else {
           this.releaseType = false
           if (newV.id) {
-            console.log(newV, '有数据')
+            this.tpltId = newV.moduleId
             this.reportdelivertestGetReportById(newV.id)
           } else {
             console.log(newV, 'tmepId')
@@ -156,7 +155,6 @@ export default {
     },
     taskIds: {
       handler(newV) {
-        console.log(newV, ' taskids')
         if (newV) {
           this.taskId = newV
           this.reportdelivertestInitReportRelease(newV)
@@ -173,6 +171,7 @@ export default {
       const res = await reportdelivertestGetReportById(val)
       if (res.code === 200) {
         const from = res.data
+        this.from.id = from.id
         this.$set(this.from, 'reportName', from.reportName) // 报告名称
         this.$set(this.fromCreateData, 'content', from.content) // 报告名称
         this.$set(this.from, 'deliverTestPlanTime', from.deliverTestPlanTime) // 计划提测时间
@@ -215,20 +214,27 @@ export default {
       this.$refs.fromCreateData.validate((valid) => {
         if (valid) {
           if (val) {
-            const data = this.fromCreateData
-            data.deliverTestPlanTime = this.from.deliverTestPlanTime
-            data.delayReason = this.from.delayReason
-            data.deliverTestActualTime = this.from.deliverTestActualTime
-            data.devActualTimeStart = this.from.devActualTimeStart
-
-            data.followVersion = this.from.followVersion
-            data.involveAppString = this.from.involveAppString
-
-            data.isCodeReview = this.from.isCodeReview
-            data.codeReviewExecutor = this.from.codeReviewExecutor
+            const data = {}
+            data.id = this.from.id
+            data.reportName = this.from.reportName
+            data.content = this.fromCreateData.content
             data.taskIds = this.taskId
             data.bizId = localStorage.getItem('bizId')
             data.moduleId = this.tpltId
+            data.deliverTestPlanTime = this.from.deliverTestPlanTime // 计划提测时间
+            data.deliverTestActualTime = this.from.deliverTestActualTime // 实际提测时间
+            if (this.from.devPlanTimeStart) {
+              data.devPlanTimeStart = this.from.devPlanTimeStart[0] // 计划开发开始时间
+              data.devPlanTimeEnd = this.from.devPlanTimeStart[1] // 计划开发结束时间
+            }
+            if (this.from.devActualTimeStart) {
+              data.devActualTimeStart = this.from.devActualTimeStart[0] // 实际开发开始时间
+              data.devActualTimeEnd = this.from.devActualTimeStart[1] // 实际开发结束时间
+            }
+            data.involveAppString = this.from.involveAppString // 跟版客户端
+            data.followVersion = this.from.followVersion // 是否跟版1 跟版 2 不跟版
+            data.isCodeReview = this.from.isCodeReview // 是否code review 0：否 1：是
+            data.codeReviewExecutor = this.from.codeReviewExecutor ? this.from.codeReviewExecutor.toString() : '' // 执行人
             reportdelivertestUpdate(data).then(res => {
               if (res.code === 200) {
                 this.$message({ type: 'success', message: '更新成功' })

src/views/reportManagement/components/TestingReport.vue

@@ -142,6 +142,20 @@ export default {
           this.dailyPreview = false // 展示第三部
           this.updateDaily = true // 编辑
           break
+        case 4: // 重新提测
+          reportdelivertestGetReportById(newData.id).then(res => {
+            if (res.code === 200) {
+              this.daily_taskIds = res.data.taskIds // 关联任务
+              this.fromData.radio = res.data // 选择的模块
+              this.reportHome = true // 步骤条
+              this.active = 2 // 步骤条状态第三步
+              this.showOne = false // 隐藏第一步
+              this.newDailyTemplate = true // 隐藏第二步
+              this.dailyPreview = false // 展示第三部
+              this.updateDaily = false // 编辑
+            }
+          })
+          break
         case 3: // 发送报告
           this.dailyId = newData.id
           this.reportHome = true // 步骤条

src/views/reportManagement/testPresentation.vue

@@ -137,7 +137,7 @@ import { launchTestList, taskListCreate } from '@/api/InterfaceReport' // 提测
 import TestingReport from '@/views/reportManagement/components/TestingReport' // 提测
 import DailyReport from '@/views/reportManagement/components/DailyReport' // 日报
 import ReleaseReport from '@/views/reportManagement/components/ReleaseReport' // 准出
-import { dailyReportList, dailyReportListV2, reportreleaseList, reportdelivertestList, reportreleaseDelete, reportdelivertestDelete, reportdelivertestUpdate, dailyReportCheckStatus, reportreleaseCheckStatus } from '@/api/reportTemplate'
+import { dailyReportList, dailyReportListV2, reportreleaseList, reportdelivertestList, reportreleaseDelete, reportdelivertestDelete, reportdelivertestUpdate, dailyReportCheckStatus, reportreleaseCheckStatus, reportdelivertestCheckStatus, reportdelivertestGetReportById } from '@/api/reportTemplate'
 import testPresenyL from '@/views/reportManagement/daily/components/testPresenyL.vue' // 老日报数据
 import ResultPageyL from '@/views/reportManagement/ReleaseReport/components/ResultPageyL.vue' // 老准出报告
 import acceptTheReport from '@/views/reportManagement/Testing/components/acceptTheReport.vue' // 老提测报告
@@ -322,7 +322,8 @@ export default {
       })
     },
 
-    report_click(e, data) { // 提测报告
+    async report_click(e, data) { // 提测报告
+      console.log(data, 'sjaicohiscnsaio')
       this.report_from.name = data.name || data.reportName
       this.report_data = data
       switch (e) {
@@ -337,10 +338,18 @@ export default {
           this.report_from.statusString = '打回'
           break
         case 3:
-          data.taskIds = [Number(this.taskId)]
-          this.dialogVisible1 = true
-          this.$nextTick(() => {
-            this.$refs.TestReport.init(4, data)
+          reportdelivertestGetReportById(data.id).then(res => {
+            if (res.code === 200) {
+              const data = res.data
+              // reportdelivertestCheckStatus(data.taskIds).then(response => {
+              //   if (response.code === 200) {
+              this.dialogVisible1 = true
+              this.$nextTick(() => {
+                this.$refs.TestReport.init(4, data)
+              })
+              //   }
+              // })
+            }
           })
           break
         case 4:
@@ -402,12 +411,17 @@ export default {
           }
         }
         if (this.title === '提测报告') {
-          this.dialogVisible1 = true
-          this.$nextTick(() => {
-            this.$refs.TestReport.init(7, [vel])
-          })
+          const res = await reportdelivertestCheckStatus([vel])
+          if (res.code === 200) {
+            this.centerDialogVisible = false
+            this.dialogVisible1 = true
+            this.$nextTick(() => {
+              this.$refs.TestReport.init(7, [vel])
+            })
+          } else {
+            this.centerDialogVisible = true
+          }
         }
-        // this.centerDialogVisible = false
       } else {
         this.$message({ message: '提示，请选择要添加的任务ID', type: 'warning' })
       }