Merge branch 'master' of http://192.168.2.4:3000/user5/simple_xg_total_process_master

src/main/java/com/jeeplus/modules/projectFilingBatch/service/ProjectFilingBatchService.java

@@ -995,34 +995,49 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
      * 添加--项目附件info
      */
     @Transactional(readOnly = false)
-    public void insertProInfo(String[] proInfos){
-        for (int i=0;i<proInfos.length;i++){
-           if (proInfos[i]!="") {
-               JSONArray jsonArray = JSONArray.fromObject(proInfos[i]);
-               for (int j = 0; j < jsonArray.size(); j++) {
-                   ProjectFilingBatchProInfo info = new ProjectFilingBatchProInfo();
-                   Object o = jsonArray.get(j);
-                   JSONObject json = JSONObject.fromObject(o);
-                   info.setProId(json.get("proId").toString());
-                   info.setId(IdGen.uuid());
-                   info.setProInfofilingBatch(json.get("filingId").toString());
-                   info.setProInfoName(json.get("names").toString());
-                   info.setProInfoType(json.get("types").toString());
-                   proInfoDao.proInfoInsert(info);
-               }
-           }
-
+    public void insertProInfo(String[] proInfos,String[] flags,String[] proId,String filingId){
+        String pro="";
+        JSONObject json = null;
+        if (flags.length!=0 && proId.length==1){
+            int count=0;
+            for (int s=0;s< proInfos.length;s++){
+                count++;
+                pro+=proInfos[s];
+                if(count!=proInfos.length){
+                    pro+=",";
+                }
+            }
+            json = JSONObject.fromObject(pro);
+            ProjectFilingBatchProInfo info = new ProjectFilingBatchProInfo();
+            info.setId(IdGen.uuid());
+            info.setProId(json.get("proId").toString());
+            info.setProInfofilingBatch(json.get("filingId").toString());
+            info.setProInfoName(json.get("names").toString());
+            info.setProInfoType(json.get("types").toString());
+            DelProInfo(info);
+            proInfoDao.proInfoInsert(info);
+        }else{
+            for (int i=0;i<proInfos.length;i++){
+                if (proInfos[i]!=""&& !"".equals(proInfos[i])) {
+                    json = JSONObject.fromObject(proInfos[i]);
+                    ProjectFilingBatchProInfo info = new ProjectFilingBatchProInfo();
+                    info.setId(IdGen.uuid());
+                    info.setProId(json.get("proId").toString());
+                    info.setProInfofilingBatch(json.get("filingId").toString());
+                    info.setProInfoName(json.get("names").toString());
+                    info.setProInfoType(json.get("types").toString());
+                    if(i==0){ DelProInfo(info);}
+                    proInfoDao.proInfoInsert(info);
+                }
+            }
         }
 
     }
-//    /**
-//     * 添加--项目附件info
-//     * @param proInfo
-//     */
-//    public ProjectFilingBatchProInfo insertProInfo(ProjectFilingBatchProInfo proInfo){
-//        if(StringUtils.isNotEmpty(proInfo.getProInfoType())){
-//            proInfo.setId(IdGen.uuid());
-//            proInfoDao.insert(proInfo);
-//        }
-//    }
+    /**
+     * 删除--项目附件info
+     * @param proInfo
+     */
+    public void DelProInfo(ProjectFilingBatchProInfo proInfo){
+        proInfoDao.delete(proInfo);
+    }
 }

src/main/java/com/jeeplus/modules/projectFilingBatch/web/ProjectFilingBatchController.java

@@ -345,7 +345,7 @@ public class ProjectFilingBatchController extends BaseController {
      */
     @RequiresPermissions(value = {"projectFilingBatch:projectFilingBatchInfo:add", "projectFilingBatch:projectFilingBatchInfo:edit"}, logical = Logical.OR)
     @RequestMapping(value = "save")
-    public String save(ProjectFilingBatch projectFilingBatch, Model model, RedirectAttributes redirectAttributes, @RequestParam("proId")String[] proId, String[] proInfos) throws Exception {
+    public String save(ProjectFilingBatch projectFilingBatch, Model model, RedirectAttributes redirectAttributes, @RequestParam("proId")String[] proId, String[] proInfos,String[] flags) throws Exception {
         if (!beanValidator(model, projectFilingBatch)){
             return form(projectFilingBatch, model);
         }
@@ -355,7 +355,10 @@ public class ProjectFilingBatchController extends BaseController {
                 if (t.getFilingStatus() == 3 ||t.getFilingStatus()==1){
                     MyBeanUtils.copyBeanNotNull2Bean(projectFilingBatch, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
                     projectFilingBatchService.saveProject(proId,t, ProjectStatusEnum.IN_APRL);//保存
-                    projectFilingBatchService.insertProInfo(proInfos);
+                    if (proInfos!=null){
+                        projectFilingBatchService.insertProInfo(proInfos,flags,proId,projectFilingBatch.getId());
+                    }
+
                 }else if(t.getFilingStatus() == 2){
                     addMessage(redirectAttributes, "归档批次已送审，无法暂存");
                     return "redirect:"+Global.getAdminPath()+"/projectFilingBatch/projectFilingBatchInfo/?repage";
@@ -367,7 +370,9 @@ public class ProjectFilingBatchController extends BaseController {
                 projectFilingBatch.setFilingStatus(1);
                 projectFilingBatchService.saveProject(proId,projectFilingBatch, ProjectStatusEnum.IN_APRL);//保存
                 //新增项目树形信息
-                projectFilingBatchService.insertProInfo(proInfos);
+                if (proInfos!=null) {
+                    projectFilingBatchService.insertProInfo(proInfos, flags, proId,projectFilingBatch.getId());
+                }
             }
             addMessage(redirectAttributes, "归档送审成功");
         }catch (Exception e){
@@ -449,7 +454,8 @@ public class ProjectFilingBatchController extends BaseController {
      */
     @RequestMapping("saveAudit")
     public String saveAudit(ProjectFilingBatch projectFilingBatch, Model model,
-                            RedirectAttributes redirectAttributes,Integer saveAuditFlag)  {
+                            RedirectAttributes redirectAttributes,Integer saveAuditFlag,
+                            @RequestParam(value = "proId",required = false) String[] proId,  @RequestParam(value = "proInfos",required = false)String[] proInfos, @RequestParam(value = "flags",required = false)String[] flags)  {
         String home = projectFilingBatch.getHome();
         try {
             String taskDefKey = projectFilingBatch.getAct().getTaskDefKey();
@@ -476,6 +482,10 @@ public class ProjectFilingBatchController extends BaseController {
 
                 String str = projectFilingBatchService.auditSave(projectFilingBatch,users);
                 addMessage(redirectAttributes, str);
+                //新增项目树形信息
+                if (proInfos!=null) {
+                    projectFilingBatchService.insertProInfo(proInfos, flags, proId,projectFilingBatch.getId());
+                }
             }
         }catch (Exception e){
             addMessage(redirectAttributes, "归档批次归档流程审批失败");

src/main/java/com/jeeplus/modules/projectrecord/service/ProjectPlanService.java

@@ -61,8 +61,14 @@ public class ProjectPlanService extends CrudService<ProjectPlanDao, ProjectPlanI
             User userR = dao.getUserId(projectPlanInfo.getRemindId());
             projectPlanInfo.setRemindName(userR.getId());
             //获取完成人信息
-            User userF = dao.getUserId(projectPlanInfo.getFinishId().split(",")[0]);
-            projectPlanInfo.setFinishName(userF.getId());
+            User userF = new User();
+            if(StringUtils.isNotBlank(projectPlanInfo.getFinishId())){
+                userF = dao.getUserId(projectPlanInfo.getFinishId());
+                projectPlanInfo.setFinishName(userF.getId());
+            }else{
+                projectPlanInfo.setFinishName("");
+            }
+            //User userF = dao.getUserId(projectPlanInfo.getFinishId().split(",")[0]);
             //根据项目类型查询typeId
             /*String projectTypeId = dao.getProjectTypeName(projectPlanInfo.getProjectStage(),projectRecords.getProjectTypeId());
             projectPlanInfo.setProjectStage(projectTypeId);*/

src/main/java/com/jeeplus/modules/projectrecord/web/ProjectPlanController.java

@@ -152,6 +152,10 @@ public class ProjectPlanController extends BaseController {
                         projectPlan.setRemindName(projectRecords.getProjectLeaders().get(0).getName());
                         projectPlan.setRemindId(projectRecords.getProjectLeaders().get(0).getId());
                     }
+                    //将项目等级人信息添加到完成人控件中
+                    User user = UserUtils.get(projectRecords.getCreateBy().getId());
+                    projectPlan.setFinishId(user.getId());
+                    projectPlan.setFinishName(user.getName());
                     projectPlanList.add(projectPlan);
                 }
             }

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

@@ -529,9 +529,7 @@ public class RuralProjectMessageController extends BaseController {
                 }
 
             }
-        /*}*/projectcontent.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectcontent.getFileAttachmentList()));
-        projectcontent.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectcontent.getFileGistdataList()));
-        projectcontent.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectcontent.getFileOtherList()));
+        /*}*/
 
         //查询总审人员信息
         List<User> auditUserList = userService.getAuditUserList();
@@ -560,6 +558,9 @@ public class RuralProjectMessageController extends BaseController {
                     }
                 }
             }
+            projectcontent.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectcontent.getFileAttachmentList()));
+            projectcontent.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectcontent.getFileGistdataList()));
+            projectcontent.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectcontent.getFileOtherList()));
             return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/reportView";
         }
         if (StringUtils.isNotBlank(projectcontentinfo.getView()) && projectcontentinfo.getView().contains("report")) {
@@ -567,7 +568,7 @@ public class RuralProjectMessageController extends BaseController {
                 Act act = getByAct(projectReportData.getProcessInstanceId());
                 projectReportData.setAct(act);
             }
-            return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/reportModify";
+            return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageModify";
         }
         return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/reportForm";
     }
@@ -1002,6 +1003,9 @@ public class RuralProjectMessageController extends BaseController {
 
 
         if (StringUtils.isNotBlank(projectReportRecord.getView()) && projectReportRecord.getView().equals("view")){
+            projectReportRecord.setFileAttachmentList(projectRecordsService.disposeDataAttachment(projectReportRecord.getFileAttachmentList()));
+            projectReportRecord.setFileGistdataList(projectRecordsService.disposeDataAttachment(projectReportRecord.getFileGistdataList()));
+            projectReportRecord.setFileOtherList(projectRecordsService.disposeDataAttachment(projectReportRecord.getFileOtherList()));
             return "modules/ruralprojectrecords/projectReportRecord/projectReportRecordView";
         }else if (StringUtils.isNotBlank(projectReportRecord.getView()) && projectReportRecord.getView().equals("modiftApply")){
             ProcessInstance processInstance = actTaskService.getProcIns(projectReportRecord.getProcessInstanceId());

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

@@ -468,7 +468,7 @@ public class RuralProjectRecordsController extends BaseController {
 		if(workContractInfo==null){
 		    return workContractInfo;
         }
-		workContractInfo.setConstructionProjectTypeStr(DictUtils.getDictLabel(String.valueOf(workContractInfo.getConstructionProjectType()),"construction_project_type",""));
+		workContractInfo.setContractType(DictUtils.getMainDictLabel(String.valueOf(workContractInfo.getContractTypeDoc()),"contract_info_type",""));
 		if(workContractInfo.getWorkClientInfoList()!=null&&!workContractInfo.getWorkClientInfoList().isEmpty()){
             StringBuilder workClinetInfoIds = new StringBuilder();
             for (WorkClientInfo workClientInfo : workContractInfo.getWorkClientInfoList()) {
@@ -932,6 +932,38 @@ public class RuralProjectRecordsController extends BaseController {
 
 
 	/**
+	 * 文件上传查看页面
+	 * @param projectRecords
+	 * @param model
+	 * @return
+	 */
+	@RequestMapping(value = "getAccessoryView")
+	public String getAccessoryView(RuralProjectRecords projectRecords, Model model) {
+		if (projectRecords!=null&&StringUtils.isNotBlank(projectRecords.getId())) {
+			projectRecords = projectRecordsService.getQueryProjectUsers(projectRecords.getId());
+			RuralProjectcontentinfo ruralProjectcontentinfo = projectRecordsService.formAccessory(projectRecords);
+			projectRecordsService.disposeData(ruralProjectcontentinfo);
+			//查询项目报告信息
+			ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(projectRecords.getId());
+			//如果项目报告不为空，则查询项目线上归档信息
+			if(null != projectReportData){
+				ProjectReportRecord projectReportRecord = ruralProjectMessageService.getProjectReportRecord(projectReportData.getId());
+				if(null != projectReportRecord){
+					model.addAttribute("projectId", projectRecords.getId());
+				}else{
+					model.addAttribute("projectId", "");
+				}
+			}
+			model.addAttribute("projectcontentinfo", ruralProjectcontentinfo);
+			model.addAttribute("projectRecords", projectRecords);
+		}else {
+			return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectRecords/?repage";
+		}
+		return "modules/ruralprojectrecords/projectAccessoryView";
+	}
+
+
+	/**
 	 *查询成果文件树形信息
 	 */
 	@RequestMapping(value = "getOutcomeAccessoryInfo")

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

@@ -1873,9 +1873,6 @@ public class WorkProjectNotifyController extends BaseController {
 
 						}
 					//}
-					projectcontentinfo.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileAttachmentList()));
-					projectcontentinfo.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileGistdataList()));
-					projectcontentinfo.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileOtherList()));
 					projectcontentinfo.setHome("home");
 					model.addAttribute("processInstanceId",projectReportData.getProcessInstanceId());
 					model.addAttribute("projectId", projectcontentinfo.getProject().getId());
@@ -1903,12 +1900,21 @@ public class WorkProjectNotifyController extends BaseController {
 					model.addAttribute("type", type);
 					model.addAttribute("list", workReviewAudits);
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						projectcontentinfo.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileAttachmentList()));
+						projectcontentinfo.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileGistdataList()));
+						projectcontentinfo.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileOtherList()));
 						return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageView";
 					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+						projectcontentinfo.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileAttachmentList()));
+						projectcontentinfo.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileGistdataList()));
+						projectcontentinfo.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileOtherList()));
 						return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageModify";
 					} else {
+						projectcontentinfo.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileAttachmentList()));
+						projectcontentinfo.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileGistdataList()));
+						projectcontentinfo.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileOtherList()));
 						return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageView";
 					}
 				} else if (workProjectNotify.getType().equals("46")) {    //工作内容报告变更
@@ -2090,18 +2096,24 @@ public class WorkProjectNotifyController extends BaseController {
 						}
 					//}
 
-					projectReportRecord.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileAttachmentList()));
-					projectReportRecord.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileGistdataList()));
-					projectReportRecord.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileOtherList()));
 					model.addAttribute("projectReportRecord", projectReportRecord);
 					model.addAttribute("project", projectReportRecord.getReport().getProject());
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						projectReportRecord.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileAttachmentList()));
+						projectReportRecord.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileGistdataList()));
+						projectReportRecord.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileOtherList()));
 						return "modules/ruralprojectrecords/projectReportRecord/projectReportRecordView";
 					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+						projectReportRecord.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileAttachmentList()));
+						projectReportRecord.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileGistdataList()));
+						projectReportRecord.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileOtherList()));
 						return "modules/projectcontentinfo/projectReportRecordAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/projectcontentinfo/projectReportRecordModifyApply";
 					} else {
+						projectReportRecord.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileAttachmentList()));
+						projectReportRecord.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileGistdataList()));
+						projectReportRecord.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileOtherList()));
 						return "modules/ruralprojectrecords/projectReportRecord/projectReportRecordView";
 
 					}

src/main/resources/mappings/modules/projectGuidang/ProjectFilingBatchProInfoDao.xml

@@ -36,4 +36,9 @@
 		where filing_batch=#{filingBatchId}
 	</select>
 
+	<delete id="delete">
+		delete from project_filingbatch_proinfo
+		where filing_batch=#{proInfofilingBatch} and project_id=#{proId}
+	</delete>
+
 </mapper>

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

@@ -62,16 +62,20 @@
 		update
   			project_plan_info
 		set
-		  update_by = #{updateBy.id},
-		  update_date = #{updateDate},
-		  remarks = #{remarks},
-		  del_flag = #{delFlag},
-		  project_id = #{projectId},
-		  project_stage = #{projectStage},
-		  begin_date = #{beginDate},
-		  end_date = #{endDate},
-		  remind_name = #{remindName},
-		  finish_name = #{finishName}
+			update_by = #{updateBy.id},
+			update_date = #{updateDate},
+			remarks = #{remarks},
+			del_flag = #{delFlag},
+			project_id = #{projectId},
+			project_stage = #{projectStage},
+			begin_date = #{beginDate},
+			end_date = #{endDate}
+			<if test="remindName != null and remindName != ''">
+			,remind_name = #{remindName}
+			</if>
+			<if test="finishName != null and finishName != ''">
+			,finish_name = #{finishName}
+			</if>
 		where id = #{id}
 	</update>
 

src/main/resources/mappings/modules/workcontractinfo/WorkContractInfoDao.xml

@@ -485,7 +485,7 @@
 				ORDER BY ${page.orderBy}
 			</when>
 			<otherwise>
-				ORDER BY a.contract_date DESC
+				ORDER BY a.update_date DESC
 			</otherwise>
 		</choose>
 	</select>

src/main/webapp/static/bos/bosupload.js

@@ -71,7 +71,7 @@ function multitestFlag (storeAs, file,attachmentId,attachmentFlag,uploadPath,div
                             var str = '' ;
                             var addFile = prefix+divId;
                             if (isContains("jpg,png,gif,bmp,jpeg",data.type)){
-                                str = '<img src="'+data1.url+'" width="50" height="50" title="'+data.attachmentName+'" onclick="openDialogView(\'预览\',\''+realPath+ '/a/sys/picturepreview/picturePreview?url=' +data1.url+ '\',\'90%\',\'90%\')" alt="'+data.attachmentName+'"/>';
+                                str = '<img src="'+data1.url+'" width="50" height="50" title="'+data.attachmentName+'" onclick="openDialogView(\'预览\',\'/a/sys/picturepreview/picturePreview?url=' +data1.url+ '\',\'90%\',\'90%\')" alt="'+data.attachmentName+'"/>';
                             }else if(isContains("pdf",data.type)){
                                 str = '<a class="attention-info" href="javascript:void(0)" title="'+data.attachmentName+'" onclick="preview(\'预览\',\''+data1.url+'\',\'90%\',\'90%\',\'1\')">'+data.attachmentName+'</a>';
                             }else {
@@ -144,7 +144,7 @@ function fBmultitestFlag (storeAs, file,attachmentId,attachmentFlag,uploadPath,d
                             var str = '' ;
                             var addFile = prefix+divId;
                             if (isContains("jpg,png,gif,bmp,jpeg",data.type)){
-                                str = '<img src="'+data1.url+'" width="50" height="50" title="'+data.attachmentName+'" onclick="openDialogView(\'预览\',\''+realPath+ '/a/sys/picturepreview/picturePreview?url=' +data1.url+ '\',\'90%\',\'90%\')" alt="'+data.attachmentName+'"/>';
+                                str = '<img src="'+data1.url+'" width="50" height="50" title="'+data.attachmentName+'" onclick="openDialogView(\'预览\',\'/a/sys/picturepreview/picturePreview?url=' +data1.url+ '\',\'90%\',\'90%\')" alt="'+data.attachmentName+'"/>';
                             }else if(isContains("pdf",data.type)){
                                 str = '<a class="attention-info" href="javascript:void(0)" title="'+data.attachmentName+'" onclick="preview(\'预览\',\''+data1.url+'\',\'90%\',\'90%\',\'1\')">'+data.attachmentName+'</a>';
                             }else {
@@ -200,7 +200,7 @@ function multitest (storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,
                 $("#jindutiao"+divId).attr("style","width: "+p+"%");
                 $("#jindutiao"+divId).attr("aria-valuenow",p+"%");
                 $("#baifenbi"+divId).html(p+"%");
-                $("#fileName"+divId).html(name);
+                $("#fileName"+divId).html("上传进度：");
                 $.ajax({
                     type:'post',
                     url:returnUrl,
@@ -224,7 +224,7 @@ function multitest (storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,
                             var str = '<tr class="trIdAdds">'+
                                 '<td class="text-center">' ;
                             if (isContains("jpg,png,gif,bmp,jpeg",data.type)){
-                                str = str +'<img src="'+data1.url+'" width="50" height="50" onclick="openDialogView(\'预览\',\''+realPath+ '/a/sys/picturepreview/picturePreview?url=' +data1.url+ '\',\'90%\',\'90%\')" alt="'+data.attachmentName+'"/>';
+                                str = str +'<img src="'+data1.url+'" width="50" height="50" onclick="openDialogView(\'预览\',\'/a/sys/picturepreview/picturePreview?url=' +data1.url+ '\',\'90%\',\'90%\')" alt="'+data.attachmentName+'"/>';
                             }else if(isContains("pdf",data.type)){
                                 str = str + '<a class="attention-info" href="javascript:void(0)" onclick="preview(\'预览\',\''+data1.url+'\',\'90%\',\'90%\',\'1\')">'+data.attachmentName+'</a>';
                             }else {
@@ -381,7 +381,7 @@ function ftlMultitest (storeAs, file,attachmentId,attachmentFlag,uploadPath,divI
                 $("#jindutiao"+divId).attr("style","width: "+p+"%");
                 $("#jindutiao"+divId).attr("aria-valuenow",p+"%");
                 $("#baifenbi"+divId).html(p+"%");
-                $("#fileName"+divId).html(name);
+                $("#fileName"+divId).html("上传进度：");
 
 
                 $.ajax({
@@ -406,7 +406,7 @@ function ftlMultitest (storeAs, file,attachmentId,attachmentFlag,uploadPath,divI
                             var str = '<tr class="trIdAdds">'+
                                 '<td class="text-center">' ;
                             if (isContains("jpg,png,gif,bmp,jpeg",data.type)){
-                                str = str +'<img src="'+data1.url+'" width="50" height="50" onclick="openDialogView(\'预览\',\''+realPath+ '/a/sys/picturepreview/picturePreview?url=' +data1.url+ '\',\'90%\',\'90%\')" alt="'+data1.name+'"/>';
+                                str = str +'<img src="'+data1.url+'" width="50" height="50" onclick="openDialogView(\'预览\',\'/a/sys/picturepreview/picturePreview?url=' +data1.url+ '\',\'90%\',\'90%\')" alt="'+data1.name+'"/>';
                             }else if(isContains("pdf",data.type)){
                                 str = str + '<a class="attention-info" href="javascript:void(0)" onclick="preview(\'预览\',\''+data1.url+'\',\'90%\',\'90%\',\'1\')">'+data1.name+'</a>';
                             }else {

src/main/webapp/static/common/jeeplus.js

@@ -446,7 +446,7 @@ function getCheckProjectState(id)
         case "2":result.label = "auditing";result.status="归档中";break;
         case "3":result.label = "cancel";result.status="撤回";break;
         case "4":result.label = "reject";result.status="驳回";break;
-        case "5":result.label = "signed";result.status="归档完成";break;
+        case "5":result.label = "signed";result.status="完成";break;
         case "7":result.label = "discarded";result.status="作废";result.action = false;break;
         case "8":result.label = "discarded";result.status="已删除";result.action = false;break;
         default:

src/main/webapp/static/common/js/common.js

@@ -78,9 +78,9 @@ function preview(title,url,width,height,type){
     }
     //var u = 'http://ow365.cn/?i=14411&furl='+url;
     if(url.indexOf("http://gangwan-app.oss-cn-hangzhou.aliyuncs.com")>-1) {
-        var u = 'https://view.officeapps.live.com/op/view.aspx?src='+encodeContent(url);
+        var u = 'https://view.officeapps.live.com/op/view.aspx?src='+encodeURIComponent(url);
     }else{
-        var u = 'https://view.officeapps.live.com/op/view.aspx?src='+encodeContent(url);
+        var u = 'https://view.officeapps.live.com/op/view.aspx?src='+encodeURIComponent(url);
     }
 
     function encodeContent(data){
@@ -91,7 +91,7 @@ function preview(title,url,width,height,type){
     }
 
     if(type == 1){
-        u = url;
+        u = 'http://www.xdocin.com/xdoc?_func=to&_format=html&_cache=true&_xdoc='+encodeURIComponent(url);
     }
     parent.layer.open({
         type: 2,

src/main/webapp/webpage/modules/projectAccessory/workAttachmentForm.jsp

@@ -84,6 +84,22 @@
 				$("#addFile"+divId).show();
 				multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,size);}
 		}
+		function showfile(){
+			var length=$("#file_attachment tr").length;
+			var files=new Array();
+			for(var i=0;i<length;i++){
+				files[i]=$("#file_attachment").find("tr").eq(i).find("td").html();
+			}
+			return files;
+		}
+		function showfileXia(){
+			var length=$("#file_attachment tr").length;
+			var xia=new Array();
+			for(var i=0;i<length;i++){
+				xia[i]=$("#file_attachment").find("tr").eq(i).find("td").eq(3).find("span").html();
+			}
+			return xia;
+		}
 	</script>
 </head>
 <body>
@@ -147,8 +163,8 @@
 								<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>
-
+										<span>
+										</span>
 										<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')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
 										</c:if>

src/main/webapp/webpage/modules/projectFilingBatch/ProjectFilingBatchProInfoForm.jsp

@@ -104,7 +104,7 @@
 					"<td style=\"text-align: center\" width=\"20%\"><input name='ProInfoName' style='text-align: center' class=\"form-control\"></input></td>"+
 					"<td width=\"20%\">" +
 					// "<span href=javascript:void(0); onclick=\"accordingBtn(this)\"   class=\"op-btn op-btn-edit\" title=\"上传附件\"><i class=\"glyphicon glyphicon-edit\"></i>&nbsp;编辑</span>" +
-					"<span class=\"op-btn op-btn-delete\" onclick=\"delListInfoRow(this)\" title=\"删除\"><i class=\"glyphicon glyphicon-remove\"></i>&nbsp;删除</span>" +
+					"<div class=\"op-btn-box\" ><span class=\"op-btn op-btn-delete\" onclick=\"delListInfoRow(this)\" title=\"删除\"><i class=\"glyphicon glyphicon-remove\"></i>&nbsp;删除</span></div>" +
 					"</td>"+
 					"</tr>"
 			)
@@ -178,7 +178,7 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th>审定单</th>
+							<th>文件类型</th>
 							<th>文件描述</th>
 							<th width="150px">操作</th>
 						</tr>

src/main/webapp/webpage/modules/projectFilingBatch/projectFilingBatchApply.jsp

@@ -4,7 +4,11 @@
 <head>
 	<title>重新申请</title>
 	<meta name="decorator" content="default"/>
+	<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>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.css"/>
 	<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>
+	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
 	<script type="text/javascript">
 		var validateForm;
 		function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
@@ -15,7 +19,171 @@
 	
 		  return false;
 		}
+		function listTr(obj){
+			var name=$(obj).find("td").eq(0).find("input").eq(0).val();
+			var tiao="."+name;
+			var span=$(obj).find("td").eq(0);
+			// var ss=$(span).val().split(" ")[4];
+			$(span).toggle(function () {
+				$(tiao).hide();
+				$(span).find("span").attr("class","treeTable-icon")
+			},function () {
+				$(tiao).show();
+				$(span).find("span").attr("class","treeTable-icon open")
+			});
+		}
+		function addRowInfoForm(obj,tbody) {
+			var proid=$(obj).val();
+			var filingId=$("#filingId").val();
+			var len="#"+tbody.id+" tr";
+			var length=$(len).length;
+			var types=new Array();
+			var names=new Array();
+			for (var i=0;i<length;i++){
+				types[i]=$(len).eq(i).find("td").eq(0).find("input").eq(0).val();
+				names[i]=$(len).eq(i).find("td").eq(1).find("input").eq(0).val();
+			}
+			var index = parent.layer.getFrameIndex(window.name);
+			openDialog1('添加信息', '${ctx}/projectFilingBatch/projectFilingBatchInfo/projectFilingBatchProInfoForm?types='+types+'&names='+names+'&proid='+proid+'&filingId='+filingId,'70%', '80%',tbody);
+		}
+		function openDialog1(title,url,width,height,tbody){
+			top.layer.open({
+				type: 2,
+				area: [width, height],
+				title: title,
+				maxmin: true, //开启最大化最小化按钮
+				content: url ,
+				btn: ['确定', '关闭'],
+				yes: function(index, layero){
+					var body = top.layer.getChildFrame('body', index);
+					var tbodyId="#"+tbody.id;
+					var JsonId="."+tbody.id;
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var types=iframeWin.contentWindow.proInfoType();
+					var names=iframeWin.contentWindow.proInfoValue();
+					var proJsons=iframeWin.contentWindow.proInfoJson();
+					var jsonInput=JsonId+"_json"
+					// $(jsonInput).val(json);
+					if(iframeWin.contentWindow.proInfoValue() ){
+						$(tbodyId).html("")
+						for (var i=0;i<types.length;i++){
+							var s=$(body).find("#file_attachment tr").eq(i).html();
+							var name=names[i];
+							var type=types[i];
+							var proJson=proJsons[i];
+							$(tbodyId).append(
+									"<tr class='listInfo'>"+
+									"<td style=\"text-align: center;position: relative;\" width=\"20%\">" +
+									"<input  readonly='true' name='ProInfoType' style='text-align: center'  class=\"form-control required\" value='"+type+"'></td>"+
+									"<td style=\"text-align: center\" width=\"20%\"><input  readonly='true' name='ProInfoName' style='text-align: center' class=\"form-control\" value='"+name+"'></input></td>"+
+									"<td style=\"text-align: center\" width=\"20%\"></td>"+
+									"<td width=\"20%\">" +
+									"<span href=javascript:void(0); onclick=\"addRowInfoForm("+edit+","+editId+")\"   class=\"op-btn op-btn-edit\" title=\"上传附件\"><i class=\"glyphicon glyphicon-edit\"></i>&nbsp;编辑</span>" +
+									"<span class=\"op-btn op-btn-delete\" onclick=\"delListInfoRow(this)\" title=\"删除\"><i class=\"glyphicon glyphicon-remove\"></i>&nbsp;删除</span>" +
+									"<input type='text' class='" + jsonInput + "'  name='proInfos' style='display: none;' value='"+proJson+"' />"+
+									"</td>"+
+									"</tr>"
+							)
+						}
+						if(types.length==1){
+							var lenId=tbodyId+"_len"
+							$(lenId).val("123");
+							var ssss=$(lenId).val()
+						}else{
+							var lenId=tbodyId+"_len"
+							$(lenId).val("");
+						}
+						top.layer.close(index);//关闭对话框。
+						// top.window[iframeName].frames.location.reload();//刷新父亲
+					}
+				},
+				cancel: function(index){
+				}
+			});
+		}
 		$(document).ready(function() {
+			var filingId=$("#filingId").val();
+			if(filingId!=""){
+				$.ajax({
+					url:"${ctx}/projectFilingBatch/projectFilingBatchInfo/formTwo",
+					data:{
+						"filingId":filingId
+					},
+					type:"post",
+					success:function (d) {
+						$.each(d.project,function(index,obj){
+							var id="projectList_"+obj.id;
+							var pid="project_"+obj.id;
+							var tid="project_"+obj.id+"_proId";
+							editId=id;
+							edit=tid;
+							var inId="#"+tid;
+							var size=$("#projectList .rowSize").size();
+							var flag=true;
+							var dd=$(inId).val();
+							for (var i=0;i<size;i++){
+								if (dd==d.id){
+									flag=false;
+								}
+							}
+							if(flag) {
+								$("#projectList").append("<tr class='rowSize' onclick='listTr(this)'>" +
+										"<td><input type=\"hidden\" name=\"proId\" id='" + tid + "' value=" + obj.id + "><input type=\"hidden\" name=\"projectid\" value=" + obj.id + "><span><i class=\"layui-icon layui-icon-triangle-d\"></i></span>" + obj.projectId + "</td>" +
+										"<td>" + obj.projectName + "</td>" +
+										"<td>" + obj.projectReportNumber + "</td>" +
+										"<td class=\"text-center op-td\" >" +
+										"<span class=\"op-btn op-btn-add\" onclick=\"addRowInfoForm("+tid+","+id+")\" title=\"添加\"><i class=\"fa fa-plus\"></i>&nbsp;添加</span>" +
+										"<span class=\"op-btn op-btn-delete\" onclick=\"delListRow(this," + id + ")\" title=\"删除\"><i class=\"glyphicon glyphicon-remove\"></i>&nbsp;删除</span>" +
+										"</td>" +
+										"</tr>")
+								$("#projectList").append("<tr class='"+obj.id+"' style='display: none;'> <td colspan='4' style='padding: 0px;'>" +
+										"<table style=\"width: 100%;padding: 0px;margin: 0px;\" class=\"table table-bordered table-condensed details\">" +
+										"<tbody id='" + id + "'>" +
+										"<input type='text' id='" + id + "_len' style='display: none;' name='flags' />"+
+										"</tbody>" +
+
+										"</table>" +
+										"</td></tr>")
+								$.ajax({
+									type : "POST",
+									url : "${ctx}/projectFilingBatch/projectFilingBatchInfo/getFilingBatchProInfo",
+									data : {
+										'projectId':obj.id,
+										'filingBatch':filingId,
+									},
+									//请求成功
+									success : function(result) {
+										var iid="#"+id
+										// var ss=(obj.id).split("_")
+										// var sa=ss[1];
+										$(iid).parent().parent().parent().show();
+										$.each(result.data,function(index,value){
+											$(iid).append(
+													"<tr class='listInfo' style='position: relative'>"+
+													// "<td class=\"hide\">"+
+													// "<input type='file' multiple='multiple' style='display: none;' onChange='if(this.value)insertAccording(this.value,"+obj.id+",this);'/>"+
+													// "<input type='hidden' style='display: none;' id='attId' value='"+value.id+"'/>"+
+													// "<input type='hidden' style='display: none;' id='fileUrl' value='"+value.url+"'/>"+
+													// "</td>"+
+													"<td style=\"text-align: center;position: relative;\" width=\"20%\">" +
+													"<input name='proInfoType' onChange='upwType(this)' style='text-align: center' readonly='true' class=\"form-control required\" value='"+value.proInfoType+"'/></td>"+
+													"<td style=\"text-align: center\" width=\"20%\"><input  readonly='true' name='proInfoName' style='text-align: center' class=\"form-control required\" value='"+value.proInfoName+"'/></td>"+
+													"<td style=\"text-align: center\" width=\"20%\"></td>"+
+													"<td width=\"20%\">" +
+													"<span href=javascript:void(0); onclick=\"addRowInfoForm("+tid+","+id+")\"   class=\"op-btn op-btn-edit\" title=\"上传附件\"><i class=\"glyphicon glyphicon-edit\"></i>&nbsp;编辑</span>" +
+													"<span class=\"op-btn op-btn-delete\" onclick=\"delListInfoRow(this)\" title=\"删除\"><i class=\"glyphicon glyphicon-remove\"></i>&nbsp;删除</span>" +
+													"<input type='text' class='" + id + "_json' style='display: none;' name='proInfos' />"+
+													"</td>"+
+													"</tr>"
+											)
+										})
+									}
+								});
+							}
+						})
+					}
+				});
+			}
 			validateForm = $("#inputForm").validate({
 				submitHandler: function(form){
 					loading('正在提交，请稍等...');
@@ -89,7 +257,7 @@
 <div class="single-form">
 	<div class="container">
 		<form:form id="inputForm" modelAttribute="projectFilingBatch" enctype="multipart/form-data" action="${ctx}/projectFilingBatch/projectFilingBatchInfo/saveAudit" method="post" class="form-horizontal">
-		<form:hidden path="id"/>
+		<form:hidden path="id" id="filingId"/>
 		<form:hidden path="home"/>
 		<form:hidden path="act.taskId"/>
 		<form:hidden path="act.taskName"/>
@@ -113,6 +281,12 @@
 							<form:input path="createBy.name" id="createBy"  readonly="true" class="form-control layui-input" />
 						</div>
 					</div>
+					<div class="layui-item layui-col-sm6 lw7 with-textarea">
+						<label class="layui-form-label"><span style="color: red">*</span>归档名称：</label>
+						<div class="layui-input-block">
+							<form:input path="filingName" htmlEscape="false" class="form-control  layui-input required"/>
+						</div>
+					</div>
 					<div class="layui-item layui-col-sm12 lw7">
 						<label class="layui-form-label">归档信息：</label>
 						<div class="layui-input-block">
@@ -135,47 +309,47 @@
 						<th style="text-align: center" width="20%">操作</th>
 					</tr>
 					</thead>
-					<tbody id="workConstructionLinkmanList">
-					<c:choose>
-						<c:when test="${not empty projectFilingBatch}">
-							<c:forEach items="${projectFilingBatch.project}" var="project" varStatus="index">
-								<tr>
-									<td>
-											${project.projectId}
-									</td>
-									<td>
-											${project.projectName}
-									</td>
-									<td>
-											${project.projectReportNumber}
-									</td>
+					<tbody id="projectList">
+<%--					<c:choose>--%>
+<%--						<c:when test="${not empty projectFilingBatch}">--%>
+<%--							<c:forEach items="${projectFilingBatch.project}" var="project" varStatus="index">--%>
+<%--								<tr>--%>
+<%--									<td>--%>
+<%--											${project.projectId}--%>
+<%--									</td>--%>
+<%--									<td>--%>
+<%--											${project.projectName}--%>
+<%--									</td>--%>
 <%--									<td>--%>
-<%--										<input id="boxNum" style="border: 0px;width: 100%;background-color: rgba(255,255,255,0);" type="text" class="form-control layui-input boxNum" value=""/>--%>
-<%--										<span class="node" style="display: none;color: red;"></span>--%>
+<%--											${project.projectReportNumber}--%>
 <%--									</td>--%>
+<%--&lt;%&ndash;									<td>&ndash;%&gt;--%>
+<%--&lt;%&ndash;										<input id="boxNum" style="border: 0px;width: 100%;background-color: rgba(255,255,255,0);" type="text" class="form-control layui-input boxNum" value=""/>&ndash;%&gt;--%>
+<%--&lt;%&ndash;										<span class="node" style="display: none;color: red;"></span>&ndash;%&gt;--%>
+<%--&lt;%&ndash;									</td>&ndash;%&gt;--%>
+<%--&lt;%&ndash;									<td>&ndash;%&gt;--%>
+<%--&lt;%&ndash;										<input  id="reboxNum"  style="border: 0px;width: 100%;background-color: rgba(255,255,255,0);" type="text" class="form-control layui-input reBoxNum" value=""/>&ndash;%&gt;--%>
+<%--&lt;%&ndash;										<span class="reNode" style="display: none;color: red;"></span>&ndash;%&gt;--%>
+<%--&lt;%&ndash;									</td>&ndash;%&gt;--%>
 <%--									<td>--%>
-<%--										<input  id="reboxNum"  style="border: 0px;width: 100%;background-color: rgba(255,255,255,0);" type="text" class="form-control layui-input reBoxNum" value=""/>--%>
-<%--										<span class="reNode" style="display: none;color: red;"></span>--%>
+<%--										<span class="op-btn op-btn-delete" onclick="delEntrustRow(this)" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>--%>
+<%--&lt;%&ndash;										<input type="hidden" id="getProId" value="${project.id}"/>&ndash;%&gt;--%>
+<%--&lt;%&ndash;										<select id="projectPass" style="border: 0px;width:100%;text-align: center;background-color: rgba(255,255,255,0);" class="form-control editable-select layui-input" readonly="true">&ndash;%&gt;--%>
+<%--&lt;%&ndash;											<option style="text-align: center" value="5">通过</option>&ndash;%&gt;--%>
+<%--&lt;%&ndash;											<option style="text-align: center" value="4">驳回</option>&ndash;%&gt;--%>
+<%--&lt;%&ndash;										</select>&ndash;%&gt;--%>
 <%--									</td>--%>
-									<td>
-										<span class="op-btn op-btn-delete" onclick="delEntrustRow(this)" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>
-<%--										<input type="hidden" id="getProId" value="${project.id}"/>--%>
-<%--										<select id="projectPass" style="border: 0px;width:100%;text-align: center;background-color: rgba(255,255,255,0);" class="form-control editable-select layui-input" readonly="true">--%>
-<%--											<option style="text-align: center" value="5">通过</option>--%>
-<%--											<option style="text-align: center" value="4">驳回</option>--%>
-<%--										</select>--%>
-									</td>
-								</tr>
-							</c:forEach>
-						</c:when>
-						<c:otherwise>
-							<tr>
-								<td colspan="7">
-									暂无数据
-								</td>
-							</tr>
-						</c:otherwise>
-					</c:choose>
+<%--								</tr>--%>
+<%--							</c:forEach>--%>
+<%--						</c:when>--%>
+<%--						<c:otherwise>--%>
+<%--							<tr>--%>
+<%--								<td colspan="7">--%>
+<%--									暂无数据--%>
+<%--								</td>--%>
+<%--							</tr>--%>
+<%--						</c:otherwise>--%>
+<%--					</c:choose>--%>
 					</tbody>
 				</table>
 			</div>

src/main/webapp/webpage/modules/projectFilingBatch/projectFilingBatchForm.jsp

@@ -74,9 +74,9 @@
                 $(span).find("span").attr("class","treeTable-icon open")
             });
         }
+        var edit;
+        var editId;
         $(document).ready(function() {
-
-
             var filingId=$("#filingId").val();
             if(filingId!=""){
                 $.ajax({
@@ -90,6 +90,8 @@
                             var id="projectList_"+obj.id;
                             var pid="project_"+obj.id;
                             var tid="project_"+obj.id+"_proId";
+                            editId=id;
+                            edit=tid;
                             var inId="#"+tid;
                             var size=$("#projectList .rowSize").size();
                             var flag=true;
@@ -112,7 +114,7 @@
                                 $("#projectList").append("<tr class='"+obj.id+"' style='display: none;'> <td colspan='4' style='padding: 0px;'>" +
                                     "<table style=\"width: 100%;padding: 0px;margin: 0px;\" class=\"table table-bordered table-condensed details\">" +
                                     "<tbody id='" + id + "'>" +
-                                    "<input type='text' id='" + id + "_json' style='display: none;' name='proInfos' />"+
+                                    "<input type='text' id='" + id + "_len' style='display: none;' name='flags' />"+
                                     "</tbody>" +
 
                                     "</table>" +
@@ -138,12 +140,14 @@
                                                 // "<input type='hidden' style='display: none;' id='attId' value='"+value.id+"'/>"+
                                                 // "<input type='hidden' style='display: none;' id='fileUrl' value='"+value.url+"'/>"+
                                                 // "</td>"+
-                                                "<td style=\"text-align: center;position: relative;\" width=\"20%\"><span style='color: red;float: left;position: absolute;left: 10px;top: 15px;'>*</span><input name='proInfoType' onChange='upwType(this)' style='text-align: center' class=\"form-control required\" value='"+value.proInfoType+"'/></td>"+
-                                                "<td style=\"text-align: center\" width=\"20%\"><input name='proInfoName' style='text-align: center' class=\"form-control required\" value='"+value.proInfoName+"'/></td>"+
+                                                "<td style=\"text-align: center;position: relative;\" width=\"20%\">" +
+                                                "<input name='proInfoType' onChange='upwType(this)' style='text-align: center' readonly='true' class=\"form-control required\" value='"+value.proInfoType+"'/></td>"+
+                                                "<td style=\"text-align: center\" width=\"20%\"><input  readonly='true' name='proInfoName' style='text-align: center' class=\"form-control required\" value='"+value.proInfoName+"'/></td>"+
                                                 "<td style=\"text-align: center\" width=\"20%\"></td>"+
                                                 "<td width=\"20%\">" +
-                                                // "<span href=javascript:void(0); onclick=\"accordingBtn(this)\"   class=\"op-btn op-btn-edit\" title=\"上传附件\"><i class=\"glyphicon glyphicon-edit\"></i>&nbsp;编辑</span>" +
+                                                "<span href=javascript:void(0); onclick=\"addRowInfoForm("+tid+","+id+")\"   class=\"op-btn op-btn-edit\" title=\"上传附件\"><i class=\"glyphicon glyphicon-edit\"></i>&nbsp;编辑</span>" +
                                                 "<span class=\"op-btn op-btn-delete\" onclick=\"delListInfoRow(this)\" title=\"删除\"><i class=\"glyphicon glyphicon-remove\"></i>&nbsp;删除</span>" +
+                                                "<input type='text' class='" + id + "_json' style='display: none;' name='proInfos' />"+
                                                 "</td>"+
                                                 "</tr>"
                                             )
@@ -520,6 +524,8 @@
                         var id="projectList_"+d.id;
                         var pid="project_"+d.id;
                         var tid="project_"+d.id+"_proId";
+                        edit=tid;
+                        editId=id;
                         var inId="#"+tid;
                         var size=$("#projectList .rowSize").size();
                         var flag=true;
@@ -542,9 +548,8 @@
                             $("#projectList").append("<tr class='"+d.id+"' style='display: none;'> <td colspan='4' style='padding: 0px;'>" +
                                 "<table style=\"width: 100%;padding: 0px;margin: 0px;\" class=\"table table-bordered table-condensed details\">" +
                                 "<tbody id='" + id + "'>" +
-                                "<input type='text' id='" + id + "_json' style='display: none;' name='proInfos' />"+
                                 "</tbody>" +
-
+                                "<input type='text' id='" + id + "_len' style='display: none;' name='flags' />"+
                                 "</table>" +
                                 "</td></tr>")
                         }
@@ -599,30 +604,42 @@
                 yes: function(index, layero){
                     var body = top.layer.getChildFrame('body', index);
                     var tbodyId="#"+tbody.id;
+                    var JsonId="."+tbody.id;
                     var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
                     var types=iframeWin.contentWindow.proInfoType();
                     var names=iframeWin.contentWindow.proInfoValue();
-                    var proJson=iframeWin.contentWindow.proInfoJson();
-                    var jsonInput=tbodyId+"_json"
-                    var json=JSON.stringify(proJson)
-                    $(jsonInput).val(json);
+                    var proJsons=iframeWin.contentWindow.proInfoJson();
+                    var jsonInput=JsonId+"_json"
+                    // $(jsonInput).val(json);
                     if(iframeWin.contentWindow.proInfoValue() ){
                         $(tbodyId).html("")
                         for (var i=0;i<types.length;i++){
                             var s=$(body).find("#file_attachment tr").eq(i).html();
                             var name=names[i];
                             var type=types[i];
+                            var proJson=proJsons[i];
                             $(tbodyId).append(
                                 "<tr class='listInfo'>"+
-                                "<td style=\"text-align: center;position: relative;\" width=\"20%\"><span style='color: red;float: left;position: absolute;left: 15px;top: 15px;'>*</span><input name='ProInfoType' style='text-align: center'  class=\"form-control required\" value='"+type+"'></td>"+
-                                "<td style=\"text-align: center\" width=\"20%\"><input name='ProInfoName' style='text-align: center' class=\"form-control\" value='"+name+"'></input></td>"+
+                                "<td style=\"text-align: center;position: relative;\" width=\"20%\">" +
+                                "<input  readonly='true' name='ProInfoType' style='text-align: center'  class=\"form-control required\" value='"+type+"'></td>"+
+                                "<td style=\"text-align: center\" width=\"20%\"><input  readonly='true' name='ProInfoName' style='text-align: center' class=\"form-control\" value='"+name+"'></input></td>"+
                                 "<td style=\"text-align: center\" width=\"20%\"></td>"+
                                 "<td width=\"20%\">" +
+                                "<span href=javascript:void(0); onclick=\"addRowInfoForm("+edit+","+editId+")\"   class=\"op-btn op-btn-edit\" title=\"上传附件\"><i class=\"glyphicon glyphicon-edit\"></i>&nbsp;编辑</span>" +
                                 "<span class=\"op-btn op-btn-delete\" onclick=\"delListInfoRow(this)\" title=\"删除\"><i class=\"glyphicon glyphicon-remove\"></i>&nbsp;删除</span>" +
+                                "<input type='text' class='" + jsonInput + "'  name='proInfos' style='display: none;' value='"+proJson+"' />"+
                                 "</td>"+
                                 "</tr>"
                             )
                         }
+                        if(types.length==1){
+                            var lenId=tbodyId+"_len"
+                            $(lenId).val("123");
+                            var ssss=$(lenId).val()
+                        }else{
+                            var lenId=tbodyId+"_len"
+                            $(lenId).val("");
+                        }
                         top.layer.close(index);//关闭对话框。
                         // top.window[iframeName].frames.location.reload();//刷新父亲
                     }
@@ -648,12 +665,12 @@
                 // "<input type='hidden' style='display: none;' id='attId' value=''/>"+
                 // "<input type='hidden' style='display: none;' id='fileUrl' value=''/>"+
                 // "</td>"+
-                "<td style=\"text-align: center;position: relative;\" width=\"20%\"><span style='color: red;float: left;position: absolute;left: 10px;top: 15px;'>*</span><input name='ProInfoType' style='text-align: center' onChange='upwType(this)' class=\"form-control required\"/></td>"+
-                "<td style=\"text-align: center\" width=\"20%\"><input name='ProInfoName' style='text-align: center' class=\"form-control\"/></td>"+
+                "<td style=\"text-align: center;position: relative;\" width=\"20%\"><input name='ProInfoType'  readonly='true' style='text-align: center' onChange='upwType(this)' class=\"form-control required\"/></td>"+
+                "<td style=\"text-align: center\" width=\"20%\"><input name='ProInfoName'  readonly='true' style='text-align: center' class=\"form-control\"/></td>"+
                 "<td style=\"text-align: center\" width=\"20%\"></td>"+
                 "<td width=\"20%\">" +
                 // "<span href=javascript:void(0); onclick=\"accordingBtn(this)\"   class=\"op-btn op-btn-edit\" title=\"上传附件\"><i class=\"glyphicon glyphicon-edit\"></i>&nbsp;编辑</span>" +
-                "<span class=\"op-btn op-btn-delete\" onclick=\"delListInfoRow(this)\" title=\"删除\"><i class=\"glyphicon glyphicon-remove\"></i>&nbsp;删除</span>" +
+                // "<span class=\"op-btn op-btn-delete\" onclick=\"delListInfoRow(this)\" title=\"删除\"><i class=\"glyphicon glyphicon-remove\"></i>&nbsp;删除</span>" +
                 "</td>"+
                 "</tr>"
             )
@@ -727,11 +744,17 @@
             });
         }
         function delListRow(o,obj){
-            $(o).parent().parent().remove();
-            $(obj).parent().parent().parent().remove();
-           var fu= $(obj).parent().parent().parent().html();
+            var tr=obj.id+" tr"
+            var html=$(tr).html()
+            if(html!="undefined"){
+                $(o).parent().parent().remove();
+                $(obj).parent().parent().parent().remove();
+            }
+
+
+           // var fu= $(obj).parent().parent().parent().html();
             // if ()
-            $(obj).parent().parent().parent().hide();
+            // $(obj).parent().parent().parent().hide();
         }
         function delListInfoRow(obj, prefix){
             var tr=$(obj).parent().parent();
@@ -991,7 +1014,7 @@
                         <thead>
                         <tr>
                             <th class="hide"></th>
-                            <th style="text-align: center" width="20%">归档项目编号/审定单</th>
+                            <th style="text-align: center" width="20%">归档项目编号/文件类型</th>
                             <th style="text-align: center" width="20%">归档项目名称/文件描述</th>
                             <th style="text-align: center" width="20%">报告号</th>
                             <th width="20%">操作</th>

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

@@ -231,10 +231,10 @@
 				<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-hover list-table">
+					<table id="upTable" class="table table-bordered table-condensed details">
 						<thead>
 						<tr>
-							<th width="40%">文件类型</th>
+							<th width="55%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -271,10 +271,10 @@
 									<div class="op-btn-box" >
 										<c:choose>
 											<c:when test="${fileAttachment.flag == 0}">
-												<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+
 											</c:when>
 											<c:otherwise>
-												<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileAttachment.parent.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+												<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 											</c:otherwise>
 										</c:choose>
 									</div>
@@ -303,10 +303,10 @@
 				<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-hover list-table">
+					<table id="gistdata_upTable" class="table table-bordered table-condensed details">
 						<thead>
 						<tr>
-							<th width="40%">文件类型</th>
+							<th width="55%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -344,10 +344,10 @@
 									<div class="op-btn-box" >
 										<c:choose>
 											<c:when test="${fileGistdata.flag == 0}">
-												<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileGistdata.id}&projectId=${project.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+
 											</c:when>
 											<c:otherwise>
-												<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileGistdata.parent.id}&projectId=${project.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+												<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileGistdata.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 											</c:otherwise>
 										</c:choose>
 									</div>
@@ -378,10 +378,10 @@
 				<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-hover list-table">
+					<table id="upTable_other" class="table table-bordered table-condensed details">
 						<thead>
 						<tr>
-							<th width="40%">文件类型</th>
+							<th width="55%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -419,10 +419,10 @@
 									<div class="op-btn-box" >
 										<c:choose>
 											<c:when test="${fileOther.flag == 0}">
-												<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileOther.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+
 											</c:when>
 											<c:otherwise>
-												<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileOther.parent.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+												<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileOther.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 											</c:otherwise>
 										</c:choose>
 									</div>

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

@@ -4,7 +4,22 @@
 <head>
 	<title>合同归档管理</title>
 	<meta name="decorator" content="default"/>
+	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
+
 	<script type="text/javascript">
+		function listTr(obj){
+			var name=$(obj).attr("id");
+			var tiao="."+name;
+			var span=$(obj).find("td").eq(2);
+			// var ss=$(span).val().split(" ")[4];
+			$(span).toggle(function () {
+				$(tiao).hide();
+				$(span).find("span").attr("class","treeTable-icon")
+			},function () {
+				$(tiao).show();
+				$(span).find("span").attr("class","treeTable-icon open")
+			});
+		}
         var validateForm;
         function doSubmit(){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
@@ -314,32 +329,41 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th>电子件名称</th>
-							<th width="100px">最大容量(M)</th>
-							<th width="18%">类型限制</th>
-							<th>文件名</th>
+							<th width="40%">电子件名称</th>
+<%--							<th width="100px">最大容量(M)</th>--%>
+							<th width="">类型限制</th>
+<%--							<th>文件名</th>--%>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_attachment">
 						<c:forEach items="${projectReportRecord.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-							<tr>
+							<tr id="file_attachment_${fileAttachment.id}_tr" onclick="listTr(this)">
 								<td style="display:none">${fileAttachment.id}</td>
 								<td style="display:none">${fileAttachment.mustFlag}</td>
-								<td>${fileAttachment.attachName}</td>
-								<td>${fileAttachment.attachLength}</td>
-								<td>${fileAttachment.attachTypes}</td>
-								<td>
-									<c:forEach items="${fileAttachment.workAttachments}" var = "workAttachment" varStatus="status">
-										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
-									</c:forEach>
-								</td>
+								<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileAttachment.attachName}</td>
+								<td>${fileAttachment.attachLength}M；${fileAttachment.attachTypes}</td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
 								</td>
 							</tr>
+							<c:forEach items="${fileAttachment.workAttachments}" var = "workAttachment" varStatus="status">
+								<tr class="file_attachment_${fileAttachment.id}_tr">
+									<td></td>
+									<td>
+										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
+									</td>
+									<td class="op-td">
+										<div class="op-btn-box" >
+											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+
+												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
+										</div>
+									</td>
+								</tr>
+							</c:forEach>
 						</c:forEach>
 						</tbody>
 					</table>
@@ -364,33 +388,43 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th>电子件名称</th>
-							<th width="100px">最大容量(M)</th>
-							<th width="18%">类型限制</th>
-							<th>文件名</th>
+							<th width="40%">电子件名称</th>
+<%--							<th width="100px">最大容量(M)</th>--%>
+							<th width="">类型限制</th>
+<%--							<th>文件名</th>--%>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_gistdata">
 						<c:forEach items="${projectReportRecord.fileGistdataList}" var = "fileGistdata" varStatus="status">
-							<tr>
+							<tr  id="file_gistdata_${fileGistdata.id}_tr" onclick="listTr(this)">
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileGistdata.id}</td>
 								<td style="display:none">${fileGistdata.mustFlag}</td>
-								<td>${fileGistdata.attachName}</td>
-								<td>${fileGistdata.attachLength}</td>
-								<td>${fileGistdata.attachTypes}</td>
-								<td>
-									<c:forEach items="${fileGistdata.workAttachments}" var = "workAttachment" varStatus="status">
-										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
-									</c:forEach>
-								</td>
+								<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileGistdata.attachName}</td>
+<%--								<td></td>--%>
+								<td>${fileGistdata.attachLength}M；${fileGistdata.attachTypes}</td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${project.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
 								</td>
 							</tr>
+							<c:forEach items="${fileGistdata.workAttachments}" var = "workAttachment" varStatus="status">
+								<tr class="file_gistdata_${fileGistdata.id}_tr">
+									<td></td>
+									<td>
+										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
+									</td>
+									<td class="op-td">
+										<div class="op-btn-box" >
+											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+
+												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
+										</div>
+									</td>
+								</tr>
+							</c:forEach>
 						</c:forEach>
 						</tbody>
 					</table>
@@ -415,33 +449,42 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th>电子件名称</th>
-							<th width="100px">最大容量(M)</th>
-							<th width="18%">类型限制</th>
-							<th>文件名</th>
+							<th width="40%">电子件名称</th>
+<%--							<th width="100px">最大容量(M)</th>--%>
+							<th width="">类型限制</th>
+<%--							<th>文件名</th>--%>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_other">
 						<c:forEach items="${projectReportRecord.fileOtherList}" var = "fileOther" varStatus="status">
-							<tr>
+							<tr id="file_other_${fileOther.id}_tr" onclick="listTr(this)">
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileOther.id}</td>
 								<td style="display:none">${fileOther.mustFlag}</td>
-								<td>${fileOther.attachName}</td>
-								<td>${fileOther.attachLength}</td>
-								<td>${fileOther.attachTypes}</td>
-								<td>
-									<c:forEach items="${fileOther.workAttachments}" var = "workAttachment" varStatus="status">
-										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
-									</c:forEach>
-								</td>
+								<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileOther.attachName}</td>
+								<td>${fileOther.attachLength}M；${fileOther.attachTypes}</td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
 								</td>
 							</tr>
+							<c:forEach items="${fileOther.workAttachments}" var = "workAttachment" varStatus="status">
+								<tr class="file_other_${fileOther.id}_tr">
+									<td></td>
+									<td>
+										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
+									</td>
+									<td class="op-td">
+										<div class="op-btn-box" >
+											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+
+												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
+										</div>
+									</td>
+								</tr>
+							</c:forEach>
 						</c:forEach>
 						</tbody>
 					</table>

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanForm.jsp

@@ -223,7 +223,6 @@
                                         <input id="projectPlanList{{idx}}_id" name="projectPlanList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
                                         <input id="projectPlanList{{idx}}_delFlag" name="projectPlanList[{{idx}}].delFlag" type="hidden" value="0"/>
                                         <input id="projectPlanList{{idx}}_remindId" name="projectPlanList[{{idx}}].remindId" type="hidden" value="{{row.remindId}}"/>
-                                        <input id="projectPlanList{{idx}}_finishId" name="projectPlanList[{{idx}}].finishId" type="hidden" value="{{row.finishId}}"/>
                                     </td>
 
                                     <td width="60px">
@@ -246,7 +245,7 @@
                                     </td>
 
                                     <td>
-                                        <sys:treeselecttPlanUser id="projectPlanList{{idx}}_finishName" name="projectPlanList[{{idx}}].finishId" value="${projectRecords.leaderIds}" labelName="projectPlanList[{{idx}}].finishName" labelValue="{{row.finishName}}"
+                                        <sys:treeselecttPlanUser id="projectPlanList{{idx}}_finishName" name="projectPlanList[{{idx}}].finishId" value="{{row.finishId}}" labelName="projectPlanList[{{idx}}].finishName" labelValue="{{row.finishName}}"
                                          title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 

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

@@ -24,6 +24,19 @@
 		}
 	</style>
 	<script type="text/javascript">
+		function listTr(obj){
+			var name=$(obj).attr("id");
+			var tiao="."+name;
+			var span=$(obj).find("td").eq(2);
+			// var ss=$(span).val().split(" ")[4];
+			$(span).toggle(function () {
+				$(tiao).hide();
+				$(span).find("span").attr("class","treeTable-icon")
+			},function () {
+				$(tiao).show();
+				$(span).find("span").attr("class","treeTable-icon open")
+			});
+		}
         var validateForm;
         function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
@@ -323,9 +336,9 @@
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>成果文件</h2></div>
-				<div class="layui-item nav-btns">
-					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=2&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
-				</div>
+<%--				<div class="layui-item nav-btns">--%>
+<%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=2&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
+<%--				</div>--%>
 				<div id="addFile_attachment" style="display: none" class="upload-progress">
 					<span id="fileName_attachment" ></span>
 					<span id="_attachment" ></span>
@@ -342,39 +355,46 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th>电子件名称</th>
-							<th width="100px">最大容量(M)</th>
-							<th width="18%">类型限制</th>
-							<th>文件名</th>
+							<th width="40%">电子件名称</th>
+<%--							<th width="100px">最大容量(M)</th>--%>
+							<th width="">类型限制</th>
+<%--							<th>文件名</th>--%>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_attachment">
 						<c:forEach items="${projectReportRecord.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-							<tr>
+							<tr  id="file_attachment_${fileAttachment.id}_tr" onclick="listTr(this)">
 								<td style="display:none">${fileAttachment.id}</td>
 								<td style="display:none">${fileAttachment.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileAttachment.mustFlag == 1}">
-										<td><span style="color: red">* </span>${fileAttachment.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileAttachment.attachName}</td>
 									</c:when>
 									<c:otherwise>
-										<td>${fileAttachment.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileAttachment.attachName}</td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileAttachment.attachLength}</td>
-								<td>${fileAttachment.attachTypes}</td>
-								<td>
-									<c:forEach items="${fileAttachment.workAttachments}" var = "workAttachment" varStatus="status">
-										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
-									</c:forEach>
-								</td>
+								<td>${fileAttachment.attachLength}M;${fileAttachment.attachTypes}</td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
 								</td>
 							</tr>
+							<c:forEach items="${fileAttachment.workAttachments}" var = "workAttachment" varStatus="status">
+								<tr class="file_attachment_${fileAttachment.id}_tr">
+									<td></td>
+									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>
+									<td class="op-td">
+										<div class="op-btn-box" >
+											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+
+												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
+										</div>
+									</td>
+								</tr>
+							</c:forEach>
 						</c:forEach>
 						</tbody>
 					</table>
@@ -410,10 +430,10 @@
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>依据性资料</h2></div>
-				<div class="layui-item nav-btns">
-						<%--<a id="gistdata_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=2&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
-				</div>
+<%--				<div class="layui-item nav-btns">--%>
+<%--						&lt;%&ndash;<a id="gistdata_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>&ndash;%&gt;--%>
+<%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=2&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
+<%--				</div>--%>
 				<div id="addFile_gistdata" style="display: none" class="upload-progress">
 					<span id="fileName_gistdata" ></span>
 					<span id="_gistdata" ></span>
@@ -430,40 +450,48 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th>电子件名称</th>
-							<th width="100px">最大容量(M)</th>
-							<th width="18%">类型限制</th>
-							<th>文件名</th>
+							<th width="40%">电子件名称</th>
+<%--							<th width="100px">最大容量(M)</th>--%>
+							<th>类型限制</th>
+<%--							<th>文件名</th>--%>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_gistdata">
 						<c:forEach items="${projectReportRecord.fileGistdataList}" var = "fileGistdata" varStatus="status">
-							<tr>
+							<tr id="file_gistdata_${fileGistdata.id}_tr" onclick="listTr(this)">
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileGistdata.id}</td>
 								<td style="display:none">${fileGistdata.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileGistdata.mustFlag == 1}">
-										<td><span style="color: red">* </span>${fileGistdata.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileGistdata.attachName}</td>
 									</c:when>
 									<c:otherwise>
-										<td>${fileGistdata.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileGistdata.attachName}</td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileGistdata.attachLength}</td>
-								<td>${fileGistdata.attachTypes}</td>
-								<td>
-									<c:forEach items="${fileGistdata.workAttachments}" var = "workAttachment" varStatus="status">
-										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
-									</c:forEach>
-								</td>
+								<td>${fileGistdata.attachLength}M;${fileGistdata.attachTypes}</td>
+
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${project.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
 								</td>
 							</tr>
+							<c:forEach items="${fileGistdata.workAttachments}" var = "workAttachment" varStatus="status">
+								<tr class="file_gistdata_${fileGistdata.id}_tr">
+									<td></td>
+									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>
+									<td class="op-td">
+										<div class="op-btn-box" >
+											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+
+												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
+										</div>
+									</td>
+								</tr>
+							</c:forEach>
 						</c:forEach>
 						</tbody>
 					</table>
@@ -499,10 +527,10 @@
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>其他文件</h2></div>
-				<div class="layui-item nav-btns">
-						<%--<a id="other_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=13&projectType=2&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_other')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
-				</div>
+<%--				<div class="layui-item nav-btns">--%>
+<%--						&lt;%&ndash;<a id="other_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>&ndash;%&gt;--%>
+<%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=13&projectType=2&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_other')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
+<%--				</div>--%>
 				<div id="addFile_other" style="display: none" class="upload-progress">
 					<span id="fileName_other" ></span>
 					<span id="_other" ></span>
@@ -519,40 +547,47 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th>电子件名称</th>
-							<th width="100px">最大容量(M)</th>
-							<th width="18%">类型限制</th>
-							<th>文件名</th>
+							<th width="40%">电子件名称</th>
+<%--							<th width="100px">最大容量(M)</th>--%>
+							<th>类型限制</th>
+<%--							<th>文件名</th>--%>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_other">
 						<c:forEach items="${projectReportRecord.fileOtherList}" var = "fileOther" varStatus="status">
-							<tr>
+							<tr id="file_other_${fileOther.id}_tr" onclick="listTr(this)">
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileOther.id}</td>
 								<td style="display:none">${fileOther.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileOther.mustFlag == 1}">
-										<td><span style="color: red">* </span>${fileOther.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileOther.attachName}</td>
 									</c:when>
 									<c:otherwise>
-										<td>${fileOther.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileOther.attachName}</td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileOther.attachLength}</td>
-								<td>${fileOther.attachTypes}</td>
-								<td>
-									<c:forEach items="${fileOther.workAttachments}" var = "workAttachment" varStatus="status">
-										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
-									</c:forEach>
-								</td>
+								<td>${fileOther.attachLength}M;${fileOther.attachTypes}</td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
 								</td>
 							</tr>
+							<c:forEach items="${fileOther.workAttachments}" var = "workAttachment" varStatus="status">
+								<tr class="addFile_other_${fileOther.id}_tr">
+									<td></td>
+									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>
+									<td class="op-td">
+										<div class="op-btn-box" >
+											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+
+												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
+										</div>
+									</td>
+								</tr>
+							</c:forEach>
 						</c:forEach>
 						</tbody>
 					</table>

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

@@ -4,6 +4,7 @@
 <head>
 	<title>造价审核新增报告管理</title>
 	<meta name="decorator" content="default"/>
+	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
 	<style>
 		label.error{
 			top:40px;
@@ -11,6 +12,19 @@
 		}
 	</style>
 	<script type="text/javascript">
+		function listTr(obj){
+			var name=$(obj).attr("id");
+			var tiao="."+name;
+			var span=$(obj).find("td").eq(2);
+			// var ss=$(span).val().split(" ")[4];
+			$(span).toggle(function () {
+				$(tiao).hide();
+				$(span).find("span").attr("class","treeTable-icon")
+			},function () {
+				$(tiao).show();
+				$(span).find("span").attr("class","treeTable-icon open")
+			});
+		}
         var validateForm;
         var dataList;
         function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
@@ -887,39 +901,46 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-									<th>电子件名称</th>
-									<th width="100px">最大容量(M)</th>
+									<th width="40%">电子件名称</th>
+<%--									<th width="100px">最大容量(M)</th>--%>
 							<th width="18%">类型限制</th>
-									<th>文件名</th>
+<%--									<th>文件名</th>--%>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_attachment">
 						<c:forEach items="${projectcontentinfo.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-							<tr>
+							<tr  id="file_attachment_${fileAttachment.id}_tr" onclick="listTr(this)">
 								<td style="display:none">${fileAttachment.id}</td>
 								<td style="display:none">${fileAttachment.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileAttachment.mustFlag == 1}">
-										<td><span style="color: red">* </span>${fileAttachment.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileAttachment.attachName}</td>
 									</c:when>
 									<c:otherwise>
-										<td>${fileAttachment.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileAttachment.attachName}</td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileAttachment.attachLength}</td>
-								<td>${fileAttachment.attachTypes}</td>
-								<td>
-									<c:forEach items="${fileAttachment.workAttachments}" var = "workAttachment" varStatus="status">
-										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
-									</c:forEach>
-								</td>
+								<td>${fileAttachment.attachLength}M;${fileAttachment.attachTypes}</td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
 								</td>
 							</tr>
+							<c:forEach items="${fileAttachment.workAttachments}" var = "workAttachment" varStatus="status">
+								<tr class="file_attachment_${fileAttachment.id}_tr">
+									<td></td>
+									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>
+									<td class="op-td">
+										<div class="op-btn-box" >
+											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+
+												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
+										</div>
+									</td>
+								</tr>
+							</c:forEach>
 						</c:forEach>
 						</tbody>
 					</table>
@@ -975,40 +996,47 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-									<th>电子件名称</th>
-									<th width="100px">最大容量(M)</th>
-							<th width="18%">类型限制</th>
-									<th>文件名</th>
+									<th width="40%">电子件名称</th>
+<%--									<th width="100px">最大容量(M)</th>--%>
+							<th >类型限制</th>
+<%--									<th>文件名</th>--%>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_gistdata">
 						<c:forEach items="${projectcontentinfo.fileGistdataList}" var = "fileGistdata" varStatus="status">
-							<tr>
+							<tr  id="file_gistdata_${fileGistdata.id}_tr" onclick="listTr(this)">
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileGistdata.id}</td>
 								<td style="display:none">${fileGistdata.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileGistdata.mustFlag == 1}">
-										<td><span style="color: red">* </span>${fileGistdata.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileGistdata.attachName}</td>
 									</c:when>
 									<c:otherwise>
-										<td>${fileGistdata.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileGistdata.attachName}</td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileGistdata.attachLength}</td>
-								<td>${fileGistdata.attachTypes}</td>
-								<td>
-									<c:forEach items="${fileGistdata.workAttachments}" var = "workAttachment" varStatus="status">
-										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
-									</c:forEach>
-								</td>
+								<td>${fileGistdata.attachLength}M;${fileGistdata.attachTypes}</td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
 								</td>
 							</tr>
+							<c:forEach items="${fileGistdata.workAttachments}" var = "workAttachment" varStatus="status">
+								<tr class="file_gistdata_${fileGistdata.id}_tr">
+									<td></td>
+									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>
+									<td class="op-td">
+										<div class="op-btn-box" >
+											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+
+												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
+										</div>
+									</td>
+								</tr>
+							</c:forEach>
 						</c:forEach>
 						</tbody>
 					</table>
@@ -1064,40 +1092,47 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-									<th>电子件名称</th>
-									<th width="100px">最大容量(M)</th>
-							<th width="18%">类型限制</th>
-									<th>文件名</th>
+									<th width="40%">电子件名称</th>
+<%--									<th width="100px">最大容量(M)</th>--%>
+							<th >类型限制</th>
+<%--									<th>文件名</th>--%>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_other">
 						<c:forEach items="${projectcontentinfo.fileOtherList}" var = "fileOther" varStatus="status">
-							<tr>
+							<tr id="file_other_${fileOther.id}_tr" onclick="listTr(this)">
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileOther.id}</td>
 								<td style="display:none">${fileOther.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileOther.mustFlag == 1}">
-										<td><span style="color: red">* </span>${fileOther.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileOther.attachName}</td>
 									</c:when>
 									<c:otherwise>
-										<td>${fileOther.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileOther.attachName}</td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileOther.attachLength}</td>
-								<td>${fileOther.attachTypes}</td>
-								<td>
-									<c:forEach items="${fileOther.workAttachments}" var = "workAttachment" varStatus="status">
-										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
-									</c:forEach>
-								</td>
+								<td>${fileOther.attachLength}M;${fileOther.attachTypes}</td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
 								</td>
 							</tr>
+							<c:forEach items="${fileOther.workAttachments}" var = "workAttachment" varStatus="status">
+								<tr class="file_other_${fileOther.id}_tr">
+									<td></td>
+									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>
+									<td class="op-td">
+										<div class="op-btn-box" >
+											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+
+												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
+										</div>
+									</td>
+								</tr>
+							</c:forEach>
 						</c:forEach>
 						</tbody>
 					</table>

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

@@ -4,6 +4,7 @@
 <head>
 	<title>报告详情管理</title>
 	<meta name="decorator" content="default"/>
+	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
 	<style>
 		label.error{
 			top:40px;
@@ -11,6 +12,19 @@
 		}
 	</style>
 	<script type="text/javascript">
+		function listTr(obj){
+			var name=$(obj).attr("id");
+			var tiao="."+name;
+			var span=$(obj).find("td").eq(2);
+			// var ss=$(span).val().split(" ")[4];
+			$(span).toggle(function () {
+				$(tiao).hide();
+				$(span).find("span").attr("class","treeTable-icon")
+			},function () {
+				$(tiao).show();
+				$(span).find("span").attr("class","treeTable-icon open")
+			});
+		}
         var validateForm;
         var dataList;
         function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
@@ -810,10 +824,10 @@
 
 			<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>--%>
-						<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=2&projectId=${projectId}&reviewFee='+$('#reviewFee').val(),'500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
-				</div>
+<%--				<div class="layui-item nav-btns">--%>
+<%--					&lt;%&ndash;<a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>&ndash;%&gt;--%>
+<%--						<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=2&projectId=${projectId}&reviewFee='+$('#reviewFee').val(),'500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
+<%--				</div>--%>
 				<div id="addFile_attachment" style="display: none" class="upload-progress">
 					<span id="fileName_attachment" ></span>
 					<span id="_attachment" ></span>
@@ -830,40 +844,47 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th>电子件名称</th>
-							<th width="100px">最大容量(M)</th>
-							<th width="18%">类型限制</th>
-							<th>文件名</th>
+							<th width="40%">电子件名称</th>
+<%--							<th width="100px">最大容量(M)</th>--%>
+							<th>类型限制</th>
+<%--							<th>文件名</th>--%>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_attachment">
 						<c:forEach items="${projectcontentinfo.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-							<tr>
+							<tr id="file_attachment_${fileAttachment.id}_tr" onclick="listTr(this)">
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileAttachment.id}</td>
 								<td style="display:none">${fileAttachment.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileAttachment.mustFlag == 1}">
-										<td><span style="color: red">* </span>${fileAttachment.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileAttachment.attachName}</td>
 									</c:when>
 									<c:otherwise>
-										<td>${fileAttachment.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileAttachment.attachName}</td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileAttachment.attachLength}</td>
-								<td>${fileAttachment.attachTypes}</td>
-								<td>
-									<c:forEach items="${fileAttachment.workAttachments}" var = "workAttachment" varStatus="status">
-										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
-									</c:forEach>
-								</td>
+								<td>${fileAttachment.attachLength}M;${fileAttachment.attachTypes}</td>
 								<td class="op-td">
 									<div class="op-btn-box" >
-										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${projectId}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${projectId}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
 								</td>
 							</tr>
+							<c:forEach items="${fileAttachment.workAttachments}" var = "workAttachment" varStatus="status">
+								<tr class="file_attachment_${fileAttachment.id}_tr">
+									<td></td>
+									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>
+									<td class="op-td">
+										<div class="op-btn-box" >
+											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+
+												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
+										</div>
+									</td>
+								</tr>
+							</c:forEach>
 						</c:forEach>
 						</tbody>
 					</table>
@@ -899,10 +920,10 @@
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>依据性资料</h2></div>
-				<div class="layui-item nav-btns">
-					<%--<a id="gistdata_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-						<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=2&projectId=${projectId}&reviewFee='+$('#reviewFee').val(),'500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
-				</div>
+<%--				<div class="layui-item nav-btns">--%>
+<%--					&lt;%&ndash;<a id="gistdata_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>&ndash;%&gt;--%>
+<%--						<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=2&projectId=${projectId}&reviewFee='+$('#reviewFee').val(),'500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
+<%--				</div>--%>
 				<div id="addFile_gistdata" style="display: none" class="upload-progress">
 					<span id="fileName_gistdata" ></span>
 					<span id="_gistdata" ></span>
@@ -919,40 +940,47 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th>电子件名称</th>
-							<th width="100px">最大容量(M)</th>
-							<th width="18%">类型限制</th>
-							<th>文件名</th>
+							<th width="40%">电子件名称</th>
+<%--							<th width="100px">最大容量(M)</th>--%>
+							<th>类型限制</th>
+<%--							<th>文件名</th>--%>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_gistdata">
 						<c:forEach items="${projectcontentinfo.fileGistdataList}" var = "fileGistdata" varStatus="status">
-							<tr>
+								<tr id="file_gistdata_${fileGistdata.id}_tr" onclick="listTr(this)">
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileGistdata.id}</td>
 								<td style="display:none">${fileGistdata.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileOther.mustFlag == 1}">
-										<td><span style="color: red">* </span>${fileGistdata.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileGistdata.attachName}</td>
 									</c:when>
 									<c:otherwise>
-										<td>${fileGistdata.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileGistdata.attachName}</td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileGistdata.attachLength}</td>
-								<td>${fileGistdata.attachTypes}</td>
-								<td>
-									<c:forEach items="${fileGistdata.workAttachments}" var = "workAttachment" varStatus="status">
-										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
-									</c:forEach>
-								</td>
+								<td>${fileGistdata.attachLength}M;${fileGistdata.attachTypes}</td>
 								<td class="op-td">
 									<div class="op-btn-box" >
-										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${projectId}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${projectId}','70%','80%',false,'inputForm','gistdata_upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
 								</td>
 							</tr>
+							<c:forEach items="${fileGistdata.workAttachments}" var = "workAttachment" varStatus="status">
+								<tr class="file_gistdata_${fileGistdata.id}_tr">
+									<td></td>
+									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>
+									<td class="op-td">
+										<div class="op-btn-box" >
+											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+
+												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
+										</div>
+									</td>
+								</tr>
+							</c:forEach>
 						</c:forEach>
 						</tbody>
 					</table>
@@ -988,10 +1016,10 @@
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>其他文件</h2></div>
-				<div class="layui-item nav-btns">
-					<%--<a id="other_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-						<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=13&projectType=2&projectId=${projectId}&reviewFee='+$('#reviewFee').val(),'500px','350px',false,'inputForm','file_other')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
-				</div>
+<%--				<div class="layui-item nav-btns">--%>
+<%--					&lt;%&ndash;<a id="other_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>&ndash;%&gt;--%>
+<%--						<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=13&projectType=2&projectId=${projectId}&reviewFee='+$('#reviewFee').val(),'500px','350px',false,'inputForm','file_other',this)" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
+<%--				</div>--%>
 				<div id="addFile_other" style="display: none" class="upload-progress">
 					<span id="fileName_other" ></span>
 					<span id="_other" ></span>
@@ -1008,40 +1036,47 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th>电子件名称</th>
-							<th width="100px">最大容量(M)</th>
-							<th width="18%">类型限制</th>
-							<th>文件名</th>
+							<th width="40%">电子件名称</th>
+<%--							<th width="100px">最大容量(M)</th>--%>
+							<th>类型限制</th>
+<%--							<th>文件名</th>--%>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_other">
 						<c:forEach items="${projectcontentinfo.fileOtherList}" var = "fileOther" varStatus="status">
-							<tr>
+							<tr id="file_other_${fileOther.id}_tr" onclick="listTr(this)">
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileOther.id}</td>
 								<td style="display:none">${fileOther.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileOther.mustFlag == 1}">
-										<td><span style="color: red">* </span>${fileOther.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileOther.attachName}</td>
 									</c:when>
 									<c:otherwise>
-										<td>${fileOther.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileOther.attachName}</td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileOther.attachLength}</td>
-								<td>${fileOther.attachTypes}</td>
-								<td>
-									<c:forEach items="${fileOther.workAttachments}" var = "workAttachment" varStatus="status">
-										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
-									</c:forEach>
-								</td>
+								<td>${fileOther.attachLength}M;${fileOther.attachTypes}</td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${projectId}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
 								</td>
 							</tr>
+							<c:forEach items="${fileOther.workAttachments}" var = "workAttachment" varStatus="status">
+								<tr class="file_other_${fileOther.id}_tr">
+									<td></td>
+									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>
+									<td class="op-td">
+										<div class="op-btn-box" >
+											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+
+												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
+										</div>
+									</td>
+								</tr>
+							</c:forEach>
 						</c:forEach>
 						</tbody>
 					</table>

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

@@ -410,11 +410,11 @@
 				<span id="attachment_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
 					<%--<table id="upTable" class="layui-table" lay-filter="permissionTable"></table>--%>
-					<table id="upTable" class="table table-bordered table-hover list-table">
+					<table id="upTable" class="table table-bordered table-condensed details">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="40%">文件类型</th>
+							<th width="55%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -454,7 +454,7 @@
 												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 											</c:when>
 											<c:otherwise>
-												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.parent.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+												<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 											</c:otherwise>
 										</c:choose>
 									</div>
@@ -514,11 +514,11 @@
 				<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-hover list-table">
+					<table id="gistdata_upTable" class="table table-bordered table-condensed details">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="40%">文件类型</th>
+							<th width="55%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -559,7 +559,7 @@
 												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 											</c:when>
 											<c:otherwise>
-												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.parent.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+												<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileGistdata.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 											</c:otherwise>
 										</c:choose>
 									</div>
@@ -618,11 +618,11 @@
 				<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-hover list-table">
+					<table id="upTable_other" class="table table-bordered table-condensed details">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="40%">文件类型</th>
+							<th width="55%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -663,7 +663,7 @@
 														<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 													</c:when>
 													<c:otherwise>
-														<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.parent.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+														<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileOther.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 													</c:otherwise>
 												</c:choose>
 											</div>

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

@@ -0,0 +1,294 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>报告详情管理</title>
+	<meta name="decorator" content="default"/>
+	<%--<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />--%>
+	<%@include file="/webpage/include/treetable.jsp" %>
+	<style>
+		label.error{
+			top:40px;
+			left:0;
+		}
+	</style>
+	<script type="text/javascript">
+        var validateForm;
+        var dataList;
+        function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
+            if(validateForm.form()){
+				if(obj == 1){
+					$("#inputForm").attr("action","${ctx}/ruralProject/ruralProjectMessage/saveReport");
+				}else{
+					$("#inputForm").attr("action","${ctx}/ruralProject/ruralProjectMessage/holdSaveReport");
+				}
+				$("#inputForm").submit();
+				return true;
+            }else {
+				parent.layer.msg("信息未填写完整!", {icon: 5});
+			}
+            return false;
+        }
+        $(document).ready(function() {
+			$("#upTable").treeTable({expandLevel : 5},{ expandable: true });
+			$("#gistdata_upTable").treeTable({expandLevel : 5},{ expandable: true });
+			$("#upTable_other").treeTable({expandLevel : 5},{ expandable: true });
+            validateForm = $("#inputForm").validate({
+                submitHandler: function(form){
+                    loading('正在提交，请稍等...');
+                    form.submit();
+                },
+                errorContainer: "#messageBox",
+                errorPlacement: function(error, element) {
+                    $("#messageBox").text("输入有误，请先更正。");
+                    if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+                        error.appendTo(element.parent().parent());
+                    } else {
+                        error.insertAfter(element);
+                    }
+                }
+            });
+        });
+	</script>
+</head>
+<body>
+<div class="single-form">
+	<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
+		<ul class="list-tabs" >
+			<li><a href="${ctx}/ruralProject/ruralProjectRecords/view?id=${projectRecords.id}">项目详情</a></li>
+			<li><a href="${ctx}/subProject/subProject/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
+			<c:if test="${not empty projectId}">
+				<li><a href="${ctx}/ruralProject/ruralProjectMessage/formRecord?reportId=${projectId}&view=view">项目线上归档信息</a></li>
+			</c:if>
+			<li class="active"><a href="${ctx}/ruralProject/ruralProjectRecords/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>
+		</ul>
+	</div>
+	<div class="container${container}">
+		<form:form id="inputForm" modelAttribute="projectcontentinfo" action="${ctx}/ruralProject/ruralProjectMessage/saveReport" method="post" class="form-horizontal">
+		<form:hidden path="id"/>
+		<form:hidden path="name"/>
+		<form:hidden path="parentIds"/>
+		<form:hidden path="edit"/>
+		<form:hidden path="projectReportData.id"/>
+		<form:hidden path="projectReportData.createBy.id"/>
+		<form:hidden path="project.id"/>
+			<input type="hidden" id="reviewFee" value="${projectcontentinfo.projectReportData.reviewFee}">
+		<sys:message content="${message}"/>
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>成果文件</h2></div>
+				<div id="addFile_attachment" style="display: none" class="upload-progress">
+					<span id="fileName_attachment" ></span>
+					<span id="_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="upTable" class="table table-bordered table-condensed details">
+						<thead>
+						<tr>
+								<%-- <th>序号</th>--%>
+							<th width="55%">文件类型</th>
+							<th width="">文件名</th>
+							<th width="100px">操作</th>
+						</tr>
+						</thead>
+						<tbody id="file_attachment">
+						<c:forEach items="${projectcontentinfo.fileAttachmentList}" var = "fileAttachment" varStatus="status">
+							<tr id="${fileAttachment.id}" pid="${fileAttachment.parent.id}">
+								<c:choose>
+									<c:when test="${fileAttachment.mustFlag == 1}">
+										<td><span style="color: red">* </span>${fileAttachment.attachName}</td>
+									</c:when>
+									<c:otherwise>
+										<c:choose>
+											<c:when test="${fileAttachment.flag == 0}">
+												<td>${fileAttachment.attachName}</td>
+											</c:when>
+											<c:otherwise>
+												<td></td>
+											</c:otherwise>
+										</c:choose>
+									</c:otherwise>
+								</c:choose>
+								<td style="text-align:center;">
+									<c:choose>
+										<c:when test="${fileAttachment.flag == 0}">
+											${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}
+										</c:when>
+										<c:otherwise>
+											<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileAttachment.url}','90%','90%')">${fileAttachment.attachName} ; </a>
+										</c:otherwise>
+									</c:choose>
+								</td>
+								<td class="op-td" style="text-align:center;">
+									<div class="op-btn-box" >
+										<c:choose>
+											<c:when test="${fileAttachment.flag == 0}">
+
+											</c:when>
+											<c:otherwise>
+												<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+											</c:otherwise>
+										</c:choose>
+									</div>
+								</td>
+							</tr>
+						</c:forEach>
+						</tbody>
+					</table>
+				</div>
+			</div>
+
+
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>依据性资料</h2></div>
+				<div id="addFile_gistdata" style="display: none" class="upload-progress">
+					<span id="fileName_gistdata" ></span>
+					<span id="_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>序号</th>--%>
+							<th width="55%">文件类型</th>
+							<th width="">文件名</th>
+							<th width="100px">操作</th>
+						</tr>
+						</thead>
+						<tbody id="file_gistdata">
+						<c:forEach items="${projectcontentinfo.fileGistdataList}" var = "fileGistdata" varStatus="status">
+							<tr id="${fileGistdata.id}" pid="${fileGistdata.parent.id}">
+									<%-- <td>${status.index + 1}</td>--%>
+										<c:choose>
+											<c:when test="${fileGistdata.mustFlag == 1}">
+												<td><span style="color: red">* </span>${fileGistdata.attachName}</td>
+											</c:when>
+											<c:otherwise>
+												<c:choose>
+													<c:when test="${fileGistdata.flag == 0}">
+														<td>${fileGistdata.attachName}</td>
+													</c:when>
+													<c:otherwise>
+														<td></td>
+													</c:otherwise>
+												</c:choose>
+											</c:otherwise>
+										</c:choose>
+								<td style="text-align:center;">
+									<c:choose>
+										<c:when test="${fileGistdata.flag == 0}">
+												${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}
+											</c:when>
+											<c:otherwise>
+												<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileGistdata.url}','90%','90%')">${fileGistdata.attachName} ; </a>
+										</c:otherwise>
+									</c:choose>
+								</td>
+								<td class="op-td"  style="text-align:center;">
+									<div class="op-btn-box" >
+										<c:choose>
+											<c:when test="${fileGistdata.flag == 0}">
+
+											</c:when>
+											<c:otherwise>
+												<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileGistdata.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+											</c:otherwise>
+										</c:choose>
+									</div>
+								</td>
+							</tr>
+						</c:forEach>
+						</tbody>
+					</table>
+				</div>
+			</div>
+
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>其他文件</h2></div>
+				<div id="addFile_other" style="display: none" class="upload-progress">
+					<span id="fileName_other" ></span>
+					<span id="_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>序号</th>--%>
+							<th width="55%">文件类型</th>
+							<th width="">文件名</th>
+							<th width="100px">操作</th>
+						</tr>
+						</thead>
+						<tbody id="file_other">
+						<c:forEach items="${projectcontentinfo.fileOtherList}" var = "fileOther" varStatus="status">
+							<tr id="${fileOther.id}" pid="${fileOther.parent.id}">
+									<%-- <td>${status.index + 1}</td>--%>
+										<c:choose>
+											<c:when test="${fileOther.mustFlag == 1}">
+												<td><span style="color: red">* </span>${fileOther.attachName}</td>
+											</c:when>
+											<c:otherwise>
+												<c:choose>
+													<c:when test="${fileOther.flag == 0}">
+														<td>${fileOther.attachName}</td>
+													</c:when>
+													<c:otherwise>
+														<td></td>
+													</c:otherwise>
+												</c:choose>
+											</c:otherwise>
+										</c:choose>
+										<td style="text-align:center;">
+											<c:choose>
+												<c:when test="${fileOther.flag == 0}">
+													${fileOther.attachLength}M;  ${fileOther.attachTypes}
+												</c:when>
+												<c:otherwise>
+													<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.url}','90%','90%')">${fileOther.attachName} ; </a>
+												</c:otherwise>
+											</c:choose>
+										</td>
+										<td class="op-td" style="text-align:center;">
+											<div class="op-btn-box" >
+												<c:choose>
+													<c:when test="${fileOther.flag == 0}">
+
+													</c:when>
+													<c:otherwise>
+														<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileOther.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+													</c:otherwise>
+												</c:choose>
+											</div>
+										</td>
+							</tr>
+						</c:forEach>
+						</tbody>
+					</table>
+				</div>
+			</div>
+		<div class="form-group layui-row page-end"></div>
+		</form:form>
+	</div>
+</div>
+</body>
+</html>

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

@@ -158,6 +158,19 @@
             $("#addFile"+divId).show();
             multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,size);}
         }
+		function listTr(obj){
+			var name=$(obj).attr("id");
+			var tiao="."+name;
+			var span=$(obj).find("td").eq(2);
+			// var ss=$(span).val().split(" ")[4];
+			$(span).toggle(function () {
+				$(tiao).hide();
+				$(span).find("span").attr("class","treeTable-icon")
+			},function () {
+				$(tiao).show();
+				$(span).find("span").attr("class","treeTable-icon open")
+			});
+		}
 	</script>
 </head>
 <body>
@@ -291,9 +304,9 @@
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>成果文件</h2></div>
-				<div class="layui-item nav-btns">
-					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=1&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
-				</div>
+<%--				<div class="layui-item nav-btns">--%>
+<%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=1&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
+<%--				</div>--%>
 				<div id="addFile_attachment" style="display: none" class="upload-progress">
 					<span id="fileName_attachment" ></span>
 					<span id="_attachment" ></span>
@@ -310,39 +323,46 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th>电子件名称</th>
-							<th width="100px">最大容量(M)</th>
-							<th width="18%">类型限制</th>
-							<th>文件名</th>
+							<th width="40%">电子件名称</th>
+<%--							<th width="100px">最大容量(M)</th>--%>
+							<th width="">类型限制</th>
+<%--							<th>文件名</th>--%>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_attachment">
 						<c:forEach items="${projectReportRecord.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-							<tr>
+							<tr  id="file_attachment_${fileAttachment.id}_tr" onclick="listTr(this)">
 								<td style="display:none">${fileAttachment.id}</td>
 								<td style="display:none">${fileAttachment.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileAttachment.mustFlag == 1}">
-										<td><span style="color: red">* </span>${fileAttachment.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileAttachment.attachName}</td>
 									</c:when>
 									<c:otherwise>
-										<td>${fileAttachment.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileAttachment.attachName}</td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileAttachment.attachLength}</td>
-								<td>${fileAttachment.attachTypes}</td>
-								<td>
-									<c:forEach items="${fileAttachment.workAttachments}" var = "workAttachment" varStatus="status">
-										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
-									</c:forEach>
-								</td>
+								<td>${fileAttachment.attachLength}M；${fileAttachment.attachTypes}</td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
 								</td>
 							</tr>
+							<c:forEach items="${fileAttachment.workAttachments}" var = "workAttachment" varStatus="status">
+								<tr class="file_attachment_${fileAttachment.id}_tr">
+									<td></td>
+									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>
+									<td class="op-td">
+										<div class="op-btn-box" >
+											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+
+												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
+										</div>
+									</td>
+								</tr>
+							</c:forEach>
 						</c:forEach>
 						</tbody>
 					</table>
@@ -357,16 +377,10 @@
                         0
                     </td>
                     <td style="text-align:center;">
-                        {{row.attachName}}
+                        <span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>{{row.attachName}}
                     </td>
                     <td style="text-align:center;">
-                        {{row.attachLength}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachTypes}}
-                    </td>
-                    <td style="text-align:center;">
-
+                        {{row.attachLength}}M；{{row.attachTypes}}
                     </td>
 					<td class="op-td">
 						<div class="op-btn-box" >
@@ -378,10 +392,10 @@
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>依据性资料</h2></div>
-				<div class="layui-item nav-btns">
-						<%--<a id="gistdata_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=1&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
-				</div>
+<%--				<div class="layui-item nav-btns">--%>
+<%--						&lt;%&ndash;<a id="gistdata_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>&ndash;%&gt;--%>
+<%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=1&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
+<%--				</div>--%>
 				<div id="addFile_gistdata" style="display: none" class="upload-progress">
 					<span id="fileName_gistdata" ></span>
 					<span id="_gistdata" ></span>
@@ -398,40 +412,48 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th>电子件名称</th>
-							<th width="100px">最大容量(M)</th>
-							<th width="18%">类型限制</th>
-							<th>文件名</th>
+							<th  width="40%">电子件名称</th>
+<%--							<th width="100px">最大容量(M)</th>--%>
+							<th width="">类型限制</th>
+<%--							<th>文件名</th>--%>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_gistdata">
 						<c:forEach items="${projectReportRecord.fileGistdataList}" var = "fileGistdata" varStatus="status">
-							<tr>
+							<tr  id="file_gistdata_${fileGistdata.id}_tr" onclick="listTr(this)">
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileGistdata.id}</td>
 								<td style="display:none">${fileGistdata.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileGistdata.mustFlag == 1}">
-										<td><span style="color: red">* </span>${fileGistdata.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileGistdata.attachName}</td>
 									</c:when>
 									<c:otherwise>
-										<td>${fileGistdata.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileGistdata.attachName}</td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileGistdata.attachLength}</td>
-								<td>${fileGistdata.attachTypes}</td>
-								<td>
-									<c:forEach items="${fileGistdata.workAttachments}" var = "workAttachment" varStatus="status">
-										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
-									</c:forEach>
-								</td>
+								<td></td>
+								<td>${fileGistdata.attachLength}M;${fileGistdata.attachTypes}</td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${project.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
 								</td>
 							</tr>
+							<c:forEach items="${fileAttachment.workAttachments}" var = "workAttachment" varStatus="status">
+								<tr class="file_gistdata_${fileGistdata.id}_tr">
+									<td></td>
+									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>
+									<td class="op-td">
+										<div class="op-btn-box" >
+											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+
+												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
+										</div>
+									</td>
+								</tr>
+							</c:forEach>
 						</c:forEach>
 						</tbody>
 					</table>
@@ -446,16 +468,10 @@
                         0
                     </td>
                     <td style="text-align:center;">
-                        {{row.attachName}}
+                        <span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>{{row.attachName}}
                     </td>
                     <td style="text-align:center;">
-                        {{row.attachLength}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachTypes}}
-                    </td>
-                    <td style="text-align:center;">
-
+                        {{row.attachLength}}M;{{row.attachTypes}}
                     </td>
 					<td class="op-td">
 						<div class="op-btn-box" >
@@ -467,10 +483,10 @@
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>其他文件</h2></div>
-				<div class="layui-item nav-btns">
-						<%--<a id="other_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=13&projectType=1&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_other')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
-				</div>
+<%--				<div class="layui-item nav-btns">--%>
+<%--						&lt;%&ndash;<a id="other_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>&ndash;%&gt;--%>
+<%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=13&projectType=1&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_other')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
+<%--				</div>--%>
 				<div id="addFile_other" style="display: none" class="upload-progress">
 					<span id="fileName_other" ></span>
 					<span id="_other" ></span>
@@ -487,29 +503,28 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th>电子件名称</th>
-							<th width="100px">最大容量(M)</th>
-							<th width="18%">类型限制</th>
-							<th>文件名</th>
+							<th width="40%">电子件名称</th>
+<%--							<th width="100px">最大容量(M)</th>--%>
+							<th>类型限制</th>
+<%--							<th>文件名</th>--%>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_other">
 						<c:forEach items="${projectReportRecord.fileOtherList}" var = "fileOther" varStatus="status">
-							<tr>
+							<tr   id="file_gistdata_${fileOther.id}_tr" onclick="listTr(this)">
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileOther.id}</td>
 								<td style="display:none">${fileOther.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileOther.mustFlag == 1}">
-										<td><span style="color: red">* </span>${fileOther.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileOther.attachName}</td>
 									</c:when>
 									<c:otherwise>
-										<td>${fileOther.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileOther.attachName}</td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileOther.attachLength}</td>
-								<td>${fileOther.attachTypes}</td>
+								<td>${fileOther.attachLength}M;${fileOther.attachTypes}</td>
 								<td>
 									<c:forEach items="${fileOther.workAttachments}" var = "workAttachment" varStatus="status">
 										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
@@ -521,6 +536,19 @@
 									</div>
 								</td>
 							</tr>
+							<c:forEach items="${fileAttachment.workAttachments}" var = "workAttachment" varStatus="status">
+								<tr class="file_gistdata_${fileOther.id}_tr">
+									<td></td>
+									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>
+									<td class="op-td">
+										<div class="op-btn-box" >
+											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+
+												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
+										</div>
+									</td>
+								</tr>
+							</c:forEach>
 						</c:forEach>
 						</tbody>
 					</table>

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

@@ -322,9 +322,9 @@
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>成果文件</h2></div>
-				<div class="layui-item nav-btns">
-					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=1&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
-				</div>
+<%--				<div class="layui-item nav-btns">--%>
+<%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=1&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
+<%--				</div>--%>
 				<div id="addFile_attachment" style="display: none" class="upload-progress">
 					<span id="fileName_attachment" ></span>
 					<span id="_attachment" ></span>
@@ -341,39 +341,47 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th>电子件名称</th>
-							<th width="100px">最大容量(M)</th>
-							<th width="18%">类型限制</th>
-							<th>文件名</th>
+							<th width="30%">电子件名称</th>
+<%--							<th width="100px">最大容量(M)</th>--%>
+							<th width="">类型限制</th>
+<%--							<th>文件名</th>--%>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_attachment">
 						<c:forEach items="${projectReportRecord.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-							<tr>
+							<tr id="file_attachment_${fileAttachment.id}_tr" onclick="listTr(this)">
 								<td style="display:none">${fileAttachment.id}</td>
 								<td style="display:none">${fileAttachment.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileAttachment.mustFlag == 1}">
-										<td><span style="color: red">* </span>${fileAttachment.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileAttachment.attachName}</td>
 									</c:when>
 									<c:otherwise>
-										<td>${fileAttachment.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileAttachment.attachName}</td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileAttachment.attachLength}</td>
-								<td>${fileAttachment.attachTypes}</td>
-								<td>
-									<c:forEach items="${fileAttachment.workAttachments}" var = "workAttachment" varStatus="status">
-										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
-									</c:forEach>
-								</td>
+								<td>${fileAttachment.attachLength}M；${fileAttachment.attachTypes}</td>
+<%--								<td></td>--%>
 								<td class="op-td">
 									<div class="op-btn-box" >
-										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
 								</td>
 							</tr>
+							<c:forEach items="${fileAttachment.workAttachments}" var = "workAttachment" varStatus="status">
+								<tr class="file_attachment_${fileAttachment.id}_tr">
+									<td></td>
+									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>
+									<td class="op-td">
+										<div class="op-btn-box" >
+											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+
+<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
+										</div>
+									</td>
+								</tr>
+							</c:forEach>
 						</c:forEach>
 						</tbody>
 					</table>
@@ -388,16 +396,10 @@
                         0
                     </td>
                     <td style="text-align:center;">
-                        {{row.attachName}}
+                       <span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span> {{row.attachName}}
                     </td>
                     <td style="text-align:center;">
-                        {{row.attachLength}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachTypes}}
-                    </td>
-                    <td style="text-align:center;">
-
+                        {{row.attachLength}}M；{{row.attachTypes}}
                     </td>
 					<td class="op-td">
 						<div class="op-btn-box" >
@@ -409,10 +411,10 @@
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>依据性资料</h2></div>
-				<div class="layui-item nav-btns">
-						<%--<a id="gistdata_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=1&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
-				</div>
+<%--				<div class="layui-item nav-btns">--%>
+<%--						&lt;%&ndash;<a id="gistdata_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>&ndash;%&gt;--%>
+<%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=1&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
+<%--				</div>--%>
 				<div id="addFile_gistdata" style="display: none" class="upload-progress">
 					<span id="fileName_gistdata" ></span>
 					<span id="_gistdata" ></span>
@@ -429,40 +431,47 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th>电子件名称</th>
-							<th width="100px">最大容量(M)</th>
-							<th width="18%">类型限制</th>
-							<th>文件名</th>
+							<th width="30%">电子件名称</th>
+<%--							<th width="100px">最大容量(M)</th>--%>
+							<th width="">类型限制</th>
+<%--							<th>文件名</th>--%>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_gistdata">
 						<c:forEach items="${projectReportRecord.fileGistdataList}" var = "fileGistdata" varStatus="status">
-							<tr>
+							<tr id="file_gistdata_${fileGistdata.id}_tr" onclick="listTr(this)">
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileGistdata.id}</td>
 								<td style="display:none">${fileGistdata.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileGistdata.mustFlag == 1}">
-										<td><span style="color: red">* </span>${fileGistdata.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileGistdata.attachName}</td>
 									</c:when>
 									<c:otherwise>
-										<td>${fileGistdata.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileGistdata.attachName}</td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileGistdata.attachLength}</td>
-								<td>${fileGistdata.attachTypes}</td>
-								<td>
-									<c:forEach items="${fileGistdata.workAttachments}" var = "workAttachment" varStatus="status">
-										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
-									</c:forEach>
-								</td>
+								<td>${fileGistdata.attachLength}M；${fileGistdata.attachTypes}</td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${project.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
 								</td>
 							</tr>
+							<c:forEach items="${fileGistdata.workAttachments}" var = "workAttachment" varStatus="status">
+								<tr class="file_gistdata_${fileGistdata.id}_tr">
+									<td></td>
+									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>
+									<td class="op-td">
+										<div class="op-btn-box" >
+											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+
+<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
+										</div>
+									</td>
+								</tr>
+							</c:forEach>
 						</c:forEach>
 						</tbody>
 					</table>
@@ -477,16 +486,10 @@
                         0
                     </td>
                     <td style="text-align:center;">
-                        {{row.attachName}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachLength}}
+                        <span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>{{row.attachName}}
                     </td>
                     <td style="text-align:center;">
-                        {{row.attachTypes}}
-                    </td>
-                    <td style="text-align:center;">
-
+                        {{row.attachLength}}M；{{row.attachTypes}}
                     </td>
 					<td class="op-td">
 						<div class="op-btn-box" >
@@ -498,10 +501,10 @@
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>其他文件</h2></div>
-				<div class="layui-item nav-btns">
-						<%--<a id="other_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=13&projectType=1&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_other')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
-				</div>
+<%--				<div class="layui-item nav-btns">--%>
+<%--						&lt;%&ndash;<a id="other_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>&ndash;%&gt;--%>
+<%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=13&projectType=1&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_other')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
+<%--				</div>--%>
 				<div id="addFile_other" style="display: none" class="upload-progress">
 					<span id="fileName_other" ></span>
 					<span id="_other" ></span>
@@ -518,40 +521,49 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th>电子件名称</th>
-							<th width="100px">最大容量(M)</th>
-							<th width="18%">类型限制</th>
-							<th>文件名</th>
+							<th width="30%">电子件名称</th>
+<%--							<th width="100px">最大容量(M)</th>--%>
+							<th width="">类型限制</th>
+<%--							<th>文件名</th>--%>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_other">
 						<c:forEach items="${projectReportRecord.fileOtherList}" var = "fileOther" varStatus="status">
-							<tr>
+							<tr id="file_other_${fileOther.id}_tr" onclick="listTr(this)">
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileOther.id}</td>
 								<td style="display:none">${fileOther.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileOther.mustFlag == 1}">
-										<td><span style="color: red">* </span>${fileOther.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileOther.attachName}</td>
 									</c:when>
 									<c:otherwise>
-										<td>${fileOther.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileOther.attachName}</td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileOther.attachLength}</td>
-								<td>${fileOther.attachTypes}</td>
-								<td>
-									<c:forEach items="${fileOther.workAttachments}" var = "workAttachment" varStatus="status">
-										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
-									</c:forEach>
-								</td>
+<%--								<td></td>--%>
+								<td>${fileOther.attachLength}M；${fileOther.attachTypes}</td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
 								</td>
 							</tr>
+							<c:forEach items="${fileOther.workAttachments}" var = "workAttachment" varStatus="status">
+								<tr class="file_other_${fileOther.id}_tr">
+									<td></td>
+									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
+									</td>
+									<td class="op-td">
+										<div class="op-btn-box" >
+											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+
+<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
+										</div>
+									</td>
+								</tr>
+							</c:forEach>
 						</c:forEach>
 						</tbody>
 					</table>
@@ -566,17 +578,12 @@
                         0
                     </td>
                     <td style="text-align:center;">
-                        {{row.attachName}}
+                       <span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span> {{row.attachName}}
                     </td>
                     <td style="text-align:center;">
-                        {{row.attachLength}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachTypes}}
-                    </td>
-                    <td style="text-align:center;">
-
+                        {{row.attachLength}}M；{{row.attachTypes}}
                     </td>
+                    <td style
 					<td class="op-td">
 						<div class="op-btn-box" >
 							<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId={{row.id}}&projectId=${project.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
@@ -675,8 +682,11 @@
 <script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
 <script src="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.js" charset="utf-8"></script>
 <script>
-	function openBill2(title,url,width,height,target,formId,tableId){
+	function openBill2(title,url,width,height,target,formId,tableId,obj){
 		var rows = $(this).parent().prevAll().length + 1;
+		var tbody="#"+$(obj).parent().parent().parent().parent().attr("id");
+		var trname=$(obj).parent().parent().parent().attr("id");
+		var filetr="."+$(obj).parent().parent().parent().attr("id");
 		var frameIndex = parent.layer.getFrameIndex(window.name);
 		var urls = url+"&index="+frameIndex;
 		if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
@@ -706,7 +716,24 @@
 				inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
 				inputForm.attr("action","${ctx}/projectAccessory/projectAccessory/saveWorkAttachment");//表单提交成功后，从服务器返回的url在当前tab中展示
 				var $document = iframeWin.contentWindow.document;
-
+				var files=iframeWin.contentWindow.showfile()
+				var xias=iframeWin.contentWindow.showfileXia()
+				// if(files.length!=0){
+				// 	// var name=filetr
+				// 	$(filetr).remove();
+				// 	for (var i=0;i<files.length;i++){
+				// 		$(tbody).append(
+				// 				"<tr class='"+trname+"'>" +
+				// 				"<td></td>" +
+				// 				"<td>" +
+				// 				files[i]+
+				// 				"</td>" +
+				// 				"<td>" +
+				// 				"</td>" +
+				// 				"</tr>"
+				// 	)
+				// 	}
+				// }
 				formSubmit2($document,formId,index,tableId);
 
 			},
@@ -938,7 +965,19 @@
 		})
 		return;
 	}
-
+	function listTr(obj){
+		var name=$(obj).attr("id");
+		var tiao="."+name;
+		var span=$(obj).find("td").eq(2);
+		// var ss=$(span).val().split(" ")[4];
+		$(span).toggle(function () {
+			$(tiao).hide();
+			$(span).find("span").attr("class","treeTable-icon")
+		},function () {
+			$(tiao).show();
+			$(span).find("span").attr("class","treeTable-icon open")
+		});
+	}
 	function confirmDelete(mess, href){
 		top.layer.confirm(mess, {icon: 3, title:'系统提示'}, function(index){
 			//do something

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

@@ -56,6 +56,7 @@
 			<c:if test="${not empty project.id}">
 				<li class="active"><a href="${ctx}/ruralProject/ruralProjectMessage/formRecord?reportId=${project.id}&view=view">项目线上归档信息</a></li>
 			</c:if>
+			<li><a href="${ctx}/ruralProject/ruralProjectRecords/getAccessoryView?id=${project.id}">附件信息</a></li>
 		</ul>
 	</div>
 	<div class="container view-form">
@@ -201,10 +202,10 @@
 			<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-hover list-table">
+				<table id="upTable" class="table table-bordered table-condensed details">
 					<thead>
 					<tr>
-						<th width="40%">文件类型</th>
+						<th width="55%">文件类型</th>
 						<th width="">文件名</th>
 						<th width="100px">操作</th>
 					</tr>
@@ -241,10 +242,10 @@
 								<div class="op-btn-box" >
 									<c:choose>
 										<c:when test="${fileAttachment.flag == 0}">
-											<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+
 										</c:when>
 										<c:otherwise>
-											<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileAttachment.parent.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 										</c:otherwise>
 									</c:choose>
 								</div>
@@ -270,10 +271,10 @@
 			<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-hover list-table">
+				<table id="gistdata_upTable" class="table table-bordered table-condensed details">
 					<thead>
 					<tr>
-						<th width="40%">文件类型</th>
+						<th width="55%">文件类型</th>
 						<th width="">文件名</th>
 						<th width="100px">操作</th>
 					</tr>
@@ -311,10 +312,10 @@
 								<div class="op-btn-box" >
 									<c:choose>
 										<c:when test="${fileGistdata.flag == 0}">
-											<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileGistdata.id}&projectId=${project.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+
 										</c:when>
 										<c:otherwise>
-											<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileGistdata.parent.id}&projectId=${project.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileGistdata.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 										</c:otherwise>
 									</c:choose>
 								</div>
@@ -342,10 +343,10 @@
 			<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-hover list-table">
+				<table id="upTable_other" class="table table-bordered table-condensed details">
 					<thead>
 					<tr>
-						<th width="40%">文件类型</th>
+						<th width="55%">文件类型</th>
 						<th width="">文件名</th>
 						<th width="100px">操作</th>
 					</tr>
@@ -383,10 +384,10 @@
 								<div class="op-btn-box" >
 									<c:choose>
 										<c:when test="${fileOther.flag == 0}">
-											<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileOther.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+
 										</c:when>
 										<c:otherwise>
-											<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileOther.parent.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileOther.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 										</c:otherwise>
 									</c:choose>
 								</div>

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

@@ -233,7 +233,7 @@
                     formatNum($("#contractPrice"));
                     $("#contractClientName").val(data.client.name);
                     $("#contractClientId").val(data.client.id);
-                    $("#constructionProjectType").val(data.constructionProjectTypeStr);
+                    $("#constructionProjectType").val(data.contractType);
                     $("#linkmanId").val(data.workClinetInfoIds);
                     //清理之前的联系人
                     var newClientId  = data.client.id;
@@ -730,7 +730,7 @@
                    </div>--%>
                    <div id="divv3">
                        <div class="layui-item layui-col-sm6 lw7">
-                           <label class="layui-form-label">工程分类：</label>
+                           <label class="layui-form-label">合同类型：</label>
                            <div class="layui-input-block">
                                <input htmlEscape="false"  readonly="true" id="constructionProjectType"  class="form-control layui-input" value="${ruralProjectRecords.workContractInfo.constructionProjectTypeStr}"/>
                            </div>

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

@@ -79,6 +79,7 @@
 			<c:if test="${not empty projectId}">
 				<li><a href="${ctx}/ruralProject/ruralProjectMessage/formRecord?reportId=${projectId}&view=view">项目线上归档信息</a></li>
 			</c:if>
+			<li><a href="${ctx}/ruralProject/ruralProjectRecords/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>
 		</ul>
 	</div>
 	<div class="container view-form">
@@ -439,7 +440,7 @@
 				</div>
 			</div>
 
-			<div class="form-group layui-row">
+			<%--<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">
@@ -466,18 +467,18 @@
 											<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>--%>
+												&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>
@@ -498,7 +499,7 @@
 						</tbody>
 					</table>
 				</div>
-			</div>
+			</div>--%>
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>项目计划列表</h2></div>
 				<div class="layui-item layui-col-sm12 lw7">

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

@@ -12,6 +12,12 @@
             if(validateForm.form()){
                 if(obj == 1) {
                     $("#flag").val("yes");
+                    var technicistRemarks = $("#technicistRemarks").val();
+                    var type = $("#type").val();
+                    if( type==4 && (undefined == technicistRemarks || null ==technicistRemarks || '' ==technicistRemarks)){
+						top.layer.msg("请填写专业咨询员审核意见！", {icon: 0});
+						return false;
+					}
                     /*if($("#taskDefKey").val()== "projectplan" && $(".trIdAdds").length==0){
                         top.layer.alert('请至少上传一个项目计划表或者实施方案文档！', {icon: 0});
                         return;
@@ -25,7 +31,9 @@
                 }
                 $("#inputForm").submit();
                 return true;
-            }
+            }else{
+				parent.layer.msg("信息未填写完整!", {icon: 5});
+			}
 
             return false;
         }
@@ -117,7 +125,7 @@
 			<form:hidden path="projectReportData.act.procDefId"/>
 			<form:hidden id="flag" path="projectReportData.act.flag"/>
 			<c:set var="status" value="${projectReportData.act.status}" />
-
+			<input type="hidden" id="type" value="${type}">
 
 			<sys:message content="${message}"/>
 			<div class="form-group layui-row first lw12">
@@ -340,7 +348,7 @@
 				</div>
 			</div>
 			<div class="form-group layui-row first lw12">
-				<div class="form-group-label"><h2>合同信息</h2></div>
+				<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">
@@ -453,9 +461,9 @@
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm12 lw7 with-textarea">
-						<label class="layui-form-label double-line">专业咨询员审核意见：</label>
+						<label class="layui-form-label double-line"><span class="require-item">*</span>专业咨询员审核意见：</label>
 						<div class="layui-input-block">
-							<form:textarea path="projectReportData.technicistRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+							<form:textarea path="projectReportData.technicistRemarks" id="technicistRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control"/>
 						</div>
 					</div>
 				</c:if>
@@ -474,10 +482,10 @@
 				<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-hover list-table">
+					<table id="upTable" class="table table-bordered table-condensed details">
 						<thead>
 						<tr>
-							<th width="40%">文件类型</th>
+							<th width="55%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -514,10 +522,10 @@
 									<div class="op-btn-box" >
 										<c:choose>
 											<c:when test="${fileAttachment.flag == 0}">
-												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileAttachment.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+
 											</c:when>
 											<c:otherwise>
-												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileAttachment.parent.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+												<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 											</c:otherwise>
 										</c:choose>
 									</div>
@@ -542,10 +550,10 @@
 				<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-hover list-table">
+					<table id="gistdata_upTable" class="table table-bordered table-condensed details">
 						<thead>
 						<tr>
-							<th width="40%">文件类型</th>
+							<th width="55%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -583,10 +591,10 @@
 									<div class="op-btn-box" >
 										<c:choose>
 											<c:when test="${fileGistdata.flag == 0}">
-												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileGistdata.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+
 											</c:when>
 											<c:otherwise>
-												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileGistdata.parent.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+												<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileGistdata.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 											</c:otherwise>
 										</c:choose>
 									</div>
@@ -613,10 +621,10 @@
 				<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-hover list-table">
+					<table id="upTable_other" class="table table-bordered table-condensed details">
 						<thead>
 						<tr>
-							<th width="40%">文件类型</th>
+							<th width="55%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -654,10 +662,10 @@
 									<div class="op-btn-box" >
 										<c:choose>
 											<c:when test="${fileOther.flag == 0}">
-												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileOther.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+
 											</c:when>
 											<c:otherwise>
-												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileOther.parent.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+												<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileOther.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 											</c:otherwise>
 										</c:choose>
 									</div>

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

@@ -4,7 +4,21 @@
 <head>
     <title>项目审批管理</title>
     <meta name="decorator" content="default"/>
+    <link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
     <script type="text/javascript">
+        function listTr(obj){
+            var name=$(obj).attr("id");
+            var tiao="."+name;
+            var span=$(obj).find("td").eq(2);
+            // var ss=$(span).val().split(" ")[4];
+            $(span).toggle(function () {
+                $(tiao).hide();
+                $(span).find("span").attr("class","treeTable-icon")
+            },function () {
+                $(tiao).show();
+                $(span).find("span").attr("class","treeTable-icon open")
+            });
+        }
         var validateForm;
         function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
@@ -510,7 +524,7 @@
                 </div>
             </div>
             <div class="form-group layui-row first lw12">
-                <div class="form-group-label"><h2>合同信息</h2></div>
+                <div class="form-group-label"><h2>报告信息</h2></div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
                     <div class="layui-input-block with-icon">
@@ -572,15 +586,15 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>工作开始日期：</label>
+                    <label class="layui-form-label">工作开始日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate form-control layui-input laydate-icon required" readonly="readonly" id="startDate" name="projectOnRural.startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate form-control layui-input laydate-icon" readonly="readonly" id="startDate" name="projectOnRural.startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>工作结束日期：</label>
+                    <label class="layui-form-label">工作结束日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate form-control layui-input laydate-icon required" readonly="readonly" id="endingDate" name="projectOnRural.endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate form-control layui-input laydate-icon" readonly="readonly" id="endingDate" name="projectOnRural.endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
             </div>
@@ -594,9 +608,9 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm12 lw7 with-textarea">
-                    <label class="layui-form-label double-line">专业咨询员审核意见：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>专业咨询员审核意见：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="projectReportData.consultantRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+                        <form:textarea path="projectReportData.consultantRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -607,9 +621,9 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm12 lw7 with-textarea">
-                    <label class="layui-form-label double-line">项目负责人审核意见：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>项目负责人审核意见：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="projectReportData.principalRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+                        <form:textarea path="projectReportData.principalRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required"/>
                     </div>
                 </div>
             </div>
@@ -630,32 +644,40 @@
                     <table id="upTable" class="table table-bordered table-condensed details">
                         <thead>
                         <tr>
-                            <th>电子件名称</th>
-                            <th width="100px">最大容量(M)</th>
-                            <th width="18%">类型限制</th>
-                            <th>文件名</th>
+                            <th width="40%">电子件名称</th>
+<%--                            <th width="100px">最大容量(M)</th>--%>
+                            <th >类型限制</th>
+<%--                            <th>文件名</th>--%>
                             <th width="150px">操作</th>
                         </tr>
                         </thead>
                         <tbody id="file_attachment">
                         <c:forEach items="${projectcontentinfo.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-                                <tr>
+                                <tr id="file_attachment_${fileAttachment.id}_tr" onclick="listTr(this)">
                                     <td style="display:none">${fileAttachment.id}</td>
                                     <td style="display:none">${fileAttachment.mustFlag}</td>
-                                    <td>${fileAttachment.attachName}</td>
-                                    <td>${fileAttachment.attachLength}</td>
-                                    <td>${fileAttachment.attachTypes}</td>
-                                    <td>
-                                        <c:forEach items="${fileAttachment.workAttachments}" var = "workAttachment" varStatus="status">
-                                            <a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
-                                        </c:forEach>
+                                    <td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileAttachment.attachName}</td>
+                                    <td>${fileAttachment.attachLength}M;${fileAttachment.attachTypes}</td>
+                                    <td class="op-td">
+                                        <div class="op-btn-box" >
+                                            <a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${projectcontentinfo.project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+                                        </div>
                                     </td>
+                                </tr>
+                            <c:forEach items="${fileAttachment.workAttachments}" var = "workAttachment" varStatus="status">
+                                <tr class="file_attachment_${fileAttachment.id}_tr">
+                                    <td></td>
+                                    <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>
                                     <td class="op-td">
                                         <div class="op-btn-box" >
-                                            <a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${projectcontentinfo.project.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+                                            <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+
+                                                <%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
                                         </div>
                                     </td>
                                 </tr>
+<%--                                <a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>--%>
+                            </c:forEach>
                         </c:forEach>
                         </tbody>
                     </table>
@@ -677,33 +699,41 @@
                 <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>电子件名称</th>
-                            <th width="100px">最大容量(M)</th>
-                            <th width="18%">类型限制</th>
-                            <th>文件名</th>
+                        <tr >
+                            <th width="40%">电子件名称</th>
+<%--                            <th width="100px">最大容量(M)</th>--%>
+                            <th >类型限制</th>
+<%--                            <th>文件名</th>--%>
                             <th width="150px">操作</th>
                         </tr>
                         </thead>
                         <tbody id="file_gistdata">
                         <c:forEach items="${projectcontentinfo.fileGistdataList}" var = "fileGistdata" varStatus="status">
-                                <tr>
+                                <tr id="file_gistdata_${fileGistdata.id}_tr" onclick="listTr(this)">
                                     <td style="display:none">${fileGistdata.id}</td>
                                     <td style="display:none">${fileGistdata.mustFlag}</td>
-                                    <td>${fileGistdata.attachName}</td>
-                                    <td>${fileGistdata.attachLength}</td>
-                                    <td>${fileGistdata.attachTypes}</td>
-                                    <td>
-                                        <c:forEach items="${fileGistdata.workAttachments}" var = "workAttachment" varStatus="status">
-                                            <a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
-                                        </c:forEach>
+                                    <td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileGistdata.attachName}</td>
+                                    <td>${fileGistdata.attachLength}M;${fileGistdata.attachTypes}</td>
+                                    <td class="op-td">
+                                        <div class="op-btn-box" >
+                                            <a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${projectcontentinfo.project.id}','70%','80%',false,'inputForm','gistdata_upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+                                        </div>
                                     </td>
+                                </tr>
+                            <c:forEach items="${fileGistdata.workAttachments}" var = "workAttachment" varStatus="status">
+                                <tr class="file_gistdata_${fileGistdata.id}_tr">
+                                    <td></td>
+                                    <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>
                                     <td class="op-td">
                                         <div class="op-btn-box" >
-                                            <a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${projectcontentinfo.project.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+                                            <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+
+                                                <%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
                                         </div>
                                     </td>
                                 </tr>
+<%--                                <a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>--%>
+                            </c:forEach>
                         </c:forEach>
                         </tbody>
                     </table>
@@ -726,32 +756,40 @@
                     <table id="upTable_other" class="table table-bordered table-condensed details">
                         <thead>
                         <tr>
-                            <th>电子件名称</th>
-                            <th width="100px">最大容量(M)</th>
-                            <th width="18%">类型限制</th>
-                            <th>文件名</th>
+                            <th width="40%">电子件名称</th>
+<%--                            <th width="100px">最大容量(M)</th>--%>
+                            <th >类型限制</th>
+<%--                            <th>文件名</th>--%>
                             <th width="150px">操作</th>
                         </tr>
                         </thead>
                         <tbody id="file_other">
                         <c:forEach items="${projectcontentinfo.fileOtherList}" var = "fileOther" varStatus="status">
-                                <tr>
+                                <tr id="file_other_${fileOther.id}_tr" onclick="listTr(this)">
                                     <td style="display:none">${fileOther.id}</td>
                                     <td style="display:none">${fileOther.mustFlag}</td>
-                                    <td>${fileOther.attachName}</td>
-                                    <td>${fileOther.attachLength}</td>
-                                    <td>${fileOther.attachTypes}</td>
-                                    <td>
-                                        <c:forEach items="${fileOther.workAttachments}" var = "workAttachment" varStatus="status">
-                                            <a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
-                                        </c:forEach>
-                                    </td>
+                                    <td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileOther.attachName}</td>
+                                    <td>${fileOther.attachLength}M;${fileOther.attachTypes}</td>
                                     <td class="op-td">
                                     <div class="op-btn-box" >
-                                        <a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${projectcontentinfo.project.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+                                        <a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${projectcontentinfo.project.id}','70%','80%',false,'inputForm','upTable_other',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
                                     </div>
                                 </td>
                                 </tr>
+                            <c:forEach items="${fileOther.workAttachments}" var = "workAttachment" varStatus="status">
+                                <tr class="file_other_${fileOther.id}_tr">
+                                    <td></td>
+                                    <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>
+                                    <td class="op-td">
+                                        <div class="op-btn-box" >
+                                            <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+
+                                                <%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
+                                        </div>
+                                    </td>
+                                </tr>
+<%--                                <a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>--%>
+                            </c:forEach>
                         </c:forEach>
                         </tbody>
                     </table>
@@ -782,7 +820,7 @@
     </div>
 </div>
 <script>
-    function openBill2(title,url,width,height,target,formId){
+    function openBill2(title,url,width,height,target,formId,tableId){
         var rows = $(this).parent().prevAll().length + 1;
         var frameIndex = parent.layer.getFrameIndex(window.name);
         var urls = url+"&index="+frameIndex;
@@ -814,14 +852,14 @@
                 inputForm.attr("action","${ctx}/projectAccessory/projectAccessory/saveWorkAttachment");//表单提交成功后，从服务器返回的url在当前tab中展示
                 var $document = iframeWin.contentWindow.document;
 
-                formSubmit2($document,formId,index);
+                formSubmit2($document,formId,index,tableId);
 
             },
             cancel: function(index){
             }
         });
     }
-    function formSubmit2($document,inputForm,index){
+    function formSubmit2($document,inputForm,index,tableId){
 
         var validateForm = $($document.getElementById(inputForm)).validate({
             submitHandler: function(form){
@@ -846,6 +884,7 @@
                     if(d.str.length>0){
                         parent.layer.msg(d.str,{icon:1});
                     }
+                    $("#"+tableId).load(location.href + " #"+tableId);
                     //关闭当前页
                     top.layer.close(index)
                 }

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

@@ -262,7 +262,7 @@
 				</div>
 			</div>
 			<div class="form-group layui-row first lw12">
-				<div class="form-group-label"><h2>合同信息</h2></div>
+				<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">
@@ -389,10 +389,10 @@
 				<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-hover list-table">
+					<table id="upTable" class="table table-bordered table-condensed details">
 						<thead>
 						<tr>
-							<th width="40%">文件类型</th>
+							<th width="55%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -427,14 +427,16 @@
 								</td>
 								<td class="op-td" style="text-align:center;">
 									<div class="op-btn-box" >
-										<c:choose>
-											<c:when test="${fileAttachment.flag == 0}">
-												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileAttachment.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-											</c:when>
-											<c:otherwise>
-												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileAttachment.parent.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-											</c:otherwise>
-										</c:choose>
+										<div class="op-btn-box" >
+											<c:choose>
+												<c:when test="${fileAttachment.flag == 0}">
+
+												</c:when>
+												<c:otherwise>
+													<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+												</c:otherwise>
+											</c:choose>
+										</div>
 									</div>
 								</td>
 							</tr>
@@ -457,10 +459,10 @@
 				<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-hover list-table">
+					<table id="gistdata_upTable" class="table table-bordered table-condensed details">
 						<thead>
 						<tr>
-							<th width="40%">文件类型</th>
+							<th width="55%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -498,10 +500,10 @@
 									<div class="op-btn-box" >
 										<c:choose>
 											<c:when test="${fileGistdata.flag == 0}">
-												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileGistdata.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+
 											</c:when>
 											<c:otherwise>
-												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileGistdata.parent.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+												<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileGistdata.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 											</c:otherwise>
 										</c:choose>
 									</div>
@@ -528,10 +530,10 @@
 				<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-hover list-table">
+					<table id="upTable_other" class="table table-bordered table-condensed details">
 						<thead>
 						<tr>
-							<th width="40%">文件类型</th>
+							<th width="55%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -569,10 +571,10 @@
 									<div class="op-btn-box" >
 										<c:choose>
 											<c:when test="${fileOther.flag == 0}">
-												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileOther.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+
 											</c:when>
 											<c:otherwise>
-												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileOther.parent.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+												<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileOther.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 											</c:otherwise>
 										</c:choose>
 									</div>

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

@@ -4,6 +4,8 @@
 <head>
 	<title>报告详情管理</title>
 	<meta name="decorator" content="default"/>
+	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
+
 	<style>
 		label.error{
 			top:40px;
@@ -475,7 +477,19 @@
                 }
             })
         }
-
+		function listTr(obj){
+			var name=$(obj).attr("id");
+			var tiao="."+name;
+			var span=$(obj).find("td").eq(2);
+			// var ss=$(span).val().split(" ")[4];
+			$(span).toggle(function () {
+				$(tiao).hide();
+				$(span).find("span").attr("class","treeTable-icon")
+			},function () {
+				$(tiao).show();
+				$(span).find("span").attr("class","treeTable-icon open")
+			});
+		}
 	</script>
 </head>
 <body>
@@ -845,9 +859,9 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 lw7 with-textarea">
-					<label class="layui-form-label double-line">专业咨询员审核意见：</label>
+					<label class="layui-form-label double-line"><span class="require-item">*</span>专业咨询员审核意见：</label>
 					<div class="layui-input-block">
-						<form:textarea path="projectReportData.consultantRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+						<form:textarea path="projectReportData.consultantRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw7">
@@ -858,9 +872,9 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 lw7 with-textarea">
-					<label class="layui-form-label double-line">项目负责人审核意见：</label>
+					<label class="layui-form-label double-line"><span class="require-item">*</span>项目负责人审核意见：</label>
 					<div class="layui-input-block">
-						<form:textarea path="projectReportData.principalRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+						<form:textarea path="projectReportData.principalRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required"/>
 					</div>
 				</div>
 			</div>
@@ -886,40 +900,48 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th>电子件名称</th>
-							<th width="100px">最大容量(M)</th>
-							<th width="18%">类型限制</th>
-							<th>文件名</th>
+							<th width="40%">电子件名称</th>
+<%--							<th width="100px">最大容量(M)</th>--%>
+							<th >类型限制</th>
+<%--							<th>文件名</th>--%>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_attachment">
 						<c:forEach items="${projectcontentinfo.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-							<tr>
+							<tr  id="file_attachment_${fileAttachment.id}_tr" onclick="listTr(this)">
 								<td style="display:none">${fileAttachment.id}</td>
 								<td style="display:none">${fileAttachment.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileAttachment.mustFlag == 1}">
-										<td><span style="color: red">* </span>${fileAttachment.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileAttachment.attachName}</td>
 									</c:when>
 									<c:otherwise>
-										<td>${fileAttachment.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileAttachment.attachName}</td>
 									</c:otherwise>
 								</c:choose>
 
-								<td>${fileAttachment.attachLength}</td>
-								<td>${fileAttachment.attachTypes}</td>
-								<td>
-									<c:forEach items="${fileAttachment.workAttachments}" var = "workAttachment" varStatus="status">
-										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
-									</c:forEach>
-								</td>
+								<td>${fileAttachment.attachLength}M;${fileAttachment.attachTypes}</td>
+
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
 								</td>
 							</tr>
+							<c:forEach items="${fileAttachment.workAttachments}" var = "workAttachment" varStatus="status">
+								<tr class="file_attachment_${fileAttachment.id}_tr">
+									<td></td>
+									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>
+									<td class="op-td">
+										<div class="op-btn-box" >
+											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+
+												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
+										</div>
+									</td>
+								</tr>
+							</c:forEach>
 						</c:forEach>
 						</tbody>
 					</table>
@@ -974,42 +996,50 @@
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
 					<table id="gistdata_upTable" class="table table-bordered table-condensed details">
 						<thead>
-						<tr>
+						<tr >
 								<%-- <th>序号</th>--%>
-							<th>电子件名称</th>
-							<th width="100px">最大容量(M)</th>
-							<th width="18%">类型限制</th>
-							<th>文件名</th>
+							<th width="40%">电子件名称</th>
+<%--							<th width="100px">最大容量(M)</th>--%>
+							<th >类型限制</th>
+<%--							<th>文件名</th>--%>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_gistdata">
 						<c:forEach items="${projectcontentinfo.fileGistdataList}" var = "fileGistdata" varStatus="status">
-							<tr>
+							<tr  id="file_gistdata_${fileGistdata.id}_tr" onclick="listTr(this)">
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileGistdata.id}</td>
 								<td style="display:none">${fileGistdata.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileGistdata.mustFlag == 1}">
-										<td><span style="color: red">* </span>${fileGistdata.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileGistdata.attachName}</td>
 									</c:when>
 									<c:otherwise>
-										<td>${fileGistdata.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileGistdata.attachName}</td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileGistdata.attachLength}</td>
-								<td>${fileGistdata.attachTypes}</td>
-								<td>
-									<c:forEach items="${fileGistdata.workAttachments}" var = "workAttachment" varStatus="status">
-										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
-									</c:forEach>
-								</td>
+								<td>${fileGistdata.attachLength}M;${fileGistdata.attachTypes}</td>
+
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
 								</td>
 							</tr>
+							<c:forEach items="${fileGistdata.workAttachments}" var = "workAttachment" varStatus="status">
+								<tr class="file_gistdata_${fileGistdata.id}_tr">
+									<td></td>
+									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>
+									<td class="op-td">
+										<div class="op-btn-box" >
+											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+
+												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
+										</div>
+									</td>
+								</tr>
+							</c:forEach>
 						</c:forEach>
 						</tbody>
 					</table>
@@ -1065,40 +1095,47 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th>电子件名称</th>
-							<th width="100px">最大容量(M)</th>
-							<th width="18%">类型限制</th>
-							<th>文件名</th>
+							<th width="40%">电子件名称</th>
+<%--							<th width="100px">最大容量(M)</th>--%>
+							<th >类型限制</th>
+<%--							<th>文件名</th>--%>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_other">
 						<c:forEach items="${projectcontentinfo.fileOtherList}" var = "fileOther" varStatus="status">
-							<tr>
+							<tr  id="file_other_${fileOther.id}_tr" onclick="listTr(this)">
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileOther.id}</td>
 								<td style="display:none">${fileOther.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileOther.mustFlag == 1}">
-										<td><span style="color: red">* </span>${fileOther.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileOther.attachName}</td>
 									</c:when>
 									<c:otherwise>
-										<td>${fileOther.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileOther.attachName}</td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileOther.attachLength}</td>
-								<td>${fileOther.attachTypes}</td>
-								<td>
-									<c:forEach items="${fileOther.workAttachments}" var = "workAttachment" varStatus="status">
-										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
-									</c:forEach>
-								</td>
+								<td>${fileOther.attachLength}M;${fileOther.attachTypes}</td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
 								</td>
 							</tr>
+							<c:forEach items="${fileOther.workAttachments}" var = "workAttachment" varStatus="status">
+								<tr class="file_other_${fileOther.id}_tr">
+									<td></td>
+									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>
+									<td class="op-td">
+										<div class="op-btn-box" >
+											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+
+												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
+										</div>
+									</td>
+								</tr>
+							</c:forEach>
 						</c:forEach>
 						</tbody>
 					</table>

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

@@ -488,10 +488,10 @@
 			<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-hover list-table">
+				<table id="upTable" class="table table-bordered table-condensed details">
 					<thead>
 					<tr>
-						<th width="40%">文件类型</th>
+						<th width="55%">文件类型</th>
 						<th width="">文件名</th>
 						<th width="100px">操作</th>
 					</tr>
@@ -556,10 +556,10 @@
 			<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-hover list-table">
+				<table id="gistdata_upTable" class="table table-bordered table-condensed details">
 					<thead>
 					<tr>
-						<th width="40%">文件类型</th>
+						<th width="55%">文件类型</th>
 						<th width="">文件名</th>
 						<th width="100px">操作</th>
 					</tr>
@@ -627,10 +627,10 @@
 			<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-hover list-table">
+				<table id="upTable_other" class="table table-bordered table-condensed details">
 					<thead>
 					<tr>
-						<th width="40%">文件类型</th>
+						<th width="55%">文件类型</th>
 						<th width="">文件名</th>
 						<th width="100px">操作</th>
 					</tr>

src/main/webapp/webpage/modules/ruralprojectrecords/subProjectInfo/subProjectInfoList.jsp

@@ -221,6 +221,7 @@
 			<li class="active"><a href="${ctx}/subProject/subProject/list?parentProId=${subProjectInfo.parentProId}&projectType=${subProjectInfo.projectType}">子项目列表</a></li>
 			<c:if test="${not empty projectId}">
 				<li><a href="${ctx}/ruralProject/ruralProjectMessage/formRecord?reportId=${projectId}&view=view">项目线上归档信息</a></li>
+				<li><a href="${ctx}/ruralProject/ruralProjectRecords/getAccessoryView?id=${subProjectInfo.parentProId}">附件信息</a></li>
 			</c:if>
 		</ul>
 	</div>

src/main/webapp/webpage/modules/sys/gridselectContractDetail.jsp

@@ -106,7 +106,7 @@
 						</div>
 						<div id="moresees" style="clear:both;display:none;">
 							<div class="layui-item query athird" style="width:25%;">
-								<span class="layui-form-label">工程类别：</span>
+								<span class="layui-form-label">合同类型：</span>
 								<div class="layui-input-block">
 									<form:select path="contractTypeDoc" cssClass="form-control required simple-select">
 										<form:option value="" label=""/>
@@ -132,7 +132,7 @@
 						</c:forEach>--%>
 						<th width="20%">合同编号</th>
 						<th width="20%">合同名称</th>
-						<th width="15%">工程分类</th>
+						<th width="15%">合同类型</th>
 						<th width="20%">委托方</th>
 						<th width="15%">创建时间</th>
 						<th width="80">创建人</th>

src/main/webapp/webpage/modules/sys/sysHome.jsp

@@ -6,6 +6,7 @@
 <head>
     <title>首页</title>
     <meta name="decorator" content="default"/>
+    <meta http-equiv="refresh" content="60">
     <script type="text/javascript">
         $(function(){
             // $("img").not(".upload_ico").each(function () {

src/main/webapp/webpage/modules/workclientinfo/workClientInfoForm.jsp

@@ -697,7 +697,7 @@
                         </tr>
                         </thead>
                         <tbody id="workClientLinkmanList">
-                        <c:forEach items="${workClientInfo.workClientLinkmanList}" var="workClientLinkman" varStatus="status">
+                        <%--<c:forEach items="${workClientInfo.workClientLinkmanList}" var="workClientLinkman" varStatus="status">
                             <tr>
                                    <td class="hide">
                                        <input id="workClientLinkmanList${status.index + 1}_id"
@@ -737,7 +737,7 @@
                                             class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>
                                    </td>
                             </tr>
-                        </c:forEach>
+                        </c:forEach>--%>
                         </tbody>
                     </table>
                     <script type="text/template" id="workClientLinkmanTpl">//<!--

src/main/webapp/webpage/modules/workclientinfo/workClientInfoFormTwo.jsp

@@ -431,14 +431,6 @@
             <input type="hidden" id="jobTypeStr" name="jobTypeStr" value="">
             <div class="form-group layui-row first">
                 <div class="form-group-label"><h2>基本信息</h2></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">&nbsp;&nbsp;
-                        <form:radiobutton id="hasUscc" class="usccClass i-checks" path="hasUscc" value="1" label="是" checked="true" />
-                        &nbsp;&nbsp;
-                        <form:radiobutton id="hasUscc" class="usccClass i-checks" path="hasUscc" value="2" label="否" />
-                    </div>
-                </div>
                 <div class="layui-item layui-col-sm6 lw7" id="search">
                     <label class="layui-form-label"><span class="require-item">*</span>客户名称：&nbsp;&nbsp;</label>
                     <div class="layui-input-block">
@@ -447,34 +439,35 @@
                         <span id="ph" style="color:#cc5965"></span>
                     </div>
                     <div id="fuzzyQuerySelect"
-                         style="z-index:1;display:none;background-color:white; position: relative; width:333px;left:120px; border: 1px solid gray;">
+                         style="z-index:1;display:none;background-color:white; position: absolute; width:333px;left:120px; border: 1px solid gray;">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>客户编号：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>拥有统一社会信用代码：</label>
+                    <div class="layui-input-block">&nbsp;&nbsp;
+                        <form:radiobutton id="hasUscc" class="usccClass i-checks" path="hasUscc" value="1" label="是" checked="true" />
+                        &nbsp;&nbsp;
+                        <form:radiobutton id="hasUscc" class="usccClass i-checks" path="hasUscc" value="2" label="否" />
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7 companyType_uscCode">
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>统一社会信用代码：</label>
                     <div class="layui-input-block">
-                        <form:input path="number" id="number" htmlEscape="false" class="form-control layui-input" readonly="true"/>
+                        <form:input path="uscCode" htmlEscape="false" id="uscCode"   class="form-control required isUscCode layui-input"/>
+                        <input type="hidden" id="oldUscCode" value="${workClientInfo.uscCode}"/>
+                        <span id="uscPh" style="color:#cc5965"></span>
                     </div>
                 </div>
-
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>客户性质：</label>
                     <div class="layui-input-block">
                         <form:select path="companyType" class="form-control simple-select required" id="companyType">
                             <form:option value="" label="--请选择客户性质--"/>
                             <form:options items="${fns:getMainDictList('company_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-
                         </form:select>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7 companyType_uscCode">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>统一社会信用代码：</label>
-                    <div class="layui-input-block">
-                        <form:input path="uscCode" htmlEscape="false" id="uscCode" class="form-control required isUscCode layui-input"/>
-                        <input type="hidden" id="oldUscCode" value="${workClientInfo.uscCode}"/>
-                        <span id="uscPh" style="color:#cc5965"></span>
-                    </div>
-                </div>
+
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>所在行业：</label>
                     <div class="layui-input-block">
@@ -485,12 +478,18 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>所在地区：</label>
-                    <div class="layui-input-block with-icon">
-                        <sys:treeselect id="area" name="area.id" value="${workClientInfo.area.id}" labelName="area.name"
-                                        labelValue="${workClientInfo.area.name}"
-                                        title="区域" url="/sys/area/treeData" cssClass="form-control required layui-input"
-                                        allowClear="true" notAllowSelectParent="false"/>
+                    <label class="layui-form-label"><span class="require-item">*</span>客户类型：</label>
+                    <div class="layui-input-block">
+                        <form:select path="clientType" id="clientType" class="form-control simple-select required">
+                            <form:option value="" label="--请选择客户类型--"/>
+                            <form:options items="${fns:getMainDictList('client_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                        </form:select>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label"><span class="require-item">*</span>代表单位：</label>
+                    <div class="layui-input-block">
+                        <div id="jobType" class="xm-select-demo" tabindex="0" contenteditable="true"></div>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -513,19 +512,10 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>客户类型：</label>
-                    <div class="layui-input-block">
-                        <form:select path="clientType" id="clientType" class="form-control simple-select required">
-                            <form:option value="" label="--请选择客户类型--"/>
-                            <form:options items="${fns:getMainDictList('client_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                        </form:select>
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>公司电话：</label>
                     <div class="layui-input-block">
-                        <form:input path="telephone" id="telephone" htmlEscape="false"
-                                    class="form-control isTel required layui-input"/>
+                        <form:input path="telephone" id="telephone" htmlEscape="false" maxlength="11"
+                                    class="form-control isTel layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -535,17 +525,20 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>代表单位：</label>
-                    <div class="layui-input-block">
-                        <div id="jobType" class="xm-select-demo" tabindex="0" contenteditable="true"></div>
+                    <label class="layui-form-label"><span class="require-item">*</span>所在地区：</label>
+                    <div class="layui-input-block with-icon">
+                        <sys:treeselect id="area" name="area.id" value="${workClientInfo.area.id}" labelName="area.name"
+                                        labelValue="${workClientInfo.area.name}"
+                                        title="区域" url="/sys/area/treeData" cssClass="form-control required layui-input"
+                                        allowClear="true" notAllowSelectParent="false"/>
                     </div>
                 </div>
 
                 <div class="layui-item layui-col-sm12 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>注册地址：</label>
+                    <label class="layui-form-label">注册地址：</label>
                     <div class="layui-input-block">
                         <form:input path="registerAddress" id="registerAddress" htmlEscape="false"
-                                    class="form-control required layui-input"/>
+                                    class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm12 lw7">
@@ -607,6 +600,7 @@
             </div>
 
 
+
             <%--<td class="companyType_orUnicode width-15 active"><label class="pull-right"><font color="red">*</font>组织机构代码或税务号：</label></td>
             <td class="companyType_orUnicode width-35">
                 <form:input path="orUnicode" htmlEscape="false"  class="form-control required"/>
@@ -693,27 +687,27 @@
                                    </td>
                                    <td><input id="workClientLinkmanList${status.index + 1}_name"
                                               name="workClientLinkmanList[${status.index + 1}].name" type="text"
-                                              value="${workClientLinkman.name}" readonly class="form-control required"/></td>
+                                              value="${workClientLinkman.name}" class="form-control required"/></td>
                                    <td><input id="workClientLinkmanList${status.index + 1}_office"
                                               name="workClientLinkmanList[${status.index + 1}].office" type="text"
-                                              value="${workClientLinkman.office}" readonly class="form-control "/></td>
+                                              value="${workClientLinkman.office}" class="form-control "/></td>
                                    <td><input id="workClientLinkmanList${status.index + 1}_position"
                                               name="workClientLinkmanList[${status.index + 1}].position" type="text"
-                                              value="${workClientLinkman.position}" readonly class="form-control "/></td>
+                                              value="${workClientLinkman.position}" class="form-control "/></td>
                                    <td><input id="workClientLinkmanList${status.index + 1}_qq"
                                               name="workClientLinkmanList[${status.index + 1}].qq"
-                                              type="text" value="${workClientLinkman.qq}" readonly class="form-control digits"/>
+                                              type="text" value="${workClientLinkman.qq}" class="form-control digits"/>
                                    </td>
                                    <td><input id="workClientLinkmanList${status.index + 1}_linkMobile"
                                               name="workClientLinkmanList[${status.index + 1}].linkMobile" type="text"
-                                              value="${workClientLinkman.linkMobile}" readonly class="form-control isPhone"/></td>
+                                              value="${workClientLinkman.linkMobile}" class="form-control isPhone"/></td>
                                    <td><input id="workClientLinkmanList${status.index + 1}_linkPhone"
                                               name="workClientLinkmanList[${status.index + 1}].linkPhone" type="text"
-                                              value="${workClientLinkman.linkPhone}" readonly class="form-control isTel"/></td>
+                                              value="${workClientLinkman.linkPhone}" class="form-control isTel"/></td>
                                    <td><input id="workClientLinkmanList{{idx}}_email"
                                               name="workClientLinkmanList[${status.index + 1}].email" type="text"
                                               value="${workClientLinkman.email}"
-                                              class="form-control email" readonly/></td>
+                                              class="form-control email"/></td>
                                    <td class="text-center op-td">
                                     <span class="op-btn op-btn-delete"
                                           onclick="delRow(this, '#workClientLinkmanList${status.index + 1}')"

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoForm.jsp

@@ -468,7 +468,7 @@
                         <form:input path="bankCard" htmlEscape="false" minlength="16" maxlength="19" class="form-control layui-input digits"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <div class="layui-item layui-col-sm6 lw7">i
                     <label class="layui-form-label">婚姻状况：</label>
                     <div class="layui-input-block">
                         <form:select path="marriage" class="form-control simple-select">