项目报告审核流程修改、报告号生成规则修改、报告号页面展示修改、归档信息页面展示修改

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

@@ -97,6 +97,7 @@ public class ProjectReportData extends ActEntity<ProjectReportData> {
 	private Double installFee;    //安装额
 	private String recordNum;     //归档申请编号
 	private String templateTypeName;
+	private String conditionType;   //判断条件
 
 
 	public String getUpId() {
@@ -580,4 +581,12 @@ public class ProjectReportData extends ActEntity<ProjectReportData> {
 	public void setTemplateTypeName(String templateTypeName) {
 		this.templateTypeName = templateTypeName;
 	}
+
+	public String getConditionType() {
+		return conditionType;
+	}
+
+	public void setConditionType(String conditionType) {
+		this.conditionType = conditionType;
+	}
 }

src/main/java/com/jeeplus/modules/projectrecord/entity/ProjectRecords.java

@@ -115,6 +115,7 @@ public class ProjectRecords extends ActEntity<ProjectRecords> {
 
 	private String dictType;
 	private String parentIds;
+	private String projectType; //类型 1.工程咨询 2.造价审核
 	private List<WorkClientAttachment> workAttachments = Lists.newArrayList();
 
 	private List<ProjectReportData> projectReportData = Lists.newArrayList();
@@ -674,4 +675,12 @@ public class ProjectRecords extends ActEntity<ProjectRecords> {
 	public void setParentIds(String parentIds) {
 		this.parentIds = parentIds;
 	}
+
+	public String getProjectType() {
+		return projectType;
+	}
+
+	public void setProjectType(String projectType) {
+		this.projectType = projectType;
+	}
 }

src/main/java/com/jeeplus/modules/projectreportnum/service/ProjectReportNumService.java

@@ -82,10 +82,10 @@ public class ProjectReportNumService extends CrudService<ProjectReportNumDao, Re
 	}
 
 	@Transactional(readOnly = false)
-	public String  saveNumber() {
+	public String  saveNumber(String bizCode) {
 		ReportNum reportNum = null;
 		int count = projectReportNumDao.countNum(UserUtils.getUser().getId());
-		String num = serialNumTplService.genSerialNum(UserUtils.getUser().getCompany(), "10");
+		String num = serialNumTplService.genSerialNum(UserUtils.getUser().getCompany(), bizCode);
 		reportNum = new ReportNum();
 		reportNum.setNum(num);
 		reportNum.setState("1");

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

@@ -351,7 +351,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         selectProcess.setProcessInstanceId(projectReportData.getProcessInstanceId());
         List<WorkActivityProcess> workActivityProcesses = workActivityProcessService.findList(selectProcess);
         List<Activity> activities = workActivityMenu.getActivities();
-        if (com.jeeplus.common.utils.StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("reportAudit")) {
+        if (com.jeeplus.common.utils.StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("newReportAudit")) {
             key = 1;
             for (int i = 0; i < workActivityProcesses.size(); i++) {
                 WorkActivityProcess activityProcess = workActivityProcesses.get(i);
@@ -396,7 +396,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                 }
             }
         } else {
-            workActivityMenu.setProcessType("reportAudit");
+            workActivityMenu.setProcessType("newReportAudit");
             for (int i = 0; i < workActivityProcesses.size(); i++) {
                 WorkActivityProcess activityProcess = workActivityProcesses.get(i);
                 String count = activityProcess.getCount() + "";
@@ -425,13 +425,18 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                     taskCount = "2";
                     exp = "pass";
                     if ("yes".equals(flag)) {
-                        workActivityProcessService.insertAuditsByType(auditUsers,reportData.getProcessInstanceId(),5,1);
+                        notifyRole = "审批通过";
+                        String reportNo = createReportNo(reportData.getConditionType());
+                        projectReportData.setNumber(reportNo);
+                        //projectReportDataService.updateNumber(projectReportData);
+                        workActivityProcess.setIsApproval("1");
+                        //workActivityProcessService.insertAuditsByType(auditUsers,reportData.getProcessInstanceId(),5,1);
 
-                        notifyRole = "盖章人盖章";
+                        /*notifyRole = "盖章人盖章";
                         workActivityProcess.setIsApproval("1");
                         enname = "gzr";
                         vars.put("gzrList", auditUsers);
-                        vars.put("gzrcount",auditUsers.size());
+                        vars.put("gzrcount",auditUsers.size());*/
                     } else {
                         notifyRole = "调整报告";
                         workActivityProcess.setIsApproval("2");
@@ -442,7 +447,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                     exp = "pass";
                     if ("yes".equals(flag)) {
                         notifyRole = "审批通过";
-                        String reportNo = createReportNo();
+                        String reportNo = createReportNo(reportData.getConditionType());
                         projectReportData.setNumber(reportNo);
                         //projectReportDataService.updateNumber(projectReportData);
                         workActivityProcess.setIsApproval("1");
@@ -518,7 +523,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
             }
             workActivityProcessService.deleteProcessIdAuditUsers(projectReportData.getProcessInstanceId());
         } else {
-            if (com.jeeplus.common.utils.StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("reportAudit")) {
+            if (com.jeeplus.common.utils.StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("newReportAudit")) {
                 WorkProjectNotify notify = new WorkProjectNotify();
                 notify.setNotifyId(projectReportData.getId());
                 userList = workProjectNotifyService.readByNotifyId(notify);
@@ -659,8 +664,8 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
     /**
      * 生成一个报告号
      */
-    public String createReportNo(){
-        String msg = projectReportNumService.saveNumber();//保存
+    public String createReportNo(String bizCode){
+        String msg = projectReportNumService.saveNumber(bizCode);//保存
         return msg;
     }
 
@@ -1099,8 +1104,8 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         }
         //总工
         List<User> bzshbs = UserUtils.getByRoleActivityEnname("bzshb",3,recordsOffice.getId(),"12",projectReportData.getCreateBy());
-        //总经理
-        List<User> gzrs = UserUtils.getByRoleActivityEnname("gzr",3,recordsOffice.getId(),"12",projectReportData.getCreateBy());
+        //盖章人
+        //List<User> gzrs = UserUtils.getByRoleActivityEnname("gzr",3,recordsOffice.getId(),"12",projectReportData.getCreateBy());
         if (com.jeeplus.common.utils.StringUtils.isNotBlank(workActivityMenu.getId())) {
             workProjectNotify.setNotifyRole("");
             workActivityMenu = workActivityMenuService.get(workActivityMenu.getId());
@@ -1142,7 +1147,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
             if (masters.size()==0){
                 return "流程审批人不能为空,项目负责人下无用户,请联系管理员！";
             }
-            processType = "reportAudit";
+            processType = "newReportAudit";
             users.addAll(masters);
             variables.put("masterList", masters);
             variables.put("mastercount", masters.size());
@@ -1186,11 +1191,11 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
             workActivityProcessService.insert(workActivityProcess);
             workActivityProcess.setCount(2);
             workActivityProcessService.insert(workActivityProcess);
-            workActivityProcess.setCount(3);
-            workActivityProcessService.insert(workActivityProcess);
+            //workActivityProcess.setCount(3);
+            //workActivityProcessService.insert(workActivityProcess);
             workActivityProcessService.insertAuditsByType(masters,processInstance.getId(),1,1);
             workActivityProcessService.insertAuditsByType(bzshbs,processInstance.getId(),2,0);
-            workActivityProcessService.insertAuditsByType(gzrs,processInstance.getId(),3,0);
+            //workActivityProcessService.insertAuditsByType(gzrs,processInstance.getId(),3,0);
         }
         return "true";
     }

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

@@ -355,6 +355,12 @@ public class RuralCostProjectMessageController extends BaseController {
             if ("modifyApply".equals(taskDefKey)){
                 ruralProjectMessageService.saveData(projectcontentinfo,3);
             }
+            //添加查询报告号模板的bizCode参数
+            if("1".equals(projectRecord.getProjectType())){
+                t.setConditionType("10");
+            }else if("2".equals(projectRecord.getProjectType())){
+                t.setConditionType("1003");
+            }
             String str = ruralProjectMessageService.auditSave(t, users);
             addMessage(redirectAttributes, str);
         }

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

@@ -259,9 +259,6 @@ public class RuralProjectMessageController extends BaseController {
     /**
      * 删除报告信息
      * @param projectcontentinfo
-     * @param status
-     * @param model
-     * @param redirectAttributes
      * @return
      */
     @RequestMapping(value = "deleteReport")
@@ -353,6 +350,12 @@ public class RuralProjectMessageController extends BaseController {
             if ("modifyApply".equals(taskDefKey)){
                 ruralProjectMessageService.saveData(projectcontentinfo,3);
             }
+            //添加查询报告号模板的bizCode参数
+            if("1".equals(projectRecord.getProjectType())){
+                t.setConditionType("10");
+            }else if("2".equals(projectRecord.getProjectType())){
+                t.setConditionType("1003");
+            }
             String str = ruralProjectMessageService.auditSave(t, users);
             addMessage(redirectAttributes, str);
         }

src/main/resources/mappings/modules/projectrecord/ProjectRecordsDao.xml

@@ -65,6 +65,7 @@
 	<select id="getRuralProjectRecodes" resultType="ProjectRecords" >
 		SELECT
 			<include refid="projectRecordsColumns"/>
+		,a.project_type as "projectType"
         ,su.name AS "createBy.name"
         ,o.top_company AS "office.name"
         FROM rural_project_records a

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

@@ -81,7 +81,7 @@
 						</div>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">签字造价师一：</label>
 					<div class="layui-input-block">
 						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${projectReportRecord.signCostOne.name}"/>
@@ -92,7 +92,7 @@
 					<div class="layui-input-block">
 						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${projectReportRecord.signCostTwo.name}"/>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">报告名称：</label>
 					<div class="layui-input-block">

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

@@ -120,7 +120,7 @@
 						</div>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>签字造价师一：</label>
 					<div class="layui-input-block with-icon">
 						<sys:treeselect id="signCostOne" name="signCostOne.id" value="${projectReportRecord.signCostOne.id}" labelName="signCostOne.name" labelValue="${projectReportRecord.signCostOne.name}"
@@ -132,7 +132,7 @@
 						<sys:treeselect id="signCostTwo" name="signCostTwo.id" value="${projectReportRecord.signCostTwo.id}" labelName="signCostTwo.name" labelValue="${projectReportRecord.signCostTwo.name}"
 										title="签字造价师二" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input required" allowClear="true" notAllowSelectParent="true"/>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>报告名称：</label>
 					<div class="layui-input-block">

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

@@ -35,7 +35,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="layui-item layui-col-sm6">
+			<%--<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">签字造价师一：</label>
 				<div class="layui-input-block">
 					<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${projectReportRecord.signCostOne.name}"/>
@@ -46,7 +46,7 @@
 				<div class="layui-input-block">
 					<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${projectReportRecord.signCostTwo.name}"/>
 				</div>
-			</div>
+			</div>--%>
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">报告名称：</label>
 				<div class="layui-input-block">

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectReportRecord/projectReportRecordForm.jsp

@@ -91,7 +91,7 @@
 						<input id="recordNum" name="recordNum"  htmlEscape="false" readonly="true" class="form-control  layui-input required" value="${projectReportRecord.recordNum}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>签字造价师一：</label>
 					<div class="layui-input-block with-icon">
 						<sys:treeselect id="signCostOne" name="signCostOne.id" value="${projectReportRecord.signCostOne.id}" labelName="signCostOne.name" labelValue="${projectReportRecord.signCostOne.name}"
@@ -103,7 +103,7 @@
 						<sys:treeselect id="signCostTwo" name="signCostTwo.id" value="${projectReportRecord.signCostTwo.id}" labelName="signCostTwo.name" labelValue="${projectReportRecord.signCostTwo.name}"
 										title="签字造价师二" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input required" allowClear="true" notAllowSelectParent="true"/>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>报告名称：</label>
 					<div class="layui-input-block">

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectReportRecord/projectReportRecordModify.jsp

@@ -123,7 +123,7 @@
 						</div>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>签字造价师一：</label>
 					<div class="layui-input-block with-icon">
 						<sys:treeselect id="signCostOne" name="signCostOne.id" value="${projectReportRecord.signCostOne.id}" labelName="signCostOne.name" labelValue="${projectReportRecord.signCostOne.name}"
@@ -135,7 +135,7 @@
 						<sys:treeselect id="signCostTwo" name="signCostTwo.id" value="${projectReportRecord.signCostTwo.id}" labelName="signCostTwo.name" labelValue="${projectReportRecord.signCostTwo.name}"
 										title="签字造价师二" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input required" allowClear="true" notAllowSelectParent="true"/>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>报告名称：</label>
 					<div class="layui-input-block">

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectReportRecord/projectReportRecordView.jsp

@@ -35,7 +35,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="layui-item layui-col-sm6">
+			<%--<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">签字造价师一：</label>
 				<div class="layui-input-block">
 					<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${projectReportRecord.signCostOne.name}"/>
@@ -46,7 +46,7 @@
 				<div class="layui-input-block">
 					<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${projectReportRecord.signCostTwo.name}"/>
 				</div>
-			</div>
+			</div>--%>
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">报告名称：</label>
 				<div class="layui-input-block">

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

@@ -342,7 +342,7 @@
 					</form:select>
 				</div>
 			</div>
-			<div class="layui-item layui-col-sm6">
+			<%--<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label"><span class="require-item">*</span>签章类型：</label>
 				<div class="layui-input-block">
 					<form:select path="projectReportData.reportType" class="form-control simple-select required">
@@ -351,7 +351,7 @@
 						<form:option value="实体章" label="实体章"/>
 					</form:select>
 				</div>
-			</div>
+			</div>--%>
 		</div>
 			<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>项目信息</h2></div>

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

@@ -325,7 +325,7 @@
 					</form:select>
 				</div>
 			</div>
-			<div class="layui-item layui-col-sm6">
+			<%--<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label"><span class="require-item">*</span>签章类型：</label>
 				<div class="layui-input-block">
 					<form:select path="projectReportData.reportType" class="form-control simple-select required">
@@ -334,7 +334,7 @@
 						<form:option value="实体章" label="实体章"/>
 					</form:select>
 				</div>
-			</div>
+			</div>--%>
 		</div>
 			<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>项目信息</h2></div>

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

@@ -21,12 +21,12 @@
 					<form:input path="projectReportData.achievementType" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 				</div>
 			</div>
-			<div class="layui-item layui-col-sm6">
+			<%--<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">签章类型：</label>
 				<div class="layui-input-block">
 					<form:input path="projectReportData.ReportType" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 				</div>
-			</div>
+			</div>--%>
 		</div>
 		<div class="form-group layui-row first lw12">
 			<div class="form-group-label"><h2>项目信息</h2></div>

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

@@ -392,7 +392,7 @@
                     ,"procId":"${projectRecords.processInstanceId}"
 					,"projectReportName":"${projectRecords.projectReportName}"
                     <c:choose>
-                        <c:when test="${flag == '1' or fn:contains(projectRecords.leaderIds,fns:getUser().id)}">
+                        <c:when test="${fn:contains(projectRecords.leaderIds,fns:getUser().id)}">
                             ,"canAdd":<c:choose>
                                             <c:when test="${projectRecords.projectReportStatus == 0 }">"1"</c:when>
                                             <c:otherwise>"0"</c:otherwise>

src/main/webapp/webpage/modules/ruralprojectrecords/projectReportRecord/projectReportRecordForm.jsp

@@ -91,7 +91,7 @@
 						<input id="recordNum" name="recordNum"  htmlEscape="false" readonly="true" class="form-control  layui-input required" value="${projectReportRecord.recordNum}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>签字造价师一：</label>
 					<div class="layui-input-block with-icon">
 						<sys:treeselect id="signCostOne" name="signCostOne.id" value="${projectReportRecord.signCostOne.id}" labelName="signCostOne.name" labelValue="${projectReportRecord.signCostOne.name}"
@@ -103,7 +103,7 @@
 						<sys:treeselect id="signCostTwo" name="signCostTwo.id" value="${projectReportRecord.signCostTwo.id}" labelName="signCostTwo.name" labelValue="${projectReportRecord.signCostTwo.name}"
 										title="签字造价师二" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input required" allowClear="true" notAllowSelectParent="true"/>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>报告名称：</label>
 					<div class="layui-input-block">

src/main/webapp/webpage/modules/ruralprojectrecords/projectReportRecord/projectReportRecordModify.jsp

@@ -123,7 +123,7 @@
 						</div>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>签字造价师一：</label>
 					<div class="layui-input-block with-icon">
 						<sys:treeselect id="signCostOne" name="signCostOne.id" value="${projectReportRecord.signCostOne.id}" labelName="signCostOne.name" labelValue="${projectReportRecord.signCostOne.name}"
@@ -135,7 +135,7 @@
 						<sys:treeselect id="signCostTwo" name="signCostTwo.id" value="${projectReportRecord.signCostTwo.id}" labelName="signCostTwo.name" labelValue="${projectReportRecord.signCostTwo.name}"
 										title="签字造价师二" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input required" allowClear="true" notAllowSelectParent="true"/>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>报告名称：</label>
 					<div class="layui-input-block">

src/main/webapp/webpage/modules/ruralprojectrecords/projectReportRecord/projectReportRecordView.jsp

@@ -35,7 +35,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="layui-item layui-col-sm6">
+			<%--<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">签字造价师一：</label>
 				<div class="layui-input-block">
 					<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${projectReportRecord.signCostOne.name}"/>
@@ -46,7 +46,7 @@
 				<div class="layui-input-block">
 					<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${projectReportRecord.signCostTwo.name}"/>
 				</div>
-			</div>
+			</div>--%>
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">报告名称：</label>
 				<div class="layui-input-block">

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

@@ -124,12 +124,12 @@
 						<form:input path="projectReportData.achievementType" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">签章类型：</label>
 					<div class="layui-input-block">
 						<form:input path="projectReportData.ReportType" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 					</div>
-				</div>
+				</div>--%>
 			</div>
 			<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>项目信息</h2></div>

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

@@ -124,12 +124,12 @@
                         <form:input path="projectReportData.achievementType" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6">
+                <%--<div class="layui-item layui-col-sm6">
                     <label class="layui-form-label">签章类型：</label>
                     <div class="layui-input-block">
                         <form:input path="projectReportData.ReportType" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
                     </div>
-                </div>
+                </div>--%>
             </div>
             <div class="form-group layui-row first lw12">
                 <div class="form-group-label"><h2>项目信息</h2></div>

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

@@ -2,553 +2,273 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
-	<title>项目审批管理</title>
+	<title>报告详情管理</title>
 	<meta name="decorator" content="default"/>
-	<script>
-		$(document).ready(function () {
-			var tt = $("#contractNum").val();
-			if (tt == null || tt === "") {
-				$("#divv").hide();
-				$("#divv3").hide();
-				setTimeout(function () {
-					var tt = $("#workClientLinkmanList").find("tr").eq(0).find("td").eq(1).text().trim();
-					$("#clientName").val(tt);
-				},100);
-			}
-
-		})
-	</script>
 	<script type="text/javascript">
-        function addRow(list, idx, tpl, row){
-            // var idx1 = $("#workClientLinkmanList tr").length;
-            bornTemplete(list, idx, tpl, row, idx);
-        }
 
-        function bornTemplete(list, idx, tpl, row, idx1){
-            $(list).append(Mustache.render(tpl, {
-                idx: idx, delBtn: true, row: row,
-                order:idx1 + 1
-            }));
-            $(list+idx).find("select").each(function(){
-                $(this).val($(this).attr("data-value"));
-            });
-            $(list+idx).find("input[type='checkbox'], input[type='radio']").each(function(){
-                var ss = $(this).attr("data-value").split(',');
-                for (var i=0; i<ss.length; i++){
-                    if($(this).val() == ss[i]){
-                        $(this).attr("checked","checked");
-                    }
-                }
-            });
-        }
-        function seeFile(fileUrl,fileName) {
-            //   location.href = "/followRecord/seeFile";
-            var index = fileName.lastIndexOf(".");
-            var fileType = fileName.substring(index);
-            // debugger
-            if (".pdf" == fileType) {
-                window.open(fileUrl);
-            } else {
-                window.open("${ctx}/isignature/iSignatureDocument/seeFile?fileUrl="+fileUrl+"&fileName="+fileName);
-            }
-        }
-	</script>
-	<script>
-		function initRecordStatus(index,id,dataid,status)
-		{
-			var elem = document.getElementById("status_td_" + index);
-			var st = getAuditState(status);
-			if(st.action)
-				var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=" + id + "&projectReportData.id="+ dataid + "&type="+status+"','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>";
-
-			elem.innerHTML = xml;
-		}
 	</script>
 </head>
+
 <body>
 <div class="single-form">
-	<div class="container view-form">
-		<form:form id="inputForm" modelAttribute="projectRecords" action="${ctx}/project/projectRecords/saveAudit" method="post" class="form-horizontal">
-			<div class="form-group layui-row first">
-				<div class="form-group-label"><h2>项目合同信息</h2></div>
-               <div id="divv">
-				   <div class="layui-item layui-col-sm12 lw6">
-					   <label class="layui-form-label">合同编号：</label>
-					   <div class="layui-input-block">
-						   <input htmlEscape="false" id="contractNum" readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.contractNum}"/>
-					   </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.workContractInfo.name}"/>
-					   </div>
-				   </div>
-				   <div class="layui-item layui-col-sm6 lw6">
-					   <label class="layui-form-label double-line">合同金额(元)：</label>
-					   <div class="layui-input-block">
-						   <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatNumber value="${projectRecords.workContractInfo.contractPrice}" pattern="#,##0.00#"/>"/>
-					   </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"  id="clientName" readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.client.name}"/>
-					</div>
-				</div>
-				<div id="divv3">
-					<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.workContractInfo.constructionProjectTypeStr}"/>
-						</div>
-					</div>
-				</div>
-			</div>
-
-			<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">
-                        <div class="input-group">
-                            <form:input path="projectId" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
-                            <span class="input-group-btn">
-                                <label class="form-status"><c:choose><c:when test="${not empty projectRecords.projectStatus}">${fns:getDictLabel(projectRecords.projectStatus, '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.area.name}"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw7">
-					<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 lw7">
-					<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 lw7">
-					<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}"/>
-					</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.leaderNameStr}"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">创建人：</label>
+	<div class="container${container}  view-form">
+		<form:form id="inputForm" modelAttribute="projectcontentinfo" action="${ctx}/ruralProject/ruralProjectMessage/reportAudit" method="post" class="form-horizontal">
+			<div class="form-group layui-row first lw12">
+				<div class="form-group-label"><h2>基本信息</h2></div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label"><span class="require-item">*</span>成果类型：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.createBy.name}"/>
+						<form:input path="projectReportData.achievementType" htmlEscape="false"  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-item layui-col-sm6">
+					<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"/>"/>
+						<form:input path="projectReportData.ReportType" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 					</div>
-				</div>
-				<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.projectStructure}"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw7">
-					<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 lw7">
-					<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 lw7">
-					<label class="layui-form-label double-line"><span class="require-item">*</span>建筑面积或规模：</label>
-					<div class="layui-input-block">
-						<form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input required number" readonly="true"/>
-					</div>
-				</div>
-				<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.measuringUnit}"/>
-					</div>
-				</div>
-				<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.projectUse}"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label double-line"><span class="require-item">*</span>咨询标的额(万元)：</label>
-					<div class="layui-input-block">
-						<input value="<fmt:formatNumber value="${projectRecords.totalFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="totalFees" class="form-control layui-input required number"  readonly="true"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label double-line">其中土建造价(万元)：</label>
-					<div class="layui-input-block">
-						<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 lw7">
-					<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="form-group layui-row first lw12">
+				<div class="form-group-label"><h2>项目信息</h2></div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">送审价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
-					<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 class="layui-item layui-col-sm6">
+					<label class="layui-form-label">审定价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
-					<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 class="layui-item layui-col-sm6">
+					<label class="layui-form-label">合同价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label">单位造价(元)：</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 class="layui-item layui-col-sm6">
+					<label class="layui-form-label">核增核减额(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="verifyFee" path="projectReportData.verifyFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
-					<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 class="layui-item layui-col-sm6">
+					<label class="layui-form-label">核增核减率(%)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="verifyRate" path="projectReportData.verifyRate" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
-					<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 class="layui-item layui-col-sm6">
+					<label class="layui-form-label">咨询标的额(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="consultFee" path="projectReportData.consultFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 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>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">土建造价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
-				<div 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.remarks}</textarea>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">安装造价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
 			</div>
-
 			<div class="form-group layui-row">
-				<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>
-						<tr>
-							<th class="hide"></th>
-							<th width="25%">委托方</th>
-							<th width="25%">联系人姓名</th>
-							<th width="25%">联系方式1</th>
-							<th width="25%">联系方式2</th>
-						</tr>
-						</thead>
-						<tbody id="workClientLinkmanList">
-						</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 class="form-group-label"><h2>报告文件</h2></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="contentTable1" 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="upTable" class="table table-bordered table-condensed details">
 						<thead>
 						<tr>
-							<th class="hide"></th>
-							<th width="25%">施工方单位名称</th>
-							<th width="25%">联系人姓名</th>
-							<th width="25%">联系方式1</th>
-							<th width="25%">联系方式2</th>
+							<th>文件预览</th>
+							<th>上传人</th>
+							<th>上传时间</th>
+							<th width="150px">操作</th>
 						</tr>
 						</thead>
-						<tbody id="workConstructionLinkmanList">
+						<tbody id="file_attachment">
+						<c:forEach items="${projectcontentinfo.projectReportData.workAttachments}" var = "workClientAttachment" varStatus="status">
+							<c:if test="${workClientAttachment.divIdType eq '_attachment'}">
+								<tr>
+									<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}"></td>
+										</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>
+													<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%')">${workClientAttachment.attachmentName}</a></td>
+												</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(encodeURIComponent('${workClientAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+										</div>
+									</td>
+								</tr>
+							</c:if>
+						</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>
 
-			<c:if test="${not empty projectRecords.workAttachments}">
 			<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">
+				<div class="form-group-label"><h2>依据性资料</h2></div>
+				<div id="addFile_gistdata" style="display: none" class="upload-progress">
+					<span id="fileName_gistdata" ></span>
+					<b><span id="baifenbi_gistdata" ></span></b>
+					<div class="progress">
+						<div id="jindutiao_gistdata" class="progress-bar" style="width: 0%" aria-valuenow="0">
+						</div>
+					</div>
+				</div>
+				<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
+				<span id="gistdata_title"></span>
+				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
+					<table id="gistdata_upTable" class="table table-bordered table-condensed details">
 						<thead>
 						<tr>
-							<th width="25%">文件预览</th>
-							<th width="25%">上传人</th>
-							<th width="25%">上传时间</th>
-							<th width="25%">操作</th>
+							<th>文件预览</th>
+							<th>上传人</th>
+							<th>上传时间</th>
+							<th width="150px">操作</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="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+						<tbody id="file_gistdata">
+						<c:forEach items="${projectcontentinfo.projectReportData.workAttachments}" var = "workClientAttachment" varStatus="status">
+							<c:if test="${workClientAttachment.divIdType eq '_gistdata'}">
+								<tr>
+									<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>
-									<%--<a href="#" onclick="seeFile('${workClientAttachment.url}','${workClientAttachment.attachmentName}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;查看</a>--%>
-								</td>
-							</tr>
-						</c:forEach>
-						</tbody>
-					</table>
-				</div>
-			</div>
-			</c:if>
-			<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;
-                    }
-                });
-
-			</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">
-					<thead>
-					<tr>
-						<th width="25%">姓名</th>
-						<th width="25%">部门</th>
-						<th width="25%">职级</th>
-						<th width="25%">状态</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>
-									<c:choose>
-										<c:when test="${user.delFlag == 0}">
-											正常
+											<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}"></td>
 										</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>
+													<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%')">${workClientAttachment.attachmentName}</a></td>
+												</c:otherwise>
+											</c:choose>
 										</c:otherwise>
 									</c:choose>
-								</td>
-							</tr>
+									<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(encodeURIComponent('${workClientAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+										</div>
+									</td>
+								</tr>
+							</c:if>
 						</c:forEach>
-					</c:if>
-					</tbody>
-				</table>
-			</div>
+						</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="upTable" class="table table-bordered table-condensed details">
+				<div class="form-group-label"><h2>其他文件</h2></div>
+				<div id="addFile_other" style="display: none" class="upload-progress">
+					<span id="fileName_other" ></span>
+					<b><span id="baifenbi_other" ></span></b>
+					<div class="progress">
+						<div id="jindutiao_other" class="progress-bar" style="width: 0%" aria-valuenow="0">
+						</div>
+					</div>
+				</div>
+				<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
+				<span id="other_title"></span>
+				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
+					<table id="upTable_other" 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>
+							<th>文件预览</th>
+							<th>上传人</th>
+							<th>上传时间</th>
+							<th width="150px">操作</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">
-												<%--<c:choose>--%>
-												<%--<c:when test="${empty projectReportData.status || projectReportData.status eq 1}">--%>
-												<%--<div style="text-align: center">--%>
-												<%--<a href="javascript:void(0)" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>--%>
-												<%--</div>--%>
-												<%--</c:when>--%>
-												<%--<c:otherwise>--%>
-												<%--<div style="text-align: center">--%>
-												<%--<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>--%>
-												<%--</div>--%>
-												<%--</c:otherwise>--%>
-												<%--</c:choose>--%>
-											<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>
+						<tbody id="file_other">
+						<c:forEach items="${projectcontentinfo.projectReportData.workAttachments}" var = "workClientAttachment" varStatus="status">
+							<c:if test="${workClientAttachment.divIdType eq '_other'}">
 								<tr>
-									<td colspan="7">
-										暂无数据
+									<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}"></td>
+										</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>
+													<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%')">${workClientAttachment.attachmentName}</a></td>
+												</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(encodeURIComponent('${workClientAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+										</div>
 									</td>
 								</tr>
-							</c:otherwise>
-						</c:choose>
+							</c:if>
+						</c:forEach>
 						</tbody>
 					</table>
 				</div>
 			</div>
 
+
+			<c:if test="${not empty projectcontentinfo.projectReportData.act.procInsId}">
+				<div class="form-group layui-row">
+					<div class="form-group-label"><h2>审批流程</h2></div>
+					<div class="layui-item layui-col-xs12 form-table-container" >
+						<act:flowChart procInsId="${projectcontentinfo.projectReportData.act.procInsId}"/>
+						<act:histoicFlow procInsId="${projectcontentinfo.projectReportData.act.procInsId}"/>
+					</div>
+				</div>
+			</c:if>
 			<div class="form-group layui-row page-end"></div>
 		</form:form>
 	</div>

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

@@ -342,7 +342,7 @@
 					</form:select>
 				</div>
 			</div>
-			<div class="layui-item layui-col-sm6">
+			<%--<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label"><span class="require-item">*</span>签章类型：</label>
 				<div class="layui-input-block">
 					<form:select path="projectReportData.reportType" class="form-control simple-select required">
@@ -351,7 +351,7 @@
 						<form:option value="实体章" label="实体章"/>
 					</form:select>
 				</div>
-			</div>
+			</div>--%>
 		</div>
 			<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>项目信息</h2></div>

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

@@ -325,7 +325,7 @@
 					</form:select>
 				</div>
 			</div>
-			<div class="layui-item layui-col-sm6">
+			<%--<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label"><span class="require-item">*</span>签章类型：</label>
 				<div class="layui-input-block">
 					<form:select path="projectReportData.reportType" class="form-control simple-select required">
@@ -334,7 +334,7 @@
 						<form:option value="实体章" label="实体章"/>
 					</form:select>
 				</div>
-			</div>
+			</div>--%>
 		</div>
 			<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>项目信息</h2></div>

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

@@ -21,12 +21,12 @@
 					<form:input path="projectReportData.achievementType" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 				</div>
 			</div>
-			<div class="layui-item layui-col-sm6">
+			<%--<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">签章类型：</label>
 				<div class="layui-input-block">
 					<form:input path="projectReportData.ReportType" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 				</div>
-			</div>
+			</div>--%>
 		</div>
 		<div class="form-group layui-row first lw12">
 			<div class="form-group-label"><h2>项目信息</h2></div>

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

@@ -392,7 +392,7 @@
                     ,"procId":"${projectRecords.processInstanceId}"
                     ,"projectReportName":"${projectRecords.projectReportName}"
                     <c:choose>
-                        <c:when test="${flag == '1' or fn:contains(projectRecords.leaderIds,fns:getUser().id)}">
+                        <c:when test="${fn:contains(projectRecords.leaderIds,fns:getUser().id)}">
                             ,"canAdd":<c:choose>
                                             <c:when test="${projectRecords.projectReportStatus == 0 }">"1"</c:when>
                                             <c:otherwise>"0"</c:otherwise>