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/quantityValueTraceabilityPlan.vue | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) 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