From 01ad8bbb87e6af83adfb3c75b85d6533abef32de Mon Sep 17 00:00:00 2001 From: zhouwx <1175765986@qq.com> Date: 星期二, 05 八月 2025 17:29:16 +0800 Subject: [PATCH] 修改 --- src/views/build/conpanyFunctionConsult/need/needIdentify/components/editDialog.vue | 170 +++++++++++++++++++++++++------------------------------- 1 files changed, 76 insertions(+), 94 deletions(-) diff --git a/src/views/build/conpanyFunctionConsult/need/needIdentify/components/editDialog.vue b/src/views/build/conpanyFunctionConsult/need/needIdentify/components/editDialog.vue index 10cf0c4..c993b89 100644 --- a/src/views/build/conpanyFunctionConsult/need/needIdentify/components/editDialog.vue +++ b/src/views/build/conpanyFunctionConsult/need/needIdentify/components/editDialog.vue @@ -29,6 +29,7 @@ <el-select v-model="state.form.year" placeholder="请选择年份" + :disabled="title === '查看'" style="width: 100%" filterable allow-create @@ -46,10 +47,10 @@ </el-form-item> </el-col> <el-col :span="12"> - <el-form-item label="部门名称:" prop="departId" > + <el-form-item label="部门名称:" prop="deptId" > <el-select :disabled="title === '查看'" - v-model="state.form.departId" + v-model="state.form.deptId" placeholder="请选择部门" style="width: 240px" > @@ -65,32 +66,39 @@ </el-row> <el-row :gutter="24"> <el-col :span="24"> - <el-form-item label="相关方期望或要求识别表:" prop="outEnvironment" > + <el-form-item label="相关方期望或要求识别表:" prop="expectContents" > <div style="display: flex;width: 100%;"> - <el-table :data="state.form.outEnvironment" :border="true" > + <el-table :data="state.form.expectContents" :border="true" > <el-table-column type="index" label="序号" align="center"></el-table-column> - <el-table-column label="相关方" prop="content" align="center" > + <el-table-column label="相关方" prop="stakeholder" align="center" > <template #default="{row,$index}"> - <el-form-item :prop="'outEnvironment.' + '[' + $index + ']' + '.content'" :rules="state.rules.out.content"> - <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" v-model="row.content" placeholder="请输入"></el-input> + <el-form-item :prop="'expectContents.' + '[' + $index + ']' + '.stakeholder'" :rules="state.rules.stakeholder"> + <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" v-model="row.stakeholder" placeholder="请输入"></el-input> </el-form-item> </template> </el-table-column> - <el-table-column label="期望或要求" prop="content" align="center" > - <template #default="{row,$index}"> - <el-form-item :prop="'outEnvironment.' + '[' + $index + ']' + '.content'" :rules="state.rules.out.content"> - <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" v-model="row.content" placeholder="请输入"></el-input> - </el-form-item> + <el-table-column label="期望或要求" prop="expectation" align="center" > + <template #default="{row,$index}"> + <div v-for="(i,index) in row.expectContentMesses" :key="index"> + <el-form-item :prop="'expectContents.' + '[' + $index + '].' +'expectContentMesses.' + '[' + index + ']' + '.expectation'" :rules="state.rules.expectation"> + <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" v-model="i.expectation" placeholder="请输入"></el-input> + </el-form-item> + </div> </template> </el-table-column> - <el-table-column label="应对措施" prop="remark" align="center" > - <template #default="{row,$index}"> - <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" v-model="row.remark" placeholder="请输入"></el-input> + <el-table-column label="应对措施" prop="solutions" align="center" > + <template #default="{row,$index}"> + <div v-for="(i,index) in row.expectContentMesses" :key="index"> + <el-form-item :prop="'expectContents.' + '[' + $index + '].' +'expectContentMesses.' + '[' + index + ']' + '.solutions'" :rules="state.rules.solutions"> + <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" v-model="i.solutions" placeholder="请输入"></el-input> + </el-form-item> + </div> </template> </el-table-column> <el-table-column label="操作" align="center" width="120" v-if="title !== '查看'" > <template #default="scope"> - <el-button link type="danger" @click="delTable(scope.row)" >删除</el-button> + <el-button link type="primary" @click="addObject(scope.row,scope.$index)" >添加</el-button> + <el-button link type="danger" @click="delObject(scope.row,scope.$index)" >删除</el-button> </template> </el-table-column> </el-table> @@ -106,15 +114,15 @@ </el-row> <el-row :gutter="24"> <el-col :span="24"> - <el-form-item label="监测频率:" prop="compilationId" > - <el-input style="width: 240px" :disabled="title === '查看'" v-model="state.form.compilationId" placeholder="请输入"></el-input> + <el-form-item label="监测频率:" prop="frequency" > + <el-input style="width: 240px" :disabled="title === '查看'" v-model="state.form.frequency" placeholder="请输入"></el-input> </el-form-item> </el-col> </el-row> <el-row :gutter="24"> <el-col :span="24"> - <el-form-item label="编制:" prop="compilationId" > - <el-select clearable v-model="state.form.compilationId" :disabled="title =='查看'" filterable style="width: 240px"> + <el-form-item label="编制:" prop="fictionId" > + <el-select clearable v-model="state.form.fictionId" :disabled="title =='查看'" filterable style="width: 240px"> <el-option v-for="item in state.peopleList" :key="item.id" @@ -153,10 +161,10 @@ </el-form-item> </el-col> <el-col :span="12"> - <el-form-item label="日期:" prop="dateTime" > + <el-form-item label="日期:" prop="fictionTime" > <el-date-picker :disabled="title === '查看'" - v-model="state.form.dateTime" + v-model="state.form.fictionTime" type="date" placeholder="请选择日期" /> @@ -181,6 +189,7 @@ import {getUser} from "@/api/onlineEducation/user"; import {getDept, getObject, getObjectPage} from "@/api/qualityObjectives/object"; import {addTable, editTable, getTargetById} from "@/api/qualityObjectives/table"; +import {addNeedDiscren, editNeedDiscren} from "@/api/need/need"; const dialogVisible = ref(false); const title = ref(""); @@ -193,31 +202,28 @@ form: { id: '', companyId: null, - departId: null, + deptId: null, year: '', - compilationId: null, + fictionId: null, checkId: null, ratifyId: null, - dateTime: null, - outEnvironment:[], - inEnvironment: [] + fictionTime: null, + frequency: '', + expectContents:[], }, rules: { companyId: [{ required: true, message: '请选择企业', trigger: 'blur' }], - departId: [{ required: true, message: '请选择部门', trigger: 'blur' }], + deptId: [{ required: true, message: '请选择部门', trigger: 'blur' }], year: [{ required: true, message: '请选择年份', trigger: 'blur' }], - compilationId: [{ required: true, message: '请选择编制人', trigger: 'blur' }], + fictionId: [{ required: true, message: '请选择编制人', trigger: 'blur' }], ratifyId: [{ required: true, message: '请选择批准人', trigger: 'blur' }], checkId: [{ required: true, message: '请选择审核人', trigger: 'blur' }], - dateTime: [{ required: true, message: '请选择日期', trigger: 'blur' }], - out: { - reason: [{required: true, message: "", trigger: "blur"}], - content: [{required: true, message: "", trigger: "blur"}], - }, - in: { - reason: [{required: true, message: "", trigger: "blur"}], - content: [{required: true, message: "", trigger: "blur"}], - }, + fictionTime: [{ required: true, message: '请选择日期', trigger: 'blur' }], + frequency: [{ required: true, message: '请输入监测频率', trigger: 'blur' }], + stakeholder: [{required: true, message: "", trigger: "blur"}], + expectation: [{required: true, message: "", trigger: "blur"}], + solutions: [{required: true, message: "", trigger: "blur"}], + expectContents:[{ required: true, message: '请填写相关方期望或要求识别表', trigger: 'blur' }], }, peopleList: [], isAdmin: false, @@ -243,42 +249,6 @@ { value: 5, label: '2021' - }, - ], - outReasonList:[ - { - id: 1, - name: '政治经济因素' - }, - { - id: 2, - name: '法律法规因素' - }, - { - id: 3, - name: '宏观政策因素' - }, - { - id: 4, - name: '文化氛围' - }, - ], - inReasonList:[ - { - id: 1, - name: '公司价值观' - }, - { - id: 2, - name: '企业文化' - }, - { - id: 3, - name: '过程能力' - }, - { - id: 4, - name: '制度流程因素' }, ], }) @@ -330,7 +300,7 @@ if(title.value === '新增'){ console.log('sta',state.form) const {id, ...data} = JSON.parse(JSON.stringify(state.form)) - const res = await addTable(data) + const res = await addNeedDiscren(data) if(res.code === 200){ ElMessage({ type: 'success', @@ -345,7 +315,7 @@ dialogVisible.value = false; }else if(title.value === '编辑'){ const {...data} = JSON.parse(JSON.stringify(state.form)) - const res = await editTable(data) + const res = await editNeedDiscren(data) if(res.code === 200){ ElMessage({ type: 'success', @@ -372,22 +342,19 @@ const reset = () => { state.form = { id: '', - qualityId: '', - - fictionId : '', - fictionName: '', - fictionTime:'', - checkId :'', - checkName: '', - checkTime:'', - ratifyId:'', - ratifyName: '', - ratifyTime: '', - outEnvironment:[], + companyId: null, + deptId: null, + year: '', + fictionId: null, + checkId: null, + ratifyId: null, + fictionTime: null, + frequency: '', + expectContents:[], } + state.deptList = [] state.peopleList = [] state.companyList = [] - state.qualityList = [] } const getPeopleList = async ()=> { if(state.isAdmin && (state.form.companyId == 0 || state.form.companyId == null)){ @@ -410,10 +377,10 @@ const selectValueCom = (val) => { - state.form.compilationId = null + state.form.fictionId = null state.form.checkId = null state.form.ratifyId = null - state.form.departId = null + state.form.deptId = null state.companyList.forEach(item => { if(item.name === val){ state.form.companyId = item.id @@ -432,10 +399,25 @@ } } const addTableData = () => { - state.form.outEnvironment.push({}) + state.form.expectContents.push({expectContentMesses: [{expectation:'',solutions: ''}],stakeholder: ''}) } -const delTable = (val) => { - state.form.outEnvironment = state.form.outEnvironment.filter(item=> item != val) +const addObject = (val,itemIndex) => { + state.form.expectContents.forEach((item,index) => { + if(index == itemIndex){ + item.expectContentMesses.push({expectContentMesses: [{expectation:'',solutions: ''}],stakeholder:val.stakeholder}) + } + }) +} +const delObject = (val,itemIndex) => { + state.form.expectContents.forEach((item,index) => { + if(index == itemIndex){ + if(item.expectContentMesses.length == 1){ + state.form.expectContents.splice(index,1) + }else { + item.expectContentMesses.pop() + } + } + }) } defineExpose({ -- Gitblit v1.9.2