From de319760a2124d3043491d40f9c2ebf3d27be78f Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期一, 24 三月 2025 10:24:27 +0800
Subject: [PATCH] 合并装备代码
---
src/views/CNAS/resourceDemand/device/component/usingExternalInstruments.vue | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/usingExternalInstruments.vue b/src/views/CNAS/resourceDemand/device/component/usingExternalInstruments.vue
index c2d11b8..d1bb7b2 100644
--- a/src/views/CNAS/resourceDemand/device/component/usingExternalInstruments.vue
+++ b/src/views/CNAS/resourceDemand/device/component/usingExternalInstruments.vue
@@ -2,12 +2,16 @@
<div>
<div>
<div class="title">
- <div class="title-search">
- <span style="width: 80px;font-size: 14px">鍗曚綅鍚嶇О锛�</span>
- <el-input v-model="searchForm.unitName" clearable size="small"
- style="margin-right: 10px;width: 220px"></el-input>
- <el-button size="mini" type="primary" @click="getYearTableDetailData">鏌ヨ</el-button>
- <el-button size="mini" @click="reset">閲嶇疆</el-button>
+ <div>
+ <el-form :model="searchForm" ref="searchForm" size="small" :inline="true">
+ <el-form-item label="鍗曚綅鍚嶇О" prop="unitName">
+ <el-input v-model="searchForm.unitName" clearable size="small"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" size="mini" @click="getYearTableDetailData">鏌ヨ</el-button>
+ <el-button size="mini" @click="reset">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
</div>
<div>
<el-button size="small" type="primary" @click="handleForm('')">鏂板</el-button>
@@ -41,7 +45,7 @@
</el-table-column>
</el-table>
<el-pagination :current-page="1" :page-size="pagination1.size" :page-sizes="[10, 20, 30, 50, 100]"
- :total="pagination1.total" layout="->,total, sizes, prev, pager, next, jumper"
+ :total="pagination1.total" layout="->,total, sizes, prev, pager, next, jumper" background
@size-change="handleSizeChange1" @current-change="handleCurrentChange1">
</el-pagination>
</div>
@@ -159,14 +163,9 @@
<style scoped>
.title {
+ height: 46px;
display: flex;
justify-content: space-between;
- align-items: center;
-}
-
-.title-search {
- display: flex;
- align-items: center;
- margin: 10px 0;
+ margin-top: 10px;
}
</style>
--
Gitblit v1.9.3