yangws #249

Merged
zhuhao merged 2 commits from yangws into main 2024-09-22 16:47:14 +08:00
2 changed files with 64 additions and 35 deletions
Showing only changes of commit d5afede36c - Show all commits

View File

@ -302,7 +302,7 @@
addClasses({classIds:classids.value.join(','),userId:userStore.userId}).then(res => {
if (res.code === 200) {
dialogVisible.value = false
ElMessage({
ElMessage({x
message: res.msg,
type: 'success',
})

View File

@ -7,7 +7,7 @@
:before-close="handleClose"
>
<el-steps v-if="type==1" style="max-width: 100%;-webkit-app-region: no-drag;height:35px" :active="activeIndex" finish-status="success" simple>
<el-step title="1.基本信息" @click="activeIndex=1" />
<el-step title="1.基本信息" @click="activeIndex=1" style="cursor:pointer"/>
<el-step title="2.在校信息" />
</el-steps>
<el-form
@ -37,12 +37,14 @@
<el-form-item label="确认密码" prop="confirmPassword" v-if="activeIndex==1">
<el-input v-model="ruleForm.confirmPassword" type="password" placeholder="请确认密码" />
</el-form-item>
<el-form-item label="所属地区" prop="address" v-if="activeIndex==2">
<el-form-item label="所属地区" prop="address" v-if="activeIndex==2">
<el-cascader
style="width:100%"
popper-class="aix-regist-address"
v-model="ruleForm.address"
:options="regionData"
@change="handleChange"
:props="{checkStrictly: true}"
/>
</el-form-item>
<el-form-item label="学校" prop="school" v-if="activeIndex==2">
@ -72,6 +74,7 @@
</el-form-item>
<el-form-item v-if="activeIndex==2">
<div class="centerDiv">
<el-button type="default" @click="activeIndex=1">上一步</el-button>
<el-button type="primary" @click="submitForm(ruleFormRef)">立即注册</el-button>
</div>
</el-form-item>
@ -419,36 +422,43 @@ const sbmitImg=()=>{
const handleChange = (value) => {
console.log('选中的地址值:', value);
};
const handleSchoolChange= async ()=>{
const handleSchoolChange= ()=>{
ruleForm.discipline=[];
ruleForm.class=[];
//
accessToDisciplines()
getClassmain()
}
//
const accessToDisciplines = () => {
getDept({deptId:ruleForm.school[2]}).then(res =>{
if(res.data.studying && res.data.studying.length){
let studying = res.data.studying.split(',')
let ary = []
studying.forEach(item =>{
let obj = {
name: item,
children: []
if(res.data.studying && res.data.studying.length){
let studying = res.data.studying.split(',')
let ary = []
studying.forEach(item =>{
let obj = {
name: item,
children: []
}
allSubjectList.value.forEach(el =>{
if(item == el.edustage){
obj.children.push(el)
}
allSubjectList.value.forEach(el =>{
if(item == el.edustage){
obj.children.push(el)
}
})
ary.push(obj)
})
schoolSubject.value = ary
}
else{
schoolSubject.value = []
}
})
listClassmain( {entpid: ruleForm.school[2], pageSize: 500, status: 'open'}).then(res=>{
gradeTree.value = groupByCondition(res.rows, item => item.agekey);
console.log(gradeTree.value,'班级')
ary.push(obj)
})
schoolSubject.value = ary
}
else{
schoolSubject.value = []
}
})
}
//
const getClassmain = async ()=>{
const res = await listClassmain( {entpid: ruleForm.school[2], pageSize: 500, status: 'open'})
console.log(res,'res')
gradeTree.value = groupByCondition(res.rows, item => item.agekey);
}
//
const groupByCondition = (arr, condition)=>{
@ -484,7 +494,13 @@ const gradeName = (key) =>{
}
}
onMounted(()=>{
//
ruleForm.address = ['50']
//
ruleForm.school = [100,255,279]
//
accessToDisciplines()
getClassmain()
})
defineExpose({
OpenModel,
@ -498,4 +514,17 @@ defineExpose({
display: flex;
justify-content: center;
}
</style>
<style lang="scss">
.aix-regist-address{
.el-cascader-node{
position: relative!important;
.el-radio{
position: absolute!important;
width: 90%!important;
left:5px!important;
}
}
}
</style>