From e9c7fa1915cd2afbadaef1884324fa7cd5aaaf25 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期二, 29 七月 2025 10:12:06 +0800
Subject: [PATCH] Merge branch 'dev_y_ztns' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev_y_ztns
---
src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue b/src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue
index eb27248..06dc2ad 100644
--- a/src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue
+++ b/src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue
@@ -17,7 +17,8 @@
</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 @current-change="currentChange">
<!-- 琛ㄦ牸鍒� -->
@@ -65,10 +66,12 @@
<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"></el-input>
+ <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"></el-input>
+ <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>
@@ -83,7 +86,7 @@
<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>
@@ -94,6 +97,22 @@
<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">
--
Gitblit v1.9.3