Browse Source

fix 机构列表 机构编辑

liu 2 years ago
parent
commit
2eb5d536ff

+ 230 - 47
ruoyi-admin/src/main/resources/templates/system/dept/dept.html

@@ -2,21 +2,127 @@
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
     <th:block th:include="include :: header('机构列表')"/>
+    <style>
+        .my-skin .layui-layer-btn .layui-layer-btn0{
+            background-color: #6F63DD;
+            color: #FFF;
+        }
+
+        .layui-input-block{
+            margin-left: 0px;
+        }
+
+        .layui-form-switch em{
+            position: relative;
+            top: -2px;
+        }
+
+        /* 新改 */
+        .table > thead > tr > th {
+            color: #666;
+            border: none!important;
+        }
+        .table > thead > tr > td {
+            border-bottom: 1px solid #fafafa!important;
+        }
+
+        .table > tbody > tr > td {
+            border-bottom: 1px solid #EBEFFA!important;
+        }
+
+        .table > thead > tr {
+            background-color: #FAFAFA;
+            height: 44px;
+        }
+
+        .table > tbody > tr {
+            height: 80px;
+        }
+
+        .row {
+            background: white;
+            border-radius: 4px;
+            padding: 22px;
+            /*margin: 0 0 24px 0;*/
+        }
+
+        .ibox-title, .ibox-content{
+            border: none!important;
+            padding: 0;
+        }
+
+        .top-file-show{
+            height: 48px;
+            line-height: 48px;
+            background: #EBEFFA;
+            border-radius: 48px;
+            color: #5780E9;
+            padding: 0 50px;
+        }
+
+        .need-del-last-border > a:last-child{
+            border-right: none!important;
+        }
+
+        /* //定义滚动条宽高,滚动条背景 */
+        ::-webkit-scrollbar{
+            width:10px;
+            height:10px;
+        }
+        /* //滚动条的轨道颜色,轨道阴影,轨道圆角 */
+        ::-webkit-scrollbar-track{
+            -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.1);
+            background-color: #f4f7fe;
+            border-radius: 4px;
+        }
+        /* //滑块颜色,滑块阴影,滑块圆角 */
+        ::-webkit-scrollbar-thumb{
+            border-radius: 4px;
+            -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.1);
+            background-color: #efefef;
+        }
+
+        /* 弹出层 */
+        .add-mask-box-class{
+            background: #E4ECFF;
+        }
+
+        .add-mask-box-class .layui-layer-title{
+            background: #E4ECFF;
+            color: #333;
+            font-weight: 700;
+            font-size: 24px;
+            height: 70px;
+            line-height: 70px;
+        }
+        .add-mask-box-class .layui-layer-content{
+            padding-top: 0!important;
+        }
+
+        .add-mask-box-class .layui-layer-btn{
+            background: #EBEFFA!important;
+            text-align: center!important;
+        }
+
+    </style>
 
 </head>
-<body class="white-bg">
-<div class="container-div">
-    <div class="row">
-        <div class="col-sm-12 search-collapse">
+
+<body class="">
+
+<div class="bg-9ac">
+    <!-- 待办 -->
+    <div class="row ibox border-none" style="box-shadow: none;border: none;">
+        <div>
             <form id="formId">
-                <div class="select-list">
+                <div class="select-list flex align-center">
                     <ul>
                         <li>
-                            <p>机构名称:</p>
+                            <p style="height: 40px;line-height: 40px;margin: 0;text-align:left;width: 65px;">机构名称: </p>
                             <input type="text" name="deptName"/>
                         </li>
                         <li>
-                            <p>机构层次:</p>
+                            <p style="height: 40px;line-height: 40px;margin: 0;width: 65px;">机构层次: </p>
                             <select name="deptLevel" th:with="type=${@dict.getType('dept_level')}">
                                 <option value="">所有</option>
                                 <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
@@ -24,68 +130,145 @@
                             </select>
                         </li>
                         <li>
-                            <p>机构类别:</p>
+                            <p style="height: 40px;line-height: 40px;margin: 0;width: 65px;">机构类别: </p>
                             <select name="deptCategory" th:with="type=${@dict.getType('dept_category')}">
                                 <option value="">所有</option>
                                 <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
                                         th:value="${dict.dictValue}"></option>
                             </select>
                         </li>
-<!--                        <li>-->
-<!--                            <p>机构政区:</p>-->
-<!--                            <input name="administrativeZones" type="hidden" id="administrativeZones">-->
-<!--                            <input type="text" id="administrativeZonesText" style="background-color: white"-->
-<!--                                   onclick="selectDataTree('dept_administrative_zones','administrativeZones','administrativeZonesText')" readonly>-->
-<!--                        </li>-->
                         <li>
-                            <p>机构状态:</p>
+                            <p style="height: 40px;line-height: 40px;margin: 0;width: 65px;">机构状态: </p>
                             <select name="status" 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>
-                            <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i
-                                    class="fa fa-search"></i>&nbsp;搜索</a>
-                            <a class="btn btn-white btn-rounded btn-sm" onclick="$.form.reset()"><i
-                                    class="fa fa-refresh"></i>&nbsp;重置</a>
+
+                        <li class="flex align-center">
+                            <button onclick="$.table.search()" type="button" class="btn btn-bg-blue padding-lr-36 margin-lr-10 flex align-center">
+                                <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" fill="currentColor" class="bi bi-search margin-r-8" viewBox="0 0 16 16">
+                                    <path d="M11.742 10.344a6.5 6.5 0 1 0-1.397 1.398h-.001c.03.04.062.078.098.115l3.85 3.85a1 1 0 0 0 1.415-1.414l-3.85-3.85a1.007 1.007 0 0 0-.115-.1zM12 6.5a5.5 5.5 0 1 1-11 0 5.5 5.5 0 0 1 11 0z"/>
+                                </svg>
+                                搜索
+                            </button>
+                            <button onclick="empty()" type="button" class="btn btn-border-bg-blue padding-lr-36 margin-lr-10 flex align-center">
+                                <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" fill="currentColor" class="bi bi-arrow-counterclockwise margin-r-8" viewBox="0 0 16 16">
+                                    <path fill-rule="evenodd" d="M8 3a5 5 0 1 1-4.546 2.914.5.5 0 0 0-.908-.417A6 6 0 1 0 8 2v1z"/>
+                                    <path d="M8 4.466V.534a.25.25 0 0 0-.41-.192L5.23 2.308a.25.25 0 0 0 0 .384l2.36 1.966A.25.25 0 0 0 8 4.466z"/>
+                                </svg>
+                                重置
+                            </button>
                         </li>
                     </ul>
                 </div>
             </form>
         </div>
-
-        <div class="btn-group-sm" id="toolbar" role="group">
-            <a class="btn btn-success" onclick="add()" shiro:hasPermission="system:dept:add">
-                <i class="fa fa-plus"></i> 新增
-            </a>
-            <a class="btn btn-white single disabled" onclick="edit()" shiro:hasPermission="system:dept:edit">
-                <i class="fa fa-edit"></i> 修改
-            </a>
-            <a class="btn btn-white single disabled" onclick="remove()"
-               shiro:hasPermission="system:dept:remove">
-                <i class="fa fa-remove"></i> 删除
-            </a>
-
-       <!--     <a class="btn btn-info" onclick="$.table.importExcel('uploadTpl')" shiro:hasPermission="system:dept:export">
-                <i class="fa fa-upload"></i> 导入
-            </a>
-            <a class="btn btn-white" onclick="$.table.exportExcel()" shiro:hasPermission="system:dept:export">
-                <i class="fa fa-download"></i> 导出
-            </a>-->
-            <a class="btn btn-white single disabled" th:if="${dept.initializedPermissions} eq '1'"
-               onclick="upload($.table.selectColumns('deptId'))" shiro:hasPermission="system:dept:upload">
-                <i class="fa fa-download"></i> 上传承诺书
-            </a>
+        <div class="flex align-center" id="toolbar" role="group">
+            <button type="button" onclick="add()" shiro:hasPermission="system:dept:add" class="btn btn-bg-blue padding-lr-12" style="margin-right: 16px">
+                <i class="fa fa-plus margin-r-8"></i> 新增</button>
+            <button type="button" id="editButton" onclick="edit()" shiro:hasPermission="system:dept:edit" class="btn btn-border-333 padding-lr-12 multiple disabled" style="margin-right: 16px" >
+                <i class="fa fa-edit margin-r-8"></i> 修改</button>
+            <button type="button" onclick="remove()"
+                    shiro:hasPermission="system:dept:remove" class="btn btn-border-333 padding-lr-12 multiple disabled" style="margin-right: 16px">
+                <i class="fa fa-remove margin-r-8"></i> 删除</button>
+            <button type="button" th:if="${dept.initializedPermissions} eq '1'"
+                    onclick="upload($.table.selectColumns('deptId'))" shiro:hasPermission="system:dept:upload" class="btn btn-border-333 padding-lr-12" style="margin-right: 16px">
+                <i class="fa fa-download"></i> 上传承诺书</button>
         </div>
-
-        <div class="col-sm-12 select-table table-striped">
-            <table id="bootstrap-table"></table>
+        <div class="ibox-content">
+            <div>
+                <div class="col-sm-12 select-table" style="padding: 0;box-shadow: none;">
+                    <table id="bootstrap-table"></table>
+                </div>
+            </div>
         </div>
-
     </div>
 </div>
+
+<!--<body class="white-bg">-->
+<!--<div class="container-div">-->
+<!--    <div class="row">-->
+<!--        <div class="col-sm-12 search-collapse">-->
+<!--            <form id="formId">-->
+<!--                <div class="select-list">-->
+<!--                    <ul>-->
+<!--                        <li>-->
+<!--                            <p>机构名称:</p>-->
+<!--                            <input type="text" name="deptName"/>-->
+<!--                        </li>-->
+<!--                        <li>-->
+<!--                            <p>机构层次:</p>-->
+<!--                            <select name="deptLevel" th:with="type=${@dict.getType('dept_level')}">-->
+<!--                                <option value="">所有</option>-->
+<!--                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}"-->
+<!--                                        th:value="${dict.dictValue}"></option>-->
+<!--                            </select>-->
+<!--                        </li>-->
+<!--                        <li>-->
+<!--                            <p>机构类别:</p>-->
+<!--                            <select name="deptCategory" th:with="type=${@dict.getType('dept_category')}">-->
+<!--                                <option value="">所有</option>-->
+<!--                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}"-->
+<!--                                        th:value="${dict.dictValue}"></option>-->
+<!--                            </select>-->
+<!--                        </li>-->
+<!--&lt;!&ndash;                        <li>&ndash;&gt;-->
+<!--&lt;!&ndash;                            <p>机构政区:</p>&ndash;&gt;-->
+<!--&lt;!&ndash;                            <input name="administrativeZones" type="hidden" id="administrativeZones">&ndash;&gt;-->
+<!--&lt;!&ndash;                            <input type="text" id="administrativeZonesText" style="background-color: white"&ndash;&gt;-->
+<!--&lt;!&ndash;                                   onclick="selectDataTree('dept_administrative_zones','administrativeZones','administrativeZonesText')" readonly>&ndash;&gt;-->
+<!--&lt;!&ndash;                        </li>&ndash;&gt;-->
+<!--                        <li>-->
+<!--                            <p>机构状态:</p>-->
+<!--                            <select name="status" 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>-->
+<!--                            <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i-->
+<!--                                    class="fa fa-search"></i>&nbsp;搜索</a>-->
+<!--                            <a class="btn btn-white btn-rounded btn-sm" onclick="$.form.reset()"><i-->
+<!--                                    class="fa fa-refresh"></i>&nbsp;重置</a>-->
+<!--                        </li>-->
+<!--                    </ul>-->
+<!--                </div>-->
+<!--            </form>-->
+<!--        </div>-->
+
+<!--        <div class="btn-group-sm" id="toolbar" role="group">-->
+<!--            <a class="btn btn-success" onclick="add()" shiro:hasPermission="system:dept:add">-->
+<!--                <i class="fa fa-plus"></i> 新增-->
+<!--            </a>-->
+<!--            <a class="btn btn-white single disabled" onclick="edit()" shiro:hasPermission="system:dept:edit">-->
+<!--                <i class="fa fa-edit"></i> 修改-->
+<!--            </a>-->
+<!--            <a class="btn btn-white single disabled" onclick="remove()"-->
+<!--               shiro:hasPermission="system:dept:remove">-->
+<!--                <i class="fa fa-remove"></i> 删除-->
+<!--            </a>-->
+
+<!--       &lt;!&ndash;     <a class="btn btn-info" onclick="$.table.importExcel('uploadTpl')" shiro:hasPermission="system:dept:export">-->
+<!--                <i class="fa fa-upload"></i> 导入-->
+<!--            </a>-->
+<!--            <a class="btn btn-white" onclick="$.table.exportExcel()" shiro:hasPermission="system:dept:export">-->
+<!--                <i class="fa fa-download"></i> 导出-->
+<!--            </a>&ndash;&gt;-->
+<!--            <a class="btn btn-white single disabled" th:if="${dept.initializedPermissions} eq '1'"-->
+<!--               onclick="upload($.table.selectColumns('deptId'))" shiro:hasPermission="system:dept:upload">-->
+<!--                <i class="fa fa-download"></i> 上传承诺书-->
+<!--            </a>-->
+<!--        </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 addFlag = [[${@permission.hasPermi('system:dept:add')}]];

+ 175 - 49
ruoyi-admin/src/main/resources/templates/system/dept/deptAll.html

@@ -2,61 +2,187 @@
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
     <th:block th:include="include :: header('机构综合展示页')"/>
+    <style>
+        .mar {
+            width: 80%;
+            margin: auto !important;
+        }
+
+        .div-ul {
+            position: fixed;
+            z-index: 1;
+            width: 100%;
+            padding: 0px;
+        }
+
+        .div-mar {
+            margin-top: 4.5%;
+        }
+
+        /*.nav li:hover{*/
+        /*    cursor: pointer;*/
+        /*    !*border-bottom: 2px solid #109dff;*!*/
+        /*    background-color: #109dff;*/
+        /*}*/
+        .ac {
+            background-color: #eeeeee;
+        }
+
+        .bs-bars {
+            margin-left: 17%;
+        }
+
+        .nav-pills li a {
+            width: 129px;
+            text-align: center;
+
+        }
+
+        /* //定义滚动条宽高,滚动条背景 */
+        ::-webkit-scrollbar {
+            width: 10px;
+            height: 10px;
+        }
+
+        /* //滚动条的轨道颜色,轨道阴影,轨道圆角 */
+        ::-webkit-scrollbar-track {
+            -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .1);
+            background-color: #f4f7fe;
+            border-radius: 4px;
+        }
+
+        /* //滑块颜色,滑块阴影,滑块圆角 */
+        ::-webkit-scrollbar-thumb {
+            border-radius: 4px;
+            -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .1);
+            background-color: #efefef;
+        }
+
+        .add-block {
+            background: white;
+            border-radius: 4px;
+            padding: 0 24px;
+            margin-bottom: 24px;
+        }
+
+        .is-row-title{
+            margin-bottom: 26px;
+        }
+
+        .row{
+            margin-bottom: 24px;
+        }
+
+        .form-control[disabled], .form-control[readonly]{
+            background: #F3F3F3;
+            border: 1px solid #D1D1D1;
+            border-radius: 4px;
+            height: 40px;
+            line-height: 40px;
+        }
+
+        .input-group-addon{
+            background: #F3F3F3;
+            border: 1px solid #D1D1D1;
+            border-radius: 4px;
+        }
+
+        label{
+            margin-bottom: 10px;
+        }
+    </style>
 </head>
-<body class="gray-bg">
-<div class="container-div">
-    <div class="row">
-        <div class="col-sm-12" style="padding-left: 0;padding-right: 0px;margin-top: 10px">
-            <div class="ibox float-e-margins" style="margin-bottom: 0px">
-                <div class="ibox-title" style="border-radius: 12px">
-                    <h5>机构信息</h5>
-                    <div class="ibox-tools">
-                        <a class="collapse-link"><i class="fa fa-chevron-up"></i>
-                        </a>
-                        <!--                        <a class="close-link"><i class="fa fa-times"></i></a>-->
-                    </div>
-                </div>
-                <div class="ibox-content" style="border-bottom-left-radius: 12px;border-bottom-right-radius: 12px">
-                    <iframe id="iframe11" frameborder="0" name="iframe11" style="width: 100%;height: 750px" src=""></iframe>
-                </div>
-            </div>
-        </div>
+<body class="">
 
-        <div class="col-sm-12" style="padding-left: 0;padding-right: 0px;margin-top: 10px">
-            <div class="ibox float-e-margins" style="margin-bottom: 0px">
-                <div class="ibox-title" style="border-radius: 12px">
-                    <h5>岗位信息</h5>
-                    <div class="ibox-tools">
-                        <a class="collapse-link"><i class="fa fa-chevron-up"></i>
-                        </a>
-                        <!--                        <a class="close-link"><i class="fa fa-times"></i></a>-->
-                    </div>
-                </div>
-                <div class="ibox-content" style="border-bottom-left-radius: 12px;border-bottom-right-radius: 12px">
-<!--                    <iframe id="iframe21" frameborder="0" name="iframe21" style="width: 100%;height: 700px" src=""></iframe>-->
-                    <iframe id="iframe22" frameborder="0" name="iframe22" style="width: 100%;height: 850px" src=""></iframe>
-                </div>
-            </div>
+<div class="bg-9ac">
+<!-- 机构信息 -->
+    <div class="add-block">
+        <div id="post3" style="height: 24px"></div>
+        <div class="is-row-title flex align-center">
+            <div style=" width:4px;height:18px; margin-right: 12px;background: #4377FE;"></div>
+            <span class="ft-20 font-weight color-333">机构信息</span>
         </div>
-
-        <div class="col-sm-12" style="padding-left: 0;padding-right: 0px;margin-top: 10px">
-            <div class="ibox float-e-margins" style="margin-bottom: 0px">
-                <div class="ibox-title" style="border-radius: 12px">
-                    <h5>人员信息</h5>
-                    <div class="ibox-tools">
-                        <a class="collapse-link"><i class="fa fa-chevron-up"></i>
-                        </a>
-                        <!--                        <a class="close-link"><i class="fa fa-times"></i></a>-->
-                    </div>
-                </div>
-                <div class="ibox-content" style="border-bottom-left-radius: 12px;border-bottom-right-radius: 12px">
-                    <iframe id="iframe31" frameborder="0" name="iframe31" style="width: 100%;" src=""></iframe>
-                </div>
-            </div>
+        <div class="ibox-content" style="border-bottom-left-radius: 12px;border-bottom-right-radius: 12px">
+            <iframe id="iframe11" frameborder="0" name="iframe11" style="width: 100%;height: 750px" src=""></iframe>
+        </div>
+    </div>
+    <!-- 岗位信息 -->
+    <div class="add-block">
+        <div id="post3" style="height: 24px"></div>
+        <div class="is-row-title flex align-center">
+            <div style=" width:4px;height:18px; margin-right: 12px;background: #4377FE;"></div>
+            <span class="ft-20 font-weight color-333">岗位信息</span>
+        </div>
+        <div class="ibox-content" style="border-bottom-left-radius: 12px;border-bottom-right-radius: 12px">
+            <iframe id="iframe22" frameborder="0" name="iframe22" style="width: 100%;height: 850px" src=""></iframe>
+        </div>
+    </div>
+    <!-- 人员信息 -->
+    <div class="add-block">
+        <div id="post3" style="height: 24px"></div>
+        <div class="is-row-title flex align-center">
+            <div style=" width:4px;height:18px; margin-right: 12px;background: #4377FE;"></div>
+            <span class="ft-20 font-weight color-333">人员信息</span>
+        </div>
+        <div class="ibox-content" style="border-bottom-left-radius: 12px;border-bottom-right-radius: 12px">
+            <iframe id="iframe31" frameborder="0" name="iframe31" style="width: 100%;" src=""></iframe>
         </div>
-
     </div>
 </div>
+
+<!--<div class="container-div">-->
+<!--    <div class="row">-->
+<!--        <div class="col-sm-12" style="padding-left: 0;padding-right: 0px;margin-top: 10px">-->
+<!--            <div class="ibox float-e-margins" style="margin-bottom: 0px">-->
+<!--                <div class="ibox-title" style="border-radius: 12px">-->
+<!--                    <h5>机构信息</h5>-->
+<!--                    <div class="ibox-tools">-->
+<!--                        <a class="collapse-link"><i class="fa fa-chevron-up"></i>-->
+<!--                        </a>-->
+<!--                        &lt;!&ndash;                        <a class="close-link"><i class="fa fa-times"></i></a>&ndash;&gt;-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--                <div class="ibox-content" style="border-bottom-left-radius: 12px;border-bottom-right-radius: 12px">-->
+<!--                    <iframe id="iframe11" frameborder="0" name="iframe11" style="width: 100%;height: 750px" src=""></iframe>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
+
+<!--        <div class="col-sm-12" style="padding-left: 0;padding-right: 0px;margin-top: 10px">-->
+<!--            <div class="ibox float-e-margins" style="margin-bottom: 0px">-->
+<!--                <div class="ibox-title" style="border-radius: 12px">-->
+<!--                    <h5>岗位信息</h5>-->
+<!--                    <div class="ibox-tools">-->
+<!--                        <a class="collapse-link"><i class="fa fa-chevron-up"></i>-->
+<!--                        </a>-->
+<!--                        &lt;!&ndash;                        <a class="close-link"><i class="fa fa-times"></i></a>&ndash;&gt;-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--                <div class="ibox-content" style="border-bottom-left-radius: 12px;border-bottom-right-radius: 12px">-->
+<!--&lt;!&ndash;                    <iframe id="iframe21" frameborder="0" name="iframe21" style="width: 100%;height: 700px" src=""></iframe>&ndash;&gt;-->
+<!--                    <iframe id="iframe22" frameborder="0" name="iframe22" style="width: 100%;height: 850px" src=""></iframe>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
+
+<!--        <div class="col-sm-12" style="padding-left: 0;padding-right: 0px;margin-top: 10px">-->
+<!--            <div class="ibox float-e-margins" style="margin-bottom: 0px">-->
+<!--                <div class="ibox-title" style="border-radius: 12px">-->
+<!--                    <h5>人员信息</h5>-->
+<!--                    <div class="ibox-tools">-->
+<!--                        <a class="collapse-link"><i class="fa fa-chevron-up"></i>-->
+<!--                        </a>-->
+<!--                        &lt;!&ndash;                        <a class="close-link"><i class="fa fa-times"></i></a>&ndash;&gt;-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--                <div class="ibox-content" style="border-bottom-left-radius: 12px;border-bottom-right-radius: 12px">-->
+<!--                    <iframe id="iframe31" frameborder="0" name="iframe31" style="width: 100%;" src=""></iframe>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
+
+<!--    </div>-->
+<!--</div>-->
 <th:block th:include="include :: footer"/>
 <script th:inline="javascript">
     var deptId = [[${deptId}]];

+ 654 - 251
ruoyi-admin/src/main/resources/templates/system/dept/edit.html

@@ -4,317 +4,408 @@
     <th:block th:include="include :: header('修改机构')"/>
     <th:block th:include="include :: datetimepicker-css"/>
     <style>
-        .form-group {
+        .mar {
             width: 80%;
             margin: auto !important;
         }
+
+        .div-ul {
+            position: fixed;
+            z-index: 1;
+            width: 100%;
+            padding: 0px;
+        }
+
+        .div-mar {
+            margin-top: 4.5%;
+        }
+
+        /*.nav li:hover{*/
+        /*    cursor: pointer;*/
+        /*    !*border-bottom: 2px solid #109dff;*!*/
+        /*    background-color: #109dff;*/
+        /*}*/
+        .ac {
+            background-color: #eeeeee;
+        }
+
+        .bs-bars {
+            margin-left: 17%;
+        }
+
+        .nav-pills li a {
+            width: 129px;
+            text-align: center;
+
+        }
+
+        /* //定义滚动条宽高,滚动条背景 */
+        ::-webkit-scrollbar {
+            width: 10px;
+            height: 10px;
+        }
+
+        /* //滚动条的轨道颜色,轨道阴影,轨道圆角 */
+        ::-webkit-scrollbar-track {
+            -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .1);
+            background-color: #f4f7fe;
+            border-radius: 4px;
+        }
+
+        /* //滑块颜色,滑块阴影,滑块圆角 */
+        ::-webkit-scrollbar-thumb {
+            border-radius: 4px;
+            -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .1);
+            background-color: #efefef;
+        }
+
+        .add-block {
+            background: white;
+            border-radius: 4px;
+            padding: 0 24px;
+            margin-bottom: 24px;
+        }
+
+        .is-row-title{
+            margin-bottom: 26px;
+        }
+
+        .row{
+            margin-bottom: 24px;
+        }
+
+        .form-control[disabled], .form-control[readonly]{
+            background: #F3F3F3;
+            border: 1px solid #D1D1D1;
+            border-radius: 4px;
+            height: 40px;
+            line-height: 40px;
+        }
+
+        .input-group-addon{
+            background: #F3F3F3;
+            border: 1px solid #D1D1D1;
+            border-radius: 4px;
+        }
+
+        label{
+            margin-bottom: 10px;
+        }
+
+        .form-control{
+            background: #F3F3F3;
+            border: 1px solid #D1D1D1;
+            border-radius: 4px;
+            height: 40px;
+            line-height: 40px;
+        }
     </style>
 </head>
-<body class="white-bg">
-<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+<body class="">
+
+<div class="bg-9ac">
     <form class="form-horizontal m" id="form-dept-edit" th:object="${dept}">
-        <!--<h4 class="form-header h4">基础信息</h4>-->
-        <div style="height: 30px;margin-bottom: 20px">
-            <span style=" width:1px;height:10px; margin-right: 1px;font-size: 21px;color: #0000FF;font-weight: 1000;">|</span>
-            <span style="margin-left: 0;color: #1d9d74;font-size: 18px">基础信息</span>
-        </div>
         <input name="deptId" th:field="*{deptId}" type="hidden">
-        <div class="row" style="margin-bottom: 10px;">
-            <div class="col-sm-3">
-                <div  style="width: 68%;margin: 0 10%">
-                    <label><span style="color: red; ">*</span>父机构</label>
-                    <div style="position: relative;" >
+
+        <!-- 岗位信息 -->
+        <div class="add-block" style="padding-bottom: 24px;">
+            <div id="post1" style="height: 24px"></div>
+            <div class="is-row-title flex align-center">
+                <div style=" width:4px;height:18px; margin-right: 12px;background: #4377FE;"></div>
+                <span class="ft-20 font-weight color-333">基础信息</span>
+            </div>
+            <div class="row">
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label><span style="color: red;margin-right: 5px; ">*</span>父机构</label>
                         <input id="treeId" name="parentId" type="hidden" th:field="*{parentId}"/>
                         <input class="form-control" type="text" style="background-color: white"
                                onclick="selectDeptTree('treeId','treeName')"
                                id="treeName"  th:field="*{parentName}">
-                        <span class="input-group-addon" style="width: 18%;height: 34px;position: absolute;left: 100%;top: 0"><i class="fa fa-search" style="position: absolute ;left: 30%;top: 30%"></i></span>
+                        <span class="input-group-addon"><i class="fa fa-search"></i></span>
                     </div>
-
                 </div>
-            </div>
-            <div class="col-sm-3"  >
-                <div class="form-group"  >
-                    <label><span style="color: red; ">*</span>机构名称</label>
-                    <input name="deptName" th:field="*{deptName}" class="form-control" type="text" required="required">
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label><span style="color: red;margin-right: 5px; ">*</span>机构名称</label><br>
+                        <div class="input-group date">
+                            <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                            <input name="deptName" th:field="*{deptName}" class="form-control" type="text" required="required">
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="col-sm-3" >
-                <div class="form-group"   >
-                    <label><span style="color: red; ">*</span>机构层次</label>
-                    <select name="deptLevel" class="form-control m-b" th:with="type=${@dict.getType('dept_level')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
-                                th:field="*{deptLevel}"></option>
-                    </select>
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label><span style="color: red;margin-right: 5px; ">*</span>机构层次</label>
+                        <select name="deptLevel" class="form-control m-b" th:with="type=${@dict.getType('dept_level')}">
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+                                    th:field="*{deptLevel}"></option>
+                        </select>
+                    </div>
                 </div>
             </div>
-            <div class="col-sm-3"  >
-                <div class="form-group">
-                    <label><span style="color: red; ">*</span>机构类别</label>
-                    <select name="deptCategory" id="deptCategory" class="form-control m-b"
-                            th:with="type=${@dict.getType('dept_category')}" onchange="checkDeptCategory(this.value)">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
-                                th:field="*{deptCategory}"></option>
-                    </select>
+            <div class="row">
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label><span style="color: red;margin-right: 5px; ">*</span>机构类别</label>
+                        <select name="deptCategory" id="deptCategory" class="form-control m-b"
+                                th:with="type=${@dict.getType('dept_category')}" onchange="checkDeptCategory(this.value)">
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+                                    th:field="*{deptCategory}"></option>
+                        </select>
+                    </div>
                 </div>
-            </div>
-        </div>
-        <div class="row" >
-            <div class="col-sm-3">
-                <div class="form-group">
-                    <label><span style="color: red; ">*</span>机构级别</label>
-                    <select name="deptRank" class="form-control m-b"
-                            th:with="type=${@dict.getType('dept_rank')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                                th:value="${dict.dictValue}" th:selected="${dict.default}" th:field="*{deptRank}"></option>
-                    </select>
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label><span style="color: red;margin-right: 5px; ">*</span>机构级别</label>
+                        <select name="deptRank" class="form-control m-b"
+                                th:with="type=${@dict.getType('dept_rank')}">
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
+                                    th:value="${dict.dictValue}" th:selected="${dict.default}" th:field="*{deptRank}"></option>
+                        </select>
+                    </div>
                 </div>
             </div>
         </div>
 
-        <div style="height: 30px;margin-bottom: 20px">
-            <span style=" width:1px;height:10px; margin-right: 1px;font-size: 21px;color: #0000FF;font-weight: 1000;">|</span>
-            <span style="margin-left: 0;color: #1d9d74;font-size: 18px">其他信息</span>
-        </div>
-
-        <div class="row" style="margin-bottom: 25px;">
-            <div class="col-sm-3"  >
-                <div class="form-group"  >
-                    <label>负责人</label>
-                    <input name="leader" th:field="*{leader}" class="form-control" type="text">
-                </div>
+        <!-- 岗位信息 -->
+        <div class="add-block" style="padding-bottom: 24px;">
+            <div id="post2" style="height: 24px"></div>
+            <div class="is-row-title flex align-center">
+                <div style=" width:4px;height:18px; margin-right: 12px;background: #4377FE;"></div>
+                <span class="ft-20 font-weight color-333">其他信息</span>
             </div>
-            <div class="col-sm-3"  >
-                <div class="form-group"  >
-                    <label>联系电话</label>
-                    <input name="phone" th:field="*{phone}" class="form-control" type="text">
+            <div class="row">
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>负责人</label>
+                        <input name="leader" th:field="*{leader}" class="form-control" type="text">
+                    </div>
                 </div>
-            </div>
-            <div class="col-sm-3"  >
-                <div class="form-group"  >
-                    <label>邮箱</label>
-                    <input name="email" th:field="*{email}" class="form-control" type="text">
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>联系电话</label>
+                        <input name="phone" th:field="*{phone}" class="form-control" type="text">
+                    </div>
                 </div>
-            </div>
-            <div class="col-sm-3"  >
-                <div class="form-group"  >
-                    <label >机构性质</label>
-                    <input id="deptNatureId" name="deptNature" type="hidden" th:field="*{deptNature}">
-                    <input class="form-control" type="text" style="background-color: white"
-                           onclick="selectDataTree('dept_nature','deptNatureId','deptNatureName')"
-                           id="deptNatureName" th:value="${@dict.getLabel('dept_nature','__*{deptNature}__')}" readonly>
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>邮箱</label>
+                        <input name="email" th:field="*{email}" class="form-control" type="text">
+                    </div>
                 </div>
             </div>
-        </div>
-        <div class="row" style="margin-bottom: 10px;">
-            <div class="col-sm-3"  >
-                <div class="form-group"  >
-                    <label>机构简称</label>
-                    <input name="deptNameAbbr" th:field="*{deptNameAbbr}" class="form-control" type="text">
+            <div class="row">
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>机构性质</label>
+                        <input id="deptNatureId" name="deptNature" type="hidden" th:field="*{deptNature}">
+                        <input class="form-control" type="text" style="background-color: white"
+                               onclick="selectDataTree('dept_nature','deptNatureId','deptNatureName')"
+                               id="deptNatureName" th:value="${@dict.getLabel('dept_nature','__*{deptNature}__')}" readonly>
+                    </div>
                 </div>
-            </div>
-            <div class="col-sm-3"  >
-                <div class="form-group"  >
-                    <label>经费形式</label>
-                    <select name="moneyForm" class="form-control m-b"
-                            th:with="type=${@dict.getType('dept_money_form')}">
-                        <option></option>
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
-                                th:field="*{moneyForm}"></option>
-                    </select>
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>机构简称</label>
+                        <input name="deptNameAbbr" th:field="*{deptNameAbbr}" class="form-control" type="text">
+                    </div>
                 </div>
-            </div>
-            <div class="col-sm-3"  >
-                <div class="form-group"  >
-                    <label>机构建制</label>
-                    <select name="deptFramework" class="form-control m-b"
-                            th:with="type=${@dict.getType('dept_framework')}">
-                        <option></option>
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
-                                th:field="*{deptFramework}"></option>
-                    </select>
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>经费形式</label>
+                        <select name="moneyForm" class="form-control m-b"
+                                th:with="type=${@dict.getType('dept_money_form')}">
+                            <option></option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+                                    th:field="*{moneyForm}"></option>
+                        </select>
+                    </div>
                 </div>
             </div>
-            <div class="col-sm-3"  >
-                <div class="form-group"  >
-                    <label>机构所在政区</label>
-                    <input id="administrativeZonesId" name="administrativeZones" type="hidden" th:field="*{administrativeZones}">
-                    <input class="form-control" type="text" th:value="${@dict.getLabel('dept_administrative_zones','__*{administrativeZones}__')}"
-                           onclick="selectDataTree('dept_administrative_zones','administrativeZonesId','administrativeZonesName')" style="background-color: white"
-                           id="administrativeZonesName" readonly>
+            <div class="row">
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>机构建制</label>
+                        <select name="deptFramework" class="form-control m-b"
+                                th:with="type=${@dict.getType('dept_framework')}">
+                            <option></option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+                                    th:field="*{deptFramework}"></option>
+                        </select>
+                    </div>
                 </div>
-            </div>
-        </div>
-        <div class="row" style="margin-bottom: 10px;">
-
-            <div class="col-sm-3"  >
-                <div class="form-group"  >
-                    <label>事业单位性质</label>
-                    <select name="unitNature" class="form-control m-b"
-                            th:with="type=${@dict.getType('dept_unit_nature')}">
-                        <option></option>
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
-                                th:field="*{unitNature}"></option>
-                    </select>
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>机构所在政区</label>
+                        <input id="administrativeZonesId" name="administrativeZones" type="hidden" th:field="*{administrativeZones}">
+                        <input class="form-control" type="text" th:value="${@dict.getLabel('dept_administrative_zones','__*{administrativeZones}__')}"
+                               onclick="selectDataTree('dept_administrative_zones','administrativeZonesId','administrativeZonesName')" style="background-color: white"
+                               id="administrativeZonesName" readonly>
+                    </div>
                 </div>
-            </div>
-            <div class="col-sm-3"  >
-                <div class="form-group"  >
-                    <label>机构所属行业</label>
-                    <select name="deptIndustry" class="form-control m-b"
-                            th:with="type=${@dict.getType('dept_industry')}">
-                        <option></option>
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
-                                th:field="*{deptIndustry}"></option>
-                    </select>
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>事业单位性质</label>
+                        <select name="unitNature" class="form-control m-b"
+                                th:with="type=${@dict.getType('dept_unit_nature')}">
+                            <option></option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+                                    th:field="*{unitNature}"></option>
+                        </select>
+                    </div>
                 </div>
             </div>
-            <div class="col-sm-3"  >
-                <div class="form-group"  >
-                    <label >隶属关系</label>
-                    <input id="subordinateRelationsId" name="subordinateRelations" type="hidden" th:field="*{subordinateRelations}">
-                    <input class="form-control" type="text" th:value="${@dict.getLabel('dept_subordinate_relations','__*{subordinateRelations}__')}"
-                           onclick="selectDataTree('dept_subordinate_relations','subordinateRelationsId','subordinateRelationsName')" style="background-color: white"
-                           id="subordinateRelationsName" readonly>
+            <div class="row">
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>机构所属行业</label>
+                        <select name="deptIndustry" class="form-control m-b"
+                                th:with="type=${@dict.getType('dept_industry')}">
+                            <option></option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+                                    th:field="*{deptIndustry}"></option>
+                        </select>
+                    </div>
                 </div>
-            </div>
-
-            <div class="col-sm-3">
-                <div class="form-group"  >
-                    <label>附属关系</label>
-                    <select name="affiliation" class="form-control m-b"
-                            th:with="type=${@dict.getType('dept_affiliation')}">
-                        <option></option>
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
-                                th:field="*{affiliation}"></option>
-                    </select>
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>隶属关系</label>
+                        <input id="subordinateRelationsId" name="subordinateRelations" type="hidden" th:field="*{subordinateRelations}">
+                        <input class="form-control" type="text" th:value="${@dict.getLabel('dept_subordinate_relations','__*{subordinateRelations}__')}"
+                               onclick="selectDataTree('dept_subordinate_relations','subordinateRelationsId','subordinateRelationsName')" style="background-color: white"
+                               id="subordinateRelationsName" readonly>
+                    </div>
                 </div>
-            </div>
-        </div>
-        <div class="row" style="margin-bottom: 20px;">
-
-            <div class="col-sm-3"    id="packdiv">
-                <div class="form-group"  >
-                    <label>是否打包设置</label><br>
-                    <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">
-                        <input type="radio" th:id="${'pack_' + dict.dictCode}" name="pack"
-                               th:value="${dict.dictValue}" th:field="*{pack}">
-                        <label th:for="${'pack_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>附属关系</label>
+                        <input id="subordinateRelationsId" name="subordinateRelations" type="hidden" th:field="*{subordinateRelations}">
+                        <input class="form-control" type="text" th:value="${@dict.getLabel('dept_subordinate_relations','__*{subordinateRelations}__')}"
+                               onclick="selectDataTree('dept_subordinate_relations','subordinateRelationsId','subordinateRelationsName')" style="background-color: white"
+                               id="subordinateRelationsName" readonly>
                     </div>
                 </div>
             </div>
-            <div class="col-sm-3"  >
-                <div class="form-group"  >
-                    <label>中央驻地方单位标识</label><br>
-                    <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">
-                        <input type="radio" th:id="${'unitId_' + dict.dictCode}" name="unitId"
-                               th:value="${dict.dictValue}"  th:field="*{unitId}">
-                        <label th:for="${'unitId_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+            <div class="row">
+                <div class="col-sm-4" id="packdiv">
+                    <div class=""   >
+                        <label>是否打包设置</label><br>
+                        <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">
+                            <input type="radio" th:id="${'pack_' + dict.dictCode}" name="pack"
+                                   th:value="${dict.dictValue}" th:field="*{pack}">
+                            <label th:for="${'pack_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                        </div>
                     </div>
                 </div>
-            </div>
-            <div class="col-sm-3"  >
-                <div class="form-group"  >
-                    <label>是否参照公务员法管理</label><br>
-                    <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">
-                        <input type="radio" th:id="${'civilServants_' + dict.dictCode}" name="civilServants"
-                               th:value="${dict.dictValue}"
-                               th:field="*{civilServants}">
-                        <label th:for="${'civilServants_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>中央驻地方单位标识</label><br>
+                        <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">
+                            <input type="radio" th:id="${'unitId_' + dict.dictCode}" name="unitId"
+                                   th:value="${dict.dictValue}"  th:field="*{unitId}">
+                            <label th:for="${'unitId_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                        </div>
                     </div>
                 </div>
-            </div>
-
-            <div class="col-sm-3"  >
-                <div class="form-group"  >
-                    <label>是否实施岗位设置管理</label><br>
-                    <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">
-                        <input type="radio" th:id="${'postSettings_' + dict.dictCode}" name="postSettings"
-                               th:value="${dict.dictValue}"  th:field="*{postSettings}">
-                        <label th:for="${'postSettings_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>是否参照公务员法管理</label><br>
+                        <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">
+                            <input type="radio" th:id="${'civilServants_' + dict.dictCode}" name="civilServants"
+                                   th:value="${dict.dictValue}"
+                                   th:field="*{civilServants}">
+                            <label th:for="${'civilServants_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                        </div>
                     </div>
                 </div>
             </div>
-            <div class="col-sm-3"  >
-                <div class="form-group"  >
-                    <label>是否实行人员聘用制</label><br>
-                    <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">
-                        <input type="radio" th:id="${'hiring_' + dict.dictCode}" name="hiring"
-                               th:value="${dict.dictValue}"  th:field="*{hiring}">
-                        <label th:for="${'hiring_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+            <div class="row">
+                <div class="col-sm-4">
+                    <div class=""   >
+                        <label>是否实施岗位设置管理</label><br>
+                        <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">
+                            <input type="radio" th:id="${'postSettings_' + dict.dictCode}" name="postSettings"
+                                   th:value="${dict.dictValue}"  th:field="*{postSettings}">
+                            <label th:for="${'postSettings_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                        </div>
                     </div>
                 </div>
-            </div>
-
-        </div>
-        <div class="row" style="margin-bottom: 20px;" >
-
-            <div class="col-sm-3"  >
-                <div class="form-group"  >
-                    <label>是否实行公开招聘制度</label><br>
-                    <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">
-                        <input type="radio" th:id="${'recruitment_' + dict.dictCode}" name="recruitment"
-                               th:value="${dict.dictValue}"  th:field="*{recruitment}">
-                        <label th:for="${'recruitment_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>是否实行人员聘用制</label><br>
+                        <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">
+                            <input type="radio" th:id="${'hiring_' + dict.dictCode}" name="hiring"
+                                   th:value="${dict.dictValue}"  th:field="*{hiring}">
+                            <label th:for="${'hiring_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                        </div>
                     </div>
                 </div>
-            </div>
-            <div class="col-sm-3"  >
-                <div class="form-group"  >
-                    <label>是否机关服务类单位</label><br>
-                    <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">
-                        <input type="radio" th:id="${'agencyService_' + dict.dictCode}" name="agencyService"
-                               th:value="${dict.dictValue}"
-                               th:field="*{agencyService}">
-                        <label th:for="${'agencyService_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>是否实行公开招聘制度</label><br>
+                        <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">
+                            <input type="radio" th:id="${'recruitment_' + dict.dictCode}" name="recruitment"
+                                   th:value="${dict.dictValue}"  th:field="*{recruitment}">
+                            <label th:for="${'recruitment_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                        </div>
                     </div>
                 </div>
             </div>
-
-            <div class="col-sm-3">
-                <div class="form-group"  >
-                    <label>机构成立日期</label><br>
-                    <div class="input-group date">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                        <input name="deptCreateTime" id="deptCreateTime" th:value="${#dates.format(dept.deptCreateTime, 'yyyy-MM-dd')}"
-                               class="form-control" placeholder="yyyy-MM-dd" type="text">
+            <div class="row">
+                <div class="col-sm-4">
+                    <div class=""   >
+                        <label>是否机关服务类单位</label><br>
+                        <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">
+                            <input type="radio" th:id="${'agencyService_' + dict.dictCode}" name="agencyService"
+                                   th:value="${dict.dictValue}"
+                                   th:field="*{agencyService}">
+                            <label th:for="${'agencyService_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                        </div>
                     </div>
                 </div>
-            </div>
-            <div class="col-sm-3"  >
-                <div class="form-group"  >
-                    <label>机构撤销日期</label><br>
-                    <div class="input-group date">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                        <input name="deptUndoTime" id="deptUndoTime" th:value="${#dates.format(dept.deptUndoTime, 'yyyy-MM-dd')}"
-                               class="form-control" placeholder="yyyy-MM-dd" type="text">
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>机构成立日期</label>
+                        <div class="input-group date">
+                            <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                            <input name="deptCreateTime" id="deptCreateTime" th:value="${#dates.format(dept.deptCreateTime, 'yyyy-MM-dd')}"
+                                   class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        </div>
                     </div>
                 </div>
-            </div>
-
-
-        </div>
-        <div class="row" style="margin-bottom: 20px;">
-
-            <div class="col-sm-3"  >
-                <div class="form-group"  >
-                    <label>机构编码</label>
-                    <input name="deptCode" th:field="*{deptCode}" class="form-control" type="text">
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>机构撤销日期</label>
+                        <div class="input-group date">
+                            <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                            <input name="deptUndoTime" id="deptUndoTime" th:value="${#dates.format(dept.deptUndoTime, 'yyyy-MM-dd')}"
+                                   class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="col-sm-3"  >
-                <div class="form-group"  >
-                    <label>机构版本</label>
-                    <input name="version" class="form-control" th:value="${dept.version}" type="text" readonly>
+            <div class="row">
+                <div class="col-sm-4">
+                    <div class=""   >
+                        <label>机构编码</label>
+                        <input name="deptCode" th:field="*{deptCode}" class="form-control" type="text">
+                    </div>
                 </div>
-            </div>
-            <div class="col-sm-3"  >
-                <div class="form-group"  >
-                    <label>机构状态</label><br>
-                    <div class="radio-box"  th:each="dict : ${@dict.getType('sys_normal_disable')}">
-                        <input type="radio" th:id="${'status_' + dict.dictCode}" name="status"
-                               th:value="${dict.dictValue}" th:field="*{status}">
-                        <label th:for="${'status_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>机构版本</label>
+                        <input name="version" class="form-control" th:value="${dept.version}" type="text" readonly>
+                    </div>
+                </div>
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>机构状态</label><br>
+                        <div class="radio-box"  th:each="dict : ${@dict.getType('sys_normal_disable')}">
+                            <input type="radio" th:id="${'status_' + dict.dictCode}" name="status"
+                                   th:value="${dict.dictValue}" th:field="*{status}">
+                            <label th:for="${'status_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -322,6 +413,318 @@
 
     </form>
 </div>
+
+<!--<div class="wrapper wrapper-content animated fadeInRight ibox-content">-->
+<!--    <form class="form-horizontal m" id="form-dept-edit" th:object="${dept}">-->
+<!--        &lt;!&ndash;<h4 class="form-header h4">基础信息</h4>&ndash;&gt;-->
+<!--        <div style="height: 30px;margin-bottom: 20px">-->
+<!--            <span style=" width:1px;height:10px; margin-right: 1px;font-size: 21px;color: #0000FF;font-weight: 1000;">|</span>-->
+<!--            <span style="margin-left: 0;color: #1d9d74;font-size: 18px">基础信息</span>-->
+<!--        </div>-->
+<!--        <input name="deptId" th:field="*{deptId}" type="hidden">-->
+<!--        <div class="row" style="margin-bottom: 10px;">-->
+<!--            <div class="col-sm-3">-->
+<!--                <div  style="width: 68%;margin: 0 10%">-->
+<!--                    <label><span style="color: red; ">*</span>父机构</label>-->
+<!--                    <div style="position: relative;" >-->
+<!--                        <input id="treeId" name="parentId" type="hidden" th:field="*{parentId}"/>-->
+<!--                        <input class="form-control" type="text" style="background-color: white"-->
+<!--                               onclick="selectDeptTree('treeId','treeName')"-->
+<!--                               id="treeName"  th:field="*{parentName}">-->
+<!--                        <span class="input-group-addon" style="width: 18%;height: 34px;position: absolute;left: 100%;top: 0"><i class="fa fa-search" style="position: absolute ;left: 30%;top: 30%"></i></span>-->
+<!--                    </div>-->
+
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="col-sm-3"  >-->
+<!--                <div class="form-group"  >-->
+<!--                    <label><span style="color: red; ">*</span>机构名称</label>-->
+<!--                    <input name="deptName" th:field="*{deptName}" class="form-control" type="text" required="required">-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="col-sm-3" >-->
+<!--                <div class="form-group"   >-->
+<!--                    <label><span style="color: red; ">*</span>机构层次</label>-->
+<!--                    <select name="deptLevel" class="form-control m-b" th:with="type=${@dict.getType('dept_level')}">-->
+<!--                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"-->
+<!--                                th:field="*{deptLevel}"></option>-->
+<!--                    </select>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="col-sm-3"  >-->
+<!--                <div class="form-group">-->
+<!--                    <label><span style="color: red; ">*</span>机构类别</label>-->
+<!--                    <select name="deptCategory" id="deptCategory" class="form-control m-b"-->
+<!--                            th:with="type=${@dict.getType('dept_category')}" onchange="checkDeptCategory(this.value)">-->
+<!--                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"-->
+<!--                                th:field="*{deptCategory}"></option>-->
+<!--                    </select>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="row" >-->
+<!--            <div class="col-sm-3">-->
+<!--                <div class="form-group">-->
+<!--                    <label><span style="color: red; ">*</span>机构级别</label>-->
+<!--                    <select name="deptRank" class="form-control m-b"-->
+<!--                            th:with="type=${@dict.getType('dept_rank')}">-->
+<!--                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}"-->
+<!--                                th:value="${dict.dictValue}" th:selected="${dict.default}" th:field="*{deptRank}"></option>-->
+<!--                    </select>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
+
+<!--        <div style="height: 30px;margin-bottom: 20px">-->
+<!--            <span style=" width:1px;height:10px; margin-right: 1px;font-size: 21px;color: #0000FF;font-weight: 1000;">|</span>-->
+<!--            <span style="margin-left: 0;color: #1d9d74;font-size: 18px">其他信息</span>-->
+<!--        </div>-->
+
+<!--        <div class="row" style="margin-bottom: 25px;">-->
+<!--            <div class="col-sm-3"  >-->
+<!--                <div class="form-group"  >-->
+<!--                    <label>负责人</label>-->
+<!--                    <input name="leader" th:field="*{leader}" class="form-control" type="text">-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="col-sm-3"  >-->
+<!--                <div class="form-group"  >-->
+<!--                    <label>联系电话</label>-->
+<!--                    <input name="phone" th:field="*{phone}" class="form-control" type="text">-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="col-sm-3"  >-->
+<!--                <div class="form-group"  >-->
+<!--                    <label>邮箱</label>-->
+<!--                    <input name="email" th:field="*{email}" class="form-control" type="text">-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="col-sm-3"  >-->
+<!--                <div class="form-group"  >-->
+<!--                    <label >机构性质</label>-->
+<!--                    <input id="deptNatureId" name="deptNature" type="hidden" th:field="*{deptNature}">-->
+<!--                    <input class="form-control" type="text" style="background-color: white"-->
+<!--                           onclick="selectDataTree('dept_nature','deptNatureId','deptNatureName')"-->
+<!--                           id="deptNatureName" th:value="${@dict.getLabel('dept_nature','__*{deptNature}__')}" readonly>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="row" style="margin-bottom: 10px;">-->
+<!--            <div class="col-sm-3"  >-->
+<!--                <div class="form-group"  >-->
+<!--                    <label>机构简称</label>-->
+<!--                    <input name="deptNameAbbr" th:field="*{deptNameAbbr}" class="form-control" type="text">-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="col-sm-3"  >-->
+<!--                <div class="form-group"  >-->
+<!--                    <label>经费形式</label>-->
+<!--                    <select name="moneyForm" class="form-control m-b"-->
+<!--                            th:with="type=${@dict.getType('dept_money_form')}">-->
+<!--                        <option></option>-->
+<!--                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"-->
+<!--                                th:field="*{moneyForm}"></option>-->
+<!--                    </select>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="col-sm-3"  >-->
+<!--                <div class="form-group"  >-->
+<!--                    <label>机构建制</label>-->
+<!--                    <select name="deptFramework" class="form-control m-b"-->
+<!--                            th:with="type=${@dict.getType('dept_framework')}">-->
+<!--                        <option></option>-->
+<!--                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"-->
+<!--                                th:field="*{deptFramework}"></option>-->
+<!--                    </select>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="col-sm-3"  >-->
+<!--                <div class="form-group"  >-->
+<!--                    <label>机构所在政区</label>-->
+<!--                    <input id="administrativeZonesId" name="administrativeZones" type="hidden" th:field="*{administrativeZones}">-->
+<!--                    <input class="form-control" type="text" th:value="${@dict.getLabel('dept_administrative_zones','__*{administrativeZones}__')}"-->
+<!--                           onclick="selectDataTree('dept_administrative_zones','administrativeZonesId','administrativeZonesName')" style="background-color: white"-->
+<!--                           id="administrativeZonesName" readonly>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="row" style="margin-bottom: 10px;">-->
+
+<!--            <div class="col-sm-3"  >-->
+<!--                <div class="form-group"  >-->
+<!--                    <label>事业单位性质</label>-->
+<!--                    <select name="unitNature" class="form-control m-b"-->
+<!--                            th:with="type=${@dict.getType('dept_unit_nature')}">-->
+<!--                        <option></option>-->
+<!--                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"-->
+<!--                                th:field="*{unitNature}"></option>-->
+<!--                    </select>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="col-sm-3"  >-->
+<!--                <div class="form-group"  >-->
+<!--                    <label>机构所属行业</label>-->
+<!--                    <select name="deptIndustry" class="form-control m-b"-->
+<!--                            th:with="type=${@dict.getType('dept_industry')}">-->
+<!--                        <option></option>-->
+<!--                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"-->
+<!--                                th:field="*{deptIndustry}"></option>-->
+<!--                    </select>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="col-sm-3"  >-->
+<!--                <div class="form-group"  >-->
+<!--                    <label >隶属关系</label>-->
+<!--                    <input id="subordinateRelationsId" name="subordinateRelations" type="hidden" th:field="*{subordinateRelations}">-->
+<!--                    <input class="form-control" type="text" th:value="${@dict.getLabel('dept_subordinate_relations','__*{subordinateRelations}__')}"-->
+<!--                           onclick="selectDataTree('dept_subordinate_relations','subordinateRelationsId','subordinateRelationsName')" style="background-color: white"-->
+<!--                           id="subordinateRelationsName" readonly>-->
+<!--                </div>-->
+<!--            </div>-->
+
+<!--            <div class="col-sm-3">-->
+<!--                <div class="form-group"  >-->
+<!--                    <label>附属关系</label>-->
+<!--                    <select name="affiliation" class="form-control m-b"-->
+<!--                            th:with="type=${@dict.getType('dept_affiliation')}">-->
+<!--                        <option></option>-->
+<!--                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"-->
+<!--                                th:field="*{affiliation}"></option>-->
+<!--                    </select>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="row" style="margin-bottom: 20px;">-->
+
+<!--            <div class="col-sm-3"    id="packdiv">-->
+<!--                <div class="form-group"  >-->
+<!--                    <label>是否打包设置</label><br>-->
+<!--                    <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">-->
+<!--                        <input type="radio" th:id="${'pack_' + dict.dictCode}" name="pack"-->
+<!--                               th:value="${dict.dictValue}" th:field="*{pack}">-->
+<!--                        <label th:for="${'pack_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="col-sm-3"  >-->
+<!--                <div class="form-group"  >-->
+<!--                    <label>中央驻地方单位标识</label><br>-->
+<!--                    <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">-->
+<!--                        <input type="radio" th:id="${'unitId_' + dict.dictCode}" name="unitId"-->
+<!--                               th:value="${dict.dictValue}"  th:field="*{unitId}">-->
+<!--                        <label th:for="${'unitId_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="col-sm-3"  >-->
+<!--                <div class="form-group"  >-->
+<!--                    <label>是否参照公务员法管理</label><br>-->
+<!--                    <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">-->
+<!--                        <input type="radio" th:id="${'civilServants_' + dict.dictCode}" name="civilServants"-->
+<!--                               th:value="${dict.dictValue}"-->
+<!--                               th:field="*{civilServants}">-->
+<!--                        <label th:for="${'civilServants_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </div>-->
+
+<!--            <div class="col-sm-3"  >-->
+<!--                <div class="form-group"  >-->
+<!--                    <label>是否实施岗位设置管理</label><br>-->
+<!--                    <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">-->
+<!--                        <input type="radio" th:id="${'postSettings_' + dict.dictCode}" name="postSettings"-->
+<!--                               th:value="${dict.dictValue}"  th:field="*{postSettings}">-->
+<!--                        <label th:for="${'postSettings_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="col-sm-3"  >-->
+<!--                <div class="form-group"  >-->
+<!--                    <label>是否实行人员聘用制</label><br>-->
+<!--                    <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">-->
+<!--                        <input type="radio" th:id="${'hiring_' + dict.dictCode}" name="hiring"-->
+<!--                               th:value="${dict.dictValue}"  th:field="*{hiring}">-->
+<!--                        <label th:for="${'hiring_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </div>-->
+
+<!--        </div>-->
+<!--        <div class="row" style="margin-bottom: 20px;" >-->
+
+<!--            <div class="col-sm-3"  >-->
+<!--                <div class="form-group"  >-->
+<!--                    <label>是否实行公开招聘制度</label><br>-->
+<!--                    <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">-->
+<!--                        <input type="radio" th:id="${'recruitment_' + dict.dictCode}" name="recruitment"-->
+<!--                               th:value="${dict.dictValue}"  th:field="*{recruitment}">-->
+<!--                        <label th:for="${'recruitment_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="col-sm-3"  >-->
+<!--                <div class="form-group"  >-->
+<!--                    <label>是否机关服务类单位</label><br>-->
+<!--                    <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">-->
+<!--                        <input type="radio" th:id="${'agencyService_' + dict.dictCode}" name="agencyService"-->
+<!--                               th:value="${dict.dictValue}"-->
+<!--                               th:field="*{agencyService}">-->
+<!--                        <label th:for="${'agencyService_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </div>-->
+
+<!--            <div class="col-sm-3">-->
+<!--                <div class="form-group"  >-->
+<!--                    <label>机构成立日期</label><br>-->
+<!--                    <div class="input-group date">-->
+<!--                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
+<!--                        <input name="deptCreateTime" id="deptCreateTime" th:value="${#dates.format(dept.deptCreateTime, 'yyyy-MM-dd')}"-->
+<!--                               class="form-control" placeholder="yyyy-MM-dd" type="text">-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="col-sm-3"  >-->
+<!--                <div class="form-group"  >-->
+<!--                    <label>机构撤销日期</label><br>-->
+<!--                    <div class="input-group date">-->
+<!--                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
+<!--                        <input name="deptUndoTime" id="deptUndoTime" th:value="${#dates.format(dept.deptUndoTime, 'yyyy-MM-dd')}"-->
+<!--                               class="form-control" placeholder="yyyy-MM-dd" type="text">-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </div>-->
+
+
+<!--        </div>-->
+<!--        <div class="row" style="margin-bottom: 20px;">-->
+
+<!--            <div class="col-sm-3"  >-->
+<!--                <div class="form-group"  >-->
+<!--                    <label>机构编码</label>-->
+<!--                    <input name="deptCode" th:field="*{deptCode}" class="form-control" type="text">-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="col-sm-3"  >-->
+<!--                <div class="form-group"  >-->
+<!--                    <label>机构版本</label>-->
+<!--                    <input name="version" class="form-control" th:value="${dept.version}" type="text" readonly>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="col-sm-3"  >-->
+<!--                <div class="form-group"  >-->
+<!--                    <label>机构状态</label><br>-->
+<!--                    <div class="radio-box"  th:each="dict : ${@dict.getType('sys_normal_disable')}">-->
+<!--                        <input type="radio" th:id="${'status_' + dict.dictCode}" name="status"-->
+<!--                               th:value="${dict.dictValue}" th:field="*{status}">-->
+<!--                        <label th:for="${'status_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
+
+<!--    </form>-->
+<!--</div>-->
 <th:block th:include="include :: footer"/>
 <th:block th:include="include :: datetimepicker-js"/>
 <script th:inline="javascript">