From 49e28208554117ec7b5b56ceab85b069662b83e7 Mon Sep 17 00:00:00 2001
From: Renpc-kilig <308442850@qq.com>
Date: Fri, 4 Jun 2021 14:04:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AF=BC=E5=85=A5=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E9=87=8D=E6=9E=84=E3=80=82=20=E5=BD=92=E6=A1=A3?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=96=B0=E5=A2=9E=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/route/applystudentsnew/list.html   |  94 ++++++++--
 .../static/route/applystudentsnew/update.html | 172 ++++++++++--------
 src/main/resources/templates/index4.html      |   2 +-
 3 files changed, 174 insertions(+), 94 deletions(-)

diff --git a/src/main/resources/static/route/applystudentsnew/list.html b/src/main/resources/static/route/applystudentsnew/list.html
index 0013dce..cc4059a 100644
--- a/src/main/resources/static/route/applystudentsnew/list.html
+++ b/src/main/resources/static/route/applystudentsnew/list.html
@@ -18,7 +18,7 @@
                 <div class="layui-card-body">
                     <div class="test-table-reload-btn" style="margin-bottom: 10px;">
                         <div class="layui-inline">
-                            <input type="text" id="keywords" class="layui-input search-item" placeholder="输入关键字">
+                            <input type="text" id="keywords" class="layui-input search-item" placeholder="身份证号/班级编号">
                         </div>
                         <div class="layui-inline">
                             <input type="text" id="startTime" class="layui-input search-item" placeholder="开始时间" readonly>
@@ -94,6 +94,85 @@
                     [
                         {type:'checkbox', fixed: 'left'},
                         {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
+                        {field: 'planName', width: 180, title: '班级名称', align:'center',
+                            templet: function(row) {
+                                var rowData = row.classPlanDTO[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        },
+                        {field: 'planNumber', width: 180, title: '班级编号', align:'center',
+                            templet: function(row) {
+                                var rowData = row.classPlanDTO[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        },
+                        {field: 'planType', width: 180, title: '计划类型', align:'center',
+                            templet: function(row) {
+                                var rowData = row.classPlanDTO[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                if('1' == rowData) {
+                                    rowData = '初训';
+                                }else if('2' == rowData) {
+                                    rowData = '复训';
+                                }else if('3' == rowData) {
+                                    rowData = '换证 ';
+                                }
+                                return rowData;
+                            }
+                        },
+                        {field: 'orgName', width: 180, title: '考试机构', align:'center',
+                            templet: function(row) {
+                                var rowData = row.classPlanDTO[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        },
+                        {field: 'planStartTime', width: 180, title: '计划开始时间', align:'center',
+                            templet: function(row) {
+                                var rowData = row.classPlanDTO[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        },
+                        {field: 'planEndTime', width: 180, title: '计划结束时间', align:'center',
+                            templet: function(row) {
+                                var rowData = row.classPlanDTO[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        },
+                        {field: 'chargePerson', width: 180, title: '负责人', align:'center',
+                            templet: function(row) {
+                                var rowData = row.classPlanDTO[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        },
+                        {field: 'chargePersonTel', width: 180, title: '联系方式', align:'center',
+                            templet: function(row) {
+                                var rowData = row.classPlanDTO[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        },
                         {field: 'name', width: 180, title: '姓名', align:'center',
                             templet: function(row) {
                                 var rowData = row[this.field];
@@ -363,19 +442,6 @@
                         }
                     });
                 }
-            } else if(layEvent === 'removeEvent') {
-                if(checkDatas.length === 0) {
-                    top.dialog.msg(top.dataMessage.table.selectDelete);
-                } else {
-                    var ids = '';
-                    for(var i = 0, item; item = checkDatas[i++];) {
-                        if(i > 1) {
-                            ids += '_';
-                        }
-                        ids += item['applyStudentsNewId'];
-                    }
-                    removeData(ids);
-                }
             }
         });
     });
diff --git a/src/main/resources/static/route/applystudentsnew/update.html b/src/main/resources/static/route/applystudentsnew/update.html
index 34a589c..700207b 100644
--- a/src/main/resources/static/route/applystudentsnew/update.html
+++ b/src/main/resources/static/route/applystudentsnew/update.html
@@ -30,28 +30,32 @@
                 <input type="hidden" id="examPointId" name="examPointId" class="layui-input" value="" placeholder="请输入知识成绩考点ID"  maxlength="255">
                 <input type="hidden" id="handsPointId" name="handsPointId" class="layui-input" value="" placeholder="请输入实操成绩考点ID"  maxlength="255">
                 <!-- 页面隐藏项 -->
-                <div class="layui-form-item">
-                    <label class="layui-form-label">姓名</label>
-                    <div class="layui-input-block">
-                        <input type="text" id="name" name="name" class="layui-input" value="" placeholder="请输入姓名"  maxlength="50" readonly>
+                <div class="layui-form-item layui-row">
+                    <div class="layui-col-lg6">
+                        <label class="layui-form-label">姓名</label>
+                        <div class="layui-input-block">
+                            <input type="text" id="name" name="name" class="layui-input" value="" placeholder="请输入姓名"  maxlength="50" readonly>
+                        </div>
+                    </div>
+                    <div class="layui-col-lg6">
+                        <label class="layui-form-label">性别</label>
+                        <div class="layui-input-block">
+                            <input type="text" id="sex" name="sex" class="layui-input" value="" placeholder="请输入性别"  maxlength="10" readonly>
+                        </div>
                     </div>
                 </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">性别</label>
-                    <div class="layui-input-block">
-                        <input type="text" id="sex" name="sex" class="layui-input" value="" placeholder="请输入性别"  maxlength="10" readonly>
+                <div class="layui-form-item layui-row">
+                    <div class="layui-col-lg6">
+                        <label class="layui-form-label">证件类型名称</label>
+                        <div class="layui-input-block">
+                            <input type="text" id="cardTypeName" name="cardTypeName" class="layui-input" value="" placeholder="请输入证件类型名称"  maxlength="255" readonly>
+                        </div>
                     </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">证件类型名称</label>
-                    <div class="layui-input-block">
-                        <input type="text" id="cardTypeName" name="cardTypeName" class="layui-input" value="" placeholder="请输入证件类型名称"  maxlength="255" readonly>
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">证件号码</label>
-                    <div class="layui-input-block">
-                        <input type="text" id="cardNumber" name="cardNumber" class="layui-input" value="" placeholder="请输入证件号码"  maxlength="50" readonly>
+                    <div class="layui-col-lg6">
+                        <label class="layui-form-label">证件号码</label>
+                        <div class="layui-input-block">
+                            <input type="text" id="cardNumber" name="cardNumber" class="layui-input" value="" placeholder="请输入证件号码"  maxlength="50" readonly>
+                        </div>
                     </div>
                 </div>
                 <div class="layui-form-item">
@@ -60,69 +64,79 @@
                         <input type="text" id="workUnit" name="workUnit" class="layui-input" value="" placeholder="请输入工作单位"  maxlength="255" readonly>
                     </div>
                 </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">工作部门</label>
-                    <div class="layui-input-block">
-                        <input type="text" id="workDept" name="workDept" class="layui-input" value="" placeholder="请输入工作部门"  maxlength="255" readonly>
+                <div class="layui-form-item layui-row">
+                    <div class="layui-col-lg6">
+                        <label class="layui-form-label">工作部门</label>
+                        <div class="layui-input-block">
+                            <input type="text" id="workDept" name="workDept" class="layui-input" value="" placeholder="请输入工作部门"  maxlength="255" readonly>
+                        </div>
+                    </div>
+                    <div class="layui-col-lg6">
+                        <label class="layui-form-label">工作职务</label>
+                        <div class="layui-input-block">
+                            <input type="text" id="workTitle" name="workTitle" class="layui-input" value="" placeholder="请输入工作职务"  maxlength="255" readonly>
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-form-item layui-row">
+                    <div class="layui-col-lg6">
+                        <label class="layui-form-label">移动电话</label>
+                        <div class="layui-input-block">
+                            <input type="text" id="phone" name="phone" class="layui-input" value="" placeholder="请输入移动电话"  maxlength="11" readonly>
+                        </div>
+                    </div>
+                    <div class="layui-col-lg6">
+                        <label class="layui-form-label" style="width: 120px;">考试机构名称</label>
+                        <div class="layui-input-block" style="margin-left: 120px;">
+                            <input type="text" id="examOrgName" name="examOrgName" class="layui-input" value="" placeholder="请输入考试机构名称"  maxlength="255" readonly>
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-form-item layui-row">
+                    <div class="layui-col-lg6">
+                        <label class="layui-form-label" style="width: 120px;">知识成绩考点</label>
+                        <div class="layui-input-block" style="margin-left: 120px;">
+                            <input type="text" id="examPointName" name="examPointName" class="layui-input" value="" placeholder="请输入知识成绩考点名称"  maxlength="255" readonly>
+                        </div>
+                    </div>
+                    <div class="layui-col-lg6">
+                        <label class="layui-form-label" style="width: 120px;">实操成绩考点</label>
+                        <div class="layui-input-block" style="margin-left: 120px;">
+                            <input type="text" id="handsPointName" name="handsPointName" class="layui-input" value="" placeholder="请输入实操成绩考点名称"  maxlength="255" readonly>
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-form-item layui-row">
+                    <div class="layui-col-lg6">
+                        <label class="layui-form-label">知识成绩</label>
+                        <div class="layui-input-block">
+                            <input type="text" id="examGrade" name="examGrade" class="layui-input" value="" placeholder="请输入知识成绩"  maxlength="255">
+                        </div>
+                    </div>
+                    <div class="layui-col-lg6">
+                        <label class="layui-form-label">实操成绩</label>
+                        <div class="layui-input-block">
+                            <input type="text" id="handsGrade" name="handsGrade" class="layui-input" value="" placeholder="请输入实操成绩"  maxlength="255">
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-form-item layui-row">
+                    <div class="layui-col-lg6">
+                        <label class="layui-form-label" style="width: 120px;">补考知识成绩</label>
+                        <div class="layui-input-block" style="margin-left: 120px;">
+                            <input type="text" id="resitExamGrade" name="resitExamGrade" class="layui-input" value="" placeholder="请输入补考知识成绩"  maxlength="255">
+                        </div>
+                    </div>
+                    <div class="layui-col-lg6">
+                        <label class="layui-form-label" style="width: 120px;">补考实操成绩</label>
+                        <div class="layui-input-block" style="margin-left: 120px;">
+                            <input type="text" id="resitHandsGrade" name="resitHandsGrade" class="layui-input" value="" placeholder="请输入补考实操成绩"  maxlength="255">
+                        </div>
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label">工作职务</label>
-                    <div class="layui-input-block">
-                        <input type="text" id="workTitle" name="workTitle" class="layui-input" value="" placeholder="请输入工作职务"  maxlength="255" readonly>
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">移动电话</label>
-                    <div class="layui-input-block">
-                        <input type="text" id="phone" name="phone" class="layui-input" value="" placeholder="请输入移动电话"  maxlength="11" readonly>
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">考试机构名称</label>
-                    <div class="layui-input-block">
-                        <input type="text" id="examOrgName" name="examOrgName" class="layui-input" value="" placeholder="请输入考试机构名称"  maxlength="255" readonly>
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">知识成绩考点</label>
-                    <div class="layui-input-block">
-                        <input type="text" id="examPointName" name="examPointName" class="layui-input" value="" placeholder="请输入知识成绩考点名称"  maxlength="255" readonly>
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">实操成绩考点</label>
-                    <div class="layui-input-block">
-                        <input type="text" id="handsPointName" name="handsPointName" class="layui-input" value="" placeholder="请输入实操成绩考点名称"  maxlength="255" readonly>
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">知识成绩</label>
-                    <div class="layui-input-block">
-                        <input type="text" id="examGrade" name="examGrade" class="layui-input" value="" placeholder="请输入知识成绩"  maxlength="255">
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">实操成绩</label>
-                    <div class="layui-input-block">
-                        <input type="text" id="handsGrade" name="handsGrade" class="layui-input" value="" placeholder="请输入实操成绩"  maxlength="255">
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">补考知识成绩</label>
-                    <div class="layui-input-block">
-                        <input type="text" id="resitExamGrade" name="resitExamGrade" class="layui-input" value="" placeholder="请输入补考知识成绩"  maxlength="255">
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">补考实操成绩</label>
-                    <div class="layui-input-block">
-                        <input type="text" id="resitHandsGrade" name="resitHandsGrade" class="layui-input" value="" placeholder="请输入补考实操成绩"  maxlength="255">
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">申请发证状态</label>
-                    <div class="layui-input-block">
+                    <label class="layui-form-label" style="width: 120px;">申请发证状态</label>
+                    <div class="layui-input-block" style="margin-left: 120px;">
                         <input type="text" id="applyPaperStatus" name="applyPaperStatus" class="layui-input" value="" placeholder="请输入申请发证状态"  maxlength="255">
                     </div>
                 </div>
diff --git a/src/main/resources/templates/index4.html b/src/main/resources/templates/index4.html
index 1c3c48d..ada1d0c 100644
--- a/src/main/resources/templates/index4.html
+++ b/src/main/resources/templates/index4.html
@@ -49,7 +49,7 @@
                 searchData: function() {
                     var keywords = $('#kw').val();
                     top.dialog.open({
-                        url: top.restAjax.path('route/insertscore/search-score.html?keywords={keywords}', [keywords]),
+                        url: top.restAjax.path('route/applystudentsnew/list.html?keywords={keywords}', [keywords]),
                         title: "查看考生信息",
                         width: '80%',
                         height: '80%',