From bc44c8e3c9d85691ce3fa73ef1300a6fae46e365 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 18 三月 2025 19:07:08 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/center-lims-before-ruoyi into dev
---
src/views/CNAS/personnel/personnelInfo/Department/components/PersonnelList/index.vue | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/views/CNAS/personnel/personnelInfo/Department/components/PersonnelList/index.vue b/src/views/CNAS/personnel/personnelInfo/Department/components/PersonnelList/index.vue
index 65aaa66..04e8033 100644
--- a/src/views/CNAS/personnel/personnelInfo/Department/components/PersonnelList/index.vue
+++ b/src/views/CNAS/personnel/personnelInfo/Department/components/PersonnelList/index.vue
@@ -58,17 +58,17 @@
</div>
<el-dialog :visible.sync="selectUserDia" title="閫夋嫨鐢ㄦ埛" width="70%">
<div class="search" style="margin-bottom: 9px;">
- <div class="search_thing">
+ <div class="search_thing" style="display: flex;">
<div class="search_label">鐢ㄦ埛鍚嶏細</div>
<div class="search_input">
<el-input v-model="queryParams.name" clearable placeholder="璇疯緭鍏�" size="small"
- @keyup.enter.native="getList()" style="width: 200px;"></el-input>
+ @keyup.enter.native="getList()" style="width: 150px;"></el-input>
</div>
</div>
</div>
<div v-if="selectUserDia" class="body" style="height: 60vh;">
- <lims-table :tableData="tableData" :column="column" :tableLoading="tableLoading" :height="'calc(100vh - 290px)'"
- :page="personPage" @pagination="pagination" :isSelection="true"
+ <lims-table :tableData="personTableData" :column="column" :tableLoading="tableLoading"
+ :height="'calc(100vh - 290px)'" :page="personPage" :isSelection="true"
:handleSelectionChange="handleSelectionChange"></lims-table>
</div>
<span slot="footer" class="dialog-footer">
@@ -139,7 +139,7 @@
queryParams: {
name: ''
},
- tableData: [],
+ personTableData: [],
column: [
{ label: "濮撳悕", prop: "name" },
{ label: "璐﹀彿", prop: "account" },
@@ -210,8 +210,10 @@
refreshTable(entity, type) {
try {
this.tableLoading = true;
- this.entity.departLimsId = this.departId;
- basicInformationOfPersonnelSelectPage({ ...this.page, ...this.entit }).then(res => {
+ this.entity.departmentId = this.departId;
+ let params = { ...this.page, ...this.entity }
+ delete params.total
+ basicInformationOfPersonnelSelectPage(params).then(res => {
this.tableLoading = false;
if (res.code === 201) {
return;
@@ -297,8 +299,7 @@
.then((res) => {
this.tableLoading = false;
if (res.code === 200) {
- this.tableData = res.data.records;
- this.personPage.total = res.data.total;
+ this.personTableData = res.data;
}
})
.catch((err) => {
@@ -313,7 +314,6 @@
handleDown() {
this.outLoading = true;
let entity = this.HaveJson(this.entity)
- delete entity.orderBy;
exportPersonBasicInfo(entity).then(res => {
this.outLoading = false;
if (res.code === 201) {
--
Gitblit v1.9.3