From dcddf912c4262bb129ed8d131bedb8fdace1c51d Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期五, 04 七月 2025 11:13:55 +0800
Subject: [PATCH] 修改
---
src/views/build/conpanyFunctionConsult/qualityObjectives/objective/components/objectiveDialog.vue | 180 +++++++++++++++++++++++++----------------------------------
1 files changed, 77 insertions(+), 103 deletions(-)
diff --git a/src/views/build/conpanyFunctionConsult/qualityObjectives/objective/components/objectiveDialog.vue b/src/views/build/conpanyFunctionConsult/qualityObjectives/objective/components/objectiveDialog.vue
index 7b51a39..b243918 100644
--- a/src/views/build/conpanyFunctionConsult/qualityObjectives/objective/components/objectiveDialog.vue
+++ b/src/views/build/conpanyFunctionConsult/qualityObjectives/objective/components/objectiveDialog.vue
@@ -11,25 +11,14 @@
<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="companyName" v-if="state.isAdmin">
- <el-select
- v-model="state.form.companyName"
- filterable
- remote
- :disabled="title == '查看' || title == '编辑' || !state.isAdmin"
- @change="selectValueCom"
- reserve-keyword
- placeholder="请输入企业名称"
- remote-show-suffix
- :remote-method="getCompanyList"
- style="width: 100%"
- >
+ <el-form-item label="企业名称:" prop="companyId" v-if="state.isAdmin">
+ <el-select v-model="state.form.companyId" placeholder="请选择" 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.name"
- />
+ :value="item.id">
+ </el-option>
</el-select>
</el-form-item>
</el-col>
@@ -143,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>
@@ -178,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>
@@ -213,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>
@@ -263,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("");
@@ -278,26 +235,26 @@
type: '',
departId: '',
method: '',
- compilationBy:'',
+ compilationId:'',
compilationTime:'',
- qualityBy: '',
+ qualityId: '',
qualityTime:'',
- leadBy:'',
+ leadId:'',
leadTime: '',
qualityTargets:[],
},
rules: {
- companyName: [{ required: true, message: '请选择企业', trigger: 'blur' }],
+ 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"}],
@@ -340,23 +297,28 @@
]
})
-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
+ if(state.isAdmin){
+ state.companyList = companyList
+ state.form.companyId = null
+ }
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()
- if(state.isAdmin){
- await getCompanyList()
- }
await getPeopleList()
dialogVisible.value = true;
}
@@ -450,35 +412,47 @@
const handleDelete = (val) => {
state.form.qualityTargets = state.form.qualityTargets.filter(item=> item != val)
}
-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)
+const getPeopleList = async ()=> {
+ const queryParams = {
+ companyId: state.form.companyId
}
- }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 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){
@@ -509,16 +483,16 @@
}
}
const selectValueCom = (val) => {
- state.form.leadBy = null
- state.form.qualityBy = null
- state.form.compilationBy = null
+ 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.name === val){
- state.form.companyId = item.id
+ if(item.id === val){
+ state.form.companyName = item.name
}
})
getDeptList()
@@ -542,7 +516,7 @@
}
}else {
const queryParams = {
- pageSize: 10,
+ pageSize: 999,
pageNum: 1,
}
const res = await getCompany(queryParams)
--
Gitblit v1.9.2