优化

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"

src/views/quality/components/tables/index.vue

@@ -13,12 +13,12 @@
           <div class="drawer-name" @click="jumper(scope.row, type)">{{ scope.row.name }}</div>
         </template>
       </el-table-column>
-      <el-table-column v-if="type === '需求'" prop="typeName" label="需求类型" min-width="110" align="center" />
+      <!-- <el-table-column v-if="type === '需求'" prop="typeName" label="需求类型" min-width="110" align="center" />
       <el-table-column v-if="type === '需求'" label="PM" min-width="100" show-overflow-tooltip align="center">
         <template v-if="scope.row.pmMemberInfoResponse" slot-scope="scope">
           <span>{{ scope.row.pmMemberInfoResponse.name }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column v-if="type === '需求'" label="状态" prop="statusName" min-width="100" align="center" />
       <el-table-column v-if="type === '任务'" label="状态" prop="statusString" min-width="100" align="center" />
     </el-table>
@@ -71,14 +71,21 @@
       </el-table-column>
     </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">
+        <template slot-scope="scope">
+          {{ scope.row.statusString }}
         </template>
       </el-table-column>
-      <el-table-column prop="statusString" label="状态" min-width="110" />
       <el-table-column label="报告人" min-width="110">
         <template slot-scope="scope">
           {{ scope.row.creatorObject.name || '' }}
@@ -150,7 +157,8 @@ export default {
       return arr
     },
     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')
     }