From f94b96403234f5927e74f72fc0cbc65d7b426019 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期三, 10 十二月 2025 14:52:50 +0800
Subject: [PATCH] 修改
---
src/views/work/assetMng/toolsMonitorMeasure/annualVerificationPlan/index.vue | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/src/views/work/assetMng/toolsMonitorMeasure/annualVerificationPlan/index.vue b/src/views/work/assetMng/toolsMonitorMeasure/annualVerificationPlan/index.vue
index 5920d53..9bc8bef 100644
--- a/src/views/work/assetMng/toolsMonitorMeasure/annualVerificationPlan/index.vue
+++ b/src/views/work/assetMng/toolsMonitorMeasure/annualVerificationPlan/index.vue
@@ -12,7 +12,7 @@
>新增</el-button>
</el-form-item>
<el-form-item v-if="isAdmin" label="单位：" >
- <el-select v-model="data.queryParams.companyId" placeholder="请选择" clearable>
+ <el-select v-model="queryParams.companyId" placeholder="请选择" clearable>
<el-option
v-for="item in companyList"
:key="item.id"
@@ -23,7 +23,7 @@
</el-form-item>
<el-form-item v-if="isAdmin" label="年份：">
<el-date-picker
- v-model="data.queryParams.year"
+ v-model="queryParams.year"
type="year"
value-format="YYYY"
placeholder="请选择年份"
@@ -32,17 +32,17 @@
<el-form-item >
<el-button v-if="isAdmin" type="primary" @click="getList">查询</el-button>
<el-button v-if="isAdmin" type="primary" plain @click="reset">重置</el-button>
- <el-button type="primary" plain @click="openDialog('edit',data.dataList)" v-if="data.hasInfo" v-hasPermi="['annualVerificationPlan:list:edit']">编辑</el-button>
+ <el-button type="primary" plain @click="openDialog('edit',dataList)" v-if="data.hasInfo" v-hasPermi="['annualVerificationPlan:list:edit']">编辑</el-button>
<el-button type="primary" plain @click="downloadFile()" v-if="data.hasInfo">导出</el-button>
<!-- <el-button type="primary">导出</el-button>-->
</el-form-item>
</el-form>
</div>
<div style="background: #fff;padding: 20px;border-radius: 0.6rem">
- <el-form :model="data.dataList" label-position="left" size="default" label-width="120px" v-if="data.hasInfo">
+ <el-form :model="dataList" label-position="left" size="default" label-width="120px" v-if="data.hasInfo">
<el-form-item v-if="isAdmin" label="单位:" prop="companyId">
<el-input
- v-model.trim="data.dataList.companyName"
+ v-model.trim="dataList.companyName"
style="width: 100%;"
readonly
>
@@ -50,7 +50,7 @@
</el-form-item>
<el-form-item label="计划名称:" prop="name">
<el-input
- v-model.trim="data.dataList.name"
+ v-model.trim="dataList.name"
style="width: 100%;"
readonly
>
@@ -58,7 +58,7 @@
</el-form-item>
<el-form-item label="年份:" prop="year">
<el-input
- v-model.trim="data.dataList.year"
+ v-model.trim="dataList.year"
style="width: 100%;"
readonly
>
@@ -67,21 +67,26 @@
<el-form-item label="设备列表:" prop="annualVerificationDevices">
</el-form-item>
- <el-table v-if="data.dataList.annualVerificationDevices && data.dataList.annualVerificationDevices.length>0" :data="data.dataList.annualVerificationDevices" style="margin-bottom: 20px" :border="true">
+ <el-table v-if="dataList.annualVerificationDevices && dataList.annualVerificationDevices.length>0" :data="dataList.annualVerificationDevices" style="margin-bottom: 20px" :border="true">
<el-table-column label="序号" type="index" width="80" align="center">
</el-table-column>
<el-table-column label="设备编号" prop="deviceNumber" align="center"/>
<el-table-column label="设备名称" prop="deviceName" align="center"/>
+ <el-table-column label="设备类型" prop="planType" align="center">
+ <template #default="scope">
+ {{scope.row.planType == 1?'软件':'硬件'}}
+ </template>
+ </el-table-column>
<el-table-column label="规格型号" prop="model" align="center"/>
<el-table-column label="校准周期" prop="calibrationCycle" align="center"/>
<el-table-column label="下次校准时间" prop="nextCalibrationTime" align="center">
<template #default="scope">
- {{scope.row.nextCalibrationTime.substring(0,10)}}
+ {{scope.row.nextCalibrationTime?.substring(0,10)}}
</template>
</el-table-column>
<el-table-column label="实际检定时间" prop="actCalibrationTime" align="center">
<template #default="scope">
- {{scope.row.actCalibrationTime.substring(0,10)}}
+ {{scope.row.actCalibrationTime?.substring(0,10)}}
</template>
</el-table-column>
<el-table-column label="校准人" prop="calibrationUser" align="center"/>
@@ -126,7 +131,7 @@
<el-col :span="12">
<el-form-item label="编制:" prop="establishmentName">
<el-input
- v-model.trim="data.dataList.establishmentName"
+ v-model.trim="dataList.establishmentName"
style="width: 100%;"
readonly
>
@@ -136,7 +141,7 @@
<el-col :span="12">
<el-form-item label="日期:" prop="establishmentTime" >
<el-input
- v-model.trim="data.dataList.establishmentTime"
+ v-model.trim="dataList.establishmentTime"
style="width: 100%;"
readonly
>
@@ -148,7 +153,7 @@
<el-col :span="12">
<el-form-item label="审核:" prop="processName">
<el-input
- v-model.trim="data.dataList.processName"
+ v-model.trim="dataList.processName"
style="width: 100%;"
readonly
>
@@ -158,7 +163,7 @@
<el-col :span="12">
<el-form-item label="日期:" prop="processTime" >
<el-input
- v-model.trim="data.dataList.processTime"
+ v-model.trim="dataList.processTime"
style="width: 100%;"
readonly
>
@@ -271,6 +276,7 @@
data.dataList.companyName = data.companyList.find(i=>i.id == data.dataList.companyId)?.name
data.dataList.establishmentTime = data.dataList.establishmentTime.substring(0,10)
data.dataList.processTime = data.dataList.processTime.substring(0,10)
+ console.log(data.dataList,'data')
}
}else{
data.hasInfo = false
@@ -325,6 +331,10 @@
}
const openDialog = (type, value) => {
+ if(!data.queryParams.companyId){
+ ElMessage.warning('请先选择单位')
+ return
+ }
dialogRef.value.openDialog(type, value, data.queryParams.companyId, data.isAdmin, data.companyList);
}
--
Gitblit v1.9.2