From a146908e41d62070123455dd76388870c5440da5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 20 十月 2026 11:26:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/CNAS/resourceDemand/device/component/check.vue | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/check.vue b/src/views/CNAS/resourceDemand/device/component/check.vue
index 834440d..b6257eb 100644
--- a/src/views/CNAS/resourceDemand/device/component/check.vue
+++ b/src/views/CNAS/resourceDemand/device/component/check.vue
@@ -23,10 +23,13 @@
</el-table-column>
<el-table-column label="鏍告煡璇佷功缂栧彿" min-width="150" prop="certificateSerialNumber"></el-table-column>
<el-table-column label="璇存槑" min-width="150" prop="remark" show-overflow-tooltip></el-table-column>
- <el-table-column label="鏍告煡鏃ユ湡" min-width="150" prop="calibrationDate"></el-table-column>
- <el-table-column label="涓嬫鏍告煡鏃ユ湡" min-width="150" prop="nextCalibrationDate"></el-table-column>
+ <el-table-column label="鏍告煡鏃ユ湡" min-width="150" prop="calibrationDate"
+ :formatter="formatDateCell"></el-table-column>
+ <el-table-column label="涓嬫鏍告煡鏃ユ湡" min-width="150" prop="nextCalibrationDate"
+ :formatter="formatDateCell"></el-table-column>
<el-table-column label="鐧昏浜�" min-width="150" prop="createUser"></el-table-column>
- <el-table-column label="鐧昏鏃ユ湡" min-width="150" prop="createTime"></el-table-column>
+ <el-table-column label="鐧昏鏃ユ湡" min-width="150" prop="createTime"
+ :formatter="formatDateCell"></el-table-column>
<el-table-column fixed="right" label="鎿嶄綔" min-width="150">
<template #default="{ row }">
<el-button size="small" link type="primary" @click="handleAttachmentClick(row)">闄勪欢</el-button>
@@ -87,7 +90,7 @@
<el-table-column label="鏈�澶у厑璁歌宸�" prop="maxPermissibleError"></el-table-column>
<el-table-column label="鍒ゅ畾鏍囧噯" prop="judgmentCriteria"></el-table-column>
<el-table-column label="鍒涘缓浜�" prop="createdBy"></el-table-column>
- <el-table-column label="鍒涘缓鏃堕棿" prop="creationTime"></el-table-column>
+ <el-table-column label="鍒涘缓鏃堕棿" prop="creationTime" :formatter="formatDateCell"></el-table-column>
<el-table-column fixed="right" label="鎿嶄綔">
<template #default="scope">
<el-button size="small" link type="primary" @click="handleDelete(scope.row)">鍒犻櫎</el-button>
@@ -250,6 +253,7 @@
<script>
import file from '@/utils/file';
import { mapGetters } from "@/utils/store-compat";
+import { formatListDate } from './dateFormat';
export default {
components: {},
props: {
@@ -340,6 +344,9 @@
this.getTableList(this.clickNodeVal.value) // 鑾峰彇璁惧鏍告煡鍒楄〃鏁版嵁
},
methods: {
+ formatDateCell(row, column, cellValue) {
+ return formatListDate(cellValue)
+ },
//鐘舵�佸垽瀹�
checkRadio() {
let resultList = this.calibrateParams.map(ele => ele.result)
@@ -669,7 +676,7 @@
.el-table {
font-size: 14px;
- color: #333;
+ color: var(--lims-text);
}
.el-table thead {
--
Gitblit v1.9.3