From 035a0adf488767288aac4d15bc70e76a4d4a5e17 Mon Sep 17 00:00:00 2001
From: kgdxpr <kgdxpr@163.com>
Date: Fri, 19 Jul 2024 14:30:31 +0800
Subject: [PATCH] 'commit'

---
 WebRoot/view/ywgl/xswh/add.html    | 47 +++++++++++++++---------------
 WebRoot/view/ywgl/xswh/update.html | 44 +++++++++++++++-------------
 2 files changed, 47 insertions(+), 44 deletions(-)

diff --git a/WebRoot/view/ywgl/xswh/add.html b/WebRoot/view/ywgl/xswh/add.html
index fb421063..c001a0e5 100644
--- a/WebRoot/view/ywgl/xswh/add.html
+++ b/WebRoot/view/ywgl/xswh/add.html
@@ -76,20 +76,12 @@
 
                 <div class="layui-form-item">
                     <label class="layui-form-label" style="width: 100px !important;"><span
-                        class="require-star"></span>学籍号</label>
-                    <div class="layui-input-block">
-                        <input type="text" name="xjh" id="xjh" lay-verify="required" autocomplete="off" placeholder="请输入学籍号"
-                            class="layui-input input-width">
-                    </div>
-                </div>
-
-                <!-- <div class="layui-form-item">
-                    <label class="layui-form-label" style="width: 100px !important;">出生日期</label>
+                        class="require-star"></span>身份证号</label>
                     <div class="layui-input-block">
-                        <input type="text" id="birthday" name="birthday" autocomplete="off"
-                            placeholder="请输入出生日期" class="layui-input input-width">
+                        <input type="text" id="id_card" name="id_card" lay-verify="required|idCard" autocomplete="off"
+                            placeholder="请输入身份证号" class="layui-input input-width">
                     </div>
-                </div> -->
+                </div>  
 
                 <div class="layui-form-item">
                     <label class="layui-form-label" style="width: 100px !important;">学生来源</label>
@@ -100,24 +92,33 @@
                             <option value="9">其他</option>
                         </select>
                     </div>
-                </div>
+                </div>                
 
                 <!-- <div class="layui-form-item">
-                    <label class="layui-form-label" style="width: 100px !important;">身份证号</label>
+                    <label class="layui-form-label" style="width: 100px !important;"><span
+                            class="require-star"></span>排序号</label>
                     <div class="layui-input-block">
-                        <input type="text" id="id_card" name="id_card" lay-verify="" autocomplete="off"
-                            placeholder="请输入身份证号" class="layui-input input-width">
+                        <input type="text" name="sort_id" lay-verify="required|sort" autocomplete="off"
+                            placeholder="请输入排序号" class="layui-input input-width">
+                    </div>
+                </div>  -->
+
+                <!-- <div class="layui-form-item">
+                    <label class="layui-form-label" style="width: 100px !important;">出生日期</label>
+                    <div class="layui-input-block">
+                        <input type="text" id="birthday" name="birthday" autocomplete="off"
+                            placeholder="请输入出生日期" class="layui-input input-width">
                     </div>
                 </div> -->
 
-                <div class="layui-form-item">
+                <!-- <div class="layui-form-item">
                     <label class="layui-form-label" style="width: 100px !important;"><span
-                            class="require-star"></span>排序号</label>
+                        class="require-star"></span>学籍号</label>
                     <div class="layui-input-block">
-                        <input type="text" name="sort_id" lay-verify="required|sort" autocomplete="off"
-                            placeholder="请输入排序号" class="layui-input input-width">
+                        <input type="text" name="xjh" id="xjh" lay-verify="required" autocomplete="off" placeholder="请输入学籍号"
+                            class="layui-input input-width">
                     </div>
-                </div> 
+                </div> -->
 
                 <!-- <div class="layui-form-item">
                     <label class="layui-form-label" style="width: 100px !important;">学籍辅号</label>
@@ -164,8 +165,8 @@
 
             // 自定义验证
             form.verify({
-                sort: [/^\d{1,5}$/, '只能输入1-5位的数字']
-                // idCard: [/^[1-9]\d{5}(19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/, '身份证号的格式不正确']
+                //sort: [/^\d{1,5}$/, '只能输入1-5位的数字']
+                idCard: [/^[1-9]\d{5}(19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/, '身份证号的格式不正确']
             });
 
             let loading = layer.load();
diff --git a/WebRoot/view/ywgl/xswh/update.html b/WebRoot/view/ywgl/xswh/update.html
index 04e408a1..ffe0b50e 100644
--- a/WebRoot/view/ywgl/xswh/update.html
+++ b/WebRoot/view/ywgl/xswh/update.html
@@ -75,13 +75,33 @@
                 </div>
 
                 <div class="layui-form-item">
+                    <label class="layui-form-label" style="width: 100px !important;"><span
+                            class="require-star"></span>身份证号</label>
+                    <div class="layui-input-block">
+                        <input type="text" id="id_card" name="id_card" lay-verify="required|idCard" autocomplete="off"
+                            placeholder="请输入身份证号" class="layui-input input-width">
+                    </div>
+                </div>                
+
+                <div class="layui-form-item">
+                    <label class="layui-form-label" style="width: 100px !important;">学生来源</label>
+                    <div class="layui-input-inline" id="zzmmView">
+                        <select id="stu_source" name="stu_source">
+                            <option value="1">正常入学</option>
+                            <option value="2">借读</option>
+                            <option value="9">其他</option>
+                        </select>
+                    </div>
+                </div>
+
+                <!-- <div class="layui-form-item">
                     <label class="layui-form-label" style="width: 100px !important;"><span
                             class="require-star"></span>学籍号</label>
                     <div class="layui-input-block">
                         <input type="text" id="xjh" name="xjh" lay-verify="required" autocomplete="off"
                             placeholder="请输入学籍号" class="layui-input input-width">
                     </div>
-                </div>
+                </div> -->
 
                 <!-- <div class="layui-form-item">
                     <label class="layui-form-label" style="width: 100px !important;">出生日期</label>
@@ -91,14 +111,7 @@
                     </div>
                 </div> -->
 
-                <!-- <div class="layui-form-item">
-                    <label class="layui-form-label" style="width: 100px !important;"><span
-                            class="require-star"></span>身份证号</label>
-                    <div class="layui-input-block">
-                        <input type="text" id="id_card" name="id_card" lay-verify="required|idCard" autocomplete="off"
-                            placeholder="请输入身份证号" class="layui-input input-width">
-                    </div>
-                </div> -->
+                
 
                 <!-- <div class="layui-form-item">
                     <label class="layui-form-label" style="width: 100px !important;"><span
@@ -117,17 +130,6 @@
                     </div>
                 </div> -->
 
-                <div class="layui-form-item">
-                    <label class="layui-form-label" style="width: 100px !important;">学生来源</label>
-                    <div class="layui-input-inline" id="zzmmView">
-                        <select id="stu_source" name="stu_source">
-                            <option value="1">正常入学</option>
-                            <option value="2">借读</option>
-                            <option value="9">其他</option>
-                        </select>
-                    </div>
-                </div>
-
 
 
 
@@ -162,7 +164,7 @@
 
             // 自定义验证
             form.verify({
-                sort: [/^\d{1,5}$/, '只能输入1-5位的数字'],
+                //sort: [/^\d{1,5}$/, '只能输入1-5位的数字'],
                 idCard: [/^[1-9]\d{5}(19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/, '身份证号的格式不正确']
             });