Merge branch 'qz_daily_0.0.3' into qz_daily_0.0.4

src/views/projectManage/bugList/bugindex.vue

@@ -195,9 +195,7 @@
                     </div>
                     <div class="Layout marginLeft">
                       <div class="queryName">开发修复时长</div>
-                      <el-select v-model="formInline.devRepairTime" size="small" clearable filterable placeholder="请选择" @change="changeSelect()">
-                        <el-option v-for="item in bugDevRepairTimeList" :key="item.code" :label="item.name" :value="item.code" />
-                      </el-select>
+                      <el-cascader v-model="formInline.devRepairTime" :options="bugDevRepairTimeList" clearable filterable size="small" placeholder="请选择" @change="changeSelect()" />
                     </div>
                   </div>
                   <div style="margin: 1.5% 0;" class="flex_start">
@@ -404,10 +402,15 @@ export default {
       if (!this.stratAndEnd) {
         this.stratAndEnd = []
       }
-      this.formInline.createStartTime = this.stratAndEnd[0] || null
-      this.formInline.createEndTime = this.stratAndEnd[1] || null
-      this.indexPage = this.formInline
-      this.$refs.bugTableDialog.bugGetTableList(this.formInline, true)
+      const fromData = { ...this.formInline }
+      if (this.formInline.devRepairTime) {
+        fromData.devRepairTimeType = this.formInline.devRepairTime[0]
+        fromData.devRepairTime = this.formInline.devRepairTime[1]
+      }
+      fromData.createStartTime = this.stratAndEnd[0] || null
+      fromData.createEndTime = this.stratAndEnd[1] || null
+      this.indexPage = fromData
+      this.$refs.bugTableDialog.bugGetTableList(fromData, true)
     },
     curIndexs(e) { // 返回查询和分页  导出功能使用
       this.indexPage.bizId = e.bizId

src/views/projectManage/components/demand.vue

@@ -158,7 +158,7 @@
     <el-row>
       <span class="demandLayout">排期：</span>
       <span class="demandeta">{{ dataList.startTime || '' }} ~ {{ dataList.endTime }}</span>
-      <span style="color: #999999; font-size: 14px;">{{ '(' + dataList.scheduleTimeAnnotation.所有 + ')' }}</span>
+      <span v-if="dataList.scheduleTimeAnnotation" style="color: #999999; font-size: 14px;">{{ '(' + dataList.scheduleTimeAnnotation.所有 + ')' }}</span>
     </el-row>
     <el-row :gutter="20">
       <el-col v-for="(item, index) in scheduleDetail" :key="index" :span="12">
@@ -169,7 +169,30 @@
     </el-row>
     <el-row>
       <span class="demandLayout">预计上线版本：</span>
-      <span v-for="item in preOnlineVersion" :key="item" class="demandeta"> {{ item }} </span>
+      <span v-if="preOnlineVersion && preOnlineVersion.length > 0">
+        <span v-for="item in dataList.preOnlineVersionInfos" :key="item.id">
+          <el-popover placement="top" width="200" trigger="click" class="test">
+            <div class="popover-title">版本时间轴</div>
+            <div class="timeline-soll">
+              <div v-for="(i, y) in timeline" :key="y" class="dateTime-flexStart">
+                <div style="width: 24px">
+                  <span class="circular" />
+                  <div v-show="y < timeline.length - 1" class="qz-timeline" />
+                </div>
+                <div class="qz-over-hidden">
+                  <el-tooltip v-if="i.name.length + i.version.length > 10" class="item" effect="dark" :content="i.name + i.version" placement="right">
+                    <span class="version">{{ i.name }}{{ i.version }}</span>
+                  </el-tooltip>
+                  <span v-else class="version">{{ i.name + i.version }}</span><br>
+                  <span class="createTime">{{ i.endTime }}</span>
+                </div>
+              </div>
+            </div>
+            <span slot="reference" class="onlineVersion online" @click="getEventList(item.id)"> {{ item.appName + " " + item.version }} </span>
+          </el-popover>
+        </span>
+      </span>
+      <!-- <span v-for="item in preOnlineVersion" :key="item" class="demandeta"> {{ item }} </span> -->
       <el-tooltip class="item" effect="dark" content="版本有问题？点击触发重新计算！" placement="right">
         <svg-icon :icon-class="icon_problem ? 'problem1' : 'problem'" class="cursorPo" @mouseenter="icon_problem = true" @mouseleave="icon_problem = false" @click="requirementUpdatePreOnlineVersion" />
       </el-tooltip>
@@ -196,6 +219,7 @@ import { taskUpdates } from '@/api/projectViewDetails'
 import { memberQueryMemberInfoByIDAPorName } from '@/api/projectIndex'
 import schedule from '@/views/projectManage/schedule' // 排期锁定弹窗
 import taskDialog from '@/views/projectManage/taskList/dialog/taskDialog' // 任务状态修改（已上线/已提测/已准出）
+import { getEvent } from '@/api/versionsCalendar'
 export default {
   components: {
     scheduleList,
@@ -231,6 +255,7 @@ export default {
       showTaskDialog: false,
       taskScheduleList: [],
       scheduleList: [],
+      timeline: [],
       datas: [{
         date: '',
         type: '',
@@ -351,6 +376,12 @@ export default {
       }
     },
 
+    getEventList(ele) {
+      getEvent(ele).then(response => {
+        this.timeline = response.data
+      })
+    },
+
     async changeStatus(e) { // 状态改变
       if (e.status === 70 || e.status === 90 || e.status === 100) {
         this.taskIdObject = e
@@ -713,3 +744,60 @@ export default {
   color: #FFF;
 }
 </style>
+<style lang="scss" scoped>
+.version {
+  white-space: nowrap;
+  font-size: 12px;
+  color: #333333;
+}
+.qz-over-hidden {
+  width: 144px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.createTime {
+  font-size: 12px;
+  color: #999999;
+}
+.timeline-soll {
+  width: 100%;
+  height: 245px;
+  overflow: hidden;
+  overflow-y: auto;
+  padding-right: 15px;
+}
+.qz-timeline {
+  width: 0px;
+  height: calc(100% + 8px);
+  border: 1px solid #E5E5E5;
+  position: relative;
+  top: -8px;
+  left: 8px;
+}
+.dateTime-flexStart {
+  display: flex;
+  justify-content: flex-start;
+  margin-bottom: 20px;
+
+}
+.circular {
+  width: 8px;
+  height: 8px;
+  margin: 5px;
+  display: inline-block;
+  border: 1px solid #60AEFF;
+  border-radius: 50%;
+}
+.popover-title {
+  font-size: 14px;
+  font-family: Microsoft Sans Serif;
+  font-weight: 400;
+  margin: 0 0 20px;
+  color: #333333;
+  text-align: center;
+}
+.online:hover {
+  color: #409EFF;
+  cursor: pointer;
+}
+</style>

src/views/projectManage/components/onlineTime.vue

@@ -0,0 +1,182 @@
+<template>
+  <div class="bottom-detail">
+    <el-row>交付日期：{{ scheduleDetail.endTize }}</el-row>
+    <el-row class="date-laout">排期：{{ scheduleDetail.startTime | handlerDate }} ~ {{ scheduleDetail.endTime | handlerDate }}
+      <span v-if="scheduleDetail.scheduleTimeAnnotation" style="color: #999999; font-size: 14px;">
+        {{ '(' + scheduleDetail.scheduleTimeAnnotation.所有 + ')' }}
+      </span>
+    </el-row>
+    <el-row>预计上线版本：
+      <span v-if="scheduleDetail.preOnlineVersion && scheduleDetail.preOnlineVersion.length > 0">
+        <span v-for="item in scheduleDetail.preOnlineVersionInfos" :key="item.id">
+          <el-popover placement="top" width="200" trigger="click" class="test">
+            <div class="popover-title">版本时间轴</div>
+            <div class="timeline-soll">
+              <div v-for="(i, y) in timeline" :key="y" class="dateTime-flexStart">
+                <div style="width: 24px">
+                  <span class="circular" />
+                  <div v-show="y < timeline.length - 1" class="qz-timeline" />
+                </div>
+                <div class="qz-over-hidden">
+                  <el-tooltip v-if="i.name.length + i.version.length > 10" class="item" effect="dark" :content="i.name + i.version" placement="right">
+                    <span class="version">{{ i.name }}{{ i.version }}</span>
+                  </el-tooltip>
+                  <span v-else class="version">{{ i.name + i.version }}</span><br>
+                  <span class="createTime">{{ i.endTime }}</span>
+                </div>
+              </div>
+            </div>
+            <span slot="reference" class="onlineVersion" @click="getEventList(item.id)"> {{ item.appName + " " + item.version }} </span>
+          </el-popover>
+        </span>
+      </span>
+      <el-tooltip class="item" effect="dark" content="版本有问题？点击触发重新计算！" placement="right">
+        <svg-icon :icon-class="icon_problem ? 'problem1' : 'problem'" style="cursor: pointer;" @mouseenter="icon_problem = true" @mouseleave="icon_problem = false" @click="taskUpdatePreOnlineVersion" />
+      </el-tooltip>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { taskUpdatePreOnlineVersion } from '@/api/taskIndex.js'
+import { analysisBizId_id } from '@/utils/crypto-js.js'
+import { getEvent } from '@/api/versionsCalendar'
+import moment from 'moment'
+export default {
+  filters: {
+    handlerDate(val) {
+      return val ? moment(val).format('YYYY-MM-DD') : ''
+    }
+  },
+  props: {
+    data: { type: Object, required: true }
+  },
+  data() {
+    return {
+      scheduleDetail: this.data,
+      icon_problem: false,
+      timeline: [],
+      activities: [{
+        name: '开发',
+        endTime: '2018-04-03',
+        version: 'large'
+      }, {
+        name: '开发',
+        endTime: '2018-04-03',
+        version: 'large'
+      }, {
+        name: '开发',
+        endTime: '2018-04-03',
+        version: 'large'
+      }, {
+        name: '开发',
+        endTime: '2018-04-03',
+        version: 'large'
+      }]
+    }
+  },
+  watch: {
+    data: {
+      handler(newV) {
+        this.scheduleDetail = newV
+      },
+      deep: true
+    }
+  },
+  methods: {
+    async taskUpdatePreOnlineVersion() {
+      const bizId_id = analysisBizId_id(this.$route.query.bizId_id)
+      const res = await taskUpdatePreOnlineVersion(bizId_id[0])
+      if (res.code === 200) {
+        this.$emit('update')
+        this.$message({ message: '预计上线版本重新计算中，请稍后刷新页面查看！', type: 'success', offset: 150 })
+      }
+    },
+    getEventList(ele) {
+      getEvent(ele).then(response => {
+        this.timeline = response.data
+      })
+    }
+  }
+
+}
+</script>
+
+<style lang="scss" scoped>
+.bottom-detail {
+  font-size: 14px;
+  width: calc(100% - 40px);
+  padding-top: 20px;
+}
+
+.el-timeline {
+  margin: 0;
+  font-size: 14px;
+  list-style: none;
+  padding: 0px;
+}
+.date-laout {
+  margin: 15px 0;
+}
+.onlineVersion:hover {
+  cursor: pointer;
+  color: #409eff;
+}
+.popover-title {
+  font-size: 14px;
+  font-family: Microsoft Sans Serif;
+  font-weight: 400;
+  margin: 0 0 20px;
+  color: #333333;
+  text-align: center;
+}
+.el-timeline-item__content {
+  font-size: 12px;
+  color: #303133;
+}
+.version {
+  white-space: nowrap;
+  font-size: 12px;
+  color: #333333;
+}
+.qz-over-hidden {
+  width: 144px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.createTime {
+  font-size: 12px;
+  color: #999999;
+}
+.timeline-soll {
+  width: 100%;
+  height: 245px;
+  overflow: hidden;
+  overflow-y: auto;
+  padding-right: 15px;
+}
+.qz-timeline {
+  width: 0px;
+  height: calc(100% + 8px);
+  border: 1px solid #E5E5E5;
+  position: relative;
+  top: -8px;
+  left: 8px;
+}
+</style>
+<style lang="scss" scoped>
+.dateTime-flexStart {
+  display: flex;
+  justify-content: flex-start;
+  margin-bottom: 20px;
+
+}
+.circular {
+  width: 8px;
+  height: 8px;
+  margin: 5px;
+  display: inline-block;
+  border: 1px solid #60AEFF;
+  border-radius: 50%;
+}
+</style>

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

@@ -157,6 +157,7 @@
           <el-table-column label="标题名称" min-width="120">
             <template slot-scope="scope">
               <a href="javascript:void(0)" style="color:#20a0ff" @click="releaseDataStatus ? OldDaily(scope.row ,'准出报告') : toReportView(scope.row, 1)">{{ scope.row.reportName }}</a>
+              <div :class="scope.row.passStatus === 0 ? 'passStatus' : 'passStatus1'">{{ scope.row.passStatus === 0 ? '通过' : '不通过' }}</div>
             </template>
           </el-table-column>
           <el-table-column label="状态" min-width="100" align="center">
@@ -604,4 +605,10 @@ export default {
 .task-report-btn {
   margin-right: 30px;
 }
+.passStatus {
+  color:rgba(126,211,33,1);
+}
+.passStatus1 {
+  color:red;
+}
 </style>

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

@@ -102,18 +102,9 @@
       </el-table-column>
 
     </el-table>
-    <div class="bottom-detail">
-      <el-row>交付日期：{{ scheduleDetail.endTime }}</el-row>
-      <el-row>排期：{{ scheduleDetail.startTime | handlerDate }} ~ {{ scheduleDetail.endTime | handlerDate }} <span style="color: #999999; font-size: 14px;">{{ '(' + scheduleDetail.scheduleTimeAnnotation ? '' : scheduleDetail.scheduleTimeAnnotation.所有 + ')' }}</span></el-row>
-      <el-row>预计上线版本：
-        <span v-if="scheduleDetail.preOnlineVersion && scheduleDetail.preOnlineVersion.length > 0">
-          <span v-for="item in scheduleDetail.preOnlineVersion" :key="item">{{ item }}</span>
-        </span>
-        <el-tooltip class="item" effect="dark" content="版本有问题？点击触发重新计算！" placement="right">
-          <svg-icon :icon-class="icon_problem ? 'problem1' : 'problem'" style="cursor: pointer;" @mouseenter="icon_problem = true" @mouseleave="icon_problem = false" @click="taskUpdatePreOnlineVersion" />
-        </el-tooltip>
-      </el-row>
-    </div>
+    <!-- 交付日期 排期 预计上线版本 -->
+    <online-date :data="scheduleDetail" @update="listByTask(taskId)" />
+    <!-- 交付日期 排期 预计上线版本 -->
     <modify-schedule
       v-if="visibleSchedule"
       :visible.sync="visibleSchedule"
@@ -126,23 +117,18 @@
   </div>
 </template>
 <script>
-import { taskUpdatePreOnlineVersion } from '@/api/taskIndex.js'
 import { EncryptId } from '@/utils/crypto-js.js'
 import { mapGetters } from 'vuex'
 import Sortable from 'sortablejs'
-import moment from 'moment'
 import 'moment/locale/zh-cn'
 import { listByTask, sortForTask } from '@/api/projectViewDetails'
 import modifySchedule from '@/views/projectManage/projectList/components/modifySchedule'
 import move from '@/assets/麻将@2x.png'
+import onlineDate from '@/views/projectManage/components/onlineTime.vue'
 export default {
   components: {
-    modifySchedule
-  },
-  filters: {
-    handlerDate(val) {
-      return val ? moment(val).format('YYYY-MM-DD') : ''
-    }
+    modifySchedule,
+    onlineDate
   },
   props: {
     id: {
@@ -170,7 +156,6 @@ export default {
     return {
       taskId: '',
       move: move,
-      icon_problem: false,
       scheduleList: [],
       scheduleDetail: {},
       visibleSchedule: false,
@@ -222,17 +207,6 @@ export default {
         this.$message({ message: '移动成功', type: 'success', duration: 1000, offset: 150 })
       }
     },
-    async taskUpdatePreOnlineVersion() {
-      const res = await taskUpdatePreOnlineVersion(this.taskId)
-      if (res.code === 200) {
-        this.listByTask(this.taskId)
-        this.$message({ message: '预计上线版本重新计算中，请稍后刷新页面查看！', type: 'success', offset: 150 })
-      }
-    },
-    // getType(value) {
-    //   const res = this.taskScheduleEvent.find(item => item.code === value) || {}
-    //   return res.msg
-    // },
     async listByTask(id) { // 获取排期列表
       this.taskId = id
       const res = await listByTask(id)
@@ -302,15 +276,6 @@ export default {
     background: #ffffff !important;
   }
 }
-.bottom-detail {
-  font-size: 14px;
-  width: calc(100% - 40px);
-  margin: 0 20px;
-  padding: 20px 0;
-  :nth-child(2) {
-    margin: 10px 0;
-  }
-}
 .sortable-tip {
   height: 26px;
   width: 15px;

src/views/projectManage/taskList/taskViewDetail.vue

@@ -230,6 +230,20 @@
           <el-container>
             <el-main style="padding: 0;">
               <schedule-list :id="taskId" ref="taskSchedule" :showunlock="showunlock" :type-list="taskScheduleEvent" class-name="white" @updataData="getSchedule" />
+              <div v-if="form_query.status >= 70" class="border-top">
+                <el-divider />
+                <el-form :inline="true" :model="form_query" class="Layout_space_start" label-position="left" label-width="110px">
+                  <el-form-item v-if="form_query.status >= 70" label="实际提测时间">
+                    <el-date-picker v-model="form_query.launchTestRealTime" type="date" :clearable="false" placeholder="请选择" format="yyyy.MM.dd" value-format="yyyy-MM-dd" style="width: 100%;" size="small" @change="setChangeArea(2)" />
+                  </el-form-item>
+                  <el-form-item v-if="form_query.status >= 90" label="实际准出时间：">
+                    <el-date-picker v-model="form_query.testFinishRealTime" type="date" :clearable="false" placeholder="请选择" format="yyyy.MM.dd" value-format="yyyy-MM-dd" style="width: 100%;" size="small" @change="setChangeArea(2)" />
+                  </el-form-item>
+                  <el-form-item v-if="form_query.status >= 100" label="实际上线时间：">
+                    <el-date-picker v-model="form_query.onlineRealTime" type="date" :clearable="false" placeholder="请选择" format="yyyy.MM.dd" value-format="yyyy-MM-dd" style="width: 100%;" size="small" @change="setChangeArea(2)" />
+                  </el-form-item>
+                </el-form>
+              </div>
             </el-main>
             <el-aside v-if="lockHide" class="SchedulingAside">
               <div v-for="(item, index) in SchedulingContent" :key="index" class="SchedulingDiv" @click="clickScheduling(item)">
@@ -324,7 +338,6 @@
 
       <!-- 发布 -->
       <el-container v-if="activeName === '6'" class="is-vertical">
-        <!-- <section class="main-section contain"> -->
         <publishTask
           v-if="loaded"
           :task-id="form_query.id"
@@ -332,7 +345,6 @@
           :user-names="userNames"
           :user-information="userInformation"
         />
-        <!-- </section> -->
       </el-container>
       <!-- 发布 -->
 
@@ -629,6 +641,14 @@ export default {
       this.lockHide = false
       this.$refs.taskSchedule.listByTask(this.taskId)
     },
+    async setChangeArea(e) {
+      const user = { name: localStorage.getItem('username'), ename: localStorage.getItem('realname'), id: '' }
+      const taskInfoDO = this.form_query
+      const resTask = await taskUpdate({ taskInfoDO, user })
+      if (resTask.code === 200) {
+        this.$message({ message: '修改成功', type: 'success', offset: 150 })
+      }
+    },
     changeSchedule() { // 修改锁定状态
       if (this.isParentRequireScheduleLocked === 1) {
         this.$message({ message: '无法解锁，请先变更归属需求的排期状态为未锁定状态！', type: 'error', duration: 3000, offset: 150 })
@@ -920,6 +940,18 @@ export default {
 }
 </script>
 <style scoped lang="scss">
+.border-top {
+  margin: 0 20px;
+  >>>.el-form-item {
+    margin: 0 30px  10px 0;
+  }
+  >>>.el-divider--horizontal {
+    display: block;
+    height: 1px;
+    width: 100%;
+    margin: 10px 0;
+  }
+}
 @import '@/styles/detail-pages.scss';
 /deep/.el-button {
   cursor: pointer;
@@ -977,7 +1009,7 @@ export default {
   .task-help-tips {
     display: flex;
     flex-direction: column;
-    margin: 0 20px;
+    margin: 0 10px;
     padding: 20px 13px;
     border-radius: 4px;
     background-color: rgba(64, 158, 255,0.1);

src/views/quality/components/cycleStatistic.vue

@@ -47,6 +47,9 @@
             <span v-if="item.count > 0">
               /<span class="reject">打回{{ item.count }}个</span>
             </span>
+            <span v-if="item.refuse > 0">
+              /<span class="reject">不通过{{ item.refuse }}个</span>
+            </span>
           </div>
           <div v-show="Number(item[childData])>=0" class="repair-up">环比：<i class="el-icon-caret-top" /><span>{{ item[childData] }}%</span></div>
           <div v-show="Number(item[childData])<0" class="repair-down">环比：<i class="el-icon-caret-bottom" /><span>{{ item[childData].substring(1,item[childData].length) }}%</span></div>

src/views/reportManagement/components/DailyReport.vue

@@ -71,7 +71,7 @@
       <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>
-      <el-button v-if="dailyPreview" size="small" type="primary" @click="sendReport">发送</el-button>
+      <el-button v-if="dailyPreview" size="small" type="primary" :loading="loading" @click="sendReport">发送</el-button>
     </div>
 
   </el-dialog>
@@ -100,6 +100,7 @@ export default {
       fromData: {
         radio: 0
       },
+      loading: false,
       newDailyTemplate: false, // 新建日报模版
       reportTamplate: false, // new模版
       dailyPreview: false, // 日报预览
@@ -278,10 +279,12 @@ export default {
     },
 
     sendReport() { // 截图
+      this.loading = true
       this.$refs.dailyPreview.sendReport()
     },
 
     handleClose() {
+      this.loading = false
       this.dialogDaliy = false
       this.updateDaily = false
       this.showOne = false // 隐藏第一步

src/views/reportManagement/components/ReleaseReport.vue

@@ -69,7 +69,7 @@
       <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>
-      <el-button v-if="dailyPreview" size="small" type="primary" @click="sendReport">发送</el-button>
+      <el-button v-if="dailyPreview" size="small" type="primary" :loading="loading" @click="sendReport">发送</el-button>
     </div>
 
   </el-dialog>
@@ -95,6 +95,7 @@ export default {
       modelId: '', // 下一步选择的模版id
       selectTemplate: [],
       tipName: '创建',
+      loading: false,
       fromData: {
         radio: 0
       },
@@ -260,10 +261,12 @@ export default {
     },
 
     sendReport() { // 截图
+      this.loading = true
       this.$refs.dailyPreview.sendReport()
     },
 
     handleClose() {
+      this.loading = false
       this.dialogDaliy = false
       this.updateDaily = false
       this.showOne = false // 隐藏第一步

src/views/reportManagement/components/TestingReport.vue

@@ -69,7 +69,7 @@
       <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>
-      <el-button v-if="dailyPreview" size="small" type="primary" @click="sendReport">发送</el-button>
+      <el-button v-if="dailyPreview" size="small" type="primary" :loading="loading" @click="sendReport">发送</el-button>
     </div>
 
   </el-dialog>
@@ -94,6 +94,7 @@ export default {
       modelId: '', // 下一步选择的模版id
       selectTemplate: [], // 模版option
       tipName: '创建',
+      loading: false,
       fromData: {
         radio: 1
       },
@@ -278,10 +279,12 @@ export default {
     },
 
     sendReport() { // 截图
+      this.loading = true
       this.$refs.dailyPreview.sendReport()
     },
 
     handleClose() {
+      this.loading = false
       this.dialogDaliy = false
       this.updateDaily = false
       this.reportTamplate = false

src/views/reportManagement/testPresentation.vue

@@ -26,6 +26,7 @@
           <el-table-column label="报告名称" min-width="280" show-overflow-tooltip>
             <template slot-scope="scope">
               <a v-if="title === '测试日报' || title === '准出报告'" href="javascript:void(0)" style="color:#20a0ff" @click="history ? toReportView(scope.row) : OldDaily(scope.row)">{{ scope.row.reportName }}</a>
+              <div v-if="title === '准出报告'" :class="scope.row.passStatus === 0 ? 'passStatus' : 'passStatus1'">{{ scope.row.passStatus === 0 ? '通过' : '不通过' }}</div>
               <a v-if="title === '提测报告'" href="javascript:void(0)" style="color:#20a0ff" @click="history ? toReportView(scope.row) : OldDaily(scope.row)">{{ history ? scope.row.reportName : scope.row.name }}</a>
               <div v-if="title === '提测报告' && scope.row.returnReason" style="color: red;">打回报告：{{ scope.row.returnReason }}</div>
             </template>
@@ -646,6 +647,12 @@ export default {
     margin-right: 20px;
   }
 }
+.passStatus {
+  color:rgba(126,211,33,1);
+}
+.passStatus1 {
+  color:red;
+}
 </style>
 <style lang="stylus">
 .el-tabs__nav-wrap::after {