From 66a2e4f98adaef112e39b1954e9541cc197628ff Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 25 三月 2025 14:11:05 +0800
Subject: [PATCH] 设备校准计划-新增设备时缺少数据报错
---
src/views/CNAS/process/ensureResults/ensureResultsValidity/components/carryOutDialog.vue | 1 +
src/views/CNAS/resourceDemand/device/component/addYearPlanDia.vue | 4 ++--
src/views/CNAS/resourceDemand/device/component/equipmentMaintenancePlan.vue | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/carryOutDialog.vue b/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/carryOutDialog.vue
index 7b4f94e..f3fd3c5 100644
--- a/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/carryOutDialog.vue
+++ b/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/carryOutDialog.vue
@@ -1,4 +1,5 @@
<template>
+<!--璐ㄩ噺鐩戞帶-瀹炴柦娴佺▼椤甸潰-->
<div>
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="formDia" title="瀹炴柦"
width="60%" @close="closeCarryOutDia">
diff --git a/src/views/CNAS/resourceDemand/device/component/addYearPlanDia.vue b/src/views/CNAS/resourceDemand/device/component/addYearPlanDia.vue
index c26a8de..09c36ce 100644
--- a/src/views/CNAS/resourceDemand/device/component/addYearPlanDia.vue
+++ b/src/views/CNAS/resourceDemand/device/component/addYearPlanDia.vue
@@ -167,8 +167,8 @@
deviceId: val.id, deviceName: val.label, deviceNumber: val.value,
specificationModel: val.specificationModel,
verificationCycles: val.calibrationDate,
- lastDate: val.lastCalibrationDate.substring(0, 10),
- planDate: val.nextCalibrationDate.substring(0, 10),
+ lastDate: val.lastCalibrationDate && val.lastCalibrationDate.substring(0, 10),
+ planDate: val.nextCalibrationDate && val.nextCalibrationDate.substring(0, 10),
verificationUnit: val.calibrationServices,
deviceAmount: 1
})
diff --git a/src/views/CNAS/resourceDemand/device/component/equipmentMaintenancePlan.vue b/src/views/CNAS/resourceDemand/device/component/equipmentMaintenancePlan.vue
index 1de0f9b..549402a 100644
--- a/src/views/CNAS/resourceDemand/device/component/equipmentMaintenancePlan.vue
+++ b/src/views/CNAS/resourceDemand/device/component/equipmentMaintenancePlan.vue
@@ -56,7 +56,7 @@
<div style="margin: 10px 0">
<el-table ref="yearTable" :data="deviceMaintenancePlanDetails" id="templateParamTable" row-key="deviceId"
:header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
- height="300px" border style="width: 100% ;">
+ height="300px" style="width: 100% ;">
<el-table-column align="center" header-align="center" label="搴忓彿" type="index" width="60"></el-table-column>
<el-table-column label="璁惧鍚嶇О" min-width="170" prop="deviceName">
<template slot-scope="scope">
--
Gitblit v1.9.3