From 050ee6d982a8ae40011f1f723198d23fedae40b3 Mon Sep 17 00:00:00 2001
From: 祖安之光 <11848914+light-of-zuan@user.noreply.gitee.com>
Date: 星期二, 15 七月 2025 09:39:13 +0800
Subject: [PATCH] 修改新增
---
src/views/build/conpanyFunctionConsult/qualityObjectives/reportsituation/index.vue | 59 ++++++++++++++++++++++++++++-------------------------------
1 files changed, 28 insertions(+), 31 deletions(-)
diff --git a/src/views/build/conpanyFunctionConsult/qualityObjectives/reportsituation/index.vue b/src/views/build/conpanyFunctionConsult/qualityObjectives/reportsituation/index.vue
index 1d6162e..f7ec263 100644
--- a/src/views/build/conpanyFunctionConsult/qualityObjectives/reportsituation/index.vue
+++ b/src/views/build/conpanyFunctionConsult/qualityObjectives/reportsituation/index.vue
@@ -2,7 +2,7 @@
<div class="app-container">
<div style="margin-bottom: 10px">
<el-form style="display: flex;flex-wrap: wrap;">
- <el-form-item v-if="!data.isAdmin">
+ <el-form-item>
<el-button
type="primary"
plain
@@ -11,24 +11,13 @@
>新增</el-button>
</el-form-item>
<el-form-item label="企业名称:" v-if="data.isAdmin" style="margin-left: 20px">
- <el-select
- v-model="data.queryParams.companyName"
- filterable
- remote
- @change="selectValue"
- reserve-keyword
- placeholder="请输入企业名称"
- remote-show-suffix
- :remote-method="getCompanyList"
- :loading="loadingCompany"
- style="width: 240px"
- >
+ <el-select v-model="data.queryParams.companyId" placeholder="请选择" filterable clearable>
<el-option
v-for="item in data.companyList"
:key="item.id"
:label="item.name"
- :value="item.name"
- />
+ :value="item.id">
+ </el-option>
</el-select>
</el-form-item>
<el-form-item label="年份:" style="margin-left: 20px">
@@ -231,8 +220,15 @@
const userInfo = JSON.parse(Cookies.get('userInfo'))
console.log("userInfo",userInfo)
data.isAdmin = userInfo.userType === 0;
- data.queryParams.companyId = userInfo.companyId
+ if(data.isAdmin){
+ data.queryParams.companyId = null
+ }else {
+ data.queryParams.companyId = userInfo.companyId
+ }
getList();
+ if(data.isAdmin){
+ getCompanyList()
+ }
});
const getList = async () => {
loading.value = true;
@@ -263,7 +259,7 @@
data.dialogVisible = true
}
const openDialog = (type,isCom, value) => {
- noticeRef.value.openDialog(type, isCom,value);
+ noticeRef.value.openDialog(type, isCom,value,data.companyList);
}
const openDeptDialog = (type, value) => {
deptRef.value.openDialog(type, value);
@@ -277,22 +273,21 @@
})
}
-const getCompanyList = async (val)=>{
- if(val != ""){
- loadingCompany.value = true;
- const queryParams = {
- name: val
- }
- const res = await getCompany(queryParams)
- if (res.code == 200) {
- loadingCompany.value = false;
- data.companyList = res.data.list
- } else {
- ElMessage.warning(res.message)
- }
+const getCompanyList = async ()=>{
+ const queryParams = {
+ pageNum: 1,
+ pageSize: 999
+ }
+ const res = await getCompany(queryParams)
+ if (res.code == 200) {
+ data.companyList = res.data.list?res.data.list:[]
+ // data.queryParams.companyId = data.companyList[0].id
+ } else {
+ ElMessage.warning(res.message)
}
}
+
const handleSizeChange = (val) => {
data.queryParams.pageSize = val
@@ -318,6 +313,7 @@
}
choosedData.value = []
data.companyList = [];
+ getCompanyList()
}else {
data.queryParams = {
companyId: data.queryParams.companyId,
@@ -328,6 +324,7 @@
}
}
getList();
+
}
const exportData = () => {
if(choosedData.value && choosedData.value.length === 0){
@@ -406,7 +403,7 @@
if (!/^\d+$/.test(value)) { // 验证是否为数字
ElMessage.warning('只能输入数字')
data.queryParams.year = '' // 重置选择，避免非法值被添加到options中
- } else if (!data.yearList.some(option => option.value === value)) { // 确保不是已存在的选项
+ } else if (!data.yearList.some(option => option.label === value)) { // 确保不是已存在的选项
data.yearList.push({ value, label: value }); // 添加新选项（这里简单地将值和标签设为相同）
}
}
--
Gitblit v1.9.2