From dab59f7624a2fb8d4114bb67b554ff09d91f810c Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 10 四月 2025 13:07:36 +0800
Subject: [PATCH] Merge branch 'radio-frequency-cable' of http://114.132.189.42:9002/r/lims-ruoyi-before into radio-frequency-cable
---
src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue b/src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue
index 9f955ca..d468caf 100644
--- a/src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue
+++ b/src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue
@@ -6,8 +6,8 @@
<el-input v-model="entity.name" clearable></el-input>
</el-form-item>
<el-form-item>
- <el-button size="small" style="margin-left: 10px" @click="refresh()">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
+ <el-button size="mini" style="margin-left: 10px" @click="refresh()">閲嶇疆</el-button>
+ <el-button size="mini" type="primary" @click="refreshTable()">鏌ヨ</el-button>
</el-form-item>
</el-form>
<div>
@@ -16,7 +16,9 @@
</div>
</div>
<div class="search-table">
- <el-table v-loading="tableLoading" :data="tableData" border height="calc(100vh - 21em)" style="width: 100%;">
+ <el-table v-loading="tableLoading" :data="tableData"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
+ height="calc(100vh - 21em)" style="width: 100%;">
<el-table-column align="center" label="搴忓彿" type="index" width="60"></el-table-column>
<el-table-column label="鍛樺伐缂栧彿" prop="account" width="150"></el-table-column>
<el-table-column label="濮撳悕" prop="name" width="120"></el-table-column>
@@ -55,7 +57,7 @@
</div>
<div v-if="selectUserDia" class="body" style="height: 60vh;">
<lims-table :tableData="tableData1" :column="column1" :isSelection="true" :handleSelectionChange="selectMethod"
- :height="'calc(100vh - 290px)'" :tableLoading="tableLoading1"></lims-table>
+ height="520" :tableLoading="tableLoading1"></lims-table>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="selectUserDia = false">鍙� 娑�</el-button>
--
Gitblit v1.9.3