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

src/main/java/com/jeeplus/modules/projectFilingBatch/dao/ProjectFilingBatchDao.java

@@ -25,4 +25,11 @@ public interface ProjectFilingBatchDao extends CrudDao<ProjectFilingBatch> {
      * @return
      */
     ProjectFilingBatch findByFilingBatchOnProject(@Param("filingBatch") String filingBatch);
+
+    /**
+     * 根据批次id查询项目信息
+     * @param childrenBatch
+     * @return
+     */
+    List<ProjectFilingbatchRelation> getRelationList(ProjectFilingBatch childrenBatch);
 }

src/main/java/com/jeeplus/modules/projectFilingBatch/entity/ProjectFilingBatchTree.java

@@ -0,0 +1,136 @@
+package com.jeeplus.modules.projectFilingBatch.entity;
+
+import com.jeeplus.common.persistence.DataEntity;
+
+/**
+ * @author: 大猫
+ * @create: 2021-03-29 19:55
+ **/
+public class ProjectFilingBatchTree extends DataEntity<ProjectFilingBatchTree> {
+    private String filingBatch ;//档次批号
+    private String filingName ;//批次归档名称
+    private String projectId; //项目id
+    private String projectNum; //项目编号
+    private String boxNum; //案卷号
+    private String reBoxNum;//确认案卷号
+    private String number;//报告号
+    private String information; //归档批次信息
+    private Integer status;//归档状态
+    private String createName;
+    private String pid;
+    private String url;
+    private Integer flag;
+    private String statusStr;
+
+    public String getFilingBatch() {
+        return filingBatch;
+    }
+
+    public void setFilingBatch(String filingBatch) {
+        this.filingBatch = filingBatch;
+    }
+
+    public String getFilingName() {
+        return filingName;
+    }
+
+    public void setFilingName(String filingName) {
+        this.filingName = filingName;
+    }
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    public String getBoxNum() {
+        return boxNum;
+    }
+
+    public void setBoxNum(String boxNum) {
+        this.boxNum = boxNum;
+    }
+
+    public String getReBoxNum() {
+        return reBoxNum;
+    }
+
+    public void setReBoxNum(String reBoxNum) {
+        this.reBoxNum = reBoxNum;
+    }
+
+    public String getNumber() {
+        return number;
+    }
+
+    public void setNumber(String number) {
+        this.number = number;
+    }
+
+    public String getInformation() {
+        return information;
+    }
+
+    public void setInformation(String information) {
+        this.information = information;
+    }
+
+    public String getPid() {
+        return pid;
+    }
+
+    public void setPid(String pid) {
+        this.pid = pid;
+    }
+
+    public String getCreateName() {
+        return createName;
+    }
+
+    public void setCreateName(String createName) {
+        this.createName = createName;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getProjectNum() {
+        return projectNum;
+    }
+
+    public void setProjectNum(String projectNum) {
+        this.projectNum = projectNum;
+    }
+
+    public Integer getFlag() {
+        return flag;
+    }
+
+    public void setFlag(Integer flag) {
+        this.flag = flag;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getStatusStr() {
+        return statusStr;
+    }
+
+    public void setStatusStr(String statusStr) {
+        this.statusStr = statusStr;
+    }
+}

src/main/java/com/jeeplus/modules/projectFilingBatch/entity/ProjectFilingbatchRelation.java

@@ -15,6 +15,10 @@ public class ProjectFilingbatchRelation extends DataEntity<ProjectFilingbatchRel
     private Integer status;//归档状态
     private String boxNum; //盒号
     private String reBoxNum;//确认盒号
+    private String projectNum;//项目编号
+    private String projectName;//项目名称
+    private String createName;//项目创建人
+    private String number;//报告号
 
     public String getFilingBatch() {
         return filingBatch;
@@ -63,4 +67,36 @@ public class ProjectFilingbatchRelation extends DataEntity<ProjectFilingbatchRel
     public void setFilingBatchStr(String filingBatchStr) {
         this.filingBatchStr = filingBatchStr;
     }
+
+    public String getProjectNum() {
+        return projectNum;
+    }
+
+    public void setProjectNum(String projectNum) {
+        this.projectNum = projectNum;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public String getCreateName() {
+        return createName;
+    }
+
+    public void setCreateName(String createName) {
+        this.createName = createName;
+    }
+
+    public String getNumber() {
+        return number;
+    }
+
+    public void setNumber(String number) {
+        this.number = number;
+    }
 }

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

@@ -10,16 +10,21 @@ import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.projectFilingBatch.dao.ProjectFilingBatchDao;
 import com.jeeplus.modules.projectFilingBatch.dao.ProjectFilingbatchRelationDao;
 import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatch;
+import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatchTree;
 import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingbatchRelation;
 import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
+import com.jeeplus.modules.projectrecord.entity.ProjectRecordTreeData;
 import com.jeeplus.modules.ruralprojectrecords.dao.RuralProjectRecordsDao;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
+import com.jeeplus.modules.ruralprojectrecords.entity.SubProjectInfo;
 import com.jeeplus.modules.ruralprojectrecords.enums.ProjectStatusEnum;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
 import com.jeeplus.modules.serialnum.service.SerialNumTplService;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.entity.Workattachment;
 import com.jeeplus.modules.sys.service.OfficeService;
+import com.jeeplus.modules.sys.service.WorkattachmentService;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workactivity.dao.WorkActivityProcessDao;
 import com.jeeplus.modules.workactivity.entity.Activity;
@@ -28,6 +33,8 @@ import com.jeeplus.modules.workactivity.service.ActivityService;
 import com.jeeplus.modules.workactivity.service.WorkActivityProcessService;
 import com.jeeplus.modules.workactivitymenu.entity.WorkActivityMenu;
 import com.jeeplus.modules.workactivitymenu.service.WorkActivityMenuService;
+import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
+import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import com.jeeplus.modules.workprojectnotify.entity.WorkProjectNotify;
 import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
 import com.jeeplus.modules.workprojectnotify.util.UtilNotify;
@@ -41,6 +48,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -75,6 +84,8 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
     private ActivityService activityService;
     @Autowired
     private SerialNumTplService serialNumTplService;
+    @Autowired
+    private WorkattachmentService workattachmentService;
     @Override
     public ProjectFilingBatch get(String id) {
         return super.get(id);
@@ -102,6 +113,205 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
         page.setList(projectGuidangList);
         return page;
     }
+
+
+    @Transactional(readOnly = false)
+    public Map<String,List> getList(ProjectFilingBatch projectFilingBatch, HttpServletRequest request, HttpServletResponse response) {
+        //添加查询类型(工程咨询)
+        Page<ProjectFilingBatch> page = this.findPage(new Page<ProjectFilingBatch>(request, response), projectFilingBatch);
+        //无合同状态下，获取委托方的名称
+        List<ProjectFilingBatch> list = page.getList();
+        List<ProjectFilingBatchTree> dataList = new ArrayList<>();
+        Map<String,List> map = new HashMap<>();
+        for (int i = 0; i < list.size(); i++) {
+            ProjectFilingBatchTree batchData = new ProjectFilingBatchTree();
+            ProjectFilingBatch batch = list.get(i);
+
+            batchData = getParentInfo(batch);
+            dataList.add(batchData);
+            //获取子项目信息
+            ProjectFilingBatch childrenBatch = new ProjectFilingBatch();
+            childrenBatch.setId(batch.getId());
+            //查询对应子项目数据
+            List<ProjectFilingbatchRelation> relationList = dao.getRelationList(childrenBatch);
+
+            //项目名称不为空则进行所有项目的查询和处理
+            for (ProjectFilingbatchRelation relation: relationList) {
+                ProjectFilingBatchTree treeData = getSubInfo(relation);
+                dataList.add(treeData);
+
+            }
+        }
+
+        map.put("data",dataList);
+        return map;
+    }
+
+
+    private ProjectFilingBatchTree getParentInfo(ProjectFilingBatch info){
+        ProjectFilingBatchTree treeData = new ProjectFilingBatchTree();
+        //将界面需要展示数据放入类中
+        //id
+        treeData.setId(info.getId());
+        treeData.setFilingBatch(info.getFilingBatch());
+        if(StringUtils.isNotBlank(info.getFilingName())){
+            treeData.setFilingName(info.getFilingName());
+        }else{
+            treeData.setFilingName("");
+        }
+        treeData.setCreateName(info.getCreateBy().getName());
+        treeData.setStatus(info.getFilingStatus());
+        treeData.setCreateDate(info.getCreateDate());
+        //父节点的pid设置为0
+        treeData.setPid("0");
+
+        //判断当前登陆人是否有操作权限
+        if(UserUtils.getUser().getId().equals(info.getCreateBy().getId())){
+            treeData.setFlag(1);
+        }else {
+            treeData.setFlag(0);
+        }
+        return treeData;
+    }
+
+    private ProjectFilingBatchTree getSubInfo(ProjectFilingbatchRelation relation){
+
+        ProjectFilingBatchTree treeData = new ProjectFilingBatchTree();
+
+        //将界面需要展示数据放入类中
+        //项目id
+        treeData.setId(relation.getId());
+        //项目id
+        treeData.setProjectId(relation.getProjectId());
+        //项目编号
+        treeData.setFilingBatch(relation.getProjectNum());
+        //项目名称
+        treeData.setFilingName(relation.getProjectName());
+        //项目创建人
+        treeData.setCreateName(relation.getCreateName());
+        //状态
+        treeData.setStatus(relation.getStatus());
+        treeData.setPid(relation.getFilingBatch());
+        treeData.setCreateDate(relation.getCreateDate());
+        treeData.setFlag(0);
+        return treeData;
+    }
+
+
+    @Transactional(readOnly = false)
+    public Map<String,List> getFilingBatchById(ProjectFilingBatch projectFilingBatch, HttpServletRequest request, HttpServletResponse response) {
+        //查询批次项目信息
+        List<ProjectFilingbatchRelation> relationList = dao.getRelationList(projectFilingBatch);
+
+        List<ProjectFilingBatchTree> dataList = new ArrayList<>();
+        Map<String,List> map = new HashMap<>();
+        for (int i = 0; i < relationList.size(); i++) {
+            ProjectFilingBatchTree batchData = new ProjectFilingBatchTree();
+            ProjectFilingbatchRelation batch = relationList.get(i);
+
+            batchData = getRelationInfo(batch,projectFilingBatch);
+            dataList.add(batchData);
+            //获取子项目信息
+            Workattachment workattachment = new Workattachment();
+            workattachment.setAttachmentId(batch.getProjectId());
+            workattachment.setDivIdType("_filingBatch");
+            //查询对应子项目数据
+            List<Workattachment> attachmentList = workattachmentService.findList(workattachment);
+
+            //项目名称不为空则进行所有项目的查询和处理
+            for (Workattachment attachment: attachmentList) {
+                ProjectFilingBatchTree treeData = getAttachmentInfo(attachment,batch.getId());
+                dataList.add(treeData);
+
+            }
+        }
+
+        map.put("data",dataList);
+        return map;
+    }
+
+    private ProjectFilingBatchTree getRelationInfo(ProjectFilingbatchRelation relation,ProjectFilingBatch filingBatch){
+        ProjectFilingBatchTree treeData = new ProjectFilingBatchTree();
+        //将界面需要展示数据放入类中
+        //项目id
+        treeData.setId(relation.getId());
+        //项目id
+        treeData.setProjectId(relation.getProjectId());
+        //项目编号
+        treeData.setProjectNum(relation.getProjectNum());
+        //项目名称
+        treeData.setFilingName(relation.getProjectName());
+        //报告号
+        treeData.setNumber(relation.getNumber());
+        //案卷号
+        if(7 == filingBatch.getFilingStatus()){
+            treeData.setBoxNum("");
+            treeData.setStatusStr("已作废");
+        }else{
+            if(2 == filingBatch.getFilingStatus() || 3 == filingBatch.getFilingStatus()){
+                treeData.setBoxNum("");
+                treeData.setStatusStr("审批中");
+            }else if(5 == filingBatch.getFilingStatus() || 4 == filingBatch.getFilingStatus()){
+                if("1" == filingBatch.getDelFlag()){
+                    treeData.setBoxNum("");
+                    treeData.setStatusStr("驳回");
+                }else{
+                    if(StringUtils.isNotBlank(relation.getBoxNum())){
+                        treeData.setBoxNum(relation.getBoxNum());
+                    }else{
+                        treeData.setBoxNum("");
+                    }
+                    treeData.setStatusStr("通过");
+                }
+            }
+        }
+        //状态
+        treeData.setStatus(relation.getStatus());
+        treeData.setPid("0");
+        return treeData;
+    }
+
+    private ProjectFilingBatchTree getAttachmentInfo(Workattachment attachment,String pId){
+        ProjectFilingBatchTree treeData = new ProjectFilingBatchTree();
+        //将界面需要展示数据放入类中
+        //项目编号
+        treeData.setProjectNum(attachment.getRemarks());
+        //报告号
+        treeData.setNumber(attachment.getAttachmentName());
+        //文件路径
+        treeData.setUrl(attachment.getUrl());
+        //项目名称
+        treeData.setFilingName("");
+        //案卷号
+        treeData.setBoxNum("");
+        treeData.setStatusStr("");
+        treeData.setPid(pId);
+        return treeData;
+    }
+
+    /**
+     * 根据项目id查询附件信息
+     * @param projectId  项目id
+     * @return
+     */
+    public Map<String,Object> getAttachmentList(String projectId) {
+        Map<String,Object> map = new HashMap<>();
+        //获取子项目信息
+        Workattachment workattachment = new Workattachment();
+        workattachment.setAttachmentId(projectId);
+        workattachment.setDivIdType("_filingBatch");
+        //查询对应子项目数据
+        List<Workattachment> attachmentList = workattachmentService.findList(workattachment);
+        if(attachmentList.size()>0){
+            map.put("result",true);
+        }else{
+            map.put("result",false);
+        }
+        map.put("data",attachmentList);
+        return map;
+    }
+
+
     public List<ProjectFilingBatch> findProjectIdByFiling(String id){
         return projectFilingBatchDao.findProjectIdByFiling(id);
     }

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

@@ -15,7 +15,9 @@ import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.enums.ProjectStatusEnum;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
+import com.jeeplus.modules.sys.dao.WorkattachmentDao;
 import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.entity.Workattachment;
 import com.jeeplus.modules.sys.service.UserService;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workengineeringproject.entity.WorkEngineeringProject;
@@ -26,10 +28,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
@@ -50,6 +49,8 @@ public class ProjectFilingBatchController extends BaseController {
     private ActTaskService actTaskService;
     @Autowired
     private UserService userService;
+    @Autowired
+    private WorkattachmentDao workattachmentDao;
     @ModelAttribute
     public ProjectFilingBatch get(@RequestParam(required = false) String id) {
         ProjectFilingBatch entity = null;
@@ -63,8 +64,7 @@ public class ProjectFilingBatchController extends BaseController {
     }
 
     @RequestMapping(value = "getProcess")
-    public String getProcess(ProjectFilingBatch projectFilingBatch, Model model, HttpServletRequest request) {
-//       projectFilingBatch=projectFilingBatchService.get(projectFilingBatch.getId());
+    public String getProcess(ProjectFilingBatch projectFilingBatch, Model model) {
         model.addAttribute("processInstanceId", projectFilingBatch.getProcessinstanceId());
         return "modules/projectFilingBatch/projectFilingBacthTask";
     }
@@ -89,6 +89,19 @@ public class ProjectFilingBatchController extends BaseController {
         return "modules/projectFilingBatch/projectFilingBatchList";
     }
 
+    /**
+     * 项目列表页面
+     */
+    @RequestMapping(value = "getFilingBatchList")
+    @ResponseBody
+    public Map<String,List> getFilingBatchList(ProjectFilingBatch projectFilingBatch, HttpServletRequest request, HttpServletResponse response) {
+        if(StringUtils.isNotBlank(projectFilingBatch.getCreateName())){
+            projectFilingBatch.setCreateNameStr(projectFilingBatch.getCreateName());
+        }
+        Map<String, List> map = projectFilingBatchService.getList(projectFilingBatch, request, response);
+        return map;
+    }
+
 
     /**
      * 查看
@@ -147,6 +160,26 @@ public class ProjectFilingBatchController extends BaseController {
     }
 
     /**
+     * 项目列表页面
+     */
+    @RequestMapping(value = "getFilingBatchById")
+    @ResponseBody
+    public Map<String,List> getFilingBatchById(ProjectFilingBatch projectFilingBatch, HttpServletRequest request, HttpServletResponse response) {
+        Map<String, List> map = projectFilingBatchService.getFilingBatchById(projectFilingBatch, request, response);
+        return map;
+    }
+
+    /**
+     * 根据项目id查询附件信息
+     */
+    @RequestMapping(value = "getAttachmentList")
+    @ResponseBody
+    public Map<String,Object> getAttachmentList(String projectId) {
+        Map<String, Object> map = projectFilingBatchService.getAttachmentList(projectId);
+        return map;
+    }
+
+    /**
      * 添加
      *
      * @param projectFilingBatch
@@ -185,6 +218,41 @@ public class ProjectFilingBatchController extends BaseController {
         model.addAttribute("projectFilingBatch", projectFilingBatch);
         return "modules/projectFilingBatch/projectFilingBatchForm";
     }
+    @RequiresPermissions(value = {"projectFilingBatch:projectFilingBatchInfo:add", "projectFilingBatch:projectFilingBatchInfo:edit"}, logical = Logical.OR)
+    @ResponseBody
+    @RequestMapping(value = "formTwo")
+    public ProjectFilingBatch formTwo(@RequestParam("filingId") String filingId, Model model) {
+        ProjectFilingBatch projectFilingBatch=new ProjectFilingBatch();
+        projectFilingBatch.setId(filingId);
+        //判断实体类是否为空
+        if (projectFilingBatch.getId() != null && StringUtils.isNotBlank(projectFilingBatch.getId())) {
+            //获取详细信息
+            projectFilingBatch = projectFilingBatchService.get(projectFilingBatch.getId());
+            List<RuralProjectRecords> ruralProjectRecordsList = new ArrayList<>();
+            //获取详细信息
+            projectFilingBatch = projectFilingBatchService.get(projectFilingBatch.getId());
+            List<ProjectFilingBatch> projectFilingBatches = projectFilingBatchService.findProjectIdByFiling(projectFilingBatch.getId());
+            for (ProjectFilingBatch filingBatch : projectFilingBatches) {
+                RuralProjectRecords ruralProjectRecords = ruralProjectRecordsService.get(filingBatch.getProjectId());
+                ruralProjectRecords.setProjectReportNumber(filingBatch.getNumber());
+                ruralProjectRecordsList.add(ruralProjectRecords);
+            }
+            //获取归档人
+            projectFilingBatch.setCreateBy(UserUtils.get(projectFilingBatch.getCreateBy().getId()));
+            //项目信息
+            projectFilingBatch.setProject(ruralProjectRecordsList);
+
+        } else {
+            //获取归档人
+            projectFilingBatch.setCreateBy(UserUtils.getUser());
+            projectFilingBatch.setCreateDate(new Date());
+        }
+        //查询总审人员信息
+//        List<User> auditUserList = userService.getFilingUserList();
+//        projectFilingBatch.setBzshbUserList(auditUserList);
+        model.addAttribute("projectFilingBatch", projectFilingBatch);
+        return projectFilingBatch;
+    }
 
     @RequiresPermissions(value={"ruralProject:ruralProjectRecords:edit"},logical=Logical.OR)
     @RequestMapping(value = "modify")
@@ -247,6 +315,15 @@ public class ProjectFilingBatchController extends BaseController {
         RuralProjectRecords projectRecords = ruralProjectRecordsService.findUseableByProjectId(projectId);
         return projectRecords;
     }
+    @ResponseBody
+    @RequestMapping(value = "updateByType")
+    public Integer updateByType(@RequestParam("id") String id,@RequestParam("remarks") String remarks) {
+        Workattachment workattachment=new Workattachment();
+        workattachment.setId(id);
+        workattachment.setRemarks(remarks);
+        Integer i= workattachmentDao.updateByRemarks(workattachment);
+        return i;
+    }
 
     /**
      * 送审归档批次项目

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

@@ -1499,8 +1499,8 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			//获取项目信息
 			RuralProjectRecords records = this.getQueryProjectUsers(projectId);
 			//根据项目id查询项目报告信息
-			ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(records.getId());
-			projectReportData = projectReportDataService.get(projectReportData.getId());
+			//ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(records.getId());
+			//projectReportData = projectReportDataService.get(projectReportData.getId());
 			ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
 
 			//添加项目类型
@@ -1508,8 +1508,8 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			relateInfo.setAttachmentProjectSort(records.getAttachmentProjectSort());
 
 			//查看送审金额是否为500w以上金额
-			Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportData.getReviewFee());
-			approvalMoney = 2;
+			//Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportData.getReviewFee());
+			Integer approvalMoney = 2;
 			switch (approvalMoney){
 				case 0:
 					//金额为0

src/main/java/com/jeeplus/modules/sys/dao/WorkattachmentDao.java

@@ -55,4 +55,11 @@ public interface WorkattachmentDao extends CrudDao<Workattachment> {
      * @return
      */
     Integer deleteByAttachmentId(String attachmentId);
+
+    /**
+     * 修改备注
+     * @param workattachment
+     * @return
+     */
+    Integer updateByRemarks(Workattachment workattachment);
 }

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

@@ -222,4 +222,32 @@
 			filing_status= 7
 		WHERE id = #{id}
 	</delete>
+
+
+	<select id="getRelationList" resultType="com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingbatchRelation">
+		SELECT
+		  a.id as "id",
+		  a.create_by as "createBy.id",
+		  r.create_date as "createDate",
+		  a.update_by as "updateBy.id",
+		  a.update_date as "updateDate",
+		  a.del_flag as "delFlag",
+		  a.filing_batch as "filingBatch",
+		  a.project_id as "projectId",
+		  a.status as "status",
+		  a.box_num as "boxNum",
+		  a.re_box_num as "reBoxNum",
+		  r.project_name as "projectName",
+		  r.project_id as "projectNum",
+		  r.project_id as "projectRecordsId",
+		  prd.number as "number",
+		  su.name as "createName"
+		FROM project_flingbatch_relation a
+		LEFT JOIN project_filingbatch f on a.id=f.filing_batch
+		LEFT JOIN rural_project_records r on a.project_id=r.id
+		LEFT JOIN project_report_data prd on prd.project_id=r.id
+		LEFT JOIN sys_user su on r.create_by=su.id
+		WHERE a.filing_batch = #{id}
+		order by a.create_date desc
+	</select>
 </mapper>

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

@@ -1378,7 +1378,7 @@
 		left join sys_user su on su.id = w1.user_id
 		left join sys_office so on so.id = su.office_id
 		<where>
-			and a.del_flag = 0 and project_type in (1,2) and prd.`status`=5
+			and a.del_flag = 0 and project_type in (1,2) and prr.`status`=5
 			and a.id not in (select project_id	FROM project_flingbatch_relation r left join project_filingbatch f on f.filing_batch=r.filing_batch	where f.filing_status in(2,3,5) )
 		    and a.id not in (select project_id	FROM project_flingbatch_relation where status in(2,3,5) )
 			<if test="projectName != null and projectName != ''">
@@ -1412,7 +1412,7 @@
 				AND a.project_name like concat(concat('%',#{projectName}),'%')
 			</if>
 
-			and a.del_flag = 0 and a.project_type in (1,2) and prd.`status`=5
+			and a.del_flag = 0 and a.project_type in (1,2) and prr.`status`=5
 			/*不捞取已经发起审批并审批状态为2、3、5的项目信息*/
 			and a.id not in (select project_id	FROM project_flingbatch_relation where status in(2,3,5) )
 			<if test="sqlMap.dsf !=null and sqlMap.dsf!=''">

src/main/resources/mappings/modules/sys/WorkattachmentDao.xml

@@ -300,7 +300,12 @@
 			attachment_flag = #{attachmentFlag}
 		WHERE id = #{id}
 	</update>
-	
+
+	<update id="updateByRemarks">
+		UPDATE work_attachment SET
+		   remarks = #{remarks}
+		WHERE id = #{id}
+	</update>
 	
 	<!--物理删除-->
 	<update id="delete">

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

@@ -88,7 +88,7 @@ function multitestFlag (storeAs, file,attachmentId,attachmentFlag,uploadPath,div
                             $(prefix+"_fileUrl").val(data.url);
                             $(prefix+"_fileAttachmentFlag").val(data.attachmentFlag);
                             $(prefix+"_fileAttachmentId").val(data.attachmentId);
-                            var result = '<a href="javascript:location.href=\''+realPath+'/a/workfullmanage/workFullManage/downLoadAttach?file=\'+encodeURIComponent(\''+data.url+'\');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>';
+                            var result = '<a style="margin-top: 10px;" href="javascript:location.href=\''+realPath+'/a/workfullmanage/workFullManage/downLoadAttach?file=\'+encodeURIComponent(\''+data.url+'\');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>';
                             var delResult =
                                 '<a href="javascript:void(0)" onclick="accordingBtn(this,\''+prefix+'\')" class=\"op-btn op-btn-edit" ><i class="fa fa-edit"></i>&nbsp;修改</a>';
                             $(prefix+"_operation").empty();
@@ -105,6 +105,71 @@ function multitestFlag (storeAs, file,attachmentId,attachmentFlag,uploadPath,div
     })
 };
 
+function fBmultipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,size, cpt,idx,prefix,currentUser) {
+    console.log("-----------------------start");
+    if(cpt == 1)
+        fBmultitestFlag(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,size, cpt,idx,prefix,currentUser);
+    else
+        multitest(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,size, cpt,idx,prefix,currentUser);
+};
+function fBmultitestFlag (storeAs, file,attachmentId,attachmentFlag,uploadPath,divId, size,cpt,idx,prefix,currentUser) {
+    var formdata = new FormData();
+    formdata.append("storeAs",storeAs);
+    formdata.append("file",file);
+    var names =  storeAs.split("/");
+    var name = names[names.length-1];
+    $.ajax({
+        type:'post',
+        url:realPath+"/bos/upload",
+        data:formdata,
+        contentType: false,
+        processData: false,
+        success:function (data1) {
+            if(data1.code==='1'){
+                returnUrl = realPath+"/sys/workattachment/saveAttachment";
+                $.ajax({
+                    type:'post',
+                    url:returnUrl,
+                    data:{
+                        "attachmentName":file['name'],
+                        "attachmentId":attachmentId,
+                        "attachmentFlag":attachmentFlag,
+                        "url":data1.url,
+                        "divIdType":divId
+                    },
+                    success:function(data){
+                        console.log('url : ' + data.url);
+                        if(data.status=="Success"){
+                            parent.layer.msg("上传成功！",{icon:1});
+                            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+'"/>';
+                            }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 {
+                                str = '<a class="attention-info" href="javascript:void(0)" title="'+data.attachmentName+'" onclick="preview(\'预览\',\''+data1.url+'\',\'90%\',\'90%\')">'+data.attachmentName+'</a>';
+                            }
+                            $(prefix).parent().parent().find("td").eq(2).html(str)
+                            $(prefix).parent().parent().find("td").eq(0).find("input").eq(1).val(data.id)
+                            var d = new Date();
+                            var dateTime=d.getFullYear() + '-' + (d.getMonth() + 1) + '-' + d.getDate();
+                            var result = '<a href="javascript:location.href=\''+realPath+'/a/workfullmanage/workFullManage/downLoadAttach?file=\'+encodeURIComponent(\''+data.url+'\');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>';
+                            var delResult =
+                                '<a href="javascript:void(0)" onclick="accordingBtn(this,\''+prefix+'\')" class=\"op-btn op-btn-edit" ><i class="fa fa-edit"></i>&nbsp;修改</a>';
+                            // $(prefix).parent().parent().find("td").eq(4).append(result)
+                        }else {
+                            parent.layer.msg("上传失败！",{icon:2});
+                        }
+                    }
+                })
+            }else {
+                parent.layer.msg("上传失败！",{icon:2});
+            }
+        }
+    })
+};
+
 function multitest (storeAs, file,attachmentId,attachmentFlag,uploadPath,divId, size,cpt) {
     // var buffer = new Buffer('123')
     var formdata = new FormData();

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

@@ -555,6 +555,23 @@ function getAuditRecordState(id)
     return result;
 }
 
+function getFilingBatchRelationStatus(id)
+{
+    var result ={};
+    result.action = true;
+    switch(id)
+    {
+        case "1":result.label = "tempstore";result.status="暂存"; result.action = false;break;
+        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;
+        default:
+            result.label = "unknown";result.status="未知";break;
+    }
+    return result;
+}
+
 function getAuditChangeState(id)
 {
     var result ={};

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

@@ -44,6 +44,13 @@
                     parent.layer.msg("请添加归档项目!", {icon: 5});
                     return false
                 }
+                for (var i=0;i<length;i++){
+                    var zhi=$("#projectList tr").eq(i).find("input[name='wType']").val();
+                    if (zhi==""){
+                        parent.layer.msg("信息未填写完整!", {icon: 5});
+                        return false
+                    }
+                }
                 $("#inputForm").submit();
                 return true;
             }else{
@@ -52,6 +59,84 @@
             return false;
         }
         $(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";
+                            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'>" +
+                                    "<td><input type=\"hidden\" name=\"proId\" id='" + tid + "' value=" + obj.id + ">" + 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=\"addRowInfo(" + 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 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 + "'>" +
+                                    "</tbody>" +
+                                    "</table>" +
+                                    "</td></tr>")
+
+                                $.ajax({
+                                    type : "POST",
+                                    url : "${ctx}/projectFilingBatch/projectFilingBatchInfo/getAttachmentList",
+                                    data : {'projectId':obj.id},
+                                    //请求成功
+                                    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>"+
+                                                "<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+"'/>"+
+                                                "</td>"+
+                                                "<td style=\"text-align: center\" width=\"20%\"><input name='wType' onChange='upwType(this)' class=\"form-control required\" value='"+value.remarks+"'/></td>"+
+                                                "<td style=\"text-align: center\" width=\"20%\"><a class=\"attention-info\" href=\"javascript:void(0)\" title=\""+value.attachmentName+"\" onclick=\"preview('预览','"+value.url+"','90%','90%')\"></a>"+value.attachmentName+"</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>" +
+                                                "</td>"+
+                                                "</tr>"
+                                            )
+                                        })
+                                    }
+                                });
+                            }
+                        })
+                    }
+                });
+            }
+
+
+
+
+
             var radioVal ;
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
@@ -152,6 +237,8 @@
                 });
             })
 
+
+
             $('#masterId').on("change", function () {
                 var masterId = $("#masterId").val();
                 $("#officeName").val('');
@@ -184,6 +271,8 @@
                 , trigger: 'click'
                 , trigger: 'click'
             });
+
+
         });
 
 
@@ -405,13 +494,35 @@
                     },
                     type:"post",
                     success:function (d) {
-                        $("#projectList").append("<tr>" +
-                            "<td><input type=\"hidden\" name=\"proId\" value="+d.id+"/>"+d.projectId+"</td>" +
-                            "<td>"+d.projectName+"</td>"+
-                            "<td>"+d.projectReportNumber+"</td>" +
-                            "<td class=\"text-center op-td\" >" +
-                            "<span class=\"op-btn op-btn-delete\" onclick=\"delEntrustRow(this)\" title=\"删除\"><i class=\"glyphicon glyphicon-remove\"></i>&nbsp;删除</span>" + "</td>"+
-                            "</tr>")
+                        var id="projectList_"+d.id;
+                        var pid="project_"+d.id;
+                        var tid="project_"+d.id+"_proId";
+                        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'>" +
+                                "<td><input type=\"hidden\" name=\"proId\" id='" + tid + "' value=" + d.id + ">" + d.projectId + "</td>" +
+                                "<td>" + d.projectName + "</td>" +
+                                "<td>" + d.projectReportNumber + "</td>" +
+                                "<td class=\"text-center op-td\" >" +
+                                "<span class=\"op-btn op-btn-add\" onclick=\"addRowInfo(" + 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 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 + "'>" +
+                                "</tbody>" +
+                                "</table>" +
+                                "</td></tr>")
+                        }
                     }
                 });
                 // alert(obj[i].id+"-------")
@@ -429,31 +540,83 @@
             return false;
         }
 
-        function insertTitle(tValue){
-            $("#flagFile").val(false);
-            var files = $("#attachment_file")[0].files;            for(var i = 0;i<files.length;i++) {                var file = files[i];
-                var attachmentId = $("#id").val();
-                var attachmentFlag = "82";
-                /*console.log(file);*/
-                var timestamp=new Date().getTime();
-
-                var storeAs = "projectRecords";
-                var uploadPath="http://gangwan-app.oss-cn-hangzhou.aliyuncs.com/"+storeAs;/*将这段字符串存到数据库即可*/
-                var divId = "_attachment";
-                $("#addFile"+divId).show();
-                multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,0);}
-        }
-
 
         function addFile() {
             $("#attachment_file").click();
         }
 
         function addRow(list, idx, tpl, row){
-            // var idx1 = $("#workClientLinkmanList tr").length;
+            // var idx1 = $("#projectList tr").length;
             bornTemplete(list, idx, tpl, row, idx);
         }
+        function addRowInfo(obj,d){
+            var id="#"+obj.id
+            var ss=(obj.id).split("_")
+            var sa=ss[1];
+            $(id).parent().parent().parent().show();
+            $(id).append(
+                "<tr>"+
+                "<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=''/>"+
+                "</td>"+
+                "<td style=\"text-align: center\" width=\"20%\"><input name='wType' onChange='upwType(this)' class=\"form-control required\"/></td>"+
+                "<td style=\"text-align: center\" width=\"20%\"></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>" +
+                "</td>"+
+                "</tr>"
+            )
+        }
+        function upwType(obj) {
+            var is=$(obj).parent().parent().find("td").eq(0).find("input").eq(1).val();
+            var id = is.toString()
+            var wtype=$(obj).val()
+            if (is==""){
+                parent.layer.msg("请先上传文件!", {icon: 5});
+                $(obj).val("")
+            }else{
+                $.ajax({
+                    type:"post",
+                    url:"${ctx}/projectFilingBatch/projectFilingBatchInfo/updateByType",
+                    data:{
+                        "id":id,
+                        "remarks":wtype
+                    },
+                    dataType:"json",
+                    success:function (d) {
 
+                    }
+                });
+            }
+        }
+
+        function accordingBtn(obj){
+            var is=$(obj).parent().parent().find("td").eq(0).find("input")
+            $(is).click();
+        }
+        function insertAccording(tValue,idx,obj) {
+            //当前登陆人
+            var currentUser = '${fns:getUser().name}';
+            var is=$(obj).parent().parent().find("td").eq(0).find("input")
+            var files = $(is)[0].files;
+            for(var i=0;i<files.length;i++) {
+                var file = files[i];
+                var id=idx.id;
+                var attachmentId = id.split("_")[1];
+                var attachmentFlag = "";
+                console.log(file);
+                var timestamp = new Date().getTime();
+                var storeAs = "filingBatch";
+                var uploadPath = "http://gangwan-app.oss-cn-hangzhou.aliyuncs.com/" + storeAs;
+                /*将这段字符串存到数据库即可*/
+                var divId = "_filingBatch";
+                fBmultipartUploadWithSts(storeAs, file, attachmentId, attachmentFlag, uploadPath, divId, "0",1,idx,is,currentUser);
+            }
+            $(is).val(123)
+        }
         function bornTemplete(list, idx, tpl, row, idx1){
             $(list).append(Mustache.render(tpl, {
                 idx: idx, delBtn: true, row: row,
@@ -471,7 +634,29 @@
                 }
             });
         }
+        function delListRow(o,obj){
+            $(o).parent().parent().remove();
+            $(obj).parent().parent().parent().remove();
+            $(obj).parent().parent().parent().hide();
+            var id=$(obj+" tr").length();
+            $.ajax({
+                type:"post",
+                url:"${ctx}/projectFilingBatch/projectFilingBatchInfo/deleteById",
+                data:{
+                    "id":id
+                },
+                dataType:"json",
+                success:function (d) {
 
+                }
+            });
+        }
+        function delListInfoRow(obj, prefix){
+            var id = $(prefix+"_id");
+            var delFlag = $(prefix+"_delFlag");
+            $(obj).parent().parent().remove();
+            $(obj).parent().parent().parent().parent().parent().parent().remove();
+        }
         function delEntrustRow(obj, prefix){
             var id = $(prefix+"_id");
             var delFlag = $(prefix+"_delFlag");
@@ -486,6 +671,20 @@
                 $("#linkmanButton").addClass("notForbidden");
             }
         }
+        function ondelEntrustRow(obj, prefix){
+            var id = $(prefix+"_id");
+            var delFlag = $(prefix+"_delFlag");
+            $(obj).parent().parent().remove();
+            if($("#workClientLinkmanList tr").length==0){
+                //按钮禁用
+                $("#addUserButton").addClass("notDisables");
+                //a标签置灰
+                $("#aButton").addClass("notForbidden");
+
+                $("#linkmanDiv").addClass("notDisables");
+                $("#linkmanButton").addClass("notForbidden");
+            }
+        }
 
         function delRow(obj, prefix){
             var id = $(prefix+"_id");
@@ -658,7 +857,7 @@
     <div class="container">
         <sys:message content="${message}"/>
         <form:form id="inputForm" modelAttribute="projectFilingBatch" action="${ctx}/projectFilingBatch/projectFilingBatchInfo/save" method="post" class="form-horizontal">
-            <form:hidden path="id"/>
+            <form:input path="id" id="filingId"/>
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>归档批次基础信息</h2></div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -674,8 +873,14 @@
                         <form:hidden path="createBy.id" htmlEscape="false"   readonly="true"  class="form-control  layui-input"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm12 lw7">
-                    <label class="layui-form-label">归档信息：</label>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">归档名称：</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 with-textarea">
+                    <label class="layui-form-label">归档说明：</label>
                     <div class="layui-input-block">
                         <form:textarea path="information" htmlEscape="false" rows="4" maxlength="200" class="form-control "/>
                     </div>
@@ -688,28 +893,32 @@
                     <sys:gridselectClientLink url="${ctx}/projectFilingBatch/projectFilingBatchInfo/finishListShow" id="constructionOrgList"   title="选择项目"
                                               cssClass="form-control required" fieldLabels="${fns:urlEncode('项目编号')}" fieldKeys="name"  searchLabel="${fns:urlEncode('客户名称')}" searchKey="name"></sys:gridselectClientLink>
                 </div>
+                <input id="attachment_file" type="file" name="attachment_file" onclick="addFile()" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
                 <div class="layui-item layui-col-xs12 form-table-container">
                     <table id="contentTable2" class="table table-bordered table-condensed details">
                         <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 style="text-align: center" width="20%">归档项目名称/文件名称</th>
+                            <th style="text-align: center" width="20%">报告号/案卷号</th>
                             <th width="20%">操作</th>
                         </tr>
                         </thead>
                         <tbody id="projectList">
-                            <c:if test="${projectFilingBatch.project!=null}">
-                                <c:forEach items="${projectFilingBatch.project}" var="pro" >
-                                    <tr>
-                                        <td><input type="hidden" name="proId" value="${pro.id}"/>${pro.projectId}</td>
-                                        <td>${pro.projectName}</td>
-                                        <td>${pro.projectReportNumber}</td>
-                                        <td class="text-center op-td" ><span class="op-btn op-btn-delete" onclick="delEntrustRow(this)" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span></td>
-                                    </tr>
-                                </c:forEach>
-                            </c:if>
+<%--                            <c:if test="${projectFilingBatch.project!=null}">--%>
+<%--                                <c:forEach items="${projectFilingBatch.project}" var="pro" >--%>
+<%--                                    <tr>--%>
+<%--                                        <td><input type="hidden" name="proId" value="${pro.id}"/>${pro.projectId}</td>--%>
+<%--                                        <td>${pro.projectName}</td>--%>
+<%--                                        <td>${pro.projectReportNumber}</td>--%>
+<%--                                        <td class="text-center op-td" >--%>
+<%--                                            <span class="op-btn op-btn-add" onclick="addRowInfo($)" title=\添加"><i class="fa fa-plus"></i>&nbsp;添加</span>--%>
+<%--                                            <span class="op-btn op-btn-delete" onclick="delEntrustRow(this)" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>--%>
+<%--                                        </td>--%>
+<%--                                    </tr>--%>
+<%--                                </c:forEach>--%>
+<%--                            </c:if>--%>
                         </tbody>
                     </table>
                 </div>

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

@@ -238,11 +238,15 @@
                     <shiro:hasPermission name="project:projectRecords:export">
                         <table:exportExcel url="${ctx}/project/projectRecords/export"></table:exportExcel><!-- 导出按钮 -->
                     </shiro:hasPermission>
+
+                    <button class="nav-btn layui-btn" id="btn-expand">全部展开</button>
+                    <button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>
                     <button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
 
                     <div style="clear: both;"></div>
                 </div>
-                <table class="oa-table layui-table" id="contentTable1"></table>
+                <table id="permissionTable" class="layui-table" lay-filter="permissionTable"></table>
+                <!-- 分页代码 -->
                 <table:page page="${page}"></table:page>
                 <div style="clear: both;"></div>
             </div>
@@ -250,114 +254,294 @@
     </div>
     <div id="changewidth"></div>
 </div>
-
 <script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
 <script>
+    resizeListWindow2();
+    $(window).resize(function(){
+        resizeListWindow2();
+    });
+</script>
+<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>
+    /*使用模块加载的方式 加载文件*/
+    layui.config({
+        base: '${ctx}/resoueces/css/layui/module/'
+    }).extend({
+        treetable: 'treetable-lay/treetable'
+    }).use(['layer', 'table', 'treetable'], function () {
+        var $ = layui.jquery;
+        var table = layui.table;
+        var layer = layui.layer;
+        var treetable = layui.treetable;
 
-    layui.use('table', function(){
-        layui.table.render({
-            limit:${ page.pageSize }
-            ,elem: '#contentTable1'
-            ,page: false
-            ,cols: [[
-                // {checkbox: true, fixed: true},
-                {field:'index',align:'center', title: '序号',width:"5%"}
-                ,{field:'filingBatch',align:'center',width:'20%', title: '归档批次号',templet:function(d){
-                        return "<a class=\"attention-info\" title=\"" + d.filingBatch + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看批次', '${ctx}/projectFilingBatch/projectFilingBatchInfo/view?id=" + d.id +"','95%', '95%')\">" + d.filingBatch + "</a>";
-                    }}
-                ,{field:'createName',align:'center', title: '创建人',  width:'20%'}
-                ,{field:'createDate',align:'center', title: '创建日期',  width:'20%'}
-                ,{align:'center', title: '状态',  width:'20%',templet:function(d){
-                        var st = getAuditState(d.filingStatus);
-                        if(st.action)
-                            var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/projectFilingBatch/projectFilingBatchInfo/getProcess?id=" + d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
-                        else
-                            var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
-                        return xml;
-                    }}
-                ,{field:'op',align:'center',title:"操作",width:'15%',templet:function(d){
-                        ////对操作进行初始化
-                        var xml="";
-                        if(d.canedit1 != undefined && d.canedit1 =="1")
-                        {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/projectFilingBatch/projectFilingBatchInfo/form?id=" + d.id +"','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
-                        }
-                        if(d.canedit2 != undefined && d.canedit2 =="1")
-                        {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/projectFilingBatch/projectFilingBatchInfo/modify?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
-                        }
-                        if(d.canrecall != undefined && d.canrecall =="1")
-                        {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/projectFilingBatch/projectFilingBatchInfo/form?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
-                        }
-                        if(d.candel != undefined && d.candel =="1")
-                        {
-                            xml+="<a href=\"${ctx}/projectFilingBatch/projectFilingBatchInfo/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目信息吗？', this.href)\" class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";
-                        }
-                        if(d.cancancel != undefined && d.cancancel =="1")
-                        {
-                            xml+="<a href=\"${ctx}/projectFilingBatch/projectFilingBatchInfo/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "&filingStatus="+d.filingStatus+ "\" onclick=\"return confirmx('确认要撤回该项目审批吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回</a>";
-                        }
-                        if(d.canedit3 != undefined && d.canedit3 =="1")
-                        {
-                            <%--xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogre('项目变更管理', '${ctx}/projectFilingBatch/projectFilingBatchInfo/form?alterBeforeRecords.id='+encodeURIComponent('" + d.id + "'),'95%','95%','','送审,暂存,关闭')\" style=\"color: white;background: darkseagreen\" class=\"op-btn op-btn-op-btn-revert\" ><i class=\"fa fa-edit\"></i> 变更</a>";--%>
-                        }
-                        // if(d.deleteAdmin != undefined && d.deleteAdmin =="1")
-                        // {
-                            <%--xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/projectFilingBatch/projectFilingBatchInfo/form?id=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改4</a>";--%>
-                            <%--xml+="<a href=\"${ctx}/projectFilingBatch/projectFilingBatchInfo/adminDelete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目信息吗？', this.href)\" class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";--%>
-                        // }
-                        return xml;
+        // 渲染表格
+        var renderTable = function () {
+            var filingName = $("#filingName").val();
+            var filingStatus = $("#filingStatus").val();
 
-                    }}
-            ]]
-            ,data: [
-                <c:if test="${ not empty page.list}">
-                <c:forEach items="${page.list}" var="projectFilingBatch" varStatus="index">
-                <c:if test="${index.index != 0}">,</c:if>
-                {
-                    "index":"${index.index+1}"
-                    ,"id":"${projectFilingBatch.id}"
-                    ,"filingBatch":"${projectFilingBatch.filingBatch}"
-                    ,"createName":"${projectFilingBatch.createBy.name}"
-                    ,"createDate":"<fmt:formatDate value="${projectFilingBatch.createDate}" pattern="yyyy-MM-dd"/>"
-                    ,"filingStatus":"${projectFilingBatch.filingStatus}"
-                    ,"procId":"${projectFilingBatch.processinstanceId}"
-                    <c:choose><c:when test="${flag == '1' or fns:getUser().id == projectFilingBatch.createBy.id}">
-                    <shiro:hasPermission name="projectFilingBatch:projectFilingBatchInfo:del">,"candel":	<c:choose><c:when test="${projectFilingBatch.filingStatus == 1 or projectFilingBatch.filingStatus == 3 or projectFilingBatch.filingStatus == 4}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
-                    <shiro:hasPermission name="projectFilingBatch:projectFilingBatchInfo:edit">,"canedit1":	<c:choose><c:when test="${projectFilingBatch.filingStatus == 1 }">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
-                    ,"canedit2":<c:choose><c:when test="${projectFilingBatch.filingStatus == 4}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
-                    ,"canrecall":<c:choose><c:when test="${projectFilingBatch.filingStatus == 3}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
-                    </shiro:hasPermission>
-                    ,"cancancel":<c:choose><c:when test="${projectFilingBatch.filingStatus == 2 && fns:getUser().id == projectFilingBatch.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
-                    ,"deleteAdmin":<c:choose><c:when test="${projectFilingBatch.filingStatus == 5}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
-                    </c:when>
-                    <c:otherwise>
-                    ,"candel":"0"
-                    ,"canedit1":"0"
-                    ,"canedit2":"0"
-                    ,"canrecall":"0"
-                    ,"cancancel":"0"
-                    </c:otherwise>
-                    </c:choose>
-                    <shiro:hasPermission name="projectFilingBatch:projectFilingBatchInfo:edit">,"canedit3":<c:choose><c:when test="${projectFilingBatch.filingStatus == 5 }">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
+            var beginDate = $("#beginDate").val();
+            var endDate = $("#endDate").val();
+            var createId = $("#createId").val();
+            var createName = $("#createName").val();
+            layer.load(2);
+            treetable.render({
+                treeColIndex: 0,//树形图标显示在第几列
+                treeSpid: 0,//最上级的父级id
+                treeIdName: 'permissionId',//id字段的名称
+                treePidName: 'pid',//pid字段的名称
+                treeDefaultClose: true,//是否默认折叠
+                treeLinkage: true,//父级展开时是否自动展开所有子级
+                elem: '#permissionTable',
+                url: '${ctx}/projectFilingBatch/projectFilingBatchInfo/getFilingBatchList?filingName='+filingName+'&pageNo=${page.pageNo}&filingStatus='+filingStatus+'&beginDate='+beginDate+'&endDate='+endDate+'&createId='+createId+'&createName='+createName,
+                page: false,
+                cols: [[
+                    /*{type: 'numbers', align:'center', title: '序号' ,width:80},*/
+                    {field: 'filingBatch', title: '归档批次号/项目编号',templet:function(d){
+                            if(0 == d.pid){
+                                return "<font style = 'font-size:14px;font-weight:500;'>"+d.filingBatch+"</font>";
+                            }else{
+                                return "<font>"+d.filingBatch+"</font>";
+                            }
+                        }},
+                    {field: 'filingName', align:'center', title: '批次名称/项目名称',templet:function(d){
+                            if(0 == d.pid){
+                                return "<a class=\"attention-info pid\" title=\"" + d.filingName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看批次信息', '${ctx}/projectFilingBatch/projectFilingBatchInfo/view?id=" + d.id +"','95%', '95%')\">" + d.filingName + "</a>";
+                            }else{
+                                return "<a class=\"attention-info\" title=\"" + d.filingName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目信息', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.projectId +"','95%', '95%')\">" + d.filingName + "</a>";
+                            }
+                        }},
+                    {field: 'createName', align:'center', title: '创建人',width:80,templet: function(d){
+                            if(0 == d.pid){
+                                return "<font style = 'font-size:14px;font-weight:500;'>"+d.createName+"</font>";
+                            }else{
+                                return "<font>"+d.createName+"</font>";
+                            }
+                        }},
+                    {field: 'createDate', align:'center', title: '创建日期',width:100,templet: function(d){
+                            var date=d.createDate;
+
+                            if(0 == d.pid){
+                                return "<font style = 'font-size:14px;font-weight:500;'>"+layui.util.toDateString(date,'yyyy-MM-dd')+"</font>";
+                            }else{
+                                return "<font>"+layui.util.toDateString(date,'yyyy-MM-dd')+"</font>";
+                            }
+                        }},
+                    {align:'center', title: '状态',  width:80,templet:function(d){
+                            if(d.pid ==0){
+                                var st = getAuditState(""+d.status);
+                                if(st.action)
+                                    var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/projectFilingBatch/projectFilingBatchInfo/getProcess?id=" + d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+                                else
+                                    var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+                                return xml;
+                            }else{
+                                var st = getFilingBatchRelationStatus(""+d.status);
+                                var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+                                return xml;
+                            }
+                        }},
+                    {templet: complain, align:'center', title: '操作' ,width:200}
+                ]],
+                done: function () {
+                    layer.closeAll('loading');
+                }
+            });
+        };
+
+        renderTable();
+
+        //触发三个button按钮
+        $('#btn-expand').click(function () {
+            treetable.expandAll('#permissionTable');
+        });
+
+        $('#btn-fold').click(function () {
+            treetable.foldAll('#permissionTable');
+        });
+
+        $('#btn-refresh').click(function () {
+            renderTable();
+        });
+
+
+        function complain(d){//操作中显示的内容
+            var xml = '';
+            if(d.pid=="0") {
+                if(d.flag == 1){
+                    if(d.status == 1){
+                        xml+="<a href=\"#\" onclick=\"openDialogre('修改批次信息', '${ctx}/projectFilingBatch/projectFilingBatchInfo/form?id=" + d.id +"','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                    }
+                    if(d.status == 2){
+                        xml+="<a href=\"${ctx}/projectFilingBatch/projectFilingBatchInfo/revoke?id=" + d.id + "&filingStatus="+d.status+ "\" onclick=\"return confirmx('确认要撤回该项目审批吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回</a>";
+                    }
+                    if(d.status == 3){
+                        //撤回操作
+                        xml+="<a href=\"#\" onclick=\"openDialogre('调整批次信息', '${ctx}/projectFilingBatch/projectFilingBatchInfo/form?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                    }
+                    if(d.status == 4){
+                        //驳回操作
+                        xml+="<a href=\"#\" onclick=\"openDialogre('调整批次信息', '${ctx}/projectFilingBatch/projectFilingBatchInfo/modify?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                    }
+                    if(d.status == 1 || d.status == 3 || d.status == 4){
+                        xml+="<a href=\"${ctx}/projectFilingBatch/projectFilingBatchInfo/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目信息吗？', this.href)\" class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";
+                    }
+                }
+                return[xml].join('');
+            }else{
+                var xml = '';
+                return[xml].join('');
+            }
+        }
+        //监听工具条
+        table.on('tool(permissionTable)', function (obj) {
+            var data = obj.data;
+            var layEvent = obj.event;
+            if(data.permissionName!=null){
+                if (layEvent === 'del') {
+                    layer.msg('删除' + data.id);
+                } else if (layEvent === 'edit') {
+                    layer.msg('修改' + data.id);
                 }
-                </c:forEach>
-                </c:if>
-            ]
+            }
         });
-    })
+    });
 
-    resizeListTable();
-    $("a").on("click",addLinkVisied);
 </script>
 <script>
-    resizeListWindow2();
-    $(window).resize(function(){
-        resizeListWindow2();
-    });
+    function openDialogres(title,url,width,height,target){
+
+        if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+            width='auto';
+            height='auto';
+        }else{//如果是PC端，根据用户设置的width和height显示。
+
+        }
+        top.layer.open({
+            type: 2,
+            area: [width, height],
+            title: title,
+            skin: 'three-btns',
+            maxmin: true, //开启最大化最小化按钮
+            content: url ,
+            btn: ['提交','暂存','关闭'],
+            btn1: function(index, layero){
+                var body = top.layer.getChildFrame('body', index);
+                var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                var inputForm = body.find('#inputForm');
+                var top_iframe;
+                if(target){
+                    top_iframe = target;//如果指定了iframe，则在改frame中跳转
+                }else{
+                    top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                }
+                inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+                if(iframeWin.contentWindow.doSubmit(1) ){
+                    //top.layer.close(index);//关闭对话框。
+                    setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+                }
+            },
+            btn2:function(index,layero){
+                var body = top.layer.getChildFrame('body', index);
+                var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                var inputForm = body.find('#inputForm');
+                var top_iframe;
+                if(target){
+                    top_iframe = target;//如果指定了iframe，则在改frame中跳转
+                }else{
+                    top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                }
+                inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+                if(iframeWin.contentWindow.doSubmit(2) ){
+                    // top.layer.close(index);//关闭对话框。
+                    setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+                }
+                return false;
+            },
+            btn3: function(index){
+            }
+        });
+    }
+    function openDialogreAudit(title,url,width,height,target){
+
+        if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+            width='auto';
+            height='auto';
+        }else{//如果是PC端，根据用户设置的width和height显示。
+
+        }
+        top.layer.open({
+            type: 2,
+            area: [width, height],
+            title: title,
+            skin: 'three-btns',
+            maxmin: true, //开启最大化最小化按钮
+            content: url ,
+            btn: ['提交','关闭'],
+            btn1: function(index, layero){
+                var body = top.layer.getChildFrame('body', index);
+                var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                var inputForm = body.find('#inputForm');
+                var top_iframe;
+                if(target){
+                    top_iframe = target;//如果指定了iframe，则在改frame中跳转
+                }else{
+                    top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                }
+                inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+                if(iframeWin.contentWindow.doSubmit(1) ){
+                    top.layer.close(index);//关闭对话框。
+                    setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+                }
+            },
+            btn2: function(index){
+            }
+        });
+    }
+    // 确认对话框
+    function confirmxRefresh(mess, href){
+        top.layer.confirm(mess, {icon: 3, title:'系统提示'}, function(index){
+            //do something
+            if (typeof href == 'function') {
+                href();
+            }else{
+                resetTip(); //loading();
+                $.ajax({
+                    url:href,
+                    data:$('#loginForm').serialize(),
+                    type:"post",
+                    success:function(data){
+                        if(data.status){
+                            parent.layer.msg(data.msg,{icon:1});
+                        }else {
+                            parent.layer.msg(data.msg,{icon:2});
+                        }
+                        //parent.refreshTrees();
+                        location = '${ctx}/project/projectRecords/list';
+                    }
+                });
+            }
+            top.layer.close(index);
+        });
+        return false;
+    }
+
+    // 确认对话框
+    function confirmxHintContent(mess, href){
+        $.ajax({
+            url:href,
+            data:$('#loginForm').serialize(),
+            type:"post",
+            success:function(data){
+                parent.layer.open({
+                    title: '提示内容'
+                    ,shade: 0
+                    ,maxmin: true
+                    ,content: data.msg
+                });
+            }
+        });
+    }
 </script>
-<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>
 </body>
 </html>

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

@@ -7,6 +7,7 @@
     <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"/>
+    <link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
     <style>
         #projectDesc-error{
             left:0;
@@ -229,76 +230,126 @@
                         <form:hidden path="createBy.id" htmlEscape="false"   readonly="true"  class="form-control  layui-input"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm12 lw7">
-                    <label class="layui-form-label">归档信息：</label>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">归档名称：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="information" htmlEscape="false" readonly="true" rows="4" maxlength="200" class="form-control "/>
+                        <form:input path="filingName" htmlEscape="false" readonly="true"  class="form-control layui-input"/>
                     </div>
                 </div>
-            </div>
-
-            <div class="form-group layui-row">
-                <div class="form-group-label"><h2>归档项目信息</h2></div>
-<%--                <div class="layui-item nav-btns">--%>
-<%--                    <sys:gridselectClientLink url="${ctx}/workclientinfo/workClientInfo/clientInfolist" id="constructionOrgList"   title="选择项目"--%>
-<%--                                              cssClass="form-control required" fieldLabels="${fns:urlEncode('项目编号')}" fieldKeys="name"  searchLabel="${fns:urlEncode('客户名称')}" searchKey="name"></sys:gridselectClientLink>--%>
-<%--                </div>--%>
-                <div class="layui-item layui-col-xs12 form-table-container">
-                    <table id="contentTable2" class="table table-bordered table-condensed details">
-                        <thead>
-                        <tr>
-                            <th class="hide"></th>
-                            <th style="text-align: center" width="16%">归档项目编号</th>
-                            <th style="text-align: center" width="16%">归档项目名称</th>
-                            <th style="text-align: center" width="16%">报告号</th>
-                            <th style="text-align: center" width="16%">案卷号</th>
-                            <th style="text-align: center" width="16%">确认案卷号</th>
-                            <th style="text-align: center" width="16%">状态</th>
-<%--                            <th 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>
-                                        <td>
-                                                ${project.boxNum}
-                                        </td>
-                                        <td>
-                                                ${project.reBoxNum}
-                                        </td>
-                                        <td>
-                                                ${project.delFlag}
-                                        </td>
-                                    </tr>
-                                </c:forEach>
-                            </c:when>
-                            <c:otherwise>
-                                <tr>
-                                    <td colspan="7">
-                                        暂无数据
-                                    </td>
-                                </tr>
-                            </c:otherwise>
-                        </c:choose>
-                        </tbody>
-                    </table>
-
+                <div class="layui-item layui-col-sm12 lw7 with-textarea">
+                    <label class="layui-form-label">归档说明：</label>
+                    <div class="layui-input-block">
+                        <form:textarea path="information" htmlEscape="false" readonly="true" rows="4" maxlength="255" class="form-control "/>
+                    </div>
                 </div>
             </div>
 
+        <div class="form-group layui-row">
+            <div class="form-group-label"><h2>归档项目信息</h2></div>
+            <table id="permissionTable" class="layui-table" lay-filter="permissionTable"></table>
+        </div>
         </form:form>
     </div>
 </div>
+<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>
+    /*使用模块加载的方式 加载文件*/
+    layui.config({
+        base: '${ctx}/resoueces/css/layui/module/'
+    }).extend({
+        treetable: 'treetable-lay/treetable'
+    }).use(['layer', 'table', 'treetable'], function () {
+        var $ = layui.jquery;
+        var table = layui.table;
+        var layer = layui.layer;
+        var treetable = layui.treetable;
+        var id =$("#id").val();
+        // 渲染表格
+        var renderTable = function () {
+            layer.load(2);
+            treetable.render({
+                treeColIndex: 0,//树形图标显示在第几列
+                treeSpid: 0,//最上级的父级id
+                treeIdName: 'permissionId',//id字段的名称
+                treePidName: 'pid',//pid字段的名称
+                treeDefaultClose: false,//是否默认折叠
+                treeLinkage: true,//父级展开时是否自动展开所有子级
+                elem: '#permissionTable',
+                url: '${ctx}/projectFilingBatch/projectFilingBatchInfo/getFilingBatchById?id='+id,
+                page: false,
+                cols: [[
+                    {field: 'projectNum', title: '项目编号/文件类型',templet:function(d){
+                            if(0 == d.pid){
+                                return "<font style = 'font-size:14px;font-weight:500;'>"+d.projectNum+"</font>";
+                            }else{
+                                return "<font>"+d.projectNum+"</font>";
+                            }
+                        }},
+                    {field: 'number', align:'center', title: '报告号/文件名',templet:function(d){
+                            if(0 == d.pid){
+                                return "<font style = 'font-size:14px;font-weight:500;'>"+d.number+"</font>";
+                            }else{
+                                return "<a class=\"attention-info\" title=\"" + d.number + "\" href=\"javascript:void(0);\" onclick=\"preview('预览', '"+d.url+"','80%', '80%')\">" + d.number + "</a>";
+                            }
+                        }},
+                    {field: 'filingName', align:'center', title: '项目名称',templet:function(d){
+                            if(0 == d.pid){
+                                return "<font style = 'font-size:14px;font-weight:500;'>"+d.filingName+"</font>";
+                            }else{
+                                return "<font>"+d.filingName+"</font>";
+                            }
+                        }},
+                    {field: 'boxNum', align:'center', title: '案卷号',templet: function(d){
+                            if(0 == d.pid){
+                                return "<font style = 'font-size:14px;font-weight:500;'>"+d.boxNum+"</font>";
+                            }else{
+                                return "<font>"+d.boxNum+"</font>";
+                            }
+                        }},
+                    {field: 'statusStr', align:'center', title: '状态',width:120,templet: function(d){
+                            if(0 == d.pid){
+                                return "<font style = 'font-size:14px;font-weight:500;'>"+d.statusStr+"</font>";
+                            }else{
+                                return "<font>"+d.statusStr+"</font>";
+                            }
+                        }}
+                ]],
+                done: function () {
+                    layer.closeAll('loading');
+                }
+            });
+        };
+
+        renderTable();
+
+        //触发三个button按钮
+        $('#btn-expand').click(function () {
+            treetable.expandAll('#permissionTable');
+        });
+
+        $('#btn-fold').click(function () {
+            treetable.foldAll('#permissionTable');
+        });
+
+        $('#btn-refresh').click(function () {
+            renderTable();
+        });
+
+        //监听工具条
+        table.on('tool(permissionTable)', function (obj) {
+            var data = obj.data;
+            var layEvent = obj.event;
+            if(data.permissionName!=null){
+                if (layEvent === 'del') {
+                    layer.msg('删除' + data.id);
+                } else if (layEvent === 'edit') {
+                    layer.msg('修改' + data.id);
+                }
+            }
+        });
+    });
+
+</script>
 </body>
 </html>

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

@@ -110,7 +110,9 @@
 					$("#inputForm").submit();
 					return true;
 				}
-            }
+            }else{
+				parent.layer.msg("请填写重要信息!", {icon: 5});
+			}
 
             return false;
         }
@@ -865,10 +867,10 @@
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>成果文件</h2></div>
-				<div class="layui-item nav-btns">
+<%--				<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=${projectRecords.id}&reviewFee='+$('#reviewFee').val(),'500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
-				</div>
+<%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=2&projectId=${projectRecords.id}&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>
@@ -953,10 +955,10 @@
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>依据性资料</h2></div>
-				<div class="layui-item nav-btns">
+<%--				<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=${projectRecords.id}&reviewFee='+$('#reviewFee').val(),'500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
-				</div>
+<%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=2&projectId=${projectRecords.id}&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>
@@ -1042,10 +1044,10 @@
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>其他文件</h2></div>
-				<div class="layui-item nav-btns">
+<%--				<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=${projectRecords.id}&reviewFee='+$('#reviewFee').val(),'500px','350px',false,'inputForm','file_other')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
-				</div>
+<%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=13&projectType=2&projectId=${projectRecords.id}&reviewFee='+$('#reviewFee').val(),'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>

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

@@ -389,9 +389,9 @@
 		<sys:message content="${message}"/>
 			<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=${projectRecords.id}&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">--%>
+<%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=1&projectId=${projectRecords.id}&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>
@@ -478,10 +478,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=${projectRecords.id}&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=1&projectId=${projectRecords.id}&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>
@@ -567,10 +567,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=${projectRecords.id}&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=1&projectId=${projectRecords.id}&reviewFee='+$('#reviewFee').val(),'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>

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

@@ -162,9 +162,10 @@
 				</div>
 				<div id="div3">
 					<div class="layui-item layui-col-sm6 lw6">
-						<label class="layui-form-label">工程分类：</label>
+						<label class="layui-form-label">合同类别：</label>
 						<div class="layui-input-block">
-							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.constructionProjectTypeStr}"/>
+							<input htmlEscape="false"  readonly="true" style="background-color: #f1f1f1" class="form-control layui-input" value="${fns:getMainDictLabel(ruralProjectRecords.workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
+<%--							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.constructionProjectTypeStr}"/>--%>
 						</div>
 					</div>
 				</div>
@@ -246,10 +247,10 @@
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">项目负责人：</label>
-                    <div class="layui-input-block  with-icon">
-                        <sys:treeselectt id="master" name="projectLeaders" value="${projectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${projectRecords.leaderNameStr}"  cssStyle="background-color: #fff"
-                                         title="用户" url="/sys/office/treeDataAll?type=3" checked="true" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
-                    </div>
+					<div class="layui-input-block  with-icon">
+						<sys:inquireselectUser id="master" name="projectLeaders" value="${projectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${projectRecords.leaderNameStr}" cssStyle="background-color: #fff"
+											   title="用户" url="/sys/office/treeDataAll?type=3" checked="true" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">所属部门：</label>

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

@@ -867,9 +867,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=${projectRecords.id}&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">--%>
+<%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=1&projectId=${projectRecords.id}&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>
@@ -956,10 +956,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=${projectRecords.id}&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=1&projectId=${projectRecords.id}&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>
@@ -1045,10 +1045,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=${projectRecords.id}&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=1&projectId=${projectRecords.id}&reviewFee='+$('#reviewFee').val(),'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>

src/main/webapp/webpage/modules/workcontractinfo/workContractAudit.jsp

@@ -119,11 +119,11 @@
                                 <div class="layui-item layui-col-sm12">
                                     <label class="layui-form-label">收费标准</label>
                                     <div class="layui-input-block">
-                                        <form:checkboxes path="chargeCriterionList" disabled="true" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="value" htmlEscape="false" items="${fns:getMainDictList('charge_criterion')}" />
+                                        <form:checkboxes path="chargeCriterionList" disabled="true" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="label" htmlEscape="false" items="${fns:getMainDictList('charge_criterion')}" />
                                     </div>
                                 </div>
                                 <div class="layui-item layui-col-sm12">
-                                    <label class="layui-form-label ">其他详情：</label>
+                                    <label class="layui-form-label "><!--其他详情：--></label>
                                     <div class="layui-input-block">
                                         <form:input path="otherDetails" readonly="true" htmlEscape="false" class="form-control layui-input"/>
                                     </div>

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoFormAdd.jsp

@@ -672,7 +672,7 @@
 							<div class="layui-item layui-col-sm12">
 								<label class="layui-form-label "><!--其他详情：--></label>
 								<div class="layui-input-block">
-									<form:input path="otherDetails" htmlEscape="false" maxlength="255" class="form-control layui-input"/>
+									<form:input path="otherDetails" id="otherDetails" htmlEscape="false" maxlength="255" class="form-control layui-input"/>
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm12 with-textarea">
@@ -850,21 +850,24 @@
 		layui.use('form', function () {
 			var form = layui.form;
 			form.render();
-
+			var zhi=$("#otherDetails").val();
 			//复选框监听器
 			form.on('checkbox(chargeCriterionList)', function(data){
-
 				var ids = [];
+
 				$("input[name='chargeCriterionList']:checked").each(function(i){
 					ids.push($(this).val());
 				})
-
-				if(ids.indexOf("4")!=-1){
-					// document.getElementById("otherDetails").readOnly=false
-				}else{
-					// document.getElementById("otherDetails").readOnly=true
-					$("#otherDetails").val(ids);
+				if ($(this).prop("checked")==true){
+					zhi+=$(this).val()+";"
 				}
+				$("#otherDetails").val(zhi);
+				// if(ids.indexOf("4")!=-1){
+				// 	// document.getElementById("otherDetails").readOnly=false
+				// }else{
+				// 	// document.getElementById("otherDetails").readOnly=true
+				// 	$("#otherDetails").val(ids);
+				// }
 			});
 		});
 	</script>

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoFormEdit.jsp

@@ -35,9 +35,9 @@
 		$(document).ready(function() {
 			var chargeCriterionH = $("#chargeCriterionH").val();
 			if(chargeCriterionH.indexOf("4")!=-1){
-				document.getElementById("otherDetails").readOnly=false
+				// document.getElementById("otherDetails").readOnly=false
 			}else{
-				document.getElementById("otherDetails").readOnly=true
+				// document.getElementById("otherDetails").readOnly=true
 				$("#otherDetails").val("");
 			}
 			validateForm = $("#inputForm").validate({
@@ -612,13 +612,14 @@
 						<div class="layui-item layui-col-sm12">
 							<label class="layui-form-label">收费标准</label>
 							<div class="layui-input-block">
-								<form:checkboxes path="chargeCriterionList" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="value" htmlEscape="false" items="${fns:getMainDictList('charge_criterion')}" />
+								<form:checkboxes path="chargeCriterionList" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="label" htmlEscape="true" items="${fns:getMainDictList('charge_criterion')}" />
+<%--								<form:checkboxes path="chargeCriterionList" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="label" htmlEscape="false" items="${fns:getMainDictList('charge_criterion')}" />--%>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm12">
-							<label class="layui-form-label ">其他详情：</label>
+							<label class="layui-form-label "><!--其他详情：--></label>
 							<div class="layui-input-block">
-								<form:input path="otherDetails" readonly="true" htmlEscape="false" maxlength="255" class="form-control layui-input"/>
+								<form:input path="otherDetails" id="otherDetails" htmlEscape="false" maxlength="255" class="form-control layui-input"/>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm12 with-textarea">
@@ -970,19 +971,22 @@
 		layui.use('form', function () {
 			var form = layui.form;
 			form.render();
-
+			var zhi=$("#otherDetails").val();
 			//复选框监听器
 			form.on('checkbox(chargeCriterionList)', function(data){
 				var ids = [];
 				$("input[name='chargeCriterionList']:checked").each(function(i){
 					ids.push($(this).val())
 				})
-				if(ids.indexOf("4")!=-1){
-					document.getElementById("otherDetails").readOnly=false
-				}else{
-					document.getElementById("otherDetails").readOnly=true
-					$("#otherDetails").val("");
+				if ($(this).prop("checked")==true){
+					zhi+=$(this).val()+";"
 				}
+				// if(ids.indexOf("4")!=-1){
+				// document.getElementById("otherDetails").readOnly=false
+				// }else{
+				// document.getElementById("otherDetails").readOnly=true
+					$("#otherDetails").val(zhi);
+				// }
 			});
 		});
 	</script>

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoLookForm.jsp

@@ -183,7 +183,7 @@
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm12">
-							<label class="layui-form-label ">其他详情：</label>
+							<label class="layui-form-label "></label>
 							<div class="layui-input-block">
 								<form:input path="otherDetails" readonly="true" htmlEscape="false" class="form-control layui-input"/>
 							</div>