Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/workinvoice/service/WorkInvoiceService.java

@@ -236,14 +236,16 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 	public void updateWorkInvoiceProjectRelationInfo(WorkInvoice workInvoice) {
 		//根据开票id删除所有开票项目 关联信息
 		dao.deleteProjectRelation(workInvoice.getId());
-		for (WorkInvoiceProjectRelation projectRelation : workInvoice.getWorkInvoiceProjectRelationList()){
-			if (StringUtils.isBlank(projectRelation.getProjectId())){
-				continue;
-			}
-			projectRelation.setInvoiceId(workInvoice.getId());
-			//新增开票和项目关联信息
-			if (WorkInvoiceReceipt.DEL_FLAG_NORMAL.equals(projectRelation.getDelFlag())) {
-				dao.insertProjectRelation(projectRelation);
+		if (null!=workInvoice.getWorkInvoiceProjectRelationList()){
+			for (WorkInvoiceProjectRelation projectRelation : workInvoice.getWorkInvoiceProjectRelationList()){
+				if (StringUtils.isBlank(projectRelation.getProjectId())){
+					continue;
+				}
+				projectRelation.setInvoiceId(workInvoice.getId());
+				//新增开票和项目关联信息
+				if (WorkInvoiceReceipt.DEL_FLAG_NORMAL.equals(projectRelation.getDelFlag())) {
+					dao.insertProjectRelation(projectRelation);
+				}
 			}
 		}
 	}

src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceAllController.java

@@ -146,6 +146,15 @@ public class WorkInvoiceAllController extends BaseController {
 		return "modules/workinvoice/workInvoiceAllList";
 	}
 	/**
+	 * 开票管理列表页面
+	 */
+	@RequestMapping(value = "projectview")
+	public String view(WorkInvoice invoice, HttpServletRequest request, HttpServletResponse response, Model model) {
+		invoice.setWorkInvoiceProjectRelationList(invoiceService.getProjectRelation(invoice));
+		model.addAttribute("WorkInvoice", invoice);
+		return "modules/workinvoice/workInvoiceProjectView";
+	}
+	/**
 	 * 工单执行（完成任务）
 	 * @param
 	 * @param model
@@ -406,9 +415,9 @@ public class WorkInvoiceAllController extends BaseController {
 //		try {
 			Map<String, Object> variables = Maps.newHashMap();
 			WorkClientInfo workClientInfo =workClientInfoService.get(workInvoice.getClient().getId());
-			ProjectRecords workProject =projectRecordsService.getRuralProjectRecodes(workInvoice.getProject().getId());
+//			ProjectRecords workProject =projectRecordsService.getRuralProjectRecodes(workInvoice.getProject().getId());
 			workInvoice.setClient(workClientInfo);
-			workInvoice.setProject(workProject);
+//			workInvoice.setProject(workProject);
 			workInvoice.setCompanyId(UserUtils.getSelectCompany().getId());
 			workInvoice.setOfficeId(UserUtils.getSelectOffice().getId());
 			String str = "";

src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceController.java

@@ -167,6 +167,15 @@ public class WorkInvoiceController extends BaseController {
 		return "modules/workinvoice/workInvoiceList";
 	}
 	/**
+	 * 开票管理列表页面-项目查看
+	 */
+	@RequestMapping(value = "projectview")
+	public String view(WorkInvoice invoice, HttpServletRequest request, HttpServletResponse response, Model model) {
+		invoice.setWorkInvoiceProjectRelationList(workInvoiceService.getProjectRelation(invoice));
+		model.addAttribute("WorkInvoice", invoice);
+		return "modules/workinvoice/workInvoiceProjectView";
+	}
+	/**
 	 * 工单执行（完成任务）
 	 * @param
 	 * @param model

src/main/java/com/jeeplus/modules/workreimbursement/web/WorkReimbursementAllController.java

@@ -175,7 +175,7 @@ public class WorkReimbursementAllController extends BaseController {
 //	@RequiresPermissions(value={"workreimbursement:workReimbursementAll:add","workreimbursement:workReimbursementAll:edit"})
 	@RequestMapping(value = "form")
 	public String form(WorkReimbursement workReimbursement,Model model) {
-		String view = "workReimbursementAllFormAdd";
+		String view = "workReimbursementFormAdd";
 		Office office = UserUtils.getSelectOffice();
 		String tabId = request.getParameter("tabId");
 		//判断报销类型状态并添加报销类型信息数据

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

@@ -26,7 +26,7 @@
 	<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}"/>
+		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>
 	             </button>

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

@@ -26,7 +26,7 @@
 	<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}"/>
+		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>
 	             </button> 

src/main/webapp/static/common/html/js/script.js

@@ -360,4 +360,25 @@ $(document).ready(function () {
     
 });
 
-    //添加进去的元素如何转化成公式
+    //添加进去的元素如何转化成公式
+
+//暂存无需判断，则送审时需要判断
+function judgment(){
+    var flag1=true;
+    $(".judgment").each(function(){
+        var zhi=$(this).val();
+        var s=$(this).parent().html();
+        if (''==zhi || null == zhi){
+            $(this).css("border","1px solid red")
+            flag1=false;
+        }else{
+            $(this).css("border","1px solid #f1f1f1")
+        }
+    });
+    if (!flag1){
+        parent.layer.msg("信息未填写完整!", {icon: 5});
+        return false;
+    }else{
+        return true;
+    }
+}

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

@@ -7,6 +7,7 @@
 
     <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}/common/html/js/script.js"></script>
     <style type="text/css">
         img {width: 50px; height: 50px;}
     </style>
@@ -17,16 +18,6 @@
         var validateForm;
         function doSubmit(i){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             //var remarks = CKEDITOR.instances.content.getData();
-            var content = CKEDITOR.instances.contents.document.getBody().getText();
-            while (content.indexOf("img{max-width:100%!important;") != -1){
-                content = content.replace("img{max-width:100%!important;}","");
-            }
-            $("#content").val(content);
-            console.log(content+","+(content == null)+(content == undefined)+(content == ""));
-            if(content == null || content == undefined || content == "" || content == "\n"){
-                parent.layer.msg('公告内容不能为空',{icon:5});
-                return false;
-            }
             var startDate = new Date($("#startDate").val());
             var endDate = new Date($("#endDate").val());
 
@@ -37,6 +28,21 @@
             if(validateForm.form()){
                 if(i==2){
                     $("#inputForm").attr("action","${ctx}/oa/oaNotify/tstore");
+                }else{
+                    var content = CKEDITOR.instances.contents.document.getBody().getText();
+                    while (content.indexOf("img{max-width:100%!important;") != -1){
+                        content = content.replace("img{max-width:100%!important;}","");
+                    }
+                    $("#content").val(content);
+                    console.log(content+","+(content == null)+(content == undefined)+(content == ""));
+                    if(content == null || content == undefined || content == "" || content == "\n"){
+                        parent.layer.msg('公告内容不能为空',{icon:5});
+                        return false;
+                    }
+                    var flag=judgment();
+                    if (!flag){
+                        return flag;
+                    }
                 }
                 $("#inputForm").submit();
                 return true;
@@ -186,7 +192,7 @@
                 <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" placeholder="请输入公告标题" maxlength="30" class="form-control required layui-input"/>
+                        <form:input path="title" htmlEscape="false" placeholder="请输入公告标题" maxlength="30" class="form-control judgment layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
@@ -198,7 +204,7 @@
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label"><span class="require-item">*</span>公告类型：</label>
                     <div class="layui-input-block">
-                        <form:select path="type" class="form-control required simple-select">
+                        <form:select path="type" class="form-control judgment simple-select">
                             <form:options items="${fns:getMainDictList('oa_notify_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
                     </div>
@@ -235,7 +241,7 @@
                     <label class="layui-form-label"><span class="require-item">*</span>内容：</label>
                     <div class="layui-input-block">
                         <form:textarea path="contents" htmlEscape="false"  colspan="3" rows="6"  maxlength="550" class="form-control "/>
-                        <form:hidden id="content" path="content" htmlEscape="false" maxlength="64" class="form-control required"/>
+                        <form:hidden id="content" path="content" htmlEscape="false" maxlength="64" class="form-control judgment"/>
                         <sys:ckeditor replace="contents" uploadPath="/oa/oa"/>
                     </div>
                 </div>
@@ -244,7 +250,7 @@
                 <div class="form-group-label"><h2>公告范围-部门</h2></div>
                 <div class="layui-item nav-btns">
                     <sys:treeselectoffices id="offices" name="" value="" labelName="memberNameStr" labelValue=""
-                                           retnParent="true" checked="true" notAllowSelectParent="true" title="部门" url="/sys/office/treeData?type=2"  cssClass="form-control required" allowClear="true"/>
+                                           retnParent="true" checked="true" notAllowSelectParent="true" title="部门" url="/sys/office/treeData?type=2"  cssClass="form-control " allowClear="true"/>
                 </div>
                 <table id="officeTable" class="table table-bordered table-condensed details">
                     <thead>
@@ -275,7 +281,7 @@
                 <div class="form-group-label"><h2>公告范围-成员</h2></div>
                 <div class="layui-item nav-btns">
                     <sys:treeselectusers id="users" name="" value="" labelName="memberNameStr" labelValue=""
-                                         retnParent="true" title="用户" url="/sys/office/treeData?type=3" checked="true" cssClass="form-control required" allowClear="true" notAllowSelectParent="true"/>
+                                         retnParent="true" title="用户" url="/sys/office/treeData?type=3" checked="true" cssClass="form-control " allowClear="true" notAllowSelectParent="true"/>
                 </div>
                 <table id="userTable" class="table table-bordered table-condensed details">
                     <thead>

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

@@ -7,12 +7,17 @@
 	<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 src="${ctxStatic}/common/html/js/script.js"></script>
 	<script type="text/javascript">
 		var validateForm;
 		function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
                 if(obj == 1) {
                     $("#flag").val("yes");
+					var flags=judgment();
+					if (!flags){
+						return flags;
+					}
                     /*if($("#taskDefKey").val()== "projectplan" && $(".trIdAdds").length==0){
                         top.layer.alert('请至少上传一个项目计划表或者实施方案文档！', {icon: 0});
                         return;
@@ -252,7 +257,7 @@
 					<label class="layui-form-label double-line"><span class="require-item">*</span>项目负责人：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:inquireselectUser id="master" name="projectLeaders" value="${projectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${projectRecords.leaderNameStr}"
-                                         title="用户" url="/sys/office/treeDataAll?type=3" checked="true" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                         title="用户" url="/sys/office/treeDataAll?type=3" checked="true" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
 				</div>
 				<%--新添代码--%>

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

@@ -8,6 +8,7 @@
     <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}/layui/layui.js"></script>
+    <script src="${ctxStatic}/common/html/js/script.js"></script>
 
     <link rel='stylesheet' type="text/css" href="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.css"/>
     <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
@@ -45,6 +46,11 @@
                 }*/
                 if(i==2){
                     $("#inputForm").attr("action","${ctx}/project/projectRecords/tstore");
+                }else if (i==1){
+                    var flags=judgment();
+                    if (!flags){
+                        return flags;
+                    }
                 }
                 $("#inputForm").submit();
                 return true;
@@ -1176,7 +1182,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}"
-                                     cssStyle="background-color:#fff"   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 judgment layui-input" allowClear="true" notAllowSelectParent="false"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -1240,7 +1246,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">创建日期：</label>
                     <div class="layui-input-block">
-                        <input id="createDate" name="createDate" htmlEscape="false"  value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>" readonly="readonly"  class="form-control required layui-input"/>
+                        <input id="createDate" name="createDate" htmlEscape="false"  value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>" readonly="readonly"  class="form-control judgment layui-input"/>
                     </div>
                 </div>
                 <%--<div class="layui-item layui-col-sm6 lw7">

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectReportRecord/projectReportRecordForm.jsp

@@ -45,114 +45,111 @@
         function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
 				var projectId = '${project.id}';
-				var leng = $("#file_attachment tr").length;
-				var boolFlag = true;
-				for(var i=0; i<leng; i++) {
-					var numberStr = $("#file_attachment tr").eq(i).find("td:first").html();
-					var second = $("#file_attachment tr").eq(i).find("td:eq(1)").html();
-					var fileFlag = $("#file_attachment tr").eq(i).find("td:last").html();
-					if(second == 1){
-						if(numberStr != undefined && numberStr !=null && numberStr !=''){
-							if (fileFlag==1){
+					if(obj == 2){
+						//$("#inputForm").attr("action","${ctx}/projectcontentinfo/projectReportRecord/store");
+						$("#inputForm").attr("action","${ctx}/ruralProject/ruralCostProjectMessage/holdSaveRecord");
+					}else{
+						var leng = $("#file_attachment tr").length;
+						for(var i=0; i<leng; i++) {
+							var numberStr = $("#file_attachment tr").eq(i).find("td:first").html();
+							var second = $("#file_attachment tr").eq(i).find("td:eq(1)").html();
+							var fileFlag = $("#file_attachment tr").eq(i).find("td:last").html();
+							if(second == 1){
+								if(numberStr != undefined && numberStr !=null && numberStr !=''){
+									if (fileFlag==1){
 
-							}else{
-								top.layer.msg("请上传成果文件！", {icon: 0});
-								return false;
+									}else{
+										top.layer.msg("请上传成果文件！", {icon: 0});
+										return false;
+									}
+									<%--$.ajax({--%>
+									<%--	type: 'post',--%>
+									<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
+									<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
+									<%--	dataType: "json",--%>
+									<%--	async: false--%>
+									<%--}).success(function (result) {--%>
+									<%--	if(result == 0){--%>
+									<%--		boolFlag = false;--%>
+									<%--		top.layer.msg("请上传成果文件！", {icon: 0});--%>
+									<%--		return false;--%>
+									<%--	}--%>
+									<%--}).error(function () {--%>
+									<%--	top.layer.msg("文件载入失败！");--%>
+									<%--});--%>
+								}
 							}
-							<%--$.ajax({--%>
-							<%--	type: 'post',--%>
-							<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
-							<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
-							<%--	dataType: "json",--%>
-							<%--	async: false--%>
-							<%--}).success(function (result) {--%>
-							<%--	if(result == 0){--%>
-							<%--		boolFlag = false;--%>
-							<%--		top.layer.msg("请上传成果文件！", {icon: 0});--%>
-							<%--		return false;--%>
-							<%--	}--%>
-							<%--}).error(function () {--%>
-							<%--	top.layer.msg("文件载入失败！");--%>
-							<%--});--%>
 						}
-					}
-				}
-				if(boolFlag){
-					var gistdata = $("#file_gistdata tr").length;
-					for(var i=0; i<gistdata; i++) {
-						var numberStr = $("#file_gistdata tr").eq(i).find("td:first").html();
-						var second = $("#file_gistdata tr").eq(i).find("td:eq(1)").html();
-						var fileFlag = $("#file_gistdata tr").eq(i).find("td:last").html();
-						if(second == 1){
-							if(numberStr != undefined && numberStr !=null && numberStr !=''){
-								if (fileFlag==1){
+						if(boolFlag){
+							var gistdata = $("#file_gistdata tr").length;
+							for(var i=0; i<gistdata; i++) {
+								var numberStr = $("#file_gistdata tr").eq(i).find("td:first").html();
+								var second = $("#file_gistdata tr").eq(i).find("td:eq(1)").html();
+								var fileFlag = $("#file_gistdata tr").eq(i).find("td:last").html();
+								if(second == 1){
+									if(numberStr != undefined && numberStr !=null && numberStr !=''){
+										if (fileFlag==1){
 
-								}else{
-									top.layer.msg("请上传依据性文件！", {icon: 0});
-									return false;
+										}else{
+											top.layer.msg("请上传依据性文件！", {icon: 0});
+											return false;
+										}
+										<%--$.ajax({--%>
+										<%--	type: 'post',--%>
+										<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
+										<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
+										<%--	dataType: "json",--%>
+										<%--	async: false--%>
+										<%--}).success(function (result) {--%>
+										<%--	if(result == 0){--%>
+										<%--		boolFlag = false;--%>
+										<%--		top.layer.msg("请上传依据性文件！", {icon: 0});--%>
+										<%--		return false;--%>
+										<%--	}--%>
+										<%--}).error(function () {--%>
+										<%--	top.layer.msg("文件载入失败！");--%>
+										<%--});--%>
+									}
 								}
-								<%--$.ajax({--%>
-								<%--	type: 'post',--%>
-								<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
-								<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
-								<%--	dataType: "json",--%>
-								<%--	async: false--%>
-								<%--}).success(function (result) {--%>
-								<%--	if(result == 0){--%>
-								<%--		boolFlag = false;--%>
-								<%--		top.layer.msg("请上传依据性文件！", {icon: 0});--%>
-								<%--		return false;--%>
-								<%--	}--%>
-								<%--}).error(function () {--%>
-								<%--	top.layer.msg("文件载入失败！");--%>
-								<%--});--%>
 							}
 						}
-					}
-				}
-				if(boolFlag){
-					var other = $("#file_other tr").length;
-					for(var i=0; i<other; i++) {
-						var numberStr = $("#file_other tr").eq(i).find("td:first").html();
-						var second = $("#file_other tr").eq(i).find("td:eq(1)").html();
-						var fileFlag = $("#file_other tr").eq(i).find("td:last").html();
-						if(second == 1){
-							if(numberStr != undefined && numberStr !=null && numberStr !=''){
-								if (fileFlag==1){
+						if(boolFlag){
+							var other = $("#file_other tr").length;
+							for(var i=0; i<other; i++) {
+								var numberStr = $("#file_other tr").eq(i).find("td:first").html();
+								var second = $("#file_other tr").eq(i).find("td:eq(1)").html();
+								var fileFlag = $("#file_other tr").eq(i).find("td:last").html();
+								if(second == 1){
+									if(numberStr != undefined && numberStr !=null && numberStr !=''){
+										if (fileFlag==1){
 
-								}else{
-									top.layer.msg("请上传其它文件！", {icon: 0});
-									return false;
+										}else{
+											top.layer.msg("请上传其它文件！", {icon: 0});
+											return false;
+										}
+										<%--$.ajax({--%>
+										<%--	type: 'post',--%>
+										<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
+										<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
+										<%--	dataType: "json",--%>
+										<%--	async: false--%>
+										<%--}).success(function (result) {--%>
+										<%--	if(result == 0){--%>
+										<%--		boolFlag = false;--%>
+										<%--		top.layer.msg("请上传其他文件！", {icon: 0});--%>
+										<%--		return false;--%>
+										<%--	}--%>
+										<%--}).error(function () {--%>
+										<%--	top.layer.msg("文件载入失败！");--%>
+										<%--});--%>
+									}
 								}
-								<%--$.ajax({--%>
-								<%--	type: 'post',--%>
-								<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
-								<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
-								<%--	dataType: "json",--%>
-								<%--	async: false--%>
-								<%--}).success(function (result) {--%>
-								<%--	if(result == 0){--%>
-								<%--		boolFlag = false;--%>
-								<%--		top.layer.msg("请上传其他文件！", {icon: 0});--%>
-								<%--		return false;--%>
-								<%--	}--%>
-								<%--}).error(function () {--%>
-								<%--	top.layer.msg("文件载入失败！");--%>
-								<%--});--%>
 							}
 						}
-					}
-				}
-				if(boolFlag){
-					if(obj == 2){
-						//$("#inputForm").attr("action","${ctx}/projectcontentinfo/projectReportRecord/store");
-						$("#inputForm").attr("action","${ctx}/ruralProject/ruralCostProjectMessage/holdSaveRecord");
-					}else{
 						$("#inputForm").attr("action","${ctx}/ruralProject/ruralCostProjectMessage/saveRecord");
 					}
 					$("#inputForm").submit();
 					return true;
-				}
             }else {
                 parent.layer.msg("信息未填写完整!", {icon: 5});
             }

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectReportRecord/projectReportRecordModify.jsp

@@ -42,112 +42,112 @@
         function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
 				var projectId = '${project.id}';
-				var leng = $("#file_attachment tr").length;
 				var boolFlag = true;
-				for(var i=0; i<leng; i++) {
-					var numberStr = $("#file_attachment tr").eq(i).find("td:first").html();
-					var second = $("#file_attachment tr").eq(i).find("td:eq(1)").html();
-					var fileFlag = $("#file_attachment tr").eq(i).find("td:last").html();
+				if(boolFlag){
+					if(obj == 2){
+						//$("#inputForm").attr("action","${ctx}/projectcontentinfo/projectReportRecord/store");
+						$("#inputForm").attr("action","${ctx}/ruralProject/ruralCostProjectMessage/holdSaveRecord");
+					}else{
+						var leng = $("#file_attachment tr").length;
+						for(var i=0; i<leng; i++) {
+							var numberStr = $("#file_attachment tr").eq(i).find("td:first").html();
+							var second = $("#file_attachment tr").eq(i).find("td:eq(1)").html();
+							var fileFlag = $("#file_attachment tr").eq(i).find("td:last").html();
 
-					if(second == 1){
-						if(numberStr != undefined && numberStr !=null && numberStr !=''){
-							if (fileFlag==1){
+							if(second == 1){
+								if(numberStr != undefined && numberStr !=null && numberStr !=''){
+									if (fileFlag==1){
 
-							}else{
-								top.layer.msg("请上传成果文件！", {icon: 0});
-								return false;
+									}else{
+										top.layer.msg("请上传成果文件！", {icon: 0});
+										return false;
+									}
+									<%--$.ajax({--%>
+									<%--	type: 'post',--%>
+									<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
+									<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
+									<%--	dataType: "json",--%>
+									<%--	async: false--%>
+									<%--}).success(function (result) {--%>
+									<%--	if(result == 0){--%>
+									<%--		boolFlag = false;--%>
+									<%--		top.layer.msg("请上传成果文件！", {icon: 0});--%>
+									<%--		return false;--%>
+									<%--	}--%>
+									<%--}).error(function () {--%>
+									<%--	top.layer.msg("文件载入失败！");--%>
+									<%--});--%>
+								}
 							}
-							<%--$.ajax({--%>
-							<%--	type: 'post',--%>
-							<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
-							<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
-							<%--	dataType: "json",--%>
-							<%--	async: false--%>
-							<%--}).success(function (result) {--%>
-							<%--	if(result == 0){--%>
-							<%--		boolFlag = false;--%>
-							<%--		top.layer.msg("请上传成果文件！", {icon: 0});--%>
-							<%--		return false;--%>
-							<%--	}--%>
-							<%--}).error(function () {--%>
-							<%--	top.layer.msg("文件载入失败！");--%>
-							<%--});--%>
 						}
-					}
-				}
-				if(boolFlag){
-					var gistdata = $("#file_gistdata tr").length;
-					for(var i=0; i<gistdata; i++) {
-						var numberStr = $("#file_gistdata tr").eq(i).find("td:first").html();
-						var second = $("#file_gistdata tr").eq(i).find("td:eq(1)").html();
-						var fileFlag = $("#file_gistdata tr").eq(i).find("td:last").html();
+						if(boolFlag){
+							var gistdata = $("#file_gistdata tr").length;
+							for(var i=0; i<gistdata; i++) {
+								var numberStr = $("#file_gistdata tr").eq(i).find("td:first").html();
+								var second = $("#file_gistdata tr").eq(i).find("td:eq(1)").html();
+								var fileFlag = $("#file_gistdata tr").eq(i).find("td:last").html();
 
-						if(second == 1){
-							if(numberStr != undefined && numberStr !=null && numberStr !=''){
-								if (fileFlag==1){
+								if(second == 1){
+									if(numberStr != undefined && numberStr !=null && numberStr !=''){
+										if (fileFlag==1){
 
-								}else{
-									top.layer.msg("请上传依据性文件！", {icon: 0});
-									return false;
+										}else{
+											top.layer.msg("请上传依据性文件！", {icon: 0});
+											return false;
+										}
+										<%--$.ajax({--%>
+										<%--	type: 'post',--%>
+										<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
+										<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
+										<%--	dataType: "json",--%>
+										<%--	async: false--%>
+										<%--}).success(function (result) {--%>
+										<%--	if(result == 0){--%>
+										<%--		boolFlag = false;--%>
+										<%--		top.layer.msg("请上传依据性文件！", {icon: 0});--%>
+										<%--		return false;--%>
+										<%--	}--%>
+										<%--}).error(function () {--%>
+										<%--	top.layer.msg("文件载入失败！");--%>
+										<%--});--%>
+									}
 								}
-								<%--$.ajax({--%>
-								<%--	type: 'post',--%>
-								<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
-								<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
-								<%--	dataType: "json",--%>
-								<%--	async: false--%>
-								<%--}).success(function (result) {--%>
-								<%--	if(result == 0){--%>
-								<%--		boolFlag = false;--%>
-								<%--		top.layer.msg("请上传依据性文件！", {icon: 0});--%>
-								<%--		return false;--%>
-								<%--	}--%>
-								<%--}).error(function () {--%>
-								<%--	top.layer.msg("文件载入失败！");--%>
-								<%--});--%>
 							}
 						}
-					}
-				}
-				if(boolFlag){
-					var other = $("#file_other tr").length;
-					for(var i=0; i<other; i++) {
-						var numberStr = $("#file_other tr").eq(i).find("td:first").html();
-						var second = $("#file_other tr").eq(i).find("td:eq(1)").html();
-						var fileFlag = $("#file_other tr").eq(i).find("td:last").html();
+						if(boolFlag){
+							var other = $("#file_other tr").length;
+							for(var i=0; i<other; i++) {
+								var numberStr = $("#file_other tr").eq(i).find("td:first").html();
+								var second = $("#file_other tr").eq(i).find("td:eq(1)").html();
+								var fileFlag = $("#file_other tr").eq(i).find("td:last").html();
 
-						if(second == 1){
-							if(numberStr != undefined && numberStr !=null && numberStr !=''){
-								if (fileFlag==1){
+								if(second == 1){
+									if(numberStr != undefined && numberStr !=null && numberStr !=''){
+										if (fileFlag==1){
 
-								}else{
-									top.layer.msg("请上传其它文件！", {icon: 0});
-									return false;
+										}else{
+											top.layer.msg("请上传其它文件！", {icon: 0});
+											return false;
+										}
+										<%--$.ajax({--%>
+										<%--	type: 'post',--%>
+										<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
+										<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
+										<%--	dataType: "json",--%>
+										<%--	async: false--%>
+										<%--}).success(function (result) {--%>
+										<%--	if(result == 0){--%>
+										<%--		boolFlag = false;--%>
+										<%--		top.layer.msg("请上传其他文件！", {icon: 0});--%>
+										<%--		return false;--%>
+										<%--	}--%>
+										<%--}).error(function () {--%>
+										<%--	top.layer.msg("文件载入失败！");--%>
+										<%--});--%>
+									}
 								}
-								<%--$.ajax({--%>
-								<%--	type: 'post',--%>
-								<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
-								<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
-								<%--	dataType: "json",--%>
-								<%--	async: false--%>
-								<%--}).success(function (result) {--%>
-								<%--	if(result == 0){--%>
-								<%--		boolFlag = false;--%>
-								<%--		top.layer.msg("请上传其他文件！", {icon: 0});--%>
-								<%--		return false;--%>
-								<%--	}--%>
-								<%--}).error(function () {--%>
-								<%--	top.layer.msg("文件载入失败！");--%>
-								<%--});--%>
 							}
 						}
-					}
-				}
-				if(boolFlag){
-					if(obj == 2){
-						//$("#inputForm").attr("action","${ctx}/projectcontentinfo/projectReportRecord/store");
-						$("#inputForm").attr("action","${ctx}/ruralProject/ruralCostProjectMessage/holdSaveRecord");
-					}else{
 						$("#inputForm").attr("action","${ctx}/ruralProject/ruralCostProjectMessage/saveRecord");
 					}
 					$("#inputForm").submit();

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/reportForm.jsp

@@ -7,6 +7,7 @@
 	<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 src="${ctxStatic}/common/html/js/script.js"></script>
 	<%@include file="/webpage/include/treetable.jsp" %>
 
 	<style>
@@ -33,133 +34,109 @@
         var dataList;
         function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
-				var projectId = '${projectRecords.id}';
-				var leng = $("#file_attachment tr").length;
-				var leng1 = $("#reportedConsultantList tr").length;
-				var boolFlag = true;
-				var startDate = new Date($("#startDate").val());
-				var endingDate = new Date($("#endingDate").val());
-				var bzshbUserId = $("#bzshbUserId").val();
-				if(bzshbUserId == undefined || bzshbUserId ==null || bzshbUserId ==''){
-					parent.layer.msg("请选择审核人员!", {icon: 5});
-					return false;
-				}
-				if(startDate.getTime() > endingDate.getTime()){
-					parent.layer.msg("工作开始日期不得大于工作结束日期!", {icon: 5});
-					return false;
-				}
-				for(var i=0; i<leng; i++) {
-					var numberStr = $("#file_attachment tr").eq(i).find("td:first").find(".faid").html();
-					var second = $("#file_attachment tr").eq(i).find("td:eq(1)").html();
-					var fileFlag = $("#file_attachment tr").eq(i).find("td:last").html();
-					if(second == 1){
-						if(numberStr != undefined && numberStr !=null && numberStr !=''){
-							if (fileFlag==1){
 
-							}else{
-								top.layer.msg("请上传成果文件！", {icon: 0});
-								return false;
+					if(obj == 1){
+						var projectId = '${projectRecords.id}';
+						var leng = $("#file_attachment tr").length;
+						var leng1 = $("#reportedConsultantList tr").length;
+						var boolFlag = true;
+						var startDate = new Date($("#startDate").val());
+						var endingDate = new Date($("#endingDate").val());
+						var bzshbUserId = $("#bzshbUserId").val();
+						if(bzshbUserId == undefined || bzshbUserId ==null || bzshbUserId ==''){
+							parent.layer.msg("请选择审核人员!", {icon: 5});
+							return false;
+						}
+						if(startDate.getTime() > endingDate.getTime()){
+							parent.layer.msg("工作开始日期不得大于工作结束日期!", {icon: 5});
+							return false;
+						}
+						for(var i=0; i<leng; i++) {
+							var numberStr = $("#file_attachment tr").eq(i).find("td:first").find(".faid").html();
+							var second = $("#file_attachment tr").eq(i).find("td:eq(1)").html();
+							var fileFlag = $("#file_attachment tr").eq(i).find("td:last").html();
+							if(second == 1){
+								if(numberStr != undefined && numberStr !=null && numberStr !=''){
+									if (fileFlag==1){
+
+									}else{
+										top.layer.msg("请上传成果文件！", {icon: 0});
+										return false;
+									}
+								}
 							}
-							<%--$.ajax({--%>
-							<%--	type: 'post',--%>
-							<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
-							<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
-							<%--	dataType: "json",--%>
-							<%--	async: false--%>
-							<%--}).success(function (result) {--%>
-							<%--	if(result == 0){--%>
-							<%--		boolFlag = false;--%>
-							<%--		top.layer.msg("请上传成果文件！", {icon: 0});--%>
-							<%--		return false;--%>
-							<%--	}--%>
-							<%--}).error(function () {--%>
-							<%--	top.layer.msg("文件载入失败！");--%>
-							<%--});--%>
 						}
-					}
-				}
-				if (leng1==0){
-					top.layer.msg("请添加咨询员信息！", {icon: 0});
-					return false;
-				}
-				if(boolFlag){
-					var gistdata = $("#file_gistdata tr").length;
-					for(var i=0; i<gistdata; i++) {
-						var numberStr = $("#file_gistdata tr").eq(i).find("td:first").find(".fgid").html();
-						var second = $("#file_gistdata tr").eq(i).find("td:eq(1)").html();
-						var fileFlag = $("#file_gistdata tr").eq(i).find("td:last").html();
 
-						if(second == 1){
-							if(numberStr != undefined && numberStr !=null && numberStr !=''){
-								if (fileFlag==1){
+						if (leng1==0){
+							top.layer.msg("请添加咨询员信息！", {icon: 0});
+							return false;
+						}
+						if(boolFlag){
+							var gistdata = $("#file_gistdata tr").length;
+							for(var i=0; i<gistdata; i++) {
+								var numberStr = $("#file_gistdata tr").eq(i).find("td:first").find(".fgid").html();
+								var second = $("#file_gistdata tr").eq(i).find("td:eq(1)").html();
+								var fileFlag = $("#file_gistdata tr").eq(i).find("td:last").html();
+
+								if(second == 1){
+									if(numberStr != undefined && numberStr !=null && numberStr !=''){
+										if (fileFlag==1){
+
+										}else{
+											top.layer.msg("请上传依据性文件！", {icon: 0});
+											return false;
+										}
 
-								}else{
-									top.layer.msg("请上传依据性文件！", {icon: 0});
-									return false;
+									}
 								}
-								<%--$.ajax({--%>
-								<%--	type: 'post',--%>
-								<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
-								<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
-								<%--	dataType: "json",--%>
-								<%--	async: false--%>
-								<%--}).success(function (result) {--%>
-								<%--	if(result == 0){--%>
-								<%--		boolFlag = false;--%>
-								<%--		top.layer.msg("请上传依据性文件！", {icon: 0});--%>
-								<%--		return false;--%>
-								<%--	}--%>
-								<%--}).error(function () {--%>
-								<%--	top.layer.msg("文件载入失败！");--%>
-								<%--});--%>
 							}
 						}
-					}
-				}
-				if(boolFlag){
-					var other = $("#file_other tr").length;
-					for(var i=0; i<other; i++) {
-						var numberStr = $("#file_other tr").eq(i).find("td:first").find(".foid").html();
-						var second = $("#file_other tr").eq(i).find("td:eq(1)").html();
-						var fileFlag = $("#file_other tr").eq(i).find("td:last").html();
+						if(boolFlag){
+							var other = $("#file_other tr").length;
+							for(var i=0; i<other; i++) {
+								var numberStr = $("#file_other tr").eq(i).find("td:first").find(".foid").html();
+								var second = $("#file_other tr").eq(i).find("td:eq(1)").html();
+								var fileFlag = $("#file_other tr").eq(i).find("td:last").html();
 
-						if(second == 1){
-							if(numberStr != undefined && numberStr !=null && numberStr !=''){
-								if (fileFlag==1){
+								if(second == 1){
+									if(numberStr != undefined && numberStr !=null && numberStr !=''){
+										if (fileFlag==1){
 
-								}else{
-									top.layer.msg("请上传其它文件！", {icon: 0});
-									return false;
+										}else{
+											top.layer.msg("请上传其它文件！", {icon: 0});
+											return false;
+										}
+										<%--$.ajax({--%>
+										<%--	type: 'post',--%>
+										<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
+										<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
+										<%--	dataType: "json",--%>
+										<%--	async: false--%>
+										<%--}).success(function (result) {--%>
+										<%--	if(result == 0){--%>
+										<%--		boolFlag = false;--%>
+										<%--		top.layer.msg("请上传其他文件！", {icon: 0});--%>
+										<%--		return false;--%>
+										<%--	}--%>
+										<%--}).error(function () {--%>
+										<%--	top.layer.msg("文件载入失败！");--%>
+										<%--});--%>
+									}
 								}
-								<%--$.ajax({--%>
-								<%--	type: 'post',--%>
-								<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
-								<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
-								<%--	dataType: "json",--%>
-								<%--	async: false--%>
-								<%--}).success(function (result) {--%>
-								<%--	if(result == 0){--%>
-								<%--		boolFlag = false;--%>
-								<%--		top.layer.msg("请上传其他文件！", {icon: 0});--%>
-								<%--		return false;--%>
-								<%--	}--%>
-								<%--}).error(function () {--%>
-								<%--	top.layer.msg("文件载入失败！");--%>
-								<%--});--%>
 							}
 						}
-					}
-				}
-				if(boolFlag){
-					if(obj == 1){
-						$("#inputForm").attr("action","${ctx}/ruralProject/ruralCostProjectMessage/saveReport");
+						var flags=judgment();
+						if (flags){
+							$("#inputForm").attr("action","${ctx}/ruralProject/ruralCostProjectMessage/saveReport");
+						}else{
+							return flags;
+						}
 					}else{
 						//$("#inputForm").attr("action","${ctx}/projectcontentinfo/projectcontentinfo/save?view=report");
 						$("#inputForm").attr("action","${ctx}/ruralProject/ruralCostProjectMessage/holdSaveReport");
 					}
 					$("#inputForm").submit();
 					return true;
-				}
             }else{
 				parent.layer.msg("请填写重要信息!", {icon: 5});
 			}
@@ -587,7 +564,7 @@
 				<label class="layui-form-label"><span class="require-item">*</span>报告编号：</label>
 				<div class="layui-input-block">
 					<div class="input-group">
-						<form:input  path="projectReportData.number" onclick="selectNum()" id="number" htmlEscape="false" readonly="true" class="form-control layui-input required"/>
+						<form:input  path="projectReportData.number" onclick="selectNum()" id="number" htmlEscape="false" readonly="true" class="form-control layui-input judgment"/>
 						<span class="input-group-btn" onclick="selectNum()">
 								<label class="form-status">
 									<c:choose>
@@ -602,7 +579,7 @@
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label"><span class="require-item">*</span>成果类型：</label>
 				<div class="layui-input-block">
-					<form:select  path="projectReportData.achievementType" class="form-control simple-select required">
+					<form:select  path="projectReportData.achievementType" class="form-control simple-select judgment">
 						<form:options items="${fns:getMainDictList('achievement_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 					</form:select>
 				</div>
@@ -828,19 +805,19 @@
 					<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 placeholder="请输入送审价" id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control required layui-input number" onchange="getFee()" onblur="getAttachment()"/>
+							<form:input placeholder="请输入送审价" id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control judgment layui-input number" onchange="getFee()" onblur="getAttachment()"/>
 						</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 placeholder="请输入审定价" id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control required layui-input number" onchange="getApprovalFee()"/>
+							<form:input placeholder="请输入审定价" id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control judgment layui-input number" onchange="getApprovalFee()"/>
 						</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 placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control required layui-input number"/>
+							<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control judgment layui-input number"/>
 						</div>
 					</div>
 					<%--<c:choose>
@@ -874,7 +851,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">
-							<select class="form-control required layui-input" id="bzshbUserId"  name="projectReportData.bzshbUserId">
+							<select class="form-control judgment layui-input" id="bzshbUserId"  name="projectReportData.bzshbUserId">
 								<option value=""/>
 								<c:forEach items="${projectRecords.bzshbUserList}" var="user" varStatus="status">
 									<option value="${user.id}" <c:if test="${projectcontentinfo.projectReportData.bzshbUserId eq user.id }">selected</c:if>>${user.name}</option>
@@ -943,7 +920,7 @@
 					<label class="layui-form-label"><span class="require-item">*</span>专业咨询员：</label>
 					<div class="layui-input-block  with-icon">
 						<sys:inquireselectUser id="consultant" name="projectReportData.consultant.id" value="${projectReportData.consultant.id}" labelName="projectReportData.consultant.name" labelValue="${projectReportData.consultant.name}"
-									 cssStyle="background-color:#fff"	title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+									 cssStyle="background-color:#fff"	title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 lw7 with-textarea">
@@ -951,7 +928,7 @@
 					<div class="layui-input-block">
 						<div class="layui-item layui-col-sm6 lw7 with-textarea">
 							<div class="layui-input-block" style="margin-left:0px;position: relative">
-								<form:textarea placeholder="请输入审批意见:" path="projectReportData.consultantRemarks" id="zixunOpinion" class="form-control required" rows="4" cssStyle="height: 200px;" maxlength="255" />
+								<form:textarea placeholder="请输入审批意见:" path="projectReportData.consultantRemarks" id="zixunOpinion" class="form-control judgment" rows="4" cssStyle="height: 200px;" maxlength="255" />
 								<a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
 								<input type="file" name="upload_files" style="display: none;">
 							</div>
@@ -976,17 +953,17 @@
 					<label class="layui-form-label"><span class="require-item">*</span>项目负责人：</label>
 					<div class="layui-input-block  with-icon">
 						<sys:reportedtreeselectUser id="principal" name="projectReportData.principal.id" value="${projectRecords.projectMasterId}" labelName="projectReportData.principal.name" labelValue="${projectRecords.projectMasterName}"
-													cssStyle="background-color:#fff" title="项目负责人" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+													cssStyle="background-color:#fff" title="项目负责人" url="/sys/office/treeDataAll?type=4" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
 <%--						<sys:inquireselectUser id="principal" name="projectReportData.principal.id" value="${projectReportData.principal.id}" labelName="projectReportData.principal.name" labelValue="${projectReportData.principal.name}"--%>
-<%--									cssStyle="background-color:#fff"	title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>--%>
+<%--									cssStyle="background-color:#fff"	title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>--%>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 lw7 with-textarea">
-					<label class="layui-form-label double-line">项目负责人审核意见：</label>
+					<label class="layui-form-label double-line"><span class="require-item">*</span>项目负责人审核意见：</label>
 					<div class="layui-input-block">
 						<div class="layui-item layui-col-sm6 lw7 with-textarea">
 							<div class="layui-input-block" style="margin-left:0px;position: relative">
-								<form:textarea placeholder="请输入审批意见：" path="projectReportData.principalRemarks" id="fuzerenOpinion" class="form-control required" rows="4" cssStyle="height: 200px;" maxlength="255" />
+								<form:textarea placeholder="请输入审批意见：" path="projectReportData.principalRemarks" id="fuzerenOpinion" class="form-control judgment" rows="4" cssStyle="height: 200px;" maxlength="255" />
 								<a id="clearOpinons" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
 								<input type="file" name="upload_files" style="display: none;">
 							</div>
@@ -1036,17 +1013,17 @@
 										</td>
 										<td>
 											<sys:reportedtreeselectUser id="reportedConsultantList${status.index+1}_zixunyuan" name="reportedConsultantList[${status.index+1}].zixunyuan" value="${info.zixunyuan}" labelName="workAccountList[${status.index+1}].zixunyuan" labelValue="${info.zixunyuanName}"
-																		title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+																		title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
 										</td>
 
 										<td>
-											<input id="reportedConsultantList${status.index+1}_zhucezigezhID" readonly="true" name="reportedConsultantList[${status.index+1}].zhucezigezhID" value="${info.zhucezigezhID}" class="form-control required"/>
+											<input id="reportedConsultantList${status.index+1}_zhucezigezhID" readonly="true" name="reportedConsultantList[${status.index+1}].zhucezigezhID" value="${info.zhucezigezhID}" class="form-control judgment"/>
 										</td>
 										<td>
-											<input id="reportedConsultantList${status.index+1}_major" readonly="true"  name="reportedConsultantList[${status.index+1}].major" value="${info.major}" class="form-control required"/>
+											<input id="reportedConsultantList${status.index+1}_major" readonly="true"  name="reportedConsultantList[${status.index+1}].major" value="${info.major}" class="form-control judgment"/>
 										</td>
 										<td>
-											<input id="reportedConsultantList${status.index+1}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[${status.index+1}].wordnr" value="${info.wordnr}" class="form-control required"/>
+											<input id="reportedConsultantList${status.index+1}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[${status.index+1}].wordnr" value="${info.wordnr}" class="form-control judgment"/>
 										</td>
 
 										<td class="text-center op-td" width="10">
@@ -1070,17 +1047,17 @@
                                     </td>
                                     <td>
                                         <sys:reportedtreeselectUser id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
-                                            title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                            title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control judgment"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_major" readonly="true"  name="reportedConsultantList[{{idx}}].major" value="{{row.major}}" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_major" readonly="true"  name="reportedConsultantList[{{idx}}].major" value="{{row.major}}" class="form-control judgment"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control judgment"/>
                                     </td>
 
                                     <td class="text-center op-td" width="10">
@@ -1144,7 +1121,7 @@
 
 							</tr>
 							<c:forEach items="${fileAttachment.workAttachments}" var = "workClientAttachment" varStatus="status">
-								<tr class="file_attachment_tr">
+								<tr class="file_attachment_${fileAttachment.id}_tr_fu">
 									<td></td>
 										<c:choose>
 										<c:when test="${projectcontentinfo.uploadMode == 2}">
@@ -1264,7 +1241,7 @@
 						</thead>
 						<tbody id="file_gistdata">
 						<c:forEach items="${projectcontentinfo.fileGistdataList}" var = "fileGistdata" varStatus="status">
-							<tr  id="file_gistdata_${fileGistdata.id}_tr" onclick="listTr(this)">
+							<tr id="file_gistdata_${fileGistdata.id}_tr" onclick="listTr(this)">
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none"><span class="fgid">${fileGistdata.id}</span></td>
 								<td style="display:none">${fileGistdata.mustFlag}</td>
@@ -1286,7 +1263,7 @@
 
 							</tr>
 							<c:forEach items="${fileGistdata.workAttachments}" var = "workClientAttachment" varStatus="status">
-								<tr class="file_gistdata_tr">
+								<tr class="file_gistdata_${fileGistdata.id}_tr">
 									<td></td>
 									<c:choose>
 										<c:when test="${projectcontentinfo.uploadMode == 2}">
@@ -1427,7 +1404,7 @@
 								<td style="display:none">${fileOther.fileFlag}</td>
 							</tr>
 							<c:forEach items="${fileOther.workAttachments}" var = "workClientAttachment" varStatus="status">
-								<tr class="file_other_tr">
+								<tr class="file_other_${fileOther.id}_tr">
 									<td></td>
 									<c:choose>
 										<c:when test="${projectcontentinfo.uploadMode == 2}">

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsForm.jsp

@@ -7,6 +7,7 @@
     <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}/layui/layuidown.js"></script>
+    <script src="${ctxStatic}/common/html/js/script.js"></script>
     <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/layuidown.css"/>
     <link rel='stylesheet' type="text/css" href="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.css"/>
     <style>
@@ -61,17 +62,19 @@
                     parent.layer.msg("工作开始日期不得大于工作结束日期!", {icon: 5});
                     return false;
                 }
-                var flag = $("#flagFile").val();
-                if(flag == 'false'){
-                    top.layer.msg('附件信息未上传完成，请等待！', {icon: 0});
-                    return;
-                }
-                /*if($("#workConstructionLinkmanList tr").length==0){
-                    top.layer.alert('请至少选择一个施工方联系人！', {icon: 0});
-                    return;
-                }*/
                 if(i==2){
                     $("#inputForm").attr("action","${ctx}/ruralProject/ruralCostProjectRecords/tstore");
+                }else{
+
+                    var flag = $("#flagFile").val();
+                    if(flag == 'false'){
+                        top.layer.msg('附件信息未上传完成，请等待！', {icon: 0});
+                        return;
+                    }
+                    var flags=judgment();
+                    if (!flags){
+                        return flags;
+                    }
                 }
                 $("#inputForm").submit();
                 return true;
@@ -888,7 +891,7 @@
                     <label class="layui-form-label"><span class="require-item">*</span>项目责任人：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:treeselect id="master" name="projectLeaders" value="${ruralProjectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${ruralProjectRecords.leaderNameStr}"
-                                       cssStyle="background-color: #fff" title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                       cssStyle="background-color: #fff" title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -925,7 +928,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:select path="submitMoney" lay-verify="required" class="form-control required simple-select">
+                        <form:select path="submitMoney" lay-verify="judgment" class="form-control judgment simple-select">
                             <form:option value=""/>
                             <form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
@@ -946,13 +949,13 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">创建日期：</label>
                     <div class="layui-input-block">
-                        <input id="createDate" name="createDate" htmlEscape="false"  value="<fmt:formatDate value="${ruralProjectRecords.createDate}" pattern="yyyy-MM-dd"/>" readonly="readonly"  class="form-control required layui-input"/>
+                        <input id="createDate" name="createDate" htmlEscape="false"  value="<fmt:formatDate value="${ruralProjectRecords.createDate}" pattern="yyyy-MM-dd"/>" readonly="readonly"  class="form-control judgment 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:select placeholder="请选择" path="attachmentProjectSort" class="form-control required editable-select layui-input" id="attachmentProjectSort" value="${attachmentProjectSort}">
+                        <form:select placeholder="请选择" path="attachmentProjectSort" class="form-control judgment editable-select layui-input" id="attachmentProjectSort" value="${attachmentProjectSort}">
                             <form:option value=""/>
                             <form:options items="${fns:getMainDictList('attachment_project_sort_cost')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
@@ -1007,7 +1010,7 @@
                 <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>预估总投资额(万元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="estimateTotalFees" htmlEscape="false" id="estimateTotalFees" class="form-control required layui-input number" onchange="getApprovalFee()"/>
+                        <form:input path="estimateTotalFees" htmlEscape="false" id="estimateTotalFees" class="form-control judgment layui-input number" onchange="getApprovalFee()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -1091,7 +1094,7 @@
                     <sys:gridselect1  id="linkman" url="${ctx}/workclientinfo/workClientInfo/linkmanList"
                                       name="linkman.id"  title="选择客户"
                                       value="${ruralProjectRecords.workContractInfo.workClinetInfoIds}"
-                                      cssClass="form-control required" fieldLabels="联系人" fieldKeys="name"
+                                      cssClass="form-control judgment" fieldLabels="联系人" fieldKeys="name"
                                       searchLabel="联系人" searchKey="name"></sys:gridselect1>
                 </div>
 <%--                <div id="addUserButton" class="layui-item nav-btns" style="float: left;">--%>
@@ -1126,7 +1129,7 @@
                     <input <input style="background-color: #FFFFFF;" readonly="true" id="workClientLinkmanList{{idx}}_clientName" name="workClientLinkmanList[{{idx}}].clientId.name" type="text" value="{{row.clientId.name}}"    class="form-control "/>
                 </td>
                 <td>
-                    <input <input style="background-color: #FFFFFF;" readonly="true" id="workClientLinkmanList{{idx}}_name" name="workClientLinkmanList[{{idx}}].name" type="text" value="{{row.name}}"    class="form-control required"/>
+                    <input <input style="background-color: #FFFFFF;" readonly="true" id="workClientLinkmanList{{idx}}_name" name="workClientLinkmanList[{{idx}}].name" type="text" value="{{row.name}}"    class="form-control judgment"/>
                 </td>
 
                 <td>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsList.jsp

@@ -500,7 +500,7 @@
             ,page: false
             ,cols: [[
 				{checkbox: true, fixed: true},
-                {field:'index',align:'center', title: '序号',width:40}
+                {field:'index',align:'center', title: '序号',width:60}
                 ,{field:'projName',align:'center', title: '项目名称',minWidth:200,templet:function(d){
 						if(1 == d.showView && d.showView != undefined){
 							return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";

src/main/webapp/webpage/modules/ruralprojectrecords/projectReportRecord/projectReportRecordForm.jsp

@@ -30,111 +30,112 @@
         function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
 				var projectId = '${project.id}';
-				var leng = $("#file_attachment tr").length;
 				var boolFlag = true;
-				for(var i=0; i<leng; i++) {
-					var numberStr = $("#file_attachment tr").eq(i).find("td:first").html();
-					var second = $("#file_attachment tr").eq(i).find("td:eq(1)").html();
-					var fileFlag = $("#file_attachment tr").eq(i).find("td:last").html();
-					if(second == 1){
-						if(numberStr != undefined && numberStr !=null && numberStr !=''){
-							if (fileFlag==1){
 
-							}else{
-								top.layer.msg("请上传成果文件！", {icon: 0});
-								return false;
+				if(boolFlag){
+					if(obj == 2){
+						//$("#inputForm").attr("action","${ctx}/projectcontentinfo/projectReportRecord/store");
+						$("#inputForm").attr("action","${ctx}/ruralProject/ruralProjectMessage/holdSaveRecord");
+					}else{
+						var leng = $("#file_attachment tr").length;
+						for(var i=0; i<leng; i++) {
+							var numberStr = $("#file_attachment tr").eq(i).find("td:first").html();
+							var second = $("#file_attachment tr").eq(i).find("td:eq(1)").html();
+							var fileFlag = $("#file_attachment tr").eq(i).find("td:last").html();
+							if(second == 1){
+								if(numberStr != undefined && numberStr !=null && numberStr !=''){
+									if (fileFlag==1){
+
+									}else{
+										top.layer.msg("请上传成果文件！", {icon: 0});
+										return false;
+									}
+									<%--$.ajax({--%>
+									<%--	type: 'post',--%>
+									<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
+									<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
+									<%--	dataType: "json",--%>
+									<%--	async: false--%>
+									<%--}).success(function (result) {--%>
+									<%--	if(result == 0){--%>
+									<%--		boolFlag = false;--%>
+									<%--		top.layer.msg("请上传成果文件！", {icon: 0});--%>
+									<%--		return false;--%>
+									<%--	}--%>
+									<%--}).error(function () {--%>
+									<%--	top.layer.msg("文件载入失败！");--%>
+									<%--});--%>
+								}
 							}
-							<%--$.ajax({--%>
-							<%--	type: 'post',--%>
-							<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
-							<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
-							<%--	dataType: "json",--%>
-							<%--	async: false--%>
-							<%--}).success(function (result) {--%>
-							<%--	if(result == 0){--%>
-							<%--		boolFlag = false;--%>
-							<%--		top.layer.msg("请上传成果文件！", {icon: 0});--%>
-							<%--		return false;--%>
-							<%--	}--%>
-							<%--}).error(function () {--%>
-							<%--	top.layer.msg("文件载入失败！");--%>
-							<%--});--%>
 						}
-					}
-				}
-				if(boolFlag){
-					var gistdata = $("#file_gistdata tr").length;
-					for(var i=0; i<gistdata; i++) {
-						var numberStr = $("#file_gistdata tr").eq(i).find("td:first").html();
-						var second = $("#file_gistdata tr").eq(i).find("td:eq(1)").html();
-						var fileFlag = $("#file_gistdata tr").eq(i).find("td:last").html();
+						if(boolFlag){
+							var gistdata = $("#file_gistdata tr").length;
+							for(var i=0; i<gistdata; i++) {
+								var numberStr = $("#file_gistdata tr").eq(i).find("td:first").html();
+								var second = $("#file_gistdata tr").eq(i).find("td:eq(1)").html();
+								var fileFlag = $("#file_gistdata tr").eq(i).find("td:last").html();
 
-						if(second == 1){
-							if(numberStr != undefined && numberStr !=null && numberStr !=''){
-								if (fileFlag==1){
+								if(second == 1){
+									if(numberStr != undefined && numberStr !=null && numberStr !=''){
+										if (fileFlag==1){
 
-								}else{
-									top.layer.msg("请上传依据性文件！", {icon: 0});
-									return false;
+										}else{
+											top.layer.msg("请上传依据性文件！", {icon: 0});
+											return false;
+										}
+										<%--$.ajax({--%>
+										<%--	type: 'post',--%>
+										<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
+										<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
+										<%--	dataType: "json",--%>
+										<%--	async: false--%>
+										<%--}).success(function (result) {--%>
+										<%--	if(result == 0){--%>
+										<%--		boolFlag = false;--%>
+										<%--		top.layer.msg("请上传依据性文件！", {icon: 0});--%>
+										<%--		return false;--%>
+										<%--	}--%>
+										<%--}).error(function () {--%>
+										<%--	top.layer.msg("文件载入失败！");--%>
+										<%--});--%>
+									}
 								}
-								<%--$.ajax({--%>
-								<%--	type: 'post',--%>
-								<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
-								<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
-								<%--	dataType: "json",--%>
-								<%--	async: false--%>
-								<%--}).success(function (result) {--%>
-								<%--	if(result == 0){--%>
-								<%--		boolFlag = false;--%>
-								<%--		top.layer.msg("请上传依据性文件！", {icon: 0});--%>
-								<%--		return false;--%>
-								<%--	}--%>
-								<%--}).error(function () {--%>
-								<%--	top.layer.msg("文件载入失败！");--%>
-								<%--});--%>
 							}
 						}
-					}
-				}
-				if(boolFlag){
-					var other = $("#file_other tr").length;
-					for(var i=0; i<other; i++) {
-						var numberStr = $("#file_other tr").eq(i).find("td:first").html();
-						var second = $("#file_other tr").eq(i).find("td:eq(1)").html();
-						var fileFlag = $("#file_other tr").eq(i).find("td:last").html();
+						if(boolFlag){
+							var other = $("#file_other tr").length;
+							for(var i=0; i<other; i++) {
+								var numberStr = $("#file_other tr").eq(i).find("td:first").html();
+								var second = $("#file_other tr").eq(i).find("td:eq(1)").html();
+								var fileFlag = $("#file_other tr").eq(i).find("td:last").html();
 
-						if(second == 1){
-							if(numberStr != undefined && numberStr !=null && numberStr !=''){
-								if (fileFlag==1){
+								if(second == 1){
+									if(numberStr != undefined && numberStr !=null && numberStr !=''){
+										if (fileFlag==1){
 
-								}else{
-									top.layer.msg("请上传其它文件！", {icon: 0});
-									return false;
+										}else{
+											top.layer.msg("请上传其它文件！", {icon: 0});
+											return false;
+										}
+										<%--$.ajax({--%>
+										<%--	type: 'post',--%>
+										<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
+										<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
+										<%--	dataType: "json",--%>
+										<%--	async: false--%>
+										<%--}).success(function (result) {--%>
+										<%--	if(result == 0){--%>
+										<%--		boolFlag = false;--%>
+										<%--		top.layer.msg("请上传其他文件！", {icon: 0});--%>
+										<%--		return false;--%>
+										<%--	}--%>
+										<%--}).error(function () {--%>
+										<%--	top.layer.msg("文件载入失败！");--%>
+										<%--});--%>
+									}
 								}
-								<%--$.ajax({--%>
-								<%--	type: 'post',--%>
-								<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
-								<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
-								<%--	dataType: "json",--%>
-								<%--	async: false--%>
-								<%--}).success(function (result) {--%>
-								<%--	if(result == 0){--%>
-								<%--		boolFlag = false;--%>
-								<%--		top.layer.msg("请上传其他文件！", {icon: 0});--%>
-								<%--		return false;--%>
-								<%--	}--%>
-								<%--}).error(function () {--%>
-								<%--	top.layer.msg("文件载入失败！");--%>
-								<%--});--%>
 							}
 						}
-					}
-				}
-				if(boolFlag){
-					if(obj == 2){
-						//$("#inputForm").attr("action","${ctx}/projectcontentinfo/projectReportRecord/store");
-						$("#inputForm").attr("action","${ctx}/ruralProject/ruralProjectMessage/holdSaveRecord");
-					}else{
 						$("#inputForm").attr("action","${ctx}/ruralProject/ruralProjectMessage/saveRecord");
 					}
 					$("#inputForm").submit();

src/main/webapp/webpage/modules/ruralprojectrecords/projectReportRecord/projectReportRecordModify.jsp

@@ -29,110 +29,110 @@
         function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
 				var projectId = '${project.id}';
-				var leng = $("#file_attachment tr").length;
 				var boolFlag = true;
-				for(var i=0; i<leng; i++) {
-					var numberStr = $("#file_attachment tr").eq(i).find("td:first").html();
-					var second = $("#file_attachment tr").eq(i).find("td:eq(1)").html();
-					var fileFlag = $("#file_attachment tr").eq(i).find("td:last").html();
-					if(second == 1){
-						if(numberStr != undefined && numberStr !=null && numberStr !=''){
-							if (fileFlag==1){
+				if(boolFlag){
+					if(obj == 2){
+						//$("#inputForm").attr("action","${ctx}/projectcontentinfo/projectReportRecord/store");
+						$("#inputForm").attr("action","${ctx}/ruralProject/ruralProjectMessage/holdSaveRecord");
+					}else{
+						var leng = $("#file_attachment tr").length;
+						for(var i=0; i<leng; i++) {
+							var numberStr = $("#file_attachment tr").eq(i).find("td:first").html();
+							var second = $("#file_attachment tr").eq(i).find("td:eq(1)").html();
+							var fileFlag = $("#file_attachment tr").eq(i).find("td:last").html();
+							if(second == 1){
+								if(numberStr != undefined && numberStr !=null && numberStr !=''){
+									if (fileFlag==1){
 
-							}else{
-								top.layer.msg("请上传成果文件！", {icon: 0});
-								return false;
+									}else{
+										top.layer.msg("请上传成果文件！", {icon: 0});
+										return false;
+									}
+									<%--$.ajax({--%>
+									<%--	type: 'post',--%>
+									<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
+									<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
+									<%--	dataType: "json",--%>
+									<%--	async: false--%>
+									<%--}).success(function (result) {--%>
+									<%--	if(result == 0){--%>
+									<%--		boolFlag = false;--%>
+									<%--		top.layer.msg("请上传成果文件！", {icon: 0});--%>
+									<%--		return false;--%>
+									<%--	}--%>
+									<%--}).error(function () {--%>
+									<%--	top.layer.msg("文件载入失败！");--%>
+									<%--});--%>
+								}
 							}
-							<%--$.ajax({--%>
-							<%--	type: 'post',--%>
-							<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
-							<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
-							<%--	dataType: "json",--%>
-							<%--	async: false--%>
-							<%--}).success(function (result) {--%>
-							<%--	if(result == 0){--%>
-							<%--		boolFlag = false;--%>
-							<%--		top.layer.msg("请上传成果文件！", {icon: 0});--%>
-							<%--		return false;--%>
-							<%--	}--%>
-							<%--}).error(function () {--%>
-							<%--	top.layer.msg("文件载入失败！");--%>
-							<%--});--%>
 						}
-					}
-				}
-				if(boolFlag){
-					var gistdata = $("#file_gistdata tr").length;
-					for(var i=0; i<gistdata; i++) {
-						var numberStr = $("#file_gistdata tr").eq(i).find("td:first").html();
-						var second = $("#file_gistdata tr").eq(i).find("td:eq(1)").html();
-						var fileFlag = $("#file_gistdata tr").eq(i).find("td:last").html();
+						if(boolFlag){
+							var gistdata = $("#file_gistdata tr").length;
+							for(var i=0; i<gistdata; i++) {
+								var numberStr = $("#file_gistdata tr").eq(i).find("td:first").html();
+								var second = $("#file_gistdata tr").eq(i).find("td:eq(1)").html();
+								var fileFlag = $("#file_gistdata tr").eq(i).find("td:last").html();
 
-						if(second == 1){
-							if(numberStr != undefined && numberStr !=null && numberStr !=''){
-								if (fileFlag==1){
+								if(second == 1){
+									if(numberStr != undefined && numberStr !=null && numberStr !=''){
+										if (fileFlag==1){
 
-								}else{
-									top.layer.msg("请上传依据性文件！", {icon: 0});
-									return false;
+										}else{
+											top.layer.msg("请上传依据性文件！", {icon: 0});
+											return false;
+										}
+										<%--$.ajax({--%>
+										<%--	type: 'post',--%>
+										<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
+										<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
+										<%--	dataType: "json",--%>
+										<%--	async: false--%>
+										<%--}).success(function (result) {--%>
+										<%--	if(result == 0){--%>
+										<%--		boolFlag = false;--%>
+										<%--		top.layer.msg("请上传依据性文件！", {icon: 0});--%>
+										<%--		return false;--%>
+										<%--	}--%>
+										<%--}).error(function () {--%>
+										<%--	top.layer.msg("文件载入失败！");--%>
+										<%--});--%>
+									}
 								}
-								<%--$.ajax({--%>
-								<%--	type: 'post',--%>
-								<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
-								<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
-								<%--	dataType: "json",--%>
-								<%--	async: false--%>
-								<%--}).success(function (result) {--%>
-								<%--	if(result == 0){--%>
-								<%--		boolFlag = false;--%>
-								<%--		top.layer.msg("请上传依据性文件！", {icon: 0});--%>
-								<%--		return false;--%>
-								<%--	}--%>
-								<%--}).error(function () {--%>
-								<%--	top.layer.msg("文件载入失败！");--%>
-								<%--});--%>
 							}
 						}
-					}
-				}
-				if(boolFlag){
-					var other = $("#file_other tr").length;
-					for(var i=0; i<other; i++) {
-						var numberStr = $("#file_other tr").eq(i).find("td:first").html();
-						var second = $("#file_other tr").eq(i).find("td:eq(1)").html();
-						var fileFlag = $("#file_other tr").eq(i).find("td:last").html();
-						if(second == 1){
-							if(numberStr != undefined && numberStr !=null && numberStr !=''){
-								if (fileFlag==1){
+						if(boolFlag){
+							var other = $("#file_other tr").length;
+							for(var i=0; i<other; i++) {
+								var numberStr = $("#file_other tr").eq(i).find("td:first").html();
+								var second = $("#file_other tr").eq(i).find("td:eq(1)").html();
+								var fileFlag = $("#file_other tr").eq(i).find("td:last").html();
+								if(second == 1){
+									if(numberStr != undefined && numberStr !=null && numberStr !=''){
+										if (fileFlag==1){
 
-								}else{
-									top.layer.msg("请上传其它文件！", {icon: 0});
-									return false;
+										}else{
+											top.layer.msg("请上传其它文件！", {icon: 0});
+											return false;
+										}
+										<%--$.ajax({--%>
+										<%--	type: 'post',--%>
+										<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
+										<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
+										<%--	dataType: "json",--%>
+										<%--	async: false--%>
+										<%--}).success(function (result) {--%>
+										<%--	if(result == 0){--%>
+										<%--		boolFlag = false;--%>
+										<%--		top.layer.msg("请上传其他文件！", {icon: 0});--%>
+										<%--		return false;--%>
+										<%--	}--%>
+										<%--}).error(function () {--%>
+										<%--	top.layer.msg("文件载入失败！");--%>
+										<%--});--%>
+									}
 								}
-								<%--$.ajax({--%>
-								<%--	type: 'post',--%>
-								<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
-								<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
-								<%--	dataType: "json",--%>
-								<%--	async: false--%>
-								<%--}).success(function (result) {--%>
-								<%--	if(result == 0){--%>
-								<%--		boolFlag = false;--%>
-								<%--		top.layer.msg("请上传其他文件！", {icon: 0});--%>
-								<%--		return false;--%>
-								<%--	}--%>
-								<%--}).error(function () {--%>
-								<%--	top.layer.msg("文件载入失败！");--%>
-								<%--});--%>
 							}
 						}
-					}
-				}
-				if(boolFlag){
-					if(obj == 2){
-						//$("#inputForm").attr("action","${ctx}/projectcontentinfo/projectReportRecord/store");
-						$("#inputForm").attr("action","${ctx}/ruralProject/ruralProjectMessage/holdSaveRecord");
-					}else{
 						$("#inputForm").attr("action","${ctx}/ruralProject/ruralProjectMessage/saveRecord");
 					}
 					$("#inputForm").submit();

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsAudit.jsp

@@ -272,6 +272,9 @@
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">工程类型：</label>
 					<div class="layui-input-block">
+						<c:if test="${projectRecords.engineeringType==''}">
+							<input htmlEscape="false" readonly="true" id="engineeringType" class="form-control layui-input"/>
+						</c:if>
 						<c:forEach items="${engineeringInfo}" varStatus="index" var="info">
 							<c:if test="${info.id == projectRecords.engineeringType}"><input htmlEscape="false" readonly="true" id="engineeringType" class="form-control layui-input"  value="${info.engineeringName}"/></c:if>
 						</c:forEach>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsForm.jsp

@@ -7,6 +7,7 @@
     <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}/layui/layuidown.js"></script>
+    <script src="${ctxStatic}/common/html/js/script.js"></script>
     <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/layuidown.css"/>
     <link rel='stylesheet' type="text/css" href="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.css"/>
     <style>
@@ -50,10 +51,7 @@
                 //     top.layer.alert('请至少上传一个项目计划表或者实施方案文档！', {icon: 0});
                 //     return;
                 // }
-                if($("#workClientLinkmanList tr").length==0){
-                    top.layer.msg("请选择委托方联系人！", {icon: 5});
-                    return;
-                }
+
                 var startDate = new Date($("#startDate").val());
                 var endingDate = new Date($("#endingDate").val());
 
@@ -65,12 +63,10 @@
                     top.layer.alert('请至少选择一个施工方联系人！', {icon: 0});
                     return;
                 }*/
-                var flag = $("#flagFile").val();
-                if(flag == 'false'){
-                    top.layer.msg('附件信息未上传完成，请等待！', {icon: 0});
+                if($("#workClientLinkmanList tr").length==0){
+                    top.layer.msg("请选择委托方联系人！", {icon: 5});
                     return;
                 }
-
                 var startDate = new Date($("#startDate").val());
                 var endingDate = new Date($("#endingDate").val());
 
@@ -81,6 +77,16 @@
 
                 if(i==2){
                     $("#inputForm").attr("action","${ctx}/ruralProject/ruralProjectRecords/tstore");
+                }else if(i==1){
+                    var flag = $("#flagFile").val();
+                    if(flag == 'false'){
+                        top.layer.msg('附件信息未上传完成，请等待！', {icon: 0});
+                        return;
+                    }
+                    var flags=judgment();
+                    if (!flags){
+                        return flags;
+                    }
                 }
                 $("#inputForm").submit();
                 return true;
@@ -866,7 +872,7 @@
                     <label class="layui-form-label"><span class="require-item">*</span>项目所在地：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:treeselectArae id="area" name="area.id" value="${ruralProjectRecords.area.id}" labelName="area.name" labelValue="${ruralProjectRecords.area.name}"
-                                       cssStyle="background-color:#fff" title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false" isAll="true"/>
+                                       cssStyle="background-color:#fff" title="区域" url="/sys/area/treeData" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="false" isAll="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -904,7 +910,7 @@
                     <label class="layui-form-label"><span class="require-item">*</span>项目责任人：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:inquireselectUser id="master" name="projectLeaders" value="${ruralProjectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${ruralProjectRecords.leaderNameStr}"
-                                       cssStyle="background-color:#fff"  title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                       cssStyle="background-color:#fff"  title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -940,7 +946,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:select path="submitMoney" class="form-control required simple-select">
+                        <form:select path="submitMoney" class="form-control judgment simple-select">
                             <form:option value=""/>
                             <form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
@@ -961,13 +967,13 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">创建日期：</label>
                     <div class="layui-input-block">
-                        <input id="createDate" name="createDate" htmlEscape="false"  value="<fmt:formatDate value="${ruralProjectRecords.createDate}" pattern="yyyy-MM-dd"/>" readonly="readonly"  class="form-control required layui-input"/>
+                        <input id="createDate" name="createDate" htmlEscape="false"  value="<fmt:formatDate value="${ruralProjectRecords.createDate}" pattern="yyyy-MM-dd"/>" readonly="readonly"  class="form-control judgment 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:select path="attachmentProjectSort" class="form-control required editable-select layui-input" id="attachmentProjectSort" value="${attachmentProjectSort}">
+                        <form:select path="attachmentProjectSort" class="form-control judgment editable-select layui-input" id="attachmentProjectSort" value="${attachmentProjectSort}">
                             <form:option value=""/>
                             <form:options items="${fns:getMainDictList('attachment_project_sort')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsList.jsp

@@ -466,7 +466,7 @@
             ,page: false
             ,cols: [[
 				{checkbox: true, fixed: true},
-                {field:'index',align:'center', title: '序号',width:40}
+                {field:'index',align:'center', title: '序号',width:55}
                 ,{field:'projName',align:'center', title: '项目名称',minWidth:200,templet:function(d){
 						if(1 == d.showView && d.showView != undefined){
 							return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageAudit.jsp

@@ -18,7 +18,7 @@
                     var technicistRemarks = $("#technicistRemarks").val();
                     var type = $("#type").val();
                     if( type==4 && (undefined == technicistRemarks || null ==technicistRemarks || '' ==technicistRemarks)){
-						top.layer.msg("请填写专业咨询员审核意见！", {icon: 0});
+						top.layer.msg("请填写技术负责人审核意见！", {icon: 0});
 						return false;
 					}
                     /*if($("#taskDefKey").val()== "projectplan" && $(".trIdAdds").length==0){
@@ -466,14 +466,14 @@
 				</c:if>
 				<c:if test="${type == 4}">
 					<div class="layui-item layui-col-sm6 lw7">
-						<label class="layui-form-label"><span class="require-item">*</span>专业咨询员：</label>
+						<label class="layui-form-label"><span class="require-item">*</span>技术负责人：</label>
 						<div class="layui-input-block  with-icon">
 							<sys:treeselect id="consultant" name="projectReportData.technicist.id" value="${projectReportData.technicist.id}" labelName="projectReportData.technicist.name" labelValue="${projectReportData.technicist.name}"
 											title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm12 lw7 with-textarea">
-						<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>技术负责人审核意见：</label>
 						<div class="layui-input-block">
 							<div class="layui-item layui-col-sm6 lw7 with-textarea">
 								<div class="layui-input-block" style="margin-left:0px;position: relative">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageModify.jsp

@@ -17,10 +17,10 @@
             // var ss=$(span).val().split(" ")[4];
             $(span).toggle(function () {
                 $(tiao).hide();
-                $(span).find("span").attr("class","default_shut")
+                $(span).find(".default_open").attr("class","default_shut")
             },function () {
                 $(tiao).show();
-                $(span).find("span").attr("class","default_open")
+                $(span).find(".default_shut").attr("class","default_open")
             });
         }
         var validateForm;
@@ -865,7 +865,7 @@
                                     <td style="display:none">${fileAttachment.fileFlag}</td>
                                 </tr>
                             <c:forEach items="${fileAttachment.workAttachments}" var = "workClientAttachment" varStatus="status">
-                                <tr class="file_attachment_tr">
+                                <tr class="file_attachment_${fileAttachment.id}_tr">
                                     <td></td>
                                     <c:choose>
                                         <c:when test="${projectcontentinfo.uploadMode == 2}">
@@ -975,7 +975,7 @@
 
                                 </tr>
                             <c:forEach items="${fileGistdata.workAttachments}" var = "workClientAttachment" varStatus="status">
-                                <tr class="file_gistdata_tr">
+                                <tr class="file_gistdata_${fileGistdata.id}_tr">
                                     <td></td>
                                     <c:choose>
                                         <c:when test="${projectcontentinfo.uploadMode == 2}">
@@ -1085,7 +1085,7 @@
 
                                 </tr>
                             <c:forEach items="${fileOther.workAttachments}" var = "workClientAttachment" varStatus="status">
-                                <tr class="file_other_tr">
+                                <tr class="file_other_${fileOther.id}_tr">
                                     <td></td>
                                     <c:choose>
                                         <c:when test="${projectcontentinfo.uploadMode == 2}">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/reportForm.jsp

@@ -7,6 +7,7 @@
 	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
 	<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}/common/html/js/script.js"></script>
 	<%@include file="/webpage/include/treetable.jsp" %>
 
 	<style>
@@ -21,124 +22,129 @@
         function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
 				var projectId = '${projectRecords.id}';
-				var leng = $("#file_attachment tr").length;
-				var leng1 = $("#reportedConsultantList tr").length;
 				var boolFlag = true;
-				var startDate = new Date($("#startDate").val());
-				var endingDate = new Date($("#endingDate").val());
-				var bzshbUserId = $("#bzshbUserId").val();
-				if(bzshbUserId == undefined || bzshbUserId ==null || bzshbUserId ==''){
-					parent.layer.msg("请选择审核人员!", {icon: 5});
-					return false;
-				}
-				if(startDate.getTime() > endingDate.getTime()){
-					parent.layer.msg("工作开始日期不得大于工作结束日期!", {icon: 5});
-					return false;
-				}
-				if (leng1==0){
-					top.layer.msg("请添加咨询员信息！", {icon: 0});
-					return false;
-				}
-				for(var i=0; i<leng; i++) {
-					var numberStr = $("#file_attachment tr").eq(i).find("td:first").html();
-					var second = $("#file_attachment tr").eq(i).find("td:eq(1)").html();
-					var name = $("#file_attachment tr").eq(i).find("td:eq(2)").html();
-					var fileFlag = $("#file_attachment tr").eq(i).find("td:last").html();
-					if(second == 1){
-					if(numberStr != undefined && numberStr !=null && numberStr !=''){
-						if (fileFlag==1){
-
-						}else{
-							top.layer.msg("请上传成果文件！", {icon: 0});
+				if(boolFlag){
+					if(obj == 1){
+						var leng = $("#file_attachment tr").length;
+						var leng1 = $("#reportedConsultantList tr").length;
+						var startDate = new Date($("#startDate").val());
+						var endingDate = new Date($("#endingDate").val());
+						var bzshbUserId = $("#bzshbUserId").val();
+						if(bzshbUserId == undefined || bzshbUserId ==null || bzshbUserId ==''){
+							parent.layer.msg("请选择审核人员!", {icon: 5});
 							return false;
 						}
-						<%--$.ajax({--%>
-						<%--	type: 'post',--%>
-						<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
-						<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
-						<%--	dataType: "json",--%>
-						<%--	async: false--%>
-						<%--}).success(function (result) {--%>
-						<%--	if(result == 0){--%>
-						<%--		boolFlag = false;--%>
-						<%--		top.layer.msg("请上传成果文件！", {icon: 0});--%>
-						<%--		return false;--%>
-						<%--	}--%>
-						<%--}).error(function () {--%>
-						<%--	top.layer.msg("文件载入失败！");--%>
-						<%--});--%>
-					}
-					}
-				}
-				if(boolFlag){
-					var gistdata = $("#file_gistdata tr").length;
-					for(var i=0; i<gistdata; i++) {
-						var numberStr = $("#file_gistdata tr").eq(i).find("td:first").html();
-						var second = $("#file_gistdata tr").eq(i).find("td:eq(1)").html();
-						var fileFlag = $("#file_gistdata tr").eq(i).find("td:last").html();
-						if(second == 1){
-						if(numberStr != undefined && numberStr !=null && numberStr !=''){
-							if (fileFlag==1){
+						if(startDate.getTime() > endingDate.getTime()){
+							parent.layer.msg("工作开始日期不得大于工作结束日期!", {icon: 5});
+							return false;
+						}
+						if (leng1==0){
+							top.layer.msg("请添加咨询员信息！", {icon: 0});
+							return false;
+						}
+						for(var i=0; i<leng; i++) {
+							var numberStr = $("#file_attachment tr").eq(i).find("td:first").html();
+							var second = $("#file_attachment tr").eq(i).find("td:eq(1)").html();
+							var name = $("#file_attachment tr").eq(i).find("td:eq(2)").html();
+							var fileFlag = $("#file_attachment tr").eq(i).find("td:last").html();
+							if(second == 1){
+								if(numberStr != undefined && numberStr !=null && numberStr !=''){
+									if (fileFlag==1){
 
-							}else{
-								top.layer.msg("请上传依据性文件！", {icon: 0});
-								return false;
+									}else{
+										top.layer.msg("请上传成果文件！", {icon: 0});
+										return false;
+									}
+									<%--$.ajax({--%>
+									<%--	type: 'post',--%>
+									<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
+									<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
+									<%--	dataType: "json",--%>
+									<%--	async: false--%>
+									<%--}).success(function (result) {--%>
+									<%--	if(result == 0){--%>
+									<%--		boolFlag = false;--%>
+									<%--		top.layer.msg("请上传成果文件！", {icon: 0});--%>
+									<%--		return false;--%>
+									<%--	}--%>
+									<%--}).error(function () {--%>
+									<%--	top.layer.msg("文件载入失败！");--%>
+									<%--});--%>
+								}
 							}
-							<%--$.ajax({--%>
-							<%--	type: 'post',--%>
-							<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
-							<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
-							<%--	dataType: "json",--%>
-							<%--	async: false--%>
-							<%--}).success(function (result) {--%>
-							<%--	if(result == 0){--%>
-							<%--		boolFlag = false;--%>
-							<%--		top.layer.msg("请上传依据性文件！", {icon: 0});--%>
-							<%--		return false;--%>
-							<%--	}--%>
-							<%--}).error(function () {--%>
-							<%--	top.layer.msg("文件载入失败！");--%>
-							<%--});--%>
 						}
+						if(boolFlag){
+							var gistdata = $("#file_gistdata tr").length;
+							for(var i=0; i<gistdata; i++) {
+								var numberStr = $("#file_gistdata tr").eq(i).find("td:first").html();
+								var second = $("#file_gistdata tr").eq(i).find("td:eq(1)").html();
+								var fileFlag = $("#file_gistdata tr").eq(i).find("td:last").html();
+								if(second == 1){
+									if(numberStr != undefined && numberStr !=null && numberStr !=''){
+										if (fileFlag==1){
+
+										}else{
+											top.layer.msg("请上传依据性文件！", {icon: 0});
+											return false;
+										}
+										<%--$.ajax({--%>
+										<%--	type: 'post',--%>
+										<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
+										<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
+										<%--	dataType: "json",--%>
+										<%--	async: false--%>
+										<%--}).success(function (result) {--%>
+										<%--	if(result == 0){--%>
+										<%--		boolFlag = false;--%>
+										<%--		top.layer.msg("请上传依据性文件！", {icon: 0});--%>
+										<%--		return false;--%>
+										<%--	}--%>
+										<%--}).error(function () {--%>
+										<%--	top.layer.msg("文件载入失败！");--%>
+										<%--});--%>
+									}
+								}
+							}
 						}
-					}
-				}
-				if(boolFlag){
-					var other = $("#ile_other tr").length;
-					for(var i=0; i<other; i++) {
-						var numberStr = $("#ile_other tr").eq(i).find("td:first").html();
-						var second = $("#ile_other tr").eq(i).find("td:eq(1)").html();
-						var fileFlag = $("#file_other tr").eq(i).find("td:last").html();
-						if(second == 1){
-						if(numberStr != undefined && numberStr !=null && numberStr !=''){
-							if (fileFlag==1){
+						if(boolFlag){
+							var other = $("#ile_other tr").length;
+							for(var i=0; i<other; i++) {
+								var numberStr = $("#ile_other tr").eq(i).find("td:first").html();
+								var second = $("#ile_other tr").eq(i).find("td:eq(1)").html();
+								var fileFlag = $("#file_other tr").eq(i).find("td:last").html();
+								if(second == 1){
+									if(numberStr != undefined && numberStr !=null && numberStr !=''){
+										if (fileFlag==1){
 
-							}else{
-								top.layer.msg("请上传其它文件！", {icon: 0});
-								return false;
+										}else{
+											top.layer.msg("请上传其它文件！", {icon: 0});
+											return false;
+										}
+										<%--$.ajax({--%>
+										<%--	type: 'post',--%>
+										<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
+										<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
+										<%--	dataType: "json",--%>
+										<%--	async: false--%>
+										<%--}).success(function (result) {--%>
+										<%--	if(result == 0){--%>
+										<%--		boolFlag = false;--%>
+										<%--		top.layer.msg("请上传其他文件！", {icon: 0});--%>
+										<%--		return false;--%>
+										<%--	}--%>
+										<%--}).error(function () {--%>
+										<%--	top.layer.msg("文件载入失败！");--%>
+										<%--});--%>
+									}
+								}
 							}
-							<%--$.ajax({--%>
-							<%--	type: 'post',--%>
-							<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
-							<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
-							<%--	dataType: "json",--%>
-							<%--	async: false--%>
-							<%--}).success(function (result) {--%>
-							<%--	if(result == 0){--%>
-							<%--		boolFlag = false;--%>
-							<%--		top.layer.msg("请上传其他文件！", {icon: 0});--%>
-							<%--		return false;--%>
-							<%--	}--%>
-							<%--}).error(function () {--%>
-							<%--	top.layer.msg("文件载入失败！");--%>
-							<%--});--%>
 						}
+						var flags=judgment();
+						if (!flags){
+							return flags;
+						}else{
+							$("#inputForm").attr("action","${ctx}/ruralProject/ruralProjectMessage/saveReport");
 						}
-					}
-				}
-				if(boolFlag){
-					if(obj == 1){
-						$("#inputForm").attr("action","${ctx}/ruralProject/ruralProjectMessage/saveReport");
 					}else{
 						//$("#inputForm").attr("action","${ctx}/projectcontentinfo/projectcontentinfo/save?view=report");
 						$("#inputForm").attr("action","${ctx}/ruralProject/ruralProjectMessage/holdSaveReport");
@@ -795,19 +801,19 @@
 					<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 placeholder="请输入送审价" id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control required layui-input number" onchange="getFee()" onblur="getAttachment()"/>
+							<form:input placeholder="请输入送审价" id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control judgment layui-input number" onchange="getFee()" onblur="getAttachment()"/>
 						</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 placeholder="请输入审定价" id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control required layui-input number" onchange="getApprovalFee()"/>
+							<form:input placeholder="请输入审定价" id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control judgment layui-input number" onchange="getApprovalFee()"/>
 						</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 placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control required layui-input number"/>
+							<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control judgment layui-input number"/>
 						</div>
 					</div>
 					<%--<c:choose>
@@ -841,7 +847,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">
-							<select class="form-control required layui-input" id="bzshbUserId"  name="projectReportData.bzshbUserId">
+							<select class="form-control judgment layui-input" id="bzshbUserId"  name="projectReportData.bzshbUserId">
 								<option value=""/>
 								<c:forEach items="${projectRecords.bzshbUserList}" var="user" varStatus="status">
 									<option value="${user.id}" <c:if test="${projectcontentinfo.projectReportData.bzshbUserId eq user.id }">selected</c:if>>${user.name}</option>
@@ -910,7 +916,7 @@
 					<label class="layui-form-label"><span class="require-item">*</span>专业咨询员：</label>
 					<div class="layui-input-block  with-icon">
 						<sys:inquireselectUser id="consultant" name="projectReportData.consultant.id" value="${projectReportData.consultant.id}" labelName="projectReportData.consultant.name" labelValue="${projectReportData.consultant.name}"
-										cssStyle="background-color:#fff"	title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+										cssStyle="background-color:#fff"	title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 lw7">
@@ -918,7 +924,7 @@
 					<div class="layui-input-block">
 						<div class="layui-item layui-col-sm6 lw7 with-textarea">
 							<div class="layui-input-block" style="margin-left:0px;position: relative">
-								<form:textarea placeholder="请输入审批意见：" path="projectReportData.consultantRemarks" id="zixunOpinion" class="form-control required" rows="4" cssStyle="height: 200px;" maxlength="255" />
+								<form:textarea placeholder="请输入审批意见：" path="projectReportData.consultantRemarks" id="zixunOpinion" class="form-control judgment" rows="4" cssStyle="height: 200px;" maxlength="255" />
 								<a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
 								<input type="file" name="upload_files" style="display: none;">
 							</div>
@@ -936,14 +942,14 @@
 								</div>
 							</div>
 						</div>
-<%--						<form:textarea placeholder="请输入审核意见" path="projectReportData.consultantRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required"/>--%>
+<%--						<form:textarea placeholder="请输入审核意见" path="projectReportData.consultantRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control judgment"/>--%>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw7" style="margin-top: 20px;">
 					<label class="layui-form-label"><span class="require-item">*</span>项目负责人：</label>
 					<div class="layui-input-block  with-icon">
 						<sys:reportedtreeselectUser id="principal" name="projectReportData.principal.id" value="${projectRecords.projectMasterId}" labelName="projectReportData.principal.name" labelValue="${projectRecords.projectMasterName}"
-									cssStyle="background-color:#fff"	title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+									cssStyle="background-color:#fff"	title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 lw7 with-textarea">
@@ -951,7 +957,7 @@
 					<div class="layui-input-block">
 							<div class="layui-item layui-col-sm6 lw7 with-textarea">
 								<div class="layui-input-block" style="margin-left:0px;position: relative">
-									<form:textarea placeholder="请输入审批意见：" path="projectReportData.principalRemarks" id="fuzerenOpinion" class="form-control required" rows="4" cssStyle="height: 200px;" maxlength="255" />
+									<form:textarea placeholder="请输入审批意见：" path="projectReportData.principalRemarks" id="fuzerenOpinion" class="form-control judgment" rows="4" cssStyle="height: 200px;" maxlength="255" />
 									<a id="clearOpinons" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
 									<input type="file" name="upload_files" style="display: none;">
 								</div>
@@ -1111,7 +1117,7 @@
 								<td style="display:none">${fileAttachment.fileFlag}</td>
 							</tr>
 							<c:forEach items="${fileAttachment.workAttachments}" var = "workClientAttachment" varStatus="status">
-								<tr class="file_attachment_tr">
+								<tr class="file_attachment_${fileAttachment.id}_tr">
 									<td></td>
 									<c:choose>
 										<c:when test="${projectcontentinfo.uploadMode == 2}">
@@ -1254,7 +1260,7 @@
 								<td style="display:none">${fileGistdata.fileFlag}</td>
 							</tr>
 							<c:forEach items="${fileGistdata.workAttachments}" var = "workClientAttachment" varStatus="status">
-								<tr class="file_gistdata_tr">
+								<tr class="file_gistdata_${fileGistdata.id}_tr">
 									<td></td>
 									<c:choose>
 										<c:when test="${projectcontentinfo.uploadMode == 2}">
@@ -1395,7 +1401,7 @@
 								<td style="display:none">${fileOther.fileFlag}</td>
 							</tr>
 							<c:forEach items="${fileOther.workAttachments}" var = "workClientAttachment" varStatus="status">
-								<tr class="file_other_tr">
+								<tr class="file_other_${fileOther.id}_tr">
 									<td></td>
 									<c:choose>
 										<c:when test="${projectcontentinfo.uploadMode == 2}">

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

@@ -136,12 +136,12 @@
 	<sys:message content="${message}"/>
 	<div class="layui-row">
 		<div class="full-width fl">
-			<div class="contentShadow layui-row" id="queryDiv">
+			<div class="layui-row contentShadow shadowLR" id="queryDiv">
 				<form:form id="searchForm" modelAttribute="workClientInfo" action="${ctx}/workclientinfo/workClientInfo/list" method="post" class="form-inline">
 					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 					<%--<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->--%>
-					<div class="commonQuery lw14">
+					<div class="commonQuery lw7">
 						<div class="layui-item query athird">
 							<label class="layui-form-label">客户名称：</label>
 							<div class="layui-input-block">
@@ -241,9 +241,8 @@
 		<div class="full-width fl">
 			<div class="contentShadow layui-form contentDetails">
 				<div class="nav-btns">
-
 					<%--此处按钮样式包括 nav-btn-add nav-btn-refresh nav-btn-import nav-btn-export nav-btn-query nav-btn-reset--%>
-					<div class="layui-btn-group" style="margin-left: 20px;">
+					<div class="layui-btn-group">
 						<shiro:hasPermission name="workclientinfo:workClientInfo:add">
 							<table:addRow url="${ctx}/workclientinfo/workClientInfo/form" title="客户管理"></table:addRow><!-- 增加按钮 -->
 						</shiro:hasPermission>

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

@@ -7,6 +7,7 @@
 	<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}/common/html/js/script.js"></script>
 	<style>
 		label.error{
 			left:0;
@@ -17,17 +18,22 @@
         var validateForm;
         var count = 0;
         function doSubmit(obj){
-            $("#contractPrice").val($("#contractPrice").val().replace(/\,/g, ""));
-            //$("#investmentAmount").val($("#investmentAmount").val().replace(/\,/g, ""));
-            // 回调函数，在编辑和保存动作时，供openDialog调用提交表单。
-			if($("#contractTypeDoc").val() == ""){
-				parent.layer.msg("请选择合同类型!", {icon: 5});
-				return false;
-			}
             if(validateForm.form()){
                 if(obj == 1){
+					$("#contractPrice").val($("#contractPrice").val().replace(/\,/g, ""));
+					//$("#investmentAmount").val($("#investmentAmount").val().replace(/\,/g, ""));
+					// 回调函数，在编辑和保存动作时，供openDialog调用提交表单。
+					if($("#contractTypeDoc").val() == ""){
+						parent.layer.msg("请选择合同类型!", {icon: 5});
+						return false;
+					}
                     //送审
-                    $("#inputForm").attr("action","${ctx}/workcontractinfo/workContractInfo/save");
+					var flags=judgment();
+					if (flags){
+						$("#inputForm").attr("action","${ctx}/workcontractinfo/workContractInfo/save");
+					}else{
+						return flags;
+					}
                 }else if(obj ==2){
                     //暂存
                     $("#inputForm").attr("action","${ctx}/workcontractinfo/workContractInfo/store");
@@ -101,16 +107,16 @@
             $("#contractFee").change(function(){
                 //状态为其他的时候  添加required样式
                 if($(this).val() == "4"){
-                    $("#contractFeeDoc").attr("class","form-control required");
+                    $("#contractFeeDoc").attr("class","form-control judgment");
                 }else{
                     $("#contractFeeDoc").attr("class","form-control");
                 }
             });
-            $("#contractType").attr("class","form-control required");
+            $("#contractType").attr("class","form-control judgment");
             /* $("#contractType").change(function(){
                  //状态为其他的时候  添加required样式
                  if($(this).val() == "5"){
-                     $("#contractTypeDoc").attr("class","form-control required");
+                     $("#contractTypeDoc").attr("class","form-control judgment");
                  }else{
                      $("#contractTypeDoc").attr("class","form-control");
                  }
@@ -610,7 +616,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"
-													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>
+													cssStyle="background-color:#fff" labelValue="${workContractInfo.client.name}" cssClass="form-control layui-input judgment" 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,13 +624,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" placeholder="请输入合同名称"   class="form-control required layui-input"/>
+									<form:input path="name" htmlEscape="false" placeholder="请输入合同名称"   class="form-control judgment 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 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"/>">
+									<input placeholder="请选择签订日期" style="background-color: #fff" class="laydate-icondate layui-input form-control layer-date laydate-icon judgment" 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">
@@ -642,7 +648,7 @@
 							<div class="layui-item layui-col-sm6 ">
 								<label class="layui-form-label"><span class="require-item">*</span>合同类型：</label>
 								<div class="layui-input-block">
-									<form:select path="contractTypeDoc" cssClass="form-control required simple-select">
+									<form:select path="contractTypeDoc" cssClass="form-control judgment simple-select">
 										<form:option value="" label=""/>
 										<form:options items="${fns:getMainDictList('contract_info_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 									</form:select>
@@ -651,7 +657,7 @@
 							<div class="layui-item layui-col-sm6">
 								<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"  placeholder="请输入合同金额/预计金额"   pattern="#.00" class="form-control required number  layui-input"/>
+									<form:input path="contractPrice" htmlEscape="false"  placeholder="请输入合同金额/预计金额"   pattern="#.00" class="form-control judgment number  layui-input"/>
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6">
@@ -742,16 +748,16 @@
                                             <input id="workClientInfoList{{idx}}_delFlag" name="workClientInfoList[{{idx}}].delFlag" type="hidden" value="0"/>
                                         </td>
                                     	<td>
-                                        	<input id="workClientInfoList{{idx}}_name" name="workClientInfoList[{{idx}}].name" type="text" value="{{row.name}}"  readonly="true"  class="form-control required"/>
+                                        	<input id="workClientInfoList{{idx}}_name" name="workClientInfoList[{{idx}}].name" type="text" value="{{row.name}}"  readonly="true"  class="form-control judgment"/>
                                    		 </td>
                                     	 <td>
-                                        	<input id="workClientInfoList{{idx}}_companyType" name="workClientInfoList[{{idx}}].companyType" type="text" value="{{row.companyType}}" readonly="true"   class="form-control required"/>
+                                        	<input id="workClientInfoList{{idx}}_companyType" name="workClientInfoList[{{idx}}].companyType" type="text" value="{{row.companyType}}" readonly="true"   class="form-control judgment"/>
                                    		 </td>
                                     	<td>
-                                            <input id="workClientInfoList{{idx}}_companyIndustry"  name="workClientInfoList[{{idx}}].companyIndustry" type="text" value="{{row.companyIndustry}}"  readonly="true"  class="form-control required"/>
+                                            <input id="workClientInfoList{{idx}}_companyIndustry"  name="workClientInfoList[{{idx}}].companyIndustry" type="text" value="{{row.companyIndustry}}"  readonly="true"  class="form-control judgment"/>
                                         </td>
                                         <td>
-                                            <input id="workClientInfoList{{idx}}_area" name="workClientInfoList[{{idx}}].area.name" type="text" value="{{row.area.name}}"  readonly="true"   class="form-control required"/>
+                                            <input id="workClientInfoList{{idx}}_area" name="workClientInfoList[{{idx}}].area.name" type="text" value="{{row.area.name}}"  readonly="true"   class="form-control judgment"/>
                                         </td>
 
                                         <td class="text-center op-td" id="workClientInfoList{{idx}}_td">

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

@@ -125,7 +125,6 @@
                         // top.layer.close(index);//关闭对话框。
                         setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
                     }
-                    return false;
                 },
                 btn3: function(index){
                 }
@@ -251,7 +250,6 @@
                         // top.layer.close(index);//关闭对话框。
                         setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
                     }
-                    return false;
                 },
                 btn3: function(index){
                 }

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

@@ -123,8 +123,10 @@
 					<div class="layui-item athird">
 						<div class="input-group">
 							<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-							<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-							<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+							<div class="layui-btn-group search-spacing">
+								<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+								<button id="searchReset" class="layui-btn layui-btn-sm " onclick="resetSearch()">重置</button>
+							</div>
 						</div>
 					</div>
 					<div style="    clear:both;"></div>

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

@@ -10,6 +10,10 @@
 			top:80px;
 			left:0;
 		}
+		#workInvoiceProjectRelationList td{
+			padding-left: 0px;
+			padding-right: 0px;
+		}
 	</style>
 	<script type="text/javascript">
         var validateForm;
@@ -149,7 +153,29 @@
                 }
             })
         }
-
+		function addRow1(list, idx, tpl, row){
+			var idx1 = $("#workInvoiceProjectRelationList tr").length;
+			if(list == '#workInvoiceProjectRelationList'){
+				bornTemplete1(list, idx, tpl, row, idx1);
+			}
+		}
+		function bornTemplete1(list, idx, tpl, row, idx1){
+			$(list).append(Mustache.render(tpl, {
+				idx: idx, delBtn: true, row: row,
+				order:idx1 + 1
+			}));
+			$(list+idx).find("select").each(function(){
+				$(this).val($(this).attr("data-value"));
+			});
+			$(list+idx).find("input[type='checkbox'], input[type='radio']").each(function(){
+				var ss = $(this).attr("data-value").split(',');
+				for (var i=0; i<ss.length; i++){
+					if($(this).val() == ss[i]){
+						$(this).attr("checked","checked");
+					}
+				}
+			});
+		}
         function addRow(list, idx, tpl, row){
             var idx1 = $("#workAccountList tr").length;
             if(list == '#workAccountList' && idx1 < 100){
@@ -309,43 +335,57 @@
 
 			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>基本信息</h2></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.project.projectName}"/>
-					</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">
-						<div class="input-group">
-							<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.number}"/>
-						</div>
-					</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.project.workContractInfo.name}"/>
-					</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.project.projectId}"/>
-					</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.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}"/>
-					</div>
+				<div class="layui-table-body layui-item layui-col-xs12 form-table-container"  style="padding:0px">
+					<table id="contentTables" class="table table-bordered table-condensed can-edit no-bottom-margin details">
+						<thead>
+						<tr>
+							<th width="200px"><font color="red">*</font>项目名称</th>
+							<th width="200px">合同名称</th>
+							<th width="200px">项目编号</th>
+							<th width="200px">委托方</th>
+							<th width="200px">报告号</th>
+						</tr>
+						</thead>
+						<tbody id="workInvoiceProjectRelationList">
+						</tbody>
+					</table>
+					<script type="text/template" id="workInvoiceProjectRelationListTpl">//<!--
+                    <tr id="workInvoiceProjectRelationList{{idx}}">
+                        <td class="hide">
+                            <input id="workInvoiceProjectRelationList{{idx}}_invoiceId" name="workInvoiceProjectRelationList[{{idx}}].invoiceId" type="hidden" value="{{row.invoiceId}}"/>
+							<input id="workInvoiceProjectRelationList{{idx}}_projectId" name="workInvoiceProjectRelationList[{{idx}}].projectId" type="hidden" value="{{row.projectId}}"/>
+							<input id="workInvoiceProjectRelationList{{idx}}_delFlag" name="workInvoiceProjectRelationList[{{idx}}].delFlag" type="hidden" value="0"/>
+                        </td>
+                        <td>
+							<input id="workInvoiceProjectRelationList{{idx}}_projectName"   type="text" value="{{row.projectName}}" maxlength="32" readonly="readonly"  class="form-control"/>
+                        </td>
+                        <td>
+							<input id="workInvoiceProjectRelationList{{idx}}_workContractName"   type="text" value="{{row.workContractName}}" maxlength="32" readonly="readonly"  class="form-control"/>
+                        </td>
+                        <td style="text-align:center;">
+							<input id="workInvoiceProjectRelationList{{idx}}_projectNum"  type="text" value="{{row.projectNum}}" maxlength="32" readonly="readonly"  class="form-control"/>
+                        </td>
+                        <td>
+							<input id="workInvoiceProjectRelationList{{idx}}_clientName"  type="text" value="{{row.clientName}}" maxlength="32" readonly="readonly"  class="form-control"/>
+                        </td>
+                        <td>
+							<input id="workInvoiceProjectRelationList{{idx}}_reportDataNum"  type="text" value="{{row.reportDataNum}}" maxlength="32" readonly="readonly"  class="form-control"/>
+                        </td>
+                    </tr>//-->
+					</script>
+					<script type="text/javascript">
+						var workInvoiceProjectRelationListRowIdx = 0, workInvoiceProjectRelationListTpl = $("#workInvoiceProjectRelationListTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+						/*if($("#id").val()){
+							workInvoiceProjectRelationListRowIdx = ${fn:length(workInvoice.workInvoiceProjectRelationList)};
+						}*/
+						$(document).ready(function() {
+							var data = ${fns:toJson(workInvoice.workInvoiceProjectRelationList)};
+							for (var i=0; i<data.length; i++){
+								addRow1('#workInvoiceProjectRelationList', workInvoiceProjectRelationListRowIdx, workInvoiceProjectRelationListTpl, data[i])
+								workInvoiceProjectRelationListRowIdx = workInvoiceProjectRelationListRowIdx + 1;
+							}
+						});
+					</script>
 				</div>
 			</div>
 			<div class="form-group layui-row first">
@@ -363,6 +403,14 @@
 					</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">
+						<div class="input-group">
+							<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.number}"/>
+						</div>
+					</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}"/>
@@ -401,7 +449,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 htmlEscape="false" readonly="true"   class="form-control layui-input" value="<fmt:formatNumber value="${workInvoice.money}" pattern="#,#00.00"/>"/>
+						<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="<fmt:formatNumber value="${workInvoice.money}" pattern="##00.00"/>"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
@@ -422,13 +470,18 @@
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${workInvoice.invoiceDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
 				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">对账人：</label>
+					<div class="layui-input-block  with-icon">
+						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workInvoice.accountCheckingUserName}"/>
+					</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"/>"/>
 					</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">
@@ -442,15 +495,15 @@
 					<table id="contentTable" class="table table-bordered table-condensed details">
 						<thead>
 						<tr>
-							<th><span class="require-item">*</span>发票代码</th>
-							<th><span class="require-item">*</span>发票号</th>
-							<th><span class="require-item">*</span>价税合计</th>
-							<th><span class="require-item">*</span>税率</th>
-							<th><span class="require-item">*</span>金额</th>
-							<th><span class="require-item">*</span>税额</th>
-							<th><span class="require-item">*</span>累计登记金额</th>
-							<th><span class="require-item">*</span>发票状态</th><%--正常--%>
-							<th><span class="require-item">*</span>被退标记</th>
+							<th>发票代码</th>
+							<th>发票号</th>
+							<th>价税合计</th>
+							<th>税率</th>
+							<th>金额</th>
+							<th>税额</th>
+							<th>累计登记金额</th>
+							<th>发票状态</th><%--正常--%>
+							<th>被退标记</th>
 								<%--<th><span class="require-item">*</span>被退票号</th>
                                 <th><span class="require-item">*</span>开票日期</th>--%>
 						</tr>
@@ -466,20 +519,20 @@
 											${workAccount.number}
 									</td>
 
-									<td title="<fmt:formatNumber value="${workAccount.totalMoney}" pattern="#,#00.00"/>">
-										<fmt:formatNumber value="${workAccount.totalMoney}" pattern="#,#00.00"/>
+									<td title="<fmt:formatNumber value="${workAccount.totalMoney}" pattern="##00.00"/>">
+										<fmt:formatNumber value="${workAccount.totalMoney}" pattern="##00.00"/>
 									</td>
 									<td title="${workAccount.tax}">
 											${workAccount.tax}
 									</td>
-									<td title="<fmt:formatNumber value="${workAccount.taxMoney}" pattern="#,#00.00"/>">
-										<fmt:formatNumber value="${workAccount.taxMoney}" pattern="#,#00.00"/>
+									<td title="<fmt:formatNumber value="${workAccount.taxMoney}" pattern="##00.00"/>">
+										<fmt:formatNumber value="${workAccount.taxMoney}" pattern="##00.00"/>
 									</td>
-									<td title="<fmt:formatNumber value="${workAccount.taxRate}" pattern="#,#00.00"/>">
-										<fmt:formatNumber value="${workAccount.taxRate}" pattern="#,#00.00"/>
+									<td title="<fmt:formatNumber value="${workAccount.taxRate}" pattern="##00.00"/>">
+										<fmt:formatNumber value="${workAccount.taxRate}" pattern="##00.00"/>
 									</td>
-									<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>">
-										<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>
+									<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="##00.00"/>">
+										<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="##00.00"/>
 									</td>
 									<td title="${workAccount.state}">
 											${workAccount.state}

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

@@ -4,6 +4,12 @@
 <head>
 	<title>发票审批</title>
 	<meta name="decorator" content="default"/>
+	<style>
+		#workInvoiceProjectRelationList td{
+			padding-left: 0px;
+			padding-right: 0px;
+		}
+	</style>
 	<script type="text/javascript">
 		var validateForm;
 		function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
@@ -36,6 +42,29 @@
 				}
 			});
 		});
+		function addRow1(list, idx, tpl, row){
+			var idx1 = $("#workInvoiceProjectRelationList tr").length;
+			if(list == '#workInvoiceProjectRelationList'){
+				bornTemplete1(list, idx, tpl, row, idx1);
+			}
+		}
+		function bornTemplete1(list, idx, tpl, row, idx1){
+			$(list).append(Mustache.render(tpl, {
+				idx: idx, delBtn: true, row: row,
+				order:idx1 + 1
+			}));
+			$(list+idx).find("select").each(function(){
+				$(this).val($(this).attr("data-value"));
+			});
+			$(list+idx).find("input[type='checkbox'], input[type='radio']").each(function(){
+				var ss = $(this).attr("data-value").split(',');
+				for (var i=0; i<ss.length; i++){
+					if($(this).val() == ss[i]){
+						$(this).attr("checked","checked");
+					}
+				}
+			});
+		}
 	</script>
 </head>
 <body>
@@ -54,10 +83,65 @@
 
 		<div class="form-group layui-row first lw14">
 			<div class="form-group-label"><h2>基本信息</h2></div>
+			<div class="layui-table-body layui-item layui-col-xs12 form-table-container"  style="padding:0px">
+				<table id="contentTables" class="table table-bordered table-condensed can-edit no-bottom-margin details">
+					<thead>
+					<tr>
+						<th width="200px"><font color="red">*</font>项目名称</th>
+						<th width="200px">合同名称</th>
+						<th width="200px">项目编号</th>
+						<th width="200px">委托方</th>
+						<th width="200px">报告号</th>
+					</tr>
+					</thead>
+					<tbody id="workInvoiceProjectRelationList">
+					</tbody>
+				</table>
+				<script type="text/template" id="workInvoiceProjectRelationListTpl">//<!--
+                    <tr id="workInvoiceProjectRelationList{{idx}}">
+                        <td class="hide">
+                            <input id="workInvoiceProjectRelationList{{idx}}_invoiceId" name="workInvoiceProjectRelationList[{{idx}}].invoiceId" type="hidden" value="{{row.invoiceId}}"/>
+							<input id="workInvoiceProjectRelationList{{idx}}_projectId" name="workInvoiceProjectRelationList[{{idx}}].projectId" type="hidden" value="{{row.projectId}}"/>
+							<input id="workInvoiceProjectRelationList{{idx}}_delFlag" name="workInvoiceProjectRelationList[{{idx}}].delFlag" type="hidden" value="0"/>
+                        </td>
+                        <td>
+							<input id="workInvoiceProjectRelationList{{idx}}_projectName"   type="text" value="{{row.projectName}}" maxlength="32" readonly="readonly"  class="form-control"/>
+                        </td>
+                        <td>
+							<input id="workInvoiceProjectRelationList{{idx}}_workContractName"   type="text" value="{{row.workContractName}}" maxlength="32" readonly="readonly"  class="form-control"/>
+                        </td>
+                        <td style="text-align:center;">
+							<input id="workInvoiceProjectRelationList{{idx}}_projectNum"  type="text" value="{{row.projectNum}}" maxlength="32" readonly="readonly"  class="form-control"/>
+                        </td>
+                        <td>
+							<input id="workInvoiceProjectRelationList{{idx}}_clientName"  type="text" value="{{row.clientName}}" maxlength="32" readonly="readonly"  class="form-control"/>
+                        </td>
+                        <td>
+							<input id="workInvoiceProjectRelationList{{idx}}_reportDataNum"  type="text" value="{{row.reportDataNum}}" maxlength="32" readonly="readonly"  class="form-control"/>
+                        </td>
+                    </tr>//-->
+				</script>
+				<script type="text/javascript">
+					var workInvoiceProjectRelationListRowIdx = 0, workInvoiceProjectRelationListTpl = $("#workInvoiceProjectRelationListTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+					/*if($("#id").val()){
+                        workInvoiceProjectRelationListRowIdx = ${fn:length(workInvoice.workInvoiceProjectRelationList)};
+						}*/
+					$(document).ready(function() {
+						var data = ${fns:toJson(workInvoice.workInvoiceProjectRelationList)};
+						for (var i=0; i<data.length; i++){
+							addRow1('#workInvoiceProjectRelationList', workInvoiceProjectRelationListRowIdx, workInvoiceProjectRelationListTpl, data[i])
+							workInvoiceProjectRelationListRowIdx = workInvoiceProjectRelationListRowIdx + 1;
+						}
+					});
+				</script>
+			</div>
+		</div>
+		<div class="form-group layui-row first lw14">
+			<div class="form-group-label"><h2>发票详情</h2></div>
 			<div class="layui-item layui-col-sm6">
-				<label class="layui-form-label">项目名称：</label>
+				<label class="layui-form-label">上级/本公司开票：</label>
 				<div class="layui-input-block">
-					<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.project.projectName}"/>
+					<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="<c:choose><c:when test="${workInvoice.ext eq '0'}">本公司开票	</c:when><c:when test="${workInvoice.ext eq '1'}">上级公司开票</c:when></c:choose>"/>
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
@@ -69,45 +153,6 @@
 				</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.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}"/>
-				</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}"/>
-				</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}"/>
-				</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.office.name}"/>--%>
-				<%--</div>--%>
-			<%--</div>--%>
-		</div>
-		<div class="form-group layui-row first lw14">
-			<div class="form-group-label"><h2>发票详情</h2></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="<c:choose><c:when test="${workInvoice.ext eq '0'}">本公司开票	</c:when><c:when test="${workInvoice.ext eq '1'}">上级公司开票</c:when></c:choose>"/>
-				</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="<c:choose><c:when test="${workInvoice.invoiceType eq '1'}">专票</c:when><c:when test="${workInvoice.invoiceType eq '2'}">普票</c:when></c:choose>"/>
@@ -152,7 +197,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="<fmt:formatNumber value="${workInvoice.money}" pattern="#,#00.00"/>"/>
+					<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="<fmt:formatNumber value="${workInvoice.money}" pattern="##00.00"/>"/>
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
@@ -161,6 +206,12 @@
 					<input htmlEscape="false" readonly="true"   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  with-icon">
+					<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workInvoice.accountCheckingUserName}"/>
+				</div>
+			</div>
 			<div class="layui-item layui-col-sm12 with-textarea">
 				<label class="layui-form-label">作废原因：</label>
 				<div class="layui-input-block">
@@ -204,20 +255,20 @@
 										${workAccount.number}
 								</td>
 
-								<td title="<fmt:formatNumber value="${workAccount.totalMoney}" pattern="#,#00.00"/>">
-									<fmt:formatNumber value="${workAccount.totalMoney}" pattern="#,#00.00"/>
+								<td title="<fmt:formatNumber value="${workAccount.totalMoney}" pattern="##00.00"/>">
+									<fmt:formatNumber value="${workAccount.totalMoney}" pattern="##00.00"/>
 								</td>
 								<td title="${workAccount.tax}">
 										${workAccount.tax}
 								</td>
-								<td title="<fmt:formatNumber value="${workAccount.taxMoney}" pattern="#,#00.00"/>">
-									<fmt:formatNumber value="${workAccount.taxMoney}" pattern="#,#00.00"/>
+								<td title="<fmt:formatNumber value="${workAccount.taxMoney}" pattern="##00.00"/>">
+									<fmt:formatNumber value="${workAccount.taxMoney}" pattern="##00.00"/>
 								</td>
-								<td title="<fmt:formatNumber value="${workAccount.taxRate}" pattern="#,#00.00"/>">
-									<fmt:formatNumber value="${workAccount.taxRate}" pattern="#,#00.00"/>
+								<td title="<fmt:formatNumber value="${workAccount.taxRate}" pattern="##00.00"/>">
+									<fmt:formatNumber value="${workAccount.taxRate}" pattern="##00.00"/>
 								</td>
-								<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>">
-									<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>
+								<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="##00.00"/>">
+									<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="##00.00"/>
 								</td>
 								<td title="${workAccount.state}">
 										${workAccount.state}

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

@@ -517,7 +517,7 @@
                 {field:'index',align:'center', title: '序号',width:40}
 				,{field:'projName',align:'center', title: '项目名称', minWidth:160,templet:function(d){
 						if(1 == d.showView && d.showView != undefined){
-							return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.projectId +"','95%', '95%')\">" + d.projName + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/workinvoiceAll/workInvoiceAll/projectview?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
 						}else{
 							return "<span title='"+ d.projName +"'>" +d.projName+ "</span>";
 						}
@@ -547,13 +547,6 @@
 				,{field:'invoiceType',align:'center', title: '发票类型',  width:90,templet:function(d){
 						return "<span title='"+ d.invoiceType +"'>" + d.invoiceType + "</span>";
 					}}
-                ,{field:'reportNumber',align:'center', title: '报告号', minWidth:150,templet:function(d){
-						<%--return "<a class=\"attention-info\" title=\"" + d.reportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.projectId + "&view=view','95%', '95%')\">" + d.reportNumber + "</a>";--%>
-						return d.reportNumber;
-                    }}
-                ,{field:'areaName',align:'center', title: '项目所在地', minWidth:80,templet:function(d){
-                        return "<span title='"+ d.areaName +"'>" + d.areaName + "</span>";
-                    }}
 				,{field:'createDate',align:'center', sort:true,title: '开票日期',  width:80}
 				,{field:'receiptMoneyDate',align:'center', sort:true,title: '收款日期',  width:80}
 				,{field:'receiptMoney',align:'center', title: '是否收款',  width:80}
@@ -647,13 +640,13 @@
                     ,"projectId":"${workInvoice.project.id}"
                     ,"areaName":"${workInvoice.project.county}"
                     ,"reportNumber":"${workInvoice.project.reportData.number}"
-                    ,"projName":"${workInvoice.project.projectName}"
+                    ,"projName":"${workInvoice.projectName}"
                     ,"clientName":"${workInvoice.client.name}"
                     ,"officeName":"${workInvoice.office.name}"
                     ,"responsibleName":"${workInvoice.createBy.name}"
                     ,"receiptMoney":"${workInvoice.receiptMoney}"
                     ,"status":"${workInvoice.invoiceState}"
-                    ,"money":"<fmt:formatNumber value="${workInvoice.money}" pattern="#,#0.00"/>"
+                    ,"money":"<fmt:formatNumber value="${workInvoice.money}" pattern="##0.00"/>"
                     ,"createDate":"<fmt:formatDate value="${workInvoice.createDate}" pattern="yyyy-MM-dd"/>"
                     ,"receiptMoneyDate":"<fmt:formatDate value="${workInvoice.receiptMoneyDate}" pattern="yyyy-MM-dd"/>"
                     <c:if test="${workInvoice.invoiceState == 1 && fns:getUser().id == workInvoice.createBy.id}"><shiro:hasPermission name="workinvoice:workInvoice:edit">,"canedit1":"1"</shiro:hasPermission></c:if><%--暂存-修改--%>

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

@@ -6,6 +6,7 @@
 	<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}/common/html/js/script.js"></script>
 	<style>
 		td input{
 			margin-left:0px !important;
@@ -15,52 +16,71 @@
 			padding-left: 0px;
 			padding-right: 0px;
 		}
+		#workInvoiceProjectRelationList td{
+			padding-left: 0px;
+			padding-right: 0px;
+		}
 	</style>
 	<script type="text/javascript">
 		var validateForm;
 		function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
 		  if(validateForm.form()){
-			  var length = $("#workReceiptList tr").length;
-			  var invoiceMoneyStr = $("#invoiceMoney").val();
-			  invoiceMoneyStr = invoiceMoneyStr.replace(/\,/g, "");
-			  var invoiceMoney = parseFloat(invoiceMoneyStr);
-			  if(length==0){
-				  parent.layer.msg('请录入收款信息',{icon:5});
-				  return false;
-			  }else{
-			  	var moneys = 0;
-				  for(var i=0; i<length; i++) {
-				  	//获取每一行的汇款金额
-				  	var money = parseFloat(workReceiptList.rows[i].cells[2].getElementsByTagName("INPUT")[0].value);
-					//计算所有汇款综合
-				  	moneys = moneys+money;
-				  }
-			  }
 			  if(obj == 2){
-			  	if(moneys<invoiceMoney){
-					layer.confirm('收款金额小于发票金额，确定收款吗？', {
-						btn: ['确定', '关闭'],
-						btn1: function(index, layero){
-							$("#inputForm").attr("action","${ctx}/workinvoiceAll/workInvoiceAll/saveAffirmReceipt");
-							$("#inputForm").submit();
-							top.layer.close(index);//关闭对话框。
-							//关闭iframe页面
-							var index = parent.layer.getFrameIndex(window.name); //获取窗口索引
-							parent.layer.close(index);
-						},btn2: function(index){
-						}
-					});
-				}else if(moneys>invoiceMoney){
-					parent.layer.msg('收款金额不得大于开票金额',{icon:5});
-					return false;
-				}else if(moneys == invoiceMoney){
-					$("#inputForm").attr("action","${ctx}/workinvoiceAll/workInvoiceAll/saveAffirmReceipt");
-					$("#inputForm").submit();
-					top.layer.close();//关闭对话框。
-					//关闭iframe页面
-					var index = parent.layer.getFrameIndex(window.name); //获取窗口索引
-					parent.layer.close(index);
-				}
+				  var length = $("#workReceiptList tr").length;
+				  var invoiceMoneyStr = $("#invoiceMoney").val();
+				  invoiceMoneyStr = invoiceMoneyStr.replace(/\,/g, "");
+				  var invoiceMoney = parseFloat(invoiceMoneyStr);
+				  if(length==0){
+					  parent.layer.msg('请录入收款信息',{icon:5});
+					  return false;
+				  }else{
+					  var moneys = 0;
+					  for(var i=0; i<length; i++) {
+						  //获取每一行的汇款金额
+						  var money = parseFloat(workReceiptList.rows[i].cells[2].getElementsByTagName("INPUT")[0].value);
+						  //计算所有汇款综合
+						  moneys = moneys+money;
+					  }
+				  }
+				  var flags=judgment();
+				  if (flags){
+					  if(moneys<invoiceMoney){
+						  layer.confirm('收款金额小于发票金额，确定收款吗？', {
+							  btn: ['确定', '关闭'],
+							  btn1: function(index, layero){
+								  var flags=judgment();
+								  if (flags){
+									  $("#inputForm").attr("action","${ctx}/workinvoiceAll/workInvoiceAll/saveAffirmReceipt");
+								  }else{
+									  return flags;
+								  }
+								  $("#inputForm").submit();
+								  top.layer.close(index);//关闭对话框。
+								  //关闭iframe页面
+								  var index = parent.layer.getFrameIndex(window.name); //获取窗口索引
+								  parent.layer.close(index);
+							  },btn2: function(index){
+							  }
+						  });
+					  }else if(moneys>invoiceMoney){
+						  parent.layer.msg('收款金额不得大于开票金额',{icon:5});
+						  return false;
+					  }else if(moneys == invoiceMoney){
+						  var flags=judgment();
+						  if (flags){
+							  $("#inputForm").attr("action","${ctx}/workinvoiceAll/workInvoiceAll/saveAffirmReceipt");
+						  }else{
+							  return flags;
+						  }
+						  $("#inputForm").submit();
+						  top.layer.close();//关闭对话框。
+						  //关闭iframe页面
+						  var index = parent.layer.getFrameIndex(window.name); //获取窗口索引
+						  parent.layer.close(index);
+					  }
+				  }else{
+					  return flags;
+				  }
 			  }else{
 			  	if(moneys > invoiceMoney){
 					parent.layer.msg('收款金额不能大于开票金额',{icon:5});
@@ -98,7 +118,29 @@
 			});
 		});
 
-
+		function addRow1(list, idx, tpl, row){
+			var idx1 = $("#workInvoiceProjectRelationList tr").length;
+			if(list == '#workInvoiceProjectRelationList'){
+				bornTemplete1(list, idx, tpl, row, idx1);
+			}
+		}
+		function bornTemplete1(list, idx, tpl, row, idx1){
+			$(list).append(Mustache.render(tpl, {
+				idx: idx, delBtn: true, row: row,
+				order:idx1 + 1
+			}));
+			$(list+idx).find("select").each(function(){
+				$(this).val($(this).attr("data-value"));
+			});
+			$(list+idx).find("input[type='checkbox'], input[type='radio']").each(function(){
+				var ss = $(this).attr("data-value").split(',');
+				for (var i=0; i<ss.length; i++){
+					if($(this).val() == ss[i]){
+						$(this).attr("checked","checked");
+					}
+				}
+			});
+		}
 
 		function addRow(list, idx, tpl, row){
 			var idx1 = $("#workReceiptList tr").length;
@@ -157,53 +199,58 @@
 
 			<div class="form-group layui-row first lw14">
 				<div class="form-group-label"><h2>基本信息</h2></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" 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" 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>
-						</div>
-					</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" 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" 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" 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" style="background-color: #f1f1f1" class="form-control layui-input" value="${workInvoice.project.reportData.number}"/>
-					</div>
+				<div class="layui-table-body layui-item layui-col-xs12 form-table-container"  style="padding:0px">
+					<table id="contentTables" class="table table-bordered table-condensed can-edit no-bottom-margin details">
+						<thead>
+						<tr>
+							<th width="200px"><font color="red">*</font>项目名称</th>
+							<th width="200px">合同名称</th>
+							<th width="200px">项目编号</th>
+							<th width="200px">委托方</th>
+							<th width="200px">报告号</th>
+						</tr>
+						</thead>
+						<tbody id="workInvoiceProjectRelationList">
+						</tbody>
+					</table>
+					<script type="text/template" id="workInvoiceProjectRelationListTpl">//<!--
+                    <tr id="workInvoiceProjectRelationList{{idx}}">
+                        <td class="hide">
+                            <input id="workInvoiceProjectRelationList{{idx}}_invoiceId" name="workInvoiceProjectRelationList[{{idx}}].invoiceId" type="hidden" value="{{row.invoiceId}}"/>
+                            <input id="workInvoiceProjectRelationList{{idx}}_projectId" name="workInvoiceProjectRelationList[{{idx}}].projectId" type="hidden" value="{{row.projectId}}"/>
+							<input id="workInvoiceProjectRelationList{{idx}}_delFlag" name="workInvoiceProjectRelationList[{{idx}}].delFlag" type="hidden" value="0"/>
+                        </td>
+                        <td>
+							<input id="workInvoiceProjectRelationList{{idx}}_projectName"   type="text" value="{{row.projectName}}" maxlength="32" readonly="readonly"  class="form-control"/>
+                        </td>
+                        <td>
+							<input id="workInvoiceProjectRelationList{{idx}}_workContractName"   type="text" value="{{row.workContractName}}" maxlength="32" readonly="readonly"  class="form-control"/>
+                        </td>
+                        <td style="text-align:center;">
+							<input id="workInvoiceProjectRelationList{{idx}}_projectNum"  type="text" value="{{row.projectNum}}" maxlength="32" readonly="readonly"  class="form-control"/>
+                        </td>
+                        <td>
+							<input id="workInvoiceProjectRelationList{{idx}}_clientName"  type="text" value="{{row.clientName}}" maxlength="32" readonly="readonly"  class="form-control"/>
+                        </td>
+                        <td>
+							<input id="workInvoiceProjectRelationList{{idx}}_reportDataNum"  type="text" value="{{row.reportDataNum}}" maxlength="32" readonly="readonly"  class="form-control"/>
+                        </td>
+                    </tr>//-->
+					</script>
+					<script type="text/javascript">
+						var workInvoiceProjectRelationListRowIdx = 0, workInvoiceProjectRelationListTpl = $("#workInvoiceProjectRelationListTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+						/*if($("#id").val()){
+							workInvoiceProjectRelationListRowIdx = ${fn:length(workInvoice.workInvoiceProjectRelationList)};
+						}*/
+						$(document).ready(function() {
+							var data = ${fns:toJson(workInvoice.workInvoiceProjectRelationList)};
+							for (var i=0; i<data.length; i++){
+								addRow1('#workInvoiceProjectRelationList', workInvoiceProjectRelationListRowIdx, workInvoiceProjectRelationListTpl, data[i])
+								workInvoiceProjectRelationListRowIdx = workInvoiceProjectRelationListRowIdx + 1;
+							}
+						});
+					</script>
 				</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.office.name}"/>--%>
-					<%--</div>--%>
-				<%--</div>--%>
 			</div>
 			<div class="form-group layui-row first lw14">
 				<div class="form-group-label"><h2>发票详情</h2></div>
@@ -220,6 +267,14 @@
 					</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">
+						<div class="input-group">
+							<input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1"  class="form-control layui-input" value="${workInvoice.number}"/>
+						</div>
+					</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" style="background-color: #f1f1f1"  class="form-control layui-input" value="${workInvoice.client.name}"/>
@@ -258,7 +313,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 htmlEscape="false" readonly="true" style="background-color: #f1f1f1" 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">
@@ -279,6 +334,12 @@
 						<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-sm6">
+					<label class="layui-form-label">对账人：</label>
+					<div class="layui-input-block  with-icon">
+						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workInvoice.accountCheckingUserName}" style="background-color: #f1f1f1"/>
+					</div>
+				</div>
 				<div class="layui-item layui-col-sm12">
 					<label class="layui-form-label">领票时间：</label>
 					<div class="layui-input-block">
@@ -292,15 +353,15 @@
 					<table id="contentTable" class="table table-bordered table-condensed details">
 						<thead>
 						<tr>
-							<th><span class="require-item">*</span>发票代码</th>
-							<th><span class="require-item">*</span>发票号</th>
-							<th><span class="require-item">*</span>开票金额</th>
-							<th><span class="require-item">*</span>税率</th>
-							<th><span class="require-item">*</span>金额</th>
-							<th><span class="require-item">*</span>税额</th>
-							<th><span class="require-item">*</span>累计登记金额</th>
-							<th><span class="require-item">*</span>发票状态</th><%--正常--%>
-							<th><span class="require-item">*</span>被退标记</th>
+							<th>发票代码</th>
+							<th>发票号</th>
+							<th>开票金额</th>
+							<th>税率</th>
+							<th>金额</th>
+							<th>税额</th>
+							<th>累计登记金额</th>
+							<th>发票状态</th><%--正常--%>
+							<th>被退标记</th>
 							<%--<th><span class="require-item">*</span>被退票号</th>
 							<th><span class="require-item">*</span>开票日期</th>--%>
 						</tr>
@@ -316,20 +377,20 @@
 										${workAccount.number}
 								</td>
 
-								<td title="<fmt:formatNumber value="${workAccount.totalMoney}" pattern="#,#00.00"/>">
-									<fmt:formatNumber value="${workAccount.totalMoney}" pattern="#,#00.00"/>
+								<td title="<fmt:formatNumber value="${workAccount.totalMoney}" pattern="##00.00"/>">
+									<fmt:formatNumber value="${workAccount.totalMoney}" pattern="##00.00"/>
 								</td>
 								<td title="${workAccount.tax}">
 										${workAccount.tax}
 								</td>
-								<td title="<fmt:formatNumber value="${workAccount.taxMoney}" pattern="#,#00.00"/>">
-									<fmt:formatNumber value="${workAccount.taxMoney}" pattern="#,#00.00"/>
+								<td title="<fmt:formatNumber value="${workAccount.taxMoney}" pattern="##00.00"/>">
+									<fmt:formatNumber value="${workAccount.taxMoney}" pattern="##00.00"/>
 								</td>
-								<td title="<fmt:formatNumber value="${workAccount.taxRate}" pattern="#,#00.00"/>">
-									<fmt:formatNumber value="${workAccount.taxRate}" pattern="#,#00.00"/>
+								<td title="<fmt:formatNumber value="${workAccount.taxRate}" pattern="##00.00"/>">
+									<fmt:formatNumber value="${workAccount.taxRate}" pattern="##00.00"/>
 								</td>
-								<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>">
-									<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>
+								<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="##00.00"/>">
+									<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="##00.00"/>
 								</td>
 								<td title="${workAccount.state}">
 										${workAccount.state}
@@ -377,14 +438,14 @@
                                         <input id="workReceiptList{{idx}}_delFlag" name="workReceiptList[{{idx}}].delFlag" type="hidden" value="0"/>
                                     </td>
                                     <td>
-                                        <input id="workReceiptList{{idx}}_companyName" placeholder="请输入汇款单位" 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 judgment "/>
                                     </td>
                                     <td>
-                                        <input id="workReceiptList{{idx}}_money" name="workReceiptList[{{idx}}].money" placeholder="请输入汇款金额" 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 judgment"/>
                                     </td>
 
                                     <td>
-                                        <input lay-verify="date" readonly="true" placeholder="yyyy-MM-dd" autocomplete="off" id="workReceiptList{{idx}}_receiptDate" name="workReceiptList[{{idx}}].receiptDate" type="text" value="{{row.receiptDate}}" style="text-align: center" class="form-control required datetime"/>
+                                        <input lay-verify="date" readonly="true" placeholder="yyyy-MM-dd" autocomplete="off" id="workReceiptList{{idx}}_receiptDate" name="workReceiptList[{{idx}}].receiptDate" type="text" value="{{row.receiptDate}}" style="text-align: center" class="form-control judgment datetime required"/>
                                     </td>
 
                                     <td class="text-center op-td" width="10">

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

@@ -19,9 +19,24 @@
 		function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
 		  if(validateForm.form()){
               if(obj == 1) {
+              	//非空验证
+				  var ff=true;
+				  $(".judgment").each(function(){
+					  var zhi=$(this).val();
+					  if (''==zhi || null == zhi){
+						  $(this).css("border","1px solid red")
+						  ff=false;
+					  }else{
+						  $(this).css("border","1px solid #f1f1f1")
+					  }
+				  });
+				  if (!ff){
+					  parent.layer.msg("发票号或开票金额未填写完整!", {icon: 5});
+					  return;
+				  }
                   $("#flag").val("yes");
               }else {
-                  $("#flag").val("no");
+				  $("#flag").val("no");
               }
               if(  obj == 1 && $("#workAccountList tr").length==0){
                   top.layer.alert('请添加发票明细！', {icon: 0});
@@ -541,7 +556,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="kaipiao" htmlEscape="false" readonly="true"   class="form-control layui-input" value="<fmt:formatNumber value="${workInvoice.money}" pattern="#,#00.00"/>"/>
+					<input id="kaipiao" htmlEscape="false" readonly="true"   class="form-control layui-input" value="<fmt:formatNumber value="${workInvoice.money}" pattern="##00.00"/>"/>
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
@@ -626,8 +641,8 @@
 					<thead>
 					<tr>
 						<th>发票代码</th>
-						<th><span class="require-item">*</span>发票号</th>
-						<th><span class="require-item">*</span>开票金额</th>
+						<th class="judgment-item"><span class="require-item">*</span>发票号</th>
+						<th class="judgment-item"><span class="require-item">*</span>开票金额</th>
 						<th width="80px">税率</th>
 						<th width="100px">金额</th>
 						<th width="100px">税额</th>
@@ -653,11 +668,11 @@
 									<input id="workAccountList{{idx}}_code" name="workAccountList[{{idx}}].code" type="text" value="{{row.code}}"    class="form-control number"/>
 								 </td>
 								 <td>
-									<input id="workAccountList{{idx}}_number" name="workAccountList[{{idx}}].number" onchange="checkSame(this)" type="text" value="{{row.number}}"  minlength="8" maxlength="8"  class="form-control number required"/>
+									<input id="workAccountList{{idx}}_number" name="workAccountList[{{idx}}].number" onchange="checkSame(this)" type="text" value="{{row.number}}"  minlength="8" maxlength="8"  class="form-control number judgment"/>
 									 <input type="hidden" id="workAccountList{{idx}}_oldNumber" value="{{row.number}}"/>
 								 </td>
 								<td>
-									<input id="workAccountList{{idx}}_totalMoney"  onblur="setCheck(this)"  onchange="getMoney(this.value,this)"  name="workAccountList[{{idx}}].totalMoney" type="text" value="{{row.totalMoney}}"    class="form-control number required"/>
+									<input id="workAccountList{{idx}}_totalMoney"  onblur="setCheck(this)"  onchange="getMoney(this.value,this)"  name="workAccountList[{{idx}}].totalMoney" type="text" value="{{row.totalMoney}}"    class="form-control number judgment"/>
 								</td>
 								<td>
 								<div class="input-group">

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

@@ -6,7 +6,7 @@
 	<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}/common/html/js/script.js"></script>
 	<style>
 		#contractTypeDoc-error{
 			top:80px;
@@ -33,12 +33,20 @@
                 if(obj == 2){
                     $("#inputForm").attr("action","${ctx}/workinvoice/workInvoice/store");
                 }else{
+					var flag=judgment();
 					var leng=$("#workInvoiceProjectRelationList tr").length;
 					if (leng==0){
-						parent.layer.msg("请添加项目信息!", {icon: 5});
+						flag=2;
+					}
+					if (flag==2){
+						parent.layer.msg("先添加项目信息!", {icon: 5});
 						return false;
 					}
-                    $("#inputForm").attr("action","${ctx}/workinvoice/workInvoice/save");
+					if (flag){
+						$("#inputForm").attr("action","${ctx}/workinvoice/workInvoice/save");
+					}else if (!flags){
+						return flag;
+					}
                 }
                 $("#inputForm").submit();
                 return true;
@@ -47,6 +55,7 @@
 			}
             return false;
         }
+
         $(document).ready(function() {
 			layui.use(['form', 'layer'], function () {
 				var form = layui.form;
@@ -55,11 +64,11 @@
 					//专票必填
 					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");
+						$("#bank").attr("class","form-control judgment layui-input");
+						$("#bankNumber").attr("class","form-control number judgment layui-input");
+						$("#orUnicode").attr("class","form-control isUscCode judgment layui-input");
+						$("#address").attr("class","form-control judgment layui-input");
+						$("#telephone").attr("class","form-control isTel judgment layui-input");
 					}else if(radioVal == 2){
 						$(".invoicetype").hide();
 						$("#bank").attr("class","form-control layui-input");
@@ -77,6 +86,7 @@
                     $(this).val(temp_amount);
                 }
             })*/
+
             jQuery.validator.addMethod("isUscCode", function(value, element) {
                 if (this.optional(element)){
                     return true;
@@ -116,6 +126,7 @@
                 },
                 errorContainer: "#messageBox",
                 errorPlacement: function(error, element) {
+
                     $("#messageBox").text("输入有误，请先更正。");
                     if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
                         error.appendTo(element.parent().parent());
@@ -210,18 +221,6 @@
 		function addRow1(list, idx, tpl, row){
 			var idx1 = $("#workInvoiceProjectRelationList tr").length;
 			if(list == '#workInvoiceProjectRelationList'){
-				// tpl = tpl.replace("workAccountList[0].financialSubjects","workAccountList["+idx1+"].financialSubjects");
-				// tpl = tpl.replace("workAccountList[0].financialSubjectss","workAccountList["+idx1+"].financialSubjectss");
-				/*var ext = $("input[name='ext']:checked").val();
-                if(ext == 0){
-                    tpl = tpl.replace("not_project_reimbursement_div","not_project_reimbursement_div\" style=\"display:none;\"");
-                    tpl = tpl.replace("project_reimbursement_div\" style=\"display:none;\"","project_reimbursement_div");
-                }else {
-                    tpl = tpl.replace("project_reimbursement_div","project_reimbursement_div\" style=\"display:none;\"");
-                    tpl = tpl.replace("not_project_reimbursement_div\" style=\"display:none;\"","not_project_reimbursement_div\"");
-                }*/
-				// tpl = tpl.replace("not_project_reimbursement_div","not_project_reimbursement_div\" style=\"display:none;\"");
-				// tpl = tpl.replace("project_reimbursement_div\" style=\"display:none;\"","project_reimbursement_div");
 				bornTemplete1(list, idx, tpl, row, idx1);
 			}
 		}
@@ -439,7 +438,7 @@
                         </td>
                         <td>
                             <sys:gridselectcallprojecttss url="${ctx}/workinvoice/workInvoice/selectproject" id="workInvoiceProjectRelationList{{idx}}_projectId" name="workInvoiceProjectRelationList[{{idx}}].projectId"  value="{{row.projectId}}"  title="选择所属项目" labelName="workInvoiceProjectRelationList[{{idx}}].projectName" cssStyle="background-color: #fff"
-													labelValue="{{row.projectName}}" cssClass="form-control required layui-input" fieldLabels="项目" fieldKeys="projectName" searchLabel="项目名称" searchKey="projectName" ></sys:gridselectcallprojecttss>
+													labelValue="{{row.projectName}}" cssClass="form-control judgment layui-input" fieldLabels="项目" fieldKeys="projectName" searchLabel="项目名称" searchKey="projectName" ></sys:gridselectcallprojecttss>
                         </td>
                         <td>
 							<input id="workInvoiceProjectRelationList{{idx}}_workContractName"   type="text" value="{{row.workContractName}}" maxlength="32" readonly="readonly"  class="form-control"/>
@@ -523,8 +522,7 @@
 					<label class="layui-form-label double-line"><span class="require-item">*</span>实际开票单位：</label>
 					<div class="layui-input-block with-icon">
 						<sys:gridselect url="${ctx}/workinvoice/workInvoice/selectclient" id="client" name="client.id"  value="${workInvoice.client.id}"  title="选择开票单位" labelName="workInvoice.client.name" cssStyle="background-color: #fff"
-										labelValue="${workInvoice.client.name}" cssClass="form-control required layui-input" fieldLabels="单位" fieldKeys="name" searchLabel="客户名称" searchKey="name" ></sys:gridselect>
-						</td>
+										labelValue="${workInvoice.client.name}" cssClass="form-control judgment layui-input" fieldLabels="单位" fieldKeys="name" searchLabel="客户名称" searchKey="name" ></sys:gridselect>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
@@ -561,7 +559,7 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>收款类型：</label>
 					<div class="layui-input-block">
-						<form:select  path="chargeType" class="form-control simple-select required">
+						<form:select  path="chargeType" class="form-control simple-select judgment">
 							<form:options items="${fns:getMainDictList('receipt_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 						</form:select>
 					</div>
@@ -569,7 +567,7 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>开票内容：</label>
 					<div class="layui-input-block">
-						<form:select path="billingContent" class="form-control simple-select required">
+						<form:select path="billingContent" class="form-control simple-select judgment">
 							<form:options items="${fns:getMainDictList('billing_content')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 						</form:select>
 					</div>
@@ -578,8 +576,8 @@
 				<div class="layui-item layui-col-sm12">
 					<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" placeholder="请输入发票金额" value="${workInvoice.money}" class="form-control required number layui-input"/>
+							<%--<form:input id=""  path="money" htmlEscape="false" class="form-control number judgment layui-input"/>--%>
+						<input name="money" htmlEscape="false" placeholder="请输入发票金额" value="${workInvoice.money}" class="form-control judgment number layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 with-textarea">
@@ -607,10 +605,10 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">对账人：</label>
+					<label class="layui-form-label"><span class="require-item">*</span>对账人：</label>
 					<div class="layui-input-block  with-icon">
 						<sys:treeselect id="master" name="accountCheckingUserId" value="${workInvoice.accountCheckingUserId}" labelName="accountCheckingUserName" labelValue="${workInvoice.accountCheckingUserName}"
-										cssStyle="background-color: #fff" title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+										cssStyle="background-color: #fff" title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
 					</div>
 				</div>
 			</div>
@@ -640,35 +638,35 @@
                                             <input id="workAccountList{{idx}}_delFlag" name="workAccountList[{{idx}}].delFlag" type="hidden" value="0"/>
                                         </td>
                                     	<td>
-                                        	<input id="workAccountList{{idx}}_code" name="workAccountList[{{idx}}].code" type="text" value="{{row.code}}"    class="form-control required"/>
+                                        	<input id="workAccountList{{idx}}_code" name="workAccountList[{{idx}}].code" type="text" value="{{row.code}}"    class="form-control judgment"/>
                                    		 </td>
                                     	 <td>
-                                        	<input id="workAccountList{{idx}}_number" name="workAccountList[{{idx}}].number" type="text" value="{{row.number}}"    class="form-control required"/>
+                                        	<input id="workAccountList{{idx}}_number" name="workAccountList[{{idx}}].number" type="text" value="{{row.number}}"    class="form-control judgment"/>
                                    		 </td>
                                     	<td>
-                                            <input id="workAccountList{{idx}}_totalMoney"  name="workAccountList[{{idx}}].totalMoney" type="text" value="{{row.totalMoney}}"    class="form-control required"/>
+                                            <input id="workAccountList{{idx}}_totalMoney"  name="workAccountList[{{idx}}].totalMoney" type="text" value="{{row.totalMoney}}"    class="form-control judgment"/>
                                         </td>
                                         <td>
                                         <div class="input-group">
-                                            <input id="workAccountList{{idx}}_tax" onblur="setTaxMoney(this)" name="workAccountList[{{idx}}].tax" type="text" value="{{row.tax}}"    class="form-control number required"/><span class="input-group-addon">%</span>
+                                            <input id="workAccountList{{idx}}_tax" onblur="setTaxMoney(this)" name="workAccountList[{{idx}}].tax" type="text" value="{{row.tax}}"    class="form-control number judgment"/><span class="input-group-addon">%</span>
                                             </div>
 
                                         </td>
                                         <td>
-                                            <input id="workAccountList{{idx}}_taxMoney" name="workAccountList[{{idx}}].taxMoney" type="text" value="{{row.taxMoney}}"    class="form-control required"/>
+                                            <input id="workAccountList{{idx}}_taxMoney" name="workAccountList[{{idx}}].taxMoney" type="text" value="{{row.taxMoney}}"    class="form-control judgment"/>
                                         </td>
 										<td>
-                                            <input id="workAccountList{{idx}}_taxRate" name="workAccountList[{{idx}}].taxRate" type="text" value="{{row.taxRate}}"    class="form-control required"/>
+                                            <input id="workAccountList{{idx}}_taxRate" name="workAccountList[{{idx}}].taxRate" type="text" value="{{row.taxRate}}"    class="form-control judgment"/>
                                         </td>
                                         <td>
-                                            <input id="workAccountList{{idx}}_incomeMoney" name="workAccountList[{{idx}}].incomeMoney" type="text" value="0"  readonly="true"  class="form-control required"/>
+                                            <input id="workAccountList{{idx}}_incomeMoney" name="workAccountList[{{idx}}].incomeMoney" type="text" value="0"  readonly="true"  class="form-control judgment"/>
                                         </td>
 
                                             <input id="workAccountList{{idx}}_state" name="workAccountList[{{idx}}].state"  type="hidden" value="正常"   class="form-control"/>
 
-                                            <input id="workAccountList{{idx}}_backSign" name="workAccountList[{{idx}}].backSign"  type="hidden" value="正常"  readonly="true"  class="form-control required"/>
+                                            <input id="workAccountList{{idx}}_backSign" name="workAccountList[{{idx}}].backSign"  type="hidden" value="正常"  readonly="true"  class="form-control judgment"/>
 
-                                            <input id="workAccountList{{idx}}_backNumber" name="workAccountList[{{idx}}].backNumber"  type="hidden" value=""  readonly="true"  class="form-control required"/>
+                                            <input id="workAccountList{{idx}}_backNumber" name="workAccountList[{{idx}}].backNumber"  type="hidden" value=""  readonly="true"  class="form-control judgment"/>
 
 
                                         <td class="text-center op-td">

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

@@ -574,7 +574,7 @@
                 {field:'index',align:'center', title: '序号',width:40}
 				,{field:'projName',align:'center', title: '项目名称', minWidth:160,templet:function(d){
 						if(1 == d.showView && d.showView != undefined){
-							return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.projectId +"','95%', '95%')\">" + d.projName + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/workinvoiceAll/workInvoiceAll/projectview?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
 						}else{
 							return "<span title='"+ d.projName +"'>" +d.projName+ "</span>";
 						}
@@ -716,7 +716,7 @@
                     ,"status":"${workInvoice.invoiceState}"
 					,"notifyFlag":"${workInvoice.notifyFlag}"
 					,"notifyId":"${workInvoice.notifyId}"
-                    ,"money":"<fmt:formatNumber value="${workInvoice.money}" pattern="#,#0.00"/>"
+                    ,"money":"<fmt:formatNumber value="${workInvoice.money}" pattern="##0.00"/>"
                     ,"createDate":"<fmt:formatDate value="${workInvoice.createDate}" pattern="yyyy-MM-dd"/>"
                     ,"receiptMoneyDate":"<fmt:formatDate value="${workInvoice.receiptMoneyDate}" pattern="yyyy-MM-dd"/>"
                     <c:if test="${workInvoice.invoiceState == 1 && fns:getUser().id == workInvoice.createBy.id}"><shiro:hasPermission name="workinvoice:workInvoice:edit">,"canedit1":"1"</shiro:hasPermission></c:if><%--暂存-修改--%>

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

@@ -6,6 +6,7 @@
 	<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}/common/html/js/script.js"></script>
 	<style>
 		#workInvoiceProjectRelationList td{
 			padding-left: 0px;
@@ -20,12 +21,20 @@
                 if(obj == 2){
                     $("#flag").val("no");
                 }else{
+					var flags=judgment();
 					var leng=$("#workInvoiceProjectRelationList tr").length;
 					if (leng==0){
-						parent.layer.msg("请添加项目信息!", {icon: 5});
+						flags=2;
+					}
+					if (flags==2){
+						parent.layer.msg("先添加项目信息!", {icon: 5});
 						return false;
 					}
-                    $("#flag").val("yes");
+					if (flags){
+						$("#flag").val("yes");
+					}else if (!flags){
+						return flags;
+					}
                 }
                 $("#inputForm").submit();
                 return true;
@@ -42,11 +51,11 @@
 					//专票必填
 					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");
+						$("#bank").attr("class","form-control judgment layui-input");
+						$("#bankNumber").attr("class","form-control number judgment layui-input");
+						$("#orUnicode").attr("class","form-control isUscCode judgment layui-input");
+						$("#address").attr("class","form-control judgment layui-input");
+						$("#telephone").attr("class","form-control isTel judgment layui-input");
 					}else if(radioVal == 2){
 						$(".invoicetype").hide();
 						$("#bank").attr("class","form-control layui-input");
@@ -249,6 +258,7 @@
 			var id = $(prefix + "_invoiceId");
 			var delFlag = $(prefix + "_delFlag");
 			if (id.val() == "") {
+				$("#del").val("1")
 				$(obj).parent().parent().remove();
 			} else if (delFlag.val() == "0") {
 				delFlag.val("1");
@@ -469,7 +479,7 @@
                         </td>
                         <td>
                             <sys:gridselectcallprojecttss url="${ctx}/workinvoice/workInvoice/selectproject" id="workInvoiceProjectRelationList{{idx}}_projectId" name="workInvoiceProjectRelationList[{{idx}}].projectId"  value="{{row.projectId}}"  title="选择所属项目" labelName="workInvoiceProjectRelationList[{{idx}}].projectName" cssStyle="background-color: #fff"
-													labelValue="{{row.projectName}}" cssClass="form-control required layui-input" fieldLabels="项目" fieldKeys="projectName" searchLabel="项目名称" searchKey="projectName" ></sys:gridselectcallprojecttss>
+													labelValue="{{row.projectName}}" cssClass="form-control judgment layui-input" fieldLabels="项目" fieldKeys="projectName" searchLabel="项目名称" searchKey="projectName" ></sys:gridselectcallprojecttss>
                         </td>
                         <td>
 							<input id="workInvoiceProjectRelationList{{idx}}_workContractName"   type="text" value="{{row.workContractName}}" maxlength="32" readonly="readonly"  class="form-control"/>
@@ -538,7 +548,7 @@
 					<label class="layui-form-label"><span class="require-item">*</span>实际开票单位：</label>
 					<div class="layui-input-block with-icon">
 						<sys:gridselect url="${ctx}/workinvoice/workInvoice/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>
+										labelValue="${workInvoice.client.name}" cssClass="form-control judgment layui-input" fieldLabels="单位" fieldKeys="name" searchLabel="客户名称" searchKey="name" ></sys:gridselect>
 						</td>
 					</div>
 				</div>
@@ -575,7 +585,7 @@
 				<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" placeholder="请输入开票金额"  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 judgment number layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 with-textarea">
@@ -603,10 +613,10 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">对账人：</label>
+					<label class="layui-form-label"><span class="require-item">*</span>对账人：</label>
 					<div class="layui-input-block  with-icon">
 						<sys:treeselect id="master" name="accountCheckingUserId" value="${workInvoice.accountCheckingUserId}" labelName="accountCheckingUserName" labelValue="${workInvoice.accountCheckingUserName}"
-										cssStyle="background-color: #fff" title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+										cssStyle="background-color: #fff" title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
 					</div>
 				</div>
 			</div>
@@ -617,8 +627,8 @@
 						<thead>
 						<tr>
 							<th>发票代码</th>
-							<th><span class="require-item">*</span>发票号</th>
-							<th><span class="require-item">*</span>开票金额</th>
+							<th>发票号</th>
+							<th>开票金额</th>
 							<th>税率</th>
 							<th>金额</th>
 							<th>税额</th>
@@ -636,25 +646,25 @@
                                             <input id="workAccountList{{idx}}_delFlag" name="workAccountList[{{idx}}].delFlag" type="hidden" value="0"/>
                                         </td>
                                     	<td>
-                                        	<input id="workAccountList{{idx}}_code" name="workAccountList[{{idx}}].code" type="text" value="{{row.code}}"    class="form-control "/>
+                                        	<input id="workAccountList{{idx}}_code" name="workAccountList[{{idx}}].code" type="text" value="{{row.code}}" readonly="true" class="form-control "/>
                                    		 </td>
                                     	 <td>
-                                        	<input id="workAccountList{{idx}}_number" name="workAccountList[{{idx}}].number" type="text" value="{{row.number}}"    class="form-control required"/>
+                                        	<input id="workAccountList{{idx}}_number" name="workAccountList[{{idx}}].number" type="text" value="{{row.number}}" readonly="true"   class="form-control"/>
                                    		 </td>
                                     	<td>
-                                            <input id="workAccountList{{idx}}_totalMoney"  name="workAccountList[{{idx}}].totalMoney" type="text" value="{{row.totalMoney}}"    class="form-control required"/>
+                                            <input id="workAccountList{{idx}}_totalMoney"  name="workAccountList[{{idx}}].totalMoney" type="text" value="{{row.totalMoney}}"  readonly="true"   class="form-control"/>
                                         </td>
                                         <td>
                                         <div class="input-group">
-                                            <input id="workAccountList{{idx}}_tax" onblur="setTaxMoney(this)" name="workAccountList[{{idx}}].tax" type="text" value="{{row.tax}}"    class="form-control number "/><span class="input-group-addon">%</span>
+                                            <input id="workAccountList{{idx}}_tax" onblur="setTaxMoney(this)" name="workAccountList[{{idx}}].tax" type="text" value="{{row.tax}}" readonly="true"   class="form-control number "/><span class="input-group-addon" style="background-color:#f1f1f1">%</span>
                                             </div>
 
                                         </td>
                                         <td>
-                                            <input id="workAccountList{{idx}}_taxMoney" name="workAccountList[{{idx}}].taxMoney" type="text" value="{{row.taxMoney}}"    class="form-control "/>
+                                            <input id="workAccountList{{idx}}_taxMoney" name="workAccountList[{{idx}}].taxMoney" type="text" value="{{row.taxMoney}}" readonly="true"   class="form-control "/>
                                         </td>
 										<td>
-                                            <input id="workAccountList{{idx}}_taxRate" name="workAccountList[{{idx}}].taxRate" type="text" value="{{row.taxRate}}"    class="form-control "/>
+                                            <input id="workAccountList{{idx}}_taxRate" name="workAccountList[{{idx}}].taxRate" type="text" value="{{row.taxRate}}"  readonly="true"  class="form-control "/>
                                         </td>
                                         <td>
                                             <input id="workAccountList{{idx}}_incomeMoney" name="workAccountList[{{idx}}].incomeMoney" type="text" value="0"  readonly="true"  class="form-control "/>

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

@@ -0,0 +1,102 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>发票管理</title>
+	<meta name="decorator" content="default"/>
+	<style>
+		#workInvoiceProjectRelationList td{
+			padding-left: 0px;
+			padding-right: 0px;
+		}
+	</style>
+	<script type="text/javascript">
+		var validateForm;
+		function doSubmit(){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
+		  if(validateForm.form()){
+			  $("#inputForm").submit();
+			  return true;
+		  }
+	
+		  return false;
+		}
+		$(document).ready(function() {
+			$("#name").focus();
+			validateForm = $("#inputForm").validate({
+				submitHandler: function(form){
+					loading('正在提交，请稍等...');
+					form.submit();
+				},
+				errorContainer: "#messageBox",
+				errorPlacement: function(error, element) {
+					$("#messageBox").text("输入有误，请先更正。");
+					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+						error.appendTo(element.parent().parent());
+					} else {
+						error.insertAfter(element);
+					}
+				}
+			});
+		});
+	</script>
+</head>
+<body >
+<div class="single-form view-form">
+	<div class="container">
+		<form:form id="inputForm" modelAttribute="workInvoice" action="${ctx}/workinvoice/workInvoice/saveAudit" method="post" class="form-horizontal">
+		<form:hidden path="id"/>
+		<form:hidden path="act.taskId"/>
+		<form:hidden path="act.taskName"/>
+		<form:hidden path="act.taskDefKey"/>
+		<form:hidden path="act.procInsId"/>
+		<form:hidden path="act.procDefId"/>
+		<form:hidden id="flag" path="act.flag"/>
+
+			<div class="form-group layui-row first lw14">
+				<div class="form-group-label"><h2>发票项目信息</h2></div>
+				<div class="layui-table-body layui-item layui-col-xs12 form-table-container"  style="padding:0px">
+					<table id="contentTables" class="table table-bordered table-condensed can-edit no-bottom-margin details">
+						<thead>
+						<tr>
+							<th width="200px"><font color="red">*</font>项目名称</th>
+							<th width="200px">合同名称</th>
+							<th width="200px">项目编号</th>
+							<th width="200px">委托方</th>
+							<th width="200px">报告号</th>
+								<%--						<th width="100px">操作</th>--%>
+						</tr>
+						</thead>
+						<tbody id="workInvoiceProjectRelationList">
+						<c:forEach items="${workInvoice.workInvoiceProjectRelationList}" var="list">
+							<tr>
+								<td>
+									<a onclick="openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=${list.projectId}','95%', '95%')">
+									<input type="text" value="${list.projectName}" maxlength="32" readonly="readonly"  class="form-control"/></a>
+								</td>
+								<td>
+									<input type="text" value="${list.workContractName}" maxlength="32" readonly="readonly"  class="form-control"/>
+								</td>
+								<td style="text-align:center;">
+									<input type="text" value="${list.projectNum}" maxlength="32" readonly="readonly"  class="form-control"/>
+								</td>
+								<td>
+									<input type="text" value="${list.clientName}" maxlength="32" readonly="readonly"  class="form-control"/>
+								</td>
+								<td>
+									<input type="text" value="${list.reportDataNum}" maxlength="32" readonly="readonly"  class="form-control"/>
+								</td>
+									<%--								<td class="text-center op-td" >--%>
+									<%--									{{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#workInvoiceProjectRelationList{{idx}}')" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>{{/delBtn}}--%>
+									<%--								</td>--%>
+							</tr>
+						</c:forEach>
+						</tbody>
+					</table>
+				</div>
+			</div>
+			<div class="form-group layui-row page-end"></div>
+		</form:form>
+	</div>
+</div>
+</body>
+</html>

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

@@ -146,7 +146,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 htmlEscape="false" readonly="true" style="background-color: #f1f1f1"  class="form-control layui-input" value="<fmt:formatNumber value="${workInvoice.money}" pattern="#,#00.00"/>"/>
+						<input htmlEscape="false" readonly="true" style="background-color: #f1f1f1"  class="form-control layui-input" value="<fmt:formatNumber value="${workInvoice.money}" pattern="##00.00"/>"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
@@ -211,20 +211,20 @@
 										${workAccount.number}
 								</td>
 
-								<td title="<fmt:formatNumber value="${workAccount.totalMoney}" pattern="#,#00.00"/>">
-									<fmt:formatNumber value="${workAccount.totalMoney}" pattern="#,#00.00"/>
+								<td title="<fmt:formatNumber value="${workAccount.totalMoney}" pattern="##00.00"/>">
+									<fmt:formatNumber value="${workAccount.totalMoney}" pattern="##00.00"/>
 								</td>
 								<td title="${workAccount.tax}">
 										${workAccount.tax}
 								</td>
 								<td title="<fmt:formatNumber value="${workAccount.taxMoney}" pattern="#,#00.00"/>">
-									<fmt:formatNumber value="${workAccount.taxMoney}" pattern="#,#00.00"/>
+									<fmt:formatNumber value="${workAccount.taxMoney}" pattern="##00.00"/>
 								</td>
 								<td title="<fmt:formatNumber value="${workAccount.taxRate}" pattern="#,#00.00"/>">
-									<fmt:formatNumber value="${workAccount.taxRate}" pattern="#,#00.00"/>
+									<fmt:formatNumber value="${workAccount.taxRate}" pattern="##00.00"/>
 								</td>
 								<td title="<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>">
-									<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="#,#00.00"/>
+									<fmt:formatNumber value="${workAccount.incomeMoney}" pattern="##00.00"/>
 								</td>
 								<td title="${workAccount.state}">
 										${workAccount.state}

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

@@ -6,7 +6,8 @@
 	<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 src="${ctxStatic}/common/html/js/script.js"></script>
+    <script type="text/javascript">
         var validateForm;
         var count = 0;
         $(document).ready(function() {
@@ -37,18 +38,18 @@
                 var radioVal = $(this).val();
                 if(radioVal == 1){
                     $(".isPublic").removeClass("hide");
-                    $("#comname").removeClass("required");
-                    $("#bank").removeClass("required");
-                    $("#bankNo").removeClass("required");
+                    $("#comname").removeClass("judgment");
+                    $("#bank").removeClass("judgment");
+                    $("#bankNo").removeClass("judgment");
                     $("#reimbursementBackList tr").each(function () {
                         $(this).remove();
                         $("#backmoney").val("0.00");
                     })
                 }else{
                     $(".isPublic").addClass("hide");
-                    $("#comname").addClass("required");
-                    $("#bank").addClass("required");
-                    $("#bankNo").addClass("required");
+                    $("#comname").addClass("judgment");
+                    $("#bank").addClass("judgment");
+                    $("#bankNo").addClass("judgment");
                     getLoan($("#achivesId").val());
                 }
             });
@@ -105,11 +106,7 @@
             <%--    }--%>
             <%--})--%>
         function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
-            var idArr = $("#workAccountList tr:visible");
-            if(idArr.length<1){
-                parent.layer.msg("请添加报销详情!", {icon: 5});
-                return false;
-            }
+
             var trlen = $("#workAccountList tr").length;
             var tdlen = $("#workAccountList tr td").length;
             var trArr = [];
@@ -129,7 +126,17 @@
             if(obj == 2){
                 $("#inputForm").attr("action","${ctx}/workreimbursement/workReimbursement/store");
             }else{
-                $("#inputForm").attr("action","${ctx}/workreimbursement/workReimbursement/save");
+                var flags=judgment();
+                var idArr = $("#workAccountList tr:visible");
+                if(idArr.length<1){
+                    parent.layer.msg("请添加报销详情!", {icon: 5});
+                    flags= false;
+                }
+                if (flags){
+                    $("#inputForm").attr("action","${ctx}/workreimbursement/workReimbursement/save");
+                }else{
+                    return flags;
+                }
             }
             if(validateForm.form()){
                 var total=0 //价税合计总额
@@ -566,14 +573,14 @@
             <div class="layui-item layui-col-sm6">
                 <label class="layui-form-label">所属部门：</label>
                 <div class="layui-input-block">
-                    <form:input path="officeName" htmlEscape="false"  readonly="true" id="officeName"  class="form-control required layui-input" value = "${workReimbursement.officeName}"/>
+                    <form:input path="officeName" htmlEscape="false"  readonly="true" id="officeName"  class="form-control judgment layui-input" value = "${workReimbursement.officeName}"/>
                     <input type="hidden" id="officeId" name="officeId" value="${workReimbursement.officeId}">
                 </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="bankCard" htmlEscape="false"  id="bankCard" minlength="16" maxlength="19" class="form-control number required layui-input" value = "${workReimbursement.bankCard}"/>
+                    <form:input path="bankCard" htmlEscape="false"  id="bankCard" minlength="16" maxlength="19" class="form-control number judgment layui-input" value = "${workReimbursement.bankCard}"/>
                 </div>
             </div>--%>
             <%--<div class="layui-item layui-col-sm6">
@@ -630,7 +637,7 @@
                 <div class="layui-input-block with-icon">
                     <div class="input-group">
                         <sys:gridworkSupplier id="comnameId" name="comnameId" value="${workReimbursement.comname}" labelName="comname" labelValue="${workReimbursement.comname}"
-                                            allowInput="true"   title="供应商/客户" url="${ctx}/workreimbursement/workReimbursement/gridSelectComname" cssClass="form-control required layui-input" ></sys:gridworkSupplier>
+                                            allowInput="true"   title="供应商/客户" url="${ctx}/workreimbursement/workReimbursement/gridSelectComname" cssClass="form-control judgment layui-input" ></sys:gridworkSupplier>
                     </div>
                 </div>
             </div>
@@ -649,7 +656,7 @@
             <div class="layui-item layui-col-sm6">
                 <label class="layui-form-label">申请人：</label>
                 <div class="layui-input-block">
-                    <form:input path="userName" htmlEscape="false"  readonly="true" id="userName"  class="form-control required layui-input" value="${workReimbursement.submitterName}"/>
+                    <form:input path="userName" htmlEscape="false"  readonly="true" id="userName"  class="form-control judgment layui-input" value="${workReimbursement.submitterName}"/>
                     <input type="hidden" id="createById" name="createBy.id" value="${workReimbursement.createBy.id}">
                 </div>
             </div>--%>
@@ -657,7 +664,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="submitterDate" name="submitterDate" type="text" readonly="true" maxlength="20" class="laydate-icondate form-control layer-date required layui-input laydate-icon"
+                    <input id="submitterDate" name="submitterDate" type="text" readonly="true" maxlength="20" class="laydate-icondate form-control layer-date judgment layui-input laydate-icon"
                            style="background-color: #fff" placeholder="请选择报销日期" value="<fmt:formatDate value="${submitterDate.submitterDate}" pattern="yyyy-MM-dd"/>"/>
                 </div>
             </div>
@@ -708,23 +715,23 @@
                                 <td>
                                     <div class="project_reimbursement_div"  style="width: 200px">
                                         <sys:reimburtreeselectUser id="workAccountList${index.index}_reimbursementName" name="workAccountList[${index.index}].reimbursementName" value="${projectRecords.leaderIds}" labelName="reimbursementNameName" labelValue="${workAccount.reimbursementName}"
-                                                                   title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                                                   title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control  layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </div>
                                 </td>
                                 <td>
-                                    <input id="workAccountList${index.index}_reimbursementNameofficeId"  name="workAccountList[${index.index}].officeId" maxlength="32" type="text" value="${workAccount.officeId}" readonly="readonly"  class="form-control required"/>
+                                    <input id="workAccountList${index.index}_reimbursementNameofficeId"  name="workAccountList[${index.index}].officeId" maxlength="32" type="text" value="${workAccount.officeId}" readonly="readonly"  class="form-control judgment"/>
                                 </td>
                                 <td style="text-align:center;">
                                     <div class="project_reimbursement_div"  style="width: 200px">
                                         <sys:treeselectAccessoryNoParent id="workAccountList${index.index}_type" name="workAccountList[${index.index}].type" value="${workAccount.type}" labelName="workAccountList[${index.index}].typeName" labelValue="${workAccount.typeName}"
-                                                                         title="报销类别" url="/reimbursementType/reimbursementType/treeData" extId=""  cssClass="form-control required  layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                                                         title="报销类别" url="/reimbursementType/reimbursementType/treeData" extId=""  cssClass="form-control judgment  layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </div>
                                 </td>
 
                                 <td>
                                     <div class="not_project_reimbursement_div"  style="width: 200px">
                                         <sys:reimburselectReproject url="${ctx}/workreimbursement/workReimbursement/selectReproject" id="workAccountList${index.index}_project" name="workAccountList[${index.index}].project.id"  value="${workAccount.project.id}"  title="选择报销项目" labelName="workAccountList[${index.index}].project.projectName"
-                                                                    labelValue="${workAccount.project.projectName}" extId="${workAccount.projectRadio}" cssClass="form-control required layui-input" fieldLabels="工程" fieldKeys="projectName" searchLabel="工程名称" searchKey="projectName" />
+                                                                    labelValue="${workAccount.project.projectName}" extId="${workAccount.projectRadio}" cssClass="form-control judgment layui-input" fieldLabels="工程" fieldKeys="projectName" searchLabel="工程名称" searchKey="projectName" />
                                     </div>
                                 </td>
                                 <td>
@@ -733,7 +740,7 @@
 
 
                                 <td>
-                                    <input id="workAccountList${index.index}_money" onchange="getMoney(this.value)" name="workAccountList[${index.index}].money" type="text" value="${workAccount.money}"  placeholder="请输入金额" maxlength="10"  class="form-control number required"/>
+                                    <input id="workAccountList${index.index}_money" onchange="getMoney(this.value)" name="workAccountList[${index.index}].money" type="text" value="${workAccount.money}"  placeholder="请输入金额" maxlength="10"  class="form-control number judgment"/>
                                 </td>
                                 <td style="text-align:center;">
                                     <input id="workAccountList${index.index}_bills"  name="workAccountList[${index.index}].bills" type="text" value="${workAccount.bills}" maxlength="32" placeholder="请输入单据张数"  class="form-control number"/>
@@ -786,7 +793,7 @@
                         <td>
                             <div class="project_reimbursement_div"  style="width: 200px">
                                 <sys:reimburtreeselectUser id="workAccountList{{idx}}_reimbursementName" name="workAccountList[{{idx}}].reimbursementName" value="${projectRecords.leaderIds}" labelName="workAccountList[{{idx}}].name" labelValue="{{row.reimbursementName}}"
-                                    title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                    title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
                             </div>
                         </td>
                         <td>
@@ -797,13 +804,13 @@
                         <td style="text-align:center;">
                             <div class="project_reimbursement_div"  style="width: 200px">
                                 <sys:treeselectAccessoryNoParent id="workAccountList{{idx}}_type" name="workAccountList[{{idx}}].type" value="${workReimbursement.workReimbursementTypeInfo.id}" labelName="workAccountList[{{idx}}].typeName" labelValue="${workReimbursement.workReimbursementTypeInfo.standardDetail}"
-                                     title="报销类别" url="/reimbursementType/reimbursementType/treeData" extId=""  cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                     title="报销类别" url="/reimbursementType/reimbursementType/treeData" extId=""  cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
                             </div>
                         </td>
                         <td>
                             <div class="not_project_reimbursement_div"  style="width: 200px">
                                 <sys:reimburselectReproject url="${ctx}/workreimbursement/workReimbursement/selectReproject" id="workAccountList{{idx}}_project" name="workAccountList[{{idx}}].project.id"  value="${workReimbursement.project.id}"  title="选择报销项目" labelName="workAccountList[{{idx}}].project.projectName"
-                                       labelValue="{{row.projectName}}" extId="" area="" cssClass="form-control required layui-input"  fieldLabels="工程" fieldKeys="projectName" searchLabel="工程名称" searchKey="projectName" ></sys:reimburselectReproject>
+                                       labelValue="{{row.projectName}}" extId="" area="" cssClass="form-control judgment layui-input"  fieldLabels="工程" fieldKeys="projectName" searchLabel="工程名称" searchKey="projectName" ></sys:reimburselectReproject>
                             </div>
                         </td>
                         <td>
@@ -811,7 +818,7 @@
                         </td>
 
                         <td>
-                            <input id="workAccountList{{idx}}_money" onchange="getMoney(this.value)" name="workAccountList[{{idx}}].money" type="text" value="{{row.money}}"  placeholder="请输入费用" maxlength="10" class="form-control number"/>
+                            <input id="workAccountList{{idx}}_money" onchange="getMoney(this.value)" name="workAccountList[{{idx}}].money" type="text" value="{{row.money}}"  placeholder="请输入费用" maxlength="10" class="form-control number judgment"/>
                         </td>
                         <td style="text-align:center;">
                             <input id="workAccountList{{idx}}_bills"  name="workAccountList[{{idx}}].bills" type="text" value="{{row.bills}}" maxlength="3" placeholder="请输入单据张数"  class="form-control number"/>
@@ -856,20 +863,20 @@
                                     <input id="reimbursementVATTaxes${index.index}_delFlag" name="reimbursementVATTaxes[${index.index}].delFlag" type="hidden" value="0"/>
                                 </td>
                                 <td>
-                                    <input id="reimbursementVATTaxes${index.index}_invoiceCode" maxlength="10" minlength="10" name="reimbursementVATTaxes[${index.index}].invoiceCode" type="text" maxlength="32" value="${reimbursementVATTaxes.invoiceCode}"  placeholder="请输入发票代码"  class="form-control required number"/>
+                                    <input id="reimbursementVATTaxes${index.index}_invoiceCode" maxlength="10" minlength="10" name="reimbursementVATTaxes[${index.index}].invoiceCode" type="text" maxlength="32" value="${reimbursementVATTaxes.invoiceCode}"  placeholder="请输入发票代码"  class="form-control judgment number"/>
                                 </td>
 
                                 <td>
-                                    <input id="reimbursementVATTaxes${index.index}_invoiceNumber" maxlength="8" minlength="8" name="reimbursementVATTaxes[${index.index}].invoiceNumber" type="text" maxlength="32" value="${reimbursementVATTaxes.invoiceNumber}"  placeholder="请输入发票号"  class="form-control number required"/>
+                                    <input id="reimbursementVATTaxes${index.index}_invoiceNumber" maxlength="8" minlength="8" name="reimbursementVATTaxes[${index.index}].invoiceNumber" type="text" maxlength="32" value="${reimbursementVATTaxes.invoiceNumber}"  placeholder="请输入发票号"  class="form-control number judgment"/>
                                 </td>
                                 <td>
-                                    <input id="reimbursementVATTaxes${index.index}_money" onchange="getMoneyVATT(${index.index})" name="reimbursementVATTaxes[${index.index}].money" type="text" maxlength="32" value="${reimbursementVATTaxes.money}"  placeholder="请输入金额"  class="form-control number required"/>
+                                    <input id="reimbursementVATTaxes${index.index}_money" onchange="getMoneyVATT(${index.index})" name="reimbursementVATTaxes[${index.index}].money" type="text" maxlength="32" value="${reimbursementVATTaxes.money}"  placeholder="请输入金额"  class="form-control number judgment"/>
                                 </td>
                                 <td>
-                                    <input id="reimbursementVATTaxes${index.index}_taxAmount" onchange="getMoneyVATT(${index.index})" name="reimbursementVATTaxes[${index.index}].taxAmount" type="text" maxlength="32" value="${reimbursementVATTaxes.taxAmount}"  placeholder="请输入税额"  class="form-control number required"/>
+                                    <input id="reimbursementVATTaxes${index.index}_taxAmount" onchange="getMoneyVATT(${index.index})" name="reimbursementVATTaxes[${index.index}].taxAmount" type="text" maxlength="32" value="${reimbursementVATTaxes.taxAmount}"  placeholder="请输入税额"  class="form-control number judgment"/>
                                 </td>
                                 <td>
-                                    <input id="reimbursementVATTaxes${index.index}_sumMoney" readOnly="true"  name="reimbursementVATTaxes[${index.index}].sumMoney" type="text" maxlength="32" value="${reimbursementVATTaxes.sumMoney}"    class="form-control number required sumMoney"/>
+                                    <input id="reimbursementVATTaxes${index.index}_sumMoney" readOnly="true"  name="reimbursementVATTaxes[${index.index}].sumMoney" type="text" maxlength="32" value="${reimbursementVATTaxes.sumMoney}"    class="form-control number judgment sumMoney"/>
                                 </td>
                                 <td class="text-center op-td">
                                     <span class="op-btn op-btn-delete" onclick="delRowA(this, '#reimbursementVATTaxes${index.index}')" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>
@@ -886,20 +893,20 @@
                                             <input id="reimbursementVATTaxes{{idx}}_delFlag" name="reimbursementVATTaxes[{{idx}}].delFlag" type="hidden" value="0"/>
                                         </td>
                                         <td>
-                                            <input id="reimbursementVATTaxes{{idx}}_invoiceCode"  maxlength="10" minlength="10" name="reimbursementVATTaxes[{{idx}}].invoiceCode" type="text" value="{{row.invoiceCode}}" maxlength="32" placeholder="请输入发票代码"  class="form-control number required"/>
+                                            <input id="reimbursementVATTaxes{{idx}}_invoiceCode"  maxlength="10" minlength="10" name="reimbursementVATTaxes[{{idx}}].invoiceCode" type="text" value="{{row.invoiceCode}}" maxlength="32" placeholder="请输入发票代码"  class="form-control number judgment"/>
                                         </td>
 
                                         <td>
-                                            <input id="reimbursementVATTaxes{{idx}}_invoiceNumber" maxlength="8" minlength="8" name="reimbursementVATTaxes[{{idx}}].invoiceNumber" type="text" value="{{row.invoiceNumber}}" maxlength="32" placeholder="请输入发票号"  class="form-control number required"/>
+                                            <input id="reimbursementVATTaxes{{idx}}_invoiceNumber" maxlength="8" minlength="8" name="reimbursementVATTaxes[{{idx}}].invoiceNumber" type="text" value="{{row.invoiceNumber}}" maxlength="32" placeholder="请输入发票号"  class="form-control number judgment"/>
                                         </td>
                                          <td>
-                                            <input id="reimbursementVATTaxes{{idx}}_money" onchange="getMoneyVATT({{idx}})" name="reimbursementVATTaxes[{{idx}}].money" type="text" value="{{row.money}}" maxlength="32" placeholder="请输入金额"  class="form-control number required"/>
+                                            <input id="reimbursementVATTaxes{{idx}}_money" onchange="getMoneyVATT({{idx}})" name="reimbursementVATTaxes[{{idx}}].money" type="text" value="{{row.money}}" maxlength="32" placeholder="请输入金额"  class="form-control number judgment"/>
                                         </td>
                                         <td>
-                                            <input id="reimbursementVATTaxes{{idx}}_taxAmount"  onchange="getMoneyVATT({{idx}})"name="reimbursementVATTaxes[{{idx}}].taxAmount" type="text" value="{{row.taxAmount}}" maxlength="32" placeholder="请输入税额"  class="form-control number required"/>
+                                            <input id="reimbursementVATTaxes{{idx}}_taxAmount"  onchange="getMoneyVATT({{idx}})"name="reimbursementVATTaxes[{{idx}}].taxAmount" type="text" value="{{row.taxAmount}}" maxlength="32" placeholder="请输入税额"  class="form-control number judgment"/>
                                         </td>
                                          <td>
-                                            <input id="reimbursementVATTaxes{{idx}}_sumMoney" readOnly="true"  name="reimbursementVATTaxes[{{idx}}].sumMoney" type="text" value="{{row.sumMoney}}" maxlength="32"  class="form-control number required sumMoney"/>
+                                            <input id="reimbursementVATTaxes{{idx}}_sumMoney" readOnly="true"  name="reimbursementVATTaxes[{{idx}}].sumMoney" type="text" value="{{row.sumMoney}}" maxlength="32"  class="form-control number judgment sumMoney"/>
                                         </td>
                                         <td class="text-center op-td">
                                             {{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRowA(this, '#reimbursementVATTaxes{{idx}}')" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>{{/delBtn}}

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

@@ -4,7 +4,7 @@
 <head>
 	<title>报销单管理</title>
 	<meta name="decorator" content="default"/>
-	<script type="text/javascript">
+    <script type="text/javascript">
 		var validateForm;
 		var count = 0;
 		$(document).ready(function() {
@@ -889,7 +889,7 @@
                         </td>
                         <td>
                             <div class="not_project_reimbursement_div"  style="width: 200px">
-                                <input id="workAccountList{{idx}}_reimbursementNameofficeId"  type="text" value="{{row.officeId}}" maxlength="32" readonly="readonly"  class="form-control"/>
+                                <input id="workAccountList{{idx}}_reimbursementNameofficeId"  type="text" value="{{row.officeId}}" maxlength="32" readonly="readonly"  class="form-control required"/>
                             </div>
                         </td>
                         <td style="text-align:center;">