zhaichao/education
1
0
Fork 0
forked from liweijie/education
Code Pull Requests Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	frontend/src/layout/components/SemesterBar.vue
#	frontend/src/views/classHour/plan/index.vue
This commit is contained in:
yangbin
2026-08-27 17:04:52 +08:00
parent be7b91ac20 c2cc535d80
commit b34efc847d
5 changed files with 10 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/views/classHour/jointTraining/index.vue
+1 -1
View File
@@ -52,7 +52,7 @@
<el-table-column prop="xmlx" label="项目类型" width="80" align="center" show-overflow-tooltip />
<el-table-column prop="sm" label="说明" min-width="120" show-overflow-tooltip />
<el-table-column prop="bz" label="备注" min-width="120" show-overflow-tooltip />
<el-table-column label="操作" width="160" align="center" fixed="right">
<el-table-column label="操作" width="230" align="center" fixed="right">
<template slot-scope="{ row }">
<el-button type="text" size="small" @click="handleDetail(row)">详情</el-button>
<el-button type="text" size="small" @click="handleEdit(row)">修改</el-button>
frontend/src/views/classHour/subsidy/index.vue
+1 -1
View File
@@ -106,7 +106,7 @@
<el-table-column prop="ksfbz" label="课时费单价" width="100" align="right" header-align="center">
<template slot-scope="{ row }">{{ fmtValue(row.ksfbz) }}</template>
</el-table-column>
<el-table-column prop="clksfbz" label="超量课时费单价" width="110" align="right" header-align="center">
<el-table-column prop="clksfbz" label="超量课时费单价" width="120" align="right" header-align="center">
<template slot-scope="{ row }">{{ fmtValue(row.clksfbz) }}</template>
</el-table-column>
</el-table>
frontend/src/views/subjectMajor/discipline/index.vue
+7 -1
View File
@@ -67,11 +67,17 @@
<el-table-column prop="jxgljgbh" label="教学管理机构" width="200" show-overflow-tooltip />
<el-table-column prop="zydm" label="专业代码" width="200" />
<el-table-column prop="zymc" label="专业名称" width="200" show-overflow-tooltip />
<el-table-column prop="zdyfl" label="分类" width="150" align="center" />
<el-table-column prop="xylb" label="学员类别" width="150" align="center" />
<el-table-column prop="xnz" label="学年制" width="120" align="center" />
<el-table-column prop="xqs" label="学期数" width="120" align="center" />
<el-table-column prop="zgzy" label="主干专业" align="center" />
<el-table-column label="停用" width="100" align="center">
<template slot-scope="{ row }">
<el-tag :type="row.ty === 1 ? 'danger' : 'success'" size="mini">
{{ row.ty === 1 ? '是' : '否' }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="230" align="center" fixed="right">
<template slot-scope="{ row }">
<el-button type="text" size="small" icon="el-icon-view" @click="handleDetail(row)">详情</el-button>
frontend/src/views/subjectMajor/major/index.vue
+1 -1
View File
@@ -100,7 +100,7 @@
<template slot-scope="scope">
<el-button type="text" size="small" icon="el-icon-view" @click="handleView(scope.row)">详情</el-button>
<el-button type="text" size="small" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button>
<el-button type="text" size="small" icon="el-icon-delete" class="text-danger" @click="handleDelete(scope.row)">删除</el-button>
<el-button type="text" size="small" icon="el-icon-delete" class="text-danger" @click="handleDelete(scope.row)">停用</el-button>
</template>
</el-table-column>
</el-table>