Browse Source

#3776 C1175 基础信息--增加学段状态判断(前端)

XW 2 months ago
parent
commit
6632dc16f3

+ 1 - 1
TEAMModelOS/ClientApp/src/common/BaseSelectSchool.vue

@@ -29,7 +29,7 @@
 				</span>
 				<DropdownMenu slot="list">
 					<div v-for="(item, index) in periods" :key="index">
-						<DropdownItem :name="index" v-if="!item.status">
+						<DropdownItem :name="index">
 							<div class="school-item">
 								<span>{{ item.name }}</span>
 							</div>

+ 5 - 2
TEAMModelOS/ClientApp/src/store/module/user.js

@@ -246,6 +246,7 @@ export default {
             state.schoolProfile.periods = data.fmtPeriods // 學制
             state.schoolProfile.grades = data.fmtGrades // 年級
             state.schoolProfile.school_base = data.school_base // 区班校基础数据
+            state.schoolProfile.school_base.period = data.school_base.period.filter(item => !item.status) // 区班校基础数据
             // state.schoolProfile.svcStatus = data.svcStatus //学校购买服务模组状态
             Vue.set(state.schoolProfile, 'svcStatus', data.svcStatus)
             state.schoolProfile.productSum = data.productSum //学校购买服务模组信息
@@ -549,8 +550,10 @@ export default {
             let fmtGrades = [];
 
             data.school_base.period.forEach(item => {
-                // 學制List
-                fmtPeriods.push({ 'id': item.id, 'name': item.name })
+                if(!item.status) {
+                    // 學制List
+                    fmtPeriods.push({ 'id': item.id, 'name': item.name })
+                }
 
                 // 年級List
                 item.grades.forEach((gradeItem, gradeIndex) => {

+ 13 - 15
TEAMModelOS/ClientApp/src/view/schoolmgmt/SystemSetting/SystemSetting.vue

@@ -105,21 +105,19 @@
 						</div>
 					</div>
 					<Draggable ghost-class="ghost" class="period-list list-group" :list="schoolSetting.period" :animation="200">
-						<div v-for="(item, index) in schoolSetting.period" :key="index">
-							<div v-if="!item.status" class="period-item list-group-item" @click.capture="choosePeriod(index)" :class="index == curPriodIndex ? 'block-bg-active block-bg' : 'block-bg'">
-								<p class="period-item-name semester-name-label" @click.stop>
-									<Input v-model="item.name" :disabled="editPrdIndex !== index" :placeholder="$t('schoolBaseInfo.pdHolder')" style="width: 160px" />
-									<span class="campus-label" @click="setCampus(item.campusId)">
-										{{ getCampusName(item.campusId) }}
-									</span>
-									<span class="type-label" @click="setPdType(item.periodType)">
-										{{ getPdType(item.periodType) }}
-									</span>
-								</p>
-								<p class="period-item-num"><span></span>{{ $t("schoolBaseInfo.semesterNum") + item.semesters.length }}</p>
-								<p class="period-item-num"><span></span>{{ $t("schoolBaseInfo.gradeNum") + item.grades.length }}</p>
-								<p class="period-item-num"><span></span>{{ $t("schoolBaseInfo.periodNum") + item.subjects.length }}</p>
-							</div>
+						<div class="period-item list-group-item" v-for="(item, index) in schoolSetting.period" :key="index" @click.capture="choosePeriod(index)" :class="index == curPriodIndex ? 'block-bg-active block-bg' : 'block-bg'">
+							<p class="period-item-name semester-name-label" @click.stop>
+								<Input v-model="item.name" :disabled="editPrdIndex !== index" :placeholder="$t('schoolBaseInfo.pdHolder')" style="width: 160px" />
+								<span class="campus-label" @click="setCampus(item.campusId)">
+									{{ getCampusName(item.campusId) }}
+								</span>
+								<span class="type-label" @click="setPdType(item.periodType)">
+									{{ getPdType(item.periodType) }}
+								</span>
+							</p>
+							<p class="period-item-num"><span></span>{{ $t("schoolBaseInfo.semesterNum") + item.semesters.length }}</p>
+							<p class="period-item-num"><span></span>{{ $t("schoolBaseInfo.gradeNum") + item.grades.length }}</p>
+							<p class="period-item-num"><span></span>{{ $t("schoolBaseInfo.periodNum") + item.subjects.length }}</p>
 						</div>
 					</Draggable>
 					<EmptyData v-show="!schoolSetting || !schoolSetting.period.length"></EmptyData>