From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue | 96 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 68 insertions(+), 28 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue b/src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue
index 09150de..06dc2ad 100644
--- a/src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue
+++ b/src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue
@@ -3,10 +3,12 @@
<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 style="display: flex;align-items: center;">
- <el-button style="margin-right: 10px" 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="getYearTableData">鍒锋柊</el-button>
+ <el-button size="small" type="primary" @click="addYearPlan('add')">鏂板</el-button>
<!-- <el-upload ref="upload" :action="action"-->
<!-- :before-upload="beforeUpload" :headers="uploadHeader" :on-error="onError"-->
<!-- :on-success="handleSuccessUp" :show-file-list="false" accept='.xls,.xlsx'>-->
@@ -15,16 +17,17 @@
</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>
@@ -50,23 +53,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.deviceNumber" clearable size="small"
- style="margin-right: 10px;width: 220px"></el-input>
- <span style="width: 80px;font-size: 14px">璁惧鍚嶇О锛�</span>
- <el-input v-model="searchForm.deviceName" clearable size="small"
- style="margin-right: 10px;width: 220px"></el-input>
- <el-button size="mini" type="primary" @click="getYearTableDetailData(currentRow)">鏌ヨ</el-button>
- <el-button size="mini" @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="deviceNumber">
+ <el-input v-model="searchForm.deviceNumber" clearable size="small"
+ @keyup.enter.native="getYearTableDetailData(currentRow)"></el-input>
+ </el-form-item>
+ <el-form-item label="璁惧鍚嶇О" prop="deviceName">
+ <el-input v-model="searchForm.deviceName" clearable size="small"
+ @keyup.enter.native="getYearTableDetailData(currentRow)"></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>
@@ -75,17 +86,33 @@
<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="deviceNumber"></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="150" prop="checkTime"></el-table-column>
<el-table-column label="鏍告煡鎸囨爣" min-width="150" prop="checkIndex"> </el-table-column>
<el-table-column label="鏍告煡鏂规硶" min-width="150" prop="checkMethod"></el-table-column>
<el-table-column label="缁撴灉濡備綍鍒ゅ畾" min-width="150" prop="howResults"></el-table-column>
<el-table-column label="鏍告煡璐熻矗浜�" min-width="150" prop="checkChargerUser"></el-table-column>
+ <el-table-column label="璁板綍鐘舵��" min-width="100" prop="recordStatus">
+ <template slot-scope="scope">
+ <el-tag type="" v-if="scope.row.recordStatus === 0" disable-transitions>鏈紑濮�</el-tag>
+ <el-tag type="warning" v-if="scope.row.recordStatus === 1" disable-transitions>寰呮壒鍑�</el-tag>
+ <el-tag type="success" v-if="scope.row.recordStatus === 2" disable-transitions>閫氳繃</el-tag>
+ <el-tag type="danger" v-if="scope.row.recordStatus === 3" disable-transitions>涓嶉�氳繃</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column label="瀵规瘮鐘舵��" min-width="100" prop="recordContrastStatus">
+ <template slot-scope="scope">
+ <el-tag type="" v-if="scope.row.recordContrastStatus === 0" disable-transitions>鏈紑濮�</el-tag>
+ <el-tag type="warning" v-if="scope.row.recordContrastStatus === 1" disable-transitions>寰呮壒鍑�</el-tag>
+ <el-tag type="success" v-if="scope.row.recordContrastStatus === 2" disable-transitions>閫氳繃</el-tag>
+ <el-tag type="danger" v-if="scope.row.recordContrastStatus === 3" disable-transitions>涓嶉�氳繃</el-tag>
+ </template>
+ </el-table-column>
<el-table-column label="澶囨敞" min-width="150" prop="remark"></el-table-column>
<!-- 鎿嶄綔鎸夐挳 -->
<el-table-column align="center" fixed="right" label="鎿嶄綔" min-width="260">
@@ -101,7 +128,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>
@@ -642,15 +669,28 @@
</script>
<style scoped>
-.title {
+.search {
+ height: 46px;
display: flex;
justify-content: space-between;
- align-items: center;
+}
+.title {
+ position: relative;
+ font-size: 16px;
+ color: #333;
+ font-weight: 400;
+ padding-left: 10px;
+ margin-bottom: 10px;
}
-.title-search {
- display: flex;
- align-items: center;
- margin: 10px 0;
+.title::before {
+ position: absolute;
+ left: 0;
+ top: 4px;
+ content: '';
+ width: 4px;
+ height: 16px;
+ background-color: #3A7BFA;
+ border-radius: 2px;
}
</style>
--
Gitblit v1.9.3