From 3757cdb07c84ab2eac4bdb41a7d98b46d38fdf48 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 30 八月 2023 18:06:30 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.110.209:9001/r/lims-before
---
src/views/experiment/inspectionApplication/index.vue | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/views/experiment/inspectionApplication/index.vue b/src/views/experiment/inspectionApplication/index.vue
index 53d5292..4d98974 100644
--- a/src/views/experiment/inspectionApplication/index.vue
+++ b/src/views/experiment/inspectionApplication/index.vue
@@ -50,8 +50,7 @@
</div>
</div>
<div class="table-box">
- <el-table ref="inspectionTable" style="width: 100%;overflow-y: auto;min-height: calc(100% - 50px)"
- max-height="calc(100% - 50px)" :cell-style="{textAlign: 'center'}"
+ <el-table ref="inspectionTable" style="width: 100%;overflow-y: auto;max-height: 600px;" :height="600" :cell-style="{textAlign: 'center'}"
:header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
:data="inspectionTable">
<el-table-column type="selection" min-width="30px" />
@@ -63,9 +62,9 @@
<div v-if="scope.row.type === 2"><span>鎴愬搧妫�楠�</span></div>
</template>
</el-table-column>
- <el-table-column prop="formTime" label="鏉ユ枡鏃ユ湡" min-width="80px" />
- <el-table-column prop="supplier" label="渚涘簲鍟嗗悕绉�" min-width="150px" />
- <el-table-column prop="mcode" label="鍘熸潗鏂欑紪鐮�" min-width="150px" />
+ <el-table-column prop="formTime" label="鏉ユ枡鏃ユ湡" min-width="90px" />
+ <el-table-column prop="supplier" label="渚涘簲鍟嗗悕绉�" min-width="150px" show-overflow-tooltip/>
+ <el-table-column prop="mcode" label="鍘熸潗鏂欑紪鐮�" min-width="170px"/>
<el-table-column prop="name" label="鍘熸潗鏂欏悕绉�" min-width="80px" />
<el-table-column prop="specifications" label="瑙勬牸鍨嬪彿" min-width="160px" />
<el-table-column prop="unit" label="鍗曚綅" min-width="50px" />
@@ -78,7 +77,7 @@
</template>
</el-table-column>
<el-table-column prop="userName" label="鐧昏浜�" min-width="80px" />
- <el-table-column prop="checkdate" label="妫�楠屾棩鏈�" min-width="150px" />
+ <el-table-column prop="checkdate" label="妫�楠屾棩鏈�" min-width="160px" />
<el-table-column label="鎿嶄綔" min-width="150" fixed="right">
<template slot-scope="scope">
<el-button type="text" size="small" @click="handleClick(scope.row)">鏌ョ湅</el-button>
@@ -952,7 +951,6 @@
.pagination {
display: flex;
- margin-top: 20px;
justify-content: end;
}
--
Gitblit v1.9.3