Merge branch 'develop5.0-tmd' of http://106.12.23.251:10080/TEAMMODEL/TEAMModelOS into develop5.0-tmd

TEAMModelOS/ClientApp/src/locale/lang/en-US/schoolBaseInfo.js

@@ -91,7 +91,7 @@ export default {
   uploadPlan: '上传平面图',
   hiteachList: 'HiTeach序号列表',
   codeSearchHolder: '请输入关键字搜索',
-  classroomCodeHolder: 'eg: HBCN0101',
+  classroomCodeHolder: 'eg: 1',
   classroomNameHolder: 'eg: 一年级一班',
   headmasterHolder: '可通过名字搜索...',
   hiTeachHolder: '请在右侧列表选择可用序号...',

TEAMModelOS/ClientApp/src/locale/lang/zh-CN/schoolBaseInfo.js

@@ -113,7 +113,7 @@ export default {
   uploadPlan: '上传平面图',
   hiteachList: 'HiTeach序号列表',
   codeSearchHolder: '请输入关键字搜索',
-  classroomCodeHolder: 'eg: HBCN0101',
+  classroomCodeHolder: 'eg: 1',
   classroomNameHolder: 'eg: 一年级一班',
   headmasterHolder: '可通过名字搜索...',
   hiTeachHolder: '请在右侧列表选择可用序号...',

TEAMModelOS/ClientApp/src/locale/lang/zh-TW/schoolBaseInfo.js

@@ -86,7 +86,7 @@ export default {
   uploadPlan: '上傳平面圖',
   hiteachList: 'HiTeach序號清單',
   codeSearchHolder: '請輸入關鍵字搜尋',
-  classroomCodeHolder: 'eg: HBCN0101',
+  classroomCodeHolder: 'eg: 1',
   classroomNameHolder: 'eg:一年級一班',
   headmasterHolder: '可通過名字搜尋…',
   hiTeachHolder: '請在右側清單選擇可用序號…',

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

@@ -73,7 +73,7 @@
                     {{$t('schoolBaseInfo.tab2')}}
                 </span>
                 <!-- 编辑教室 -->
-                <Button v-if="$access.can('admin.*|classroom-upd')" class="save-btn" :loading="isSaveLoading" :disabled="!updated" icon="ios-albums-outline" @click="saveClassroom()" v-show="currentTabIndex == 0">
+                <Button class="save-btn" :loading="isSaveLoading" :disabled="!updated" icon="ios-albums-outline" @click="saveClassroom()" v-show="currentTabIndex == 0">
                     {{$t('schoolBaseInfo.saveInfo')}}
                 </Button>
                 <!-- 添加学生 -->
@@ -294,7 +294,7 @@ export default {
                     { required: true, message: this.$t('schoolBaseInfo.typeWarning'), trigger: 'change' }
                 ],
                 year: [
-                    { required: true, type:Number, message: this.$t('schoolBaseInfo.gradeWarning'), trigger: 'change' }
+                    { required: true, type:'number', message: this.$t('schoolBaseInfo.gradeWarning'), trigger: 'change' }
                 ]
             }
         }
@@ -625,7 +625,7 @@ export default {
             this.curClassIndex = 0
             this.filterYear = 'all'
             if (this.filterPeriod) {
-                this.classListShow = this.classList.filter(item => item.periodId == this.filterPeriod || !item.periodId)
+                this.classListShow = this.classList.filter(item => item.periodId == this.filterPeriod)
             } else {
                 this.classListShow = [...this.classList]
             }