From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue b/src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue
index 3936a69..aac448d 100644
--- a/src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue
+++ b/src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue
@@ -1,16 +1,18 @@
<template>
<div>
- <div style="display: flex;justify-content: space-between;">
- <el-form :model="entity" ref="entity" size="small" :inline="true">
- <el-form-item label="浜哄憳鍚嶇О">
- <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-form-item>
- </el-form>
- <div>
+ <div style="display: flex;justify-content: space-between">
+ <div style="display: flex;">
+ <div style="margin-bottom: 18px;margin-right: 10px;display: flex;align-items: center;line-height: 32px;">
+ <span style="width: 88px;font-size: 14px;font-weight: 700;color: #606266;">浜哄憳鍚嶇О</span>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="entity.name"
+ @keyup.enter.native="refreshTable"></el-input>
+ </div>
+ <div style="line-height: 30px;">
+ <el-button type="primary" size="mini" @click="refreshTable">鏌ヨ</el-button>
+ <el-button size="mini" @click="refresh">閲嶇疆</el-button>
+ </div>
+ </div>
+ <div style="line-height: 30px;">
<el-button :loading="outLoading" size="small" type="primary" @click="handleDown">瀵煎嚭</el-button>
<el-button size="small" type="primary" @click="openSelectUserDia">鏂板缓</el-button>
</div>
@@ -57,7 +59,7 @@
</div>
<div v-if="selectUserDia" class="body" style="height: 60vh;">
<lims-table :tableData="tableData1" :column="column1" :isSelection="true" :handleSelectionChange="selectMethod"
- height="560" :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