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/documentRecords/regularReviewsRecord.vue |   85 ++++++++++++++++--------------------------
 1 files changed, 32 insertions(+), 53 deletions(-)

diff --git a/src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue b/src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue
index 2df716e..4e56e7a 100644
--- a/src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue
+++ b/src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue
@@ -1,30 +1,30 @@
 <template>
   <!-- 鏂囦欢瀹氭湡瀹℃煡璁板綍 -->
-  <div class="PeriodicDocumentReviewRecords">
+  <div class="capacity-scope">
     <el-tabs type="border-card" v-model="activeName" style="height: 100%;">
       <el-tab-pane label="濉啓" name="濉啓" style="height: 100%;">
         <div class="search">
-          <div class="search_thing">
-            <div class="search_label">鏂囦欢鍚嶇О锛�</div>
-            <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
-                v-model="queryParams.documentName" @keyup.enter.native="refreshTable()"></el-input></div>
+          <div>
+            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
+              <el-form-item label="鏂囦欢鍚嶇О" prop="documentName">
+                <el-input size="small" placeholder="璇疯緭鍏�" clearable
+                          v-model="queryParams.documentName" @keyup.enter.native="refreshTable()"></el-input>
+              </el-form-item>
+              <el-form-item label="鏂囦欢缂栧彿" prop="documentCode">
+                <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.documentCode"
+                          @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">
-            <div class="search_label">鏂囦欢缂栧彿锛�</div>
-            <div class="search_input">
-              <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.documentCode"
-                @keyup.enter.native="refreshTable()"></el-input>
-            </div>
-          </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">
+          <div>
             <el-button size="small" type="primary" @click="openAdd" v-if="addPower">鏂板</el-button>
             <el-upload :action="action" :multiple="false" :show-file-list="false" accept='.doc,.docx'
-              :headers="uploadHeader" :on-change="beforeUpload" :on-error="onError" ref='upload' v-if="upPower"
-              :on-success="handleSuccessUp" style="display:inline-block;margin-left: 20px;">
+                       :headers="uploadHeader" :on-change="beforeUpload" :on-error="onError" ref='upload' v-if="upPower"
+                       :on-success="handleSuccessUp" style="display:inline-block;margin-left: 20px;">
               <el-button type="primary" size="small">瀵煎叆</el-button></el-upload>
           </div>
         </div>
@@ -34,19 +34,18 @@
         </div>
       </el-tab-pane>
       <el-tab-pane label="鍘嗗彶璁板綍" name="鍘嗗彶璁板綍" style="height: 100%;">
-        <div class="search">
-          <div class="search_thing">
-            <div class="search_label">骞达細</div>
-            <div class="search_input">
+        <div>
+          <el-form :model="queryParams0" ref="queryParams0" size="small" :inline="true">
+            <el-form-item label="骞�" prop="year">
               <el-date-picker v-model="queryParams0.year" type="year" placeholder="閫夋嫨骞�" format="yyyy"
-                value-format="yyyy" size="small" @change="refreshTable(1)">
+                              value-format="yyyy" size="small" @change="refreshTable(1)">
               </el-date-picker>
-            </div>
-          </div>
-          <div class="search_thing" style="padding-left: 30px;">
-            <el-button size="small" @click="refresh(1)">閲� 缃�</el-button>
-            <el-button size="small" type="primary" @click="refreshTable(1)">鏌� 璇�</el-button>
-          </div>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" size="mini" @click="refreshTable(1)">鏌� 璇�</el-button>
+              <el-button icon="el-icon-refresh" size="mini" @click="refresh(1)">閲� 缃�</el-button>
+            </el-form-item>
+          </el-form>
         </div>
         <div class="table">
           <lims-table :tableData="tableData0" :column="column0" :page="page0" :tableLoading="tableLoading"
@@ -143,6 +142,7 @@
   pageManageDocumentList,
 } from '@/api/cnas/systemManagement/documentControl.js'
 export default {
+  name: 'RegularReviewsRecord',
   components: {
     limsTable,
     filePreview
@@ -529,17 +529,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 {
@@ -558,21 +551,7 @@
   width: calc(100% - 110px);
 }
 
-.table {
-  margin-top: 10px;
-  background-color: #fff;
-  height: calc(100% - 60px - 140px);
-  padding: 20px;
-  padding-top: 0;
-}
-
 >>>.el-tabs__content {
   height: 100%;
-}
-
-.btns {
-  position: absolute;
-  right: 20px;
-  top: 5px;
 }
 </style>

--
Gitblit v1.9.3