2 Commits 0e33aaa5df ... 946350dd70

Author SHA1 Message Date
  liu 946350dd70 Merge branch 'cloud' of http://115.238.142.158:20182/Ahrs/AHRS into cloud 2 years ago
  liu e43fdf7307 fix 另一个机构编辑页面 2 years ago

+ 1 - 0
ruoyi-admin/src/main/resources/templates/system/dept/edit.html

@@ -416,6 +416,7 @@
     </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;-->

+ 634 - 233
ruoyi-admin/src/main/resources/templates/system/dept/editPart.html

@@ -4,306 +4,707 @@
     <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}">
-        <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: 0px;">
-            <div class="col-sm-3">
-                <div class="form-group" 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}" readonly/>
                         <input class="form-control" type="text" id="treeName" style="background-color: white"
                                readonly="true" 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" readonly>
+                <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" readonly>
+                        </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')}" disabled>
-                        <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')}" disabled>
+                            <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')}" disabled>
-                        <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')}" disabled>
+                            <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" style="margin-bottom: 0px;">
-            <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')}" disabled>
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
-                                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')}" disabled>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+                                    th:field="*{deptRank}"></option>
+                        </select>
+                    </div>
                 </div>
             </div>
         </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 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: 35px;">
-            <div class="col-sm-3"  >
-                <div class="form-group"  >
-                    <label>负责人</label>
-                    <input name="leader" th:field="*{leader}" 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="phone" th:field="*{phone}" 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 name="email" th:field="*{email}" class="form-control" type="text">
+                <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 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: 35px;">
-            <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"
-                           onclick="selectDataTree('dept_nature','deptNatureId','deptNatureName')"
-                           id="deptNatureName" th:value="${@dict.getLabel('dept_nature','__*{deptNature}__')}" disabled>
-                </div>
+        <!-- 岗位信息 -->
+        <div class="add-block" style="padding-bottom: 24px;">
+            <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-3"  >
-                <div class="form-group"  >
-                    <label>机构所属行业</label>
-                    <select name="deptIndustry" class="form-control m-b"
-                            th:with="type=${@dict.getType('dept_industry')}" disabled>
-                        <option></option>
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
-                                th:field="*{deptIndustry}"></option>
-                    </select>
+            <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"
+                               onclick="selectDataTree('dept_nature','deptNatureId','deptNatureName')"
+                               id="deptNatureName" th:value="${@dict.getLabel('dept_nature','__*{deptNature}__')}" disabled>
+                    </div>
                 </div>
-            </div>
-            <div class="col-sm-3"  >
-                <div class="form-group"  >
-                    <label>机构简称</label>
-                    <input name="deptNameAbbr" th:field="*{deptNameAbbr}" class="form-control" type="text" disabled>
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>机构所属行业</label>
+                        <select name="deptIndustry" class="form-control m-b"
+                                th:with="type=${@dict.getType('dept_industry')}" disabled>
+                            <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="moneyForm" class="form-control m-b"
-                            th:with="type=${@dict.getType('dept_money_form')}" disabled>
-                        <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" disabled>
+                    </div>
                 </div>
             </div>
-        </div>
-        <div class="row" style="margin-bottom: 20px;">
-            <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')}" disabled>
-                        <option></option>
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
-                                th:field="*{deptFramework}"></option>
-                    </select>
+            <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')}" disabled>
+                            <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>
-                    <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')"
-                           id="administrativeZonesName" disabled>
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>机构建制</label>
+                        <select name="deptFramework" class="form-control m-b"
+                                th:with="type=${@dict.getType('dept_framework')}" disabled>
+                            <option></option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+                                    th:field="*{deptFramework}"></option>
+                        </select>
+                    </div>
                 </div>
-            </div>
-            <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')}" disabled>
-                        <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')"
+                               id="administrativeZonesName" disabled>
+                    </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')}" disabled>
-                        <option></option>
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
-                                th:field="*{affiliation}"></option>
-                    </select>
+            <div class="row">
+                <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')}" disabled>
+                            <option></option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+                                    th:field="*{unitNature}"></option>
+                        </select>
+                    </div>
                 </div>
-            </div>
-        </div>
-        <div class="row" style="margin-bottom: 20px;">
-            <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')"
-                           id="subordinateRelationsName" disabled>
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>附属关系</label>
+                        <select name="affiliation" class="form-control m-b"
+                                th:with="type=${@dict.getType('dept_affiliation')}" disabled>
+                            <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="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}" disabled>
-                        <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')"
+                               id="subordinateRelationsName" disabled>
                     </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}" disabled>
-                        <label th:for="${'unitId_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+            <div class="row">
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>是否打包设置</label>
+                        <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}" disabled>
+                            <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} " disabled>
-                        <label th:for="${'civilServants_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>中央驻地方单位标识</label>
+                        <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}" disabled>
+                            <label th:for="${'unitId_' + 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="${'postSettings_' + dict.dictCode}" name="postSettings"
-                               th:value="${dict.dictValue}"  th:field="*{postSettings}" disabled>
-                        <label th:for="${'postSettings_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>是否参照公务员法管理</label>
+                        <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} " disabled>
+                            <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}" disabled>
-                        <label th:for="${'hiring_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+            <div class="row">
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>是否实施岗位设置管理</label>
+                        <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}" disabled>
+                            <label th:for="${'postSettings_' + 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="${'recruitment_' + dict.dictCode}" name="recruitment"
-                               th:value="${dict.dictValue}"  th:field="*{recruitment}" disabled>
-                        <label th:for="${'recruitment_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>是否实行人员聘用制</label>
+                        <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}" disabled>
+                            <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}" disabled>
-                        <label th:for="${'agencyService_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>是否实行公开招聘制度</label>
+                        <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}" disabled>
+                            <label th:for="${'recruitment_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                        </div>
                     </div>
                 </div>
             </div>
-        </div>
-        <div class="row" style="margin-bottom: 25px;" >
-            <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" disabled>
+            <div class="row">
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>是否机关服务类单位</label>
+                        <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}" disabled>
+                            <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" disabled>
+                <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" disabled>
+                        </div>
                     </div>
                 </div>
-            </div>
-            <div class="col-sm-3"  >
-                <div class="form-group"  >
-                    <label>机构编码</label>
-                    <input name="deptCode" th:field="*{deptCode}" class="form-control" type="text" disabled>
+                <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" disabled>
+                        </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" disabled>
+            <div class="row">
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>机构编码</label>
+                        <input name="deptCode" th:field="*{deptCode}" class="form-control" type="text" disabled>
+                    </div>
+                </div>
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>机构版本</label>
+                        <input name="version" class="form-control" th:value="${dept.version}" type="text" disabled>
+                    </div>
                 </div>
             </div>
+
         </div>
 
     </form>
 </div>
+<!--<div class="wrapper wrapper-content animated fadeInRight ibox-content">-->
+<!--    <form class="form-horizontal m" id="form-dept-edit" th:object="${dept}">-->
+<!--        <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: 0px;">-->
+<!--            <div class="col-sm-3">-->
+<!--                <div class="form-group" 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}" readonly/>-->
+<!--                        <input class="form-control" type="text" id="treeName" style="background-color: white"-->
+<!--                               readonly="true" 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" readonly>-->
+<!--                </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')}" disabled>-->
+<!--                        <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')}" disabled>-->
+<!--                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"-->
+<!--                                th:field="*{deptCategory}"></option>-->
+<!--                    </select>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="row" style="margin-bottom: 0px;">-->
+<!--            <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')}" disabled>-->
+<!--                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"-->
+<!--                                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: 35px;">-->
+<!--            <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>-->
+
+<!--        <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: 35px;">-->
+<!--            <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"-->
+<!--                           onclick="selectDataTree('dept_nature','deptNatureId','deptNatureName')"-->
+<!--                           id="deptNatureName" th:value="${@dict.getLabel('dept_nature','__*{deptNature}__')}" disabled>-->
+<!--                </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')}" disabled>-->
+<!--                        <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 name="deptNameAbbr" th:field="*{deptNameAbbr}" class="form-control" type="text" disabled>-->
+<!--                </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')}" disabled>-->
+<!--                        <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="row" style="margin-bottom: 20px;">-->
+<!--            <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')}" disabled>-->
+<!--                        <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')"-->
+<!--                           id="administrativeZonesName" disabled>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <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')}" disabled>-->
+<!--                        <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="affiliation" class="form-control m-b"-->
+<!--                            th:with="type=${@dict.getType('dept_affiliation')}" disabled>-->
+<!--                        <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"  >-->
+<!--                <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')"-->
+<!--                           id="subordinateRelationsName" disabled>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <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}" disabled>-->
+<!--                        <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}" disabled>-->
+<!--                        <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} " disabled>-->
+<!--                        <label th:for="${'civilServants_' + 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="${'postSettings_' + dict.dictCode}" name="postSettings"-->
+<!--                               th:value="${dict.dictValue}"  th:field="*{postSettings}" disabled>-->
+<!--                        <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}" disabled>-->
+<!--                        <label th:for="${'hiring_' + 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="${'recruitment_' + dict.dictCode}" name="recruitment"-->
+<!--                               th:value="${dict.dictValue}"  th:field="*{recruitment}" disabled>-->
+<!--                        <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}" disabled>-->
+<!--                        <label th:for="${'agencyService_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="row" style="margin-bottom: 25px;" >-->
+<!--            <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" disabled>-->
+<!--                    </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" disabled>-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="col-sm-3"  >-->
+<!--                <div class="form-group"  >-->
+<!--                    <label>机构编码</label>-->
+<!--                    <input name="deptCode" th:field="*{deptCode}" class="form-control" type="text" disabled>-->
+<!--                </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" disabled>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
+
+<!--    </form>-->
+<!--</div>-->
 <th:block th:include="include :: footer"/>
 <th:block th:include="include :: datetimepicker-js"/>
 <script th:inline="javascript">