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/documentControl/components/FileObsoletionRequest.vue | 61 ++++++++----------------------
1 files changed, 17 insertions(+), 44 deletions(-)
diff --git a/src/views/CNAS/systemManagement/documentControl/components/FileObsoletionRequest.vue b/src/views/CNAS/systemManagement/documentControl/components/FileObsoletionRequest.vue
index 4ffb93a..9d93027 100644
--- a/src/views/CNAS/systemManagement/documentControl/components/FileObsoletionRequest.vue
+++ b/src/views/CNAS/systemManagement/documentControl/components/FileObsoletionRequest.vue
@@ -1,19 +1,22 @@
<template>
<!-- 鏂囦欢浣滃簾鐢宠 -->
- <div class="file-obsoletion-request" style="height: 100%;">
+ <div>
<div class="search">
- <div class="search_thing">
- <div class="search_label">鏂囦欢缂栧彿锛�</div>
- <div class="search_input"><el-input v-model="queryParams.documentCode" clearable placeholder="璇疯緭鍏�" size="small"
- @keyup.enter.native="refreshTable()"></el-input></div>
+ <div>
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
+ <el-form-item label="鏂囦欢缂栧彿" prop="documentCode">
+ <el-input v-model="queryParams.documentCode" clearable placeholder="璇疯緭鍏�" size="small"
+ @keyup.enter.native="refreshTable()"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="refreshTable">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="refresh">閲� 缃�</el-button>
+ </el-form-item>
+ </el-form>
</div>
- <div class="search_thing" style="padding-left: 30px;">
- <el-button size="small" @click="refresh()">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
- </div>
- <div class="btns" style="padding-left: 30px;">
- <el-button size="small" type="primary"
- @click="addDialogVisible = true, addInfo = {}, file = null">鏂囦欢浣滃簾鐢宠</el-button>
+ <div>
+ <el-button size="small" type="primary" icon="el-icon-plus"
+ @click="addDialogVisible = true, addInfo = {}, file = null">鏂囦欢浣滃簾鐢宠</el-button>
<el-button :loading="outLoading" size="small" type="primary" @click="handleOut">瀵煎嚭</el-button>
</div>
</div>
@@ -72,17 +75,6 @@
</div>
</div>
</el-col>
- <!-- <el-col :span="12" style="margin-bottom: 16px;">
- <div class="search_thing">
- <div class="search_label">浣滃簾鏂瑰紡锛�</div>
- <div class="search_input">
- <el-select v-model="addInfo.method" size="small" style="width: 100%;">
- <el-option label="浣滃簾" value="浣滃簾"></el-option>
- <el-option label="鏃犳晥" value="鏃犳晥"></el-option>
- </el-select>
- </div>
- </div>
- </el-col> -->
<el-col :span="12" style="margin-bottom: 16px;">
<div class="search_thing">
<div class="search_label">鏈熸湜浣滃簾鏃堕棿锛�</div>
@@ -417,17 +409,10 @@
</script>
<style scoped>
-.title {
- height: 60px;
- line-height: 60px;
-}
-
.search {
- background-color: #fff;
- height: 40px;
+ height: 46px;
display: flex;
- align-items: center;
- position: relative;
+ justify-content: space-between;
}
.search_thing {
@@ -444,17 +429,5 @@
.search_input {
width: calc(100% - 110px);
-}
-
-.table {
- background-color: #fff;
- height: calc(100% - 60px - 80px);
- padding: 20px;
-}
-
-.btns {
- position: absolute;
- right: 20px;
- top: 5px;
}
</style>
--
Gitblit v1.9.3