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/qualityManage/continuousImprovement/index.vue | 34 +++++++++++++++-------------------
1 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/src/views/work/qualityManage/continuousImprovement/index.vue b/src/views/work/qualityManage/continuousImprovement/index.vue
index 06d8506..4494ed3 100644
--- a/src/views/work/qualityManage/continuousImprovement/index.vue
+++ b/src/views/work/qualityManage/continuousImprovement/index.vue
@@ -11,7 +11,7 @@
v-hasPermi="['continuousImprovement:list: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"
@@ -21,24 +21,12 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="年份:" style="margin-left: 20px">
- <el-select
+ <el-form-item label="年份:" style="margin-left: 20px">
+ <el-date-picker
v-model="data.queryParams.year"
- placeholder="请选择年份"
- style="width: 240px"
- filterable
- allow-create
- default-first-option
- :reserve-keyword="false"
- @change="handleChangeNum"
- >
- <el-option
- v-for="item in data.yearList"
- :key="item.value"
- :label="item.label"
- :value="item.label"
- />
- </el-select>
+ type="year"
+ value-format="YYYY"
+ />
</el-form-item>
<el-form-item>
<el-button type="primary" style="margin-left: 30px" @click="searchClick">查询</el-button>
@@ -56,7 +44,7 @@
<el-table v-loading="loading" :data="dataList" :border="true" @selection-change="handleSelectionChange" :span-method="mergeCells">
<el-table-column type="selection" width="55" prop="selection" />
<!-- <el-table-column type="index" 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="year" align="center" />
<el-table-column label="改进项" prop="items" align="center" />
<el-table-column label="具体措施" prop="measure" align="center" />
@@ -110,6 +98,7 @@
pageNum: 1,
pageSize: 10,
companyId: null,
+ year:''
},
companyList: [],
isAdmin: false,
@@ -151,11 +140,15 @@
}else {
data.queryParams.companyId = userInfo.companyId
}
+ getNowYear()
getList();
if(data.isAdmin){
getCompanyList()
}
});
+const getNowYear = () =>{
+ data.queryParams.year = new Date().getFullYear().toString()
+}
const getList = async () => {
loading.value = true;
const res = await getInside(data.queryParams);
@@ -226,6 +219,7 @@
companyId: '',
pageNum: 1,
pageSize: 10,
+ year:''
}
choosedData.value = []
data.companyList = [];
@@ -235,8 +229,10 @@
companyId: data.queryParams.companyId,
pageNum: 1,
pageSize: 10,
+ year:''
}
}
+ getNowYear()
getList();
}
--
Gitblit v1.9.2