修改

src/views/courseStatistics/sectionInfo.vue

@@ -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="12"><span class="page_p_txt">教室：{{ ClassroomName }}</span></el-col>
-                    <el-col :span="6"><span class="page_p_txt">课程：{{ CourceName }}</span></el-col>
+                </el-row>
-                    <el-col :span="5"> <span class="page_p_txt">教师：{{ TeacherName }}</span></el-col>
+            </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>

src/views/teach-log/teach-log.vue

@@ -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,10 +1260,12 @@ 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;
                     } */
-
+                    if ((!this.formItem.TeacherNumber || this.formItem.TeacherNumber.length == 0) && (!this.formItem.ClassCode || this.formItem.ClassCode.length == 0)) {
-                    this.classformItem.MajorCode = new Array(this.formItem.ClassCode.length).fill('e3649c').join(',')
+                        ElMessageBox.confirm(
-                    console.log(this.formItem.Date);
+                            '未选择上课班级和授课教师. 确定提交?',
-                    console.log(this.formItem.Time);
+                            '提示',
-                    
+                            {
-                    const arrT = this.formItem.TeacherNumber
+                                confirmButtonText: '确定',
-                    const objT = this.NewClassList
+                                cancelButtonText: '取消',
-
+                                type: 'warning',
-                    const commonElements = arrT.map(number => 
+                            }
-                        objT.find(obj => obj.Number === number)
+                        ).then(() => {
-                    ).filter(Boolean);
+                            this.submitFormFinally()
-
+                        }).catch(() => {
-                    const namesString = commonElements.map(obj => obj.Name).join(', ');
+                            ElMessage({
-
+                                type: 'info',
-                    this.formItem.TeacherTitle = commonElements[0].Title
+                                message: '已取消提交，请继续选择',
-
+                            })
-                    let datas = {
+                        })
-                        AcademicNumber: '', //自动生成，不需填写
+                    } else if (!this.formItem.TeacherNumber || this.formItem.TeacherNumber.length == 0) {
-                        YearTerm: '2025-1', //学期，必填
+                        ElMessageBox.confirm(
-                        SchoolAreaCode: 1, //	校区Code，必填
+                            '未选择授课教师. 确定提交?',
-                        CollegeCode: 101, //	学院Code，单个Code值，必填
+                            '提示',
-                        MajorCode: this.classformItem.MajorCode, //专业Code，可多个Code值
+                            {
-                        ClassCode: this.formItem.ClassCode == '' ? '' : this.formItem.ClassCode.join(','), //班级Code，可多个Code值，必填
+                                confirmButtonText: '确定',
-                        BuildingCode: '001', //楼Code
+                                cancelButtonText: '取消',
-                        ClassroomCode: vm.formItem.ClassroomCode, //教室Code
+                                type: 'warning',
-                        Weeks: 1, //上课周次 例如,1,2, 代表第一周和第二周
+                            }
-                        WeekDay: 1, //上课时间 周几 新增 2020改 例如：3 即 星期三
+                        ).then(() => {
-                        ScheduleName: '01', //节次
+                            this.submitFormFinally()
-                        CourceName: vm.formItem.CourceName, //课程名称
+                        }).catch(() => {
-                        CourceCode: "", //	课程代码
+                            ElMessage({
-                        CourceType: '', //课程类型 暂为空即可
+                                type: 'info',
-                        Grade: "", //年级
+                                message: '已取消提交，请继续选择',
-                        IsValid: vm.formItem.IsValid, //是否有效
+                            })
-                        xnw:'1',
+                        })
-                        //TeacherNumber: this.IsOutSide == '1' ? vm.formItem.TeacherNumber : '', //任课教师工号
+                    } else if (!this.formItem.ClassCode || this.formItem.ClassCode.length == 0) {
-                        //TeacherName: vm.formItem.TeacherName, //教师姓名
+                        ElMessageBox.confirm(
-                        TeachingLogId: 0,
+                            '未选择上课班级. 确定提交?',
-
+                            '提示',
-                        IsOutSide: this.IsOutSide == '1' ? false : true,
+                            {
-                        TeacherTitle: this.formItem.TeacherTitle,
+                                confirmButtonText: '确定',
-                        Date: this.formItem.Date,
+                                cancelButtonText: '取消',
-                        Time: `${this.formItem.Time[0]}-${this.formItem.Time[1]}`,
+                                type: 'warning',
-                        IsByDate: this.formItem.IsByDate == '1' ? true : false,
+                            }
-                        TimeInterval:0,
+                        ).then(() => {
-                        TeachingForm:0,
+                            this.submitFormFinally()
-                        TeacherNumber:this.formItem.TeacherNumber == undefined ? '' : this.formItem.TeacherNumber.join(','),
+                        }).catch(() => {
-                        TeacherName: namesString, //教师姓名
+                            ElMessage({
-                    };
+                                type: 'info',
-                    postaddinfo(datas).then((res) => {
+                                message: '已取消提交，请继续选择',
-                        let data = res;
+                            })
-                        if (data == 1) {
+                        })
-                            this.$message({
+                    } else{
-                                message: '新增成功',
+                        this.submitFormFinally()
-                                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);
-                        });
                 } 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, //	学院Code，单个Code值，必填
+                MajorCode: this.classformItem.MajorCode, //专业Code，可多个Code值
+                ClassCode: this.formItem.ClassCode == '' ? '' : this.formItem.ClassCode.join(','), //班级Code，可多个Code值，必填
+                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();//默认值