Bläddra i källkod

暂存(不需要必填项)

[user3] 4 år sedan
förälder
incheckning
5f57d2d7d0
14 ändrade filer med 660 tillägg och 659 borttagningar
  1. 1 1
      src/main/webapp/WEB-INF/tags/sys/treeselectArae.tag
  2. 6 1
      src/main/webapp/webpage/modules/projectrecord/projectRecordsAudit.jsp
  3. 8 2
      src/main/webapp/webpage/modules/projectrecord/projectRecordsForm.jsp
  4. 90 93
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectReportRecord/projectReportRecordForm.jsp
  5. 91 91
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectReportRecord/projectReportRecordModify.jsp
  6. 109 132
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/reportForm.jsp
  7. 19 16
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsForm.jsp
  8. 92 91
      src/main/webapp/webpage/modules/ruralprojectrecords/projectReportRecord/projectReportRecordForm.jsp
  9. 91 91
      src/main/webapp/webpage/modules/ruralprojectrecords/projectReportRecord/projectReportRecordModify.jsp
  10. 19 13
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsForm.jsp
  11. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsList.jsp
  12. 3 3
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageAudit.jsp
  13. 5 5
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageModify.jsp
  14. 125 119
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/reportForm.jsp

+ 1 - 1
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> 

+ 6 - 1
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>
 				<%--新添代码--%>

+ 8 - 2
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">

+ 90 - 93
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});
             }

+ 91 - 91
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();

+ 109 - 132
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}">

+ 19 - 16
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>

+ 92 - 91
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();

+ 91 - 91
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();

+ 19 - 13
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>

+ 1 - 1
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>";

+ 3 - 3
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">

+ 5 - 5
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}">

+ 125 - 119
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}">