入职登记完善页面修改

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -60,14 +60,14 @@ import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecordsAlter;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecordsReported;
 import com.jeeplus.modules.ruralprojectrecords.enums.ProjectStatusEnum;
-import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectMessageService;
-import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsAlterService;
-import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsDownMessageService;
-import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
+import com.jeeplus.modules.ruralprojectrecords.service.*;
 import com.jeeplus.modules.serialnum.service.SerialNumTplService;
+import com.jeeplus.modules.sys.dao.RoleDao;
 import com.jeeplus.modules.sys.entity.*;
 import com.jeeplus.modules.sys.service.CompanyService;
 import com.jeeplus.modules.sys.service.OfficeService;
+import com.jeeplus.modules.sys.service.RoleService;
+import com.jeeplus.modules.sys.service.UserService;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.sysuseroffice.entity.Useroffice;
@@ -362,6 +362,8 @@ public class WorkProjectNotifyController extends BaseController {
     @Autowired
     private RuralProjectRecordsService ruralProjectRecordsService;
 	@Autowired
+	private RuralPeojectRecordChooseCheckService ruralPeojectRecordChooseCheckService;
+	@Autowired
 	private ProjectRecordsAlterService projectRecordsAlterService;
 	@Autowired
 	private RuralProjectRecordsAlterService ruralProjectRecordsAlterService;
@@ -449,6 +451,12 @@ public class WorkProjectNotifyController extends BaseController {
 	private HistoicFlowUtil histoicFlowUtil;
 	@Autowired
 	private ProjectAccessoryRelationService projectAccessoryRelationService;
+	@Autowired
+	private UserService userService;
+	@Autowired
+	private RoleDao roleDao;
+	@Autowired
+	private RoleService roleService;
 
 	@ModelAttribute
 	public WorkProjectNotify get(@RequestParam(required=false) String id) {
@@ -1342,6 +1350,56 @@ public class WorkProjectNotifyController extends BaseController {
 						}
 					}
 
+				} else if (workProjectNotify.getType().equals("140")) {    //项目检查
+					boolean flag = false;
+					//通过通知信息id获取项目登记对象
+					RuralProjectRecords ruralProjectRecords = ruralPeojectRecordChooseCheckService.get(workProjectNotify.getNotifyId());
+
+					if (ruralProjectRecords != null && StringUtils.isNotBlank(ruralProjectRecords.getId())) {
+						ruralProjectRecordsService.queryProjectDetail(ruralProjectRecords);
+						ProjectPlanInfo projectPlanInfo = new ProjectPlanInfo();
+						projectPlanInfo.setProjectId(ruralProjectRecords.getId());
+						//获取项目计划信息
+						List<ProjectPlanInfo> projectPlanList = projectPlanService.getProjectPlanList(projectPlanInfo);
+						//项目计划附件信息
+						List<WorkClientAttachment> projectPlanAttachment = projectPlanService.getWorkAttachment(ruralProjectRecords.getId());
+						ruralProjectRecords.setProjectPlanList(projectPlanList);
+						ruralProjectRecords.setWorkAttachments(projectPlanAttachment);
+					}
+					ruralProjectRecords.setAct(getByAct(ruralProjectRecords.getCheckProcessInstanceId()));
+					ruralProjectRecords.setHome("home");
+					model.addAttribute("processInstanceId", ruralProjectRecords.getCheckProcessInstanceId());
+					model.addAttribute("projectRecords", ruralProjectRecords);
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						//处理项目类别
+						List<MainDictDetail> mainDictList = DictUtils.getMainDictList("attachment_project_sort");
+						for (MainDictDetail info: mainDictList) {
+							if(ruralProjectRecords.getAttachmentProjectSort().equals(info.getValue())){
+								ruralProjectRecords.setAttachmentProjectSort(info.getLabel());
+								break;
+							}
+						}
+						return "modules/ruralprojectrecords/ruralProjectRecordsView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+						//处理项目类别
+						List<MainDictDetail> mainDictList = DictUtils.getMainDictList("attachment_project_sort");
+						for (MainDictDetail info: mainDictList) {
+							if(ruralProjectRecords.getAttachmentProjectSort().equals(info.getValue())){
+								ruralProjectRecords.setAttachmentProjectSort(info.getLabel());
+								break;
+							}
+						}
+						//查询总审人员信息
+						List<User> auditUserList = userService.getAuditUserList();
+						ruralProjectRecords.setBzshbUserList(auditUserList);
+						return "modules/ruralprojectrecords/check/ruralProjectRecordsAudit";
+					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
+						return "modules/ruralprojectrecords/ruralProjectRecordsModify";
+					} else {
+						return "modules/ruralprojectrecords/ruralProjectRecordsView";
+					}
+
+
 				} else if (workProjectNotify.getType().equals("139")) {    //项目登记
 					ProjectFollowReport followReport = projectImplementEarlyService.getFollowById(workProjectNotify.getNotifyId());
 					ProjectRecords records = projectRecordsService.getQueryProjectUsers(followReport.getProjectId());
@@ -2323,6 +2381,16 @@ public class WorkProjectNotifyController extends BaseController {
 						if (StringUtils.isNotBlank(workStaffBasicInfo.getId())) {
 							workStaffBasicInfoService.queryDetails(workStaffBasicInfo);
 						}
+						workStaffBasicInfo.setRoleId(roleService.getRoleIdByUserId(workStaffBasicInfo.getUserId()));
+						List<Role> roleList = roleDao.getByOfficeId(workStaffBasicInfo.getOffice().getId());
+						if(roleList.size()>0){
+							for (Role role: roleList) {
+								if(role.getId().equals(workStaffBasicInfo.getRoleId())){
+									workStaffBasicInfo.setRoleName(role.getName());
+									break;
+								}
+							}
+						}
 						workStaffBasicInfo.setHome("home");
 						model.addAttribute("workStaffBasicInfo", workStaffBasicInfo);
 						String view = "modules/workstaff/workStaffAchiveInfoForm";

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

@@ -234,9 +234,9 @@
                             </div>
                         </div>
                         <div class="layui-item layui-col-sm12">
-                            <label class="layui-form-label"><span class="require-item">*</span>身份证号码：</label>
+                            <label class="layui-form-label">身份证号码：</label>
                             <div class="layui-input-block">
-                                <form:input path="idCard" htmlEscape="false" onchange="caculateAge(this.value);" readonly="true" class="form-control idCard layui-input required"/>
+                                <form:input path="idCard" htmlEscape="false" onchange="caculateAge(this.value);" readonly="true" class="form-control idCard layui-input"/>
                             </div>
                         </div>
                     </div>
@@ -256,9 +256,9 @@
                                 </div>
                             </div>
                             <div class="layui-item layui-col-sm12">
-                                <label class="layui-form-label"><span class="require-item">*</span>年    龄：</label>
+                                <label class="layui-form-label">年    龄：</label>
                                 <div class="layui-input-block">
-                                    <form:input path="age" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
+                                    <form:input path="age" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
                                 </div>
                             </div>
                         </div>
@@ -282,7 +282,7 @@
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label"><span class="require-item">*</span>出生日期：</label>
+                        <label class="layui-form-label">出生日期：</label>
                         <div class="layui-input-block">
                             <input name="birthday" value="<fmt:formatDate value="${workStaffBasicInfo.birthday}" pattern="yyyy-MM-dd"/>" type="text" readonly="true" class="form-control  layui-input" />
                         </div>
@@ -301,132 +301,200 @@
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label"><span class="require-item">*</span>移动电话：</label>
+                        <label class="layui-form-label">移动电话：</label>
                         <div class="layui-input-block">
-                            <form:input path="mobile" htmlEscape="false" readonly="true" class="form-control layui-input required isPhone"/>
+                            <form:input path="mobile" htmlEscape="false" readonly="true" class="form-control layui-input isPhone"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label"><span class="require-item">*</span>归属部门：</label>
+                        <label class="layui-form-label">座机：</label>
                         <div class="layui-input-block">
-                            <input name="office.name" value="${workStaffBasicInfo.office.name}" type="text" readonly="true" class="form-control  layui-input" />
-                            <input name="office.id" value="${workStaffBasicInfo.office.id}" type="hidden" readonly="true" class="form-control  layui-input" />
+                            <form:input path="phone" htmlEscape="false" class="form-control isTel  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 name="duty" value="${workStaffBasicInfo.duty}" type="text" readonly="true" class="form-control  layui-input" />
+                            <input name="status" value="${workStaffBasicInfo.status}" type="text" 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 with-icon">
-                            <form:input path="jobGrade.name" htmlEscape="false"  readonly="true"  class="form-control layui-input "/>
-                            <form:hidden path="jobGrade.id" htmlEscape="false"  readonly="true"  class="form-control layui-input "/>
+                        <label class="layui-form-label">银行卡号：</label>
+                        <div class="layui-input-block">
+                            <form:input path="bankCard" htmlEscape="false" readonly="true" minlength="16" maxlength="19" class="form-control layui-input digits"/>
                         </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:select path="marriage" class="form-control simple-select required">
+                                <form:option value="" label=""/>
+                                <form:options items="${fns:getDictList('marriage_status')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+                            </form:select>
+                        </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="politics" class="form-control simple-select required basicInfo">
+                                <form:option value="" label=""/>
+                                <form:options items="${fns:getDictList('politics_type')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+                            </form:select>
+                        </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">
-                            <input id="salary" htmlEscape="false" readonly value="<fmt:formatNumber pattern="#,##0.00#" value="${workStaffBasicInfo.salary}"/>" class="form-control layui-input"/>
+                            <sys:treeselect id="nativePlace" name="nativePlace.id" value="${workStaffBasicInfo.nativePlace.id}" labelName="" labelValue="${workStaffBasicInfo.nativePlace.name}"
+                                            title="区域" url="/sys/area/treeData" cssClass="form-control layui-input basicInfo" allowClear="true" notAllowSelectParent="true"/>
                         </div>
                     </div>
-                    <%--<div class="layui-item layui-col-sm6 lw7">--%>
-                        <%--<label class="layui-form-label double-line"><span class="require-item">*</span>是否 TS人员：</label>--%>
-                        <%--<div class="layui-input-block">--%>
-                            <%--<input value="${fns:getDictLabel(workStaffBasicInfo.ts,'yes_no','')}" type="text" readonly="true" class="form-control  layui-input" />--%>
-                            <%--<input name="ts" value="${workStaffBasicInfo.ts}" 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>
+                        <label class="layui-form-label">户口所在地：</label>
                         <div class="layui-input-block">
-                            <input name="status" value="${workStaffBasicInfo.status}" type="text" readonly="true" class="form-control  layui-input" />
+                            <form:input path="household" htmlEscape="false" 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>
+                        <label class="layui-form-label">常住地址：</label>
                         <div class="layui-input-block">
-                            <input name="entryDate" value="<fmt:formatDate value="${workStaffBasicInfo.entryDate}" pattern="yyyy-MM-dd"/>" type="text" readonly="true" class="form-control  layui-input" />
+                            <form:input path="address" htmlEscape="false" class="form-control layui-input basicInfo"/>
                         </div>
+                    </div><div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">社保账号：</label>
+                    <div class="layui-input-block">
+                        <form:input path="socialSecurityId" htmlEscape="false" class="form-control layui-input number" maxlength="12"/>
                     </div>
+                </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label double-line"><span class="require-item">*</span>参加工作日期：</label>
+                        <label class="layui-form-label">医保账号：</label>
                         <div class="layui-input-block">
-                            <input name="workDate" value="<fmt:formatDate value="${workStaffBasicInfo.workDate}" pattern="yyyy-MM"/>" type="text" readonly="true" class="form-control  layui-input" />
+                            <form:input path="medicalInsuranceId" htmlEscape="false" class="form-control layui-input number" maxlength="12"/>
                         </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">
-                            <input name="bankName" value="${workStaffBasicInfo.bankName}" type="text" readonly="true" class="form-control  layui-input" />
+                            <form:input path="accumulationFundId" htmlEscape="false" class="form-control layui-input number" maxlength="12"/>
                         </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="bankCard" htmlEscape="false" readonly="true" minlength="16" maxlength="19" class="form-control layui-input digits"/>
+                            <form:input path="wechatId" htmlEscape="false" 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>
+                        <label class="layui-form-label">QQ号：</label>
                         <div class="layui-input-block">
-                            <form:select path="marriage" class="form-control simple-select required">
-                                <form:option value="" label=""/>
-                                <form:options items="${fns:getDictList('marriage_status')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
-                            </form:select>
+                            <form:input path="qqId" htmlEscape="false" class="form-control layui-input number" minlength="5" maxlength="10"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label"><span class="require-item">*</span>政治面貌：</label>
+                        <label class="layui-form-label"><span class="require-item">*</span>入职日期：</label>
                         <div class="layui-input-block">
-                            <form:select path="politics" class="form-control simple-select required basicInfo">
-                                <form:option value="" label=""/>
-                                <form:options items="${fns:getDictList('politics_type')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
-                            </form:select>
+                            <input 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">
-                        <label class="layui-form-label double-line">是否退伍军人：</label>
+                        <label class="layui-form-label">试用岗位：</label>
                         <div class="layui-input-block">
-                            <form:select path="exSoldier" class="form-control simple-select basicInfo">
-                                <form:option value="" label=""/>
-                                <form:options items="${fns:getDictList('yes_no')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                            </form:select>
+                            <form:input path="tryOutJob" htmlEscape="false" 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 double-line">试用期(月)：</label>
                         <div class="layui-input-block">
-                            <form:input path="address" htmlEscape="false" class="form-control layui-input basicInfo"/>
+                            <form:input path="trialPeriod" htmlEscape="false" class="form-control layui-input number" maxlength="2"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label"><span class="require-item">*</span>籍    贯：</label>
+                        <label class="layui-form-label double-line">试用期结束日期：</label>
+                        <div class="layui-input-block">
+                            <input id="tryEndTime" name="tryEndTime" type="text" maxlength="20" readonly class="form-control layui-input"
+                                   value="<fmt:formatDate value="${workStaffBasicInfo.tryEndTime}" pattern="yyyy-MM-dd"/>"/>
+                        </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 name="office.name" value="${workStaffBasicInfo.office.name}" type="text" readonly="true" class="form-control  layui-input" />
+                            <input name="office.id" value="${workStaffBasicInfo.office.id}" 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 path="roleName" htmlEscape="false" readonly="true" class="form-control layui-input"/>
+                        </div>
+                    </div>
+                    <div class="layui-item layui-col-sm12 with-textarea">
+                        <label class="layui-form-label">备注：</label>
+                        <div class="layui-input-block">
+                            <form:textarea path="remarks" htmlEscape="false" rows="4" maxlength="500" class="form-control "/>
+                        </div>
+                    </div>
+                    <div class="layui-item layui-col-sm12 with-textarea">
+                        <label class="layui-form-label">个人简介：</label>
+                        <div class="layui-input-block">
+                            <form:textarea path="individualResume" htmlEscape="false" rows="4" maxlength="500" class="form-control "/>
+                        </div>
+                    </div>
+
+
+
+                    <%--<div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label">职    位：</label>
+                        <div class="layui-input-block">
+                            <input name="duty" value="${workStaffBasicInfo.duty}" type="text" 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 with-icon">
-                            <sys:treeselect id="nativePlace" name="nativePlace.id" value="${workStaffBasicInfo.nativePlace.id}" labelName="" labelValue="${workStaffBasicInfo.nativePlace.name}"
-                                            title="区域" url="/sys/area/treeData" cssClass="form-control layui-input basicInfo" allowClear="true" notAllowSelectParent="true"/>
+                            <form:input path="jobGrade.name" htmlEscape="false"  readonly="true"  class="form-control layui-input "/>
+                            <form:hidden path="jobGrade.id" 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">基本工资：</label>
+                        <div class="layui-input-block with-icon">
+                            <input id="salary" htmlEscape="false" readonly value="<fmt:formatNumber pattern="#,##0.00#" value="${workStaffBasicInfo.salary}"/>" class="form-control layui-input"/>
+                        </div>
+                    </div>
+                    &lt;%&ndash;<div class="layui-item layui-col-sm6 lw7">&ndash;%&gt;
+                        &lt;%&ndash;<label class="layui-form-label double-line"><span class="require-item">*</span>是否 TS人员：</label>&ndash;%&gt;
+                        &lt;%&ndash;<div class="layui-input-block">&ndash;%&gt;
+                            &lt;%&ndash;<input value="${fns:getDictLabel(workStaffBasicInfo.ts,'yes_no','')}" type="text" readonly="true" class="form-control  layui-input" />&ndash;%&gt;
+                            &lt;%&ndash;<input name="ts" value="${workStaffBasicInfo.ts}" type="hidden" readonly="true" class="form-control  layui-input" />&ndash;%&gt;
+                        &lt;%&ndash;</div>&ndash;%&gt;
+                    &lt;%&ndash;</div>&ndash;%&gt;
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label double-line"><span class="require-item">*</span>参加工作日期：</label>
                         <div class="layui-input-block">
-                            <form:input path="household" htmlEscape="false" class="form-control layui-input basicInfo"/>
+                            <input name="workDate" value="<fmt:formatDate value="${workStaffBasicInfo.workDate}" pattern="yyyy-MM"/>" type="text" readonly="true" class="form-control  layui-input" />
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label double-line"><span class="require-item">*</span>从事本行业日期：</label>
+                        <label class="layui-form-label">开户银行：</label>
                         <div class="layui-input-block">
-                            <input id="industryDate" name="industryDate" type="text" maxlength="20" readonly class="laydate-icondate form-control layui-input layer-date laydate-icon required basicInfo"
-                                   value="<fmt:formatDate value="${workStaffBasicInfo.industryDate}" pattern="yyyy-MM"/>"/>
+                            <input name="bankName" value="${workStaffBasicInfo.bankName}" type="text" readonly="true" class="form-control  layui-input" />
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label double-line">试用期结束日期：</label>
+                        <label class="layui-form-label double-line">是否退伍军人：</label>
                         <div class="layui-input-block">
-                            <input id="tryEndTime" name="tryEndTime" type="text" maxlength="20" readonly class="form-control layui-input"
-                                   value="<fmt:formatDate value="${workStaffBasicInfo.tryEndTime}" pattern="yyyy-MM-dd"/>"/>
+                            <form:select path="exSoldier" class="form-control simple-select basicInfo">
+                                <form:option value="" label=""/>
+                                <form:options items="${fns:getDictList('yes_no')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                            </form:select>
+                        </div>
+                    </div>
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label double-line"><span class="require-item">*</span>从事本行业日期：</label>
+                        <div class="layui-input-block">
+                            <input id="industryDate" name="industryDate" type="text" maxlength="20" readonly class="laydate-icondate form-control layui-input layer-date laydate-icon required basicInfo"
+                                   value="<fmt:formatDate value="${workStaffBasicInfo.industryDate}" pattern="yyyy-MM"/>"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
@@ -442,7 +510,7 @@
                             <input id="workEndDate"  type="text" maxlength="20" readonly class="form-control layui-input"
                                    value="<fmt:formatDate value="${workStaffBasicInfo.workEndDate}" pattern="yyyy-MM-dd"/>"/>
                         </div>
-                    </div>
+                    </div>--%>
                 </div>
                 <div class="form-group layui-row">
                     <div class="form-group-label"><h2>教育经历</h2></div>
@@ -458,8 +526,8 @@
                                 <th width="10%">所学专业</th>
                                 <th width="12%"><span class="require-item">*</span>学    历</th>
                                 <th width="8%">学    位</th>
-                                <th width="8%"><span class="require-item">*</span>学历性质</th>
-                                <th width="11%"><span class="require-item">*</span>入学日期</th>
+                                <th width="8%">学历性质</th>
+                                <th width="11%">入学日期</th>
                                 <th width="11%">毕业日期</th>
                                 <th width="10%">学历证书</th>
                                 <th width="10%">学位证书</th>
@@ -503,7 +571,7 @@
                                         </select>
                                     </td>
                                     <td style="text-align:center;">
-                                        <input id="educationList${varStatus.index}_startDate" name="educationList[${varStatus.index}].startDate" type="text" maxlength="20" class="laydate-icon form-control layer-date laydate-icondate required"
+                                        <input id="educationList${varStatus.index}_startDate" name="educationList[${varStatus.index}].startDate" type="text" maxlength="20" class="laydate-icon form-control layer-date laydate-icondate"
                                                value="<fmt:formatDate value="${education.startDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
                                     </td>
                                     <td style="text-align:center;">
@@ -561,7 +629,7 @@
                         </select>
                     </td>
                     <td style="text-align:center;">
-                        <input id="educationList{{idx}}_startDate" name="educationList[{{idx}}].startDate" type="text" maxlength="20" class="laydate-icon form-control layer-date laydate-icondate required"
+                        <input id="educationList{{idx}}_startDate" name="educationList[{{idx}}].startDate" type="text" maxlength="20" class="laydate-icon form-control layer-date laydate-icondate"
                                value="<fmt:formatDate value="${row.startDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
                     </td>
                     <td style="text-align:center;">
@@ -595,10 +663,12 @@
                                 laydate.render({
                                     elem: startDateId, //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
                                     event: 'click' //响应事件。如果没有传入event，则按照默认的click
+                                ,trigger: 'click' //自动弹出控件的事件，采用click弹出
                                 });
                                 laydate.render({
                                     elem: endDateId, //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
                                     event: 'click' //响应事件。如果没有传入event，则按照默认的click
+                                ,trigger: 'click' //自动弹出控件的事件，采用click弹出
                                 });
                             }
                         </script>
@@ -767,6 +837,7 @@
                                 laydate.render({
                                     elem: startDateId, //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
                                     event: 'click' //响应事件。如果没有传入event，则按照默认的click
+                                ,trigger: 'click' //自动弹出控件的事件，采用click弹出
                                 });
                             }
                         </script>
@@ -877,10 +948,12 @@
                                 laydate.render({
                                     elem: startDateId, //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
                                     event: 'click' //响应事件。如果没有传入event，则按照默认的click
+                                ,trigger: 'click' //自动弹出控件的事件，采用click弹出
                                 });
                                 laydate.render({
                                     elem: endDateId, //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
                                     event: 'click' //响应事件。如果没有传入event，则按照默认的click
+                                ,trigger: 'click' //自动弹出控件的事件，采用click弹出
                                 });
                             }
                         </script>
@@ -1033,10 +1106,12 @@
                                 laydate.render({
                                     elem: startDateId, //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
                                     event: 'click' //响应事件。如果没有传入event，则按照默认的click
+                                ,trigger: 'click' //自动弹出控件的事件，采用click弹出
                                 });
                                 laydate.render({
                                     elem: registDateId, //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
                                     event: 'click' //响应事件。如果没有传入event，则按照默认的click
+                                ,trigger: 'click' //自动弹出控件的事件，采用click弹出
                                 });
                             }
                         </script>
@@ -1143,6 +1218,7 @@
                                 laydate.render({
                                     elem: startDateId, //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
                                     event: 'click' //响应事件。如果没有传入event，则按照默认的click
+                                ,trigger: 'click' //自动弹出控件的事件，采用click弹出
                                 });
                             }
                         </script>
@@ -1382,10 +1458,12 @@
                                 laydate.render({
                                     elem: startDateId, //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
                                     event: 'click' //响应事件。如果没有传入event，则按照默认的click
+                                ,trigger: 'click' //自动弹出控件的事件，采用click弹出
                                 });
                                 laydate.render({
                                     elem: endDateId, //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
                                     event: 'click' //响应事件。如果没有传入event，则按照默认的click
+                                ,trigger: 'click' //自动弹出控件的事件，采用click弹出
                                 });
                             }
                         </script>
@@ -1475,10 +1553,12 @@
                                 laydate.render({
                                     elem: startDateId, //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
                                     event: 'click' //响应事件。如果没有传入event，则按照默认的click
+                                ,trigger: 'click' //自动弹出控件的事件，采用click弹出
                                 });
                                 laydate.render({
                                     elem: endDateId, //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
                                     event: 'click' //响应事件。如果没有传入event，则按照默认的click
+                                ,trigger: 'click' //自动弹出控件的事件，采用click弹出
                                 });
                             }
                         </script>