Merge remote-tracking branch 'origin/master'

src/main/resources/mappings/modules/workreimbursement/WorkReimbursementDao.xml

@@ -49,7 +49,8 @@
 			<include refid="workReimbursementColumns"/>,
 		a.money AS "money"
 		,a.office_id as "officeId"
-		,su.name as "submitterName"
+		,su.name as "submitterName",
+		a.submitter_id AS "submitterId"
 		FROM work_reimbursement a
 		<include refid="workReimbursementJoins"/>
 		left join sys_user su on su.id = a.submitter_id

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

@@ -263,7 +263,7 @@
                             <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="age" htmlEscape="false" readonly="false" class="form-control  layui-input required"/>
+                                    <form:input path="age" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
                                 </div>
                             </div>
                         </div>
@@ -289,7 +289,7 @@
                     <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="birthday" value="<fmt:formatDate value="${workStaffBasicInfo.birthday}" pattern="yyyy-MM-dd"/>" type="text" class="form-control  layui-input" />
+                            <input id="birthday" name="birthday" value="<fmt:formatDate value="${workStaffBasicInfo.birthday}"  pattern="yyyy-MM-dd"/>" readonly type="text" class="form-control  layui-input" />
                         </div>
                     </div>
                     <%--<div class="layui-item layui-col-sm6 lw7">

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

@@ -272,7 +272,7 @@
                         <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="age" htmlEscape="false" readonly="false" class="form-control  layui-input required"/>
+                                <form:input path="age" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
                             </div>
                         </div>
                     </div>
@@ -298,7 +298,7 @@
                 <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="birthday" value="<fmt:formatDate value="${workStaffBasicInfo.birthday}" pattern="yyyy-MM-dd"/>" type="text"  class="form-control  layui-input" />
+                        <input id="birthday" name="birthday" value="<fmt:formatDate value="${workStaffBasicInfo.birthday}" pattern="yyyy-MM-dd"/>" type="text" readonly="true"  class="form-control  layui-input" />
                     </div>
                 </div>
                 <%--<div class="layui-item layui-col-sm6 lw7">