Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/workstaff/service/WorkStaffBasicInfoService.java

@@ -485,7 +485,7 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
 	    if (workStaffBasicInfo==null||StringUtils.isBlank(workStaffBasicInfo.getId())||StringUtils.isBlank(workStaffBasicInfo.getUserId())){
 	        return;
         }
-        WorkProjectNotify workProjectNotify = UtilNotify.saveNotify(workStaffBasicInfo.getId(),null, workStaffBasicInfo.getCompany().getId(),
+        /*WorkProjectNotify workProjectNotify = UtilNotify.saveNotify(workStaffBasicInfo.getId(),null, workStaffBasicInfo.getCompany().getId(),
                 titleStr, contentStr,"69","0",remark,"");
         List<String> userIds = new ArrayList<>();
         userIds.add(workStaffBasicInfo.getUserId());
@@ -493,7 +493,7 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
         workProjectNotify.setId("");
         workProjectNotify.setNotifyRole("");
         workProjectNotifyService .save(workProjectNotify);
-        UserUtils.pushIm(userIds,contentStr);
+        UserUtils.pushIm(userIds,contentStr);*/
     }
 
     private String createNo(WorkStaffBasicInfo workStaffBasicInfo) {

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoForm.jsp

@@ -34,12 +34,9 @@
                         $("#inputForm").submit();
                         parent.layer.closeAll();
                     }else {
-                        parent.layer.alert('该成员将收到信息完善待办。',
-                            function (index) {
-                                $("#notifyFlag").val("1");
-                                $("#inputForm").submit();
-                                parent.layer.closeAll();
-                            });
+                        $("#notifyFlag").val("1");
+                        $("#inputForm").submit();
+                        parent.layer.closeAll();
                     }
                 }
                 return false;
@@ -96,7 +93,12 @@
                 });
             })
 
-
+            laydate.render({
+                elem: '#entryDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+                event: 'focus', //响应事件。如果没有传入event，则按照默认的click
+                type : 'date'
+                , trigger: 'click'
+            });
 
             laydate.render({
                 elem: '#tryEndTime', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
@@ -425,53 +427,14 @@
             <input id="updateFlag" value="${updateFlag}" style="display:none;">
             <div class="form-group layui-row first">
                 <div class="form-group-label"><h2>基本信息</h2></div>
-                <div class="layui-item layui-col-sm6 lw7" style="padding-right: 0;">
-                    <div class="layui-item layui-col-sm12">
-                        <label class="layui-form-label"><span class="require-item">*</span>工    号：</label>
-                        <div class="layui-input-block">
-                            <form:input path="no" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
-                        </div>
-                    </div>
-                    <div class="layui-item layui-col-sm12">
-                        <label class="layui-form-label"><span class="require-item">*</span>性    别：</label>
-                        <div class="layui-input-block">
-                            <form:select path="gender" class="form-control simple-select required">
-                                <form:option value="" label="请选择"/>
-                                <form:options items="${fns:getDictList('sex')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                            </form:select>
-                        </div>
-                    </div>
-                    <div class="layui-item layui-col-sm12">
-                        <label class="layui-form-label">身份证号码：</label>
-                        <div class="layui-input-block">
-                            <form:input path="idCard" placeholder="请输入身份证号码" htmlEscape="false" onchange="caculateAge(this.value);" class="form-control idCard layui-input"/>
-                        </div>
-                    </div>
+                <%--<div class="layui-item layui-col-sm6 lw7" style="padding-right: 0;">
+
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <div style="margin-right: 120px;">
-                        <div class="layui-item layui-col-sm12">
-                            <label class="layui-form-label"><span class="require-item">*</span>姓    名：</label>
-                            <div class="layui-input-block">
-                                <form:input path="name" placeholder="请输入姓名" htmlEscape="false" class="form-control layui-input required"/>
-                            </div>
-                        </div>
-                        <div class="layui-item layui-col-sm12">
-                            <label class="layui-form-label"><span class="require-item">*</span>民    族：</label>
-                            <div class="layui-input-block">
-                                <form:select path="nation" class="form-control simple-select required">
-                                    <form:options items="${fns:getDictList('nation_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                                </form:select>
-                            </div>
-                        </div>
-                        <div class="layui-item layui-col-sm12">
-                            <label class="layui-form-label">年    龄：</label>
-                            <div class="layui-input-block">
-                                <form:input path="age" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
-                            </div>
-                        </div>
+
                     </div>
-                    <div class="profile_box_wrapper">
+                    &lt;%&ndash;<div class="profile_box_wrapper">
                         <div class="profile_box">
                             <div id="this_upload_image_div_1">
                                 <div id="this_upload_div_1" style="position:relative;">
@@ -488,44 +451,72 @@
                                 </div>
                             </div>
                         </div>
+                    </div>&ndash;%&gt;
+                </div>--%>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label"><span class="require-item">*</span>工    号：</label>
+                    <div class="layui-input-block">
+                        <form:input path="no" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">出生日期：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>姓    名：</label>
                     <div class="layui-input-block">
-                        <input id="birthday" name="birthday" type="text" maxlength="20" readonly class="laydate-icondate form-control layui-input layer-date laydate-icon"
-                              style="background-color: #fff" placeholder="请选择出生日期" value="<fmt:formatDate value="${workStaffBasicInfo.birthday}" pattern="yyyy-MM-dd"/>"/>
+                        <form:input path="name" placeholder="请输入姓名" htmlEscape="false" class="form-control layui-input required"/>
                     </div>
                 </div>
-                <%--<div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>公历/农历：</label>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label"><span class="require-item">*</span>性    别：</label>
                     <div class="layui-input-block">
-                        <form:select path="calendar" class="form-control simple-select required">
-                            <form:options items="${fns:getDictList('calendar_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                        <form:select path="gender" class="form-control simple-select required">
+                            <form:option value="" label="请选择"/>
+                            <form:options items="${fns:getDictList('sex')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
                     </div>
-                </div>--%>
+                </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">电子邮箱：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>民    族：</label>
                     <div class="layui-input-block">
-                        <form:input path="email" htmlEscape="false" placeholder="请输入电子邮箱" class="form-control layui-input email"/>
+                        <form:select path="nation" class="form-control simple-select required">
+                            <form:options items="${fns:getDictList('nation_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                        </form:select>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">移动电话：</label>
+                    <label class="layui-form-label">身份证号码：</label>
                     <div class="layui-input-block">
-                        <form:input path="mobile" id="mobile" placeholder="请输入移动电话" htmlEscape="false" class="form-control layui-input isPhone"/>
-                        <span id="ph" style="color: #CC5965"></span>
+                        <form:input path="idCard" placeholder="请输入身份证号码" htmlEscape="false" onchange="caculateAge(this.value);" class="form-control idCard layui-input"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">年    龄：</label>
+                    <div class="layui-input-block">
+                        <form:input path="age" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
+                    </div>
+                </div>
+
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">出生日期：</label>
+                    <div class="layui-input-block">
+                        <input id="birthday" name="birthday" type="text" maxlength="20" readonly class="laydate-icondate form-control layui-input layer-date laydate-icon"
+                              style="background-color: #fff" placeholder="请选择出生日期" value="<fmt:formatDate value="${workStaffBasicInfo.birthday}" pattern="yyyy-MM-dd"/>"/>
                     </div>
                 </div>
+
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">座机：</label>
+                    <label class="layui-form-label">电子邮箱：</label>
                     <div class="layui-input-block">
-                        <form:input path="phone" htmlEscape="false" placeholder="请输入座机号"
-                                    class="form-control isTel  layui-input"/>
+                        <form:input path="email" htmlEscape="false" placeholder="请输入电子邮箱" class="form-control layui-input email"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">移动电话：</label>
+                    <div class="layui-input-block">
+                        <form:input path="mobile" id="mobile" placeholder="请输入移动电话" htmlEscape="false" class="form-control layui-input isPhone"/>
+                        <span id="ph" style="color: #CC5965"></span>
+                    </div>
+                </div>
+                <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>员工状态：</label>
                     <div class="layui-input-block">
                         <form:select path="status" onchange="changeTryEndTime(this.value);" class="form-control simple-select required">
@@ -533,8 +524,8 @@
                             <form:options items="${fns:getDictList('staff_status')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
                         </form:select>
                     </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                </div>--%>
+                <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">银行卡号：</label>
                     <div class="layui-input-block">
                         <form:input path="bankCard" placeholder="请输入银行卡号" htmlEscape="false" minlength="16" maxlength="19" class="form-control layui-input digits"/>
@@ -576,8 +567,8 @@
                     <div class="layui-input-block">
                         <form:input path="address" placeholder="请输入常住地址" htmlEscape="false" class="form-control layui-input"/>
                     </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                </div>--%>
+                <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">社保账号：</label>
                     <div class="layui-input-block">
                         <form:input path="socialSecurityId" placeholder="请输入社保账号" htmlEscape="false" class="form-control layui-input number" maxlength="12"/>
@@ -594,8 +585,8 @@
                     <div class="layui-input-block">
                         <form:input path="accumulationFundId" placeholder="请输入公积金账号" htmlEscape="false" class="form-control layui-input number" maxlength="12"/>
                     </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                </div>--%>
+                <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">微信号：</label>
                     <div class="layui-input-block">
                         <form:input path="wechatId" placeholder="请输入微信号" htmlEscape="false" class="form-control layui-input"/>
@@ -606,7 +597,7 @@
                     <div class="layui-input-block">
                         <form:input path="qqId" placeholder="请输入QQ号" htmlEscape="false" class="form-control layui-input number" minlength="5" maxlength="10"/>
                     </div>
-                </div>
+                </div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">入职日期：</label>
                     <div class="layui-input-block">
@@ -614,7 +605,7 @@
                                style="background-color: #fff" placeholder="请选择入职日期" value="<fmt:formatDate value="${workStaffBasicInfo.entryDate}" pattern="yyyy-MM-dd"/>"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">试用岗位：</label>
                     <div class="layui-input-block">
                         <form:input placeholder="请输入使用岗位" path="tryOutJob" htmlEscape="false" class="form-control layui-input"/>
@@ -632,7 +623,7 @@
                         <input id="tryEndTime" name="tryEndTime"   type="text" maxlength="20" readonly class="laydate-icondate form-control layui-input layer-date laydate-icon"
                              placeholder="请选择试用期结束时间" value="<fmt:formatDate value="${workStaffBasicInfo.tryEndTime}" pattern="yyyy-MM-dd"/>"/>
                     </div>
-                </div>
+                </div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>归属部门：</label>
                     <div class="layui-input-block with-icon">
@@ -647,24 +638,24 @@
                         </select>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>最高学历：</label>
                     <div class="layui-input-block ">
                         <form:input placeholder="请输入最高学历" path="highestEducation" htmlEscape="false" class="form-control layui-input required" maxlength="64"/>
                     </div>
-                </div>
+                </div>--%>
                 <div class="layui-item layui-col-sm12  lw7 with-textarea">
                     <label class="layui-form-label">备注：</label>
                     <div class="layui-input-block">
                         <form:textarea path="remarks" placeholder="请输入备注" htmlEscape="false" rows="4" maxlength="500" class="form-control "/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm12 lw7 with-textarea">
+                <%--<div class="layui-item layui-col-sm12 lw7 with-textarea">
                     <label class="layui-form-label">个人简介：</label>
                     <div class="layui-input-block">
                         <form:textarea path="individualResume" placeholder="请输入个人简介 " htmlEscape="false" rows="4" maxlength="500" class="form-control "/>
                     </div>
-                </div>
+                </div>--%>
 
 
                 <%--<div class="layui-item layui-col-sm6 lw7">
@@ -745,7 +736,7 @@
                 </div>--%>
             </div>
 
-            <div class="form-group layui-row">
+            <%--<div class="form-group layui-row">
                 <div class="form-group-label"><h2>手签章</h2></div>
                 <div class="layui-item nav-btns">
                     <button type="button" class="layui-btn" id="test1">上传手签章</button>
@@ -761,10 +752,10 @@
                         <p id="handSignatureText"></p>
                     </div>
                 </div>
-            </div>
+            </div>--%>
 
 
-            <div class="form-group layui-row">
+            <%--<div class="form-group layui-row">
                 <div class="form-group-label"><h2>教育经历</h2></div>
                 <div class="layui-item nav-btns">
                     <a href=javascript:void(0); onclick="addRowEducation('#educationList',educationIdx,educationTpl)" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>
@@ -925,8 +916,8 @@
                         }
                     </script>
                 </div>
-            </div>
-            <div class="form-group layui-row">
+            </div>--%>
+            <%--<div class="form-group layui-row">
                 <div class="form-group-label"><h2>劳动关系</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container">
                     <table id="labourTable" class="table table-bordered table-condensed details">
@@ -952,7 +943,7 @@
                                 <td><fmt:formatDate value="${buyDetails.contractEndTime}" pattern="yyyy-MM-dd"/></td>
                                 <td><fmt:formatDate value="${buyDetails.tryEndTime}" pattern="yyyy-MM-dd"/></td>
                                 <td><fmt:formatDate value="${buyDetails.transactTime}" pattern="yyyy-MM-dd"/></td>
-                                    <%--试用期结束时间<td><fmt:formatDate value="${buyDetails.tryEndTime}" pattern="yyyy-MM-dd"/></td>--%>
+                                    &lt;%&ndash;试用期结束时间<td><fmt:formatDate value="${buyDetails.tryEndTime}" pattern="yyyy-MM-dd"/></td>&ndash;%&gt;
 
                                 <c:forEach items="${buyDetails.workAttachments}" var = "workClientAttachment" varStatus="status">
                                     <c:choose>
@@ -980,8 +971,8 @@
                         </tbody>
                     </table>
                 </div>
-            </div>
-            <div class="form-group layui-row">
+            </div>--%>
+            <%--<div class="form-group layui-row">
                 <div class="form-group-label"><h2>外语语种</h2></div>
                 <div class="layui-item nav-btns">
                     <a href=javascript:void(0); onclick="addRowLanguage('#languageList',languageIdx,languageTpl)" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>
@@ -1094,8 +1085,8 @@
                         }
                     </script>
                 </div>
-            </div>
-            <div class="form-group layui-row">
+            </div>--%>
+            <%--<div class="form-group layui-row">
                 <div class="form-group-label"><h2>工作经历</h2></div>
                 <div class="layui-item nav-btns">
                     <a href=javascript:void(0); onclick="addRowExperience('#experienceList', experienceIdx, experienceTpl)" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>
@@ -1210,8 +1201,8 @@
                         }
                     </script>
                 </div>
-            </div>
-            <div class="form-group layui-row">
+            </div>--%>
+            <%--<div class="form-group layui-row">
                 <div class="form-group-label"><h2>执业资格证书</h2></div>
                 <div class="layui-item nav-btns">
                     <a href=javascript:void(0); onclick="addRowCertificate('#certificateList',certificateIdx,certificateTpl)" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>
@@ -1349,8 +1340,8 @@
                         }
                     </script>
                 </div>
-            </div>
-            <div class="form-group layui-row">
+            </div>--%>
+            <%--<div class="form-group layui-row">
                 <div class="form-group-label"><h2>职称</h2></div>
                 <div class="layui-item nav-btns">
                     <a href=javascript:void(0); onclick="addRowTitle('#titleList',titleIdx,titleTpl)" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>
@@ -1456,8 +1447,8 @@
                         }
                     </script>
                 </div>
-            </div>
-            <div class="form-group layui-row">
+            </div>--%>
+            <%--<div class="form-group layui-row">
                 <div class="form-group-label"><h2>家庭情况</h2></div>
                 <div class="layui-item nav-btns">
                     <a href=javascript:void(0); onclick="addRowFamily('#familyList', familyIdx, familyTpl)" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>
@@ -1548,8 +1539,8 @@
                         }
                     </script>
                 </div>
-            </div>
-            <div class="form-group layui-row">
+            </div>--%>
+            <%--<div class="form-group layui-row">
                 <div class="form-group-label"><h2>培训经历</h2></div>
                 <div class="layui-item nav-btns">
                     <a href=javascript:void(0); onclick="addRowTraining('#trainingList',trainingIdx,trainingTpl)" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>
@@ -1701,8 +1692,8 @@
                         }
                     </script>
                 </div>
-            </div>
-            <div class="form-group layui-row">
+            </div>--%>
+            <%--<div class="form-group layui-row">
                 <div class="form-group-label"><h2>社会及行业职务</h2></div>
                 <div class="layui-item nav-btns">
                     <a href=javascript:void(0); onclick="addRowSocialPosition('#socialPositionList',socialPositionIdx,socialPositionTpl)" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>
@@ -1796,8 +1787,8 @@
                         }
                     </script>
                 </div>
-            </div>
-            <div class="form-group layui-row">
+            </div>--%>
+            <%--<div class="form-group layui-row">
                 <div class="form-group-label"><h2>奖惩情况</h2></div>
                 <div class="layui-item nav-btns">
                     <a href=javascript:void(0); onclick="addRowRewards('#rewardsList',rewardsIdx,rewardsTpl)" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>
@@ -1895,8 +1886,8 @@
                         }
                     </script>
                 </div>
-            </div>
-            <div class="form-group layui-row">
+            </div>--%>
+            <%--<div class="form-group layui-row">
                 <div class="form-group-label"><h2>工作业绩</h2></div>
                 <div class="layui-item nav-btns">
                     <a href=javascript:void(0); onclick="addRowAchievement('#achievementList',achievementIdx,achievementTpl)" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>
@@ -1996,8 +1987,8 @@
                         }
                     </script>
                 </div>
-            </div>
-            <div class="form-group layui-row">
+            </div>--%>
+            <%--<div class="form-group layui-row">
                 <div class="form-group-label"><h2>电子档案</h2></div>
                 <div class="layui-item nav-btns">
                     <a href=javascript:void(0); onclick="addRowRecord('#recordList',recordIdx,recordTpl)" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>
@@ -2091,7 +2082,7 @@
                         }
                     </script>
                 </div>
-            </div>
+            </div>--%>
         </form:form>
     </div>
 </div>

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoList.jsp

@@ -251,7 +251,7 @@
                 ,{field:'mobile',align:'center', title: '移动电话', minWidth:100}
                 ,{field:'office',align:'center', title: '部门', minWidth:100}
                 ,{field:'role',align:'center', title: '岗位', minWidth:100}
-                ,{field:'highestEducation',align:'center', title: '最高学历', minWidth:100}
+                //,{field:'highestEducation',align:'center', title: '最高学历', minWidth:100}
                 // ,{field:'jobGrade',align:'center', title: '职级', minWidth:100}
                 /*,{field:'auditUserName',align:'center', title: '校审人员', minWidth:100
                     ,event:'auditUserId',config:{type:'select',data:params,verify:true}
@@ -264,7 +264,7 @@
                         }
                         return ''
                     }}*/
-                ,{field:'status',align:'center', title: '员工状态', minWidth:80}
+                //,{field:'status',align:'center', title: '员工状态', minWidth:80}
                 ,{field:'entryDate', align:'center',sort:true,title: '入职日期',width:100}
                 ,{field:'op',align:'center',title:"操作",width:130,templet:function(d){
                         ////对操作进行初始化
@@ -276,9 +276,9 @@
 
                         if(d.freeze != undefined && d.freeze == "1"){
                             if(d.userLoginFlag == 1){
-                                xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('冻结', '${ctx}/workstaff/workStaffBasicInfo/freeze?userId="+ d.userId + "','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 冻结</a>";
+                                xml +="<a href=\"${ctx}/workstaff/workStaffBasicInfo/freeze?userId=" + d.userId + "\" onclick=\"return confirmx('确认要注销该人员信息吗？', this.href)\"   class=\"layui-btn layui-btn-xs layui-btn-warm\"> 注销</a>";
                             }else{
-                                xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('激活', '${ctx}/workstaff/workStaffBasicInfo/freeze?userId="+ d.userId + "','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 激活</a>";
+                                xml +="<a href=\"${ctx}/workstaff/workStaffBasicInfo/freeze?userId=" + d.userId + "\" onclick=\"return confirmx('确认要激活该人员信息吗？', this.href)\"   class=\"layui-btn layui-btn-xs layui-btn-normal\"> 激活</a>";
                             }
                         }
 

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoView.jsp

@@ -53,48 +53,52 @@
                 <form:hidden path="userId"/>
                 <div class="form-group layui-row first">
                     <div class="form-group-label"><h2>基本信息</h2></div>
-                    <div class="layui-item layui-col-sm6 lw7" style="padding-right: 0;">
-                        <div class="layui-item layui-col-sm12">
-                            <label class="layui-form-label"><span class="require-item">*</span>工    号：</label>
-                            <div class="layui-input-block">
-                                <form:input  style="background-color: #f1f1f1" path="no" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
-                            </div>
+                    <%--<div class="layui-item layui-col-sm6 lw7" style="padding-right: 0;">
+
+                    </div>--%>
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label"><span class="require-item">*</span>工    号：</label>
+                        <div class="layui-input-block">
+                            <form:input  style="background-color: #f1f1f1" path="no" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
                         </div>
-                        <div class="layui-item layui-col-sm12">
-                            <label class="layui-form-label"><span class="require-item">*</span>性    别：</label>
-                            <div class="layui-input-block">
-                                <input  style="background-color: #f1f1f1" value="${fns:getDictLabel(workStaffBasicInfo.gender,'sex','')}" type="text" readonly="true" class="form-control  layui-input" />
-                                <input name="gender" value="${workStaffBasicInfo.gender}" type="hidden" readonly="true" class="form-control  layui-input" />
-                            </div>
+                    </div>
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label"><span class="require-item">*</span>姓    名：</label>
+                        <div class="layui-input-block">
+                            <form:input  style="background-color: #f1f1f1" path="name" htmlEscape="false" readonly="true" class="form-control layui-input required"/>
                         </div>
-                        <div class="layui-item layui-col-sm12">
-                            <label class="layui-form-label">身份证号码：</label>
-                            <div class="layui-input-block">
-                                <form:input  style="background-color: #f1f1f1" path="idCard" htmlEscape="false" onchange="caculateAge(this.value);" readonly="true" class="form-control idCard layui-input"/>
-                            </div>
+                    </div>
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label"><span class="require-item">*</span>性    别：</label>
+                        <div class="layui-input-block">
+                            <input  style="background-color: #f1f1f1" value="${fns:getDictLabel(workStaffBasicInfo.gender,'sex','')}" type="text" readonly="true" class="form-control  layui-input" />
+                            <input name="gender" value="${workStaffBasicInfo.gender}" type="hidden" readonly="true" class="form-control  layui-input" />
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label"><span class="require-item">*</span>民    族：</label>
+                        <div class="layui-input-block">
+                            <input  style="background-color: #f1f1f1" value="${fns:getDictLabel(workStaffBasicInfo.nation,'nation_type','')}" type="text" readonly="true" class="form-control  layui-input" />
+                            <input name="nation" value="${workStaffBasicInfo.nation}" type="hidden" readonly="true" class="form-control  layui-input" />
+                        </div>
+                    </div>
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label">身份证号码：</label>
+                        <div class="layui-input-block">
+                            <form:input  style="background-color: #f1f1f1" path="idCard" htmlEscape="false" onchange="caculateAge(this.value);" readonly="true" class="form-control idCard layui-input"/>
+                        </div>
+                    </div>
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label">年    龄：</label>
+                        <div class="layui-input-block">
+                            <form:input  style="background-color: #f1f1f1" path="age" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
+                        </div>
+                    </div>
+
+
+                    <%--<div class="layui-item layui-col-sm6 lw7">
                         <div style="margin-right: 120px;">
-                            <div class="layui-item layui-col-sm12">
-                                <label class="layui-form-label"><span class="require-item">*</span>姓    名：</label>
-                                <div class="layui-input-block">
-                                    <form:input  style="background-color: #f1f1f1" path="name" htmlEscape="false" readonly="true" class="form-control layui-input required"/>
-                                </div>
-                            </div>
-                            <div class="layui-item layui-col-sm12">
-                                <label class="layui-form-label"><span class="require-item">*</span>民    族：</label>
-                                <div class="layui-input-block">
-                                    <input  style="background-color: #f1f1f1" value="${fns:getDictLabel(workStaffBasicInfo.nation,'nation_type','')}" type="text" readonly="true" class="form-control  layui-input" />
-                                    <input name="nation" value="${workStaffBasicInfo.nation}" type="hidden" readonly="true" class="form-control  layui-input" />
-                                </div>
-                            </div>
-                            <div class="layui-item layui-col-sm12">
-                                <label class="layui-form-label">年    龄：</label>
-                                <div class="layui-input-block">
-                                    <form:input  style="background-color: #f1f1f1" path="age" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
-                                </div>
-                            </div>
+
                         </div>
                         <div class="profile_box_wrapper">
                             <div class="profile_box">
@@ -102,7 +106,7 @@
                                     <div id="this_upload_div_1" style="position:relative;">
                                         <c:choose>
                                             <c:when test="${not empty workStaffBasicInfo.picture}">
-                                                <%--<span id="this_upload_close_1" class="pic_close glyphicon glyphicon-remove" onclick="this_close_img(1)"></span>--%>
+                                                &lt;%&ndash;<span id="this_upload_close_1" class="pic_close glyphicon glyphicon-remove" onclick="this_close_img(1)"></span>&ndash;%&gt;
                                                 <img alt="_blank" id="this_upload_image_1" class="upload_ico" style="cursor:pointer;"  src="${workStaffBasicInfo.picture}" />
                                             </c:when>
                                             <c:otherwise>
@@ -114,7 +118,7 @@
                                 </div>
                             </div>
                         </div>
-                    </div>
+                    </div>--%>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">出生日期：</label>
                         <div class="layui-input-block">
@@ -140,7 +144,7 @@
                             <form:input  style="background-color: #f1f1f1" path="mobile" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
                         </div>
                     </div>
-                    <div class="layui-item layui-col-sm6 lw7">
+                    <%--<div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">座机：</label>
                         <div class="layui-input-block">
                             <form:input  style="background-color: #f1f1f1" path="phone" readonly="true" htmlEscape="false"  class="form-control  layui-input"/>
@@ -217,14 +221,14 @@
                         <div class="layui-input-block">
                             <form:input style="background-color: #f1f1f1" path="qqId" htmlEscape="false" readonly="true" class="form-control layui-input number" minlength="5" maxlength="10"/>
                         </div>
-                    </div>
+                    </div>--%>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">入职日期：</label>
                         <div class="layui-input-block">
                             <input style="background-color: #f1f1f1" name="entryDate" value="<fmt:formatDate value="${workStaffBasicInfo.entryDate}" pattern="yyyy-MM-dd"/>" type="text" readonly="true" class="form-control  layui-input" />
                         </div>
                     </div>
-                    <div class="layui-item layui-col-sm6 lw7">
+                    <%--<div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">试用岗位：</label>
                         <div class="layui-input-block">
                             <form:input style="background-color: #f1f1f1" path="tryOutJob" htmlEscape="false" readonly="true" class="form-control layui-input"/>
@@ -242,7 +246,7 @@
                             <input id="tryEndTime"  type="text" maxlength="20" readonly class="form-control layui-input"
                                    style="background-color: #f1f1f1" value="<fmt:formatDate value="${workStaffBasicInfo.tryEndTime}" pattern="yyyy-MM-dd"/>"/>
                         </div>
-                    </div>
+                    </div>--%>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label"><span class="require-item">*</span>归属部门：</label>
                         <div class="layui-input-block">
@@ -256,24 +260,24 @@
                             <input style="background-color: #f1f1f1" id="roleName" value="${workStaffBasicInfo.roleName}" type="text" readonly class="form-control layui-input" />
                         </div>
                     </div>
-                    <div class="layui-item layui-col-sm6 lw7">
+                    <%--<div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label"><span class="require-item">*</span>最高学历：</label>
                         <div class="layui-input-block ">
                             <input style="background-color: #f1f1f1" id="highestEducation" value="${workStaffBasicInfo.highestEducation}" type="text" readonly class="form-control layui-input" />
                         </div>
-                    </div>
+                    </div>--%>
                     <div class="layui-item layui-col-sm12 with-textarea">
                         <label class="layui-form-label">备注：</label>
                         <div class="layui-input-block">
                             <form:textarea style="background-color: #f1f1f1" path="remarks" htmlEscape="false" readonly="true" rows="4" maxlength="500" class="form-control "/>
                         </div>
                     </div>
-                    <div class="layui-item layui-col-sm12 with-textarea">
+                    <%--<div class="layui-item layui-col-sm12 with-textarea">
                         <label class="layui-form-label">个人简介：</label>
                         <div class="layui-input-block">
                             <form:textarea style="background-color: #f1f1f1" path="individualResume" htmlEscape="false" readonly="true" rows="4" maxlength="500" class="form-control "/>
                         </div>
-                    </div>
+                    </div>--%>
 
 
 
@@ -346,7 +350,7 @@
                     </div>--%>
                 </div>
 
-                <div class="form-group layui-row">
+                <%--<div class="form-group layui-row">
                     <div class="form-group-label"><h2>手签章</h2></div>
                     <div class="layui-item nav-btns">
                         <div class="layui-upload-list">
@@ -361,8 +365,8 @@
                             <p id="handSignatureText"></p>
                         </div>
                     </div>
-                </div>
-                <div class="form-group layui-row">
+                </div>--%>
+                <%--<div class="form-group layui-row">
                     <div class="form-group-label"><h2>教育经历</h2></div>
                     <div class="layui-item layui-col-xs12 form-table-container">
                         <table id="educationTable" class="table table-bordered table-condensed details">
@@ -441,7 +445,7 @@
                                     <td><fmt:formatDate value="${buyDetails.contractEndTime}" pattern="yyyy-MM-dd"/></td>
                                     <td><fmt:formatDate value="${buyDetails.tryEndTime}" pattern="yyyy-MM-dd"/></td>
                                     <td><fmt:formatDate value="${buyDetails.transactTime}" pattern="yyyy-MM-dd"/></td>
-                                        <%--试用期结束时间<td><fmt:formatDate value="${buyDetails.tryEndTime}" pattern="yyyy-MM-dd"/></td>--%>
+                                        &lt;%&ndash;试用期结束时间<td><fmt:formatDate value="${buyDetails.tryEndTime}" pattern="yyyy-MM-dd"/></td>&ndash;%&gt;
 
                                     <c:forEach items="${buyDetails.workAttachments}" var = "workClientAttachment" varStatus="status">
                                         <c:choose>
@@ -842,8 +846,8 @@
                             </tbody>
                         </table>
                     </div>
-                </div>
-                <div class="form-group layui-row">
+                </div>--%>
+                <%--<div class="form-group layui-row">
                     <div class="form-group-label"><h2>电子档案</h2></div>
                     <div class="layui-item layui-col-xs12 form-table-container">
                         <table id="recordTable" class="table table-bordered table-condensed details">
@@ -875,7 +879,7 @@
                             </tbody>
                         </table>
                     </div>
-                </div>
+                </div>--%>
             </form:form>
         </div>
     </div>