优化报告

src/views/reportManagement/ReleaseReport/newReleaeTemplate.vue

@@ -165,6 +165,7 @@ export default {
   watch: {
     taskIds: {
       handler(newV) {
+        console.log(newV, '任务IDs')
         if (newV) {
           this.$nextTick(() => {
             this.taskId = _.cloneDeep(newV)
@@ -179,7 +180,7 @@ export default {
     },
     templateId: {
       handler(newV) {
-        console.log(newV, '你恐惧烦恼的你')
+        console.log(newV, '准出报告')
         if (newV.name === '新建模版' || newV.name === '编辑模版') { // 新建、编辑模版
           this.releaseType = true
           this.from = { ...this.from, ...newV.from }
@@ -191,8 +192,8 @@ export default {
           this.reportId = newV.id
           this.reportreleaseGetReportById(newV.id)
         } else { // 新建
+          console.log(newV, '准出报告1')
           this.tpsltId = newV
-          // this.reportreleaseInitReportRelease(newV)
           this.settingGetReportModuleById(newV)
         }
       },
@@ -225,9 +226,6 @@ export default {
     setDefaultData(dav) {
       const from = dav
       this.from = { ...this.from, ...dav, 'taskIds': from.taskId }
-      // console.log( from.customFields, '编辑')
-      // this.customList = from.customFields
-      console.log(dav, '编辑')
       if (from.devPlanTimeStart) {
         this.$set(this.from, 'devPlanTimeStart', [from.devPlanTimeStart, from.devPlanTimeEnd]) // 计划开发开始时间-计划开发结束时间
       }
@@ -253,9 +251,9 @@ export default {
         } else {
           this.customList = [...this.customList]
         }
-        // this.from = res.data
         this.modelID = res.data.id
         this.from = { ...this.from, ...res.data, 'moduleName': res.data.moduleName, 'passStatus': 0 }
+        console.log(this.from, 'xinjian')
       }
     },
 

src/views/reportManagement/Testing/newTestingTemplate.vue

@@ -202,7 +202,6 @@ export default {
     templateId: {
       handler(newV) {
         if (newV.name === '新建模版' || newV.name === '编辑模版') {
-          console.log(newV, '模版')
           this.releaseType = true
           this.from = { ...this.from, ...newV.from }
           newV.name === '编辑模版' ? this.settingGetReportModuleById(newV.repot_up) : ''

src/views/reportManagement/components/ReleaseReport.vue

@@ -178,7 +178,9 @@ export default {
       this.$refs.newReleaeTemplate.getCreateData(this.templateId)
     },
 
-    report_return() {
+    async report_return() {
+      const res = await reportreleaseGetReportById(this.dailyId)
+      this.daily_taskIds = res.data.taskIds
       this.reportHome = '准出报告' // 步骤条
       this.showOne = true // 模版选择
       this.reportTamplate = false // 编辑区域

src/views/reportManagement/components/TestingReport.vue

@@ -186,7 +186,6 @@ export default {
     },
 
     getCustom(arr) { // 自定义确认
-      console.log(arr, this.temporary, '结果')
       this.templateId = { 'from': this.temporary.from, 'name': this.temporary.name === '创建提测报告模版' ? '新建模版' : '编辑模版' }
       this.customList = [...arr]
       this.reportHome = this.temporary.name
@@ -212,7 +211,9 @@ export default {
       this.$refs.newReportTemplate.getCreateData(this.templateId)
       // }
     },
-    report_return() { // 新建模版点击返回
+    async report_return() { // 新建模版点击返回
+      const res = await reportdelivertestGetReportById(this.dailyId)
+      this.daily_taskIds = res.data.taskIds
       this.reportHome = '提测报告' // 步骤条
       this.showOne = true // 模版选择
       this.newDailyTemplate = false // 隐藏第二步