代码上传

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectReportRecordService.java

@@ -1857,7 +1857,7 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 								workattachment.setUrl(uploadFilePath);
 								workattachment.setType("doc");
 								workattachment.setAttachmentFlag("100");
-								workattachment.setAttachmentName("备考表.doc");
+								workattachment.setAttachmentName("电子档案备考表.doc");
 								workattachment.setAttachmentUser(UserUtils.getUser().getId());
 								workattachmentService.insertOnWorkAttachment(workattachment);
 							}

src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecords.java

@@ -35,6 +35,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private Date remindTime;	//提醒时间
 	private Date paperFilingAuditPassDate;	//A类纸质归档审核时间
 	private Date filingBatchAuditPassDate;	//B类纸质归档审核时间
+	private Date firstAuditDate;	//质量复核首次审核通过时间
 	private String hiatus;	//短期/永久（0:短期，1:永久）
 	private String pmdrCompanyId;
 	private String pmdrCreateBy;
@@ -2673,4 +2674,12 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setEndSubmitScale(String endSubmitScale) {
 		this.endSubmitScale = endSubmitScale;
 	}
+
+	public Date getFirstAuditDate() {
+		return firstAuditDate;
+	}
+
+	public void setFirstAuditDate(Date firstAuditDate) {
+		this.firstAuditDate = firstAuditDate;
+	}
 }

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

@@ -1045,10 +1045,16 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
      */
     @Transactional(readOnly = false)
     public void exigenceProjectSave(ProjectReportData projectReportData){
-        //添加审核通过日期
-        projectReportData.setAuditPassDate(new Date());
         //根据报告id查询超期状态
         ProjectReportData reportData = projectReportDataDao.get(projectReportData.getId());
+        //根据报告id查询是否存在审核通过时间。若没有则将当前时间设定为审核通过事件
+        //添加首次审核通过日期
+        if(null == reportData.getFirstAuditDate()){
+            projectReportData.setFirstAuditDate(new Date());
+        }
+
+        //添加审核通过日期
+        projectReportData.setAuditPassDate(new Date());
         //获取当前质量符合的数据信息判定该质量符合是否为超期，若为超期则对数据状态进行调整
         if(null != reportData && StringUtils.isNotBlank(reportData.getOverReportStatus()) && "1".equals(reportData.getOverReportStatus())){
             projectReportData.setStatus("7");
@@ -1319,6 +1325,9 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
                             projectReportData.setNumber(reportNo);*/
                             //添加审核通过日期
                             projectReportData.setAuditPassDate(new Date());
+                            if(null == projectReportData.getFirstAuditDate()){
+                                projectReportData.setFirstAuditDate(new Date());
+                            }
                         }
                         workActivityProcess.setIsApproval("1");
                     } else {

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

@@ -488,24 +488,27 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 
 				//判断是A类还是B类 2是A类1是B类
 				if ("1".equals(info.getSubmitMoney())){
+					if(info.getProjectReportNumber().equals("苏兴造字【2023】5231")){
+						System.out.println();
+					}
 					//设置电子未归档天数
-					if (null != info.getPrdAuditDate() && 5 != info.getProjectReportRecordStatus()
+					if (null != info.getFirstAuditDate() && 5 != info.getProjectReportRecordStatus()
 							&& 7!= info.getProjectReportRecordStatus()){
 						try {
-							Date date2 = format.parse(info.getPrdAuditDate());
+							Date date2 = info.getFirstAuditDate();
 							Long dateTimeLong = date.getTime();
 							Long date2TimeLong = date2.getTime();
 							//计算未归档天数
 							Long endTime = (dateTimeLong - date2TimeLong)/(24*60*60*1000);
-							endTime = endTime - endingAdventRecordCount;
+							endTime = endTime - endingAdventRecordCount+1;
 							info.setNoArchivedDays(endTime.toString());
-						} catch (ParseException e) {
+						} catch (Exception e) {
 							e.printStackTrace();
 						}
-					}else if (null != info.getPrdAuditDate() && (5 == info.getProjectReportRecordStatus()
+					}else if (null != info.getFirstAuditDate() && (5 == info.getProjectReportRecordStatus()
 							|| 7 == info.getProjectReportRecordStatus()) && null != info.getProjectReportRecordAuditDate()) {
 						try {
-							Date date2 = format.parse(info.getPrdAuditDate());
+							Date date2 = info.getFirstAuditDate();
 							//获取电子归档审核通过时间
 							Long dateTimeLong = info.getProjectReportRecordAuditDate().getTime();
 							Long date2TimeLong = date2.getTime();
@@ -513,31 +516,31 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 							Long endTime = (dateTimeLong - date2TimeLong) / (24 * 60 * 60 * 1000);
 							endTime = endTime - endingAdventRecordCount;
 							info.setNoArchivedDays(endTime.toString());
-						} catch (ParseException e) {
+						} catch (Exception e) {
 							e.printStackTrace();
 						}
 					}
 
 					//设置纸质未归档天数
-					if (null != info.getPrdAuditDate()
+					if (null != info.getFirstAuditDate()
 							&& !"5".equals(info.getPaperFilingStatus())
 							&& !"7".equals(info.getPaperFilingStatus()) && !"10".equals(info.getPaperFilingStatus())){
 						try {
-							Date date2 = format.parse(info.getPrdAuditDate());
+							Date date2 = info.getFirstAuditDate();
 							Long dateTimeLong = date.getTime();
 							Long date2TimeLong = date2.getTime();
 							//计算未归档天数
 							Long endTime = (dateTimeLong - date2TimeLong)/(24*60*60*1000);
 							endTime = endTime - endingAdventRecordBCount;
 							info.setPaperNoArchivedDays(endTime.toString());
-						} catch (ParseException e) {
+						} catch (Exception e) {
 							e.printStackTrace();
 						}
-					}else if(null != info.getPrdAuditDate()
+					}else if(null != info.getFirstAuditDate()
 							&& ("5".equals(info.getPaperFilingStatus())
 							|| "10".equals(info.getPaperFilingStatus())) && null != info.getFilingBatchAuditPassDate()) {
 						try {
-							Date date2 = format.parse(info.getPrdAuditDate());
+							Date date2 = info.getFirstAuditDate();
 							//获取电子归档审核通过时间
 							Long dateTimeLong = info.getFilingBatchAuditPassDate().getTime();
 							Long date2TimeLong = date2.getTime();
@@ -545,7 +548,7 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 							Long endTime = (dateTimeLong - date2TimeLong) / (24 * 60 * 60 * 1000);
 							endTime = endTime - endingAdventRecordBCount;
 							info.setPaperNoArchivedDays(endTime.toString());
-						} catch (ParseException e) {
+						} catch (Exception e) {
 							e.printStackTrace();
 						}
 
@@ -3349,7 +3352,7 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		//获取项目数据(非紧急项目-电子归档)
 		List<RuralProjectRecords> projectRecordsList = dao.getProjectRecordListByAdvent(projectRecords);
 		projectRecordsList.addAll(projectRecordsExamineList);
-		for (RuralProjectRecords info: projectRecordsList) {
+		/*for (RuralProjectRecords info: projectRecordsList) {
 			//判定 若项目类别为 数字化项目审核 则不进行考核
 			if("10".equals(info.getAttachmentProjectSort()) && "2".equals(info.getProjectType())){
 				continue;
@@ -3395,7 +3398,7 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 				}
 			}
 
-		}
+		}*/
 		//获取项目数据（获取已经超期的项目数据，进行修改超期状态）
 		List<RuralProjectRecords> projectNotReportExamineList = dao.getProjectNotrecordListExamine(projectRecords);
 		List<RuralProjectRecords> projectNotReportList = dao.getProjectNotrecordList(projectRecords);

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

@@ -1500,6 +1500,17 @@ public class RuralProjectMessageNewController extends BaseController {
                 Double ziXunShouRu = Double.valueOf(projectReportData.getZiXunShouRu());
                 reported.setZiXunShouRu(String.format("%.2f", ziXunShouRu));
             }
+            //咨询标的额处理
+            if(StringUtils.isNotBlank(records.getZiXunBDE()) && StringUtils.isNotBlank(reported.getZiXunBDE())){
+                if(StringUtils.isNotBlank(reported.getZiXunBDE()) && !"null".equals(reported.getZiXunBDE())){
+
+                }else if(StringUtils.isNotBlank(records.getZiXunBDE())){
+                    Double ziXunBDE = Double.valueOf(records.getZiXunBDE())/10000;
+                    reported.setZiXunBDE(String.format("%.2f", ziXunBDE));
+                }
+            }else{
+                reported.setZiXunBDE("");
+            }
 
 
             ruralProjectMessageS.disposeProjectRecords(records,reported);

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

@@ -3,6 +3,7 @@ package com.jeeplus.modules.ruralprojectrecords.web;
 import com.jeeplus.common.config.Global;
 import com.jeeplus.common.utils.MyBeanUtils;
 import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.utils.ThisLocalityDownloadUtil;
 import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActTaskService;
@@ -28,6 +29,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -386,4 +389,17 @@ public class RuralProjectRecordsDownMessageController extends BaseController {
             return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
         }
     }
+
+    /**
+     * 下载档案备考表模板
+     */
+    @RequestMapping(value = "downloadTemplate")
+    public void downloadTemplate(HttpServletRequest request, HttpServletResponse response) {
+        try {
+            ThisLocalityDownloadUtil download = new ThisLocalityDownloadUtil();
+            download.download("档案备考表.docx",request,response);
+        } catch (Exception e) {
+            logger.error("档案备考表下载失败！",e);
+        }
+    }
 }

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

@@ -177,18 +177,18 @@ public class RuralProjectSignatureOldMessageDisposeController extends BaseContro
     public Map<String,Object> reportView(){
         Map<String,Object> map = new HashMap<>();
         final Calendar c = Calendar.getInstance();
-        Integer year = c.get(Calendar.YEAR);
+        Integer year = 2023;
         System.out.println(c.get(Calendar.DATE));
         System.out.println(c.getActualMaximum(Calendar.DATE));
         //if (c.get(Calendar.DATE) == c.getActualMaximum(Calendar.DATE)){
         long l1 = System.currentTimeMillis();
-        Integer month = c.get(Calendar.MONTH); //第一个月从0开始，所以得到月份＋1
+        Integer month = 12; //第一个月从0开始，所以得到月份＋1
         //当月最后一天
         //projectRecordsService.getBatchArchiveNotify();
         logger.info("-----------公司级—月度报表（开始）------------------");
         statementCompanyComprehensiveService.disposeStatementCompany(year,2,month);
         logger.info("------------公司级—月度报表（结束）------------------");
-        logger.info("-----------部门级—月度报表（开始）------------------");
+        /*logger.info("-----------部门级—月度报表（开始）------------------");
         //statementCompanyComprehensiveService.disposeStatementOffice(year,2,month);
         logger.info("------------部门级—月度报表（结束）------------------");
         logger.info("------------公司级—年度报表(月报中年度信息)（开始)------------------");
@@ -199,7 +199,7 @@ public class RuralProjectSignatureOldMessageDisposeController extends BaseContro
         logger.info("------------部门级—年度报表(月报中年度信息)（结束）------------------");
         logger.info("-----------张静—月度报表（开始）------------------");
         // statementCompanyComprehensiveService.disposeReportDataStatementCompany(year,2,month);
-        logger.info("------------张静—月度报表（结束）------------------");
+        logger.info("------------张静—月度报表（结束）------------------");*/
         //}
 
         map.put("msgMonth","月度报表处理完成");
@@ -295,13 +295,13 @@ public class RuralProjectSignatureOldMessageDisposeController extends BaseContro
         Map<String,Object> map = new HashMap<>();
         /*logger.info("-----------项目超期未上报定时任务开始------------------");
         projectRecordsService.saveProjectReportedListByAdvent();
-        logger.info("------------项目超期未上报定时任务结束------------------");
+        logger.info("------------项目超期未上报定时任务结束------------------");*/
         logger.info("-----------项目超期未归档定时任务开始（电子归档）------------------");
         projectRecordsService.saveProjectRecordListByAdvent();
         logger.info("------------项目超期未归档定时任务结束（电子归档）------------------");
         logger.info("------------项目超期未质量符合定时任务开始--------------------");
         projectRecordsService.getJudgeAdvanceWeekNotice();
-        logger.info("------------项目超期未质量符合定时任务结束--------------------");*/
+        logger.info("------------项目超期未质量符合定时任务结束--------------------");
         /*logger.info("------------项目超期未质量符合定时任务开始--------------------");
         projectRecordsService.getJudgeAdvanceWeekNotice();
         logger.info("------------项目超期未质量符合定时任务结束--------------------");*/

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

@@ -5,7 +5,6 @@ package com.jeeplus.modules.workprojectnotify.web;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.google.common.collect.Lists;
 import com.jeeplus.common.config.Global;
@@ -14,7 +13,6 @@ import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.utils.DateUtils;
 import com.jeeplus.common.utils.MyBeanUtils;
 import com.jeeplus.common.utils.StringUtils;
-import com.jeeplus.common.utils.ThisLocalityDownloadUtil;
 import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.common.web.BaseController;
@@ -9708,18 +9706,5 @@ public class WorkProjectNotifyController extends BaseController {
 		}
 	}
 
-	/**
-	 * 下载档案备考表模板（废除）
-	 */
-	@RequestMapping(value = "downloadTemplate")
-	public void downloadTemplate(HttpServletRequest request,HttpServletResponse response) {
-		try {
-			ThisLocalityDownloadUtil download = new ThisLocalityDownloadUtil();
-			download.download("档案备考表.docx",request,response);
-		} catch (Exception e) {
-			logger.error("档案备考表下载失败！",e);
-		}
-	}
-
 
 }

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

@@ -441,7 +441,7 @@ END) as projectScale*/
 		,prd.id as prdId
 		,prr.id as prrId
 		,prd.audit_pass_date as auditPassDate
-		,prd.audit_pass_date as "reportAuditDate"
+		,prd.first_audit_date as "reportAuditDate"
 		,if(date_add(prd.audit_pass_date,interval #{endingCount} day) >now(),"0","1") as reportedType
 		,ifnull(rprr.report_status,0) as "reportStatus"
 		,ifnull(rprr.sync_status,0) as "syncStatus"

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

@@ -207,7 +207,7 @@
 	<select id="get" resultType="RuralProjectRecords" >
 		SELECT
 			<include refid="projectRecordsColumns"/>
-
+		,ifnull(prd.consult_fee,"") as "ziXunBDE"
 		,(SELECT group_concat( su.NAME ) FROM work_project_user wpu LEFT JOIN sys_user su ON su.id = wpu.user_id WHERE wpu.project_id = a.id ) AS "leaderNameStr",
 		(SELECT group_concat( su.id ) FROM work_project_user wpu LEFT JOIN sys_user su ON su.id = wpu.user_id WHERE wpu.project_id = a.id ) AS "leaderNameIds",
 		(select group_concat(office.name) from sys_office office left join sys_user suo on suo.office_id = office.id left join work_project_user wpu ON suo.id = wpu.user_id where wpu.project_id = a.id) AS "officeName"
@@ -2211,7 +2211,7 @@
 			and a.emergency_project = 1
 			and (a.reported_state=6 or a.reported_state is null)
 			and (prd.status = 5 or prd.status = 7)
-			and now() > date_add(prd.audit_pass_date,interval #{startCount} day)
+			and now() > date_add(prd.first_audit_date,interval #{startCount} day)
 		</where>
 	</select>
 
@@ -2614,7 +2614,7 @@
 			and (a.record_state=6 or a.record_state is null)
 			and (prd.status = 5 or prd.status = 7)
 			and pmdr.id is null
-			and now() > date_add(prd.audit_pass_date,interval #{startCount} day)
+			and now() > date_add(prd.first_audit_date,interval #{startCount} day)
 		</where>
 	</select>
 
@@ -2666,7 +2666,7 @@
 			and a.emergency_project = 1
 			and (a.record_state!=5 or a.record_state is null)
 			and (prd.status = 5 or prd.status = 7)
-			and now() > date_add(prd.audit_pass_date,interval #{endingCount} day)
+			and now() > date_add(prd.first_audit_date,interval #{endingCount} day)
 			and prd.audit_pass_date is not null
 			and a.record_state is null
 		</where>
@@ -3304,6 +3304,7 @@
 		,prr.id as prrId
 		,prrd.id as prrdId
 		,prd.audit_pass_date as auditPassDate
+		,prd.first_audit_date as firstAuditDate
 		,prd.audit_pass_date as "prdAuditDate"
 		,if(date_add(prd.audit_pass_date,interval #{ruralProjectRecords.endingCount} day) >now(),"0","1") as reportedType
 		,ifnull(rprr.report_status,0) as "reportStatus"
@@ -4851,7 +4852,7 @@
 			AND a.submit_money = 1
 			and (a.paper_filing_status != 10 or a.paper_filing_status is null)
 			AND (pfp.STATUS IS NULL or (pfp.STATUS != 5 and pfp.STATUS != 7))
-			and now() > date_add(prd.audit_pass_date,interval #{startCount} day)
+			and now() > date_add(prd.first_audit_date,interval #{startCount} day)
 			and (pmdrd.id is null or pmdrd.status = 1 or pmdrd.status = 2 or pmdrd.status = 3 or pmdrd.status = 4)
 		</where>
 	</select>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/adminSubmitReportedProvincialStandingForm.jsp

@@ -67,12 +67,12 @@
                     return false;
                 }
 
-                //审定价
-                if(!$("#ShenDingJia").is(":hidden")){
-                    var ShenDingJia = $("#ShenDingJia").val();
-                    if(undefined != ShenDingJia && null != ShenDingJia && "" != ShenDingJia){
-                        if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
-                            parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
+                //咨询标的额
+                if(!$("#ZiXunBDE").is(":hidden")){
+                    var ZiXunBDE = $("#ZiXunBDE").val();
+                    if(undefined != ZiXunBDE && null != ZiXunBDE && "" != ZiXunBDE){
+                        if(parseFloat(ZiXunShouRu) >= parseFloat(ZiXunBDE)){
+                            parent.layer.msg("咨询营业收入金额应小于咨询标的额!", {icon: 5});
                             return false;
                         }
                     }

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/bzshbReportedAudit.jsp

@@ -65,13 +65,14 @@
                         parent.layer.msg("咨询营业收入金额必须大于0!", {icon: 5});
                         return false;
                     }
-
-                    //审定价
-                    if(!$("#ShenDingJia").is(":hidden")){
-                        var ShenDingJia = $("#ShenDingJia").val();
-                        if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
-                            parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
-                            return false;
+                    //咨询标的额
+                    if(!$("#ZiXunBDE").is(":hidden")){
+                        var ZiXunBDE = $("#ZiXunBDE").val();
+                        if(undefined != ZiXunBDE && null != ZiXunBDE && "" != ZiXunBDE){
+                            if(parseFloat(ZiXunShouRu) >= parseFloat(ZiXunBDE)){
+                                parent.layer.msg("咨询营业收入金额应小于咨询标的额!", {icon: 5});
+                                return false;
+                            }
                         }
                     }
                     //审核增减率

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/newReportedForm.jsp

@@ -69,12 +69,12 @@
                         parent.layer.msg("咨询营业收入金额必须大于0!", {icon: 5});
                         return false;
                     }
-                    //审定价
-                    if(!$("#ShenDingJia").is(":hidden")){
-                        var ShenDingJia = $("#ShenDingJia").val();
-                        if(undefined != ShenDingJia && null != ShenDingJia && "" != ShenDingJia){
-                            if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
-                                parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
+                    //咨询标的额
+                    if(!$("#ZiXunBDE").is(":hidden")){
+                        var ZiXunBDE = $("#ZiXunBDE").val();
+                        if(undefined != ZiXunBDE && null != ZiXunBDE && "" != ZiXunBDE){
+                            if(parseFloat(ZiXunShouRu) >= parseFloat(ZiXunBDE)){
+                                parent.layer.msg("咨询营业收入金额应小于咨询标的额!", {icon: 5});
                                 return false;
                             }
                         }
@@ -1164,12 +1164,19 @@
                         </form:select>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw6">
+                <%--<div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:gridselectContract url="${ctx}/ruralProject/ruralProjectRecords/selectcontract" type="" isTotal="" id="contractId" name="workContractInfo.id"  value="${ruralProjectRecordsReported.workContractInfo.id}"  title="选择合同" labelName="ZiXunHTBH"
                                                 cssStyle="background-color:#fff"     labelValue="${ruralProjectRecordsReported.ziXunHTBH}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
                     </div>
+                </div>--%>
+
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
+                    <div class="layui-input-block with-icon">
+                        <form:input path="ZiXunHTBH" placeholder="请输入合同编号" htmlEscape="false" readonly="true" class="form-control layui-input required"/>
+                    </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>合同类型：</label>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/reportedAudit.jsp

@@ -65,13 +65,12 @@
                         parent.layer.msg("咨询营业收入金额必须大于0!", {icon: 5});
                         return false;
                     }
-
-                    //审定价
-                    if(!$("#ShenDingJia").is(":hidden")){
-                        var ShenDingJia = $("#ShenDingJia").val();
-                        if(undefined != ShenDingJia && null != ShenDingJia && "" != ShenDingJia){
-                            if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
-                                parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
+                    //咨询标的额
+                    if(!$("#ZiXunBDE").is(":hidden")){
+                        var ZiXunBDE = $("#ZiXunBDE").val();
+                        if(undefined != ZiXunBDE && null != ZiXunBDE && "" != ZiXunBDE){
+                            if(parseFloat(ZiXunShouRu) >= parseFloat(ZiXunBDE)){
+                                parent.layer.msg("咨询营业收入金额应小于咨询标的额!", {icon: 5});
                                 return false;
                             }
                         }

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/reportedModify.jsp

@@ -66,13 +66,12 @@
                     parent.layer.msg("咨询营业收入金额必须大于0!", {icon: 5});
                     return false;
                 }
-
-                //审定价
-                if(!$("#ShenDingJia").is(":hidden")){
-                    var ShenDingJia = $("#ShenDingJia").val();
-                    if(undefined != ShenDingJia && null != ShenDingJia && "" != ShenDingJia){
-                        if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
-                            parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
+                //咨询标的额
+                if(!$("#ZiXunBDE").is(":hidden")){
+                    var ZiXunBDE = $("#ZiXunBDE").val();
+                    if(undefined != ZiXunBDE && null != ZiXunBDE && "" != ZiXunBDE){
+                        if(parseFloat(ZiXunShouRu) >= parseFloat(ZiXunBDE)){
+                            parent.layer.msg("咨询营业收入金额应小于咨询标的额!", {icon: 5});
                             return false;
                         }
                     }
@@ -1156,12 +1155,18 @@
                         </form:select>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw6">
+                <%--<div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:gridselectContract url="${ctx}/ruralProject/ruralProjectRecords/selectcontract" type="" isTotal="" id="contractId" name="workContractInfo.id"  value="${ruralProjectRecordsReported.workContractInfo.id}"  title="选择合同" labelName="ZiXunHTBH"
                                                 cssStyle="background-color:#fff"     labelValue="${ruralProjectRecordsReported.ziXunHTBH}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
                     </div>
+                </div>--%>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
+                    <div class="layui-input-block with-icon">
+                        <form:input path="ZiXunHTBH" placeholder="请输入合同编号" htmlEscape="false" readonly="true" class="form-control layui-input required"/>
+                    </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>合同类型：</label>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/submitReportedProvincialStandingForm.jsp

@@ -66,13 +66,12 @@
                     parent.layer.msg("咨询营业收入金额必须大于0!", {icon: 5});
                     return false;
                 }
-
-                //审定价
-                if(!$("#ShenDingJia").is(":hidden")){
-                    var ShenDingJia = $("#ShenDingJia").val();
-                    if(undefined != ShenDingJia && null != ShenDingJia && "" != ShenDingJia){
-                        if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
-                            parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
+                //咨询标的额
+                if(!$("#ZiXunBDE").is(":hidden")){
+                    var ZiXunBDE = $("#ZiXunBDE").val();
+                    if(undefined != ZiXunBDE && null != ZiXunBDE && "" != ZiXunBDE){
+                        if(parseFloat(ZiXunShouRu) >= parseFloat(ZiXunBDE)){
+                            parent.layer.msg("咨询营业收入金额应小于咨询标的额!", {icon: 5});
                             return false;
                         }
                     }

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

@@ -69,12 +69,14 @@
                         parent.layer.msg("咨询营业收入金额必须大于0!", {icon: 5});
                         return false;
                     }
-                    //审定价
-                    if(!$("#ShenDingJia").is(":hidden")){
-                        var ShenDingJia = $("#ShenDingJia").val();
-                        if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
-                            parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
-                            return false;
+                    //咨询标的额
+                    if(!$("#ZiXunBDE").is(":hidden")){
+                        var ZiXunBDE = $("#ZiXunBDE").val();
+                        if(undefined != ZiXunBDE && null != ZiXunBDE && "" != ZiXunBDE){
+                            if(parseFloat(ZiXunShouRu) >= parseFloat(ZiXunBDE)){
+                                parent.layer.msg("咨询营业收入金额应小于咨询标的额!", {icon: 5});
+                                return false;
+                            }
                         }
                     }
                     //审核增减率

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

@@ -172,12 +172,14 @@
 							parent.layer.msg("咨询营业收入金额必须大于0!", {icon: 5});
 							return false;
 						}
-						//审定价
-						var ShenDingJia = $("#ShenDingJia").val();
-						if(undefined != ShenDingJia && null != ShenDingJia && "" != ShenDingJia){
-							if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
-								parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
-								return false;
+						//咨询标的额
+						if(!$("#ZiXunBDE").is(":hidden")){
+							var ZiXunBDE = $("#ZiXunBDE").val();
+							if(undefined != ZiXunBDE && null != ZiXunBDE && "" != ZiXunBDE){
+								if(parseFloat(ZiXunShouRu) >= parseFloat(ZiXunBDE)){
+									parent.layer.msg("咨询营业收入金额应小于咨询标的额!", {icon: 5});
+									return false;
+								}
 							}
 						}
 						var list = [];

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

@@ -71,13 +71,14 @@
                     parent.layer.msg("咨询营业收入金额必须大于0!", {icon: 5});
                     return false;
                 }
-
-                //审定价
-                if(!$("#ShenDingJia").is(":hidden")){
-                    var ShenDingJia = $("#ShenDingJia").val();
-                    if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
-                        parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
-                        return false;
+                //咨询标的额
+                if(!$("#ZiXunBDE").is(":hidden")){
+                    var ZiXunBDE = $("#ZiXunBDE").val();
+                    if(undefined != ZiXunBDE && null != ZiXunBDE && "" != ZiXunBDE){
+                        if(parseFloat(ZiXunShouRu) >= parseFloat(ZiXunBDE)){
+                            parent.layer.msg("咨询营业收入金额应小于咨询标的额!", {icon: 5});
+                            return false;
+                        }
                     }
                 }
                 var list = [];

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

@@ -71,13 +71,14 @@
                     parent.layer.msg("咨询营业收入金额必须大于0!", {icon: 5});
                     return false;
                 }
-
-                //审定价
-                if(!$("#ShenDingJia").is(":hidden")){
-                    var ShenDingJia = $("#ShenDingJia").val();
-                    if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
-                        parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
-                        return false;
+                //咨询标的额
+                if(!$("#ZiXunBDE").is(":hidden")){
+                    var ZiXunBDE = $("#ZiXunBDE").val();
+                    if(undefined != ZiXunBDE && null != ZiXunBDE && "" != ZiXunBDE){
+                        if(parseFloat(ZiXunShouRu) >= parseFloat(ZiXunBDE)){
+                            parent.layer.msg("咨询营业收入金额应小于咨询标的额!", {icon: 5});
+                            return false;
+                        }
                     }
                 }
                 var list = [];

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

@@ -61,13 +61,14 @@
                     parent.layer.msg("咨询营业收入金额必须大于0!", {icon: 5});
                     return false;
                 }
-
-                //审定价
-                if(!$("#ShenDingJia").is(":hidden")){
-                    var ShenDingJia = $("#ShenDingJia").val();
-                    if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
-                        parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
-                        return false;
+                //咨询标的额
+                if(!$("#ZiXunBDE").is(":hidden")){
+                    var ZiXunBDE = $("#ZiXunBDE").val();
+                    if(undefined != ZiXunBDE && null != ZiXunBDE && "" != ZiXunBDE){
+                        if(parseFloat(ZiXunShouRu) >= parseFloat(ZiXunBDE)){
+                            parent.layer.msg("咨询营业收入金额应小于咨询标的额!", {icon: 5});
+                            return false;
+                        }
                     }
                 }
                 //审核增减率

src/main/webapp/webpage/modules/ruralprojectrecords/reported/import/adminReportedForm.jsp

@@ -69,12 +69,12 @@
                         parent.layer.msg("咨询营业收入金额必须大于0!", {icon: 5});
                         return false;
                     }
-                    //审定价
-                    if(!$("#ShenDingJia").is(":hidden")){
-                        var ShenDingJia = $("#ShenDingJia").val();
-                        if(undefined != ShenDingJia && null != ShenDingJia && "" != ShenDingJia){
-                            if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
-                                parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
+                    //咨询标的额
+                    if(!$("#ZiXunBDE").is(":hidden")){
+                        var ZiXunBDE = $("#ZiXunBDE").val();
+                        if(undefined != ZiXunBDE && null != ZiXunBDE && "" != ZiXunBDE){
+                            if(parseFloat(ZiXunShouRu) >= parseFloat(ZiXunBDE)){
+                                parent.layer.msg("咨询营业收入金额应小于咨询标的额!", {icon: 5});
                                 return false;
                             }
                         }

src/main/webapp/webpage/modules/ruralprojectrecords/reported/import/reportedAudit.jsp

@@ -66,12 +66,12 @@
                         return false;
                     }
 
-                    //审定价
-                    if(!$("#ShenDingJia").is(":hidden")){
-                        var ShenDingJia = $("#ShenDingJia").val();
-                        if(undefined != ShenDingJia && null != ShenDingJia && "" != ShenDingJia){
-                            if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
-                                parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
+                    //咨询标的额
+                    if(!$("#ZiXunBDE").is(":hidden")){
+                        var ZiXunBDE = $("#ZiXunBDE").val();
+                        if(undefined != ZiXunBDE && null != ZiXunBDE && "" != ZiXunBDE){
+                            if(parseFloat(ZiXunShouRu) >= parseFloat(ZiXunBDE)){
+                                parent.layer.msg("咨询营业收入金额应小于咨询标的额!", {icon: 5});
                                 return false;
                             }
                         }

src/main/webapp/webpage/modules/ruralprojectrecords/reported/import/reportedForm.jsp

@@ -69,12 +69,12 @@
                         parent.layer.msg("咨询营业收入金额必须大于0!", {icon: 5});
                         return false;
                     }
-                    //审定价
-                    if(!$("#ShenDingJia").is(":hidden")){
-                        var ShenDingJia = $("#ShenDingJia").val();
-                        if(undefined != ShenDingJia && null != ShenDingJia && "" != ShenDingJia){
-                            if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
-                                parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
+                    //咨询标的额
+                    if(!$("#ZiXunBDE").is(":hidden")){
+                        var ZiXunBDE = $("#ZiXunBDE").val();
+                        if(undefined != ZiXunBDE && null != ZiXunBDE && "" != ZiXunBDE){
+                            if(parseFloat(ZiXunShouRu) >= parseFloat(ZiXunBDE)){
+                                parent.layer.msg("咨询营业收入金额应小于咨询标的额!", {icon: 5});
                                 return false;
                             }
                         }

src/main/webapp/webpage/modules/ruralprojectrecords/reported/import/reportedModify.jsp

@@ -67,12 +67,12 @@
                     return false;
                 }
 
-                //审定价
-                if(!$("#ShenDingJia").is(":hidden")){
-                    var ShenDingJia = $("#ShenDingJia").val();
-                    if(undefined != ShenDingJia && null != ShenDingJia && "" != ShenDingJia){
-                        if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
-                            parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
+                //咨询标的额
+                if(!$("#ZiXunBDE").is(":hidden")){
+                    var ZiXunBDE = $("#ZiXunBDE").val();
+                    if(undefined != ZiXunBDE && null != ZiXunBDE && "" != ZiXunBDE){
+                        if(parseFloat(ZiXunShouRu) >= parseFloat(ZiXunBDE)){
+                            parent.layer.msg("咨询营业收入金额应小于咨询标的额!", {icon: 5});
                             return false;
                         }
                     }

src/main/webapp/webpage/modules/ruralprojectrecords/reported/import/reportedView.jsp

@@ -69,12 +69,12 @@
                         parent.layer.msg("咨询营业收入金额必须大于0!", {icon: 5});
                         return false;
                     }
-                    //审定价
-                    if(!$("#ShenDingJia").is(":hidden")){
-                        var ShenDingJia = $("#ShenDingJia").val();
-                        if(undefined != ShenDingJia && null != ShenDingJia && "" != ShenDingJia){
-                            if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
-                                parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
+                    //咨询标的额
+                    if(!$("#ZiXunBDE").is(":hidden")){
+                        var ZiXunBDE = $("#ZiXunBDE").val();
+                        if(undefined != ZiXunBDE && null != ZiXunBDE && "" != ZiXunBDE){
+                            if(parseFloat(ZiXunShouRu) >= parseFloat(ZiXunBDE)){
+                                parent.layer.msg("咨询营业收入金额应小于咨询标的额!", {icon: 5});
                                 return false;
                             }
                         }

src/main/webapp/webpage/modules/ruralprojectrecords/reported/reportedAudit.jsp

@@ -66,12 +66,12 @@
                         return false;
                     }
 
-                    //审定价
-                    if(!$("#ShenDingJia").is(":hidden")){
-                        var ShenDingJia = $("#ShenDingJia").val();
-                        if(undefined != ShenDingJia && null != ShenDingJia && "" != ShenDingJia){
-                            if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
-                                parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
+                    //咨询标的额
+                    if(!$("#ZiXunBDE").is(":hidden")){
+                        var ZiXunBDE = $("#ZiXunBDE").val();
+                        if(undefined != ZiXunBDE && null != ZiXunBDE && "" != ZiXunBDE){
+                            if(parseFloat(ZiXunShouRu) >= parseFloat(ZiXunBDE)){
+                                parent.layer.msg("咨询营业收入金额应小于咨询标的额!", {icon: 5});
                                 return false;
                             }
                         }

src/main/webapp/webpage/modules/ruralprojectrecords/reported/reportedForm.jsp

@@ -69,12 +69,12 @@
                         parent.layer.msg("咨询营业收入金额必须大于0!", {icon: 5});
                         return false;
                     }
-                    //审定价
-                    if(!$("#ShenDingJia").is(":hidden")){
-                        var ShenDingJia = $("#ShenDingJia").val();
-                        if(undefined != ShenDingJia && null != ShenDingJia && "" != ShenDingJia){
-                            if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
-                                parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
+                    //咨询标的额
+                    if(!$("#ZiXunBDE").is(":hidden")){
+                        var ZiXunBDE = $("#ZiXunBDE").val();
+                        if(undefined != ZiXunBDE && null != ZiXunBDE && "" != ZiXunBDE){
+                            if(parseFloat(ZiXunShouRu) >= parseFloat(ZiXunBDE)){
+                                parent.layer.msg("咨询营业收入金额应小于咨询标的额!", {icon: 5});
                                 return false;
                             }
                         }

src/main/webapp/webpage/modules/ruralprojectrecords/reported/reportedModify.jsp

@@ -66,13 +66,12 @@
                     parent.layer.msg("咨询营业收入金额必须大于0!", {icon: 5});
                     return false;
                 }
-
-                //审定价
-                if(!$("#ShenDingJia").is(":hidden")){
-                    var ShenDingJia = $("#ShenDingJia").val();
-                    if(undefined != ShenDingJia && null != ShenDingJia && "" != ShenDingJia){
-                        if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
-                            parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
+                //咨询标的额
+                if(!$("#ZiXunBDE").is(":hidden")){
+                    var ZiXunBDE = $("#ZiXunBDE").val();
+                    if(undefined != ZiXunBDE && null != ZiXunBDE && "" != ZiXunBDE){
+                        if(parseFloat(ZiXunShouRu) >= parseFloat(ZiXunBDE)){
+                            parent.layer.msg("咨询营业收入金额应小于咨询标的额!", {icon: 5});
                             return false;
                         }
                     }

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

@@ -171,12 +171,14 @@
 							parent.layer.msg("咨询营业收入金额必须大于0!", {icon: 5});
 							return false;
 						}
-						//审定价
-						var ShenDingJia = $("#ShenDingJia").val();
-						if(undefined != ShenDingJia && null != ShenDingJia && "" != ShenDingJia){
-							if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
-								parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
-								return false;
+						//咨询标的额
+						if(!$("#ZiXunBDE").is(":hidden")){
+							var ZiXunBDE = $("#ZiXunBDE").val();
+							if(undefined != ZiXunBDE && null != ZiXunBDE && "" != ZiXunBDE){
+								if(parseFloat(ZiXunShouRu) >= parseFloat(ZiXunBDE)){
+									parent.layer.msg("咨询营业收入金额应小于咨询标的额!", {icon: 5});
+									return false;
+								}
 							}
 						}
 						var list = [];

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

@@ -1164,9 +1164,9 @@
                         var st = getAuditState(d.projectReportStatus);
                         if(st.action){
 							if (d.submitMoney=="1"){
-								var xml = "<span title='质量复核时间："+ d.reportAuditDate +"' class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								var xml = "<span title='质量复核首次通过时间："+ d.reportAuditDate +"' class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 							}else if (d.submitMoney=="2"){
-								var xml = "<span title='质量复核时间："+ d.reportAuditDate +"' onclick=\"openDialogReportView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getProcessOne?id=" + d.id + "&projectReportData.id=" + d.bid + "&type=2','"+ d.id +"','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								var xml = "<span title='质量复核首次通过时间："+ d.reportAuditDate +"' onclick=\"openDialogReportView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getProcessOne?id=" + d.id + "&projectReportData.id=" + d.bid + "&type=2','"+ d.id +"','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 							}
 						} else{
 							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";

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

@@ -69,12 +69,12 @@
                         parent.layer.msg("咨询营业收入金额必须大于0!", {icon: 5});
                         return false;
                     }
-                    //审定价
-                    if(!$("#ShenDingJia").is(":hidden")){
-                        var ShenDingJia = $("#ShenDingJia").val();
-                        if(undefined != ShenDingJia && null != ShenDingJia && "" != ShenDingJia){
-                            if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
-                                parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
+                    //咨询标的额
+                    if(!$("#ZiXunBDE").is(":hidden")){
+                        var ZiXunBDE = $("#ZiXunBDE").val();
+                        if(undefined != ZiXunBDE && null != ZiXunBDE && "" != ZiXunBDE){
+                            if(parseFloat(ZiXunShouRu) >= parseFloat(ZiXunBDE)){
+                                parent.layer.msg("咨询营业收入金额应小于咨询标的额!", {icon: 5});
                                 return false;
                             }
                         }
@@ -1134,12 +1134,18 @@
                         </form:select>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw6">
+                <%--<div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:gridselectContract url="${ctx}/ruralProject/ruralProjectRecords/selectcontract" type="" isTotal="" id="contractId" name="workContractInfo.id"  value="${ruralProjectRecordsReported.workContractInfo.id}"  title="选择合同" labelName="ZiXunHTBH"
                                                 cssStyle="background-color:#fff"     labelValue="${ruralProjectRecordsReported.ziXunHTBH}" cssClass="form-control judgment layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
                     </div>
+                </div>--%>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
+                    <div class="layui-input-block with-icon">
+                        <form:input path="ZiXunHTBH" placeholder="请输入合同编号" htmlEscape="false" readonly="true" class="form-control layui-input required"/>
+                    </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>合同类型：</label>

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

@@ -66,13 +66,12 @@
                     parent.layer.msg("咨询营业收入金额必须大于0!", {icon: 5});
                     return false;
                 }
-
-                //审定价
-                if(!$("#ShenDingJia").is(":hidden")){
-                    var ShenDingJia = $("#ShenDingJia").val();
-                    if(undefined != ShenDingJia && null != ShenDingJia && "" != ShenDingJia){
-                        if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
-                            parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
+                //咨询标的额
+                if(!$("#ZiXunBDE").is(":hidden")){
+                    var ZiXunBDE = $("#ZiXunBDE").val();
+                    if(undefined != ZiXunBDE && null != ZiXunBDE && "" != ZiXunBDE){
+                        if(parseFloat(ZiXunShouRu) >= parseFloat(ZiXunBDE)){
+                            parent.layer.msg("咨询营业收入金额应小于咨询标的额!", {icon: 5});
                             return false;
                         }
                     }
@@ -1136,12 +1135,18 @@
                         </form:select>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw6">
+                <%--<div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:gridselectContract url="${ctx}/ruralProject/ruralProjectRecords/selectcontract" type="" isTotal="" id="contractId" name="workContractInfo.id"  value="${ruralProjectRecordsReported.workContractInfo.id}"  title="选择合同" labelName="ZiXunHTBH"
                                                 cssStyle="background-color:#fff"     labelValue="${ruralProjectRecordsReported.ziXunHTBH}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
                     </div>
+                </div>--%>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
+                    <div class="layui-input-block with-icon">
+                        <form:input path="ZiXunHTBH" placeholder="请输入合同编号" htmlEscape="false" readonly="true" class="form-control layui-input required"/>
+                    </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>合同类型：</label>

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

@@ -171,12 +171,14 @@
 							parent.layer.msg("咨询营业收入金额必须大于0!", {icon: 5});
 							return false;
 						}
-						//审定价
-						var ShenDingJia = $("#ShenDingJia").val();
-						if(undefined != ShenDingJia && null != ShenDingJia && "" != ShenDingJia){
-							if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
-								parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
-								return false;
+						//咨询标的额
+						if(!$("#ZiXunBDE").is(":hidden")){
+							var ZiXunBDE = $("#ZiXunBDE").val();
+							if(undefined != ZiXunBDE && null != ZiXunBDE && "" != ZiXunBDE){
+								if(parseFloat(ZiXunShouRu) >= parseFloat(ZiXunBDE)){
+									parent.layer.msg("咨询营业收入金额应小于咨询标的额!", {icon: 5});
+									return false;
+								}
 							}
 						}
 						var list = [];

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

@@ -1080,18 +1080,23 @@
 							</div>
 						</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 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="consultFee" path="projectReportData.consultFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+							</div>
+						</div>
+
+						<div class="layui-item layui-col-sm6">
+							<span style="color: red">注：咨询标的额是指咨询项目编审后的最终造价，其中工程结算项目填审定价，标底编制填招标控制价，工程造价全过程管理填工程投资总额或审定价</span>
+						</div>
 						<c:if test="${projectRecords.projectType == 2}">
 							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label">土建造价(元)：</label>

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

@@ -782,12 +782,15 @@
                     </div>
                 </c:if>
 
-                <%--<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="consultFee" path="projectReportData.consultFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+                        <form:input id="consultFee" path="projectReportData.consultFee" htmlEscape="false"  class="form-control layui-input"/>
                     </div>
-                </div>--%>
+                </div>
+                <div class="layui-item layui-col-sm6">
+                    <span style="color: red">注：咨询标的额是指咨询项目编审后的最终造价，其中工程结算项目填审定价，标底编制填招标控制价，工程造价全过程管理填工程投资总额或审定价</span>
+                </div>
                 <c:if test="${projectRecords.projectType == 2}">
                     <div class="layui-item layui-col-sm6">
                         <label class="layui-form-label">土建造价(元)：</label>

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

@@ -1122,13 +1122,8 @@
 							<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">
-						<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" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input number" onchange="getBuildingFee()"/>
@@ -1159,6 +1154,15 @@
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6 lw7">
+						<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"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6 lw7">
+						<span style="color: red">注：咨询标的额是指咨询项目编审后的最终造价，其中工程结算项目填审定价，标底编制填招标控制价，工程造价全过程管理填工程投资总额或审定价</span>
+					</div>
+					<div class="layui-item layui-col-sm6 lw7">
 						<label class="layui-form-label"><span class="require-item">*</span>工作开始日期：</label>
 						<div class="layui-input-block">
 							<input placeholder="请选择开始日期" style="background-color: #fff" class="laydate-icondate form-control layui-input judgment layer-date laydate-icon" readonly="readonly" id="startDate" name="projectOnRural.startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">

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

@@ -65,13 +65,14 @@
                         parent.layer.msg("咨询营业收入金额必须大于0!", {icon: 5});
                         return false;
                     }
-
-                    //审定价
-                    if(!$("#ShenDingJia").is(":hidden")){
-                        var ShenDingJia = $("#ShenDingJia").val();
-                        if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
-                            parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
-                            return false;
+                    //咨询标的额
+                    if(!$("#ZiXunBDE").is(":hidden")){
+                        var ZiXunBDE = $("#ZiXunBDE").val();
+                        if(undefined != ZiXunBDE && null != ZiXunBDE && "" != ZiXunBDE){
+                            if(parseFloat(ZiXunShouRu) >= parseFloat(ZiXunBDE)){
+                                parent.layer.msg("咨询营业收入金额应小于咨询标的额!", {icon: 5});
+                                return false;
+                            }
                         }
                     }
                     //审核增减率

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

@@ -69,12 +69,14 @@
                         parent.layer.msg("咨询营业收入金额必须大于0!", {icon: 5});
                         return false;
                     }
-                    //审定价
-                    if(!$("#ShenDingJia").is(":hidden")){
-                        var ShenDingJia = $("#ShenDingJia").val();
-                        if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
-                            parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
-                            return false;
+                    //咨询标的额
+                    if(!$("#ZiXunBDE").is(":hidden")){
+                        var ZiXunBDE = $("#ZiXunBDE").val();
+                        if(undefined != ZiXunBDE && null != ZiXunBDE && "" != ZiXunBDE){
+                            if(parseFloat(ZiXunShouRu) >= parseFloat(ZiXunBDE)){
+                                parent.layer.msg("咨询营业收入金额应小于咨询标的额!", {icon: 5});
+                                return false;
+                            }
                         }
                     }
                     //审核增减率

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

@@ -72,12 +72,14 @@
                     return false;
                 }
 
-                //审定价
-                if(!$("#ShenDingJia").is(":hidden")){
-                    var ShenDingJia = $("#ShenDingJia").val();
-                    if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
-                        parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
-                        return false;
+                //咨询标的额
+                if(!$("#ZiXunBDE").is(":hidden")){
+                    var ZiXunBDE = $("#ZiXunBDE").val();
+                    if(undefined != ZiXunBDE && null != ZiXunBDE && "" != ZiXunBDE){
+                        if(parseFloat(ZiXunShouRu) >= parseFloat(ZiXunBDE)){
+                            parent.layer.msg("咨询营业收入金额应小于咨询标的额!", {icon: 5});
+                            return false;
+                        }
                     }
                 }
                 var list = [];

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

@@ -67,12 +67,12 @@
                     return false;
                 }
 
-                //审定价
-                if(!$("#ShenDingJia").is(":hidden")){
-                    var ShenDingJia = $("#ShenDingJia").val();
-                    if(undefined != ShenDingJia && null != ShenDingJia && "" != ShenDingJia){
-                        if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
-                            parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
+                //咨询标的额
+                if(!$("#ZiXunBDE").is(":hidden")){
+                    var ZiXunBDE = $("#ZiXunBDE").val();
+                    if(undefined != ZiXunBDE && null != ZiXunBDE && "" != ZiXunBDE){
+                        if(parseFloat(ZiXunShouRu) >= parseFloat(ZiXunBDE)){
+                            parent.layer.msg("咨询营业收入金额应小于咨询标的额!", {icon: 5});
                             return false;
                         }
                     }
@@ -1144,12 +1144,18 @@
                         </form:select>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw6">
+                <%--<div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:gridselectContract url="${ctx}/ruralProject/ruralProjectRecords/selectcontract" type="" isTotal="" id="contractId" name="workContractInfo.id"  value="${ruralProjectRecordsReported.workContractInfo.id}"  title="选择合同" labelName="ZiXunHTBH"
                                                 cssStyle="background-color:#fff"     labelValue="${ruralProjectRecordsReported.ziXunHTBH}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
                     </div>
+                </div>--%>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
+                    <div class="layui-input-block with-icon">
+                        <form:input path="ZiXunHTBH" placeholder="请输入合同编号" htmlEscape="false" readonly="true" class="form-control layui-input required"/>
+                    </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>合同类型：</label>

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

@@ -356,18 +356,21 @@
 					<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">
-					<label class="layui-form-label">送审价(元)：</label>
-					<div class="layui-input-block with-icon">
-						<form:input id="reviewFee" path="projectReportData.reviewFee" cssStyle="background-color: #f1f1f1" 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" cssStyle="background-color: #f1f1f1" 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" cssStyle="background-color: #f1f1f1" 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" cssStyle="background-color: #f1f1f1" 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">
@@ -397,48 +400,66 @@
 						<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" cssStyle="background-color: #f1f1f1" 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" cssStyle="background-color: #f1f1f1" 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" cssStyle="background-color: #f1f1f1" 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" cssStyle="background-color: #f1f1f1" path="projectReportData.verifyRate" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+						</div>
+					</div>
+				</c:if>
+				<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="consultFee" cssStyle="background-color: #f1f1f1" 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" cssStyle="background-color: #f1f1f1" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
-					</div>
+					<span style="color: red">注：咨询标的额是指咨询项目编审后的最终造价，其中工程结算项目填审定价，标底编制填招标控制价，工程造价全过程管理填工程投资总额或审定价</span>
 				</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" cssStyle="background-color: #f1f1f1" 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" cssStyle="background-color: #f1f1f1" 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" cssStyle="background-color: #f1f1f1" 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" cssStyle="background-color: #f1f1f1" 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" cssStyle="background-color: #f1f1f1" 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" cssStyle="background-color: #f1f1f1" 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" cssStyle="background-color: #f1f1f1" 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>
@@ -452,12 +473,7 @@
 						<input class=" form-control layui-input" style="background-color: #f1f1f1" readonly="readonly" id="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"  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>