优化

src/api/reportTemplate.js

@@ -92,6 +92,15 @@ export function dailyReportCreate(data) {
   })
 }
 
+// 任务下日报
+export function dailyReportGetByTaskIdV2(data) {
+  return request({
+    url: Presentation + '/dailyReport/getByTaskIdV2',
+    method: 'post',
+    data
+  })
+}
+
 // 更新创建
 export function dailyReportUpdate(data) {
   return request({
@@ -228,6 +237,15 @@ export function reportreleaseDelete(data, id) {
   })
 }
 
+// 任务下准出报告list
+export function reportreleaseGetByTaskId(data) {
+  return request({
+    url: Presentation + '/reportrelease/getByTaskId',
+    method: 'post',
+    data
+  })
+}
+
 // 报告查看（需区分已发送或未发送--状态区分）
 export function reportreleaseGetReportById(id) {
   return request({
@@ -326,3 +344,13 @@ export function reportdelivertestCheckStatus(data, id) {
     data
   })
 }
+
+// 任务下提测报告
+export function reportdelivertestGetByTaskId(data) {
+  return request({
+    url: Presentation + `/reportdelivertest/getByTaskId`,
+    method: 'post',
+    data
+  })
+}
+

src/views/projectManage/taskList/components/reportList.vue

@@ -119,7 +119,7 @@
                   </div>
                   <el-input v-show="Str === '打回'" v-model="launchRepulseInfo" type="textarea" placeholder="请输入打回原因..." :rows="3" />
                   <span slot="footer" class="dialog-footer">
-                    <el-button type="primary" size="mini" @click="dailySend()">确 定</el-button>
+                    <el-button type="primary" size="mini" @click="dailySend(scope.row.id)">确 定</el-button>
                     <el-button type="danger" size="mini" @click="dialog_daily = false">取 消</el-button>
                   </span>
                 </el-dialog>
@@ -187,7 +187,7 @@
                   </div>
                   <el-input v-show="Str === '打回'" v-model="launchRepulseInfo" type="textarea" placeholder="请输入打回原因..." :rows="3" />
                   <span slot="footer" class="dialog-footer">
-                    <el-button type="primary" size="mini" @click="clientSend()">确 定</el-button>
+                    <el-button type="primary" size="mini" @click="clientSend(scope.row.id)">确 定</el-button>
                     <el-button type="danger" size="mini" @click="dialog_client = false">取 消</el-button>
                   </span>
                 </el-dialog>
@@ -229,7 +229,7 @@ import TestReport from '@/views/reportManagement/components/TestingReport' //
 import DailyReport from '@/views/reportManagement/components/DailyReport' // 日报
 import ReleaseReport from '@/views/reportManagement/components/ReleaseReport' // 准出
 import { dailyReportDelete, projectTestReportDelete } from '@/api/testPresentetion' // 日报
-import { reportdelivertestList, reportreleaseList, dailyReportListV2, reportdelivertestUpdate } from '@/api/reportTemplate'
+import { reportdelivertestGetByTaskId, reportreleaseGetByTaskId, dailyReportGetByTaskIdV2, reportdelivertestUpdate } from '@/api/reportTemplate'
 export default {
   components: {
     TestReport,
@@ -288,7 +288,7 @@ export default {
       val === 10086 ? this.dataStatus = !this.dataStatus : ''
       if (this.dataStatus) {
         const data = { taskId: this.taskId, bizId: localStorage.getItem('bizId'), curIndex: this.testPages.curIndex, pageSize: this.testPages.pageSize }
-        const res = await reportdelivertestList(data)
+        const res = await reportdelivertestGetByTaskId(data)
         if (res.code === 200) {
           this.testData = res.data.list
           this.testPages.total = res.data.total
@@ -306,10 +306,10 @@ export default {
       val === 10011 ? this.dailyDataStatus = !this.dailyDataStatus : ''
       if (this.dailyDataStatus) {
         const indexPage = { taskId: this.taskId, bizId: localStorage.getItem('bizId'), curIndex: this.clientPages.curIndex, pageSize: this.clientPages.pageSize }
-        const res = await dailyReportListV2(indexPage)
+        const res = await dailyReportGetByTaskIdV2(indexPage)
         if (res.code === 200) {
-          this.dailyData = res.data
-          this.dailyPages.total = res.total
+          this.dailyData = res.data.list
+          this.dailyPages.total = res.data.total
         }
       } else {
         const params = { taskId: this.taskId, curIndex: this.dailyPages.curIndex, pageSize: this.dailyPages.pageSize }
@@ -324,7 +324,7 @@ export default {
       val === 10000 ? this.releaseDataStatus = !this.releaseDataStatus : ''
       if (this.releaseDataStatus) {
         const indexPage = { taskId: this.taskId, bizId: localStorage.getItem('bizId'), curIndex: this.clientPages.curIndex, pageSize: this.clientPages.pageSize }
-        const res = await reportreleaseList(indexPage)
+        const res = await reportreleaseGetByTaskId(indexPage)
         if (res.code === 200) {
           this.clientData = res.data.list
           this.clientPages.total = res.data.total
@@ -364,7 +364,7 @@ export default {
     },
     async passOrBackSend() { // 提测打回
       this.dialog_testData = false
-      const userData = { id: '', ename: this.userInformation, name: this.userNames }
+      // const userData = { id: '', ename: this.userInformation, name: this.userNames }
       if (this.Str === '通过' || this.Str === '打回') {
         const data = {
           id: this.reportData.id,
@@ -381,18 +381,21 @@ export default {
           this.$message({ message: res.msg, type: 'success', offset: 150 })
         }
       } else if (this.Str === '删除') {
-        const res = await launchTestDelete(userData, this.CallBackId)
+        const res = await launchTestDelete(this.reportData.id)
         if (res.code === 200) {
           this.$message({ type: 'success', message: '删除成功' })
         }
       }
     },
-    async dailySend() { // 测试日报删除
-      const res = await dailyReportDelete(this.CallBackId)
+
+    async dailySend(e) { // 测试日报删除
+      console.log(e)
+      const res = await dailyReportDelete(e)
       if (res.code === 200) {
         this.$message({ type: 'success', message: '删除成功' })
       }
     },
+
     async clientSend() { // 准出报告删除
       const res = await projectTestReportDelete(this.CallBackId)
       if (res.code === 200) {

src/views/reportManagement/ReleaseReport/newReleaeTemplate.vue

@@ -9,7 +9,7 @@
         <el-input v-model="from.reportName" size="small" type="text" maxlength="50" style="width:100%;" placeholder="请输入模版名称（不可与现有模版重名）" />
       </el-form-item>
 
-      <div class="backStyle">{{ !releaseType ? '报告模版' : '模版内容' }}</div>
+      <div class="backStyle">{{ !releaseType ? '报告内容' : '模版内容' }}</div>
 
       <el-row class="from-margin">
         <el-col :span="24">