From d3a5fbcc6516c77b32f54518a65e3238c3029d6d Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 14 三月 2025 19:31:35 +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/Records/index.vue | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/src/views/CNAS/personnel/personnelInfo/Department/components/Records/index.vue b/src/views/CNAS/personnel/personnelInfo/Department/components/Records/index.vue
index 413d1a2..c34c01c 100644
--- a/src/views/CNAS/personnel/personnelInfo/Department/components/Records/index.vue
+++ b/src/views/CNAS/personnel/personnelInfo/Department/components/Records/index.vue
@@ -17,7 +17,7 @@
</template>
<template v-slot:table>
<limsTable :column="superviseColumnData" :handleSelectionChange="handleSelectionChange"
- :height="'calc(100vh - 19em)'" :isSelection="true" :table-data="superviseTableData"
+ :height="'calc(100vh - 20em)'" :isSelection="true" :table-data="superviseTableData"
:table-loading="superviseLoading" rowKey="id" style="margin-top: 18px; padding: 0 15px;"
:page="page" @pagination="pagination">
<div slot="action" slot-scope="scope">
@@ -95,7 +95,7 @@
loading: false,
page: {
current: 1,
- pageSize: 20,
+ size: 20,
total: 0
},
// 鐩戠潱璁板綍
@@ -245,7 +245,7 @@
},
pagination({ page, limit }) {
this.page.current = page;
- this.page.pageSize = limit;
+ this.page.size = limit;
this.getTableData();
},
// 鑾峰彇鐩戠潱璁板綍
@@ -255,7 +255,7 @@
departLimsId: this.isDepartment ? this.departId : null,
userId: this.isDepartment ? null : this.departId,
current: this.page.current,
- size: this.page.pageSize
+ size: this.page.size
})
if (code == 200) {
this.superviseTableData = data.records
@@ -325,10 +325,10 @@
cancelButtonText: '鍙栨秷',
type: 'warning'
})
- .then(() => {
+ .then(async () => {
console.log(this.multipleSelection)
- let ids = this.multipleSelection.map((item) => item.id)
- const code = this.delTableData(ids)
+ let ids = this.multipleSelection.map((item) => item.id).join(',')
+ const code = await this.delTableData(ids)
this.$message({
type: code == 200 ? 'success' : 'error',
message: code == 200 ? '鍒犻櫎鎴愬姛锛�' : '鍒犻櫎澶辫触锛�'
@@ -338,11 +338,7 @@
},
// 鍒犻櫎api
async delTableData(ids) {
- const { code } = await this.$axios({
- method: 'delete',
- url: deletePersonSupervisionRecord,
- data: ids
- })
+ const { code } = await deletePersonSupervisionRecord({ ids })
return code
},
// 琛岃儗鏅壊
--
Gitblit v1.9.3