This commit is contained in:
gjz 2025-04-23 16:31:47 +08:00
parent 6d4deca501
commit 1218214a4c
2 changed files with 342 additions and 222 deletions

View File

@ -4,12 +4,18 @@
<el-col :span="24">
<el-row class="page_p">
<!-- <el-col :span="6"><span class="page_p_txt">学期{{ termname }}</span></el-col> -->
<el-col :span="8">
<el-col :span="12">
<span class="page_p_txt">节次 {{ WeekDay }} ({{ Schedulename }})</span>
</el-col>
<el-col :span="5"><span class="page_p_txt">教室{{ ClassroomName }}</span></el-col>
<el-col :span="6"><span class="page_p_txt">课程{{ CourceName }}</span></el-col>
<el-col :span="5"> <span class="page_p_txt">教师{{ TeacherName }}</span></el-col>
<el-col :span="12"><span class="page_p_txt">教室{{ ClassroomName }}</span></el-col>
</el-row>
</el-col>
</el-row>
<el-row style="line-height: 62px; padding: 0 30px">
<el-col :span="24">
<el-row class="page_p">
<el-col :span="12"><span class="page_p_txt">课程{{ CourceName }}</span></el-col>
<el-col :span="12"> <span class="page_p_txt">教师{{ TeacherName }}</span></el-col>
</el-row>
<!-- <el-row class="page_p">
<el-col :span="6"><span class="page_p_txt">上课日期{{ shkDate }}</span></el-col>

View File

@ -352,6 +352,7 @@
</template>
<script>
import { ElMessage, ElMessageBox } from 'element-plus'
import axios from "axios";
import {
getToken,
@ -515,18 +516,12 @@ export default {
ClassroomCode: [
{ required: true, message: '教室不能为空', trigger: 'change' },
],
ClassCode: [
{ required: true, message: '班级不能为空', trigger: 'change' },
],
Date: [
{ required: true, message: '日期不能为空', trigger: 'change' },
],
Time: [
{ required: true, message: '时间不能为空', trigger: 'change' },
],
TeacherNumber: [
{ required: true, message: '教师不能为空', trigger: 'change' },
],
Weeks: [
{ required: true, message: '周次不能为空', trigger: 'change' },
],
@ -708,7 +703,7 @@ export default {
this.kshfile = false;
this.classId = '';
this.SelectClassList1('','s')
//this.SelectClassList1('','s')
},
modelteacher() {
// debugger;
@ -1265,11 +1260,13 @@ export default {
getedit({ gtid: id }).then((res) => {
let data = res;
var ClassCodeNew = (data.ClassCode == ''||data.ClassCode==undefined||data.ClassCode==null) ? [] : data.ClassCode.replace(/"([^"]*)"/, '$1').split(',')
var TeacherNumberNew = (data.TeacherNumber == ''||data.TeacherNumber==undefined||data.TeacherNumber==null) ? [] : data.TeacherNumber.replace(/"([^"]*)"/, '$1').split(',')
//
const countTime = this.convertToTimeRange(data.StartTime, data.EndTime);
console.log(data.ClassCode.replace(/"([^"]*)"/, '$1').split(','));
/* this.formItem = {
ClassCode: data.ClassCode.replace(/"([^"]*)"/, '$1').split(','),
} */
@ -1285,7 +1282,7 @@ export default {
SchoolAreaCode: data.SchoolAreaCode,
CollegeCode: data.CollegeCode,
MajorCode: data.MajorCode,
ClassCode: data.ClassCode.replace(/"([^"]*)"/, '$1').split(','),
ClassCode: ClassCodeNew,
BuildingCode: data.BuildingCode,
Date: data.Date,
falseDate: data.falseDate,
@ -1306,7 +1303,7 @@ export default {
CourceType: data.CourceType == "" ? "必修" : data.CourceType,
IsByDate:data.IsByDate==true?'1':'2',
TeacherNumber:data.TeacherNumber == undefined ? '' : data.TeacherNumber.replace(/"([^"]*)"/, '$1').split(',')
TeacherNumber:TeacherNumberNew
// SchoolArea: '', //
// Term: '', //
// College: '', //
@ -1413,7 +1410,6 @@ export default {
},
submitForm(formName) {
//
let vm = this;
// debugger
this.$refs[formName].validate((valid) => {
if (valid) {
@ -1426,198 +1422,60 @@ export default {
});
return false;
} */
this.classformItem.MajorCode = new Array(this.formItem.ClassCode.length).fill('e3649c').join(',')
console.log(this.formItem.Date);
console.log(this.formItem.Time);
const arrT = this.formItem.TeacherNumber
const objT = this.NewClassList
const commonElements = arrT.map(number =>
objT.find(obj => obj.Number === number)
).filter(Boolean);
const namesString = commonElements.map(obj => obj.Name).join(', ');
this.formItem.TeacherTitle = commonElements[0].Title
let datas = {
AcademicNumber: '', //
YearTerm: '2025-1', //
SchoolAreaCode: 1, // Code
CollegeCode: 101, // CodeCode
MajorCode: this.classformItem.MajorCode, //CodeCode
ClassCode: this.formItem.ClassCode == '' ? '' : this.formItem.ClassCode.join(','), //CodeCode
BuildingCode: '001', //Code
ClassroomCode: vm.formItem.ClassroomCode, //Code
Weeks: 1, // ,1,2,
WeekDay: 1, // 2020 3
ScheduleName: '01', //
CourceName: vm.formItem.CourceName, //
CourceCode: "", //
CourceType: '', //
Grade: "", //
IsValid: vm.formItem.IsValid, //
xnw:'1',
//TeacherNumber: this.IsOutSide == '1' ? vm.formItem.TeacherNumber : '', //
//TeacherName: vm.formItem.TeacherName, //
TeachingLogId: 0,
IsOutSide: this.IsOutSide == '1' ? false : true,
TeacherTitle: this.formItem.TeacherTitle,
Date: this.formItem.Date,
Time: `${this.formItem.Time[0]}-${this.formItem.Time[1]}`,
IsByDate: this.formItem.IsByDate == '1' ? true : false,
TimeInterval:0,
TeachingForm:0,
TeacherNumber:this.formItem.TeacherNumber == undefined ? '' : this.formItem.TeacherNumber.join(','),
TeacherName: namesString, //
};
postaddinfo(datas).then((res) => {
let data = res;
if (data == 1) {
this.$message({
message: '新增成功',
type: 'success'
});
this.drawerform = false;
this.getTabledatainfo(this.pageobj.pageNum);
} else if (data == 2) {
this.$message({
message: '教务编号已存在,教务编号是唯一的',
type: 'error'
});
} else if (data == 3) {
this.$message({
message: '教务编号不能为空',
type: 'error'
});
} else if (data == 4) {
this.$message({
message: '学年学期不能为空',
type: 'error'
});
} else if (data == 5) {
this.$message({
message: '学院不能为空',
type: 'error'
});
} else if (data == 6) {
this.$message({
message: '专业不能为空',
type: 'error'
});
} else if (data == 7) {
this.$message({
message: '教室不能为空',
type: 'error'
});
} else if (data == 8) {
this.$message({
message: '日期不能为空',
type: 'error'
});
} else if (data == 9) {
this.$message({
message: '节次名称不能为空',
type: 'error'
});
} else if (data == 10) {
this.$message({
message: '课程名称不能为空',
type: 'error'
});
} else if (data == 11) {
this.$message({
message: '课程名称不存在',
type: 'error'
});
} else if (data == 12) {
this.$message({
message: '教师工号不能为空',
type: 'error'
});
} else if (data == 13) {
this.$message({
message: '教师姓名不能为空',
type: 'error'
});
} else if (data == 14) {
this.$message({
message: '教师的工号和姓名不对应',
type: 'error'
});
} else if (data == 15) {
this.$message({
message: '学院有误',
type: 'error'
});
} else if (data == 16) {
this.$message({
message: '专业有误',
type: 'error'
});
} else if (data == 17) {
this.$message({
message: '教室有误',
type: 'error'
});
} else if (data == 18) {
this.$message({
message: '班级有误',
type: 'error'
});
} else if (data == 19) {
this.$message({
message: '日期有误',
type: 'error'
});
} else {
this.$message({
message: '新增失败',
type: 'error'
});
}
})
.catch((err) => {
// console.log(err);
});
if ((!this.formItem.TeacherNumber || this.formItem.TeacherNumber.length == 0) && (!this.formItem.ClassCode || this.formItem.ClassCode.length == 0)) {
ElMessageBox.confirm(
'未选择上课班级和授课教师. 确定提交?',
'提示',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}
).then(() => {
this.submitFormFinally()
}).catch(() => {
ElMessage({
type: 'info',
message: '已取消提交,请继续选择',
})
})
} else if (!this.formItem.TeacherNumber || this.formItem.TeacherNumber.length == 0) {
ElMessageBox.confirm(
'未选择授课教师. 确定提交?',
'提示',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}
).then(() => {
this.submitFormFinally()
}).catch(() => {
ElMessage({
type: 'info',
message: '已取消提交,请继续选择',
})
})
} else if (!this.formItem.ClassCode || this.formItem.ClassCode.length == 0) {
ElMessageBox.confirm(
'未选择上课班级. 确定提交?',
'提示',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}
).then(() => {
this.submitFormFinally()
}).catch(() => {
ElMessage({
type: 'info',
message: '已取消提交,请继续选择',
})
})
} else{
this.submitFormFinally()
}
} else {
// debugger
// console.log('');
@ -1625,7 +1483,204 @@ export default {
}
});
},
submitFormFinally() {
let vm = this;
this.classformItem.MajorCode = new Array(this.formItem.ClassCode.length).fill('e3649c').join(',')
console.log(this.formItem.Date);
console.log(this.formItem.Time);
const arrT = this.formItem.TeacherNumber
const objT = this.NewClassList
var commonElements
var namesString
if(arrT.length!=0){
commonElements = arrT.map(number =>
objT.find(obj => obj.Number === number)
).filter(Boolean);
namesString = commonElements.map(obj => obj.Name).join(', ');
this.formItem.TeacherTitle = commonElements[0].Title
}
let datas = {
AcademicNumber: '', //
YearTerm: '2025-1', //
SchoolAreaCode: 1, // Code
CollegeCode: 101, // CodeCode
MajorCode: this.classformItem.MajorCode, //CodeCode
ClassCode: this.formItem.ClassCode == '' ? '' : this.formItem.ClassCode.join(','), //CodeCode
BuildingCode: '001', //Code
ClassroomCode: vm.formItem.ClassroomCode, //Code
Weeks: 1, // ,1,2,
WeekDay: 1, // 2020 3
ScheduleName: '01', //
CourceName: vm.formItem.CourceName, //
CourceCode: "", //
CourceType: '', //
Grade: "", //
IsValid: vm.formItem.IsValid, //
xnw: '1',
//TeacherNumber: this.IsOutSide == '1' ? vm.formItem.TeacherNumber : '', //
//TeacherName: vm.formItem.TeacherName, //
TeachingLogId: 0,
IsOutSide: this.IsOutSide == '1' ? false : true,
TeacherTitle: this.formItem.TeacherTitle,
Date: this.formItem.Date,
Time: `${this.formItem.Time[0]}-${this.formItem.Time[1]}`,
IsByDate: this.formItem.IsByDate == '1' ? true : false,
TimeInterval: 0,
TeachingForm: 0,
TeacherNumber: (!this.formItem.TeacherNumber || this.formItem.TeacherNumber.length == 0) ? '' : this.formItem.TeacherNumber.join(','),
TeacherName: namesString, //
};
postaddinfo(datas).then((res) => {
let data = res;
if (data == 1) {
this.$message({
message: '新增成功',
type: 'success'
});
this.drawerform = false;
this.getTabledatainfo(this.pageobj.pageNum);
} else if (data == 2) {
this.$message({
message: '教务编号已存在,教务编号是唯一的',
type: 'error'
});
} else if (data == 3) {
this.$message({
message: '教务编号不能为空',
type: 'error'
});
} else if (data == 4) {
this.$message({
message: '学年学期不能为空',
type: 'error'
});
} else if (data == 5) {
this.$message({
message: '学院不能为空',
type: 'error'
});
} else if (data == 6) {
this.$message({
message: '专业不能为空',
type: 'error'
});
} else if (data == 7) {
this.$message({
message: '教室不能为空',
type: 'error'
});
} else if (data == 8) {
this.$message({
message: '日期不能为空',
type: 'error'
});
} else if (data == 9) {
this.$message({
message: '节次名称不能为空',
type: 'error'
});
} else if (data == 10) {
this.$message({
message: '课程名称不能为空',
type: 'error'
});
} else if (data == 11) {
this.$message({
message: '课程名称不存在',
type: 'error'
});
} else if (data == 12) {
this.$message({
message: '教师工号不能为空',
type: 'error'
});
} else if (data == 13) {
this.$message({
message: '教师姓名不能为空',
type: 'error'
});
} else if (data == 14) {
this.$message({
message: '教师的工号和姓名不对应',
type: 'error'
});
} else if (data == 15) {
this.$message({
message: '学院有误',
type: 'error'
});
} else if (data == 16) {
this.$message({
message: '专业有误',
type: 'error'
});
} else if (data == 17) {
this.$message({
message: '教室有误',
type: 'error'
});
} else if (data == 18) {
this.$message({
message: '班级有误',
type: 'error'
});
} else if (data == 19) {
this.$message({
message: '日期有误',
type: 'error'
});
} else {
this.$message({
message: '新增失败',
type: 'error'
});
}
})
.catch((err) => {
// console.log(err);
});
},
editsubmitForm(formName) {
//
let vm = this;
@ -1642,21 +1697,85 @@ export default {
return false;
}
this.classformItem.MajorCode = new Array(this.formItem.ClassCode.length).fill('e3649c').join(',')
if ((!this.formItem.TeacherNumber || this.formItem.TeacherNumber.length == 0) && (!this.formItem.ClassCode || this.formItem.ClassCode.length == 0)) {
ElMessageBox.confirm(
'未选择上课班级和授课教师. 确定提交?',
'提示',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}
).then(() => {
this.editsubmitFormFin()
}).catch(() => {
ElMessage({
type: 'info',
message: '已取消提交,请继续选择',
})
})
} else if (!this.formItem.TeacherNumber || this.formItem.TeacherNumber.length == 0) {
ElMessageBox.confirm(
'未选择授课教师. 确定提交?',
'提示',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}
).then(() => {
this.editsubmitFormFin()
}).catch(() => {
ElMessage({
type: 'info',
message: '已取消提交,请继续选择',
})
})
} else if (!this.formItem.ClassCode || this.formItem.ClassCode.length == 0) {
ElMessageBox.confirm(
'未选择上课班级. 确定提交?',
'提示',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}
).then(() => {
this.editsubmitFormFin()
}).catch(() => {
ElMessage({
type: 'info',
message: '已取消提交,请继续选择',
})
})
} else{
this.editsubmitFormFin()
}
} else {
// console.log('error submit!!');
return false;
}
});
},
editsubmitFormFin(){
let vm = this;
this.classformItem.MajorCode = new Array(this.formItem.ClassCode.length).fill('e3649c').join(',')
const arrT = this.formItem.TeacherNumber
const objT = this.NewClassList
const commonElements = arrT.map(number =>
objT.find(obj => obj.Number === number)
).filter(Boolean);
const namesString = commonElements.map(obj => obj.Name).join(', ');
this.formItem.TeacherTitle = commonElements[0].Title
var commonElements
var namesString
if(arrT.length!=0){
commonElements = arrT.map(number =>
objT.find(obj => obj.Number === number)
).filter(Boolean);
namesString = commonElements.map(obj => obj.Name).join(', ');
this.formItem.TeacherTitle = commonElements[0].Title
}
let datas = {
AcademicNumber: vm.formItem.AcademicNumber, //
YearTerm: vm.formItem.YearTerm, //
@ -1691,6 +1810,7 @@ export default {
TeacherNumber:this.formItem.TeacherNumber == undefined ? '' : this.formItem.TeacherNumber.join(','),
TeacherName: namesString, //
};
debugger
posteditinfo(datas).then((res) => {
let data = res;
if (data == 1) {
@ -1834,13 +1954,7 @@ export default {
.catch((err) => {
// console.log(err);
});
} else {
// console.log('error submit!!');
return false;
}
});
},
//
resetForm(formName) {
this.defaultValues();//