From 1ea1ad2c56e95e71e1756cfca73e7183f9795ac9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 16 四月 2025 15:23:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_test
---
src/views/CNAS/resourceDemand/device/component/usingExternalInstruments.vue | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/usingExternalInstruments.vue b/src/views/CNAS/resourceDemand/device/component/usingExternalInstruments.vue
index 24e4f56..0dcf6fb 100644
--- a/src/views/CNAS/resourceDemand/device/component/usingExternalInstruments.vue
+++ b/src/views/CNAS/resourceDemand/device/component/usingExternalInstruments.vue
@@ -1,20 +1,25 @@
<template>
<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="small" type="primary" @click="getYearTableDetailData">鏌� 璇�</el-button>
- <el-button size="small" @click="reset">閲� 缃�</el-button>
+ <div style="display: flex;justify-content: space-between;margin-top: 10px;">
+ <div style="display: flex;">
+ <div style="margin-bottom: 18px;margin-right: 10px;display: flex;align-items: center;line-height: 32px;">
+ <span style="width: 88px;font-size: 14px;font-weight: 700;color: #606266;">鍗曚綅鍚嶇О</span>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="searchForm.unitName"
+ @keyup.enter.native="getYearTableDetailData"></el-input>
+ </div>
+ <div style="line-height: 30px;">
+ <el-button type="primary" size="mini" @click="getYearTableDetailData">鏌ヨ</el-button>
+ <el-button size="mini" @click="reset">閲嶇疆</el-button>
+ </div>
</div>
- <div>
+ <div style="line-height: 30px;">
<el-button size="small" type="primary" @click="handleForm('')">鏂板</el-button>
</div>
</div>
<div>
<el-table ref="yearTable" v-loading="yearTableDetailDataLoading" :data="yearTableDetailData"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
height="calc(100vh - 18em)" style="width: 100% ;">
<!-- 琛ㄦ牸鍒� -->
<el-table-column align="center" header-align="center" label="搴忓彿" prop="prop" type="index"
@@ -40,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>
@@ -158,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