From dd2bdb18a8394d2f2a13534a98bcadb8020e3668 Mon Sep 17 00:00:00 2001
From: 祖安之光 <11848914+light-of-zuan@user.noreply.gitee.com>
Date: 星期三, 23 七月 2025 16:09:33 +0800
Subject: [PATCH] 修改新增
---
src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableDeptDialog.vue | 289 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 183 insertions(+), 106 deletions(-)
diff --git a/src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableDeptDialog.vue b/src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableDeptDialog.vue
index f95285a..3e55bd9 100644
--- a/src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableDeptDialog.vue
+++ b/src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableDeptDialog.vue
@@ -11,26 +11,36 @@
<el-form :model="state.form" size="default" ref="busRef" :rules="state.rules" >
<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 == '查看' || !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="请选择" 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.name"
- />
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="24">
+ <el-col :span="24">
+ <el-form-item label="部门:" prop="departId" >
+ <el-select
+ v-model="state.form.departId"
+ placeholder="请选择部门"
+ filterable
+ clearable
+ style="width: 100%"
+ :disabled="title == '查看' || title == '编辑'"
+ @change="selectValueDep"
+ >
+ <el-option
+ v-for="item in state.deptList"
+ :key="item.deptId"
+ :label="item.deptName"
+ :value="item.deptId">
+ </el-option>
</el-select>
</el-form-item>
</el-col>
@@ -39,7 +49,7 @@
<el-col :span="24">
<el-form-item label="质量目标:" prop="qualityId" >
<el-select
- :disabled="title === '查看'"
+ :disabled="title === '查看' || title == '编辑'"
v-model="state.form.qualityId"
placeholder="请选择质量目标"
style="width: 100%"
@@ -50,6 +60,7 @@
:key="item.id"
:label="item.message"
:value="item.id"
+ :title="item.message"
/>
</el-select>
</el-form-item>
@@ -69,38 +80,83 @@
<el-table-column type="index" label="序号" align="center"></el-table-column>
<el-table-column label="目标项目" prop="message" align="center" />
<el-table-column label="目标展开" align="center" >
+<!-- <template #default="{row,$index}">-->
+<!-- <el-form-item :prop="'qualityTargets.' + '[' + $index + ']' + '.method'" :rules="state.rules.method">-->
+<!-- <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" v-model="row.method" placeholder="请输入"></el-input>-->
+<!-- </el-form-item>-->
+<!-- </template>-->
<template #default="{row,$index}">
- <el-form-item :prop="'qualityTargets.' + '[' + $index + ']' + '.method'" :rules="state.rules.method">
- <el-input :disabled="title === '查看'" type="textarea" v-model="row.method" placeholder="请输入"></el-input>
- </el-form-item>
+ <div v-for="(i,index) in row.qualityTargetMesses" :key="index">
+ <el-form-item :prop="'qualityTargets.' + '[' + $index + '].' +'qualityTargetMesses.' + '[' + index + ']' + '.method'" :rules="state.rules.method">
+ <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" v-model="i.method" placeholder="请输入"></el-input>
+ </el-form-item>
+
+ </div>
</template>
</el-table-column>
<el-table-column label="实施对策" align="center" >
<template #default="{row,$index}">
- <el-form-item :prop="'qualityTargets.' + '[' + $index + ']' + '.calculate'" :rules="state.rules.calculate">
- <el-input :disabled="title === '查看'" type="textarea" v-model="row.calculate" placeholder="请输入"></el-input>
- </el-form-item>
+ <div v-for="(i,index) in row.qualityTargetMesses" :key="index">
+ <el-form-item :prop="'qualityTargets.' + '[' + $index + '].'+'qualityTargetMesses.' + '[' + index + ']' + '.calculate'" :rules="state.rules.calculate">
+ <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" v-model="i.calculate" placeholder="请输入"></el-input>
+ </el-form-item>
+
+ </div>
</template>
+<!-- <template #default="{row,$index}">-->
+<!-- <el-form-item :prop="'qualityTargets.' + '[' + $index + ']' + '.calculate'" :rules="state.rules.calculate">-->
+<!-- <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" v-model="row.calculate" placeholder="请输入"></el-input>-->
+<!-- </el-form-item>-->
+<!-- </template>-->
</el-table-column>
<el-table-column label="责任人" align="center" >
<template #default="{row,$index}">
- <el-form-item :prop="'qualityTargets.' + '[' + $index + ']' + '.dutyName'" :rules="state.rules.dutyName">
- <el-input :disabled="title === '查看'" type="textarea" v-model="row.dutyName" placeholder="请输入"></el-input>
- </el-form-item>
+ <div v-for="(i,index) in row.qualityTargetMesses" :key="index">
+ <el-form-item :prop="'qualityTargets.' + '[' + $index + '].'+'qualityTargetMesses.' + '[' + index + ']' + '.dutyName'" :rules="state.rules.dutyName">
+ <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" v-model="i.dutyName" placeholder="请输入"></el-input>
+ </el-form-item>
+ </div>
</template>
+<!-- <template #default="{row,$index}">-->
+<!-- <el-form-item :prop="'qualityTargets.' + '[' + $index + ']' + '.dutyName'" :rules="state.rules.dutyName">-->
+<!-- <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" v-model="row.dutyName" placeholder="请输入"></el-input>-->
+<!-- </el-form-item>-->
+<!-- </template>-->
</el-table-column>
<el-table-column label="考核时机" align="center" >
<template #default="{row,$index}">
- <el-form-item :prop="'qualityTargets.' + '[' + $index + ']' + '.frequency'" :rules="state.rules.frequency">
- <el-input :disabled="title === '查看'" type="textarea" v-model="row.frequency" placeholder="请输入"></el-input>
- </el-form-item>
+ <div v-for="(i,index) in row.qualityTargetMesses" :key="index">
+ <el-form-item :prop="'qualityTargets.' + '[' + $index + '].' +'qualityTargetMesses.' + '[' + index + ']'+ '.frequency'" :rules="state.rules.frequency">
+ <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" v-model="i.frequency" placeholder="请输入"></el-input>
+ </el-form-item>
+
+ </div>
</template>
+<!-- <template #default="{row,$index}">-->
+<!-- <el-form-item :prop="'qualityTargets.' + '[' + $index + ']' + '.frequency'" :rules="state.rules.frequency">-->
+<!-- <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" v-model="row.frequency" placeholder="请输入"></el-input>-->
+<!-- </el-form-item>-->
+<!-- </template>-->
</el-table-column>
<el-table-column label="备注" align="center" >
<template #default="{row,$index}">
- <el-form-item :prop="'qualityTargets.' + '[' + $index + ']' + '.remark'">
- <el-input :disabled="title === '查看'" type="textarea" v-model="row.remark" placeholder="请输入"></el-input>
- </el-form-item>
+ <div v-for="(i,index) in row.qualityTargetMesses" :key="index">
+ <el-form-item :prop="'qualityTargets.' + '[' + $index + '].'+'qualityTargetMesses.' + '[' + index + ']' + '.remark'">
+ <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" v-model="i.remark"></el-input>
+ </el-form-item>
+
+ </div>
+ </template>
+<!-- <template #default="{row,$index}">-->
+<!-- <el-form-item :prop="'qualityTargets.' + '[' + $index + ']' + '.remark'">-->
+<!-- <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" v-model="row.remark" placeholder="请输入"></el-input>-->
+<!-- </el-form-item>-->
+<!-- </template>-->
+ </el-table-column>
+ <el-table-column label="操作" align="center" width="120" v-if="title !== '查看'" >
+ <template #default="scope">
+ <el-button link type="primary" @click="addObject(scope.row)" >添加</el-button>
+ <el-button link type="danger" @click="delObject(scope.row)" >删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -108,24 +164,13 @@
</el-row>
<el-row :gutter="24">
<el-col :span="12">
- <el-form-item label="编制:" prop="fictionName" >
- <el-select
- :disabled="title === '查看'"
- v-model="state.form.fictionName"
- filterable
- remote
- @change="selectValue"
- reserve-keyword
- placeholder="请输入人员名称"
- remote-show-suffix
- :remote-method="getPeopleList"
- style="width: 240px"
- >
+ <el-form-item label="编制:" prop="fictionId" >
+ <el-select clearable v-model="state.form.fictionId" :disabled="title =='查看'" filterable style="width: 100%">
<el-option
v-for="item in state.peopleList"
:key="item.id"
:label="item.name"
- :value="item.name"
+ :value="item.id"
/>
</el-select>
</el-form-item>
@@ -143,24 +188,13 @@
</el-row>
<el-row :gutter="24" >
<el-col :span="12">
- <el-form-item label="审核:" prop="checkName" >
- <el-select
- :disabled="title === '查看'"
- v-model="state.form.checkName"
- filterable
- remote
- @change="selectValue1"
- reserve-keyword
- placeholder="请输入人员名称"
- remote-show-suffix
- :remote-method="getPeopleList"
- style="width: 240px"
- >
+ <el-form-item label="审核:" prop="checkId" >
+ <el-select clearable v-model="state.form.checkId" :disabled="title =='查看'" filterable style="width: 100%">
<el-option
v-for="item in state.peopleList"
:key="item.id"
:label="item.name"
- :value="item.name"
+ :value="item.id"
/>
</el-select>
</el-form-item>
@@ -178,24 +212,13 @@
</el-row>
<el-row :gutter="24">
<el-col :span="12">
- <el-form-item label="批准(公司分管领导):" prop="ratifyName" >
- <el-select
- :disabled="title === '查看'"
- v-model="state.form.ratifyName"
- filterable
- remote
- @change="selectValue2"
- reserve-keyword
- placeholder="请输入人员名称"
- remote-show-suffix
- :remote-method="getPeopleList"
- style="width: 240px"
- >
+ <el-form-item label="批准(公司分管领导):" prop="ratifyId" >
+ <el-select clearable v-model="state.form.ratifyId" :disabled="title =='查看'" filterable style="width: 100%">
<el-option
v-for="item in state.peopleList"
:key="item.id"
:label="item.name"
- :value="item.name"
+ :value="item.id"
/>
</el-select>
</el-form-item>
@@ -227,7 +250,7 @@
import {getCompany} from "@/api/onlineEducation/company";
import {ElMessage} from "element-plus";
import {getUser} from "@/api/onlineEducation/user";
-import {getObject, getObjectPage} from "@/api/qualityObjectives/object";
+import {getDept, getObject, getObjectPage} from "@/api/qualityObjectives/object";
import {addTable, editTable, getTargetById} from "@/api/qualityObjectives/table";
const dialogVisible = ref(false);
@@ -239,6 +262,7 @@
const state = reactive({
form: {
id: '',
+ departId: null,
qualityId: '',
number: '',
serial: '',
@@ -254,13 +278,14 @@
qualityTargets:[],
},
rules: {
- companyName: [{ required: true, message: '请选择企业', trigger: 'blur' }],
+ departId: [{ required: true, message: '请选择部门', trigger: 'blur' }],
+ companyId: [{ required: true, message: '请选择企业', trigger: 'blur' }],
qualityId: [{ required: true, message: '请选择质量目标', trigger: 'blur' }],
number: [{ required: true, message: '请输入编号', trigger: 'blur' }],
serial: [{ required: true, message: '请输入序号', trigger: 'blur' }],
- fictionName: [{ required: true, message: '请选择拟制', trigger: 'blur' }],
- ratifyName: [{ required: true, message: '请选择批准人', trigger: 'blur' }],
- checkName: [{ required: true, message: '请选择审核人', trigger: 'blur' }],
+ fictionId: [{ required: true, message: '请选择拟制', trigger: 'blur' }],
+ ratifyId: [{ required: true, message: '请选择批准人', trigger: 'blur' }],
+ checkId: [{ required: true, message: '请选择审核人', trigger: 'blur' }],
checkTime: [{ required: true, message: '请选择日期', trigger: 'blur' }],
ratifyTime: [{ required: true, message: '请选择日期', trigger: 'blur' }],
fictionTime: [{ required: true, message: '请选择日期', trigger: 'blur' }],
@@ -282,7 +307,7 @@
});
-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
@@ -290,20 +315,24 @@
if(state.isAdmin){
state.form.companyId = value.companyId
state.form.companyName = value.companyName
+ state.companyList = companyList
}
- await getQualityList()
+ await getDeptList()
+ // await getQualityList()
title.value = type === 'add' ? '新增' : type ==='edit' ? '编辑' : '查看' ;
if(type === 'edit' || type === 'review') {
state.form = JSON.parse(JSON.stringify(value));
}
+
+ await getPeopleList()
dialogVisible.value = true;
}
const getQualityList = async () => {
if(state.form.companyId){
- const res = await getObject({companyId:state.form.companyId,type: 2 });
+ const res = await getObject({departId:state.form.departId ,companyId:state.form.companyId,type: 2 });
if(res.code === 200){
state.qualityList = res.data.data.map(item => {
return {
@@ -322,8 +351,23 @@
}
+const getDeptList = async () => {
+ if(state.isAdmin && (state.form.companyId == 0 || state.form.companyId == null)){
+ return
+ }
+ const param = {
+ pageNum: 1,
+ pageSize: 999,
+ companyId: state.form.companyId
+ }
+ const res = await getDept(param)
+ if(res.code === 200){
+ state.deptList = res.data
+ }
+}
const onSubmit = async () => {
const valid = await busRef.value.validate();
+ console.log('sta',state.form)
if(valid){
if(title.value === '新增'){
console.log('sta',state.form)
@@ -370,6 +414,7 @@
const reset = () => {
state.form = {
id: '',
+ departId: null,
qualityId: '',
number: '',
serial: '',
@@ -387,20 +432,22 @@
state.peopleList = []
state.companyList = []
}
-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.peopleList = res.data.list?res.data.list:[]
+ }else{
+ ElMessage.warning(res.message)
+ }
+};
const selectValue = (val) => {
state.peopleList.forEach(item => {
if(item.name === val){
@@ -429,7 +476,8 @@
state.form.qualityTargets = res.data.map(item => {
return {
id: item.id,
- message: item.message
+ message: item.message,
+ qualityTargetMesses: [{qualityTargetId: item.id}]
}
})
@@ -440,29 +488,58 @@
}
const selectValueCom = (val) => {
+ state.form.departId = null
state.form.qualityId = null
state.qualityList = []
state.form.qualityTargets = []
+ state.form.fictionId = null
+ state.form.fictionName = ''
+ state.form.checkId = null
+ state.form.checkName = ''
+ state.form.ratifyId = null
+ state.form.ratifyName = ''
state.companyList.forEach(item => {
if(item.name === val){
state.form.companyId = item.id
}
})
+ getDeptList()
getQualityList()
+ getPeopleList()
}
-const getCompanyList = async (val)=>{
- if(val != ""){
- const queryParams = {
- name: val
+const selectValueDep = async (val) => {
+ state.form.departId = val
+ state.form.qualityId = null
+ state.qualityList = []
+ state.form.qualityTargets = []
+ // state.form.fictionId = null
+ // state.form.fictionName = ''
+ // state.form.checkId = null
+ // state.form.checkName = ''
+ // state.form.ratifyId = null
+ // state.form.ratifyName = ''
+ await getQualityList()
+}
+const addObject = (val) => {
+ console.log('val',state.form.qualityTargets)
+ state.form.qualityTargets.forEach(item => {
+ if(item.id == val.id){
+ item.qualityTargetMesses.push({qualityTargetId: item.id})
}
- const res = await getCompany(queryParams)
- if (res.code == 200) {
- state.companyList = res.data.list
+ })
- } else {
- ElMessage.warning(res.message)
+}
+const delObject = (val) => {
+ state.form.qualityTargets.forEach(item => {
+ if(item.id == val.id){
+ if(item.qualityTargetMesses.length == 1){
+ ElMessage.warning('至少保留一组数据')
+ return
+ }
+ item.qualityTargetMesses.pop()
+
}
- }
+ })
}
defineExpose({
openDialog
--
Gitblit v1.9.2