From 0a26d58a3906b9e13946c7cb46fae51a0de98920 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期一, 17 三月 2025 15:49:08 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/CNAS/systemManagement/internalAuditManagement/components/yearPlan.vue | 37 +++++++++++++++++--------------------
1 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/src/views/CNAS/systemManagement/internalAuditManagement/components/yearPlan.vue b/src/views/CNAS/systemManagement/internalAuditManagement/components/yearPlan.vue
index 2c37944..cf2dab2 100644
--- a/src/views/CNAS/systemManagement/internalAuditManagement/components/yearPlan.vue
+++ b/src/views/CNAS/systemManagement/internalAuditManagement/components/yearPlan.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.purpose" clearable size="small"></el-input>
- <el-button size="small" style="margin-left: 10px" @click="resetSearchForm">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="searchList">鏌� 璇�</el-button>
- </span>
- <span class="search-group">
+ <div class="search">
+ <div>
+ <el-form :model="searchForm" ref="searchForm" size="small" :inline="true">
+ <el-form-item label="鍐呭鐩殑" prop="purpose">
+ <el-input v-model="searchForm.purpose" clearable size="small"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="searchList">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetSearchForm">閲� 缃�</el-button>
+ </el-form-item>
+ </el-form>
+ </div>
+ <div>
<el-button size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
- </span>
+ </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" @pagination="pagination" :page="page">
+ :table-loading="tableLoading" @pagination="pagination" :page="page">
</limsTable>
</div>
<year-plan-dia v-if="yearPlanDia" ref="yearPlanDia" @closeYearDia="closeYearDia"></year-plan-dia>
@@ -295,17 +300,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