This commit is contained in:
parent
2ee0bd02ff
commit
5483242ee8
|
@ -42,13 +42,13 @@
|
|||
style="overflow: auto; height: 450px; overflow-x: hidden" :scrollbar-always-on="true">
|
||||
<!-- <el-table-column type="selection">
|
||||
</el-table-column> -->
|
||||
<el-table-column align="center" width="55" label="选择">
|
||||
<template #default="scope">
|
||||
<!-- <el-table-column align="center" width="55" label="选择">
|
||||
<template #default="scope"> -->
|
||||
<!-- 可以手动的修改label的值,从而控制选择哪一项 -->
|
||||
<el-radio class="radio" v-model="templateSelection"
|
||||
<!-- <el-radio class="radio" v-model="templateSelection"
|
||||
:label="scope.row.TeacherId"> </el-radio>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column> -->
|
||||
<el-table-column label="序号" type="index" align="center" width="55" />
|
||||
<el-table-column prop="Name" align="center" label="姓名">
|
||||
</el-table-column>
|
||||
|
@ -105,7 +105,7 @@ export default {
|
|||
oldTotal: 0,
|
||||
oldCurrent: 1,
|
||||
Total: 0,
|
||||
pageSize: 10,
|
||||
pageSize: 1000,
|
||||
pageNum: 0,
|
||||
pageSizeOptions: [10, 20, 50, 100, 150, 200],
|
||||
disabled: false,
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -238,7 +238,7 @@
|
|||
</div>
|
||||
</el-drawer>
|
||||
|
||||
<el-dialog title="选择教师" v-model="teachershow" center draggable>
|
||||
<el-dialog title="选择教师" v-model="teachershow" center draggable destroy-on-close>
|
||||
<teacher-select @funval="numberval" :showteacherselect="showteacherselect"
|
||||
:activwshow="activwshow"></teacher-select>
|
||||
</el-dialog>
|
||||
|
@ -549,15 +549,13 @@ export default {
|
|||
getclinfodetail(id,HeadTeacherNum) {
|
||||
//获取编辑信息
|
||||
getClassInfodetail({ gcid: id }).then((res) => {
|
||||
|
||||
debugger
|
||||
let data = res;
|
||||
this.formItem = {
|
||||
collegeId: data.CollegeId,
|
||||
selectId: data.MajorId,
|
||||
ClassinfoGrade: data.Grade || '',
|
||||
Counselor: data.CounselorNum || '',
|
||||
ClassRemark: data.HeadTeacherNum || '',
|
||||
ClassRemark: data.ClassRemark || '',
|
||||
Name: data.Name,
|
||||
ClassInfoId: data.ClassInfoId,
|
||||
TrainingStartTime:data.TrainingStartTime,
|
||||
|
@ -590,7 +588,7 @@ export default {
|
|||
MajorId: 1,
|
||||
TeacherName:this.formItem.TeacherName,
|
||||
ClassRemark:this.formItem.ClassRemark,
|
||||
ClassinfoGrade: '',//this.formItem.ClassinfoGrade
|
||||
ClassinfoGrade: '1',//this.formItem.ClassinfoGrade
|
||||
HeadTeacherNum: this.formItem.TeacherNumber
|
||||
};
|
||||
|
||||
|
@ -681,20 +679,20 @@ export default {
|
|||
let datas = {
|
||||
ClassinfoId: this.formItem.ClassInfoId,
|
||||
Name: this.formItem.Name,
|
||||
HeadTeacherNum: this.formItem.TeacherNumber,
|
||||
HeadTeacherNum: this.formItem.HeadTeacherNum,
|
||||
|
||||
TrainingStartTime: this.formItem.TrainingStartTime,
|
||||
TrainingEndTime: this.formItem.TrainingEndTime,
|
||||
TeacherName:this.formItem.TeacherName,
|
||||
ClassRemark:this.formItem.ClassRemark,
|
||||
|
||||
ClassinfoGrade: '',
|
||||
Grade: '1',// 年级
|
||||
collegeId:1,
|
||||
MajorId: 1,
|
||||
Grade: '',
|
||||
CounselorNum: '',
|
||||
};
|
||||
|
||||
debugger
|
||||
console.log(datas);
|
||||
|
||||
postClassInfoeditinfo(datas).then((res) => {
|
||||
|
|
|
@ -8,17 +8,17 @@
|
|||
<div class="seachbox">
|
||||
|
||||
<div class="seachbox">
|
||||
<!-- 学期检索 --><el-select v-model="queryParams.Term" @change="getgetcourseListinfo()" filterable
|
||||
<!-- 学期检索 --><!-- <el-select v-model="queryParams.Term" @change="getgetcourseListinfo()" filterable
|
||||
placeholder="学期" clearable size="small" class="ml-5 seachbox_input">
|
||||
<el-option v-for="item in TermList" :key="item.name" :label="item.name" :value="item.value" />
|
||||
</el-select>
|
||||
</el-select> -->
|
||||
<!-- 学院检索 -->
|
||||
<el-select v-model="queryParams.collegeId" filterable @change="getgetcourseListinfo()"
|
||||
<!-- <el-select v-model="queryParams.collegeId" filterable @change="getgetcourseListinfo()"
|
||||
placeholder="学院" clearable size="small" class="ml-5 seachbox_input">
|
||||
|
||||
<el-option v-for="item in CollegeList" :key="item.value" :label="item.name"
|
||||
:value="item.value" />
|
||||
</el-select>
|
||||
</el-select> -->
|
||||
<!-- 教师检索 -->
|
||||
<el-input v-model.trim="queryParams.nname" placeholder="教师姓名" clearable size="small"
|
||||
style="width:200px; margin:0px 10px 0px 0px "></el-input>
|
||||
|
|
|
@ -5,52 +5,22 @@
|
|||
<div>
|
||||
<el-card>
|
||||
<!-- 检索区域 -->
|
||||
<div class="seachbox">
|
||||
<div class="seachbox">
|
||||
<!-- 学期检索 --><!-- <el-select v-model="queryParams.Term" placeholder="学期" filterable clearable
|
||||
size="small" class="ml-5 seachbox_input">
|
||||
<el-option v-for="item in TermList" :key="item.name" :label="item.name" :value="item.value" />
|
||||
</el-select> -->
|
||||
<!-- 学院检索 -->
|
||||
<!-- <el-select v-model="queryParams.College" placeholder="学院" filterable clearable size="small"
|
||||
class="ml-5 seachbox_input">
|
||||
<el-option v-for="item in CollegeList" :key="item.name" :label="item.name"
|
||||
:value="item.value" />
|
||||
</el-select> -->
|
||||
<!-- 教室检索 -->
|
||||
<div class="seachbox" style="display: flex;align-items: center;">
|
||||
<!-- <div class="seachbox"> -->
|
||||
<el-select v-model="queryParams.Classroom" placeholder="教室" filterable clearable size="small"
|
||||
class="ml-5 seachbox_input">
|
||||
<el-option v-for="item in ClassroomList" :key="item.name" :label="item.name"
|
||||
:value="item.name" />
|
||||
</el-select>
|
||||
<!-- 周次检索 -->
|
||||
<!-- <el-select v-model="queryParams.Week" placeholder="周次" filterable clearable size="small"
|
||||
@change="selectweek" class="ml-5 seachbox_input">
|
||||
<el-option v-for="item in WeekList" :key="item.name" :label="item.name" :value="item.value" />
|
||||
</el-select> -->
|
||||
<!-- 教师检索 -->
|
||||
<el-input v-model.trim="queryParams.Teacher" placeholder="教师" clearable size="small"
|
||||
style="width:200px; margin:0px 10px 0px 0px "></el-input>
|
||||
<!-- 节次检索 -->
|
||||
<!-- <el-select v-model="queryParams.Section" placeholder="节次" filterable clearable size="small"
|
||||
class="ml-5 seachbox_input">
|
||||
<el-option v-for="item in SectionList" :key="item.name" :label="item.name"
|
||||
:value="item.value" />
|
||||
</el-select> -->
|
||||
<!-- <el-select v-model="queryParams.Status" placeholder="状态" filterable clearable size="small"
|
||||
class="ml-5 seachbox_input">
|
||||
<el-option v-for="item in StatusList" :key="item.name" :label="item.name" :value="item.value" />
|
||||
</el-select> -->
|
||||
<!-- 日历检索 -->
|
||||
|
||||
<!-- <el-date-picker v-model="queryParams.Date" value-format="YYYY-MM-DD" type="daterange"
|
||||
@change="selecttimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
|
||||
style="margin-top: 10px;" /> -->
|
||||
|
||||
<!-- 按钮——————搜索 -->
|
||||
<el-button class="ml-5" style="margin-left: 10px;" type="primary"
|
||||
@click="ClickSearch">搜索</el-button>
|
||||
<div style="width: 390px;">
|
||||
<el-date-picker v-model="queryParams.Date" value-format="YYYY-MM-DD" type="daterange"
|
||||
@change="selecttimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"/>
|
||||
</div>
|
||||
<el-button class="ml-5" style="margin-left: 0px;" type="primary"
|
||||
@click="ClickSearch">搜索</el-button>
|
||||
<!-- </div> -->
|
||||
<!-- 状态检索 -->
|
||||
<!-- <div class="status">
|
||||
|
||||
|
@ -76,7 +46,9 @@
|
|||
<el-table :data="tableData" border stripe :header-cell-style="{ 'text-align': 'center' }"
|
||||
:scrollbar-always-on="true">
|
||||
<!-- <el-table-column type="selection" width="55" align="center" /> -->
|
||||
<el-table-column prop="TeacherName" align="center" label="教师名字" width="100">
|
||||
<el-table-column prop="CourceName" align="left" label="课程名称">
|
||||
</el-table-column>
|
||||
<el-table-column prop="TeacherName" align="center" label="教师姓名" width="100">
|
||||
</el-table-column>
|
||||
<el-table-column prop="TeacherTitle" align="center" label="教师职称" width="100">
|
||||
</el-table-column>
|
||||
|
@ -86,9 +58,7 @@
|
|||
<el-tag v-if="scope.row.IsOutSide">校外教师</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="DateTime" label="日期" align="left">
|
||||
</el-table-column>
|
||||
<el-table-column prop="CourceName" align="left" label="课程名称">
|
||||
<el-table-column prop="DateTime" label="日期" align="center">
|
||||
</el-table-column>
|
||||
<el-table-column prop="ClassName" align="left" label="班级名称">
|
||||
</el-table-column>
|
||||
|
@ -189,7 +159,7 @@
|
|||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="校内/外教师" prop="xnw">
|
||||
<el-radio-group v-model="IsOutSide">
|
||||
<el-radio-group v-model="IsOutSide" @change="handleChange">
|
||||
<el-radio label="1">校内</el-radio>
|
||||
<el-radio label="2">校外</el-radio>
|
||||
</el-radio-group>
|
||||
|
@ -262,18 +232,18 @@
|
|||
<el-form-item label="课程名称" prop="CourceName">
|
||||
<el-input placeholder="请填写课程" clearable v-model.trim="formItem.CourceName"> </el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="午别时段" prop="TimeInterval">
|
||||
<!-- <el-form-item label="午别时段" prop="TimeInterval">
|
||||
<el-input placeholder="请填写午别时段" clearable v-model.trim="formItem.TimeInterval"> </el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="教学形式" prop="TeachingForm">
|
||||
<el-input placeholder="请填写午别时段" clearable v-model.trim="formItem.TeachingForm"> </el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="按日期时间排课" prop="IsByDate">
|
||||
</el-form-item> -->
|
||||
<!-- <el-form-item label="按日期时间排课" prop="IsByDate">
|
||||
<el-radio-group v-model="formItem.IsByDate">
|
||||
<el-radio label="1">是</el-radio>
|
||||
<el-radio label="2">否</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-form-item> -->
|
||||
<!-- 新增__课程类型 -->
|
||||
<!--
|
||||
<el-form-item label="请填写课程类型" prop="CourceType">
|
||||
|
@ -1085,7 +1055,6 @@ export default {
|
|||
|
||||
classSelectclasscode(e) {
|
||||
//弹框里选择班级
|
||||
debugger;
|
||||
let obj = {};
|
||||
/* obj = this.NewClassList.find((item) => { // 这里的userList就是上面遍历的数据源
|
||||
return item.value === e; // 筛选出匹配数据
|
||||
|
@ -1242,7 +1211,7 @@ export default {
|
|||
}
|
||||
|
||||
// Time: `${this.formItem.Time[0]}-${this.formItem.Time[1]}`,
|
||||
|
||||
this.IsOutSide = data.IsOutSide== true ? '2' : '1',
|
||||
this.formItem = {
|
||||
Time: countTime,
|
||||
TeacherTitle: data.TeacherTitle,
|
||||
|
@ -1271,6 +1240,7 @@ export default {
|
|||
TeachingLogId: data.TeachingLogId,
|
||||
CourceCode: data.CourceCode,
|
||||
CourceType: data.CourceType == "" ? "必修" : data.CourceType,
|
||||
IsByDate:data.IsByDate==true?'1':'2',
|
||||
// SchoolArea: '', //校区
|
||||
// Term: '', //学期
|
||||
// College: '', //学院
|
||||
|
@ -1363,6 +1333,12 @@ export default {
|
|||
return item.id !== index
|
||||
})
|
||||
},
|
||||
handleChange(){
|
||||
//debugger
|
||||
this.formItem.TeacherName = ''
|
||||
this.formItem.TeacherNumber = ''
|
||||
this.formItem.TeacherTitle = ''
|
||||
},
|
||||
submitForm(formName) {
|
||||
//新增提交
|
||||
let vm = this;
|
||||
|
@ -1401,7 +1377,7 @@ export default {
|
|||
Grade: "", //年级
|
||||
IsValid: vm.formItem.IsValid, //是否有效
|
||||
xnw:'1',
|
||||
TeacherNumber: vm.formItem.TeacherNumber, //任课教师工号
|
||||
TeacherNumber: this.IsOutSide == '1' ? vm.formItem.TeacherNumber : '', //任课教师工号
|
||||
TeacherName: vm.formItem.TeacherName, //教师姓名
|
||||
TeachingLogId: 0,
|
||||
|
||||
|
@ -1413,7 +1389,6 @@ export default {
|
|||
TimeInterval:0,
|
||||
TeachingForm:0
|
||||
};
|
||||
|
||||
debugger
|
||||
postaddinfo(datas).then((res) => {
|
||||
let data = res;
|
||||
|
@ -1578,13 +1553,15 @@ export default {
|
|||
return false;
|
||||
}
|
||||
|
||||
this.classformItem.MajorCode = new Array(this.classformItem.ClassCode.length).fill('e3649c').join(',')
|
||||
|
||||
let datas = {
|
||||
AcademicNumber: vm.formItem.AcademicNumber, //自动生成,不需填写
|
||||
YearTerm: vm.formItem.YearTerm, //学期,必填
|
||||
SchoolAreaCode: vm.formItem.SchoolAreaCode, // 校区Code,必填
|
||||
CollegeCode: vm.formItem.CollegeCode, // 学院Code,单个Code值,必填
|
||||
MajorCode: vm.getzhaunclasslist("MajorCode").toString(), //专业Code,可多个Code值
|
||||
ClassCode: vm.getzhaunclasslist("ClassCode").toString(), //班级Code,可多个Code值,必填
|
||||
MajorCode: this.classformItem.MajorCode, //专业Code,可多个Code值
|
||||
ClassCode: this.classformItem.ClassCode.join(','), //班级Code,可多个Code值,必填
|
||||
BuildingCode: vm.formItem.BuildingCode, //楼Code
|
||||
ClassroomCode: vm.formItem.ClassroomCode, //教室Code
|
||||
Weeks: vm.formItem.Weeks.toString(), //上课周次 例如,1,2, 代表第一周和第二周
|
||||
|
@ -1601,6 +1578,12 @@ export default {
|
|||
TeacherNumber: vm.formItem.TeacherNumber, //任课教师工号
|
||||
TeacherName: vm.formItem.TeacherName, //教师姓名
|
||||
TeachingLogId: vm.formItem.TeachingLogId,
|
||||
|
||||
IsOutSide: this.IsOutSide == '1' ? false : true,
|
||||
TeacherTitle: vm.formItem.TeacherTitle,
|
||||
Date: this.formItem.Date,
|
||||
Time: `${this.formItem.Time[0]}-${this.formItem.Time[1]}`,
|
||||
IsByDate: this.formItem.IsByDate == '1' ? true : false,
|
||||
};
|
||||
posteditinfo(datas).then((res) => {
|
||||
let data = res;
|
||||
|
|
Loading…
Reference in New Issue