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/procurementPlatform/warehouseManagement/monthlyInspectionRecord/index.vue | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/src/views/work/procurementPlatform/warehouseManagement/monthlyInspectionRecord/index.vue b/src/views/work/procurementPlatform/warehouseManagement/monthlyInspectionRecord/index.vue
index 2b3892a..c955ef5 100644
--- a/src/views/work/procurementPlatform/warehouseManagement/monthlyInspectionRecord/index.vue
+++ b/src/views/work/procurementPlatform/warehouseManagement/monthlyInspectionRecord/index.vue
@@ -8,9 +8,10 @@
plain
icon="Plus"
@click="openDialog('add',{})"
+ v-hasPermi="['monthlyInspectionRecord:add']"
>新增</el-button>
</el-form-item>
- <el-form-item label="企业名称:" v-if="data.isAdmin" style="margin-left: 20px">
+ <el-form-item label="单位名称:" v-if="data.isAdmin" style="margin-left: 20px">
<el-select v-model="data.queryParams.companyId" placeholder="请选择" filterable clearable>
<el-option
v-for="item in data.companyList"
@@ -20,7 +21,15 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item v-if="data.isAdmin">
+ <el-form-item label="年份:" style="margin-left: 20px">
+ <el-date-picker
+ v-model="data.queryParams.year"
+ type="year"
+ value-format="YYYY"
+ placeholder="请选择年份"
+ />
+ </el-form-item>
+ <el-form-item >
<el-button type="primary" style="margin-left: 30px" @click="searchClick">查询</el-button>
<el-button plain @click="reset">重置</el-button>
</el-form-item>
@@ -36,9 +45,10 @@
<el-table v-loading="loading" :data="dataList" :border="true" @selection-change="handleSelectionChange" :span-method="mergeCells">
<el-table-column type="selection" prop="selection" width="55" />
<!-- <el-table-column type="index" prop="sequenceNumber" label="序号" width="80" align="center"></el-table-column>-->
-<!-- <el-table-column label="企业名称" prop="companyName" align="center" v-if="data.isAdmin" />-->
+<!-- <el-table-column label="单位名称" prop="companyName" align="center" v-if="data.isAdmin" />-->
<el-table-column label="名称" prop="recordName" align="center">
</el-table-column>
+ <el-table-column label="年份" prop="year" align="center" />
<el-table-column label="时间" prop="monthlyTime" align="center" />
<el-table-column label="检查人" prop="checkUser" align="center" />
<el-table-column label="防护" prop="entrench" align="center" />
@@ -51,8 +61,8 @@
<el-table-column label="操作" align="center" prop="operate" class-name="small-padding fixed-width" width="160">
<template #default="scope">
<el-button link type="primary" @click="openDialog('review',scope.row)" >查看</el-button>
- <el-button link type="primary" @click="openDialog('edit',scope.row)" >编辑</el-button>
- <el-button link type="danger" @click="handleDelete(scope.row)" >删除</el-button>
+ <el-button link type="primary" @click="openDialog('edit',scope.row)" v-hasPermi="['monthlyInspectionRecord:edit']">编辑</el-button>
+ <el-button link type="danger" @click="handleDelete(scope.row)" v-hasPermi="['monthlyInspectionRecord:del']">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -115,12 +125,15 @@
}else {
data.queryParams.companyId = userInfo.companyId
}
+ getNowYear()
getList();
if(data.isAdmin){
getCompanyList()
}
});
-
+const getNowYear = () =>{
+ data.queryParams.year = new Date().getFullYear().toString()
+}
const resData = ref([])
const getList = async () => {
loading.value = true;
@@ -143,6 +156,7 @@
safety: listItem.safety,
environment: listItem.environment,
consistency: listItem.consistency,
+ year:obj.year
});
}
}
@@ -212,6 +226,7 @@
pageSize: 10,
}
}
+ getNowYear()
getList();
}
--
Gitblit v1.9.2