From 9e4ea4987852902539e91ec438150c1deaa89742 Mon Sep 17 00:00:00 2001 From: zhouwx <1175765986@qq.com> Date: 星期五, 25 七月 2025 17:15:04 +0800 Subject: [PATCH] 修改 --- src/views/work/onlineEducation/offlineEducation/components/recordDialog.vue | 250 +++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 196 insertions(+), 54 deletions(-) diff --git a/src/views/work/onlineEducation/offlineEducation/components/recordDialog.vue b/src/views/work/onlineEducation/offlineEducation/components/recordDialog.vue index b887e2a..84a4743 100644 --- a/src/views/work/onlineEducation/offlineEducation/components/recordDialog.vue +++ b/src/views/work/onlineEducation/offlineEducation/components/recordDialog.vue @@ -9,45 +9,35 @@ :close-on-click-modal="false" > <el-form :model="state.form" size="default" ref="superRef" :rules="state.formRules" label-width="180px" > - <el-form-item label="企业名称:" prop="companyName" > - <el-select - v-if="state.isAdmin" - v-model="state.form.companyName" - style="width: 100%" - v-loadMoreNew:[reselect]="handleScroll" - :popper-class="reselect.name" - @change="selectCompany" - class="item-width" - > + <el-form-item label="企业名称:" v-if="state.isAdmin" prop="companyId"> + <el-select v-model="state.form.companyId" filterable placeholder="请选择" :disabled="state.title == '查看' || state.title == '编辑' || !state.isAdmin" clearable @change="selectValueCom" style="width:100%"> <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-input v-else v-model.trim="state.form.companyName" disabled ></el-input> </el-form-item> <el-form-item label="计划名称:" prop="planName" > <el-input v-model.trim="state.form.planName" placeholder="请输入计划名称"></el-input> </el-form-item> - <el-form-item label="学员:" prop="studentName" > + <el-form-item label="学员:" prop="studentId" > <el-select - v-model="state.form.studentName" + clearable + multiple + collapse-tags + collapse-tags-tooltip + v-model="state.students" + :disabled="state.title =='查看'" + filterable style="width: 100%" - v-loadMoreNew:[reselectStu]="handleScrollStu" - :popper-class="reselectStu.name" - class="m-2" - @change="selectValue" - placeholder="请选择学生" - popper-class="more_select_dropdown" > <el-option - v-for="item in state.studentList" + v-for="item in state.peopleList" :key="item.id" :label="item.name" - :value="item.name" + :value="item.id" /> </el-select> </el-form-item> @@ -55,22 +45,56 @@ <el-input v-model.trim="state.form.courseName" :disabled="disabled" placeholder="请输入课程名称" ></el-input> </el-form-item> <el-form-item label="培训等级:" prop="level" > - <el-input v-model.trim="state.form.level" :disabled="disabled" placeholder="请输入培训等级" ></el-input> + <el-select + v-model="state.form.level" + style="width: 100%" + > + <el-option + v-for="item in state.levelList" + :key="item.id" + :label="item.name" + :value="item.id" + /> + </el-select> +<!-- <el-input v-model.trim="state.form.level" :disabled="disabled" placeholder="请输入培训等级" ></el-input>--> </el-form-item> - <el-form-item label="要求课时(分):" prop="period" > - <el-input v-model.trim="state.form.period" :disabled="disabled" placeholder="请输入要求课时(分)" ></el-input> - </el-form-item> - <el-form-item label="实际课时(分):" prop="actualPeriod" > - <el-input v-model.trim="state.form.actualPeriod" :disabled="disabled" placeholder="请输入实际课时(分)" ></el-input> - </el-form-item> - <el-form-item label="考试成绩:" prop="score" > - <el-input v-model.trim="state.form.score" :disabled="disabled" placeholder="请输入考试成绩" ></el-input> - </el-form-item> - <el-form-item label="是否合格:" prop="passed" > - <el-radio-group v-model="state.form.passed" :disabled="disabled"> - <el-radio :label="0">不合格</el-radio> - <el-radio :label="1">合格</el-radio> - </el-radio-group> +<!-- <el-form-item label="要求课时(分):" prop="period" >--> +<!-- <el-input v-model.trim="state.form.period"--> +<!-- @input="state.form.period = state.form.period--> +<!-- .replace(/[^0-9.]/g, '')--> +<!-- .replace(/(\..*)\./g, '$1')--> +<!-- .replace(/^(-?\d+\.?\d*).*/, '$1')"--> +<!-- :disabled="disabled" placeholder="请输入要求课时(分)" ></el-input>--> +<!-- </el-form-item>--> +<!-- <el-form-item label="实际课时(分):" prop="actualPeriod" >--> +<!-- <el-input v-model.trim="state.form.actualPeriod"--> +<!-- @input="state.form.actualPeriod = state.form.actualPeriod--> +<!-- .replace(/[^0-9.]/g, '')--> +<!-- .replace(/(\..*)\./g, '$1')--> +<!-- .replace(/^(-?\d+\.?\d*).*/, '$1')"--> +<!-- :disabled="disabled" placeholder="请输入实际课时(分)" ></el-input>--> +<!-- </el-form-item>--> +<!-- <el-form-item label="考试成绩:" prop="score" >--> +<!-- <el-input v-model.trim="state.form.score"--> +<!-- @input="state.form.score = state.form.score--> +<!-- .replace(/[^0-9.]/g, '')--> +<!-- .replace(/(\..*)\./g, '$1')--> +<!-- .replace(/^(-?\d+\.?\d*).*/, '$1')"--> +<!-- :disabled="disabled" placeholder="请输入考试成绩" ></el-input>--> +<!-- </el-form-item>--> +<!-- <el-form-item label="是否合格:" prop="passed" >--> +<!-- <el-radio-group v-model="state.form.passed" :disabled="disabled">--> +<!-- <el-radio :label="0">不合格</el-radio>--> +<!-- <el-radio :label="1">合格</el-radio>--> +<!-- </el-radio-group>--> +<!-- </el-form-item>--> + <el-form-item label="培训记录:" prop="passed" > + <el-upload accept=".jpg,.jpeg,.png,.doc,.docx,.pdf,.xls,xlsx,ppt,pptx" style="width: 100%" :action="state.uploadUrl" :headers="state.header" method="post" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile)" :on-exceed="showTip" v-model:file-list="state.fileList" :before-upload="picSize" :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles)" > + <el-button type="primary">点击上传</el-button> +<!-- <template #tip>--> +<!-- <div class="el-upload__tip">尺寸小于5M,最多可上传1份</div>--> +<!-- </template>--> + </el-upload> </el-form-item> </el-form> <template #footer v-if="state.title !='查看'"> @@ -95,6 +119,9 @@ import {addStudent, checkStuIdNo, checkStuPhone, editStudent} from "@/api/onlineEducation/student"; import {addRecord, editRecord} from "@/api/onlineEducation/examRecord"; import {getCompany} from "@/api/onlineEducation/company"; +import {delPic} from "@/api/onlineEducation/banner"; +import {getToken} from "@/utils/auth"; +import {getUser} from "@/api/onlineEducation/user"; const emit = defineEmits(["getList"]); const dialogVisible = ref(false) @@ -121,17 +148,16 @@ passed: 0, studentName: '', courseName: '', - companyId: null + companyId: null, + files: [] }, formRules:{ - companyName: [{ required: true, message: '请输入企业名称', trigger: 'blur' }], + companyId: [{ required: true, message: '请输入企业名称', trigger: 'blur' }], planName: [{ required: true, message: '请输入计划名称', trigger: 'blur' }], - studentName: [{ required: true, message: '请选择学员', trigger: 'blur' }], + studentId: [{ required: true, message: '请选择学员', trigger: 'blur' }], level: [{ required: true, message: '请输入培训等级', trigger: 'blur' }], - period: [{ required: true, message: '请输入要求课时(分)', trigger: 'blur' }], - actualPeriod: [{ required: true, message: '实际课时(分)', trigger: 'blur' }], - score: [{ required: true, message: '请输入考试成绩', trigger: 'blur' }], + courseName: [{ required: true, message: '请输入课程名称', trigger: 'blur' }], }, isAdmin: false, studentList: [], @@ -144,6 +170,21 @@ companyPageNum: 1, // 当前页码 companyPageSize: 10, // 每页显示的数量 hasMoreItems: null, // 是否还有更多选项 + levelList: [ + { + id: 1, + name: '公司级' + }, + { + id: 2, + name: '部门级' + }, + ], + uploadUrl: import.meta.env.VITE_APP_BASE_API + '/system/common/uploadFile', + header: { + Authorization: getToken() + }, + students: [] }) onMounted(() => { @@ -152,37 +193,45 @@ const disabled = ref(false); const openDialog = async (type, value) => { - await loadMoreStuData(); - if(state.isAdmin){ - await loadMoreCompanyData(); - } + const userInfo = JSON.parse(Cookies.get('userInfo')) console.log("userInfo",userInfo) if(userInfo.userType === 0){ state.isAdmin = true; state.form.userType = 0; + state.form.companyId = null + await getCompanyList() }else { state.isAdmin = false; state.form.companyId = userInfo.companyId; state.form.companyName = userInfo.companyName; state.form.userType = 1; } - state.title = type === 'add' ? '新增' : type ==='edit' ? '编辑' : type ==='pwd' ? '修改密码' : '查看' ; if(type === 'edit' || type === 'view') { if( type === 'view'){ disabled.value = true; } - state.form = value + + state.form = JSON.parse(JSON.stringify(value)) + state.students = state.form.students.map(i => i.id) + state.fileList = value.files.map(i => { + return { + name: i.fileName, + path: i.filePath + } + }) // state.form.studentName = value.company.name; console.log("ba",state.form) } if(type == 'pwd'){ state.form.id = value.id } + await getPeopleList() dialogVisible.value = true } const onSubmit = async () => { + state.form.studentId = state.students.join(',') const valid = await superRef.value.validate(); if(valid){ if(state.title == '新增'){ @@ -197,8 +246,7 @@ ElMessage.warning(res.message) } }else if(state.title == '编辑'){ - const {id, name, phone, sex, companyId, empno, post, duty, idNo} = state.form - const data = {id, name, phone, sex, companyId, empno, post, duty, idNo} + const {...data} = state.form const res = await editRecord(data) if(res.code == 200){ ElMessage.success(res.message) @@ -243,8 +291,10 @@ state.companyPageSize = 10; state.companyList = []; state.stuPageNum = 1; + state.students = [] state.stuPageSize = 10; state.studentList = []; + state.fileList = [] superRef.value.clearValidate(); superRef.value.resetFields() dialogVisible.value = false; @@ -267,7 +317,35 @@ } - +const getCompanyList = async ()=>{ + const queryParams = { + pageNum: 1, + pageSize: 999 + } + const res = await getCompany(queryParams) + if (res.code == 200) { + state.companyList = res.data.list?res.data.list:[] + // data.queryParams.companyId = data.companyList[0].id + } else { + ElMessage.warning(res.message) + } +} +const getPeopleList = async ()=> { + if(state.isAdmin && !state.form.companyId && (state.form.companyId == 0 || state.form.companyId == null)){ + return + } + const queryParams = { + pageNum: 1, + pageSize: 9999, + companyId: state.form.companyId + } + const res = await getStudent(queryParams) + if(res.code == 200){ + state.peopleList = res.data.list?res.data.list:[] + }else{ + ElMessage.warning(res.message) + } +}; const handleScrollStu = () => { console.log(' student',state.hasMoreStu); if(state.stuPageNum >= state.hasMoreStu) return @@ -311,7 +389,71 @@ ElMessage.warning(res.message) } } +const handleAvatarSuccess = (response,uploadFile) => { + if(response.code == 200){ + state.form.files = state.fileList.map(item => { + return { + fileName: item.response ? item.response?.data.originName: item.name, + filePath: item.response ? item.response?.data.path: item.path + } + }) + }else{ + // state.fileList = [] + // state.form.files = [] + ElMessage({ + type: 'warning', + message: response.message + }) + } +} +const showTip =()=>{ + ElMessage({ + type: 'warning', + message: '超出文件上传数量' + }); +} +const picSize = async (rawFile) => { + if(rawFile.size / 1024 / 1024 > 5){ + ElMessage({ + type: 'warning', + message: '文件大小不能超过5M' + }); + return false + } +}; +const handleRemove = async (file, uploadFiles) => { + state.form.files = state.fileList.map(item => { + return { + fileName: item.response ? item.response?.data.originName: item.name, + filePath: item.response ? item.response?.data.path: item.path + } + }) + // let path = state.form.filePath; + // await delPic({path: path}).then(res => { + // if(res.code == 200){ + // // ElMessage({ + // // type: 'success', + // // message: '文件已删除' + // // }) + // state.form.fileName = '' + // state.form.filePath = '' + // }else{ + // ElMessage({ + // type: 'warning', + // message: res.message + // }) + // } + // }).catch(() => { + // state.form.fileName = '' + // state.form.filePath = '' + // }); +} +const selectValueCom = (val) => { + state.students = [] + state.form.studentId = null + getPeopleList() +} defineExpose({ -- Gitblit v1.9.2