Merge remote-tracking branch 'origin/master'

src/main/webapp/WEB-INF/tags/sys/gridselect.tag

@@ -44,7 +44,7 @@ function searchGrid${id}(){
 
 	<input id="${id}Id" name="${name}"  type="hidden" value="${value}"/>
 	<div class="input-group" style="width: 100%">
-		<input id="${id}Name"  name="${labelName }" ${allowInput?'':'readonly="readonly"'}  type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
+		<input id="${id}Name" placeholder="${title}"  name="${labelName }" ${allowInput?'':'readonly="readonly"'}  type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
 		class="${cssClass}" style="${cssStyle}"/>
        		 <span class="input-group-btn">
 	       		 <button type="button" onclick="searchGrid${id}()" id="${id}Button" class="btn <c:if test="${fn:contains(cssClass, 'input-sm')}"> btn-sm </c:if><c:if test="${fn:contains(cssClass, 'input-lg')}"> btn-lg </c:if>  btn-primary ${disabled} ${hideBtn ? 'hide' : ''}"><i class="fa fa-search"></i>

src/main/webapp/WEB-INF/tags/sys/gridselectcallprojectt.tag

@@ -46,7 +46,7 @@ function searchGrid${id}(){
 </script>
 	<input id="${id}Id" name="${name}"  type="hidden" value="${value}"/>
 	<div class="input-group" style="width: 100%">
-		<input id="${id}Name"  name="${labelName }" ${allowInput?'':'readonly="readonly"'} type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
+		<input id="${id}Name" placeholder="${title}" name="${labelName }" ${allowInput?'':'readonly="readonly"'} type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
 		class="${cssClass}" style="${cssStyle}"/>
        		 <span class="input-group-btn">
 	       		 <button type="button" onclick="searchGrid${id}()" id="${id}Button" class="btn <c:if test="${fn:contains(cssClass, 'input-sm')}"> btn-sm </c:if><c:if test="${fn:contains(cssClass, 'input-lg')}"> btn-lg </c:if>  btn-primary ${disabled} ${hideBtn ? 'hide' : ''}"><i class="fa fa-search"></i>

src/main/webapp/WEB-INF/tags/sys/gridselectclien1.tag

@@ -46,7 +46,7 @@ function searchGrid${id}(){
 
 	<input id="${id}Id" name="${name}"  type="hidden" value="${value}"/>
 	<div class="input-group" style="width: 100%">
-		<input id="${id}Name"  name="${labelName }" ${allowInput?'':'readonly="readonly"'}  type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
+		<input id="${id}Name" placeholder="${title}"  name="${labelName }" ${allowInput?'':'readonly="readonly"'}  type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
 		class="${cssClass}" style="${cssStyle}"/>
        		 <span class="input-group-btn">
 	       		 <button type="button" onclick="searchGrid${id}()" id="${id}Button" class="btn <c:if test="${fn:contains(cssClass, 'input-sm')}"> btn-sm </c:if><c:if test="${fn:contains(cssClass, 'input-lg')}"> btn-lg </c:if>  btn-primary ${disabled} ${hideBtn ? 'hide' : ''}"><i class="fa fa-search"></i>

src/main/webapp/WEB-INF/tags/sys/reimburselectReproject.tag

@@ -56,7 +56,7 @@ var  userId=$("#submitterIdId").val();
 
 	<input id="${id}Id" name="${name}"  type="hidden" value="${value}"/>
 	<div class="input-group">
-		<input id="${id}Name"  name="${labelName }" ${allowInput?'':'readonly="readonly"'}  onclick="searchGrid${id}()" type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
+		<input id="${id}Name" placeholder="${title}" name="${labelName }" ${allowInput?'':'readonly="readonly"'}  onclick="searchGrid${id}()" type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
 		class="${cssClass}" style="background-color: #ffffff; ${cssStyle}"/>
     </div>
 	 <label id="${id}Name-error" class="error" for="${id}Name" style="display:none"></label>

src/main/webapp/WEB-INF/tags/sys/reimburtreeselectUser.tag

@@ -24,7 +24,7 @@
 <%@ attribute name="dataMsgRequired" type="java.lang.String" required="false" description=""%>
 	<input id="${id}Id" name="${name}" class="${cssClass}" type="hidden" value="${value}"/>
 	<div class="input-group">
-		<input id="${id}Name" name="${labelName}" ${allowInput?'':'readonly="readonly"'}  type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
+		<input id="${id}Name"placeholder="请选择${title}" name="${labelName}" ${allowInput?'':'readonly="readonly"'}  type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
 		class="${cssClass}" style="background-color: #ffffff; ${cssStyle} "/>
        		
     </div>

src/main/webapp/WEB-INF/tags/sys/treeselect.tag

@@ -23,7 +23,7 @@
 <%@ attribute name="disabled" type="java.lang.String" required="false" description="是否限制选择，如果限制，设置为disabled"%>
 <%@ attribute name="dataMsgRequired" type="java.lang.String" required="false" description=""%>
 <%@ attribute name="rule" type="java.lang.String" required="false" description="考勤规则模块用"%>
-	<input id="${id}Id" name="${name}" class="${cssClass}" type="hidden" value="${value}"/>
+	<input id="${id}Id" name="${name}" class="${cssClass}" type="hidden" value="${value}" />
 	<div class="input-group">
 		<input id="${id}Name" placeholder="请选择${title}" name="${labelName}" ${allowInput?'':'readonly="readonly"'}  type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
 		class="${cssClass} required" style="${cssStyle}"/>

src/main/webapp/WEB-INF/tags/sys/treeselectAccessoryNoParent.tag

@@ -24,7 +24,7 @@
 <%@ attribute name="dataMsgRequired" type="java.lang.String" required="false" description=""%>
 	<input id="${id}Id" name="${name}" class="${cssClass}" type="hidden" value="${value}"/>
 	<div class="input-group">
-		<input id="${id}Name" name="${labelName}" ${allowInput?'':'readonly="true"'}  type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
+		<input id="${id}Name" name="${labelName}" placeholder="${title}" ${allowInput?'':'readonly="true"'}  type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
 		class="${cssClass}" style="background-color: #ffffff; ${cssStyle}"/>
        		
     </div>

src/main/webapp/WEB-INF/tags/sys/treeselectComp.tag

@@ -24,7 +24,7 @@
 <%@ attribute name="dataMsgRequired" type="java.lang.String" required="false" description=""%>
 	<input id="${id}Id" name="${name}" class="${cssClass}" type="hidden" value="${value}"/>
 	<div class="input-group">
-		<input id="${id}Name" name="${labelName}" ${allowInput?'':'readonly="readonly"'}  type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
+		<input id="${id}Name" placeholder="请选择${title}" name="${labelName}" ${allowInput?'':'readonly="readonly"'}  type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
 		class="${cssClass}" style="${cssStyle}"/>
        		 <span class="input-group-btn">
 	       		 <button type="button"  id="${id}Button" class="btn <c:if test="${fn:contains(cssClass, 'input-sm')}"> btn-sm </c:if><c:if test="${fn:contains(cssClass, 'input-lg')}"> btn-lg </c:if>  btn-primary ${disabled} ${hideBtn ? 'hide' : ''}"><i class="fa fa-search"></i>

src/main/webapp/WEB-INF/tags/sys/treeselectOnNotRequest.tag

@@ -25,7 +25,7 @@
 <%@ attribute name="rule" type="java.lang.String" required="false" description="考勤规则模块用"%>
 	<input id="${id}Id" name="${name}" class="${cssClass}" type="hidden" value="${value}"/>
 	<div class="input-group">
-		<input id="${id}Name" name="${labelName}" ${allowInput?'':'readonly="readonly"'}  type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
+		<input id="${id}Name" placeholder="请选择${title}" name="${labelName}" ${allowInput?'':'readonly="readonly"'}  type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
 		class="${cssClass}" style="${cssStyle}"/>
        		 <span class="input-group-btn">
 	       		 <button type="button"  id="${id}Button" class="btn <c:if test="${fn:contains(cssClass, 'input-sm')}"> btn-sm </c:if><c:if test="${fn:contains(cssClass, 'input-lg')}"> btn-lg </c:if>  btn-primary ${disabled} ${hideBtn ? 'hide' : ''}"><i class="fa fa-search"></i>

src/main/webapp/WEB-INF/tags/sys/treeselectRole.tag

@@ -23,7 +23,7 @@
 <%@ attribute name="dataMsgRequired" type="java.lang.String" required="false" description=""%>
 	<input id="${id}Id" name="${name}" class="${cssClass}" type="hidden" value="${value}"/>
 	<div class="input-group">
-		<input id="${id}Name" name="${labelName}" ${allowInput?'':'readonly="readonly"'}  type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
+		<input id="${id}Name" placeholder="${title}" name="${labelName}" ${allowInput?'':'readonly="readonly"'}  type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
 		class="${cssClass}" style="${cssStyle}"/>
        		 <span class="input-group-btn">
 	       		 <button type="button"  id="${id}Button" class="btn <c:if test="${fn:contains(cssClass, 'input-sm')}"> btn-sm </c:if><c:if test="${fn:contains(cssClass, 'input-lg')}"> btn-lg </c:if>  btn-primary ${disabled} ${hideBtn ? 'hide' : ''}"><i class="fa fa-search"></i>

src/main/webapp/webpage/modules/oa/oaNotifyAudit.jsp

@@ -159,28 +159,28 @@
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label">公告标题：</label>
                     <div class="layui-input-block">
-                        <input htmlEscape="false" readonly="true" maxlength="30" class="form-control required layui-input"
+                        <input htmlEscape="false" readonly="true" style="background-color: #f1f1f1" maxlength="30" class="form-control required layui-input"
                                value="${oaNotify.title}"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label">文号：</label>
                     <div class="layui-input-block">
-                        <input htmlEscape="false" readonly="true" maxlength="30" class="form-control required layui-input"
+                        <input htmlEscape="false" readonly="true" style="background-color: #f1f1f1" maxlength="30" class="form-control required layui-input"
                                value="${oaNotify.referenceNumber}"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label">公告类型：</label>
                     <div class="layui-input-block">
-                        <input htmlEscape="false" readonly="true" maxlength="30" class="form-control required layui-input"
+                        <input htmlEscape="false" readonly="true" style="background-color: #f1f1f1" maxlength="30" class="form-control required layui-input"
                                value="${fns:getMainDictLabel(oaNotify.type, 'oa_notify_type', '')}"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label">创建日期：</label>
                     <div class="layui-input-block">
-                        <input id="createDate" name="createDate" htmlEscape="false" readonly="true"
+                        <input style="background-color: #f1f1f1" id="createDate" name="createDate" htmlEscape="false" readonly="true"
                                class="laydate-icondate form-control layer-date layui-input laydate-icon"
                                value="<fmt:formatDate value="${oaNotify.createDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
                     </div>
@@ -189,7 +189,7 @@
                     <div class="layui-item layui-col-sm6">
                         <label class="layui-form-label">开始日期：</label>
                         <div class="layui-input-block">
-                            <input id="startDate" name="startDate" htmlEscape="false" readonly="true"
+                            <input id="startDate" style="background-color: #f1f1f1" name="startDate" htmlEscape="false" readonly="true"
                                    class="laydate-icondate form-control layer-date layui-input laydate-icon"
                                    value="<fmt:formatDate value="${oaNotify.startDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
                         </div>
@@ -197,7 +197,7 @@
                     <div class="layui-item layui-col-sm6">
                         <label class="layui-form-label">结束日期：</label>
                         <div class="layui-input-block">
-                            <input id="endDate" name="endDate" htmlEscape="false" readonly="true"
+                            <input id="endDate" name="endDate" style="background-color: #f1f1f1" htmlEscape="false" readonly="true"
                                    class="laydate-icondate form-control layer-date layui-input laydate-icon"
                                    value="<fmt:formatDate value="${oaNotify.endDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
                         </div>
@@ -206,14 +206,14 @@
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label">创建人：</label>
                     <div class="layui-input-block">
-                        <form:input id="cBName" path="createBy.name" htmlEscape="false" readonly="true"
+                        <form:input style="background-color: #f1f1f1" id="cBName" path="createBy.name" htmlEscape="false" readonly="true"
                                     class="form-control  layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label">所属部门：</label>
                     <div class="layui-input-block">
-                        <form:input id="office" path="office.name" htmlEscape="false" readonly="true"
+                        <form:input style="background-color: #f1f1f1" id="office" path="office.name" htmlEscape="false" readonly="true"
                                     class="form-control  layui-input"/>
                     </div>
                 </div>

src/main/webapp/webpage/modules/oa/oaNotifyForm.jsp

@@ -4,6 +4,9 @@
 <head>
     <title>通知管理</title>
     <meta name="decorator" content="default"/>
+
+    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
     <style type="text/css">
         img {width: 50px; height: 50px;}
     </style>
@@ -44,6 +47,9 @@
             return false;
         }
         $(document).ready(function() {
+            layui.use(['form', 'layer'], function () {
+                var form = layui.form;
+            });
             //$("#name").focus();
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
@@ -180,13 +186,13 @@
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label"><span class="require-item">*</span>公告标题：</label>
                     <div class="layui-input-block">
-                        <form:input path="title" htmlEscape="false" maxlength="30" class="form-control required layui-input"/>
+                        <form:input path="title" htmlEscape="false" placeholder="请输入公告标题" maxlength="30" class="form-control required layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label">文号：</label>
                     <div class="layui-input-block">
-                        <form:input path="referenceNumber" htmlEscape="false" maxlength="30" class="form-control layui-input"/>
+                        <form:input path="referenceNumber" placeholder="请输入文号" htmlEscape="false" maxlength="30" class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/oa/oaNotifyModifyApply.jsp

@@ -4,6 +4,8 @@
 <head>
     <title>通知管理</title>
     <meta name="decorator" content="default"/>
+    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
     <style type="text/css">
         img {width: 50px; height: 50px;}
     </style>
@@ -39,6 +41,9 @@
             return false;
         }
         $(document).ready(function() {
+            layui.use(['form', 'layer'], function () {
+                var form = layui.form;
+            });
             //$("#name").focus();
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
@@ -180,13 +185,13 @@
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label"><span class="require-item">*</span>公告标题：</label>
                     <div class="layui-input-block">
-                        <form:input path="title" htmlEscape="false" maxlength="30" class="form-control required layui-input"/>
+                        <form:input path="title" htmlEscape="false" maxlength="30" placeholder="请输入公告标题" class="form-control required layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label">文号：</label>
                     <div class="layui-input-block">
-                        <form:input path="referenceNumber" htmlEscape="false" maxlength="30" class="form-control layui-input"/>
+                        <form:input path="referenceNumber" placeholder="请输入文号" htmlEscape="false" maxlength="30" class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/projectAccessory/projectTemplate/projectTemplateForm.jsp

@@ -4,6 +4,8 @@
 <head>
 	<title>复核标准管理</title>
 	<meta name="decorator" content="default"/>
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<script src="${ctxStatic}/layer-v2.3/layui/xmSelect.js" charset="utf-8"></script>
 	<style>
 		label.error{
@@ -26,6 +28,9 @@
 		  return false;
 		}
 		$(document).ready(function() {
+			layui.use(['form', 'layer'], function () {
+				var form = layui.form;
+			});
 			contentDetailTypeShow();
 			validateForm = $("#inputForm").validate({
 				submitHandler: function(form){
@@ -52,7 +57,7 @@
 <body>
 <div class="single-form">
 	<div class="container">
-		<form:form id="inputForm" modelAttribute="projectAccessoryInfo" action="${ctx}/projectTemplate/projectTemplate/save" method="post" class="form-horizontal">
+		<form:form id="inputForm" modelAttribute="projectAccessoryInfo" action="${ctx}/projectTemplate/projectTemplate/save" method="post" class="form-horizontal layui-form">
 		<form:hidden path="id"/>
 		<form:hidden path="companyId"/>
 		<input type="hidden" id="attachTypes" name="attachTypes" value="">
@@ -77,13 +82,13 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label double-line"><span class="require-item">*</span>附件结构名称：</label>
 					<div class="layui-input-block">
-						<form:input path="attachName" htmlEscape="false" maxlength="100" class="form-control layui-input required"/>
+						<form:input path="attachName" placeholder="请输入附件结构名称" htmlEscape="false" maxlength="100" class="form-control layui-input required"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>序号：</label>
 					<div class="layui-input-block">
-						<form:input path="indexNum" htmlEscape="false" maxlength="10"  class="form-control required number layui-input"/>
+						<form:input path="indexNum" placeholder="请输入序号" htmlEscape="false" maxlength="10"  class="form-control required number layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
@@ -95,13 +100,13 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label double-line">文件大小(M)：</label>
 					<div class="layui-input-block">
-						<form:input path="attachLength" htmlEscape="false" maxlength="10" class="form-control number layui-input"/>
+						<form:input path="attachLength" placeholder="请输入文件大小" htmlEscape="false" maxlength="10" class="form-control number 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" id="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+						<form:textarea path="remarks" placeholder="请输入备注信息" id="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
 					</div>
 				</div>
 			</div>

src/main/webapp/webpage/modules/projectrecord/projectRecordsAudit.jsp

@@ -5,6 +5,8 @@
 	<title>项目审批管理</title>
 	<meta name="decorator" content="default"/>
 	<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<script type="text/javascript">
 		var validateForm;
 		function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
@@ -29,6 +31,22 @@
 		  return false;
 		}
 		$(document).ready(function() {
+			$(".apen").click(function(){
+				var span=$(this).html();
+				var opinion=$("#opinion").val()+span+";"
+				$("#opinion").val(opinion);
+			})
+			layui.use(['form', 'layer'], function () {
+				var form = layui.form;
+				//下拉框监听器
+				layui.form.on('select(opinion)', function(data){
+					var span=data.value;
+					if(span!=""){
+						var opinion=$("#opinion").val()+span+";"
+						$("#opinion").val(opinion);
+					}
+				});
+			});
 			validateForm = $("#inputForm").validate({
 				submitHandler: function(form){
 					loading('正在提交，请稍等...');
@@ -101,7 +119,7 @@
 <body >
 <div class="single-form">
 	<div class="container">
-		<form:form id="inputForm" modelAttribute="projectRecords" enctype="multipart/form-data" action="${ctx}/project/projectRecords/saveAudit" method="post" class="form-horizontal">
+		<form:form id="inputForm" modelAttribute="projectRecords" enctype="multipart/form-data" action="${ctx}/project/projectRecords/saveAudit" method="post" class="form-horizontal layui-form">
 		<form:hidden path="id"/>
 		<form:hidden path="home"/>
 		<form:hidden path="workContractInfo.client.id" id="contractClientId" value="${projectRecords.workContractInfo.client.id}"/>
@@ -600,17 +618,38 @@
 					</table>
 				</div>
 			</div>
-
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>审批意见</h2></div>
-				<div class="layui-item layui-col-sm12 lw6 with-textarea">
-					<label class="layui-form-label">审批意见：</label>
-					<div class="layui-input-block">
-						<form:textarea path="act.comment" class="form-control" rows="4" maxlength="127" />
+				<div class="layui-item layui-col-sm8 lw6 with-textarea">
+					<div class="layui-input-block" style="margin-left:10px;">
+						<form:textarea placeholder="请输入审批意见" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
 						<input type="file" name="upload_files" style="display: none;">
 					</div>
 				</div>
+				<div class="layui-item layui-col-sm4 lw6 with-textarea">
+					<div class="layui-input-block" style="margin-left:10px;">
+						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">同意</span></div>
+						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">不同意</span></div>
+						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">请领导审核</span></div>
+						<div style="padding: 10px 0px;">
+							<form:select path="act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">
+								<form:option value=""/>
+								<form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+							</form:select>
+						</div>
+					</div>
+				</div>
 			</div>
+<%--			<div class="form-group layui-row">--%>
+<%--				<div class="form-group-label"><h2>审批意见</h2></div>--%>
+<%--				<div class="layui-item layui-col-sm12 lw6 with-textarea">--%>
+<%--					<label class="layui-form-label">审批意见：</label>--%>
+<%--					<div class="layui-input-block">--%>
+<%--						<form:textarea path="act.comment" class="form-control" rows="4" maxlength="127" />--%>
+<%--						<input type="file" name="upload_files" style="display: none;">--%>
+<%--					</div>--%>
+<%--				</div>--%>
+<%--			</div>--%>
 
 			<script>
                 var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");

src/main/webapp/webpage/modules/projectrecord/projectRecordsForm.jsp

@@ -53,6 +53,47 @@
             return false;
         }
         $(document).ready(function() {
+            var id;
+            var name;
+            var cname;
+            var cprice;
+            var ccname;
+            var cptype;
+            if ($("#contractIdId").val()!=null || $("#contractIdId").val()!=''){
+                id=$("#contractIdId").val();
+                name=$("#contractIdName").val();
+                cname=$("#contractName").val();
+                cprice=$("#contractPrice").val();
+                ccname=$("#contractClientName").val();
+                cptype=$("#constructionProjectType").val();
+            }
+            layui.use(['form', 'layer'], function () {
+                var form = layui.form;
+                //有无合同监听器
+                layui.form.on('radio(ext)', function(data){
+                    var span=data.value;
+                    if(span==0){
+                        $("#contractIdId").val(id);
+                        $("#contractIdName").val(name);
+                        $("#contractName").val(cname);
+                        $("#contractPrice").val(cprice);
+                        $("#contractClientName").val(ccname);
+                        $("#constructionProjectType").val(cptype);
+                        $("#divv").show();
+                        $("#divv3").show();
+                    }else{
+                        var h=$("#d1").html();
+                        $("#contractIdId").val("");
+                        $("#contractIdName").val("");
+                        $("#contractName").val("");
+                        $("#contractPrice").val("");
+                        $("#contractClientName").val("");
+                        $("#constructionProjectType").val("");
+                        $("#divv").hide();
+                        $("#divv3").hide();
+                    }
+                });
+            });
             var radioVal ;
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
@@ -99,9 +140,11 @@
             });
 
             //自动选择合同状态
-            if ($("#projectName").val() != null) {
+            if ($("#projectName").val() != "") {
                 if ($("#contractName").val() == "") {
                     $("#ext1").iCheck("check");
+                }else{
+                    $("#ext").iCheck("check");
                 }
             }
 
@@ -1053,7 +1096,7 @@
 <div class="single-form">
     <div class="container">
         <sys:message content="${message}"/>
-        <form:form id="inputForm" modelAttribute="projectRecords" action="${ctx}/project/projectRecords/save" method="post" class="form-horizontal">
+        <form:form id="inputForm" modelAttribute="projectRecords" action="${ctx}/project/projectRecords/save" method="post" class="form-horizontal layui-form">
             <form:hidden path="id"/>
             <form:hidden path="workContractInfo.client.id" id="contractClientId" value="${workContractInfo.client.id}"/>
 
@@ -1063,10 +1106,10 @@
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">合同情况：</label>
                         <div class="layui-input-block">
-                            <input type="radio" class="i-checks" name="ext" checked id="ext" value="0">
-                            <label for="ext">有合同</label>
-                            <input type="radio" class="i-checks" name="ext" id="ext1" value="1">
-                            <label for="ext1">无合同</label>
+                            <input type="radio" title="有合同" lay-filter="ext" name="ext" checked id="ext" value="0">
+<%--                            <label for="ext">有合同</label>--%>
+                            <input type="radio" title="无合同" lay-filter="ext" name="ext" id="ext1" value="1">
+<%--                            <label for="ext1">无合同</label>--%>
                         </div>
                     </div>
                 </div>
@@ -1076,7 +1119,7 @@
                            <label class="layui-form-label"><span class="require-item">*</span>选择合同：</label>
                            <div class="layui-input-block  with-icon">
                                <sys:gridselectContract url="${ctx}/project/projectRecords/selectcontract" type="" isTotal="" id="contractId" name="workContractInfo.id"  value="${projectRecords.workContractInfo.id}"  title="选择合同" labelName="workContractInfo.name"
-                                                       labelValue="${projectRecords.workContractInfo.name}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
+                                                    cssStyle="background-color:#fff"   labelValue="${projectRecords.workContractInfo.name}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
                            </div>
                        </div>
                        <div class="layui-item layui-col-sm6 lw7">
@@ -1114,7 +1157,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">
-                        <form:input path="projectName" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="projectName" placeholder="请输入项目名称" htmlEscape="false"  class="form-control layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -1133,7 +1176,7 @@
                     <label class="layui-form-label"><span class="require-item">*</span>项目所在地：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:treeselect id="area" name="area.id" value="${projectRecords.area.id}" labelName="area.name" labelValue="${projectRecords.area.name}"
-                                        title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
+                                     cssStyle="background-color:#fff"   title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -1157,7 +1200,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">建设地点：</label>
                     <div class="layui-input-block">
-                        <form:input path="projectSite" htmlEscape="false"  class="form-control layui-input"/>
+                        <form:input placeholder="请输入建设地点" path="projectSite" htmlEscape="false"  class="form-control layui-input"/>
                     </div>
                 </div>
                 <%--<div class="layui-item layui-col-sm6 lw7">
@@ -1224,7 +1267,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">建筑面积或规模：</label>
                     <div class="layui-input-block"><%--onchange="getFee()"--%>
-                        <form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input number" />
+                        <form:input placeholder="请输入建筑面积和规模" path="buildingScale" htmlEscape="false"  class="form-control layui-input number" />
                     </div>
                 </div>
                <%-- <div class="layui-item layui-col-sm6 lw7">
@@ -1278,31 +1321,31 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">单位造价(元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="unitFees" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="false"/>
+                        <form:input placeholder="请输入单位造价" path="unitFees" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="false"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">土建单位造价(元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="buildingUnitFees" htmlEscape="false" id="buildingUnitFees" class="form-control layui-input" readonly="false"/>
+                        <form:input placeholder="请输入土建单位造价" path="buildingUnitFees" htmlEscape="false" id="buildingUnitFees" class="form-control layui-input" readonly="false"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">安装单位造价(元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="installUnitFees" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="false"/>
+                        <form:input placeholder="请输入安装单位造价" path="installUnitFees" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="false"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
                     <label class="layui-form-label">工程概况：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="projectDesc" htmlEscape="false" rows="4"  maxlength="255"  class="form-control"/>
+                        <form:textarea placeholder="请输入工程概况" path="projectDesc" htmlEscape="false" rows="4"  maxlength="255"  class="form-control"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
                     <label class="layui-form-label ">特殊要求：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+                        <form:textarea placeholder="请输入特殊要求" path="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
                     </div>
                 </div>
             </div>

src/main/webapp/webpage/modules/serialnum/serialNumTplForm.jsp

@@ -4,6 +4,8 @@
 <head>
 	<title>编号模板管理</title>
 	<meta name="decorator" content="default"/>
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<script type="text/javascript">
 		var validateForm;
 		function doSubmit(index1){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
@@ -32,6 +34,9 @@
 		  return false;
 		}
 		$(document).ready(function() {
+			layui.use(['form', 'layer'], function () {
+				var form = layui.form;
+			});
 			validateForm = $("#inputForm").validate({
 				submitHandler: function(form){
 					loading('正在提交，请稍等...');
@@ -89,14 +94,14 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>模板名称：</label>
 					<div class="layui-input-block">
-						<form:input path="tplName" htmlEscape="false"  maxlength="64"  class="form-control layui-input required"/>
+						<form:input path="tplName" placeholder="请输入模板名称" htmlEscape="false"  maxlength="64"  class="form-control layui-input required"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>公司：</label>
 					<div class="layui-input-block with-icon">
 						<sys:treeselectComp id="company" name="company.id" value="${serialNumTpl.company.id}" labelName="parent.name" labelValue="${serialNumTpl.company.name}"
-											cssStyle="required" title="公司" url="/sys/office/treeDataCompany?type=2" extId="${serialNumTpl.company.id}"  cssClass="form-control layui-input " allowClear="${serialNumTpl.currentUser.admin}"/>
+											cssStyle="required;background-color:#fff" title="公司" url="/sys/office/treeDataCompany?type=2" extId="${serialNumTpl.company.id}"  cssClass="form-control layui-input " allowClear="${serialNumTpl.currentUser.admin}"/>
 					</div>
 				</div>
 				<%--<div class="layui-item layui-col-sm6">--%>
@@ -126,19 +131,19 @@
 					<label class="layui-form-label">起始序列号：</label>
 					<div class="layui-input-block">
 						<input type="hidden" name="oldSerialNum" id="oldSerialNum" value="${serialNumTpl.serialNum}">
-						<form:input path="serialNum" htmlEscape="false" class="form-control digits layui-input "/>
+						<form:input placeholder="请输入起始序列号" path="serialNum" htmlEscape="false" class="form-control digits layui-input "/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>序列号长度：</label>
 					<div class="layui-input-block">
-						<form:input path="serialNumLen" htmlEscape="false" maxlength="1" class="form-control required digits layui-input "/>
+						<form:input path="serialNumLen" placeholder="请输入序列号长度" htmlEscape="false" maxlength="1" class="form-control required digits layui-input "/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>编号模板：</label>
 					<div class="layui-input-block">
-						<form:input path="serialTpl" htmlEscape="false"  readonly="true" class="form-control required layui-input "/>
+						<form:input path="serialTpl" htmlEscape="false" readonly="true" class="form-control required layui-input "/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
@@ -329,6 +334,9 @@
 								idx: idx, delBtn: true, row: row,
 								order:idx1 + 1, idx1:idx1
 							}));
+							layui.use(['form', 'layer'], function () {
+								var form = layui.form;
+							});
 							$(list+idx).find("select").each(function(){
 								$(this).val($(this).attr("data-value"));
 							});

src/main/webapp/webpage/modules/sys/addUserInfo.jsp

@@ -82,7 +82,7 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>手机：</label>
 					<div class="layui-input-block">
-						<input id="mobile" name="mobile" type="text" class="layui-input required form-control"/>
+						<input placeholder="请输入手机号" id="mobile" name="mobile" type="text" class="layui-input required form-control"/>
 						<span class="help-inline"></span>
 					</div>
 				</div>
@@ -129,7 +129,7 @@
 					<div class="layui-input-block">
 						<div class="input-group with-icon">
 							<sys:treeselect id="office" name="office.id" value="${user.office.id}" labelName="office.name" labelValue="${user.office.name}"
-											title="部门" url="/sys/office/treeData?type=2" cssClass="form-control required layui-input" notAllowSelectParent="true"/>
+										cssStyle="background-color:#fff"	title="部门" url="/sys/office/treeData?type=2" cssClass="form-control required layui-input" notAllowSelectParent="true"/>
 						</div>
 					</div>
 				</div>
@@ -138,7 +138,7 @@
 					<div class="layui-input-block">
 						<div class="input-group with-icon">
 							<sys:treeselectRole id="roleIds" name="roleIds" value="${user.roleIds}" labelName="roleNames" labelValue="${user.roleNames}"
-												title="选择岗位" url="/sys/office/treeDataRole?type=2&isAll=false&userId=${user.id}" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+												cssStyle="background-color:#fff"	title="选择岗位" url="/sys/office/treeDataRole?type=2&isAll=false&userId=${user.id}" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
 							<label id="roleIdList-error" class="error" for="roleIdList"></label>
 						</div>
 					</div>

src/main/webapp/webpage/modules/sys/areaForm.jsp

@@ -4,6 +4,9 @@
 <head>
 	<title>区域管理</title>
 	<meta name="decorator" content="default"/>
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
+	<%@include file="/webpage/include/treeview.jsp" %>
 	<script type="text/javascript">
 		var validateForm;
 		function doSubmit(){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
@@ -15,6 +18,9 @@
 		  return false;
 		}
 		$(document).ready(function() {
+			layui.use(['form', 'layer'], function () {
+				var form = layui.form;
+			});
 			$("#name").focus();
 			validateForm = $("#inputForm").validate({
 				submitHandler: function(form){
@@ -37,7 +43,7 @@
 <body>
 <div class="single-form">
 	<div class="container">
-	<form:form id="inputForm" modelAttribute="area" action="${ctx}/sys/area/save" method="post" class="form-horizontal">
+	<form:form id="inputForm" modelAttribute="area" action="${ctx}/sys/area/save" method="post" class="form-horizontal layui-form">
 		<form:hidden path="id"/>
 		<sys:message content="${message}"/>
 
@@ -47,19 +53,19 @@
 				<label class="layui-form-label">上级区域：</label>
 				<div class="layui-input-block with-icon">
 					<sys:treeselect id="area" name="parent.id" value="${area.parent.id}" labelName="parent.name" labelValue="${area.parent.name}"
-									title="区域" url="/sys/area/treeData" extId="${area.id}" cssClass="form-control layui-input" allowClear="true"/>
+								cssStyle="background-color:#fff"	title="区域" url="/sys/area/treeData" extId="${area.id}" cssClass="form-control layui-input" allowClear="true"/>
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">区域名称：</label>
 				<div class="layui-input-block with-icon">
-					<form:input path="name" htmlEscape="false" maxlength="50" class="form-control layui-input required"/>
+					<form:input placeholder="请输入区域名称" path="name" htmlEscape="false" maxlength="50" class="form-control layui-input required"/>
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label"><span class="require-item">*</span>区域编码：</label>
 				<div class="layui-input-block with-icon">
-					<form:input path="code" htmlEscape="false" maxlength="50" class="form-control layui-input"/>
+					<form:input placeholder="请输入区域编码" path="code" htmlEscape="false" maxlength="50" class="form-control layui-input"/>
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
@@ -73,7 +79,7 @@
 			<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="200" class="form-control"/>
+					<form:textarea path="remarks" placeholder="请输入备注" htmlEscape="false" rows="4" maxlength="200" class="form-control"/>
 				</div>
 			</div>
 		</div>

src/main/webapp/webpage/modules/sys/dictForm.jsp

@@ -45,37 +45,37 @@
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">键值：</label>
 				<div class="layui-input-block">
-					<form:input path="value" htmlEscape="false" maxlength="50" class="form-control layui-input required"/>
+					<form:input placeholder="请输入键值" path="value" htmlEscape="false" maxlength="50" class="form-control layui-input required"/>
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">标签：</label>
 				<div class="layui-input-block">
-					<form:input path="label" htmlEscape="false" maxlength="50" class="form-control layui-input required"/>
+					<form:input placeholder="请输入标签" path="label" htmlEscape="false" maxlength="50" class="form-control layui-input required"/>
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">类型：</label>
 				<div class="layui-input-block">
-					<form:input path="type" htmlEscape="false" maxlength="50" class="form-control layui-input required abc"/>
+					<form:input path="type" placeholder="请输入类型" htmlEscape="false" maxlength="50" class="form-control layui-input required abc"/>
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">描述：</label>
 				<div class="layui-input-block">
-					<form:input path="description" htmlEscape="false" maxlength="50" class="form-control layui-input required"/>
+					<form:input path="description" placeholder="请输入描述" htmlEscape="false" maxlength="50" class="form-control layui-input required"/>
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm12">
 				<label class="layui-form-label">排序：</label>
 				<div class="layui-input-block">
-					<form:input path="sort" htmlEscape="false" maxlength="11" class="form-control required layui-input digits"/>
+					<form:input path="sort" placeholder="请输入排序" htmlEscape="false" maxlength="11" class="form-control required layui-input digits"/>
 				</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="200" class="form-control "/>
+					<form:textarea path="remarks" placeholder="请输入备注" htmlEscape="false" rows="4" maxlength="200" class="form-control "/>
 				</div>
 			</div>
 		</div>

src/main/webapp/webpage/modules/sys/mainDictDetailForm.jsp

@@ -168,13 +168,13 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>名称：</label>
 					<div class="layui-input-block">
-						<form:input path="detailName" htmlEscape="false" id="detailName"   class="form-control layui-input required"/>
+						<form:input path="detailName" placeholder="请输入名称" htmlEscape="false" id="detailName"   class="form-control layui-input required"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>键值：</label>
 					<div class="layui-input-block">
-						<form:input path="detailKey" htmlEscape="false" id="detailKey"   class="form-control detailKey layui-input required"/>
+						<form:input path="detailKey" htmlEscape="false" id="detailKey" placeholder="请输入键值"  class="form-control detailKey layui-input required"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
@@ -250,31 +250,31 @@
 					<label class="layui-form-label">类型名称：</label>
 					<div class="layui-input-block">
 						<input type="hidden" name="typeId" value="${mainDict.id}">
-						<input htmlEscape="false" readonly="true"   class="form-control layui-input required" value="${mainDict.name}"/>
+						<input htmlEscape="false" readonly="true" style="background-color: #f1f1f1"  class="form-control layui-input required" value="${mainDict.name}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">所属类型：</label>
 					<div class="layui-input-block">
-						<input id="typeName" htmlEscape="false" readonly="true"   class="form-control layui-input required" value="${mainDict.typeName}"/>
+						<input id="typeName" htmlEscape="false" readonly="true" style="background-color: #f1f1f1"  class="form-control layui-input required" value="${mainDict.typeName}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>排序：</label>
 					<div class="layui-input-block">
-						<form:input path="sort" htmlEscape="false"  id="sort"  class="form-control number layui-input required"/>
+						<form:input path="sort" htmlEscape="false" placeholder="请输入排序" id="sort"  class="form-control number layui-input required"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">末级标记：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false" readonly="true" class="form-control layui-input required" value="<c:choose><c:when test="${mainDictDetail.endFlag == '0'}">否</c:when><c:otherwise>是</c:otherwise></c:choose>"/>
+						<input htmlEscape="false" readonly="true" style="background-color: #f1f1f1" class="form-control layui-input required" value="<c:choose><c:when test="${mainDictDetail.endFlag == '0'}">否</c:when><c:otherwise>是</c:otherwise></c:choose>"/>
 					</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" class="form-control "/>
+						<form:textarea path="remarks" placeholder="请输入描述" htmlEscape="false" rows="4" class="form-control "/>
 					</div>
 				</div>
 			</div>

src/main/webapp/webpage/modules/sys/mainDictForm.jsp

@@ -4,6 +4,8 @@
 <head>
 	<title>字典管理</title>
 	<meta name="decorator" content="default"/>
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<style>
 		#remarks-error{
 			left:0;
@@ -21,6 +23,9 @@
 		  return false;
 		}
 		$(document).ready(function() {
+			layui.use(['form', 'layer'], function () {
+				var form = layui.form;
+			});
 			validateForm = $("#inputForm").validate({
 				submitHandler: function(form){
 					loading('正在提交，请稍等...');
@@ -67,7 +72,7 @@
 <body>
 <div class="single-form">
 	<div class="container">
-		<form:form id="inputForm" modelAttribute="mainDict" action="${ctx}/sys/mainDict/save" method="post" class="form-horizontal">
+		<form:form id="inputForm" modelAttribute="mainDict" action="${ctx}/sys/mainDict/save" method="post" class="form-horizontal layui-form">
 		<form:hidden path="id"/>
 		<sys:message content="${message}"/>
 			<div class="form-group layui-row first">
@@ -76,19 +81,19 @@
 					<label class="layui-form-label"><span class="require-item">*</span>类型：</label>
 					<div class="layui-input-block">
 						<input id="oldTypeName" name="oldTypeName" type="hidden" value="${mainDict.typeName}"/>
-						<form:input path="typeName" htmlEscape="false"    class="form-control typeName layui-input required"/>
+						<form:input placeholder="请输入类型" path="typeName" htmlEscape="false"    class="form-control typeName 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:input path="name" htmlEscape="false"    class="form-control layui-input required"/>
+						<form:input path="name" placeholder="请输入类型名称" htmlEscape="false"    class="form-control layui-input required"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>类型排序：</label>
 					<div class="layui-input-block">
-						<form:input path="typeSort" htmlEscape="false"    class="form-control number layui-input required"/>
+						<form:input path="typeSort" htmlEscape="false" placeholder="请输入类型排序"   class="form-control number layui-input required"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
@@ -103,7 +108,7 @@
 				<div class="layui-item layui-col-sm12 with-textarea">
 					<label class="layui-form-label"><span class="require-item">*</span>类型描述：</label>
 					<div class="layui-input-block">
-						<form:textarea path="remarks" htmlEscape="false" rows="4" class="form-control required"/>
+						<form:textarea path="remarks" placeholder="请输入类型描述" htmlEscape="false" rows="4" class="form-control required"/>
 					</div>
 				</div>
 			</div>

src/main/webapp/webpage/modules/sys/menuForm.jsp

@@ -48,22 +48,22 @@
 									 title="菜单" url="/sys/menu/treeData" extId="${menu.id}" cssClass="form-control layui-input required" notAllowSelectParent="false"/>
 		         <td  class="width-15 active"><label class="pull-right"><font color="red">*</font> 名称:</label></td>
 		         <td  class="width-35" >
-					 <form:input path="name" htmlEscape="false" maxlength="50" class="form-control layui-input required"/>
+					 <form:input path="name" placeholder="请输入名称" htmlEscape="false" maxlength="50" class="form-control layui-input required"/>
 				 </td>
 		      </tr>
 		      <tr>
 		         <td  class="width-15 active"><label class="pull-right">链接:</label></td>
-		         <td class="width-35" ><form:input path="href" htmlEscape="false" maxlength="2000" class="form-control layui-input"/>
+		         <td class="width-35" ><form:input path="href" placeholder="请输入链接" htmlEscape="false" maxlength="2000" class="form-control layui-input"/>
 					<span class="help-inline">点击菜单跳转的页面</span></td>
 		         <td  class="width-15 active"><label class="pull-right">目标:</label></td>
-		         <td  class="width-35" ><form:input path="target" htmlEscape="false" maxlength="10" class="form-control layui-input"/>
+		         <td  class="width-35" ><form:input path="target" placeholder="请输入目标" htmlEscape="false" maxlength="10" class="form-control layui-input"/>
 					<span class="help-inline">链接打开的目标窗口，默认：mainFrame</span></td>
 		      </tr>
 		      <tr>
 		         <td  class="width-15 active"><label class="pull-right">图标:</label></td>
 		         <td class="width-35" ><sys:iconselect id="icon" name="icon" value="${menu.icon}"/></td>
 		         <td  class="width-15 active"><label class="pull-right">排序:</label></td>
-		         <td  class="width-35" ><form:input path="sort" htmlEscape="false" maxlength="50" class="form-control layui-input"/>
+		         <td  class="width-35" ><form:input path="sort" placeholder="请输入排序" htmlEscape="false" maxlength="50" class="form-control layui-input"/>
 					<span class="help-inline">排列顺序，升序。</span></td>
 		      </tr>
 		      <tr>
@@ -71,12 +71,12 @@
 		         <td class="width-35" ><form:radiobuttons path="isShow" items="${fns:getDictList('show_hide')}" itemLabel="label" itemValue="value" htmlEscape="false" class="required i-checks "/>
 					<span class="help-inline">该菜单或操作是否显示到系统菜单中</span></td>
 		         <td  class="width-15 active"><label class="pull-right">权限标识:</label></td>
-		         <td  class="width-35" ><form:input path="permission" htmlEscape="false" maxlength="100" class="form-control layui-input"/>
+		         <td  class="width-35" ><form:input path="permission" placeholder="请输入权限标识" htmlEscape="false" maxlength="100" class="form-control layui-input"/>
 					<span class="help-inline">控制器中定义的权限标识，如：@RequiresPermissions("权限标识")</span></td>
 		      </tr>
 		      <tr>
 		         <td  class="width-15 active"><label class="pull-right">备注:</label></td>
-		         <td class="width-35" ><form:textarea path="remarks" htmlEscape="false" rows="3" class="form-control layui-input "/></td>
+		         <td class="width-35" ><form:textarea placeholder="请输入备注" path="remarks" htmlEscape="false" rows="3" class="form-control layui-input "/></td>
 		         <td  class="width-15 active"><label class="pull-right"></label></td>
 		         <td  class="width-35" ></td>
 		      </tr>

src/main/webapp/webpage/modules/sys/officeForm.jsp

@@ -4,6 +4,8 @@
 <head>
 	<title>机构管理</title>
 	<meta name="decorator" content="default"/>
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<style>
 		label.error{
 			left:0;
@@ -21,6 +23,9 @@
             return false;
         }
 		$(document).ready(function() {
+			layui.use(['form', 'layer'], function () {
+				var form = layui.form;
+			});
             jQuery.validator.addMethod("isMobile", function(value, element) {
                 var length = value.length;
                 var mobile = /^(13[0-9]{9})|(18[0-9]{9})|(19[0-9]{9})|(14[0-9]{9})|(17[0-9]{9})|(15[0-9]{9})$/;
@@ -94,7 +99,7 @@
 <body>
 <div class="single-form">
 	<div class="container">
-	<form:form id="inputForm" modelAttribute="office" action="${ctx}/sys/office/save" method="post" class="form-horizontal">
+	<form:form id="inputForm" modelAttribute="office" action="${ctx}/sys/office/save" method="post" class="form-horizontal layui-form">
 		<form:hidden path="id"/>
 		<sys:message content="${message}"/>
 		<input type="hidden" id = "sign"/>
@@ -108,7 +113,7 @@
 				<div class="layui-input-block with-icon">
 					<c:choose>
 						<c:when test="${not empty office.id}">
-							<input htmlEscape="false"  readonly="true"  class="form-control layui-input" value="${office.parent.name}"/>
+							<input placeholder="请输入上级机构" htmlEscape="false"  readonly="true"  class="form-control layui-input" value="${office.parent.name}"/>
 						</c:when>
 						<c:otherwise>
 							<sys:treeselectComp id="parentId" name="parent.id" value="${office.parent.id}" labelName="parent.name" labelValue="${office.parent.name}"
@@ -130,13 +135,13 @@
 					<c:choose>
 						<c:when test="${cname == 'no'}">
 							<td class="width-35">
-								<input htmlEscape="false" readonly="true" class="form-control layui-input" value="${office.name}"/>
+								<input placeholder="请输入机构名称" htmlEscape="false" readonly="true" class="form-control layui-input" value="${office.name}"/>
 							</td>
 						</c:when>
 						<c:otherwise>
 							<td class="width-35">
 								<input id="oldName" name="oldName" type="hidden" value="${office.name}">
-								<form:input path="name" htmlEscape="false" maxlength="50" class="form-control layui-input required"/>
+								<form:input placeholder="请输入机构名称" path="name" htmlEscape="false" maxlength="50" class="form-control layui-input required"/>
 						</c:otherwise>
 					</c:choose>
 				</div>
@@ -144,13 +149,13 @@
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label"><span class="require-item">*</span>机构全称：</label>
 				<div class="layui-input-block">
-					<form:input path="topCompany" htmlEscape="false" maxlength="64"  cssClass="form-control layui-input required" />
+					<form:input path="topCompany" placeholder="请输入机构全称" htmlEscape="false" maxlength="64"  cssClass="form-control layui-input required" />
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label"><span class="require-item">*</span>机构编码：</label>
 				<div class="layui-input-block">
-					<form:input path="code" htmlEscape="false" maxlength="50" class="form-control number layui-input required"/>
+					<form:input path="code" placeholder="请输入机构编码" htmlEscape="false" maxlength="50" class="form-control number layui-input required"/>
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
@@ -224,7 +229,7 @@
 				<div class="layui-input-block with-icon">
 					<c:choose>
 						<c:when test="${not empty office.id}">
-							<input htmlEscape="false" readonly="true" class="form-control layui-input" value="${fns:getDictLabel(office.useable, 'office_useable', '')}"/>
+							<input htmlEscape="false" placeholder="请输入机构状态" readonly="true" class="form-control layui-input" value="${fns:getDictLabel(office.useable, 'office_useable', '')}"/>
 						</c:when>
 						<c:otherwise>
 							<form:select path="useable" class="form-control required simple-select" onchange="dispSimpleName(this.value);">
@@ -245,7 +250,7 @@
 			<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="3" maxlength="200" class="form-control"/>
+					<form:textarea path="remarks" placeholder="请输入备注" htmlEscape="false" rows="3" maxlength="200" class="form-control"/>
 				</div>
 			</div>
 		</div>

src/main/webapp/webpage/modules/sys/roleForm.jsp

@@ -4,6 +4,8 @@
 <head>
     <title>岗位管理</title>
     <meta name="decorator" content="default"/>
+    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
     <%@include file="/webpage/include/treeview.jsp" %>
     <style>
         .form-horizontal{
@@ -28,6 +30,9 @@
             return false;
         }
         $(document).ready(function(){
+            layui.use(['form', 'layer'], function () {
+                var form = layui.form;
+            });
             $("#name").focus();
 
             validateForm= $("#inputForm").validate({
@@ -197,7 +202,7 @@
 <body>
 <div class="single-form">
     <div class="container" style="display:flex;width:90%;margin-left:10%;">
-        <form:form id="inputForm" modelAttribute="role" autocomplete="off" action="${ctx}/sys/role/save" method="post" class="form-horizontal" >
+        <form:form id="inputForm" modelAttribute="role" autocomplete="off" action="${ctx}/sys/role/save" method="post" class="form-horizontal layui-form" >
             <form:hidden path="id"/>
             <sys:message content="${message}"/>
 
@@ -221,21 +226,21 @@
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label"><span class="require-item">*</span>岗位编号：</label>
                     <div class="layui-input-block">
-                        <form:input path="number" htmlEscape="false" maxlength="2" class="form-control required number layui-input"/>
+                        <form:input path="number" placeholder="请输入岗位编号" htmlEscape="false" maxlength="2" class="form-control required number layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label"><span class="require-item">*</span>归属机构：</label>
                     <div class="layui-input-block with-icon">
                         <sys:treeselect id="office" name="office.id" value="${role.office.id}" labelName="office.name" labelValue="${role.office.topCompany}"
-                                        title="机构" url="/sys/office/treeData" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                       cssStyle="background-color:#fff"  title="机构" url="/sys/office/treeData" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label"><span class="require-item">*</span>岗位名称：</label>
                     <div class="layui-input-block">
                         <input id="oldName" name="oldName" type="hidden" value="${role.name}">
-                        <form:input path="name" htmlEscape="false" maxlength="50" class="form-control required layui-input"/>
+                        <form:input placeholder="请输入岗位名称" path="name" htmlEscape="false" maxlength="50" class="form-control required layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
@@ -281,7 +286,7 @@
                 <div class="layui-item layui-col-sm12 with-textarea">
                     <label class="layui-form-label">备注：</label>
                     <div class="layui-input-block">
-                        <form:textarea style="resize:none;" path="remarks" htmlEscape="false" rows="4" maxlength="200" class="form-control "/>
+                        <form:textarea placeholder="请输入备注" style="resize:none;" path="remarks" htmlEscape="false" rows="4" maxlength="200" class="form-control "/>
                     </div>
                 </div>
             </div>

src/main/webapp/webpage/modules/sys/sysroleactivityForm.jsp

@@ -4,6 +4,8 @@
 <head>
 	<title>工作流角色信息管理</title>
 	<meta name="decorator" content="default"/>
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<style>
 		label.error{
 			left:0;
@@ -21,6 +23,10 @@
 		  return false;
 		}
 		$(document).ready(function() {
+
+			layui.use(['form', 'layer'], function () {
+				var form = layui.form;
+			});
 			validateForm = $("#inputForm").validate({
 				submitHandler: function(form){
 					loading('正在提交，请稍等...');
@@ -42,7 +48,7 @@
 <body>
 <div class="single-form">
 	<div class="container">
-		<form:form id="inputForm" modelAttribute="sysRoleActivity" action="${ctx}/sys/sysroleactivity/save" method="post" class="form-horizontal">
+		<form:form id="inputForm" modelAttribute="sysRoleActivity" action="${ctx}/sys/sysroleactivity/save" method="post" class="form-horizontal layui-form">
 		<form:hidden path="id"/>
 
 			<div class="form-group layui-row first">
@@ -50,13 +56,13 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>角色名称：</label>
 					<div class="layui-input-block">
-						<form:input path="name" htmlEscape="false"    class="form-control required layui-input "/>
+						<form:input path="name" htmlEscape="false"  placeholder="请输入角色名称"  class="form-control required layui-input "/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>编码：</label>
 					<div class="layui-input-block">
-						<form:input path="sort" htmlEscape="false" minlength="4" maxlength="4" class="layui-input form-control number required"/>
+						<form:input path="sort" htmlEscape="false" placeholder="请输入编码" minlength="4" maxlength="4" class="layui-input form-control number required"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12">
@@ -71,7 +77,7 @@
 				<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"    class="form-control "/>
+						<form:textarea path="remarks" placeholder="请输入备注信息" htmlEscape="false" rows="4"    class="form-control "/>
 					</div>
 				</div>
 			</div>

src/main/webapp/webpage/modules/sys/userForm.jsp

@@ -137,19 +137,19 @@
 					<label class="layui-form-label"><span class="require-item">*</span>登录名：</label>
 					<div class="layui-input-block">
 						<input id="oldLoginName" name="oldLoginName" type="hidden" value="${user.loginName}">
-						<form:input path="loginName" htmlEscape="false" minlength="11" maxlength="11" class="form-control layui-input required number text-muted isMobile userName"/>
+						<form:input path="loginName" placeholder="请输入登录名" htmlEscape="false" minlength="11" maxlength="11" class="form-control layui-input required number text-muted isMobile userName"/>
 					</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:input path="mobile" htmlEscape="false" maxlength="11" minlength="11" class="form-control layui-input text-muted number required isMobile"/>
+						<form:input path="mobile" placeholder="请输入手机号" htmlEscape="false" maxlength="11" minlength="11" class="form-control layui-input text-muted number required isMobile"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12">
 					<label class="layui-form-label">邮箱：</label>
 					<div class="layui-input-block">
-						<form:input path="email" htmlEscape="false" maxlength="100" class="form-control layui-input email"/>
+						<form:input path="email" placeholder="请输入邮箱" htmlEscape="false" maxlength="100" class="form-control layui-input email"/>
 					</div>
 				</div>
 			</div>
@@ -158,21 +158,21 @@
 					<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" htmlEscape="false" maxlength="50" class="form-control layui-input required"/>
+							<form:input path="name" placeholder="请输入姓名" htmlEscape="false" maxlength="50" 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 htmlEscape="false" readonly="true" class="form-control layui-input" value="${user.company.name}"/>
+							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${user.company.name}"/>
 						</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 with-icon">
 							<sys:treeselect id="office" name="office.id" value="${user.office.id}" labelName="office.name" labelValue="${user.office.name}"
-											title="部门" url="/sys/office/treeData?type=2" cssClass="form-control layui-input required" notAllowSelectParent="false"/>
+										cssStyle="background-color:#fff"	title="部门" url="/sys/office/treeData?type=2" cssClass="form-control layui-input required" notAllowSelectParent="false"/>
 						</div>
 					</div>
 				</div>
@@ -198,20 +198,20 @@
 			<div class="layui-item layui-col-sm6 lw7">
 				<label class="layui-form-label"><c:if test="${empty user.id}"><span class="require-item">*</span></c:if>密码：</label>
 				<div class="layui-input-block">
-					<input id="newPassword" name="newPassword" type="password" value="" maxlength="12" minlength="6" class="form-control layui-input ${empty user.id?'required':''}"/>
+					<input id="newPassword" placeholder="请输入密码" name="newPassword" type="password" value="" maxlength="12" minlength="6" class="form-control layui-input ${empty user.id?'required':''}"/>
 					<c:if test="${not empty user.id}"><span class="help-inline">若不修改密码，请留空。</span></c:if>
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6 lw7">
 				<label class="layui-form-label"><c:if test="${empty user.id}"><font color="red">*</font></c:if>确认密码：</label>
 				<div class="layui-input-block">
-					<input id="confirmNewPassword" name="confirmNewPassword" type="password"  class="layui-input form-control ${empty user.id?'required':''}" value="" maxlength="12" minlength="6" equalTo="#newPassword"/>
+					<input id="confirmNewPassword"placeholder="请输入确认密码" name="confirmNewPassword" type="password"  class="layui-input form-control ${empty user.id?'required':''}" value="" maxlength="12" minlength="6" equalTo="#newPassword"/>
 				</div>
 			</div>
-			<div class="layui-item layui-col-sm12 lw7">
+			<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" htmlEscape="false" rows="2" maxlength="200" class="form-control"/>
+					<form:textarea path="remarks" placeholder="请输入备注" htmlEscape="false" rows="2" maxlength="200" class="form-control"/>
 				</div>
 			</div>
 			<c:if test="${not empty user.id}">

src/main/webapp/webpage/modules/sys/userModifyMobo.jsp

@@ -162,14 +162,14 @@
 			<div class="layui-item layui-col-sm12 lw12">
 				<label class="layui-form-label"><span class="require-item">*</span>输入密码：</label>
 				<div class="layui-input-block">
-					<input id="password" name="password" type="password" value="" maxlength="50" minlength="3"  class="form-control  layui-input required"/>
+					<input id="password" name="password" placeholder="请输入密码" type="password" value="" maxlength="50" minlength="3"  class="form-control  layui-input required"/>
 					<span id="span" class="help-inline"></span>
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm12 lw12">
 				<label class="layui-form-label"><span class="require-item">*</span>输入新手机号：</label>
 				<div class="layui-input-block">
-					<input id="mobile" name="mobile" type="text" value="" maxlength="11" minlength="11" class="form-control layui-input text-muted required isMobile"/>
+					<input id="mobile" name="mobile" type="text" placeholder="请输入手机号" value="" maxlength="11" minlength="11" class="form-control layui-input text-muted required isMobile"/>
 					<span id="mobileSpan" class="help-inline"></span>
 				</div>
 			</div>
@@ -177,7 +177,7 @@
 				<label class="layui-form-label"><span class="require-item">*</span>输入验证码：</label>
 				<div class="layui-input-block">
 					<div style="width:60%;float: left;">
-					<input id="randomCode" name="randomCode" type="text" value="" maxlength="50" minlength="3" class="form-control required layui-input" />
+					<input id="randomCode" name="randomCode" placeholder="请输入验证码" type="text" value="" maxlength="50" minlength="3" class="form-control required layui-input" />
 
 					</div>
 					<button id="sendPassBtn" class="sendPass" type="button">

src/main/webapp/webpage/modules/sys/userModifyPwd.jsp

@@ -76,20 +76,20 @@
                 <div class="layui-item layui-col-sm12">
                     <label class="layui-form-label"><span class="require-item">*</span>旧密码：</label>
                     <div class="layui-input-block">
-                        <input id="oldPassword" name="oldPassword" type="password" value="" maxlength="50" minlength="3"  class="form-control layui-input required"/>
+                        <input id="oldPassword" placeholder="请输入旧密码" name="oldPassword" type="password" value="" maxlength="50" minlength="3"  class="form-control layui-input required"/>
                         <span id="span" class="help-inline"></span>
                     </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 id="newPassword" name="newPassword" type="password" value="" maxlength="12" class="form-control layui-input required"/>
+						<input id="newPassword" placeholder="请输入新密码"  name="newPassword" type="password" value="" maxlength="12" 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 id="confirmNewPassword" name="confirmNewPassword" type="password" value="" maxlength="12" class="form-control layui-input required" equalTo="#newPassword"/>
+						<input id="confirmNewPassword" placeholder="请输入确认密码"  name="confirmNewPassword" type="password" value="" maxlength="12" class="form-control layui-input required" equalTo="#newPassword"/>
 					</div>
 				</div>
 

src/main/webapp/webpage/modules/workContractBorrow/workContractBorrowForm.jsp

@@ -110,13 +110,13 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label double-line"><span class="require-item">*</span>借用日期：</label>
 					<div class="layui-input-block">
-						<input id="borrowDate" name="borrowDate"  htmlEscape="false" readonly="readonly" class="laydate-icondate required form-control layer-date  layui-input laydate-icon" value="<fmt:formatDate value="${workContractBorrow.borrowDate}" pattern="yyyy-MM-dd"/>"/>
+						<input id="borrowDate" name="borrowDate" placeholder="请选择借用日期" style="background-color: #fff" htmlEscape="false" readonly="readonly" class="laydate-icondate required form-control layer-date  layui-input laydate-icon" value="<fmt:formatDate value="${workContractBorrow.borrowDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label double-line"><span class="require-item">*</span>大概归还日期：</label>
 					<div class="layui-input-block">
-						<input id="aboutGiveDate" name="aboutGiveDate"  htmlEscape="false" readonly="readonly" class="laydate-icondate required form-control layer-date  layui-input laydate-icon" value="<fmt:formatDate value="${workContractBorrow.aboutGiveDate}" pattern="yyyy-MM-dd"/>"/>
+						<input id="aboutGiveDate" name="aboutGiveDate" placeholder="请选择归还日期" style="background-color: #fff" htmlEscape="false" readonly="readonly" class="laydate-icondate required form-control layer-date  layui-input laydate-icon" value="<fmt:formatDate value="${workContractBorrow.aboutGiveDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
 				</div>
 				<%--<div class="layui-item layui-col-sm6">
@@ -128,7 +128,7 @@
 				<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="255" class="form-control "/>
+						<form:textarea placeholder="请输入备注" path="remarks" htmlEscape="false" rows="4" maxlength="255" class="form-control "/>
 					</div>
 				</div>
 			</div>

src/main/webapp/webpage/modules/workReimbursementType/reimbursementTypeForm.jsp

@@ -80,7 +80,7 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label double-line"><span class="require-item">*</span>报销内容名称：</label>
 					<div class="layui-input-block">
-						<form:input path="standardDetail" htmlEscape="false" class="form-control layui-input required"/>
+						<form:input path="standardDetail" placeholder="请输入报销内容名称" htmlEscape="false" class="form-control layui-input required"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/workclientinfo/workClientInfoForm.jsp

@@ -8,6 +8,8 @@
 <head>
 	<title>客户信息管理</title>
 	<meta name="decorator" content="default"/>
+    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
     <script src="${ctxStatic}/layer-v2.3/layui/xmSelect.js" charset="utf-8"></script>
     <%--<style type="text/css">--%>
         <%--.btn-file{--%>
@@ -74,6 +76,22 @@
 		  return false;
 		}
 		$(document).ready(function() {
+            layui.use(['form', 'layer'], function () {
+                var form = layui.form;
+                //单选监听器
+                layui.form.on('radio(hasUscc)', function(data){
+                    var span=data.value;
+                    if("2"==span){
+                        $(".companyType_uscCode").hide();
+                        /*$('input[name="uscCode"]').attr("class","form-control");*/
+                        $('input[name="uscCode"]').val("");
+                    }else {
+                        $(".companyType_uscCode").show();
+                        /*$('input[name="uscCode"]').attr("class","form-control required isUscCode layui-input");*/
+                    }
+                });
+
+            });
             contentDetailTypeShow();
             checkContentKeyUp('unitIntroduction',500);
             $.validator.messages["orUnicode"] = true;
@@ -448,7 +466,7 @@
         <input type="hidden" value="${param.param}" id="param">
         <form:form id="inputForm" modelAttribute="workClientInfo" enctype="multipart/form-data"
                    onkeydown="if(event.keyCode==13)return false;" action="${ctx}/workclientinfo/workClientInfo/save"
-                   method="post" class="form-horizontal">
+                   method="post" class="form-horizontal layui-form">
             <form:hidden path="id"/>
             <form:hidden path="jobTypeShow"/>
             <input type="hidden" id="jobTypeStr" name="jobTypeStr" value="">
@@ -457,7 +475,7 @@
                 <div class="layui-item layui-col-sm6 lw7" id="search">
                     <label class="layui-form-label"><span class="require-item">*</span>客户名称：&nbsp;&nbsp;</label>
                     <div class="layui-input-block">
-                        <form:input path="name" htmlEscape="false" id="name" class="form-control required layui-input"/>
+                        <form:input path="name" placeholder="请输入客户名称" htmlEscape="false" id="name" class="form-control required layui-input"/>
                         <a onclick="fuzzyQuery()"  class="nav-btn nav-btn-add" style="margin-right: 0px;top:0px;right:1px;position: absolute;height:40px;line-height: 40px;">查询</a>
                         <span id="ph" style="color:#cc5965"></span>
                     </div>
@@ -468,15 +486,15 @@
                 <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">&nbsp;&nbsp;
-                        <form:radiobutton id="hasUscc" class="usccClass i-checks" path="hasUscc" value="1" label="是" checked="true" />
+                        <form:radiobutton id="hasUscc" class="usccClass" name="usccClass" path="hasUscc" lay-filter="hasUscc" value="1" label="是" checked="true" />
                         &nbsp;&nbsp;
-                        <form:radiobutton id="hasUscc" class="usccClass i-checks" path="hasUscc" value="2" label="否" />
-                    </div>
+                        <form:radiobutton id="hasUscc" class="usccClass" name="usccClass" path="hasUscc" lay-filter="hasUscc" value="2" label="否" />
+                        </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7 companyType_uscCode">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>统一社会信用代码：</label>
                     <div class="layui-input-block">
-                        <form:input path="uscCode" htmlEscape="false" id="uscCode"   class="form-control required isUscCode layui-input"/>
+                        <form:input path="uscCode" placeholder="请输入统一社会信用代码" htmlEscape="false" id="uscCode"   class="form-control required isUscCode layui-input"/>
                         <input type="hidden" id="oldUscCode" value="${workClientInfo.uscCode}"/>
                         <span id="uscPh" style="color:#cc5965"></span>
                     </div>
@@ -518,33 +536,33 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">法人代表：</label>
                     <div class="layui-input-block">
-                        <form:input path="lawerPresint" id="lawerPresint" htmlEscape="false" class="form-control layui-input"/>
+                        <form:input placeholder="请输入法人代表" path="lawerPresint" id="lawerPresint" htmlEscape="false" 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="zipCode" id="zipCode" htmlEscape="false" minlength="6" maxlength="6"
-                                    class="form-control digits layui-input"/>
+                                    placeholder="请输入邮政编码" class="form-control digits 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="fax"  id="fax" htmlEscape="false" class="form-control isTel layui-input"/>
+                        <form:input path="fax" placeholder="请输入传真"  id="fax" htmlEscape="false" class="form-control isTel 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 path="telephone" id="telephone" htmlEscape="false" maxlength="11"
-                                    class="form-control isTel layui-input required"/>
+                                    placeholder="请输入公司电话" class="form-control isTel layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">公司网址：</label>
                     <div class="layui-input-block">
-                        <form:input path="companyUrl" id="companyUrl" htmlEscape="false" class="form-control isUrl layui-input"/>
+                        <form:input placeholder="请输入公司网址" path="companyUrl" id="companyUrl" htmlEscape="false" class="form-control isUrl layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -552,6 +570,7 @@
                     <div class="layui-input-block with-icon">
                         <sys:treeselect id="area" name="area.id" value="${workClientInfo.area.id}" labelName="area.name"
                                         labelValue="${workClientInfo.area.name}"
+                                        cssStyle="background-color:#fff"
                                         title="区域" url="/sys/area/treeData" cssClass="form-control required layui-input"
                                         allowClear="true" notAllowSelectParent="false"/>
                     </div>
@@ -560,14 +579,14 @@
                 <div class="layui-item layui-col-sm12 lw7">
                     <label class="layui-form-label">注册地址：</label>
                     <div class="layui-input-block">
-                        <form:input path="registerAddress" id="registerAddress" htmlEscape="false"
+                        <form:input path="registerAddress" placeholder="请输入注册地址" id="registerAddress" htmlEscape="false"
                                     class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm12 lw7">
                     <label class="layui-form-label">详细地址：</label>
                     <div class="layui-input-block">
-                        <form:input path="address" id="address" htmlEscape="false" class="form-control layui-input"/>
+                        <form:input path="address" placeholder="请输入详细地址" id="address" htmlEscape="false" class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm12 lw7">
@@ -598,11 +617,11 @@
                                     </td>
 
                                     <td>
-                                        <input id="workClientBankList{{idx}}_ourBank" onblur="testOurBank(this.value)" name="workClientBankList[{{idx}}].ourBank" type="text" value="{{row.ourBank}}"    class="form-control required"/>
+                                        <input placeholder="请输入开户银行" id="workClientBankList{{idx}}_ourBank" onblur="testOurBank(this.value)" name="workClientBankList[{{idx}}].ourBank" type="text" value="{{row.ourBank}}"    class="form-control required"/>
                                     </td>
 
                                     <td>
-                                        <input id="workClientBankList{{idx}}_bankNumber" onblur="testBankNumber(this.value)" name="workClientBankList[{{idx}}].bankNumber" type="text" value="{{row.bankNumber}}"  minlength="16" maxlength="19"  class="form-control required digits "/>
+                                        <input placeholder="请输入开户账号 " id="workClientBankList{{idx}}_bankNumber" onblur="testBankNumber(this.value)" name="workClientBankList[{{idx}}].bankNumber" type="text" value="{{row.bankNumber}}"  minlength="16" maxlength="19"  class="form-control required digits "/>
                                     </td>
 
                                     <td class="text-center op-td" width="10">
@@ -616,7 +635,7 @@
                     <label class="layui-form-label">单位简介：</label>
                     <div class="layui-input-block">
                         <form:textarea path="unitIntroduction" htmlEscape="false" rows="4" maxlength="500"
-                                       onkeyup="checkContentKeyUp('unitIntroduction',500);" class="form-control "/>
+                                       placeholder="请输入单位简介" onkeyup="checkContentKeyUp('unitIntroduction',500);" class="form-control "/>
                     </div>
                     <span id="contentMsg" style="float: right"></span>
                 </div>
@@ -713,20 +732,20 @@
                                    <td><input id="workClientLinkmanList${status.index + 1}_office"
                                               name="workClientLinkmanList[${status.index + 1}].office" type="text"
                                               value="${workClientLinkman.office}" readonly class="form-control "/></td>
-                                   <td><input id="workClientLinkmanList${status.index + 1}_position"
+                                   <td><input  id="workClientLinkmanList${status.index + 1}_position"
                                               name="workClientLinkmanList[${status.index + 1}].position" type="text"
                                               value="${workClientLinkman.position}" readonly class="form-control "/></td>
                                    <td><input id="workClientLinkmanList${status.index + 1}_qq"
                                               name="workClientLinkmanList[${status.index + 1}].qq"
                                               type="text" value="${workClientLinkman.qq}" readonly class="form-control digits"/>
                                    </td>
-                                   <td><input id="workClientLinkmanList${status.index + 1}_linkMobile"
+                                   <td><input  id="workClientLinkmanList${status.index + 1}_linkMobile"
                                               name="workClientLinkmanList[${status.index + 1}].linkMobile" type="text"
                                               value="${workClientLinkman.linkMobile}" readonly class="form-control isPhone"/></td>
-                                   <td><input id="workClientLinkmanList${status.index + 1}_linkPhone"
+                                   <td><input placeholder="请输入联系方式2" id="workClientLinkmanList${status.index + 1}_linkPhone"
                                               name="workClientLinkmanList[${status.index + 1}].linkPhone" type="text"
                                               value="${workClientLinkman.linkPhone}" readonly class="form-control isTel"/></td>
-                                   <td><input id="workClientLinkmanList{{idx}}_email"
+                                   <td><input  id="workClientLinkmanList{{idx}}_email"
                                               name="workClientLinkmanList[${status.index + 1}].email" type="text"
                                               value="${workClientLinkman.email}"
                                               class="form-control email" readonly/></td>
@@ -748,33 +767,33 @@
                 </td>
 
                 <td>
-                    <input id="workClientLinkmanList{{idx}}_name" name="workClientLinkmanList[{{idx}}].name" type="text" value="{{row.name}}"    class="form-control required"/>
+                    <input  placeholder="请输入联系人姓名" id="workClientLinkmanList{{idx}}_name" name="workClientLinkmanList[{{idx}}].name" type="text" value="{{row.name}}"    class="form-control required"/>
                 </td>
                 <td>
-                    <input id="workClientLinkmanList{{idx}}_office" name="workClientLinkmanList[{{idx}}].office" type="text" value="{{row.office}}"    class="form-control "/>
+                    <input placeholder="请输入部门" id="workClientLinkmanList{{idx}}_office" name="workClientLinkmanList[{{idx}}].office" type="text" value="{{row.office}}"    class="form-control "/>
                 </td>
                 <td>
-                    <input id="workClientLinkmanList{{idx}}_position" name="workClientLinkmanList[{{idx}}].position" type="text" value="{{row.position}}"    class="form-control "/>
+                    <input placeholder="请输入职务" id="workClientLinkmanList{{idx}}_position" name="workClientLinkmanList[{{idx}}].position" type="text" value="{{row.position}}"    class="form-control "/>
                 </td>
 
 
                 <td>
-                    <input id="workClientLinkmanList{{idx}}_qq" name="workClientLinkmanList[{{idx}}].qq" type="text" value="{{row.qq}}"    class="form-control digits"/>
+                    <input placeholder="请输入QQ" id="workClientLinkmanList{{idx}}_qq" name="workClientLinkmanList[{{idx}}].qq" type="text" value="{{row.qq}}"    class="form-control digits"/>
                 </td>
 
 
                 <td>
-                    <input id="workClientLinkmanList{{idx}}_linkPhone" name="workClientLinkmanList[{{idx}}].linkPhone" type="text" value="{{row.linkPhone}}"    class="form-control isTel"/>
+                    <input placeholder="请输入联系方式1" id="workClientLinkmanList{{idx}}_linkPhone" name="workClientLinkmanList[{{idx}}].linkPhone" type="text" value="{{row.linkPhone}}"    class="form-control isTel"/>
                 </td>
 
 
                 <td>
-                    <input id="workClientLinkmanList{{idx}}_linkMobile" name="workClientLinkmanList[{{idx}}].linkMobile" type="text" value="{{row.linkMobile}}"    class="form-control isPhone"/>
+                    <input placeholder="请输入联系方式2" id="workClientLinkmanList{{idx}}_linkMobile" name="workClientLinkmanList[{{idx}}].linkMobile" type="text" value="{{row.linkMobile}}"    class="form-control isPhone"/>
                 </td>
 
 
                 <td>
-                    <input id="workClientLinkmanList{{idx}}_email" name="workClientLinkmanList[{{idx}}].email" type="text" value="{{row.email}}"    class="form-control email"/>
+                    <input placeholder="请输入E-mail" id="workClientLinkmanList{{idx}}_email" name="workClientLinkmanList[{{idx}}].email" type="text" value="{{row.email}}"    class="form-control email"/>
                 </td>
 
                 <td class="text-center op-td" >

src/main/webapp/webpage/modules/workclientinfo/workClientTypeForm.jsp

@@ -8,7 +8,8 @@
 <head>
 	<title>客户信息管理</title>
 	<meta name="decorator" content="default"/>
-
+    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
     <script src="${ctxStatic}/layer-v2.3/layui/xmSelect.js" charset="utf-8"></script>
 
     <%--<style type="text/css">--%>
@@ -91,6 +92,22 @@
         }
         //新添代码（end）
 		$(document).ready(function() {
+            layui.use(['form', 'layer'], function () {
+                var form = layui.form;
+                //单选监听器
+                layui.form.on('radio(hasUscc)', function(data){
+                    var span=data.value;
+                    if("2"==span){
+                        $(".companyType_uscCode").hide();
+                        /*$('input[name="uscCode"]').attr("class","form-control");*/
+                        $('input[name="uscCode"]').val("");
+                    }else {
+                        $(".companyType_uscCode").show();
+                        /*$('input[name="uscCode"]').attr("class","form-control required isUscCode layui-input");*/
+                    }
+                });
+
+            });
             contentDetailTypeShow();
             checkContentKeyUp('unitIntroduction',500);
             $.validator.messages["orUnicode"] = true;
@@ -500,7 +517,7 @@
         <input type="hidden" value="${param.param}" id="param">
         <form:form id="inputForm" modelAttribute="workClientInfo" enctype="multipart/form-data"
                    onkeydown="if(event.keyCode==13)return false;" action="${ctx}/workclientinfo/workClientInfo/save"
-                   method="post" class="form-horizontal">
+                   method="post" class="form-horizontal layui-form">
             <form:hidden path="id"/>
             <input type="hidden" id="jobTypeStr" name="jobTypeStr" value="">
             <input type="hidden" id="linkType" name="jobTypeStr" value="${linkType}">
@@ -509,15 +526,15 @@
                 <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">&nbsp;&nbsp;
-                        <form:radiobutton id="hasUscc" class="usccClass i-checks" path="hasUscc" value="1" label="是" checked="true" />
+                        <form:radiobutton id="hasUscc" class="usccClass" name="usccClass" path="hasUscc" lay-filter="hasUscc" value="1" label="是" checked="true" />
                         &nbsp;&nbsp;
-                        <form:radiobutton id="hasUscc" class="usccClass i-checks" path="hasUscc" value="2" label="否" />
+                        <form:radiobutton id="hasUscc" class="usccClass" name="usccClass" path="hasUscc" lay-filter="hasUscc" value="2" label="否" />
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7" id="search">
                     <label class="layui-form-label"><span class="require-item">*</span>客户名称：&nbsp;&nbsp;</label>
                     <div class="layui-input-block">
-                        <form:input path="name" htmlEscape="false" id="name" class="form-control required layui-input"/>
+                        <form:input path="name" placeholder="请输入客户名称" htmlEscape="false" id="name" class="form-control required layui-input"/>
                         <a onclick="fuzzyQuery()"  class="nav-btn nav-btn-add" style="margin-right: 0px;top:0px;right:1px;position: absolute;height:40px;line-height: 40px;">查询</a>
                         <span id="ph" style="color:#cc5965"></span>
                     </div>
@@ -545,7 +562,7 @@
                 <div class="layui-item layui-col-sm6 lw7 companyType_uscCode">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>统一社会信用代码：</label>
                     <div class="layui-input-block">
-                        <form:input path="uscCode" htmlEscape="false" id="uscCode" class="form-control required isUscCode layui-input"/>
+                        <form:input path="uscCode" placeholder="请输入统一社会信用代码" htmlEscape="false" id="uscCode" class="form-control required isUscCode layui-input"/>
                         <input type="hidden" id="oldUscCode" value="${workClientInfo.uscCode}"/>
                         <span id="uscPh" style="color:#cc5965"></span>
                     </div>
@@ -564,6 +581,7 @@
                     <div class="layui-input-block with-icon">
                         <sys:treeselect id="area" name="area.id" value="${workClientInfo.area.id}" labelName="area.name"
                                         labelValue="${workClientInfo.area.name}"
+                                        cssStyle="background-color:#fff"
                                         title="区域" url="/sys/area/treeData" cssClass="form-control required layui-input"
                                         allowClear="true" notAllowSelectParent="false"/>
                     </div>
@@ -571,20 +589,20 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">法人代表：</label>
                     <div class="layui-input-block">
-                        <form:input path="lawerPresint" id="lawerPresint" htmlEscape="false" class="form-control layui-input"/>
+                        <form:input placeholder="请输入法人代表" path="lawerPresint" id="lawerPresint" htmlEscape="false" 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="zipCode" id="zipCode" htmlEscape="false" minlength="6" maxlength="6"
+                        <form:input placeholder="请输入邮政编码" path="zipCode" id="zipCode" htmlEscape="false" minlength="6" maxlength="6"
                                     class="form-control digits 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="fax"  id="fax" htmlEscape="false" class="form-control isTel layui-input"/>
+                        <form:input placeholder="请输入传真" path="fax"  id="fax" htmlEscape="false" class="form-control isTel layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -599,14 +617,14 @@
                 <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="telephone" id="telephone" htmlEscape="false"
+                        <form:input placeholder="请输入公司电话" path="telephone" id="telephone" htmlEscape="false"
                                     class="form-control isTel  required 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="companyUrl" id="companyUrl" htmlEscape="false" class="form-control isUrl layui-input"/>
+                        <form:input placeholder="请输入公司网址" path="companyUrl" id="companyUrl" htmlEscape="false" class="form-control isUrl layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -619,14 +637,14 @@
                 <div class="layui-item layui-col-sm12 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>注册地址：</label>
                     <div class="layui-input-block">
-                        <form:input path="registerAddress" id="registerAddress" htmlEscape="false"
+                        <form:input path="registerAddress" id="registerAddress" htmlEscape="false" placeholder="请输入注册地址"
                                     class="form-control required layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm12 lw7">
                     <label class="layui-form-label">详细地址：</label>
                     <div class="layui-input-block">
-                        <form:input path="address" id="address" htmlEscape="false" class="form-control layui-input"/>
+                        <form:input path="address" placeholder="请输入详细地址" id="address" htmlEscape="false" class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm12 lw7">
@@ -657,11 +675,11 @@
                                     </td>
 
                                     <td>
-                                        <input id="workClientBankList{{idx}}_ourBank" onblur="testOurBank(this.value)" name="workClientBankList[{{idx}}].ourBank" type="text" value="{{row.ourBank}}"    class="form-control required"/>
+                                        <input placeholder="请输入开户银行" id="workClientBankList{{idx}}_ourBank" onblur="testOurBank(this.value)" name="workClientBankList[{{idx}}].ourBank" type="text" value="{{row.ourBank}}"    class="form-control required"/>
                                     </td>
 
                                     <td>
-                                        <input id="workClientBankList{{idx}}_bankNumber" onblur="testBankNumber(this.value)" name="workClientBankList[{{idx}}].bankNumber" type="text" value="{{row.bankNumber}}"  minlength="16" maxlength="19"  class="form-control required digits "/>
+                                        <input placeholder="请输入开户账号" id="workClientBankList{{idx}}_bankNumber" onblur="testBankNumber(this.value)" name="workClientBankList[{{idx}}].bankNumber" type="text" value="{{row.bankNumber}}"  minlength="16" maxlength="19"  class="form-control required digits "/>
                                     </td>
 
                                     <td class="text-center op-td" width="10">
@@ -674,7 +692,7 @@
                 <div class="layui-item layui-col-sm12 lw7">
                     <label class="layui-form-label">单位简介：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="unitIntroduction" htmlEscape="false" rows="4" maxlength="500"
+                        <form:textarea placeholder="请输入单位简介" path="unitIntroduction" htmlEscape="false" rows="4" maxlength="500"
                                        onkeyup="checkContentKeyUp('unitIntroduction',500);" class="form-control "/>
                     </div>
                     <span id="contentMsg" style="float: right"></span>
@@ -810,33 +828,33 @@
                 </td>
 
                 <td>
-                    <input id="workClientLinkmanList{{idx}}_name" name="workClientLinkmanList[{{idx}}].name" type="text" value="{{row.name}}"    class="form-control required"/>
+                    <input placeholder="请输入联系人姓名" id="workClientLinkmanList{{idx}}_name" name="workClientLinkmanList[{{idx}}].name" type="text" value="{{row.name}}"    class="form-control required"/>
                 </td>
                 <td>
-                    <input id="workClientLinkmanList{{idx}}_office" name="workClientLinkmanList[{{idx}}].office" type="text" value="{{row.office}}"    class="form-control "/>
+                    <input placeholder="请输入部门" id="workClientLinkmanList{{idx}}_office" name="workClientLinkmanList[{{idx}}].office" type="text" value="{{row.office}}"    class="form-control "/>
                 </td>
                 <td>
-                    <input id="workClientLinkmanList{{idx}}_position" name="workClientLinkmanList[{{idx}}].position" type="text" value="{{row.position}}"    class="form-control "/>
+                    <input placeholder="请输入职务" id="workClientLinkmanList{{idx}}_position" name="workClientLinkmanList[{{idx}}].position" type="text" value="{{row.position}}"    class="form-control "/>
                 </td>
 
 
                 <td>
-                    <input id="workClientLinkmanList{{idx}}_qq" name="workClientLinkmanList[{{idx}}].qq" type="text" value="{{row.qq}}"    class="form-control digits"/>
+                    <input placeholder="请输入QQ" id="workClientLinkmanList{{idx}}_qq" name="workClientLinkmanList[{{idx}}].qq" type="text" value="{{row.qq}}"    class="form-control digits"/>
                 </td>
 
 
                 <td>
-                    <input id="workClientLinkmanList{{idx}}_linkPhone" name="workClientLinkmanList[{{idx}}].linkPhone" type="text" value="{{row.linkPhone}}"    class="form-control isTel"/>
+                    <input placeholder="请输入联系方式1" id="workClientLinkmanList{{idx}}_linkPhone" name="workClientLinkmanList[{{idx}}].linkPhone" type="text" value="{{row.linkPhone}}"    class="form-control isTel"/>
                 </td>
 
 
                 <td>
-                    <input id="workClientLinkmanList{{idx}}_linkMobile" name="workClientLinkmanList[{{idx}}].linkMobile" type="text" value="{{row.linkMobile}}"    class="form-control isPhone"/>
+                    <input placeholder="请输入联系方式2" id="workClientLinkmanList{{idx}}_linkMobile" name="workClientLinkmanList[{{idx}}].linkMobile" type="text" value="{{row.linkMobile}}"    class="form-control isPhone"/>
                 </td>
 
 
                 <td>
-                    <input id="workClientLinkmanList{{idx}}_email" name="workClientLinkmanList[{{idx}}].email" type="text" value="{{row.email}}"    class="form-control email"/>
+                    <input placeholder="请输入E-mail" id="workClientLinkmanList{{idx}}_email" name="workClientLinkmanList[{{idx}}].email" type="text" value="{{row.email}}"    class="form-control email"/>
                 </td>
 
                 <td class="text-center op-td" >

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoFormAdd.jsp

@@ -610,7 +610,7 @@
 								<label class="layui-form-label"><span class="require-item">*</span>客户名称：</label>
 								<div class="layui-input-block with-icon" <%--style="margin-right:95px;"--%>>
 									<sys:gridselectclien1 url="${ctx}/workcontractinfo/workContractInfo/selectclientAhref" id="client" name="client.id"  value="${workContractInfo.client.id}"  title="选择客户" labelName="client.name"
-														  labelValue="${workContractInfo.client.name}" cssClass="form-control layui-input required" fieldLabels="客户名称" fieldKeys="name" searchLabel="客户名称" searchKey="name" searchLabel1="联系人" searchKey1="workLinkName"></sys:gridselectclien1>
+													cssStyle="background-color:#fff" labelValue="${workContractInfo.client.name}" cssClass="form-control layui-input required" fieldLabels="客户名称" fieldKeys="name" searchLabel="客户名称" searchKey="name" searchLabel1="联系人" searchKey1="workLinkName"></sys:gridselectclien1>
 
 								</div>
 								<%--<a href="javascript:void(0)" onclick="openBill('新增客户管理', '${ctx}/workclientinfo/workClientInfo/form?param=2','90%','90%',false,'inputForm')" class="nav-btn nav-btn-add" style="margin-right: 0px;top:0px;right:16px;position: absolute;height:40px;line-height: 40px;"><i class="fa fa-plus"></i> 新增</a>--%>
@@ -618,25 +618,25 @@
 							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label"><span class="require-item">*</span>合同名称：</label>
 								<div class="layui-input-block">
-									<form:input path="name" htmlEscape="false"    class="form-control required layui-input"/>
+									<form:input path="name" htmlEscape="false" placeholder="请输入合同名称"   class="form-control required layui-input"/>
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label"><span class="require-item">*</span>签订日期：</label>
 								<div class="layui-input-block">
-									<input class="laydate-icondate layui-input form-control layer-date laydate-icon required" readonly="readonly" id="contractDate" name="contractDate" value="<fmt:formatDate value="${workContractInfo.contractDate}" pattern="yyyy-MM-dd"/>">
+									<input placeholder="请选择签订日期" style="background-color: #fff" class="laydate-icondate layui-input form-control layer-date laydate-icon required" readonly="readonly" id="contractDate" name="contractDate" value="<fmt:formatDate value="${workContractInfo.contractDate}" pattern="yyyy-MM-dd"/>">
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label">合同生效日期：</label>
 								<div class="layui-input-block">
-									<input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="effectiveDate" name="effectiveDate" value="<fmt:formatDate value="${workContractInfo.effectiveDate}" pattern="yyyy-MM-dd"/>">
+									<input placeholder="请选择合同生效日期" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="effectiveDate" name="effectiveDate" value="<fmt:formatDate value="${workContractInfo.effectiveDate}" pattern="yyyy-MM-dd"/>">
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label">合同终止日期：</label>
 								<div class="layui-input-block">
-									<input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="closingDate" name="closingDate" value="<fmt:formatDate value="${workContractInfo.closingDate}" pattern="yyyy-MM-dd"/>">
+									<input placeholder="请输入合同终止日期" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="closingDate" name="closingDate" value="<fmt:formatDate value="${workContractInfo.closingDate}" pattern="yyyy-MM-dd"/>">
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6 ">
@@ -649,15 +649,15 @@
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label double-line"><span class="require-item">*</span>合同金额 (元)预计金额：</label>
+								<label class="layui-form-label double-line"><span class="require-item">*</span>合同金额 (元)<br/>预计金额：</label>
 								<div class="layui-input-block">
-									<form:input path="contractPrice" htmlEscape="false"     pattern="#.00" class="form-control required number  layui-input"/>
+									<form:input path="contractPrice" htmlEscape="false"  placeholder="请输入合同金额/预计金额"   pattern="#.00" class="form-control required number  layui-input"/>
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label">对方合同编号：</label>
 								<div class="layui-input-block">
-									<form:input path="anotherContractNum" htmlEscape="false" class="form-control layui-input"/>
+									<form:input path="anotherContractNum" placeholder="请输入对方合同编号" htmlEscape="false" class="form-control layui-input"/>
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm12">
@@ -672,19 +672,19 @@
 							<div class="layui-item layui-col-sm12">
 								<label class="layui-form-label "><!--其他详情：--></label>
 								<div class="layui-input-block">
-									<form:input path="otherDetails" id="otherDetails" htmlEscape="false" maxlength="255" class="form-control layui-input"/>
+									<form:input placeholder="请选择收费标准" path="otherDetails" id="otherDetails" htmlEscape="false" maxlength="255" 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="contractSpecial" htmlEscape="false" rows="4" maxlength="1000"   class="form-control "/>
+									<form:textarea placeholder="请输入合同特别条款" path="contractSpecial" htmlEscape="false" rows="4" maxlength="1000"   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="remarks" id="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+									<form:textarea path="remarks" placeholder="请输入备注" id="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
 								</div>
 							</div>
 						</div>

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoFormEdit.jsp

@@ -567,25 +567,25 @@
 						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label"><span class="require-item">*</span>合同名称：</label>
 							<div class="layui-input-block">
-								<form:input path="name" htmlEscape="false"    class="form-control required layui-input"/>
+								<form:input path="name" htmlEscape="false" placeholder="请输入客户名称"   class="form-control required layui-input"/>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label"><span class="require-item">*</span>签订日期：</label>
 							<div class="layui-input-block">
-								<input class="laydate-icondate layui-input form-control layer-date laydate-icon required" readonly="readonly" id="contractDate" name="contractDate" value="<fmt:formatDate value="${workContractInfo.contractDate}" pattern="yyyy-MM-dd"/>">
+								<input placeholder="请选择签订日期" style="background-color: #fff" class="laydate-icondate layui-input form-control layer-date laydate-icon required" readonly="readonly" id="contractDate" name="contractDate" value="<fmt:formatDate value="${workContractInfo.contractDate}" pattern="yyyy-MM-dd"/>">
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label">合同生效日期：</label>
 							<div class="layui-input-block">
-								<input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="effectiveDate" name="effectiveDate" value="<fmt:formatDate value="${workContractInfo.effectiveDate}" pattern="yyyy-MM-dd"/>">
+								<input placeholder="请选择合同生效日期" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="effectiveDate" name="effectiveDate" value="<fmt:formatDate value="${workContractInfo.effectiveDate}" pattern="yyyy-MM-dd"/>">
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label">合同终止日期：</label>
 							<div class="layui-input-block">
-								<input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="closingDate" name="closingDate" value="<fmt:formatDate value="${workContractInfo.closingDate}" pattern="yyyy-MM-dd"/>">
+								<input placeholder="请选择合同终止日期" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="closingDate" name="closingDate" value="<fmt:formatDate value="${workContractInfo.closingDate}" pattern="yyyy-MM-dd"/>">
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6 ">
@@ -600,13 +600,13 @@
 						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label double-line"><span class="require-item">*</span>合同金额(元)预计金额：</label>
 							<div class="layui-input-block">
-								<form:input path="contractPrice" htmlEscape="false"     pattern="#.00" class="form-control required number  layui-input"/>
+								<form:input placeholder="请输入合同金额" path="contractPrice" htmlEscape="false"     pattern="#.00" class="form-control required number  layui-input"/>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label">对方合同编号：</label>
 							<div class="layui-input-block">
-								<form:input path="anotherContractNum" htmlEscape="false" class="form-control layui-input"/>
+								<form:input placeholder="请输入对方合同编号" path="anotherContractNum" htmlEscape="false" class="form-control layui-input"/>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm12">
@@ -619,19 +619,19 @@
 						<div class="layui-item layui-col-sm12">
 							<label class="layui-form-label "><!--其他详情：--></label>
 							<div class="layui-input-block">
-								<form:input path="otherDetails" id="otherDetails" htmlEscape="false" maxlength="255" class="form-control layui-input"/>
+								<form:input placeholder="请选择收费标准" path="otherDetails" id="otherDetails" htmlEscape="false" maxlength="255" 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="contractSpecial" htmlEscape="false" rows="4"  maxlength="1000"  class="form-control "/>
+								<form:textarea placeholder="请输入合同特别条款" path="contractSpecial" htmlEscape="false" rows="4"  maxlength="1000"  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="remarks" id="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+								<form:textarea placeholder="请输入备注" path="remarks" id="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
 							</div>
 						</div>
 					</div>

src/main/webapp/webpage/modules/workcontractrecord/workContractRecordAudit.jsp

@@ -158,19 +158,19 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>案卷号：</label>
 					<div class="layui-input-block">
-						<form:input path="fileNum" htmlEscape="false" class="form-control layui-input"/>
+						<form:input path="fileNum" placeholder="请输入案卷号" htmlEscape="false" class="form-control layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label double-line"><span class="require-item">*</span>确认案卷号：</label>
 					<div class="layui-input-block">
-						<input id="fileNumTow" name="fileNumTow" type="text"  class="layui-input form-control" equalTo="#fileNum"/>
+						<input id="fileNumTow" placeholder="请输入确认案卷号" name="fileNumTow" type="text"  class="layui-input form-control" equalTo="#fileNum"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12  with-textarea">
 					<label class="layui-form-label">说明：</label>
 					<div class="layui-input-block">
-						<textarea  htmlEscape="false" rows="4" readonly="true"    class="form-control ">${workContractRecord.instruction}</textarea>
+						<textarea placeholder="请输入说明" htmlEscape="false" rows="4" readonly="true"    class="form-control ">${workContractRecord.instruction}</textarea>
 					</div>
 				</div>
 			</div>

src/main/webapp/webpage/modules/workcontractrecord/workContractRecordForm.jsp

@@ -150,7 +150,7 @@
 				<div class="layui-item layui-col-sm12  with-textarea">
 					<label class="layui-form-label">说明：</label>
 					<div class="layui-input-block">
-						<form:textarea path="instruction" htmlEscape="false" rows="4"    class="form-control "/>
+						<form:textarea placeholder="请输入说明" path="instruction" htmlEscape="false" rows="4"    class="form-control "/>
 					</div>
 				</div>
 			</div>

src/main/webapp/webpage/modules/workcontractrecord/workContractRecordModifyApply.jsp

@@ -157,7 +157,7 @@
 				<div class="layui-item layui-col-sm12  with-textarea">
 					<label class="layui-form-label">说明：</label>
 					<div class="layui-input-block">
-						<form:textarea path="instruction" htmlEscape="false" rows="4"    class="form-control "/>
+						<form:textarea placeholder="请输入说明" path="instruction" htmlEscape="false" rows="4"    class="form-control "/>
 					</div>
 				</div>
 			</div>

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllForm.jsp

@@ -4,6 +4,8 @@
 <head>
 	<title>发票管理</title>
 	<meta name="decorator" content="default"/>
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<%--<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>--%>
 	<style>
 		#contractTypeDoc-error{
@@ -36,6 +38,28 @@
                     $(this).val(temp_amount);
                 }
             })*/
+			layui.use(['form', 'layer'], function () {
+				var form = layui.form;
+				form.on("radio(invoiceType)", function (event) {
+					var radioVal = $(this).val();
+					//专票必填
+					if (radioVal == 1) {
+						$(".invoicetype").show();
+						$("#bank").attr("class", "form-control required layui-input");
+						$("#bankNumber").attr("class", "form-control number required layui-input");
+						$("#orUnicode").attr("class", "form-control isUscCode required layui-input");
+						$("#address").attr("class", "form-control required layui-input");
+						$("#telephone").attr("class", "form-control isTel required layui-input");
+					} else if (radioVal == 2) {
+						$(".invoicetype").hide();
+						$("#bank").attr("class", "form-control layui-input");
+						$("#bankNumber").attr("class", "form-control number layui-input");
+						$("#orUnicode").attr("class", "form-control isUscCode layui-input");
+						$("#address").attr("class", "form-control layui-input");
+						$("#telephone").attr("class", "form-control isTel layui-input");
+					}
+				});
+			});
             jQuery.validator.addMethod("isUscCode", function(value, element) {
                 if (this.optional(element)){
                     return true;
@@ -342,7 +366,7 @@
 <body>
 <div class="single-form">
 	<div class="container">
-		<form:form id="inputForm" modelAttribute="workInvoice" action="${ctx}/workinvoiceAll/workInvoiceAll/save" method="post" class="form-horizontal">
+		<form:form id="inputForm" modelAttribute="workInvoice" action="${ctx}/workinvoiceAll/workInvoiceAll/save" method="post" class="form-horizontal layui-form">
 			<form:hidden path="id"/>
 			<form:hidden path="invoiceDate"/>
 			<form:hidden path="province" id="province"/>
@@ -354,7 +378,7 @@
 					<div class="layui-input-block  with-icon">
 						<input type="hidden" value="" id ="ids">
 						<sys:gridselectcallprojectt url="${ctx}/workinvoiceAll/workInvoiceAll/selectproject" id="project" name="project.id"  value="${workInvoice.project.id}"  title="选择所属项目" labelName="workInvoice.project.projectName"
-													labelValue="${workInvoice.project.projectName}" cssClass="form-control required layui-input" fieldLabels="项目" fieldKeys="projectName" searchLabel="项目名称" searchKey="projectName" ></sys:gridselectcallprojectt>
+												cssStyle="background-color:#fff"	labelValue="${workInvoice.project.projectName}" cssClass="form-control required layui-input" fieldLabels="项目" fieldKeys="projectName" searchLabel="项目名称" searchKey="projectName" ></sys:gridselectcallprojectt>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
@@ -428,48 +452,48 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>发票类型：</label>
 					<div class="layui-input-block">
-						<input type="radio" class="i-checks" name="invoiceType" checked id="invoiceType1" value="1">
-						<label for="invoiceType1">专票</label>
-						<input type="radio" class="i-checks" name="invoiceType" id="invoiceType" value="2">
-						<label for="invoiceType">普票</label>
+						<input type="radio" lay-filter="invoiceType" title="专票" name="invoiceType" checked id="invoiceType1" value="1">
+<%--						<label for="invoiceType1">专票</label>--%>
+						<input type="radio" lay-filter="invoiceType" title="普票" name="invoiceType" id="invoiceType" value="2">
+<%--						<label for="invoiceType">普票</label>--%>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label double-line"><span class="require-item">*</span>实际开票单位：</label>
 					<div class="layui-input-block with-icon">
 						<sys:gridselect url="${ctx}/workinvoiceAll/workInvoiceAll/selectclient" id="client" name="client.id"  value="${workInvoice.client.id}"  title="选择开票单位" labelName="workInvoice.client.name"
-										labelValue="${workInvoice.client.name}" cssClass="form-control required layui-input" fieldLabels="单位" fieldKeys="name" searchLabel="客户名称" searchKey="name" ></sys:gridselect>
+									cssStyle="background:#fff"	labelValue="${workInvoice.client.name}" cssClass="form-control required layui-input" fieldLabels="单位" fieldKeys="name" searchLabel="客户名称" searchKey="name" ></sys:gridselect>
 						</td>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label double-line"><span class="require-item invoicetype">*</span>纳税人识别号：</label>
 					<div class="layui-input-block">
-						<form:input id="orUnicode" path="orUnicode" htmlEscape="false"    class="form-control isUscCode layui-input"/>
+						<form:input id="orUnicode" path="orUnicode" htmlEscape="false" placeholder="请输入纳税人识别号"   class="form-control isUscCode layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item invoicetype">*</span>地址：</label>
 					<div class="layui-input-block">
-						<form:input id="address" path="address" htmlEscape="false"    class="form-control layui-input"/>
+						<form:input id="address" path="address" htmlEscape="false" placeholder="请输入地址"   class="form-control layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item invoicetype">*</span>电话：</label>
 					<div class="layui-input-block">
-						<form:input id="telephone" path="telephone" htmlEscape="false"    class="form-control isTel layui-input"/>
+						<form:input id="telephone" path="telephone" htmlEscape="false" placeholder="请输入电话"   class="form-control isTel layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item invoicetype">*</span>开户银行：</label>
 					<div class="layui-input-block">
-						<form:input id ="bank"  path="bank" htmlEscape="false"   class="form-control layui-input"/>
+						<form:input id ="bank"  path="bank" htmlEscape="false" placeholder="请输入开户银行"  class="form-control layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item invoicetype">*</span>银行账号：</label>
 					<div class="layui-input-block">
-						<form:input id="bankNumber" path="bankNumber" htmlEscape="false"   class="form-control number layui-input"/>
+						<form:input id="bankNumber" path="bankNumber" htmlEscape="false" placeholder="请输入银行账号"  class="form-control number layui-input"/>
 					</div>
 				</div>
 
@@ -494,13 +518,13 @@
 					<label class="layui-form-label double-line"><span class="require-item">*</span>发票金额(元)：</label>
 					<div class="layui-input-block">
 							<%--<form:input id=""  path="money" htmlEscape="false" class="form-control number required layui-input"/>--%>
-						<input name="money" htmlEscape="false"  value="${workInvoice.money}" class="form-control required number layui-input"/>
+						<input name="money" htmlEscape="false" placeholder="请输入发票金额" value="${workInvoice.money}" class="form-control required number layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 with-textarea">
 					<label class="layui-form-label double-line">开票内容要求：</label>
 					<div class="layui-input-block">
-						<form:textarea path="content" id="contractTypeDoc" htmlEscape="false" rows="4"    class="form-control"/>
+						<form:textarea path="content" id="contractTypeDoc" placeholder="请输入开票内容要求" htmlEscape="false" rows="4"    class="form-control"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllReceiptForm.jsp

@@ -4,6 +4,8 @@
 <head>
 	<title>发票管理</title>
 	<meta name="decorator" content="default"/>
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<style>
 		td input{
 			margin-left:0px !important;
@@ -158,14 +160,14 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>项目名称：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.project.projectName}"/>
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true"   class="form-control layui-input" value="${workInvoice.project.projectName}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">发票申请编号：</label>
 					<div class="layui-input-block">
 						<div class="input-group">
-							<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.number}"/>
+							<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true"   class="form-control layui-input" value="${workInvoice.number}"/>
 							<span class="input-group-btn">
 							<label class="form-status"><c:choose><c:when test="${ empty workInvoice.invoiceState}">新添</c:when><c:otherwise>${fns:getDictLabel(workInvoice.invoiceState, 'audit_state','')}</c:otherwise>	</c:choose></label>
 						</span>
@@ -175,25 +177,25 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">合同名称：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.project.workContractInfo.name}"/>
+						<input htmlEscape="false" readonly="true" style="background-color: #f1f1f1"  class="form-control layui-input" value="${workInvoice.project.workContractInfo.name}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">项目编号：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.project.projectId}"/>
+						<input htmlEscape="false" readonly="true" style="background-color: #f1f1f1"  class="form-control layui-input" value="${workInvoice.project.projectId}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">委托方：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.project.workContractInfo.client.name}"/>
+						<input htmlEscape="false" readonly="true" style="background-color: #f1f1f1"  class="form-control layui-input" value="${workInvoice.project.workContractInfo.client.name}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">报告号：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workInvoice.project.reportData.number}"/>
+						<input htmlEscape="false"  readonly="true" style="background-color: #f1f1f1" class="form-control layui-input" value="${workInvoice.project.reportData.number}"/>
 					</div>
 				</div>
 				<%--<div class="layui-item layui-col-sm6">--%>
@@ -214,73 +216,73 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>发票类型：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="<c:choose><c:when test="${workInvoice.invoiceType eq '1'}">专票</c:when><c:when test="${workInvoice.invoiceType eq '2'}">普票</c:when></c:choose>"/>
+						<input htmlEscape="false" readonly="true" style="background-color: #f1f1f1"   class="form-control layui-input" value="<c:choose><c:when test="${workInvoice.invoiceType eq '1'}">专票</c:when><c:when test="${workInvoice.invoiceType eq '2'}">普票</c:when></c:choose>"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>实际开票单位：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.client.name}"/>
+						<input htmlEscape="false" readonly="true" style="background-color: #f1f1f1"  class="form-control layui-input" value="${workInvoice.client.name}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">纳税人识别号：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.orUnicode}"/>
+						<input htmlEscape="false" readonly="true" style="background-color: #f1f1f1"  class="form-control layui-input" value="${workInvoice.orUnicode}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">地址：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.address}"/>
+						<input htmlEscape="false" readonly="true" style="background-color: #f1f1f1"  class="form-control layui-input" value="${workInvoice.address}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">电话：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.telephone}"/>
+						<input htmlEscape="false" readonly="true" style="background-color: #f1f1f1"  class="form-control layui-input" value="${workInvoice.telephone}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">开户银行：</label>
 					<div class="layui-input-block  ">
-						<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.bank}"/>
+						<input htmlEscape="false" readonly="true" style="background-color: #f1f1f1"  class="form-control layui-input" value="${workInvoice.bank}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">银行账号：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.bankNumber}"/>
+						<input htmlEscape="false" readonly="true" style="background-color: #f1f1f1"  class="form-control layui-input" value="${workInvoice.bankNumber}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>开票金额(元)：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false" readonly="true"  id="invoiceMoney" class="form-control layui-input" value="<fmt:formatNumber value="${workInvoice.money}" pattern="#,#00.00"/>"/>
+						<input htmlEscape="false" readonly="true" style="background-color: #f1f1f1" id="invoiceMoney" class="form-control layui-input" value="<fmt:formatNumber value="${workInvoice.money}" pattern="#,#00.00"/>"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">开票内容要求：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.content}"/>
+						<input htmlEscape="false" readonly="true" style="background-color: #f1f1f1"  class="form-control layui-input" value="${workInvoice.content}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">开票人：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.drawerName}"/>
+						<input htmlEscape="false" readonly="true" style="background-color: #f1f1f1"  class="form-control layui-input" value="${workInvoice.drawerName}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">开票时间：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${workInvoice.invoiceDate}" pattern="yyyy-MM-dd"/>"/>
+						<input htmlEscape="false"  readonly="true" style="background-color: #f1f1f1" class="form-control layui-input" value="<fmt:formatDate value="${workInvoice.invoiceDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12">
 					<label class="layui-form-label">领票时间：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${workInvoice.takeDate}" pattern="yyyy-MM-dd"/>"/>
+						<input htmlEscape="false"  readonly="true" style="background-color: #f1f1f1" class="form-control layui-input" value="<fmt:formatDate value="${workInvoice.takeDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
 				</div>
 			</div>
@@ -375,10 +377,10 @@
                                         <input id="workReceiptList{{idx}}_delFlag" name="workReceiptList[{{idx}}].delFlag" type="hidden" value="0"/>
                                     </td>
                                     <td>
-                                        <input id="workReceiptList{{idx}}_companyName" name="workReceiptList[{{idx}}].companyName" value="{{row.companyName}}" style="text-align: center" class="form-control required"/>
+                                        <input id="workReceiptList{{idx}}_companyName" placeholder="请输入汇款单位" name="workReceiptList[{{idx}}].companyName" value="{{row.companyName}}" style="text-align: center" class="form-control required"/>
                                     </td>
                                     <td>
-                                        <input id="workReceiptList{{idx}}_money" name="workReceiptList[{{idx}}].money" value="{{row.money}}" style="text-align: center" class="form-control number required"/>
+                                        <input id="workReceiptList{{idx}}_money" name="workReceiptList[{{idx}}].money" placeholder="请输入汇款金额" value="{{row.money}}" style="text-align: center" class="form-control number required"/>
                                     </td>
 
                                     <td>

src/main/webapp/webpage/modules/workinvoice/workInvoiceAuditEnd.jsp

@@ -556,10 +556,10 @@
 							value="${workInvoice.invoiceDate}" pattern="yyyy-MM-dd"/>">
 				</div>
 			</div>
-			<div class="layui-item layui-col-sm12">
+			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">领票时间：</label>
 				<div class="layui-input-block">
-					<input class="form-control layer-date laydate-icon layui-input laydate-icondate" id="takeDate" name="takeDate" value="<fmt:formatDate
+					<input placeholder="请选择领票时间" class="form-control layer-date laydate-icon layui-input laydate-icondate" id="takeDate" name="takeDate" value="<fmt:formatDate
 							value="${workInvoice.takeDate}" pattern="yyyy-MM-dd"/>">
 				</div>
 			</div>

src/main/webapp/webpage/modules/workinvoice/workInvoiceForm.jsp

@@ -4,6 +4,8 @@
 <head>
 	<title>发票管理</title>
 	<meta name="decorator" content="default"/>
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<%--<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>--%>
 	<style>
 		#contractTypeDoc-error{
@@ -84,28 +86,32 @@
                 }
             });
 
-            $("input[name='invoiceType']").on('ifChecked', function(event){
-                var radioVal = $(this).val();
-                //专票必填
-                if(radioVal == 1){
-                    $(".invoicetype").show();
-                    $("#bank").attr("class","form-control required layui-input");
-                    $("#bankNumber").attr("class","form-control number required layui-input");
-                    $("#orUnicode").attr("class","form-control isUscCode required layui-input");
-                    $("#address").attr("class","form-control required layui-input");
-                    $("#telephone").attr("class","form-control isTel required layui-input");
-                }else if(radioVal == 2){
-                    $(".invoicetype").hide();
-                    $("#bank").attr("class","form-control layui-input");
-                    $("#bankNumber").attr("class","form-control number layui-input");
-                    $("#orUnicode").attr("class","form-control isUscCode layui-input");
-                    $("#address").attr("class","form-control layui-input");
-                    $("#telephone").attr("class","form-control isTel layui-input");
-                }
-            });
+
             /*--------------*/
 
         });
+		layui.use(['form', 'layer'], function () {
+			var form = layui.form;
+			form.on("radio(invoiceType)", function(event){
+				var radioVal = $(this).val();
+				//专票必填
+				if(radioVal == 1){
+					$(".invoicetype").show();
+					$("#bank").attr("class","form-control required layui-input");
+					$("#bankNumber").attr("class","form-control number required layui-input");
+					$("#orUnicode").attr("class","form-control isUscCode required layui-input");
+					$("#address").attr("class","form-control required layui-input");
+					$("#telephone").attr("class","form-control isTel required layui-input");
+				}else if(radioVal == 2){
+					$(".invoicetype").hide();
+					$("#bank").attr("class","form-control layui-input");
+					$("#bankNumber").attr("class","form-control number layui-input");
+					$("#orUnicode").attr("class","form-control isUscCode layui-input");
+					$("#address").attr("class","form-control layui-input");
+					$("#telephone").attr("class","form-control isTel layui-input");
+				}
+			});
+		});
         function setValuee(obj){
             $.ajax({
                 type:'post',
@@ -152,8 +158,8 @@
                     $("#officeName").val(d.officeName);
                     $("#officeId").val(d.officeId);
 					$("#prdNumber").val(d.prdNumber);
+				})
                 }
-            })
         }
 
         function addRow(list, idx, tpl, row){
@@ -342,7 +348,7 @@
 <body>
 <div class="single-form">
 	<div class="container">
-		<form:form id="inputForm" modelAttribute="workInvoice" action="${ctx}/workinvoice/workInvoice/save" method="post" class="form-horizontal">
+		<form:form id="inputForm" modelAttribute="workInvoice" action="${ctx}/workinvoice/workInvoice/save" method="post" class="layui-form">
 			<form:hidden path="id"/>
 			<form:hidden path="invoiceDate"/>
 			<form:hidden path="province" id="province"/>
@@ -428,10 +434,10 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>发票类型：</label>
 					<div class="layui-input-block">
-						<input type="radio" class="i-checks" name="invoiceType" checked id="invoiceType1" value="1">
-						<label for="invoiceType1">专票</label>
-						<input type="radio" class="i-checks" name="invoiceType" id="invoiceType" value="2">
-						<label for="invoiceType">普票</label>
+						<input type="radio" name="invoiceType" lay-filter="invoiceType" title="专票" checked id="invoiceType1" value="1">
+<%--						<label for="invoiceType1">专票</label>--%>
+						<input type="radio" name="invoiceType" lay-filter="invoiceType" title="普票" id="invoiceType" value="2">
+<%--						<label for="invoiceType">普票</label>--%>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
@@ -445,31 +451,31 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label double-line"><span class="require-item invoicetype">*</span>纳税人识别号：</label>
 					<div class="layui-input-block">
-						<form:input id="orUnicode" path="orUnicode" htmlEscape="false"    class="form-control isUscCode layui-input"/>
+						<form:input id="orUnicode" path="orUnicode" htmlEscape="false" placeholder="请输入纳税人识别号"   class="form-control isUscCode layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item invoicetype">*</span>地址：</label>
 					<div class="layui-input-block">
-						<form:input id="address" path="address" htmlEscape="false"    class="form-control layui-input"/>
+						<form:input id="address" path="address" htmlEscape="false"  placeholder="请输入地址"  class="form-control layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item invoicetype">*</span>电话：</label>
 					<div class="layui-input-block">
-						<form:input id="telephone" path="telephone" htmlEscape="false"    class="form-control isTel layui-input"/>
+						<form:input id="telephone" path="telephone" htmlEscape="false"  placeholder="请输入电话"  class="form-control isTel layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item invoicetype">*</span>开户银行：</label>
 					<div class="layui-input-block">
-						<form:input id ="bank"  path="bank" htmlEscape="false"   class="form-control layui-input"/>
+						<form:input id ="bank"  path="bank" htmlEscape="false" placeholder="请输入开户银行"  class="form-control layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item invoicetype">*</span>银行账号：</label>
 					<div class="layui-input-block">
-						<form:input id="bankNumber" path="bankNumber" htmlEscape="false"   class="form-control number layui-input"/>
+						<form:input id="bankNumber" path="bankNumber" htmlEscape="false" placeholder="请输入银行账号"  class="form-control number layui-input"/>
 					</div>
 				</div>
 
@@ -494,13 +500,13 @@
 					<label class="layui-form-label double-line"><span class="require-item">*</span>发票金额(元)：</label>
 					<div class="layui-input-block">
 							<%--<form:input id=""  path="money" htmlEscape="false" class="form-control number required layui-input"/>--%>
-						<input name="money" htmlEscape="false"  value="${workInvoice.money}" class="form-control required number layui-input"/>
+						<input name="money" htmlEscape="false" placeholder="请输入发票金额" value="${workInvoice.money}" class="form-control required number layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 with-textarea">
 					<label class="layui-form-label double-line">开票内容要求：</label>
 					<div class="layui-input-block">
-						<form:textarea path="content" id="contractTypeDoc" htmlEscape="false" rows="4"    class="form-control"/>
+						<form:textarea path="content" id="contractTypeDoc" placeholder="请输入开票内容要求" htmlEscape="false" rows="4"    class="form-control"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/workinvoice/workInvoiceModify.jsp

@@ -4,6 +4,8 @@
 <head>
 	<title>发票管理</title>
 	<meta name="decorator" content="default"/>
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<script type="text/javascript">
         var validateForm;
         function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
@@ -22,6 +24,28 @@
             return false;
         }
         $(document).ready(function() {
+			layui.use(['form', 'layer'], function () {
+				var form = layui.form;
+				form.on("radio(invoiceType)", function(event){
+					var radioVal = $(this).val();
+					//专票必填
+					if(radioVal == 1){
+						$(".invoicetype").show();
+						$("#bank").attr("class","form-control required layui-input");
+						$("#bankNumber").attr("class","form-control number required layui-input");
+						$("#orUnicode").attr("class","form-control isUscCode required layui-input");
+						$("#address").attr("class","form-control required layui-input");
+						$("#telephone").attr("class","form-control isTel required layui-input");
+					}else if(radioVal == 2){
+						$(".invoicetype").hide();
+						$("#bank").attr("class","form-control layui-input");
+						$("#bankNumber").attr("class","form-control number layui-input");
+						$("#orUnicode").attr("class","form-control isUscCode layui-input");
+						$("#address").attr("class","form-control layui-input");
+						$("#telephone").attr("class","form-control isTel layui-input");
+					}
+				});
+			});
             /*$('#money').keyup(function(){
                 var c=$(this);
                 if(/[^\d]/.test(c.val())){//替换非数字字符
@@ -77,25 +101,25 @@
                 }
             });
 
-            $("input[name='invoiceType']").on('ifChecked', function(event){
-                var radioVal = $(this).val();
-                //专票必填
-                if(radioVal == 1){
-                    $(".invoicetype").show();
-                    $("#bank").attr("class","form-control required layui-input");
-                    $("#bankNumber").attr("class","form-control number required layui-input");
-                    $("#orUnicode").attr("class","form-control isUscCode required layui-input");
-                    $("#address").attr("class","form-control required layui-input");
-                    $("#telephone").attr("class","form-control isTel required layui-input");
-                }else if(radioVal == 2){
-                    $(".invoicetype").hide();
-                    $("#bank").attr("class","form-control layui-input");
-                    $("#bankNumber").attr("class","form-control number layui-input");
-                    $("#orUnicode").attr("class","form-control isUscCode layui-input");
-                    $("#address").attr("class","form-control layui-input");
-                    $("#telephone").attr("class","form-control isTel layui-input");
-                }
-            });
+            // $("input[name='invoiceType']").on('ifChecked', function(event){
+            //     var radioVal = $(this).val();
+            //     //专票必填
+            //     if(radioVal == 1){
+            //         $(".invoicetype").show();
+            //         $("#bank").attr("class","form-control required layui-input");
+            //         $("#bankNumber").attr("class","form-control number required layui-input");
+            //         $("#orUnicode").attr("class","form-control isUscCode required layui-input");
+            //         $("#address").attr("class","form-control required layui-input");
+            //         $("#telephone").attr("class","form-control isTel required layui-input");
+            //     }else if(radioVal == 2){
+            //         $(".invoicetype").hide();
+            //         $("#bank").attr("class","form-control layui-input");
+            //         $("#bankNumber").attr("class","form-control number layui-input");
+            //         $("#orUnicode").attr("class","form-control isUscCode layui-input");
+            //         $("#address").attr("class","form-control layui-input");
+            //         $("#telephone").attr("class","form-control isTel layui-input");
+            //     }
+            // });
 
         });
         function setValuee(obj){
@@ -334,7 +358,7 @@
 <body>
 <div class="single-form">
 	<div class="container">
-		<form:form id="inputForm" modelAttribute="workInvoice" action="${ctx}/workinvoice/workInvoice/saveAudit" method="post" class="form-horizontal">
+		<form:form id="inputForm" modelAttribute="workInvoice" action="${ctx}/workinvoice/workInvoice/saveAudit" method="post" class="form-horizontal layui-form">
 			<form:hidden path="id"/>
 			<form:hidden path="invoiceDate"/>
 			<form:hidden path="home"/>
@@ -428,10 +452,10 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>发票类型：</label>
 					<div class="layui-input-block">
-						<input type="radio" class="i-checks" name="invoiceType" checked id="invoiceType1" value="1">
-						<label for="invoiceType1">专票</label>
-						<input type="radio" class="i-checks" name="invoiceType" id="invoiceType" value="2">
-						<label for="invoiceType">普票</label>
+						<input type="radio" lay-filter="invoiceType" title="专票" name="invoiceType" checked id="invoiceType1" value="1">
+<%--						<label for="invoiceType1">专票</label>--%>
+						<input type="radio" lay-filter="invoiceType" title="普票" name="invoiceType" id="invoiceType" value="2">
+<%--						<label for="invoiceType">普票</label>--%>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
@@ -445,43 +469,43 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item invoicetype">*</span>纳税人识别号：</label>
 					<div class="layui-input-block">
-						<form:input id="orUnicode" path="orUnicode" htmlEscape="false"    class="form-control isUscCode layui-input"/>
+						<form:input id="orUnicode" path="orUnicode" placeholder="请输入纳税人识别码" htmlEscape="false"    class="form-control isUscCode layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item invoicetype">*</span>地址：</label>
 					<div class="layui-input-block">
-						<form:input id="address" path="address" htmlEscape="false"    class="form-control layui-input"/>
+						<form:input id="address" path="address" placeholder="请输入地址" htmlEscape="false"    class="form-control layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item invoicetype">*</span>电话：</label>
 					<div class="layui-input-block">
-						<form:input id="telephone" path="telephone" htmlEscape="false"    class="form-control isTel layui-input"/>
+						<form:input id="telephone" path="telephone" placeholder="请输入电话" htmlEscape="false"    class="form-control isTel layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item invoicetype">*</span>开户银行：</label>
 					<div class="layui-input-block">
-						<form:input id ="bank"  path="bank" htmlEscape="false"   class="form-control layui-input"/>
+						<form:input id ="bank"  path="bank" htmlEscape="false" placeholder="请输入开户银行"  class="form-control layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item invoicetype">*</span>银行账号：</label>
 					<div class="layui-input-block">
-						<form:input id="bankNumber" path="bankNumber" htmlEscape="false"   class="form-control number layui-input"/>
+						<form:input id="bankNumber" path="bankNumber" htmlEscape="false" placeholder="请输入银行账号"  class="form-control number 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">
-						<input name="money" htmlEscape="false"  value="<fmt:formatNumber value="${workInvoice.money}" pattern="#.00#"/>" class="form-control required number layui-input"/>
+						<input name="money" htmlEscape="false" placeholder="请输入开票金额"  value="<fmt:formatNumber value="${workInvoice.money}" pattern="#.00#"/>" class="form-control required number 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="content" id="contractTypeDoc" htmlEscape="false" rows="4"    class="form-control"/>
+						<form:textarea path="content" id="contractTypeDoc" placeholder="请输入开票内容" htmlEscape="false" rows="4"    class="form-control"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/workreimbursement/workReimbursementAudit.jsp

@@ -85,14 +85,14 @@
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">报销人：</label>
 				<div class="layui-input-block">
-					<form:input path="submitterName" htmlEscape="false" readonly="true"  id="submitterName"  class="form-control layui-input" value = "${workReimbursement.submitterName}"/>
+					<form:input path="submitterName" cssStyle="background-color: #f1f1f1" htmlEscape="false" readonly="true"  id="submitterName"  class="form-control layui-input" value = "${workReimbursement.submitterName}"/>
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">报销编号：</label>
 				<div class="layui-input-block">
 					<div class="input-group">
-						<input htmlEscape="false"  readonly="true"  class="form-control layui-input" value="${workReimbursement.number}"/>
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true"  class="form-control layui-input" value="${workReimbursement.number}"/>
 						<span class="input-group-btn">
                         <label class="form-status"><c:choose><c:when test="${not empty workReimbursement.status}">${fns:getDictLabel(workReimbursement.status, 'audit_state', '')}</c:when><c:otherwise>新添</c:otherwise></c:choose></label>
                      </span>
@@ -102,7 +102,7 @@
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">所属部门：</label>
 				<div class="layui-input-block">
-					<input htmlEscape="false"  readonly="true" class="form-control layui-input" value = "${workReimbursement.officeName}"/>
+					<input htmlEscape="false" style="background-color: #f1f1f1"  readonly="true" class="form-control layui-input" value = "${workReimbursement.officeName}"/>
 				</div>
 			</div>
 			<%--<div class="layui-item layui-col-sm6">
@@ -172,13 +172,13 @@
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">报销日期：</label>
 				<div class="layui-input-block">
-					<input readonly="readonly" class="form-control layui-input" value="<fmt:formatDate value="${workReimbursement.submitterDate}" pattern="yyyy-MM-dd"/>"/>
+					<input readonly="readonly" style="background-color: #f1f1f1" class="form-control layui-input" value="<fmt:formatDate value="${workReimbursement.submitterDate}" pattern="yyyy-MM-dd"/>"/>
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6 with-textarea">
 				<label class="layui-form-label ">备注：</label>
 				<div class="layui-input-block">
-					<form:textarea path="remarks" htmlEscape="false" rows="4"  maxlength="255" value="${workReimbursement.remarks}"  class="form-control "/>
+					<form:textarea path="remarks" placeholder="请输入备注" htmlEscape="false" rows="4"  maxlength="255" value="${workReimbursement.remarks}"  class="form-control "/>
 				</div>
 			</div>
 		</div>

src/main/webapp/webpage/modules/workreimbursement/workReimbursementFormAdd.jsp

@@ -4,10 +4,15 @@
 <head>
 	<title>报销单管理</title>
 	<meta name="decorator" content="default"/>
+    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<script type="text/javascript">
 		var validateForm;
 		var count = 0;
 		$(document).ready(function() {
+            layui.use(['form', 'layer'], function () {
+                var form = layui.form;
+            })
             if($("#submitterDate").val()==null || $("#submitterDate").val()==''){
                 $("#submitterDate").val(getNowFormatDate());
             }
@@ -499,7 +504,7 @@
 <body>
 <div class="single-form">
 <div class="container">
-    <form:form id="inputForm" modelAttribute="workReimbursement" action="${ctx}/workreimbursement/workReimbursement/save" method="post" class="form-horizontal" >
+    <form:form id="inputForm" modelAttribute="workReimbursement" action="${ctx}/workreimbursement/workReimbursement/save" method="post" class="form-horizontal layui-form" >
         <form:hidden path="id"/>
         <form:hidden path="achivesId"/>
         <form:hidden path="submitterId"/>
@@ -621,13 +626,13 @@
                 <label class="layui-form-label"><span class="require-item">*</span>报销日期：</label>
                 <div class="layui-input-block">
                     <input id="submitterDate" name="submitterDate" type="text" readonly="true" maxlength="20" class="laydate-icondate form-control layer-date required layui-input laydate-icon"
-                           value="<fmt:formatDate value="${submitterDate.submitterDate}" pattern="yyyy-MM-dd"/>"/>
+                           style="background-color: #fff" placeholder="请选择报销日期" value="<fmt:formatDate value="${submitterDate.submitterDate}" pattern="yyyy-MM-dd"/>"/>
                 </div>
             </div>
             <div class="layui-item layui-col-sm6 with-textarea">
                 <label class="layui-form-label ">备注：</label>
                 <div class="layui-input-block">
-                    <form:textarea path="remarks" htmlEscape="false" rows="4"  maxlength="255" value="${workReimbursement.remarks}"  class="form-control "/>
+                    <form:textarea path="remarks" placeholder="请输入内容" htmlEscape="false" rows="4"  maxlength="255" value="${workReimbursement.remarks}"  class="form-control "/>
                 </div>
             </div>
         </div>

src/main/webapp/webpage/modules/workreimbursement/workReimbursementFormDetail.jsp

@@ -80,14 +80,14 @@
         <div class="layui-item layui-col-sm6">
             <label class="layui-form-label"><span class="require-item">*</span>报销人：</label>
             <div class="layui-input-block">
-                <form:input path="submitterName" htmlEscape="false"  id="submitterName"  class="form-control layui-input" value = "${workReimbursement.submitterName}"/>
+                <form:input path="submitterName" readonly="true" cssStyle="background-color: #f1f1f1" htmlEscape="false"  id="submitterName"  class="form-control layui-input" value = "${workReimbursement.submitterName}"/>
             </div>
         </div>
         <div class="layui-item layui-col-sm6">
             <label class="layui-form-label">报销编号：</label>
             <div class="layui-input-block">
                 <div class="input-group">
-                    <input htmlEscape="false"  readonly="true"  class="form-control layui-input" value="${workReimbursement.number}"/>
+                    <input htmlEscape="false"  readonly="true" style="background-color: #f1f1f1"  class="form-control layui-input" value="${workReimbursement.number}"/>
                     <span class="input-group-btn">
                         <label class="form-status"><c:choose><c:when test="${not empty workReimbursement.status}">${fns:getDictLabel(workReimbursement.status, 'audit_state', '')}</c:when><c:otherwise>新添</c:otherwise></c:choose></label>
                      </span>
@@ -97,7 +97,7 @@
         <div class="layui-item layui-col-sm6">
             <label class="layui-form-label">所属部门：</label>
             <div class="layui-input-block">
-                <input htmlEscape="false"  readonly="true" class="form-control layui-input" value = "${workReimbursement.officeName}"/>
+                <input htmlEscape="false" style="background-color: #f1f1f1"  readonly="true" class="form-control layui-input" value = "${workReimbursement.officeName}"/>
             </div>
         </div>
         <%--<div class="layui-item layui-col-sm6">
@@ -167,13 +167,13 @@
         <div class="layui-item layui-col-sm6">
             <label class="layui-form-label">报销日期：</label>
             <div class="layui-input-block">
-                <input readonly="readonly" class="form-control layui-input" value="<fmt:formatDate value="${workReimbursement.submitterDate}" pattern="yyyy-MM-dd"/>"/>
+                <input readonly="readonly" style="background-color: #f1f1f1" class="form-control layui-input" value="<fmt:formatDate value="${workReimbursement.submitterDate}" pattern="yyyy-MM-dd"/>"/>
             </div>
         </div>
         <div class="layui-item layui-col-sm6 with-textarea">
             <label class="layui-form-label ">备注：</label>
             <div class="layui-input-block">
-                <form:textarea path="remarks" htmlEscape="false" rows="4"  maxlength="255" value="${workReimbursement.remarks}"  class="form-control "/>
+                <form:textarea path="remarks" cssStyle="background-color: #f1f1f1" readonly="true" htmlEscape="false" rows="4"  maxlength="255" value="${workReimbursement.remarks}"  class="form-control "/>
             </div>
         </div>
     </div>

src/main/webapp/webpage/modules/workreimbursement/workReimbursementList.jsp

@@ -283,6 +283,7 @@
                     ,"submitterName":"<c:out value="${fns:getUserById(workReimbursement.submitterId).name}" escapeXml="true"/>"
                     ,"handleName":"<c:out value="${fns:getUserById(workReimbursement.handleId).name}" escapeXml="true"/>"
                     ,"officeId":"${fns:getOfficeById(workReimbursement.officeId).name}"
+                    ,"proId":"${workReimbursement.project.projectId}"
                     ,"projectId":
                         <c:if test="${workReimbursement.ext == 1}">
                             "<c:out value="${workReimbursement.projectName}" escapeXml="true"/>"

src/main/webapp/webpage/modules/workreimbursement/workReimbursementModifyApply.jsp

@@ -634,7 +634,7 @@
             <div class="layui-item layui-col-sm6 with-textarea">
                 <label class="layui-form-label ">备注：</label>
                 <div class="layui-input-block">
-                    <form:textarea path="remarks" htmlEscape="false" rows="4"  maxlength="255" value="${workReimbursement.remarks}"  class="form-control "/>
+                    <form:textarea placeholder="请输入备注" path="remarks" htmlEscape="false" rows="4"  maxlength="255" value="${workReimbursement.remarks}"  class="form-control "/>
                 </div>
             </div>
     </div>

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

@@ -471,7 +471,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span id="tryEndTimeSpan" class="require-item"></span>试用期结束日期：</label>
                     <div class="layui-input-block">
-                        <input id="tryEndTime" name="tryEndTime"  type="text" maxlength="20" readonly class="laydate-icondate form-control layui-input layer-date laydate-icon"
+                        <input id="tryEndTime" name="tryEndTime"  type="text" maxlength="20" disabled="disabled" readonly class="laydate-icondate form-control layui-input layer-date laydate-icon"
                                value="<fmt:formatDate value="${workStaffBasicInfo.tryEndTime}" pattern="yyyy-MM-dd"/>"/>
                     </div>
                 </div>

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

@@ -46,6 +46,12 @@
             return false;
         }
         $(document).ready(function() {
+            laydate.render({
+                elem: '#tryEndTime', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+                event: 'focus', //响应事件。如果没有传入event，则按照默认的click
+                type : 'datetime'
+                , trigger: 'click'
+            });
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
                     loading('正在提交，请稍等...');
@@ -364,7 +370,7 @@
                         <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:option value="" label="请选择"/>
                                 <form:options items="${fns:getDictList('sex')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                             </form:select>
                         </div>
@@ -372,7 +378,7 @@
                     <div class="layui-item layui-col-sm12">
                         <label class="layui-form-label">身份证号码：</label>
                         <div class="layui-input-block">
-                            <form:input path="idCard" htmlEscape="false" onchange="caculateAge(this.value);" class="form-control idCard layui-input"/>
+                            <form:input path="idCard" placeholder="请输入身份证号码" htmlEscape="false" onchange="caculateAge(this.value);" class="form-control idCard layui-input"/>
                         </div>
                     </div>
                 </div>
@@ -381,7 +387,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="name" htmlEscape="false" class="form-control layui-input required"/>
+                                <form:input path="name" placeholder="请输入姓名" htmlEscape="false" class="form-control layui-input required"/>
                             </div>
                         </div>
                         <div class="layui-item layui-col-sm12">
@@ -422,7 +428,7 @@
                     <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"
-                               value="<fmt:formatDate value="${workStaffBasicInfo.birthday}" pattern="yyyy-MM-dd"/>"/>
+                              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">
@@ -436,20 +442,20 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">电子邮箱：</label>
                     <div class="layui-input-block">
-                        <form:input path="email" htmlEscape="false" class="form-control layui-input email"/>
+                        <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" htmlEscape="false" class="form-control layui-input isPhone"/>
+                        <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">座机：</label>
                     <div class="layui-input-block">
-                        <form:input path="phone" htmlEscape="false"
+                        <form:input path="phone" htmlEscape="false" placeholder="请输入座机号"
                                     class="form-control isTel  layui-input"/>
                     </div>
                 </div>
@@ -457,7 +463,7 @@
                     <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">
-                            <form:option value="" label=""/>
+                            <form:option value="" label="请选择"/>
                             <form:options items="${fns:getDictList('staff_status')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
                         </form:select>
                     </div>
@@ -465,14 +471,14 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">银行卡号：</label>
                     <div class="layui-input-block">
-                        <form:input path="bankCard" htmlEscape="false" minlength="16" maxlength="19" class="form-control layui-input digits"/>
+                        <form:input path="bankCard" placeholder="请输入银行卡号" htmlEscape="false" minlength="16" maxlength="19" class="form-control layui-input digits"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">i
+                <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">婚姻状况：</label>
                     <div class="layui-input-block">
                         <form:select path="marriage" class="form-control simple-select">
-                            <form:option value="" label=""/>
+                            <form:option value="" label="请选择"/>
                             <form:options items="${fns:getDictList('marriage_status')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
                         </form:select>
                     </div>
@@ -481,7 +487,7 @@
                     <label class="layui-form-label">政治面貌：</label>
                     <div class="layui-input-block">
                         <form:select path="politics" class="form-control simple-select">
-                            <form:option value="" label=""/>
+                            <form:option value="" label="请选择"/>
                             <form:options items="${fns:getDictList('politics_type')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
                         </form:select>
                     </div>
@@ -490,82 +496,82 @@
                     <label class="layui-form-label">籍    贯：</label>
                     <div class="layui-input-block with-icon">
                         <sys:treeselectOnNotRequest id="nativePlace" name="nativePlace.id" value="${workStaffBasicInfo.nativePlace.id}" labelName="" labelValue="${workStaffBasicInfo.nativePlace.name}"
-                                        title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                     cssStyle="background-color:#fff"   title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">户口所在地：</label>
                     <div class="layui-input-block">
-                        <form:input path="household" htmlEscape="false" class="form-control layui-input"/>
+                        <form:input path="household" placeholder="请输入户口所在地" htmlEscape="false" 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="address" htmlEscape="false" class="form-control layui-input"/>
+                        <form:input path="address" placeholder="请输入常住地址" htmlEscape="false" 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="socialSecurityId" htmlEscape="false" class="form-control layui-input number" maxlength="12"/>
+                        <form:input path="socialSecurityId" placeholder="请输入社保账号" 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>
                     <div class="layui-input-block">
-                        <form:input path="medicalInsuranceId" htmlEscape="false" class="form-control layui-input number" maxlength="12"/>
+                        <form:input path="medicalInsuranceId" placeholder="请输入医保账号" 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>
                     <div class="layui-input-block">
-                        <form:input path="accumulationFundId" htmlEscape="false" class="form-control layui-input number" maxlength="12"/>
+                        <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">
                     <label class="layui-form-label">微信号：</label>
                     <div class="layui-input-block">
-                        <form:input path="wechatId" htmlEscape="false" class="form-control layui-input"/>
+                        <form:input path="wechatId" placeholder="请输入微信号" htmlEscape="false" class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">QQ号：</label>
                     <div class="layui-input-block">
-                        <form:input path="qqId" htmlEscape="false" class="form-control layui-input number" minlength="5" maxlength="10"/>
+                        <form:input path="qqId" placeholder="请输入QQ号" 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">入职日期：</label>
                     <div class="layui-input-block">
                         <input id="entryDate" name="entryDate" type="text" maxlength="20" readonly class="laydate-icondate form-control layui-input layer-date laydate-icon"
-                               value="<fmt:formatDate value="${workStaffBasicInfo.entryDate}" pattern="yyyy-MM-dd"/>"/>
+                               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">
                     <label class="layui-form-label">试用岗位：</label>
                     <div class="layui-input-block">
-                        <form:input path="tryOutJob" htmlEscape="false" class="form-control layui-input"/>
+                        <form:input placeholder="请输入使用岗位" path="tryOutJob" htmlEscape="false" class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">试用期(月)：</label>
                     <div class="layui-input-block">
-                        <form:input path="trialPeriod" htmlEscape="false" class="form-control layui-input number" maxlength="2"/>
+                        <form:input placeholder="请输入试用期" 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 double-line"><span id="tryEndTimeSpan" class="require-item"></span>试用期结束日期：</label>
                     <div class="layui-input-block">
-                        <input id="tryEndTime" name="tryEndTime"  type="text" maxlength="20" readonly class="laydate-icondate form-control layui-input layer-date laydate-icon"
-                               value="<fmt:formatDate value="${workStaffBasicInfo.tryEndTime}" pattern="yyyy-MM-dd"/>"/>
+                        <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 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">
                         <sys:treeselect id="office" name="office.id" value="${workStaffBasicInfo.office.id}" labelName="office.name" labelValue="${workStaffBasicInfo.office.name}"
-                                        title="部门" url="/sys/office/treeData?type=2" cssClass="form-control layui-input required" notAllowSelectParent="true"/>
+                                       cssStyle="background-color:#fff" title="部门" url="/sys/office/treeData?type=2" cssClass="form-control layui-input required" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -578,13 +584,13 @@
                 <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 "/>
+                        <form:textarea path="remarks" placeholder="请输入备注" 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 "/>
+                        <form:textarea path="individualResume" placeholder="请输入个人简介 " htmlEscape="false" rows="4" maxlength="500" class="form-control "/>
                     </div>
                 </div>
 
@@ -756,10 +762,10 @@
                         <input id="educationList{{idx}}_eduPhoto" name="educationList[{{idx}}].eduPhoto" type="hidden" value="{{row.eduPhoto}}"/>
                     </td>
                     <td style="text-align:center;">
-                        <input id="educationList{{idx}}_school" name="educationList[{{idx}}].school" htmlEscape="false" value="{{row.school}}" class="form-control required"/>
+                        <input placeholder="请输入毕业院校" id="educationList{{idx}}_school" name="educationList[{{idx}}].school" htmlEscape="false" value="{{row.school}}" class="form-control required"/>
                     </td>
                     <td style="text-align:center;">
-                        <input id="educationList{{idx}}_major" name="educationList[{{idx}}].major" htmlEscape="false" value="{{row.major}}" class="form-control"/>
+                        <input placeholder="请输入所学专业" id="educationList{{idx}}_major" name="educationList[{{idx}}].major" htmlEscape="false" value="{{row.major}}" class="form-control"/>
                     </td>
                     <td style="text-align:center;">
                         <select name="educationList[{{idx}}].edu" id="educationList{{idx}}_edu" class="form-control required">
@@ -784,17 +790,17 @@
                     </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"
-                               value="<fmt:formatDate value="${row.startDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
+                              style="background-color:#fff" placeholder="入学日期" value="<fmt:formatDate value="${row.startDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
                     </td>
                     <td style="text-align:center;">
                         <input id="educationList{{idx}}_endDate" name="educationList[{{idx}}].endDate" type="text" maxlength="20" class="laydate-icon form-control layer-date laydate-icondate"
-                               value="<fmt:formatDate value="${row.endDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
+                                style="background-color:#fff" placeholder="毕业日期" value="<fmt:formatDate value="${row.endDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
                     </td>
-                    <td class="text-left op-td">
+                    <td class="text-center op-td">
                         <a class="op-btn op-btn-add" title="上传" onclick="this_upload_file_button('educationList{{idx}}_eduPhotoFile')"><i class="fa fa-plus"></i>&nbsp;上传</a><span id="educationList{{idx}}_eduPhotoFileName1"></span>
                         <input id="educationList{{idx}}_eduPhotoFile" name="educationList[{{idx}}].eduPhotoFile" style="display:none" type="file" onchange="changeFileName(this,1);"/>
                     </td>
-                    <td class="text-left op-td">
+                    <td class="text-center op-td">
                         <a class="op-btn op-btn-add" title="上传" onclick="this_upload_file_button('educationList{{idx}}_degreePhotoFile')"><i class="fa fa-plus"></i>&nbsp;上传</a><span id="educationList{{idx}}_degreePhotoFileName1"></span>
                         <input id="educationList{{idx}}_degreePhotoFile" name="educationList[{{idx}}].degreePhotoFile" style="display:none" type="file" onchange="changeFileName(this,1);"/>
                     </td>
@@ -963,13 +969,13 @@
                         </select>
                     </td>
                     <td style="text-align:center;">
-                        <input id="languageList{{idx}}_certificate" name="languageList[{{idx}}].certificate" class="form-control" value="{{row.certificate}}"/>
+                        <input id="languageList{{idx}}_certificate" placeholder="请输入证书名称" name="languageList[{{idx}}].certificate" class="form-control" value="{{row.certificate}}"/>
                     </td>
                     <td style="text-align:center;">
                         <input id="languageList{{idx}}_certifDate" name="languageList[{{idx}}].certifDate" type="text" maxlength="20" class="laydate-icon form-control layer-date laydate-icondate"
-							            value="<fmt:formatDate value="${row.certifDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
+							           style="background-color:#fff" placeholder="获证日期"  value="<fmt:formatDate value="${row.certifDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
                     </td>
-                    <td class="text-left op-td">
+                    <td class="text-center op-td">
                         <a class="op-btn op-btn-add" title="上传" onclick="this_upload_file_button('languageList{{idx}}_file')"><i class="fa fa-plus"></i>&nbsp;上传</a><span id="languageList{{idx}}_fileName1"></span>
                         <input id="languageList{{idx}}_file" name="languageList[{{idx}}].file" style="display:none" type="file" onchange="changeFileName(this,1)"/>
                     </td>
@@ -1061,27 +1067,27 @@
                                     <input id="experienceList{{idx}}_delFlag" name="experienceList[{{idx}}].delFlag" type="hidden" value="0"/>
                                 </td>
                                 <td style="text-align:center;">
-                                    <input id="experienceList{{idx}}_company" name="experienceList[{{idx}}].company" class="form-control required" value="{{row.company}}"/>
+                                    <input placeholder="请输入所在单位" id="experienceList{{idx}}_company" name="experienceList[{{idx}}].company" class="form-control required" value="{{row.company}}"/>
                                 </td>
                                 <td style="text-align:center;">
-                                    <input id="experienceList{{idx}}_dept" name="experienceList[{{idx}}].dept" class="form-control required" value="{{row.dept}}"/>
+                                    <input placeholder="请输入工作部门" id="experienceList{{idx}}_dept" name="experienceList[{{idx}}].dept" class="form-control required" value="{{row.dept}}"/>
                                 </td>
                                 <td style="text-align:center;">
-                                    <input id="experienceList{{idx}}_duty" name="experienceList[{{idx}}].duty" class="form-control required" value="{{row.duty}}"/>
+                                    <input placeholder="请输入职位或岗位" id="experienceList{{idx}}_duty" name="experienceList[{{idx}}].duty" class="form-control required" value="{{row.duty}}"/>
                                 </td>
                                 <td style="text-align:center;">
                                     <input id="experienceList{{idx}}_startDate" name="experienceList[{{idx}}].startDate" type="text" maxlength="20" class="laydate-icon form-control layer-date laydate-icondate required"
-							            value="<fmt:formatDate value="${row.startDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
+							           style="background-color:#fff " placeholder="起始日期" value="<fmt:formatDate value="${row.startDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
                                 </td>
                                 <td style="text-align:center;">
                                     <input id="experienceList{{idx}}_endDate" name="experienceList[{{idx}}].endDate" type="text" maxlength="20" class="laydate-icon form-control layer-date laydate-icondate required"
-							            value="<fmt:formatDate value="${row.endDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
+							           style="background-color:#fff " placeholder="终止日期" value="<fmt:formatDate value="${row.endDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
                                 </td>
                                 <td style="text-align:center;">
-                                    <input id="experienceList{{idx}}_certifier" name="experienceList[{{idx}}].certifier" class="form-control" value="{{row.certifier}}"/>
+                                    <input placeholder="请输入证明人" id="experienceList{{idx}}_certifier" name="experienceList[{{idx}}].certifier" class="form-control" value="{{row.certifier}}"/>
                                 </td>
                                 <td style="text-align:center;">
-                                    <input id="experienceList{{idx}}_certifierTel" name="experienceList[{{idx}}].certifierTel" class="form-control" value="{{row.certifierTel}}"/>
+                                    <input placeholder="请输入证明人联系方式" id="experienceList{{idx}}_certifierTel" name="experienceList[{{idx}}].certifierTel" class="form-control" value="{{row.certifierTel}}"/>
                                 </td>
                                 <td class="text-center op-td">
                                     <a href=javascript:void(0); onclick="delRow(this, '#experienceList{{idx}}')"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 取消</a>
@@ -1209,27 +1215,27 @@
                             </select>
                             </td>
                             <td>
-                            <input id="certificateList{{idx}}_num" name="certificateList[{{idx}}].num" class="form-control required" value="{{row.num}}"/>
+                            <input placeholder="请输入证书编号" id="certificateList{{idx}}_num" name="certificateList[{{idx}}].num" class="form-control required" value="{{row.num}}"/>
                                 </td>
                                 <td>
-                                <input id="certificateList{{idx}}_issuingAuthority" name="certificateList[{{idx}}].issuingAuthority" class="form-control required" value="{{row.issuingAuthority}}"/>
+                                <input placeholder="请输入发证机关" id="certificateList{{idx}}_issuingAuthority" name="certificateList[{{idx}}].issuingAuthority" class="form-control required" value="{{row.issuingAuthority}}"/>
                                 </td>
                                 <td>
                                 <input id="certificateList{{idx}}_issuingDate" name="certificateList[{{idx}}].issuingDate" type="text" maxlength="20" class="laydate-icon form-control layer-date laydate-icondate required"
-                            value="<fmt:formatDate value="${certificate.issuingDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
+                           style="background-color:#fff " placeholder="发证日期" value="<fmt:formatDate value="${certificate.issuingDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
                                 </td>
                                 <td>
                                 <input id="certificateList{{idx}}_registDate" name="certificateList[{{idx}}].registDate" type="text" maxlength="20" class="laydate-icon form-control layer-date laydate-icondate"
-                            value="<fmt:formatDate value="${certificate.registDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
+                          style="background-color:#fff " placeholder="注册日期" value="<fmt:formatDate value="${certificate.registDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
                                 </td>
                                 <td>
-                                <input id="certificateList{{idx}}_registNum" name="certificateList[{{idx}}].registNum" class="form-control" value="{{row.registNum}}"/>
+                                <input placeholder="请输入注册证书编号" id="certificateList{{idx}}_registNum" name="certificateList[{{idx}}].registNum" class="form-control" value="{{row.registNum}}"/>
                                 </td>
                                 <td>
-                                <input id="certificateList{{idx}}_major" name="certificateList[{{idx}}].major" class="form-control" value="{{row.major}}"/>
+                                <input placeholder="请输入专业" id="certificateList{{idx}}_major" name="certificateList[{{idx}}].major" class="form-control" value="{{row.major}}"/>
                                 </td>
                                 <td>
-                                <input id="certificateList{{idx}}_grade" name="certificateList[{{idx}}].grade" class="form-control" value="{{row.grade}}"/>
+                                <input placeholder="请输入等级" id="certificateList{{idx}}_grade" name="certificateList[{{idx}}].grade" class="form-control" value="{{row.grade}}"/>
                                 </td>
                                 <td>
                                 <select name="certificateList[{{idx}}].issType" id="certificateList{{idx}}_issType" class="form-control">
@@ -1237,7 +1243,7 @@
                                 <option value="考核">考核</option>
                             </select>
                             </td>
-                            <td class="text-left op-td">
+                            <td class="text-center op-td">
                                 <a class="op-btn op-btn-add" title="上传" onclick="this_upload_file_button('certificateList{{idx}}_file')"><i class="fa fa-plus"></i>&nbsp;上传</a><span id="certificateList{{idx}}_fileName1"></span>
                                 <input id="certificateList{{idx}}_file" name="certificateList[{{idx}}].file" style="display:none" type="file" onchange="changeFileName(this,1)"/>
                                 </td>
@@ -1335,22 +1341,22 @@
                                         <input id="titleList{{idx}}_filePath" name="titleList[{{idx}}].filePath" type="hidden" value="{{row.filePath}}"/>
                                     </td>
                                     <td>
-                                        <input id="titleList{{idx}}_name" name="titleList[{{idx}}].name" class="form-control required" value="{{row.name}}"/>
+                                        <input placeholder="请输入职称名称" id="titleList{{idx}}_name" name="titleList[{{idx}}].name" class="form-control required" value="{{row.name}}"/>
                                     </td>
                                     <td>
-                                        <input id="titleList{{idx}}_grade" name="titleList[{{idx}}].grade" class="form-control required" value="{{row.grade}}"/>
+                                        <input placeholder="请输入职称等级" id="titleList{{idx}}_grade" name="titleList[{{idx}}].grade" class="form-control required" value="{{row.grade}}"/>
                                     </td>
                                     <td>
                                         <input id="titleList{{idx}}_startDate" name="titleList[{{idx}}].startDate" type="text" maxlength="20" class="laydate-icon form-control layer-date laydate-icondate required"
-                                               value="<fmt:formatDate value="${row.startDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
+                                               style="background-color:#fff " placeholder="获取日期" value="<fmt:formatDate value="${row.startDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
                                     </td>
                                     <td>
-                                        <input id="titleList{{idx}}_pathway" name="titleList[{{idx}}].pathway" class="form-control required" value="{{row.pathway}}"/>
+                                        <input  placeholder="请输入途径" id="titleList{{idx}}_pathway" name="titleList[{{idx}}].pathway" class="form-control required" value="{{row.pathway}}"/>
                                     </td>
                                     <td>
-                                        <input id="titleList{{idx}}_approvalAuthority" name="titleList[{{idx}}].approvalAuthority" class="form-control required" value="{{row.approvalAuthority}}"/>
+                                        <input  placeholder="请输入审批单位" id="titleList{{idx}}_approvalAuthority" name="titleList[{{idx}}].approvalAuthority" class="form-control required" value="{{row.approvalAuthority}}"/>
                                     </td>
-                                    <td class="text-left op-td">
+                                    <td class="text-center op-td">
                                         <a class="op-btn op-btn-add" title="上传" onclick="this_upload_file_button('titleList{{idx}}_file')"><i class="fa fa-plus"></i>&nbsp;上传</a><span id="titleList{{idx}}_fileName1"></span>
                                         <input id="titleList{{idx}}_file" name="titleList[{{idx}}].file" style="display:none" type="file" onchange="changeFileName(this,1)"/>
                                     </td>
@@ -1435,13 +1441,13 @@
                                     <input id="familyList{{idx}}_delFlag" name="familyList[{{idx}}].delFlag" type="hidden" value="0"/>
                                 </td>
                                 <td style="text-align:center;">
-                                    <input id="familyList{{idx}}_relation" name="familyList[{{idx}}].relation" class="form-control required" value="{{row.relation}}"/>
+                                    <input placeholder="请输入与本人的关系" id="familyList{{idx}}_relation" name="familyList[{{idx}}].relation" class="form-control required" value="{{row.relation}}"/>
                                 </td>
                                 <td style="text-align:center;">
-                                    <input id="familyList{{idx}}_name" name="familyList[{{idx}}].name" class="form-control required" value="{{row.name}}"/>
+                                    <input placeholder="请输入成员姓名" id="familyList{{idx}}_name" name="familyList[{{idx}}].name" class="form-control required" value="{{row.name}}"/>
                                 </td>
                                 <td style="text-align:center;">
-                                    <input id="familyList{{idx}}_idCard" name="familyList[{{idx}}].idCard" class="form-control required idCard" value="{{row.idCard}}"/>
+                                    <input placeholder="请输入身份证号" id="familyList{{idx}}_idCard" name="familyList[{{idx}}].idCard" class="form-control required idCard" value="{{row.idCard}}"/>
                                 </td>
                                 <td style="text-align:center;">
                                     <select name="familyList[{{idx}}].gender" class="form-control required">
@@ -1450,7 +1456,7 @@
                                     </select>
                                 </td>
                                 <td style="text-align:center;">
-                                    <input id="familyList{{idx}}_contact" name="familyList[{{idx}}].contact" class="form-control required" value="{{row.contact}}"/>
+                                    <input placeholder="请输入联系方式" id="familyList{{idx}}_contact" name="familyList[{{idx}}].contact" class="form-control required" value="{{row.contact}}"/>
                                 </td>
                                 <td class="text-center op-td">
                                     <a href=javascript:void(0); onclick="delRow(this, '#familyList{{idx}}')"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 取消</a>
@@ -1556,21 +1562,21 @@
                                     <input id="trainingList{{idx}}_filePath" name="trainingList[{{idx}}].filePath" type="hidden" value="{{row.filePath}}"/>
                                 </td>
                                 <td>
-                                    <input id="trainingList{{idx}}_name" name="trainingList[{{idx}}].name" class="form-control required" value="{{row.name}}"/>
+                                    <input placeholder="请输入培训名称" id="trainingList{{idx}}_name" name="trainingList[{{idx}}].name" class="form-control required" value="{{row.name}}"/>
                                 </td>
                                 <td>
-                                    <input id="trainingList{{idx}}_agency" name="trainingList[{{idx}}].agency" class="form-control" value="{{row.agency}}"/>
+                                    <input placeholder="请输入培训机构" id="trainingList{{idx}}_agency" name="trainingList[{{idx}}].agency" class="form-control" value="{{row.agency}}"/>
                                 </td>
                                 <td>
-                                    <input id="trainingList{{idx}}_address" name="trainingList[{{idx}}].address" class="form-control" value="{{row.address}}"/>
+                                    <input placeholder="请输入培训地点" id="trainingList{{idx}}_address" name="trainingList[{{idx}}].address" class="form-control" value="{{row.address}}"/>
                                 </td>
                                 <td>
                                     <input id="trainingList{{idx}}_startDate" name="trainingList[{{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" />
+                                          placeholder="起始日期" style="background-color:#fff" value="<fmt:formatDate value="${row.startDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
                                 </td>
                                 <td>
                                     <input id="trainingList{{idx}}_endDate" name="trainingList[{{idx}}].endDate" type="text" maxlength="20" class="laydate-icon form-control layer-date laydate-icondate"
-                                           value="<fmt:formatDate value="${row.endDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
+                                          placeholder="终止日期" style="background-color:#fff" value="<fmt:formatDate value="${row.endDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
                                 </td>
                                 <td>
                                     <select name="trainingList[{{idx}}].type" id="trainingList{{idx}}_type" class="form-control required">
@@ -1581,17 +1587,17 @@
                                     </select>
                                 </td>
                                 <td>
-                                    <input id="trainingList{{idx}}_hours" name="trainingList[{{idx}}].hours" class="form-control" value="{{row.hours}}"/>
+                                    <input placeholder="学时" id="trainingList{{idx}}_hours" name="trainingList[{{idx}}].hours" class="form-control" value="{{row.hours}}"/>
                                 </td>
                                 <td>
-                                    <input id="trainingList{{idx}}_certificate" name="trainingList[{{idx}}].certificate" class="form-control required" value="{{row.certificate}}"/>
+                                    <input placeholder="请输入所获证书" id="trainingList{{idx}}_certificate" name="trainingList[{{idx}}].certificate" class="form-control required" value="{{row.certificate}}"/>
                                 </td>
-                                <td class="text-left op-td">
+                                <td class="text-center op-td">
                                     <a class="op-btn op-btn-add" title="上传" onclick="this_upload_file_button('trainingList{{idx}}_file')"><i class="fa fa-plus"></i>&nbsp;上传</a><span id="trainingList{{idx}}_fileName1"></span>
                                     <input id="trainingList{{idx}}_file" name="trainingList[{{idx}}].file" style="display:none" type="file" onchange="changeFileName(this,1)"/>
                                 </td>
                                 <td>
-                                    <input id="trainingList{{idx}}_remarks" name="trainingList[{{idx}}].remarks" class="form-control" value="{{row.remarks}}"/>
+                                    <input placeholder="请输入备注" id="trainingList{{idx}}_remarks" name="trainingList[{{idx}}].remarks" class="form-control" value="{{row.remarks}}"/>
                                 </td>
                                 <td class="text-center op-td">
                                     <a href=javascript:void(0); onclick="delRow(this, '#titleList{{idx}}')"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>
@@ -1675,18 +1681,18 @@
                                     <input id="socialPositionList{{idx}}_delFlag" name="socialPositionList[{{idx}}].delFlag" type="hidden" value="0"/>
                                 </td>
                                 <td style="text-align:center;">
-                                    <input id="socialPositionList{{idx}}_name" name="socialPositionList[{{idx}}].name" class="form-control required" value="{{row.name}}"/>
+                                    <input placeholder="请输入职务名称" id="socialPositionList{{idx}}_name" name="socialPositionList[{{idx}}].name" class="form-control required" value="{{row.name}}"/>
                                 </td>
                                 <td style="text-align:center;">
                                     <input id="socialPositionList{{idx}}_startDate" name="socialPositionList[{{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" />
+							            placeholder="开始日期" style="background-color:#fff" value="<fmt:formatDate value="${row.startDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
                                 </td>
                                 <td style="text-align:center;">
                                     <input id="socialPositionList{{idx}}_endDate" name="socialPositionList[{{idx}}].endDate" type="text" maxlength="20" class="laydate-icon form-control layer-date laydate-icondate"
-							            value="<fmt:formatDate value="${row.endDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
+							            placeholder="结束日期" style="background-color:#fff" value="<fmt:formatDate value="${row.endDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
                                 </td>
                                 <td style="text-align:center;">
-                                    <input id="socialPositionList{{idx}}_organization" name="socialPositionList[{{idx}}].organization" class="form-control" value="{{row.organization}}"/>
+                                    <input placeholder="请输入任职机构" id="socialPositionList{{idx}}_organization" name="socialPositionList[{{idx}}].organization" class="form-control" value="{{row.organization}}"/>
                                 </td>
                                 <td class="text-center op-td">
                                     <a href=javascript:void(0); onclick="delRow(this, '#socialPositionList{{idx}}')"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 取消</a>
@@ -1785,19 +1791,19 @@
                                     </select>
                                 </td>
                                 <td style="text-align:center;">
-                                    <input id="rewardsList{{idx}}_name" name="rewardsList[{{idx}}].name" class="form-control required" value="{{row.name}}"/>
+                                    <input placeholder="请输入名称" id="rewardsList{{idx}}_name" name="rewardsList[{{idx}}].name" class="form-control required" value="{{row.name}}"/>
                                 </td>
                                 <td style="text-align:center;">
-                                    <input id="rewardsList{{idx}}_atTime" name="rewardsList[{{idx}}].atTime" class="form-control required" value="{{row.atTime}}"/>
+                                    <input placeholder="请输入时间" id="rewardsList{{idx}}_atTime" name="rewardsList[{{idx}}].atTime" class="form-control required" value="{{row.atTime}}"/>
                                 </td>
                                 <td style="text-align:center;">
-                                    <input id="rewardsList{{idx}}_grade" name="rewardsList[{{idx}}].grade" class="form-control" value="{{row.grade}}"/>
+                                    <input placeholder="请输入级别" id="rewardsList{{idx}}_grade" name="rewardsList[{{idx}}].grade" class="form-control" value="{{row.grade}}"/>
                                 </td>
                                 <td style="text-align:center;">
-                                    <input id="rewardsList{{idx}}_reason" name="rewardsList[{{idx}}].reason" class="form-control required" value="{{row.reason}}"/>
+                                    <input placeholder="请输入原因" id="rewardsList{{idx}}_reason" name="rewardsList[{{idx}}].reason" class="form-control required" value="{{row.reason}}"/>
                                 </td>
                                 <td style="text-align:center;">
-                                    <input id="rewardsList{{idx}}_organization" name="rewardsList[{{idx}}].organization" class="form-control required" value="{{row.organization}}"/>
+                                    <input placeholder="请输入授予机构" id="rewardsList{{idx}}_organization" name="rewardsList[{{idx}}].organization" class="form-control required" value="{{row.organization}}"/>
                                 </td>
                                 <td class="text-center op-td">
                                     <a href=javascript:void(0); onclick="delRow(this, '#rewardsList{{idx}}')"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 取消</a>
@@ -1879,16 +1885,16 @@
                                     <input id="achievementList{{idx}}_delFlag" name="achievementList[{{idx}}].delFlag" type="hidden" value="0"/>
                                 </td>
                                 <td style="text-align:center;">
-                                    <input id="achievementList{{idx}}_projName" name="achievementList[{{idx}}].projName" class="form-control" value="{{row.projName}}"/>
+                                    <input placeholder="请输入项目名称" id="achievementList{{idx}}_projName" name="achievementList[{{idx}}].projName" class="form-control" value="{{row.projName}}"/>
                                 </td>
                                 <td style="text-align:center;">
-                                    <input id="achievementList{{idx}}_projClient" name="achievementList[{{idx}}].projClient" class="form-control" value="{{row.projClient}}"/>
+                                    <input placeholder="请输入委托方" id="achievementList{{idx}}_projClient" name="achievementList[{{idx}}].projClient" class="form-control" value="{{row.projClient}}"/>
                                 </td>
                                 <td style="text-align:center;">
-                                    <input id="achievementList{{idx}}_category" name="achievementList[{{idx}}].category" class="form-control" value="{{row.category}}"/>
+                                    <input placeholder="请输入工程分类" id="achievementList{{idx}}_category" name="achievementList[{{idx}}].category" class="form-control" value="{{row.category}}"/>
                                 </td>
                                 <td style="text-align:center;">
-                                    <input id="achievementList{{idx}}_unitNumber" name="achievementList[{{idx}}].unitNumber" class="form-control" value="{{row.unitNumber}}"/>
+                                    <input placeholder="请输入规模类型/单位/数量" id="achievementList{{idx}}_unitNumber" name="achievementList[{{idx}}].unitNumber" class="form-control" value="{{row.unitNumber}}"/>
                                 </td>
                                 <td style="text-align:center;">
                                     <select name="achievementList[{{idx}}].duty" class="form-control">
@@ -1898,7 +1904,7 @@
                                     </select>
                                 </td>
                                 <td style="text-align:center;">
-                                    <input id="achievementList{{idx}}_content" name="achievementList[{{idx}}].content" class="form-control" value="{{row.content}}"/>
+                                    <input placeholder="请输入参与内容" id="achievementList{{idx}}_content" name="achievementList[{{idx}}].content" class="form-control" value="{{row.content}}"/>
                                 </td>
                                 <td class="text-center op-td">
                                     <a href=javascript:void(0); onclick="delRow(this, '#achievementList{{idx}}')"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 取消</a>
@@ -1986,9 +1992,9 @@
                                 </select>
                             </td>
                             <td>
-                                <input id="recordList{{idx}}_num" name="recordList[{{idx}}].num" class="form-control" value="{{row.num}}"/>
+                                <input placeholder="请输入编号" id="recordList{{idx}}_num" name="recordList[{{idx}}].num" class="form-control" value="{{row.num}}"/>
                             </td>
-                            <td class="text-left op-td">
+                            <td class="text-center op-td">
                                 <a class="op-btn op-btn-add" title="上传" onclick="this_upload_file_button('recordList{{idx}}_file')"><i class="fa fa-plus"></i>&nbsp;上传</a><span id="recordList{{idx}}_fileName1"></span>
                                 <input id="recordList{{idx}}_file" name="recordList[{{idx}}].file" style="display:none" type="file" onchange="changeFileName(this,1)"/>
                             </td>