Merge branch 'develop3.0' of http://106.12.23.251:10080/TEAMMODEL/TEAMModelOS into develop3.0

TEAMModelOS/ClientApp/src/view/school-mgmt/ClassroomSetting/ClassroomSetting.vue

@@ -618,6 +618,7 @@
                     res => {
                         if (res.error == null) {
                             this.$Message.success(this.$t('schoolBaseInfo.csTips3'))
+                            this.classroomList[this.currentClassroomIndex].id = res.result.data.id
                             this.updated = false
                             this.isSaveLoading = false
                             this.isListLoading = false
@@ -663,14 +664,16 @@
                     }).then(
                         (res) => {
                             if (res.error == null) {
+                                if (this.currentClassroomIndex >= index && index > 0) {
+                                    this.currentClassroomIndex = 0
+                                }
+                                this.delIndex = undefined
                                 this.classroomList.splice(index, 1)
                                 this.classroomListShow.splice(index, 1)
                                 this.$Message.success(this.$t('schoolBaseInfo.csTips7'))
                                 this.updated = false
                                 this.isListLoading = false
-                                if (this.currentClassroomIndex >= index && index > 0) {
-                                    this.currentClassroomIndex = 0
-                                }
+                                
                             }
                         },
                         (err) => {
@@ -681,12 +684,15 @@
                     if (this.currentClassroomIndex >= index && index > 0) {
                         this.currentClassroomIndex = 0
                     }
+                    this.delIndex = undefined
                     this.classroomList.splice(index, 1)
                     this.classroomListShow.splice(index, 1)
                     setTimeout(()=> {
                         this.isListLoading = false
+                        this.updated = false
                     },500)
                 }
+                
             },
             uploadSchoolPlan(res, file) {
                 this.$Message.success(this.$t('schoolBaseInfo.csTips5'))

TEAMModelOS/ClientApp/src/view/student-account/Index.vue

@@ -50,7 +50,7 @@
         </div>
         <!--学生账号table-->
         <div class="sc-content dark-iview-table" style="position:relative">
-            <Table ref="selection" :columns="tableColumns" :data="tableShowData" height="730" :loading="tableLoading" @on-select="getSelectInfo" @on-select-cancel="getSelectInfo" @on-select-all="getSelectInfo" @on-select-all-cancel="cancelAll">
+            <Table ref="selection" :columns="tableColumns" :data="tableShowData" height="730" :loading="tableLoading" @on-selection-change="getSelectInfo">
                 <Loading slot="loading"></Loading>
                 <template slot-scope="{ row,index }" slot="status">
                     <Icon v-if="index % 3 == 1" type="md-checkmark-circle-outline" size="18" color="#1CD0A1" />
@@ -194,10 +194,6 @@
             },
             /**根据学段、年级、班级搜索 */
             filterStudentInfo() {
-                console.log('------')
-                console.log(this.searchPeriod)
-                console.log(this.searchGrade)
-                console.log(this.searchClassroom)
                 if (this.searchClassroom !== '' && this.searchClassroom !== undefined) {
                     let findCountParams = {
                         "collectionName": "CoreStudent",
@@ -234,7 +230,6 @@
                     classroomCodes = classrooms.map((item) => {
                         return item.classroomCode
                     })
-                    console.log(this.classroomCodes)
                     if (classroomCodes.length == 0) {
                         if (this.searchPeriod == '' || this.searchPeriod == undefined) {
                             let findCountParams = {
@@ -275,27 +270,6 @@
                         this.baseFindStudent(params)
                     }
                 }
-                //let grade = ''
-                //if (this.searchPeriod == undefined) {
-                //    this.searchPeriod = ''
-                //}
-                //if (this.searchGrade == undefined || this.searchGrade == '') {
-                //    this.grade = ''
-                //} else {
-                //    grade = '"gradeCode":' + '"' + this.searchGrade + '"'
-                //}
-                //if (this.searchClassroom == undefined) {
-                //    this.searchClassroom = ''
-                //}
-                //this.tableLoading = true
-                //this.tableShowData = this.tableData.filter(
-                //    item => {
-                //        return JSON.stringify(item).indexOf(this.searchPeriod) !== -1 && JSON.stringify(item).indexOf(grade) !== -1 && JSON.stringify(item).indexOf(this.searchClassroom) !== -1
-                //    }
-                //)
-                //this.currentPage = 1
-                ////this.getPageData()
-                //this.tableLoading = false
 
             },
             cancelAll() {
@@ -364,8 +338,6 @@
                     this.editStudentInfo = []
                     let objStr = JSON.stringify(this.tableShowData[index])
                     this.editStudentInfo.push(JSON.parse(objStr))
-                    console.log('single')
-                    console.log(this.editStudentInfo)
                     this.tableShowData[index]._checked = true
                     this.$forceUpdate()
                     this.addStudentStatus = true
@@ -373,9 +345,6 @@
                     if (this.selections.length > 0) {
                         this.editStudentInfo.length = 0
                         this.editStudentInfo = [...this.selections]
-                        console.log(this.selections)
-                        console.log('selections')
-                        console.log(this.editStudentInfo)
                         this.addStudentStatus = true
                     }
                     else {