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 | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/views/CNAS/resourceDemand/device/component/equipmentCalibrationPlan.vue b/src/views/CNAS/resourceDemand/device/component/equipmentCalibrationPlan.vue index 4ac34e9..de3f07b 100644 --- a/src/views/CNAS/resourceDemand/device/component/equipmentCalibrationPlan.vue +++ b/src/views/CNAS/resourceDemand/device/component/equipmentCalibrationPlan.vue @@ -13,14 +13,15 @@ </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="160" prop="writeTime"></el-table-column> <el-table-column label="鎵瑰噯鐘舵��" min-width="100" prop="ratifyStatus"> @@ -61,10 +62,12 @@ <div> <el-form :model="searchForm" ref="searchForm" size="small" :inline="true"> <el-form-item label="璁惧鍚嶇О鍙婂瀷鍙�" prop="deviceName"> - <el-input v-model="searchForm.deviceName" clearable size="small"></el-input> + <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" clearable size="small"></el-input> + <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> @@ -79,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> -- Gitblit v1.9.3