2 Commits 5c69402d4a ... aed57f7431

Author SHA1 Message Date
  liu aed57f7431 Merge branch 'cloud' of http://115.238.142.158:20182/Ahrs/AHRS into cloud 2 years ago
  liu 56a6f902b0 fix 人员编辑页面 2 years ago

+ 845 - 389
ruoyi-system/src/main/resources/templates/ahrs/personnel/edit.html

@@ -39,49 +39,65 @@
 
         }
 
-        .my-skin .layui-layer-btn .layui-layer-btn0 {
-            background-color: #6F63DD;
-            color: #FFF;
-        }
-
         /* //定义滚动条宽高,滚动条背景 */
-        ::-webkit-scrollbar{
-          width:10px;
-          height:10px;
+        ::-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-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;
+        ::-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="">
-<!--<div class="col-sm-12 div-ul">-->
-<!--    <div class="ibox" th:if="${!jianyuan}">-->
-<!--        <ul class="nav nav-pills">-->
-<!--            &lt;!&ndash;            <li class="ac"><a href="#post1" style="color: #1a1a1a">基本信息</a></li>&ndash;&gt;-->
-<!--            &lt;!&ndash;            <li><a href="#post2" style="color: #1a1a1a">岗位变更信息</a></li>&ndash;&gt;-->
-<!--            &lt;!&ndash;            <li><a href="#post3" style="color: #1a1a1a">其他信息</a></li>&ndash;&gt;-->
-<!--            <div class="layui-layer-btn layui-layer-btn-" style="text-align: right;background: #ffffff;border-top: 0px">-->
-<!--                <a class="layui-layer-btn0" shiro:hasPermission="ahrs:personnel:edit" href="javascript:void(0)"-->
-<!--                   onclick="submitHandler()">保存</a>-->
-<!--                <a class="layui-layer-btn1" shiro:hasPermission="ahrs:personnel:edit" href="javascript:void(0)"-->
-<!--                   onclick="resetFrom()">重置</a>-->
-<!--            </div>-->
-<!--        </ul>-->
-<!--    </div>-->
-<!--</div>-->
 
-<div>
+
+
+<div class="bg-9ac">
     <form class="form-horizontal" id="form-personnel-edit" th:object="${personnel}">
         <input name="personnelId" th:field="*{personnelId}" type="hidden">
         <input name="version" th:field="*{version}" type="hidden">
@@ -96,436 +112,876 @@
 
         <input name="currentPostGrades" type="hidden" id="currentPostGrades" th:field="*{currentPostGrades}">
         <input name="additionalPostGrades" type="hidden" id="additionalPostGrades" th:field="*{additionalPostGrades}">
-
-
-<!--        <div id="post10" >-->
-<!--            <div id="show1" style="width: 30px;height: 165px;position: absolute;top: 10px;left: 5px;margin-top: 50px;" >-->
-<!--                <div-->
-<!--                     style="height: 120px;background-color: rgb(210, 210, 210);border-radius: 6px;text-align: center;line-height: 20px;padding: 20px 5px;box-shadow: 3px 3px 3px gray;">-->
-<!--                    <a style="color: black;font-weight: 600">基本信息</a>-->
-<!--                </div>-->
-<!--                <div-->
-<!--                     style="height: 150px;background-color: #fff;border-radius: 6px;margin-top: 5px;text-align: center;line-height: 20px;padding: 20px 5px;box-shadow: 3px 3px 3px gray;">-->
-<!--                    <a style="font-weight: 600">岗位变更信息</a>-->
-<!--                </div>-->
-<!--                <div-->
-<!--                     style="height: 120px;background-color: #fff;border-radius: 6px;margin-top: 5px;text-align: center;line-height: 20px;padding: 20px 5px;box-shadow: 3px 3px 3px gray;">-->
-<!--                    <a style="font-weight: 600">其他信息</a>-->
-<!--                </div>-->
-<!--                <div-->
-<!--                     style="height: 150px;background-color: #fff;border-radius: 6px;margin-top: 5px;text-align: center;line-height: 20px;padding: 20px 5px;box-shadow: 3px 3px 3px gray;">-->
-<!--                    <a style="font-weight: 600">历史修改信息</a>-->
-<!--                </div>-->
-<!--            </div>-->
-<!--        </div>-->
-
-         <div id="post1" style="height: 40px">
-        </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: 30px">
-            <div class="col-sm-3">
-                <div class="form-group mar">
-                    <label><span style="color: red;margin-right: 5px; ">*</span>单位</label>
-                    <input class="form-control" type="text" name="deptName"
-                           onclick="selectDeptTree('treeId','treeName')" id="treeName" th:field="*{deptName}" required>
-                </div>
+        <!-- 基本信息 -->
+        <div class="add-block">
+            <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="col-sm-3">
-                <div class="form-group mar">
-                    <label><span style="color: red;margin-right: 5px; ">*</span>姓名</label>
-                    <input name="name" placeholder="请输入人员姓名" th:field="*{name}" class="form-control" type="text"
-                           maxlength="30" required>
+            <div class="row">
+                <div class="col-sm-5" >
+                    <div class=""   >
+                        <label><span style="color: red;margin-right: 5px; ">*</span>单位</label>
+                        <input class="form-control" type="text" name="deptName"
+                               onclick="selectDeptTree('treeId','treeName')" id="treeName" th:field="*{deptName}" required>
+                    </div>
                 </div>
-            </div>
-            <div class="col-sm-3">
-                <div class="form-group mar">
-                    <label><span style="color: red;margin-right: 5px; ">*</span>身份证号</label>
-                    <input name="idcard" placeholder="请输入身份证号" class="form-control" th:field="*{idcard}" type="text"
-                           maxlength="30" required onblur="getBirthdayAndSexByIdNO(this.value)" readonly>
+                <div class="col-sm-5" >
+                    <div class=""  >
+                        <label><span style="color: red;margin-right: 5px; ">*</span>姓名</label>
+                        <input name="name" placeholder="请输入人员姓名" th:field="*{name}" class="form-control" type="text"
+                               maxlength="30" required>
+                    </div>
                 </div>
-            </div>
-            <div class="col-sm-3">
-                <div class="form-group mar" style="height: 70px">
-                    <p><img style="width:140px;height:160px;" id="photo1"
-                            th:src="(${#strings.isEmpty(personnel.photo)}) ? @{/img/profile.jpg} : @{*{photo}}"></p>
-                    <p style="text-align: center;width: 140px"><a href="javascript:photo()" style="text-align: center">修改头像</a>
-                    </p>
+                <div class="col-sm-2" style="text-align: right;">
+                    <div class="flex flex-direction align-center" style="height: 80px" >
+                        <p><img  style="width:160px;height:225px;"  id="photo1" th:src="(${#strings.isEmpty(personnel.photo)}) ? @{/img/profile.jpg} : @{*{photo}}"></p>
+                        <p class="btn-border-blue" style="margin-top: 10px;padding: 0 10px;"><a href="javascript:photo()"  style="text-align: center;color: #4377FE;">修改头像</a></p>
+                    </div>
                 </div>
             </div>
-        </div>
-        <div class="row" style="margin-bottom: 18px">
-            <div class="col-sm-3">
-                <div class="form-group mar">
-                    <label><span style="color: red;margin-right: 5px; ">*</span>性别</label>
-                    <select name="sex" id="sex" class="form-control m-b" th:with="type=${@dict.getType('sys_user_sex')}"
-                            required  readonly>
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
-                                th:field="*{sex}"></option>
-                    </select>
+            <div class="row">
+                <div class="col-sm-5" >
+                    <div class=""   >
+                        <label><span style="color: red;margin-right: 5px; ">*</span>身份证号</label>
+                        <input name="idcard" placeholder="请输入身份证号" class="form-control" th:field="*{idcard}" type="text"
+                               maxlength="30" required onblur="getBirthdayAndSexByIdNO(this.value)" readonly>
+                    </div>
                 </div>
-            </div>
-            <div class="col-sm-3">
-                <div class="form-group mar">
-                    <label>年龄</label>
-                    <input name="age" id="age" placeholder="请输入年龄"
-                           onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"
-                           onafterpaste="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"
-                           class="form-control" type="text" th:field="*{age}" maxlength="30"  readonly>
+                <div class="col-sm-5" >
+                    <div class=""   >
+                        <label><span style="color: red;margin-right: 5px; ">*</span>性别</label>
+                        <select name="sex" id="sex" class="form-control m-b" th:with="type=${@dict.getType('sys_user_sex')}"
+                                required  readonly>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+                                    th:field="*{sex}"></option>
+                        </select>
+                    </div>
                 </div>
             </div>
-            <div class="col-sm-3">
-                <div class="form-group mar">
-                    <label><span style="color: red;margin-right: 5px; ">*</span>身份证出生年月</label>
-                    <div class="input-group date">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                        <input name="birthTime" id="birthTime" class="form-control" placeholder="请选择身份证出生年月" type="text"
-                               th:value="${#dates.format(personnel.birthTime, 'yyyy-MM-dd')}" required  readonly>
+            <div class="row">
+                <div class="col-sm-5" >
+                    <div class=""   >
+                        <label>年龄</label>
+                        <input name="age" id="age" placeholder="请输入年龄"
+                               onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"
+                               onafterpaste="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"
+                               class="form-control" type="text" th:field="*{age}" maxlength="30"  readonly>
+                    </div>
+                </div>
+                <div class="col-sm-5" >
+                    <div class=""   >
+                        <label><span style="color: red;margin-right: 5px; ">*</span>身份证出生年月</label>
+                        <div class="input-group date">
+                            <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                            <input name="birthTime" id="birthTime" class="form-control" placeholder="请选择身份证出生年月" type="text"
+                                   th:value="${#dates.format(personnel.birthTime, 'yyyy-MM-dd')}" required  readonly>
+                        </div>
                     </div>
                 </div>
             </div>
-
-        </div>
-
-        <div class="row" style="margin-bottom: 30px">
-            <div class="col-sm-3" id="sub" th:if="${deptCategory} eq '3' and ${pack} eq'Y'">
-                <div class="form-group mar">
-                    <label><span style="color: red;margin-right: 5px; ">子单位</span></label>
-                    <select name="sonDept" id="sonDept" class="form-control m-b"
-                            th:with="type=${@dict.getTypeByDictParentValue('dept_pack',deptId)}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                                th:value="${dict.dictValue}" th:field="*{sonDept}"></option>
-                    </select>
+            <div class="row">
+                <div class="col-sm-5"  id="sub" th:if="${deptCategory} eq '3' and ${pack} eq'Y'">
+                    <div class=""   >
+                        <label><span style="color: red;margin-right: 5px; ">子单位</span></label>
+                        <select name="sonDept" id="sonDept" class="form-control m-b"
+                                th:with="type=${@dict.getTypeByDictParentValue('dept_pack',deptId)}">
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
+                                    th:value="${dict.dictValue}" th:field="*{sonDept}"></option>
+                        </select>
+                    </div>
                 </div>
             </div>
         </div>
 
-
-        <div id="post2" style="height: 100px">
-        </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: 30px">
-            <div class="col-sm-3">
-                <div class="form-group mar">
-                    <label><span style="color: red;margin-right: 5px; ">*</span>现任岗位</label>
-                    <input id="currentPostTypeId" name="currentPostType" type="hidden" th:field="*{currentPostType}">
-                    <input class="form-control" type="text" placeholder="请选择现任岗位"
-                           th:value="${@dict.getLabel('per_post_type','__*{currentPostType}__')}"
-                           onclick="selectDataTree('per_post_type','currentPostTypeId','currentPostTypeName')"
-                           id="currentPostTypeName" style="background-color: white" readonly required>
-                </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 mar">
-                    <label>现任岗位认定备案时间</label><br>
-                    <div class="input-group date">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                        <input name="currentPostTime" class="form-control" placeholder="请选择现任岗位认定备案时间" type="text"
-                               th:value="${#dates.format(personnel.currentPostTime, 'yyyy-MM-dd')}">
+            <div class="row">
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label><span style="color: red;margin-right: 5px; ">*</span>现任岗位</label>
+                        <input id="currentPostTypeId" name="currentPostType" type="hidden" th:field="*{currentPostType}">
+                        <input class="form-control" type="text" placeholder="请选择现任岗位"
+                               th:value="${@dict.getLabel('per_post_type','__*{currentPostType}__')}"
+                               onclick="selectDataTree('per_post_type','currentPostTypeId','currentPostTypeName')"
+                               id="currentPostTypeName" style="background-color: white" readonly required>
                     </div>
                 </div>
-            </div>
-            <div class="col-sm-3">
-                <div class="form-group mar">
-                    <label><span name="leadershipPosStyle"></span><span name="leadershipPosStyle2">领导职务</span></label>
-                    <input name="leadershipPos" placeholder="请输入领导职务" class="form-control" type="text" maxlength="30"
-                           th:field="*{leadershipPos}">
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>现任岗位认定备案时间</label><br>
+                        <div class="input-group date">
+                            <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                            <input name="currentPostTime" class="form-control" placeholder="请选择现任岗位认定备案时间" type="text"
+                                   th:value="${#dates.format(personnel.currentPostTime, 'yyyy-MM-dd')}">
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="col-sm-3">
-                <div class="form-group mar">
-                    <label>领导职务时间</label><br>
-                    <div class="input-group date">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                        <input name="leadershipPosTime" class="form-control" placeholder="请选择领导职务时间" type="text"
-                               th:value="${#dates.format(personnel.leadershipPosTime, 'yyyy-MM-dd')}">
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label><span name="leadershipPosStyle"></span><span name="leadershipPosStyle2">领导职务</span></label>
+                        <input name="leadershipPos" placeholder="请输入领导职务" class="form-control" type="text" maxlength="30"
+                               th:field="*{leadershipPos}">
                     </div>
                 </div>
             </div>
-        </div>
 
-        <div class="row" style="margin-bottom: 24px">
-            <div class="col-sm-3"   th:if="${deptLevel} == '2'" >
-                <div class="form-group mar" >
-                    <label>职员等级</label>
-                    <select name="staffGrades" class="form-control m-b" th:with="type=${@dict.getType('staff_grades')}">
-                        <option value="">无</option>
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"  th:field="*{staffGrades}"></option>
-                    </select>
+            <div class="row" style="margin-bottom: 0;">
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>领导职务时间</label><br>
+                        <div class="input-group date">
+                            <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                            <input name="leadershipPosTime" class="form-control" placeholder="请选择领导职务时间" type="text"
+                                   th:value="${#dates.format(personnel.leadershipPosTime, 'yyyy-MM-dd')}">
+                        </div>
+                    </div>
                 </div>
-            </div>
-
-            <div class="col-sm-3">
-                <div class="form-group mar">
-                    <label>兼任岗位</label>
-                    <input id="additionalPostTypeId" name="additionalPostType" type="hidden"
-                           th:field="*{additionalPostType}">
-                    <input class="form-control" type="text" placeholder="请选择兼任岗位"
-                           th:value="${@dict.getLabel('per_post_type','__*{additionalPostType}__')}"
-                           onclick="selectDataTree('per_post_type_add','additionalPostTypeId','additionalPostTypeName')"
-                           id="additionalPostTypeName" style="background-color: white" readonly>
+                <div class="col-sm-4"   th:if="${deptLevel} == '2'" >
+                    <div class="" >
+                        <label>职员等级</label>
+                        <select name="staffGrades" class="form-control m-b" th:with="type=${@dict.getType('staff_grades')}">
+                            <option value="">无</option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"  th:field="*{staffGrades}"></option>
+                        </select>
+                    </div>
                 </div>
-            </div>
-            <div class="col-sm-3">
-                <div class="form-group mar">
-                    <label>兼任岗位认定备案时间</label>
-                    <div class="input-group date">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                        <input name="additionalPostTime" class="form-control" placeholder="请选择兼任岗位认定备案时间" type="text"
-                               th:value="${#dates.format(personnel.additionalPostTime, 'yyyy-MM-dd')}">
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>兼任岗位</label>
+                        <input id="additionalPostTypeId" name="additionalPostType" type="hidden"
+                               th:field="*{additionalPostType}">
+                        <input class="form-control" type="text" placeholder="请选择兼任岗位"
+                               th:value="${@dict.getLabel('per_post_type','__*{additionalPostType}__')}"
+                               onclick="selectDataTree('per_post_type_add','additionalPostTypeId','additionalPostTypeName')"
+                               id="additionalPostTypeName" style="background-color: white" readonly>
+                    </div>
+                </div>
+                <div class="col-sm-4" th:if="${deptLevel} != '2'">
+                    <div class=""   >
+                        <label>兼任岗位认定备案时间</label>
+                        <div class="input-group date">
+                            <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                            <input name="additionalPostTime" class="form-control" placeholder="请选择兼任岗位认定备案时间" type="text"
+                                   th:value="${#dates.format(personnel.additionalPostTime, 'yyyy-MM-dd')}">
+                        </div>
                     </div>
                 </div>
             </div>
-        </div>
-        <div>
-            <div style="margin-bottom: 20px;margin-top: 70px">
-                <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 class="row" style="margin-bottom: 0;" th:if="${deptLevel} == '2'" >
+                <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="additionalPostTime" class="form-control" placeholder="请选择兼任岗位认定备案时间" type="text" th:value="${#dates.format(personnel.additionalPostTime, 'yyyy-MM-dd')}" readonly disabled>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
 
-
-
-
-        <div class="row" style="margin-bottom: 20px">
-            <div class="col-sm-3">
-                <div class="form-group mar">
-                    <label>民族</label>
-                    <select name="national" class="form-control m-b" th:with="type=${@dict.getType('per_national')}">
-                        <option value="">无</option>
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
-                                th:field="*{national}"></option>
-                    </select>
-                </div>
+        <!-- 其他信息 -->
+        <div class="add-block" style="padding: 24px;">
+            <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 mar">
-                    <label>政治面貌</label><br>
-                    <select name="politicalLandscape" class="form-control m-b"
-                            th:with="type=${@dict.getType('per_political_landscape')}">
-                        <option value="">无</option>
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
-                                th:field="*{politicalLandscape}"></option>
-                    </select>
+            <div class="row">
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>民族</label>
+                        <select name="national" class="form-control m-b" th:with="type=${@dict.getType('per_national')}">
+                            <option value="">无</option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+                                    th:field="*{national}"></option>
+                        </select>
+                    </div>
                 </div>
-            </div>
-            <div class="col-sm-3">
-                <div class="form-group mar">
-                    <label>籍贯</label><br>
-                    <input id="nativePlaceId" name="nativePlace" type="hidden" th:field="*{nativePlace}">
-                    <input class="form-control" type="text" placeholder="请选择籍贯"
-                           th:value="${@dict.getLabel('dept_administrative_zones','__*{nativePlace}__')}"
-                           onclick="selectDataTree('dept_administrative_zones','nativePlaceId','nativePlaceName')"
-                           id="nativePlaceName" style="background-color: white" readonly>
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>政治面貌</label><br>
+                        <select name="politicalLandscape" class="form-control m-b"
+                                th:with="type=${@dict.getType('per_political_landscape')}">
+                            <option value="">无</option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+                                    th:field="*{politicalLandscape}"></option>
+                        </select>
+                    </div>
                 </div>
-            </div>
-            <div class="col-sm-3">
-                <div class="form-group mar">
-                    <label>健康状况</label><br>
-                    <input id="healthId" name="health" type="hidden" th:field="*{health}">
-                    <input class="form-control" type="text" placeholder="请选择健康状况"
-                           th:value="${@dict.getLabel('per_health','__*{health}__')}"
-                           onclick="selectDataTree('per_health','healthId','healthName')" id="healthName"
-                           style="background-color: white" readonly>
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>籍贯</label><br>
+                        <input id="nativePlaceId" name="nativePlace" type="hidden" th:field="*{nativePlace}">
+                        <input class="form-control" type="text" placeholder="请选择籍贯"
+                               th:value="${@dict.getLabel('dept_administrative_zones','__*{nativePlace}__')}"
+                               onclick="selectDataTree('dept_administrative_zones','nativePlaceId','nativePlaceName')"
+                               id="nativePlaceName" style="background-color: white" readonly>
+                    </div>
                 </div>
             </div>
-        </div>
-        <div class="row" style="margin-bottom: 30px">
-            <div class="col-sm-3">
-                <div class="form-group mar">
-                    <label>婚姻状况</label><br>
-                    <input id="maritalStatusId" name="maritalStatus" type="hidden" th:field="*{maritalStatus}" required>
-                    <input class="form-control" type="text" placeholder="请选择婚姻状况"
-                           th:value="${@dict.getLabel('per_marital_status','__*{maritalStatus}__')}"
-                           onclick="selectDataTree('per_marital_status','maritalStatusId','maritalStatusName')"
-                           id="maritalStatusName" style="background-color: white" readonly>
+            <div class="row">
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>健康状况</label><br>
+                        <input id="healthId" name="health" type="hidden" th:field="*{health}">
+                        <input class="form-control" type="text" placeholder="请选择健康状况"
+                               th:value="${@dict.getLabel('per_health','__*{health}__')}"
+                               onclick="selectDataTree('per_health','healthId','healthName')" id="healthName"
+                               style="background-color: white" readonly>
+                    </div>
                 </div>
-            </div>
-            <div class="col-sm-3">
-                <div class="form-group mar">
-                    <label>进入本单位方式</label><br>
-                    <input id="enterWayId" name="enterWay" type="hidden" th:field="*{enterWay}">
-                    <input class="form-control" type="text" placeholder="请选择进入本单位方式"
-                           th:value="${@dict.getLabel('per_enter_way','__*{enterWay}__')}"
-                           onclick="selectDataTree('per_enter_way','enterWayId','enterWayName')" id="enterWayName"
-                           style="background-color: white" readonly>
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>婚姻状况</label><br>
+                        <input id="maritalStatusId" name="maritalStatus" type="hidden" th:field="*{maritalStatus}" required>
+                        <input class="form-control" type="text" placeholder="请选择婚姻状况"
+                               th:value="${@dict.getLabel('per_marital_status','__*{maritalStatus}__')}"
+                               onclick="selectDataTree('per_marital_status','maritalStatusId','maritalStatusName')"
+                               id="maritalStatusName" style="background-color: white" readonly>
+                    </div>
                 </div>
-            </div>
-            <div class="col-sm-3">
-                <div class="form-group mar">
-                    <label>进入本单位备案时间</label>
-                    <div class="input-group date">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                        <input name="enterTime" class="form-control" placeholder="请选择进入本单位备案时间" type="text"
-                               th:value="${#dates.format(personnel.enterTime, 'yyyy-MM-dd')}">
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>进入本单位方式</label><br>
+                        <input id="enterWayId" name="enterWay" type="hidden" th:field="*{enterWay}">
+                        <input class="form-control" type="text" placeholder="请选择进入本单位方式"
+                               th:value="${@dict.getLabel('per_enter_way','__*{enterWay}__')}"
+                               onclick="selectDataTree('per_enter_way','enterWayId','enterWayName')" id="enterWayName"
+                               style="background-color: white" readonly>
                     </div>
                 </div>
             </div>
-            <div class="col-sm-3">
-                <div class="form-group mar">
-                    <label>脱离本单位方式</label><br>
-                    <input id="outWayId" name="outWay" type="hidden" th:field="*{outWay}">
-                    <input class="form-control" type="text" placeholder="请选择脱离本单位方式"
-                           th:value="${@dict.getLabel('per_out_way','__*{outWay}__')}"
-                           onclick="selectDataTree('per_out_way','outWayId','outWayName')" id="outWayName"
-                           style="background-color: white" readonly>
+            <div class="row">
+                <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="enterTime" class="form-control" placeholder="请选择进入本单位备案时间" type="text"
+                                   th:value="${#dates.format(personnel.enterTime, 'yyyy-MM-dd')}">
+                        </div>
+                    </div>
                 </div>
-            </div>
-        </div>
-        <div class="row" style="margin-bottom: 30px;margin-top: 20px">
-            <div class="col-sm-3">
-                <div class="form-group mar">
-                    <label>脱离本单位备案时间</label>
-                    <div class="input-group date">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                        <input name="outTime" class="form-control" placeholder="请选择脱离本单位备案时间" type="text"
-                               th:value="${#dates.format(personnel.outTime, 'yyyy-MM-dd')}">
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>脱离本单位方式</label><br>
+                        <input id="outWayId" name="outWay" type="hidden" th:field="*{outWay}">
+                        <input class="form-control" type="text" placeholder="请选择脱离本单位方式"
+                               th:value="${@dict.getLabel('per_out_way','__*{outWay}__')}"
+                               onclick="selectDataTree('per_out_way','outWayId','outWayName')" id="outWayName"
+                               style="background-color: white" readonly>
                     </div>
                 </div>
-            </div>
-            <div class="col-sm-3">
-                <div class="form-group mar">
-                    <label>职称</label>
-                    <input name="title" id="title" th:field="*{title}" class="form-control" type="text" maxlength="30"
-                           readonly>
+                <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="outTime" class="form-control" placeholder="请选择脱离本单位备案时间" type="text"
+                                   th:value="${#dates.format(personnel.outTime, 'yyyy-MM-dd')}">
+                        </div>
+                    </div>
                 </div>
             </div>
-            <!--            <div class="col-sm-3" >-->
-            <!--                <div class="form-group mar"   >-->
-            <!--                    <label>专业技术人员专业类别</label>-->
-            <!--                    <input id="professionalCategoryId" name="professionalCategory" type="hidden"  th:field="*{professionalCategory}">-->
-            <!--                    <input class="form-control" type="text"  th:value="${@dict.getLabel('per_professional_category','__*{professionalCategory}__')}" onclick="selectDataTree('per_professional_category','professionalCategoryId','professionalCategoryName')" id="professionalCategoryName" style="background-color: white" readonly>-->
-            <!--                </div>-->
-            <!--            </div>-->
-            <div class="col-sm-3">
-                <div class="form-group mar">
-                    <label><span style="color: red;margin-right: 5px; ">*</span>人员类别</label>
-                    <input id="personnelCategoryId" name="personnelCategory" type="hidden"
-                           th:field="*{personnelCategory}" required>
-                    <input class="form-control" type="text" placeholder="请选择人员类别"
-                           th:value="${@dict.getLabel('per_category','__*{personnelCategory}__')}"
-                           onclick="selectDataTree('per_category','personnelCategoryId','personnelCategoryName')"
-                           id="personnelCategoryName" style="background-color: white" readonly required>
+            <div class="row">
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label>职称</label>
+                        <input name="title" id="title" th:field="*{title}" class="form-control" type="text" maxlength="30"
+                               readonly>
+                    </div>
                 </div>
-            </div>
-            <div class="col-sm-3">
-                <div class="form-group mar">
-                    <label><span style="color: red;margin-right: 5px; ">*</span>人员状态</label>
-                    <input id="personnelStatusId" name="personnelStatus" type="hidden" th:field="*{personnelStatus}"
-                           required>
-                    <input class="form-control" type="text" placeholder="请选择人员状态"
-                           th:value="${@dict.getLabel('per_status','__*{personnelStatus}__')}"
-                           onclick="selectDataTree('per_status','personnelStatusId','personnelStatusName')"
-                           id="personnelStatusName" style="background-color: white" readonly required>
+                <!--            <div class="col-sm-3" >-->
+                <!--                <div class=""   >-->
+                <!--                    <label>专业技术人员专业类别</label>-->
+                <!--                    <input id="professionalCategoryId" name="professionalCategory" type="hidden"  th:field="*{professionalCategory}">-->
+                <!--                    <input class="form-control" type="text"  th:value="${@dict.getLabel('per_professional_category','__*{professionalCategory}__')}"id="professionalCategoryName" style="background-color: #eee" readonly disabled>-->
+                <!--                </div>-->
+                <!--            </div>-->
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label ><span style="color: red;margin-right: 5px; ">*</span>人员类别</label>
+                        <input id="personnelCategoryId" name="personnelCategory" type="hidden"
+                               th:field="*{personnelCategory}" required>
+                        <input class="form-control" type="text" placeholder="请选择人员类别"
+                               th:value="${@dict.getLabel('per_category','__*{personnelCategory}__')}"
+                               onclick="selectDataTree('per_category','personnelCategoryId','personnelCategoryName')"
+                               id="personnelCategoryName" style="background-color: white" readonly required>
+                    </div>
                 </div>
-            </div>
-
-        </div>
-        <div class="row" style="margin-bottom: 30px">
-            <div class="col-sm-3">
-                <div class="form-group mar">
-                    <label>是否港澳台及外籍人士</label><br>
-                    <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">
-                        <input type="radio" th:id="${'foreigner_' + dict.dictCode}" name="foreigner"
-                               th:value="${dict.dictValue}" th:field="*{foreigner}">
-                        <label th:for="${'foreigner_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                <div class="col-sm-4" >
+                    <div class=""   >
+                        <label><span style="color: red;margin-right: 5px; ">*</span>人员状态</label>
+                        <input id="personnelStatusId" name="personnelStatus" type="hidden" th:field="*{personnelStatus}"
+                               required>
+                        <input class="form-control" type="text" placeholder="请选择人员状态"
+                               th:value="${@dict.getLabel('per_status','__*{personnelStatus}__')}"
+                               onclick="selectDataTree('per_status','personnelStatusId','personnelStatusName')"
+                               id="personnelStatusName" style="background-color: white" readonly required>
                     </div>
                 </div>
             </div>
-            <div class="col-sm-3">
-                <div class="form-group mar">
-                    <label>特殊人才</label><br>
-                    <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">
-                        <input type="radio" th:id="${'specialTalent_' + dict.dictCode}" name="specialTalent"
-                               th:value="${dict.dictValue}" th:field="*{specialTalent}">
-                        <label th:for="${'specialTalent_' + 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="${'foreigner_' + dict.dictCode}" name="foreigner"
+                                   th:value="${dict.dictValue}" th:field="*{foreigner}">
+                            <label th:for="${'foreigner_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                        </div>
                     </div>
                 </div>
-            </div>
-        </div>
-
-
-        <div class="row">
-            <div class="col-sm-4" style="margin:0 10px 0 65px ;width: 45%;">
-                <div class="form-group" style="width: 100%;">
-                    <label>备注</label><br>
-                    <div class="col-xs-24">
-                        <textarea name="remark" maxlength="500" placeholder="请输入备注" class="form-control" rows="2"
-                                  th:field="*{remark}"></textarea>
+                <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="${'specialTalent_' + dict.dictCode}" name="specialTalent"
+                                   th:value="${dict.dictValue}" th:field="*{specialTalent}">
+                            <label th:for="${'specialTalent_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                        </div>
                     </div>
                 </div>
             </div>
-            <div class="col-sm-4" style="margin:0 10px 0 90px ;width: 45%;">
-                <div class="form-group" style="width: 100%;">
-                    <label>附件</label>
-                    <div class="input-group col-sm-8" style="width: 100% ">
-                        <input type="text" class="form-control" οnkeydοwn="return false;" οnpaste="return false;"
-                               style="font-size: 0px">
-                        <label class="input-group-btn" style="display: none" id="trasch">
-                            <button type="button" class="btn btn-default" onclick="removeFile()">
-                                <span class="glyphicon glyphicon glyphicon-trash"></span>
-                            </button>
-                        </label>
-                        <input type="file" style="display: none;" id="fileUpload" class="file" multiple
-                               accept=".pdf,.png,.jpg"
-                               onchange="uploadPDFOrImgFiles('fileUpload','attachment','annex1','trasch')">
-                        <label class="input-group-btn">
-                        <span class="btn btn-primary" onclick="uploadFileCheck('fileUpload','annex1')">
-                            <i class="glyphicon glyphicon-folder-open"></i>
-                            选择
-                        </span>
-                        </label>
-                        <a id="annex1" style=" font-size: 12px;position: absolute;top: 10px;left:20px; z-index: 10;width: 65%;overflow: hidden;
-                        text-overflow:ellipsis;white-space: nowrap" onclick="openFile()"></a>
+            <div class="row">
+                <div class="col-sm-4">
+                    <div class="" style="width: 100%;">
+                        <label>备注</label><br>
+                        <div>
+                            <textarea name="remark" maxlength="500" placeholder="请输入备注" class="form-control" rows="2" th:field="*{remark}"></textarea>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-4">
+                    <div class="form-group" style="width: 100%;">
+                        <label>附件</label>
+                        <div class="input-group col-sm-8" style="width: 100% ">
+                            <input type="text" class="form-control" οnkeydοwn="return false;" οnpaste="return false;"
+                                   style="font-size: 0px">
+                            <label class="input-group-btn" style="display: none" id="trasch">
+                                <button type="button" class="btn btn-none-color absolute-fixed-right" style="position: absolute;" onclick="removeFile()">
+                                    <span class="glyphicon glyphicon-remove"></span>
+                                </button>
+                            </label>
+                            <input type="file" style="display: none;" id="fileUpload" class="file" multiple
+                                   accept=".pdf,.png,.jpg"
+                                   onchange="uploadPDFOrImgFiles('fileUpload','attachment','annex1','trasch')">
+                            <label class="input-group-btn">
+                          <span class="btn btn-primary bg-color-blue border-color-blue flex align-center" style="margin-left: 17px;" onclick="uploadFileCheck('fileUpload','annex1')">
+                              <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" fill="currentColor" class="bi bi-folder2-open" viewBox="0 0 16 16" style="margin-right: 6px;">
+                                <path d="M1 3.5A1.5 1.5 0 0 1 2.5 2h2.764c.958 0 1.76.56 2.311 1.184C7.985 3.648 8.48 4 9 4h4.5A1.5 1.5 0 0 1 15 5.5v.64c.57.265.94.876.856 1.546l-.64 5.124A2.5 2.5 0 0 1 12.733 15H3.266a2.5 2.5 0 0 1-2.481-2.19l-.64-5.124A1.5 1.5 0 0 1 1 6.14V3.5zM2 6h12v-.5a.5.5 0 0 0-.5-.5H9c-.964 0-1.71-.629-2.174-1.154C6.374 3.334 5.82 3 5.264 3H2.5a.5.5 0 0 0-.5.5V6zm-.367 1a.5.5 0 0 0-.496.562l.64 5.124A1.5 1.5 0 0 0 3.266 14h9.468a1.5 1.5 0 0 0 1.489-1.314l.64-5.124A.5.5 0 0 0 14.367 7H1.633z"/>
+                              </svg>
+                              选择
+                          </span>
+                            </label>
+                            <a id="annex1" style=" font-size: 14px;position: absolute;top: 10px;left:20px; z-index: 10;width: 65%;overflow: hidden;
+                          text-overflow:ellipsis;white-space: nowrap" onclick="openFile()"></a>
+                        </div>
                     </div>
                 </div>
             </div>
         </div>
 
-
-        <div id="post3" style="height: 100px">
-        </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="col-sm-12" style="padding-left: 0;padding-right: 0px;margin-top: 30px">
+        <!-- 岗位变更信息 -->
+        <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="iframe1" frameborder="0" name="iframe1" style="width: 100%;height: 700px" src=""></iframe>
+                <iframe id="iframe1" frameborder="0"   name="iframe1" style="width: 100%;height: 700px" src=""></iframe>
+            </div>
+        </div>
+        <!-- 历史修改信息 -->
+        <div class="add-block">
+            <div id="post4" 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="">
+                <div class="ibox-content" style="border-bottom-left-radius: 12px;border-bottom-right-radius: 12px">
+                    <iframe id="iframe2" frameborder="0" name="iframe2" style="width: 100%;height: 700px" src=""></iframe>
+                </div>
             </div>
         </div>
+        <div id="post5" style="height: 0px">
+        </div>
+
+
+    </form>
+</div>
+
+
+<!--<div class="col-sm-12 div-ul">-->
+<!--    <div class="ibox" th:if="${!jianyuan}">-->
+<!--        <ul class="nav nav-pills">-->
+<!--            &lt;!&ndash;            <li class="ac"><a href="#post1" style="color: #1a1a1a">基本信息</a></li>&ndash;&gt;-->
+<!--            &lt;!&ndash;            <li><a href="#post2" style="color: #1a1a1a">岗位变更信息</a></li>&ndash;&gt;-->
+<!--            &lt;!&ndash;            <li><a href="#post3" style="color: #1a1a1a">其他信息</a></li>&ndash;&gt;-->
+<!--            <div class="layui-layer-btn layui-layer-btn-" style="text-align: right;background: #ffffff;border-top: 0px">-->
+<!--                <a class="layui-layer-btn0" shiro:hasPermission="ahrs:personnel:edit" href="javascript:void(0)"-->
+<!--                   onclick="submitHandler()">保存</a>-->
+<!--                <a class="layui-layer-btn1" shiro:hasPermission="ahrs:personnel:edit" href="javascript:void(0)"-->
+<!--                   onclick="resetFrom()">重置</a>-->
+<!--            </div>-->
+<!--        </ul>-->
+<!--    </div>-->
+<!--</div>-->
+
+<!--<div>-->
+<!--    <form class="form-horizontal" id="form-personnel-edit" th:object="${personnel}">-->
+<!--        <input name="personnelId" th:field="*{personnelId}" type="hidden">-->
+<!--        <input name="version" th:field="*{version}" type="hidden">-->
+<!--        <input name="photo" th:field="*{photo}" type="hidden">-->
+<!--        <input name="attachment" id="attachment" type="hidden" th:field="*{attachment}">-->
+<!--        <input name="deptId" th:field="*{deptId}" type="hidden" id="treeId">-->
+
+<!--        <input name="createBy" th:field="*{createBy}" type="hidden">-->
+<!--        <input name="createTime" type="hidden" th:value="${#dates.format(personnel.createTime, 'yyyy-MM-dd HH:mm:ss')}">-->
+<!--        <input name="updateBy" th:field="*{updateBy}" type="hidden">-->
+<!--        <input name="updateTime" type="hidden" th:value="${#dates.format(personnel.updateTime, 'yyyy-MM-dd HH:mm:ss')}">-->
+
+<!--        <input name="currentPostGrades" type="hidden" id="currentPostGrades" th:field="*{currentPostGrades}">-->
+<!--        <input name="additionalPostGrades" type="hidden" id="additionalPostGrades" th:field="*{additionalPostGrades}">-->
+
+
+<!--&lt;!&ndash;        <div id="post10" >&ndash;&gt;-->
+<!--&lt;!&ndash;            <div id="show1" style="width: 30px;height: 165px;position: absolute;top: 10px;left: 5px;margin-top: 50px;" >&ndash;&gt;-->
+<!--&lt;!&ndash;                <div&ndash;&gt;-->
+<!--&lt;!&ndash;                     style="height: 120px;background-color: rgb(210, 210, 210);border-radius: 6px;text-align: center;line-height: 20px;padding: 20px 5px;box-shadow: 3px 3px 3px gray;">&ndash;&gt;-->
+<!--&lt;!&ndash;                    <a style="color: black;font-weight: 600">基本信息</a>&ndash;&gt;-->
+<!--&lt;!&ndash;                </div>&ndash;&gt;-->
+<!--&lt;!&ndash;                <div&ndash;&gt;-->
+<!--&lt;!&ndash;                     style="height: 150px;background-color: #fff;border-radius: 6px;margin-top: 5px;text-align: center;line-height: 20px;padding: 20px 5px;box-shadow: 3px 3px 3px gray;">&ndash;&gt;-->
+<!--&lt;!&ndash;                    <a style="font-weight: 600">岗位变更信息</a>&ndash;&gt;-->
+<!--&lt;!&ndash;                </div>&ndash;&gt;-->
+<!--&lt;!&ndash;                <div&ndash;&gt;-->
+<!--&lt;!&ndash;                     style="height: 120px;background-color: #fff;border-radius: 6px;margin-top: 5px;text-align: center;line-height: 20px;padding: 20px 5px;box-shadow: 3px 3px 3px gray;">&ndash;&gt;-->
+<!--&lt;!&ndash;                    <a style="font-weight: 600">其他信息</a>&ndash;&gt;-->
+<!--&lt;!&ndash;                </div>&ndash;&gt;-->
+<!--&lt;!&ndash;                <div&ndash;&gt;-->
+<!--&lt;!&ndash;                     style="height: 150px;background-color: #fff;border-radius: 6px;margin-top: 5px;text-align: center;line-height: 20px;padding: 20px 5px;box-shadow: 3px 3px 3px gray;">&ndash;&gt;-->
+<!--&lt;!&ndash;                    <a style="font-weight: 600">历史修改信息</a>&ndash;&gt;-->
+<!--&lt;!&ndash;                </div>&ndash;&gt;-->
+<!--&lt;!&ndash;            </div>&ndash;&gt;-->
+<!--&lt;!&ndash;        </div>&ndash;&gt;-->
+
+<!--         <div id="post1" style="height: 40px">-->
+<!--        </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: 30px">-->
+<!--            <div class="col-sm-3">-->
+<!--                <div class="form-group mar">-->
+<!--                    <label><span style="color: red;margin-right: 5px; ">*</span>单位</label>-->
+<!--                    <input class="form-control" type="text" name="deptName"-->
+<!--                           onclick="selectDeptTree('treeId','treeName')" id="treeName" th:field="*{deptName}" required>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="col-sm-3">-->
+<!--                <div class="form-group mar">-->
+<!--                    <label><span style="color: red;margin-right: 5px; ">*</span>姓名</label>-->
+<!--                    <input name="name" placeholder="请输入人员姓名" th:field="*{name}" class="form-control" type="text"-->
+<!--                           maxlength="30" required>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="col-sm-3">-->
+<!--                <div class="form-group mar">-->
+<!--                    <label><span style="color: red;margin-right: 5px; ">*</span>身份证号</label>-->
+<!--                    <input name="idcard" placeholder="请输入身份证号" class="form-control" th:field="*{idcard}" type="text"-->
+<!--                           maxlength="30" required onblur="getBirthdayAndSexByIdNO(this.value)" readonly>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="col-sm-3">-->
+<!--                <div class="form-group mar" style="height: 70px">-->
+<!--                    <p><img style="width:140px;height:160px;" id="photo1"-->
+<!--                            th:src="(${#strings.isEmpty(personnel.photo)}) ? @{/img/profile.jpg} : @{*{photo}}"></p>-->
+<!--                    <p style="text-align: center;width: 140px"><a href="javascript:photo()" style="text-align: center">修改头像</a>-->
+<!--                    </p>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="row" style="margin-bottom: 18px">-->
+<!--            <div class="col-sm-3">-->
+<!--                <div class="form-group mar">-->
+<!--                    <label><span style="color: red;margin-right: 5px; ">*</span>性别</label>-->
+<!--                    <select name="sex" id="sex" class="form-control m-b" th:with="type=${@dict.getType('sys_user_sex')}"-->
+<!--                            required  readonly>-->
+<!--                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"-->
+<!--                                th:field="*{sex}"></option>-->
+<!--                    </select>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="col-sm-3">-->
+<!--                <div class="form-group mar">-->
+<!--                    <label>年龄</label>-->
+<!--                    <input name="age" id="age" placeholder="请输入年龄"-->
+<!--                           onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"-->
+<!--                           onafterpaste="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"-->
+<!--                           class="form-control" type="text" th:field="*{age}" maxlength="30"  readonly>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="col-sm-3">-->
+<!--                <div class="form-group mar">-->
+<!--                    <label><span style="color: red;margin-right: 5px; ">*</span>身份证出生年月</label>-->
+<!--                    <div class="input-group date">-->
+<!--                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
+<!--                        <input name="birthTime" id="birthTime" class="form-control" placeholder="请选择身份证出生年月" type="text"-->
+<!--                               th:value="${#dates.format(personnel.birthTime, 'yyyy-MM-dd')}" required  readonly>-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </div>-->
+
+<!--        </div>-->
 
+<!--        <div class="row" style="margin-bottom: 30px">-->
+<!--            <div class="col-sm-3" id="sub" th:if="${deptCategory} eq '3' and ${pack} eq'Y'">-->
+<!--                <div class="form-group mar">-->
+<!--                    <label><span style="color: red;margin-right: 5px; ">子单位</span></label>-->
+<!--                    <select name="sonDept" id="sonDept" class="form-control m-b"-->
+<!--                            th:with="type=${@dict.getTypeByDictParentValue('dept_pack',deptId)}">-->
+<!--                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}"-->
+<!--                                th:value="${dict.dictValue}" th:field="*{sonDept}"></option>-->
+<!--                    </select>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
 
 
+<!--        <div id="post2" style="height: 100px">-->
+<!--        </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 id="post4" style="height: 100px">
-        </div>
+<!--        <div class="row" style="margin-bottom: 30px">-->
+<!--            <div class="col-sm-3">-->
+<!--                <div class="form-group mar">-->
+<!--                    <label><span style="color: red;margin-right: 5px; ">*</span>现任岗位</label>-->
+<!--                    <input id="currentPostTypeId" name="currentPostType" type="hidden" th:field="*{currentPostType}">-->
+<!--                    <input class="form-control" type="text" placeholder="请选择现任岗位"-->
+<!--                           th:value="${@dict.getLabel('per_post_type','__*{currentPostType}__')}"-->
+<!--                           onclick="selectDataTree('per_post_type','currentPostTypeId','currentPostTypeName')"-->
+<!--                           id="currentPostTypeName" style="background-color: white" readonly required>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="col-sm-3">-->
+<!--                <div class="form-group mar">-->
+<!--                    <label>现任岗位认定备案时间</label><br>-->
+<!--                    <div class="input-group date">-->
+<!--                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
+<!--                        <input name="currentPostTime" class="form-control" placeholder="请选择现任岗位认定备案时间" type="text"-->
+<!--                               th:value="${#dates.format(personnel.currentPostTime, 'yyyy-MM-dd')}">-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="col-sm-3">-->
+<!--                <div class="form-group mar">-->
+<!--                    <label><span name="leadershipPosStyle"></span><span name="leadershipPosStyle2">领导职务</span></label>-->
+<!--                    <input name="leadershipPos" placeholder="请输入领导职务" class="form-control" type="text" maxlength="30"-->
+<!--                           th:field="*{leadershipPos}">-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="col-sm-3">-->
+<!--                <div class="form-group mar">-->
+<!--                    <label>领导职务时间</label><br>-->
+<!--                    <div class="input-group date">-->
+<!--                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
+<!--                        <input name="leadershipPosTime" class="form-control" placeholder="请选择领导职务时间" type="text"-->
+<!--                               th:value="${#dates.format(personnel.leadershipPosTime, 'yyyy-MM-dd')}">-->
+<!--                    </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="col-sm-12" style="padding-left: 0;padding-right: 0px;margin-top: 30px">
-            <div class="ibox-content" style="border-bottom-left-radius: 12px;border-bottom-right-radius: 12px">
-                <iframe id="iframe2" frameborder="0" name="iframe2" style="width: 100%;height: 700px" src=""></iframe>
-            </div>
-        </div>
+<!--        <div class="row" style="margin-bottom: 24px">-->
+<!--            <div class="col-sm-3"   th:if="${deptLevel} == '2'" >-->
+<!--                <div class="form-group mar" >-->
+<!--                    <label>职员等级</label>-->
+<!--                    <select name="staffGrades" class="form-control m-b" th:with="type=${@dict.getType('staff_grades')}">-->
+<!--                        <option value="">无</option>-->
+<!--                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"  th:field="*{staffGrades}"></option>-->
+<!--                    </select>-->
+<!--                </div>-->
+<!--            </div>-->
 
+<!--            <div class="col-sm-3">-->
+<!--                <div class="form-group mar">-->
+<!--                    <label>兼任岗位</label>-->
+<!--                    <input id="additionalPostTypeId" name="additionalPostType" type="hidden"-->
+<!--                           th:field="*{additionalPostType}">-->
+<!--                    <input class="form-control" type="text" placeholder="请选择兼任岗位"-->
+<!--                           th:value="${@dict.getLabel('per_post_type','__*{additionalPostType}__')}"-->
+<!--                           onclick="selectDataTree('per_post_type_add','additionalPostTypeId','additionalPostTypeName')"-->
+<!--                           id="additionalPostTypeName" style="background-color: white" readonly>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="col-sm-3">-->
+<!--                <div class="form-group mar">-->
+<!--                    <label>兼任岗位认定备案时间</label>-->
+<!--                    <div class="input-group date">-->
+<!--                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
+<!--                        <input name="additionalPostTime" class="form-control" placeholder="请选择兼任岗位认定备案时间" type="text"-->
+<!--                               th:value="${#dates.format(personnel.additionalPostTime, 'yyyy-MM-dd')}">-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div>-->
+<!--            <div style="margin-bottom: 20px;margin-top: 70px">-->
+<!--                <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>-->
 
-        <div id="post5" style="height: 100px">
-        </div>
 
-    </form>
-</div>
+
+
+<!--        <div class="row" style="margin-bottom: 20px">-->
+<!--            <div class="col-sm-3">-->
+<!--                <div class="form-group mar">-->
+<!--                    <label>民族</label>-->
+<!--                    <select name="national" class="form-control m-b" th:with="type=${@dict.getType('per_national')}">-->
+<!--                        <option value="">无</option>-->
+<!--                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"-->
+<!--                                th:field="*{national}"></option>-->
+<!--                    </select>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="col-sm-3">-->
+<!--                <div class="form-group mar">-->
+<!--                    <label>政治面貌</label><br>-->
+<!--                    <select name="politicalLandscape" class="form-control m-b"-->
+<!--                            th:with="type=${@dict.getType('per_political_landscape')}">-->
+<!--                        <option value="">无</option>-->
+<!--                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"-->
+<!--                                th:field="*{politicalLandscape}"></option>-->
+<!--                    </select>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="col-sm-3">-->
+<!--                <div class="form-group mar">-->
+<!--                    <label>籍贯</label><br>-->
+<!--                    <input id="nativePlaceId" name="nativePlace" type="hidden" th:field="*{nativePlace}">-->
+<!--                    <input class="form-control" type="text" placeholder="请选择籍贯"-->
+<!--                           th:value="${@dict.getLabel('dept_administrative_zones','__*{nativePlace}__')}"-->
+<!--                           onclick="selectDataTree('dept_administrative_zones','nativePlaceId','nativePlaceName')"-->
+<!--                           id="nativePlaceName" style="background-color: white" readonly>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="col-sm-3">-->
+<!--                <div class="form-group mar">-->
+<!--                    <label>健康状况</label><br>-->
+<!--                    <input id="healthId" name="health" type="hidden" th:field="*{health}">-->
+<!--                    <input class="form-control" type="text" placeholder="请选择健康状况"-->
+<!--                           th:value="${@dict.getLabel('per_health','__*{health}__')}"-->
+<!--                           onclick="selectDataTree('per_health','healthId','healthName')" id="healthName"-->
+<!--                           style="background-color: white" readonly>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="row" style="margin-bottom: 30px">-->
+<!--            <div class="col-sm-3">-->
+<!--                <div class="form-group mar">-->
+<!--                    <label>婚姻状况</label><br>-->
+<!--                    <input id="maritalStatusId" name="maritalStatus" type="hidden" th:field="*{maritalStatus}" required>-->
+<!--                    <input class="form-control" type="text" placeholder="请选择婚姻状况"-->
+<!--                           th:value="${@dict.getLabel('per_marital_status','__*{maritalStatus}__')}"-->
+<!--                           onclick="selectDataTree('per_marital_status','maritalStatusId','maritalStatusName')"-->
+<!--                           id="maritalStatusName" style="background-color: white" readonly>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="col-sm-3">-->
+<!--                <div class="form-group mar">-->
+<!--                    <label>进入本单位方式</label><br>-->
+<!--                    <input id="enterWayId" name="enterWay" type="hidden" th:field="*{enterWay}">-->
+<!--                    <input class="form-control" type="text" placeholder="请选择进入本单位方式"-->
+<!--                           th:value="${@dict.getLabel('per_enter_way','__*{enterWay}__')}"-->
+<!--                           onclick="selectDataTree('per_enter_way','enterWayId','enterWayName')" id="enterWayName"-->
+<!--                           style="background-color: white" readonly>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="col-sm-3">-->
+<!--                <div class="form-group mar">-->
+<!--                    <label>进入本单位备案时间</label>-->
+<!--                    <div class="input-group date">-->
+<!--                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
+<!--                        <input name="enterTime" class="form-control" placeholder="请选择进入本单位备案时间" type="text"-->
+<!--                               th:value="${#dates.format(personnel.enterTime, 'yyyy-MM-dd')}">-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="col-sm-3">-->
+<!--                <div class="form-group mar">-->
+<!--                    <label>脱离本单位方式</label><br>-->
+<!--                    <input id="outWayId" name="outWay" type="hidden" th:field="*{outWay}">-->
+<!--                    <input class="form-control" type="text" placeholder="请选择脱离本单位方式"-->
+<!--                           th:value="${@dict.getLabel('per_out_way','__*{outWay}__')}"-->
+<!--                           onclick="selectDataTree('per_out_way','outWayId','outWayName')" id="outWayName"-->
+<!--                           style="background-color: white" readonly>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="row" style="margin-bottom: 30px;margin-top: 20px">-->
+<!--            <div class="col-sm-3">-->
+<!--                <div class="form-group mar">-->
+<!--                    <label>脱离本单位备案时间</label>-->
+<!--                    <div class="input-group date">-->
+<!--                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
+<!--                        <input name="outTime" class="form-control" placeholder="请选择脱离本单位备案时间" type="text"-->
+<!--                               th:value="${#dates.format(personnel.outTime, 'yyyy-MM-dd')}">-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="col-sm-3">-->
+<!--                <div class="form-group mar">-->
+<!--                    <label>职称</label>-->
+<!--                    <input name="title" id="title" th:field="*{title}" class="form-control" type="text" maxlength="30"-->
+<!--                           readonly>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            &lt;!&ndash;            <div class="col-sm-3" >&ndash;&gt;-->
+<!--            &lt;!&ndash;                <div class="form-group mar"   >&ndash;&gt;-->
+<!--            &lt;!&ndash;                    <label>专业技术人员专业类别</label>&ndash;&gt;-->
+<!--            &lt;!&ndash;                    <input id="professionalCategoryId" name="professionalCategory" type="hidden"  th:field="*{professionalCategory}">&ndash;&gt;-->
+<!--            &lt;!&ndash;                    <input class="form-control" type="text"  th:value="${@dict.getLabel('per_professional_category','__*{professionalCategory}__')}" onclick="selectDataTree('per_professional_category','professionalCategoryId','professionalCategoryName')" id="professionalCategoryName" style="background-color: white" readonly>&ndash;&gt;-->
+<!--            &lt;!&ndash;                </div>&ndash;&gt;-->
+<!--            &lt;!&ndash;            </div>&ndash;&gt;-->
+<!--            <div class="col-sm-3">-->
+<!--                <div class="form-group mar">-->
+<!--                    <label><span style="color: red;margin-right: 5px; ">*</span>人员类别</label>-->
+<!--                    <input id="personnelCategoryId" name="personnelCategory" type="hidden"-->
+<!--                           th:field="*{personnelCategory}" required>-->
+<!--                    <input class="form-control" type="text" placeholder="请选择人员类别"-->
+<!--                           th:value="${@dict.getLabel('per_category','__*{personnelCategory}__')}"-->
+<!--                           onclick="selectDataTree('per_category','personnelCategoryId','personnelCategoryName')"-->
+<!--                           id="personnelCategoryName" style="background-color: white" readonly required>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="col-sm-3">-->
+<!--                <div class="form-group mar">-->
+<!--                    <label><span style="color: red;margin-right: 5px; ">*</span>人员状态</label>-->
+<!--                    <input id="personnelStatusId" name="personnelStatus" type="hidden" th:field="*{personnelStatus}"-->
+<!--                           required>-->
+<!--                    <input class="form-control" type="text" placeholder="请选择人员状态"-->
+<!--                           th:value="${@dict.getLabel('per_status','__*{personnelStatus}__')}"-->
+<!--                           onclick="selectDataTree('per_status','personnelStatusId','personnelStatusName')"-->
+<!--                           id="personnelStatusName" style="background-color: white" readonly required>-->
+<!--                </div>-->
+<!--            </div>-->
+
+<!--        </div>-->
+<!--        <div class="row" style="margin-bottom: 30px">-->
+<!--            <div class="col-sm-3">-->
+<!--                <div class="form-group mar">-->
+<!--                    <label>是否港澳台及外籍人士</label><br>-->
+<!--                    <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">-->
+<!--                        <input type="radio" th:id="${'foreigner_' + dict.dictCode}" name="foreigner"-->
+<!--                               th:value="${dict.dictValue}" th:field="*{foreigner}">-->
+<!--                        <label th:for="${'foreigner_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="col-sm-3">-->
+<!--                <div class="form-group mar">-->
+<!--                    <label>特殊人才</label><br>-->
+<!--                    <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">-->
+<!--                        <input type="radio" th:id="${'specialTalent_' + dict.dictCode}" name="specialTalent"-->
+<!--                               th:value="${dict.dictValue}" th:field="*{specialTalent}">-->
+<!--                        <label th:for="${'specialTalent_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
+
+
+<!--        <div class="row">-->
+<!--            <div class="col-sm-4" style="margin:0 10px 0 65px ;width: 45%;">-->
+<!--                <div class="form-group" style="width: 100%;">-->
+<!--                    <label>备注</label><br>-->
+<!--                    <div class="col-xs-24">-->
+<!--                        <textarea name="remark" maxlength="500" placeholder="请输入备注" class="form-control" rows="2"-->
+<!--                                  th:field="*{remark}"></textarea>-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="col-sm-4" style="margin:0 10px 0 90px ;width: 45%;">-->
+<!--                <div class="form-group" style="width: 100%;">-->
+<!--                    <label>附件</label>-->
+<!--                    <div class="input-group col-sm-8" style="width: 100% ">-->
+<!--                        <input type="text" class="form-control" οnkeydοwn="return false;" οnpaste="return false;"-->
+<!--                               style="font-size: 0px">-->
+<!--                        <label class="input-group-btn" style="display: none" id="trasch">-->
+<!--                            <button type="button" class="btn btn-default" onclick="removeFile()">-->
+<!--                                <span class="glyphicon glyphicon glyphicon-trash"></span>-->
+<!--                            </button>-->
+<!--                        </label>-->
+<!--                        <input type="file" style="display: none;" id="fileUpload" class="file" multiple-->
+<!--                               accept=".pdf,.png,.jpg"-->
+<!--                               onchange="uploadPDFOrImgFiles('fileUpload','attachment','annex1','trasch')">-->
+<!--                        <label class="input-group-btn">-->
+<!--                        <span class="btn btn-primary" onclick="uploadFileCheck('fileUpload','annex1')">-->
+<!--                            <i class="glyphicon glyphicon-folder-open"></i>-->
+<!--                            选择-->
+<!--                        </span>-->
+<!--                        </label>-->
+<!--                        <a id="annex1" style=" font-size: 12px;position: absolute;top: 10px;left:20px; z-index: 10;width: 65%;overflow: hidden;-->
+<!--                        text-overflow:ellipsis;white-space: nowrap" onclick="openFile()"></a>-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
+
+
+<!--        <div id="post3" style="height: 100px">-->
+<!--        </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="col-sm-12" style="padding-left: 0;padding-right: 0px;margin-top: 30px">-->
+<!--            <div class="ibox-content" style="border-bottom-left-radius: 12px;border-bottom-right-radius: 12px">-->
+<!--                <iframe id="iframe1" frameborder="0" name="iframe1" style="width: 100%;height: 700px" src=""></iframe>-->
+<!--            </div>-->
+<!--        </div>-->
+
+
+
+
+
+<!--        <div id="post4" style="height: 100px">-->
+<!--        </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="col-sm-12" style="padding-left: 0;padding-right: 0px;margin-top: 30px">-->
+<!--            <div class="ibox-content" style="border-bottom-left-radius: 12px;border-bottom-right-radius: 12px">-->
+<!--                <iframe id="iframe2" frameborder="0" name="iframe2" style="width: 100%;height: 700px" src=""></iframe>-->
+<!--            </div>-->
+<!--        </div>-->
+
+
+<!--        <div id="post5" style="height: 100px">-->
+<!--        </div>-->
+
+<!--    </form>-->
+<!--</div>-->
 
 
 <th:block th:include="include :: footer"/>

File diff suppressed because it is too large
+ 526 - 442
ruoyi-system/src/main/resources/templates/ahrs/personnel/editPart.html


Some files were not shown because too many files changed in this diff