From 8edfe5a740151978422bdba16b6b68b20f0706c7 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 24 三月 2025 13:32:29 +0800
Subject: [PATCH] 设备校准计划-新增设备赋值优化

---
 src/views/CNAS/resourceDemand/device/component/addYearPlanDia.vue |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/views/CNAS/resourceDemand/device/component/addYearPlanDia.vue b/src/views/CNAS/resourceDemand/device/component/addYearPlanDia.vue
index 3b8db3d..c26a8de 100644
--- a/src/views/CNAS/resourceDemand/device/component/addYearPlanDia.vue
+++ b/src/views/CNAS/resourceDemand/device/component/addYearPlanDia.vue
@@ -13,6 +13,7 @@
       </div>
       <div style="margin: 10px 0">
         <el-table id="templateParamTable" ref="yearTable" :data="calibrationPlanDetailList" height="300px"
+                  v-loading="yearTableLoading"
                   :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
           row-key="deviceId" style="width: 100% ;">
           <el-table-column label="璁惧鍚嶇О鍙婂瀷鍙�" min-width="190" prop="deviceName">
@@ -115,7 +116,8 @@
         planId: '',
         calibrationPlanDetailList: [],
       },
-      operationType: ''
+      operationType: '',
+      yearTableLoading: false
     }
   },
   mounted() {
@@ -129,21 +131,26 @@
         this.form = {
           planName: '',
           planYear: '',
-          examinePlanDetailsList: [],
+          calibrationPlanDetailList: [],
         }
+        this.calibrationPlanDetailList = []
       } else {
         this.getRowInfo(row)
       }
       this.applicationForm = true
     },
     getRowInfo(row) {
+      this.yearTableLoading = true
       getDeviceCalibrationPlan({ planId: row.planId }).then(res => {
+        this.yearTableLoading = false
         if (res.code == 200) {
           this.calibrationPlanDetailList = res.data.calibrationPlanDetailList
           this.form.planName = res.data.planName
           this.form.planYear = res.data.planYear
           this.form.planId = res.data.planId
         }
+      }).catch(err => {
+        this.yearTableLoading = false
       })
     },
     // 娣诲姞璁惧
@@ -158,7 +165,12 @@
       this.selectionRows.map(val => {
         this.calibrationPlanDetailList.push({
           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)
+          specificationModel: val.specificationModel,
+          verificationCycles: val.calibrationDate,
+          lastDate: val.lastCalibrationDate.substring(0, 10),
+          planDate: val.nextCalibrationDate.substring(0, 10),
+          verificationUnit: val.calibrationServices,
+          deviceAmount: 1
         })
       })
       this.addEquipDia = false

--
Gitblit v1.9.3