qinzhipeng_v 5 年之前
父节点
当前提交
2b38adce39

+ 6 - 0
src/views/reportManagement/ReleaseReport/releaePreview.vue

@@ -114,6 +114,12 @@ export default {
       const res = await reportreleaseGetReportById(val)
       if (res.code === 200) {
         this.fromCreateData = res.data
+        if (res.data.sendTo) {
+          this.$set(this.form, 'name', [res.data.sendTo])
+        }
+        if (res.data.sendCc) {
+          this.$set(this.form, 'names', [res.data.sendCc])
+        }
       }
     },
 

+ 6 - 1
src/views/reportManagement/Testing/TestingPreview.vue

@@ -118,7 +118,6 @@ export default {
   watch: {
     dailyId: {
       handler(newV) {
-        console.log(newV, 'cdskcjbdsjcbdsbcnjdsncjkdsncjkdsncjkdsncjkldsncklsdnclkndsklcndklsnckl')
         this.daily_Id = newV
         this.reportdelivertestGetReportById(newV)
       },
@@ -130,6 +129,12 @@ export default {
       const res = await reportdelivertestGetReportById(val)
       if (res.code === 200) {
         this.fromCreateData = res.data
+        if (res.data.sendTo) {
+          this.$set(this.form, 'name', [res.data.sendTo])
+        }
+        if (res.data.sendCc) {
+          this.$set(this.form, 'names', [res.data.sendCc])
+        }
         this.reportdelivertestGetRequiresByTaskIds(this.fromCreateData.taskIds)
       }
     },

+ 7 - 0
src/views/reportManagement/Testing/newTestingTemplate.vue

@@ -183,6 +183,8 @@ export default {
       if (res.code === 200) {
         const from = res.data
         this.from.id = from.id
+        this.from.sendCc = from.sendCc
+        this.from.sendTo = from.sendTo
         this.$set(this.from, 'reportName', from.reportName) // 报告名称
         this.$set(this.fromCreateData, 'content', from.content) // 报告名称
         this.$set(this.from, 'deliverTestPlanTime', from.deliverTestPlanTime) // 计划提测时间
@@ -200,6 +202,8 @@ export default {
       const res = await reportdelivertestInitReportRelease({ taskIds: val })
       if (res.code === 200) {
         const from = res.data
+        this.from.sendCc = from.sendCc
+        this.from.sendTo = from.sendTo
         this.$set(this.fromCreateData, 'content', from.content) // 报告名称
         this.$set(this.from, 'deliverTestPlanTime', from.deliverTestPlanTime) // 计划提测时间
         this.$set(this.from, 'devPlanTimeStart', [from.devPlanTimeStart, from.devPlanTimeEnd]) // 计划开发时间
@@ -276,6 +280,7 @@ export default {
               }
             })
           } else {
+            console.log(this.fromCreateData, 'cdsc')
             const data = {}
             data.reportName = this.from.reportName
             data.content = this.fromCreateData.content
@@ -295,6 +300,8 @@ export default {
             data.involveAppIds = this.from.involveAppIds // 跟版客户端
             data.followVersion = this.from.followVersion // 是否跟版1 跟版 2 不跟版
             data.isCodeReview = this.from.isCodeReview // 是否code review 0:否 1:是
+            data.sendCc = this.from.sendCc
+            data.sendTo = this.from.sendTo
             data.codeReviewExecutor = this.from.codeReviewExecutor ? this.from.codeReviewExecutor.toString() : '' // 执行人
             reportdelivertestCreate(data).then(res => {
               if (res.code === 200) {

+ 1 - 1
src/views/reportManagement/components/DailyReport.vue

@@ -244,7 +244,7 @@ export default {
       this.dailyPreview = false // 隐藏第三步
     },
 
-    SaveNextStep(ele) { // 第二步到第三部
+    SaveNextStep(ele, vel) { // 第二步到第三部
       this.dailyId = ele.id // 新建报告id
       this.reportHome = true // 步骤条
       this.active = 3 // 步骤条状态第三步

+ 10 - 0
src/views/reportManagement/daily/dailyPreview.vue

@@ -68,11 +68,21 @@ export default {
       immediate: true
     }
   },
+  destroyed() {
+    this.$set(this.form, 'names', null)
+    this.$set(this.form, 'name', null)
+  },
   methods: {
     async dailyReportGetV2(val) { // 获取日报数据
       const res = await dailyReportGetV2(val)
       if (res.code === 200) {
         this.fromCreateData = res.data
+        if (res.data.sendTo) {
+          this.$set(this.form, 'name', [res.data.sendTo])
+        }
+        if (res.data.sendCc) {
+          this.$set(this.form, 'names', [res.data.sendCc])
+        }
       }
     },