Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/projectEngineering/dao/ProjectEngineeringInfoDao.java

@@ -0,0 +1,30 @@
+package com.jeeplus.modules.projectEngineering.dao;
+
+import com.jeeplus.common.persistence.CrudDao;
+import com.jeeplus.common.persistence.TreeDao;
+import com.jeeplus.common.persistence.annotation.MyBatisDao;
+import com.jeeplus.modules.projectAccessory.entity.ProjectAccessoryInfo;
+import com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo;
+import com.jeeplus.modules.projectEngineering.entity.ProjectEngineeringInfo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 工程类型
+ */
+@MyBatisDao
+public interface ProjectEngineeringInfoDao extends CrudDao<ProjectEngineeringInfo>, TreeDao<ProjectEngineeringInfo> {
+
+    /**
+     * 获取所有的父级信息
+     * @return
+     */
+    public List<ProjectEngineeringInfo> getParentAll();
+
+    String selectOrderNum(String parentId);
+
+    List<ProjectEngineeringInfo> fingIds(@Param("parentIdSet") Set<String> parentIdSet, @Param("companyId") String companyId);
+
+}

src/main/java/com/jeeplus/modules/projectEngineering/entity/ProjectEngineeringInfo.java

@@ -0,0 +1,83 @@
+package com.jeeplus.modules.projectEngineering.entity;
+
+import com.jeeplus.common.persistence.TreeEntity;
+import com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo;
+
+/**
+ * 工程类型实体类
+ */
+public class ProjectEngineeringInfo extends TreeEntity<ProjectEngineeringInfo> {
+
+    private String engineeringName; //名称
+    private String indexNum;        //序号
+    private String parentIds;		// 所有父ID
+    private String parentId;		// 父ID
+    private String companyId;   //公司id
+    private String parentName;
+
+
+    public String getParentName() {
+        return parentName;
+    }
+
+    public void setParentName(String parentName) {
+        this.parentName = parentName;
+    }
+
+    public String getEngineeringName() {
+        return engineeringName;
+    }
+
+    public void setEngineeringName(String engineeringName) {
+        this.engineeringName = engineeringName;
+    }
+
+    public String getIndexNum() {
+        return indexNum;
+    }
+
+    public void setIndexNum(String indexNum) {
+        this.indexNum = indexNum;
+    }
+
+    @Override
+    public ProjectEngineeringInfo getParent() {
+        return parent;
+    }
+
+    @Override
+    public void setParent(ProjectEngineeringInfo parent) {
+        this.parent = parent;
+    }
+    public int getGrade(){
+        String[] split = this.getParentIds().split(",");
+        if ("0".equals(this.parent.id)){
+            return Integer.parseInt(this.parent.id);
+        }
+        return split.length-1;
+    }
+
+    public String getParentIds() {
+        return parentIds;
+    }
+
+    public void setParentIds(String parentIds) {
+        this.parentIds = parentIds;
+    }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+}

src/main/java/com/jeeplus/modules/projectEngineering/service/ProjectEngineeringService.java

@@ -0,0 +1,136 @@
+package com.jeeplus.modules.projectEngineering.service;
+
+import com.google.common.collect.Lists;
+import com.jeeplus.common.service.TreeService;
+import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.modules.projectAccessory.dao.ProjectTemplateDao;
+import com.jeeplus.modules.projectAccessory.entity.ProjectAccessoryInfo;
+import com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo;
+import com.jeeplus.modules.projectEngineering.dao.ProjectEngineeringInfoDao;
+import com.jeeplus.modules.projectEngineering.entity.ProjectEngineeringInfo;
+import com.jeeplus.modules.sys.entity.Office;
+import com.jeeplus.modules.sys.utils.UserUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+
+@Service
+@Transactional(readOnly = true)
+public class ProjectEngineeringService extends TreeService<ProjectEngineeringInfoDao, ProjectEngineeringInfo> {
+    @Autowired
+    private ProjectEngineeringInfoDao engineeringInfoDao;
+
+    public ProjectEngineeringInfo get(String id) {
+        return super.get(id);
+    }
+    private List<ProjectEngineeringInfo> fingIds(Set<String> parentIdSet, String companyId) {
+        return engineeringInfoDao.fingIds(parentIdSet,companyId);
+    }
+    /**
+     * 查询所有数据
+     * @param projectEngineeringInfo
+     * @return
+     */
+    public List<ProjectEngineeringInfo> findList(ProjectEngineeringInfo projectEngineeringInfo) {
+        List<ProjectEngineeringInfo> projectEngineeringInfoList = new ArrayList<>();
+        List<ProjectEngineeringInfo> listReturn = Lists.newArrayList();
+        //根据条件查询数据集合
+        List<ProjectEngineeringInfo> listAll = super.findList(projectEngineeringInfo);
+        Office company = UserUtils.getSelectCompany();
+        projectEngineeringInfo.setCompanyId(company.getId());
+        //判断，数据不为空则添加到返回集合中
+        if (listAll!=null && listAll.size()!=0){
+            projectEngineeringInfoList.addAll(listAll);
+        }
+
+        if(projectEngineeringInfoList!=null&&projectEngineeringInfoList.size()>0&&projectEngineeringInfo!=null&& (StringUtils.isNotBlank(projectEngineeringInfo.getEngineeringName())||StringUtils.isNotBlank(projectEngineeringInfo.getIndexNum()))){
+            //标准内容模糊查询，查询所有父节点
+            Set<String> parentIdSet = new HashSet<>();
+            for (ProjectEngineeringInfo engineeringInfo : projectEngineeringInfoList) {
+                String parentIds = engineeringInfo.getParentIds();
+                if (StringUtils.isNotBlank(parentIds)){
+                    parentIdSet.addAll(Arrays.asList(parentIds.split(",")));
+                }
+            }
+            for (ProjectEngineeringInfo engineeringInfo : projectEngineeringInfoList) {
+                parentIdSet.remove(engineeringInfo.getId());
+            }
+            projectEngineeringInfoList.addAll(0,this.fingIds(parentIdSet,"0"));
+            projectEngineeringInfoList.addAll(0,this.fingIds(parentIdSet,UserUtils.getSelectCompany().getId()));
+        }
+        sortList(listReturn,projectEngineeringInfoList,"0",true);
+        return listReturn;
+    }
+    public static void sortList(List<ProjectEngineeringInfo> list, List<ProjectEngineeringInfo> sourcelist, String parentId, boolean cascade){
+        for (int i=0; i<sourcelist.size(); i++){
+            ProjectEngineeringInfo e = sourcelist.get(i);
+            if (e.getParent()!=null && StringUtils.isNotBlank(e.getParent().getId()) && e.getParent().getId().equals(parentId)){
+                list.add(e);
+                if (cascade){
+                    // 判断是否还有子节点, 有则继续获取子节点
+                    for (int j=0; j<sourcelist.size(); j++){
+                        ProjectEngineeringInfo child = sourcelist.get(j);
+                        if (child.getParent()!=null && StringUtils.isNotBlank(child.getParent().getId()) && child.getParent().getId().equals(e.getId())){
+                            sortList(list, sourcelist, e.getId(), true);
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    /**
+     * 新增
+     * @param projectEngineeringInfo
+     */
+    @Transactional(readOnly = false)
+    public void save(ProjectEngineeringInfo projectEngineeringInfo) {
+        //设置序号
+        if(projectEngineeringInfo.getIsNewRecord()) {
+            projectEngineeringInfo.setParent(this.get(projectEngineeringInfo.getParent().getId()));
+            String orderNum = null;
+            //判断是否选择了父级节点。没有选择则默认为第一级别
+            if(null != projectEngineeringInfo.getParent()){
+                //添加数据
+                String parentids=projectEngineeringInfo.getParent().getParentIds();
+                projectEngineeringInfo.setParentIds(parentids+projectEngineeringInfo.getParent().getId()+",");
+                projectEngineeringInfo.setParentId(projectEngineeringInfo.getParent().getId());
+                orderNum = this.selectOrderNum(projectEngineeringInfo.getParent().getId());
+                projectEngineeringInfo.setCompanyId(UserUtils.getSelectCompany().getId());
+            }else{
+                //添加数据
+                projectEngineeringInfo.setParentIds("0,");
+                projectEngineeringInfo.setParentId("0");
+                orderNum = this.selectOrderNum("0");
+                projectEngineeringInfo.setCompanyId("0");
+            }
+            //判断是否有数据，没有数据则默认给编号01，有则在最大数据上递增1
+            if (StringUtils.isBlank(orderNum)) {
+                projectEngineeringInfo.setIndexNum(projectEngineeringInfo.getParent().getIndexNum() + "01");
+            } else {
+                projectEngineeringInfo.setIndexNum(String.valueOf(Integer.valueOf(orderNum) + 1));
+            }
+        }
+        //根据条件进行新增或修改处理
+        if (StringUtils.isNotBlank(projectEngineeringInfo.getId())){
+            projectEngineeringInfo.preUpdate();
+            dao.update(projectEngineeringInfo);
+        }else{
+            projectEngineeringInfo.preInsert();
+            dao.insert(projectEngineeringInfo);
+        }
+    }
+
+    /**
+     * 获取所有父级信息
+     * @return
+     */
+    public List<ProjectEngineeringInfo> getParentInfo(){
+        return engineeringInfoDao.getParentAll();
+    }
+    public String selectOrderNum(String parentId) {
+        return engineeringInfoDao.selectOrderNum(parentId);
+    }
+}

src/main/java/com/jeeplus/modules/projectEngineering/web/ProjectEngineeringController.java

@@ -0,0 +1,117 @@
+package com.jeeplus.modules.projectEngineering.web;
+
+import com.jeeplus.common.config.Global;
+import com.jeeplus.common.utils.MyBeanUtils;
+import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.web.BaseController;
+import com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo;
+import com.jeeplus.modules.projectAccessory.service.ProjectTemplateService;
+import com.jeeplus.modules.projectEngineering.entity.ProjectEngineeringInfo;
+import com.jeeplus.modules.projectEngineering.service.ProjectEngineeringService;
+import org.apache.shiro.authz.annotation.Logical;
+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.servlet.mvc.support.RedirectAttributes;
+
+import java.util.List;
+
+/**
+ * 工程类型
+ *
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/projectEngineering/projectEngineering")
+public class ProjectEngineeringController  extends BaseController {
+    @Autowired
+    private ProjectEngineeringService engineeringService;
+
+    @ModelAttribute
+    public ProjectEngineeringInfo get(@RequestParam(required=false) String id) {
+        ProjectEngineeringInfo entity = null;
+        if (StringUtils.isNotBlank(id)){
+            entity = engineeringService.get(id);
+        }
+        if (entity == null){
+            entity = new ProjectEngineeringInfo();
+        }
+        return entity;
+    }
+
+    /**
+     * 工程类型列表
+     * @param projectEngineeringInfo
+     * @param model
+     * @return
+     */
+    @RequiresPermissions("projectEngineering:projectEngineering:list")
+    @RequestMapping(value = {"list", ""})
+    public String list(ProjectEngineeringInfo projectEngineeringInfo, Model model) {
+        List<ProjectEngineeringInfo> list = engineeringService.findList(projectEngineeringInfo);
+        model.addAttribute("list", list);
+        model.addAttribute("projectengineeringInfo", projectEngineeringInfo);
+        return "modules/projectAccessory/projectEngineering/projectEngineeringList";
+    }
+    /**
+     * 查看，增加，编辑工程类型表单页面
+     * @param projectEngineeringInfo
+     * @param model
+     * @return
+     */
+    @RequiresPermissions(value={"projectEngineering:projectEngineering:add","projectEngineering:projectEngineering:edit"},logical= Logical.OR)
+    @RequestMapping(value = "form")
+    public String form(ProjectEngineeringInfo projectEngineeringInfo, Model model) {
+        //获取所有父级工程类型
+        List<ProjectEngineeringInfo> parentInfos=engineeringService.getParentInfo();
+        model.addAttribute("parentInfos", parentInfos);
+        if(projectEngineeringInfo!=null&&projectEngineeringInfo.getParent()!=null&&StringUtils.isNotBlank(projectEngineeringInfo.getParent().getId())){
+            ProjectEngineeringInfo parent = engineeringService.get(projectEngineeringInfo.getParent().getId());
+            model.addAttribute("parent", parent);
+        }
+        model.addAttribute("projectEngineeringInfo", projectEngineeringInfo);
+        return "modules/projectAccessory/projectEngineering/projectEngineeringForm";
+    }
+    /**
+     * 保存工程类型
+     * @param projectEngineeringInfo
+     * @param model
+     * @param redirectAttributes
+     * @return
+     * @throws Exception
+     */
+    @RequiresPermissions(value={"projectEngineering:projectEngineering:add","projectEngineering:projectEngineering:edit"},logical= Logical.OR)
+    @RequestMapping(value = "save")
+    public String save(ProjectEngineeringInfo projectEngineeringInfo, Model model, RedirectAttributes redirectAttributes) throws Exception{
+//        if (!beanValidator(model, projectEngineeringInfo)){
+//            return form(projectEngineeringInfo, model);
+//        }
+        if(!projectEngineeringInfo.getIsNewRecord()){//编辑表单保存
+            ProjectEngineeringInfo t = engineeringService.get(projectEngineeringInfo.getId());//从数据库取出记录的值
+            MyBeanUtils.copyBeanNotNull2Bean(projectEngineeringInfo, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
+            engineeringService.save(t);//保存
+        }else{//新增表单保存
+            engineeringService.save(projectEngineeringInfo);//保存
+        }
+        addMessage(redirectAttributes, "保存成功");
+        return "redirect:"+ Global.getAdminPath()+"/projectEngineering/projectEngineering/?repage";
+    }
+    /**
+     * 删除工程类型
+     * @param projectEngineeringInfo
+     * @param redirectAttributes
+     * @return
+     */
+    @RequiresPermissions("projectEngineering:projectEngineering:del")
+    @RequestMapping(value = "delete")
+    public String delete(ProjectEngineeringInfo projectEngineeringInfo, RedirectAttributes redirectAttributes) {
+        engineeringService.delete(projectEngineeringInfo);
+        addMessage(redirectAttributes, "删除成功");
+        return "redirect:"+Global.getAdminPath()+"/projectEngineering/projectEngineering/?repage";
+    }
+}
+
+

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

@@ -52,9 +52,11 @@ import org.springframework.security.access.method.P;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -376,7 +378,7 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
      * @throws Exception
      */
     @Transactional(readOnly = false)
-    public void saveProject(String[] proId,ProjectFilingBatch projectFilingBatch, ProjectStatusEnum projectStatus) throws Exception {
+    public void saveProject(String[] proId,ProjectFilingBatch projectFilingBatch, ProjectStatusEnum projectStatus,String[] proInfos,String[] flags) throws Exception {
         long t1 = System.currentTimeMillis();
 
         Integer oldStatus = projectFilingBatch.getFilingStatus();
@@ -422,6 +424,10 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
             filingbatchRelation.preInsert();
             projectFilingbatchRelationDao.insert(filingbatchRelation);
         }
+        //新增项目树形信息
+        if (proInfos.length!=0){
+            this.insertProInfo(proInfos,flags,proId,projectFilingBatch.getId());
+        }
         long t4 = System.currentTimeMillis();
         //启动审批流程
         if (projectFilingBatch.getFilingStatus()== ProjectStatusEnum.IN_APRL.getValue()&&(oldStatus==null|| ProjectStatusEnum.REJECTED.getValue()!=oldStatus)) {
@@ -628,7 +634,7 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
      * @throws Exception
      */
     @Transactional(readOnly = false)
-    public String auditSave(ProjectFilingBatch projectFilingBatch, List<User> auditUsers) throws Exception {
+    public String auditSave(ProjectFilingBatch projectFilingBatch, List<User> auditUsers,String[] proInfos, String[] flags) throws Exception {
         this.queryInfo(projectFilingBatch);
         Integer filingStatus = projectFilingBatch.getFilingStatus();
         String taskDefKey = projectFilingBatch.getAct().getTaskDefKey();
@@ -641,7 +647,7 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
             for (int i=0;i<proId.length;i++) {
                 proId[i]=projectFilingBatches.get(i).getProjectId();
             }
-            saveProject(proId,projectFilingBatch, ProjectStatusEnum.IN_APRL);
+            saveProject(proId,projectFilingBatch, ProjectStatusEnum.IN_APRL,proInfos,flags);
         }
 
         String comment = "";
@@ -1035,7 +1041,7 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
                     ProjectFilingBatchProInfo info = new ProjectFilingBatchProInfo();
                     info.setId(IdGen.uuid());
                     info.setProId(json.get("proId").toString());
-                    info.setProInfofilingBatch(json.get("filingId").toString());
+                    info.setProInfofilingBatch(filingId);
                     info.setProInfoName(json.get("names").toString());
                     info.setProInfoType(json.get("types").toString());
                     if(count==0 || !prid.equals(json.get("proId").toString())){
@@ -1058,7 +1064,7 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
             ProjectFilingBatchProInfo info = new ProjectFilingBatchProInfo();
             info.setId(IdGen.uuid());
             info.setProId(json.get("proId").toString());
-            info.setProInfofilingBatch(json.get("filingId").toString());
+            info.setProInfofilingBatch(filingId);
             info.setProInfoName(json.get("names").toString());
             info.setProInfoType(json.get("types").toString());
             DelProInfo(info);

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

@@ -354,10 +354,10 @@ public class ProjectFilingBatchController extends BaseController {
                 ProjectFilingBatch t = projectFilingBatchService.get(projectFilingBatch.getId());//从数据库取出记录的值
                 if (t.getFilingStatus() == 3 ||t.getFilingStatus()==1){
                     MyBeanUtils.copyBeanNotNull2Bean(projectFilingBatch, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
-                    projectFilingBatchService.saveProject(proId,t, ProjectStatusEnum.IN_APRL);//保存
-                    if (proInfos.length!=0){
-                        projectFilingBatchService.insertProInfo(proInfos,flags,proId,projectFilingBatch.getId());
-                    }
+                    projectFilingBatchService.saveProject(proId,t, ProjectStatusEnum.IN_APRL,proInfos,flags);//保存
+//                    if (proInfos.length!=0){
+//                        projectFilingBatchService.insertProInfo(proInfos,flags,proId,projectFilingBatch.getId());
+//                    }
 
                 }else if(t.getFilingStatus() == 2){
                     addMessage(redirectAttributes, "归档批次已送审，无法暂存");
@@ -368,11 +368,11 @@ public class ProjectFilingBatchController extends BaseController {
                 }
             } else {//新增表单保存
                 projectFilingBatch.setFilingStatus(1);
-                projectFilingBatchService.saveProject(proId,projectFilingBatch, ProjectStatusEnum.IN_APRL);//保存
-                //新增项目树形信息
-                if (proInfos.length!=0) {
-                    projectFilingBatchService.insertProInfo(proInfos, flags, proId,projectFilingBatch.getId());
-                }
+                projectFilingBatchService.saveProject(proId,projectFilingBatch, ProjectStatusEnum.IN_APRL,proInfos,flags);//保存
+//                //新增项目树形信息
+//                if (proInfos.length!=0) {
+//                    projectFilingBatchService.insertProInfo(proInfos, flags, proId,projectFilingBatch.getId());
+//                }
             }
             addMessage(redirectAttributes, "归档送审成功");
         }catch (Exception e){
@@ -480,7 +480,7 @@ public class ProjectFilingBatchController extends BaseController {
                     return "redirect:"+Global.getAdminPath()+"/projectFilingBatch/projectFilingBatchInfo/?repage";
                 }
 
-                String str = projectFilingBatchService.auditSave(projectFilingBatch,users);
+                String str = projectFilingBatchService.auditSave(projectFilingBatch,users,proInfos,flags);
                 addMessage(redirectAttributes, str);
                 //新增项目树形信息
                 if (proInfos!=null) {

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

@@ -523,7 +523,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         projectcontentinfoDao.deleteConsultant(projectcontentinfo.getProjectOnRural().getId());
         //保存咨询员信息
         for (RuralReportConsultant info : projectcontentinfo.getReportedConsultantList()){
-            if (info.getId() == null){
+            if (info.getZixunyuan() == null){
                 continue;
             }
             //添加项目id
@@ -2047,7 +2047,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         ruralProjectRecordsReportedDao.deleteConsultant(reported);
         //保存咨询员信息
         for (ReportedConsultant info : reported.getReportedConsultantList()){
-            if (info.getId() == null){
+            if (info.getZixunyuan() == null){
                 continue;
             }
             //添加项目上报id
@@ -2287,7 +2287,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                 ruralProjectRecordsReportedDao.deleteConsultant(reported);
                 //保存咨询员信息
                 for (ReportedConsultant info : reported.getReportedConsultantList()){
-                    if (info.getId() == null){
+                    if (info.getZixunyuan() == null){
                         continue;
                     }
                     //添加项目上报id
@@ -2645,7 +2645,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         ruralProjectRecordsReportedDao.deleteConsultant(reported);
         //保存咨询员信息
         for (ReportedConsultant info : reported.getReportedConsultantList()){
-            if (info.getId() == null){
+            if (info.getZixunyuan() == null){
                 continue;
             }
             //添加项目上报id
@@ -2687,6 +2687,11 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         return "";
     }
 
+    /**
+     * 根据项目id 查询报告咨询员列表
+     * @param projectId
+     * @return
+     */
     public List<RuralReportConsultant> getConsultantsList(String projectId){
         List<RuralReportConsultant> list=projectcontentinfoDao.findByProjectId(projectId);
         return list;

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

@@ -56,10 +56,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 造价审核项目列表Controller
@@ -1115,7 +1112,7 @@ public class RuralCostProjectMessageController extends BaseController {
             //判定是否是一级造价师
             if ("161".equals( workStaff.getName())){
                 workStaffCertificate.setName(workStaff.getName());
-                workStaffCertificate.setNum(workStaff.getNum());
+                workStaffCertificate.setNum(workStaff.getName());
                 workStaffCertificate.setMajor(workStaff.getMajor());
             }
         }
@@ -1326,11 +1323,18 @@ public class RuralCostProjectMessageController extends BaseController {
             records.setReportData(projectReportData);
             reported = ruralProjectMessageService.disposeData(records);
         }
+        //查询报告咨询员的信息
+        List<RuralReportConsultant> consultants=ruralProjectMessageService.getConsultantsList(projectRecords.getId());
+        for (RuralReportConsultant consultant:consultants){
+            User user=userService.get(consultant.getZixunyuan());
+            consultant.setZixunyuanName(user.getName());
+        }
 
         model.addAttribute("ruralProjectRecordsReported", reported);
         //查询项目信息
         RuralProjectRecords records = projectRecordsService.getQueryProjectUsers(reported.getProjectId());
         model.addAttribute("ruralProjectRecords", records);
+        model.addAttribute("consultantInfo", consultants);
 
         return "modules/ruralprojectrecords/cost/reportedForm";
     }
@@ -1563,7 +1567,14 @@ public class RuralCostProjectMessageController extends BaseController {
             records.setReportData(projectReportData);
             reported = ruralProjectMessageService.disposeData(records);
         }
+        //根据项目id查找报告咨询员信息
+        List<RuralReportConsultant> consultants = ruralProjectMessageService.getConsultantsList(projectRecords.getId());
+        for (RuralReportConsultant consultant:consultants){
+            User user=userService.get(consultant.getZixunyuan());
+            consultant.setZixunyuanName(user.getName());
+        }
         model.addAttribute("ruralProjectRecordsReported", reported);
+        model.addAttribute("consultantInfo", consultants);
         return "modules/ruralprojectrecords/cost/reportedFormPerson";
     }
 

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

@@ -34,10 +34,7 @@ import com.jeeplus.modules.projectrecord.entity.ProjectRecordTreeData;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.projectrecord.service.ProjectPlanService;
 import com.jeeplus.modules.projectrecord.service.ProjectRecordsService;
-import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
-import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecordsReported;
-import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectcontentinfo;
-import com.jeeplus.modules.ruralprojectrecords.entity.SubProjectInfo;
+import com.jeeplus.modules.ruralprojectrecords.entity.*;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectMessageService;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
 import com.jeeplus.modules.ruralprojectrecords.service.SubProjectInfoService;
@@ -472,6 +469,12 @@ public class RuralProjectMessageController extends BaseController {
         RuralProjectRecords ruralProjectRecords = projectRecordsService.getQueryProjectUsers(projectcontentinfo1.getProject().getId());
         Projectcontentinfo projectcontent = projectcontentinfoService.getByInfoId(projectReportData.getId());
         projectcontent.setProjectReportData(projectReportData);
+        //根据项目id查找报告咨询员信息
+        List<RuralReportConsultant> consultants = ruralProjectMessageService.getConsultantsList(projectcontentinfo.getProjectId());
+        for (RuralReportConsultant consultant:consultants){
+            User user=userService.get(consultant.getZixunyuan());
+            consultant.setZixunyuanName(user.getName());
+        }
         //根据条件查询附件必填项
         //判断项目类别是否为打包项目(1：打包项目，0：非打包项目)
         /*Integer projectSort = projectAccessoryRelationService.decideAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
@@ -542,6 +545,7 @@ public class RuralProjectMessageController extends BaseController {
         model.addAttribute("projectRecords", ruralProjectRecords);
         model.addAttribute("id", projectcontentinfo.getId());
         model.addAttribute("projectcontentinfo", projectcontent);
+        model.addAttribute("info", consultants);
         //获取是否含有上报信息
         RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReportedById(projectcontentinfo.getReportedId());
         if(null != reported){
@@ -1335,6 +1339,16 @@ public class RuralProjectMessageController extends BaseController {
             reported = ruralProjectMessageService.disposeData(records);
         }
         model.addAttribute("ruralProjectRecordsReported", reported);
+        //查询报告咨询员的信息
+        List<RuralReportConsultant> consultants=ruralProjectMessageService.getConsultantsList(projectRecords.getId());
+        for (RuralReportConsultant consultant:consultants){
+            User user=userService.get(consultant.getZixunyuan());
+            consultant.setZixunyuanName(user.getName());
+        }
+        //查询项目信息
+        RuralProjectRecords records = projectRecordsService.getQueryProjectUsers(reported.getProjectId());
+        model.addAttribute("ruralProjectRecords", records);
+        model.addAttribute("consultantInfo", consultants);
         return "modules/ruralprojectrecords/ruralporjectmessage/reportedForm";
     }
 

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

@@ -63,9 +63,8 @@ import com.jeeplus.modules.projectrecord.service.ProjectImplementEarlyService;
 import com.jeeplus.modules.projectrecord.service.ProjectPlanService;
 import com.jeeplus.modules.projectrecord.service.ProjectRecordsAlterService;
 import com.jeeplus.modules.projectrecord.service.ProjectRecordsService;
-import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
-import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecordsAlter;
-import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecordsReported;
+import com.jeeplus.modules.ruralprojectrecords.dao.RuralProjectRecordsReportedDao;
+import com.jeeplus.modules.ruralprojectrecords.entity.*;
 import com.jeeplus.modules.ruralprojectrecords.enums.ProjectStatusEnum;
 import com.jeeplus.modules.ruralprojectrecords.service.*;
 import com.jeeplus.modules.serialnum.service.SerialNumTplService;
@@ -469,6 +468,8 @@ public class WorkProjectNotifyController extends BaseController {
 	private WorkattachmentService workattachmentService;
 	@Autowired
 	private ProjectFilingBatchProInfoDao projectFilingBatchProInfoDao;
+	@Autowired
+	private RuralProjectRecordsReportedDao ruralProjectRecordsReportedDao;
 
 	@ModelAttribute
 	public WorkProjectNotify get(@RequestParam(required=false) String id) {
@@ -1530,7 +1531,16 @@ public class WorkProjectNotifyController extends BaseController {
 					}else{
 						reported.setHome("home");
 					}
+					//查询咨询员信息
+					List<ReportedConsultant> consultantList = ruralProjectRecordsReportedDao.consultantList(reported.getId());
+					if(0 < consultantList.size()) {
+						for (ReportedConsultant info : consultantList) {
+							User user=userService.get(info.getZixunyuan());
+							info.setZixunyuanName(user.getName());
+						}
+					}
 					model.addAttribute("ruralProjectRecordsReported", reported);
+					model.addAttribute("consultantInfo", consultantList);
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						return "modules/ruralprojectrecords/ruralporjectmessage/reportedView";
 					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
@@ -1852,7 +1862,12 @@ public class WorkProjectNotifyController extends BaseController {
 							}
 						}
 					}
-
+					//根据项目id查找咨询员信息
+					List<RuralReportConsultant> consultants=ruralProjectMessageService.getConsultantsList(projectReportData.getProject().getId());
+					for (RuralReportConsultant consultant:consultants){
+						User user=userService.get(consultant.getZixunyuan());
+						consultant.setZixunyuanName(user.getName());
+					}
 					//根据条件查询附件必填项
 					//判断项目类别是否为打包项目(1：打包项目，0：非打包项目)
 					/*Integer projectSort = projectAccessoryRelationService.decideAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
@@ -1922,6 +1937,7 @@ public class WorkProjectNotifyController extends BaseController {
 					model.addAttribute("id", projectcontentinfo.getId());
 					model.addAttribute("projectcontentinfo", projectcontentinfo);
 					model.addAttribute("projectRecords", ruralProjectRecords);
+					model.addAttribute("consultantinfo", consultants);
 					WorkReviewAudit workReviewAudit = new WorkReviewAudit();
 					String type = "";
 					if ("master".equals(act.getTaskDefKey())) {

src/main/resources/mappings/modules/projectEngineering/PeojectEngineeringDao.xml

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jeeplus.modules.projectEngineering.dao.ProjectEngineeringInfoDao">
+
+    <sql id="engineeringColumns">
+        a.id AS "id",
+		a.create_by AS "createBy.id",
+		a.create_date AS "createDate",
+		a.update_by AS "updateBy.id",
+		a.update_date AS "updateDate",
+		a.remarks AS "remarks",
+		a.del_flag AS "delFlag",
+		a.parent_id AS "parent.id",
+		a.engineering_name AS "engineeringName",
+		a.parent_ids AS "parentIds",
+		a.company_id AS "companyId",
+		a.index_num AS "indexNum"
+    </sql>
+    <select id="get" resultType="com.jeeplus.modules.projectEngineering.entity.ProjectEngineeringInfo" >
+        SELECT
+        <include refid="engineeringColumns"/>
+        FROM project_engineering_info a
+        WHERE a.id = #{id}
+    </select>
+    <select id="findList" resultType="com.jeeplus.modules.projectEngineering.entity.ProjectEngineeringInfo" >
+        SELECT
+        <include refid="engineeringColumns"/>
+        FROM project_engineering_info a
+        <where>
+            a.del_flag = 0
+            <if test="engineeringName!=null and engineeringName != ''">
+                and a.engineering_name like concat('%',#{engineeringName},'%')
+            </if>
+            <if test="parentIds!=null and parentIds != ''">
+                and a.parent_ids like concat('%',#{parentIds},'%')
+            </if>
+            <if test="indexNum != null and indexNum!=0">
+                and a.index_num = #{indexNum}
+            </if>
+        </where>
+        <choose>
+            <when test="page !=null and page.orderBy != null and page.orderBy != ''">
+                ORDER BY ${page.orderBy}
+            </when>
+            <otherwise>
+                ORDER BY a.index_num
+            </otherwise>
+        </choose>
+    </select>
+    <select id="getParentAll"
+            resultType="com.jeeplus.modules.projectEngineering.entity.ProjectEngineeringInfo">
+        SELECT
+        <include refid="engineeringColumns"/>
+        FROM project_engineering_info a
+        <where>
+            a.del_flag = 0
+            and a.parent_id ="0"
+        </where>
+        ORDER BY a.index_num
+    </select>
+    <select id="selectOrderNum" resultType="java.lang.String">
+        SELECT MAX(index_num) FROM project_engineering_info WHERE parent_id = #{parentId}
+    </select>
+    <insert id="insert">
+        insert into project_engineering_info(
+            id,
+            create_by,
+            create_date,
+            update_by,
+            update_date,
+            remarks,
+            del_flag,
+            parent_id,
+            engineering_name,
+            index_num,
+            parent_ids,
+            company_id
+        )values (
+            #{id},
+            #{createBy.id},
+            #{createDate},
+            #{updateBy.id},
+            #{updateDate},
+            #{remarks},
+            #{delFlag},
+            #{parentId},
+            #{engineeringName},
+            #{indexNum},
+            #{parentIds},
+            #{companyId}
+        )
+    </insert>
+    <update id="update">
+        update project_engineering_info set
+            update_by = #{updateBy.id},
+            update_date = #{updateDate},
+            remarks = #{remarks},
+            parent_id = #{parent.id},
+            engineering_name = #{engineeringName},
+            index_num = #{indexNum},
+            parent_ids = #{parentIds},
+            company_id = #{companyId}
+        WHERE id = #{id}
+    </update>
+    <update id="delete">
+        DELETE FROM project_engineering_info
+        WHERE id = #{id} OR find_in_set(#{id},parent_ids)
+    </update>
+    <select id="fingIds" resultType="com.jeeplus.modules.projectEngineering.entity.ProjectEngineeringInfo">
+        SELECT <include refid="engineeringColumns"/>
+        FROM project_engineering_info a
+        <where>
+            <if test="parentIdSet!=null and parentIdSet.size!=0">
+                a.id in
+                <foreach collection="parentIdSet" item="parentId" separator="," open="(" close=")">
+                    #{parentId}
+                </foreach>
+            </if>
+            AND del_flag ='0'
+            AND company_id = #{companyId}
+        </where>
+        ORDER BY a.index_num
+    </select>
+</mapper>

src/main/webapp/webpage/modules/act/actTaskHistoricFlow.jsp

@@ -1,23 +1,23 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
 <%@ include file="/webpage/include/taglib.jsp"%>
 <style type="text/css">
-	tr{
+	#spLiu tr{
 		white-space: nowrap;
 	}
-	td span,
-	td{
+	#spLiu td span,
+	#spLiu td{
 		/*word-break: keep-all;!*必须*!*/
 		overflow: hidden;
 		text-overflow: ellipsis;
 		white-space: nowrap;
 	}
-	td span{
+	#spLiu td span{
 		/*width:inherit;*/
 		display: inline-block;
 	}
 </style>
 <div class="layui-col-sm12 layui-col-md12 layui-col-lg12 workflow-table">
-	<table class="table table-striped table-bordered table-hover table-condensed details">
+	<table id="spLiu" class="table table-striped table-bordered table-hover table-condensed details">
 		<thead>
 		<tr>
 			<th width="150" style="text-align: center;">审批环节</th>

src/main/webapp/webpage/modules/projectAccessory/projectEngineering/projectEngineeringForm.jsp

@@ -0,0 +1,113 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>复核标准管理</title>
+	<meta name="decorator" content="default"/>
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
+	<script src="${ctxStatic}/layer-v2.3/layui/xmSelect.js" charset="utf-8"></script>
+	<style>
+		label.error{
+			top:40px;
+			left:0;
+		}
+		#standardDetail-error{
+			top:82px;
+			left:0;
+		}
+	</style>
+	<script type="text/javascript">
+		var validateForm;
+		function doSubmit(){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
+			if(validateForm.form()){
+				$("#inputForm").submit();
+				return true;
+			}
+
+			return false;
+		}
+		$(document).ready(function() {
+			layui.use(['form', 'layer'], function () {
+				var form = layui.form;
+			});
+			validateForm = $("#inputForm").validate({
+				submitHandler: function(form){
+					loading('正在提交，请稍等...');
+					form.submit();
+				},
+				errorContainer: "#messageBox",
+				errorPlacement: function(error, element) {
+					$("#messageBox").text("输入有误，请先更正。");
+					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+						error.appendTo(element.parent().parent());
+					} else {
+						error.insertAfter(element);
+					}
+				}
+			});
+			var edit = "${workReviewStandard.id}";
+			if(edit!=null && edit!=''){
+				$("#reviewParentButton").attr("disabled","disabled");
+			}
+		});
+	</script>
+</head>
+<body>
+<div class="single-form">
+	<div class="container">
+		<form:form id="inputForm" modelAttribute="projectEngineeringInfo" action="${ctx}/projectEngineering/projectEngineering/save" method="post" class="form-horizontal layui-form">
+			<form:hidden path="id"/>
+			<form:hidden path="companyId"/>
+			<div class="form-group layui-row first">
+				<div class="form-group-label"><h2>工程类型信息</h2></div>
+					<%--<div class="layui-item layui-col-sm6">
+                        <label class="layui-form-label double-line"><span class="require-item">*</span>附件类型：</label>
+                        <div class="layui-input-block">
+                            <input type="text" value="${projectAccessoryInfo.parent.parentName}" readonly="readonly" class="form-control layui-input">
+                        </div>
+                    </div>--%>
+
+				<div class="layui-item layui-col-sm6 ">
+					<label class="layui-form-label">上级类型：</label>
+					<div class="layui-input-block">
+						<select name="parent.id" class="form-control required simple-select">
+							<option value="0">添加父级</option>
+							<c:forEach items="${parentInfos}" var="info" varStatus="index">
+								<option value="${info.id}">${info.engineeringName}</option>
+							</c:forEach>
+							<c:if test="${null != parent.id}">
+								<option value="${parent.id}" selected>${parent.engineeringName}</option>
+							</c:if>
+						</select>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label double-line"><span class="require-item">*</span>工程类型名称：</label>
+					<div class="layui-input-block">
+						<form:input path="engineeringName" placeholder="请输入工程类型名称" htmlEscape="false" maxlength="100" class="form-control layui-input required"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">序号：</label>
+					<div class="layui-input-block">
+						<form:input path="indexNum" readonly="true" htmlEscape="false" maxlength="10"  class="form-control number layui-input"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm12 with-textarea">
+					<label class="layui-form-label ">备注信息：</label>
+					<div class="layui-input-block">
+						<form:textarea path="remarks" placeholder="请输入备注信息" id="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+					</div>
+				</div>
+			</div>
+		</form:form>
+	</div>
+</div>
+<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
+<script>
+
+
+</script>
+</body>
+</html>

src/main/webapp/webpage/modules/projectAccessory/projectEngineering/projectEngineeringList.jsp

@@ -0,0 +1,124 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>工程类型管理管理</title>
+    <meta name="decorator" content="default"/>
+    <%@include file="/webpage/include/treetable.jsp" %>
+    <script type="text/javascript">
+        $(document).ready(function() {
+            $("#treeTable").treeTable({expandLevel : 5},{ expandable: true });
+        });
+    </script>
+	<style>
+		body{
+			background-color:transparent;
+			filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#26FFFFFF, endColorstr=#26FFFFFF);
+			color:#ffffff;
+			background-color:rgba(255,255,255,0);
+			height:100%;
+		}
+	</style>
+</head>
+<body >
+	<div class="wrapper wrapper-content">
+		<sys:message content="${message}"/>
+		<div class="layui-row">
+			<div class="full-width fl">
+				<div class="contentShadow layui-row" id="queryDiv">
+				<form:form id="searchForm" modelAttribute="projectengineeringInfo" action="${ctx}/projectEngineering/projectEngineering" method="post" class="form-inline">
+					<div class="commonQuery">
+						<div class="layui-item query athird">
+							<label class="layui-form-label double-line">工程类型名：</label>
+							<div class="layui-input-block with-icon">
+								<form:input path="engineeringName" htmlEscape="false" class=" form-control layui-input"></form:input>
+							</div>
+						</div>
+						<div class="layui-item query athird">
+							<label class="layui-form-label">序号：</label>
+							<div class="layui-input-block">
+								<form:input path="indexNum" htmlEscape="false" class=" form-control layui-input"></form:input>
+							</div>
+						</div>
+						<div class="layui-item athird">
+							<div class="input-group">
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<button id="searchReset" style="margin-right: 10px;" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>--%>
+<%--								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>--%>
+							</div>
+						</div>
+						<div style="    clear:both;"></div>
+					</div>
+
+					</form:form>
+				</div>
+			</div>
+			<div class="full-width fl">
+				<div class="contentShadow layui-form contentDetails">
+					<div class="nav-btns">
+							<div class="layui-btn-group">
+								<shiro:hasPermission name="projectEngineering:projectEngineering:add">
+									<a onclick="openDialog('添加工程类型', '${ctx}/projectEngineering/projectEngineering/form','80%','80%')" class="layui-btn layui-btn-sm layui-bg-blue"> 添加工程类型</a>
+								</shiro:hasPermission>
+								<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+							</div>
+						<div style="clear: both;"></div>
+					</div>
+
+	
+					<!-- 表格 -->
+					<table id="treeTable" class="table table-bordered table-hover list-table">
+						<thead>
+							<tr>
+								<th  width="30%">工程类型名称</th>
+								<th >序号</th>
+								<th width="240px">操作</th>
+							</tr>
+						</thead>
+						<tbody>
+						<c:forEach items="${list}" var="projectAccessory">
+							<tr id="${projectAccessory.id}" pid="${projectAccessory.parent.id}">
+								<td>
+									${projectAccessory.engineeringName}
+								</td>
+								<td style="text-align: center">
+									${projectAccessory.indexNum}
+								</td>
+								<td class="op-td text-center">
+									<div class="layui-btn-group">
+									<div class="op-btn-box">
+										<shiro:hasPermission name="projectEngineering:projectEngineering:add">
+											<a href="javascript:void(0);" onclick="openDialog('添加附件结构', '${ctx}/projectEngineering/projectEngineering/form?parent.id=${projectAccessory.id}','80%','80%')" class="layui-btn layui-btn-xs layui-bg-blue"> 添加下级结构</a>
+										</shiro:hasPermission>
+										<shiro:hasPermission name="projectEngineering:projectEngineering:edit">
+											<a href="javascript:void(0);" onclick="openDialog('修改附件结构', '${ctx}/projectEngineering/projectEngineering/form?id=${projectAccessory.id}','80%','80%')" class="layui-btn layui-btn-xs layui-bg-green" > 修改</a>
+										</shiro:hasPermission>
+										<shiro:hasPermission name="projectEngineering:projectEngineering:del">
+											<a href="${ctx}/projectEngineering/projectEngineering/delete?id=${projectAccessory.id}" onclick="return confirmx('确认要删除该工程类型结构及其子工程结构吗？', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>
+										</shiro:hasPermission>
+									</div>
+									</div>
+								</td>
+							</tr>
+						</c:forEach>
+						</tbody>
+					</table>
+	
+		<!-- 分页代码 -->
+	<%--<table:page page="${page}"></table:page>--%>
+
+				</div>
+			</div>
+		</div>
+</div>
+	<script>
+        resizeListWindow1();
+        $(window).resize(function(){
+            resizeListWindow1();
+        });
+	</script>
+</body>
+</html>

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

@@ -9,6 +9,8 @@
 	<link rel='stylesheet' type="text/css" href="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.css"/>
 	<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>
 	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
+	<%@include file="/webpage/include/treetable.jsp" %>
+
 	<script type="text/javascript">
 		var validateForm;
 		function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
@@ -26,10 +28,10 @@
 			// var ss=$(span).val().split(" ")[4];
 			$(span).toggle(function () {
 				$(tiao).hide();
-				$(span).find("span").attr("class","treeTable-icon")
+				$(span).find("span").eq(0).attr("class","default_shut")
 			},function () {
 				$(tiao).show();
-				$(span).find("span").attr("class","treeTable-icon open")
+				$(span).find("span").eq(0).attr("class","default_open")
 			});
 		}
 		function addRowInfoForm(obj,tbody) {
@@ -128,7 +130,7 @@
 							}
 							if(flag) {
 								$("#projectList").append("<tr class='rowSize' onclick='listTr(this)'>" +
-										"<td ><input type=\"hidden\" name=\"proId\" id='" + tid + "' value=" + obj.id + "><input type=\"hidden\" name=\"projectid\" value=" + obj.id + "/><span><i class=\"layui-icon layui-icon-triangle-d\"></i></span>" + obj.projectId + "</td>" +
+										"<td ><input type=\"hidden\" name=\"proId\" id='" + tid + "' value=" + obj.id + "><input type=\"hidden\" name=\"projectid\" value=" + obj.id + "/><span class='default_open ' style=\"padding-right: 15px; \"></span>" + obj.projectId + "</td>" +
 										"<td >" + obj.projectName + "</td>" +
 										"<td >" + obj.projectReportNumber + "</td>" +
 										"<td class=\"text-center op-td\" >" +
@@ -313,7 +315,7 @@
 			<div class="form-group layui-row  first">
 				<div class="form-group-label"><h2>项目基础信息</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" style="padding:0px">
-				<table id="contentTable2" class="table table-bordered table-condensed details">
+				<table id="contentTable2" class="table table-bordered table-condensed details tree_table">
 					<thead>
 					<tr>
 <%--						<th class="hide"></th>--%>

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

@@ -8,6 +8,8 @@
 	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
 	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
+	<%@include file="/webpage/include/treetable.jsp" %>
+
 	<script type="text/javascript">
 		var validateForm;
 		function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
@@ -68,10 +70,10 @@
 				var ss=$(span).val().split(" ")[4];
 				$(span).toggle(function () {
 					$(tiao).hide();
-					$(span).find("span").attr("class","treeTable-icon")
+					$(span).find("span").eq(0).attr("class","default_shut")
 				},function () {
 					$(tiao).show();
-					$(span).find("span").attr("class","treeTable-icon open")
+					$(span).find("span").eq(0).attr("class","default_open")
 				});
 			})
 			validateForm = $("#inputForm").validate({
@@ -280,7 +282,7 @@
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>项目基础信息</h2></div>
-					<table id="contentTable" class="table table-bordered table-condensed can-edit">
+					<table id="contentTable" class="table table-bordered table-condensed can-edit tree_table">
 						<thead>
 						<tr>
 							<th width="20%" style="text-align: center">归档项目编号</th>
@@ -305,9 +307,10 @@
 										<td class="hide">
 											<input id="projectFilingbatchRelations${index.index}_status" name="projectFilingbatchRelations[${index.index}].status" type="hidden" value=""/>
 										</td>
-										<td  style="background-color: #f1f1f1;">
-											<span class="treeTable-icon open" style="padding-left: 10px;"><i class="layui-icon layui-icon-triangle-d"></i></span>  ${project.projectId}
-<%--											<span style="padding-left: 10px;padding-right: 10px;float: left">-</span>${project.projectId}--%>
+										<td style="background-color: #f1f1f1;text-align: center;line-height: 25px">
+											<span class="default_open" style="padding-right: 20px;"></span>  ${project.projectId}
+
+										<%--											<span style="padding-left: 10px;padding-right: 10px;float: left">-</span>${project.projectId}--%>
 <%--											<input style="cursor:Pointer" type="text" value="  -  ${project.projectId}" readonly="readonly"  class="form-control"/>--%>
 										</td>
 										<td>

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

@@ -8,6 +8,7 @@
     <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" />
+    <%@include file="/webpage/include/treetable.jsp" %>
     <style>
         #projectDesc-error{
             left:0;
@@ -68,10 +69,10 @@
             // var ss=$(span).val().split(" ")[4];
             $(span).toggle(function () {
                 $(tiao).hide();
-                $(span).find("span").attr("class","treeTable-icon")
+                $(span).find("span").eq(0).attr("class","default_shut")
             },function () {
                 $(tiao).show();
-                $(span).find("span").attr("class","treeTable-icon open")
+                $(span).find("span").eq(0).attr("class","default_open")
             });
         }
         var edit;
@@ -103,7 +104,7 @@
                             }
                             if(flag) {
                                 $("#projectList").append("<tr class='rowSize' onclick='listTr(this)'>" +
-                                    "<td><input type=\"hidden\" name=\"proId\" id='" + tid + "' value=" + obj.id + "><input type=\"hidden\" name=\"projectid\" value=" + obj.id + "><span><i class=\"layui-icon layui-icon-triangle-d\"></i></span>" + obj.projectId + "</td>" +
+                                    "<td><span class='default_open ' style=\"padding-right: 15px; \"></span><input type=\"hidden\" name=\"proId\" id='" + tid + "' value=" + obj.id + "><input type=\"hidden\" name=\"projectid\" value=" + obj.id + ">" + obj.projectId + "</td>" +
                                     "<td>" + obj.projectName + "</td>" +
                                     "<td>" + obj.projectReportNumber + "</td>" +
                                     "<td class=\"text-center op-td\" >" +
@@ -538,7 +539,7 @@
                         }
                         if(flag) {
                             $("#projectList").append("<tr class='rowSize' onclick='listTr(this)'>" +
-                                "<td><input type=\"hidden\" name=\"proId\" id='" + tid + "' value=" + d.id + "><input type=\"hidden\" name=\"projectid\" value=" + d.id + "><span class='treeTable-icon'><i class=\"layui-icon layui-icon-triangle-d\"></i></span>" + d.projectId + "</td>" +
+                                "<td><span class='default_shut' style=\"padding-right: 15px; \"></span><input type=\"hidden\" name=\"proId\" id='" + tid + "' value=" + d.id + "><input type=\"hidden\" name=\"projectid\" value=" + d.id + ">" + d.projectId + "</td>" +
                                 "<td>" + d.projectName + "</td>" +
                                 "<td>" + d.projectReportNumber + "</td>" +
                                 "<td class=\"text-center op-td\" >" +
@@ -1013,7 +1014,7 @@
                 </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">
+                    <table id="contentTable2" class="table table-bordered table-condensed details tree_table">
                         <thead>
                         <tr>
                             <th class="hide"></th>

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

@@ -465,7 +465,7 @@
                     }
                     if(d.status == 4){
                         //驳回操作
-                        xml+="<a href=\"#\" onclick=\"openDialogre('调整批次信息', '${ctx}/projectFilingBatch/projectFilingBatchInfo/modify?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"olayui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
+                        xml+="<a href=\"#\" onclick=\"openDialogre('调整批次信息', '${ctx}/projectFilingBatch/projectFilingBatchInfo/modify?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</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=\"layui-btn layui-btn-xs layui-bg-red\"> 删除</a>";

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

@@ -7,7 +7,6 @@
 	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
 	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
-
 	<%@include file="/webpage/include/treetable.jsp" %>
 	<script type="text/javascript">
         var validateForm;
@@ -59,6 +58,14 @@
                     }
                 }
             });
+			$(".tabMove").mouseover(function(){
+				//tips层-下
+				var td=$(this)
+				var tdval=$(this).find("input").val();
+				layer.tips(tdval, td, {
+					tips: 3
+				});
+			})
         });
 	</script>
 </head>
@@ -237,7 +244,7 @@
 					<table id="upTable" class="table table-bordered table-condensed details">
 						<thead>
 						<tr>
-							<th width="55%">文件类型</th>
+							<th width="30%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -247,12 +254,12 @@
 							<tr id="${fileAttachment.id}" pid="${fileAttachment.parent.id}">
 								<c:choose>
 									<c:when test="${fileAttachment.mustFlag == 1}">
-										<td><span style="color: red">* </span>${fileAttachment.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
 									</c:when>
 									<c:otherwise>
 										<c:choose>
 											<c:when test="${fileAttachment.flag == 0}">
-												<td>${fileAttachment.attachName}</td>
+												<td class="tabMove" style="text-align: left;">${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
 											</c:when>
 											<c:otherwise>
 												<td></td>
@@ -309,7 +316,7 @@
 					<table id="gistdata_upTable" class="table table-bordered table-condensed details">
 						<thead>
 						<tr>
-							<th width="55%">文件类型</th>
+							<th width="30%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -320,12 +327,12 @@
 									<%-- <td>${status.index + 1}</td>--%>
 								<c:choose>
 									<c:when test="${fileGistdata.mustFlag == 1}">
-										<td><span style="color: red">* </span>${fileGistdata.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span style="color: red">* </span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
 									</c:when>
 									<c:otherwise>
 										<c:choose>
 											<c:when test="${fileGistdata.flag == 0}">
-												<td>${fileGistdata.attachName}</td>
+												<td class="tabMove" style="text-align: left;">${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
 											</c:when>
 											<c:otherwise>
 												<td></td>
@@ -384,7 +391,7 @@
 					<table id="upTable_other" class="table table-bordered table-condensed details">
 						<thead>
 						<tr>
-							<th width="55%">文件类型</th>
+							<th width="30%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -395,12 +402,12 @@
 									<%-- <td>${status.index + 1}</td>--%>
 								<c:choose>
 									<c:when test="${fileOther.mustFlag == 1}">
-										<td><span style="color: red">* </span>${fileOther.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
 									</c:when>
 									<c:otherwise>
 										<c:choose>
 											<c:when test="${fileOther.flag == 0}">
-												<td>${fileOther.attachName}</td>
+												<td class="tabMove" style="text-align: left;">${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
 											</c:when>
 											<c:otherwise>
 												<td></td>

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

@@ -5,6 +5,7 @@
 	<title>合同归档管理</title>
 	<meta name="decorator" content="default"/>
 	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
+	<%@include file="/webpage/include/treetable.jsp" %>
 
 	<script type="text/javascript">
 		function listTr(obj){
@@ -14,10 +15,10 @@
 			// var ss=$(span).val().split(" ")[4];
 			$(span).toggle(function () {
 				$(tiao).hide();
-				$(span).find("span").attr("class","treeTable-icon")
+				$(span).find("span").eq(0).attr("class","default_shut")
 			},function () {
 				$(tiao).show();
-				$(span).find("span").attr("class","treeTable-icon open")
+				$(span).find("span").eq(0).attr("class","default_open")
 			});
 		}
         var validateForm;
@@ -112,6 +113,14 @@
             return false;
         }
         $(document).ready(function() {
+			$(".tabMove").mouseover(function(){
+				//tips层-下
+				var td=$(this)
+				var tdval=$(this).find("input").val();
+				layer.tips(tdval, td, {
+					tips: 3
+				});
+			})
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
                     loading('正在提交，请稍等...');
@@ -325,11 +334,11 @@
 				<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
 				<span id="attachment_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable" class="table table-bordered table-condensed details">
+					<table id="upTable" class="table table-bordered table-condensed details tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="40%">电子件名称</th>
+							<th width="30%">电子件名称</th>
 <%--							<th width="100px">最大容量(M)</th>--%>
 							<th width="">类型限制</th>
 <%--							<th>文件名</th>--%>
@@ -341,7 +350,7 @@
 							<tr id="file_attachment_${fileAttachment.id}_tr" onclick="listTr(this)">
 								<td style="display:none">${fileAttachment.id}</td>
 								<td style="display:none">${fileAttachment.mustFlag}</td>
-								<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileAttachment.attachName}</td>
+								<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
 								<td>${fileAttachment.attachLength}M；${fileAttachment.attachTypes}</td>
 								<td class="op-td">
 									<div class="op-btn-box" >
@@ -371,7 +380,7 @@
 			</div>
 
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>依据性资料</h2></div>
+				<div class="form-group-label"><h2>依据性文件</h2></div>
 				<div id="addFile_gistdata" style="display: none" class="upload-progress">
 					<span id="fileName_gistdata" ></span>
 					<span id="_gistdata" ></span>
@@ -384,11 +393,11 @@
 				<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
 				<span id="gistdata_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="gistdata_upTable" class="table table-bordered table-condensed details">
+					<table id="gistdata_upTable" class="table table-bordered table-condensed details tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="40%">电子件名称</th>
+							<th width="30%">电子件名称</th>
 <%--							<th width="100px">最大容量(M)</th>--%>
 							<th width="">类型限制</th>
 <%--							<th>文件名</th>--%>
@@ -401,7 +410,7 @@
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileGistdata.id}</td>
 								<td style="display:none">${fileGistdata.mustFlag}</td>
-								<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileGistdata.attachName}</td>
+								<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
 <%--								<td></td>--%>
 								<td>${fileGistdata.attachLength}M；${fileGistdata.attachTypes}</td>
 								<td class="op-td">
@@ -445,7 +454,7 @@
 				<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
 				<span id="other_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable_other" class="table table-bordered table-condensed details">
+					<table id="upTable_other" class="table table-bordered table-condensed details tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
@@ -462,7 +471,7 @@
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileOther.id}</td>
 								<td style="display:none">${fileOther.mustFlag}</td>
-								<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileOther.attachName}</td>
+								<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
 								<td>${fileOther.attachLength}M；${fileOther.attachTypes}</td>
 								<td class="op-td">
 									<div class="op-btn-box" >

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

@@ -7,6 +7,8 @@
 	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
 	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
+	<%@include file="/webpage/include/treetable.jsp" %>
+
 	<style>
 		label.error:nth-child(2){
 			top:40px;
@@ -34,10 +36,10 @@
 			// var ss=$(span).val().split(" ")[4];
 			$(span).toggle(function () {
 				$(tiao).hide();
-				$(span).find("span").attr("class","treeTable-icon")
+				$(span).find("span").eq(0).attr("class","default_shut")
 			},function () {
 				$(tiao).show();
-				$(span).find("span").attr("class","treeTable-icon open")
+				$(span).find("span").eq(0).attr("class","default_open")
 			});
 		}
         function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
@@ -155,7 +157,14 @@
             $("#attachment_btn").click(function () {
                 $("#attachment_file").click();
             });
-
+			$(".tabMove").mouseover(function(){
+				//tips层-下
+				var td=$(this)
+				var tdval=$(this).find("input").val();
+				layer.tips(tdval, td, {
+					tips: 3
+				});
+			})
         });
         function insertTitle(tValue){
             var list = "${projectReportRecord.workAttachments}";
@@ -320,11 +329,11 @@
 				<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
 				<span id="attachment_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable" class="table table-bordered table-condensed details">
+					<table id="upTable" class="table table-bordered table-condensed details tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="40%">电子件名称</th>
+							<th width="30%">电子件名称</th>
 <%--							<th width="100px">最大容量(M)</th>--%>
 							<th>类型限制</th>
 <%--							<th>文件名</th>--%>
@@ -338,10 +347,10 @@
 								<td style="display:none">${fileAttachment.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileAttachment.mustFlag == 1}">
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileAttachment.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
 									</c:when>
 									<c:otherwise>
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileAttachment.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
 								<td>${fileAttachment.attachLength}M；${fileAttachment.attachTypes}</td>
@@ -398,7 +407,7 @@
 			</script>
 
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>依据性资料</h2></div>
+				<div class="form-group-label"><h2>依据性文件</h2></div>
 <%--				<div class="layui-item nav-btns">--%>
 <%--						&lt;%&ndash;<a id="gistdata_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>&ndash;%&gt;--%>
 <%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=2&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
@@ -415,11 +424,11 @@
 				<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
 				<span id="gistdata_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="gistdata_upTable" class="table table-bordered table-condensed details">
+					<table id="gistdata_upTable" class="table table-bordered table-condensed details tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="40%">电子件名称</th>
+							<th width="30%">电子件名称</th>
 <%--							<th width="100px">最大容量(M)</th>--%>
 							<th>类型限制</th>
 <%--							<th>文件名</th>--%>
@@ -434,10 +443,10 @@
 								<td style="display:none">${fileGistdata.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileGistdata.mustFlag == 1}">
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileGistdata.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
 									</c:when>
 									<c:otherwise>
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileGistdata.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
 								<td>${fileGistdata.attachLength}M;${fileGistdata.attachTypes}</td>
@@ -512,11 +521,11 @@
 				<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
 				<span id="other_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable_other" class="table table-bordered table-condensed details">
+					<table id="upTable_other" class="table table-bordered table-condensed details tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="40%">电子件名称</th>
+							<th width="30%">电子件名称</th>
 <%--							<th width="100px">最大容量(M)</th>--%>
 							<th>类型限制</th>
 <%--							<th>文件名</th>--%>
@@ -531,10 +540,10 @@
 								<td style="display:none">${fileOther.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileOther.mustFlag == 1}">
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileOther.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open ' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
 									</c:when>
 									<c:otherwise>
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileOther.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
 								<td>${fileOther.attachLength}M;${fileOther.attachTypes}</td>

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

@@ -5,6 +5,7 @@
 	<title>合同归档管理</title>
 	<meta name="decorator" content="default"/>
 	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
+	<%@include file="/webpage/include/treetable.jsp" %>
 	<style>
 		label.error:nth-child(2){
 			top:40px;
@@ -31,10 +32,10 @@
 			// var ss=$(span).val().split(" ")[4];
 			$(span).toggle(function () {
 				$(tiao).hide();
-				$(span).find("span").attr("class","treeTable-icon")
+				$(span).find("span").eq(0).attr("class","default_shut")
 			},function () {
 				$(tiao).show();
-				$(span).find("span").attr("class","treeTable-icon open")
+				$(span).find("span").eq(0).attr("class","default_open")
 			});
 		}
         var validateForm;
@@ -135,6 +136,14 @@
 
         }
         $(document).ready(function() {
+			$(".tabMove").mouseover(function(){
+				//tips层-下
+				var td=$(this)
+				var tdval=$(this).find("input").val();
+				layer.tips(tdval, td, {
+					tips: 3
+				});
+			})
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
                     loading('正在提交，请稍等...');
@@ -351,11 +360,11 @@
 				<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
 				<span id="attachment_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable" class="table table-bordered table-condensed details">
+					<table id="upTable" class="table table-bordered table-condensed details tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="40%">电子件名称</th>
+							<th width="30%">电子件名称</th>
 <%--							<th width="100px">最大容量(M)</th>--%>
 							<th width="">类型限制</th>
 <%--							<th>文件名</th>--%>
@@ -369,10 +378,10 @@
 								<td style="display:none">${fileAttachment.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileAttachment.mustFlag == 1}">
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileAttachment.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
 									</c:when>
 									<c:otherwise>
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileAttachment.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
 								<td>${fileAttachment.attachLength}M;${fileAttachment.attachTypes}</td>
@@ -429,7 +438,7 @@
 			</script>
 
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>依据性资料</h2></div>
+				<div class="form-group-label"><h2>依据性文件</h2></div>
 <%--				<div class="layui-item nav-btns">--%>
 <%--						&lt;%&ndash;<a id="gistdata_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>&ndash;%&gt;--%>
 <%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=2&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
@@ -446,11 +455,11 @@
 				<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
 				<span id="gistdata_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="gistdata_upTable" class="table table-bordered table-condensed details">
+					<table id="gistdata_upTable" class="table table-bordered table-condensed details tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="40%">电子件名称</th>
+							<th width="30%">电子件名称</th>
 <%--							<th width="100px">最大容量(M)</th>--%>
 							<th>类型限制</th>
 <%--							<th>文件名</th>--%>
@@ -465,10 +474,10 @@
 								<td style="display:none">${fileGistdata.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileGistdata.mustFlag == 1}">
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileGistdata.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
 									</c:when>
 									<c:otherwise>
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileGistdata.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
 								<td>${fileGistdata.attachLength}M;${fileGistdata.attachTypes}</td>
@@ -543,11 +552,11 @@
 				<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
 				<span id="other_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable_other" class="table table-bordered table-condensed details">
+					<table id="upTable_other" class="table table-bordered table-condensed details tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="40%">电子件名称</th>
+							<th width="30%">电子件名称</th>
 <%--							<th width="100px">最大容量(M)</th>--%>
 							<th>类型限制</th>
 <%--							<th>文件名</th>--%>
@@ -562,10 +571,10 @@
 								<td style="display:none">${fileOther.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileOther.mustFlag == 1}">
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileOther.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther	.attachName}"/></td>
 									</c:when>
 									<c:otherwise>
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileOther.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
 								<td>${fileOther.attachLength}M;${fileOther.attachTypes}</td>

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

@@ -7,6 +7,8 @@
 	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
 	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
+	<%@include file="/webpage/include/treetable.jsp" %>
+
 	<style>
 		label.error{
 			top:40px;
@@ -21,10 +23,10 @@
 			// var ss=$(span).val().split(" ")[4];
 			$(span).toggle(function () {
 				$(tiao).hide();
-				$(span).find("span").attr("class","treeTable-icon")
+				$(span).find("span").eq(0).attr("class","default_shut")
 			},function () {
 				$(tiao).show();
-				$(span).find("span").attr("class","treeTable-icon open")
+				$(span).find("span").eq(0).attr("class","default_open")
 			});
 		}
         var validateForm;
@@ -133,6 +135,9 @@
             return false;
         }
         $(document).ready(function() {
+			$("#upTable").treeTable({expandLevel : 5},{ expandable: true });
+			$("#gistdata_upTable").treeTable({expandLevel : 5},{ expandable: true });
+			$("#upTable_other").treeTable({expandLevel : 5},{ expandable: true });
 			layui.use(['form', 'layer'], function () {
 				var form = layui.form;
 			})
@@ -180,6 +185,14 @@
 				, trigger: 'click'
 				, trigger: 'click'
 			});
+			$(".tabMove").mouseover(function(){
+				//tips层-下
+				var td=$(this)
+				var tdval=$(this).find("input").val();
+				layer.tips(tdval, td, {
+					tips: 3
+				});
+			})
         });
         function hasInArr(id,idArr) {
             for(var i=0;i<idArr.length;i++){
@@ -899,7 +912,7 @@
 				<div class="layui-item layui-col-sm6 lw7">
 					<label class="layui-form-label"><span class="require-item">*</span>项目负责人：</label>
 					<div class="layui-input-block  with-icon">
-						<sys:reportedtreeselectUser id="principal" name="projectReportData.principal.id" value="${ruralProjectRecords.projectMasterId}" labelName="projectMasterName" labelValue="${projectRecords.projectMasterName}"
+						<sys:reportedtreeselectUser id="principal" name="projectReportData.principal.id" value="${ruralProjectRecords.projectMasterId}" labelName="projectReportData.principal.name" labelValue="${projectRecords.projectMasterName}"
 													cssStyle="background-color:#fff" title="项目负责人" url="/sys/office/treeDataAll?type=4" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
 <%--						<sys:inquireselectUser id="principal" name="projectReportData.principal.id" value="${projectReportData.principal.id}" labelName="projectReportData.principal.name" labelValue="${projectReportData.principal.name}"--%>
 <%--									cssStyle="background-color:#fff"	title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>--%>
@@ -1013,28 +1026,28 @@
 				<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
 				<span id="attachment_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable" class="table table-bordered table-condensed details">
+					<table id="upTable" class="table table-bordered table-condensed details tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-									<th width="40%">电子件名称</th>
+									<th width="30%">电子件名称</th>
 <%--									<th width="100px">最大容量(M)</th>--%>
-							<th width="18%">类型限制</th>
+							<th>类型限制</th>
 <%--									<th>文件名</th>--%>
-							<th width="150px">操作</th>
+							<th width="100px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_attachment">
 						<c:forEach items="${projectcontentinfo.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-							<tr  id="file_attachment_${fileAttachment.id}_tr" onclick="listTr(this)">
+							<tr id="file_attachment_${fileAttachment.id}_tr" onclick="listTr(this)">
 								<td style="display:none">${fileAttachment.id}</td>
 								<td style="display:none">${fileAttachment.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileAttachment.mustFlag == 1}">
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileAttachment.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
 									</c:when>
 									<c:otherwise>
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileAttachment.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
 								<td>${fileAttachment.attachLength}M;${fileAttachment.attachTypes}</td>
@@ -1108,11 +1121,11 @@
 				<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
 				<span id="gistdata_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="gistdata_upTable" class="table table-bordered table-condensed details">
+					<table id="gistdata_upTable" class="table table-bordered table-condensed details tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-									<th width="40%">电子件名称</th>
+									<th width="30%">电子件名称</th>
 <%--									<th width="100px">最大容量(M)</th>--%>
 							<th >类型限制</th>
 <%--									<th>文件名</th>--%>
@@ -1127,10 +1140,10 @@
 								<td style="display:none">${fileGistdata.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileGistdata.mustFlag == 1}">
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileGistdata.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
 									</c:when>
 									<c:otherwise>
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileGistdata.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
 								<td>${fileGistdata.attachLength}M;${fileGistdata.attachTypes}</td>
@@ -1204,11 +1217,11 @@
 				<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
 				<span id="other_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable_other" class="table table-bordered table-condensed details">
+					<table id="upTable_other" class="table table-bordered table-condensed details tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-									<th width="40%">电子件名称</th>
+									<th width="30%">电子件名称</th>
 <%--									<th width="100px">最大容量(M)</th>--%>
 							<th >类型限制</th>
 <%--									<th>文件名</th>--%>
@@ -1223,10 +1236,10 @@
 								<td style="display:none">${fileOther.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileOther.mustFlag == 1}">
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileOther.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther	.attachName}"/></td>
 									</c:when>
 									<c:otherwise>
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileOther.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
 								<td>${fileOther.attachLength}M;${fileOther.attachTypes}</td>

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

@@ -7,6 +7,8 @@
 	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
 	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
+	<%@include file="/webpage/include/treetable.jsp" %>
+
 	<style>
 		label.error{
 			top:40px;
@@ -21,10 +23,10 @@
 			// var ss=$(span).val().split(" ")[4];
 			$(span).toggle(function () {
 				$(tiao).hide();
-				$(span).find("span").attr("class","treeTable-icon")
+				$(span).find("span").eq(0).attr("class","default_shut")
 			},function () {
 				$(tiao).show();
-				$(span).find("span").attr("class","treeTable-icon open")
+				$(span).find("span").eq(0).attr("class","default_open")
 			});
 		}
         var validateForm;
@@ -177,6 +179,14 @@
 				, trigger: 'click'
 				, trigger: 'click'
 			});
+			$(".tabMove").mouseover(function(){
+				//tips层-下
+				var td=$(this)
+				var tdval=$(this).find("input").val();
+				layer.tips(tdval, td, {
+					tips: 3
+				});
+			})
         });
         function hasInArr(id,idArr) {
             for(var i=0;i<idArr.length;i++){
@@ -814,8 +824,8 @@
 				<div class="layui-item layui-col-sm6 lw7">
 					<label class="layui-form-label"><span class="require-item">*</span>项目负责人：</label>
 					<div class="layui-input-block  with-icon">
-						<sys:treeselect id="principal" name="projectReportData.principal.id" value="${projectReportData.principal.id}" labelName="projectReportData.principal.name" labelValue="${projectReportData.principal.name}"
-									cssStyle="background-color:#fff"	title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+						<sys:reportedtreeselectUser id="principal" name="projectReportData.principal.id" value="${ruralProjectRecords.projectMasterId}" labelName="projectReportData.principal.name" labelValue="${projectRecords.projectMasterName}"
+									cssStyle="background-color:#fff"	title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 lw7 with-textarea">
@@ -825,7 +835,88 @@
 					</div>
 				</div>
 			</div>
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2><span class="require-item">*</span>咨询员</h2></div>
+				<div class="layui-item layui-col-sm12 lw6">
+					<div class="layui-item nav-btns">
+						<div class="layui-item nav-btns" style="padding-left:0px;">
+							<a class="nav-btn nav-btn-add"
+							   onclick="addRow('#reportedConsultantList', workClientBankRowIdx, workClientBankTpl);workClientBankRowIdx = workClientBankRowIdx + 1;"
+							   title="新增"><i class="fa fa-plus"></i> 新增</a>
+						</div>
+						<table id="bankinfo" class="table table-bordered table-condensed can-edit">
+							<thead>
+							<tr>
+								<th width="60px">编号</th>
+								<th ><span class="require-item">*</span>咨询员名称</th>
+								<th ><span class="require-item">*</span>注册/资格证号</th>
+								<th ><span class="require-item">*</span>专业</th>
+								<th ><span class="require-item">*</span>本人负责内容</th>
+								<th width="100px">操作</th>
+							</tr>
+							</thead>
+							<tbody id="reportedConsultantList">
+							<c:forEach items="${info}" var = "info" varStatus="status">
+								<tr>
+									<td width="60px">
+										<input id="reportedConsultantList${status.index+1}_costNum" name="reportedConsultantList[${status.index+1}].costNum" readonly="readonly" style="text-align: center"  value="${status.index+1}" type="text" class="form-control contentDetail"/>
+									</td>
+									<td>
+										<sys:reportedtreeselectUser id="reportedConsultantList${status.index+1}_zixunyuan" name="reportedConsultantList[${status.index+1}].zixunyuan" value="${info.zixunyuan}" labelName="workAccountList[${status.index+1}].zixunyuan" labelValue="${info.zixunyuanName}"
+																	title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+									</td>
+
+									<td>
+										<input id="reportedConsultantList${status.index+1}_zhucezigezhID" readonly="true" name="reportedConsultantList[${status.index+1}].zhucezigezhID" value="${info.zhucezigezhID}" class="form-control required"/>
+									</td>
+									<td>
+										<input id="reportedConsultantList${status.index+1}_major" readonly="true"  name="reportedConsultantList[${status.index+1}].major" value="${info.major}" class="form-control required"/>
+									</td>
+									<td>
+										<input id="reportedConsultantList${status.index+1}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[${status.index+1}].wordnr" value="${info.wordnr}" class="form-control required"/>
+									</td>
+
+									<td class="text-center op-td" width="10">
+										<span class="op-btn op-btn-delete" onclick="delRow(this, '#reportedConsultantList${status.index+1}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>
+									</td>
+								</tr>
+							</c:forEach>
+							</tbody>
+						</table>
+						<script type="text/template" id="workClientBankTpl">//<!--
+                                <tr id="reportedConsultantList{{idx}}">
+                                    <td class="hide">
+                                        <input id="reportedConsultantList{{idx}}_id" name="reportedConsultantList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
+                                        <input id="reportedConsultantList{{idx}}_delFlag" name="reportedConsultantList[{{idx}}].delFlag" type="hidden" value="0"/>
+                                        <input id="reportedConsultantList{{idx}}_remindId" name="reportedConsultantList[{{idx}}].remindId" type="hidden" value="{{row.remindId}}"/>
+                                    </td>
 
+                                    <td width="60px">
+                                        <input id="reportedConsultantList{{idx}}_costNum" name="reportedConsultantList[{{idx}}].costNum" readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
+                                    </td>
+                                    <td>
+                                        <sys:reportedtreeselectUser id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
+                                            title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                    </td>
+
+                                    <td>
+                                        <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control required"/>
+                                    </td>
+                                    <td>
+                                        <input id="reportedConsultantList{{idx}}_major" readonly="true"  name="reportedConsultantList[{{idx}}].major" value="{{row.major}}" class="form-control required"/>
+                                    </td>
+                                    <td>
+                                        <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control required"/>
+                                    </td>
+
+                                    <td class="text-center op-td" width="10">
+                                        {{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#reportedConsultantList{{idx}}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>{{/delBtn}}
+                                    </td>
+                                </tr>//-->
+						</script>
+					</div>
+				</div>
+			</div>
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>成果文件</h2></div>
@@ -845,11 +936,11 @@
 				<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
 				<span id="attachment_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable" class="table table-bordered table-condensed details">
+					<table id="upTable" class="table table-bordered table-condensed details tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="40%">电子件名称</th>
+							<th width="30%">电子件名称</th>
 <%--							<th width="100px">最大容量(M)</th>--%>
 							<th>类型限制</th>
 <%--							<th>文件名</th>--%>
@@ -864,10 +955,10 @@
 								<td style="display:none">${fileAttachment.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileAttachment.mustFlag == 1}">
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileAttachment.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
 									</c:when>
 									<c:otherwise>
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileAttachment.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
 								<td>${fileAttachment.attachLength}M;${fileAttachment.attachTypes}</td>
@@ -924,7 +1015,7 @@
 			</script>
 
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>依据性资料</h2></div>
+				<div class="form-group-label"><h2>依据性文件</h2></div>
 <%--				<div class="layui-item nav-btns">--%>
 <%--					&lt;%&ndash;<a id="gistdata_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>&ndash;%&gt;--%>
 <%--						<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=2&projectId=${projectId}&reviewFee='+$('#reviewFee').val(),'500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
@@ -941,11 +1032,11 @@
 				<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
 				<span id="gistdata_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="gistdata_upTable" class="table table-bordered table-condensed details">
+					<table id="gistdata_upTable" class="table table-bordered table-condensed details tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="40%">电子件名称</th>
+							<th width="30%">电子件名称</th>
 <%--							<th width="100px">最大容量(M)</th>--%>
 							<th>类型限制</th>
 <%--							<th>文件名</th>--%>
@@ -960,10 +1051,10 @@
 								<td style="display:none">${fileGistdata.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileOther.mustFlag == 1}">
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileGistdata.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
 									</c:when>
 									<c:otherwise>
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileGistdata.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
 								<td>${fileGistdata.attachLength}M;${fileGistdata.attachTypes}</td>
@@ -1037,7 +1128,7 @@
 				<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
 				<span id="other_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable_other" class="table table-bordered table-condensed details">
+					<table id="upTable_other" class="table table-bordered table-condensed details tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
@@ -1056,10 +1147,10 @@
 								<td style="display:none">${fileOther.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileOther.mustFlag == 1}">
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileOther.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther	.attachName}"/></td>
 									</c:when>
 									<c:otherwise>
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileOther.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
 								<td>${fileOther.attachLength}M;${fileOther.attachTypes}</td>
@@ -1296,24 +1387,16 @@
 		}
 		return false;
 	}
-
-	function addRowBaseData(list, idx, tpl, row){
-		bornTemplete(list, idx, tpl, row, idx);
+	function addRow(list, idx, tpl, row){
+		var idx1 = $("#reportedConsultantList tr").length;
+		idx1 +=1;
+		bornTemplete(list, idx1, tpl, row, idx);
 	}
 
 	function bornTemplete(list, idx, tpl, row, idx1){
-		var idx1 = '';
-		if(list == 'file_attachment'){
-			idx1 = $("#file_attachment tr").length +1;
-		}else if(list == 'file_gistdata'){
-			idx1 = $("#file_gistdata tr").length +1;
-		}else if(list == 'file_other'){
-			idx1 = $("#file_other tr").length +1;
-		}
-
 		$(list).append(Mustache.render(tpl, {
 			idx: idx, delBtn: true, row: row,
-			order:idx1 + 1, idx1:idx1
+			order:idx1 + 1
 		}));
 		$(list+idx).find("select").each(function(){
 			$(this).val($(this).attr("data-value"));
@@ -1327,6 +1410,36 @@
 			}
 		});
 	}
+	// function addRowBaseData(list, idx, tpl, row){
+	// 	bornTemplete(list, idx, tpl, row, idx);
+	// }
+	//
+	// function bornTemplete(list, idx, tpl, row, idx1){
+	// 	var idx1 = '';
+	// 	if(list == 'file_attachment'){
+	// 		idx1 = $("#file_attachment tr").length +1;
+	// 	}else if(list == 'file_gistdata'){
+	// 		idx1 = $("#file_gistdata tr").length +1;
+	// 	}else if(list == 'file_other'){
+	// 		idx1 = $("#file_other tr").length +1;
+	// 	}
+	//
+	// 	$(list).append(Mustache.render(tpl, {
+	// 		idx: idx, delBtn: true, row: row,
+	// 		order:idx1 + 1, idx1:idx1
+	// 	}));
+	// 	$(list+idx).find("select").each(function(){
+	// 		$(this).val($(this).attr("data-value"));
+	// 	});
+	// 	$(list+idx).find("input[type='checkbox'], input[type='radio']").each(function(){
+	// 		var ss = $(this).attr("data-value").split(',');
+	// 		for (var i=0; i<ss.length; i++){
+	// 			if($(this).val() == ss[i]){
+	// 				$(this).attr("checked","checked");
+	// 			}
+	// 		}
+	// 	});
+	// }
 	function delRowBaseData(obj, prefix,userId){
 		var id = $(prefix+"_id").val();
 		var currentUser = '${fns:getUser().id}';
@@ -1410,7 +1523,25 @@
 			top.layer.close(index);
 		});
 		return false;
+
+	}
+	function delRow(obj, prefix){
+		var id = $(prefix+"_id");
+		var delFlag = $(prefix+"_delFlag");
+		$(obj).parent().parent().remove();
 	}
 </script>
+<script type="text/javascript">
+	var workClientBankRowIdx = 0,
+			workClientBankTpl = $("#workClientBankTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
+	$(document).ready(function () {
+		var dataBank = ${fns:toJson(ruralProjectRecordsReported.reportedConsultantList)};
+		for (var i = 0; i < dataBank.length; i++) {
+			addRow('#reportedConsultantList', workClientBankRowIdx, workClientBankTpl, dataBank[i]);
+			workClientBankRowIdx = workClientBankRowIdx + 1;
+		}
+	});
+
+</script>
 </body>
 </html>

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

@@ -422,9 +422,9 @@
         }
 
         function addRow(list, idx, tpl, row){
-            // var idx1 = $("#workClientLinkmanList tr").length;
-            idx +=1;
-            bornTemplete(list, idx, tpl, row, idx);
+            var idx1 = $("#reportedConsultantList tr").length;
+            idx1 +=1;
+            bornTemplete(list, idx1, tpl, row, idx);
         }
 
         function bornTemplete(list, idx, tpl, row, idx1){
@@ -578,7 +578,7 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>咨询项目负责人：</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:reportedtreeselectUser id="master" name="xmFZR" value="${ruralProjectRecords.projectMasterId}" labelName="leaderNameStr" labelValue="${projectRecords.projectMasterName}"
+                        <sys:reportedtreeselectUser id="master" name="xmFZR" value="${ruralProjectRecords.projectMasterId}" labelName="leaderNameStr" labelValue="${ruralProjectRecords.projectMasterName}"
                                                     cssStyle="background-color:#fff" title="项目负责人" url="/sys/office/treeDataAll?type=4" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
 <%--                        <sys:inquireselectUser id="master" name="xmFZR" value="${ruralProjectRecordsReported.xmFZR}" labelName="leaderNameStr" labelValue="${ruralProjectRecordsReported.leaderNameStr}"--%>
 <%--                                      cssStyle="background-color:#fff"  title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>--%>
@@ -674,6 +674,7 @@
                                 <th width="60px">编号</th>
                                 <th ><span class="require-item">*</span>咨询员名称</th>
                                 <th ><span class="require-item">*</span>注册/资格证号</th>
+                                <th width="10%"><span class="require-item">*</span>专业</th>
                                 <th ><span class="require-item">*</span>本人负责内容</th>
                                 <th ><span class="require-item">*</span>完成营业收入比例（%）</th>
                                 <th ><span class="require-item">*</span>完成营业收入（元）</th>
@@ -681,7 +682,36 @@
                             </tr>
                             </thead>
                             <tbody id="reportedConsultantList">
+                                 <c:forEach items="${consultantInfo}" var = "info" varStatus="status">
+                                    <tr>
+                                        <td width="60px">
+                                            <input id="reportedConsultantList${status.index+1}_costNum" name="reportedConsultantList[${status.index+1}].costNum" readonly="readonly" style="text-align: center"  value="${status.index+1}" type="text" class="form-control contentDetail"/>
+                                        </td>
+                                        <td>
+                                            <sys:reportedtreeselectUser id="reportedConsultantList${status.index+1}_zixunyuan" name="reportedConsultantList[${status.index+1}].zixunyuan" value="${info.zixunyuan}" labelName="workAccountList[${status.index+1}].zixunyuan" labelValue="${info.zixunyuanName}"
+                                                                        title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                        </td>
+                                        <td>
+                                            <input id="reportedConsultantList${status.index+1}_zhucezigezhID" readonly="true" name="reportedConsultantList[${status.index+1}].zhucezigezhID" value="${info.zhucezigezhID}" class="form-control required"/>
+                                        </td>
+                                        <td>
+                                            <input id="reportedConsultantList${status.index+1}_remarks" readonly="true"  name="reportedConsultantList[${status.index+1}].remarks" value="${info.major}" class="form-control required"/>
+                                        </td>
+                                        <td>
+                                            <input id="reportedConsultantList${status.index+1}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[${status.index+1}].wordnr" value="${info.wordnr}" class="form-control required"/>
+                                        </td>
+                                        <td>
+                                            <input id="reportedConsultantList${status.index+1}_wcyysrbl" placeholder="请输入收入比例" onblur="setTaxMoney(this)" name="reportedConsultantList[${status.index+1}].wcyysrbl"  class="form-control number required"/>
+                                        </td>
 
+                                        <td>
+                                            <input id="reportedConsultantList${status.index+1}_wcyysr" onblur="setTaxMoney(this)" placeholder="请输入营业收入" name="reportedConsultantList[${status.index+1}].wcyysr"  class="form-control number required"/>
+                                        </td>
+                                        <td class="text-center op-td" width="10">
+                                            <span class="op-btn op-btn-delete" onclick="delRow(this, '#reportedConsultantList${status.index+1}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>
+                                        </td>
+                                    </tr>
+                                </c:forEach>
                             </tbody>
                         </table>
                         <script type="text/template" id="workClientBankTpl">//<!--
@@ -699,11 +729,13 @@
                                         <sys:reportedtreeselectUser id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
                                             title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
-
                                     <td>
                                         <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control required"/>
                                     </td>
                                     <td>
+                                        <input id="reportedConsultantList{{idx}}_remarks" readonly="true"  name="reportedConsultantList[{{idx}}].remarks" value="{{row.remarks}}" class="form-control required"/>
+                                    </td>
+                                    <td>
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control required"/>
                                     </td>
 
@@ -1011,7 +1043,7 @@
                 $.ajax({
                     type:"post",
                     url:'${ctx}/ruralProject/ruralProjectMessage/getArea',
-                    data:{"userId":data.value},
+                    data:{"id":data.value},
                     dataType:"json",
                     async: false,
                     success:function(data){
@@ -1031,13 +1063,13 @@
 <script type="text/javascript">
     var workClientBankRowIdx = 0,
         workClientBankTpl = $("#workClientBankTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
-    $(document).ready(function () {
-        var dataBank = ${fns:toJson(ruralProjectRecordsReported.reportedConsultantList)};
-        for (var i = 0; i < dataBank.length; i++) {
-            addRow('#reportedConsultantList', workClientBankRowIdx, workClientBankTpl, dataBank[i]);
-            workClientBankRowIdx = workClientBankRowIdx + 1;
-        }
-    });
+    <%--$(document).ready(function () {--%>
+    <%--    var dataBank = ${fns:toJson(ruralProjectRecordsReported.reportedConsultantList)};--%>
+    <%--    for (var i = 0; i < dataBank.length; i++) {--%>
+    <%--        addRow('#reportedConsultantList', workClientBankRowIdx, workClientBankTpl, dataBank[i]);--%>
+    <%--        workClientBankRowIdx = workClientBankRowIdx + 1;--%>
+    <%--    }--%>
+    <%--});--%>
 
 </script>
 </body>

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

@@ -672,6 +672,7 @@
                                 <th width="60px">编号</th>
                                 <th ><span class="require-item">*</span>咨询员名称</th>
                                 <th ><span class="require-item">*</span>注册/资格证号</th>
+                                <th width="10%"><span class="require-item">*</span>专业</th>
                                 <th ><span class="require-item">*</span>本人负责内容</th>
                                 <th ><span class="require-item">*</span>完成营业收入比例（%）</th>
                                 <th ><span class="require-item">*</span>完成营业收入（元）</th>
@@ -679,7 +680,36 @@
                             </tr>
                             </thead>
                             <tbody id="reportedConsultantList">
+                            <c:forEach items="${consultantInfo}" var = "info" varStatus="status">
+                                <tr>
+                                    <td width="60px">
+                                        <input id="reportedConsultantList${status.index+1}_costNum" name="reportedConsultantList[${status.index+1}].costNum" readonly="readonly" style="text-align: center"  value="${status.index+1}" type="text" class="form-control contentDetail"/>
+                                    </td>
+                                    <td>
+                                        <sys:reportedtreeselectUser id="reportedConsultantList${status.index+1}_zixunyuan" name="reportedConsultantList[${status.index+1}].zixunyuan" value="${info.zixunyuan}" labelName="workAccountList[${status.index+1}].zixunyuan" labelValue="${info.zixunyuanName}"
+                                                                    title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                    </td>
+                                    <td>
+                                        <input id="reportedConsultantList${status.index+1}_zhucezigezhID" readonly="true" name="reportedConsultantList[${status.index+1}].zhucezigezhID" value="${info.zhucezigezhID}" class="form-control required"/>
+                                    </td>
+                                    <td>
+                                        <input id="reportedConsultantList${status.index+1}_remarks" readonly="true"  name="reportedConsultantList[${status.index+1}].remarks" value="${info.major}" class="form-control required"/>
+                                    </td>
+                                    <td>
+                                        <input id="reportedConsultantList${status.index+1}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[${status.index+1}].wordnr" value="${info.wordnr}" class="form-control required"/>
+                                    </td>
+                                    <td>
+                                        <input id="reportedConsultantList${status.index+1}_wcyysrbl" placeholder="请输入收入比例" onblur="setTaxMoney(this)" name="reportedConsultantList[${status.index+1}].wcyysrbl"  class="form-control number required"/>
+                                    </td>
 
+                                    <td>
+                                        <input id="reportedConsultantList${status.index+1}_wcyysr" onblur="setTaxMoney(this)" placeholder="请输入营业收入" name="reportedConsultantList[${status.index+1}].wcyysr"  class="form-control number required"/>
+                                    </td>
+                                    <td class="text-center op-td" width="10">
+                                        <span class="op-btn op-btn-delete" onclick="delRow(this, '#reportedConsultantList${status.index+1}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>
+                                    </td>
+                                </tr>
+                            </c:forEach>
                             </tbody>
                         </table>
                         <script type="text/template" id="workClientBankTpl">//<!--
@@ -697,11 +727,13 @@
                                         <sys:reportedtreeselectUser id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
                                             title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
-
-                                    <td>
+<td>
                                         <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control required"/>
                                     </td>
                                     <td>
+                                        <input id="reportedConsultantList{{idx}}_major" readonly="true"  name="reportedConsultantList[{{idx}}].major" value="{{row.major}}" class="form-control required"/>
+                                    </td>
+                                    <td>
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control required"/>
                                     </td>
 

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

@@ -600,8 +600,8 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>咨询项目负责人：</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:inquireselectUser id="master" name="xmFZR" value="${ruralProjectRecordsReported.xmFZR}" labelName="leaderNameStr" labelValue="${ruralProjectRecordsReported.leaderNameStr}"
-                                        title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                        <sys:reportedtreeselectUser id="master" name="xmFZR" value="${ruralProjectRecordsReported.xmFZR}" labelName="leaderNameStr" labelValue="${ruralProjectRecordsReported.leaderNameStr}"
+                                        title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -688,6 +688,7 @@
                                 <th width="60px">编号</th>
                                 <th ><span class="require-item">*</span>咨询员名称</th>
                                 <th ><span class="require-item">*</span>注册/资格证号</th>
+                                <th width="10%"><span class="require-item">*</span>专业</th>
                                 <th ><span class="require-item">*</span>本人负责内容</th>
                                 <th ><span class="require-item">*</span>完成营业收入比例（%）</th>
                                 <th ><span class="require-item">*</span>完成营业收入（元）</th>
@@ -718,6 +719,9 @@
                                         <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control required"/>
                                     </td>
                                     <td>
+                                        <input id="reportedConsultantList{{idx}}_remarks" readonly="true"  name="reportedConsultantList[{{idx}}].remarks" value="{{row.remarks}}" class="form-control required"/>
+                                    </td>
+                                    <td>
                                         <input id="reportedConsultantList{{idx}}_wordnr"  name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control required"/>
                                     </td>
 

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

@@ -6,7 +6,9 @@
 	<meta name="decorator" content="default"/>
 	<script src="${ctxStatic}/layer-v2.3/layim/layui/layui.js"></script>
     <link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
-	<%--<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>--%>
+	<%@include file="/webpage/include/treetable.jsp" %>
+
+<%--<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>--%>
     <style>
         .layui-table th{
             font-size: 14px;

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

@@ -5,6 +5,7 @@
 	<title>合同归档管理</title>
 	<meta name="decorator" content="default"/>
 	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
+	<%@include file="/webpage/include/treetable.jsp" %>
 	<style>
 		label.error:nth-child(2){
 			top:40px;
@@ -123,6 +124,14 @@
 
         }
         $(document).ready(function() {
+			$(".tabMove").mouseover(function(){
+				//tips层-下
+				var td=$(this)
+				var tdval=$(this).find("input").val();
+				layer.tips(tdval, td, {
+					tips: 3
+				});
+			})
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
                     loading('正在提交，请稍等...');
@@ -165,10 +174,10 @@
 			// var ss=$(span).val().split(" ")[4];
 			$(span).toggle(function () {
 				$(tiao).hide();
-				$(span).find("span").attr("class","treeTable-icon")
+				$(span).find("span").eq(0).attr("class","default_shut")
 			},function () {
 				$(tiao).show();
-				$(span).find("span").attr("class","treeTable-icon open")
+				$(span).find("span").eq(0).attr("class","default_open")
 			});
 		}
 	</script>
@@ -319,11 +328,11 @@
 				<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
 				<span id="attachment_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable" class="table table-bordered table-condensed details">
+					<table id="upTable" class="table table-bordered table-condensed details tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="40%">电子件名称</th>
+							<th width="30%">电子件名称</th>
 <%--							<th width="100px">最大容量(M)</th>--%>
 							<th width="">类型限制</th>
 <%--							<th>文件名</th>--%>
@@ -337,10 +346,10 @@
 								<td style="display:none">${fileAttachment.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileAttachment.mustFlag == 1}">
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileAttachment.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
 									</c:when>
 									<c:otherwise>
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileAttachment.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
 								<td>${fileAttachment.attachLength}M；${fileAttachment.attachTypes}</td>
@@ -391,7 +400,7 @@
 			</script>
 
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>依据性资料</h2></div>
+				<div class="form-group-label"><h2>依据性文件</h2></div>
 <%--				<div class="layui-item nav-btns">--%>
 <%--						&lt;%&ndash;<a id="gistdata_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>&ndash;%&gt;--%>
 <%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=1&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
@@ -408,7 +417,7 @@
 				<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
 				<span id="gistdata_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="gistdata_upTable" class="table table-bordered table-condensed details">
+					<table id="gistdata_upTable" class="table table-bordered table-condensed details tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
@@ -427,10 +436,10 @@
 								<td style="display:none">${fileGistdata.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileGistdata.mustFlag == 1}">
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileGistdata.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
 									</c:when>
 									<c:otherwise>
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileGistdata.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
 								<td></td>
@@ -499,11 +508,11 @@
 				<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
 				<span id="other_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable_other" class="table table-bordered table-condensed details">
+					<table id="upTable_other" class="table table-bordered table-condensed details tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="40%">电子件名称</th>
+							<th width="30%">电子件名称</th>
 <%--							<th width="100px">最大容量(M)</th>--%>
 							<th>类型限制</th>
 <%--							<th>文件名</th>--%>
@@ -518,10 +527,10 @@
 								<td style="display:none">${fileOther.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileOther.mustFlag == 1}">
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileOther.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther	.attachName}"/></td>
 									</c:when>
 									<c:otherwise>
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileOther.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
 								<td>${fileOther.attachLength}M;${fileOther.attachTypes}</td>

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

@@ -5,6 +5,7 @@
 	<title>合同归档管理</title>
 	<meta name="decorator" content="default"/>
 	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
+	<%@include file="/webpage/include/treetable.jsp" %>
 	<style>
 		label.error:nth-child(2){
 			top:40px;
@@ -122,6 +123,14 @@
 
         }
         $(document).ready(function() {
+			$(".tabMove").mouseover(function(){
+				//tips层-下
+				var td=$(this)
+				var tdval=$(this).find("input").val();
+				layer.tips(tdval, td, {
+					tips: 3
+				});
+			})
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
                     loading('正在提交，请稍等...');
@@ -337,7 +346,7 @@
 				<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
 				<span id="attachment_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable" class="table table-bordered table-condensed details">
+					<table id="upTable" class="table table-bordered table-condensed details tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
@@ -355,10 +364,10 @@
 								<td style="display:none">${fileAttachment.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileAttachment.mustFlag == 1}">
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileAttachment.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
 									</c:when>
 									<c:otherwise>
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileAttachment.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
 								<td>${fileAttachment.attachLength}M；${fileAttachment.attachTypes}</td>
@@ -410,7 +419,7 @@
 			</script>
 
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>依据性资料</h2></div>
+				<div class="form-group-label"><h2>依据性文件</h2></div>
 <%--				<div class="layui-item nav-btns">--%>
 <%--						&lt;%&ndash;<a id="gistdata_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>&ndash;%&gt;--%>
 <%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=1&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
@@ -427,7 +436,7 @@
 				<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
 				<span id="gistdata_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="gistdata_upTable" class="table table-bordered table-condensed details">
+					<table id="gistdata_upTable" class="table table-bordered table-condensed details tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
@@ -446,10 +455,10 @@
 								<td style="display:none">${fileGistdata.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileGistdata.mustFlag == 1}">
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileGistdata.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
 									</c:when>
 									<c:otherwise>
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileGistdata.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
 								<td>${fileGistdata.attachLength}M；${fileGistdata.attachTypes}</td>
@@ -517,7 +526,7 @@
 				<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
 				<span id="other_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable_other" class="table table-bordered table-condensed details">
+					<table id="upTable_other" class="table table-bordered table-condensed details tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
@@ -536,10 +545,10 @@
 								<td style="display:none">${fileOther.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileOther.mustFlag == 1}">
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileOther.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther	.attachName}"/></td>
 									</c:when>
 									<c:otherwise>
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileOther.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
 <%--								<td></td>--%>
@@ -972,10 +981,10 @@
 		// var ss=$(span).val().split(" ")[4];
 		$(span).toggle(function () {
 			$(tiao).hide();
-			$(span).find("span").attr("class","treeTable-icon")
+			$(span).find("span").eq(0).attr("class","default_shut")
 		},function () {
 			$(tiao).show();
-			$(span).find("span").attr("class","treeTable-icon open")
+			$(span).find("span").eq(0).attr("class","default_open")
 		});
 	}
 	function confirmDelete(mess, href){

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

@@ -69,6 +69,14 @@
                     $("#clientName").val(tt);
                 },100);
             }
+			$(".tabMove").mouseover(function(){
+				//tips层-下
+				var td=$(this)
+				var tdval=$(this).find("input").val();
+				layer.tips(tdval, td, {
+					tips: 3
+				});
+			})
         });
 
         function insertTitle(tValue){
@@ -111,6 +119,7 @@
                 }
             });
         }
+
 	</script>
 </head>
 <body >
@@ -471,7 +480,54 @@
 					</div>
 				</c:if>
 			</div>
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2><span class="require-item">*</span>咨询员</h2></div>
+				<div class="layui-item layui-col-sm12 lw6">
+					<div class="layui-item nav-btns">
+						<table id="bankinfo" class="table table-bordered table-condensed can-edit">
+							<thead>
+							<tr>
+								<th width="60px">编号</th>
+								<th ><span class="require-item">*</span>咨询员名称</th>
+								<th ><span class="require-item">*</span>注册/资格证号</th>
+								<th ><span class="require-item">*</span>专业</th>
+								<th ><span class="require-item">*</span>本人负责内容</th>
+<%--								<th width="100px">操作</th>--%>
+							</tr>
+							</thead>
+							<tbody id="reportedConsultantList">
+							<c:forEach items="${consultantinfo}" var = "info" varStatus="status">
+								<tr>
+									<td width="60px">
+										<input id="reportedConsultantList${status.index+1}_costNum" name="reportedConsultantList[${status.index+1}].costNum" readonly="readonly" style="text-align: center"  value="${status.index+1}" type="text" class="form-control contentDetail"/>
+									</td>
+									<td>
+										<input id="reportedConsultantList${status.index+1}_zixunyuan" readonly="true" name="reportedConsultantList[${status.index+1}].zixunyuan" value="${info.zixunyuanName}" class="form-control required"/>
+
+<%--										<sys:reportedtreeselectUser id="reportedConsultantList${status.index+1}_zixunyuan" name="reportedConsultantList[${status.index+1}].zixunyuan" value="${info.zixunyuan}" labelName="workAccountList[${status.index+1}].zixunyuan" labelValue="${info.zixunyuanName}"--%>
+<%--																	title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>--%>
+									</td>
 
+									<td>
+										<input id="reportedConsultantList${status.index+1}_zhucezigezhID" readonly="true" name="reportedConsultantList[${status.index+1}].zhucezigezhID" value="${info.zhucezigezhID}" class="form-control required"/>
+									</td>
+									<td>
+										<input id="reportedConsultantList${status.index+1}_major" readonly="true"  name="reportedConsultantList[${status.index+1}].major" value="${info.major}" class="form-control required"/>
+									</td>
+									<td>
+										<input id="reportedConsultantList${status.index+1}_wordnr" readonly="true" placeholder="请输入本人负责内容" name="reportedConsultantList[${status.index+1}].wordnr" value="${info.wordnr}" class="form-control required"/>
+									</td>
+
+<%--									<td class="text-center op-td" width="10">--%>
+<%--										<span class="op-btn op-btn-delete" onclick="delRow(this, '#reportedConsultantList${status.index+1}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>--%>
+<%--									</td>--%>
+								</tr>
+							</c:forEach>
+							</tbody>
+						</table>
+					</div>
+				</div>
+			</div>
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>成果文件</h2></div>
 				<div id="addFile_attachment" style="display: none" class="upload-progress">
@@ -488,7 +544,7 @@
 					<table id="upTable" class="table table-bordered table-condensed details">
 						<thead>
 						<tr>
-							<th width="55%">文件类型</th>
+							<th width="30%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -498,12 +554,12 @@
 							<tr id="${fileAttachment.id}" pid="${fileAttachment.parent.id}">
 								<c:choose>
 									<c:when test="${fileAttachment.mustFlag == 1}">
-										<td><span style="color: red">* </span>${fileAttachment.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
 									</c:when>
 									<c:otherwise>
 										<c:choose>
 											<c:when test="${fileAttachment.flag == 0}">
-												<td>${fileAttachment.attachName}</td>
+												<td class="tabMove" style="text-align: left;">${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
 											</c:when>
 											<c:otherwise>
 												<td></td>
@@ -556,7 +612,7 @@
 					<table id="gistdata_upTable" class="table table-bordered table-condensed details">
 						<thead>
 						<tr>
-							<th width="55%">文件类型</th>
+							<th width="30%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -567,12 +623,12 @@
 									<%-- <td>${status.index + 1}</td>--%>
 										<c:choose>
 											<c:when test="${fileGistdata.mustFlag == 1}">
-												<td><span style="color: red">* </span>${fileGistdata.attachName}</td>
+												<td class="tabMove" style="text-align: left;"><span style="color: red">* </span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
 											</c:when>
 											<c:otherwise>
 												<c:choose>
 													<c:when test="${fileGistdata.flag == 0}">
-														<td>${fileGistdata.attachName}</td>
+														<td class="tabMove" style="text-align: left;">${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
 													</c:when>
 													<c:otherwise>
 														<td></td>
@@ -624,10 +680,10 @@
 				<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
 				<span id="other_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable_other" class="table table-bordered table-condensed details">
+					<table id="upTable_other" class="table table-bordered table-condensed details tree_table">
 						<thead>
 						<tr>
-							<th width="55%">文件类型</th>
+							<th width="30%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -638,12 +694,12 @@
 									<%-- <td>${status.index + 1}</td>--%>
 										<c:choose>
 											<c:when test="${fileOther.mustFlag == 1}">
-												<td><span style="color: red">* </span>${fileOther.attachName}</td>
+												<td class="tabMove" style="text-align: left;"><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
 											</c:when>
 											<c:otherwise>
 												<c:choose>
 													<c:when test="${fileOther.flag == 0}">
-														<td>${fileOther.attachName}</td>
+														<td class="tabMove" style="text-align: left;">${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
 													</c:when>
 													<c:otherwise>
 														<td></td>

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

@@ -7,6 +7,8 @@
     <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
     <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
     <link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
+    <%@include file="/webpage/include/treetable.jsp" %>
+
     <script type="text/javascript">
         function listTr(obj){
             var name=$(obj).attr("id");
@@ -15,10 +17,10 @@
             // var ss=$(span).val().split(" ")[4];
             $(span).toggle(function () {
                 $(tiao).hide();
-                $(span).find("span").attr("class","treeTable-icon")
+                $(span).find("span").attr("class","default_shut")
             },function () {
                 $(tiao).show();
-                $(span).find("span").attr("class","treeTable-icon open")
+                $(span).find("span").attr("class","default_open")
             });
         }
         var validateForm;
@@ -132,6 +134,9 @@
             return false;
         }
         $(document).ready(function() {
+            $("#upTable").treeTable({expandLevel : 5},{ expandable: true });
+            $("#gistdata_upTable").treeTable({expandLevel : 5},{ expandable: true });
+            $("#upTable_other").treeTable({expandLevel : 5},{ expandable: true });
             layui.use(['form', 'layer'], function () {
                 var form = layui.form;
             })
@@ -149,6 +154,7 @@
                         error.insertAfter(element);
                     }
                 }
+
             });
 
             var contractNum = $("#contractNum").val();
@@ -175,6 +181,14 @@
                 , trigger: 'click'
                 , trigger: 'click'
             });
+            $(".tabMove").mouseover(function(){
+                //tips层-下
+                var td=$(this)
+                var tdval=$(this).find("input").val();
+                layer.tips(tdval, td, {
+                    tips: 3
+                });
+            })
         });
         function getFee() {
             var rf = $("#reviewFee").val();
@@ -265,10 +279,10 @@
         function addFile() {
             $("#attachment_file").click();
         }
-
         function addRow(list, idx, tpl, row){
-            // var idx1 = $("#workClientLinkmanList tr").length;
-            bornTemplete(list, idx, tpl, row, idx);
+            var idx1 = $("#reportedConsultantList tr").length;
+            idx1 +=1;
+            bornTemplete(list, idx1, tpl, row, idx);
         }
 
         function bornTemplete(list, idx, tpl, row, idx1){
@@ -288,12 +302,34 @@
                 }
             });
         }
+        // function addRow(list, idx, tpl, row){
+        //     // var idx1 = $("#workClientLinkmanList tr").length;
+        //     bornTemplete(list, idx, tpl, row, idx);
+        // }
+        //
+        // function bornTemplete(list, idx, tpl, row, idx1){
+        //     $(list).append(Mustache.render(tpl, {
+        //         idx: idx, delBtn: true, row: row,
+        //         order:idx1 + 1
+        //     }));
+        //     $(list+idx).find("select").each(function(){
+        //         $(this).val($(this).attr("data-value"));
+        //     });
+        //     $(list+idx).find("input[type='checkbox'], input[type='radio']").each(function(){
+        //         var ss = $(this).attr("data-value").split(',');
+        //         for (var i=0; i<ss.length; i++){
+        //             if($(this).val() == ss[i]){
+        //                 $(this).attr("checked","checked");
+        //             }
+        //         }
+        //     });
+        // }
     </script>
 </head>
 <body >
 <div class="single-form">
-    <div class="container">
-        <form:form id="inputForm" modelAttribute="projectcontentinfo" enctype="multipart/form-data" action="${ctx}/ruralProject/ruralProjectMessage/reportAudit" method="post" class="form-horizontal layui-form">
+    <div class="container${container}">
+        <form:form id="inputForm" modelAttribute="projectcontentinfo" enctype="multipart/form-data" action="${ctx}/ruralProject/ruralProjectMessage/reportAudit" method="post" class="layui-form">
             <form:hidden path="id"/>
             <form:hidden path="home"/>
             <form:hidden path="project.id"/>
@@ -621,8 +657,8 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>项目负责人：</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:inquireselectUser id="principal" name="projectReportData.principal.id" value="${projectReportData.principal.id}" labelName="projectReportData.principal.name" labelValue="${projectReportData.principal.name}"
-                                      cssStyle="background-color:#fff"  title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                        <sys:reportedtreeselectUser id="principal" name="projectReportData.principal.id" value="${projectReportData.principal.id}" labelName="projectReportData.principal.name" labelValue="${projectReportData.principal.name}"
+                                      cssStyle="background-color:#fff"  title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm12 lw7 with-textarea">
@@ -632,7 +668,87 @@
                     </div>
                 </div>
             </div>
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2><span class="require-item">*</span>咨询员</h2></div>
+                <div class="layui-item layui-col-sm12 lw6">
+                    <div class="layui-item nav-btns">
+                        <div class="layui-item nav-btns" style="padding-left:0px;">
+                            <a class="nav-btn nav-btn-add"
+                               onclick="addRow('#reportedConsultantList', workClientBankRowIdx, workClientBankTpl);workClientBankRowIdx = workClientBankRowIdx + 1;"
+                               title="新增"><i class="fa fa-plus"></i> 新增</a>
+                        </div>
+                        <table id="bankinfo" class="table table-bordered table-condensed can-edit">
+                            <thead>
+                            <tr>
+                                <th width="60px">编号</th>
+                                <th ><span class="require-item">*</span>咨询员名称</th>
+                                <th ><span class="require-item">*</span>注册/资格证号</th>
+                                <th ><span class="require-item">*</span>专业</th>
+                                <th ><span class="require-item">*</span>本人负责内容</th>
+                                <th width="100px">操作</th>
+                            </tr>
+                            </thead>
+                            <tbody id="reportedConsultantList">
+                            <c:forEach items="${consultantinfo}" var = "info" varStatus="status">
+                                <tr>
+                                    <td width="60px">
+                                        <input id="reportedConsultantList${status.index+1}_costNum" name="reportedConsultantList[${status.index+1}].costNum" readonly="readonly" style="text-align: center"  value="${status.index+1}" type="text" class="form-control contentDetail"/>
+                                    </td>
+                                    <td>
+                                        <sys:reportedtreeselectUser id="reportedConsultantList${status.index+1}_zixunyuan" name="reportedConsultantList[${status.index+1}].zixunyuan" value="${info.zixunyuan}" labelName="workAccountList[${status.index+1}].zixunyuan" labelValue="${info.zixunyuanName}"
+                                                                    title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                    </td>
+                                    <td>
+                                        <input id="reportedConsultantList${status.index+1}_zhucezigezhID" readonly="true" name="reportedConsultantList[${status.index+1}].zhucezigezhID" value="${info.zhucezigezhID}" class="form-control required"/>
+                                    </td>
+                                    <td>
+                                        <input id="reportedConsultantList${status.index+1}_major" readonly="true"  name="reportedConsultantList[${status.index+1}].major" value="${info.major}" class="form-control required"/>
+                                    </td>
+                                    <td>
+                                        <input id="reportedConsultantList${status.index+1}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[${status.index+1}].wordnr" value="${info.wordnr}" class="form-control required"/>
+                                    </td>
+
+                                    <td class="text-center op-td" width="10">
+                                        <span class="op-btn op-btn-delete" onclick="delRow(this, '#reportedConsultantList${status.index+1}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>
+                                    </td>
+                                </tr>
+                            </c:forEach>
+                            </tbody>
+                        </table>
+                        <script type="text/template" id="workClientBankTpl">//<!--
+                                <tr id="reportedConsultantList{{idx}}">
+                                    <td class="hide">
+                                        <input id="reportedConsultantList{{idx}}_id" name="reportedConsultantList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
+                                        <input id="reportedConsultantList{{idx}}_delFlag" name="reportedConsultantList[{{idx}}].delFlag" type="hidden" value="0"/>
+                                        <input id="reportedConsultantList{{idx}}_remindId" name="reportedConsultantList[{{idx}}].remindId" type="hidden" value="{{row.remindId}}"/>
+                                    </td>
+
+                                    <td width="60px">
+                                        <input id="reportedConsultantList{{idx}}_costNum" name="reportedConsultantList[{{idx}}].costNum" readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
+                                    </td>
+                                    <td>
+                                        <sys:reportedtreeselectUser id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
+                                            title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                    </td>
+
+                                    <td>
+                                        <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control required"/>
+                                    </td>
+                                    <td>
+                                        <input id="reportedConsultantList{{idx}}_major" readonly="true"  name="reportedConsultantList[{{idx}}].major" value="{{row.major}}" class="form-control required"/>
+                                    </td>
+                                    <td>
+                                        <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control required"/>
+                                    </td>
 
+                                    <td class="text-center op-td" width="10">
+                                        {{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#reportedConsultantList{{idx}}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>{{/delBtn}}
+                                    </td>
+                                </tr>//-->
+                        </script>
+                    </div>
+                </div>
+            </div>
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>成果文件</h2></div>
                 <div id="addFile_attachment" style="display: none" class="upload-progress">
@@ -646,10 +762,10 @@
                 <input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
                 <span id="attachment_title"></span>
                 <div class="layui-item layui-col-xs12" style="padding:0 16px;">
-                    <table id="upTable" class="table table-bordered table-condensed details">
+                    <table id="upTable" class="table table-bordered table-condensed details tree_table">
                         <thead>
                         <tr>
-                            <th width="40%">电子件名称</th>
+                            <th width="30%">电子件名称</th>
 <%--                            <th width="100px">最大容量(M)</th>--%>
                             <th >类型限制</th>
 <%--                            <th>文件名</th>--%>
@@ -661,7 +777,7 @@
                                 <tr id="file_attachment_${fileAttachment.id}_tr" onclick="listTr(this)">
                                     <td style="display:none">${fileAttachment.id}</td>
                                     <td style="display:none">${fileAttachment.mustFlag}</td>
-                                    <td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileAttachment.attachName}</td>
+                                    <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
                                     <td>${fileAttachment.attachLength}M;${fileAttachment.attachTypes}</td>
                                     <td class="op-td">
                                         <div class="op-btn-box" >
@@ -705,7 +821,7 @@
                     <table id="gistdata_upTable" class="table table-bordered table-condensed details">
                         <thead>
                         <tr >
-                            <th width="40%">电子件名称</th>
+                            <th width="30%">电子件名称</th>
 <%--                            <th width="100px">最大容量(M)</th>--%>
                             <th >类型限制</th>
 <%--                            <th>文件名</th>--%>
@@ -717,7 +833,7 @@
                                 <tr id="file_gistdata_${fileGistdata.id}_tr" onclick="listTr(this)">
                                     <td style="display:none">${fileGistdata.id}</td>
                                     <td style="display:none">${fileGistdata.mustFlag}</td>
-                                    <td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileGistdata.attachName}</td>
+                                    <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
                                     <td>${fileGistdata.attachLength}M;${fileGistdata.attachTypes}</td>
                                     <td class="op-td">
                                         <div class="op-btn-box" >
@@ -758,10 +874,10 @@
                 <input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
                 <span id="other_title"></span>
                 <div class="layui-item layui-col-xs12" style="padding:0 16px;">
-                    <table id="upTable_other" class="table table-bordered table-condensed details">
+                    <table id="upTable_other" class="table table-bordered table-condensed details tree_table">
                         <thead>
                         <tr>
-                            <th width="40%">电子件名称</th>
+                            <th width="30%">电子件名称</th>
 <%--                            <th width="100px">最大容量(M)</th>--%>
                             <th >类型限制</th>
 <%--                            <th>文件名</th>--%>
@@ -773,7 +889,7 @@
                                 <tr id="file_other_${fileOther.id}_tr" onclick="listTr(this)">
                                     <td style="display:none">${fileOther.id}</td>
                                     <td style="display:none">${fileOther.mustFlag}</td>
-                                    <td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileOther.attachName}</td>
+                                    <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
                                     <td>${fileOther.attachLength}M;${fileOther.attachTypes}</td>
                                     <td class="op-td">
                                     <div class="op-btn-box" >
@@ -824,17 +940,29 @@
                     </div>
                 </div>
             </div>
-        </form:form>
-
-        <div class="form-group layui-row">
-            <div class="form-group-label"><h2>审批流程</h2></div>
-            <div class="layui-item layui-col-xs12 form-table-container" >
-                <act:flowChart procInsId="${processInstanceId}"/>
-                <act:histoicFlow procInsId="${processInstanceId}"/>
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>审批流程</h2></div>
+                <div class="layui-item layui-col-xs12 form-table-container" >
+                    <act:flowChart procInsId="${processInstanceId}"/>
+                    <act:histoicFlow procInsId="${processInstanceId}"/>
+                </div>
             </div>
-        </div>
+        </form:form>
     </div>
+
 </div>
+<script type="text/javascript">
+    var workClientBankRowIdx = 0,
+        workClientBankTpl = $("#workClientBankTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
+    $(document).ready(function () {
+        var dataBank = ${fns:toJson(ruralProjectRecordsReported.reportedConsultantList)};
+        for (var i = 0; i < dataBank.length; i++) {
+            addRow('#reportedConsultantList', workClientBankRowIdx, workClientBankTpl, dataBank[i]);
+            workClientBankRowIdx = workClientBankRowIdx + 1;
+        }
+    });
+
+</script>
 <script>
     $(document).ready(function() {
         $("#clearOpinon").click(function(){

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

@@ -7,6 +7,7 @@
 	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
 	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
 	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
+	<%@include file="/webpage/include/treetable.jsp" %>
 
 	<style>
 		label.error{
@@ -122,6 +123,14 @@
             return false;
         }
         $(document).ready(function() {
+			$(".tabMove").mouseover(function(){
+				//tips层-下
+				var td=$(this)
+				var tdval=$(this).find("input").val();
+				layer.tips(tdval, td, {
+					tips: 3
+				});
+			})
 			layui.use(['form', 'layer'], function () {
 				var form = layui.form;
 			})
@@ -489,10 +498,10 @@
 			// var ss=$(span).val().split(" ")[4];
 			$(span).toggle(function () {
 				$(tiao).hide();
-				$(span).find("span").attr("class","treeTable-icon")
+				$(span).find("span").eq(0).attr("class","default_shut")
 			},function () {
 				$(tiao).show();
-				$(span).find("span").attr("class","treeTable-icon open")
+				$(span).find("span").eq(0).attr("class","default_open")
 			});
 		}
 	</script>
@@ -872,8 +881,8 @@
 				<div class="layui-item layui-col-sm6 lw7">
 					<label class="layui-form-label"><span class="require-item">*</span>项目负责人：</label>
 					<div class="layui-input-block  with-icon">
-						<sys:inquireselectUser id="principal" name="projectReportData.principal.id" value="${projectReportData.principal.id}" labelName="projectReportData.principal.name" labelValue="${projectReportData.principal.name}"
-									cssStyle="background-color:#fff"	title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+						<sys:reportedtreeselectUser id="principal" name="projectReportData.principal.id" value="${projectRecords.projectMasterId}" labelName="projectReportData.principal.name" labelValue="${projectRecords.projectMasterName}"
+									cssStyle="background-color:#fff"	title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 lw7 with-textarea">
@@ -883,7 +892,88 @@
 					</div>
 				</div>
 			</div>
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2><span class="require-item">*</span>咨询员</h2></div>
+				<div class="layui-item layui-col-sm12 lw6">
+					<div class="layui-item nav-btns">
+						<div class="layui-item nav-btns" style="padding-left:0px;">
+							<a class="nav-btn nav-btn-add"
+							   onclick="addRow('#reportedConsultantList', workClientBankRowIdx, workClientBankTpl);workClientBankRowIdx = workClientBankRowIdx + 1;"
+							   title="新增"><i class="fa fa-plus"></i> 新增</a>
+						</div>
+						<table id="bankinfo" class="table table-bordered table-condensed can-edit">
+							<thead>
+							<tr>
+								<th width="60px">编号</th>
+								<th ><span class="require-item">*</span>咨询员名称</th>
+								<th ><span class="require-item">*</span>注册/资格证号</th>
+								<th ><span class="require-item">*</span>专业</th>
+								<th ><span class="require-item">*</span>本人负责内容</th>
+								<th width="100px">操作</th>
+							</tr>
+							</thead>
+							<tbody id="reportedConsultantList">
+							<c:forEach items="${info}" var = "info" varStatus="status">
+								<tr>
+									<td width="60px">
+										<input id="reportedConsultantList${status.index+1}_costNum" name="reportedConsultantList[${status.index+1}].costNum" readonly="readonly" style="text-align: center"  value="${status.index+1}" type="text" class="form-control contentDetail"/>
+									</td>
+									<td>
+										<sys:reportedtreeselectUser id="reportedConsultantList${status.index+1}_zixunyuan" name="reportedConsultantList[${status.index+1}].zixunyuan" value="${info.zixunyuan}" labelName="workAccountList[${status.index+1}].zixunyuan" labelValue="${info.zixunyuanName}"
+																	title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+									</td>
+
+									<td>
+										<input id="reportedConsultantList${status.index+1}_zhucezigezhID" readonly="true" name="reportedConsultantList[${status.index+1}].zhucezigezhID" value="${info.zhucezigezhID}" class="form-control required"/>
+									</td>
+									<td>
+										<input id="reportedConsultantList${status.index+1}_major" readonly="true"  name="reportedConsultantList[${status.index+1}].major" value="${info.major}" class="form-control required"/>
+									</td>
+									<td>
+										<input id="reportedConsultantList${status.index+1}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[${status.index+1}].wordnr" value="${info.wordnr}" class="form-control required"/>
+									</td>
 
+									<td class="text-center op-td" width="10">
+										<span class="op-btn op-btn-delete" onclick="delRow(this, '#reportedConsultantList${status.index+1}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>
+									</td>
+								</tr>
+							</c:forEach>
+							</tbody>
+						</table>
+						<script type="text/template" id="workClientBankTpl">//<!--
+                                <tr id="reportedConsultantList{{idx}}">
+                                    <td class="hide">
+                                        <input id="reportedConsultantList{{idx}}_id" name="reportedConsultantList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
+                                        <input id="reportedConsultantList{{idx}}_delFlag" name="reportedConsultantList[{{idx}}].delFlag" type="hidden" value="0"/>
+                                        <input id="reportedConsultantList{{idx}}_remindId" name="reportedConsultantList[{{idx}}].remindId" type="hidden" value="{{row.remindId}}"/>
+                                    </td>
+
+                                    <td width="60px">
+                                        <input id="reportedConsultantList{{idx}}_costNum" name="reportedConsultantList[{{idx}}].costNum" readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
+                                    </td>
+                                    <td>
+                                        <sys:reportedtreeselectUser id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
+                                            title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                    </td>
+
+                                    <td>
+                                        <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control required"/>
+                                    </td>
+                                    <td>
+                                        <input id="reportedConsultantList{{idx}}_major" readonly="true"  name="reportedConsultantList[{{idx}}].major" value="{{row.major}}" class="form-control required"/>
+                                    </td>
+                                    <td>
+                                        <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control required"/>
+                                    </td>
+
+                                    <td class="text-center op-td" width="10">
+                                        {{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#reportedConsultantList{{idx}}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>{{/delBtn}}
+                                    </td>
+                                </tr>//-->
+						</script>
+					</div>
+				</div>
+			</div>
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>成果文件</h2></div>
 <%--				<div class="layui-item nav-btns">--%>
@@ -901,11 +991,11 @@
 				<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
 				<span id="attachment_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable" class="table table-bordered table-condensed details">
+					<table id="upTable" class="table table-bordered table-condensed details tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="40%">电子件名称</th>
+							<th width="30%">电子件名称</th>
 <%--							<th width="100px">最大容量(M)</th>--%>
 							<th >类型限制</th>
 <%--							<th>文件名</th>--%>
@@ -919,10 +1009,10 @@
 								<td style="display:none">${fileAttachment.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileAttachment.mustFlag == 1}">
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileAttachment.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
 									</c:when>
 									<c:otherwise>
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileAttachment.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
 
@@ -982,7 +1072,7 @@
 
 
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>依据性资料</h2></div>
+				<div class="form-group-label"><h2>依据性文件</h2></div>
 <%--				<div class="layui-item 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>--%>
@@ -999,11 +1089,11 @@
 				<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
 				<span id="gistdata_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="gistdata_upTable" class="table table-bordered table-condensed details">
+					<table id="gistdata_upTable" class="table table-bordered table-condensed details tree_table">
 						<thead>
 						<tr >
 								<%-- <th>序号</th>--%>
-							<th width="40%">电子件名称</th>
+							<th width="30%">电子件名称</th>
 <%--							<th width="100px">最大容量(M)</th>--%>
 							<th >类型限制</th>
 <%--							<th>文件名</th>--%>
@@ -1018,10 +1108,10 @@
 								<td style="display:none">${fileGistdata.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileGistdata.mustFlag == 1}">
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileGistdata.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
 									</c:when>
 									<c:otherwise>
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileGistdata.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
 								<td>${fileGistdata.attachLength}M;${fileGistdata.attachTypes}</td>
@@ -1096,11 +1186,11 @@
 				<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
 				<span id="other_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable_other" class="table table-bordered table-condensed details">
+					<table id="upTable_other" class="table table-bordered table-condensed details tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="40%">电子件名称</th>
+							<th width="30%">电子件名称</th>
 <%--							<th width="100px">最大容量(M)</th>--%>
 							<th >类型限制</th>
 <%--							<th>文件名</th>--%>
@@ -1115,10 +1205,10 @@
 								<td style="display:none">${fileOther.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileOther.mustFlag == 1}">
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileOther.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther	.attachName}"/></td>
 									</c:when>
 									<c:otherwise>
-										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileOther.attachName}</td>
+										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
 								<td>${fileOther.attachLength}M;${fileOther.attachTypes}</td>
@@ -1467,6 +1557,46 @@
 		});
 		return false;
 	}
+	function delRow(obj, prefix){
+		var id = $(prefix+"_id");
+		var delFlag = $(prefix+"_delFlag");
+		$(obj).parent().parent().remove();
+	}
+	function addRow(list, idx, tpl, row){
+		var idx1 = $("#reportedConsultantList tr").length;
+		idx1 +=1;
+		bornTemplete(list, idx1, tpl, row, idx);
+	}
+
+	function bornTemplete(list, idx, tpl, row, idx1){
+		$(list).append(Mustache.render(tpl, {
+			idx: idx, delBtn: true, row: row,
+			order:idx1 + 1
+		}));
+		$(list+idx).find("select").each(function(){
+			$(this).val($(this).attr("data-value"));
+		});
+		$(list+idx).find("input[type='checkbox'], input[type='radio']").each(function(){
+			var ss = $(this).attr("data-value").split(',');
+			for (var i=0; i<ss.length; i++){
+				if($(this).val() == ss[i]){
+					$(this).attr("checked","checked");
+				}
+			}
+		});
+	}
+</script>
+<script type="text/javascript">
+	var workClientBankRowIdx = 0,
+			workClientBankTpl = $("#workClientBankTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
+	$(document).ready(function () {
+		var dataBank = ${fns:toJson(ruralProjectRecordsReported.reportedConsultantList)};
+		for (var i = 0; i < dataBank.length; i++) {
+			addRow('#reportedConsultantList', workClientBankRowIdx, workClientBankTpl, dataBank[i]);
+			workClientBankRowIdx = workClientBankRowIdx + 1;
+		}
+	});
+
 </script>
 </body>
 </html>

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

@@ -608,8 +608,8 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>咨询项目负责人：</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:inquireselectUser id="master" name="xmFZR" value="${ruralProjectRecordsReported.xmFZR}" labelName="leaderNameStr" labelValue="${ruralProjectRecordsReported.leaderNameStr}"
-                                      cssStyle="background-color:#fff"  title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                        <sys:reportedtreeselectUser id="master" name="xmFZR" value="${ruralProjectRecordsReported.xmFZR}" labelName="leaderNameStr" labelValue="${ruralProjectRecordsReported.leaderNameStr}"
+                                      cssStyle="background-color:#fff"  title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -696,6 +696,7 @@
                                 <th width="60px">编号</th>
                                 <th ><span class="require-item">*</span>咨询员名称</th>
                                 <th ><span class="require-item">*</span>注册/资格证号</th>
+                                <th width="10%"><span class="require-item">*</span>专业</th>
                                 <th ><span class="require-item">*</span>本人负责内容</th>
                                 <th ><span class="require-item">*</span>完成营业收入比例（%）</th>
                                 <th ><span class="require-item">*</span>完成营业收入（元）</th>
@@ -726,6 +727,9 @@
                                         <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control required"/>
                                     </td>
                                     <td>
+                                        <input id="reportedConsultantList{{idx}}_remarks" readonly="true"  name="reportedConsultantList[{{idx}}].remarks" value="{{row.remarks}}" class="form-control required"/>
+                                    </td>
+                                    <td>
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control required"/>
                                     </td>
 

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

@@ -438,9 +438,9 @@
         }
 
         function addRow(list, idx, tpl, row){
-            // var idx1 = $("#workClientLinkmanList tr").length;
-            idx +=1;
-            bornTemplete(list, idx, tpl, row, idx);
+            var idx1 = $("#reportedConsultantList tr").length;
+            idx1 +=1;
+            bornTemplete(list, idx1, tpl, row, idx);
         }
 
         function bornTemplete(list, idx, tpl, row, idx1){
@@ -594,8 +594,8 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>咨询项目负责人：</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:inquireselectUser id="master" name="xmFZR" value="${ruralProjectRecordsReported.xmFZR}" labelName="leaderNameStr" labelValue="${ruralProjectRecordsReported.leaderNameStr}"
-                                       cssStyle="background-color:#fff" title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                        <sys:reportedtreeselectUser id="master" name="xmFZR" value="${ruralProjectRecords.projectMasterId}" labelName="leaderNameStr" labelValue="${ruralProjectRecords.projectMasterName}"
+                                       cssStyle="background-color:#fff" title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -688,6 +688,7 @@
                                 <th width="60px">编号</th>
                                 <th ><span class="require-item">*</span>咨询员名称</th>
                                 <th ><span class="require-item">*</span>注册/资格证号</th>
+                                <th width="10%"><span class="require-item">*</span>专业</th>
                                 <th ><span class="require-item">*</span>本人负责内容</th>
                                 <th ><span class="require-item">*</span>完成营业收入比例（%）</th>
                                 <th ><span class="require-item">*</span>完成营业收入（元）</th>
@@ -695,7 +696,36 @@
                             </tr>
                             </thead>
                             <tbody id="reportedConsultantList">
+                            <c:forEach items="${consultantInfo}" var = "info" varStatus="status">
+                                <tr>
+                                    <td width="60px">
+                                        <input id="reportedConsultantList${status.index+1}_costNum" name="reportedConsultantList[${status.index+1}].costNum" readonly="readonly" style="text-align: center"  value="${status.index+1}" type="text" class="form-control contentDetail"/>
+                                    </td>
+                                    <td>
+                                        <sys:reportedtreeselectUser id="reportedConsultantList${status.index+1}_zixunyuan" name="reportedConsultantList[${status.index+1}].zixunyuan" value="${info.zixunyuan}" labelName="workAccountList[${status.index+1}].zixunyuan" labelValue="${info.zixunyuanName}"
+                                                                    title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                    </td>
+                                    <td>
+                                        <input id="reportedConsultantList${status.index+1}_zhucezigezhID" readonly="true" name="reportedConsultantList[${status.index+1}].zhucezigezhID" value="${info.zhucezigezhID}" class="form-control required"/>
+                                    </td>
+                                    <td>
+                                        <input id="reportedConsultantList${status.index+1}_remarks" readonly="true"  name="reportedConsultantList[${status.index+1}].remarks" value="${info.major}" class="form-control required"/>
+                                    </td>
+                                    <td>
+                                        <input id="reportedConsultantList${status.index+1}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[${status.index+1}].wordnr" value="${info.wordnr}" class="form-control required"/>
+                                    </td>
+                                    <td>
+                                        <input id="reportedConsultantList${status.index+1}_wcyysrbl" placeholder="请输入收入比例" onblur="setTaxMoney(this)" name="reportedConsultantList[${status.index+1}].wcyysrbl"  class="form-control number required"/>
+                                    </td>
 
+                                    <td>
+                                        <input id="reportedConsultantList${status.index+1}_wcyysr" onblur="setTaxMoney(this)" placeholder="请输入营业收入" name="reportedConsultantList[${status.index+1}].wcyysr"  class="form-control number required"/>
+                                    </td>
+                                    <td class="text-center op-td" width="10">
+                                        <span class="op-btn op-btn-delete" onclick="delRow(this, '#reportedConsultantList${status.index+1}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>
+                                    </td>
+                                </tr>
+                            </c:forEach>
                             </tbody>
                         </table>
                         <script type="text/template" id="workClientBankTpl">//<!--
@@ -717,6 +747,9 @@
                                     <td>
                                         <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control required"/>
                                     </td>
+                                     <td>
+                                        <input id="reportedConsultantList{{idx}}_remarks" readonly="true"  name="reportedConsultantList[{{idx}}].remarks" value="{{row.remarks}}" class="form-control required"/>
+                                    </td>
                                     <td>
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control required"/>
                                     </td>
@@ -1045,13 +1078,13 @@
 <script type="text/javascript">
     var workClientBankRowIdx = 0,
         workClientBankTpl = $("#workClientBankTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
-    $(document).ready(function () {
-        var dataBank = ${fns:toJson(ruralProjectRecordsReported.reportedConsultantList)};
-        for (var i = 0; i < dataBank.length; i++) {
-            addRow('#reportedConsultantList', workClientBankRowIdx, workClientBankTpl, dataBank[i]);
-            workClientBankRowIdx = workClientBankRowIdx + 1;
-        }
-    });
+    <%--$(document).ready(function () {--%>
+    <%--    var dataBank = ${fns:toJson(ruralProjectRecordsReported.reportedConsultantList)};--%>
+    <%--    for (var i = 0; i < dataBank.length; i++) {--%>
+    <%--        addRow('#reportedConsultantList', workClientBankRowIdx, workClientBankTpl, dataBank[i]);--%>
+    <%--        workClientBankRowIdx = workClientBankRowIdx + 1;--%>
+    <%--    }--%>
+    <%--});--%>
 
 </script>
 </body>

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

@@ -599,8 +599,8 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>咨询项目负责人：</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:inquireselectUser id="master" name="xmFZR" value="${ruralProjectRecordsReported.xmFZR}" labelName="leaderNameStr" labelValue="${ruralProjectRecordsReported.leaderNameStr}"
-                                      cssStyle="background:#fff"  title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                        <sys:reportedtreeselectUser id="master" name="xmFZR" value="${ruralProjectRecordsReported.xmFZR}" labelName="leaderNameStr" labelValue="${ruralProjectRecordsReported.leaderNameStr}"
+                                      cssStyle="background:#fff"  title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -673,7 +673,7 @@
             </div>
 
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2><span class="require-item">*</span></h2></div>
+                <div class="form-group-label"><h2><span class="require-item">*</span>咨询员</h2></div>
                 <div class="layui-item layui-col-sm12 lw6">
                     <div class="layui-item nav-btns">
                         <div class="layui-item nav-btns" style="padding-left:0px;">
@@ -687,6 +687,7 @@
                                 <th width="60px">编号</th>
                                 <th ><span class="require-item">*</span>咨询员名称</th>
                                 <th ><span class="require-item">*</span>注册/资格证号</th>
+                                <th width="10%"><span class="require-item">*</span>专业</th>
                                 <th ><span class="require-item">*</span>本人负责内容</th>
                                 <th ><span class="require-item">*</span>完成营业收入比例（%）</th>
                                 <th ><span class="require-item">*</span>完成营业收入（元）</th>
@@ -717,6 +718,9 @@
                                         <input id="reportedConsultantList{{idx}}_zhucezigezhID"  readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control required"/>
                                     </td>
                                     <td>
+                                        <input id="reportedConsultantList{{idx}}_remarks" readonly="true"  name="reportedConsultantList[{{idx}}].remarks" value="{{row.remarks}}" class="form-control required"/>
+                                    </td>
+                                    <td>
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control required"/>
                                     </td>
 

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

@@ -757,7 +757,7 @@
 					}
 					if(d.projectReportStatus == 1){
 						xml+="<a href=\"#\" onclick=\"openDialogre('修改报告信息', '${ctx}/ruralProject/ruralProjectMessage/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改报告</a>";
-						xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-btn-red\" > 删除报告</a>";
+						xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除报告</a>";
 					}
 					if(d.projectReportStatus == 2){
 						xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "\" onclick=\"return confirmx('确认要撤回该项目报告审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-btn-red\" > 撤回报告</a>";
@@ -765,12 +765,12 @@
 					if(d.projectReportStatus == 3){
 						//撤回操作
 						xml+="<a href=\"#\" onclick=\"openDialogre('调整报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改报告</a>";
-						xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-btn-red\" > 删除报告</a>";
+						xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除报告</a>";
 					}
 					if(d.projectReportStatus == 4){
 						//驳回操作
 						xml+="<a href=\"#\" onclick=\"openDialogreReport('调整报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + "&view=report','"+d.id+"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改报告</a>";
-						xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-btn-red\" > 删除报告</a>";
+						xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除报告</a>";
 					}
 
 					//线上归档操作