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/systemManagement/managementReview/components/meetingRecords.vue | 72 +++++++++--------------------------
1 files changed, 19 insertions(+), 53 deletions(-)
diff --git a/src/views/CNAS/systemManagement/managementReview/components/meetingRecords.vue b/src/views/CNAS/systemManagement/managementReview/components/meetingRecords.vue
index 819fa92..a664a9a 100644
--- a/src/views/CNAS/systemManagement/managementReview/components/meetingRecords.vue
+++ b/src/views/CNAS/systemManagement/managementReview/components/meetingRecords.vue
@@ -1,19 +1,24 @@
<template>
<div>
- <div class="search-background">
- <span class="search-group">
- <span style="width: 160px">浼氳鍦扮偣锛�</span>
- <el-input v-model="searchForm.place" clearable size="small"></el-input>
- <el-button size="medium" style="margin-left: 10px" @click="resetSearchForm">閲� 缃�</el-button>
- <el-button size="medium" type="primary" @click="searchList">鏌� 璇�</el-button>
- </span>
- <span class="search-group">
- <el-button size="medium" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
- </span>
+ <div class="search">
+ <div>
+ <el-form :model="searchForm" ref="searchForm" size="small" :inline="true">
+ <el-form-item label="浼氳鍦扮偣" prop="place">
+ <el-input v-model="searchForm.place" clearable size="small"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" size="mini" @click="searchList">鏌ヨ</el-button>
+ <el-button size="mini" @click="resetSearchForm">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
+ </div>
+ <div>
+ <el-button size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
+ </div>
</div>
<div class="table">
<limsTable :column="tableColumn" :height="'calc(100vh - 23em)'" :table-data="tableData"
- :table-loading="tableLoading" style="padding: 0 10px;margin-bottom: 16px" :page="page" @pagination="pagination">
+ :table-loading="tableLoading" :page="page" @pagination="pagination">
</limsTable>
</div>
<meeting-records-dia v-if="meetingRecordsDia" ref="meetingRecordsDia"
@@ -112,7 +117,6 @@
this.tableLoading = true
getPageMeeting({ place: this.searchForm.place, pages: this.page.current, size: this.page.size }).then(res => {
this.tableLoading = false
- if (res.code === 201) return
this.tableData = res.data.records
this.page.total = res.data.total
}).catch(err => {
@@ -146,7 +150,6 @@
this.tableLoading = true
deleteMeeting({ id: row.id }).then(res => {
this.tableLoading = false
- if (res.code === 201) return
this.$message.success('鍒犻櫎鎴愬姛')
this.searchList()
}).catch(err => {
@@ -167,37 +170,8 @@
},
handleDown(row) {
exportMeeting({ id: row.id }).then(res => {
- if (res.code == 201) {
- this.$message.error(res.message)
- return
- }
const blob = new Blob([res], { type: 'application/octet-stream' });
- //灏咮lob 瀵硅薄杞崲鎴愬瓧绗︿覆
- let reader = new FileReader();
- reader.readAsText(blob, 'utf-8');
- reader.onload = () => {
- try {
- let result = JSON.parse(reader.result);
- if (result.message) {
- this.$message.error(result.message);
- } else {
- const url = URL.createObjectURL(blob);
- const link = document.createElement('a');
- link.href = url;
- link.download = '浼氳璁板綍.docx';
- link.click();
- this.$message.success('瀵煎嚭鎴愬姛')
- }
- } catch (err) {
- console.log(err);
- const url = URL.createObjectURL(blob);
- const link = document.createElement('a');
- link.href = url;
- link.download = '浼氳璁板綍.docx';
- link.click();
- this.$message.success('瀵煎嚭鎴愬姛')
- }
- }
+ this.$download.saveAs(blob, '浼氳璁板綍.docx');
})
},
}
@@ -205,17 +179,9 @@
</script>
<style scoped>
-.search-background {
- width: 100%;
- height: 60px;
- line-height: 60px;
+.search {
+ height: 46px;
display: flex;
justify-content: space-between;
-}
-
-.search-group {
- display: flex;
- align-items: center;
- margin: 0 20px;
}
</style>
--
Gitblit v1.9.3