Home Explore Help
Register Sign In
user5
/
simple_xg_total_process_master
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge remote-tracking branch 'origin/master'

user5 4 years ago
parent
955b420193 71603b0a5c
commit
22c8d3ae77
15 changed files with 666 additions and 77 deletions
Unified View Show Diff Stats
  1. 7 0
      src/main/webapp/WEB-INF/tlds/fns.tld
  2. 49 5
      src/main/webapp/webpage/modules/oa/oaNotifyAudit.jsp
  3. 40 0
      src/main/webapp/webpage/modules/projectFilingBatch/projectFilingBatchAudit.jsp
  4. 48 5
      src/main/webapp/webpage/modules/projectcontentinfo/projectReportRecordAudit.jsp
  5. 48 6
      src/main/webapp/webpage/modules/ruralprojectrecords/check/ruralProjectRecordsAudit.jsp
  6. 47 5
      src/main/webapp/webpage/modules/ruralprojectrecords/check/ruralProjectRecordsDownAudit.jsp
  7. 37 6
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsAudit.jsp
  8. 49 7
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageAudit.jsp
  9. 47 7
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedAudit.jsp
  10. 50 6
      src/main/webapp/webpage/modules/workContractBorrow/workContractBorrowAudit.jsp
  11. 44 4
      src/main/webapp/webpage/modules/workcontractinfo/workContractAudit.jsp
  12. 50 6
      src/main/webapp/webpage/modules/workcontractrecord/workContractRecordAudit.jsp
  13. 47 5
      src/main/webapp/webpage/modules/workinvoice/workInvoiceAuditEnd.jsp
  14. 50 6
      src/main/webapp/webpage/modules/workreimbursement/workReimbursementAudit.jsp
  15. 53 9
      src/main/webapp/webpage/modules/workreimbursement/workReimbursementCWAudit.jsp

+ 7 - 0
src/main/webapp/WEB-INF/tlds/fns.tld
View File 

@@ -195,6 +195,13 @@
 
     <example>${fns:getMainDictList(type)}</example>
 
     <example>${fns:getMainDictList(type)}</example>
 
   </function>
 
   </function>
 
   <function>
 
   <function>
 
+    <description>获取公司字典对象列表</description>
 
+    <name>getMainDictListOnProjectAdvent</name>
 
+    <function-class>com.jeeplus.modules.sys.utils.DictUtils</function-class>
 
+    <function-signature>java.util.List getMainDictListOnProjectAdvent(java.lang.String)</function-signature>
 
+    <example>${fns:getMainDictListOnProjectAdvent(type)}</example>
 
+  </function>
 
+  <function>
 
     <description>获取字典对象列表</description>
 
     <description>获取字典对象列表</description>
 
     <name>getDictListJson</name>
 
     <name>getDictListJson</name>
 
     <function-class>com.jeeplus.modules.sys.utils.DictUtils</function-class>
 
     <function-class>com.jeeplus.modules.sys.utils.DictUtils</function-class>

+ 49 - 5
src/main/webapp/webpage/modules/oa/oaNotifyAudit.jsp
View File 

@@ -4,6 +4,8 @@
 
 <head>
 
 <head>
 
     <title>通知管理</title>
 
     <title>通知管理</title>
 
     <meta name="decorator" content="default"/>
 
     <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">
 
     <style type="text/css">
 
         img {width: 50px; height: 50px;}
 
         img {width: 50px; height: 50px;}
 
     </style>
 
     </style>
 
@@ -121,7 +123,7 @@
 
 <body >
 
 <body >
 
 <div class="single-form">
 
 <div class="single-form">
 
     <div class="container  view-form">
 
     <div class="container  view-form">
 
-        <form:form id="inputForm" modelAttribute="oaNotify" enctype="multipart/form-data" action="${ctx}/oa/oaNotify/saveAudit" method="post" class="form-horizontal">
 
+        <form:form id="inputForm" modelAttribute="oaNotify" enctype="multipart/form-data" action="${ctx}/oa/oaNotify/saveAudit" method="post" class="form-horizontal layui-form">
 
             <form:hidden path="id"/>
 
             <form:hidden path="id"/>
 
             <form:hidden path="home"/>
 
             <form:hidden path="home"/>
 
             <form:hidden path="act.taskId"/>
 
             <form:hidden path="act.taskId"/>
 
@@ -364,14 +366,36 @@
 
                 </div>
 
                 </div>
 
             <div class="form-group layui-row">
 
             <div class="form-group layui-row">
 
                 <div class="form-group-label"><h2>审批意见</h2></div>
 
                 <div class="form-group-label"><h2>审批意见</h2></div>
 
-                <div class="layui-item layui-col-xs12 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 path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
 
                         <input type="file" name="upload_files" style="display: none;">
 
                         <input type="file" name="upload_files" style="display: none;">
 
                     </div>
 
                     </div>
 
                 </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>
 
+<%--            <div class="form-group layui-row">--%>
 
+<%--                <div class="form-group-label"><h2>审批意见</h2></div>--%>
 
+<%--                <div class="layui-item layui-col-xs12 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>--%>
 
             <div class="form-group layui-row">
 
             <div class="form-group layui-row">
 
                 <div class="form-group-label"><h2>审批流程</h2></div>
 
                 <div class="form-group-label"><h2>审批流程</h2></div>
 
                 <div class="layui-item layui-col-xs12 form-table-container" >
 
                 <div class="layui-item layui-col-xs12 form-table-container" >
 
@@ -384,5 +408,25 @@
 
         </form:form>
 
         </form:form>
 
     </div>
 
     </div>
 
 </div>
 
 </div>
 
+<script>
 
+    $(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);
 
+                }
 
+            });
 
+        });
 
+    })
 
+</script>
 
 </body>
 
 </body>
 
 </html>
 
 </html>

+ 40 - 0
src/main/webapp/webpage/modules/projectFilingBatch/projectFilingBatchAudit.jsp
View File 

@@ -361,6 +361,28 @@
 
 						</tbody>
 
 						</tbody>
 
 					</table>
 
 					</table>
 
 			</div>
 
 			</div>
 
+			<div class="form-group layui-row">
 
+				<div class="form-group-label"><h2>审核意见</h2></div>
 
+				<div class="layui-item layui-col-sm8 lw6 with-textarea">
 
+					<div class="layui-input-block" style="margin-left:10px;">
 
+						<form:textarea 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>
 
 
 
 
 
 
 
@@ -375,6 +397,24 @@
 
 	</div>
 
 	</div>
 
 </div>
 
 </div>
 
 <script type="text/javascript">
 
 <script type="text/javascript">
 
+	$(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);
 
+				}
 
+			});
 
+		});
 
+	})
 
 	layui.use(['form', 'layer'], function () {
 
 	layui.use(['form', 'layer'], function () {
 
 		var form = layui.form;
 
 		var form = layui.form;
 
 		//下拉框监听器
 
 		//下拉框监听器

+ 48 - 5
src/main/webapp/webpage/modules/projectcontentinfo/projectReportRecordAudit.jsp
View File 

@@ -4,7 +4,10 @@
 
 <head>
 
 <head>
 
 	<title>合同归档管理</title>
 
 	<title>合同归档管理</title>
 
 	<meta name="decorator" content="default"/>
 
 	<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"/>
 
 	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
 
 	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
 
+
 
 	<%@include file="/webpage/include/treetable.jsp" %>
 
 	<%@include file="/webpage/include/treetable.jsp" %>
 
 	<script type="text/javascript">
 
 	<script type="text/javascript">
 
         var validateForm;
 
         var validateForm;
 
@@ -62,7 +65,7 @@
 
 <body>
 
 <body>
 
 <div class="single-form">
 
 <div class="single-form">
 
 	<div class="container">
 
 	<div class="container">
 
-		<form:form id="inputForm" modelAttribute="projectReportRecord" action="${ctx}/projectcontentinfo/projectReportRecord/auditSave" method="post" class="form-horizontal">
 
+		<form:form id="inputForm" modelAttribute="projectReportRecord" action="${ctx}/projectcontentinfo/projectReportRecord/auditSave" method="post" class="form-horizontal layui-form">
 
 		<form:hidden path="id"/>
 
 		<form:hidden path="id"/>
 
 		<form:hidden path="type"/>
 
 		<form:hidden path="type"/>
 
 		<form:hidden path="home"/>
 
 		<form:hidden path="home"/>
 
@@ -497,14 +500,36 @@
 
 			</div>--%>
 
 			</div>--%>
 
 			<div class="form-group layui-row">
 
 			<div class="form-group layui-row">
 
 				<div class="form-group-label"><h2>审批意见</h2></div>
 
 				<div class="form-group-label"><h2>审批意见</h2></div>
 
-				<div class="layui-item layui-col-xs12 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 path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
 
 						<input type="file" name="upload_files" style="display: none;">
 
 						<input type="file" name="upload_files" style="display: none;">
 
 					</div>
 
 					</div>
 
 				</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>
 
+<%--			<div class="form-group layui-row">--%>
 
+<%--				<div class="form-group-label"><h2>审批意见</h2></div>--%>
 
+<%--				<div class="layui-item layui-col-xs12 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>--%>
 
 			<div class="form-group layui-row">
 
 			<div class="form-group layui-row">
 
 				<div class="form-group-label"><h2>审批流程</h2></div>
 
 				<div class="form-group-label"><h2>审批流程</h2></div>
 
 				<div class="layui-item layui-col-xs12 form-table-container" >
 
 				<div class="layui-item layui-col-xs12 form-table-container" >
 
@@ -520,6 +545,24 @@
 
 <script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
 
 <script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
 
 <script src="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.js" charset="utf-8"></script>
 
 <script src="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.js" charset="utf-8"></script>
 
 <script>
 
 <script>
 
+	$(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);
 
+				}
 
+			});
 
+		});
 
+	})
 
 	function openBill3(title,url,width,height,target,formId,tableId){
 
 	function openBill3(title,url,width,height,target,formId,tableId){
 
 		var rows = $(this).parent().prevAll().length + 1;
 
 		var rows = $(this).parent().prevAll().length + 1;
 
 		var frameIndex = parent.layer.getFrameIndex(window.name);
 
 		var frameIndex = parent.layer.getFrameIndex(window.name);

+ 48 - 6
src/main/webapp/webpage/modules/ruralprojectrecords/check/ruralProjectRecordsAudit.jsp
View File 

@@ -4,6 +4,8 @@
 
 <head>
 
 <head>
 
 	<title>项目审批管理</title>
 
 	<title>项目审批管理</title>
 
 	<meta name="decorator" content="default"/>
 
 	<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>
 
 	<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>
 
 	<script type="text/javascript">
 
 	<script type="text/javascript">
 
 		var validateForm;
 
 		var validateForm;
 
@@ -116,7 +118,7 @@
 
 <body >
 
 <body >
 
 <div class="single-form">
 
 <div class="single-form">
 
 	<div class="container">
 
 	<div class="container">
 
-		<form:form id="inputForm" modelAttribute="projectRecords" enctype="multipart/form-data" action="${ctx}/project/recordChooseCheck/saveAudit" method="post" class="form-horizontal">
 
+		<form:form id="inputForm" modelAttribute="projectRecords" enctype="multipart/form-data" action="${ctx}/project/recordChooseCheck/saveAudit" method="post" class="form-horizontal layui-form">
 
 		<form:hidden path="id"/>
 
 		<form:hidden path="id"/>
 
 		<form:hidden path="home"/>
 
 		<form:hidden path="home"/>
 
 		<form:hidden path="workContractInfo.client.id" id="contractClientId" value="${projectRecords.workContractInfo.client.id}"/>
 
 		<form:hidden path="workContractInfo.client.id" id="contractClientId" value="${projectRecords.workContractInfo.client.id}"/>
 
@@ -444,19 +446,58 @@
 
 					</table>
 
 					</table>
 
 				</div>
 
 				</div>
 
 			</div>
 
 			</div>
 
-
 
 			<div class="form-group layui-row">
 
 			<div class="form-group layui-row">
 
 				<div class="form-group-label"><h2>提交说明</h2></div>
 
 				<div class="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 path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
 
 						<input type="file" name="upload_files" style="display: none;">
 
 						<input type="file" name="upload_files" style="display: none;">
 
 					</div>
 
 					</div>
 
 				</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>
 
+<%--			<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>
 
 			<script>
 
+				$(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);
 
+							}
 
+						});
 
+					});
 
+				})
 
                 var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
 
                 var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
 
                 var workConstructionLinkmanRowIdx = 0, workConstructionLinkmanTpl = $("#workConstructionLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
 
                 var workConstructionLinkmanRowIdx = 0, workConstructionLinkmanTpl = $("#workConstructionLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
 
                 $(document).ready(function() {
 
                 $(document).ready(function() {
 
@@ -470,6 +511,7 @@
 
                         addRow('#workConstructionLinkmanList', workConstructionLinkmanRowIdx, workConstructionLinkmanTpl, dataBank[i]);
 
                         addRow('#workConstructionLinkmanList', workConstructionLinkmanRowIdx, workConstructionLinkmanTpl, dataBank[i]);
 
                         workConstructionLinkmanRowIdx = workConstructionLinkmanRowIdx + 1;
 
                         workConstructionLinkmanRowIdx = workConstructionLinkmanRowIdx + 1;
 
                     }
 
                     }
 
+
 
                 });
 
                 });
 
 
 
 			</script>
 
 			</script>

+ 47 - 5
src/main/webapp/webpage/modules/ruralprojectrecords/check/ruralProjectRecordsDownAudit.jsp
View File 

@@ -5,6 +5,8 @@
 
 	<title>项目审批管理</title>
 
 	<title>项目审批管理</title>
 
 	<meta name="decorator" content="default"/>
 
 	<meta name="decorator" content="default"/>
 
 	<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>
 
 	<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">
 
 	<script type="text/javascript">
 
 		var validateForm;
 
 		var validateForm;
 
 		function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
 
 		function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
 
@@ -130,7 +132,7 @@
 
 <body >
 
 <body >
 
 <div class="single-form">
 
 <div class="single-form">
 
 	<div class="container">
 
 	<div class="container">
 
-		<form:form id="inputForm" modelAttribute="projectRecords" enctype="multipart/form-data" action="${ctx}/project/recordChooseCheck/saveAudit" method="post" class="form-horizontal">
 
+		<form:form id="inputForm" modelAttribute="projectRecords" enctype="multipart/form-data" action="${ctx}/project/recordChooseCheck/saveAudit" method="post" class="form-horizontal layui-form">
 
 		<form:hidden path="id"/>
 
 		<form:hidden path="id"/>
 
 		<form:hidden path="home"/>
 
 		<form:hidden path="home"/>
 
 		<form:hidden path="workContractInfo.client.id" id="contractClientId" value="${projectRecords.workContractInfo.client.id}"/>
 
 		<form:hidden path="workContractInfo.client.id" id="contractClientId" value="${projectRecords.workContractInfo.client.id}"/>
 
@@ -476,16 +478,56 @@
 
 			</div>
 
 			</div>
 
 			<div class="form-group layui-row">
 
 			<div class="form-group layui-row">
 
 				<div class="form-group-label"><h2>提交说明</h2></div>
 
 				<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 path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
 
 						<input type="file" name="upload_files" style="display: none;">
 
 						<input type="file" name="upload_files" style="display: none;">
 
 					</div>
 
 					</div>
 
 				</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>
 
+<%--			<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>
 
 			<script>
 
+				$(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);
 
+							}
 
+						});
 
+					});
 
+				})
 
                 var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
 
                 var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
 
                 var workConstructionLinkmanRowIdx = 0, workConstructionLinkmanTpl = $("#workConstructionLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
 
                 var workConstructionLinkmanRowIdx = 0, workConstructionLinkmanTpl = $("#workConstructionLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
 
                 $(document).ready(function() {
 
                 $(document).ready(function() {

+ 37 - 6
src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsAudit.jsp
View File 

@@ -5,6 +5,10 @@
 
 	<title>项目审批管理</title>
 
 	<title>项目审批管理</title>
 
 	<meta name="decorator" content="default"/>
 
 	<meta name="decorator" content="default"/>
 
 	<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>
 
 	<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"/>
 
+	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
 
+
 
 	<script type="text/javascript">
 
 	<script type="text/javascript">
 
 		var validateForm;
 
 		var validateForm;
 
 		function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
 
 		function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
 
@@ -115,7 +119,7 @@
 
 <body >
 
 <body >
 
 <div class="single-form">
 
 <div class="single-form">
 
 	<div class="container">
 
 	<div class="container">
 
-		<form:form id="inputForm" modelAttribute="projectRecords" enctype="multipart/form-data" action="${ctx}/ruralProject/ruralProjectRecords/saveAudit" method="post" class="form-horizontal">
 
+		<form:form id="inputForm" modelAttribute="projectRecords" enctype="multipart/form-data" action="${ctx}/ruralProject/ruralProjectRecords/saveAudit" method="post" class="layui-form">
 
 		<form:hidden path="id"/>
 
 		<form:hidden path="id"/>
 
 		<form:hidden path="home"/>
 
 		<form:hidden path="home"/>
 
 		<form:hidden path="workContractInfo.client.id" id="contractClientId" value="${projectRecords.workContractInfo.client.id}"/>
 
 		<form:hidden path="workContractInfo.client.id" id="contractClientId" value="${projectRecords.workContractInfo.client.id}"/>
 
@@ -662,13 +666,25 @@
 
 
 
 			<div class="form-group layui-row">
 
 			<div class="form-group layui-row">
 
 				<div class="form-group-label"><h2>审批意见</h2></div>
 
 				<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 path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
 
 						<input type="file" name="upload_files" style="display: none;">
 
 						<input type="file" name="upload_files" style="display: none;">
 
 					</div>
 
 					</div>
 
 				</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>
 
 
 
 			<script>
 
 			<script>
 
@@ -685,8 +701,23 @@
 
                         addRow('#workConstructionLinkmanList', workConstructionLinkmanRowIdx, workConstructionLinkmanTpl, dataBank[i]);
 
                         addRow('#workConstructionLinkmanList', workConstructionLinkmanRowIdx, workConstructionLinkmanTpl, dataBank[i]);
 
                         workConstructionLinkmanRowIdx = workConstructionLinkmanRowIdx + 1;
 
                         workConstructionLinkmanRowIdx = workConstructionLinkmanRowIdx + 1;
 
                     }
 
                     }
 
+                    $(".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);
 
+							}
 
+						});
 
+					});
 
                 });
 
                 });
 
-
 
 			</script>
 
 			</script>
 
 
 
 			<div class="form-group layui-row">
 
 			<div class="form-group layui-row">

+ 49 - 7
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageAudit.jsp
View File 

@@ -5,6 +5,9 @@
 
 	<title>项目审批管理</title>
 
 	<title>项目审批管理</title>
 
 	<meta name="decorator" content="default"/>
 
 	<meta name="decorator" content="default"/>
 
 	<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>
 
 	<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"/>
 
+	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
 
 	<%@include file="/webpage/include/treetable.jsp" %>
 
 	<%@include file="/webpage/include/treetable.jsp" %>
 
 	<script type="text/javascript">
 
 	<script type="text/javascript">
 
         var validateForm;
 
         var validateForm;
 
@@ -113,7 +116,7 @@
 
 <body >
 
 <body >
 
 <div class="single-form">
 
 <div class="single-form">
 
 	<div class="container">
 
 	<div class="container">
 
-		<form:form id="inputForm" modelAttribute="projectcontentinfo" enctype="multipart/form-data" action="${ctx}/ruralProject/ruralProjectMessage/reportAudit" method="post" class="form-horizontal">
 
+		<form:form id="inputForm" modelAttribute="projectcontentinfo" enctype="multipart/form-data" action="${ctx}/ruralProject/ruralProjectMessage/reportAudit" method="post" class="form-horizontal layui-form">
 
 			<form:hidden path="id"/>
 
 			<form:hidden path="id"/>
 
 			<form:hidden path="home"/>
 
 			<form:hidden path="home"/>
 
 			<form:hidden path="project.id"/>
 
 			<form:hidden path="project.id"/>
 
@@ -679,17 +682,38 @@
 
 				</div>
 
 				</div>
 
 			</div>
 
 			</div>
 
 
 
-
 
 			<div class="form-group layui-row">
 
 			<div class="form-group layui-row">
 
 				<div class="form-group-label"><h2>审批意见</h2></div>
 
 				<div class="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="projectReportData.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 path="projectReportData.act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
 
 						<input type="file" name="upload_files" style="display: none;">
 
 						<input type="file" name="upload_files" style="display: none;">
 
 					</div>
 
 					</div>
 
 				</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="projectReportData.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>
 
+<%--			<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="projectReportData.act.comment" class="form-control" rows="4" maxlength="127" />--%>
 
+<%--						<input type="file" name="upload_files" style="display: none;">--%>
 
+<%--					</div>--%>
 
+<%--				</div>--%>
 
+<%--			</div>--%>
 
 
 
 		</form:form>
 
 		</form:form>
 
 
 
@@ -703,7 +727,25 @@
 
 	</div>
 
 	</div>
 
 </div>
 
 </div>
 
 <script>
 
 <script>
 
-	function openBill2(title,url,width,height,target,formId,tableId){
 
+	$(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);
 
+				}
 
+			});
 
+		});
 
+	})
 
+		function openBill2(title,url,width,height,target,formId,tableId){
 
 		var rows = $(this).parent().prevAll().length + 1;
 
 		var rows = $(this).parent().prevAll().length + 1;
 
 		var frameIndex = parent.layer.getFrameIndex(window.name);
 
 		var frameIndex = parent.layer.getFrameIndex(window.name);
 
 		var urls = url+"&index="+frameIndex;
 
 		var urls = url+"&index="+frameIndex;

+ 47 - 7
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedAudit.jsp
View File 

@@ -6,6 +6,8 @@
 
     <meta name="decorator" content="default"/>
 
     <meta name="decorator" content="default"/>
 
     <script type="text/javascript" src="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.js"></script>
 
     <script type="text/javascript" src="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.js"></script>
 
     <script type="text/javascript" src="${ctxStatic}/iCheck/icheck.min.js"></script>
 
     <script type="text/javascript" src="${ctxStatic}/iCheck/icheck.min.js"></script>
 
+    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
 
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 
     <link rel='stylesheet' type="text/css" href="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.css"/>
 
     <link rel='stylesheet' type="text/css" href="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.css"/>
 
     <style>
 
     <style>
 
         #projectDesc-error{
 
         #projectDesc-error{
 
@@ -982,17 +984,38 @@
 
                     </div>
 
                     </div>
 
                 </div>
 
                 </div>
 
             </div>
 
             </div>
 
-
 
-            <div class="form-group layui-row lw8">
 
+            <div class="form-group layui-row">
 
                 <div class="form-group-label"><h2>审批意见</h2></div>
 
                 <div class="form-group-label"><h2>审批意见</h2></div>
 
-                <div class="layui-item layui-col-sm12  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 path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
 
                         <input type="file" name="upload_files" style="display: none;">
 
                         <input type="file" name="upload_files" style="display: none;">
 
                     </div>
 
                     </div>
 
                 </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>
 
+<%--            <div class="form-group layui-row lw8">--%>
 
+<%--                <div class="form-group-label"><h2>审批意见</h2></div>--%>
 
+<%--                <div class="layui-item layui-col-sm12  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>--%>
 
 
 
             <div class="form-group layui-row">
 
             <div class="form-group layui-row">
 
                 <div class="form-group-label"><h2>审批流程</h2></div>
 
                 <div class="form-group-label"><h2>审批流程</h2></div>
 
@@ -1008,7 +1031,24 @@
 
 
 
 <script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
 
 <script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
 
 <script>
 
 <script>
 
-
 
+    $(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);
 
+                }
 
+            });
 
+        });
 
+    })
 
     layui.use(['table','form'], function(){
 
     layui.use(['table','form'], function(){
 
 
 
         var form = layui.form;
 
         var form = layui.form;

+ 50 - 6
src/main/webapp/webpage/modules/workContractBorrow/workContractBorrowAudit.jsp
View File 

@@ -5,6 +5,8 @@
 
 	<title>合同归档管理</title>
 
 	<title>合同归档管理</title>
 
 	<meta name="decorator" content="default"/>
 
 	<meta name="decorator" content="default"/>
 
 	<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>
 
 	<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">
 
 	<script type="text/javascript">
 
 		var validateForm;
 
 		var validateForm;
 
 		function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
 
 		function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
 
@@ -64,7 +66,7 @@
 
 <body >
 
 <body >
 
 <div class="single-form">
 
 <div class="single-form">
 
 	<div class="container">
 
 	<div class="container">
 
-		<form:form id="inputForm" modelAttribute="workContractBorrow" action="${ctx}/workContractBorrow/workContractBorrow/saveAudit" method="post" class="form-horizontal">
 
+		<form:form id="inputForm" modelAttribute="workContractBorrow" action="${ctx}/workContractBorrow/workContractBorrow/saveAudit" method="post" class="form-horizontal layui-form">
 
 			<form:hidden path="id"/>
 
 			<form:hidden path="id"/>
 
 			<form:hidden path="workContractInfo.id"/>
 
 			<form:hidden path="workContractInfo.id"/>
 
 			<form:hidden path="home"/>
 
 			<form:hidden path="home"/>
 
@@ -174,15 +176,37 @@
 
 					</table>
 
 					</table>
 
 				</div>
 
 				</div>
 
 			</div>--%>
 
 			</div>--%>
 
-			<div class="form-group layui-row lw8">
 
+<%--			<div class="form-group layui-row lw8">--%>
 
+<%--				<div class="form-group-label"><h2>审批意见</h2></div>--%>
 
+<%--				<div class="layui-item layui-col-sm12  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>--%>
 
+			<div class="form-group layui-row">
 
 				<div class="form-group-label"><h2>审批意见</h2></div>
 
 				<div class="form-group-label"><h2>审批意见</h2></div>
 
-				<div class="layui-item layui-col-sm12  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 path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
 
 						<input type="file" name="upload_files" style="display: none;">
 
 						<input type="file" name="upload_files" style="display: none;">
 
 					</div>
 
 					</div>
 
 				</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>
 
 			<div class="form-group layui-row">
 
 			<div class="form-group layui-row">
 
 				<div class="form-group-label"><h2>审批流程</h2></div>
 
 				<div class="form-group-label"><h2>审批流程</h2></div>
 
@@ -195,5 +219,25 @@
 
 		</form:form>
 
 		</form:form>
 
 	</div>
 
 	</div>
 
 </div>
 
 </div>
 
+<script>
 
+	$(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);
 
+				}
 
+			});
 
+		});
 
+	})
 
+</script>
 
 </body>
 
 </body>
 
 </html>
 
 </html>

+ 44 - 4
src/main/webapp/webpage/modules/workcontractinfo/workContractAudit.jsp
View File 

@@ -211,14 +211,36 @@
 
                 </div>
 
                 </div>
 
                 <div class="form-group layui-row">
 
                 <div class="form-group layui-row">
 
                     <div class="form-group-label"><h2>审批意见</h2></div>
 
                     <div class="form-group-label"><h2>审批意见</h2></div>
 
-                    <div class="layui-item layui-col-xs12 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 path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
 
                             <input type="file" name="upload_files" style="display: none;">
 
                             <input type="file" name="upload_files" style="display: none;">
 
                         </div>
 
                         </div>
 
                     </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>
 
+<%--                <div class="form-group layui-row">--%>
 
+<%--                    <div class="form-group-label"><h2>审批意见</h2></div>--%>
 
+<%--                    <div class="layui-item layui-col-xs12 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>--%>
 
 
 
             </form:form>
 
             </form:form>
 
         <div class="form-group layui-row">
 
         <div class="form-group layui-row">
 
@@ -230,6 +252,24 @@
 
         </div>
 
         </div>
 
     </div>
 
     </div>
 
     <script>
 
     <script>
 
+        $(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);
 
+                    }
 
+                });
 
+            });
 
+        })
 
         layui.use('form', function () {
 
         layui.use('form', function () {
 
             var form = layui.form;
 
             var form = layui.form;
 
             form.render();
 
             form.render();

+ 50 - 6
src/main/webapp/webpage/modules/workcontractrecord/workContractRecordAudit.jsp
View File 

@@ -5,6 +5,8 @@
 
 	<title>合同归档管理</title>
 
 	<title>合同归档管理</title>
 
 	<meta name="decorator" content="default"/>
 
 	<meta name="decorator" content="default"/>
 
 	<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>
 
 	<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">
 
 	<script type="text/javascript">
 
 		var validateForm;
 
 		var validateForm;
 
 		function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
 
 		function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
 
@@ -92,7 +94,7 @@
 
 <body >
 
 <body >
 
 <div class="single-form">
 
 <div class="single-form">
 
 	<div class="container">
 
 	<div class="container">
 
-		<form:form id="inputForm" modelAttribute="workContractRecord" action="${ctx}/workcontractrecord/workContractRecord/saveAudit" method="post" class="form-horizontal">
 
+		<form:form id="inputForm" modelAttribute="workContractRecord" action="${ctx}/workcontractrecord/workContractRecord/saveAudit" method="post" class="form-horizontal layui-form">
 
 			<form:hidden path="id"/>
 
 			<form:hidden path="id"/>
 
 			<form:hidden path="workContractInfo.id"/>
 
 			<form:hidden path="workContractInfo.id"/>
 
 			<form:hidden path="home"/>
 
 			<form:hidden path="home"/>
 
@@ -219,15 +221,37 @@
 
 					</table>
 
 					</table>
 
 				</div>
 
 				</div>
 
 			</div>
 
 			</div>
 
-			<div class="form-group layui-row lw8">
 
+<%--			<div class="form-group layui-row lw8">--%>
 
+<%--				<div class="form-group-label"><h2>审批意见</h2></div>--%>
 
+<%--				<div class="layui-item layui-col-sm12  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>--%>
 
+			<div class="form-group layui-row">
 
 				<div class="form-group-label"><h2>审批意见</h2></div>
 
 				<div class="form-group-label"><h2>审批意见</h2></div>
 
-				<div class="layui-item layui-col-sm12  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 path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
 
 						<input type="file" name="upload_files" style="display: none;">
 
 						<input type="file" name="upload_files" style="display: none;">
 
 					</div>
 
 					</div>
 
 				</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>
 
 			<div class="form-group layui-row">
 
 			<div class="form-group layui-row">
 
 				<div class="form-group-label"><h2>审批流程</h2></div>
 
 				<div class="form-group-label"><h2>审批流程</h2></div>
 
@@ -240,5 +264,25 @@
 
 		</form:form>
 
 		</form:form>
 
 	</div>
 
 	</div>
 
 </div>
 
 </div>
 
+<script>
 
+	$(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);
 
+				}
 
+			});
 
+		});
 
+	})
 
+</script>
 
 </body>
 
 </body>
 
 </html>
 
 </html>

+ 47 - 5
src/main/webapp/webpage/modules/workinvoice/workInvoiceAuditEnd.jsp
View File 

@@ -4,6 +4,8 @@
 
 <head>
 
 <head>
 
 	<title>发票审批</title>
 
 	<title>发票审批</title>
 
 	<meta name="decorator" content="default"/>
 
 	<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">
 
 	<script type="text/javascript">
 
 		var validateForm;
 
 		var validateForm;
 
         var count = 0;
 
         var count = 0;
 
@@ -424,7 +426,7 @@
 
 <body>
 
 <body>
 
 <div class="single-form">
 
 <div class="single-form">
 
 	<div class="container">
 
 	<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="id"/>
 
 		<form:hidden path="home"/>
 
 		<form:hidden path="home"/>
 
 		<form:hidden path="act.taskId"/>
 
 		<form:hidden path="act.taskId"/>
 
@@ -561,12 +563,34 @@
 
 							value="${workInvoice.takeDate}" pattern="yyyy-MM-dd"/>">
 
 							value="${workInvoice.takeDate}" pattern="yyyy-MM-dd"/>">
 
 				</div>
 
 				</div>
 
 			</div>
 
 			</div>
 
-			<div class="layui-item layui-col-sm12 with-textarea">
 
-				<label class="layui-form-label">审批意见：</label>
 
-				<div class="layui-input-block">
 
-					<form:textarea path="act.comment" class="form-control " rows="5" maxlength="20"/>
 
+			<div class="form-group layui-row">
 
+				<div class="form-group-label"><h2>审批意见</h2></div>
 
+				<div class="layui-item layui-col-sm8 lw6 with-textarea">
 
+					<div class="layui-input-block" style="margin-left:10px;">
 
+						<form:textarea 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>
 
 			</div>
 
+<%--			<div class="layui-item layui-col-sm12 with-textarea">--%>
 
+<%--				<label class="layui-form-label">审批意见：</label>--%>
 
+<%--				<div class="layui-input-block">--%>
 
+<%--					<form:textarea path="act.comment" class="form-control " rows="5" maxlength="20"/>--%>
 
+<%--				</div>--%>
 
+<%--			</div>--%>
 
 		</div>
 
 		</div>
 
 		<div class="form-group layui-row">
 
 		<div class="form-group layui-row">
 
 			<div class="form-group-label"><h2>发票明细</h2></div>
 
 			<div class="form-group-label"><h2>发票明细</h2></div>
 
@@ -648,6 +672,24 @@
 
 							</tr>//-->
 
 							</tr>//-->
 
 				</script>
 
 				</script>
 
 				<script type="text/javascript">
 
 				<script type="text/javascript">
 
+					$(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);
 
+								}
 
+							});
 
+						});
 
+					})
 
 					var workAccountListRowIdx = 0, workAccountListTpl = $("#workAccountListTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
 
 					var workAccountListRowIdx = 0, workAccountListTpl = $("#workAccountListTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
 
 					$(document).ready(function() {
 
 					$(document).ready(function() {
 
 						var data = ${fns:toJson(workInvoice.workAccountList)};
 
 						var data = ${fns:toJson(workInvoice.workAccountList)};

+ 50 - 6
src/main/webapp/webpage/modules/workreimbursement/workReimbursementAudit.jsp
View File 

@@ -4,6 +4,8 @@
 
 <head>
 
 <head>
 
 	<title>报销审核</title>
 
 	<title>报销审核</title>
 
 	<meta name="decorator" content="default"/>
 
 	<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">
 
 	<script type="text/javascript">
 
 		var validateForm;
 
 		var validateForm;
 
 		function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
 
 		function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
 
@@ -68,7 +70,7 @@
 
 <body>
 
 <body>
 
 <div class="single-form">
 
 <div class="single-form">
 
 	<div class="container view-form">
 
 	<div class="container view-form">
 
-	<form:form id="inputForm" modelAttribute="workReimbursement" enctype="multipart/form-data" action="${ctx}/workreimbursement/workReimbursement/saveAudit" method="post" class="form-horizontal">
 
+	<form:form id="inputForm" modelAttribute="workReimbursement" enctype="multipart/form-data" action="${ctx}/workreimbursement/workReimbursement/saveAudit" method="post" class="form-horizontal layui-form">
 
 		<form:hidden path="id"/>
 
 		<form:hidden path="id"/>
 
 		<form:hidden path="home"/>
 
 		<form:hidden path="home"/>
 
 		<form:hidden path="act.taskId"/>
 
 		<form:hidden path="act.taskId"/>
 
@@ -428,14 +430,36 @@
 
 		</div>
 
 		</div>
 
 		<div class="form-group layui-row">
 
 		<div class="form-group layui-row">
 
 			<div class="form-group-label"><h2>审批意见</h2></div>
 
 			<div class="form-group-label"><h2>审批意见</h2></div>
 
-			<div class="layui-item layui-col-xs12 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 class="layui-item layui-col-sm8 lw6 with-textarea">
 
+				<div class="layui-input-block" style="margin-left:10px;">
 
+					<form:textarea 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>
 
 		</div>
 
 		</div>
 
+<%--		<div class="form-group layui-row">--%>
 
+<%--			<div class="form-group-label"><h2>审批意见</h2></div>--%>
 
+<%--			<div class="layui-item layui-col-xs12 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>--%>
 
 		<div class="form-group layui-row">
 
 		<div class="form-group layui-row">
 
 			<div class="form-group-label"><h2>审批流程</h2></div>
 
 			<div class="form-group-label"><h2>审批流程</h2></div>
 
 			<div class="layui-item layui-col-xs12 form-table-container" >
 
 			<div class="layui-item layui-col-xs12 form-table-container" >
 
@@ -448,6 +472,26 @@
 
 	</form:form>
 
 	</form:form>
 
 </div>
 
 </div>
 
 </div>
 
 </div>
 
+<script>
 
+	$(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);
 
+				}
 
+			});
 
+		});
 
+	})
 
+</script>
 
 </body>
 
 </body>
 
 </html>
 
 </html>

+ 53 - 9
src/main/webapp/webpage/modules/workreimbursement/workReimbursementCWAudit.jsp
View File 

@@ -4,6 +4,8 @@
 
 <head>
 
 <head>
 
     <title>报销审核</title>
 
     <title>报销审核</title>
 
     <meta name="decorator" content="default"/>
 
     <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">
 
     <script type="text/javascript">
 
         var validateForm;
 
         var validateForm;
 
         var state;//考核科目显示隐藏
 
         var state;//考核科目显示隐藏
 
@@ -251,7 +253,7 @@
 
 <body>
 
 <body>
 
 <div class="single-form">
 
 <div class="single-form">
 
     <div class="container view-form">
 
     <div class="container view-form">
 
-        <form:form id="inputForm" modelAttribute="workReimbursement" enctype="multipart/form-data" action="${ctx}/workreimbursement/workReimbursement/saveAudit" method="post" class="form-horizontal">
 
+        <form:form id="inputForm" modelAttribute="workReimbursement" enctype="multipart/form-data" action="${ctx}/workreimbursement/workReimbursement/saveAudit" method="post" class="form-horizontal layui-form">
 
         <form:hidden path="id"/>
 
         <form:hidden path="id"/>
 
         <form:hidden path="home"/>
 
         <form:hidden path="home"/>
 
         <form:hidden path="ext"/>
 
         <form:hidden path="ext"/>
 
@@ -745,16 +747,38 @@
 
                 </table>
 
                 </table>
 
             </div>
 
             </div>
 
         </div>
 
         </div>
 
-        <div class="form-group layui-row">
 
-            <div class="form-group-label"><h2>审批意见</h2></div>
 
-            <div class="layui-item layui-col-xs12 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 class="form-group layui-row">
 
+                <div class="form-group-label"><h2>审批意见</h2></div>
 
+                <div class="layui-item layui-col-sm8 lw6 with-textarea">
 
+                    <div class="layui-input-block" style="margin-left:10px;">
 
+                        <form:textarea 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>
 
             </div>
 
-        </div>
 
+<%--        <div class="form-group layui-row">--%>
 
+<%--            <div class="form-group-label"><h2>审批意见</h2></div>--%>
 
+<%--            <div class="layui-item layui-col-xs12 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>--%>
 
         <div class="form-group layui-row">
 
         <div class="form-group layui-row">
 
             <div class="form-group-label"><h2>审批流程</h2></div>
 
             <div class="form-group-label"><h2>审批流程</h2></div>
 
             <div class="layui-item layui-col-xs12 form-table-container" >
 
             <div class="layui-item layui-col-xs12 form-table-container" >
 
@@ -766,6 +790,26 @@
 
         </form:form>
 
         </form:form>
 
     </div>
 
     </div>
 
 </div>
 
 </div>
 
+<script>
 
+    $(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);
 
+                }
 
+            });
 
+        });
 
+    })
 
+</script>
 
 </body>
 
 </body>
 
 </html>
 
 </html>