ソースを参照

报告签章代码

user5 3 年 前
コミット
b9cd52d781
18 ファイル変更4747 行追加2494 行削除
  1. 13 0
      src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/ProjectApprovalSignature.java
  2. 23 1
      src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageElectronicSealService.java
  3. 6 6
      src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageService.java
  4. 24 0
      src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsService.java
  5. 8 8
      src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageController.java
  6. 4 1
      src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageElectronicSealController.java
  7. 12 9
      src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java
  8. 951 520
      src/main/resources/freemarker/projectSignature.ftl
  9. 213 488
      src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsApprovalAudit.jsp
  10. 171 1
      src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsApprovalForm.jsp
  11. 221 482
      src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsApprovalModify.jsp
  12. 1237 0
      src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsApprovalView.jsp
  13. 211 488
      src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsReportSignatureAudit.jsp
  14. 175 1
      src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsReportSignatureForm.jsp
  15. 222 479
      src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsReportSignatureModify.jsp
  16. 1241 0
      src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsReportSignatureView.jsp
  17. 14 9
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/electronicSeal/ruralProjectMessageElectronicSealList.jsp
  18. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/view/ruralProjectRecordsView.jsp

+ 13 - 0
src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/ProjectApprovalSignature.java

@@ -1,7 +1,11 @@
 package com.jeeplus.modules.ruralprojectrecords.entity;
 
+import com.google.common.collect.Lists;
 import com.jeeplus.common.persistence.ActEntity;
 import com.jeeplus.modules.sys.entity.Office;
+import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
+
+import java.util.List;
 
 /**
  * @author: 徐滕
@@ -13,6 +17,7 @@ public class ProjectApprovalSignature extends ActEntity<ProjectApprovalSignature
     private String processInstanceId;   //流程编号
     private Office company;
     private Office office;
+    private List<WorkClientAttachment> workAttachments = Lists.newArrayList();
 
     public String getProjectId() {
         return projectId;
@@ -53,4 +58,12 @@ public class ProjectApprovalSignature extends ActEntity<ProjectApprovalSignature
     public void setOffice(Office office) {
         this.office = office;
     }
+
+    public List<WorkClientAttachment> getWorkAttachments() {
+        return workAttachments;
+    }
+
+    public void setWorkAttachments(List<WorkClientAttachment> workAttachments) {
+        this.workAttachments = workAttachments;
+    }
 }

+ 23 - 1
src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageElectronicSealService.java

@@ -36,6 +36,7 @@ import com.jeeplus.modules.workactivity.service.ActivityService;
 import com.jeeplus.modules.workactivity.service.WorkActivityProcessService;
 import com.jeeplus.modules.workactivitymenu.entity.WorkActivityMenu;
 import com.jeeplus.modules.workactivitymenu.service.WorkActivityMenuService;
+import com.jeeplus.modules.workclientinfo.dao.WorkClientAttachmentDao;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
@@ -103,6 +104,8 @@ public class RuralProjectMessageElectronicSealService extends CrudService<RuralP
     private WorkActivityProcessDao workActivityProcessDao;
     @Autowired
     private WorkattachmentService workattachmentService;
+    @Autowired
+    private WorkClientAttachmentDao workClientAttachmentDao;
 
     /**
      * 根据项目id查询审定单是否存在送审信息
@@ -162,6 +165,23 @@ public class RuralProjectMessageElectronicSealService extends CrudService<RuralP
             projectApprovalSignature.preUpdate();
             dao.updateApprovalSignature(projectApprovalSignature);
         }
+        for (WorkClientAttachment workClientAttachment : projectApprovalSignature.getWorkAttachments()){
+            if (workClientAttachment.getId() == null){
+                continue;
+            }
+            if (WorkClientAttachment.DEL_FLAG_NORMAL.equals(workClientAttachment.getDelFlag())){
+                workClientAttachment.setAttachmentId(projectApprovalSignature.getId());
+                workClientAttachment.setAttachmentFlag("144");
+                workClientAttachment.setAttachmentUser(UserUtils.getUser().getId());
+                if (com.jeeplus.common.utils.StringUtils.isBlank(workClientAttachment.getId()) || "null".equals(workClientAttachment.getId())){
+                    workattachmentService.insertOnWorkClientAttachment(workClientAttachment);
+                }else{
+                    workattachmentService.updateOnWorkClientAttachment(workClientAttachment);
+                }
+            }else{
+                workClientAttachmentDao.delete(workClientAttachment);
+            }
+        }
         //启动审批流程
         this.startApprovalAudit(projectApprovalSignature,projectApprovalSignature.getProcessInstanceId());
     }
@@ -1508,7 +1528,7 @@ public class RuralProjectMessageElectronicSealService extends CrudService<RuralP
             data.put("ziDate","");
             data.put("shenDate","");
         }
-        if(null != projectReportSignatureInfo && null != projectReportSignatureInfo.getReviewDate()){
+        if(null != projectReportSignatureInfo && StringUtils.isNotBlank(projectReportSignatureInfo.getReviewOpinion())){
             data.put("projectMasterRemarks",projectReportSignatureInfo.getReviewOpinion());
         }else{
             data.put("projectMasterRemarks","");
@@ -1761,6 +1781,8 @@ public class RuralProjectMessageElectronicSealService extends CrudService<RuralP
             BigDecimal submitFee=new BigDecimal(projectReportSignatureInfo.getSubmitFee());
             BigDecimal authorizeFee=new BigDecimal(projectReportSignatureInfo.getAuthorizeFee());
             BigDecimal subtract = submitFee.subtract(authorizeFee);
+            //submitFee = submitFee.multiply(BigDecimal.valueOf(100));
+            subtract = subtract.multiply(BigDecimal.valueOf(100));
             BigDecimal divide = subtract.divide(submitFee,2,BigDecimal.ROUND_HALF_UP);
             data.put("decreaseAccountingRate",divide.toString());
         }else{

+ 6 - 6
src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageService.java

@@ -3878,8 +3878,8 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         location.setRectType("SEAL_CORPORATE");
         //location.setKeyword("咨询企业(章)");
         location.setKeywordIndex(-1);
-        location.setOffsetX("0.7749");
-        location.setOffsetY("0.2725");
+        location.setOffsetX("0.5264");
+        location.setOffsetY("0.6787");
         locations.add(location);
         companyAction.setLocations(locations);
         actions.add(companyAction);
@@ -3906,8 +3906,8 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                     principalLocation.setRectType("SEAL_CORPORATE");
                     //principalLocation.setKeyword("项目负责人(签字盖章)");
                     principalLocation.setKeywordIndex(-1);
-                    principalLocation.setOffsetX("0.7759");
-                    principalLocation.setOffsetY("0.1934");
+                    principalLocation.setOffsetX("0.5971");
+                    principalLocation.setOffsetY("0.8176");
                     principalLocations.add(principalLocation);
                     actionUser.setLocations(principalLocations);
                     actions.add(actionUser);
@@ -3934,8 +3934,8 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                 principalLocation.setRectType("SEAL_CORPORATE");
                 //principalLocation.setKeyword("签发人");
                 principalLocation.setKeywordIndex(-1);
-                principalLocation.setOffsetX("0.7518");
-                principalLocation.setOffsetY("0.1642");
+                principalLocation.setOffsetX("0.7758");
+                principalLocation.setOffsetY("0.7339");
                 principalLocations.add(principalLocation);
                 actionUser.setLocations(principalLocations);
                 actions.add(actionUser);

+ 24 - 0
src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsService.java

@@ -1376,6 +1376,14 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		List<WorkClientAttachment> attachments = workattachmentService.getAttachmentList(attchment);
 		projectRecords.setWorkAttachments(attachments);
 	}
+	public void getWorkAttachmentBySignature(RuralProjectRecords projectRecords,String fileType) {
+		WorkClientAttachment attchment = new WorkClientAttachment();
+		attchment.setAttachmentId(projectRecords.getId());
+		attchment.setAttachmentFlag(fileType);
+		List<WorkClientAttachment> attachments = workattachmentService.getAttachmentList(attchment);
+		workattachmentService.clientAttachmentManageOnUrl(attachments);
+		projectRecords.setWorkAttachments(attachments);
+	}
 
 	public void queryReportData(RuralProjectRecords projectRecords){
        String projectId = projectRecords.getId();
@@ -1452,6 +1460,22 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
         this.queryReportData(projectRecords);
     }
 
+    public void queryProjectDetailBySignature(RuralProjectRecords projectRecords,String fileType) {
+		if(null != projectRecords.getWorkContractInfo() && StringUtils.isNotBlank(projectRecords.getWorkContractInfo().getId())){
+			this.queryContractInfos(projectRecords);
+		}
+        //设置项目组成员
+        this.queryUserNames(projectRecords);
+        //设置项目组成员所属部门
+        this.queryOfficeName(projectRecords);
+        //设置委托方联系人信息
+        this.queryLinkmanInfos(projectRecords);
+        //设置附件信息
+        this.getWorkAttachmentBySignature(projectRecords,fileType);
+        //设置报告
+        this.queryReportData(projectRecords);
+    }
+
     public Page<RuralProjectRecords> findPageDetail(Page<RuralProjectRecords> page, RuralProjectRecords projectRecords) {
 	    boolean dateflag = false;
 	    if(projectRecords.getBeginDate()==null){

+ 8 - 8
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageController.java

@@ -1821,24 +1821,24 @@ public class RuralProjectMessageController extends BaseController {
             //获取真签单的documentId
             String documentId = SignaturePostUtil.getDocument(srcFile);
             //获取竖版假(空白)签单的documentId
-            /*String verticalInvalidDocumentId = SignaturePostUtil.getVerticalInvalidDocument(verticalInvalidFile.getName(),verticalInvalidFile);
+            String verticalInvalidDocumentId = SignaturePostUtil.getVerticalInvalidDocument(verticalInvalidFile.getName(),verticalInvalidFile);
             if("".equals(verticalInvalidDocumentId)){
                 map.put("str","竖版模板文件创建失败");
                 return map;
-            }*/
+            }
             //获取横板假(空白)签单的documentId
-            String acrossInvalidDocumentId = SignaturePostUtil.getAcrossVerticalInvalidDocument(acrossInvalidFile.getName(),acrossInvalidFile);
+            /*String acrossInvalidDocumentId = SignaturePostUtil.getAcrossVerticalInvalidDocument(acrossInvalidFile.getName(),acrossInvalidFile);
             if("".equals(acrossInvalidDocumentId)){
                 map.put("str","横版模板文件创建失败");
                 return map;
-            }
+            }*/
             List<String> documentList = Lists.newArrayList();
             List<String> invalidDocumentList = Lists.newArrayList();
             documentList.add(documentId);
-            //documentList.add(verticalInvalidDocumentId);
-            documentList.add(acrossInvalidDocumentId);
-            //invalidDocumentList.add(verticalInvalidDocumentId);
-            invalidDocumentList.add(acrossInvalidDocumentId);
+            documentList.add(verticalInvalidDocumentId);
+            //documentList.add(acrossInvalidDocumentId);
+            invalidDocumentList.add(verticalInvalidDocumentId);
+            //invalidDocumentList.add(acrossInvalidDocumentId);
             //将空白单的documentId存入数据库种
             projectReportData.setSignatureInvalidDocumentId(String.join(",", invalidDocumentList));
             //根据项目id 和 documentId生成合同id

+ 4 - 1
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageElectronicSealController.java

@@ -183,7 +183,7 @@ public class RuralProjectMessageElectronicSealController extends BaseController
     public String approvalForm(RuralProjectRecords projectRecords, Model model){
         if (projectRecords!=null&& StringUtils.isNotBlank(projectRecords.getId())) {
             projectRecords = projectRecordsService.get(projectRecords.getId());
-            projectRecordsService.queryProjectDetail(projectRecords);
+            projectRecordsService.queryProjectDetailBySignature(projectRecords,"144");
             ProjectPlanInfo projectPlanInfo = new ProjectPlanInfo();
             projectPlanInfo.setProjectId(projectRecords.getId());
             if(null != projectRecords.getWorkContractInfo()){
@@ -253,11 +253,13 @@ public class RuralProjectMessageElectronicSealController extends BaseController
                     addMessage(redirectAttributes, "审定单签章申请已登记完成,无法再次送审");
                     return "redirect:"+Global.getAdminPath()+"/ruralProject/electronicSeal/?repage";
                 }
+                projectApprovalSignature.setWorkAttachments(projectRecords.getWorkAttachments());
                 ruralProjectMessageElectronicSealService.approvalSave(projectApprovalSignature);//保存
             }else{
                 projectApprovalSignature = new ProjectApprovalSignature();
                 projectApprovalSignature.setProjectId(projectRecords.getId());
                 projectApprovalSignature.setStatus(ProjectStatusEnum.IN_APRL.getValue());
+                projectApprovalSignature.setWorkAttachments(projectRecords.getWorkAttachments());
                 ruralProjectMessageElectronicSealService.approvalSave(projectApprovalSignature);//保存
             }
             addMessage(redirectAttributes, "保存审定单签章申请成功");
@@ -341,6 +343,7 @@ public class RuralProjectMessageElectronicSealController extends BaseController
         //根据项目id查询对应的审定单数据状态是否是已经被送审或者 是否存在值
         ProjectApprovalSignature projectApprovalSignature = ruralProjectMessageElectronicSealService.getProjectApprovalSignature(projectRecords.getId());
         projectRecords = projectRecordsService.get(projectRecords.getId());
+        projectRecordsService.queryProjectDetailBySignature(projectRecords,"144");
         projectRecords.setProcessInstanceId(projectApprovalSignature.getProcessInstanceId());
         projectRecords.setProjectStatus(projectApprovalSignature.getStatus());
         ProcessInstance processInstance = actTaskService.getProcIns(projectRecords.getProcessInstanceId());

+ 12 - 9
src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -1277,6 +1277,7 @@ public class WorkProjectNotifyController extends BaseController {
 					}
 				} else if (workProjectNotify.getType().equals("144")) {    //合同管理new
 					RuralProjectRecords ruralProjectRecords = ruralProjectMessageElectronicSealService.getProjectApprovalSignatureById(workProjectNotify.getNotifyId());
+
 					if (ruralProjectRecords != null && StringUtils.isNotBlank(ruralProjectRecords.getId())) {
 						//根据项目id查询对应的审定单数据状态是否是已经被送审或者 是否存在值
 						ProjectApprovalSignature projectApprovalSignature = ruralProjectMessageElectronicSealService.getProjectApprovalSignature(ruralProjectRecords.getId());
@@ -1287,9 +1288,10 @@ public class WorkProjectNotifyController extends BaseController {
 						//获取项目计划信息
 						List<ProjectPlanInfo> projectPlanList = projectPlanService.getProjectPlanList(projectPlanInfo);
 						//项目计划附件信息
-						List<WorkClientAttachment> projectPlanAttachment = projectPlanService.getWorkAttachment(ruralProjectRecords.getId());
+						//List<WorkClientAttachment> projectPlanAttachment = projectPlanService.getWorkAttachment(ruralProjectRecords.getId());
 						ruralProjectRecords.setProjectPlanList(projectPlanList);
-						ruralProjectRecords.setWorkAttachments(projectPlanAttachment);
+						//ruralProjectRecords.setWorkAttachments(projectPlanAttachment);
+						ruralProjectRecordsService.getWorkAttachmentBySignature(ruralProjectRecords,"144");
 						if(null != projectApprovalSignature){
 							ruralProjectRecords.setProjectStatus(projectApprovalSignature.getStatus());
 							ruralProjectRecords.setProcessInstanceId(projectApprovalSignature.getProcessInstanceId());
@@ -1322,7 +1324,7 @@ public class WorkProjectNotifyController extends BaseController {
 					model.addAttribute("processInstanceId", ruralProjectRecords.getProcessInstanceId());
 					model.addAttribute("projectRecords", ruralProjectRecords);
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
-						return "modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsApprovalForm";
+						return "modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsApprovalView";
 					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						//审核模板标识
 						model.addAttribute("identification", "ruralprojectrecords");
@@ -1334,7 +1336,7 @@ public class WorkProjectNotifyController extends BaseController {
 						model.addAttribute("engInfo", engineeringInfo);
 						return "modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsApprovalModify";
 					} else {
-						return "modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsApprovalForm";
+						return "modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsApprovalView";
 					}
 				} else if (workProjectNotify.getType().equals("145")) {    //合同管理new
 					RuralProjectRecords ruralProjectRecords = ruralProjectMessageElectronicSealService.getProjectReportSignatureById(workProjectNotify.getNotifyId());
@@ -1348,9 +1350,10 @@ public class WorkProjectNotifyController extends BaseController {
 						//获取项目计划信息
 						List<ProjectPlanInfo> projectPlanList = projectPlanService.getProjectPlanList(projectPlanInfo);
 						//项目计划附件信息
-						List<WorkClientAttachment> projectPlanAttachment = projectPlanService.getWorkAttachment(ruralProjectRecords.getId());
+						//List<WorkClientAttachment> projectPlanAttachment = projectPlanService.getWorkAttachment(ruralProjectRecords.getId());
 						ruralProjectRecords.setProjectPlanList(projectPlanList);
-						ruralProjectRecords.setWorkAttachments(projectPlanAttachment);
+						ruralProjectRecordsService.getWorkAttachmentBySignature(ruralProjectRecords,"145");
+						//ruralProjectRecords.setWorkAttachments(projectPlanAttachment);
 						if(null != projectApprovalSignature){
 							ruralProjectRecords.setProjectStatus(projectApprovalSignature.getStatus());
 							ruralProjectRecords.setProcessInstanceId(projectApprovalSignature.getProcessInstanceId());
@@ -1383,7 +1386,7 @@ public class WorkProjectNotifyController extends BaseController {
 					model.addAttribute("processInstanceId", ruralProjectRecords.getProcessInstanceId());
 					model.addAttribute("projectRecords", ruralProjectRecords);
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
-						return "modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsReportSignatureForm";
+						return "modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsReportSignatureView";
 					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						//审核模板标识
 						model.addAttribute("identification", "ruralprojectrecords");
@@ -1393,9 +1396,9 @@ public class WorkProjectNotifyController extends BaseController {
 						//查询工程类型信息
 						ProjectEngineeringInfo engineeringInfo=engineeringService.get(ruralProjectRecords.getEngineeringType());
 						model.addAttribute("engInfo", engineeringInfo);
-						return "ruralProjectRecordsReportSignatureModify1";
+						return "modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsReportSignatureModify";
 					} else {
-						return "modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsReportSignatureForm";
+						return "modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsReportSignatureView";
 					}
 				} else if (workProjectNotify.getType().equals("18")) {
 					Company company = companyService.get(workProjectNotify.getNotifyId());

ファイルの差分が大きいため隠しています
+ 951 - 520
src/main/resources/freemarker/projectSignature.ftl


+ 213 - 488
src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsApprovalAudit.jsp

@@ -4,10 +4,12 @@
 <head>
 	<title>项目审批管理</title>
 	<meta name="decorator" content="default"/>
-	<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>
-	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
-	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
-	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
+	<script type="text/javascript" src="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.js"></script>
+	<script type="text/javascript" src="${ctxStatic}/iCheck/icheck.min.js"></script>
+	<script type="text/javascript" src="${ctxStatic}/layui/layuidown.js"></script>
+	<script src="${ctxStatic}/common/html/js/script.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/layuidown.css"/>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.css"/>
 
 	<script type="text/javascript">
 		var validateForm;
@@ -126,7 +128,7 @@
 <body >
 <div class="single-form">
 	<div class="container">
-		<form:form id="inputForm" modelAttribute="projectRecords" enctype="multipart/form-data" action="${ctx}/ruralProject/electronicSeal/approvalSaveAudit" method="post" class="layui-form">
+		<form:form id="inputForm" modelAttribute="projectRecords" enctype="multipart/form-data" action="${ctx}/ruralProject/electronicSeal/approvalSaveAudit" method="post" class="form-horizontal layui-form">
 		<form:hidden path="id"/>
 		<form:hidden path="home"/>
 		<form:hidden path="act.taskId"/>
@@ -192,85 +194,58 @@
 
 			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>项目基础信息</h2></div>
-                <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label">项目名称:</label>
-                    <div class="layui-input-block">
-                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectName}"/>
-                    </div>
-                </div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">报告号:</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false"  readonly="true" class="form-control layui-input" style="background-color: #f1f1f1" value="${projectRecords.projectReportNumber}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">项目名称:</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false"  readonly="true" class="form-control layui-input" style="background-color: #f1f1f1" value="${projectRecords.projectName}"/>
+					</div>
+				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">项目编号:</label>
 					<div class="layui-input-block">
-                        <div class="input-group">
-                            <form:input path="projectId" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
-                            <span class="input-group-btn">
+						<div class="input-group">
+							<form:input path="projectId" htmlEscape="false"  readonly="true" class="form-control layui-input" cssStyle="background-color: #f1f1f1"/>
+							<span class="input-group-btn">
                                 <label class="form-status"><c:choose><c:when test="${not empty projectRecords.projectStatus}">${fns:getDictLabel(projectRecords.projectStatus, 'rural_project_audit_state', '')}</c:when><c:otherwise>新添</c:otherwise></c:choose></label>
                              </span>
-                        </div>
+						</div>
 					</div>
 				</div>
-				<%--<div class="layui-item layui-col-sm6 lw6">--%>
-					<%--<label class="layui-form-label">规模类型:</label>--%>
-					<%--<div class="layui-input-block">--%>
-						<%--<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.scaleType}"/>--%>
-					<%--</div>--%>
-				<%--</div>--%>
-				<%--<div class="layui-item layui-col-sm6 lw6">--%>
-					<%--<label class="layui-form-label">规模单位:</label>--%>
-					<%--<div class="layui-input-block">--%>
-						<%--<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.scaleUnit}"/>--%>
-					<%--</div>--%>
-				<%--</div>--%>
-				<%--<div class="layui-item layui-col-sm6 lw6">--%>
-					<%--<label class="layui-form-label">规模数量:</label>--%>
-					<%--<div class="layui-input-block">--%>
-						<%--<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.scaleQuantity}"/>--%>
-					<%--</div>--%>
-				<%--</div>--%>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">项目所在地:</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.province}-${projectRecords.city}-${projectRecords.county}"/>
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.province}-${projectRecords.city}-${projectRecords.county}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">投资性质:</label>
 					<div class="layui-input-block">
+						<c:if test="${projectRecords.projectProperties==null}">
+							<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input"/>
+						</c:if>
 						<c:forEach  items="${fns:getMainDictList('project_properties')}" var="v">
 							<c:if test="${v.value==projectRecords.projectProperties}">
-								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${v.label}"/>
+								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${v.label}"/>
 							</c:if>
 						</c:forEach>
 					</div>
 				</div>
-<%--				<div class="layui-item layui-col-sm6 lw6">--%>
-<%--					<label class="layui-form-label">所在省份:</label>--%>
-<%--					<div class="layui-input-block">--%>
-<%--						<form:input path="province" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>--%>
-<%--					</div>--%>
-<%--				</div>--%>
-<%--				<div class="layui-item layui-col-sm6 lw6">--%>
-<%--					<label class="layui-form-label">所在地级市:</label>--%>
-<%--					<div class="layui-input-block">--%>
-<%--						<form:input path="city" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>--%>
-<%--					</div>--%>
-<%--				</div>--%>
-<%--				<div class="layui-item layui-col-sm6 lw6">--%>
-<%--					<label class="layui-form-label">所在区县:</label>--%>
-<%--					<div class="layui-input-block">--%>
-<%--						<form:input path="county" htmlEscape="false" id="areaName1" class="form-control layui-input" readonly="true"/>--%>
-<%--					</div>--%>
-<%--				</div>--%>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">建设地点:</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectSite}"/>
+						<input htmlEscape="false" style="background-color: #f1f1f1"  readonly="true" class="form-control layui-input" value="${projectRecords.projectSite}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">创建人:</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.createBy.name}"/>
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.createBy.name}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
@@ -282,7 +257,7 @@
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">所属部门:</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false" readonly="true" id="officeName" class="form-control layui-input" value="${projectRecords.officeName}"/>
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" id="officeName" class="form-control layui-input" value="${projectRecords.officeName}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
@@ -311,145 +286,43 @@
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">送审规模(万元):</label>
 					<div class="layui-input-block">
-						<form:input path="submitScale" id="submitScale" readonly="true" maxlength="12" htmlEscape="false" onkeyup="wirteNum(this)" placeholder="请输入送审规模" class="form-control layui-input number"/>
+						<form:input path="submitScale" readonly="true" style="background-color: #f1f1f1" id="submitScale" maxlength="12" htmlEscape="false" placeholder="请输入送审规模" class="form-control layui-input number"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">工作开始日期:</label>
 					<div class="layui-input-block">
-						<input class=" form-control layui-input " readonly="true" id="startDate" name="startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+						<input class="laydate-icondate form-control layui-input layer-date ash"  style="background-color: #f1f1f1" readonly="true" id="startDate" name="startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">工作结束日期:</label>
 					<div class="layui-input-block">
-						<input class=" form-control layui-input " readonly="true" id="endingDate" name="endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+						<input class="laydate-icondate form-control layui-input layer-date "  style="background-color: #f1f1f1" readonly="true" id="endingDate" name="endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">创建日期:</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"/>
+						<input htmlEscape="false"  style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw6">
+				<div class="layui-item layui-col-sm6 lw7">
 					<label class="layui-form-label">项目类别:</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false" readonly="true" class="form-control layui-input" value="${projectRecords.attachmentProjectSort}"/>
-					</div>
-				</div>
-				<%--<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">工程结构:</label>
-					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectStructure}"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">地上层数:</label>
-					<div class="layui-input-block">
-						<form:input path="onGroundNum" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">底下层数:</label>
-					<div class="layui-input-block">
-						<form:input path="underGroundNum" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">建筑面积或规模:</label>
-					<div class="layui-input-block">
-						<form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">计量单位:</label>
-					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.measuringUnit}"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">工程用途:</label>
-					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectUse}"/>
-					</div>
-				</div>--%>
-				<%--<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">预估总投资额(万元):</label>
-					<div class="layui-input-block">
-						<input value="<fmt:formatNumber value="${projectRecords.estimateTotalFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="estimateTotalFees" class="form-control layui-input number"  readonly="true"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">咨询标的额(万元):</label>
-					<div class="layui-input-block">
-						<input value="<fmt:formatNumber value="${projectRecords.totalFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="totalFees" class="form-control layui-input number"  readonly="true"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">其中土建造价(万元):</label>
-					<div class="layui-input-block">
-						<input   value="<fmt:formatNumber value="${projectRecords.buildingFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="buildingFees" class="form-control layui-input" readonly="true"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">其中安装造价(万元):</label>
-					<div class="layui-input-block">
-						<input  value="<fmt:formatNumber value="${projectRecords.installFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="installFees" class="form-control layui-input" readonly="true"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">其中土建百分比(%):</label>
-					<div class="layui-input-block">
-						<form:input path="buildingPercent" htmlEscape="false" id="buildingPercent" class="form-control layui-input" readonly="true"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">其中安装百分比(%):</label>
-					<div class="layui-input-block">
-						<form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
-					</div>
-				</div>--%>
-				<%--<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">施工单位:</label>
-					<div class="layui-input-block">
-						<form:input path="constructionUnit" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
+						<input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${projectRecords.attachmentProjectSort}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">施工方联系方式:</label>
-					<div class="layui-input-block">
-						<form:input path="constructionLinkman" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
-					</div>
-				</div>--%>
-				<%--<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">单位造价(元):</label>
-					<div class="layui-input-block">
-						<input value="<fmt:formatNumber value="${projectRecords.unitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="true"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">土建单位造价(元):</label>
-					<div class="layui-input-block">
-						<input  value="<fmt:formatNumber value="${projectRecords.buildingUnitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="buildingUnitFees" class="form-control layui-input" readonly="true"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">安装单位造价(元):</label>
-					<div class="layui-input-block">
-						<input  value="<fmt:formatNumber value="${projectRecords.installUnitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="readonly"/>
-					</div>
-				</div>--%>
 				<div class="layui-item layui-col-sm6 lw6 with-textarea">
 					<label class="layui-form-label">工程概况:</label>
 					<div class="layui-input-block">
-						<textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${projectRecords.projectDesc}</textarea>
+						<textarea htmlEscape="false" rows="4" readonly="true"  style="background-color: #f1f1f1" maxlength="1000" class="form-control" >${projectRecords.projectDesc}</textarea>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6 with-textarea">
-					<label class="layui-form-label">特殊要求:</label>
+					<label class="layui-form-label">备注:</label>
 					<div class="layui-input-block">
-						<textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${projectRecords.remarks}</textarea>
+						<textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000"  style="background-color: #f1f1f1" class="form-control" >${projectRecords.remarks}</textarea>
 					</div>
 				</div>
 			</div>
@@ -469,30 +342,27 @@
 						</tr>
 						</thead>
 						<tbody id="workClientLinkmanList">
+						<c:forEach items="${projectRecords.workClientLinkmanList}" var="info" varStatus="index">
+							<tr>
+								<td >
+										${info.clientId.name}
+								</td>
+								<td>
+										${info.name}
+								</td>
+								<td>
+										${info.linkPhone}
+								</td>
+								<td>
+										${info.linkMobile}
+								</td>
+							</tr>
+						</c:forEach>
 						</tbody>
 					</table>
-					<script type="text/template" id="workClientLinkmanTpl">//<!--
-					<tr id="workClientLinkmanList{{idx}}">
-					<td class="hide">
-						<input id="workClientLinkmanList{{idx}}_id" name="workClientLinkmanList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
-						<input id="workClientLinkmanList{{idx}}_delFlag" name="workClientLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
-					</td>
-					<td>
-						{{row.clientId.name}}
-					</td>
-					<td>
-						{{row.name}}
-					</td>
-					<td>
-						{{row.linkPhone}}
-					</td>
-					<td>
-						{{row.linkMobile}}
-					</td>
-				</tr>//-->
-					</script>
 				</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" >
@@ -507,327 +377,182 @@
 						</tr>
 						</thead>
 						<tbody id="workConstructionLinkmanList">
-						</tbody>
-					</table>
-					<script type="text/template" id="workConstructionLinkmanTpl">//<!--
-					<tr id="workConstructionLinkmanList{{idx}}">
-					<td class="hide">
-						<input id="workConstructionLinkmanList{{idx}}_id" name="workConstructionLinkmanList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
-						<input id="workConstructionLinkmanList{{idx}}_delFlag" name="workConstructionLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
-					</td>
-					<td>
-						{{row.clientId.name}}
-					</td>
-					<td>
-						{{row.name }}
-					</td>
-					<td>
-						{{row.linkPhone}}
-					</td>
-					<td>
-						{{row.linkMobile}}
-					</td>
-				</tr>//-->
-					</script>
-				</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" >
-					<table id="upTable" class="table table-bordered table-condensed details">
-						<thead>
-						<tr>
-							<th width="25%">报告编号</th>
-							<th width="25%">报告名称</th>
-							<th width="20%">工作内容类型</th>
-							<th width="10%">签章类型</th>
-							<th width="10%">创建日期</th>
-							<th width="10%">状态</th>
-						</tr>
-						</thead>
-						<tbody>
-						<c:choose>
-							<c:when test="${not empty projectRecords.projectReportData}">
-								<c:forEach items="${projectRecords.projectReportData}" var="projectReportData" varStatus="index">
-									<tr>
-										<td><a title="${projectReportData.number}" href="javascript:void(0)" onclick="openDialogView('查看报告详情', '${ctx}/projectcontentinfo/projectcontentinfo/form1?id=${projectReportData.id}','95%', '95%')">
-												${projectReportData.number}
-										</a></td>
-										<td>
-												${projectReportData.name}
-										</td>
-										<td title="${fns:getContentTypeName(projectReportData.type,"")}">
-												${fns:getContentTypeName(projectReportData.type,"")}
-										</td>
-										<td title="${projectReportData.reportType}">
-												${projectReportData.reportType}
-										</td>
-										<td>
-											<fmt:formatDate value="${projectReportData.reportDate}" pattern="yyyy-MM-dd"/>
-										</td>
-										<td class="op-td">
-												&lt;%&ndash;<c:choose>&ndash;%&gt;
-												&lt;%&ndash;<c:when test="${empty projectReportData.status || projectReportData.status eq 1}">&ndash;%&gt;
-												&lt;%&ndash;<div style="text-align: center">&ndash;%&gt;
-												&lt;%&ndash;<a href="javascript:void(0)" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>&ndash;%&gt;
-												&lt;%&ndash;</div>&ndash;%&gt;
-												&lt;%&ndash;</c:when>&ndash;%&gt;
-												&lt;%&ndash;<c:otherwise>&ndash;%&gt;
-												&lt;%&ndash;<div style="text-align: center">&ndash;%&gt;
-												&lt;%&ndash;<a href="javascript:void(0)" onclick="openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=${id}&projectReportData.id=${projectReportData.id}&type=1','95%','95%')" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>&ndash;%&gt;
-												&lt;%&ndash;</div>&ndash;%&gt;
-												&lt;%&ndash;</c:otherwise>&ndash;%&gt;
-												&lt;%&ndash;</c:choose>&ndash;%&gt;
-											<div style="text-align: center" id="status_td_${index.index+1}">
-											</div>
-											<script>
-												initRecordStatus(${index.index+1},"${id}","${projectReportData.id}","${projectReportData.status}");
-											</script>
-										</td>
-									</tr>
-								</c:forEach>
-							</c:when>
-							<c:otherwise>
-								<tr>
-									<td colspan="7">
-										暂无数据
-									</td>
-								</tr>
-							</c:otherwise>
-						</c:choose>
-						</tbody>
-					</table>
-				</div>
-			</div>--%>
-			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>项目计划列表</h2></div>
-				<div class="layui-item layui-col-sm12 lw7">
-					<div class="layui-item nav-btns">
-<%--						<div class="layui-item nav-btns" style="padding-left:0px;">--%>
-<%--							<a class="nav-btn nav-btn-add"--%>
-<%--							   onclick="addRow('#projectPlanList', workClientBankRowIdx, workClientBankTpl);workClientBankRowIdx = workClientBankRowIdx + 1;"--%>
-<%--							   title="新增"><i class="fa fa-plus"></i> 新增</a>--%>
-<%--							<shiro:hasPermission name="project:projectPlan:export">--%>
-<%--								<a class="nav-btn nav-btn-export" title="导出"  onclick="return confirmx('确认要导出该项目计划列表吗?', '${ctx}/project/projectPlan/export?id=${projectRecords.id}');"><i class="fa fa-file-excel-o"></i> 导出</a>--%>
-<%--							</shiro:hasPermission>--%>
-<%--						</div>--%>
-						<table id="bankinfo" class="table table-bordered table-condensed can-edit">
-							<thead>
+						<c:forEach items="${projectRecords.workConstructionLinkmanList}" var="info" varStatus="index">
 							<tr>
-								<th width="60px">编号</th>
-								<th >任务阶段</th>
-								<th >计划开始时间</th>
-								<th >计划结束时间</th>
-								<th >提醒人</th>
-								<th >完成人</th>
+								<td >
+										${info.clientId.name}
+								</td>
+								<td>
+										${info.name}
+								</td>
+								<td>
+										${info.linkPhone}
+								</td>
+								<td>
+										${info.linkMobile}
+								</td>
 							</tr>
-							</thead>
-							<tbody id="projectPlanList">
-
-							</tbody>
-						</table>
-						<script type="text/template" id="workClientBankTpl">//<!--
-                                <tr id="projectPlanList{{idx}}">
-                                    <td class="hide">
-                                        <input id="projectPlanList{{idx}}_id" name="projectPlanList[{{idx}}].id" type="hidden" readonly="true" value="{{row.id}}"/>
-                                        <input id="projectPlanList{{idx}}_delFlag" name="projectPlanList[{{idx}}].delFlag" type="hidden" readonly="true" value="0"/>
-                                        <input id="projectPlanList{{idx}}_remindId" name="projectPlanList[{{idx}}].remindId" type="hidden" readonly="true" value="{{row.remindId}}"/>
-                                    </td>
-
-                                    <td width="60px">
-                                        <input id="projectPlanList{{idx}}_costNum" name="projectPlanList[{{idx}}].costNum" readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
-                                    </td>
-                                    <td>
-                                        <input id="projectPlanList{{idx}}_projectStage" name="projectPlanList[{{idx}}].projectStage" readonly="true" list ="num" title="{{row.projectStage}}"  value="{{row.projectStage}}" class="form-control required"/>
-                                    </td>
-
-                                    <td>
-                                        <input lay-verify="date" readonly="true" placeholder="yyyy-MM-dd" autocomplete="off" id="projectPlanList{{idx}}_beginDate" name="projectPlanList[{{idx}}].beginDate" style="text-align: center" type="text" value="{{row.beginDate}}"  class="form-control required datetime"/>
-                                    </td>
-                                    <td>
-                                        <input lay-verify="date" readonly="true" placeholder="yyyy-MM-dd" autocomplete="off" id="projectPlanList{{idx}}_endDate" name="projectPlanList[{{idx}}].endDate" style="text-align: center" type="text" value="{{row.endDate}}"  class="form-control required datetime"/>
-                                    </td>
-
-                                    <td>
-                                    	<input id="projectPlanList{{idx}}_remindName" name="remindName" readonly="readonly" style="text-align: center"  value="{{row.remindName}}" type="text" class="form-control contentDetail"/>
-<%--                                        <sys:treeselecttPlanUser  id="projectPlanList{{idx}}_remindName" name="remindName" value="${projectRecords.leaderIds}" labelName="projectPlanList[{{idx}}].remindName" labelValue="{{row.remindName}}"--%>
-<%--                                         title="用户" url="/sys/office/treeDataByPlan?type=3&projectId=${projectRecords.id}" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true" disabled="true"/>--%>
-                                    </td>
-
-                                    <td>
-                                    	<input id="projectPlanList{{idx}}_finishName" name="projectPlanList[{{idx}}].finishId" readonly="readonly" style="text-align: center"  value="{{row.finishName}}" type="text" class="form-control contentDetail"/>
-<%--                                        <sys:treeselecttPlanUser id="projectPlanList{{idx}}_finishName" name="projectPlanList[{{idx}}].finishId" value="${projectRecords.leaderIds}" labelName="projectPlanList[{{idx}}].finishName" labelValue="{{row.finishName}}"--%>
-<%--                                         title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true" disabled="true" />--%>
-                                    </td>
-
-<%--                                    <td class="text-center op-td" width="10">--%>
-<%--                                        {{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#projectPlanList{{idx}}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>{{/delBtn}}--%>
-<%--                                    </td>--%>
-                                </tr>//-->
-						</script>
-					</div>
+						</c:forEach>
+						</tbody>
+					</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" >--%>
-<%--					<table id="listAttachment" class="table table-bordered table-condensed no-bottom-margin details">--%>
-<%--						<thead>--%>
-<%--						<tr>--%>
-<%--							<th width="25%">文件预览</th>--%>
-<%--							<th width="25%">上传人</th>--%>
-<%--							<th width="25%">上传时间</th>--%>
-<%--							<th width="25%">操作</th>--%>
-<%--						</tr>--%>
-<%--						</thead>--%>
-<%--						<tbody id="file_attachment">--%>
-<%--						<c:forEach items="${projectRecords.workAttachments}" var="workClientAttachment" varStatus="status">--%>
-<%--							<tr>--%>
-<%--									&lt;%&ndash;<td>${status.index + 1}</td>&ndash;%&gt;--%>
-<%--								<c:choose>--%>
-<%--									<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')--%>
-<%--															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')--%>
-<%--															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')--%>
-<%--															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')--%>
-<%--															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">--%>
-<%--										<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">--%>
-<%--									</c:when>--%>
-<%--									<c:otherwise>--%>
-<%--										<c:choose>--%>
-<%--											<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">--%>
-<%--												<td><a href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','95%','95%','1')">${workClientAttachment.attachmentName}</a></td>--%>
-<%--											</c:when>--%>
-<%--											<c:otherwise>--%>
-<%--												<td><a href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','95%','95%')">${workClientAttachment.attachmentName}</a></td>--%>
-<%--											</c:otherwise>--%>
-<%--										</c:choose>--%>
-<%--									</c:otherwise>--%>
-<%--								</c:choose>--%>
-<%--								<td>${workClientAttachment.createBy.name}</td>--%>
-<%--								<td><fmt:formatDate value="${workClientAttachment.createDate}" pattern="yyyy-MM-dd"/></td>--%>
-<%--								<td  class="op-td">--%>
-<%--									<a href="javascript:location.href=encodeURI('${ctx}/workcontractinfo/workContractInfo/downLoadAttach?file=${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>--%>
-<%--								</td>--%>
-<%--							</tr>--%>
-<%--						</c:forEach>--%>
-<%--						</tbody>--%>
-<%--					</table>--%>
-<%--				</div>--%>
-<%--			</div>--%>
-<%--			<div class="form-group layui-row">--%>
-<%--				<div class="layui-item layui-col-sm8 lw6 with-textarea">--%>
-<%--					<div class="layui-input-block" style="margin-left:10px;position: relative">--%>
-<%--						<form:textarea placeholder="请输入意见:" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />--%>
-<%--						<a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>--%>
-<%--						<input type="file" name="upload_files" style="display: none;">--%>
-<%--					</div>--%>
-<%--				</div>--%>
-<%--				<div class="layui-item layui-col-sm4 lw6 with-textarea">--%>
-<%--					<div class="layui-input-block" style="margin-left:10px;">--%>
-<%--						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>--%>
-<%--						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>--%>
-<%--						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>--%>
-<%--						<div style="padding: 5px 0px;">--%>
-<%--							<form:select path="act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">--%>
-<%--								<form:option value=""/>--%>
-<%--								<form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>--%>
-<%--							</form:select>--%>
-<%--						</div>--%>
-<%--					</div>--%>
-<%--				</div>--%>
-<%--			</div>--%>
 
-			<script>
-                var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
-                var workConstructionLinkmanRowIdx = 0, workConstructionLinkmanTpl = $("#workConstructionLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
-                $(document).ready(function() {
-                    var data = ${fns:toJson(projectRecords.workClientLinkmanList)};
-                    for (var i=0; i<data.length; i++){
-                        addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl, data[i]);
-                        workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
-                    }
-                    var dataBank = ${fns:toJson(projectRecords.workConstructionLinkmanList)};
-                    for (var i=0; i<dataBank.length; i++){
-                        addRow('#workConstructionLinkmanList', workConstructionLinkmanRowIdx, workConstructionLinkmanTpl, dataBank[i]);
-                        workConstructionLinkmanRowIdx = workConstructionLinkmanRowIdx + 1;
-                    }
-
-                });
-				layui.use('form', function () {
-					var form = layui.form;
-					form.render();
-				});
-                function f1(row) {
-					// window.parent.document.getElementById('opinion').value = row;
-					$("#opinion").val(row)
-                }
-				function openDialogre(title,url,width,height,target,buttons) {
-					if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端,就使用自适应大小弹窗
-						width = 'auto';
-						height = 'auto';
-					} else {//如果是PC端,根据用户设置的width和height显示。
-					}
-					var split = buttons.split(",");
-					top.layer.open({
-						type: 2,
-						area: [width, height],
-						title: title,
-						maxmin: true, //开启最大化最小化按钮
-						skin: 'three-btns',
-						content: url,
-						btn: split,
-						btn1: function(index, layero){
-							top.layer.close(index)
-							document.getElementById('iframe').contentWindow.location.reload();
-						}
-					});
-				}
-			</script>
 
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>项目组成员列表</h2></div>
-				<div class="layui-item layui-col-xs12 form-table-container" >
-					<table id="usersListTable" class="table table-bordered table-condensed no-bottom-margin details">
+				<div class="form-group-label"><h2>审定单签章附件信息</h2></div>
+				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
+					<table id="listAttachment" class="table table-bordered table-condensed details">
 						<thead>
 						<tr>
-							<th width="25%">姓名</th>
-							<th width="25%">部门</th>
-							<th width="25%">职级</th>
-							<th width="55px;">状态</th>
+								<%-- <th>序号</th>--%>
+							<th>文件预览</th>
+							<th>上传人</th>
+							<th>上传时间</th>
+							<th width="180px">操作</th>
 						</tr>
 						</thead>
-						<tbody id="usersList">
-						<c:if test="${not empty projectRecords.projectMembers}">
-							<c:forEach items="${projectRecords.projectMembers}" var="user">
-								<tr id="${user.id}">
-									<td>
-											${user.name}
-									</td>
-									<td>
-											${user.office.name}
-									</td>
-									<td>
-											${user.basicInfo.jobGrade.name}
-									</td>
-									<td>
+						<tbody id="file_attachment">
+						<c:forEach items="${projectRecords.workAttachments}" var = "workClientAttachment" varStatus="status">
+							<tr>
+									<%-- <td>${status.index + 1}</td>--%>
+								<c:choose>
+									<c:when test="${projectRecords.uploadMode == 2}">
 										<c:choose>
-											<c:when test="${user.delFlag == 0}">
-												正常
+											<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+												<td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
 											</c:when>
 											<c:otherwise>
-												移除
+												<c:choose>
+													<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+														<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.temporaryUrl}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
+													</c:when>
+													<c:otherwise>
+														<c:choose>
+															<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+															</c:when>
+															<c:otherwise>
+																<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+															</c:otherwise>
+														</c:choose>
+													</c:otherwise>
+												</c:choose>
 											</c:otherwise>
 										</c:choose>
-									</td>
-								</tr>
-							</c:forEach>
-						</c:if>
+									</c:when>
+									<c:otherwise>
+										<c:choose>
+											<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+												<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+											</c:when>
+											<c:otherwise>
+												<c:choose>
+													<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+														<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
+													</c:when>
+													<c:otherwise>
+														<c:choose>
+															<c:when test="${workReimbursement.uploadMode == 2}">
+																<c:choose>
+																	<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+																		<td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+																	</c:when>
+																	<c:otherwise>
+																		<c:choose>
+																			<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+																				<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
+																			</c:when>
+																			<c:otherwise>
+																				<c:choose>
+																					<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																						<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+																					</c:when>
+																					<c:otherwise>
+																						<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+																					</c:otherwise>
+																				</c:choose>
+																			</c:otherwise>
+																		</c:choose>
+																	</c:otherwise>
+																</c:choose>
+															</c:when>
+															<c:otherwise>
+																<c:choose>
+																	<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+																		<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+																	</c:when>
+																	<c:otherwise>
+																		<c:choose>
+																			<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+																				<td><a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
+																			</c:when>
+																			<c:otherwise>
+																				<c:choose>
+																					<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																						<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
+																					</c:when>
+																					<c:otherwise>
+																						<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+																					</c:otherwise>
+																				</c:choose>
+																			</c:otherwise>
+																		</c:choose>
+																	</c:otherwise>
+																</c:choose>
+															</c:otherwise>
+														</c:choose>
+													</c:otherwise>
+												</c:choose>
+											</c:otherwise>
+										</c:choose>
+									</c:otherwise>
+								</c:choose>
+
+								<td>${workClientAttachment.createBy.name}</td>
+								<td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
+								<td class="op-td">
+									<div class="op-btn-box" >
+										<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+											<%--													<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">--%>
+											<%--														<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>--%>
+											<%--													</c:if>--%>
+									</div>
+								</td>
+							</tr>
+						</c:forEach>
 						</tbody>
 					</table>
 				</div>
 			</div>
 
+
+
 	</form:form>
 		<div class="form-group-label">
 			<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=${identification}&name=${identificationName}','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 审核意见模板列表</a></div>

+ 171 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsApprovalForm.jsp

@@ -322,6 +322,9 @@
 , trigger: 'click'
             });
 
+            $("#attachment_btn").click(function () {
+                $("#attachment_file").click();
+            });
         });
 
 
@@ -562,7 +565,7 @@
             $("#flagFile").val(false);
             var files = $("#attachment_file")[0].files;            for(var i = 0;i<files.length;i++) {                var file = files[i];
                 var attachmentId = $("#id").val();
-                var attachmentFlag = "82";
+                var attachmentFlag = "144";
                 /*console.log(file);*/
                 var timestamp=new Date().getTime();
 
@@ -1066,6 +1069,173 @@
                     </table>
                 </div>
             </div>
+
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>审定单签章附件信息</h2></div>
+                <div class="layui-item nav-btns">
+                    <a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
+                </div>
+                <div id="addFile_attachment" style="display: none" class="upload-progress">
+                    <span id="fileName_attachment" ></span>
+                    <b><span id="baifenbi_attachment" ></span></b>
+                    <div class="progress">
+                        <div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
+                        </div>
+                    </div>
+                </div>
+                <input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
+                <span id="attachment_title"></span>
+                <div class="layui-item layui-col-xs12" style="padding:0 16px;">
+                    <table id="listAttachment" class="table table-bordered table-condensed details">
+                        <thead>
+                        <tr>
+                                <%-- <th>序号</th>--%>
+                            <th>文件预览</th>
+                            <th>上传人</th>
+                            <th>上传时间</th>
+                            <th width="180px">操作</th>
+                        </tr>
+                        </thead>
+                        <tbody id="file_attachment">
+                        <c:forEach items="${projectRecords.workAttachments}" var = "workClientAttachment" varStatus="status">
+                            <tr>
+                                    <%-- <td>${status.index + 1}</td>--%>
+                                <c:choose>
+                                    <c:when test="${projectRecords.uploadMode == 2}">
+                                        <c:choose>
+                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+                                                <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+                                            </c:when>
+                                            <c:otherwise>
+                                                <c:choose>
+                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.temporaryUrl}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
+                                                    </c:when>
+                                                    <c:otherwise>
+                                                        <c:choose>
+                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+                                                            </c:when>
+                                                            <c:otherwise>
+                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                            </c:otherwise>
+                                                        </c:choose>
+                                                    </c:otherwise>
+                                                </c:choose>
+                                            </c:otherwise>
+                                        </c:choose>
+                                    </c:when>
+                                    <c:otherwise>
+                                        <c:choose>
+                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+                                                <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+                                            </c:when>
+                                            <c:otherwise>
+                                                <c:choose>
+                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
+                                                    </c:when>
+                                                    <c:otherwise>
+                                                        <c:choose>
+                                                            <c:when test="${workReimbursement.uploadMode == 2}">
+                                                                <c:choose>
+                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+                                                                        <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+                                                                    </c:when>
+                                                                    <c:otherwise>
+                                                                        <c:choose>
+                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+                                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
+                                                                            </c:when>
+                                                                            <c:otherwise>
+                                                                                <c:choose>
+                                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+                                                                                    </c:when>
+                                                                                    <c:otherwise>
+                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                                    </c:otherwise>
+                                                                                </c:choose>
+                                                                            </c:otherwise>
+                                                                        </c:choose>
+                                                                    </c:otherwise>
+                                                                </c:choose>
+                                                            </c:when>
+                                                            <c:otherwise>
+                                                                <c:choose>
+                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+                                                                        <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+                                                                    </c:when>
+                                                                    <c:otherwise>
+                                                                        <c:choose>
+                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+                                                                                <td><a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
+                                                                            </c:when>
+                                                                            <c:otherwise>
+                                                                                <c:choose>
+                                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
+                                                                                    </c:when>
+                                                                                    <c:otherwise>
+                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                                    </c:otherwise>
+                                                                                </c:choose>
+                                                                            </c:otherwise>
+                                                                        </c:choose>
+                                                                    </c:otherwise>
+                                                                </c:choose>
+                                                            </c:otherwise>
+                                                        </c:choose>
+                                                    </c:otherwise>
+                                                </c:choose>
+                                            </c:otherwise>
+                                        </c:choose>
+                                    </c:otherwise>
+                                </c:choose>
+
+                                <td>${workClientAttachment.createBy.name}</td>
+                                <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
+                                <td class="op-td">
+                                    <div class="op-btn-box" >
+                                        <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                            <%--													<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">--%>
+                                            <%--														<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>--%>
+                                            <%--													</c:if>--%>
+                                        <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
+                                    </div>
+                                </td>
+                            </tr>
+                        </c:forEach>
+                        </tbody>
+                    </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" >

+ 221 - 482
src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsApprovalModify.jsp

@@ -4,17 +4,17 @@
 <head>
     <title>项目审批管理</title>
     <meta name="decorator" content="default"/>
-    <script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>
-    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
-    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
-    <link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
+    <script type="text/javascript" src="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.js"></script>
+    <script type="text/javascript" src="${ctxStatic}/iCheck/icheck.min.js"></script>
+    <script type="text/javascript" src="${ctxStatic}/layui/layuidown.js"></script>
+    <script src="${ctxStatic}/common/html/js/script.js"></script>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/layuidown.css"/>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.css"/>
 
     <script type="text/javascript">
         var validateForm;
         function doSubmit(obj){//回调函数,在编辑和保存动作时,供openDialog调用提交表单。
             if(validateForm.form()){
-                var ss= document.getElementById("iframe").contentWindow.document.getElementById("opinion").value
-                $("#opinion").val(ss);
                 if(obj == 1) {
                     $("#flag").val("yes");
                 }else {
@@ -79,12 +79,16 @@
                 $("#c2").hide();
                 $("#c1").show();
             }
+
+            $("#attachment_btn").click(function () {
+                $("#attachment_file").click();
+            });
         });
 
         function insertTitle(tValue){
             var files = $("#attachment_file")[0].files;            for(var i = 0;i<files.length;i++) {                var file = files[i];
                 var attachmentId = $("#id").val();
-                var attachmentFlag = "82";
+                var attachmentFlag = "144";
                 console.log(file);
                 var timestamp=new Date().getTime();
 
@@ -126,7 +130,7 @@
 <body >
 <div class="single-form">
     <div class="container">
-        <form:form id="inputForm" modelAttribute="projectRecords" enctype="multipart/form-data" action="${ctx}/ruralProject/electronicSeal/approvalSaveAudit" method="post" class="layui-form">
+        <form:form id="inputForm" modelAttribute="projectRecords" enctype="multipart/form-data" action="${ctx}/ruralProject/electronicSeal/approvalSaveAudit" method="post" class="form-horizontal layui-form">
             <form:hidden path="id"/>
             <form:hidden path="home"/>
             <form:hidden path="act.taskId"/>
@@ -193,84 +197,57 @@
             <div class="form-group layui-row first">
                 <div class="form-group-label"><h2>项目基础信息</h2></div>
                 <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label">报告号:</label>
+                    <div class="layui-input-block">
+                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" style="background-color: #f1f1f1" value="${projectRecords.projectReportNumber}"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">项目名称:</label>
                     <div class="layui-input-block">
-                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectName}"/>
+                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" style="background-color: #f1f1f1" value="${projectRecords.projectName}"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">项目编号:</label>
                     <div class="layui-input-block">
                         <div class="input-group">
-                            <form:input path="projectId" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
+                            <form:input path="projectId" htmlEscape="false"  readonly="true" class="form-control layui-input" cssStyle="background-color: #f1f1f1"/>
                             <span class="input-group-btn">
                                 <label class="form-status"><c:choose><c:when test="${not empty projectRecords.projectStatus}">${fns:getDictLabel(projectRecords.projectStatus, 'rural_project_audit_state', '')}</c:when><c:otherwise>新添</c:otherwise></c:choose></label>
                              </span>
                         </div>
                     </div>
                 </div>
-                    <%--<div class="layui-item layui-col-sm6 lw6">--%>
-                    <%--<label class="layui-form-label">规模类型:</label>--%>
-                    <%--<div class="layui-input-block">--%>
-                    <%--<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.scaleType}"/>--%>
-                    <%--</div>--%>
-                    <%--</div>--%>
-                    <%--<div class="layui-item layui-col-sm6 lw6">--%>
-                    <%--<label class="layui-form-label">规模单位:</label>--%>
-                    <%--<div class="layui-input-block">--%>
-                    <%--<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.scaleUnit}"/>--%>
-                    <%--</div>--%>
-                    <%--</div>--%>
-                    <%--<div class="layui-item layui-col-sm6 lw6">--%>
-                    <%--<label class="layui-form-label">规模数量:</label>--%>
-                    <%--<div class="layui-input-block">--%>
-                    <%--<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.scaleQuantity}"/>--%>
-                    <%--</div>--%>
-                    <%--</div>--%>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">项目所在地:</label>
                     <div class="layui-input-block">
-                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.province}-${projectRecords.city}-${projectRecords.county}"/>
+                        <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.province}-${projectRecords.city}-${projectRecords.county}"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">投资性质:</label>
                     <div class="layui-input-block">
+                        <c:if test="${projectRecords.projectProperties==null}">
+                            <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input"/>
+                        </c:if>
                         <c:forEach  items="${fns:getMainDictList('project_properties')}" var="v">
                             <c:if test="${v.value==projectRecords.projectProperties}">
-                                <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${v.label}"/>
+                                <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${v.label}"/>
                             </c:if>
                         </c:forEach>
                     </div>
                 </div>
-                    <%--				<div class="layui-item layui-col-sm6 lw6">--%>
-                    <%--					<label class="layui-form-label">所在省份:</label>--%>
-                    <%--					<div class="layui-input-block">--%>
-                    <%--						<form:input path="province" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>--%>
-                    <%--					</div>--%>
-                    <%--				</div>--%>
-                    <%--				<div class="layui-item layui-col-sm6 lw6">--%>
-                    <%--					<label class="layui-form-label">所在地级市:</label>--%>
-                    <%--					<div class="layui-input-block">--%>
-                    <%--						<form:input path="city" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>--%>
-                    <%--					</div>--%>
-                    <%--				</div>--%>
-                    <%--				<div class="layui-item layui-col-sm6 lw6">--%>
-                    <%--					<label class="layui-form-label">所在区县:</label>--%>
-                    <%--					<div class="layui-input-block">--%>
-                    <%--						<form:input path="county" htmlEscape="false" id="areaName1" class="form-control layui-input" readonly="true"/>--%>
-                    <%--					</div>--%>
-                    <%--				</div>--%>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">建设地点:</label>
                     <div class="layui-input-block">
-                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectSite}"/>
+                        <input htmlEscape="false" style="background-color: #f1f1f1"  readonly="true" class="form-control layui-input" value="${projectRecords.projectSite}"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">创建人:</label>
                     <div class="layui-input-block">
-                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.createBy.name}"/>
+                        <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.createBy.name}"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -282,7 +259,7 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">所属部门:</label>
                     <div class="layui-input-block">
-                        <input htmlEscape="false" readonly="true" id="officeName" class="form-control layui-input" value="${projectRecords.officeName}"/>
+                        <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" id="officeName" class="form-control layui-input" value="${projectRecords.officeName}"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -311,145 +288,43 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line">送审规模(万元):</label>
                     <div class="layui-input-block">
-                        <form:input path="submitScale" id="submitScale" readonly="true" maxlength="12" htmlEscape="false" onkeyup="wirteNum(this)" placeholder="请输入送审规模" class="form-control layui-input number"/>
+                        <form:input path="submitScale" readonly="true" style="background-color: #f1f1f1" id="submitScale" maxlength="12" htmlEscape="false" placeholder="请输入送审规模" class="form-control layui-input number"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line">工作开始日期:</label>
                     <div class="layui-input-block">
-                        <input class=" form-control layui-input " readonly="true" id="startDate" name="startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate form-control layui-input layer-date ash"  style="background-color: #f1f1f1" readonly="true" id="startDate" name="startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line">工作结束日期:</label>
                     <div class="layui-input-block">
-                        <input class=" form-control layui-input " readonly="true" id="endingDate" name="endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate form-control layui-input layer-date "  style="background-color: #f1f1f1" readonly="true" id="endingDate" name="endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">创建日期:</label>
                     <div class="layui-input-block">
-                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"/>
+                        <input htmlEscape="false"  style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw6">
+                <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">项目类别:</label>
                     <div class="layui-input-block">
-                        <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${projectRecords.attachmentProjectSort}"/>
+                        <input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${projectRecords.attachmentProjectSort}"/>
                     </div>
                 </div>
-                    <%--<div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label">工程结构:</label>
-                        <div class="layui-input-block">
-                            <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectStructure}"/>
-                        </div>
-                    </div>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label">地上层数:</label>
-                        <div class="layui-input-block">
-                            <form:input path="onGroundNum" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
-                        </div>
-                    </div>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label">底下层数:</label>
-                        <div class="layui-input-block">
-                            <form:input path="underGroundNum" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
-                        </div>
-                    </div>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">建筑面积或规模:</label>
-                        <div class="layui-input-block">
-                            <form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
-                        </div>
-                    </div>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label">计量单位:</label>
-                        <div class="layui-input-block">
-                            <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.measuringUnit}"/>
-                        </div>
-                    </div>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label">工程用途:</label>
-                        <div class="layui-input-block">
-                            <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectUse}"/>
-                        </div>
-                    </div>--%>
-                    <%--<div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">预估总投资额(万元):</label>
-                        <div class="layui-input-block">
-                            <input value="<fmt:formatNumber value="${projectRecords.estimateTotalFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="estimateTotalFees" class="form-control layui-input number"  readonly="true"/>
-                        </div>
-                    </div>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">咨询标的额(万元):</label>
-                        <div class="layui-input-block">
-                            <input value="<fmt:formatNumber value="${projectRecords.totalFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="totalFees" class="form-control layui-input number"  readonly="true"/>
-                        </div>
-                    </div>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">其中土建造价(万元):</label>
-                        <div class="layui-input-block">
-                            <input   value="<fmt:formatNumber value="${projectRecords.buildingFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="buildingFees" class="form-control layui-input" readonly="true"/>
-                        </div>
-                    </div>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">其中安装造价(万元):</label>
-                        <div class="layui-input-block">
-                            <input  value="<fmt:formatNumber value="${projectRecords.installFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="installFees" class="form-control layui-input" readonly="true"/>
-                        </div>
-                    </div>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">其中土建百分比(%):</label>
-                        <div class="layui-input-block">
-                            <form:input path="buildingPercent" htmlEscape="false" id="buildingPercent" class="form-control layui-input" readonly="true"/>
-                        </div>
-                    </div>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">其中安装百分比(%):</label>
-                        <div class="layui-input-block">
-                            <form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
-                        </div>
-                    </div>--%>
-                    <%--<div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">施工单位:</label>
-                        <div class="layui-input-block">
-                            <form:input path="constructionUnit" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
-                        </div>
-                    </div>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">施工方联系方式:</label>
-                        <div class="layui-input-block">
-                            <form:input path="constructionLinkman" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
-                        </div>
-                    </div>--%>
-                    <%--<div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">单位造价(元):</label>
-                        <div class="layui-input-block">
-                            <input value="<fmt:formatNumber value="${projectRecords.unitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="true"/>
-                        </div>
-                    </div>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">土建单位造价(元):</label>
-                        <div class="layui-input-block">
-                            <input  value="<fmt:formatNumber value="${projectRecords.buildingUnitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="buildingUnitFees" class="form-control layui-input" readonly="true"/>
-                        </div>
-                    </div>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">安装单位造价(元):</label>
-                        <div class="layui-input-block">
-                            <input  value="<fmt:formatNumber value="${projectRecords.installUnitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="readonly"/>
-                        </div>
-                    </div>--%>
                 <div class="layui-item layui-col-sm6 lw6 with-textarea">
                     <label class="layui-form-label">工程概况:</label>
                     <div class="layui-input-block">
-                        <textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${projectRecords.projectDesc}</textarea>
+                        <textarea htmlEscape="false" rows="4" readonly="true"  style="background-color: #f1f1f1" maxlength="1000" class="form-control" >${projectRecords.projectDesc}</textarea>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6 with-textarea">
-                    <label class="layui-form-label">特殊要求:</label>
+                    <label class="layui-form-label">备注:</label>
                     <div class="layui-input-block">
-                        <textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${projectRecords.remarks}</textarea>
+                        <textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000"  style="background-color: #f1f1f1" class="form-control" >${projectRecords.remarks}</textarea>
                     </div>
                 </div>
             </div>
@@ -469,30 +344,27 @@
                         </tr>
                         </thead>
                         <tbody id="workClientLinkmanList">
+                        <c:forEach items="${projectRecords.workClientLinkmanList}" var="info" varStatus="index">
+                            <tr>
+                                <td >
+                                        ${info.clientId.name}
+                                </td>
+                                <td>
+                                        ${info.name}
+                                </td>
+                                <td>
+                                        ${info.linkPhone}
+                                </td>
+                                <td>
+                                        ${info.linkMobile}
+                                </td>
+                            </tr>
+                        </c:forEach>
                         </tbody>
                     </table>
-                    <script type="text/template" id="workClientLinkmanTpl">//<!--
-					<tr id="workClientLinkmanList{{idx}}">
-					<td class="hide">
-						<input id="workClientLinkmanList{{idx}}_id" name="workClientLinkmanList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
-						<input id="workClientLinkmanList{{idx}}_delFlag" name="workClientLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
-					</td>
-					<td>
-						{{row.clientId.name}}
-					</td>
-					<td>
-						{{row.name}}
-					</td>
-					<td>
-						{{row.linkPhone}}
-					</td>
-					<td>
-						{{row.linkMobile}}
-					</td>
-				</tr>//-->
-                    </script>
                 </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" >
@@ -507,322 +379,189 @@
                         </tr>
                         </thead>
                         <tbody id="workConstructionLinkmanList">
+                        <c:forEach items="${projectRecords.workConstructionLinkmanList}" var="info" varStatus="index">
+                            <tr>
+                                <td >
+                                        ${info.clientId.name}
+                                </td>
+                                <td>
+                                        ${info.name}
+                                </td>
+                                <td>
+                                        ${info.linkPhone}
+                                </td>
+                                <td>
+                                        ${info.linkMobile}
+                                </td>
+                            </tr>
+                        </c:forEach>
                         </tbody>
                     </table>
-                    <script type="text/template" id="workConstructionLinkmanTpl">//<!--
-					<tr id="workConstructionLinkmanList{{idx}}">
-					<td class="hide">
-						<input id="workConstructionLinkmanList{{idx}}_id" name="workConstructionLinkmanList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
-						<input id="workConstructionLinkmanList{{idx}}_delFlag" name="workConstructionLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
-					</td>
-					<td>
-						{{row.clientId.name}}
-					</td>
-					<td>
-						{{row.name }}
-					</td>
-					<td>
-						{{row.linkPhone}}
-					</td>
-					<td>
-						{{row.linkMobile}}
-					</td>
-				</tr>//-->
-                    </script>
                 </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" >
-                    <table id="upTable" class="table table-bordered table-condensed details">
-                        <thead>
-                        <tr>
-                            <th width="25%">报告编号</th>
-                            <th width="25%">报告名称</th>
-                            <th width="20%">工作内容类型</th>
-                            <th width="10%">签章类型</th>
-                            <th width="10%">创建日期</th>
-                            <th width="10%">状态</th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <c:choose>
-                            <c:when test="${not empty projectRecords.projectReportData}">
-                                <c:forEach items="${projectRecords.projectReportData}" var="projectReportData" varStatus="index">
-                                    <tr>
-                                        <td><a title="${projectReportData.number}" href="javascript:void(0)" onclick="openDialogView('查看报告详情', '${ctx}/projectcontentinfo/projectcontentinfo/form1?id=${projectReportData.id}','95%', '95%')">
-                                                ${projectReportData.number}
-                                        </a></td>
-                                        <td>
-                                                ${projectReportData.name}
-                                        </td>
-                                        <td title="${fns:getContentTypeName(projectReportData.type,"")}">
-                                                ${fns:getContentTypeName(projectReportData.type,"")}
-                                        </td>
-                                        <td title="${projectReportData.reportType}">
-                                                ${projectReportData.reportType}
-                                        </td>
-                                        <td>
-                                            <fmt:formatDate value="${projectReportData.reportDate}" pattern="yyyy-MM-dd"/>
-                                        </td>
-                                        <td class="op-td">
-                                                &lt;%&ndash;<c:choose>&ndash;%&gt;
-                                                &lt;%&ndash;<c:when test="${empty projectReportData.status || projectReportData.status eq 1}">&ndash;%&gt;
-                                                &lt;%&ndash;<div style="text-align: center">&ndash;%&gt;
-                                                &lt;%&ndash;<a href="javascript:void(0)" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>&ndash;%&gt;
-                                                &lt;%&ndash;</div>&ndash;%&gt;
-                                                &lt;%&ndash;</c:when>&ndash;%&gt;
-                                                &lt;%&ndash;<c:otherwise>&ndash;%&gt;
-                                                &lt;%&ndash;<div style="text-align: center">&ndash;%&gt;
-                                                &lt;%&ndash;<a href="javascript:void(0)" onclick="openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=${id}&projectReportData.id=${projectReportData.id}&type=1','95%','95%')" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>&ndash;%&gt;
-                                                &lt;%&ndash;</div>&ndash;%&gt;
-                                                &lt;%&ndash;</c:otherwise>&ndash;%&gt;
-                                                &lt;%&ndash;</c:choose>&ndash;%&gt;
-                                            <div style="text-align: center" id="status_td_${index.index+1}">
-                                            </div>
-                                            <script>
-                                                initRecordStatus(${index.index+1},"${id}","${projectReportData.id}","${projectReportData.status}");
-                                            </script>
-                                        </td>
-                                    </tr>
-                                </c:forEach>
-                            </c:when>
-                            <c:otherwise>
-                                <tr>
-                                    <td colspan="7">
-                                        暂无数据
-                                    </td>
-                                </tr>
-                            </c:otherwise>
-                        </c:choose>
-                        </tbody>
-                    </table>
-                </div>
-            </div>--%>
-            <div class="form-group layui-row">
-                <div class="form-group-label"><h2>项目计划列表</h2></div>
-                <div class="layui-item layui-col-sm12 lw7">
-                    <div class="layui-item nav-btns">
-                            <%--						<div class="layui-item nav-btns" style="padding-left:0px;">--%>
-                            <%--							<a class="nav-btn nav-btn-add"--%>
-                            <%--							   onclick="addRow('#projectPlanList', workClientBankRowIdx, workClientBankTpl);workClientBankRowIdx = workClientBankRowIdx + 1;"--%>
-                            <%--							   title="新增"><i class="fa fa-plus"></i> 新增</a>--%>
-                            <%--							<shiro:hasPermission name="project:projectPlan:export">--%>
-                            <%--								<a class="nav-btn nav-btn-export" title="导出"  onclick="return confirmx('确认要导出该项目计划列表吗?', '${ctx}/project/projectPlan/export?id=${projectRecords.id}');"><i class="fa fa-file-excel-o"></i> 导出</a>--%>
-                            <%--							</shiro:hasPermission>--%>
-                            <%--						</div>--%>
-                        <table id="bankinfo" class="table table-bordered table-condensed can-edit">
-                            <thead>
-                            <tr>
-                                <th width="60px">编号</th>
-                                <th >任务阶段</th>
-                                <th >计划开始时间</th>
-                                <th >计划结束时间</th>
-                                <th >提醒人</th>
-                                <th >完成人</th>
-                            </tr>
-                            </thead>
-                            <tbody id="projectPlanList">
 
-                            </tbody>
-                        </table>
-                        <script type="text/template" id="workClientBankTpl">//<!--
-                                <tr id="projectPlanList{{idx}}">
-                                    <td class="hide">
-                                        <input id="projectPlanList{{idx}}_id" name="projectPlanList[{{idx}}].id" type="hidden" readonly="true" value="{{row.id}}"/>
-                                        <input id="projectPlanList{{idx}}_delFlag" name="projectPlanList[{{idx}}].delFlag" type="hidden" readonly="true" value="0"/>
-                                        <input id="projectPlanList{{idx}}_remindId" name="projectPlanList[{{idx}}].remindId" type="hidden" readonly="true" value="{{row.remindId}}"/>
-                                    </td>
-
-                                    <td width="60px">
-                                        <input id="projectPlanList{{idx}}_costNum" name="projectPlanList[{{idx}}].costNum" readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
-                                    </td>
-                                    <td>
-                                        <input id="projectPlanList{{idx}}_projectStage" name="projectPlanList[{{idx}}].projectStage" readonly="true" list ="num" title="{{row.projectStage}}"  value="{{row.projectStage}}" class="form-control required"/>
-                                    </td>
-
-                                    <td>
-                                        <input lay-verify="date" readonly="true" placeholder="yyyy-MM-dd" autocomplete="off" id="projectPlanList{{idx}}_beginDate" name="projectPlanList[{{idx}}].beginDate" style="text-align: center" type="text" value="{{row.beginDate}}"  class="form-control required datetime"/>
-                                    </td>
-                                    <td>
-                                        <input lay-verify="date" readonly="true" placeholder="yyyy-MM-dd" autocomplete="off" id="projectPlanList{{idx}}_endDate" name="projectPlanList[{{idx}}].endDate" style="text-align: center" type="text" value="{{row.endDate}}"  class="form-control required datetime"/>
-                                    </td>
-
-                                    <td>
-                                    	<input id="projectPlanList{{idx}}_remindName" name="remindName" readonly="readonly" style="text-align: center"  value="{{row.remindName}}" type="text" class="form-control contentDetail"/>
-<%--                                        <sys:treeselecttPlanUser  id="projectPlanList{{idx}}_remindName" name="remindName" value="${projectRecords.leaderIds}" labelName="projectPlanList[{{idx}}].remindName" labelValue="{{row.remindName}}"--%>
-<%--                                         title="用户" url="/sys/office/treeDataByPlan?type=3&projectId=${projectRecords.id}" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true" disabled="true"/>--%>
-                                    </td>
-
-                                    <td>
-                                    	<input id="projectPlanList{{idx}}_finishName" name="projectPlanList[{{idx}}].finishId" readonly="readonly" style="text-align: center"  value="{{row.finishName}}" type="text" class="form-control contentDetail"/>
-<%--                                        <sys:treeselecttPlanUser id="projectPlanList{{idx}}_finishName" name="projectPlanList[{{idx}}].finishId" value="${projectRecords.leaderIds}" labelName="projectPlanList[{{idx}}].finishName" labelValue="{{row.finishName}}"--%>
-<%--                                         title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true" disabled="true" />--%>
-                                    </td>
-
-<%--                                    <td class="text-center op-td" width="10">--%>
-<%--                                        {{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#projectPlanList{{idx}}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>{{/delBtn}}--%>
-<%--                                    </td>--%>
-                                </tr>//-->
-                        </script>
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>审定单签章附件信息</h2></div>
+                <div class="layui-item nav-btns">
+                    <a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
+                </div>
+                <div id="addFile_attachment" style="display: none" class="upload-progress">
+                    <span id="fileName_attachment" ></span>
+                    <b><span id="baifenbi_attachment" ></span></b>
+                    <div class="progress">
+                        <div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
+                        </div>
                     </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" >--%>
-            <%--					<table id="listAttachment" class="table table-bordered table-condensed no-bottom-margin details">--%>
-            <%--						<thead>--%>
-            <%--						<tr>--%>
-            <%--							<th width="25%">文件预览</th>--%>
-            <%--							<th width="25%">上传人</th>--%>
-            <%--							<th width="25%">上传时间</th>--%>
-            <%--							<th width="25%">操作</th>--%>
-            <%--						</tr>--%>
-            <%--						</thead>--%>
-            <%--						<tbody id="file_attachment">--%>
-            <%--						<c:forEach items="${projectRecords.workAttachments}" var="workClientAttachment" varStatus="status">--%>
-            <%--							<tr>--%>
-            <%--									&lt;%&ndash;<td>${status.index + 1}</td>&ndash;%&gt;--%>
-            <%--								<c:choose>--%>
-            <%--									<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')--%>
-            <%--															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')--%>
-            <%--															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')--%>
-            <%--															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')--%>
-            <%--															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">--%>
-            <%--										<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">--%>
-            <%--									</c:when>--%>
-            <%--									<c:otherwise>--%>
-            <%--										<c:choose>--%>
-            <%--											<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">--%>
-            <%--												<td><a href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','95%','95%','1')">${workClientAttachment.attachmentName}</a></td>--%>
-            <%--											</c:when>--%>
-            <%--											<c:otherwise>--%>
-            <%--												<td><a href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','95%','95%')">${workClientAttachment.attachmentName}</a></td>--%>
-            <%--											</c:otherwise>--%>
-            <%--										</c:choose>--%>
-            <%--									</c:otherwise>--%>
-            <%--								</c:choose>--%>
-            <%--								<td>${workClientAttachment.createBy.name}</td>--%>
-            <%--								<td><fmt:formatDate value="${workClientAttachment.createDate}" pattern="yyyy-MM-dd"/></td>--%>
-            <%--								<td  class="op-td">--%>
-            <%--									<a href="javascript:location.href=encodeURI('${ctx}/workcontractinfo/workContractInfo/downLoadAttach?file=${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>--%>
-            <%--								</td>--%>
-            <%--							</tr>--%>
-            <%--						</c:forEach>--%>
-            <%--						</tbody>--%>
-            <%--					</table>--%>
-            <%--				</div>--%>
-            <%--			</div>--%>
-            <%--			<div class="form-group layui-row">--%>
-            <%--				<div class="layui-item layui-col-sm8 lw6 with-textarea">--%>
-            <%--					<div class="layui-input-block" style="margin-left:10px;position: relative">--%>
-            <%--						<form:textarea placeholder="请输入意见:" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />--%>
-            <%--						<a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>--%>
-            <%--						<input type="file" name="upload_files" style="display: none;">--%>
-            <%--					</div>--%>
-            <%--				</div>--%>
-            <%--				<div class="layui-item layui-col-sm4 lw6 with-textarea">--%>
-            <%--					<div class="layui-input-block" style="margin-left:10px;">--%>
-            <%--						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>--%>
-            <%--						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>--%>
-            <%--						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>--%>
-            <%--						<div style="padding: 5px 0px;">--%>
-            <%--							<form:select path="act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">--%>
-            <%--								<form:option value=""/>--%>
-            <%--								<form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>--%>
-            <%--							</form:select>--%>
-            <%--						</div>--%>
-            <%--					</div>--%>
-            <%--				</div>--%>
-            <%--			</div>--%>
-
-            <script>
-                var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
-                var workConstructionLinkmanRowIdx = 0, workConstructionLinkmanTpl = $("#workConstructionLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
-                $(document).ready(function() {
-                    var data = ${fns:toJson(projectRecords.workClientLinkmanList)};
-                    for (var i=0; i<data.length; i++){
-                        addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl, data[i]);
-                        workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
-                    }
-                    var dataBank = ${fns:toJson(projectRecords.workConstructionLinkmanList)};
-                    for (var i=0; i<dataBank.length; i++){
-                        addRow('#workConstructionLinkmanList', workConstructionLinkmanRowIdx, workConstructionLinkmanTpl, dataBank[i]);
-                        workConstructionLinkmanRowIdx = workConstructionLinkmanRowIdx + 1;
-                    }
-
-                });
-                layui.use('form', function () {
-                    var form = layui.form;
-                    form.render();
-                });
-                function f1(row) {
-                    // window.parent.document.getElementById('opinion').value = row;
-                    $("#opinion").val(row)
-                }
-                function openDialogre(title,url,width,height,target,buttons) {
-                    if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端,就使用自适应大小弹窗
-                        width = 'auto';
-                        height = 'auto';
-                    } else {//如果是PC端,根据用户设置的width和height显示。
-                    }
-                    var split = buttons.split(",");
-                    top.layer.open({
-                        type: 2,
-                        area: [width, height],
-                        title: title,
-                        maxmin: true, //开启最大化最小化按钮
-                        skin: 'three-btns',
-                        content: url,
-                        btn: split,
-                        btn1: function(index, layero){
-                            top.layer.close(index)
-                            document.getElementById('iframe').contentWindow.location.reload();
-                        }
-                    });
-                }
-            </script>
-
-            <div class="form-group layui-row">
-                <div class="form-group-label"><h2>项目组成员列表</h2></div>
-                <div class="layui-item layui-col-xs12 form-table-container" >
-                    <table id="usersListTable" class="table table-bordered table-condensed no-bottom-margin details">
+                <input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
+                <span id="attachment_title"></span>
+                <div class="layui-item layui-col-xs12" style="padding:0 16px;">
+                    <table id="listAttachment" class="table table-bordered table-condensed details">
                         <thead>
                         <tr>
-                            <th width="25%">姓名</th>
-                            <th width="25%">部门</th>
-                            <th width="25%">职级</th>
-                            <th width="55px;">状态</th>
+                                <%-- <th>序号</th>--%>
+                            <th>文件预览</th>
+                            <th>上传人</th>
+                            <th>上传时间</th>
+                            <th width="180px">操作</th>
                         </tr>
                         </thead>
-                        <tbody id="usersList">
-                        <c:if test="${not empty projectRecords.projectMembers}">
-                            <c:forEach items="${projectRecords.projectMembers}" var="user">
-                                <tr id="${user.id}">
-                                    <td>
-                                            ${user.name}
-                                    </td>
-                                    <td>
-                                            ${user.office.name}
-                                    </td>
-                                    <td>
-                                            ${user.basicInfo.jobGrade.name}
-                                    </td>
-                                    <td>
+                        <tbody id="file_attachment">
+                        <c:forEach items="${projectRecords.workAttachments}" var = "workClientAttachment" varStatus="status">
+                            <tr>
+                                    <%-- <td>${status.index + 1}</td>--%>
+                                <c:choose>
+                                    <c:when test="${projectRecords.uploadMode == 2}">
                                         <c:choose>
-                                            <c:when test="${user.delFlag == 0}">
-                                                正常
+                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+                                                <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
                                             </c:when>
                                             <c:otherwise>
-                                                移除
+                                                <c:choose>
+                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.temporaryUrl}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
+                                                    </c:when>
+                                                    <c:otherwise>
+                                                        <c:choose>
+                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+                                                            </c:when>
+                                                            <c:otherwise>
+                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                            </c:otherwise>
+                                                        </c:choose>
+                                                    </c:otherwise>
+                                                </c:choose>
                                             </c:otherwise>
                                         </c:choose>
-                                    </td>
-                                </tr>
-                            </c:forEach>
-                        </c:if>
+                                    </c:when>
+                                    <c:otherwise>
+                                        <c:choose>
+                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+                                                <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+                                            </c:when>
+                                            <c:otherwise>
+                                                <c:choose>
+                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
+                                                    </c:when>
+                                                    <c:otherwise>
+                                                        <c:choose>
+                                                            <c:when test="${workReimbursement.uploadMode == 2}">
+                                                                <c:choose>
+                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+                                                                        <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+                                                                    </c:when>
+                                                                    <c:otherwise>
+                                                                        <c:choose>
+                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+                                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
+                                                                            </c:when>
+                                                                            <c:otherwise>
+                                                                                <c:choose>
+                                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+                                                                                    </c:when>
+                                                                                    <c:otherwise>
+                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                                    </c:otherwise>
+                                                                                </c:choose>
+                                                                            </c:otherwise>
+                                                                        </c:choose>
+                                                                    </c:otherwise>
+                                                                </c:choose>
+                                                            </c:when>
+                                                            <c:otherwise>
+                                                                <c:choose>
+                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+                                                                        <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+                                                                    </c:when>
+                                                                    <c:otherwise>
+                                                                        <c:choose>
+                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+                                                                                <td><a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
+                                                                            </c:when>
+                                                                            <c:otherwise>
+                                                                                <c:choose>
+                                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
+                                                                                    </c:when>
+                                                                                    <c:otherwise>
+                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                                    </c:otherwise>
+                                                                                </c:choose>
+                                                                            </c:otherwise>
+                                                                        </c:choose>
+                                                                    </c:otherwise>
+                                                                </c:choose>
+                                                            </c:otherwise>
+                                                        </c:choose>
+                                                    </c:otherwise>
+                                                </c:choose>
+                                            </c:otherwise>
+                                        </c:choose>
+                                    </c:otherwise>
+                                </c:choose>
+
+                                <td>${workClientAttachment.createBy.name}</td>
+                                <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
+                                <td class="op-td">
+                                    <div class="op-btn-box" >
+                                        <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                            <%--													<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">--%>
+                                            <%--														<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>--%>
+                                            <%--													</c:if>--%>
+                                        <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
+                                    </div>
+                                </td>
+                            </tr>
+                        </c:forEach>
                         </tbody>
                     </table>
                 </div>

ファイルの差分が大きいため隠しています
+ 1237 - 0
src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsApprovalView.jsp


+ 211 - 488
src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsReportSignatureAudit.jsp

@@ -4,10 +4,12 @@
 <head>
 	<title>项目审批管理</title>
 	<meta name="decorator" content="default"/>
-	<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>
-	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
-	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
-	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
+	<script type="text/javascript" src="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.js"></script>
+	<script type="text/javascript" src="${ctxStatic}/iCheck/icheck.min.js"></script>
+	<script type="text/javascript" src="${ctxStatic}/layui/layuidown.js"></script>
+	<script src="${ctxStatic}/common/html/js/script.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/layuidown.css"/>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.css"/>
 
 	<script type="text/javascript">
 		var validateForm;
@@ -126,7 +128,7 @@
 <body >
 <div class="single-form">
 	<div class="container">
-		<form:form id="inputForm" modelAttribute="projectRecords" enctype="multipart/form-data" action="${ctx}/ruralProject/electronicSeal/reportSignatureSaveAudit" method="post" class="layui-form">
+		<form:form id="inputForm" modelAttribute="projectRecords" enctype="multipart/form-data" action="${ctx}/ruralProject/electronicSeal/reportSignatureSaveAudit" method="post" class="form-horizontal layui-form">
 		<form:hidden path="id"/>
 		<form:hidden path="home"/>
 		<form:hidden path="act.taskId"/>
@@ -192,85 +194,58 @@
 
 			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>项目基础信息</h2></div>
-                <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label">项目名称:</label>
-                    <div class="layui-input-block">
-                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectName}"/>
-                    </div>
-                </div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">报告号:</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false"  readonly="true" class="form-control layui-input" style="background-color: #f1f1f1" value="${projectRecords.projectReportNumber}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">项目名称:</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false"  readonly="true" class="form-control layui-input" style="background-color: #f1f1f1" value="${projectRecords.projectName}"/>
+					</div>
+				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">项目编号:</label>
 					<div class="layui-input-block">
-                        <div class="input-group">
-                            <form:input path="projectId" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
-                            <span class="input-group-btn">
+						<div class="input-group">
+							<form:input path="projectId" htmlEscape="false"  readonly="true" class="form-control layui-input" cssStyle="background-color: #f1f1f1"/>
+							<span class="input-group-btn">
                                 <label class="form-status"><c:choose><c:when test="${not empty projectRecords.projectStatus}">${fns:getDictLabel(projectRecords.projectStatus, 'rural_project_audit_state', '')}</c:when><c:otherwise>新添</c:otherwise></c:choose></label>
                              </span>
-                        </div>
+						</div>
 					</div>
 				</div>
-				<%--<div class="layui-item layui-col-sm6 lw6">--%>
-					<%--<label class="layui-form-label">规模类型:</label>--%>
-					<%--<div class="layui-input-block">--%>
-						<%--<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.scaleType}"/>--%>
-					<%--</div>--%>
-				<%--</div>--%>
-				<%--<div class="layui-item layui-col-sm6 lw6">--%>
-					<%--<label class="layui-form-label">规模单位:</label>--%>
-					<%--<div class="layui-input-block">--%>
-						<%--<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.scaleUnit}"/>--%>
-					<%--</div>--%>
-				<%--</div>--%>
-				<%--<div class="layui-item layui-col-sm6 lw6">--%>
-					<%--<label class="layui-form-label">规模数量:</label>--%>
-					<%--<div class="layui-input-block">--%>
-						<%--<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.scaleQuantity}"/>--%>
-					<%--</div>--%>
-				<%--</div>--%>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">项目所在地:</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.province}-${projectRecords.city}-${projectRecords.county}"/>
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.province}-${projectRecords.city}-${projectRecords.county}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">投资性质:</label>
 					<div class="layui-input-block">
+						<c:if test="${projectRecords.projectProperties==null}">
+							<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input"/>
+						</c:if>
 						<c:forEach  items="${fns:getMainDictList('project_properties')}" var="v">
 							<c:if test="${v.value==projectRecords.projectProperties}">
-								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${v.label}"/>
+								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${v.label}"/>
 							</c:if>
 						</c:forEach>
 					</div>
 				</div>
-<%--				<div class="layui-item layui-col-sm6 lw6">--%>
-<%--					<label class="layui-form-label">所在省份:</label>--%>
-<%--					<div class="layui-input-block">--%>
-<%--						<form:input path="province" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>--%>
-<%--					</div>--%>
-<%--				</div>--%>
-<%--				<div class="layui-item layui-col-sm6 lw6">--%>
-<%--					<label class="layui-form-label">所在地级市:</label>--%>
-<%--					<div class="layui-input-block">--%>
-<%--						<form:input path="city" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>--%>
-<%--					</div>--%>
-<%--				</div>--%>
-<%--				<div class="layui-item layui-col-sm6 lw6">--%>
-<%--					<label class="layui-form-label">所在区县:</label>--%>
-<%--					<div class="layui-input-block">--%>
-<%--						<form:input path="county" htmlEscape="false" id="areaName1" class="form-control layui-input" readonly="true"/>--%>
-<%--					</div>--%>
-<%--				</div>--%>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">建设地点:</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectSite}"/>
+						<input htmlEscape="false" style="background-color: #f1f1f1"  readonly="true" class="form-control layui-input" value="${projectRecords.projectSite}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">创建人:</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.createBy.name}"/>
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.createBy.name}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
@@ -282,7 +257,7 @@
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">所属部门:</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false" readonly="true" id="officeName" class="form-control layui-input" value="${projectRecords.officeName}"/>
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" id="officeName" class="form-control layui-input" value="${projectRecords.officeName}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
@@ -311,145 +286,43 @@
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">送审规模(万元):</label>
 					<div class="layui-input-block">
-						<form:input path="submitScale" id="submitScale" readonly="true" maxlength="12" htmlEscape="false" onkeyup="wirteNum(this)" placeholder="请输入送审规模" class="form-control layui-input number"/>
+						<form:input path="submitScale" readonly="true" style="background-color: #f1f1f1" id="submitScale" maxlength="12" htmlEscape="false" placeholder="请输入送审规模" class="form-control layui-input number"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">工作开始日期:</label>
 					<div class="layui-input-block">
-						<input class=" form-control layui-input " readonly="true" id="startDate" name="startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+						<input class="laydate-icondate form-control layui-input layer-date ash"  style="background-color: #f1f1f1" readonly="true" id="startDate" name="startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">工作结束日期:</label>
 					<div class="layui-input-block">
-						<input class=" form-control layui-input " readonly="true" id="endingDate" name="endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+						<input class="laydate-icondate form-control layui-input layer-date "  style="background-color: #f1f1f1" readonly="true" id="endingDate" name="endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">创建日期:</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"/>
+						<input htmlEscape="false"  style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw6">
+				<div class="layui-item layui-col-sm6 lw7">
 					<label class="layui-form-label">项目类别:</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false" readonly="true" class="form-control layui-input" value="${projectRecords.attachmentProjectSort}"/>
-					</div>
-				</div>
-				<%--<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">工程结构:</label>
-					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectStructure}"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">地上层数:</label>
-					<div class="layui-input-block">
-						<form:input path="onGroundNum" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">底下层数:</label>
-					<div class="layui-input-block">
-						<form:input path="underGroundNum" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">建筑面积或规模:</label>
-					<div class="layui-input-block">
-						<form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">计量单位:</label>
-					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.measuringUnit}"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">工程用途:</label>
-					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectUse}"/>
-					</div>
-				</div>--%>
-				<%--<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">预估总投资额(万元):</label>
-					<div class="layui-input-block">
-						<input value="<fmt:formatNumber value="${projectRecords.estimateTotalFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="estimateTotalFees" class="form-control layui-input number"  readonly="true"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">咨询标的额(万元):</label>
-					<div class="layui-input-block">
-						<input value="<fmt:formatNumber value="${projectRecords.totalFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="totalFees" class="form-control layui-input number"  readonly="true"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">其中土建造价(万元):</label>
-					<div class="layui-input-block">
-						<input   value="<fmt:formatNumber value="${projectRecords.buildingFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="buildingFees" class="form-control layui-input" readonly="true"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">其中安装造价(万元):</label>
-					<div class="layui-input-block">
-						<input  value="<fmt:formatNumber value="${projectRecords.installFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="installFees" class="form-control layui-input" readonly="true"/>
+						<input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${projectRecords.attachmentProjectSort}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">其中土建百分比(%):</label>
-					<div class="layui-input-block">
-						<form:input path="buildingPercent" htmlEscape="false" id="buildingPercent" class="form-control layui-input" readonly="true"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">其中安装百分比(%):</label>
-					<div class="layui-input-block">
-						<form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
-					</div>
-				</div>--%>
-				<%--<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">施工单位:</label>
-					<div class="layui-input-block">
-						<form:input path="constructionUnit" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">施工方联系方式:</label>
-					<div class="layui-input-block">
-						<form:input path="constructionLinkman" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
-					</div>
-				</div>--%>
-				<%--<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">单位造价(元):</label>
-					<div class="layui-input-block">
-						<input value="<fmt:formatNumber value="${projectRecords.unitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="true"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">土建单位造价(元):</label>
-					<div class="layui-input-block">
-						<input  value="<fmt:formatNumber value="${projectRecords.buildingUnitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="buildingUnitFees" class="form-control layui-input" readonly="true"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">安装单位造价(元):</label>
-					<div class="layui-input-block">
-						<input  value="<fmt:formatNumber value="${projectRecords.installUnitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="readonly"/>
-					</div>
-				</div>--%>
 				<div class="layui-item layui-col-sm6 lw6 with-textarea">
 					<label class="layui-form-label">工程概况:</label>
 					<div class="layui-input-block">
-						<textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${projectRecords.projectDesc}</textarea>
+						<textarea htmlEscape="false" rows="4" readonly="true"  style="background-color: #f1f1f1" maxlength="1000" class="form-control" >${projectRecords.projectDesc}</textarea>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6 with-textarea">
-					<label class="layui-form-label">特殊要求:</label>
+					<label class="layui-form-label">备注:</label>
 					<div class="layui-input-block">
-						<textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${projectRecords.remarks}</textarea>
+						<textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000"  style="background-color: #f1f1f1" class="form-control" >${projectRecords.remarks}</textarea>
 					</div>
 				</div>
 			</div>
@@ -469,30 +342,27 @@
 						</tr>
 						</thead>
 						<tbody id="workClientLinkmanList">
+						<c:forEach items="${projectRecords.workClientLinkmanList}" var="info" varStatus="index">
+							<tr>
+								<td >
+										${info.clientId.name}
+								</td>
+								<td>
+										${info.name}
+								</td>
+								<td>
+										${info.linkPhone}
+								</td>
+								<td>
+										${info.linkMobile}
+								</td>
+							</tr>
+						</c:forEach>
 						</tbody>
 					</table>
-					<script type="text/template" id="workClientLinkmanTpl">//<!--
-					<tr id="workClientLinkmanList{{idx}}">
-					<td class="hide">
-						<input id="workClientLinkmanList{{idx}}_id" name="workClientLinkmanList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
-						<input id="workClientLinkmanList{{idx}}_delFlag" name="workClientLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
-					</td>
-					<td>
-						{{row.clientId.name}}
-					</td>
-					<td>
-						{{row.name}}
-					</td>
-					<td>
-						{{row.linkPhone}}
-					</td>
-					<td>
-						{{row.linkMobile}}
-					</td>
-				</tr>//-->
-					</script>
 				</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" >
@@ -507,322 +377,175 @@
 						</tr>
 						</thead>
 						<tbody id="workConstructionLinkmanList">
-						</tbody>
-					</table>
-					<script type="text/template" id="workConstructionLinkmanTpl">//<!--
-					<tr id="workConstructionLinkmanList{{idx}}">
-					<td class="hide">
-						<input id="workConstructionLinkmanList{{idx}}_id" name="workConstructionLinkmanList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
-						<input id="workConstructionLinkmanList{{idx}}_delFlag" name="workConstructionLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
-					</td>
-					<td>
-						{{row.clientId.name}}
-					</td>
-					<td>
-						{{row.name }}
-					</td>
-					<td>
-						{{row.linkPhone}}
-					</td>
-					<td>
-						{{row.linkMobile}}
-					</td>
-				</tr>//-->
-					</script>
-				</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" >
-					<table id="upTable" class="table table-bordered table-condensed details">
-						<thead>
-						<tr>
-							<th width="25%">报告编号</th>
-							<th width="25%">报告名称</th>
-							<th width="20%">工作内容类型</th>
-							<th width="10%">签章类型</th>
-							<th width="10%">创建日期</th>
-							<th width="10%">状态</th>
-						</tr>
-						</thead>
-						<tbody>
-						<c:choose>
-							<c:when test="${not empty projectRecords.projectReportData}">
-								<c:forEach items="${projectRecords.projectReportData}" var="projectReportData" varStatus="index">
-									<tr>
-										<td><a title="${projectReportData.number}" href="javascript:void(0)" onclick="openDialogView('查看报告详情', '${ctx}/projectcontentinfo/projectcontentinfo/form1?id=${projectReportData.id}','95%', '95%')">
-												${projectReportData.number}
-										</a></td>
-										<td>
-												${projectReportData.name}
-										</td>
-										<td title="${fns:getContentTypeName(projectReportData.type,"")}">
-												${fns:getContentTypeName(projectReportData.type,"")}
-										</td>
-										<td title="${projectReportData.reportType}">
-												${projectReportData.reportType}
-										</td>
-										<td>
-											<fmt:formatDate value="${projectReportData.reportDate}" pattern="yyyy-MM-dd"/>
-										</td>
-										<td class="op-td">
-												&lt;%&ndash;<c:choose>&ndash;%&gt;
-												&lt;%&ndash;<c:when test="${empty projectReportData.status || projectReportData.status eq 1}">&ndash;%&gt;
-												&lt;%&ndash;<div style="text-align: center">&ndash;%&gt;
-												&lt;%&ndash;<a href="javascript:void(0)" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>&ndash;%&gt;
-												&lt;%&ndash;</div>&ndash;%&gt;
-												&lt;%&ndash;</c:when>&ndash;%&gt;
-												&lt;%&ndash;<c:otherwise>&ndash;%&gt;
-												&lt;%&ndash;<div style="text-align: center">&ndash;%&gt;
-												&lt;%&ndash;<a href="javascript:void(0)" onclick="openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=${id}&projectReportData.id=${projectReportData.id}&type=1','95%','95%')" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>&ndash;%&gt;
-												&lt;%&ndash;</div>&ndash;%&gt;
-												&lt;%&ndash;</c:otherwise>&ndash;%&gt;
-												&lt;%&ndash;</c:choose>&ndash;%&gt;
-											<div style="text-align: center" id="status_td_${index.index+1}">
-											</div>
-											<script>
-												initRecordStatus(${index.index+1},"${id}","${projectReportData.id}","${projectReportData.status}");
-											</script>
-										</td>
-									</tr>
-								</c:forEach>
-							</c:when>
-							<c:otherwise>
-								<tr>
-									<td colspan="7">
-										暂无数据
-									</td>
-								</tr>
-							</c:otherwise>
-						</c:choose>
-						</tbody>
-					</table>
-				</div>
-			</div>--%>
-			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>项目计划列表</h2></div>
-				<div class="layui-item layui-col-sm12 lw7">
-					<div class="layui-item nav-btns">
-<%--						<div class="layui-item nav-btns" style="padding-left:0px;">--%>
-<%--							<a class="nav-btn nav-btn-add"--%>
-<%--							   onclick="addRow('#projectPlanList', workClientBankRowIdx, workClientBankTpl);workClientBankRowIdx = workClientBankRowIdx + 1;"--%>
-<%--							   title="新增"><i class="fa fa-plus"></i> 新增</a>--%>
-<%--							<shiro:hasPermission name="project:projectPlan:export">--%>
-<%--								<a class="nav-btn nav-btn-export" title="导出"  onclick="return confirmx('确认要导出该项目计划列表吗?', '${ctx}/project/projectPlan/export?id=${projectRecords.id}');"><i class="fa fa-file-excel-o"></i> 导出</a>--%>
-<%--							</shiro:hasPermission>--%>
-<%--						</div>--%>
-						<table id="bankinfo" class="table table-bordered table-condensed can-edit">
-							<thead>
+						<c:forEach items="${projectRecords.workConstructionLinkmanList}" var="info" varStatus="index">
 							<tr>
-								<th width="60px">编号</th>
-								<th >任务阶段</th>
-								<th >计划开始时间</th>
-								<th >计划结束时间</th>
-								<th >提醒人</th>
-								<th >完成人</th>
+								<td >
+										${info.clientId.name}
+								</td>
+								<td>
+										${info.name}
+								</td>
+								<td>
+										${info.linkPhone}
+								</td>
+								<td>
+										${info.linkMobile}
+								</td>
 							</tr>
-							</thead>
-							<tbody id="projectPlanList">
-
-							</tbody>
-						</table>
-						<script type="text/template" id="workClientBankTpl">//<!--
-                                <tr id="projectPlanList{{idx}}">
-                                    <td class="hide">
-                                        <input id="projectPlanList{{idx}}_id" name="projectPlanList[{{idx}}].id" type="hidden" readonly="true" value="{{row.id}}"/>
-                                        <input id="projectPlanList{{idx}}_delFlag" name="projectPlanList[{{idx}}].delFlag" type="hidden" readonly="true" value="0"/>
-                                        <input id="projectPlanList{{idx}}_remindId" name="projectPlanList[{{idx}}].remindId" type="hidden" readonly="true" value="{{row.remindId}}"/>
-                                    </td>
-
-                                    <td width="60px">
-                                        <input id="projectPlanList{{idx}}_costNum" name="projectPlanList[{{idx}}].costNum" readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
-                                    </td>
-                                    <td>
-                                        <input id="projectPlanList{{idx}}_projectStage" name="projectPlanList[{{idx}}].projectStage" readonly="true" list ="num" title="{{row.projectStage}}"  value="{{row.projectStage}}" class="form-control required"/>
-                                    </td>
-
-                                    <td>
-                                        <input lay-verify="date" readonly="true" placeholder="yyyy-MM-dd" autocomplete="off" id="projectPlanList{{idx}}_beginDate" name="projectPlanList[{{idx}}].beginDate" style="text-align: center" type="text" value="{{row.beginDate}}"  class="form-control required datetime"/>
-                                    </td>
-                                    <td>
-                                        <input lay-verify="date" readonly="true" placeholder="yyyy-MM-dd" autocomplete="off" id="projectPlanList{{idx}}_endDate" name="projectPlanList[{{idx}}].endDate" style="text-align: center" type="text" value="{{row.endDate}}"  class="form-control required datetime"/>
-                                    </td>
-
-                                    <td>
-                                    	<input id="projectPlanList{{idx}}_remindName" name="remindName" readonly="readonly" style="text-align: center"  value="{{row.remindName}}" type="text" class="form-control contentDetail"/>
-<%--                                        <sys:treeselecttPlanUser  id="projectPlanList{{idx}}_remindName" name="remindName" value="${projectRecords.leaderIds}" labelName="projectPlanList[{{idx}}].remindName" labelValue="{{row.remindName}}"--%>
-<%--                                         title="用户" url="/sys/office/treeDataByPlan?type=3&projectId=${projectRecords.id}" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true" disabled="true"/>--%>
-                                    </td>
-
-                                    <td>
-                                    	<input id="projectPlanList{{idx}}_finishName" name="projectPlanList[{{idx}}].finishId" readonly="readonly" style="text-align: center"  value="{{row.finishName}}" type="text" class="form-control contentDetail"/>
-<%--                                        <sys:treeselecttPlanUser id="projectPlanList{{idx}}_finishName" name="projectPlanList[{{idx}}].finishId" value="${projectRecords.leaderIds}" labelName="projectPlanList[{{idx}}].finishName" labelValue="{{row.finishName}}"--%>
-<%--                                         title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true" disabled="true" />--%>
-                                    </td>
-
-<%--                                    <td class="text-center op-td" width="10">--%>
-<%--                                        {{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#projectPlanList{{idx}}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>{{/delBtn}}--%>
-<%--                                    </td>--%>
-                                </tr>//-->
-						</script>
-					</div>
+						</c:forEach>
+						</tbody>
+					</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" >--%>
-<%--					<table id="listAttachment" class="table table-bordered table-condensed no-bottom-margin details">--%>
-<%--						<thead>--%>
-<%--						<tr>--%>
-<%--							<th width="25%">文件预览</th>--%>
-<%--							<th width="25%">上传人</th>--%>
-<%--							<th width="25%">上传时间</th>--%>
-<%--							<th width="25%">操作</th>--%>
-<%--						</tr>--%>
-<%--						</thead>--%>
-<%--						<tbody id="file_attachment">--%>
-<%--						<c:forEach items="${projectRecords.workAttachments}" var="workClientAttachment" varStatus="status">--%>
-<%--							<tr>--%>
-<%--									&lt;%&ndash;<td>${status.index + 1}</td>&ndash;%&gt;--%>
-<%--								<c:choose>--%>
-<%--									<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')--%>
-<%--															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')--%>
-<%--															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')--%>
-<%--															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')--%>
-<%--															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">--%>
-<%--										<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">--%>
-<%--									</c:when>--%>
-<%--									<c:otherwise>--%>
-<%--										<c:choose>--%>
-<%--											<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">--%>
-<%--												<td><a href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','95%','95%','1')">${workClientAttachment.attachmentName}</a></td>--%>
-<%--											</c:when>--%>
-<%--											<c:otherwise>--%>
-<%--												<td><a href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','95%','95%')">${workClientAttachment.attachmentName}</a></td>--%>
-<%--											</c:otherwise>--%>
-<%--										</c:choose>--%>
-<%--									</c:otherwise>--%>
-<%--								</c:choose>--%>
-<%--								<td>${workClientAttachment.createBy.name}</td>--%>
-<%--								<td><fmt:formatDate value="${workClientAttachment.createDate}" pattern="yyyy-MM-dd"/></td>--%>
-<%--								<td  class="op-td">--%>
-<%--									<a href="javascript:location.href=encodeURI('${ctx}/workcontractinfo/workContractInfo/downLoadAttach?file=${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>--%>
-<%--								</td>--%>
-<%--							</tr>--%>
-<%--						</c:forEach>--%>
-<%--						</tbody>--%>
-<%--					</table>--%>
-<%--				</div>--%>
-<%--			</div>--%>
-<%--			<div class="form-group layui-row">--%>
-<%--				<div class="layui-item layui-col-sm8 lw6 with-textarea">--%>
-<%--					<div class="layui-input-block" style="margin-left:10px;position: relative">--%>
-<%--						<form:textarea placeholder="请输入意见:" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />--%>
-<%--						<a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>--%>
-<%--						<input type="file" name="upload_files" style="display: none;">--%>
-<%--					</div>--%>
-<%--				</div>--%>
-<%--				<div class="layui-item layui-col-sm4 lw6 with-textarea">--%>
-<%--					<div class="layui-input-block" style="margin-left:10px;">--%>
-<%--						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>--%>
-<%--						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>--%>
-<%--						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>--%>
-<%--						<div style="padding: 5px 0px;">--%>
-<%--							<form:select path="act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">--%>
-<%--								<form:option value=""/>--%>
-<%--								<form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>--%>
-<%--							</form:select>--%>
-<%--						</div>--%>
-<%--					</div>--%>
-<%--				</div>--%>
-<%--			</div>--%>
 
-			<script>
-                var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
-                var workConstructionLinkmanRowIdx = 0, workConstructionLinkmanTpl = $("#workConstructionLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
-                $(document).ready(function() {
-                    var data = ${fns:toJson(projectRecords.workClientLinkmanList)};
-                    for (var i=0; i<data.length; i++){
-                        addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl, data[i]);
-                        workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
-                    }
-                    var dataBank = ${fns:toJson(projectRecords.workConstructionLinkmanList)};
-                    for (var i=0; i<dataBank.length; i++){
-                        addRow('#workConstructionLinkmanList', workConstructionLinkmanRowIdx, workConstructionLinkmanTpl, dataBank[i]);
-                        workConstructionLinkmanRowIdx = workConstructionLinkmanRowIdx + 1;
-                    }
-
-                });
-				layui.use('form', function () {
-					var form = layui.form;
-					form.render();
-				});
-                function f1(row) {
-					// window.parent.document.getElementById('opinion').value = row;
-					$("#opinion").val(row)
-                }
-				function openDialogre(title,url,width,height,target,buttons) {
-					if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端,就使用自适应大小弹窗
-						width = 'auto';
-						height = 'auto';
-					} else {//如果是PC端,根据用户设置的width和height显示。
-					}
-					var split = buttons.split(",");
-					top.layer.open({
-						type: 2,
-						area: [width, height],
-						title: title,
-						maxmin: true, //开启最大化最小化按钮
-						skin: 'three-btns',
-						content: url,
-						btn: split,
-						btn1: function(index, layero){
-							top.layer.close(index)
-							document.getElementById('iframe').contentWindow.location.reload();
-						}
-					});
-				}
-			</script>
 
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>项目组成员列表</h2></div>
-				<div class="layui-item layui-col-xs12 form-table-container" >
-					<table id="usersListTable" class="table table-bordered table-condensed no-bottom-margin details">
+				<div class="form-group-label"><h2>报告签章附件信息</h2></div>
+				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
+					<table id="listAttachment" class="table table-bordered table-condensed details">
 						<thead>
 						<tr>
-							<th width="25%">姓名</th>
-							<th width="25%">部门</th>
-							<th width="25%">职级</th>
-							<th width="55px;">状态</th>
+								<%-- <th>序号</th>--%>
+							<th>文件预览</th>
+							<th>上传人</th>
+							<th>上传时间</th>
+							<th width="180px">操作</th>
 						</tr>
 						</thead>
-						<tbody id="usersList">
-						<c:if test="${not empty projectRecords.projectMembers}">
-							<c:forEach items="${projectRecords.projectMembers}" var="user">
-								<tr id="${user.id}">
-									<td>
-											${user.name}
-									</td>
-									<td>
-											${user.office.name}
-									</td>
-									<td>
-											${user.basicInfo.jobGrade.name}
-									</td>
-									<td>
+						<tbody id="file_attachment">
+						<c:forEach items="${projectRecords.workAttachments}" var = "workClientAttachment" varStatus="status">
+							<tr>
+									<%-- <td>${status.index + 1}</td>--%>
+								<c:choose>
+									<c:when test="${projectRecords.uploadMode == 2}">
 										<c:choose>
-											<c:when test="${user.delFlag == 0}">
-												正常
+											<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+												<td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
 											</c:when>
 											<c:otherwise>
-												移除
+												<c:choose>
+													<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+														<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.temporaryUrl}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
+													</c:when>
+													<c:otherwise>
+														<c:choose>
+															<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+															</c:when>
+															<c:otherwise>
+																<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+															</c:otherwise>
+														</c:choose>
+													</c:otherwise>
+												</c:choose>
 											</c:otherwise>
 										</c:choose>
-									</td>
-								</tr>
-							</c:forEach>
-						</c:if>
+									</c:when>
+									<c:otherwise>
+										<c:choose>
+											<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+												<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+											</c:when>
+											<c:otherwise>
+												<c:choose>
+													<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+														<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
+													</c:when>
+													<c:otherwise>
+														<c:choose>
+															<c:when test="${workReimbursement.uploadMode == 2}">
+																<c:choose>
+																	<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+																		<td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+																	</c:when>
+																	<c:otherwise>
+																		<c:choose>
+																			<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+																				<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
+																			</c:when>
+																			<c:otherwise>
+																				<c:choose>
+																					<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																						<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+																					</c:when>
+																					<c:otherwise>
+																						<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+																					</c:otherwise>
+																				</c:choose>
+																			</c:otherwise>
+																		</c:choose>
+																	</c:otherwise>
+																</c:choose>
+															</c:when>
+															<c:otherwise>
+																<c:choose>
+																	<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+																		<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+																	</c:when>
+																	<c:otherwise>
+																		<c:choose>
+																			<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+																				<td><a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
+																			</c:when>
+																			<c:otherwise>
+																				<c:choose>
+																					<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																						<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
+																					</c:when>
+																					<c:otherwise>
+																						<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+																					</c:otherwise>
+																				</c:choose>
+																			</c:otherwise>
+																		</c:choose>
+																	</c:otherwise>
+																</c:choose>
+															</c:otherwise>
+														</c:choose>
+													</c:otherwise>
+												</c:choose>
+											</c:otherwise>
+										</c:choose>
+									</c:otherwise>
+								</c:choose>
+
+								<td>${workClientAttachment.createBy.name}</td>
+								<td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
+								<td class="op-td">
+									<div class="op-btn-box" >
+										<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+											<%--													<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">--%>
+											<%--														<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>--%>
+											<%--													</c:if>--%>
+									</div>
+								</td>
+							</tr>
+						</c:forEach>
 						</tbody>
 					</table>
 				</div>

+ 175 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsReportSignatureForm.jsp

@@ -322,6 +322,11 @@
 , trigger: 'click'
             });
 
+
+            $("#attachment_btn").click(function () {
+                $("#attachment_file").click();
+            });
+
         });
 
 
@@ -562,7 +567,7 @@
             $("#flagFile").val(false);
             var files = $("#attachment_file")[0].files;            for(var i = 0;i<files.length;i++) {                var file = files[i];
                 var attachmentId = $("#id").val();
-                var attachmentFlag = "82";
+                var attachmentFlag = "145";
                 /*console.log(file);*/
                 var timestamp=new Date().getTime();
 
@@ -1066,6 +1071,175 @@
                     </table>
                 </div>
             </div>
+
+
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>报告签章附件信息</h2></div>
+                <div class="layui-item nav-btns">
+                    <a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
+                </div>
+                <div id="addFile_attachment" style="display: none" class="upload-progress">
+                    <span id="fileName_attachment" ></span>
+                    <b><span id="baifenbi_attachment" ></span></b>
+                    <div class="progress">
+                        <div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
+                        </div>
+                    </div>
+                </div>
+                <input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
+                <span id="attachment_title"></span>
+                <div class="layui-item layui-col-xs12" style="padding:0 16px;">
+                    <table id="listAttachment" class="table table-bordered table-condensed details">
+                        <thead>
+                        <tr>
+                                <%-- <th>序号</th>--%>
+                            <th>文件预览</th>
+                            <th>上传人</th>
+                            <th>上传时间</th>
+                            <th width="180px">操作</th>
+                        </tr>
+                        </thead>
+                        <tbody id="file_attachment">
+                        <c:forEach items="${projectRecords.workAttachments}" var = "workClientAttachment" varStatus="status">
+                            <tr>
+                                    <%-- <td>${status.index + 1}</td>--%>
+                                <c:choose>
+                                    <c:when test="${projectRecords.uploadMode == 2}">
+                                        <c:choose>
+                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+                                                <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+                                            </c:when>
+                                            <c:otherwise>
+                                                <c:choose>
+                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.temporaryUrl}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
+                                                    </c:when>
+                                                    <c:otherwise>
+                                                        <c:choose>
+                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+                                                            </c:when>
+                                                            <c:otherwise>
+                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                            </c:otherwise>
+                                                        </c:choose>
+                                                    </c:otherwise>
+                                                </c:choose>
+                                            </c:otherwise>
+                                        </c:choose>
+                                    </c:when>
+                                    <c:otherwise>
+                                        <c:choose>
+                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+                                                <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+                                            </c:when>
+                                            <c:otherwise>
+                                                <c:choose>
+                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
+                                                    </c:when>
+                                                    <c:otherwise>
+                                                        <c:choose>
+                                                            <c:when test="${workReimbursement.uploadMode == 2}">
+                                                                <c:choose>
+                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+                                                                        <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+                                                                    </c:when>
+                                                                    <c:otherwise>
+                                                                        <c:choose>
+                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+                                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
+                                                                            </c:when>
+                                                                            <c:otherwise>
+                                                                                <c:choose>
+                                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+                                                                                    </c:when>
+                                                                                    <c:otherwise>
+                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                                    </c:otherwise>
+                                                                                </c:choose>
+                                                                            </c:otherwise>
+                                                                        </c:choose>
+                                                                    </c:otherwise>
+                                                                </c:choose>
+                                                            </c:when>
+                                                            <c:otherwise>
+                                                                <c:choose>
+                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+                                                                        <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+                                                                    </c:when>
+                                                                    <c:otherwise>
+                                                                        <c:choose>
+                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+                                                                                <td><a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
+                                                                            </c:when>
+                                                                            <c:otherwise>
+                                                                                <c:choose>
+                                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
+                                                                                    </c:when>
+                                                                                    <c:otherwise>
+                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                                    </c:otherwise>
+                                                                                </c:choose>
+                                                                            </c:otherwise>
+                                                                        </c:choose>
+                                                                    </c:otherwise>
+                                                                </c:choose>
+                                                            </c:otherwise>
+                                                        </c:choose>
+                                                    </c:otherwise>
+                                                </c:choose>
+                                            </c:otherwise>
+                                        </c:choose>
+                                    </c:otherwise>
+                                </c:choose>
+
+                                <td>${workClientAttachment.createBy.name}</td>
+                                <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
+                                <td class="op-td">
+                                    <div class="op-btn-box" >
+                                        <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                            <%--													<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">--%>
+                                            <%--														<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>--%>
+                                            <%--													</c:if>--%>
+                                        <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
+                                    </div>
+                                </td>
+                            </tr>
+                        </c:forEach>
+                        </tbody>
+                    </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" >

+ 222 - 479
src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsReportSignatureModify.jsp

@@ -4,10 +4,12 @@
 <head>
     <title>项目审批管理</title>
     <meta name="decorator" content="default"/>
-    <script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>
-    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
-    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
-    <link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
+    <script type="text/javascript" src="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.js"></script>
+    <script type="text/javascript" src="${ctxStatic}/iCheck/icheck.min.js"></script>
+    <script type="text/javascript" src="${ctxStatic}/layui/layuidown.js"></script>
+    <script src="${ctxStatic}/common/html/js/script.js"></script>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/layuidown.css"/>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.css"/>
 
     <script type="text/javascript">
         var validateForm;
@@ -79,12 +81,16 @@
                 $("#c2").hide();
                 $("#c1").show();
             }
+
+            $("#attachment_btn").click(function () {
+                $("#attachment_file").click();
+            });
         });
 
         function insertTitle(tValue){
             var files = $("#attachment_file")[0].files;            for(var i = 0;i<files.length;i++) {                var file = files[i];
                 var attachmentId = $("#id").val();
-                var attachmentFlag = "82";
+                var attachmentFlag = "145";
                 console.log(file);
                 var timestamp=new Date().getTime();
 
@@ -126,7 +132,7 @@
 <body >
 <div class="single-form">
     <div class="container">
-        <form:form id="inputForm" modelAttribute="projectRecords" enctype="multipart/form-data" action="${ctx}/ruralProject/electronicSeal/reportSignatureSaveAudit" method="post" class="layui-form">
+        <form:form id="inputForm" modelAttribute="projectRecords" enctype="multipart/form-data" action="${ctx}/ruralProject/electronicSeal/reportSignatureSaveAudit" method="post" class="form-horizontal layui-form">
             <form:hidden path="id"/>
             <form:hidden path="home"/>
             <form:hidden path="act.taskId"/>
@@ -193,84 +199,57 @@
             <div class="form-group layui-row first">
                 <div class="form-group-label"><h2>项目基础信息</h2></div>
                 <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label">报告号:</label>
+                    <div class="layui-input-block">
+                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" style="background-color: #f1f1f1" value="${projectRecords.projectReportNumber}"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">项目名称:</label>
                     <div class="layui-input-block">
-                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectName}"/>
+                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" style="background-color: #f1f1f1" value="${projectRecords.projectName}"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">项目编号:</label>
                     <div class="layui-input-block">
                         <div class="input-group">
-                            <form:input path="projectId" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
+                            <form:input path="projectId" htmlEscape="false"  readonly="true" class="form-control layui-input" cssStyle="background-color: #f1f1f1"/>
                             <span class="input-group-btn">
                                 <label class="form-status"><c:choose><c:when test="${not empty projectRecords.projectStatus}">${fns:getDictLabel(projectRecords.projectStatus, 'rural_project_audit_state', '')}</c:when><c:otherwise>新添</c:otherwise></c:choose></label>
                              </span>
                         </div>
                     </div>
                 </div>
-                    <%--<div class="layui-item layui-col-sm6 lw6">--%>
-                    <%--<label class="layui-form-label">规模类型:</label>--%>
-                    <%--<div class="layui-input-block">--%>
-                    <%--<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.scaleType}"/>--%>
-                    <%--</div>--%>
-                    <%--</div>--%>
-                    <%--<div class="layui-item layui-col-sm6 lw6">--%>
-                    <%--<label class="layui-form-label">规模单位:</label>--%>
-                    <%--<div class="layui-input-block">--%>
-                    <%--<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.scaleUnit}"/>--%>
-                    <%--</div>--%>
-                    <%--</div>--%>
-                    <%--<div class="layui-item layui-col-sm6 lw6">--%>
-                    <%--<label class="layui-form-label">规模数量:</label>--%>
-                    <%--<div class="layui-input-block">--%>
-                    <%--<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.scaleQuantity}"/>--%>
-                    <%--</div>--%>
-                    <%--</div>--%>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">项目所在地:</label>
                     <div class="layui-input-block">
-                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.province}-${projectRecords.city}-${projectRecords.county}"/>
+                        <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.province}-${projectRecords.city}-${projectRecords.county}"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">投资性质:</label>
                     <div class="layui-input-block">
+                        <c:if test="${projectRecords.projectProperties==null}">
+                            <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input"/>
+                        </c:if>
                         <c:forEach  items="${fns:getMainDictList('project_properties')}" var="v">
                             <c:if test="${v.value==projectRecords.projectProperties}">
-                                <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${v.label}"/>
+                                <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${v.label}"/>
                             </c:if>
                         </c:forEach>
                     </div>
                 </div>
-                    <%--				<div class="layui-item layui-col-sm6 lw6">--%>
-                    <%--					<label class="layui-form-label">所在省份:</label>--%>
-                    <%--					<div class="layui-input-block">--%>
-                    <%--						<form:input path="province" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>--%>
-                    <%--					</div>--%>
-                    <%--				</div>--%>
-                    <%--				<div class="layui-item layui-col-sm6 lw6">--%>
-                    <%--					<label class="layui-form-label">所在地级市:</label>--%>
-                    <%--					<div class="layui-input-block">--%>
-                    <%--						<form:input path="city" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>--%>
-                    <%--					</div>--%>
-                    <%--				</div>--%>
-                    <%--				<div class="layui-item layui-col-sm6 lw6">--%>
-                    <%--					<label class="layui-form-label">所在区县:</label>--%>
-                    <%--					<div class="layui-input-block">--%>
-                    <%--						<form:input path="county" htmlEscape="false" id="areaName1" class="form-control layui-input" readonly="true"/>--%>
-                    <%--					</div>--%>
-                    <%--				</div>--%>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">建设地点:</label>
                     <div class="layui-input-block">
-                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectSite}"/>
+                        <input htmlEscape="false" style="background-color: #f1f1f1"  readonly="true" class="form-control layui-input" value="${projectRecords.projectSite}"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">创建人:</label>
                     <div class="layui-input-block">
-                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.createBy.name}"/>
+                        <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.createBy.name}"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -282,7 +261,7 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">所属部门:</label>
                     <div class="layui-input-block">
-                        <input htmlEscape="false" readonly="true" id="officeName" class="form-control layui-input" value="${projectRecords.officeName}"/>
+                        <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" id="officeName" class="form-control layui-input" value="${projectRecords.officeName}"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -311,145 +290,43 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line">送审规模(万元):</label>
                     <div class="layui-input-block">
-                        <form:input path="submitScale" id="submitScale" readonly="true" maxlength="12" htmlEscape="false" onkeyup="wirteNum(this)" placeholder="请输入送审规模" class="form-control layui-input number"/>
+                        <form:input path="submitScale" readonly="true" style="background-color: #f1f1f1" id="submitScale" maxlength="12" htmlEscape="false" placeholder="请输入送审规模" class="form-control layui-input number"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line">工作开始日期:</label>
                     <div class="layui-input-block">
-                        <input class=" form-control layui-input " readonly="true" id="startDate" name="startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate form-control layui-input layer-date ash"  style="background-color: #f1f1f1" readonly="true" id="startDate" name="startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line">工作结束日期:</label>
                     <div class="layui-input-block">
-                        <input class=" form-control layui-input " readonly="true" id="endingDate" name="endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate form-control layui-input layer-date "  style="background-color: #f1f1f1" readonly="true" id="endingDate" name="endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">创建日期:</label>
                     <div class="layui-input-block">
-                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"/>
+                        <input htmlEscape="false"  style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw6">
+                <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">项目类别:</label>
                     <div class="layui-input-block">
-                        <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${projectRecords.attachmentProjectSort}"/>
+                        <input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${projectRecords.attachmentProjectSort}"/>
                     </div>
                 </div>
-                    <%--<div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label">工程结构:</label>
-                        <div class="layui-input-block">
-                            <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectStructure}"/>
-                        </div>
-                    </div>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label">地上层数:</label>
-                        <div class="layui-input-block">
-                            <form:input path="onGroundNum" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
-                        </div>
-                    </div>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label">底下层数:</label>
-                        <div class="layui-input-block">
-                            <form:input path="underGroundNum" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
-                        </div>
-                    </div>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">建筑面积或规模:</label>
-                        <div class="layui-input-block">
-                            <form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
-                        </div>
-                    </div>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label">计量单位:</label>
-                        <div class="layui-input-block">
-                            <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.measuringUnit}"/>
-                        </div>
-                    </div>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label">工程用途:</label>
-                        <div class="layui-input-block">
-                            <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectUse}"/>
-                        </div>
-                    </div>--%>
-                    <%--<div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">预估总投资额(万元):</label>
-                        <div class="layui-input-block">
-                            <input value="<fmt:formatNumber value="${projectRecords.estimateTotalFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="estimateTotalFees" class="form-control layui-input number"  readonly="true"/>
-                        </div>
-                    </div>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">咨询标的额(万元):</label>
-                        <div class="layui-input-block">
-                            <input value="<fmt:formatNumber value="${projectRecords.totalFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="totalFees" class="form-control layui-input number"  readonly="true"/>
-                        </div>
-                    </div>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">其中土建造价(万元):</label>
-                        <div class="layui-input-block">
-                            <input   value="<fmt:formatNumber value="${projectRecords.buildingFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="buildingFees" class="form-control layui-input" readonly="true"/>
-                        </div>
-                    </div>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">其中安装造价(万元):</label>
-                        <div class="layui-input-block">
-                            <input  value="<fmt:formatNumber value="${projectRecords.installFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="installFees" class="form-control layui-input" readonly="true"/>
-                        </div>
-                    </div>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">其中土建百分比(%):</label>
-                        <div class="layui-input-block">
-                            <form:input path="buildingPercent" htmlEscape="false" id="buildingPercent" class="form-control layui-input" readonly="true"/>
-                        </div>
-                    </div>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">其中安装百分比(%):</label>
-                        <div class="layui-input-block">
-                            <form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
-                        </div>
-                    </div>--%>
-                    <%--<div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">施工单位:</label>
-                        <div class="layui-input-block">
-                            <form:input path="constructionUnit" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
-                        </div>
-                    </div>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">施工方联系方式:</label>
-                        <div class="layui-input-block">
-                            <form:input path="constructionLinkman" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
-                        </div>
-                    </div>--%>
-                    <%--<div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">单位造价(元):</label>
-                        <div class="layui-input-block">
-                            <input value="<fmt:formatNumber value="${projectRecords.unitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="true"/>
-                        </div>
-                    </div>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">土建单位造价(元):</label>
-                        <div class="layui-input-block">
-                            <input  value="<fmt:formatNumber value="${projectRecords.buildingUnitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="buildingUnitFees" class="form-control layui-input" readonly="true"/>
-                        </div>
-                    </div>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">安装单位造价(元):</label>
-                        <div class="layui-input-block">
-                            <input  value="<fmt:formatNumber value="${projectRecords.installUnitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="readonly"/>
-                        </div>
-                    </div>--%>
                 <div class="layui-item layui-col-sm6 lw6 with-textarea">
                     <label class="layui-form-label">工程概况:</label>
                     <div class="layui-input-block">
-                        <textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${projectRecords.projectDesc}</textarea>
+                        <textarea htmlEscape="false" rows="4" readonly="true"  style="background-color: #f1f1f1" maxlength="1000" class="form-control" >${projectRecords.projectDesc}</textarea>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6 with-textarea">
-                    <label class="layui-form-label">特殊要求:</label>
+                    <label class="layui-form-label">备注:</label>
                     <div class="layui-input-block">
-                        <textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${projectRecords.remarks}</textarea>
+                        <textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000"  style="background-color: #f1f1f1" class="form-control" >${projectRecords.remarks}</textarea>
                     </div>
                 </div>
             </div>
@@ -469,30 +346,27 @@
                         </tr>
                         </thead>
                         <tbody id="workClientLinkmanList">
+                        <c:forEach items="${projectRecords.workClientLinkmanList}" var="info" varStatus="index">
+                            <tr>
+                                <td >
+                                        ${info.clientId.name}
+                                </td>
+                                <td>
+                                        ${info.name}
+                                </td>
+                                <td>
+                                        ${info.linkPhone}
+                                </td>
+                                <td>
+                                        ${info.linkMobile}
+                                </td>
+                            </tr>
+                        </c:forEach>
                         </tbody>
                     </table>
-                    <script type="text/template" id="workClientLinkmanTpl">//<!--
-					<tr id="workClientLinkmanList{{idx}}">
-					<td class="hide">
-						<input id="workClientLinkmanList{{idx}}_id" name="workClientLinkmanList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
-						<input id="workClientLinkmanList{{idx}}_delFlag" name="workClientLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
-					</td>
-					<td>
-						{{row.clientId.name}}
-					</td>
-					<td>
-						{{row.name}}
-					</td>
-					<td>
-						{{row.linkPhone}}
-					</td>
-					<td>
-						{{row.linkMobile}}
-					</td>
-				</tr>//-->
-                    </script>
                 </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" >
@@ -507,327 +381,196 @@
                         </tr>
                         </thead>
                         <tbody id="workConstructionLinkmanList">
+                        <c:forEach items="${projectRecords.workConstructionLinkmanList}" var="info" varStatus="index">
+                            <tr>
+                                <td >
+                                        ${info.clientId.name}
+                                </td>
+                                <td>
+                                        ${info.name}
+                                </td>
+                                <td>
+                                        ${info.linkPhone}
+                                </td>
+                                <td>
+                                        ${info.linkMobile}
+                                </td>
+                            </tr>
+                        </c:forEach>
                         </tbody>
                     </table>
-                    <script type="text/template" id="workConstructionLinkmanTpl">//<!--
-					<tr id="workConstructionLinkmanList{{idx}}">
-					<td class="hide">
-						<input id="workConstructionLinkmanList{{idx}}_id" name="workConstructionLinkmanList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
-						<input id="workConstructionLinkmanList{{idx}}_delFlag" name="workConstructionLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
-					</td>
-					<td>
-						{{row.clientId.name}}
-					</td>
-					<td>
-						{{row.name }}
-					</td>
-					<td>
-						{{row.linkPhone}}
-					</td>
-					<td>
-						{{row.linkMobile}}
-					</td>
-				</tr>//-->
-                    </script>
                 </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" >
-                    <table id="upTable" class="table table-bordered table-condensed details">
-                        <thead>
-                        <tr>
-                            <th width="25%">报告编号</th>
-                            <th width="25%">报告名称</th>
-                            <th width="20%">工作内容类型</th>
-                            <th width="10%">签章类型</th>
-                            <th width="10%">创建日期</th>
-                            <th width="10%">状态</th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <c:choose>
-                            <c:when test="${not empty projectRecords.projectReportData}">
-                                <c:forEach items="${projectRecords.projectReportData}" var="projectReportData" varStatus="index">
-                                    <tr>
-                                        <td><a title="${projectReportData.number}" href="javascript:void(0)" onclick="openDialogView('查看报告详情', '${ctx}/projectcontentinfo/projectcontentinfo/form1?id=${projectReportData.id}','95%', '95%')">
-                                                ${projectReportData.number}
-                                        </a></td>
-                                        <td>
-                                                ${projectReportData.name}
-                                        </td>
-                                        <td title="${fns:getContentTypeName(projectReportData.type,"")}">
-                                                ${fns:getContentTypeName(projectReportData.type,"")}
-                                        </td>
-                                        <td title="${projectReportData.reportType}">
-                                                ${projectReportData.reportType}
-                                        </td>
-                                        <td>
-                                            <fmt:formatDate value="${projectReportData.reportDate}" pattern="yyyy-MM-dd"/>
-                                        </td>
-                                        <td class="op-td">
-                                                &lt;%&ndash;<c:choose>&ndash;%&gt;
-                                                &lt;%&ndash;<c:when test="${empty projectReportData.status || projectReportData.status eq 1}">&ndash;%&gt;
-                                                &lt;%&ndash;<div style="text-align: center">&ndash;%&gt;
-                                                &lt;%&ndash;<a href="javascript:void(0)" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>&ndash;%&gt;
-                                                &lt;%&ndash;</div>&ndash;%&gt;
-                                                &lt;%&ndash;</c:when>&ndash;%&gt;
-                                                &lt;%&ndash;<c:otherwise>&ndash;%&gt;
-                                                &lt;%&ndash;<div style="text-align: center">&ndash;%&gt;
-                                                &lt;%&ndash;<a href="javascript:void(0)" onclick="openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=${id}&projectReportData.id=${projectReportData.id}&type=1','95%','95%')" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>&ndash;%&gt;
-                                                &lt;%&ndash;</div>&ndash;%&gt;
-                                                &lt;%&ndash;</c:otherwise>&ndash;%&gt;
-                                                &lt;%&ndash;</c:choose>&ndash;%&gt;
-                                            <div style="text-align: center" id="status_td_${index.index+1}">
-                                            </div>
-                                            <script>
-                                                initRecordStatus(${index.index+1},"${id}","${projectReportData.id}","${projectReportData.status}");
-                                            </script>
-                                        </td>
-                                    </tr>
-                                </c:forEach>
-                            </c:when>
-                            <c:otherwise>
-                                <tr>
-                                    <td colspan="7">
-                                        暂无数据
-                                    </td>
-                                </tr>
-                            </c:otherwise>
-                        </c:choose>
-                        </tbody>
-                    </table>
-                </div>
-            </div>--%>
-            <div class="form-group layui-row">
-                <div class="form-group-label"><h2>项目计划列表</h2></div>
-                <div class="layui-item layui-col-sm12 lw7">
-                    <div class="layui-item nav-btns">
-                            <%--						<div class="layui-item nav-btns" style="padding-left:0px;">--%>
-                            <%--							<a class="nav-btn nav-btn-add"--%>
-                            <%--							   onclick="addRow('#projectPlanList', workClientBankRowIdx, workClientBankTpl);workClientBankRowIdx = workClientBankRowIdx + 1;"--%>
-                            <%--							   title="新增"><i class="fa fa-plus"></i> 新增</a>--%>
-                            <%--							<shiro:hasPermission name="project:projectPlan:export">--%>
-                            <%--								<a class="nav-btn nav-btn-export" title="导出"  onclick="return confirmx('确认要导出该项目计划列表吗?', '${ctx}/project/projectPlan/export?id=${projectRecords.id}');"><i class="fa fa-file-excel-o"></i> 导出</a>--%>
-                            <%--							</shiro:hasPermission>--%>
-                            <%--						</div>--%>
-                        <table id="bankinfo" class="table table-bordered table-condensed can-edit">
-                            <thead>
-                            <tr>
-                                <th width="60px">编号</th>
-                                <th >任务阶段</th>
-                                <th >计划开始时间</th>
-                                <th >计划结束时间</th>
-                                <th >提醒人</th>
-                                <th >完成人</th>
-                            </tr>
-                            </thead>
-                            <tbody id="projectPlanList">
 
-                            </tbody>
-                        </table>
-                        <script type="text/template" id="workClientBankTpl">//<!--
-                                <tr id="projectPlanList{{idx}}">
-                                    <td class="hide">
-                                        <input id="projectPlanList{{idx}}_id" name="projectPlanList[{{idx}}].id" type="hidden" readonly="true" value="{{row.id}}"/>
-                                        <input id="projectPlanList{{idx}}_delFlag" name="projectPlanList[{{idx}}].delFlag" type="hidden" readonly="true" value="0"/>
-                                        <input id="projectPlanList{{idx}}_remindId" name="projectPlanList[{{idx}}].remindId" type="hidden" readonly="true" value="{{row.remindId}}"/>
-                                    </td>
 
-                                    <td width="60px">
-                                        <input id="projectPlanList{{idx}}_costNum" name="projectPlanList[{{idx}}].costNum" readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
-                                    </td>
-                                    <td>
-                                        <input id="projectPlanList{{idx}}_projectStage" name="projectPlanList[{{idx}}].projectStage" readonly="true" list ="num" title="{{row.projectStage}}"  value="{{row.projectStage}}" class="form-control required"/>
-                                    </td>
-
-                                    <td>
-                                        <input lay-verify="date" readonly="true" placeholder="yyyy-MM-dd" autocomplete="off" id="projectPlanList{{idx}}_beginDate" name="projectPlanList[{{idx}}].beginDate" style="text-align: center" type="text" value="{{row.beginDate}}"  class="form-control required datetime"/>
-                                    </td>
-                                    <td>
-                                        <input lay-verify="date" readonly="true" placeholder="yyyy-MM-dd" autocomplete="off" id="projectPlanList{{idx}}_endDate" name="projectPlanList[{{idx}}].endDate" style="text-align: center" type="text" value="{{row.endDate}}"  class="form-control required datetime"/>
-                                    </td>
-
-                                    <td>
-                                    	<input id="projectPlanList{{idx}}_remindName" name="remindName" readonly="readonly" style="text-align: center"  value="{{row.remindName}}" type="text" class="form-control contentDetail"/>
-<%--                                        <sys:treeselecttPlanUser  id="projectPlanList{{idx}}_remindName" name="remindName" value="${projectRecords.leaderIds}" labelName="projectPlanList[{{idx}}].remindName" labelValue="{{row.remindName}}"--%>
-<%--                                         title="用户" url="/sys/office/treeDataByPlan?type=3&projectId=${projectRecords.id}" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true" disabled="true"/>--%>
-                                    </td>
-
-                                    <td>
-                                    	<input id="projectPlanList{{idx}}_finishName" name="projectPlanList[{{idx}}].finishId" readonly="readonly" style="text-align: center"  value="{{row.finishName}}" type="text" class="form-control contentDetail"/>
-<%--                                        <sys:treeselecttPlanUser id="projectPlanList{{idx}}_finishName" name="projectPlanList[{{idx}}].finishId" value="${projectRecords.leaderIds}" labelName="projectPlanList[{{idx}}].finishName" labelValue="{{row.finishName}}"--%>
-<%--                                         title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true" disabled="true" />--%>
-                                    </td>
-
-<%--                                    <td class="text-center op-td" width="10">--%>
-<%--                                        {{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#projectPlanList{{idx}}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>{{/delBtn}}--%>
-<%--                                    </td>--%>
-                                </tr>//-->
-                        </script>
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>报告签章附件信息</h2></div>
+                <div class="layui-item nav-btns">
+                    <a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
+                </div>
+                <div id="addFile_attachment" style="display: none" class="upload-progress">
+                    <span id="fileName_attachment" ></span>
+                    <b><span id="baifenbi_attachment" ></span></b>
+                    <div class="progress">
+                        <div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
+                        </div>
                     </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" >--%>
-            <%--					<table id="listAttachment" class="table table-bordered table-condensed no-bottom-margin details">--%>
-            <%--						<thead>--%>
-            <%--						<tr>--%>
-            <%--							<th width="25%">文件预览</th>--%>
-            <%--							<th width="25%">上传人</th>--%>
-            <%--							<th width="25%">上传时间</th>--%>
-            <%--							<th width="25%">操作</th>--%>
-            <%--						</tr>--%>
-            <%--						</thead>--%>
-            <%--						<tbody id="file_attachment">--%>
-            <%--						<c:forEach items="${projectRecords.workAttachments}" var="workClientAttachment" varStatus="status">--%>
-            <%--							<tr>--%>
-            <%--									&lt;%&ndash;<td>${status.index + 1}</td>&ndash;%&gt;--%>
-            <%--								<c:choose>--%>
-            <%--									<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')--%>
-            <%--															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')--%>
-            <%--															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')--%>
-            <%--															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')--%>
-            <%--															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">--%>
-            <%--										<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">--%>
-            <%--									</c:when>--%>
-            <%--									<c:otherwise>--%>
-            <%--										<c:choose>--%>
-            <%--											<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">--%>
-            <%--												<td><a href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','95%','95%','1')">${workClientAttachment.attachmentName}</a></td>--%>
-            <%--											</c:when>--%>
-            <%--											<c:otherwise>--%>
-            <%--												<td><a href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','95%','95%')">${workClientAttachment.attachmentName}</a></td>--%>
-            <%--											</c:otherwise>--%>
-            <%--										</c:choose>--%>
-            <%--									</c:otherwise>--%>
-            <%--								</c:choose>--%>
-            <%--								<td>${workClientAttachment.createBy.name}</td>--%>
-            <%--								<td><fmt:formatDate value="${workClientAttachment.createDate}" pattern="yyyy-MM-dd"/></td>--%>
-            <%--								<td  class="op-td">--%>
-            <%--									<a href="javascript:location.href=encodeURI('${ctx}/workcontractinfo/workContractInfo/downLoadAttach?file=${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>--%>
-            <%--								</td>--%>
-            <%--							</tr>--%>
-            <%--						</c:forEach>--%>
-            <%--						</tbody>--%>
-            <%--					</table>--%>
-            <%--				</div>--%>
-            <%--			</div>--%>
-            <%--			<div class="form-group layui-row">--%>
-            <%--				<div class="layui-item layui-col-sm8 lw6 with-textarea">--%>
-            <%--					<div class="layui-input-block" style="margin-left:10px;position: relative">--%>
-            <%--						<form:textarea placeholder="请输入意见:" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />--%>
-            <%--						<a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>--%>
-            <%--						<input type="file" name="upload_files" style="display: none;">--%>
-            <%--					</div>--%>
-            <%--				</div>--%>
-            <%--				<div class="layui-item layui-col-sm4 lw6 with-textarea">--%>
-            <%--					<div class="layui-input-block" style="margin-left:10px;">--%>
-            <%--						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>--%>
-            <%--						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>--%>
-            <%--						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>--%>
-            <%--						<div style="padding: 5px 0px;">--%>
-            <%--							<form:select path="act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">--%>
-            <%--								<form:option value=""/>--%>
-            <%--								<form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>--%>
-            <%--							</form:select>--%>
-            <%--						</div>--%>
-            <%--					</div>--%>
-            <%--				</div>--%>
-            <%--			</div>--%>
-
-            <script>
-                var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
-                var workConstructionLinkmanRowIdx = 0, workConstructionLinkmanTpl = $("#workConstructionLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
-                $(document).ready(function() {
-                    var data = ${fns:toJson(projectRecords.workClientLinkmanList)};
-                    for (var i=0; i<data.length; i++){
-                        addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl, data[i]);
-                        workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
-                    }
-                    var dataBank = ${fns:toJson(projectRecords.workConstructionLinkmanList)};
-                    for (var i=0; i<dataBank.length; i++){
-                        addRow('#workConstructionLinkmanList', workConstructionLinkmanRowIdx, workConstructionLinkmanTpl, dataBank[i]);
-                        workConstructionLinkmanRowIdx = workConstructionLinkmanRowIdx + 1;
-                    }
-
-                });
-                layui.use('form', function () {
-                    var form = layui.form;
-                    form.render();
-                });
-                function f1(row) {
-                    // window.parent.document.getElementById('opinion').value = row;
-                    $("#opinion").val(row)
-                }
-                function openDialogre(title,url,width,height,target,buttons) {
-                    if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端,就使用自适应大小弹窗
-                        width = 'auto';
-                        height = 'auto';
-                    } else {//如果是PC端,根据用户设置的width和height显示。
-                    }
-                    var split = buttons.split(",");
-                    top.layer.open({
-                        type: 2,
-                        area: [width, height],
-                        title: title,
-                        maxmin: true, //开启最大化最小化按钮
-                        skin: 'three-btns',
-                        content: url,
-                        btn: split,
-                        btn1: function(index, layero){
-                            top.layer.close(index)
-                            document.getElementById('iframe').contentWindow.location.reload();
-                        }
-                    });
-                }
-            </script>
-
-            <div class="form-group layui-row">
-                <div class="form-group-label"><h2>项目组成员列表</h2></div>
-                <div class="layui-item layui-col-xs12 form-table-container" >
-                    <table id="usersListTable" class="table table-bordered table-condensed no-bottom-margin details">
+                <input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
+                <span id="attachment_title"></span>
+                <div class="layui-item layui-col-xs12" style="padding:0 16px;">
+                    <table id="listAttachment" class="table table-bordered table-condensed details">
                         <thead>
                         <tr>
-                            <th width="25%">姓名</th>
-                            <th width="25%">部门</th>
-                            <th width="25%">职级</th>
-                            <th width="55px;">状态</th>
+                                <%-- <th>序号</th>--%>
+                            <th>文件预览</th>
+                            <th>上传人</th>
+                            <th>上传时间</th>
+                            <th width="180px">操作</th>
                         </tr>
                         </thead>
-                        <tbody id="usersList">
-                        <c:if test="${not empty projectRecords.projectMembers}">
-                            <c:forEach items="${projectRecords.projectMembers}" var="user">
-                                <tr id="${user.id}">
-                                    <td>
-                                            ${user.name}
-                                    </td>
-                                    <td>
-                                            ${user.office.name}
-                                    </td>
-                                    <td>
-                                            ${user.basicInfo.jobGrade.name}
-                                    </td>
-                                    <td>
+                        <tbody id="file_attachment">
+                        <c:forEach items="${projectRecords.workAttachments}" var = "workClientAttachment" varStatus="status">
+                            <tr>
+                                    <%-- <td>${status.index + 1}</td>--%>
+                                <c:choose>
+                                    <c:when test="${projectRecords.uploadMode == 2}">
                                         <c:choose>
-                                            <c:when test="${user.delFlag == 0}">
-                                                正常
+                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+                                                <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
                                             </c:when>
                                             <c:otherwise>
-                                                移除
+                                                <c:choose>
+                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.temporaryUrl}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
+                                                    </c:when>
+                                                    <c:otherwise>
+                                                        <c:choose>
+                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+                                                            </c:when>
+                                                            <c:otherwise>
+                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                            </c:otherwise>
+                                                        </c:choose>
+                                                    </c:otherwise>
+                                                </c:choose>
                                             </c:otherwise>
                                         </c:choose>
-                                    </td>
-                                </tr>
-                            </c:forEach>
-                        </c:if>
+                                    </c:when>
+                                    <c:otherwise>
+                                        <c:choose>
+                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+                                                <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+                                            </c:when>
+                                            <c:otherwise>
+                                                <c:choose>
+                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
+                                                    </c:when>
+                                                    <c:otherwise>
+                                                        <c:choose>
+                                                            <c:when test="${workReimbursement.uploadMode == 2}">
+                                                                <c:choose>
+                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+                                                                        <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+                                                                    </c:when>
+                                                                    <c:otherwise>
+                                                                        <c:choose>
+                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+                                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
+                                                                            </c:when>
+                                                                            <c:otherwise>
+                                                                                <c:choose>
+                                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+                                                                                    </c:when>
+                                                                                    <c:otherwise>
+                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                                    </c:otherwise>
+                                                                                </c:choose>
+                                                                            </c:otherwise>
+                                                                        </c:choose>
+                                                                    </c:otherwise>
+                                                                </c:choose>
+                                                            </c:when>
+                                                            <c:otherwise>
+                                                                <c:choose>
+                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+                                                                        <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+                                                                    </c:when>
+                                                                    <c:otherwise>
+                                                                        <c:choose>
+                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+                                                                                <td><a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
+                                                                            </c:when>
+                                                                            <c:otherwise>
+                                                                                <c:choose>
+                                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
+                                                                                    </c:when>
+                                                                                    <c:otherwise>
+                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                                    </c:otherwise>
+                                                                                </c:choose>
+                                                                            </c:otherwise>
+                                                                        </c:choose>
+                                                                    </c:otherwise>
+                                                                </c:choose>
+                                                            </c:otherwise>
+                                                        </c:choose>
+                                                    </c:otherwise>
+                                                </c:choose>
+                                            </c:otherwise>
+                                        </c:choose>
+                                    </c:otherwise>
+                                </c:choose>
+
+                                <td>${workClientAttachment.createBy.name}</td>
+                                <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
+                                <td class="op-td">
+                                    <div class="op-btn-box" >
+                                        <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                            <%--													<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">--%>
+                                            <%--														<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>--%>
+                                            <%--													</c:if>--%>
+                                        <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
+                                    </div>
+                                </td>
+                            </tr>
+                        </c:forEach>
                         </tbody>
                     </table>
                 </div>
             </div>
 
+
         </form:form>
         <%--<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">

ファイルの差分が大きいため隠しています
+ 1241 - 0
src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsReportSignatureView.jsp


+ 14 - 9
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/electronicSeal/ruralProjectMessageElectronicSealList.jsp

@@ -1164,12 +1164,16 @@
                             var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
                     }}
-				,{align:'center', title: '报告签章申请',  width:100,templet:function(d){
+				,{align:'center', title: '报告签章申请',  width:130,templet:function(d){
 						var st = getAuditState(d.reportSignatureStatus);
 						if(st.action)
 							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/electronicSeal/getReportedProcess?processInstanceId=" + d.reportSignatureProcessInstanceId + "','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>";
+
+						if(d.prsiId != null && d.prsiId != undefined && d.prsiId != ""){
+							xml+="<span  style='margin-left: 5px;' class=\"layui-badge layui-bg-orange\">已填</span>";
+						}
 						return xml;
 					}}
                 ,{field:'op',align:'center',title:"操作",width:320,templet:function(d) {
@@ -1208,18 +1212,19 @@
 								if(d.reportSignatureFlag != "1"){
 									xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogreByReportImportFile('上传报告签章', '${ctx}/ruralProject/ruralProjectMessage/skipImportReportWord?id=" + d.id + "&visitType=1','500px', '300px','','导入,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 报告签章</a>";
 								}
-								if(d.signatureDownloadUrl != null && d.signatureDownloadUrl != undefined && d.signatureDownloadUrl != ""){
-									xml+="<a href=\""+d.signatureDownloadUrl+"\" class=\"layui-btn  layui-btn-xs\">报告下载</a>"
-								}else{
-									if(d.prsiId != null && d.prsiId != undefined && d.prsiId != ""){
-										//报告下载
-										xml+="<a href=\"${ctx}/ruralProject/electronicSeal/downloadMassControl?id="+ d.pidId +"\" class=\"layui-btn  layui-btn-xs\">报告下载</a>"
-									}
-								}
+
 								//自动生成电子签章报告(在有报告的前提下可使用,没有报告信息则不进行展示该按钮)
 								//xml+="<a href=\"${ctx}/ruralProject/electronicSeal/downloadMassControl?id="+ d.pidId +"\" onclick=\"return confirmx('确认要自动生成报告签章吗?', this.href)\" class=\"layui-btn  layui-btn-xs\" > 自动生成报告签章</a>";
 								</shiro:hasPermission>
 							}
+							if(d.signatureDownloadUrl != null && d.signatureDownloadUrl != undefined && d.signatureDownloadUrl != ""){
+								xml+="<a href=\""+d.signatureDownloadUrl+"\" class=\"layui-btn  layui-btn-xs\">报告下载</a>"
+							}else{
+								if(d.prsiId != null && d.prsiId != undefined && d.prsiId != ""){
+									//报告下载
+									xml+="<a href=\"${ctx}/ruralProject/electronicSeal/downloadMassControl?id="+ d.pidId +"\" class=\"layui-btn  layui-btn-xs\">报告下载</a>"
+								}
+							}
 
 						}
 						xml+="</div>";

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/view/ruralProjectRecordsView.jsp

@@ -404,7 +404,7 @@
 			</div>
 			<c:if test="${projectRecords.reportSignatureFlag == 1}">
 				<div class="form-group layui-row">
-					<div class="form-group-label"><h2>审定单签章附件表</h2></div>
+					<div class="form-group-label"><h2>报告签章附件表</h2></div>
 					<div class="layui-item layui-col-xs12 form-table-container" >
 						<table id="contentTable" class="table table-bordered table-condensed no-bottom-margin details">
 							<thead>