工程咨询项目质量复核、报告签发、上报功能调整

src/main/java/com/jeeplus/modules/projectAccessory/service/ProjectTemplateService.java

@@ -381,7 +381,7 @@ public class ProjectTemplateService extends TreeService<ProjectTemplateDao, Proj
                                            String engineeringId, RuralProjectRecords projectRecords, Projectcontentinfo projectcontentinfo,String screenType){
         //创建报告文件、依据性文件、其他文件必填列表以及数据父节点的value值集合
 
-        if(screenType.contains("1000")){
+        if(screenType.contains("1000") && "2".equals(projectRecords.getProjectType())){
             BigDecimal submitScale = projectRecords.getSubmitScale();
             // 送审金额大于等于1000万时
             if(submitScale.compareTo(BigDecimal.valueOf(1000))!=-1){
@@ -466,7 +466,7 @@ public class ProjectTemplateService extends TreeService<ProjectTemplateDao, Proj
                                            String engineeringId, RuralProjectRecords projectRecords, ProjectMaterialDefectRecord projectcontentinfo,String screenType){
         //创建报告文件、依据性文件、其他文件必填列表以及数据父节点的value值集合
 
-        if(screenType.contains("1000")){
+        if(screenType.contains("1000") && "2".equals(projectRecords.getProjectType())){
             BigDecimal submitScale = projectRecords.getSubmitScale();
             // 送审金额大于等于1000万时
             if(submitScale.compareTo(BigDecimal.valueOf(1000))!=-1){
@@ -551,7 +551,7 @@ public class ProjectTemplateService extends TreeService<ProjectTemplateDao, Proj
                                        String engineeringId, RuralProjectRecords projectRecords, RuralProjectcontentinfo projectcontentinfo,String screenType){
         //创建报告文件、依据性文件、其他文件必填列表以及数据父节点的value值集合
 
-        if(screenType.contains("1000")){
+        if(screenType.contains("1000") && "2".equals(projectRecords.getProjectType())){
             BigDecimal submitScale = projectRecords.getSubmitScale();
             // 送审金额大于等于1000万时
             if(submitScale.compareTo(BigDecimal.valueOf(1000))!=-1){
@@ -636,7 +636,7 @@ public class ProjectTemplateService extends TreeService<ProjectTemplateDao, Proj
                                        String engineeringId, RuralProjectRecords projectRecords, ProjectReportRecord projectcontentinfo,String screenType){
         //创建报告文件、依据性文件、其他文件必填列表以及数据父节点的value值集合
 
-        if("1000".equals(screenType)){
+        if("1000".equals(screenType) && "2".equals(projectRecords.getProjectType())){
             BigDecimal submitScale = projectRecords.getSubmitScale();
             // 送审金额大于等于1000万时
             if(submitScale.compareTo(BigDecimal.valueOf(1000))!=-1){

src/main/java/com/jeeplus/modules/ruralprojectrecords/dao/RuralProjectRecordsReportedDao.java

@@ -63,4 +63,17 @@ public interface RuralProjectRecordsReportedDao extends CrudDao<RuralProjectReco
     void updateStatusById(RuralProjectRecordsReported reported);
 
     void updateProcessIdAndStatus(RuralProjectRecordsReported reported);
+
+    /**
+     * 根据项目id查询上报信息
+     * @param projectId
+     * @return
+     */
+    RuralProjectRecordsReported getByProjectId(String projectId);
+
+    /**
+     * 修改上报数据中的咨询标的额
+     * @param reported
+     */
+    void updateZiXunBDE(RuralProjectRecordsReported reported);
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageNewService.java

@@ -3545,6 +3545,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
         RuralProjectRecords records = new RuralProjectRecords();
         records.setId(reported.getId());
         records.setReportedState(String.valueOf(projectStatus.getValue()));
+        records.setTotalFees(Double.valueOf(reported.getZiXunBDE()));
         dao.updateReported(records);
 
         return null;

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsService.java

@@ -36,11 +36,9 @@ import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.projectreportnum.service.ProjectReportNumService;
 import com.jeeplus.modules.ruralprojectrecords.dao.RuralProjectClientLinkmanDao;
 import com.jeeplus.modules.ruralprojectrecords.dao.RuralProjectRecordsDao;
+import com.jeeplus.modules.ruralprojectrecords.dao.RuralProjectRecordsReportedDao;
 import com.jeeplus.modules.ruralprojectrecords.dao.RuralWorkProjectUserDao;
-import com.jeeplus.modules.ruralprojectrecords.entity.ImportBRuralProjectRecords;
-import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
-import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecordsExport;
-import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectcontentinfo;
+import com.jeeplus.modules.ruralprojectrecords.entity.*;
 import com.jeeplus.modules.ruralprojectrecords.enums.ProjectStatusEnum;
 import com.jeeplus.modules.serialnum.service.SerialNumTplService;
 import com.jeeplus.modules.statement.entity.StatementCompanyComprehensiveInfo;
@@ -194,6 +192,8 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 	@Autowired
 	private RuralProjectRecordsDao ruralProjectRecordsDao;
 	@Autowired
+	private RuralProjectRecordsReportedDao ruralProjectRecordsReportedDao;
+	@Autowired
 	private ProjectMaterialChooseService chooseService;
 //	@Autowired
 //	private RuralProjectRecordsService projectRecordsService;
@@ -961,6 +961,17 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		//保存委托方联系人1
 		List<WorkClientLinkman> workClientLinkmanList = projectRecords.getWorkClientLinkmanList();
 		this.saveLinkmanInfos(projectRecords.getId(), workClientLinkmanList, 1);
+
+		//判断是否为咨询项目，若是咨询项目判断是否存在上报数据，若存在则修改上报数据中的标的额
+		if("1".equals(projectRecords.getProjectType()) && null != projectRecords.getTotalFees()){
+			//根据项目id查询上报信息
+			RuralProjectRecordsReported projectRecordsReported = ruralProjectRecordsReportedDao.getByProjectId(projectRecords.getId());
+			if(null != projectRecordsReported){
+				projectRecordsReported.setZiXunBDE(String.valueOf(projectRecords.getTotalFees()));
+				//修改咨询标的额金额
+				ruralProjectRecordsReportedDao.updateZiXunBDE(projectRecordsReported);
+			}
+		}
 	}
 
 

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageNewController.java

@@ -1471,6 +1471,8 @@ public class RuralProjectMessageNewController extends BaseController {
             ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
             records.setReportData(projectReportData);
             reported = ruralProjectMessageService.disposeData(records);
+            //将项目中的咨询标的额添加到上报数据中
+            reported.setZiXunBDE(String.valueOf(records.getTotalFees()));
 
             //合同价送审价审定价处理
             if(StringUtils.isNotBlank(reported.getHeTongJia())){

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectRecordsController.java

@@ -242,6 +242,9 @@ public class RuralProjectRecordsController extends BaseController {
 				model.addAttribute("projectStartDate", "");
 				model.addAttribute("projectEndDate", "");
 			}
+			//根据归属部门Id查询归属部门名称显示
+			String belongingDepartmentName = projectRecordsService.getBelongingDepartmentNameByBelongingDepartment(projectRecords.getBelongingDepartment());
+			model.addAttribute("belongingDepartmentName",belongingDepartmentName);
 		}else {
 		    projectRecords.setCreateBy(UserUtils.getUser());
 		    projectRecords.setCreateDate(new Date());

src/main/java/com/jeeplus/modules/workclientinfo/web/WorkClientInfoController.java

@@ -829,6 +829,7 @@ public class WorkClientInfoController extends BaseController {
 		if(StringUtils.isBlank(keyword)){
 			return null;
 		}
+		String s = TicketQueryUtils.enterpriseSearchByName(keyword);
 		return  TicketQueryUtils.enterpriseSearchByName(keyword);
 	}
 

src/main/java/com/jeeplus/modules/workfullmanage/service/WorkFullManageService.java

@@ -830,9 +830,11 @@ public class WorkFullManageService extends CrudService<WorkFullManageDao, WorkFu
 				}
 
 				for (MainDictDetail type : certificateType) {
-					if(consultantUserConsultant.getZhucezigezhKey().equals(type.getValue())){
+					if(StringUtils.isNotBlank(consultantUserConsultant.getZhucezigezhKey()) && consultantUserConsultant.getZhucezigezhKey().equals(type.getValue())){
 						data.put("consultantQualification1",type.getLabel());
 						break;
+					}else{
+						data.put("consultantQualification1","");
 					}
 				}
 			}

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

@@ -1664,6 +1664,9 @@
 	<update id="updateReported">
 		UPDATE rural_project_records SET
 			reported_state = #{reportedState}
+			<if test="totalFees !=null and totalFees !=''">
+				,total_fees = #{totalFees}
+			</if>
 		WHERE id = #{id}
 	</update>
 	<update id="updateFileStatusTwo">

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

@@ -448,4 +448,17 @@
         WHERE id = #{id}
     </update>
 
+	<select id="getByProjectId" resultType="RuralProjectRecordsReported" >
+		SELECT
+		<include refid="projectRecordsReportedColumns"/>
+		FROM rural_project_records_reported a
+		WHERE a.id = #{projectId}
+	</select>
+
+	<update id="updateZiXunBDE" >
+        UPDATE  rural_project_records_reported SET
+        ZiXunBDE = #{ZiXunBDE}
+        WHERE id = #{id}
+    </update>
+
 </mapper>

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

@@ -900,18 +900,21 @@
 								<input id="number" value="${projectReportData.number}" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 							</div>
 						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">送审价(元)：</label>
-							<div class="layui-input-block with-icon">
-								<input id="reviewFee" value="${projectReportData.reviewFee}" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+						<c:if test="${projectRecords.projectType == 2}">
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">送审价(元)：</label>
+								<div class="layui-input-block with-icon">
+									<input id="reviewFee" value="${projectReportData.reviewFee}" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								</div>
 							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">审定价(元)：</label>
-							<div class="layui-input-block with-icon">
-								<input id="approvalFee" value="${projectReportData.approvalFee}" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">审定价(元)：</label>
+								<div class="layui-input-block with-icon">
+									<input id="approvalFee" value="${projectReportData.approvalFee}" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								</div>
 							</div>
-						</div>
+						</c:if>
+
 						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label">合同类别：</label>
 							<div class="layui-input-block with-icon">
@@ -938,48 +941,60 @@
 								<input style="background-color: #f1f1f1" value="${bzshbUserName}" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 							</div>
 						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">核增核减额(元)：</label>
-							<div class="layui-input-block with-icon">
-								<input id="verifyFee" value="${projectReportData.verifyFee}" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+						<c:if test="${projectRecords.projectType == 2}">
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">核增核减额(元)：</label>
+								<div class="layui-input-block with-icon">
+									<input id="verifyFee" value="${projectReportData.verifyFee}" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								</div>
 							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">核增核减率(%)：</label>
-							<div class="layui-input-block with-icon">
-								<input id="verifyRate" value="${projectReportData.verifyRate}" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">核增核减率(%)：</label>
+								<div class="layui-input-block with-icon">
+									<input id="verifyRate" value="${projectReportData.verifyRate}" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								</div>
 							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
+						</c:if>
+
+						<%--<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label">咨询标的额(元)：</label>
 							<div class="layui-input-block with-icon">
 								<input id="consultFee" value="${projectReportData.consultFee}" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">土建造价(元)：</label>
-							<div class="layui-input-block with-icon">
-								<input id="buildingFee" value="${projectReportData.buildingFee}" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+						</div>--%>
+						<div class="layui-item layui-col-sm6 lw7">
+							<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+							<div class="layui-input-block">
+								<input value="${projectReportData.ziXunShouRu}" readonly="true" cssStyle="background-color: #f1f1f1" htmlEscape="false" class="form-control layui-input"/>
 							</div>
 						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">安装造价(元)：</label>
-							<div class="layui-input-block with-icon">
-								<input id="installFee" value="${projectReportData.installFee}" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+						<c:if test="${projectRecords.projectType == 2}">
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">土建造价(元)：</label>
+								<div class="layui-input-block with-icon">
+									<input id="buildingFee" value="${projectReportData.buildingFee}" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								</div>
 							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">土建比例(%)：</label>
-							<div class="layui-input-block with-icon">
-								<input id="buildingRate" value="${projectReportData.buildingRate}" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">安装造价(元)：</label>
+								<div class="layui-input-block with-icon">
+									<input id="installFee" value="${projectReportData.installFee}" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								</div>
 							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">安装比例(%)：</label>
-							<div class="layui-input-block with-icon">
-								<input id="installRate" value="${projectReportData.installRate}" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">土建比例(%)：</label>
+								<div class="layui-input-block with-icon">
+									<input id="buildingRate" value="${projectReportData.buildingRate}" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+								</div>
 							</div>
-						</div>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">安装比例(%)：</label>
+								<div class="layui-input-block with-icon">
+									<input id="installRate" value="${projectReportData.installRate}" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+								</div>
+							</div>
+						</c:if>
+
 
 						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label">工作开始日期：</label>
@@ -993,12 +1008,6 @@
 								<input class=" form-control layui-input" readonly="readonly" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
 							</div>
 						</div>
-						<div class="layui-item layui-col-sm6 lw7">
-							<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
-							<div class="layui-input-block">
-								<input value="${projectReportData.ziXunShouRu}" readonly="true" cssStyle="background-color: #f1f1f1" htmlEscape="false" class="form-control layui-input"/>
-							</div>
-						</div>
 					</div>
 					<div class="form-group layui-row">
 						<div style="float: right"> <a href="${ctx}/workfullmanage/workFullManage/downloadMassControl?id=${projectReportData.id}"  onclick="return confirmx('确认要下载控制流程单吗？', this.href)" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载流程单</a></div>
@@ -1114,26 +1123,29 @@
 									<input id="number" value="${projectReportData.number}" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 								</div>
 							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">送审价(元)：</label>
-								<div class="layui-input-block with-icon">
-									<input id="reviewFee" value="${projectReportData.reviewFee}" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+							<c:if test="${projectRecords.projectType == 2}">
+								<div class="layui-item layui-col-sm6">
+									<label class="layui-form-label">送审价(元)：</label>
+									<div class="layui-input-block with-icon">
+										<input id="reviewFee" value="${projectReportData.reviewFee}" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+									</div>
 								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">审定价(元)：</label>
-								<div class="layui-input-block with-icon">
-									<input id="approvalFee" value="${projectReportData.approvalFee}" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								<div class="layui-item layui-col-sm6">
+									<label class="layui-form-label">审定价(元)：</label>
+									<div class="layui-input-block with-icon">
+										<input id="approvalFee" value="${projectReportData.approvalFee}" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+									</div>
 								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
+							</c:if>
+
+							<%--<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label">合同类别：</label>
 								<div class="layui-input-block with-icon">
 									<input type="radio" title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0"  disabled <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
 									<input type="radio" title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" disabled <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
-										<%--							<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input number"/>--%>
+										&lt;%&ndash;							<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input number"/>&ndash;%&gt;
 								</div>
-							</div>
+							</div>--%>
 							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label">合同价(元)：</label>
 								<div class="layui-input-block with-icon">
@@ -1152,48 +1164,60 @@
 									<input style="background-color: #f1f1f1" value="${bzshbUserName}" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 								</div>
 							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">核增核减额(元)：</label>
-								<div class="layui-input-block with-icon">
-									<input id="verifyFee" value="${projectReportData.verifyFee}" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+							<c:if test="${projectRecords.projectType == 2}">
+								<div class="layui-item layui-col-sm6">
+									<label class="layui-form-label">核增核减额(元)：</label>
+									<div class="layui-input-block with-icon">
+										<input id="verifyFee" value="${projectReportData.verifyFee}" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+									</div>
 								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">核增核减率(%)：</label>
-								<div class="layui-input-block with-icon">
-									<input id="verifyRate" value="${projectReportData.verifyRate}" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								<div class="layui-item layui-col-sm6">
+									<label class="layui-form-label">核增核减率(%)：</label>
+									<div class="layui-input-block with-icon">
+										<input id="verifyRate" value="${projectReportData.verifyRate}" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+									</div>
 								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
+							</c:if>
+
+							<%--<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label">咨询标的额(元)：</label>
 								<div class="layui-input-block with-icon">
 									<input id="consultFee" value="${projectReportData.consultFee}" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">土建造价(元)：</label>
-								<div class="layui-input-block with-icon">
-									<input id="buildingFee" value="${projectReportData.buildingFee}" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+							</div>--%>
+							<div class="layui-item layui-col-sm6 lw7">
+								<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+								<div class="layui-input-block">
+									<input value="${projectReportData.ziXunShouRu}" readonly="true" cssStyle="background-color: #f1f1f1" htmlEscape="false" class="form-control layui-input"/>
 								</div>
 							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">安装造价(元)：</label>
-								<div class="layui-input-block with-icon">
-									<input id="installFee" value="${projectReportData.installFee}" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+							<c:if test="${projectRecords.projectType == 2}">
+								<div class="layui-item layui-col-sm6">
+									<label class="layui-form-label">土建造价(元)：</label>
+									<div class="layui-input-block with-icon">
+										<input id="buildingFee" value="${projectReportData.buildingFee}" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+									</div>
 								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">土建比例(%)：</label>
-								<div class="layui-input-block with-icon">
-									<input id="buildingRate" value="${projectReportData.buildingRate}" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+								<div class="layui-item layui-col-sm6">
+									<label class="layui-form-label">安装造价(元)：</label>
+									<div class="layui-input-block with-icon">
+										<input id="installFee" value="${projectReportData.installFee}" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+									</div>
 								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">安装比例(%)：</label>
-								<div class="layui-input-block with-icon">
-									<input id="installRate" value="${projectReportData.installRate}" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+								<div class="layui-item layui-col-sm6">
+									<label class="layui-form-label">土建比例(%)：</label>
+									<div class="layui-input-block with-icon">
+										<input id="buildingRate" value="${projectReportData.buildingRate}" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+									</div>
 								</div>
-							</div>
+								<div class="layui-item layui-col-sm6">
+									<label class="layui-form-label">安装比例(%)：</label>
+									<div class="layui-input-block with-icon">
+										<input id="installRate" value="${projectReportData.installRate}" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+									</div>
+								</div>
+							</c:if>
+
 
 							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label">工作开始日期：</label>
@@ -1207,12 +1231,6 @@
 									<input class=" form-control layui-input" readonly="readonly" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
 								</div>
 							</div>
-							<div class="layui-item layui-col-sm6 lw7">
-								<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
-								<div class="layui-input-block">
-									<input value="${projectReportData.ziXunShouRu}" readonly="true" cssStyle="background-color: #f1f1f1" htmlEscape="false" class="form-control layui-input"/>
-								</div>
-							</div>
 						</div>
 						<div style="overflow: hidden">
 							<div class="form-group-label">

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

@@ -800,7 +800,7 @@
 				<div class="form-group layui-row first hide" id="qualityView">
 					<div class="form-group layui-row first lw12">
 						<div class="form-group-label">
-							<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载报告模板</a></div>
+							<%--<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载报告模板</a></div>--%>
 							<h2>质量复核信息</h2>
 						</div>
 						<div class="layui-item layui-col-sm6">
@@ -809,18 +809,21 @@
 								<form:input id="reviewFee" path="projectReportData.number" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 							</div>
 						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">送审价(元)：</label>
-							<div class="layui-input-block with-icon">
-								<form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+						<c:if test="${projectRecords.projectType == 2}">
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">送审价(元)：</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								</div>
 							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">审定价(元)：</label>
-							<div class="layui-input-block with-icon">
-								<form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">审定价(元)：</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								</div>
 							</div>
-						</div>
+						</c:if>
+
 						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label">合同类别：</label>
 							<div class="layui-input-block with-icon">
@@ -847,48 +850,60 @@
 								<input style="background-color: #f1f1f1" value="${bzshbUserName}" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 							</div>
 						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">核增核减额(元)：</label>
-							<div class="layui-input-block with-icon">
-								<form:input id="verifyFee" path="projectReportData.verifyFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+						<c:if test="${projectRecords.projectType == 2}">
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">核增核减额(元)：</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="verifyFee" path="projectReportData.verifyFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								</div>
 							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">核增核减率(%)：</label>
-							<div class="layui-input-block with-icon">
-								<form:input id="verifyRate" path="projectReportData.verifyRate" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">核增核减率(%)：</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="verifyRate" path="projectReportData.verifyRate" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								</div>
 							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
+						</c:if>
+
+						<%--<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label">咨询标的额(元)：</label>
 							<div class="layui-input-block with-icon">
 								<form:input id="consultFee" path="projectReportData.consultFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">土建造价(元)：</label>
-							<div class="layui-input-block with-icon">
-								<form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+						</div>--%>
+						<div class="layui-item layui-col-sm6 lw7">
+							<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+							<div class="layui-input-block">
+								<form:input path="projectReportData.ZiXunShouRu"  readonly="true" cssStyle="background-color: #f1f1f1" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
 							</div>
 						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">安装造价(元)：</label>
-							<div class="layui-input-block with-icon">
-								<form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+						<c:if test="${projectRecords.projectType == 2}">
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">土建造价(元)：</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								</div>
 							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">土建比例(%)：</label>
-							<div class="layui-input-block with-icon">
-								<form:input id="buildingRate" path="projectReportData.buildingRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">安装造价(元)：</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								</div>
 							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">安装比例(%)：</label>
-							<div class="layui-input-block with-icon">
-								<form:input id="installRate" path="projectReportData.installRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">土建比例(%)：</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="buildingRate" path="projectReportData.buildingRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+								</div>
 							</div>
-						</div>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">安装比例(%)：</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="installRate" path="projectReportData.installRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+								</div>
+							</div>
+						</c:if>
+
 
 						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label">工作开始日期：</label>
@@ -902,12 +917,6 @@
 								<input class=" form-control layui-input" readonly="readonly" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
 							</div>
 						</div>
-						<div class="layui-item layui-col-sm6 lw7">
-							<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
-							<div class="layui-input-block">
-								<form:input path="projectReportData.ZiXunShouRu"  readonly="true" cssStyle="background-color: #f1f1f1" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
-							</div>
-						</div>
 					</div>
 					<div class="form-group layui-row">
 						<div style="float: right"> <a href="${ctx}/workfullmanage/workFullManage/downloadMassControl?id=${projectReportData.id}"  onclick="return confirmx('确认要下载控制流程单吗？', this.href)" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载流程单</a></div>
@@ -1023,18 +1032,21 @@
 									<form:input id="reviewFee" path="projectReportData.number" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 								</div>
 							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">送审价(元)：</label>
-								<div class="layui-input-block with-icon">
-									<form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+							<c:if test="${projectRecords.projectType == 2}">
+								<div class="layui-item layui-col-sm6">
+									<label class="layui-form-label">送审价(元)：</label>
+									<div class="layui-input-block with-icon">
+										<form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+									</div>
 								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">审定价(元)：</label>
-								<div class="layui-input-block with-icon">
-									<form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								<div class="layui-item layui-col-sm6">
+									<label class="layui-form-label">审定价(元)：</label>
+									<div class="layui-input-block with-icon">
+										<form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+									</div>
 								</div>
-							</div>
+							</c:if>
+
 							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label">合同类别：</label>
 								<div class="layui-input-block with-icon">
@@ -1058,48 +1070,60 @@
 									<form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
 								</div>
 							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">核增核减额(元)：</label>
-								<div class="layui-input-block with-icon">
-									<form:input id="verifyFee" path="projectReportData.verifyFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+							<c:if test="${projectRecords.projectType == 2}">
+								<div class="layui-item layui-col-sm6">
+									<label class="layui-form-label">核增核减额(元)：</label>
+									<div class="layui-input-block with-icon">
+										<form:input id="verifyFee" path="projectReportData.verifyFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+									</div>
 								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">核增核减率(%)：</label>
-								<div class="layui-input-block with-icon">
-									<form:input id="verifyRate" path="projectReportData.verifyRate" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								<div class="layui-item layui-col-sm6">
+									<label class="layui-form-label">核增核减率(%)：</label>
+									<div class="layui-input-block with-icon">
+										<form:input id="verifyRate" path="projectReportData.verifyRate" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+									</div>
 								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
+							</c:if>
+
+							<%--<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label">咨询标的额(元)：</label>
 								<div class="layui-input-block with-icon">
 									<form:input id="consultFee" path="projectReportData.consultFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">土建造价(元)：</label>
-								<div class="layui-input-block with-icon">
-									<form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+							</div>--%>
+							<div class="layui-item layui-col-sm6 lw7">
+								<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+								<div class="layui-input-block">
+									<form:input path="projectReportData.ZiXunShouRu"  readonly="true" cssStyle="background-color: #f1f1f1" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
 								</div>
 							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">安装造价(元)：</label>
-								<div class="layui-input-block with-icon">
-									<form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+							<c:if test="${projectRecords.projectType == 2}">
+								<div class="layui-item layui-col-sm6">
+									<label class="layui-form-label">土建造价(元)：</label>
+									<div class="layui-input-block with-icon">
+										<form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+									</div>
 								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">土建比例(%)：</label>
-								<div class="layui-input-block with-icon">
-									<form:input id="buildingRate" path="projectReportData.buildingRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+								<div class="layui-item layui-col-sm6">
+									<label class="layui-form-label">安装造价(元)：</label>
+									<div class="layui-input-block with-icon">
+										<form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+									</div>
 								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">安装比例(%)：</label>
-								<div class="layui-input-block with-icon">
-									<form:input id="installRate" path="projectReportData.installRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+								<div class="layui-item layui-col-sm6">
+									<label class="layui-form-label">土建比例(%)：</label>
+									<div class="layui-input-block with-icon">
+										<form:input id="buildingRate" path="projectReportData.buildingRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+									</div>
 								</div>
-							</div>
+								<div class="layui-item layui-col-sm6">
+									<label class="layui-form-label">安装比例(%)：</label>
+									<div class="layui-input-block with-icon">
+										<form:input id="installRate" path="projectReportData.installRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+									</div>
+								</div>
+							</c:if>
+
 
 							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label">工作开始日期：</label>
@@ -1113,12 +1137,6 @@
 									<input class=" form-control layui-input" readonly="readonly" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
 								</div>
 							</div>
-							<div class="layui-item layui-col-sm6 lw7">
-								<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
-								<div class="layui-input-block">
-									<form:input path="projectReportData.ZiXunShouRu"  readonly="true" cssStyle="background-color: #f1f1f1" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
-								</div>
-							</div>
 						</div>
 						<div style="overflow: hidden">
 							<div class="form-group-label">

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

@@ -923,12 +923,18 @@
                         <p style="color: red;font-size: 12px;">500万及500万以上为A级，500万以下为B级</p>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw6">
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line">咨询标的额(万元)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="totalFees" htmlEscape="false" id="totalFees" onkeyup="wirteNum(this)" placeholder="请输入咨询标的额(万元)" class="form-control layui-input number"/>
+                    </div>
+                </div>
+                <%--<div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>送审规模（万元）：</label>
                     <div class="layui-input-block">
                         <form:input path="submitScale" id="submitScale" maxlength="12" htmlEscape="false" onkeyup="wirteNum(this)" placeholder="请输入送审规模" class="form-control required layui-input number"/>
                     </div>
-                </div>
+                </div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">工作开始日期：</label>
                     <div class="layui-input-block">

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

@@ -1133,11 +1133,17 @@
 <%--                    </div>--%>
 <%--                </div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line">咨询标的额(万元)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="totalFees" htmlEscape="false" id="totalFees" onkeyup="wirteNum(this)" placeholder="请输入咨询标的额(万元)" class="form-control layui-input number"/>
+                    </div>
+                </div>
+                <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>送审规模（万元）：</label>
                     <div class="layui-input-block">
                         <form:input path="submitScale" id="submitScale" maxlength="12" htmlEscape="false" onkeyup="wirteNum(this)" placeholder="请输入送审规模" class="form-control layui-input judgment number"/>
                     </div>
-                </div>
+                </div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">工作开始日期：</label>
                     <div class="layui-input-block">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/newReported/reportedForm.jsp

@@ -1345,7 +1345,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>建筑规模：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>建筑规模：</label>
                     <div class="layui-input-block readOnlyFFF">
                         <form:select path="GCGMValue" class="form-control layui-input required simple-select" lay-filter="GCGMValue">
                             <form:options items="${fns:getMainDictList('architectural_scale')}" itemLabel="label" itemValue="value" htmlEscape="false"/>

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

@@ -1019,7 +1019,7 @@
 				<div class="form-group layui-row first hide" id="qualityView">
 					<div class="form-group layui-row first lw12">
 						<div class="form-group-label">
-							<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载报告模板</a></div>
+							<%--1<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载报告模板</a></div>--%>
 							<h2>质量复核信息</h2>
 						</div>
 						<div class="layui-item layui-col-sm6">
@@ -1028,18 +1028,20 @@
 								<form:input id="reviewFee" path="projectReportData.number" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 							</div>
 						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">送审价(元)：</label>
-							<div class="layui-input-block with-icon">
-								<form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+						<c:if test="${projectRecords.projectType == 2}">
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">送审价(元)：</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								</div>
 							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">审定价(元)：</label>
-							<div class="layui-input-block with-icon">
-								<form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">审定价(元)：</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								</div>
 							</div>
-						</div>
+						</c:if>
 						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label">合同类别：</label>
 							<div class="layui-input-block with-icon">
@@ -1063,48 +1065,60 @@
 								<form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
 							</div>
 						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">核增核减额(元)：</label>
-							<div class="layui-input-block with-icon">
-								<form:input id="verifyFee" path="projectReportData.verifyFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+						<c:if test="${projectRecords.projectType == 2}">
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">核增核减额(元)：</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="verifyFee" path="projectReportData.verifyFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								</div>
 							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">核增核减率(%)：</label>
-							<div class="layui-input-block with-icon">
-								<form:input id="verifyRate" path="projectReportData.verifyRate" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">核增核减率(%)：</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="verifyRate" path="projectReportData.verifyRate" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								</div>
 							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
+						</c:if>
+
+						<%--<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label">咨询标的额(元)：</label>
 							<div class="layui-input-block with-icon">
 								<form:input id="consultFee" path="projectReportData.consultFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">土建造价(元)：</label>
-							<div class="layui-input-block with-icon">
-								<form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+						</div>--%>
+						<div class="layui-item layui-col-sm6 lw7">
+							<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+							<div class="layui-input-block">
+								<form:input path="projectReportData.ZiXunShouRu"  readonly="true" cssStyle="background-color: #f1f1f1" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
 							</div>
 						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">安装造价(元)：</label>
-							<div class="layui-input-block with-icon">
-								<form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+						<c:if test="${projectRecords.projectType == 2}">
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">土建造价(元)：</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								</div>
 							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">土建比例(%)：</label>
-							<div class="layui-input-block with-icon">
-								<form:input id="buildingRate" path="projectReportData.buildingRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">安装造价(元)：</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								</div>
 							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">安装比例(%)：</label>
-							<div class="layui-input-block with-icon">
-								<form:input id="installRate" path="projectReportData.installRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">土建比例(%)：</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="buildingRate" path="projectReportData.buildingRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+								</div>
 							</div>
-						</div>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">安装比例(%)：</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="installRate" path="projectReportData.installRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+								</div>
+							</div>
+						</c:if>
+
 
 						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label">工作开始日期：</label>
@@ -1118,12 +1132,6 @@
 								<input class=" form-control layui-input" readonly="readonly" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
 							</div>
 						</div>
-						<div class="layui-item layui-col-sm6 lw7">
-							<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
-							<div class="layui-input-block">
-								<form:input path="projectReportData.ZiXunShouRu"  readonly="true" cssStyle="background-color: #f1f1f1" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
-							</div>
-						</div>
 					</div>
 					<div class="form-group layui-row">
 						<div class="form-group-label"><h2><span class="require-item">*</span>项目组成员(质量控制流程)</h2></div>

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

@@ -959,7 +959,7 @@
 				<div class="form-group layui-row first hide" id="qualityView">
 					<div class="form-group layui-row first lw12">
 						<div class="form-group-label">
-							<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载报告模板</a></div>
+							<%--<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载报告模板</a></div>--%>
 							<h2>质量复核信息</h2>
 						</div>
 						<div class="layui-item layui-col-sm6">
@@ -968,18 +968,21 @@
 								<form:input id="reviewFee" path="projectReportData.number" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 							</div>
 						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">送审价(元)：</label>
-							<div class="layui-input-block with-icon">
-								<form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+						<c:if test="${projectRecords.projectType == 2}">
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">送审价(元)：</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								</div>
 							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">审定价(元)：</label>
-							<div class="layui-input-block with-icon">
-								<form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">审定价(元)：</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								</div>
 							</div>
-						</div>
+						</c:if>
+
 						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label">合同类别：</label>
 							<div class="layui-input-block with-icon">
@@ -1009,48 +1012,60 @@
 								<input style="background-color: #f1f1f1" value="${bzshbUserName}" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 							</div>
 						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">核增核减额(元)：</label>
-							<div class="layui-input-block with-icon">
-								<form:input id="verifyFee" path="projectReportData.verifyFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+						<c:if test="${projectRecords.projectType == 2}">
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">核增核减额(元)：</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="verifyFee" path="projectReportData.verifyFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								</div>
 							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">核增核减率(%)：</label>
-							<div class="layui-input-block with-icon">
-								<form:input id="verifyRate" path="projectReportData.verifyRate" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">核增核减率(%)：</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="verifyRate" path="projectReportData.verifyRate" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								</div>
 							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
+						</c:if>
+
+						<%--<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label">咨询标的额(元)：</label>
 							<div class="layui-input-block with-icon">
 								<form:input id="consultFee" path="projectReportData.consultFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">土建造价(元)：</label>
-							<div class="layui-input-block with-icon">
-								<form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+						</div>--%>
+						<div class="layui-item layui-col-sm6 lw7">
+							<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+							<div class="layui-input-block">
+								<form:input path="projectReportData.ZiXunShouRu"  readonly="true" cssStyle="background-color: #f1f1f1" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
 							</div>
 						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">安装造价(元)：</label>
-							<div class="layui-input-block with-icon">
-								<form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+						<c:if test="${projectRecords.projectType == 2}">
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">土建造价(元)：</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								</div>
 							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">土建比例(%)：</label>
-							<div class="layui-input-block with-icon">
-								<form:input id="buildingRate" path="projectReportData.buildingRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">安装造价(元)：</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								</div>
 							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">安装比例(%)：</label>
-							<div class="layui-input-block with-icon">
-								<form:input id="installRate" path="projectReportData.installRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">土建比例(%)：</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="buildingRate" path="projectReportData.buildingRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+								</div>
 							</div>
-						</div>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">安装比例(%)：</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="installRate" path="projectReportData.installRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+								</div>
+							</div>
+						</c:if>
+
 
 						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label">工作开始日期：</label>
@@ -1064,12 +1079,6 @@
 								<input class=" form-control layui-input" readonly="readonly" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
 							</div>
 						</div>
-						<div class="layui-item layui-col-sm6 lw7">
-							<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
-							<div class="layui-input-block">
-								<form:input path="projectReportData.ZiXunShouRu"  readonly="true" cssStyle="background-color: #f1f1f1" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
-							</div>
-						</div>
 					</div>
 					<div class="form-group layui-row">
 						<div class="form-group-label"><h2>项目组成员(质量控制流程)</h2></div>
@@ -1187,18 +1196,21 @@
 								<form:input id="reviewFee" path="projectReportData.number" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 							</div>
 						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">送审价(元)：</label>
-							<div class="layui-input-block with-icon">
-								<form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+						<c:if test="${projectRecords.projectType == 2}">
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">送审价(元)：</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								</div>
 							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">审定价(元)：</label>
-							<div class="layui-input-block with-icon">
-								<form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">审定价(元)：</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								</div>
 							</div>
-						</div>
+						</c:if>
+
 						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label">合同类别：</label>
 							<div class="layui-input-block with-icon">
@@ -1222,48 +1234,60 @@
 								<form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
 							</div>
 						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">核增核减额(元)：</label>
-							<div class="layui-input-block with-icon">
-								<form:input id="verifyFee" path="projectReportData.verifyFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+						<c:if test="${projectRecords.projectType == 2}">
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">核增核减额(元)：</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="verifyFee" path="projectReportData.verifyFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								</div>
 							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">核增核减率(%)：</label>
-							<div class="layui-input-block with-icon">
-								<form:input id="verifyRate" path="projectReportData.verifyRate" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">核增核减率(%)：</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="verifyRate" path="projectReportData.verifyRate" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								</div>
 							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
+						</c:if>
+
+						<%--<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label">咨询标的额(元)：</label>
 							<div class="layui-input-block with-icon">
 								<form:input id="consultFee" path="projectReportData.consultFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">土建造价(元)：</label>
-							<div class="layui-input-block with-icon">
-								<form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+						</div>--%>
+						<div class="layui-item layui-col-sm6 lw7">
+							<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+							<div class="layui-input-block">
+								<form:input path="projectReportData.ZiXunShouRu"  readonly="true" cssStyle="background-color: #f1f1f1" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
 							</div>
 						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">安装造价(元)：</label>
-							<div class="layui-input-block with-icon">
-								<form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+						<c:if test="${projectRecords.projectType == 2}">
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">土建造价(元)：</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								</div>
 							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">土建比例(%)：</label>
-							<div class="layui-input-block with-icon">
-								<form:input id="buildingRate" path="projectReportData.buildingRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">安装造价(元)：</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								</div>
 							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">安装比例(%)：</label>
-							<div class="layui-input-block with-icon">
-								<form:input id="installRate" path="projectReportData.installRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">土建比例(%)：</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="buildingRate" path="projectReportData.buildingRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+								</div>
 							</div>
-						</div>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">安装比例(%)：</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="installRate" path="projectReportData.installRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+								</div>
+							</div>
+						</c:if>
+
 
 						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label">工作开始日期：</label>
@@ -1277,12 +1301,6 @@
 								<input class=" form-control layui-input" readonly="readonly" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
 							</div>
 						</div>
-						<div class="layui-item layui-col-sm6 lw7">
-							<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
-							<div class="layui-input-block">
-								<form:input path="projectReportData.ZiXunShouRu"  readonly="true" cssStyle="background-color: #f1f1f1" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
-							</div>
-						</div>
 					</div>
 					<div>
 						<div>

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

@@ -730,18 +730,21 @@
             </div>
             <div class="form-group layui-row first lw12">
                 <div class="form-group-label"><h2>质量复核信息</h2></div>
-                <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
-                    <div class="layui-input-block with-icon">
-                        <form:input placeholder="请输入送审价" id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control required layui-input" onchange="getFee()"/>
+                <c:if test="${projectRecords.projectType == 2}">
+                    <div class="layui-item layui-col-sm6">
+                        <label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
+                        <div class="layui-input-block with-icon">
+                            <form:input placeholder="请输入送审价" id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control required layui-input" onchange="getFee()"/>
+                        </div>
                     </div>
-                </div>
-                <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label"><span class="require-item">*</span>审定价(元)：</label>
-                    <div class="layui-input-block with-icon">
-                        <form:input placeholder="请输入审定价" id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control required layui-input" onchange="getApprovalFee()"/>
+                    <div class="layui-item layui-col-sm6">
+                        <label class="layui-form-label"><span class="require-item">*</span>审定价(元)：</label>
+                        <div class="layui-input-block with-icon">
+                            <form:input placeholder="请输入审定价" id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control required layui-input" onchange="getApprovalFee()"/>
+                        </div>
                     </div>
-                </div>
+                </c:if>
+
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label">合同类别：</label>
                     <div class="layui-input-block with-icon">
@@ -764,48 +767,54 @@
                         <form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false" class="form-control layui-input"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label">核增核减额(元)：</label>
-                    <div class="layui-input-block with-icon">
-                        <form:input id="verifyFee" path="projectReportData.verifyFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+                <c:if test="${projectRecords.projectType == 2}">
+                    <div class="layui-item layui-col-sm6">
+                        <label class="layui-form-label">核增核减额(元)：</label>
+                        <div class="layui-input-block with-icon">
+                            <form:input id="verifyFee" path="projectReportData.verifyFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+                        </div>
                     </div>
-                </div>
-                <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label">核增核减率(%)：</label>
-                    <div class="layui-input-block with-icon">
-                        <form:input id="verifyRate" path="projectReportData.verifyRate" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+                    <div class="layui-item layui-col-sm6">
+                        <label class="layui-form-label">核增核减率(%)：</label>
+                        <div class="layui-input-block with-icon">
+                            <form:input id="verifyRate" path="projectReportData.verifyRate" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+                        </div>
                     </div>
-                </div>
-                <div class="layui-item layui-col-sm6">
+                </c:if>
+
+                <%--<div class="layui-item layui-col-sm6">
                     <label class="layui-form-label">咨询标的额(元)：</label>
                     <div class="layui-input-block with-icon">
                         <form:input id="consultFee" path="projectReportData.consultFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
                     </div>
-                </div>
-                <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label">土建造价(元)：</label>
-                    <div class="layui-input-block with-icon">
-                        <form:input placeholder="请输入土建造价" id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input" onchange="getBuildingFee()"/>
+                </div>--%>
+                <c:if test="${projectRecords.projectType == 2}">
+                    <div class="layui-item layui-col-sm6">
+                        <label class="layui-form-label">土建造价(元)：</label>
+                        <div class="layui-input-block with-icon">
+                            <form:input placeholder="请输入土建造价" id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input" onchange="getBuildingFee()"/>
+                        </div>
                     </div>
-                </div>
-                <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label">安装造价(元)：</label>
-                    <div class="layui-input-block with-icon">
-                        <form:input placeholder="请输入安装造价" id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input" onchange="getInstallFee()"/>
+                    <div class="layui-item layui-col-sm6">
+                        <label class="layui-form-label">安装造价(元)：</label>
+                        <div class="layui-input-block with-icon">
+                            <form:input placeholder="请输入安装造价" id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input" onchange="getInstallFee()"/>
+                        </div>
                     </div>
-                </div>
-                <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label">土建比例(%)：</label>
-                    <div class="layui-input-block with-icon">
-                        <form:input id="buildingRate" path="projectReportData.buildingRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+                    <div class="layui-item layui-col-sm6">
+                        <label class="layui-form-label">土建比例(%)：</label>
+                        <div class="layui-input-block with-icon">
+                            <form:input id="buildingRate" path="projectReportData.buildingRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+                        </div>
                     </div>
-                </div>
-                <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label">安装比例(%)：</label>
-                    <div class="layui-input-block with-icon">
-                        <form:input id="installRate" path="projectReportData.installRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+                    <div class="layui-item layui-col-sm6">
+                        <label class="layui-form-label">安装比例(%)：</label>
+                        <div class="layui-input-block with-icon">
+                            <form:input id="installRate" path="projectReportData.installRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+                        </div>
                     </div>
-                </div>
+                </c:if>
+
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>工作开始日期：</label>
                     <div class="layui-input-block">

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

@@ -476,18 +476,20 @@
             </div>
             <div class="form-group layui-row first lw12">
                 <div class="form-group-label"><h2>质量复核信息</h2></div>
-                <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
-                    <div class="layui-input-block with-icon">
-                        <form:input placeholder="请输入送审价"  readonly="true" id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control required layui-input" onchange="getFee()"/>
+                <c:if test="${projectRecords.projectType == 2}">
+                    <div class="layui-item layui-col-sm6">
+                        <label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
+                        <div class="layui-input-block with-icon">
+                            <form:input placeholder="请输入送审价"  readonly="true" id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control required layui-input" onchange="getFee()"/>
+                        </div>
                     </div>
-                </div>
-                <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label"><span class="require-item">*</span>审定价(元)：</label>
-                    <div class="layui-input-block with-icon">
-                        <form:input placeholder="请输入审定价"  readonly="true" id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control required layui-input" onchange="getApprovalFee()"/>
+                    <div class="layui-item layui-col-sm6">
+                        <label class="layui-form-label"><span class="require-item">*</span>审定价(元)：</label>
+                        <div class="layui-input-block with-icon">
+                            <form:input placeholder="请输入审定价"  readonly="true" id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control required layui-input" onchange="getApprovalFee()"/>
+                        </div>
                     </div>
-                </div>
+                </c:if>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label">合同类别：</label>
                     <div class="layui-input-block with-icon">
@@ -510,48 +512,54 @@
                         <form:input placeholder="请输入合同费率" readonly="true" id="contractRate" path="projectReportData.contractRate" htmlEscape="false" class="form-control layui-input"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label">核增核减额(元)：</label>
-                    <div class="layui-input-block with-icon">
-                        <form:input id="verifyFee" path="projectReportData.verifyFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+                <c:if test="${projectRecords.projectType == 2}">
+                    <div class="layui-item layui-col-sm6">
+                        <label class="layui-form-label">核增核减额(元)：</label>
+                        <div class="layui-input-block with-icon">
+                            <form:input id="verifyFee" path="projectReportData.verifyFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+                        </div>
                     </div>
-                </div>
-                <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label">核增核减率(%)：</label>
-                    <div class="layui-input-block with-icon">
-                        <form:input id="verifyRate" path="projectReportData.verifyRate" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+                    <div class="layui-item layui-col-sm6">
+                        <label class="layui-form-label">核增核减率(%)：</label>
+                        <div class="layui-input-block with-icon">
+                            <form:input id="verifyRate" path="projectReportData.verifyRate" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+                        </div>
                     </div>
-                </div>
-                <div class="layui-item layui-col-sm6">
+                </c:if>
+
+                <%--<div class="layui-item layui-col-sm6">
                     <label class="layui-form-label">咨询标的额(元)：</label>
                     <div class="layui-input-block with-icon">
                         <form:input id="consultFee" path="projectReportData.consultFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
                     </div>
-                </div>
-                <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label">土建造价(元)：</label>
-                    <div class="layui-input-block with-icon">
-                        <form:input placeholder="请输入土建造价" readonly="true" id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input" onchange="getBuildingFee()"/>
+                </div>--%>
+                <c:if test="${projectRecords.projectType == 2}">
+                    <div class="layui-item layui-col-sm6">
+                        <label class="layui-form-label">土建造价(元)：</label>
+                        <div class="layui-input-block with-icon">
+                            <form:input placeholder="请输入土建造价" readonly="true" id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input" onchange="getBuildingFee()"/>
+                        </div>
                     </div>
-                </div>
-                <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label">安装造价(元)：</label>
-                    <div class="layui-input-block with-icon">
-                        <form:input placeholder="请输入安装造价" readonly="true" id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input" onchange="getInstallFee()"/>
+                    <div class="layui-item layui-col-sm6">
+                        <label class="layui-form-label">安装造价(元)：</label>
+                        <div class="layui-input-block with-icon">
+                            <form:input placeholder="请输入安装造价" readonly="true" id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input" onchange="getInstallFee()"/>
+                        </div>
                     </div>
-                </div>
-                <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label">土建比例(%)：</label>
-                    <div class="layui-input-block with-icon">
-                        <form:input id="buildingRate" path="projectReportData.buildingRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+                    <div class="layui-item layui-col-sm6">
+                        <label class="layui-form-label">土建比例(%)：</label>
+                        <div class="layui-input-block with-icon">
+                            <form:input id="buildingRate" path="projectReportData.buildingRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+                        </div>
                     </div>
-                </div>
-                <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label">安装比例(%)：</label>
-                    <div class="layui-input-block with-icon">
-                        <form:input id="installRate" path="projectReportData.installRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+                    <div class="layui-item layui-col-sm6">
+                        <label class="layui-form-label">安装比例(%)：</label>
+                        <div class="layui-input-block with-icon">
+                            <form:input id="installRate" path="projectReportData.installRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+                        </div>
                     </div>
-                </div>
+                </c:if>
+
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">工作开始日期：</label>
                     <div class="layui-input-block">

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

@@ -595,10 +595,9 @@
         	/*var projectSort = $("#projectSort").val();
         	//0为非打包项目
         	if(projectSort == 0){*/
-				var reviewFee = $("#reviewFee").val();
-				$("#upTable").load(location.href+"&reviewFee="+reviewFee + " #upTable");
-				$("#gistdata_upTable").load(location.href+"&reviewFee="+reviewFee + " #gistdata_upTable");
-				$("#upTable_other").load(location.href+"&reviewFee="+reviewFee + " #upTable_other");
+				$("#upTable").load(location.href+" #upTable");
+				$("#gistdata_upTable").load(location.href+ " #gistdata_upTable");
+				$("#upTable_other").load(location.href+ " #upTable_other");
 			/*}*/
 		}
 
@@ -1035,19 +1034,19 @@
 				</div>
 			</div>
 			<div class="form-group layui-row first lw12">
-				<div class="form-group-label"><h2>合同信息</h2></div>
-					<div class="layui-item layui-col-sm6">
+				<div class="form-group-label"><h2>质量复核信息</h2></div>
+					<%--<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
 						<div class="layui-input-block with-icon">
 							<form:input placeholder="请输入送审价" id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control judgment layui-input number" onchange="getFee()" onblur="getAttachment()"/>
 						</div>
-					</div>
-					<div class="layui-item layui-col-sm6">
+					</div>--%>
+					<%--<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label"><span class="require-item">*</span>审定价(元)：</label>
 						<div class="layui-input-block with-icon">
 							<form:input placeholder="请输入审定价" id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control judgment layui-input number" onchange="getApprovalFee()"/>
 						</div>
-					</div>
+					</div>--%>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">合同类别：</label>
 						<div class="layui-input-block with-icon">
@@ -1111,7 +1110,7 @@
 							</select>
 						</div>
 					</div>
-					<div class="layui-item layui-col-sm6">
+					<%--<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">核增核减额(元)：</label>
 						<div class="layui-input-block with-icon">
 							<form:input id="verifyFee" path="projectReportData.verifyFee" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
@@ -1122,8 +1121,8 @@
 						<div class="layui-input-block with-icon">
 							<form:input id="verifyRate" path="projectReportData.verifyRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
 						</div>
-					</div>
-					<div class="layui-item layui-col-sm6">
+					</div>--%>
+					<%--<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">咨询标的额(元)：</label>
 						<div class="layui-input-block with-icon">
 							<form:input id="consultFee" path="projectReportData.consultFee" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
@@ -1152,6 +1151,12 @@
 						<div class="layui-input-block with-icon">
 							<form:input id="installRate" path="projectReportData.installRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
 						</div>
+					</div>--%>
+					<div class="layui-item layui-col-sm6 lw7">
+						<label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（万元）：</label>
+						<div class="layui-input-block">
+							<form:input path="projectReportData.ZiXunShouRu" id="ziXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input judgment"/>
+						</div>
 					</div>
 					<div class="layui-item layui-col-sm6 lw7">
 						<label class="layui-form-label"><span class="require-item">*</span>工作开始日期：</label>
@@ -1165,12 +1170,6 @@
 							<input placeholder="请选择结束日期" style="background-color: #fff" class="laydate-icondate form-control layui-input judgment layer-date laydate-icon " readonly="readonly" id="endingDate" name="projectOnRural.endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
 						</div>
 					</div>
-					<div class="layui-item layui-col-sm6 lw7">
-						<label class="layui-form-label double-line"><span class="require-item">*</span>造价咨询营业收入（万元）：</label>
-						<div class="layui-input-block">
-							<form:input path="projectReportData.ZiXunShouRu" id="ziXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input judgment"/>
-						</div>
-					</div>
 				</div>
 			<%--<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>咨询质量控制信息</h2></div>
@@ -2173,8 +2172,7 @@
 			cancel: function(index){
 			},
 			end:function () {
-				var reviewFee = $("#reviewFee").val();
-				$("#"+tableId).load(location.href+"&reviewFee="+reviewFee + " #"+tableId);
+				$("#"+tableId).load(location.href+ " #"+tableId);
 			}
 		});
 	}
@@ -2209,8 +2207,7 @@
 					if(d.str.length>0){
 						parent.layer.msg(d.str,{icon:1});
 					}
-					var reviewFee = $("#reviewFee").val();
-					$("#"+tableId).load(location.href+"&reviewFee="+reviewFee + " #"+tableId);
+					$("#"+tableId).load(location.href+ " #"+tableId);
 					//关闭当前页
 					top.layer.close(index)
 				}

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

@@ -426,10 +426,9 @@
         	/*var projectSort = $("#projectSort").val();
         	//0为非打包项目
         	if(projectSort == 0){*/
-				var reviewFee = $("#reviewFee").val();
-				$("#upTable").load(location.href+"&reviewFee="+reviewFee + " #upTable");
-				$("#gistdata_upTable").load(location.href+"&reviewFee="+reviewFee + " #gistdata_upTable");
-				$("#upTable_other").load(location.href+"&reviewFee="+reviewFee + " #upTable_other");
+				$("#upTable").load(location.href + " #upTable");
+				$("#gistdata_upTable").load(location.href + " #gistdata_upTable");
+				$("#upTable_other").load(location.href + " #upTable_other");
 			/*}*/
 		}
 
@@ -687,19 +686,21 @@
 				</div>
 			</div>
 			<div class="form-group layui-row first lw12">
-				<div class="form-group-label"><h2>合同信息</h2></div>
-					<div class="layui-item layui-col-sm6">
-						<label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
-						<div class="layui-input-block with-icon">
-							<form:input placeholder="请输入送审价" id="reviewFee" readonly="true" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control judgment layui-input number" onchange="getFee()" onblur="getAttachment()"/>
+				<div class="form-group-label"><h2>质量复核信息</h2></div>
+					<c:if test="${projectRecords.projectType == 2}">
+						<div class="layui-item layui-col-sm6">
+							<label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
+							<div class="layui-input-block with-icon">
+								<form:input placeholder="请输入送审价" id="reviewFee" readonly="true" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control judgment layui-input number" onchange="getFee()" onblur="getAttachment()"/>
+							</div>
 						</div>
-					</div>
-					<div class="layui-item layui-col-sm6">
-						<label class="layui-form-label"><span class="require-item">*</span>审定价(元)：</label>
-						<div class="layui-input-block with-icon">
-							<form:input placeholder="请输入审定价" id="approvalFee" readonly="true"  path="projectReportData.approvalFee" htmlEscape="false"  class="form-control judgment layui-input number" onchange="getApprovalFee()"/>
+						<div class="layui-item layui-col-sm6">
+							<label class="layui-form-label"><span class="require-item">*</span>审定价(元)：</label>
+							<div class="layui-input-block with-icon">
+								<form:input placeholder="请输入审定价" id="approvalFee" readonly="true"  path="projectReportData.approvalFee" htmlEscape="false"  class="form-control judgment layui-input number" onchange="getApprovalFee()"/>
+							</div>
 						</div>
-					</div>
+					</c:if>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">合同类别：</label>
 						<div class="layui-input-block with-icon">
@@ -735,48 +736,60 @@
 							</select>
 						</div>
 					</div>
-					<div class="layui-item layui-col-sm6">
-						<label class="layui-form-label">核增核减额(元)：</label>
-						<div class="layui-input-block with-icon">
-							<form:input id="verifyFee" path="projectReportData.verifyFee"  htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+					<c:if test="${projectRecords.projectType == 2}">
+						<div class="layui-item layui-col-sm6">
+							<label class="layui-form-label">核增核减额(元)：</label>
+							<div class="layui-input-block with-icon">
+								<form:input id="verifyFee" path="projectReportData.verifyFee"  htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+							</div>
 						</div>
-					</div>
-					<div class="layui-item layui-col-sm6">
-						<label class="layui-form-label">核增核减率(%)：</label>
-						<div class="layui-input-block with-icon">
-							<form:input id="verifyRate" path="projectReportData.verifyRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+						<div class="layui-item layui-col-sm6">
+							<label class="layui-form-label">核增核减率(%)：</label>
+							<div class="layui-input-block with-icon">
+								<form:input id="verifyRate" path="projectReportData.verifyRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+							</div>
 						</div>
-					</div>
-					<div class="layui-item layui-col-sm6">
+					</c:if>
+
+					<%--<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">咨询标的额(元)：</label>
 						<div class="layui-input-block with-icon">
 							<form:input id="consultFee" path="projectReportData.consultFee" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
 						</div>
-					</div>
-					<div class="layui-item layui-col-sm6">
-						<label class="layui-form-label">土建造价(元)：</label>
-						<div class="layui-input-block with-icon">
-							<form:input placeholder="请输入土建造价" id="buildingFee"  readonly="true"  path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input number" onchange="getBuildingFee()"/>
+					</div>--%>
+					<div class="layui-item layui-col-sm6 lw7">
+						<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+						<div class="layui-input-block">
+							<form:input path="projectReportData.ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" readonly="true" class="form-control layui-input"/>
 						</div>
 					</div>
-					<div class="layui-item layui-col-sm6">
-						<label class="layui-form-label">安装造价(元)：</label>
-						<div class="layui-input-block with-icon">
-							<form:input placeholder="请输入安装造价" id="installFee"  readonly="true"  path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input number" onchange="getInstallFee()"/>
+					<c:if test="${projectRecords.projectType == 2}">
+						<div class="layui-item layui-col-sm6">
+							<label class="layui-form-label">土建造价(元)：</label>
+							<div class="layui-input-block with-icon">
+								<form:input placeholder="请输入土建造价" id="buildingFee"  readonly="true"  path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input number" onchange="getBuildingFee()"/>
+							</div>
 						</div>
-					</div>
-					<div class="layui-item layui-col-sm6">
-						<label class="layui-form-label">土建比例(%)：</label>
-						<div class="layui-input-block with-icon">
-							<form:input id="buildingRate" path="projectReportData.buildingRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+						<div class="layui-item layui-col-sm6">
+							<label class="layui-form-label">安装造价(元)：</label>
+							<div class="layui-input-block with-icon">
+								<form:input placeholder="请输入安装造价" id="installFee"  readonly="true"  path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input number" onchange="getInstallFee()"/>
+							</div>
 						</div>
-					</div>
-					<div class="layui-item layui-col-sm6">
-						<label class="layui-form-label">安装比例(%)：</label>
-						<div class="layui-input-block with-icon">
-							<form:input id="installRate" path="projectReportData.installRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+						<div class="layui-item layui-col-sm6">
+							<label class="layui-form-label">土建比例(%)：</label>
+							<div class="layui-input-block with-icon">
+								<form:input id="buildingRate" path="projectReportData.buildingRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+							</div>
 						</div>
-					</div>
+						<div class="layui-item layui-col-sm6">
+							<label class="layui-form-label">安装比例(%)：</label>
+							<div class="layui-input-block with-icon">
+								<form:input id="installRate" path="projectReportData.installRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+							</div>
+						</div>
+					</c:if>
+
 					<div class="layui-item layui-col-sm6 lw7">
 						<label class="layui-form-label">工作开始日期：</label>
 						<div class="layui-input-block">
@@ -789,12 +802,6 @@
 							<input placeholder="请选择结束日期" style="background-color: #f1f1f1" disabled class="laydate-icondate form-control layui-input layer-date laydate-icon " readonly="readonly" id="endingDate" name="projectOnRural.endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
 						</div>
 					</div>
-					<div class="layui-item layui-col-sm6 lw7">
-						<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
-						<div class="layui-input-block">
-							<form:input path="projectReportData.ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" readonly="true" class="form-control layui-input"/>
-						</div>
-					</div>
 				</div>
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>成果文件</h2></div>
@@ -1472,8 +1479,7 @@
 			cancel: function(index){
 			},
 			end:function () {
-				var reviewFee = $("#reviewFee").val();
-				$("#"+tableId).load(location.href+"&reviewFee="+reviewFee + " #"+tableId);
+				$("#"+tableId).load(location.href+ " #"+tableId);
 			}
 		});
 	}
@@ -1508,8 +1514,7 @@
 					if(d.str.length>0){
 						parent.layer.msg(d.str,{icon:1});
 					}
-					var reviewFee = $("#reviewFee").val();
-					$("#"+tableId).load(location.href+"&reviewFee="+reviewFee + " #"+tableId);
+					$("#"+tableId).load(location.href + " #"+tableId);
 					//关闭当前页
 					top.layer.close(index)
 				}

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

@@ -1119,7 +1119,7 @@
 								}
 							}
 							//报告签发操作
-							if(d.projectReportStatus == 5 || d.projectReportStatus == 7 && d.emergencyProject != 1){
+							if((d.projectReportStatus == 5 || d.projectReportStatus == 7) && d.emergencyProject != 1){
 
 								if(d.projectReportStatusTwo == 0){
 									xml+="<a href=\"#\" onclick=\"openDialogre('报告签发', '${ctx}/ruralProject/ruralProjectMessageNewTwo/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 报告签发</a>";
@@ -1352,7 +1352,7 @@
 							}
 						}
 						<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:adminEdit">
-						if ('0'!=d.projectReportStatus && '1'!=d.projectReportStatus){
+						if ('0'!=d.projectReportStatus && '6'!=d.projectReportStatus && '1'!=d.projectReportStatus){
 							xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralProjectMessage/adminEditForm?projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改质量复核</a>";
 						}
 						if(d.paperFilingStatus == 5){

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

@@ -291,12 +291,22 @@
 <%--						</div>--%>
 <%--					</div>--%>
 <%--				</div>--%>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">送审规模（万元）：</label>
-					<div class="layui-input-block">
-						<form:input path="submitScale" readonly="true" style="background-color: #f1f1f1" id="submitScale" maxlength="12" htmlEscape="false" placeholder="请输入送审规模" class="form-control layui-input number"/>
+				<c:if test="${projectRecords.projectType == 2}">
+					<div class="layui-item layui-col-sm6 lw6">
+						<label class="layui-form-label double-line">送审规模（万元）：</label>
+						<div class="layui-input-block">
+							<form:input path="submitScale" readonly="true" style="background-color: #f1f1f1" id="submitScale" maxlength="12" htmlEscape="false" placeholder="请输入送审规模" class="form-control layui-input number"/>
+						</div>
 					</div>
-				</div>
+				</c:if>
+				<c:if test="${projectRecords.projectType == 1}">
+					<div class="layui-item layui-col-sm6 lw7">
+						<label class="layui-form-label double-line">咨询标的额(万元)：</label>
+						<div class="layui-input-block">
+							<form:input path="totalFees" readonly="true" style="background-color: #f1f1f1" htmlEscape="false" id="totalFees" placeholder="请输入咨询标的额(万元)" class="form-control layui-input number"/>
+						</div>
+					</div>
+				</c:if>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">工作开始日期：</label>
 					<div class="layui-input-block">