Merge branch 'liqk/develop' into develop

TEAMModelOS/ClientApp/public/lang/en-US.js

@@ -3579,6 +3579,8 @@ const LANG_EN_US = {
         pdtyp13:'碩士研究生',
         pdtyp14:'博士研究生',
         pdtyp15:'企業',
+        pdtyp16:'设置学段类型',
+        pdtyp17:'学段类型',
 
         // ClassroomSetting.vue
         classroomList: 'Classroom List',

TEAMModelOS/ClientApp/public/lang/zh-CN.js

@@ -3582,6 +3582,8 @@ const LANG_ZH_CN = {
         pdtyp13:'硕士研究生',
         pdtyp14:'博士研究生',
         pdtyp15:'企业',
+        pdtyp16:'设置学段类型',
+        pdtyp17:'学段类型',
 
         // ClassroomSetting.vue
         classroomList: '教室列表',

TEAMModelOS/ClientApp/public/lang/zh-TW.js

@@ -3583,6 +3583,8 @@ const LANG_ZH_TW = {
         pdtyp13:'碩士研究生',
         pdtyp14:'博士研究生',
         pdtyp15:'企業',
+        pdtyp16:'设置学段类型',
+        pdtyp17:'学段类型',
 
         // ClassroomSetting.vue
         classroomList: '教室清單',

TEAMModelOS/ClientApp/src/view/schoolmgmt/SystemSetting/SystemSetting.vue

@@ -345,7 +345,7 @@
         <!-- 设置学段类型 -->
         <Modal v-model="pdTypeStatus" footer-hide className="ed-name-modal" class="campus-modal">
             <div slot="header" class="modal-header" style="text-align:left;width: 100%;">
-                设置学段类型
+                {{$t('schoolBaseInfo.pdtyp16')}}
             </div>
             <div class="edit-name-content custom-radio-box" style="text-align:left;">
                 <RadioGroup v-model="pdType">
@@ -664,7 +664,7 @@ export default {
                 let info = this.pdTypeList.find(item=>item.value === type[0])
                 if(info) return info.label
             }
-            return '学段类型'
+            return this.$t('schoolBaseInfo.pdtyp17')
         },
         getCampusName(id) {
             if (id && this.schoolSetting?.campuses?.length) {