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 | 96 ++++++++++++++++++++----------------------------
1 files changed, 40 insertions(+), 56 deletions(-)
diff --git a/src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue b/src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue
index edf7b44..aac448d 100644
--- a/src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue
+++ b/src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue
@@ -1,26 +1,26 @@
<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>
- <el-button
- :loading="outLoading"
- size="small"
- type="primary"
- @click="handleDown">瀵煎嚭</el-button>
+ <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>
</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>
@@ -40,18 +40,10 @@
</template>
</el-table-column>
</el-table>
- <el-pagination
- :current-page="1"
- :current-page.sync="page.current"
- :page-size="page.size"
- :page-sizes="[10, 20, 30, 50, 100]"
- :total="page.total"
- background
- layout="->,total, sizes, prev, pager, next, jumper"
- style="margin-top: 16px"
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- >
+ <el-pagination :current-page="1" :current-page.sync="page.current" :page-size="page.size"
+ :page-sizes="[10, 20, 30, 50, 100]" :total="page.total" background
+ layout="->,total, sizes, prev, pager, next, jumper" style="margin-top: 10px" @size-change="handleSizeChange"
+ @current-change="handleCurrentChange">
</el-pagination>
</div>
<el-dialog :visible.sync="selectUserDia" title="閫夋嫨鐢ㄦ埛" width="70%">
@@ -59,22 +51,15 @@
<div class="search_thing">
<div class="search_label">鐢ㄦ埛鍚嶏細</div>
<div class="search_input">
- <el-input
- v-model="addUserTableInfo.name"
- clearable
- placeholder="璇疯緭鍏�"
- size="small"
- @change="selectUserList"
- ></el-input>
+ <el-input v-model="addUserTableInfo.name" clearable placeholder="璇疯緭鍏�" size="small"
+ @change="selectUserList"></el-input>
</div>
<el-button size="small" style="margin-left: 10px" type="primary" @click="selectUserList">鏌ヨ</el-button>
</div>
</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>
+ <lims-table :tableData="tableData1" :column="column1" :isSelection="true" :handleSelectionChange="selectMethod"
+ height="520" :tableLoading="tableLoading1"></lims-table>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="selectUserDia = false">鍙� 娑�</el-button>
@@ -85,7 +70,7 @@
</template>
<script>
-import {selectUserCondition} from "@/api/business/inspectionTask";
+import { selectUserCondition } from "@/api/business/inspectionTask";
import limsTable from "@/components/Table/lims-table.vue";
import {
basicInformationOfPersonnelSelectPage,
@@ -94,12 +79,12 @@
upUserDepardLimsId
} from "@/api/cnas/personal/personalList";
import store from "@/store";
-import {Message} from "element-ui";
+import { Message } from "element-ui";
export default {
name: 'PersonnelList',
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
- components: {limsTable},
+ components: { limsTable },
props: {
departId: {
type: Number,
@@ -129,9 +114,9 @@
tableData1: [],
tableLoading1: false,
column1: [
- {label: '濮撳悕', prop: 'name'},
- {label: '璐﹀彿', prop: 'account'},
- {label: '瑙掕壊', prop: 'roleName'},
+ { label: '濮撳悕', prop: 'name' },
+ { label: '璐﹀彿', prop: 'account' },
+ { label: '瑙掕壊', prop: 'roleName' },
{
dataType: 'tag',
label: '鐘舵��',
@@ -151,12 +136,12 @@
}
}
},
- {label: '鐢佃瘽鍙风爜', prop: 'phone'},
+ { label: '鐢佃瘽鍙风爜', prop: 'phone' },
],
page1: {
- total:0,
- size:10,
- current:1
+ total: 0,
+ size: 10,
+ current: 1
},
selectUserDia: false, // 娣诲姞浜哄憳寮规
entity: {
@@ -215,7 +200,7 @@
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- delUserDepardLimsId({id: row.userId}).then(res => {
+ delUserDepardLimsId({ id: row.userId }).then(res => {
this.$message.success('鍒犻櫎鎴愬姛');
this.refreshTable();
this.$emit('refreshTree')
@@ -234,12 +219,12 @@
this.refreshTable();
},
// 鎵撳紑鏂板浜哄憳寮规
- openSelectUserDia () {
+ openSelectUserDia() {
this.selectUserDia = true;
this.selectUserList()
},
// 鏌ヨ鏂板寮规鐨勪汉鍛樺垪琛�
- selectUserList () {
+ selectUserList() {
this.tableLoading1 = true
selectUserCondition().then(res => {
this.tableLoading1 = false
@@ -288,11 +273,10 @@
this.outLoading = true;
let entity = this.HaveJson(this.entity)
delete entity.orderBy;
- exportPersonBasicInfo({...entity}).then(res => {
+ exportPersonBasicInfo({ ...entity }).then(res => {
this.outLoading = false;
- const blob = new Blob([res], {type: 'application/octet-stream'});
+ const blob = new Blob([res], { type: 'application/octet-stream' });
this.$download.saveAs(blob, '浜哄憳淇℃伅.xlsx')
- this.$message.success('瀵煎嚭鎴愬姛')
})
},
},
--
Gitblit v1.9.3