合并代码

puzhibing

2024-03-04 7e7f901b2172281dc294dfbc67e6ad00625f09f4

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudent.html

@@ -10,12 +10,31 @@
                    <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">
@@ -29,24 +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"/>
                            <#button name="查看详情" icon="fa-edit" clickFun="TStudent.openTStudentDetail1()" space="true"/>
                            <#button name="学员评语" icon="fa-edit" clickFun="TStudent.openTStudentDetail2()" space="true"/>
                            @if(shiro.hasPermission("/tStudent/frozen")){
                            <#button name="冻结" icon="fa-edit" clickFun="TStudent.editCoursePackageState(2)" space="true"/>
                            <#button name="解冻" icon="fa-edit" clickFun="TStudent.editCoursePackageState(1)" 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/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"/>
                            @}
                            @if(shiro.hasPermission("/tStudent/comit")){
                            <#button name="学员评语" icon="fa-edit" clickFun="TStudent.openTStudentDetail2()" space="true"/>
                            @}
                        </div>
                        <#table id="TStudentTable"/>
                    </div>
@@ -56,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>