准出报告

src/views/projectManage/taskList/taskViewDetail.vue

@@ -359,7 +359,7 @@ import schedule from '@/views/projectManage/schedule' // 排期锁定弹窗
 import download from '@/views/projectManage/components/export.vue'
 import record from '@/views/projectManage/components/record.vue'
 import timeLine from '@/views/projectManage/components/timeLine.vue'
-import { dailyReportCheckStatus } from '@/api/reportTemplate'
+import { dailyReportCheckStatus, reportreleaseCheckStatus } from '@/api/reportTemplate'
 export default {
   components: {
     searchPeople,
@@ -687,8 +687,13 @@ export default {
           })
           break
         case 3:
-          this.dialogClient = true
-          this.$nextTick(() => { this.$refs.ClientReport.init(7, [this.taskId]) })
+          reportreleaseCheckStatus([this.taskId]).then(res => {
+            if (res.code === 200) {
+              this.dialogClient = true
+              this.$nextTick(() => { this.$refs.ClientReport.init(7, [this.taskId]) })
+            }
+          })
+
           break
       }
     },

src/views/reportManagement/Testing/TestingPreview.vue

@@ -11,7 +11,7 @@
       <searchTeam :value.sync="form.names" :clearable="true" :multiple="true" style="width:100%" />
     </div>
     <div id="repot-list">
-      <div class="backStyle">{{ fromCreateData.reportName }}</div>
+      <div class="report-tit">{{ fromCreateData.reportName }}</div>
 
       <el-row>
         <el-col :span="12" class="Layout_space_between">
@@ -163,27 +163,7 @@ export default {
     line-height:22px;
     color:#666666;
     opacity:1;
-    .from-name {
-      width: 140px !important;
-    }
-    .from-names {
-      width: 100px !important;
-    }
-    .from-namea {
-      width: 119px !important;
-    }
-    .from-namer {
-      width: 140px !important;
-      margin-left:10px;
-    }
-    .from-namev {
-      margin-left:10px;
-      vertical-align: sub;
-    }
-    .from-value {
-      margin-left: 30px;
-      color:rgba(126,211,33,1);
-    }
+    margin-bottom: 10px;
   .report-taskList{
     font-size:14px;
     font-family:MicrosoftYaHei;
@@ -206,6 +186,12 @@ export default {
     border-radius: 4px;
     margin: 10px 0;
   }
+  .report-tit {
+    font-size: 20px;
+    font-weight: bold;
+    border-radius: 4px;
+    margin: 15px 0;
+  }
   .report-margin {
     margin-bottom: 20px;
   }

src/views/reportManagement/components/ReleaseReport.vue

@@ -23,7 +23,7 @@
             </el-col>
             <el-col :span="5" class="creatorList">
               {{ item.creatorObject.name }}
-              <span class="operation">
+              <span v-if="item.creator !== 'SYSTEM' && item.creator !== '系统'" class="operation">
                 <i class="el-icon-edit-outline didi-hover" @click="open_new_template(item)" />
                 <el-popover :ref="item.id" placement="bottom" width="300" trigger="click">
                   <div><div class="blur-column" /> 删除模版</div>

src/views/reportManagement/components/TestingReport.vue

@@ -23,7 +23,7 @@
             </el-col>
             <el-col :span="5" class="creatorList">
               {{ item.creatorObject.name }}
-              <span class="operation">
+              <span v-if="item.creator !== 'SYSTEM' && item.creator !== '系统'" class="operation">
                 <i class="el-icon-edit-outline didi-hover" @click="open_new_template(item)" />
                 <el-popover :ref="item.id" placement="bottom" width="300" trigger="click">
                   <div><div class="blur-column" /> 删除模版</div>

src/views/reportManagement/testPresentation.vue

@@ -137,7 +137,7 @@ import { launchTestList, taskListCreate } from '@/api/InterfaceReport' // 提测
 import TestingReport from '@/views/reportManagement/components/TestingReport' // 提测
 import DailyReport from '@/views/reportManagement/components/DailyReport' // 日报
 import ReleaseReport from '@/views/reportManagement/components/ReleaseReport' // 准出
-import { dailyReportList, dailyReportListV2, reportreleaseList, reportdelivertestList, reportreleaseDelete, reportdelivertestDelete, reportdelivertestUpdate, dailyReportCheckStatus } from '@/api/reportTemplate'
+import { dailyReportList, dailyReportListV2, reportreleaseList, reportdelivertestList, reportreleaseDelete, reportdelivertestDelete, reportdelivertestUpdate, dailyReportCheckStatus, reportreleaseCheckStatus } from '@/api/reportTemplate'
 import testPresenyL from '@/views/reportManagement/daily/components/testPresenyL.vue' // 老日报数据
 import ResultPageyL from '@/views/reportManagement/ReleaseReport/components/ResultPageyL.vue' // 老准出报告
 import acceptTheReport from '@/views/reportManagement/Testing/components/acceptTheReport.vue' // 老提测报告
@@ -390,10 +390,16 @@ export default {
           }
         }
         if (this.title === '准出报告') {
-          this.dialogClient = true
-          this.$nextTick(() => {
-            this.$refs.ClientReport.init(7, [vel])
-          })
+          const res = await reportreleaseCheckStatus([vel])
+          if (res.code === 200) {
+            this.centerDialogVisible = false
+            this.dialogClient = true
+            this.$nextTick(() => {
+              this.$refs.ClientReport.init(7, [vel])
+            })
+          } else {
+            this.centerDialogVisible = true
+          }
         }
         if (this.title === '提测报告') {
           this.dialogVisible1 = true