|
|
@@ -176,10 +176,10 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column v-if="releaseDataStatus" label="操作" width="200">
|
|
|
<template slot-scope="scope">
|
|
|
- <div v-if="scope.row.status === 1 ? false : true">
|
|
|
- <span v-if="scope.row.status === 2 ? true : false" class="btn" @click="clientButtom(5,scope.row.id, scope.row)">发送</span>
|
|
|
- <span v-if="scope.row.status === 2 ? true : false" style="margin: 0 30px;" class="btn" @click="clientButtom(6,scope.row.id, scope.row)">编辑</span>
|
|
|
- <span v-if="scope.row.status === 2 ? true : false" class="btn" @click="clientButtom(4,scope.row.id, scope.row )">删除</span>
|
|
|
+ <div v-if="scope.row.status === 3 ? false : true">
|
|
|
+ <span v-if="scope.row.status === 0 ? true : false" class="btn" @click="clientButtom(5,scope.row.id, scope.row)">发送</span>
|
|
|
+ <span v-if="scope.row.status === 0 ? true : false" style="margin: 0 30px;" class="btn" @click="clientButtom(6,scope.row.id, scope.row)">编辑</span>
|
|
|
+ <span v-if="scope.row.status === 0 ? true : false" class="btn" @click="clientButtom(4,scope.row.id, scope.row )">删除</span>
|
|
|
<el-dialog :title="titName" :visible.sync="dialog_client" width="30%" :close-on-click-modal="false">
|
|
|
<div style="position: absolute; top: 23px; left: 12px;width:4px;height:17px;background:#409EFF;border-radius:1px;" />
|
|
|
<div align="center">
|
|
|
@@ -188,7 +188,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(scope.row.id)">确 定</el-button>
|
|
|
+ <el-button type="primary" size="mini" @click="clientSend()">确 定</el-button>
|
|
|
<el-button type="danger" size="mini" @click="dialog_client = false">取 消</el-button>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
@@ -235,8 +235,7 @@
|
|
|
import {
|
|
|
dailyReport,
|
|
|
projectTestReport,
|
|
|
- launchTest,
|
|
|
- launchTestDelete
|
|
|
+ launchTest
|
|
|
} from '@/api/taskIndex' // ajax
|
|
|
import '@/styles/PublicStyle/index.scss'
|
|
|
import testPresenyL from '@/views/reportManagement/daily/components/testPresenyL.vue' // 老日报数据
|
|
|
@@ -245,8 +244,8 @@ import acceptTheReport from '@/views/reportManagement/Testing/components/acceptT
|
|
|
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 { reportdelivertestGetByTaskId, reportreleaseGetByTaskId, dailyReportGetByTaskIdV2, reportdelivertestUpdate, reportdelivertestCheckStatus } from '@/api/reportTemplate'
|
|
|
+import { dailyReportDelete } from '@/api/testPresentetion' // 日报
|
|
|
+import { reportdelivertestGetByTaskId, reportreleaseGetByTaskId, dailyReportGetByTaskIdV2, reportdelivertestUpdate, reportdelivertestCheckStatus, reportreleaseDelete, reportdelivertestDelete } from '@/api/reportTemplate'
|
|
|
export default {
|
|
|
components: {
|
|
|
TestReport,
|
|
|
@@ -409,8 +408,9 @@ export default {
|
|
|
this.$message({ message: res.msg, type: 'success', offset: 150 })
|
|
|
}
|
|
|
} else if (this.Str === '删除') {
|
|
|
- const res = await launchTestDelete(this.reportData.id)
|
|
|
+ const res = await reportdelivertestDelete({}, this.reportData.id)
|
|
|
if (res.code === 200) {
|
|
|
+ this.getTest()
|
|
|
this.$message({ type: 'success', message: '删除成功' })
|
|
|
}
|
|
|
}
|
|
|
@@ -445,7 +445,7 @@ export default {
|
|
|
},
|
|
|
|
|
|
async clientSend() { // 准出报告删除
|
|
|
- const res = await projectTestReportDelete(this.CallBackId)
|
|
|
+ const res = await reportreleaseDelete({}, this.CallBackId)
|
|
|
if (res.code === 200) {
|
|
|
this.dialog_client = false
|
|
|
this.getClient()
|
wangziqian