From 4d5264ead8c96c78c9928e22fc66b0af190ed180 Mon Sep 17 00:00:00 2001
From: 祖安之光 <11848914+light-of-zuan@user.noreply.gitee.com>
Date: Fri, 08 May 2026 11:06:42 +0800
Subject: [PATCH] 修改loading
---
src/views/work/assetMng/toolsMonitorMeasure/equipCalibrateConfirm/index.vue | 58 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 45 insertions(+), 13 deletions(-)
diff --git a/src/views/work/assetMng/toolsMonitorMeasure/equipCalibrateConfirm/index.vue b/src/views/work/assetMng/toolsMonitorMeasure/equipCalibrateConfirm/index.vue
index a025777..b4d77f2 100644
--- a/src/views/work/assetMng/toolsMonitorMeasure/equipCalibrateConfirm/index.vue
+++ b/src/views/work/assetMng/toolsMonitorMeasure/equipCalibrateConfirm/index.vue
@@ -11,7 +11,7 @@
v-hasPermi="['equipCalibrateConfirm:add']"
>新增</el-button>
</el-form-item>
- <el-form-item v-if="isAdmin" label="企业：" >
+ <el-form-item v-if="isAdmin" label="单位：" >
<el-select v-model="data.queryParams.companyId" placeholder="请选择" clearable>
<el-option
v-for="item in companyList"
@@ -21,9 +21,17 @@
</el-option>
</el-select>
</el-form-item>
+ <el-form-item label="年份:">
+ <el-date-picker
+ v-model="data.queryParams.year"
+ type="year"
+ value-format="YYYY"
+ placeholder="请选择年份"
+ />
+ </el-form-item>
<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" @click="getList">查询</el-button>
+ <el-button type="primary" plain @click="reset">重置</el-button>
<!-- <el-button type="primary">导出</el-button>-->
</el-form-item>
</el-form>
@@ -36,6 +44,7 @@
{{scope.row.deviceName + '确认单'}}
</template>
</el-table-column>
+ <el-table-column prop="calibrationTime" align="center" label="校准日期" />
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button link type="primary" @click="openDialog('view',scope.row)">查看</el-button>
@@ -82,7 +91,8 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- companyId: null
+ companyId: null,
+ year:''
},
total: 0,
dataList: [],
@@ -109,9 +119,12 @@
data.isAdmin = false
data.queryParams.companyId = userStore.companyId
}
+ await getNowYear()
await getList()
})
-
+const getNowYear = () =>{
+ data.queryParams.year = new Date().getFullYear().toString()
+}
onUnmounted(()=>{
})
@@ -120,7 +133,12 @@
loading.value = true
const res = await getCalibrationMonitoringEquipmentList(data.queryParams)
if(res.code == 200){
- data.dataList = res.data.list || []
+ data.dataList = res.data.list.map(item => {
+ return{
+ ...item,
+ calibrationTime: item.calibrationTime.substring(0,10)
+ }
+ }) || []
data.total = res.data.total
}else{
ElMessage.warning(res.message)
@@ -174,14 +192,28 @@
}
/** 重置新增的表单以及其他数据 */
-const reset= async()=> {
- data.queryParams = {
- pageNum: 1,
- pageSize: 10,
- companyId: null
+const reset= async()=>{
+ if(data.isAdmin){
+ data.queryParams = {
+ companyId: '',
+ pageNum: 1,
+ pageSize: 10,
+ year: '',
+
+ }
+ data.companyList = [];
+ await getCompanyList()
+ }else {
+ data.queryParams = {
+ companyId: data.queryParams.companyId,
+ pageNum: 1,
+ pageSize: 10,
+ year: '',
+ }
}
- await getCompanyList()
- await getList()
+ await getNowYear()
+ await getList();
+
}
const handleDelete = (val) => {
ElMessageBox.confirm(
--
Gitblit v1.9.2