From e6f2e152a23f5883215ab8dcb75718533c581ac7 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期二, 14 十月 2025 09:15:37 +0800
Subject: [PATCH] 修改
---
src/views/build/conpanyFunctionConsult/qualityObjectives/objective/components/objectiveDialog.vue | 234 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 163 insertions(+), 71 deletions(-)
diff --git a/src/views/build/conpanyFunctionConsult/qualityObjectives/objective/components/objectiveDialog.vue b/src/views/build/conpanyFunctionConsult/qualityObjectives/objective/components/objectiveDialog.vue
index 9b37946..177507c 100644
--- a/src/views/build/conpanyFunctionConsult/qualityObjectives/objective/components/objectiveDialog.vue
+++ b/src/views/build/conpanyFunctionConsult/qualityObjectives/objective/components/objectiveDialog.vue
@@ -3,12 +3,26 @@
<el-dialog
v-model="dialogVisible"
:title="title"
- width="50%"
+ width="900px"
:before-close="handleClose"
:close-on-press-escape="false"
:close-on-click-modal="false"
>
<el-form :model="state.form" size="default" ref="busRef" :rules="state.rules" label-width="120px" >
+ <el-row :gutter="24">
+ <el-col :span="24">
+ <el-form-item label="企业名称:" prop="companyId" v-if="state.isAdmin">
+ <el-select v-model="state.form.companyId" placeholder="请选择" filterable clearable style="width: 100%" :disabled="title == '查看' || title == '编辑' || !state.isAdmin" @change="selectValueCom">
+ <el-option
+ v-for="item in state.companyList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="年份:" prop="year" >
@@ -47,6 +61,7 @@
v-model="state.form.type"
placeholder="请选择质量目标级别"
style="width: 100%"
+ @change="changeLevel"
>
<el-option
v-for="item in state.levelList"
@@ -62,7 +77,7 @@
<el-input v-model="state.form.companyName" disabled></el-input>
</el-form-item>
<el-form-item label="部门名称:" prop="departId" v-else-if="state.form.type == 2">
-<!-- <el-cascader v-model="state.form.departId" :options="state.deptList" />-->
+<!-- <el-cascader v-model="state.form.departId" :disabled="title === '查看'" :options="state.deptList" />-->
<el-select
:disabled="title === '查看'"
v-model="state.form.departId"
@@ -117,24 +132,13 @@
</el-row>
<el-row :gutter="24" v-if="state.form.type == 2">
<el-col :span="12">
- <el-form-item label="编制:" prop="compilationName" >
- <el-select
- :disabled="title === '查看'"
- v-model="state.form.compilationName"
- filterable
- remote
- @change="selectValue"
- reserve-keyword
- placeholder="请输入人员名称"
- remote-show-suffix
- :remote-method="getPeopleList"
- style="width: 240px"
- >
+ <el-form-item label="编制:" prop="compilationId" >
+ <el-select clearable v-model="state.form.compilationId" :disabled="title =='查看'" filterable style="width: 100%">
<el-option
- v-for="item in state.peopleList"
+ v-for="item in state.userList"
:key="item.id"
:label="item.name"
- :value="item.name"
+ :value="item.id"
/>
</el-select>
</el-form-item>
@@ -152,24 +156,13 @@
</el-row>
<el-row :gutter="24" >
<el-col :span="12">
- <el-form-item label="质量管理部:" prop="qualityName" >
- <el-select
- :disabled="title === '查看'"
- v-model="state.form.qualityName"
- filterable
- remote
- @change="selectValue1"
- reserve-keyword
- placeholder="请输入人员名称"
- remote-show-suffix
- :remote-method="getPeopleList"
- style="width: 240px"
- >
+ <el-form-item label="质量管理部:" prop="qualityId" >
+ <el-select clearable v-model="state.form.qualityId" :disabled="title =='查看'" filterable style="width: 100%">
<el-option
- v-for="item in state.peopleList"
+ v-for="item in state.userList"
:key="item.id"
:label="item.name"
- :value="item.name"
+ :value="item.id"
/>
</el-select>
</el-form-item>
@@ -187,24 +180,13 @@
</el-row>
<el-row :gutter="24">
<el-col :span="12">
- <el-form-item label="公司分管领导:" prop="leadName" >
- <el-select
- :disabled="title === '查看'"
- v-model="state.form.leadName"
- filterable
- remote
- @change="selectValue2"
- reserve-keyword
- placeholder="请输入人员名称"
- remote-show-suffix
- :remote-method="getPeopleList"
- style="width: 240px"
- >
+ <el-form-item label="公司分管领导:" prop="leadId" >
+ <el-select clearable v-model="state.form.leadId" :disabled="title =='查看'" filterable style="width: 100%">
<el-option
- v-for="item in state.peopleList"
+ v-for="item in state.userList"
:key="item.id"
:label="item.name"
- :value="item.name"
+ :value="item.id"
/>
</el-select>
</el-form-item>
@@ -237,6 +219,7 @@
import {ElMessage} from "element-plus";
import {getUser} from "@/api/onlineEducation/user";
import {addObjective, editObject, getDept} from "@/api/qualityObjectives/object";
+import {listUser} from "@/api/system/user";
const dialogVisible = ref(false);
const title = ref("");
@@ -247,34 +230,37 @@
const state = reactive({
form: {
id: '',
- year: '',
+ year: '2025',
num: '',
type: '',
departId: '',
method: '',
- compilationBy:'',
+ compilationId:'',
compilationTime:'',
- qualityBy: '',
+ qualityId: '',
qualityTime:'',
- leadBy:'',
+ leadId:'',
leadTime: '',
qualityTargets:[],
},
rules: {
+ companyId: [{ required: true, message: '请选择企业', trigger: 'blur' }],
year: [{ required: true, message: '请输入年份', trigger: 'blur' }],
num: [{ required: true, message: '请输入序号', trigger: 'blur' }],
type: [{ required: true, message: '请选择级别', trigger: 'blur' }],
method: [{ required: true, message: '请输入目标测量方法', trigger: 'blur' }],
- compilationName: [{ required: true, message: '请选择编制人员', trigger: 'blur' }],
+ compilationId: [{ required: true, message: '请选择编制人员', trigger: 'blur' }],
compilationTime: [{ required: true, message: '请选择日期', trigger: 'blur' }],
- qualityName: [{ required: true, message: '请选择质量管理部人员', trigger: 'blur' }],
+ qualityId: [{ required: true, message: '请选择质量管理部人员', trigger: 'blur' }],
qualityTime: [{ required: true, message: '请选择日期', trigger: 'blur' }],
- leadName: [{ required: true, message: '请选择公司分管领导', trigger: 'blur' }],
+ leadId: [{ required: true, message: '请选择公司分管领导', trigger: 'blur' }],
leadTime: [{ required: true, message: '请选择日期', trigger: 'blur' }],
departId: [{ required: true, message: '请选择部门', trigger: 'blur' }],
objName: [{required: true, message: "质量目标不能为空", trigger: "blur"}],
},
+ isAdmin: false,
+ companyList: [],
deptList: [],
peopleList: [],
yearList: [
@@ -311,22 +297,42 @@
]
})
-const openDialog = async (type, value) => {
+const openDialog = async (type, value,companyList) => {
const userInfo = JSON.parse(Cookies.get('userInfo'))
+ state.isAdmin = userInfo.userType === 0;
state.form.companyName = userInfo.companyName
state.form.companyId = userInfo.companyId
- await getDeptList()
+ if(state.isAdmin){
+ state.companyList = companyList
+ state.form.companyId = null
+ }
+ state.form.year = new Date().getFullYear().toString()
title.value = type === 'add' ? '新增' : type ==='edit' ? '编辑' : '查看' ;
if(type === 'edit' || type === 'review') {
state.form = JSON.parse(JSON.stringify(value));
+ state.form.compilationBy = state.form.compilationId
+ state.form.leadBy = state.form.leadId
+ state.form.qualityBy = state.form.qualityId
+
+ if(state.isAdmin){
+ state.form.companyId = value.companyId
+ state.form.companyName = value.companyName
+ }
}
+ await getDeptList()
+ await getPeopleList()
dialogVisible.value = true;
}
const addObject = () => {
state.form.qualityTargets.push({})
}
const getDeptList = async () => {
- const res = await getDept()
+ const param = {
+ pageNum: 1,
+ pageSize: 999,
+ companyId: state.form.companyId
+ }
+ const res = await getDept(param)
if(res.code === 200){
state.deptList = res.data
}
@@ -337,6 +343,10 @@
if(title.value === '新增'){
console.log('sta',state.form)
const {id, ...data} = JSON.parse(JSON.stringify(state.form))
+ if(data.qualityTargets && data.qualityTargets.length == 0){
+ ElMessage.warning('请填写质量目标')
+ return
+ }
const res = await addObjective(data)
if(res.code === 200){
ElMessage({
@@ -352,6 +362,10 @@
dialogVisible.value = false;
}else if(title.value === '编辑'){
const {...data} = JSON.parse(JSON.stringify(state.form))
+ if(data.qualityTargets && data.qualityTargets.length == 0){
+ ElMessage.warning('请填写质量目标')
+ return
+ }
const res = await editObject(data)
if(res.code === 200){
ElMessage({
@@ -379,7 +393,7 @@
const reset = () => {
state.form = {
id: '',
- year: '',
+ year: '2025',
num: '',
type: '',
departId: '',
@@ -393,25 +407,58 @@
qualityTargets:[],
}
state.peopleList = []
+ state.companyList = []
}
const handleDelete = (val) => {
state.form.qualityTargets = state.form.qualityTargets.filter(item=> item != val)
}
-const getPeopleList = async (val)=>{
- if(val != ""){
- const queryParams = {
- name: val
- }
- const res = await getUser(queryParams)
- if (res.code == 200) {
- state.peopleList = res.data.list
- } else {
- ElMessage.warning(res.message)
- }
+const getPeopleList = async ()=> {
+ if(state.isAdmin && (state.form.companyId == 0 || state.form.companyId == null)){
+ return
}
-}
+ const queryParams = {
+ pageNum: 1,
+ pageSize: 9999,
+ companyId: state.form.companyId
+ }
+ const res = await getUser(queryParams)
+ if(res.code == 200){
+ state.userList = res.data.list?res.data.list:[]
+ }else{
+ ElMessage.warning(res.message)
+ }
+};
+// const getPeopleList = async (val)=>{
+// if(val){
+// const queryParams = {
+// name: val,
+// companyId: state.form.companyId == 0 ? null : state.form.companyId
+// }
+// const res = await getUser(queryParams)
+// if (res.code == 200) {
+// state.peopleList = res.data.list
+//
+// } else {
+// ElMessage.warning(res.message)
+// }
+// }else {
+// const queryParams = {
+// pageNum: 1,
+// pageSize: 10,
+// companyId: state.form.companyId == 0 ? null : state.form.companyId
+// }
+// const res = await getUser(queryParams)
+// if (res.code == 200) {
+// state.peopleList = res.data.list
+//
+// } else {
+// ElMessage.warning(res.message)
+// }
+//
+// }
+// }
const selectValue = (val) => {
state.peopleList.forEach(item => {
if(item.name === val){
@@ -437,10 +484,55 @@
if (!/^\d+$/.test(value)) { // 验证是否为数字
ElMessage.warning('只能输入数字')
state.form.year = '' // 重置选择，避免非法值被添加到options中
- } else if (!state.yearList.some(option => option.value === value)) { // 确保不是已存在的选项
+ } else if (!state.yearList.some(option => option.label === value)) { // 确保不是已存在的选项
state.yearList.push({ value, label: value }); // 添加新选项（这里简单地将值和标签设为相同）
}
}
+const selectValueCom = (val) => {
+ state.form.leadId = null
+ state.form.qualityId = null
+ state.form.compilationId = null
+ state.form.leadName = null
+ state.form.qualityName = null
+ state.form.compilationName = null
+ state.form.departId = null
+ state.companyList.forEach(item => {
+ if(item.id === val){
+ state.form.companyName = item.name
+ }
+ })
+ getDeptList()
+ getPeopleList()
+}
+const changeLevel = () => {
+ // state.form.companyName = ''
+ state.form.departId = null
+}
+const getCompanyList = async (val)=>{
+ if(val){
+ const queryParams = {
+ name: val
+ }
+ const res = await getCompany(queryParams)
+ if (res.code == 200) {
+ state.companyList = res.data.list
+
+ } else {
+ ElMessage.warning(res.message)
+ }
+ }else {
+ const queryParams = {
+ pageSize: 999,
+ pageNum: 1,
+ }
+ const res = await getCompany(queryParams)
+ if (res.code == 200) {
+ state.companyList = res.data.list
+ } else {
+ ElMessage.warning(res.message)
+ }
+ }
+}
defineExpose({
openDialog
--
Gitblit v1.9.2