优化

src/views/reportManagement/components/DailyReport.vue

@@ -46,7 +46,7 @@
       <!-- 第一步 -->
       <el-button v-if="showOne" size="small" type="primary" @click="NextStep()">下一步</el-button>
       <!-- 第二步 -->
-      <el-button v-if="newDailyTemplate" size="small" type="primary" @click="reportReturn">上一步</el-button>
+      <el-button v-if="newDailyTemplate" size="small" type="primary" @click="report_Return">上一步</el-button>
       <el-button v-if="newDailyTemplate" size="small" type="primary" @click="getCreateData">保存, 下一步</el-button>
       <!-- 第三步 -->
       <el-button v-if="dailyPreview" size="small" type="primary" @click="sendReportReturn">上一步</el-button>
@@ -209,6 +209,17 @@ export default {
       this.$refs.newReportTemplate.getCreateData(3)
     },
 
+    report_Return() {
+      this.fromData.radio = this.selectTemplate[0].id
+      this.reportHome = '测试日报' // 步骤条
+      this.showOne = true // 模版选择
+      this.reportTamplate = false // 编辑区域
+      this.newDailyTemplate = false // 隐藏第二步
+      this.dailyPreview = false // 隐藏第三步
+      this.customList = []
+      this.getreportTemplate()
+    },
+
     reportReturn() { // 新建模版点击返回
       this.fromData.radio = this.selectTemplate[0].id
       this.reportHome = this.tits // 步骤条

src/views/reportManagement/components/ReleaseReport.vue

@@ -47,7 +47,7 @@
         <!-- 第一步 -->
         <el-button v-if="showOne" size="small" type="primary" @click="NextStep()">下一步</el-button>
         <!-- 第二步 -->
-        <el-button v-if="newDailyTemplate" size="small" type="primary" @click="reportReturn">上一步</el-button>
+        <el-button v-if="newDailyTemplate" size="small" type="primary" @click="report_return">上一步</el-button>
         <el-button v-if="newDailyTemplate" size="small" type="primary" @click="getCreateData">保存, 下一步</el-button>
         <!-- 第三步 -->
         <el-button v-if="dailyPreview" size="small" type="primary" @click="sendReportReturn">上一步</el-button>
@@ -178,6 +178,16 @@ export default {
       this.$refs.newReleaeTemplate.getCreateData(this.templateId)
     },
 
+    report_return() {
+      this.reportHome = '准出报告' // 步骤条
+      this.showOne = true // 模版选择
+      this.reportTamplate = false // 编辑区域
+      this.newDailyTemplate = false // 隐藏第二步
+      this.dailyPreview = false // 隐藏第三步
+      this.customList = []
+      this.getreportTemplate()
+    },
+
     reportReturn() { // 新建模版点击返回
       this.reportHome = this.tits // 步骤条
       this.showOne = true // 模版选择
@@ -260,6 +270,7 @@ export default {
       if (res.code === 200) {
         this.daily_taskIds = null// 关联任务
         this.fromData.radio = res.data // 选择的模块
+        this.customList = res.data.customFields
       }
       this.reportHome = '准出报告' // 步骤条
       this.active = 2 // 步骤条状态第三步

src/views/reportManagement/components/TestingReport.vue

@@ -46,7 +46,7 @@
         <!-- 第一步 -->
         <el-button v-if="showOne" size="small" type="primary" @click="NextStep()">下一步</el-button>
         <!-- 第二步 -->
-        <el-button v-if="newDailyTemplate" size="small" type="primary" @click="reportReturn">上一步</el-button>
+        <el-button v-if="newDailyTemplate" size="small" type="primary" @click="report_return">上一步</el-button>
         <el-button v-if="newDailyTemplate" size="small" type="primary" @click="getCreateData">保存, 下一步</el-button>
         <!-- 第三步 -->
         <el-button v-if="dailyPreview" size="small" type="primary" @click="sendReportReturn">上一步</el-button>
@@ -211,6 +211,14 @@ export default {
       this.$refs.newReportTemplate.getCreateData(this.templateId)
       // }
     },
+    report_return() { // 新建模版点击返回
+      this.reportHome = '提测报告' // 步骤条
+      this.showOne = true // 模版选择
+      this.newDailyTemplate = false // 隐藏第二步
+      this.dailyPreview = false // 隐藏第三步
+      this.customList = []
+      this.getreportTemplate()
+    },
 
     reportReturn() { // 新建模版点击返回
       this.reportHome = this.tits // 步骤条