Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/bzshbExamine/dao/BzshbExaminDao.java

@@ -3,6 +3,7 @@ package com.jeeplus.modules.bzshbExamine.dao;
 import com.jeeplus.common.persistence.CrudDao;
 import com.jeeplus.common.persistence.annotation.MyBatisDao;
 import com.jeeplus.modules.bzshbExamine.entity.BzshbExaminInfo;
+import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 
 import java.util.List;
@@ -62,4 +63,11 @@ public interface BzshbExaminDao extends CrudDao<BzshbExaminInfo> {
      * @return
      */
     List<BzshbExaminInfo> getProjectRecordsExd(BzshbExaminInfo bzshbExaminInfo);
+
+    /**
+     * 修改报告的抽查状态以及评分
+     * @param projectReportData
+     * @return
+     */
+    Integer updateBzshbExamin(ProjectReportData projectReportData);
 }

src/main/java/com/jeeplus/modules/bzshbExamine/entity/BzshbExaminInfo.java

@@ -34,6 +34,7 @@ public class BzshbExaminInfo extends DataEntity<BzshbExaminInfo> {
     private String masterName;      //项目责任人
     private Integer examinFlag;     //是否检查标识（1：已查；0：未查）
     private String examinFlagStr;   //是否检查
+    private String examinScore;   //检查分数
     private String view;
 
 
@@ -197,4 +198,12 @@ public class BzshbExaminInfo extends DataEntity<BzshbExaminInfo> {
     public void setAuditUserList(List<User> auditUserList) {
         this.auditUserList = auditUserList;
     }
+
+    public String getExaminScore() {
+        return examinScore;
+    }
+
+    public void setExaminScore(String examinScore) {
+        this.examinScore = examinScore;
+    }
 }

src/main/java/com/jeeplus/modules/bzshbExamine/web/BzshbExaminController.java

@@ -1,6 +1,7 @@
 package com.jeeplus.modules.bzshbExamine.web;
 
 import com.google.common.collect.Lists;
+import com.jeeplus.common.config.Global;
 import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.utils.MyBeanUtils;
 import com.jeeplus.common.utils.StringUtils;
@@ -13,6 +14,7 @@ import com.jeeplus.modules.projectAccessory.service.ProjectTemplateService;
 import com.jeeplus.modules.projectEngineering.service.ProjectEngineeringService;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
+import com.jeeplus.modules.projectcontentinfo.service.ProjectContentDataService;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataService;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectcontentinfoService;
 import com.jeeplus.modules.projectrecord.entity.ProjectPlanInfo;
@@ -41,6 +43,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -84,6 +87,8 @@ public class BzshbExaminController extends BaseController {
     private WorkContractInfoService workContractInfoService;
     @Autowired
     private ProjectPlanService projectPlanService;
+    @Autowired
+    private ProjectContentDataService projectContentDataService;
 
     /**
      * 查询列表
@@ -143,7 +148,17 @@ public class BzshbExaminController extends BaseController {
             ruralProjectRecords.setProjectMasterName(projectReportData.getPrincipal().getName());
         }
         Projectcontentinfo projectcontentinfo = projectcontentinfoService.getByInfoId(projectReportData.getId());
+
+        //获取总审抽查的质量复核标准
+        String reviewId="2";
+        List<WorkReviewAudit> workReviewAudits = projectContentDataService.findListExamin(reviewId,"紧急项目");
+        if (null!=workReviewAudits){
+            projectReportData.setProjectReviewList(workReviewAudits);
+            model.addAttribute("workReviewAudits", workReviewAudits);
+        }
         projectcontentinfo.setProjectReportData(projectReportData);
+
+
         //添加当前文件服务器类型
         projectcontentinfo.setUploadMode(uploadMode);
         List<MainDictDetail> achievementTypes = DictUtils.getMainDictList("achievement_type");
@@ -321,19 +336,20 @@ public class BzshbExaminController extends BaseController {
         model.addAttribute("subProjectInfos", subProjectInfos);
         model.addAttribute("workContractInfo", workContractInfo);
         model.addAttribute("projectRecordPlans", projectRecordPlans);
-        WorkReviewAudit workReviewAudit = new WorkReviewAudit();
         model.addAttribute("projectReportData", projectReportData);
-        workReviewAudit.setCompanyId(UserUtils.getSelectCompany().getId());
-        workReviewAudit.setReportId(projectReportData.getId());
-        List<WorkReviewAudit> workReviewAudits = workReviewStandardService.findAuditList(workReviewAudit);
-        model.addAttribute("list", workReviewAudits);
-
         model.addAttribute("consultantinfo", consultants);
         model.addAttribute("consultantCount", consultants.size());
         projectcontentinfo.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileAttachmentList()));
         projectcontentinfo.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileGistdataList()));
         projectcontentinfo.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileOtherList()));
         if("view".equals(bzshbExaminInfo.getView())){
+            WorkReviewAudit workReviewAudit = new WorkReviewAudit();
+            String type = "4";
+            workReviewAudit.setCompanyId(UserUtils.getSelectCompany().getId());
+            workReviewAudit.setType(type);
+            workReviewAudit.setReportId(projectReportData.getId());
+            List<WorkReviewAudit> workReviewAuditList = workReviewStandardService.findAuditList(workReviewAudit);
+            model.addAttribute("list", workReviewAuditList);
             return "modules/bzshbExamin/bzshbExamineView";
         }
         return "modules/bzshbExamin/bzshbExamineform";
@@ -413,4 +429,14 @@ public class BzshbExaminController extends BaseController {
         projectRecords.setUploadMode(uploadMode);
         return projectRecords;
     }
+    @ResponseBody
+    @RequestMapping(value = {"saveScore"})
+    public String saveScore(Projectcontentinfo projectcontentinfo){
+        try {
+            workReviewStandardService.saveExaminAudit(projectcontentinfo);
+            return "抽查成功";
+        }catch (Exception e){
+            return "抽查失败";
+        }
+    }
 }

src/main/java/com/jeeplus/modules/projectcontentinfo/entity/ProjectReportData.java

@@ -118,6 +118,8 @@ public class ProjectReportData extends ActEntity<ProjectReportData> {
 	private String contractCategory;	//报告合同类别
 	private String contractRate;	//合同费率
 
+	private String examinScore;		//抽查总分
+
 
 	public String getUpId() {
 		return upId;
@@ -780,4 +782,12 @@ public class ProjectReportData extends ActEntity<ProjectReportData> {
 	public void setZiXunShouRu(String ziXunShouRu) {
 		ZiXunShouRu = ziXunShouRu;
 	}
+
+	public String getExaminScore() {
+		return examinScore;
+	}
+
+	public void setExaminScore(String examinScore) {
+		this.examinScore = examinScore;
+	}
 }

src/main/java/com/jeeplus/modules/projectcontentinfo/entity/Projectcontentinfo.java

@@ -14,6 +14,7 @@ import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecordsReported;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralReportConsultant;
 import com.jeeplus.modules.sys.entity.Workattachment;
+import com.jeeplus.modules.workreview.entity.WorkReviewAudit;
 
 import java.util.Date;
 import java.util.List;
@@ -67,6 +68,8 @@ public class Projectcontentinfo extends TreeEntity<Projectcontentinfo> {
 	private List<String> chargeCriterionList;	//合同收费标准
 
 	private RuralProjectRecordsReported recordsReported;	//上报
+	private List<WorkReviewAudit> projectReviewList;	//复核抽查标准
+	private String reviewScore;		//复核标准总分
 
 
 	public RuralProjectRecords getProjectOnRural() {
@@ -362,4 +365,20 @@ public class Projectcontentinfo extends TreeEntity<Projectcontentinfo> {
 	public void setProjectReportDataTwo(ProjectReportDataTwo projectReportDataTwo) {
 		this.projectReportDataTwo = projectReportDataTwo;
 	}
+
+	public List<WorkReviewAudit> getProjectReviewList() {
+		return projectReviewList;
+	}
+
+	public void setProjectReviewList(List<WorkReviewAudit> projectReviewList) {
+		this.projectReviewList = projectReviewList;
+	}
+
+	public String getReviewScore() {
+		return reviewScore;
+	}
+
+	public void setReviewScore(String reviewScore) {
+		this.reviewScore = reviewScore;
+	}
 }

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

@@ -461,4 +461,39 @@ public class ProjectContentDataService extends CrudService<ProjectContentDataDao
         }
         return workReviewAudits;
     }
+    /**
+     * 总审抽查标准
+     * @param reviewId
+     * @param name
+     * @return
+     */
+    public List<WorkReviewAudit> findListExamin(String reviewId,String name) {
+        WorkReviewStandard workReviewStandard = new WorkReviewStandard();
+        workReviewStandard.setStandardDetail(name);
+        String reviewIds = "0,"+reviewId+",";
+        workReviewStandard.setParentIds(reviewIds);
+        workReviewStandard.setType(reviewId);
+        List<WorkReviewStandard> workReviewStandards = workReviewStandardService.findListByType(workReviewStandard);
+        List<WorkReviewAudit> workReviewAudits = new ArrayList<>();
+        for (WorkReviewStandard reviewStandard:workReviewStandards){
+            int orderNum = Integer.parseInt(reviewStandard.getOrderNum());
+            if (orderNum>200100){
+                WorkReviewAudit workReviewAudit = new WorkReviewAudit();
+                workReviewAudit.setMaxDeduct(reviewStandard.getMaxDeduct());
+                workReviewAudit.setOrderNum(reviewStandard.getOrderNum());
+                workReviewAudit.setStandardDetail(reviewStandard.getStandardDetail());
+                workReviewAudit.setSort(reviewStandard.getSort());
+                workReviewAudit.setId(reviewStandard.getId());
+                if (orderNum>200100 && orderNum<200199){
+                    workReviewAudit.setType("1");
+                    workReviewAudit.setParent(new WorkReviewAudit("0"));
+                    workReviewAudit.setParentIds("0,");
+                }
+                if (StringUtils.isNotBlank(workReviewAudit.getType())) {
+                    workReviewAudits.add(workReviewAudit);
+                }
+            }
+        }
+        return workReviewAudits;
+    }
 }

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

@@ -695,10 +695,6 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
                             return str;
                         }
 
-
-                        if (!str.equals("true")){
-                            return str;
-                        }
                     }
                 }
             }

src/main/java/com/jeeplus/modules/workreview/service/WorkReviewStandardService.java

@@ -7,12 +7,18 @@ import com.google.common.collect.Lists;
 import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.service.TreeService;
 import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.modules.bzshbExamine.dao.BzshbExaminDao;
+import com.jeeplus.modules.bzshbExamine.entity.BzshbExaminInfo;
+import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
+import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
+import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataService;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workreview.dao.WorkReviewAuditDao;
 import com.jeeplus.modules.workreview.dao.WorkReviewStandardDao;
 import com.jeeplus.modules.workreview.entity.WorkReviewAudit;
 import com.jeeplus.modules.workreview.entity.WorkReviewStandard;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -27,9 +33,12 @@ import java.util.*;
 @Service
 @Transactional(readOnly = true)
 public class WorkReviewStandardService extends TreeService<WorkReviewStandardDao, WorkReviewStandard> {
-
+    @Autowired
+    private ProjectReportDataService projectReportDataService;
     @Autowired
     private WorkReviewAuditDao workReviewAuditDao;
+    @Autowired
+    private BzshbExaminDao bzshbExaminDao;
 
 	public WorkReviewStandard get(String id) {
 		return super.get(id);
@@ -291,4 +300,23 @@ public class WorkReviewStandardService extends TreeService<WorkReviewStandardDao
         }
 
     }
+    @Transactional(readOnly = false)
+    public void saveExaminAudit(Projectcontentinfo projectcontentinfo) {
+	    //保存抽查标准
+        List<WorkReviewAudit> workReviewAudits=projectcontentinfo.getProjectReviewList();
+        if (workReviewAudits.size()>0){
+            for (WorkReviewAudit workReviewAudit:workReviewAudits){
+                workReviewAudit.setReportId(projectcontentinfo.getProjectReportData().getId());
+                workReviewAudit.setId(null);
+                workReviewAudit.setType("4");
+                workReviewAudit.setParent(new WorkReviewAudit("0"));
+                workReviewAudit.setParentIds("0,");
+                if (com.jeeplus.common.utils.StringUtils.isNotBlank(workReviewAudit.getType())) {
+                    saveAudit(workReviewAudit);
+                }
+            }
+        }
+        projectcontentinfo.getProjectReportData().setExaminScore(projectcontentinfo.getReviewScore());
+        bzshbExaminDao.updateBzshbExamin(projectcontentinfo.getProjectReportData());
+    }
 }

src/main/resources/mappings/modules/bzshbExamin/BzshbExaminDao.xml

@@ -121,7 +121,8 @@
 		su.name as "createName",
 		suw.name as "masterName",
 		prd.examin_flag as "examinFlag",
-		if(prd.examin_flag=1,"已查","未查") as examinFlagStr
+		if(prd.examin_flag=1,"已查","未查") as examinFlagStr,
+		prd.examin_score as "examinScore"
 		from rural_project_records a
 		left join work_project_user wpu on wpu.project_id = a.id
 		left join project_report_data prd on prd.project_id = a.id
@@ -208,7 +209,8 @@
 		su.name as "createName",
 		suw.name as "masterName",
 		prd.examin_flag as "examinFlag",
-		if(prd.examin_flag=1,"已查","未查") as examinFlagStr
+		if(prd.examin_flag=1,"已查","未查") as examinFlagStr,
+		prd.examin_score as "examinScore"
 		from rural_project_records a
 		left join work_project_user wpu on wpu.project_id = a.id
 		left join project_report_data prd on prd.project_id = a.id
@@ -235,4 +237,11 @@
 		</where>
 		order by a.create_date desc
 	</select>
+
+	<update id="updateBzshbExamin">
+		UPDATE project_report_data SET
+		   examin_flag = 1,
+		   examin_score =#{examinScore}
+		WHERE id = #{id}
+	</update>
 </mapper>

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

@@ -362,7 +362,7 @@
 				,{field:'createName',align:'center', title: '创建人'}
 				,{field:'masterName',align:'center', title: '责任人'}
 				,{field:'examinFlagStr',align:'center', title: '抽查状态'}
-				,{field:'randomScore',align:'center', title: '抽查分数'}
+				,{field:'examinScore',align:'center', title: '抽查分数'}
                 ,{field:'op',align:'center',title:"操作",width:130,templet:function(d){
                         ////对操作进行初始化
                         var xml="";
@@ -390,7 +390,7 @@
 					,"masterName":"${bzshbExamin.masterName}"
 					,"examinFlagStr":"${bzshbExamin.examinFlagStr}"
 					,"examinFlag":"${bzshbExamin.examinFlag}"
-					,"randomScore":"${bzshbExamin.examinFlag}"
+					,"examinScore":"${bzshbExamin.examinScore}"
 					,"examine":<c:choose><c:when test="${bzshbExamin.examinFlag == 0}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
 				}
                 </c:forEach>

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

@@ -363,7 +363,7 @@
 				,{field:'createName',align:'center', title: '创建人'}
 				,{field:'masterName',align:'center', title: '责任人'}
 				,{field:'examinFlagStr',align:'center', title: '抽查状态'}
-				,{field:'randomScore',align:'center', title: '抽查分数'}
+				,{field:'examinScore',align:'center', title: '抽查分数'}
                 ,{field:'op',align:'center',title:"操作",width:130,templet:function(d){
                         ////对操作进行初始化
                         var xml="";
@@ -391,7 +391,7 @@
 					,"masterName":"${bzshbExamin.masterName}"
 					,"examinFlagStr":"${bzshbExamin.examinFlagStr}"
 					,"examinFlag":"${bzshbExamin.examinFlag}"
-					,"randomScore":"${bzshbExamin.examinFlag}"
+					,"examinScore":"${bzshbExamin.examinScore}"
 					,"examine":<c:choose><c:when test="${bzshbExamin.examinFlag == 0}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
 				}
                 </c:forEach>

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

@@ -133,10 +133,13 @@
 						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
 					}
 					inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
-					inputForm.attr("action","${ctx}/subProject/subProject/save");//表单提交成功后，从服务器返回的url在当前tab中展示
-					var $document = iframeWin.contentWindow.document;
-
-					formSubmit2($document,formId,index,tableId);
+					if(iframeWin.contentWindow.doSubmit(1) ){
+						// top.layer.close(index);//关闭对话框。
+						setTimeout(function(){
+							top.layer.close(index)
+							location.reload();
+						}, 100);//延时0.1秒，对应360 7.1版本bug
+					}
 
 				},
 				cancel: function(index){
@@ -326,7 +329,7 @@
 				,{field:'createName',align:'center', title: '创建人'}
 				,{field:'masterName',align:'center', title: '责任人'}
 				,{field:'examinFlagStr',align:'center', title: '抽查状态'}
-				,{field:'randomScore',align:'center', title: '抽查分数'}
+				,{field:'examinScore',align:'center', title: '抽查分数'}
                 ,{field:'op',align:'center',title:"操作",width:130,templet:function(d){
                         ////对操作进行初始化
                         var xml="";
@@ -354,7 +357,7 @@
 					,"masterName":"${bzshbExamin.masterName}"
 					,"examinFlagStr":"${bzshbExamin.examinFlagStr}"
 					,"examinFlag":"${bzshbExamin.examinFlag}"
-					,"randomScore":"${bzshbExamin.examinFlag}"
+					,"examinScore":"${bzshbExamin.examinScore}"
 					,"examine":<c:choose><c:when test="${bzshbExamin.examinFlag == 0}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
 				}
                 </c:forEach>

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

@@ -326,7 +326,7 @@
 				,{field:'createName',align:'center', title: '创建人'}
 				,{field:'masterName',align:'center', title: '责任人'}
 				,{field:'examinFlagStr',align:'center', title: '抽查状态'}
-				,{field:'randomScore',align:'center', title: '抽查分数'}
+				,{field:'examinScore',align:'center', title: '抽查分数'}
                 ,{field:'op',align:'center',title:"操作",width:130,templet:function(d){
                         ////对操作进行初始化
                         var xml="";
@@ -354,7 +354,7 @@
 					,"masterName":"${bzshbExamin.masterName}"
 					,"examinFlagStr":"${bzshbExamin.examinFlagStr}"
 					,"examinFlag":"${bzshbExamin.examinFlag}"
-					,"randomScore":"${bzshbExamin.examinFlag}"
+					,"examinScore":"${bzshbExamin.examinScore}"
 					,"examine":<c:choose><c:when test="${bzshbExamin.examinFlag == 0}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
 				}
                 </c:forEach>

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

@@ -88,6 +88,15 @@
 				$(id).removeAttr("class","hide");
 
 			})
+			var length=$("#treeTable2 tbody tr").length;
+			var total=0;
+			for (var i=0;i<length;i++){
+				var zhi=$("#treeTable2 tbody").find("tr").eq(i).find("#maxDeduct").val();
+				if (undefined!=zhi && ''!=zhi){
+					total=total+parseInt(zhi);
+				}
+			}
+			$("#total").val(total);
         });
 
         function insertTitle(tValue){
@@ -1494,12 +1503,57 @@
 				</div>
 			</div>
 		</form:form>
-
-		<div class="form-group-label">
-			<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre1('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=${identification}&name=${identificationName}','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 审核意见模板列表</a></div>
-			<h2>审批意见</h2>
+		<div class="form-group layui-row">
+			<div class="form-group-label">
+				<h2>总审抽查评分</h2>
+			</div>
+			<div>
+				<div class="layui-item layui-col-xs12" >
+					<table id="treeTable2" class="table table-bordered table-condensed details no-bottom-margin">
+						<thead>
+						<tr>
+							<%--<th width="25%">序号</th>--%>
+							<th width="40%">符合内容及评分标准</th>
+							<th width="10%">自校</th>
+							<th width="20%">打分</th>
+							<%--<th width="15%">操作</th>--%>
+						</tr>
+						</thead>
+						<tbody>
+						<c:forEach items="${list}" var="workReviewAudit" varStatus="index">
+							<tr id="${workReviewAudit.id}" pid="${workReviewAudit.parent.id}">
+								<td class="hide">
+									<input type="text" name="projectReviewList[${index.index}].standardDetail" value="${workReviewAudit.standardDetail}">
+									<input type="text" name="projectReviewList[${index.index}].orderNum" value="${workReviewAudit.orderNum}">
+								</td>
+								<td title="${workReviewAudit.standardDetail}">
+										${workReviewAudit.standardDetail}
+								</td>
+								<td>
+									<i class="fa fa-check"></i>
+								</td>
+								<td class="input-td">
+									<input id="maxDeduct" name="projectReviewList[${index.index}].deduct" htmlEscape="false" readonly="true"  class="form-control layui-input "  value="${workReviewAudit.deduct}">
+								</td>
+							</tr>
+						</c:forEach>
+						<tr>
+							<td colspan="2" style="font-weight: bold">总分</td>
+							<td style="padding: 0px;">
+								<input id="total" name="reviewScore" htmlEscape="false" readonly="true"  class="form-control layui-input judgment">
+							</td>
+						</tr>
+						</tbody>
+					</table>
+				</div>
+			</div>
 		</div>
-		<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
+
+<%--		<div class="form-group-label">--%>
+<%--			<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre1('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=${identification}&name=${identificationName}','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 审核意见模板列表</a></div>--%>
+<%--			<h2>审批意见</h2>--%>
+<%--		</div>--%>
+<%--		<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>--%>
 	</div>
 </div>
 <script>

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

@@ -13,8 +13,6 @@
 	<script type="text/javascript">
         var validateForm;
         function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
-			var ss= document.getElementById("iframe").contentWindow.document.getElementById("opinion").value
-			$("#opinion").val(ss);
             if(validateForm.form()){
                 if(obj == 1) {
 					var flags=judgment();
@@ -24,7 +22,17 @@
 						return flags;
 					}
                 }
-                $("#inputForm").submit();
+				$("#inputForm").ajaxSubmit({
+					success:function(data) {
+						var d = data;
+						//输出提示信息
+						parent.layer.msg(d,{icon:1});
+						//关闭当前页
+						top.layer.close(index)
+						location.reload();
+					}
+				});
+                // $("#inputForm").submit();
                 return true;
             }else{
 				parent.layer.msg("信息未填写完整!", {icon: 5});
@@ -137,12 +145,34 @@
 			obj.value = obj.value.replace(".","$#$").replace(/\./g,"").replace("$#$",".");
 			obj.value = obj.value.replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3'); //只能输入两个小数
 		}
+		function reportMaxDeduct(maxDeduct,id,parentId){
+			var dataList = ${fns:toJson(workReviewAudits)};
+			var maxDeductTotal = 0;
+			var maxDeducts = 0;
+			var total=0;
+			for (var i=0; i<dataList.length; i++){
+				if(dataList[i].id == id){
+					maxDeducts = dataList[i].maxDeduct;
+				}
+			}
+			var length=$("#treeTable2 tbody tr").length;
+			for (var i=0;i<length;i++){
+				var zhi=$("#treeTable2 tbody").find("tr").eq(i).find("#maxDeduct").val();
+				if (undefined!=zhi && ''!=zhi){
+					total=total+parseInt(zhi);
+				}
+			}
+			$("#total").val(total);
+			parent.layer.msg('输入打分项成功',{icon:1});
+			return false;
+		}
+
 	</script>
 </head>
 <body >
 <div class="single-form">
 	<div class="container">
-		<form:form id="inputForm" modelAttribute="projectcontentinfo" enctype="multipart/form-data" action="${ctx}/ruralProject/ruralProjectMessageNew/reportAudit" method="post" class="form-horizontal layui-form">
+		<form:form id="inputForm" modelAttribute="projectcontentinfo" enctype="multipart/form-data" action="${ctx}/bzshbExamin/bzshbExamin/saveScore" method="post" class="form-horizontal layui-form">
 			<form:hidden path="id"/>
 			<form:hidden path="home"/>
 			<form:hidden path="project.id"/>
@@ -1492,14 +1522,61 @@
 						</div>
 					</div>
 				</div>
+				<div class="form-group layui-row">
+					<div class="form-group-label">
+						<h2>总审抽查评分</h2>
+					</div>
+					<div>
+						<div class="layui-item layui-col-xs12" >
+							<table id="treeTable2" class="table table-bordered table-condensed details no-bottom-margin">
+								<thead>
+								<tr>
+										<%--<th width="25%">序号</th>--%>
+									<th width="40%">符合内容及评分标准</th>
+									<th width="10%">自校</th>
+									<th width="20%">打分</th>
+										<%--<th width="15%">操作</th>--%>
+								</tr>
+								</thead>
+								<tbody>
+								<c:forEach items="${workReviewAudits}" var="workReviewAudit" varStatus="index">
+									<tr id="${workReviewAudit.id}" pid="${workReviewAudit.parent.id}">
+										<td class="hide">
+											<input type="text" name="projectReviewList[${index.index}].standardDetail" value="${workReviewAudit.standardDetail}">
+											<input type="text" name="projectReviewList[${index.index}].orderNum" value="${workReviewAudit.orderNum}">
+										</td>
+										<td title="${workReviewAudit.standardDetail}">
+												${workReviewAudit.standardDetail}
+										</td>
+										<td>
+											<i class="fa fa-check"></i>
+										</td>
+										<td class="input-td">
+											<input id="maxDeduct" name="projectReviewList[${index.index}].deduct" htmlEscape="false"  class="form-control layui-input judgment" onChange="if(this.value)reportMaxDeduct(this.value,'${workReviewAudit.id}','${workReviewAudit.parent.id}')" placeholder="${workReviewAudit.maxDeduct}">
+										</td>
+									</tr>
+								</c:forEach>
+								<tr>
+									<td colspan="2" style="font-weight: bold">总分</td>
+									<td style="padding: 0px;">
+										<input id="total" name="reviewScore" htmlEscape="false" readonly="true"  class="form-control layui-input judgment">
+									</td>
+								</tr>
+								</tbody>
+							</table>
+						</div>
+					</div>
+				</div>
+
 			</div>
 		</form:form>
-
-		<div class="form-group-label">
-			<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre1('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=${identification}&name=${identificationName}','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 审核意见模板列表</a></div>
-			<h2>审批意见</h2>
-		</div>
-		<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
+<%--		<div class="form-group layui-row">--%>
+<%--			<div class="form-group-label">--%>
+<%--				<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre1('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=${identification}&name=${identificationName}','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 审核意见模板列表</a></div>--%>
+<%--				<h2>审批意见</h2>--%>
+<%--			</div>--%>
+<%--			<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>--%>
+<%--		</div>--%>
 	</div>
 </div>
 <script>

src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/projectRecordDescriptionForm.jsp

@@ -164,7 +164,7 @@
 			<form:hidden id="reportId" path="report.id"/>
 			<form:hidden path="report.name"/>
 			<form:hidden path="report.project.id"/>
-			<form:input path="view"/>
+			<form:hidden path="view"/>
 
 			<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>基本信息</h2></div>

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

@@ -17,7 +17,23 @@
 			$("#opinion").val(ss);
             if(validateForm.form()){
                 if(obj == 1) {
-					var flags=judgment();
+					// var flags=judgment();
+					var flags=true;
+					$(".judgment").each(function(){
+						var zhi=$(this).val();
+						var s=$(this).parent().html();
+						if (''==zhi || null == zhi){
+							// if(!$("#"+this.id).is(":hidden")){
+								$(this).css("border","1px solid red")
+								flags=false;
+							// }
+						}else{
+							$(this).css("border","1px solid #f1f1f1")
+						}
+					});
+					if (!flags){
+						parent.layer.msg("信息未填写完整!", {icon: 5});
+					}
 					if (flags){
 						$("#flag").val("yes");
 					}else{
@@ -36,7 +52,7 @@
                         $("#flag").val("no2");
                     }
                 }
-                $("#inputForm").submit();
+                // $("#inputForm").submit();
                 return true;
             }else{
 				parent.layer.msg("信息未填写完整!", {icon: 5});
@@ -1645,10 +1661,10 @@
 												</td>
 
 												<td>
-													<input lay-verify="date" placeholder="yyyy-MM-dd" autocomplete="off" readonly="readonly" type="text" value="${plan.beginDate}"  class="form-control required datetime"/>
+													<input lay-verify="date" placeholder="yyyy-MM-dd" autocomplete="off" readonly="readonly" type="text" value="${plan.beginDate}"  class="form-control datetime"/>
 												</td>
 												<td>
-													<input lay-verify="date" placeholder="yyyy-MM-dd" autocomplete="off"  readonly="readonly"  type="text" value="${plan.endDate}"  class="form-control required datetime"/>
+													<input lay-verify="date" placeholder="yyyy-MM-dd" autocomplete="off"  readonly="readonly"  type="text" value="${plan.endDate}"  class="form-control datetime"/>
 												</td>
 
 												<td>

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

@@ -973,13 +973,6 @@
 							</table>
 						</div>
 					</div>
-							<div class="form-group layui-row">
-								<div class="form-group-label"><h2>审批流程</h2></div>
-								<div class="layui-item layui-col-xs12 form-table-container" >
-									<act:flowChart procInsId="${processInstanceId}"/>
-									<act:histoicFlow procInsId="${processInstanceId}"/>
-								</div>
-							</div>
 							<div>
 								<div class="form-group-label">
 									<h2>报告签发复核内容</h2>
@@ -1022,6 +1015,13 @@
 									</div>
 								</div>
 							</div>
+							<div class="form-group layui-row">
+								<div class="form-group-label"><h2>审批流程</h2></div>
+								<div class="layui-item layui-col-xs12 form-table-container" >
+									<act:flowChart procInsId="${processInstanceId}"/>
+									<act:histoicFlow procInsId="${processInstanceId}"/>
+								</div>
+							</div>
 
 				</div>
 				<div class="form-group layui-row first hide" id="subProjectInfo">