Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -3322,6 +3322,12 @@ public class WorkProjectNotifyController extends BaseController {
 					String review="";
 					if ("2".equals(ruralProjectRecords.getSubmitMoney())){
 						review="1";
+					}else{
+						if(StringUtils.isBlank(ruralProjectRecords.getEmergencyProject()) ||"0".equals(ruralProjectRecords.getEmergencyProject())){
+							review="2";
+						}else{
+							review="3";
+						}
 					};
 					List<WorkReviewAudit> workReviewAuditList = projectContentDataService.findListReview(review,"质量复核");
 					WorkReviewAudit revAudit = new WorkReviewAudit();
@@ -3346,7 +3352,7 @@ public class WorkProjectNotifyController extends BaseController {
 						WorkReviewAudit workReviewAudit = new WorkReviewAudit();
 						workReviewAudit.setCompanyId(UserUtils.getSelectCompany().getId());
 						workReviewAudit.setType(type);
-						workReviewAudit.setReportId(workProjectNotify.getNotifyId());
+						workReviewAudit.setReportId(data.getId());
 						List<WorkReviewAudit> audits = workReviewStandardService.findAuditList(workReviewAudit);
 						for(WorkReviewAudit reviewAudit:workReviewAudits){
 							for (WorkReviewAudit audit:audits){

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

@@ -354,12 +354,12 @@ END) as projectScale
 				AND (a.create_by = #{createBy.id} or sua.name like concat('%',#{createBy.name},'%'))
 			</if>
 			<choose>
-				<when test="filingProjectStatus == 0">
-					AND pfp.status is null
+				<when test="downProjectReportRecordStatus == 0">
+					AND( pfp.status is null or ppf.status is null )
 				</when>
 				<otherwise>
-					<if test="filingProjectStatus!=null and filingProjectStatus !=''">
-						AND pfp.status = #{filingProjectStatus}
+					<if test="downProjectReportRecordStatus!=null and downProjectReportRecordStatus !=''">
+						AND (pfp.status = #{downProjectReportRecordStatus} or ppf.status = #{downProjectReportRecordStatus})
 					</if>
 				</otherwise>
 			</choose>
@@ -476,6 +476,7 @@ END) as projectScale
 		left join rural_project_report_record_down prrd on prrd.report_id = prd.id
 		LEFT JOIN project_flingbatch_relation pfp on pfp.project_id= a.id
 		LEFT JOIN sys_user sua on a.create_by = sua.id
+		left join project_paper_filing ppf on ppf.project_id = a.id
 		<where>
 			a.status = 5
 			<if test="bzshbUserId!=null and bzshbUserId!=''">
@@ -556,12 +557,12 @@ END) as projectScale
 			</if>
 
 			<choose>
-				<when test="filingProjectStatus == 0">
-					AND pfp.status is null
+				<when test="downProjectReportRecordStatus == 0">
+					AND( pfp.status is null or ppf.status is null )
 				</when>
 				<otherwise>
-					<if test="filingProjectStatus!=null and filingProjectStatus !=''">
-						AND pfp.status = #{filingProjectStatus}
+					<if test="downProjectReportRecordStatus!=null and downProjectReportRecordStatus !=''">
+						AND (pfp.status = #{downProjectReportRecordStatus} or ppf.status = #{downProjectReportRecordStatus})
 					</if>
 				</otherwise>
 			</choose>

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

@@ -455,12 +455,12 @@
 				AND (a.create_by = #{createBy.id} or sua.name like concat('%',#{createBy.name},'%'))
 			</if>
 			<choose>
-				<when test="filingProjectStatus == 0">
-					AND pfp.status is null
+				<when test="downProjectReportRecordStatus == 0">
+					AND( pfp.status is null or ppf.status is null )
 				</when>
 				<otherwise>
-					<if test="filingProjectStatus!=null and filingProjectStatus !=''">
-						AND pfp.status = #{filingProjectStatus}
+					<if test="downProjectReportRecordStatus!=null and downProjectReportRecordStatus !=''">
+						AND (pfp.status = #{downProjectReportRecordStatus} or ppf.status = #{downProjectReportRecordStatus})
 					</if>
 				</otherwise>
 			</choose>
@@ -652,16 +652,16 @@
 				AND (a.create_by = #{createBy.id} or sua.name like concat('%',#{createBy.name},'%'))
 			</if>
 
-				<choose>
-					<when test="filingProjectStatus == 0">
-						AND pfp.status is null
-					</when>
-					<otherwise>
-						<if test="filingProjectStatus!=null and filingProjectStatus !=''">
-							AND pfp.status = #{filingProjectStatus}
-						</if>
-					</otherwise>
-				</choose>
+			<choose>
+				<when test="downProjectReportRecordStatus == 0">
+					AND( pfp.status is null or ppf.status is null )
+				</when>
+				<otherwise>
+					<if test="downProjectReportRecordStatus!=null and downProjectReportRecordStatus !=''">
+						AND (pfp.status = #{downProjectReportRecordStatus} or ppf.status = #{downProjectReportRecordStatus})
+					</if>
+				</otherwise>
+			</choose>
 			<if test="reportData!=null and reportData.number !=null and reportData.number !=''">
 				and prd.number like concat('%',#{reportData.number},'%')
 			</if>

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

@@ -125,7 +125,7 @@
 	<select id="findList" resultType="RuralProjectRecords" >
 		SELECT
 			<include refid="projectRecordsColumns"/>
-		,
+		,a.submit_money as "submitMoney",
 		wci.name AS "workContractInfo.name",
 		wct.id AS "workContractInfo.client.id",
 		wct.name AS "workContractInfo.client.name",
@@ -229,11 +229,17 @@
 			<if test="filingProjectStatus!=null and filingProjectStatus !=''">
 				and pfp.status =${filingProjectStatus}
 			</if>
+			<if test="submitMoney!=null and submitMoney !=''">
+				and a.submit_money =${submitMoney}
+			</if>
 			<if test="createBy !=null and createBy !=''">
 				<if test="createBy.name !=null and createBy.name !=''">
 					AND cr.name like concat(concat('%',#{createBy.name}),'%')
 				</if>
 			</if>
+			<if test="office!=null and office.name!=null and office.name!=''">
+				AND o.name like concat(concat('%',#{office.name}),'%')
+			</if>
             <if test="sqlMap.delFlag !=null and sqlMap.delFlag!=''">
 				${sqlMap.delFlag}
             </if>
@@ -349,8 +355,9 @@
 					#{officeId}
 				</foreach>
 			</if>
-
-
+			<if test="office!=null and office.name!=null and office.name!=''">
+				AND o.name like concat(concat('%',#{office.name}),'%')
+			</if>
 			<if test="reportData!=null and reportData.number !=null and reportData.number !=''">
 				and prd.number like concat('%',#{reportData.number},'%')
 			</if>
@@ -360,6 +367,9 @@
 			<if test="filingProjectStatus!=null and filingProjectStatus !=''">
 				and pfp.status =${filingProjectStatus}
 			</if>
+			<if test="submitMoney!=null and submitMoney !=''">
+				and a.submit_money =${submitMoney}
+			</if>
 			<if test="sqlMap.delFlag !=null and sqlMap.delFlag!=''">
 				${sqlMap.delFlag}
 			</if>

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

@@ -0,0 +1,106 @@
+<%@ tag language="java" pageEncoding="UTF-8"%>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<%@ attribute name="id" type="java.lang.String" required="true" description="编号"%>
+<%@ attribute name="name" type="java.lang.String" required="true" description="隐藏域名称（ID）"%>
+<%@ attribute name="value" type="java.lang.String" required="true" description="隐藏域值（ID）"%>
+<%@ attribute name="labelName" type="java.lang.String" required="true" description="输入框名称（Name）"%>
+<%@ attribute name="labelValue" type="java.lang.String" required="true" description="输入框值（Name）"%>
+<%@ attribute name="title" type="java.lang.String" required="true" description="选择框标题"%>
+<%@ attribute name="url" type="java.lang.String" required="true" description="树结构数据地址"%>
+<%@ attribute name="checked" type="java.lang.Boolean" required="false" description="是否显示复选框，如果不需要返回父节点，请设置notAllowSelectParent为true"%>
+<%@ attribute name="extId" type="java.lang.String" required="false" description="排除掉的编号（不能选择的编号）"%>
+<%@ attribute name="isAll" type="java.lang.Boolean" required="false" description="是否列出全部数据，设置true则不进行数据权限过滤（目前仅对Office有效）"%>
+<%@ attribute name="notAllowSelectRoot" type="java.lang.Boolean" required="false" description="不允许选择根节点"%>
+<%@ attribute name="notAllowSelectParent" type="java.lang.Boolean" required="false" description="不允许选择父节点"%>
+<%@ attribute name="module" type="java.lang.String" required="false" description="过滤栏目模型（只显示指定模型，仅针对CMS的Category树）"%>
+<%@ attribute name="selectScopeModule" type="java.lang.Boolean" required="false" description="选择范围内的模型（控制不能选择公共模型，不能选择本栏目外的模型）（仅针对CMS的Category树）"%>
+<%@ attribute name="allowClear" type="java.lang.Boolean" required="false" description="是否允许清除"%>
+<%@ attribute name="allowInput" type="java.lang.Boolean" required="false" description="文本框可填写"%>
+<%@ attribute name="cssClass" type="java.lang.String" required="false" description="css样式"%>
+<%@ attribute name="cssStyle" type="java.lang.String" required="false" description="css样式"%>
+<%@ attribute name="smallBtn" type="java.lang.Boolean" required="false" description="缩小按钮显示"%>
+<%@ attribute name="hideBtn" type="java.lang.Boolean" required="false" description="是否显示按钮"%>
+<%@ attribute name="disabled" type="java.lang.String" required="false" description="是否限制选择，如果限制，设置为disabled"%>
+<%@ attribute name="dataMsgRequired" type="java.lang.String" required="false" description=""%>
+<%@ attribute name="rule" type="java.lang.String" required="false" description="考勤规则模块用"%>
+	<input id="${id}Id" name="${name}" class="${cssClass}" type="hidden" value="${value}" />
+	<div class="input-group">
+		<input id="${id}Name" placeholder="请选择${title}" name="${labelName}"  type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
+		class="${cssClass}" style="${cssStyle}"/>
+       		 <span class="input-group-btn">
+	       		 <button type="button"  id="${id}Button" class="btn <c:if test="${fn:contains(cssClass, 'input-sm')}"> btn-sm </c:if><c:if test="${fn:contains(cssClass, 'input-lg')}"> btn-lg </c:if>  btn-primary ${disabled} ${hideBtn ? 'hide' : ''}"><i class="fa fa-search"></i>
+	             </button>
+       		 </span>
+
+    </div>
+	 <label id="${id}Name-error" class="error" for="${id}Name" style="display:none"></label>
+<script type="text/javascript">
+	$("#${id}Button").click(function(){
+		// 是否限制选择，如果限制，设置为disabled
+		if ($("#${id}Button").hasClass("disabled")){
+			return true;
+		}
+		// 正常打开
+		top.layer.open({
+		    type: 2,
+		    area: ['300px', '420px'],
+		    title:"选择${title}",
+		    ajaxData:{selectIds: $("#${id}Id").val()},
+		    content: "${ctx}/tag/treeselect?url="+encodeURIComponent("${url}")+"&module=${module}&checked=${checked}&extId=${extId}&isAll=${isAll}&unit=${unit}" ,
+		    btn: ['确定', '关闭']
+    	       ,yes: function(index, layero){ //或者使用btn1
+						var tree = layero.find("iframe")[0].contentWindow.tree;//h.find("iframe").contents();
+						var ids = [], names = [], nodes = [];
+						if ("${checked}" == "true"){
+							nodes = tree.getCheckedNodes(true);
+						}else{
+							nodes = tree.getSelectedNodes();
+						}
+						for(var i=0; i<nodes.length; i++) {//<c:if test="${checked && notAllowSelectParent}">
+							if (nodes[i].isParent){
+								continue; // 如果为复选框选择，则过滤掉父节点
+							}//</c:if><c:if test="${notAllowSelectRoot}">
+							if (nodes[i].level == 0){
+								//top.$.jBox.tip("不能选择根节点（"+nodes[i].name+"）请重新选择。");
+								// top.layer.msg("不能选择根节点（"+nodes[i].name+"）请重新选择。", {icon: 0});
+								// return false;
+							}//</c:if><c:if test="${notAllowSelectParent}">
+							if (nodes[i].isParent){
+								//top.$.jBox.tip("不能选择父节点（"+nodes[i].name+"）请重新选择。");
+								//layer.msg('有表情地提示');
+								// top.layer.msg("不能选择父节点（"+nodes[i].name+"）请重新选择。", {icon: 0});
+								// return false;
+							}//</c:if><c:if test="${not empty module && selectScopeModule}">
+							if (nodes[i].module == ""){
+								//top.$.jBox.tip("不能选择公共模型（"+nodes[i].name+"）请重新选择。");
+								// top.layer.msg("不能选择公共模型（"+nodes[i].name+"）请重新选择。", {icon: 0});
+								// return false;
+							}else if (nodes[i].module != "${module}"){
+								//top.$.jBox.tip("不能选择当前栏目以外的栏目模型，请重新选择。");
+								// top.layer.msg("不能选择当前栏目以外的栏目模型，请重新选择。", {icon: 0});
+								// return false;
+							}//</c:if>
+							ids.push(nodes[i].id);
+							names.push(nodes[i].name);//<c:if test="${!checked}">
+							break; // 如果为非复选框选择，则返回第一个选择  </c:if>
+						}
+						$("#${id}Id").val(ids.join(",").replace(/u_/ig,"")).change();
+						$("#${id}Name").val(names.join(",")).change();
+						$("#${id}Name").focus();
+						var rule="${rule}";
+						var id="${id}";
+						if(rule=='rule'){
+                            var _placeName =  id.split("_")[0]+"_placeName";
+                            var _itude =  id.split("_")[0]+"_itude";
+                            $("#"+_placeName).val("");
+                            $("#"+_itude).val("");
+						}
+						top.layer.close(index);
+				    	       },
+    	cancel: function(index){ //或者使用btn2
+    	           //按钮【按钮二】的回调
+    	       }
+		});
+
+	});
+</script>

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

@@ -262,7 +262,9 @@
 						<c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
 							<input type="radio" disabled name="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${projectRecords.submitMoney==v.value}">checked</c:if>>
 						</c:forEach>
-							<%--<form:select path="submitMoney" disabled="true" style="background-color: #f1f1f1"  class="form-control simple-select">
+						<p style="color: red;font-size: 12px;">200万以上部队或政府项目及500万以上其它项目为A级,其余为B级</p>
+
+					<%--<form:select path="submitMoney" disabled="true" style="background-color: #f1f1f1"  class="form-control simple-select">
                                 <form:option value=""/>
                                 <form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                             </form:select>--%>

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

@@ -294,6 +294,7 @@
 							<c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
 								<input type="radio" disabled name="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${projectRecords.submitMoney==v.value}">checked</c:if>>
 							</c:forEach>
+							<p style="color: red;font-size: 12px;">200万以上部队或政府项目及500万以上其它项目为A级,其余为B级</p>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6 lw6">

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

@@ -248,6 +248,7 @@
 						<c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
 							<input type="radio" disabled name="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${projectRecords.submitMoney==v.value}">checked</c:if>>
 						</c:forEach>
+						<p style="color: red;font-size: 12px;">200万以上部队或政府项目及500万以上其它项目为A级,其余为B级</p>
 							<%--<form:select path="submitMoney" disabled="true" style="background-color: #f1f1f1"  class="form-control simple-select">
                                 <form:option value=""/>
                                 <form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>

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

@@ -294,6 +294,7 @@
 						<c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
 							<input type="radio" disabled name="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${projectRecords.submitMoney==v.value}">checked</c:if>>
 						</c:forEach>
+						<p style="color: red;font-size: 12px;">200万以上部队或政府项目及500万以上其它项目为A级,其余为B级</p>
 							<%--<form:select path="submitMoney" disabled="true" style="background-color: #f1f1f1"  class="form-control simple-select">
                                 <form:option value=""/>
                                 <form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>

src/main/webapp/webpage/modules/projectcontentinfo/projectReportRecordAudit.jsp

@@ -206,6 +206,7 @@
 									<c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
 										<input type="radio" disabled name="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${projectRecords.submitMoney==v.value}">checked</c:if>>
 									</c:forEach>
+									<p style="color: red;font-size: 12px;">200万以上部队或政府项目及500万以上其它项目为A级,其余为B级</p>
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6 lw6">

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

@@ -569,9 +569,9 @@
 							</div>
 						</div>
 						<div class="layui-item query athird ">
-							<label class="layui-form-label">批量归档：</label>
+							<label class="layui-form-label">线下归档：</label>
 							<div class="layui-input-block">
-								<form:select path="filingProjectStatus" class=" form-control  simple-select">
+								<form:select path="downProjectReportRecordStatus" class=" form-control  simple-select">
 									<form:option value="" label=""/>
 									<form:option value="0" label="未归档"/>
 									<form:option value="2" label="归档中"/>

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

@@ -879,6 +879,7 @@
                         <c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
                             <input type="radio" name="submitMoney" id="submitMoney" value="${v.value}" lay-filter="submitMoney"  title="${v.label}" <c:if test="${ruralProjectRecords.submitMoney==v.value}">checked</c:if>>
                         </c:forEach>
+                        <p style="color: red;font-size: 12px;">200万以上部队或政府项目及500万以上其它项目为A级,其余为B级</p>
                     </div>
                 </div>
 <%--                <div class="layui-item layui-col-sm6 lw7" style="display: none">--%>

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

@@ -1025,6 +1025,7 @@
                         <c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
                             <input type="radio" name="submitMoney" lay-filter="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${ruralProjectRecords.submitMoney==v.value}">checked</c:if>>
                         </c:forEach>
+                        <p style="color: red;font-size: 12px;">200万以上部队或政府项目及500万以上其它项目为A级,其余为B级</p>
                     </div>
                 </div>
 

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

@@ -381,7 +381,7 @@
 						<div class="layui-item query athird">
 							<label class="layui-form-label">部门：</label>
 							<div class="layui-input-block with-icon">
-								<sys:treeselect id="officeId" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
+								<sys:treeselectMoHu id="officeId" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
 												title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
 							</div>
 						</div>
@@ -430,7 +430,18 @@
 								</form:select>
 							</div>
 						</div>
-
+						<div class="layui-item query athird ">
+							<label class="layui-form-label double-line">项目等级：</label>
+							<div class="layui-input-block">
+								<form:select path="submitMoney" class="form-control simple-select">
+									<form:option value="" label=""/>
+									<form:option value="2" label="A级"/>
+									<form:option value="1" label="B级"/>
+									<%--<form:option value="3" label="B级紧急"/>
+									<form:option value="1" label="B级非紧急"/>--%>
+								</form:select>
+							</div>
+						</div>
 
 
 						<div style="clear:both;"></div>
@@ -527,6 +538,9 @@
                         return "<span title=\"" + d.client + "\">" + d.client + "</span>";
                     }}
                 ,{field:'createDate',align:'center', title: '创建日期',  width:80}
+				,{field: 'submitMoneyStr', align:'center', title: '项目等级',width:100,templet: function(d){
+						return "<font style = 'font-size:14px;'>"+d.submitMoneyStr+"</font>";
+					}}
                 ,{align:'center', title: '状态',  width:70,templet:function(d){
                         var st = getruralProjectState(d.projectStatus);
                         if(st.action)
@@ -637,6 +651,23 @@
 					,"recordStatus":"0"
                     </c:otherwise>
                     </c:choose>
+					,"submitMoneyStr":
+							<c:choose>
+								<c:when test="${'2'==projectRecords.submitMoney}">
+								"A级"
+								</c:when>
+								<c:otherwise>
+								"B级"
+								<%--<c:choose>
+									<c:when test="${'1'==projectRecords.emergencyProject}">
+										"B级紧急"
+									</c:when>
+									<c:otherwise>
+										"B级非紧急"
+									</c:otherwise>
+								</c:choose>--%>
+								</c:otherwise>
+							</c:choose>
                     <shiro:hasPermission name="ruralProject:ruralCostProjectRecords:edit">,"canedit3":<c:choose><c:when test="${projectRecords.projectStatus == 5 && fn:contains(projectRecords.leaderIds,fns:getUser().id)}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
 					<shiro:hasPermission name="ruralProject:ruralCostProjectRecords:accessory">
 						,"recordStatus":

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

@@ -981,6 +981,7 @@
                         <c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
                             <input type="radio" name="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${ruralProjectRecords.submitMoney==v.value}">checked</c:if>>
                         </c:forEach>
+                        <p style="color: red;font-size: 12px;">200万以上部队或政府项目及500万以上其它项目为A级,其余为B级</p>
                         <%--<form:select path="submitMoney" class="form-control required simple-select">
                             <form:option value=""/>
                             <form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>

src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordAudit.jsp

@@ -279,6 +279,7 @@
 									<c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
 										<input type="radio" disabled name="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${projectRecords.submitMoney==v.value}">checked</c:if>>
 									</c:forEach>
+									<p style="color: red;font-size: 12px;">200万以上部队或政府项目及500万以上其它项目为A级,其余为B级</p>
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6 lw6">
@@ -323,16 +324,21 @@
 									<textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000"  style="background-color: #f1f1f1" class="form-control" >${projectRecords.remarks}</textarea>
 								</div>
 							</div>
-							<div class="form-group layui-row">
-								<div class="form-group-label"><h2>审批流程</h2></div>
-								<div class="layui-item layui-col-xs12 form-table-container" >
-									<act:flowChart procInsId="${projectReportRecord.act.procInsId}"/>
-									<act:histoicFlowRecordTwo procInsId="${projectReportRecord.act.procInsId}"  recordId="${projectReportRecord.id}"/>
+							<c:if test="${type != '1'}">
+								<div class="form-group layui-row">
+									<div class="form-group-label">
+										<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=referenceRemarks&name=备考表','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 备考表模板列表</a></div>
+										<h2>备考表</h2>
+									</div>
+									<div class="layui-item layui-col-sm11 with-textarea">
+										<label class="layui-form-label "><span class="require-item">*</span>备考表：</label>
+										<div class="layui-input-block">
+											<iframe id="referenceView" src="${ctx}/auditTemplate/auditTemplate/referenceView?identification=referenceRemarks" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
+											<form:hidden placeholder="请输入备考表内容" path="referenceRemarks" htmlEscape="false" rows="7"  maxlength="500"  class="form-control"/>
+										</div>
+									</div>
 								</div>
-							</div>
-
-
-
+							</c:if>
 				</div>
 				<div class="form-group layui-row first hide" id="subProjectInfo">
 					<table class="oa-table layui-table" id="contentTable1">
@@ -1086,6 +1092,52 @@
 						</div>
 
 					</c:if>
+
+					<c:if test="${type=='1' && projectRecords.submitMoney=='1'}">
+						<div style="overflow:hidden;">
+							<div class="form-group-label">
+								<h2>质量复核内容</h2>
+							</div>
+							<div>
+								<div class="layui-item layui-col-xs12" >
+									<table id="treeTable2" class="table table-bordered table-condensed reviews no-bottom-margin">
+										<thead>
+										<tr>
+											<th width="40%">符合内容及评分标准</th>
+											<th width="10%">自校</th>
+											<th >意见</th>
+										</tr>
+										</thead>
+										<tbody id="projectReviewList">
+										<c:forEach items="${list}" var="workReviewAudit" varStatus="index">
+											<tr id="${workReviewAudit.id}" pid="${workReviewAudit.parent.id}">
+												<td class="hide">
+													<input id="projectReviewList${index.index}_standardId" name="projectReviewList[${index.index}].standardId" type="hidden" value="${workReviewAudit.id}"/>
+												</td>
+												<td title="${workReviewAudit.standardDetail}">
+														${workReviewAudit.standardDetail}
+												</td>
+												<td>
+													<i class="fa fa-check"></i>
+												</td>
+												<td class="input-td">
+													<input id="deductOpinion" name="projectReviewList[${index.index}].deductOption" placeholder="请输入意见" readonly="true" style="background-color: #FFFFFF;" value="" onclick="openDeductInfo(this.value,'${workReviewAudit.id}',this)" class="form-control layui-input"/>
+												</td>
+											</tr>
+										</c:forEach>
+										</tbody>
+									</table>
+								</div>
+							</div>
+						</div>
+					</c:if>
+					<div>
+						<div class="form-group-label">
+							<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=${identification}&name=${identificationName}','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 审核意见模板列表</a></div>
+							<h2>审批意见</h2>
+						</div>
+						<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
+					</div>
 				</div>
 				<div class="form-group layui-row first hide" id="issueView">
 					<c:if test="${projectRecords.submitMoney=='1'}">
@@ -1722,67 +1774,14 @@
 				</div>
 			</div>
 
-			<c:if test="${type != '1'}">
-				<div class="form-group layui-row">
-					<div class="form-group-label">
-						<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=referenceRemarks&name=备考表','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 备考表模板列表</a></div>
-						<h2>备考表</h2>
-					</div>
-					<div class="layui-item layui-col-sm11 with-textarea">
-						<label class="layui-form-label "><span class="require-item">*</span>备考表：</label>
-						<div class="layui-input-block">
-							<iframe id="referenceView" src="${ctx}/auditTemplate/auditTemplate/referenceView?identification=referenceRemarks" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
-							<form:hidden placeholder="请输入备考表内容" path="referenceRemarks" htmlEscape="false" rows="7"  maxlength="500"  class="form-control"/>
-						</div>
-					</div>
-				</div>
-			</c:if>
-			<c:if test="${type=='1' && projectRecords.submitMoney=='1'}">
-				<div style="overflow:hidden;">
-					<div class="form-group-label">
-						<h2>质量复核内容</h2>
-					</div>
-					<div>
-						<div class="layui-item layui-col-xs12" >
-							<table id="treeTable2" class="table table-bordered table-condensed reviews no-bottom-margin">
-								<thead>
-								<tr>
-									<th width="40%">符合内容及评分标准</th>
-									<th width="10%">自校</th>
-									<th >意见</th>
-								</tr>
-								</thead>
-								<tbody id="projectReviewList">
-								<c:forEach items="${list}" var="workReviewAudit" varStatus="index">
-									<tr id="${workReviewAudit.id}" pid="${workReviewAudit.parent.id}">
-										<td class="hide">
-											<input id="projectReviewList${index.index}_standardId" name="projectReviewList[${index.index}].standardId" type="hidden" value="${workReviewAudit.id}"/>
-										</td>
-										<td title="${workReviewAudit.standardDetail}">
-												${workReviewAudit.standardDetail}
-										</td>
-										<td>
-											<i class="fa fa-check"></i>
-										</td>
-										<td class="input-td">
-											<input id="deductOpinion" name="projectReviewList[${index.index}].deductOption" placeholder="请输入意见" readonly="true" style="background-color: #FFFFFF;" value="" onclick="openDeductInfo(this.value,'${workReviewAudit.id}',this)" class="form-control layui-input"/>
-										</td>
-									</tr>
-								</c:forEach>
-								</tbody>
-							</table>
-						</div>
-					</div>
-				</div>
-			</c:if>
 			<div class="form-group layui-row page-end"></div>
 		</form:form>
-		<div>
-		<div class="form-group-label">
-			<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=${identification}&name=${identificationName}','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 审核意见模板列表</a></div>
-			<h2>审批意见</h2>
-		</div>
-		<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
+		<div class="form-group layui-row">
+			<div class="form-group-label"><h2>审批流程</h2></div>
+			<div class="layui-item layui-col-xs12 form-table-container" >
+				<act:flowChart procInsId="${projectReportRecord.act.procInsId}"/>
+				<act:histoicFlowRecordTwo procInsId="${projectReportRecord.act.procInsId}"  recordId="${projectReportRecord.id}"/>
+			</div>
 		</div>
 		</div>
 </div>

src/main/webapp/webpage/modules/ruralprojectrecords/record/projectReportRecordAudit.jsp

@@ -226,6 +226,7 @@
 									<c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
 										<input type="radio" disabled name="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${projectRecords.submitMoney==v.value}">checked</c:if>>
 									</c:forEach>
+									<p style="color: red;font-size: 12px;">200万以上部队或政府项目及500万以上其它项目为A级,其余为B级</p>
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6 lw6">

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

@@ -323,6 +323,7 @@
 						<c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
 							<input type="radio" name="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${projectRecords.submitMoney==v.value}">checked</c:if>>
 						</c:forEach>
+						<p style="color: red;font-size: 12px;">200万以上部队或政府项目及500万以上其它项目为A级,其余为B级</p>
 <%--						<form:select path="submitMoney" disabled="true" class="form-control required simple-select">--%>
 <%--							<form:option value=""/>--%>
 <%--							<form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>

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

@@ -1043,6 +1043,7 @@
                         <c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
                             <input type="radio" name="submitMoney" id="submitMoney" lay-filter="submitMoney"  value="${v.value}" title="${v.label}" <c:if test="${ruralProjectRecords.submitMoney==v.value}">checked</c:if>>
                         </c:forEach>
+                        <p style="color: red;font-size: 12px;">200万以上部队或政府项目及500万以上其它项目为A级,其余为B级</p>
 <%--                        <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"/>--%>

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

@@ -354,7 +354,7 @@
 						<div class="layui-item query athird">
 							<label class="layui-form-label">部门:</label>
 							<div class="layui-input-block with-icon">
-								<sys:treeselect id="officeId" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
+								<sys:treeselectMoHu id="officeId" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
 												title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
 							</div>
 						</div>
@@ -403,6 +403,19 @@
 								</form:select>
 							</div>
 						</div>
+						<div class="layui-item query athird ">
+							<label class="layui-form-label double-line">项目等级：</label>
+							<div class="layui-input-block">
+								<form:select path="submitMoney" class="form-control simple-select">
+									<form:option value="" label=""/>
+									<form:option value="2" label="A级"/>
+									<form:option value="1" label="B级"/>
+									<%--<form:option value="3" label="B级紧急"/>
+									<form:option value="1" label="B级非紧急"/>--%>
+								</form:select>
+							</div>
+						</div>
+
 						<div style="clear:both;"></div>
 					</div>
 				</form:form>
@@ -493,6 +506,9 @@
                         return "<span title=\"" + d.client + "\">" + d.client + "</span>";
                     }}
                 ,{field:'createDate',align:'center', title: '创建日期',  width:80}
+				,{field: 'submitMoneyStr', align:'center', title: '项目等级',width:100,templet: function(d){
+						return "<font style = 'font-size:14px;'>"+d.submitMoneyStr+"</font>";
+					}}
                 ,{align:'center', title: '状态',  width:70,templet:function(d){
                         <%--var st = getAuditState(d.projectStatus)--%>
                         <%--var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/project/projectRecords/getProcess?id=" + d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
@@ -607,6 +623,23 @@
                     ,"recordStatus":"0"
                     </c:otherwise>
                     </c:choose>
+					,"submitMoneyStr":
+							<c:choose>
+							<c:when test="${'2'==projectRecords.submitMoney}">
+							"A级"
+					</c:when>
+					<c:otherwise>
+					"B级"
+					<%--<c:choose>
+                        <c:when test="${'1'==projectRecords.emergencyProject}">
+                            "B级紧急"
+                        </c:when>
+                        <c:otherwise>
+                            "B级非紧急"
+                        </c:otherwise>
+                    </c:choose>--%>
+					</c:otherwise>
+					</c:choose>
                     <shiro:hasPermission name="ruralProject:ruralProjectRecords:edit">,"canedit3":<c:choose><c:when test="${projectRecords.projectStatus == 5 && fn:contains(projectRecords.leaderIds,fns:getUser().id)}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
 					<shiro:hasPermission name="ruralProject:ruralProjectRecords:accessory">
 					,"recordStatus":

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

@@ -974,6 +974,7 @@
                         <c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
                             <input type="radio" name="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${projectRecords.submitMoney==v.value}">checked</c:if>>
                         </c:forEach>
+                        <p style="color: red;font-size: 12px;">200万以上部队或政府项目及500万以上其它项目为A级,其余为B级</p>
 <%--                        <form:select path="submitMoney" class="form-control required simple-select">--%>
 <%--                            <form:option value=""/>--%>
 <%--                            <form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>

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

@@ -266,6 +266,7 @@
 <%--							<form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
 <%--						</form:select>--%>
 						<input class=" form-control layui-input " readonly="true" id="submitMoney" name="submitMoney" style="background-color: #f1f1f1" value="${projectRecords.submitMoney}"/>
+						<p style="color: red;font-size: 12px;">200万以上部队或政府项目及500万以上其它项目为A级,其余为B级</p>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllList.jsp

@@ -659,9 +659,9 @@
 							</div>
 						</div>
 						<div class="layui-item query athird ">
-							<label class="layui-form-label">批量归档：</label>
+							<label class="layui-form-label">线下归档：</label>
 							<div class="layui-input-block">
-								<form:select path="filingProjectStatus" class=" form-control  simple-select">
+								<form:select path="downProjectReportRecordStatus" class=" form-control  simple-select">
 									<form:option value="" label=""/>
 									<form:option value="0" label="未归档"/>
 									<form:option value="2" label="归档中"/>

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

@@ -362,6 +362,7 @@
 								<c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
 									<input type="radio" disabled name="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${projectRecords.submitMoney==v.value}">checked</c:if>>
 								</c:forEach>
+								<p style="color: red;font-size: 12px;">200万以上部队或政府项目及500万以上其它项目为A级,其余为B级</p>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6 lw6">
@@ -1124,6 +1125,136 @@
 							</div>
 						</div>
 					</div>
+					<div class="form-group layui-row">
+						<div class="form-group-label"><h2><span class="require-item">*</span>项目组成员(质量控制流程)</h2></div>
+						<div class="layui-item layui-col-sm12 lw6">
+							<div class="layui-item nav-btns">
+								<table id="bankinfo1" class="table table-bordered table-condensed can-edit">
+									<thead>
+									<tr>
+										<th width="60px">编号</th>
+										<th ><span class="require-item">*</span>成员名称</th>
+										<th >角色</th>
+										<th >注册/资格证号</th>
+										<th >专业</th>
+										<th >本人负责内容</th>
+										<th ><span class="require-item">*</span>审核意见</th>
+											<%--								<th width="100px">操作</th>--%>
+									</tr>
+									</thead>
+									<tbody id="reportedConsultantList">
+									<c:forEach items="${consultantinfo}" var = "info" varStatus="status">
+										<tr>
+											<td width="60px">
+												<input id="reportedConsultantList${status.index+1}_costNum" name="reportedConsultantList[${status.index+1}].costNum" readonly="readonly" style="text-align: center"  value="${status.index+1}" type="text" class="form-control contentDetail"/>
+											</td>
+											<td>
+												<input id="reportedConsultantList${status.index+1}_zixunyuanName" readonly="true" name="reportedConsultantList[${status.index+1}].zixunyuanName" value="${info.zixunyuanName}" class="form-control judgment"/>
+
+													<%--										<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"/>--%>
+											</td>
+
+											<td>
+												<input id="reportedConsultantList${status.index+1}_role" readonly="true" name="reportedConsultantList[${status.index+1}].role" value="${info.role}" class="form-control"/>
+											</td>
+											<td>
+												<input id="reportedConsultantList${status.index+1}_zhucezigezhID" readonly="true" name="reportedConsultantList[${status.index+1}].zhucezigezhID" value="${info.zhucezigezhID}" class="form-control"/>
+											</td>
+											<td>
+												<input id="reportedConsultantList${status.index+1}_major" readonly="true"  name="reportedConsultantList[${status.index+1}].major" value="${info.major}" class="form-control"/>
+											</td>
+											<td>
+												<input id="reportedConsultantList${status.index+1}_wordnr" readonly="true" placeholder="请输入本人负责内容" name="reportedConsultantList[${status.index+1}].wordnr" value="${info.wordnr}" class="form-control"/>
+											</td>
+											<td>
+												<c:choose>
+													<c:when test="${consultantCount == status.index+1}">
+														<input id="reportedConsultantList${status.index+1}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" onclick="openInfo('reportedConsultantList${status.index+1}',this.value)" class="form-control judgment"/>
+													</c:when>
+													<c:otherwise>
+														<input id="reportedConsultantList${status.index+1}_auditOpinion" title="${info.auditOpinion}"  placeholder="请输入审核意见" readonly="true" name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" onclick="readOpenInfo(this.value)" class="form-control judgment"/>
+													</c:otherwise>
+												</c:choose>
+
+											</td>
+
+												<%--									<td class="text-center op-td" width="10">--%>
+												<%--										<span class="op-btn op-btn-delete" onclick="delRow(this, '#reportedConsultantList${status.index+1}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>--%>
+												<%--									</td>--%>
+											<td class="hide">
+												<input id="reportedConsultantList${status.index+1}_id" name="reportedConsultantList[${status.index+1}].id" type="hidden" value="${info.id}"/>
+												<input id="reportedConsultantList${status.index+1}_delFlag" name="reportedConsultantList[${status.index+1}].delFlag" type="hidden" value="0"/>
+												<input id="reportedConsultantList${status.index+1}_zhucezigezhKey" name="reportedConsultantList[${status.index+1}].zhucezigezhKey" type="hidden" value="${info.zhucezigezhKey}"/>
+												<input id="reportedConsultantList${status.index+1}_zixunyuan" name="reportedConsultantList[${status.index+1}].zixunyuan" type="hidden" value="${info.zixunyuan}"/>
+											</td>
+										</tr>
+									</c:forEach>
+									</tbody>
+								</table>
+							</div>
+						</div>
+					</div>
+					<div>
+						<div class="form-group-label">
+							<h2>质量复核内容</h2>
+						</div>
+						<div>
+							<div class="layui-item layui-col-xs12" >
+								<table id="treeTable2" class="table table-bordered table-condensed reviews no-bottom-margin">
+									<thead>
+									<tr>
+											<%--<th width="25%">序号</th>--%>
+										<th width="40%">符合内容及评分标准</th>
+										<th width="10%">自校</th>
+											<%--												<th width="10%">最高分</th>--%>
+											<%--												<th width="10%">扣分</th>--%>
+										<th >意见</th>
+
+											<%--<th width="15%">操作</th>--%>
+									</tr>
+									</thead>
+									<tbody id="projectReviewList">
+									<c:forEach items="${list}" var="workReviewAudit" varStatus="index">
+										<tr id="${workReviewAudit.id}" pid="${workReviewAudit.parent.id}">
+											<td class="hide">
+												<input id="projectReviewList${index.index}_standardId" name="projectReviewList[${index.index}].standardId" type="hidden" value="${workReviewAudit.id}"/>
+											</td>
+											<td title="${workReviewAudit.standardDetail}">
+													${workReviewAudit.standardDetail}
+											</td>
+											<td>
+												<i class="fa fa-check"></i>
+											</td>
+												<%--													<td class="input-td">--%>
+												<%--														<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" name="projectReviewList[${index.index}].deduct"  class="form-control layui-input number" onChange="if(this.value)reportMaxDeduct(this.value,'${workReviewAudit.id}','${workReviewAudit.parent.id}',this)" placeholder="请输入"/>--%>
+												<%--													</td>--%>
+											<td class="input-td">
+												<input id="deductOpinion" name="projectReviewList[${index.index}].deductOption" placeholder="请输入意见" readonly="true" style="background-color: #FFFFFF;" 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 id="maxTotal"></td>--%>
+										<%--												<td>(扣)&nbsp;<span id="total" style="color: red"></span></td>--%>
+										<%--												<td>(得)&nbsp;<span id="deTotal" style="color: red"></span></td>--%>
+										<%--											</tr>--%>
+									</tbody>
+								</table>
+							</div>
+						</div>
+					</div>
+					<div class="form-group layui-row">
+						<div class="form-group-label">
+							<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre1('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=${identification}&name=${identificationName}','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 审核意见模板列表</a></div>
+							<h2>审批意见</h2>
+						</div>
+						<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
+					</div>
 				</div>
 				<div class="form-group layui-row first hide" id="issueView">
 					<div class="topMar">
@@ -1601,146 +1732,16 @@
 				</div>
 				<div>
 					<div class="form-group layui-row">
-						<div class="form-group-label"><h2><span class="require-item">*</span>项目组成员(质量控制流程)</h2></div>
-						<div class="layui-item layui-col-sm12 lw6">
-							<div class="layui-item nav-btns">
-								<table id="bankinfo1" class="table table-bordered table-condensed can-edit">
-									<thead>
-									<tr>
-										<th width="60px">编号</th>
-										<th ><span class="require-item">*</span>成员名称</th>
-										<th >角色</th>
-										<th >注册/资格证号</th>
-										<th >专业</th>
-										<th >本人负责内容</th>
-										<th ><span class="require-item">*</span>审核意见</th>
-											<%--								<th width="100px">操作</th>--%>
-									</tr>
-									</thead>
-									<tbody id="reportedConsultantList">
-									<c:forEach items="${consultantinfo}" var = "info" varStatus="status">
-										<tr>
-											<td width="60px">
-												<input id="reportedConsultantList${status.index+1}_costNum" name="reportedConsultantList[${status.index+1}].costNum" readonly="readonly" style="text-align: center"  value="${status.index+1}" type="text" class="form-control contentDetail"/>
-											</td>
-											<td>
-												<input id="reportedConsultantList${status.index+1}_zixunyuanName" readonly="true" name="reportedConsultantList[${status.index+1}].zixunyuanName" value="${info.zixunyuanName}" class="form-control judgment"/>
-
-													<%--										<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"/>--%>
-											</td>
-
-											<td>
-												<input id="reportedConsultantList${status.index+1}_role" readonly="true" name="reportedConsultantList[${status.index+1}].role" value="${info.role}" class="form-control"/>
-											</td>
-											<td>
-												<input id="reportedConsultantList${status.index+1}_zhucezigezhID" readonly="true" name="reportedConsultantList[${status.index+1}].zhucezigezhID" value="${info.zhucezigezhID}" class="form-control"/>
-											</td>
-											<td>
-												<input id="reportedConsultantList${status.index+1}_major" readonly="true"  name="reportedConsultantList[${status.index+1}].major" value="${info.major}" class="form-control"/>
-											</td>
-											<td>
-												<input id="reportedConsultantList${status.index+1}_wordnr" readonly="true" placeholder="请输入本人负责内容" name="reportedConsultantList[${status.index+1}].wordnr" value="${info.wordnr}" class="form-control"/>
-											</td>
-											<td>
-												<c:choose>
-													<c:when test="${consultantCount == status.index+1}">
-														<input id="reportedConsultantList${status.index+1}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" onclick="openInfo('reportedConsultantList${status.index+1}',this.value)" class="form-control judgment"/>
-													</c:when>
-													<c:otherwise>
-														<input id="reportedConsultantList${status.index+1}_auditOpinion" title="${info.auditOpinion}"  placeholder="请输入审核意见" readonly="true" name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" onclick="readOpenInfo(this.value)" class="form-control judgment"/>
-													</c:otherwise>
-												</c:choose>
-
-											</td>
-
-												<%--									<td class="text-center op-td" width="10">--%>
-												<%--										<span class="op-btn op-btn-delete" onclick="delRow(this, '#reportedConsultantList${status.index+1}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>--%>
-												<%--									</td>--%>
-											<td class="hide">
-												<input id="reportedConsultantList${status.index+1}_id" name="reportedConsultantList[${status.index+1}].id" type="hidden" value="${info.id}"/>
-												<input id="reportedConsultantList${status.index+1}_delFlag" name="reportedConsultantList[${status.index+1}].delFlag" type="hidden" value="0"/>
-												<input id="reportedConsultantList${status.index+1}_zhucezigezhKey" name="reportedConsultantList[${status.index+1}].zhucezigezhKey" type="hidden" value="${info.zhucezigezhKey}"/>
-												<input id="reportedConsultantList${status.index+1}_zixunyuan" name="reportedConsultantList[${status.index+1}].zixunyuan" type="hidden" value="${info.zixunyuan}"/>
-											</td>
-										</tr>
-									</c:forEach>
-									</tbody>
-								</table>
-							</div>
-						</div>
-					</div>
-					<div class="form-group layui-row">
 						<div class="form-group-label"><h2>审批流程</h2></div>
 						<div class="layui-item layui-col-xs12 form-table-container" >
 							<act:flowChart procInsId="${processInstanceId}"/>
 							<act:histoicFlow procInsId="${processInstanceId}"/>
 						</div>
 					</div>
-					<div>
-						<div class="form-group-label">
-							<h2>质量复核内容</h2>
-						</div>
-						<div>
-							<div class="layui-item layui-col-xs12" >
-								<table id="treeTable2" class="table table-bordered table-condensed reviews no-bottom-margin">
-									<thead>
-									<tr>
-											<%--<th width="25%">序号</th>--%>
-										<th width="40%">符合内容及评分标准</th>
-										<th width="10%">自校</th>
-											<%--												<th width="10%">最高分</th>--%>
-											<%--												<th width="10%">扣分</th>--%>
-										<th >意见</th>
-
-											<%--<th width="15%">操作</th>--%>
-									</tr>
-									</thead>
-									<tbody id="projectReviewList">
-									<c:forEach items="${list}" var="workReviewAudit" varStatus="index">
-										<tr id="${workReviewAudit.id}" pid="${workReviewAudit.parent.id}">
-											<td class="hide">
-												<input id="projectReviewList${index.index}_standardId" name="projectReviewList[${index.index}].standardId" type="hidden" value="${workReviewAudit.id}"/>
-											</td>
-											<td title="${workReviewAudit.standardDetail}">
-													${workReviewAudit.standardDetail}
-											</td>
-											<td>
-												<i class="fa fa-check"></i>
-											</td>
-												<%--													<td class="input-td">--%>
-												<%--														<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" name="projectReviewList[${index.index}].deduct"  class="form-control layui-input number" onChange="if(this.value)reportMaxDeduct(this.value,'${workReviewAudit.id}','${workReviewAudit.parent.id}',this)" placeholder="请输入"/>--%>
-												<%--													</td>--%>
-											<td class="input-td">
-												<input id="deductOpinion" name="projectReviewList[${index.index}].deductOption" placeholder="请输入意见" readonly="true" style="background-color: #FFFFFF;" 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 id="maxTotal"></td>--%>
-										<%--												<td>(扣)&nbsp;<span id="total" style="color: red"></span></td>--%>
-										<%--												<td>(得)&nbsp;<span id="deTotal" style="color: red"></span></td>--%>
-										<%--											</tr>--%>
-									</tbody>
-								</table>
-							</div>
-						</div>
-					</div>
 				</div>
 			</div>
 
 		</form:form>
-		<div class="form-group layui-row">
-			<div class="form-group-label">
-				<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre1('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=${identification}&name=${identificationName}','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 审核意见模板列表</a></div>
-				<h2>审批意见</h2>
-			</div>
-			<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
-		</div>
 
 	</div>
 </div>

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

@@ -341,6 +341,7 @@
 								<c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
 									<input type="radio" disabled name="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${projectRecords.submitMoney==v.value}">checked</c:if>>
 								</c:forEach>
+								<p style="color: red;font-size: 12px;">200万以上部队或政府项目及500万以上其它项目为A级,其余为B级</p>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6 lw6">
@@ -1070,49 +1071,50 @@
 							</div>
 						</div>
 					</div>
-					<div style="overflow: hidden">
-						<div class="form-group-label">
-							<h2>质量复核内容</h2>
-						</div>
-						<div>
-							<div class="layui-item layui-col-xs12" >
-								<table id="treeTable2" class="table table-bordered table-condensed details no-bottom-margin">
-									<thead>
-									<tr>
-										<th width="40%">符合内容及评分标准</th>
-										<th width="10%">自校</th>
-										<th >意见</th>
-									</tr>
-									</thead>
-									<tbody>
-									<c:forEach items="${datalist}" var="workReviewAudit" varStatus="index">
-										<tr id="${workReviewAudit.id}" pid="${workReviewAudit.parent.id}">
-												<%--<td title="${workReviewAudit.orderNum}">--%>
-												<%--${workReviewAudit.orderNum}--%>
-												<%--</td>--%>
-											<td title="${workReviewAudit.standardDetail}">
-													${workReviewAudit.standardDetail}
-											</td>
-											<td>
-												<i class="fa fa-check"></i>
-											</td>
-												<%--									<td class="input-td">--%>
-												<%--										<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;background-color: #fff" title="${workReviewAudit.deductOption}" readonly="true" name="deductOpinion" value="${workReviewAudit.deductOption}" onclick="readOpenInfo(this.value)" class="form-control layui-input"/>
-											</td>
+					<c:if test="${projectRecords.submitMoney=='2' || (projectRecords.submitMoney=='1' && (0==projectRecords.emergencyProject || null==projectRecords.emergencyProject))}">
+						<div style="overflow: hidden">
+							<div class="form-group-label">
+								<h2>质量复核内容</h2>
+							</div>
+							<div>
+								<div class="layui-item layui-col-xs12" >
+									<table id="treeTable2" class="table table-bordered table-condensed details no-bottom-margin">
+										<thead>
+										<tr>
+											<th width="40%">符合内容及评分标准</th>
+											<th width="10%">自校</th>
+											<th >意见</th>
 										</tr>
-									</c:forEach>
-									</tbody>
-								</table>
+										</thead>
+										<tbody>
+										<c:forEach items="${datalist}" var="workReviewAudit" varStatus="index">
+											<tr id="${workReviewAudit.id}" pid="${workReviewAudit.parent.id}">
+													<%--<td title="${workReviewAudit.orderNum}">--%>
+													<%--${workReviewAudit.orderNum}--%>
+													<%--</td>--%>
+												<td title="${workReviewAudit.standardDetail}">
+														${workReviewAudit.standardDetail}
+												</td>
+												<td>
+													<i class="fa fa-check"></i>
+												</td>
+													<%--									<td class="input-td">--%>
+													<%--										<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;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>
+										</tbody>
+									</table>
+								</div>
 							</div>
 						</div>
-					</div>
-
+					</c:if>
 				</div>
 				<div class="form-group layui-row first hide" id="issueView">
 					<div class="form-group layui-row first lw12">
@@ -1223,6 +1225,68 @@
 							</div>
 						</div>
 					</div>
+					<div>
+						<div>
+							<div class="form-group-label">
+								<h2>报告签发复核内容</h2>
+							</div>
+							<div style="overflow:hidden;">
+								<div class="layui-item layui-col-xs12" >
+									<table id="" class="table table-bordered table-condensed reviews no-bottom-margin">
+										<thead>
+										<tr>
+												<%--<th width="25%">序号</th>--%>
+											<th width="40%">符合内容及评分标准</th>
+											<th width="10%">自校</th>
+												<%--												<th width="10%">最高分</th>--%>
+												<%--												<th width="10%">扣分</th>--%>
+											<th >意见</th>
+												<%--<th width="15%">操作</th>--%>
+										</tr>
+										</thead>
+										<tbody>
+										<c:forEach items="${list}" var="workReviewAudit" varStatus="index">
+											<tr id="${workReviewAudit.id}" pid="${workReviewAudit.parent.id}">
+												<td class="hide">
+														<%--														<input id="projectReviewList${index.index}_id" name="projectReviewList[${index.index}].id" type="hidden" value="${workReviewAudit.id}"/>--%>
+													<input id="projectReviewList${index.index}_standardId" name="projectReviewList[${index.index}].standardId" type="hidden" value="${workReviewAudit.id}"/>
+												</td>
+												<td title="${workReviewAudit.standardDetail}">
+														${workReviewAudit.standardDetail}
+												</td>
+												<td>
+													<i class="fa fa-check"></i>
+												</td>
+													<%--													<td class="input-td">--%>
+													<%--														<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" name="projectReviewList[${index.index}].deduct"  class="form-control layui-input number" onChange="if(this.value)reportMaxDeduct(this.value,'${workReviewAudit.id}','${workReviewAudit.parent.id}',this)" placeholder="请输入"/>--%>
+													<%--													</td>--%>
+												<td class="input-td">
+													<input id="deductOpinion" name="projectReviewList[${index.index}].deductOption" placeholder="请输入意见" readonly="true" style="background-color: #FFFFFF;" 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 id="maxTotal"></td>--%>
+											<%--												<td>(扣)&nbsp;<span id="total" style="color: red"></span></td>--%>
+											<%--												<td>(得)&nbsp;<span id="deTotal" style="color: red"></span></td>--%>
+											<%--											</tr>--%>
+										</tbody>
+									</table>
+								</div>
+							</div>
+						</div>
+					</div>
+					<div>
+						<div class="form-group-label">
+							<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre1('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=${identification}&name=${identificationName}','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 审核意见模板列表</a></div>
+							<h2>审批意见</h2>
+						</div>
+						<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
+					</div>
 				</div>
 				<div class="form-group layui-row first hide" id="AccessoryView">
 					<div class="form-group layui-row">
@@ -1637,165 +1701,15 @@
 				</div>
 
 			</div>
-			<div>
-				<div>
-					<div class="form-group-label">
-						<h2>报告签发复核内容</h2>
-					</div>
-					<div>
-						<div class="layui-item layui-col-xs12" >
-							<table id="" class="table table-bordered table-condensed reviews no-bottom-margin">
-								<thead>
-								<tr>
-										<%--<th width="25%">序号</th>--%>
-									<th width="40%">符合内容及评分标准</th>
-									<th width="10%">自校</th>
-										<%--												<th width="10%">最高分</th>--%>
-										<%--												<th width="10%">扣分</th>--%>
-									<th >意见</th>
-										<%--<th width="15%">操作</th>--%>
-								</tr>
-								</thead>
-								<tbody>
-								<c:forEach items="${list}" var="workReviewAudit" varStatus="index">
-									<tr id="${workReviewAudit.id}" pid="${workReviewAudit.parent.id}">
-										<td class="hide">
-												<%--														<input id="projectReviewList${index.index}_id" name="projectReviewList[${index.index}].id" type="hidden" value="${workReviewAudit.id}"/>--%>
-											<input id="projectReviewList${index.index}_standardId" name="projectReviewList[${index.index}].standardId" type="hidden" value="${workReviewAudit.id}"/>
-										</td>
-										<td title="${workReviewAudit.standardDetail}">
-												${workReviewAudit.standardDetail}
-										</td>
-										<td>
-											<i class="fa fa-check"></i>
-										</td>
-											<%--													<td class="input-td">--%>
-											<%--														<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" name="projectReviewList[${index.index}].deduct"  class="form-control layui-input number" onChange="if(this.value)reportMaxDeduct(this.value,'${workReviewAudit.id}','${workReviewAudit.parent.id}',this)" placeholder="请输入"/>--%>
-											<%--													</td>--%>
-										<td class="input-td">
-											<input id="deductOpinion" name="projectReviewList[${index.index}].deductOption" placeholder="请输入意见" readonly="true" style="background-color: #FFFFFF;" 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 id="maxTotal"></td>--%>
-									<%--												<td>(扣)&nbsp;<span id="total" style="color: red"></span></td>--%>
-									<%--												<td>(得)&nbsp;<span id="deTotal" style="color: red"></span></td>--%>
-									<%--											</tr>--%>
-								</tbody>
-							</table>
-						</div>
-					</div>
-				</div>
-				<div class="form-group layui-row">
-					<div class="form-group-label"><h2>审批流程</h2></div>
-					<div class="layui-item layui-col-xs12 form-table-container" >
-						<act:flowChart procInsId="${processInstanceId}"/>
-						<act:histoicFlow procInsId="${processInstanceId}"/>
-					</div>
-				</div>
-			</div>
-			<%--<div class="form-group layui-row first lw12">
-				<div class="form-group-label"><h2>咨询质量控制信息</h2></div>
-
-				<c:if test="${type ==3 || type ==4}">
-					<div class="layui-item layui-col-sm6 lw7">
-						<label class="layui-form-label">专业咨询员：</label>
-						<div class="layui-input-block  with-icon">
-							<input id="projectReportDataConsultantName" class="form-control layui-input" readonly="readonly" value="${projectReportDataTwo.consultant.name}">
-						</div>
-					</div>
-					<div class="layui-item layui-col-sm12 lw7 with-textarea">
-						<label class="layui-form-label double-line">专业咨询员审核意见：</label>
-						<div class="layui-input-block">
-							<form:textarea path="projectReportDataTwo.consultantRemarks" readonly="true" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
-						</div>
-					</div>
-					<div class="layui-item layui-col-sm6 lw7">
-						<label class="layui-form-label">项目负责人：</label>
-						<div class="layui-input-block">
-							<input id="projectReportDataPrincipalName" class="form-control layui-input" readonly="readonly" value="${projectReportDataTwo.principal.name}">
-						</div>
-					</div>
-					<div class="layui-item layui-col-sm12 lw7 with-textarea">
-						<label class="layui-form-label double-line">项目负责人审核意见：</label>
-						<div class="layui-input-block">
-							<form:textarea path="projectReportDataTwo.principalRemarks" readonly="true" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
-						</div>
-					</div>
-				</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>
-						<div class="layui-input-block  with-icon">
-							<sys:treeselect id="consultant" name="projectReportDataTwo.technicist.id" value="${projectReportDataTwo.technicist.id}" labelName="projectReportDataTwo.technicist.name" labelValue="${projectReportDataTwo.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>
-						<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="projectReportDataTwo.technicistRemarks" id="technicistRemarks" class="form-control" 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>
-							</div>
-							<div class="layui-item layui-col-sm4 lw6 with-textarea">
-								<div class="layui-input-block" style="margin-left:10px;">
-									<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinions" name="shs" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>
-									<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinions" name="shs" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>
-									<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinions" name="shs" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>
-									<div style="padding: 5px 0px;">
-										<form:select path="projectReportDataTwo.technicistRemarks" id="auditOpinion" lay-filter="zixunOpinion" lay-verify="zixunOpinion" class="form-control simple-select">
-											<form:option value=""/>
-											<form:options items="${fns:getMainDictListOnProjectAdvent('consultant_comments')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
-										</form:select>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
-				</c:if>
-			</div>--%>
-
-
-<%--			<div class="form-group layui-row">--%>
-<%--				<div class="form-group-label"><h2>审批意见</h2></div>--%>
-<%--				<div class="layui-item layui-col-sm8 lw6 with-textarea">--%>
-<%--					<div class="layui-input-block" style="margin-left:10px;position: relative">--%>
-<%--						<form:textarea placeholder="请输入意见:" path="projectReportDataTwo.act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />--%>
-<%--						<a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>--%>
-<%--						<input type="file" name="upload_files" style="display: none;">--%>
-<%--					</div>--%>
-<%--				</div>--%>
-<%--				<div class="layui-item layui-col-sm4 lw6 with-textarea">--%>
-<%--					<div class="layui-input-block" style="margin-left:10px;">--%>
-<%--						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>--%>
-<%--						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>--%>
-<%--						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>--%>
-<%--						<div style="padding: 5px 0px;">--%>
-<%--							<form:select path="projectReportDataTwo.act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">--%>
-<%--								<form:option value=""/>--%>
-<%--								<form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>--%>
-<%--							</form:select>--%>
-<%--						</div>--%>
-<%--					</div>--%>
-<%--				</div>--%>
-<%--			</div>--%>
 
 		</form:form>
-
-		<div class="form-group-label">
-			<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre1('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=${identification}&name=${identificationName}','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 审核意见模板列表</a></div>
-			<h2>审批意见</h2>
+		<div class="form-group layui-row">
+			<div class="form-group-label"><h2>审批流程</h2></div>
+			<div class="layui-item layui-col-xs12 form-table-container" >
+				<act:flowChart procInsId="${processInstanceId}"/>
+				<act:histoicFlow procInsId="${processInstanceId}"/>
+			</div>
 		</div>
-		<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
 	</div>
 </div>
 <script>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList.jsp

@@ -567,9 +567,9 @@
 							</div>
 						</div>
 						<div class="layui-item query athird ">
-							<label class="layui-form-label">批量归档：</label>
+							<label class="layui-form-label">线下归档：</label>
 							<div class="layui-input-block">
-								<form:select path="filingProjectStatus" class=" form-control  simple-select">
+								<form:select path="downProjectReportRecordStatus" class=" form-control  simple-select">
 									<form:option value="" label=""/>
 									<form:option value="0" label="未归档"/>
 									<form:option value="2" label="归档中"/>

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

@@ -265,6 +265,7 @@
 							<c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
 								<input type="radio" disabled name="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${projectRecords.submitMoney==v.value}">checked</c:if>>
 							</c:forEach>
+							<p style="color: red;font-size: 12px;">200万以上部队或政府项目及500万以上其它项目为A级,其余为B级</p>
 								<%--<form:select path="submitMoney" disabled="true" style="background-color: #f1f1f1"  class="form-control simple-select">
                                     <form:option value=""/>
                                     <form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>

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

@@ -366,7 +366,7 @@
 					</div>
 				</div>
 			</div>
-			<c:if test="${projectRecords.submitMoney==2}">
+			<c:if test="${projectRecords.submitMoney==2 || (projectRecords.submitMoney==1 && (0==projectRecords.emergencyProject || null==projectRecords.emergencyProject))}">
 				<div>
 					<div class="form-group-label">
 						<h2>质量复核内容</h2>
@@ -376,14 +376,10 @@
 							<table id="treeTable2" class="table table-bordered table-condensed details no-bottom-margin">
 								<thead>
 								<tr>
-										<%--<th width="25%">序号</th>--%>
 									<th width="40%">符合内容及评分标准</th>
 									<th width="10%">自校</th>
-										<%--								<th width="10%">最高分</th>--%>
-										<%--								<th width="10%">扣分</th>--%>
 									<th >意见</th>
 
-										<%--<th width="15%">操作</th>--%>
 								</tr>
 								</thead>
 								<tbody>

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

@@ -246,6 +246,7 @@
 						<c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
 							<input type="radio" disabled name="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${projectRecords.submitMoney==v.value}">checked</c:if>>
 						</c:forEach>
+						<p style="color: red;font-size: 12px;">200万以上部队或政府项目及500万以上其它项目为A级,其余为B级</p>
 						<%--<form:select path="submitMoney" disabled="true" style="background-color: #f1f1f1"  class="form-control simple-select">
 							<form:option value=""/>
 							<form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>