From df37a11663cd8c546fca1f471ecccb2258c707a0 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期二, 24 六月 2025 13:27:54 +0800
Subject: [PATCH] 修改
---
src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableDeptDialog.vue | 6 ++
src/views/build/conpanyFunctionConsult/qualityObjectives/table/index.vue | 9 +++-
src/views/build/conpanyFunctionConsult/companyInfo/policy/index.vue | 6 ++
src/views/build/conpanyFunctionConsult/qualityObjectives/objective/index.vue | 8 +++-
src/views/build/conpanyFunctionConsult/companyInfo/overview/index.vue | 6 ++
src/views/build/conpanyFunctionConsult/companyInfo/qualifications/index.vue | 6 ++
src/views/build/conpanyFunctionConsult/companyInfo/basicInfo/index.vue | 6 ++
src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableCompanyDialog.vue | 6 ++
src/views/build/conpanyFunctionConsult/qualityObjectives/reportsituation/index.vue | 8 +++-
9 files changed, 49 insertions(+), 12 deletions(-)
diff --git a/src/views/build/conpanyFunctionConsult/companyInfo/basicInfo/index.vue b/src/views/build/conpanyFunctionConsult/companyInfo/basicInfo/index.vue
index e7b9096..0907ea5 100644
--- a/src/views/build/conpanyFunctionConsult/companyInfo/basicInfo/index.vue
+++ b/src/views/build/conpanyFunctionConsult/companyInfo/basicInfo/index.vue
@@ -107,7 +107,11 @@
const userInfo = JSON.parse(Cookies.get('userInfo'))
console.log("userInfo",userInfo)
data.isAdmin = userInfo.userType === 0;
- data.queryParams.companyId = userInfo.companyId ? userInfo.companyId : null
+ if(data.isAdmin){
+ data.queryParams.companyId = null
+ }else {
+ data.queryParams.companyId = userInfo.companyId
+ }
getList();
});
const getList = async () => {
diff --git a/src/views/build/conpanyFunctionConsult/companyInfo/overview/index.vue b/src/views/build/conpanyFunctionConsult/companyInfo/overview/index.vue
index 2ac8fc0..547cf7b 100644
--- a/src/views/build/conpanyFunctionConsult/companyInfo/overview/index.vue
+++ b/src/views/build/conpanyFunctionConsult/companyInfo/overview/index.vue
@@ -96,7 +96,11 @@
const userInfo = JSON.parse(Cookies.get('userInfo'))
console.log("userInfo",userInfo)
data.isAdmin = userInfo.userType === 0;
- data.queryParams.companyId = userInfo.companyId ? userInfo.companyId : null
+ if(data.isAdmin){
+ data.queryParams.companyId = null
+ }else {
+ data.queryParams.companyId = userInfo.companyId
+ }
getList();
});
const getList = async () => {
diff --git a/src/views/build/conpanyFunctionConsult/companyInfo/policy/index.vue b/src/views/build/conpanyFunctionConsult/companyInfo/policy/index.vue
index 5f06dd7..f515e69 100644
--- a/src/views/build/conpanyFunctionConsult/companyInfo/policy/index.vue
+++ b/src/views/build/conpanyFunctionConsult/companyInfo/policy/index.vue
@@ -97,7 +97,11 @@
const userInfo = JSON.parse(Cookies.get('userInfo'))
console.log("userInfo",userInfo)
data.isAdmin = userInfo.userType === 0;
- data.queryParams.companyId = userInfo.companyId ? userInfo.companyId : null
+ if(data.isAdmin){
+ data.queryParams.companyId = null
+ }else {
+ data.queryParams.companyId = userInfo.companyId
+ }
getList();
});
const getList = async () => {
diff --git a/src/views/build/conpanyFunctionConsult/companyInfo/qualifications/index.vue b/src/views/build/conpanyFunctionConsult/companyInfo/qualifications/index.vue
index a12e16c..3483d9f 100644
--- a/src/views/build/conpanyFunctionConsult/companyInfo/qualifications/index.vue
+++ b/src/views/build/conpanyFunctionConsult/companyInfo/qualifications/index.vue
@@ -115,7 +115,11 @@
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();
});
const getList = async () => {
diff --git a/src/views/build/conpanyFunctionConsult/qualityObjectives/objective/index.vue b/src/views/build/conpanyFunctionConsult/qualityObjectives/objective/index.vue
index f663890..10b7cf7 100644
--- a/src/views/build/conpanyFunctionConsult/qualityObjectives/objective/index.vue
+++ b/src/views/build/conpanyFunctionConsult/qualityObjectives/objective/index.vue
@@ -192,7 +192,11 @@
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();
});
const getList = async () => {
@@ -339,7 +343,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 }); // 添加新选项（这里简单地将值和标签设为相同）
}
}
diff --git a/src/views/build/conpanyFunctionConsult/qualityObjectives/reportsituation/index.vue b/src/views/build/conpanyFunctionConsult/qualityObjectives/reportsituation/index.vue
index 1d6162e..76a51dd 100644
--- a/src/views/build/conpanyFunctionConsult/qualityObjectives/reportsituation/index.vue
+++ b/src/views/build/conpanyFunctionConsult/qualityObjectives/reportsituation/index.vue
@@ -231,7 +231,11 @@
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();
});
const getList = async () => {
@@ -406,7 +410,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 }); // 添加新选项（这里简单地将值和标签设为相同）
}
}
diff --git a/src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableCompanyDialog.vue b/src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableCompanyDialog.vue
index 761114b..bb6f51d 100644
--- a/src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableCompanyDialog.vue
+++ b/src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableCompanyDialog.vue
@@ -396,7 +396,11 @@
const chooseQuality = async (val) => {
const res = await getTargetById({qualityId: val})
if(res.code == 200){
- state.form.qualityTargets = res.data
+ state.form.qualityTargets = res.data.map(item => {
+ return {
+ message: item.message
+ }
+ })
}else {
ElMessage.warning(res.message)
diff --git a/src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableDeptDialog.vue b/src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableDeptDialog.vue
index 971aab0..429ff83 100644
--- a/src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableDeptDialog.vue
+++ b/src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableDeptDialog.vue
@@ -384,7 +384,11 @@
const chooseQuality = async (val) => {
const res = await getTargetById({qualityId: val})
if(res.code == 200){
- state.form.qualityTargets = res.data
+ state.form.qualityTargets = res.data.map(item => {
+ return {
+ message: item.message
+ }
+ })
}else {
ElMessage.warning(res.message)
diff --git a/src/views/build/conpanyFunctionConsult/qualityObjectives/table/index.vue b/src/views/build/conpanyFunctionConsult/qualityObjectives/table/index.vue
index 5ea28e2..78621e6 100644
--- a/src/views/build/conpanyFunctionConsult/qualityObjectives/table/index.vue
+++ b/src/views/build/conpanyFunctionConsult/qualityObjectives/table/index.vue
@@ -209,7 +209,12 @@
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();
});
const getList = async () => {
@@ -366,7 +371,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