优化

src/views/reportManagement/ReleaseReport/newReleaeTemplate.vue

@@ -139,41 +139,46 @@ export default {
         this.$nextTick(() => {
           this.taskId = res.data.taskIds
         })
-        const from = res.data
-        this.$set(this.from, 'reportName', from.reportName) // 报告名称
-        this.$set(this.from, 'releasePlanTime', from.releasePlanTime) // 计划准出时间
-        this.$set(this.from, 'releaseActualTime', from.releaseActualTime) // 实际准出时间
-        this.$set(this.from, 'isDelay', from.isDelay) // 准出是否延期 1 延期，0未延期
-        this.$set(this.from, 'delayReason', from.delayReason) // 是否延期
-        this.$set(this.from, 'content', from.content) // 富文本
-        this.$set(this.from, 'delayReason', from.delayReason) // 延期原因
-        this.fromData.content = from.content // 富文本
-        if (from.devPlanTimeStart) {
-          this.$set(this.from, 'devPlanTimeStart', [from.devPlanTimeStart, from.devPlanTimeEnd]) // 计划开发开始时间-计划开发结束时间
-        }
-        if (from.devActualTimeStart) {
-          this.$set(this.from, 'devActualTimeStart', [from.devActualTimeStart, from.devActualTimeEnd]) // 实际开发开始时间-实际开发结束时间
-        }
-        if (from.testPlanTimeStart) {
-          this.$set(this.from, 'testPlanTimeStart', [from.testPlanTimeStart, from.testPlanTimeEnd]) // 计划测试开始时间-计划测试结束时间
-        }
-        if (from.testActualTimeStart) {
-          this.$set(this.from, 'testActualTimeStart', [from.testActualTimeStart, from.testActualTimeEnd]) // 实际测试开始时间-实际测试结束时间
-        }
-        this.from.taskIds = from.taskId // 关联任务
-        this.from.bizId = from.bizId // 业务线
-        this.from.moduleId = from.moduleId // 模块id
-        this.from.developer = from.developer ? from.developer.split() : null // 开发人员
-        this.from.tester = from.tester ? from.tester.split() : null // 测试人员
-        console.log(this.from, 'bianji')
+        this.setDefaultData(res.data)
       }
     },
 
     async reportreleaseInitReportRelease() { // 获取表单数据
       const res = await reportreleaseInitReportRelease({ taskIds: this.taskId })
       if (res.code === 200) {
-        this.from = res.data
+        this.setDefaultData(res.data)
+      }
+    },
+
+    setDefaultData(dav) {
+      const from = dav
+      if (dav.reportName !== null) {
+        this.$set(this.from, 'reportName', from.reportName) // 报告名称
+      }
+      this.$set(this.from, 'releasePlanTime', from.releasePlanTime) // 计划准出时间
+      this.$set(this.from, 'releaseActualTime', from.releaseActualTime) // 实际准出时间
+      this.$set(this.from, 'isDelay', from.isDelay) // 准出是否延期 1 延期，0未延期
+      this.$set(this.from, 'delayReason', from.delayReason) // 是否延期
+      this.$set(this.from, 'content', from.content) // 富文本
+      this.$set(this.from, 'delayReason', from.delayReason) // 延期原因
+      this.fromData.content = from.content // 富文本
+      if (from.devPlanTimeStart) {
+        this.$set(this.from, 'devPlanTimeStart', [from.devPlanTimeStart, from.devPlanTimeEnd]) // 计划开发开始时间-计划开发结束时间
+      }
+      if (from.devActualTimeStart) {
+        this.$set(this.from, 'devActualTimeStart', [from.devActualTimeStart, from.devActualTimeEnd]) // 实际开发开始时间-实际开发结束时间
+      }
+      if (from.testPlanTimeStart) {
+        this.$set(this.from, 'testPlanTimeStart', [from.testPlanTimeStart, from.testPlanTimeEnd]) // 计划测试开始时间-计划测试结束时间
+      }
+      if (from.testActualTimeStart) {
+        this.$set(this.from, 'testActualTimeStart', [from.testActualTimeStart, from.testActualTimeEnd]) // 实际测试开始时间-实际测试结束时间
       }
+      this.from.taskIds = from.taskId // 关联任务
+      this.from.bizId = from.bizId // 业务线
+      this.from.moduleId = from.moduleId // 模块id
+      this.from.developer = from.developer ? from.developer.split() : null // 开发人员
+      this.from.tester = from.tester ? from.tester.split() : null // 测试人员
     },
 
     async settingGetReportModuleById(val) { // 获取富文本内容

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

@@ -40,10 +40,10 @@
 
         <el-row>
           <el-col :span="12" class="Layout_space_between task-bot">
-            <span class="from-name">计划开发时间：{{ details.devPlanTimeStart + '至' + details.devPlanTimeEnd }}</span>
+            <span class="from-name">计划开发时间：{{ details.devPlanTimeStart !== null ? details.devPlanTimeStart + '至' + details.devPlanTimeEnd : '' }}</span>
           </el-col>
           <el-col :span="12" class="Layout_space_between task-bot">
-            <span class="from-namer">实际开发时间：{{ details.devActualTimeStart + '至' + details.devActualTimeEnd }}</span>
+            <span class="from-namer">实际开发时间：{{ details.devActualTimeStart !== null ? details.devActualTimeStart + '至' + details.devActualTimeEnd : '' }}</span>
           </el-col>
         </el-row>
 

src/views/reportManagement/Testing/newTestingTemplate.vue

@@ -145,7 +145,6 @@ export default {
             this.tpltId = newV.moduleId
             this.reportdelivertestGetReportById(newV.id)
           } else {
-            console.log(newV, 'tmepId')
             this.tpltId = newV
             this.tpltId ? this.settingGetReportModuleById(newV) : ''
           }
@@ -188,14 +187,23 @@ export default {
     async reportdelivertestInitReportRelease(val) { // 报告时间
       const res = await reportdelivertestInitReportRelease({ taskIds: val })
       if (res.code === 200) {
-        console.log(res, 'xsaxabu')
-        this.from = res.data
+        const from = res.data
+        this.$set(this.fromCreateData, 'content', from.content) // 报告名称
+        this.$set(this.from, 'deliverTestPlanTime', from.deliverTestPlanTime) // 计划提测时间
+        this.$set(this.from, 'devPlanTimeStart', [from.devPlanTimeStart, from.devPlanTimeEnd]) // 计划开发时间
+        this.$set(this.from, 'devActualTimeStart', [from.devActualTimeStart, from.devActualTimeEnd]) // 实际开发时间
+        this.from.deliverTestActualTime = from.deliverTestActualTime // 实际提测时间
+        this.from.involveAppString = from.involveAppString // 跟版客户端
+        this.from.followVersion = from.followVersion // 是否跟版1 跟版 2 不跟版
+        this.from.isCodeReview = from.isCodeReview // 是否code review 0：否 1：是
+        this.from.codeReviewExecutor = from.codeReviewExecutor ? from.codeReviewExecutor.split() : '' // 执行人
       }
       const res2 = await reportdelivertestGetRequiresByTaskIds({ taskIds: val })
       if (res2.code === 200) {
         this.tableData = res.data.list
       }
     },
+
     async configShowTaskEnum() {
       const res = await configShowTaskEnum()
       if (res.code === 200) {