From c174b26c85b9b03894dd06d8fbf28e398709da4d Mon Sep 17 00:00:00 2001
From: wangxy <1481820854@qq.com>
Date: Tue, 20 May 2025 11:13:00 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E8=B4=A6=E5=8F=B7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/system/user/add.html  | 84 ++-----------------
 .../resources/templates/system/user/edit.html | 62 ++------------
 .../resources/templates/system/user/user.html |  8 --
 3 files changed, 14 insertions(+), 140 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/user/add.html b/ruoyi-admin/src/main/resources/templates/system/user/add.html
index a340d363..51f8ba72 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/add.html
@@ -69,9 +69,9 @@
             </div>
             <div class="col-sm-6">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label is-required">身份证号码：</label>
+                    <label class="col-sm-4 control-label">身份证号码：</label>
                     <div class="col-sm-8">
-                        <input name="cerno" placeholder="请输入身份证号码" class="form-control" type="text" maxlength="30" required>
+                        <input name="cerno" placeholder="请输入身份证号码" class="form-control" type="text" maxlength="30" >
                     </div>
                 </div>
             </div>
@@ -101,9 +101,9 @@
         <div class="row">
             <div class="col-sm-6">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label is-required">籍贯：</label>
+                    <label class="col-sm-4 control-label">籍贯：</label>
                     <div class="col-sm-8">
-                        <input name="userarea" required class="form-control" placeholder="请输入籍贯" type="text">
+                        <input name="userarea"  class="form-control" placeholder="请输入籍贯" type="text">
                     </div>
                 </div>
             </div>
@@ -169,42 +169,6 @@
         </div>
 
         <div class="row">
-            <div class="col-sm-6">
-                <div class="form-group">
-                    <label class="col-sm-4 control-label is-required">是否持有护照或港澳通行证：</label>
-                    <div class="col-sm-8">
-                        <div class="radio-box" th:each="dict : ${@dict.getType('sys_user_passport')}">
-                            <input type="radio" required th:id="${dict.dictCode}" name="havePassport" th:value="${dict.dictValue}" th:checked="${dict.default}">
-                            <label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-6">
-                <div class="form-group">
-                    <label class="col-sm-4 control-label is-required">是否具有出入境备案：</label>
-                    <div class="col-sm-8">
-                        <div class="radio-box" th:each="dict : ${@dict.getType('sys_user_passport')}">
-                            <input type="radio" required th:id="${dict.dictCode}" name="entryexitFiling" th:value="${dict.dictValue}" th:checked="${dict.default}">
-                            <label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="row">
-            <div class="col-sm-6">
-                <div class="form-group">
-                    <label class="col-sm-4 control-label">涉密程度：</label>
-                    <div class="col-sm-8">
-                        <select name="shemichengdu"  class="form-control m-b" th:with="type=${@dict.getType('sys_user_shemi')}">
-                            <option value="">---请选择---</option>
-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                        </select>
-                    </div>
-                </div>
-            </div>
             <div class="col-sm-6">
                 <div class="form-group">
                     <label class="col-sm-4 control-label">学历：</label>
@@ -213,42 +177,6 @@
                     </div>
                 </div>
             </div>
-        </div>
-        <div class="row">
-            <div class="col-sm-6">
-                <div class="form-group">
-                    <label class="col-sm-4 control-label">生效时间：</label>
-                    <div class="col-sm-8">
-                        <input name="startdate" readonly class="form-control"      type="text">
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-6">
-                <div class="form-group">
-                    <label class="col-sm-4 control-label">失效时间：</label>
-                    <div class="col-sm-8">
-                        <input name="enddate" readonly class="form-control" value="2050-12-31" type="text">
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-sm-6">
-                <div class="form-group">
-                    <label class="col-sm-4 control-label is-required">保密协议签订书：</label>
-                    <div class="fileinput fileinput-new col-sm-8" data-provides="fileinput">
-                        <span class="btn btn-white btn-file" style="overflow: visible">
-                            <span class="fileinput-new">选择文件</span>
-                            <span class="fileinput-exists">更改</span>
-                            <input type="file" id="fileUrlId" name="..." required>
-                            <input type="hidden" id="fileUrl" name="confAgreement" required>
-                            <input type="hidden" id="fileName" name="confName" required>
-                        </span>
-                        <span class="fileinput-filename"></span>
-                        <a href="#" class="close fileinput-exists" data-dismiss="fileinput" style="float: none">&times;</a>
-                    </div>
-                </div>
-            </div>
             <div class="col-sm-6">
                 <div class="form-group">
                     <label class="col-sm-4 control-label">健康状况：</label>
@@ -257,6 +185,10 @@
                     </div>
                 </div>
             </div>
+        </div>
+
+        <div class="row">
+
             <input type="hidden" id="status">
         </div>
         <h4 class="form-header h4">其他信息</h4>
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/edit.html b/ruoyi-admin/src/main/resources/templates/system/user/edit.html
index 8c67bca0..ae7cc376 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/edit.html
@@ -44,9 +44,9 @@
             </div>
             <div class="col-sm-6">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label is-required">身份证号码：</label>
+                    <label class="col-sm-4 control-label">身份证号码：</label>
                     <div class="col-sm-8">
-                        <input name="cerno" placeholder="请输入身份证号码" class="form-control" type="text" maxlength="30" th:field="*{cerno}" required>
+                        <input name="cerno" placeholder="请输入身份证号码" class="form-control" type="text" maxlength="30" th:field="*{cerno}">
                     </div>
                 </div>
             </div>
@@ -98,9 +98,9 @@
         <div class="row">
             <div class="col-sm-6">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label is-required">籍贯：</label>
+                    <label class="col-sm-4 control-label">籍贯：</label>
                     <div class="col-sm-8">
-                        <input name="userarea" required class="form-control" th:field="*{userarea}" type="text">
+                        <input name="userarea"  class="form-control" th:field="*{userarea}" type="text">
                     </div>
                 </div>
             </div>
@@ -152,54 +152,6 @@
                     </div>
                 </div>
             </div>
-            <div class="col-sm-6">
-                <div class="form-group">
-                    <label class="col-sm-4 control-label">政治面貌：</label>
-                    <div class="col-sm-8">
-                        <select name="politics" class="form-control m-b" th:with="type=${@dict.getType('sys_user_politics')}">
-                            <option value="">---请选择---</option>
-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{politics}"></option>
-                        </select>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-sm-6">
-                <div class="form-group">
-                    <label class="col-sm-4 control-label is-required">是否持有护照或港澳通行证：</label>
-                    <div class="col-sm-8">
-                        <div class="radio-box" th:each="dict : ${@dict.getType('sys_user_passport')}">
-                            <input type="radio" required th:id="${dict.dictCode}" name="havePassport" th:value="${dict.dictValue}" th:field="*{havePassport}">
-                            <label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-6">
-                <div class="form-group">
-                    <label class="col-sm-4 control-label is-required">是否具有出入境备案：</label>
-                    <div class="col-sm-8">
-                        <div class="radio-box" th:each="dict : ${@dict.getType('sys_user_passport')}">
-                            <input type="radio" required th:id="${dict.dictCode}" name="entryexitFiling" th:value="${dict.dictValue}" th:field="*{entryexitFiling}">
-                            <label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-sm-6">
-                <div class="form-group">
-                    <label class="col-sm-4 control-label">涉密程度：</label>
-                    <div class="col-sm-8">
-                        <select name="shemichengdu"  class="form-control m-b" th:with="type=${@dict.getType('sys_user_shemi')}">
-                            <option value="">---请选择---</option>
-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{shemichengdu}"></option>
-                        </select>
-                    </div>
-                </div>
-            </div>
             <div class="col-sm-6">
                 <div class="form-group">
                     <label class="col-sm-4 control-label">学历：</label>
@@ -209,7 +161,7 @@
                 </div>
             </div>
         </div>
-        <div class="row">
+        <!--<div class="row">
             <div class="form-group">
                 <label class="col-sm-2 control-label is-required">保密协议签订书：</label>
                 <br/>
@@ -225,9 +177,7 @@
                     <a href="#" class="close fileinput-exists" data-dismiss="fileinput" style="float: none">&times;</a>
                 </div>
             </div>
-        </div>
-
-
+        </div>-->
         <h4 class="form-header h4">其他信息</h4>
         <div class="row">
             <div class="col-sm-12">
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/user.html b/ruoyi-admin/src/main/resources/templates/system/user/user.html
index 9db7eaaf..e3161887 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/user.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/user.html
@@ -163,14 +163,6 @@
 		        		return statusTools(row);
 		        	}
 		        },
-					{
-						title: '审核状态',
-						align: 'center',
-						field: 'examine',
-						formatter: function(value, row, index) {
-							return $.table.selectDictLabel(examineState, value);
-						}
-					},
 		        {
 		            field: 'createTime',
 		            title: '创建时间',