From 17d7230744601a599b6bcb7da19dda3c8eb9b0df Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 24 三月 2025 13:51:14 +0800
Subject: [PATCH] 量值溯源计划-新增设备赋值优化
---
src/views/CNAS/resourceDemand/device/component/equipmentCalibrationPlan.vue | 4 ++--
src/views/CNAS/resourceDemand/device/component/quantityValueTraceabilityPlan.vue | 21 ++++++++++++++++-----
src/views/CNAS/resourceDemand/device/component/addVerificationYearPlanDia.vue | 11 +++++++++--
src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue | 6 +++---
src/views/CNAS/resourceDemand/device/component/equipmentMaintenancePlan.vue | 2 +-
5 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/addVerificationYearPlanDia.vue b/src/views/CNAS/resourceDemand/device/component/addVerificationYearPlanDia.vue
index 91d52a4..29618b3 100644
--- a/src/views/CNAS/resourceDemand/device/component/addVerificationYearPlanDia.vue
+++ b/src/views/CNAS/resourceDemand/device/component/addVerificationYearPlanDia.vue
@@ -13,7 +13,8 @@
</div>
<div style="margin: 10px 0">
<el-table ref="yearTable" :data="examinePlanDetailsList" id="templateParamTable" row-key="deviceId"
- :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border height="500px" style="width: 100% ;">
+ v-loading="yearTableLoading"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border height="500px">
<el-table-column label="璁惧鍚嶇О" min-width="190" prop="deviceName">
<template slot-scope="scope">
<el-input v-model="scope.row.deviceName" clearable size="small"></el-input>
@@ -118,7 +119,8 @@
planId: '',
examinePlanDetailsList: [],
},
- operationType: ''
+ operationType: '',
+ yearTableLoading: false
}
},
mounted() {
@@ -134,6 +136,7 @@
planYear: '',
examinePlanDetailsList: [],
}
+ this.examinePlanDetailsList = []
} else {
this.getRowInfo(row)
}
@@ -141,13 +144,17 @@
this.getUserList()
},
getRowInfo(row) {
+ this.yearTableLoading = true
getDeviceExaminePlan({ planId: row.planId }).then(res => {
+ this.yearTableLoading = false
if (res.code == 200) {
this.examinePlanDetailsList = res.data.examinePlanDetailsList
this.form.planName = res.data.planName
this.form.planYear = res.data.planYear
this.form.planId = res.data.planId
}
+ }).catch(error => {
+ this.yearTableLoading = false
})
},
// 娣诲姞璁惧
diff --git a/src/views/CNAS/resourceDemand/device/component/equipmentCalibrationPlan.vue b/src/views/CNAS/resourceDemand/device/component/equipmentCalibrationPlan.vue
index 1ebdab3..7bdf1f2 100644
--- a/src/views/CNAS/resourceDemand/device/component/equipmentCalibrationPlan.vue
+++ b/src/views/CNAS/resourceDemand/device/component/equipmentCalibrationPlan.vue
@@ -20,7 +20,7 @@
<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">
@@ -83,7 +83,7 @@
<!-- 琛ㄦ牸鍒� -->
<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>
diff --git a/src/views/CNAS/resourceDemand/device/component/equipmentMaintenancePlan.vue b/src/views/CNAS/resourceDemand/device/component/equipmentMaintenancePlan.vue
index 424bfe6..1de0f9b 100644
--- a/src/views/CNAS/resourceDemand/device/component/equipmentMaintenancePlan.vue
+++ b/src/views/CNAS/resourceDemand/device/component/equipmentMaintenancePlan.vue
@@ -48,7 +48,7 @@
title="璁惧淇濆吇璁″垝琛�" width="80%" @close="closeDialog">
<div style="display: flex;align-items: center;">
<el-button v-if="operationType !== 'check'" size="small" type="primary" @click="addTableRow">娣诲姞</el-button>
- <span style="width: 60px">骞翠唤锛�</span>
+ <span style="width: 60px;margin-left: 10px">骞翠唤锛�</span>
<el-date-picker v-model="form.planYear" type="year" value-format="yyyy" clearable size="small" format="yyyy"
placeholder="閫夋嫨骞�">
</el-date-picker>
diff --git a/src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue b/src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue
index 6cb7975..eb27248 100644
--- a/src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue
+++ b/src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue
@@ -19,12 +19,12 @@
<div>
<el-table ref="yearTable" v-loading="yearTableDataLoading" :data="yearTableData" height="calc(60vh - 20em)"
: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">
@@ -88,7 +88,7 @@
<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>
diff --git a/src/views/CNAS/resourceDemand/device/component/quantityValueTraceabilityPlan.vue b/src/views/CNAS/resourceDemand/device/component/quantityValueTraceabilityPlan.vue
index 9d2fc26..bb806b6 100644
--- a/src/views/CNAS/resourceDemand/device/component/quantityValueTraceabilityPlan.vue
+++ b/src/views/CNAS/resourceDemand/device/component/quantityValueTraceabilityPlan.vue
@@ -50,7 +50,7 @@
title="浠櫒璁惧閲忓�兼函婧愮鐞嗘�讳綋璁″垝" width="80%" @close="closeDialog">
<div style="display: flex;align-items: center;">
<el-button v-if="operationType !== 'check'" size="small" type="primary" @click="addTableRow">娣诲姞</el-button>
- <span style="width: 60px">骞翠唤锛�</span>
+ <span style="width: 60px;margin-left: 10px">骞翠唤锛�</span>
<el-date-picker v-model="form.planYear" type="year" value-format="yyyy" clearable size="small" format="yyyy"
placeholder="閫夋嫨骞�">
</el-date-picker>
@@ -58,7 +58,7 @@
<div style="margin: 10px 0">
<el-table ref="yearTable" :data="deviceTraceabilityManagementDetails" height="300px" id="templateParamTable"
:header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
- row-key="deviceId" style="width: 100% ;">
+ row-key="deviceId" v-loading="yearTableLoading">
<el-table-column align="center" header-align="center" label="搴忓彿" type="index" width="60"></el-table-column>
<el-table-column label="璁惧鍚嶇О" min-width="170" prop="deviceId">
<template slot-scope="scope">
@@ -211,6 +211,7 @@
notificationLoading: false,
auditId: '',
traceabilityManagementId: '',
+ yearTableLoading: false
}
},
mounted() {
@@ -272,17 +273,20 @@
this.form = {
planYear: '',
deviceTraceabilityManagementDetails: []
- },
- this.deviceTraceabilityManagementDetails = []
+ }
+ this.deviceTraceabilityManagementDetails = []
if (row) {
this.traceabilityManagementId = row.traceabilityManagementId
+ this.yearTableLoading = true
getTraceabilityManagementDetail({ traceabilityManagementId: this.traceabilityManagementId }).then(res => {
+ this.yearTableLoading = false
if (res.code === 200) {
this.form = res.data
this.deviceTraceabilityManagementDetails = this.form.deviceTraceabilityManagementDetails
}
}).catch(error => {
console.error(error)
+ this.yearTableLoading = false
})
}
},
@@ -298,7 +302,14 @@
changeMachineName() {
this.deviceTraceabilityManagementDetails = []
this.selectionRows.map(val => {
- this.deviceTraceabilityManagementDetails.push({ deviceId: val.id, managementNumber: val.value, deviceName: val.label, specificationModel: val.specificationModel })
+ this.deviceTraceabilityManagementDetails.push({
+ deviceId: val.id,
+ managementNumber: val.value,
+ deviceName: val.label,
+ specificationModel: val.specificationModel,
+ verificationUnit: val.calibrationServices,
+ verificationCycle: val.calibrationDate
+ })
})
this.addEquipDia = false
this.rowDrop()
--
Gitblit v1.9.3