From 481ce9ffb9396cdd8c48bf9b28dffe228b83bc9e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 17 四月 2025 14:20:33 +0800
Subject: [PATCH] 设备维护保养页面开发、联调

---
 src/views/CNAS/resourceDemand/device/component/equipmentCalibrationPlan.vue |   80 ++++++++++++++++++++++++++--------------
 1 files changed, 52 insertions(+), 28 deletions(-)

diff --git a/src/views/CNAS/resourceDemand/device/component/equipmentCalibrationPlan.vue b/src/views/CNAS/resourceDemand/device/component/equipmentCalibrationPlan.vue
index 4f2b061..de3f07b 100644
--- a/src/views/CNAS/resourceDemand/device/component/equipmentCalibrationPlan.vue
+++ b/src/views/CNAS/resourceDemand/device/component/equipmentCalibrationPlan.vue
@@ -3,24 +3,27 @@
   <div>
     <div>
       <div style="margin: 10px 0;display: flex;align-items: center;justify-content: space-between;">
-        <span>骞村害璁″垝琛�</span>
+        <div class="title">
+          <span style="font-weight: bold">骞村害璁″垝琛�</span>
+        </div>
         <div>
           <el-button size="small" type="primary" @click="getYearTableData">鍒锋柊</el-button>
-          <el-button style="margin-right: 10px" size="small" type="primary" @click="addYearPlan('add')">鏂板</el-button>
+          <el-button size="small" type="primary" @click="addYearPlan('add')">鏂板</el-button>
           <!--          <el-button size="small" type="primary" @click="record">瀵煎叆</el-button>-->
         </div>
       </div>
       <div>
-        <el-table ref="yearTable" v-loading="yearTableDataLoading" :data="yearTableData" height="calc(60vh - 20em)"
+        <el-table ref="yearTable" v-loading="yearTableDataLoading"
+                  :data="yearTableData" height="calc(60vh - 16em)"
                   :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
-          highlight-current-row style="width: 100% ;" @current-change="currentChange">
+                  highlight-current-row @current-change="currentChange">
           <!-- 琛ㄦ牸鍒� -->
           <el-table-column align="center" header-align="center" label="搴忓彿" prop="prop" type="index"
             width="70"></el-table-column>
           <el-table-column label="骞翠唤" min-width="80" prop="planYear"></el-table-column>
-          <el-table-column label="璁″垝鍚嶇О" min-width="180" prop="planName"></el-table-column>
+          <el-table-column label="璁″垝鍚嶇О" min-width="180" prop="planName" show-overflow-tooltip></el-table-column>
           <el-table-column label="缂栧埗浜�" min-width="100" prop="writeName"></el-table-column>
-          <el-table-column label="缂栧埗鏃ユ湡" min-width="150" prop="writeTime"></el-table-column>
+          <el-table-column label="缂栧埗鏃ユ湡" min-width="160" prop="writeTime"></el-table-column>
           <el-table-column label="鎵瑰噯鐘舵��" min-width="100" prop="ratifyStatus">
             <template slot-scope="scope">
               <el-tag v-if="scope.row.ratifyStatus === 1" type="success">鎵瑰噯</el-tag>
@@ -46,23 +49,31 @@
           </el-table-column>
         </el-table>
         <el-pagination :current-page="1" :page-size="pagination.size" :page-sizes="[10, 20, 30, 50, 100]"
-          :total="pagination.total" layout="->,total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange"
-          @current-change="handleCurrentChange">
+                       background :total="pagination.total" layout="->,total, sizes, prev, pager, next, jumper"
+                       @size-change="handleSizeChange" @current-change="handleCurrentChange">
         </el-pagination>
       </div>
     </div>
     <div>
-      <span>骞村害璁″垝鏄庣粏琛�</span>
       <div class="title">
-        <div class="title-search">
-          <span style="width: 120px;font-size: 14px">璁惧鍚嶇О鍙婂瀷鍙凤細</span>
-          <el-input v-model="searchForm.deviceName" clearable size="small"
-            style="margin-right: 10px;width: 220px"></el-input>
-          <span style="width: 80px;font-size: 14px">浠櫒缂栧彿锛�</span>
-          <el-input v-model="searchForm.deviceNumber" clearable size="small"
-            style="margin-right: 10px;width: 220px"></el-input>
-          <el-button size="small" type="primary" @click="getYearTableDetailData(currentRow)">鏌� 璇�</el-button>
-          <el-button size="small" @click="reset">閲� 缃�</el-button>
+        <span style="font-weight: bold">骞村害璁″垝鏄庣粏琛�</span>
+      </div>
+      <div class="search">
+        <div>
+          <el-form :model="searchForm" ref="searchForm" size="small" :inline="true">
+            <el-form-item label="璁惧鍚嶇О鍙婂瀷鍙�" prop="deviceName">
+              <el-input v-model="searchForm.deviceName" clearable
+                        @keyup.enter.native="getYearTableDetailData(currentRow)" size="small"></el-input>
+            </el-form-item>
+            <el-form-item label="浠櫒缂栧彿" prop="deviceNumber">
+              <el-input v-model="searchForm.deviceNumber"
+                        @keyup.enter.native="getYearTableDetailData(currentRow)" clearable size="small"></el-input>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" size="mini" @click="getYearTableDetailData(currentRow)">鏌ヨ</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('add')">鏂板</el-button>
@@ -71,11 +82,11 @@
       <div>
         <el-table ref="yearTableDetailData" v-loading="yearTableDetailDataLoading" :data="yearTableDetailData"
                   :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
-          height="calc(60vh - 20em)" style="width: 100% ;">
+                  :height="'calc(100vh - 34em)'" style="width: 100% ;">
           <!-- 琛ㄦ牸鍒� -->
           <el-table-column align="center" header-align="center" label="搴忓彿" prop="prop" type="index"
             width="70"></el-table-column>
-          <el-table-column label="璁惧鍚嶇О鍙婂瀷鍙�" min-width="180" prop="deviceName"></el-table-column>
+          <el-table-column label="璁惧鍚嶇О鍙婂瀷鍙�" min-width="180" prop="deviceName" show-overflow-tooltip></el-table-column>
           <el-table-column label="璁惧鏁伴噺" min-width="180" prop="deviceAmount"></el-table-column>
           <el-table-column label="浠櫒缂栧彿" min-width="150" prop="deviceNumber"></el-table-column>
           <el-table-column label="妫�瀹氬崟浣�" min-width="150" prop="verificationUnit"> </el-table-column>
@@ -94,8 +105,8 @@
           </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"
-          @size-change="handleSizeChange1" @current-change="handleCurrentChange1">
+                       background :total="pagination1.total" layout="->,total, sizes, prev, pager, next, jumper"
+                       @size-change="handleSizeChange1" @current-change="handleCurrentChange1">
         </el-pagination>
       </div>
     </div>
@@ -597,14 +608,27 @@
 
 <style scoped>
 .title {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
+  position: relative;
+  font-size: 16px;
+  color: #333;
+  font-weight: 400;
+  padding-left: 10px;
+  margin-bottom: 10px;
 }
 
-.title-search {
+.title::before {
+  position: absolute;
+  left: 0;
+  top: 4px;
+  content: '';
+  width: 4px;
+  height: 16px;
+  background-color: #3A7BFA;
+  border-radius: 2px;
+}
+.search {
+  height: 46px;
   display: flex;
-  align-items: center;
-  margin: 10px 0;
+  justify-content: space-between;
 }
 </style>

--
Gitblit v1.9.3