Merge remote-tracking branch 'origin/master'

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordsDao.xml

@@ -1582,6 +1582,7 @@
 		left join sys_user su on su.id = w1.user_id
 		left join sys_office so on so.id = su.office_id
 		<where>
+			and a.submit_money = 1
 			and a.del_flag = 0 and project_type in (1,2) and prd.`status`=5
 			and a.id not in (select project_id	FROM project_flingbatch_relation r left join project_filingbatch f on f.filing_batch=r.filing_batch	where f.filing_status in(2,3,5) )
 		    and a.id not in (select project_id	FROM project_flingbatch_relation where status in(2,3,5) )
@@ -1617,7 +1618,7 @@
 			<if test="projectName != null and projectName != ''">
 				AND a.project_name like concat(concat('%',#{projectName}),'%')
 			</if>
-
+			and a.submit_money = 1
 			and a.del_flag = 0 and a.project_type in (1,2) and prd.`status`=5
 			/*不捞取已经发起审批并审批状态为2、3、5的项目信息*/
 			and a.id not in (select project_id	FROM project_flingbatch_relation where status in(2,3,5) )

src/main/webapp/webpage/modules/bzshbExamin/bzshbExamineView.jsp

@@ -90,13 +90,19 @@
 			})
 			var length=$("#treeTable2 tbody tr").length;
 			var total=0;
+			var maxTotal=0;
 			for (var i=0;i<length;i++){
-				var zhi=$("#treeTable2 tbody").find("tr").eq(i).find("#maxDeduct").html();
+				var zhi=$("#treeTable2 tbody").find("tr").eq(i).find("#deduct").html();
+				var zhiMax=$("#treeTable2 tbody").find("tr").eq(i).find("#maxDeduct").html();
 				if (undefined!=zhi && ''!=zhi){
 					total=total+parseInt(zhi);
 				}
+				if (undefined!=zhiMax && ''!=zhiMax){
+					maxTotal=maxTotal+parseInt(zhiMax);
+				}
 			}
 			$("#total").html(total);
+			$("#maxTotal").html(maxTotal);
         });
 
         function insertTitle(tValue){
@@ -1515,6 +1521,7 @@
 							<%--<th width="25%">序号</th>--%>
 							<th width="40%">符合内容及评分标准</th>
 							<th width="10%">自校</th>
+							<th width="10%">最高分</th>
 							<th width="20%">打分</th>
 							<th >打分意见</th>
 
@@ -1535,15 +1542,19 @@
 									<i class="fa fa-check"></i>
 								</td>
 								<td class="input-td">
-									<span id="maxDeduct">${workReviewAudit.deduct}</span>
+									<span id="maxDeduct">${workReviewAudit.maxDeduct}</span>
+								</td>
+								<td class="input-td">
+									<span id="deduct">${workReviewAudit.deduct}</span>
 								</td>
 								<td class="input-td">
-									<input id="deductOpinion" title="${workReviewAudit.deductOption}" style="background-color: #fff;text-align: center"  placeholder="请输入审核意见" readonly="true" name="deductOpinion" value="${workReviewAudit.deductOption}" onclick="readOpenInfo(this.value)" class="form-control layui-input"/>
+									<input id="deductOpinion" title="${workReviewAudit.deductOption}" style="background-color: #fff;text-align: center" readonly="true" name="deductOpinion" value="${workReviewAudit.deductOption}" onclick="readOpenInfo(this.value)" class="form-control layui-input"/>
 								</td>
 							</tr>
 						</c:forEach>
 						<tr>
 							<td colspan="2" style="font-weight: bold">总分</td>
+							<td id="maxTotal"></td>
 							<td id="total" >
 							</td>
 							<td></td>

src/main/webapp/webpage/modules/bzshbExamin/bzshbExamineform.jsp

@@ -96,6 +96,15 @@
 				$(id).removeAttr("class","hide");
 
 			})
+			var maxTotal=0;
+			var length=$("#treeTable2 tbody tr").length;
+			for (var i=0;i<length;i++){
+				var zhi=$("#treeTable2 tbody").find("tr").eq(i).find("#maxDeduct").val();
+				if (undefined!=zhi && ''!=zhi){
+					maxTotal=maxTotal+parseInt(zhi);
+				}
+			}
+			$("#maxTotal").html(maxTotal);
         });
 
         function insertTitle(tValue){
@@ -145,7 +154,7 @@
 			obj.value = obj.value.replace(".","$#$").replace(/\./g,"").replace("$#$",".");
 			obj.value = obj.value.replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3'); //只能输入两个小数
 		}
-		function reportMaxDeduct(maxDeduct,id,parentId,obj){
+		function reportMaxDeduct(deduct,id,parentId,obj){
 			<%--console.log(${fns:toJson(list)})--%>
 			<%--var dataList = ${fns:toJson(list)}--%>
 			<%--var maxDeductTotal = 0;--%>
@@ -159,7 +168,7 @@
 			<%--	//     maxDeductTotal = dataList[i].maxDeduct;--%>
 			<%--	// }--%>
 			<%--}--%>
-			if(isNaN(maxDeduct)){
+			if(isNaN(deduct)){
 				parent.layer.msg("输入的不是数字格式",{icon:2});
 				$(obj).val("")
 				return false;
@@ -167,7 +176,7 @@
 			$.ajax({
 				url:"${ctx}/workreview/workReviewStandard/reportMaxDeduct",
 				data:{
-					"maxDeduct":maxDeduct,
+					"maxDeduct":deduct,
 					"id":id,
 				},
 				type:"post",
@@ -175,7 +184,7 @@
 					if(data.status){
 						var length=$("#treeTable2 tbody tr").length;
 						for (var i=0;i<length;i++){
-							var zhi=$("#treeTable2 tbody").find("tr").eq(i).find("#maxDeduct").val();
+							var zhi=$("#treeTable2 tbody").find("tr").eq(i).find("#deduct").val();
 							if (undefined!=zhi && ''!=zhi){
 								total=total+parseInt(zhi);
 							}
@@ -1559,7 +1568,8 @@
 										<%--<th width="25%">序号</th>--%>
 									<th width="40%">符合内容及评分标准</th>
 									<th width="10%">自校</th>
-									<th width="20%"><span class="require-item">*</span>打分</th>
+									<th width="10%">最高分</th>
+									<th width="10%"><span class="require-item">*</span>打分</th>
 									<th >打分意见</th>
 
 										<%--<th width="15%">操作</th>--%>
@@ -1579,17 +1589,21 @@
 											<i class="fa fa-check"></i>
 										</td>
 										<td class="input-td">
-											<input id="maxDeduct" htmlEscape="false"  class="form-control layui-input judgment" onChange="if(this.value)reportMaxDeduct(this.value,'${workReviewAudit.id}','${workReviewAudit.parent.id}',this)" placeholder="${workReviewAudit.maxDeduct}" />
+											<input id="maxDeduct" readonly="true" htmlEscape="false" class="form-control layui-input" style="background-color: #fff;text-align: center" value="${workReviewAudit.maxDeduct}" />
+										</td>
+										<td class="input-td">
+											<input id="deduct" htmlEscape="false"  class="form-control layui-input judgment" onChange="if(this.value)reportMaxDeduct(this.value,'${workReviewAudit.id}','${workReviewAudit.parent.id}',this)" placeholder="请输入" />
 										</td>
 										<td class="input-td">
-											<input id="deductOpinion" placeholder="请输入打分意见" readonly="true" style="background-color: #FFFFFF;" name="deductOpinion" value="" onclick="openDeductInfo(this.value,'${workReviewAudit.id}',this)" class="form-control layui-input judgment"/>
+											<input id="deductOpinion" placeholder="请输入打分意见" readonly="true" style="background-color: #FFFFFF;" name="deductOpinion" value="" onclick="openDeductInfo(this.value,'${workReviewAudit.id}',this)" class="form-control layui-input"/>
 										</td>
 									</tr>
 								</c:forEach>
 								<tr>
 									<td colspan="2" style="font-weight: bold">总分</td>
-									<td style="padding: 0px;">
-										<input id="total" name="reviewScore" htmlEscape="false" readonly="true"  class="form-control layui-input ">
+									<td id="maxTotal"></td>
+									<td  class="input-td">
+										<input id="total" name="reviewScore" htmlEscape="false" readonly="true"  style="background-color: #FFFFFF;"  class="form-control layui-input ">
 									</td>
 									<td></td>
 								</tr>

src/main/webapp/webpage/modules/projectPaperFiling/projectPaperFilingForm.jsp

@@ -84,7 +84,7 @@
 		<form:form id="inputForm" modelAttribute="projectPaperFiling" action="${ctx}/paperFiling/paperFiling/save" method="post" class="form-horizontal  layui-form">
 			<input type="hidden" id="id" name="id" value="${projectPaperFiling.id}">
 			<input type="hidden" id="id" name="projectId" value="${projectRecords.id}">
-			<form:input path="view"/>
+			<form:hidden path="view"/>
 			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>项目合同信息</h2></div>
                <div id="divv">

src/main/webapp/webpage/modules/projectPaperFiling/projectPaperFilingModify.jsp

@@ -135,7 +135,7 @@
 			<form:hidden path="act.procInsId"/>
 			<form:hidden path="act.procDefId"/>
 			<form:hidden id="flag" path="act.flag"/>
-			<form:input path="view"/>
+			<form:hidden path="view"/>
 			<input type="hidden" id="opinion" name="act.comment" value="" maxlength="250">
 			<c:set var="status" value="${projectRecords.act.status}" />
 			<div class="form-group layui-row first">

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

@@ -970,17 +970,17 @@
 								if(d.submitMoney == "2"){
 									/*xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralCostProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";*/
 									if(d.paperFilingStatus == 0){
-										xml+="<a href=\"#\" onclick=\"openDialogre('新增纸质归档信息', '${ctx}/paperFiling/paperFiling/form?projectId=" + d.id +"&view=filing','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 纸质归档</a>";
+										xml+="<a href=\"#\" onclick=\"openDialogre('新增纸质归档信息', '${ctx}/paperFiling/paperFiling/form?projectId=" + d.id +"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 纸质归档</a>";
 									}
 									if(d.paperFilingStatus == 2){
-										xml+="<a href=\"${ctx}/paperFiling/paperFiling/cancelInvalidate?id=" + d.ppfId + "&view=filing&processInstanceId=" + d.ppfProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该纸质归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" > 撤回纸质归档</a>";
+										xml+="<a href=\"${ctx}/paperFiling/paperFiling/cancelInvalidate?id=" + d.ppfId + "&processInstanceId=" + d.ppfProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该纸质归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" > 撤回纸质归档</a>";
 									}
 									if(d.paperFilingStatus == 3){
-										xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/paperFiling/paperFiling/form?id=" + d.ppfId + "&projectId=" + d.id +"&view=filing ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 纸质重新归档</a>";
+										xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/paperFiling/paperFiling/form?id=" + d.ppfId + "&projectId=" + d.id +" ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 纸质重新归档</a>";
 									}
 									if(d.paperFilingStatus == 4){
 										//驳回操作
-										xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/paperFiling/paperFiling/modify?id=" + d.ppfId + "&projectId=" + d.id + "&processInstanceId=" + d.ppfProcessInstanceId + "&view=filing ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 纸质重新归档</a>";
+										xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/paperFiling/paperFiling/modify?id=" + d.ppfId + "&projectId=" + d.id + "&processInstanceId=" + d.ppfProcessInstanceId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 纸质重新归档</a>";
 									}
 								}
 							}

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

@@ -116,6 +116,15 @@
 				$(id).removeAttr("class","hide");
 
 			})
+			var maxTotal=0;
+			var length=$("#treeTable2 tbody tr").length;
+			for (var i=0;i<length;i++){
+				var zhi=$("#treeTable2 tbody").find("tr").eq(i).find("#maxDeduct").val();
+				if (undefined!=zhi && ''!=zhi){
+					maxTotal=maxTotal+parseInt(zhi);
+				}
+			}
+			$("#maxTotal").html(maxTotal);
         });
 
         function insertTitle(tValue){
@@ -166,7 +175,7 @@
 			obj.value = obj.value.replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3'); //只能输入两个小数
 		}
 		// 确认对话框
-		function reportMaxDeduct(maxDeduct,id,parentId,obj){
+		function reportMaxDeduct(deduct,id,parentId,obj){
         	<%--console.log(${fns:toJson(list)})--%>
 			<%--var dataList = ${fns:toJson(list)}--%>
 			<%--var maxDeductTotal = 0;--%>
@@ -180,7 +189,7 @@
 			<%--	//     maxDeductTotal = dataList[i].maxDeduct;--%>
 			<%--	// }--%>
 			<%--}--%>
-			if(isNaN(maxDeduct)){
+			if(isNaN(deduct)){
 				parent.layer.msg("输入的不是数字格式",{icon:2});
 				$(obj).val("")
 				return false;
@@ -188,7 +197,7 @@
 			$.ajax({
 				url:"${ctx}/workreview/workReviewStandard/reportMaxDeduct",
 				data:{
-					"maxDeduct":maxDeduct,
+					"maxDeduct":deduct,
 					"id":id,
 				},
 				type:"post",
@@ -196,7 +205,7 @@
 					if(data.status){
 						var length=$("#treeTable2 tbody tr").length;
 						for (var i=0;i<length;i++){
-							var zhi=$("#treeTable2 tbody").find("tr").eq(i).find("#maxDeduct").val();
+							var zhi=$("#treeTable2 tbody").find("tr").eq(i).find("#deduct").val();
 							if (undefined!=zhi && ''!=zhi){
 								total=total+parseInt(zhi);
 							}
@@ -1149,7 +1158,8 @@
 													<%--<th width="25%">序号</th>--%>
 												<th width="40%">符合内容及评分标准</th>
 												<th width="10%">自校</th>
-												<th width="20%"><span class="require-item">*</span>打分</th>
+												<th width="10%">最高分</th>
+												<th width="10%"><span class="require-item">*</span>打分</th>
 												<th >打分意见</th>
 
 													<%--<th width="15%">操作</th>--%>
@@ -1168,7 +1178,10 @@
 														<i class="fa fa-check"></i>
 													</td>
 													<td class="input-td">
-														<input id="maxDeduct" htmlEscape="false"  class="form-control layui-input number judgment" onChange="if(this.value)reportMaxDeduct(this.value,'${workReviewAudit.id}','${workReviewAudit.parent.id}',this)" placeholder="${workReviewAudit.maxDeduct}" />
+														<input id="maxDeduct" readonly="true" htmlEscape="false" class="form-control layui-input" style="background-color: #fff;text-align: center" value="${workReviewAudit.maxDeduct}" />
+													</td>
+													<td class="input-td">
+														<input id="deduct" htmlEscape="false"  class="form-control layui-input number judgment" onChange="if(this.value)reportMaxDeduct(this.value,'${workReviewAudit.id}','${workReviewAudit.parent.id}',this)" placeholder="请输入" />
 													</td>
 													<td class="input-td">
 														<input id="deductOpinion" placeholder="请输入打分意见" readonly="true" style="background-color: #FFFFFF;" name="deductOpinion" value="" onclick="openDeductInfo(this.value,'${workReviewAudit.id}',this)" class="form-control layui-input"/>
@@ -1177,6 +1190,7 @@
 											</c:forEach>
 											<tr>
 												<td colspan="2" style="font-weight: bold">总分</td>
+												<td id="maxTotal"></td>
 												<td id="total"></td>
 												<td></td>
 											</tr>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageAuditTwo.jsp

@@ -100,6 +100,15 @@
 				$(id).removeAttr("class","hide");
 
 			})
+			var maxTotal=0;
+			var length=$("#treeTable2 tbody tr").length;
+			for (var i=0;i<length;i++){
+				var zhi=$("#treeTable2 tbody").find("tr").eq(i).find("#maxDeduct").val();
+				if (undefined!=zhi && ''!=zhi){
+					maxTotal=maxTotal+parseInt(zhi);
+				}
+			}
+			$("#maxTotal").html(maxTotal);
         });
 
         function insertTitle(tValue){
@@ -143,7 +152,7 @@
             });
         }
 		// 确认对话框
-		function reportMaxDeduct(maxDeduct,id,parentId,obj){
+		function reportMaxDeduct(deduct,id,parentId,obj){
 			<%--console.log(${fns:toJson(list)})--%>
 			<%--var dataList = ${fns:toJson(list)}--%>
 			<%--var maxDeductTotal = 0;--%>
@@ -156,7 +165,7 @@
 			<%--	//     maxDeductTotal = dataList[i].maxDeduct;--%>
 			<%--	// }--%>
 			<%--}--%>
-			if(isNaN(maxDeduct)){
+			if(isNaN(deduct)){
 				parent.layer.msg("输入的不是数字格式",{icon:2});
 				$(obj).val("")
 				return false;
@@ -165,7 +174,7 @@
 			$.ajax({
 				url:"${ctx}/workreview/workReviewStandard/reportMaxDeduct",
 				data:{
-					"maxDeduct":maxDeduct,
+					"maxDeduct":deduct,
 					"id":id,
 				},
 				type:"post",
@@ -173,7 +182,7 @@
 					if(data.status){
 						var length=$("#treeTable2 tbody tr").length;
 						for (var i=0;i<length;i++){
-							var zhi=$("#treeTable2 tbody").find("tr").eq(i).find("#maxDeduct").val();
+							var zhi=$("#treeTable2 tbody").find("tr").eq(i).find("#deduct").val();
 							if (undefined!=zhi && ''!=zhi){
 								total=total+parseInt(zhi);
 							}
@@ -993,7 +1002,8 @@
 													<%--<th width="25%">序号</th>--%>
 												<th width="40%">符合内容及评分标准</th>
 												<th width="10%">自校</th>
-												<th width="20%"><span class="require-item">*</span>打分</th>
+												<th width="10%">最高分</th>
+												<th width="10%"><span class="require-item">*</span>打分</th>
 												<th >打分意见</th>
 													<%--<th width="15%">操作</th>--%>
 											</tr>
@@ -1011,7 +1021,10 @@
 														<i class="fa fa-check"></i>
 													</td>
 													<td class="input-td">
-														<input id="maxDeduct" htmlEscape="false"  class="form-control layui-input number judgment" onChange="if(this.value)reportMaxDeduct(this.value,'${workReviewAudit.id}','${workReviewAudit.parent.id}',this)" placeholder="${workReviewAudit.maxDeduct}">
+														<input id="maxDeduct" readonly="true" htmlEscape="false" class="form-control layui-input" style="background-color: #fff;text-align: center" value="${workReviewAudit.maxDeduct}" />
+													</td>
+													<td class="input-td">
+														<input id="deduct" htmlEscape="false"  class="form-control layui-input number judgment" onChange="if(this.value)reportMaxDeduct(this.value,'${workReviewAudit.id}','${workReviewAudit.parent.id}',this)"   placeholder="请输入"/>
 													</td>
 													<td class="input-td">
 														<input id="deductOpinion" placeholder="请输入打分意见" readonly="true" style="background-color: #FFFFFF;" name="deductOpinion" value="" onclick="openDeductInfo(this.value,'${workReviewAudit.id}',this)" class="form-control layui-input"/>
@@ -1020,6 +1033,7 @@
 											</c:forEach>
 											<tr>
 												<td colspan="2" style="font-weight: bold">总分</td>
+												<td id="maxTotal"></td>
 												<td id="total"></td>
 												<td></td>
 

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

@@ -50,13 +50,19 @@
 			}
 			var length=$("#treeTable2 tbody tr").length;
 			var total=0;
+			var maxTotal=0;
 			for (var i=0;i<length;i++){
-				var zhi=$("#treeTable2 tbody").find("tr").eq(i).find("#maxDeduct").val();
+				var zhi=$("#treeTable2 tbody").find("tr").eq(i).find("#deduct").val();
+				var zhiMax=$("#treeTable2 tbody").find("tr").eq(i).find("#maxDeduct").val();
 				if (undefined!=zhi && ''!=zhi){
 					total=total+parseInt(zhi);
 				}
+				if (undefined!=zhiMax && ''!=zhiMax){
+					maxTotal=maxTotal+parseInt(zhiMax);
+				}
 			}
 			$("#total").html(total);
+			$("#maxTotal").html(maxTotal);
 		});
 
 		function readOpenInfo(value) {
@@ -888,7 +894,8 @@
 									<%--<th width="25%">序号</th>--%>
 								<th width="40%">符合内容及评分标准</th>
 								<th width="10%">自校</th>
-								<th width="20%">打分</th>
+								<th width="10%">最高分</th>
+								<th width="10%">打分</th>
 								<th >打分意见</th>
 									<%--<th width="15%">操作</th>--%>
 							</tr>
@@ -906,16 +913,20 @@
 										<i class="fa fa-check"></i>
 									</td>
 									<td class="input-td">
-										<input id="maxDeduct" style="text-align: center" htmlEscape="false" readonly="true" class="form-control layui-input" value="${workReviewAudit.deduct}">
+										<input id="maxDeduct" readonly="true" htmlEscape="false" class="form-control layui-input" style="background-color: #fff;text-align: center" value="${workReviewAudit.maxDeduct}" />
+									</td>
+									<td class="input-td">
+										<input id="deduct" htmlEscape="false" readonly="true" style="text-align: center;background-color: #fff" class="form-control layui-input number"  value="${workReviewAudit.deduct}"/>
 									</td>
 									<td class="input-td">
-										<input id="deductOpinion" style="text-align: center" title="${workReviewAudit.deductOption}" readonly="true" name="deductOpinion" value="${workReviewAudit.deductOption}" onclick="readOpenInfo(this.value)" class="form-control layui-input"/>
+										<input id="deductOpinion" title="${workReviewAudit.deductOption}" style="text-align: center;background-color: #fff"   readonly="true" name="deductOpinion" value="${workReviewAudit.deductOption}" onclick="readOpenInfo(this.value)" class="form-control layui-input"/>
 									</td>
 								</tr>
 							</c:forEach>
 							<tr>
 								<td colspan="2" style="font-weight: bold">总分</td>
-								<td id="total" style="background-color: #F1f1f1"></td>
+								<td id="maxTotal"></td>
+								<td id="total" ></td>
 								<td style="background-color: #F1f1f1"></td>
 
 							</tr>

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

@@ -50,13 +50,19 @@
 			}
 			var length=$("#treeTable2 tbody tr").length;
 			var total=0;
+			var maxTotal=0;
 			for (var i=0;i<length;i++){
-				var zhi=$("#treeTable2 tbody").find("tr").eq(i).find("#maxDeduct").val();
+				var zhi=$("#treeTable2 tbody").find("tr").eq(i).find("#deduct").val();
+				var zhiMax=$("#treeTable2 tbody").find("tr").eq(i).find("#maxDeduct").val();
 				if (undefined!=zhi && ''!=zhi){
 					total=total+parseInt(zhi);
 				}
+				if (undefined!=zhiMax && ''!=zhiMax){
+					maxTotal=maxTotal+parseInt(zhiMax);
+				}
 			}
 			$("#total").html(total);
+			$("#maxTotal").html(maxTotal);
 		});
 
 		function readOpenInfo(value) {
@@ -986,7 +992,8 @@
 									<%--<th width="25%">序号</th>--%>
 								<th width="40%">符合内容及评分标准</th>
 								<th width="10%">自校</th>
-								<th width="20%">打分</th>
+									<th width="10%">最高分</th>
+									<th width="10%">打分</th>
 								<th >打分意见</th>
 									<%--<th width="15%">操作</th>--%>
 							</tr>
@@ -1004,15 +1011,19 @@
 										<i class="fa fa-check"></i>
 									</td>
 									<td class="input-td">
-										<input id="maxDeduct" style="text-align: center" htmlEscape="false" readonly="true" class="form-control layui-input" value="${workReviewAudit.deduct}">
+										<input id="maxDeduct" readonly="true" htmlEscape="false" class="form-control layui-input" style="background-color: #fff;text-align: center" value="${workReviewAudit.maxDeduct}" />
+									</td>
+									<td class="input-td">
+										<input id="deduct" htmlEscape="false" readonly="true" style="text-align: center;background-color: #fff" class="form-control layui-input number"  value="${workReviewAudit.deduct}"/>
 									</td>
 									<td class="input-td">
-										<input id="deductOpinion" title="${workReviewAudit.deductOption}"  readonly="true" name="deductOpinion" value="${workReviewAudit.deductOption}" onclick="readOpenInfo(this.value)" class="form-control layui-input"/>
+										<input id="deductOpinion" title="${workReviewAudit.deductOption}" style="text-align: center;background-color: #fff"   readonly="true" name="deductOpinion" value="${workReviewAudit.deductOption}" onclick="readOpenInfo(this.value)" class="form-control layui-input"/>
 									</td>
 								</tr>
 							</c:forEach>
 							<tr>
 								<td colspan="2" style="font-weight: bold">总分</td>
+								<td id="maxTotal"></td>
 								<td id="total" style="background-color: #F1f1f1"></td>
 								<td style="background-color: #F1f1f1"></td>
 							</tr>

src/main/webapp/webpage/modules/ruralprojectrecords/view/reportIssueView.jsp

@@ -65,13 +65,19 @@
 			})
 			var length=$("#treeTable2 tbody tr").length;
 			var total=0;
+			var maxTotal=0;
 			for (var i=0;i<length;i++){
-				var zhi=$("#treeTable2 tbody").find("tr").eq(i).find("#maxDeduct").val();
+				var zhi=$("#treeTable2 tbody").find("tr").eq(i).find("#deduct").val();
+				var zhiMax=$("#treeTable2 tbody").find("tr").eq(i).find("#maxDeduct").val();
 				if (undefined!=zhi && ''!=zhi){
 					total=total+parseInt(zhi);
 				}
+				if (undefined!=zhiMax && ''!=zhiMax){
+					maxTotal=maxTotal+parseInt(zhiMax);
+				}
 			}
 			$("#total").html(total);
+			$("#maxTotal").html(maxTotal);
 		});
 
 		function openDialogre(title,url,width,height,target,buttons) {
@@ -303,7 +309,8 @@
 									<%--<th width="25%">序号</th>--%>
 								<th width="40%">符合内容及评分标准</th>
 								<th width="10%">自校</th>
-								<th width="20%">打分</th>
+								<th width="10%">最高分</th>
+								<th width="10%">打分</th>
 								<th >打分意见</th>
 
 									<%--<th width="15%">操作</th>--%>
@@ -322,17 +329,21 @@
 										<i class="fa fa-check"></i>
 									</td>
 									<td class="input-td">
-										<input id="maxDeduct" style="text-align: center" htmlEscape="false" readonly="true" class="form-control layui-input" value="${workReviewAudit.deduct}">
+										<input id="maxDeduct" readonly="true" htmlEscape="false" class="form-control layui-input" style="background-color: #fff;text-align: center" value="${workReviewAudit.maxDeduct}" />
+									</td>
+									<td class="input-td">
+										<input id="deduct" style="text-align: center;background-color: #fff" htmlEscape="false" readonly="true" class="form-control layui-input" value="${workReviewAudit.deduct}">
 									</td>
 									<td class="input-td">
-										<input id="deductOpinion" style="text-align: center" title="${workReviewAudit.deductOption}" readonly="true" name="deductOpinion" value="${workReviewAudit.deductOption}" onclick="readOpenInfo(this.value)" class="form-control layui-input"/>
+										<input id="deductOpinion" style="text-align: center;background-color: #fff" title="${workReviewAudit.deductOption}" readonly="true" name="deductOpinion" value="${workReviewAudit.deductOption}" onclick="readOpenInfo(this.value)" class="form-control layui-input"/>
 									</td>
 								</tr>
 							</c:forEach>
 							<tr>
 								<td colspan="2" style="font-weight: bold">总分</td>
-								<td id="total" style="background-color: #F1f1f1"></td>
-								<td style="background-color: #F1f1f1"></td>
+								<td id="maxTotal"></td>
+								<td id="total" ></td>
+								<td ></td>
 
 							</tr>
 							</tbody>

src/main/webapp/webpage/modules/ruralprojectrecords/view/reportView.jsp

@@ -65,13 +65,19 @@
 			})
 			var length=$("#treeTable2 tbody tr").length;
 			var total=0;
+			var maxTotal=0;
 			for (var i=0;i<length;i++){
-				var zhi=$("#treeTable2 tbody").find("tr").eq(i).find("#maxDeduct").val();
+				var zhi=$("#treeTable2 tbody").find("tr").eq(i).find("#deduct").val();
+				var zhiMax=$("#treeTable2 tbody").find("tr").eq(i).find("#maxDeduct").val();
 				if (undefined!=zhi && ''!=zhi){
 					total=total+parseInt(zhi);
 				}
+				if (undefined!=zhiMax && ''!=zhiMax){
+					maxTotal=maxTotal+parseInt(zhiMax);
+				}
 			}
 			$("#total").html(total);
+			$("#maxTotal").html(maxTotal);
 		});
 
 		function openDialogre(title,url,width,height,target,buttons) {
@@ -371,7 +377,8 @@
 									<%--<th width="25%">序号</th>--%>
 								<th width="40%">符合内容及评分标准</th>
 								<th width="10%">自校</th>
-								<th width="20%">打分</th>
+								<th width="10%">最高分</th>
+								<th width="10%">打分</th>
 								<th >打分意见</th>
 
 									<%--<th width="15%">操作</th>--%>
@@ -390,15 +397,19 @@
 										<i class="fa fa-check"></i>
 									</td>
 									<td class="input-td">
-										<input id="maxDeduct" style="text-align: center;background-color: #fff" htmlEscape="false" readonly="true" class="form-control layui-input" value="${workReviewAudit.deduct}">
+										<input id="maxDeduct" readonly="true" htmlEscape="false" class="form-control layui-input" style="background-color: #fff;text-align: center" value="${workReviewAudit.maxDeduct}" />
+									</td>
+									<td class="input-td">
+										<input id="deduct" style="text-align: center;background-color: #fff" htmlEscape="false" readonly="true" class="form-control layui-input" value="${workReviewAudit.deduct}">
 									</td>
 									<td class="input-td">
-										<input id="deductOpinion" title="${workReviewAudit.deductOption}" readonly="true" name="deductOpinion" value="${workReviewAudit.deductOption}" onclick="readOpenInfo(this.value)" class="form-control layui-input"/>
+										<input id="deductOpinion" style="text-align: center;background-color: #fff" title="${workReviewAudit.deductOption}" readonly="true" name="deductOpinion" value="${workReviewAudit.deductOption}" onclick="readOpenInfo(this.value)" class="form-control layui-input"/>
 									</td>
 								</tr>
 							</c:forEach>
 							<tr>
 								<td colspan="2" style="font-weight: bold">总分</td>
+								<td id="maxTotal"></td>
 								<td id="total"></td>
 								<td ></td>
 							</tr>

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

@@ -27,10 +27,21 @@
 						parent.layer.msg("请选择合同类型!", {icon: 5});
 						return false;
 					}
+					//判断收费标准是否选择
+					var ff=false;
+					$("[name='chargeCriterionList']").each(function(){
+						if($(this).prop("checked")){
+							ff=true;
+						}
+					})
+					if (!ff){
+						parent.layer.msg("未选择收费标准!", {icon: 5});
+						return false;
+					}
                     //送审
 					var flags=judgment();
 					if (flags){
-						$("#inputForm").attr("action","${ctx}/workcontractinfo/workContractInfo/save");
+						<%--<!--$("#inputForm").attr("action","${ctx}/workcontractinfo/workContractInfo/save");-->--%>
 					}else{
 						return flags;
 					}
@@ -106,16 +117,16 @@
 				$("#contractPrice").parent().parent().hide();
 				$("#contractPrice").removeClass("judgment")
 				$("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准：")
-				$("#describeContentDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>描述内容：")
+				$("#otherDetailsDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>")
 				$("#otherDetails").attr("class","form-control layui-input judgment")
-				$("#describeContent").attr("class","form-control judgment")
+				// $("#describeContent").attr("class","form-control judgment")
 			}else{
 				$("#contractPrice").parent().parent().show();
 				$("#contractPrice").attr("class","form-control judgment number layui-input")
 				$("#chargeCriterionList").find("label").eq(0).html("收费标准：")
-				$("#describeContentDiv").find("label").eq(0).html("描述内容：")
+				$("#otherDetailsDiv").find("label").eq(0).html("")
 				$("#otherDetails").attr("class","form-control layui-input")
-				$("#describeContent").attr("class","form-control")
+				// $("#otherDetails").attr("class","form-control")
 			}
 
 
@@ -708,19 +719,19 @@
 							<div class="layui-item layui-col-sm12" id="chargeCriterionList" >
 								<label class="layui-form-label">收费标准：</label>
 								<div class="layui-input-block">
-									<form:checkboxes path="chargeCriterionList" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="label" htmlEscape="true" items="${fns:getMainDictList('charge_criterion')}" />
+									<form:checkboxes path="chargeCriterionList" name="chargeCriterionList" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="label" htmlEscape="true" items="${fns:getMainDictList('charge_criterion')}" />
 <%--									<form:checkboxes path="chargeCriterionList" cssStyle="display: none;" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="value" htmlEscape="true" items="${fns:getMainDictList('charge_criterion')}" />--%>
 								</div>
 							</div>
 
 
-							<div class="layui-item layui-col-sm12">
-								<label class="layui-form-label "><!--其他详情：--></label>
+							<div class="layui-item layui-col-sm12"  id="otherDetailsDiv">
+								<label class="layui-form-label "></label>
 								<div class="layui-input-block">
 									<form:input placeholder="请选择收费标准" path="otherDetails" id="otherDetails" htmlEscape="false" maxlength="255" class="form-control layui-input"/>
 								</div>
 							</div>
-							<div class="layui-item layui-col-sm12 with-textarea" id="describeContentDiv">
+							<div class="layui-item layui-col-sm12 with-textarea">
 								<label class="layui-form-label ">描述内容：</label>
 								<div class="layui-input-block">
 									<form:textarea placeholder="请输入描述内容" path="describeContent" htmlEscape="false" rows="4" maxlength="500"   class="form-control "/>
@@ -1048,16 +1059,16 @@
 					$("#contractPrice").parent().parent().hide();
 					$("#contractPrice").removeClass("judgment")
 					$("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准：")
-					$("#describeContentDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>描述内容：")
+					$("#otherDetailsDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>")
 					$("#otherDetails").attr("class","form-control layui-input judgment")
-					$("#describeContent").attr("class","form-control judgment")
+					// $("#describeContent").attr("class","form-control judgment")
 				}else{
 					$("#contractPrice").parent().parent().show();
 					$("#contractPrice").attr("class","form-control judgment number layui-input")
 					$("#chargeCriterionList").find("label").eq(0).html("收费标准：")
-					$("#describeContentDiv").find("label").eq(0).html("描述内容：")
+					$("#otherDetailsDiv").find("label").eq(0).html("")
 					$("#otherDetails").attr("class","form-control layui-input")
-					$("#describeContent").attr("class","form-control")
+					// $("#describeContent").attr("class","form-control")
 				}
 			})
 		});

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

@@ -19,6 +19,17 @@
 				return false;
 			}
             if(validateForm.form()){
+				//判断收费标准是否选择
+				var ff=false;
+				$("[name='chargeCriterionList']").each(function(){
+					if($(this).prop("checked")){
+						ff=true;
+					}
+				})
+				if (!ff){
+					parent.layer.msg("未选择收费标准!", {icon: 5});
+					return false;
+				}
                // if(obj == 1) {
                     $("#flag").val("yes");
                 /*}else {
@@ -101,16 +112,16 @@
 				$("#contractPrice").parent().parent().hide();
 				$("#contractPrice").removeClass("required")
 				$("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准：")
-				$("#describeContentDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>描述内容：")
+				$("#otherDetailsDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>")
 				$("#otherDetails").attr("class","form-control layui-input required")
-				$("#describeContent").attr("class","form-control required")
+				// $("#describeContent").attr("class","form-control required")
 			}else{
 				$("#contractPrice").parent().parent().show();
 				$("#contractPrice").attr("class","form-control required number layui-input")
 				$("#chargeCriterionList").find("label").eq(0).html("收费标准：")
-				$("#describeContentDiv").find("label").eq(0).html("描述内容：")
+				$("#otherDetailsDiv").find("label").eq(0).html("")
 				$("#otherDetails").attr("class","form-control layui-input")
-				$("#describeContent").attr("class","form-control")
+				// $("#describeContent").attr("class","form-control")
 			}
 
 
@@ -654,7 +665,7 @@
 <%--								<form:checkboxes path="chargeCriterionList" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="label" htmlEscape="false" items="${fns:getMainDictList('charge_criterion')}" />--%>
 							</div>
 						</div>
-						<div class="layui-item layui-col-sm12">
+						<div class="layui-item layui-col-sm12" id="otherDetailsDiv">
 							<label class="layui-form-label "><!--其他详情：--></label>
 							<div class="layui-input-block">
 								<form:input placeholder="请选择收费标准" path="otherDetails" id="otherDetails" htmlEscape="false" maxlength="255" class="form-control layui-input required"/>
@@ -1159,7 +1170,7 @@
 					$("#contractPrice").parent().parent().hide();
 					$("#contractPrice").removeClass("required")
 					$("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准：")
-					$("#describeContentDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>描述内容：")
+					$("#otherDetailsDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>")
 					$("#otherDetails").attr("class","form-control layui-input re" +
 							"" +
 							"quired")
@@ -1169,9 +1180,9 @@
 					$("#contractPrice").parent().parent().show();
 					$("#contractPrice").attr("class","form-control required number layui-input")
 					$("#chargeCriterionList").find("label").eq(0).html("收费标准：")
-					$("#describeContentDiv").find("label").eq(0).html("描述内容：")
+					$("#otherDetailsDiv").find("label").eq(0).html("")
 					$("#otherDetails").attr("class","form-control layui-input")
-					$("#describeContent").attr("class","form-control")
+					// $("#describeContent").attr("class","form-control")
 				}
 			})
 		});