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/internalAuditManagement/components/auditMeetingSign.vue | 42 ++++++++++++++++++------------------------
1 files changed, 18 insertions(+), 24 deletions(-)
diff --git a/src/views/CNAS/systemManagement/internalAuditManagement/components/auditMeetingSign.vue b/src/views/CNAS/systemManagement/internalAuditManagement/components/auditMeetingSign.vue
index 1ea5e3a..62ab478 100644
--- a/src/views/CNAS/systemManagement/internalAuditManagement/components/auditMeetingSign.vue
+++ b/src/views/CNAS/systemManagement/internalAuditManagement/components/auditMeetingSign.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.meetingDate" 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="meetingDate">
+ <el-input v-model="searchForm.meetingDate" 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>
<audit-meeting-sign-dia v-if="auditMeetingSignDia" ref="auditMeetingSignDia"
@@ -119,7 +124,6 @@
this.tableLoading = true
pageInternalMeeting({ ...entity, ...page }).then(res => {
this.tableLoading = false
- if (res.code === 201) return
this.tableData = res.data.records
this.page.total = res.data.total
}).catch(err => {
@@ -153,7 +157,6 @@
this.tableLoading = true
delInternalMeeting({ meetingId: row.meetingId }).then(res => {
this.tableLoading = false
- if (res.code === 201) return
this.$message.success('鍒犻櫎鎴愬姛')
this.searchList()
}).catch(err => {
@@ -171,7 +174,6 @@
handleDown(row) {
exportInternalMeeting({ meetingId: row.meetingId }).then(res => {
this.outLoading = false
- this.$message.success('瀵煎嚭鎴愬姛')
const blob = new Blob([res], { type: 'application/msword' });
this.$download.saveAs(blob, '鍐呭浼氳绛惧埌' + '.docx');
})
@@ -186,17 +188,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