From b8af2974b1e09faffcaeac552cbab73545d9e443 Mon Sep 17 00:00:00 2001
From: dsh <15569653818@163.com>
Date: Tue, 16 Apr 2024 10:13:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=89=E5=AF=86=E4=BA=BA=E5=91=98=E7=99=BB?=
 =?UTF-8?q?=E8=AE=B0=E3=80=81=E6=B6=89=E5=AF=86=E4=BA=BA=E5=91=98=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/system/user/user.html |   9 +
 .../user/userexamine/examinedetail.html       | 343 +++++++++++++++++-
 .../system/user/userexamine/userexamine.html  | 137 ++++++-
 3 files changed, 480 insertions(+), 9 deletions(-)
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 1d9f18e..68f70d2 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/user.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/user.html
@@ -93,6 +93,7 @@
 		var editFlag = [[${@permission.hasPermi('system:user:edit')}]];
 		var removeFlag = [[${@permission.hasPermi('system:user:remove')}]];
 		var resetPwdFlag = [[${@permission.hasPermi('system:user:resetPwd')}]];
+		var examineState = [[${@dict.getType('sys_examine_state')}]];
 		var prefix = ctx + "system/user";
 
 		$(function() {
@@ -162,6 +163,14 @@
 		        		return statusTools(row);
 		        	}
 		        },
+					{
+						title: '审核状态',
+						align: 'center',
+						field: 'examine',
+						formatter: function(value, row, index) {
+							return $.table.selectDictLabel(examineState, value);
+						}
+					},
 		        {
 		            field: 'createTime',
 		            title: '创建时间',
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/userexamine/examinedetail.html b/ruoyi-admin/src/main/resources/templates/system/user/userexamine/examinedetail.html
index 566549b..fa909d9 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/userexamine/examinedetail.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/userexamine/examinedetail.html
@@ -1,10 +1,347 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
 <head>
-    <meta charset="UTF-8">
-    <title>Title</title>
+    <th:block th:include="include :: header('涉密人员审核')" />
+    <th:block th:include="include :: select2-css" />
+    <th:block th:include="include :: datetimepicker-css" />
 </head>
+<style>
+    .select2-container--bootstrap.select2-container--disabled .select2-selection, .select2-container--bootstrap.select2-container--disabled .select2-selection--multiple .select2-selection__choice {
+        background: none;
+    }
+    .select2-container--bootstrap .select2-selection--multiple .select2-selection__choice {
+        color: #fff;
+        background-color: #1AB394 !important;
+        border: 1px solid #1AB394;
+        border-radius: 4px;
+        cursor: default;
+        float: left;
+        margin: 5px 0 0 6px;
+        padding: 0 6px;
+    }
+</style>
 <body>
+<div class="main-content">
+    <form class="form-horizontal" id="form-user-edit" th:object="${user}">
+        <input name="userId"  type="hidden"  th:field="*{userId}" />
+        <input name="deptId"  type="hidden"  th:field="*{deptId}" id="treeId"/>
+        <h4 class="form-header h4">基本信息</h4>
+        <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">
+                        <input name="userName" disabled placeholder="请输入用户名称" class="form-control" type="text" maxlength="30" th:field="*{userName}" required>
+                    </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">
+                        <div class="input-group">
+                            <input class="form-control" disabled type="text" name="deptName" onclick="selectDeptTree()" id="treeName" th:field="*{dept.deptName}">
+                            <span class="input-group-addon"><i class="fa fa-search"></i></span>
+                        </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">
+                        <div class="input-group">
+                            <input name="phonenumber" disabled placeholder="请输入手机号码" class="form-control" type="text" maxlength="11" th:field="*{phonenumber}">
+                            <span class="input-group-addon"><i class="fa fa-mobile"></i></span>
+                        </div>
+                    </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">
+                        <div class="input-group">
+                            <input name="email" disabled class="form-control email" type="text" maxlength="50" placeholder="请输入邮箱" th:field="*{email}">
+                            <span class="input-group-addon"><i class="fa fa-envelope"></i></span>
+                        </div>
+                    </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">
+                        <input class="form-control" disabled type="text" readonly="true" th:field="*{loginName}"/>
+                    </div>
+                </div>
+            </div>
+            <input type="hidden" id="status">
+        </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 id="post" disabled class="form-control select2-multiple" multiple>
+                            <option th:each="post:${posts}" th:value="${post.postId}" th:text="${post.postName}" th:selected="${post.flag}" th:disabled="${post.status == '1'}"></option>
+                        </select>
+                    </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="sex" disabled class="form-control m-b" th:with="type=${@dict.getType('sys_user_sex')}">
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{sex}"></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">角色：</label>
+                    <div class="col-sm-8">
+                        <label th:each="role:${roles}" class="check-box">
+                            <input name="role" disabled type="checkbox" th:value="${role.roleId}" th:text="${role.roleName}" th:checked="${role.flag}">
+                        </label>
+                    </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="helthy" disabled class="form-control"  th:field="*{helthy}" 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">用户地区：</label>
+                    <div class="col-sm-8">
+                        <input name="userarea" disabled class="form-control" th:field="*{userarea}" 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">
+                        <select name="nation" disabled class="form-control m-b" th:with="type=${@dict.getType('sys_user_nation')}">
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></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">出生年月：</label>
+                    <div class="col-sm-8">
+                        <div class="input-group date">
+                            <input name="birthday" disabled th:value="${#dates.format(user.birthday, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                            <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        </div>
+                    </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" disabled class="form-control m-b" th:with="type=${@dict.getType('sys_user_politics')}">
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></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">涉密程度：</label>
+                    <div class="col-sm-8">
+                        <select name="shemichengdu" disabled class="form-control m-b" th:with="type=${@dict.getType('sys_user_shemi')}">
+                            <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>
+                    <div class="col-sm-8">
+                        <input name="graduate" disabled th:field="*{graduate}" class="form-control" type="text">
+                    </div>
+                </div>
+            </div>
+        </div>
+        <h4 class="form-header h4">其他信息</h4>
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="form-group">
+                    <label class="col-xs-2 control-label">备注：</label>
+                    <div class="col-xs-10">
+                        <textarea name="remark" disabled maxlength="500" class="form-control" rows="3">[[*{remark}]]</textarea>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </form>
+</div>
+<div class="row">
+    <div class="col-sm-offset-5 col-sm-10">
+        <button type="button" class="btn btn-sm btn-primary" onclick="pass('0')"><i class="fa fa-check"></i>通 过</button>&nbsp;
+        <button type="button" class="btn btn-sm btn-danger" onclick="pass('1')"><i class="fa fa-remove"></i>不通过</button>&nbsp;
+        <button type="button" class="btn btn-sm btn-danger" onclick="closeItem()"><i class="fa fa-reply-all"></i>关 闭 </button>
+        <div style="display: none;" class="sysuser_name" th:text="${sysuser.userName}"></div>
+    </div>
+</div>
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: select2-js" />
+<th:block th:include="include :: datetimepicker-js" />
+<script type="text/javascript">
+    var prefix = ctx + "system/user";
 
+    $("#form-user-edit").validate({
+        onkeyup: false,
+        rules:{
+            email:{
+                email:true,
+                remote: {
+                    url: prefix + "/checkEmailUnique",
+                    type: "post",
+                    dataType: "json",
+                    data: {
+                        "userId": function() {
+                            return $("#userId").val();
+                        },
+                        "email": function() {
+                            return $.common.trim($("#email").val());
+                        }
+                    }
+                }
+            },
+            phonenumber:{
+                isPhone:true,
+                remote: {
+                    url: prefix + "/checkPhoneUnique",
+                    type: "post",
+                    dataType: "json",
+                    data: {
+                        "userId": function() {
+                            return $("#userId").val();
+                        },
+                        "phonenumber": function() {
+                            return $.common.trim($("#phonenumber").val());
+                        }
+                    }
+                }
+            },
+        },
+        messages: {
+            "email": {
+                remote: "Email已经存在"
+            },
+            "phonenumber":{
+                remote: "手机号码已经存在"
+            }
+        },
+        focusCleanup: true
+    });
+    // 获取当前北京时间
+    function getCurrentDateTime() {
+        var currentDate = new Date();
+        var year = currentDate.getFullYear(); // 年份
+        var month = currentDate.getMonth() + 1; // 月份
+        var day = currentDate.getDate(); // 当月的某一天
+        var hours = currentDate.getHours(); // 小时
+        var minutes = currentDate.getMinutes(); // 分钟
+        var seconds = currentDate.getSeconds(); // 秒钟
+        // 将时间部分补零，保证两位数显示
+        month = month < 10 ? '0' + month : month;
+        day = day < 10 ? '0' + day : day;
+        hours = hours < 10 ? '0' + hours : hours;
+        minutes = minutes < 10 ? '0' + minutes : minutes;
+        seconds = seconds < 10 ? '0' + seconds : seconds;
+
+        // 格式化输出日期时间
+        return year + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + seconds;
+    }
+    function pass(type){
+        var params = {
+            id: $("input[name='userId']").val(),
+            examine: type,
+            examineuser:document.querySelector('.sysuser_name').innerHTML ,
+            examinedate: getCurrentDateTime()
+        };
+        $.ajax({
+            type : "GET",
+            url : `/system/userexamine/saveexamine/${params.id}/${params.examine}/${params.examinedate}/${params.examineuser}`,
+            async : false,
+            beforeSend: function () {
+                $.modal.loading("正在处理中，请稍候...");
+            },
+            success: function(result) {
+                $.operate.successTabCallback(result);
+            }
+        });
+    }
+    function submitHandler() {
+        if ($.validate.form()) {
+            var data = $("#form-user-edit").serializeArray();
+            var status = $("input[id='status']").is(':checked') == true ? 0 : 1;
+            var roleIds = $.form.selectCheckeds("role");
+            var postIds = $.form.selectSelects("post");
+            data.push({"name": "status", "value": status});
+            data.push({"name": "roleIds", "value": roleIds});
+            data.push({"name": "postIds", "value": postIds});
+            $.operate.saveTab(prefix + "/edit", data);
+        }
+    }
+
+    /* 用户管理-修改-选择部门树 */
+    function selectDeptTree() {
+        var deptId = $.common.isEmpty($("#treeId").val()) ? "100" : $("#treeId").val();
+        var url = ctx + "system/user/selectDeptTree/" + deptId;
+        var options = {
+            title: '选择部门',
+            width: "380",
+            url: url,
+            callBack: doSubmit
+        };
+        $.modal.openOptions(options);
+    }
+
+    function doSubmit(index, layero){
+        var body = $.modal.getChildFrame(index);
+        $("#treeId").val(body.find('#treeId').val());
+        $("#treeName").val(body.find('#treeName').val());
+        $.modal.close(index);
+    }
+    $("input[name='birthday']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+
+    $(function() {
+        $('#post').select2({
+            placeholder: "请选择岗位",
+            allowClear: true
+        });
+    })
+</script>
 </body>
 </html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/userexamine/userexamine.html b/ruoyi-admin/src/main/resources/templates/system/user/userexamine/userexamine.html
index 2227d8c..e6abd0b 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/userexamine/userexamine.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/userexamine/userexamine.html
@@ -1,12 +1,137 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-    <meta charset="UTF-8">
-    <title>
-        Title
-    </title>
+    <th:block th:include="include :: header('涉密人员审核列表')" />
 </head>
-<body>
+<body class="gray-bg">
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <label>人员状态：</label>
+                            <select name="trainState" th:with="type=${@dict.getType('sys_normal_disable')}">
+                                <option value="">所有</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                            </select>
+                        </li>
+                        <li>
+                            <label>审核状态：</label>
+                            <select name="trainState" th:with="type=${@dict.getType('sys_examine_state')}">
+                                <option value="">所有</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                            </select>
+                        </li>
+                        <li>
+                            <label>人员姓名：</label>
+                            <input type="text" name="trainName"/>
+                        </li>
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
+        </div>
+    </div>
+</div>
+<th:block th:include="include :: footer" />
+<script th:inline="javascript">
+    var examineFlag = [[${@permission.hasPermi('system:userexamine:examine')}]];
+    var downloadFlag = [[${@permission.hasPermi('system:userexamine:examine')}]];
+    var userStatus = [[${@dict.getType('sys_normal_disable')}]];
+    var userPolitics = [[${@dict.getType('sys_user_politics')}]];
+    var examineState = [[${@dict.getType('sys_examine_state')}]];
+    var prefix = ctx + "system/user";
 
+    $(function() {
+        var options = {
+            url: prefix + "/list",
+            modalName: "涉密人员审核",
+            columns: [{
+                checkbox: true
+            },
+                {
+                    field: 'userId',
+                    title: 'id',
+                },
+                {
+                    field: 'loginName',
+                    title: '人员编号',
+                },
+                {
+                    field: 'examine',
+                    title: '审核状态',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(examineState, value);
+                    }
+                },
+                {
+                    field: 'examineuser',
+                    title: '审核人',
+                },
+                {
+                    field: 'examinedate',
+                    title: '审核时间',
+                },
+                {
+                    field: 'userName',
+                    title: '人员姓名',
+                },
+                {
+                    field: 'status',
+                    title: '用户状态',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(userStatus, value);
+                    }
+                },
+                {
+                    field: 'phonenumber',
+                    title: '联系电话'
+                },
+                {
+                    field: 'politics',
+                    title: '政治面貌',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(userPolitics, value);
+                    }
+                },
+                {
+                    field: 'userarea',
+                    title: '户籍地址',
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        if(row.examine !== '2'){
+                            actions.push('<a disabled class="btn btn-success btn-xs ' + examineFlag + '" href="javascript:void(0)"><i class="fa fa-edit"></i>审核</a> ');
+                            actions.push('<a class="btn btn-success btn-xs ' + downloadFlag + '" href="javascript:void(0)"><i class="fa fa-download"></i>打印</a> ');
+                        }else{
+                            actions.push('<a class="btn btn-success btn-xs ' + examineFlag + '" href="javascript:void(0)" onclick="examinedetail(\'' + row.userId + '\')"><i class="fa fa-edit"></i>审核</a> ');
+                            actions.push('<a class="btn btn-success btn-xs ' + downloadFlag + '" href="javascript:void(0)" onclick="download(\'' + row.userId + '\')"><i class="fa fa-download"></i>打印</a> ');
+                        }
+                        return actions.join('');
+                    }
+                }]
+        };
+        $.table.init(options);
+    });
+    function examinedetail(id) {
+        var url ='/system/userexamine/examine/' + id;
+        $.modal.openTab("涉密人员审核", url);
+    }
+    function download(id){
+        var url ='/system/userexamine/examine/' + id;
+        $.modal.openTab("涉密人员审核", url);
+    }
+</script>
 </body>
 </html>
\ No newline at end of file
