wenbobowen 4 år sedan
förälder
incheckning
bb51d238c4

+ 1 - 1
src/views/quality/components/requireDrawer.vue

@@ -32,7 +32,7 @@
       </el-table>
     </div>
     <el-pagination
-      style="text-align: center;"
+      style="text-align: right; margin-right: 30px;"
       :current-page.sync="currentPage"
       :page-size="10"
       layout="total, prev, pager, next, jumper"

+ 8 - 4
src/views/quality/components/tables/index.vue

@@ -77,11 +77,14 @@
       <el-table-column prop="bugStatusName" label="状态" min-width="100" align="center" />
     </el-table>
 
-    <el-table v-if="title === '报告统计数据'" :data="data" style="width: auto;" height="calc(100vh - 318px)" :header-cell-style="{ 'color':'rgba(74,74,74,1)','font-size':'14px','font-weight':'500' }">
+    <el-table v-if="title === '报告统计数据'" :data="data" style="width: auto;" height="calc(100vh - 296px)" :header-cell-style="{ 'color':'rgba(74,74,74,1)','font-size':'14px','font-weight':'500' }">
       <el-table-column label="报告名称" min-width="200" show-overflow-tooltip>
         <template slot-scope="scope">
-          <div class="drawer-id">{{ scope.row.id }}</div>
-          <span class="drawer-name" @click.stop="jumper(scope.row, '报告')">{{ scope.row.reportName || '' }}</span>
+          <span v-if="scope.row.typeString === '日报'" class="drawer-name" @click.stop="jumper(scope.row, '日报')">{{ scope.row.reportName || '' }}</span>
+          <span v-if="scope.row.typeString === '准出'" class="drawer-name" @click.stop="jumper(scope.row, '准出')">{{ scope.row.reportName || '' }}</span>
+          <span v-if="scope.row.typeString === '提测报告'" class="drawer-name" @click.stop="jumper(scope.row, '提测')">{{ scope.row.reportName || '' }}</span>
+          <div v-if="scope.row.typeString === '准出' && scope.row.passStatus === 1" style="color: red;">不通过</div>
+          <div v-if="scope.row.typeString === '提测报告' && scope.row.returnReason" style="color: red;">打回报告:{{ scope.row.returnReason }}</div>
         </template>
       </el-table-column>
       <el-table-column prop="statusString" label="状态" min-width="110">
@@ -126,7 +129,8 @@ export default {
   },
   methods: {
     jumper(val, name) { // 需求、任务、缺陷跳转
-      const bizId_id = EncryptId(`${val.bizId}_${val.id}`)
+      const { bizId = null } = this.$store.state.global || {}
+      const bizId_id = EncryptId(`${bizId}_${val.id}`)
       const newTab = this.$router.resolve({ name: name + '详情', query: { bizId_id: bizId_id }})
       window.open(newTab.href, '_blank')
     }