From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudent.html | 49 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 38 insertions(+), 11 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudent.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudent.html
index 9fe851c..a179210 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudent.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudent.html
@@ -9,12 +9,34 @@
<div class="row row-lg">
<div class="col-sm-12">
<div class="row">
+ @if(objectType ==1){
<div class="col-sm-3">
- <#NameCon id="province" name="省份" />
+ <div class="input-group">
+ <div class="input-group-btn open">
+ <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button" aria-expanded="true">
+ 所在省
+ </button>
+ </div>
+ <select class="form-control" id="pCode" onchange="TCompetition.oneChange(this)">
+ <option value="">全部</option>
+ @for(obj in list){
+ <option value="${obj.code}">${obj.name}</option>
+ @}
+ </select>
+ </div>
</div>
<div class="col-sm-3">
- <#NameCon id="city" name="城市" />
+ <div class="input-group">
+ <div class="input-group-btn open">
+ <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button" aria-expanded="true">
+ 所在市
+ </button>
+ </div>
+ <select class="form-control" id="cCode">
+ </select>
+ </div>
</div>
+ @}
<div class="col-sm-3">
<#NameCon id="name" name="姓名" />
</div>
@@ -26,21 +48,25 @@
</div>
<div class="col-sm-3">
<#button name="搜索" icon="fa-search" clickFun="TStudent.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TStudent.resetSearch()" space="true"/>
</div>
</div>
<div class="hidden-xs" id="TStudentTableToolbar" role="group">
- @if(shiro.hasPermission("/tStudent/add")){
- <#button name="添加" icon="fa-plus" clickFun="TStudent.openAddTStudent()"/>
+ @if(shiro.hasPermission("/tStudent/update")){
+ <#button name="修改" icon="fa-edit" clickFun="TStudent.openTStudentDetail()"/>
@}
-
- <#button name="修改" icon="fa-edit" clickFun="TStudent.openTStudentDetail()" space="true"/>
+ @if(shiro.hasPermission("/tStudent/frozen")){
+ <#button name="冻结" icon="fa-edit" clickFun="TStudent.editCoursePackageState(2)" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tStudent/frozen")){
+ <#button name="解冻" icon="fa-edit" clickFun="TStudent.editCoursePackageState(1)" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tStudent/info")){
<#button name="查看详情" icon="fa-edit" clickFun="TStudent.openTStudentDetail1()" space="true"/>
- <#button name="学员评语" icon="fa-edit" clickFun="TStudent.openTStudentDetail2()" space="true"/>
-
- @if(shiro.hasPermission("/tStudent/delete")){
- <#button name="删除" icon="fa-remove" clickFun="TStudent.delete()" space="true"/>
@}
-<!-- <button id="exportButton">TTTTTTTTTT</button>-->
+ @if(shiro.hasPermission("/tStudent/comit")){
+ <#button name="学员评语" icon="fa-edit" clickFun="TStudent.openTStudentDetail2()" space="true"/>
+ @}
</div>
<#table id="TStudentTable"/>
</div>
@@ -50,6 +76,7 @@
</div>
</div>
<script src="${ctxPath}/modular/system/tStudent/tStudent.js"></script>
+<script src="${ctxPath}/modular/system/tShop/tShop.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jspdf/2.4.0/jspdf.umd.min.js">
</script>
<script>
--
Gitblit v1.7.1