Merge branch 'qz_daily_0.0.3' into qz_daily_0.0.4

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

@@ -157,7 +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>
+              <div v-if="scope.row.passStatus === 1" class="passStatus1">不通过</div>
             </template>
           </el-table-column>
           <el-table-column label="状态" min-width="100" align="center">

src/views/quality/components/cycleStatistic.vue

@@ -47,7 +47,7 @@
             <span v-if="item.count > 0">
               /<span class="reject">打回{{ item.count }}个</span>
             </span>
-            <span v-if="item.refuse > 0">
+            <span v-if=" item.label === '准出报告' && item.refuse > 0">
               /<span class="reject">不通过{{ item.refuse }}个</span>
             </span>
           </div>

src/views/reportManagement/testPresentation.vue

@@ -26,7 +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>
+              <div v-if="title === '准出报告' && scope.row.passStatus === 1" class="passStatus1">不通过</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>
@@ -647,9 +647,6 @@ export default {
     margin-right: 20px;
   }
 }
-.passStatus {
-  color:rgba(126,211,33,1);
-}
 .passStatus1 {
   color:red;
 }