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

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

@@ -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/projectcontentinfo/dao/ProjectReportDataDao.java

@@ -9,6 +9,7 @@ import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportTreeData;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecordTreeData;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectReportData;
+import com.jeeplus.modules.ruralprojectrecords.entity.RuralReportConsultant;
 import com.jeeplus.modules.sys.entity.Workattachment;
 import org.apache.ibatis.annotations.Param;
 
@@ -123,4 +124,11 @@ public interface ProjectReportDataDao extends CrudDao<ProjectReportData> {
      * @return
      */
     ProjectReportData processFindInfoByStatus(ProjectReportData projectReportData);
+
+    /**
+     * 根据项目id查询三级校审咨询员信息
+     * @param projectId
+     * @return
+     */
+    List<RuralReportConsultant> getConsultantList(String projectId);
 }

src/main/java/com/jeeplus/modules/projectcontentinfo/dao/ProjectcontentinfoDao.java

@@ -7,7 +7,10 @@ import com.jeeplus.common.persistence.CrudDao;
 import com.jeeplus.common.persistence.annotation.MyBatisDao;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectContentTreeData;
 import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
+import com.jeeplus.modules.ruralprojectrecords.entity.ReportedConsultant;
+import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecordsReported;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectcontentinfo;
+import com.jeeplus.modules.ruralprojectrecords.entity.RuralReportConsultant;
 import com.jeeplus.modules.sys.entity.Workattachment;
 import com.jeeplus.modules.workcontent.entity.WorkContentClaim;
 import org.apache.ibatis.annotations.Param;
@@ -80,4 +83,23 @@ public interface ProjectcontentinfoDao extends CrudDao<Projectcontentinfo> {
 	 * @return
 	 */
 	WorkContentClaim getTypeByProjectIdAndContentId(@Param("projectId") String projectId ,@Param("contentId")  String contentId);
+	/**
+	 * 删除报告咨询员信息
+	 * @param projectId
+	 * @return
+	 */
+	int deleteConsultant(@Param("projectId") String projectId);
+	/**
+	 * 新增报告咨询员信息
+	 * @param info
+	 * @return
+	 */
+	int insertConsultant(RuralReportConsultant info);
+
+	/**
+	 * 根据项目id查找报告咨询员信息
+	 * @param projectId
+	 * @return
+	 */
+	List<RuralReportConsultant> findByProjectId(@Param("projectId") String projectId);
 }

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

@@ -4,11 +4,14 @@
 package com.jeeplus.modules.projectcontentinfo.entity;
 
 
+import com.google.common.collect.Lists;
 import com.jeeplus.common.persistence.TreeEntity;
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
 import com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
+import com.jeeplus.modules.ruralprojectrecords.entity.ReportedConsultant;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
+import com.jeeplus.modules.ruralprojectrecords.entity.RuralReportConsultant;
 import com.jeeplus.modules.sys.entity.Workattachment;
 
 import java.util.Date;
@@ -53,6 +56,8 @@ public class Projectcontentinfo extends TreeEntity<Projectcontentinfo> {
 	private String monthlyContent;  //月报内容信息
 	private String monthlyNumber;   //月报编号
 
+	private List<RuralReportConsultant> reportedConsultantList= Lists.newArrayList();;//咨询员列表
+
 	private List<ProjectTemplateInfo> fileAttachmentList;   //报告文件
 	private List<ProjectTemplateInfo> fileGistdataList;   //依据性文件
 	private List<ProjectTemplateInfo> fileOtherList;   //其他文件
@@ -319,4 +324,12 @@ public class Projectcontentinfo extends TreeEntity<Projectcontentinfo> {
 	public void setFileOtherList(List<ProjectTemplateInfo> fileOtherList) {
 		this.fileOtherList = fileOtherList;
 	}
+
+	public List<RuralReportConsultant> getReportedConsultantList() {
+		return reportedConsultantList;
+	}
+
+	public void setReportedConsultantList(List<RuralReportConsultant> reportedConsultantList) {
+		this.reportedConsultantList = reportedConsultantList;
+	}
 }

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectReportDataService.java

@@ -23,6 +23,7 @@ import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.projectrecord.service.ProjectRecordsService;
 import com.jeeplus.modules.projectreportnum.service.ProjectReportNumService;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectReportData;
+import com.jeeplus.modules.ruralprojectrecords.entity.RuralReportConsultant;
 import com.jeeplus.modules.serialnum.service.SerialNumTplService;
 import com.jeeplus.modules.sys.dao.WorkattachmentDao;
 import com.jeeplus.modules.sys.entity.Office;
@@ -1573,4 +1574,14 @@ public class ProjectReportDataService extends CrudService<ProjectReportDataDao,
 		return projectReportData;
 	}
 
+
+	/**
+	 * 根据项目id查询三级校审咨询员信息
+	 * @param projectId
+	 * @return
+	 */
+	public List<RuralReportConsultant> getConsultantList(String projectId){
+		List<RuralReportConsultant> consultantList = dao.getConsultantList(projectId);
+		return consultantList;
+	}
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecords.java

@@ -175,6 +175,10 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private String checkNotifyId; //选查代办判定条件
 	private String actType; //流程节点
 
+	private String projectMasterName;	//项目负责人名称
+	private String projectMasterId;		//项目负责人id
+	private List<User> projectMasterIds; //项目负责人list
+
 	private List<String> civilProjectList = Lists.newArrayList();
 	private List<WorkClientAttachment> workAttachments = Lists.newArrayList();
 
@@ -1221,4 +1225,28 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setActType(String actType) {
 		this.actType = actType;
 	}
+
+	public String getProjectMasterName() {
+		return projectMasterName;
+	}
+
+	public void setProjectMasterName(String projectMasterName) {
+		this.projectMasterName = projectMasterName;
+	}
+
+	public String getProjectMasterId() {
+		return projectMasterId;
+	}
+
+	public void setProjectMasterId(String projectMasterId) {
+		this.projectMasterId = projectMasterId;
+	}
+
+	public List<User> getProjectMasterIds() {
+		return projectMasterIds;
+	}
+
+	public void setProjectMasterIds(List<User> projectMasterIds) {
+		this.projectMasterIds = projectMasterIds;
+	}
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralReportConsultant.java

@@ -0,0 +1,83 @@
+package com.jeeplus.modules.ruralprojectrecords.entity;
+
+import com.jeeplus.common.persistence.DataEntity;
+
+/**
+ * 新增报告-咨询员表
+ */
+public class RuralReportConsultant extends DataEntity<RuralReportConsultant> {
+
+    private String zixunyuanId;   //咨询员序号   自增长
+    private String zixunyuan;       //咨询员
+    private String zixunyuanName;       //咨询员(录入)
+    private String zhucezigezhID;  //注册/资格证号
+    private String zhucezigezh;  //资格证
+    private String major;           //专业
+    private String wordnr;          //本人复制内容
+    private String projectId;       //项目id
+
+    public String getZixunyuanId() {
+        return zixunyuanId;
+    }
+
+    public void setZixunyuanId(String zixunyuanId) {
+        this.zixunyuanId = zixunyuanId;
+    }
+
+    public String getZixunyuan() {
+        return zixunyuan;
+    }
+
+    public String getZhucezigezh() {
+        return zhucezigezh;
+    }
+
+    public void setZhucezigezh(String zhucezigezh) {
+        this.zhucezigezh = zhucezigezh;
+    }
+
+    public void setZixunyuan(String zixunyuan) {
+        this.zixunyuan = zixunyuan;
+    }
+
+    public String getZixunyuanName() {
+        return zixunyuanName;
+    }
+
+    public void setZixunyuanName(String zixunyuanName) {
+        this.zixunyuanName = zixunyuanName;
+    }
+
+    public String getZhucezigezhID() {
+        return zhucezigezhID;
+    }
+
+    public void setZhucezigezhID(String zhucezigezhID) {
+        this.zhucezigezhID = zhucezigezhID;
+    }
+
+    public String getMajor() {
+        return major;
+    }
+
+    public void setMajor(String major) {
+        this.major = major;
+    }
+
+    public String getWordnr() {
+        return wordnr;
+    }
+
+    public void setWordnr(String wordnr) {
+        this.wordnr = wordnr;
+    }
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+}

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

@@ -517,6 +517,22 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         Projectcontentinfo contentinfo = projectcontentinfoDao.findListByProject(s).get(0);
         projectcontentinfo.setProjectOnRural(this.getInfo(projectcontentinfo.getProject().getId()));
         List<Workattachment> attachmentList = projectcontentinfo.getWorkAttachments();
+        //获取报告咨询员信息
+        List<RuralReportConsultant> ruralReportConsultants=projectcontentinfo.getReportedConsultantList();
+        //删除上报咨询员信息
+        projectcontentinfoDao.deleteConsultant(projectcontentinfo.getProjectOnRural().getId());
+        //保存咨询员信息
+        for (RuralReportConsultant info : projectcontentinfo.getReportedConsultantList()){
+            if (info.getZixunyuan() == null){
+                continue;
+            }
+            //添加项目id
+            info.setProjectId(projectcontentinfo.getProjectOnRural().getId());
+            info.preInsert();
+//            ruralProjectRecordsReportedDao.insertConsultant(info);
+            projectcontentinfoDao.insertConsultant(info);
+
+        }
         //工作报告
         if (projectcontentinfo.getProjectReportData()!=null){
             //保存工作报告相关数据
@@ -1916,9 +1932,10 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
 
             //查询咨询员信息
             List<ReportedConsultant> consultantList = ruralProjectRecordsReportedDao.consultantList(id);
-            if(0 < consultantList.size())
-            for (ReportedConsultant info: consultantList) {
-                info.setZixunyuanId(info.getZixunyuan());
+            if(0 < consultantList.size()) {
+                for (ReportedConsultant info : consultantList) {
+                    info.setZixunyuanId(info.getZixunyuan());
+                }
             }
             ruralProjectRecordsReported.setReportedConsultantList(consultantList);
         }
@@ -2030,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
@@ -2270,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
@@ -2628,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
@@ -2669,4 +2686,14 @@ 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

@@ -29,6 +29,7 @@ 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.RuralReportConsultant;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectMessageService;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
@@ -38,6 +39,9 @@ import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
+import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
+import com.jeeplus.modules.workstaff.entity.WorkStaffCertificate;
+import com.jeeplus.modules.workstaff.service.WorkStaffBasicInfoService;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.history.HistoricProcessInstance;
 import org.activiti.engine.runtime.ProcessInstance;
@@ -47,18 +51,12 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.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
@@ -96,6 +94,8 @@ public class RuralCostProjectMessageController extends BaseController {
     private ProjectAccessoryRelationService projectAccessoryRelationService;
     @Autowired
     private UserService userService;
+    @Autowired
+    private WorkStaffBasicInfoService workStaffBasicInfoService;
 
     private static byte[] SYN_BYTE = new byte[0];
 
@@ -448,6 +448,14 @@ public class RuralCostProjectMessageController 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());
@@ -517,6 +525,7 @@ public class RuralCostProjectMessageController 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){
@@ -1088,8 +1097,27 @@ public class RuralCostProjectMessageController extends BaseController {
         return "modules/ruralprojectrecords/cost/projectReportRecord/projectReportRecordModify";
     }
 
-
-
+    /**
+     * 咨询员获取资格证号和专业
+     * @param workStaffBasicInfo
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "getWorkUser")
+    public WorkStaffCertificate getWorkUser(WorkStaffBasicInfo workStaffBasicInfo){
+        workStaffBasicInfo = workStaffBasicInfoService.getWorkStaffBasicInfoByUserId(workStaffBasicInfo.getId());
+        workStaffBasicInfoService.queryDetails(workStaffBasicInfo);
+        WorkStaffCertificate workStaffCertificate=new WorkStaffCertificate();
+        for (WorkStaffCertificate workStaff:workStaffBasicInfo.getCertificateList()){
+            //判定是否是一级造价师
+            if ("161".equals( workStaff.getName())){
+                workStaffCertificate.setName(workStaff.getName());
+                workStaffCertificate.setNum(workStaff.getName());
+                workStaffCertificate.setMajor(workStaff.getMajor());
+            }
+        }
+        return workStaffCertificate;
+    }
 
     /**
      * 保存报告归档
@@ -1295,7 +1323,19 @@ 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";
     }
 
@@ -1527,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/ruralprojectrecords/web/RuralProjectViewController.java

@@ -580,4 +580,67 @@ public class RuralProjectViewController extends BaseController {
         model.addAttribute("project", projectReportRecord.getReport().getProject());
         return "modules/ruralprojectrecords/view/projectReportRecordView";
     }
+    /**
+     * 项目选查
+     * 传参：项目id
+     * @param projectRecords
+     * @param model
+     * @return
+     */
+//    @RequiresPermissions(value={"ruralProject:ruralProjectView:view"})
+    @RequestMapping(value = "searchview")
+    public String searchview(RuralProjectRecords projectRecords, Model model) {
+        if (projectRecords!=null&& StringUtils.isNotBlank(projectRecords.getId())) {
+            projectRecords = projectRecordsService.get(projectRecords.getId());
+            projectRecordsService.queryProjectDetail(projectRecords);
+            ProjectPlanInfo projectPlanInfo = new ProjectPlanInfo();
+            projectPlanInfo.setProjectId(projectRecords.getId());
+            if(null != projectRecords.getWorkContractInfo()){
+                if(null != projectRecords.getWorkContractInfo().getContractTypeDoc()){
+                    projectRecords.getWorkContractInfo().setContractType(DictUtils.getMainDictLabel(String.valueOf(projectRecords.getWorkContractInfo().getContractTypeDoc()),"contract_info_type",""));
+                }
+            }
+            //获取项目计划信息
+            List<ProjectPlanInfo> projectPlanList = projectPlanService.getProjectPlanList(projectPlanInfo);
+            projectRecords.setProjectPlanList(projectPlanList);
+            List<MainDictDetail> mainDictList = Lists.newArrayList();
+            //工程咨询
+            if("1".equals(projectRecords.getProjectType())){
+                mainDictList = DictUtils.getMainDictList("attachment_project_sort");
+                //造价审核
+            } else if("2".equals(projectRecords.getProjectType())){
+                mainDictList = DictUtils.getMainDictList("attachment_project_sort_cost");
+            }
+            if(StringUtils.isNotBlank(projectRecords.getAttachmentProjectSort())){
+                //处理项目类别
+                for (MainDictDetail info: mainDictList) {
+                    if(projectRecords.getAttachmentProjectSort().equals(info.getValue())){
+                        projectRecords.setAttachmentProjectSort(info.getLabel());
+                        break;
+                    }
+                }
+            }
+
+            //查询项目报告信息
+            ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(projectRecords.getId());
+            //如果项目报告不为空，则查询项目线上归档信息
+            if(null != projectReportData){
+                ProjectReportRecord projectReportRecord = ruralProjectMessageService.getProjectReportRecord(projectReportData.getId());
+                if(null != projectReportRecord){
+                    model.addAttribute("projectId", projectRecords.getId());
+                }else{
+                    model.addAttribute("projectId", "");
+                }
+            }
+
+            model.addAttribute("flagProjectReportData",projectReportData);
+
+        }
+        model.addAttribute("projectRecords", projectRecords);
+        RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReported(projectRecords.getId());
+        if (null!=reported){
+            model.addAttribute("reportedId",reported.getId());
+        }
+        return "modules/ruralprojectrecords/view/selectiveSearchView";
+    }
 }

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

@@ -27,4 +27,6 @@ public interface AreaDao extends TreeDao<Area> {
 	List<Area> getChildren(String parentId);
 
     Area findAraeByid(String id);
+
+	List<Area> findAraeByParentId(String id);
 }

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

@@ -244,4 +244,11 @@ public interface UserDao extends CrudDao<User> {
 	int updateUser(User user);
 
 	String findUserNo(String weChatId);
+
+	/**
+	 * 根据名称获取用户信息
+	 * @param name
+	 * @return
+	 */
+	User findUserByUserName(String name);
 }

src/main/java/com/jeeplus/modules/sys/service/AreaService.java

@@ -40,6 +40,25 @@ public class AreaService extends TreeService<AreaDao, Area> {
 		return UserUtils.findAraeByid(pid);
 	}
 
+
+	/**
+	 * 根据id查该地区下所有子集
+	 * @param areaList
+	 * @param id
+	 * @return
+	 */
+	public List<Area> findAraeListByParentId(List<Area> areaList,String id){
+		List<Area> areas = UserUtils.findAraeListByParentId(id);
+		if(null != areas){
+			areaList.addAll(areas);
+			for (Area area: areas) {
+				this.findAraeListByParentId(areaList,area.getId());
+			}
+		}
+		return areaList;
+	}
+
+
 	@Transactional(readOnly = false)
 	public void save(Area area) {
 		super.save(area);

src/main/java/com/jeeplus/modules/sys/service/SystemService.java

@@ -1567,4 +1567,13 @@ public class SystemService extends BaseService implements InitializingBean {
         user.setOffice(office);
         return userDao.countByOffice(user);
     }
+
+    /**
+     * 根据用户名称查询用户信息
+     * @param name
+     * @return
+     */
+    public User findUserByUserName(String name) {
+        return userDao.findUserByUserName(name);
+    }
 }

src/main/java/com/jeeplus/modules/sys/utils/UserUtils.java

@@ -119,6 +119,17 @@ public class UserUtils {
 		return area;
 	}
 
+
+	/**
+	 * 根据ID获取区域
+	 * @param id
+	 * @return
+	 */
+	public static List<Area> findAraeListByParentId(String id){
+		List<Area> areas=areaDao.findAraeByParentId(id);
+		return areas;
+	}
+
 	public static User getNoSession(String id){
 		User user = userDao.get(id);
 		if (user == null){

src/main/java/com/jeeplus/modules/sys/web/AreaController.java

@@ -142,14 +142,25 @@ public class AreaController extends BaseController {
 //		}
 		return "redirect:" + adminPath + "/sys/area/";
 	}
-
+	//排重
+	public  static  LinkedList<Map<String,Object>>  paichong(LinkedList<Map<String,Object>> list){
+		LinkedList<Map<String,Object>> linkedList=new LinkedList<>();
+		Iterator<Map<String,Object>> it=list.iterator();
+		while (it.hasNext()){
+			Map<String,Object> str=it.next();
+			if (!linkedList.contains(str)){
+				linkedList.add(str);
+			}
+		}
+		return linkedList;
+	}
 	@RequiresPermissions("user")
 	@ResponseBody
 	@RequestMapping(value = "treeData")
 	public List<Map<String, Object>> treeData(@RequestParam(required=false) String extId,@RequestParam(required=false) String selectName, HttpServletResponse response) {
 //		List<Map<String, Object>> mapList = Lists.newArrayList();
 		List<Area> list = areaService.findByArae(selectName);
-		HashSet<Map<String,Object>> prantsSet = new HashSet();
+		LinkedList<Map<String,Object>> prantsSet = new LinkedList<>();
 		for (int i=0; i<list.size(); i++){
 			Area e = list.get(i);
 			if (StringUtils.isBlank(extId) || (extId!=null && !extId.equals(e.getId()) && e.getParentIds().indexOf(","+extId+",")==-1)){
@@ -169,6 +180,18 @@ public class AreaController extends BaseController {
 							prantsSet.add(prantsmap);
 						}
 					}
+					List<Area> areaList = Lists.newArrayList();
+					//根据id查该地区下所有子集
+					areaList = areaService.findAraeListByParentId(areaList,e.getId());
+					for (Area info: areaList) {
+						Map<String, Object> prantsmap = Maps.newHashMap();
+						prantsmap.put("id", info.getId());
+						prantsmap.put("pId", info.getParentId());
+						prantsmap.put("pIds", info.getParentIds());
+						prantsmap.put("name", info.getName());
+						prantsmap.put("selectName", selectName);
+						prantsSet.add(prantsmap);
+					}
 				}
 				map.put("id", e.getId());
 				map.put("pId", e.getParentId());
@@ -178,7 +201,8 @@ public class AreaController extends BaseController {
 				prantsSet.add(map);
 			}
 		}
-		List<Map<String,Object>> mapList = Lists.newArrayList(prantsSet);
+		List<Map<String,Object>> s=paichong(prantsSet);
+		List<Map<String,Object>> mapList = Lists.newArrayList(s);
 		return mapList;
 	}
 

src/main/java/com/jeeplus/modules/sys/web/OfficeController.java

@@ -28,7 +28,9 @@ import com.jeeplus.modules.wexinpackage.access.util.access.AddressDepartment;
 import com.jeeplus.modules.wexinpackage.access.util.access.WeChatParamsUtil;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
+import com.jeeplus.modules.workstaff.entity.WorkStaffCertificate;
 import com.jeeplus.modules.workstaff.service.WorkStaffBasicInfoService;
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -500,6 +502,8 @@ public class OfficeController extends BaseController {
             //存放部门搜索添加
             office.setOldName(selectName);
         }
+        HashSet<Map<String, Object>> mapSet = new HashSet<>();
+        //查询所有有关部门
         List<Office> list = officeService.findByParentIdsLike(office);
         for (int i = 0; i < list.size(); i++) {
             Office e = list.get(i);
@@ -513,16 +517,28 @@ public class OfficeController extends BaseController {
                 map.put("pIds", e.getParentIds());
                 map.put("name", e.getTopCompany());
                 map.put("selectName", selectName);
-                if (type != null && "3".equals(type)) {
+                if (type != null && ("3".equals(type) || "4".equals(type))) {
                     map.put("isParent", true);
                 }
+                if("4".equals(type)){
+                    //根据参数获取信息
+                    List<User> listUser = systemService.treeDataByNameOnReported(e.getId(),selectName);
+                    if(listUser.size()>0) {
+                        mapSet.add(map);
+                    }
+                }
                 mapList.add(map);
             }
         }
+
+        if("4".equals(type)){
+            List<Map<String,Object>> mapList1=new ArrayList<>(mapSet);
+            return mapList1;
+        }
         if(!"2".equals(type)){
             List<User> userList= new ArrayList<>();
-            HashSet<Map<String, Object>> mapSet = new HashSet<>();
-            if (null != selectName && "" != selectName){
+            //判定参数必须存在
+            if (StringUtils.isNotBlank(selectName)){
                 userList = systemService.findUserByName(selectName);
                 if (0 != userList.size()){
                     Iterator it = mapList.iterator();
@@ -548,8 +564,7 @@ public class OfficeController extends BaseController {
                     List<Map<String,Object>> mapList1=new ArrayList<>(mapSet);
                     return mapList1;
                 }
-        }
-
+            }
         }
         return mapList;
     }

src/main/java/com/jeeplus/modules/sys/web/UserController.java

@@ -18,15 +18,13 @@ import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.projectrecord.dao.WorkProjectUserDao;
 import com.jeeplus.modules.sys.dao.UserDao;
-import com.jeeplus.modules.sys.entity.Office;
-import com.jeeplus.modules.sys.entity.Role;
-import com.jeeplus.modules.sys.entity.SystemConfig;
-import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.entity.*;
 import com.jeeplus.modules.sys.security.SystemAuthorizingRealm;
 import com.jeeplus.modules.sys.service.OfficeService;
 import com.jeeplus.modules.sys.service.SystemConfigService;
 import com.jeeplus.modules.sys.service.SystemService;
 import com.jeeplus.modules.sys.service.UserService;
+import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.sysimportinfo.entity.SysImportInfo;
 import com.jeeplus.modules.sysimportinfo.service.SysImportInfoService;
@@ -1015,6 +1013,10 @@ public class UserController extends BaseController {
     public List<Map<String, Object>> treeDataByNameOnReported(@RequestParam(required=false) String projectId,@RequestParam(required=false) String officeId,@RequestParam(required = false) String selectName, HttpServletResponse response) {
         List<Map<String, Object>> mapList = Lists.newArrayList();
         if(StringUtils.isBlank(projectId)){
+            if(StringUtils.isBlank(officeId)){
+                return mapList;
+            }
+            //根据部门查询人员信息
             List<User> list = systemService.treeDataByNameOnReported(officeId,selectName);
             for (int i=0; i<list.size(); i++){
                 Map<String, Object> map = Maps.newHashMap();
@@ -1026,13 +1028,6 @@ public class UserController extends BaseController {
                 map.put("name", name);
                 WorkStaffBasicInfo info = workStaffBasicInfoService.getWorkStaffBasicInfoByUserId(e.getId());
                 workStaffBasicInfoService.queryDetails(info);
-                List<WorkStaffCertificate> certificateList = info.getCertificateList();
-                for (WorkStaffCertificate certificate:certificateList) {
-                    if("注册/资格证".equals(certificate.getName())){
-                        map.put("officeId", certificate.getNum());
-                        break;
-                    }
-                }
                 mapList.add(map);
             }
         }else{
@@ -1461,5 +1456,21 @@ public class UserController extends BaseController {
         return ajaxJson;
     }
 
+    /**
+     * 验证工号是否重复
+     * @param oldNo
+     * @param no
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "getUserByName")
+    public AjaxJson getUserByName(String name) {
+        AjaxJson ajaxJson = new AjaxJson();
+        if(StringUtils.isNotBlank(name)){
+            User user = systemService.findUserByUserName(name);
+            ajaxJson.put("data",user);
+        }
+        return ajaxJson;
+    }
 
 }

src/main/java/com/jeeplus/modules/workclientinfo/service/WorkClientInfoService.java

@@ -185,8 +185,58 @@ public class WorkClientInfoService extends CrudService<WorkClientInfoDao, WorkCl
      * @return
      */
     public Page<WorkClientInfo> findPage(Page<WorkClientInfo> page, WorkClientInfo workClientInfo) {
-//        workClientInfo.setOfficeId(UserUtils.getSelectOffice().getId());
-//        workClientInfo.getSqlMap().put("dsf", dataScopeFilter(workClientInfo.getCurrentUser(), "o", "u","s", MenuStatusEnum.WORK_CLIENT_INFO.getValue()));
+        workClientInfo.setOfficeId(UserUtils.getSelectOffice().getId());
+        workClientInfo.getSqlMap().put("dsf", dataScopeFilter(workClientInfo.getCurrentUser(), "o", "u","s", MenuStatusEnum.WORK_CLIENT_INFO.getValue()));
+        long t1 = System.currentTimeMillis();
+        //根据项目类型获取对应的客户id个数
+        int count = workClientInfoDao.queryCount(workClientInfo);
+        page.setCount(count);
+        long t2 = System.currentTimeMillis();
+        logger.info("查询客户总数耗时：{}",t2-t1);
+        page.setCountFlag(false);
+        workClientInfo.setPage(page);
+        List<WorkClientInfo> list = findList(workClientInfo);
+        //根据客户id查询客户的相关客户类型
+        for (WorkClientInfo clientInfo: list) {
+            clientInfo.setJobTypeStr(workClientInfoDao.getJobTypeStr(clientInfo.getId()));
+        }
+        long t3 = System.currentTimeMillis();
+        logger.info("查询客户列表耗时：{}",t3-t2);
+        if(list!=null && list.size()>0){
+            for (int i = 0; i < list.size(); i++) {
+                WorkClientInfo entity = list.get(i);
+                List<WorkClientLinkman> linkmanList = findLinkmanList(entity);
+                entity.setWorkClientLinkmanList(linkmanList);
+                if(linkmanList!=null && linkmanList.size()>0){
+                    StringBuilder builder = new StringBuilder();
+                    for (int j = 0; j < linkmanList.size(); j++) {
+                        builder.append(linkmanList.get(j).getName());
+                        if(j<linkmanList.size()-1){
+                            builder.append(",");
+                        }
+                    }
+                    entity.setLinkManNames(builder.toString());
+                }
+                List<WorkClientBank> bankList = findBankList(entity);
+                entity.setWorkClientBankList(bankList);
+            }
+        }
+        long t4 = System.currentTimeMillis();
+        logger.info("查询客户详情耗时：{}",t4-t3);
+        logger.info("查询客户总耗时：{}",t4-t1);
+        page.setList(list);
+        return page;
+    }
+
+
+
+    /**
+     * 获取一个客户信息
+     * @param page 分页对象
+     * @param workClientInfo
+     * @return
+     */
+    public Page<WorkClientInfo> findPageByContract(Page<WorkClientInfo> page, WorkClientInfo workClientInfo) {
         long t1 = System.currentTimeMillis();
         //根据项目类型获取对应的客户id个数
         int count = workClientInfoDao.queryCount(workClientInfo);

src/main/java/com/jeeplus/modules/workclientinfo/web/WorkClientInfoController.java

@@ -86,14 +86,10 @@ public class WorkClientInfoController extends BaseController {
 	@RequestMapping(value = {"list", ""})
 	public String list(WorkClientInfo workClientInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
 
-		if(StringUtils.isNotBlank(workClientInfo.getCreateId())){
-			User selectUser = UserUtils.get(workClientInfo.getCreateId());
-			model.addAttribute("createName", selectUser.getName());
-		}else{
-			if(StringUtils.isNotBlank(workClientInfo.getCreateNameStr())){
-				model.addAttribute("createName", workClientInfo.getCreateNameStr());
-			}
+		if(StringUtils.isNotBlank(workClientInfo.getCreateNameStr())){
+			model.addAttribute("createName", workClientInfo.getCreateNameStr());
 		}
+
 		WorkClientLinkman workClientLinkman = workClientInfo.getWorkClientLinkman();
 		if(workClientLinkman != null){
 			workClientLinkman.setId("");

src/main/java/com/jeeplus/modules/workcontractinfo/service/WorkContractInfoService.java

@@ -357,8 +357,8 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 			workContractInfo.setTotalContractIds(","+workContractInfo.getTotalContractIds()+",");
 		}
 		String companyId = UserUtils.getUser().getComId();
-//		workContractInfo.getSqlMap().put("dsf", dataScopeFilter(workContractInfo.getCurrentUser(), "o", "u","s", MenuStatusEnum.WORK_CONTRACT_INFO.getValue()));
-		workContractInfo.getSqlMap().put("dsf","and (a.company_id='"+companyId+"')");
+		workContractInfo.getSqlMap().put("dsf", dataScopeFilter(workContractInfo.getCurrentUser(), "o", "u","s", MenuStatusEnum.WORK_CONTRACT_INFO.getValue()));
+		//workContractInfo.getSqlMap().put("dsf","and (a.company_id='"+companyId+"')");
 		int count = dao.queryCount(workContractInfo);
 		page.setCount(count);
 		page.setCountFlag(false);

src/main/java/com/jeeplus/modules/workcontractinfo/web/WorkContractInfoController.java

@@ -917,6 +917,7 @@ public class WorkContractInfoController extends BaseController {
                 workContractInfo.setCreateName(name);
                 workContractInfo.setCreateCompany(comId);
                 workContractInfo.setCompanyId(comId);
+                workContractInfo.setOfficeId(UserUtils.getSelectOffice().getId());
                 List<WorkClientAttachment> list = workContractInfo.getWorkAttachments();
                 List<WorkClientAttachment> list1 = new ArrayList<>();
                 List<WorkClientAttachment> list2 = new ArrayList<>();
@@ -1463,7 +1464,7 @@ public class WorkContractInfoController extends BaseController {
      */
     @RequestMapping(value = "selectclientAhref")
     public String selectclientAhref(WorkClientInfo client, String url, String fieldLabels, String fieldKeys, String searchLabel, String searchKey, String searchLabel1, String searchKey1, HttpServletRequest request, HttpServletResponse response, Model model) {
-        Page<WorkClientInfo> page = workClientInfoService.findPage(new Page<WorkClientInfo>(request, response), client);
+        Page<WorkClientInfo> page = workClientInfoService.findPageByContract(new Page<WorkClientInfo>(request, response), client);
         try {
             fieldLabels = URLDecoder.decode(fieldLabels, "UTF-8");
             fieldKeys = URLDecoder.decode(fieldKeys, "UTF-8");

src/main/java/com/jeeplus/modules/workfullmanage/web/WorkFullManageController.java

@@ -20,6 +20,7 @@ import com.jeeplus.modules.contractclient.service.WorkContractClientService;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataService;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
+import com.jeeplus.modules.ruralprojectrecords.entity.RuralReportConsultant;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.entity.Role;
@@ -861,6 +862,17 @@ public class WorkFullManageController extends BaseController {
 		RuralProjectRecords ruralProjectRecords = ruralProjectRecordsService.get(projectReportData.getProject().getId());
 		//获取合同信息
 		WorkContractInfo workContractInfo = workContractInfoService.get(ruralProjectRecords.getWorkContractInfo().getId());
+		//获取咨询员信息
+		List<RuralReportConsultant> consultantList = projectReportDataService.getConsultantList(ruralProjectRecords.getId());
+		//根据 职业资格名称查询字典表并比对当前人员是否已添加该职业资格信息
+		List<MainDictDetail> certificateType = DictUtils.getMainDictList("certificate_type");
+		for (RuralReportConsultant entity: consultantList) {
+			for (MainDictDetail type : certificateType) {
+				if(entity.getZhucezigezhID().equals(type.getValue())){
+					entity.setZhucezigezh(type.getLabel());
+				}
+			}
+		}
 
 		List<MainDictDetail> mainDictList = Lists.newArrayList();
 		//工程咨询
@@ -911,9 +923,33 @@ public class WorkFullManageController extends BaseController {
 		data.put("promiseTime",promiseTime);
 		data.put("projectMaster",ruralProjectRecords.getLeaderNameStr());
 		//咨询员信息
-		data.put("consultantName",projectReportData.getConsultant().getName());
-		data.put("consultantProfession","");
-		data.put("consultantQualification","");
+		if(null != consultantList){
+			for (int i = 0; i<consultantList.size(); i++){
+				if (i >=6){
+					break;
+				}
+				data.put("consultantName"+i,consultantList.get(i).getZixunyuanName());
+				if(StringUtils.isBlank(consultantList.get(i).getMajor())){
+					data.put("consultantProfession"+i,"");
+				}else{
+					data.put("consultantProfession"+i,consultantList.get(i).getMajor());
+				}
+				data.put("consultantQualification"+i,consultantList.get(i).getZhucezigezh());
+			}
+			if(consultantList.size()<6){
+				for (int i = consultantList.size(); i<6; i++){
+					data.put("consultantName"+i,"");
+					data.put("consultantProfession"+i,"");
+					data.put("consultantQualification"+i,"");
+				}
+			}
+		}else{
+			for (int i = 0; i<6; i++){
+				data.put("consultantName"+i,"");
+				data.put("consultantProfession"+i,"");
+				data.put("consultantQualification"+i,"");
+			}
+		}
 
 		Map consultantMap = dateCalendar(projectReportData.getConsultantDate());
 		//专业咨询员

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/java/com/jeeplus/modules/workstaff/service/WorkStaffBasicInfoService.java

@@ -148,7 +148,8 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
      * @return
      */
     public WorkStaffBasicInfo getWorkStaffBasicInfoByUserId(String userId) {
-		return dao.getWorkStaffBasicInfoByUserId(userId);
+        WorkStaffBasicInfo workStaffBasicInfo=dao.getWorkStaffBasicInfoByUserId(userId);
+		return workStaffBasicInfo;
 	}
 	public Integer getByCompany(WorkStaffBasicInfo workStaffBasicInfo) {
 	  return workStaffAchivesDao.getByCompany(workStaffBasicInfo);

src/main/resources/freemarker/massControl.ftl

@@ -936,15 +936,7 @@
 											<w:sz w:val="20"/>
 											<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
 										</w:rPr>
-										<w:t>${consultantName}</w:t>
-									</w:r>
-									<w:r>
-										<w:rPr>
-											<w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="Arial"/>
-											<w:kern w:val="0"/>
-											<w:sz w:val="20"/>
-										</w:rPr>
-										<w:t>　</w:t>
+										<w:t>${consultantName0}</w:t>
 									</w:r>
 								</w:p>
 							</w:tc>
@@ -963,7 +955,7 @@
 								<w:p>
 									<w:pPr>
 										<w:widowControl/>
-										<w:jc w:val="left"/>
+										<w:jc w:val="center"/>
 										<w:rPr>
 											<w:rFonts w:hint="default" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体" w:cs="Arial"/>
 											<w:kern w:val="0"/>
@@ -976,17 +968,9 @@
 											<w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="Arial"/>
 											<w:kern w:val="0"/>
 											<w:sz w:val="20"/>
-										</w:rPr>
-										<w:t>　</w:t>
-									</w:r>
-									<w:r>
-										<w:rPr>
-											<w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="Arial"/>
-											<w:kern w:val="0"/>
-											<w:sz w:val="20"/>
 											<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
 										</w:rPr>
-										<w:t>${consultantProfession}</w:t>
+										<w:t>${consultantProfession0}</w:t>
 									</w:r>
 								</w:p>
 							</w:tc>
@@ -1018,17 +1002,9 @@
 											<w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="Arial"/>
 											<w:kern w:val="0"/>
 											<w:sz w:val="20"/>
-										</w:rPr>
-										<w:t>　</w:t>
-									</w:r>
-									<w:r>
-										<w:rPr>
-											<w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="Arial"/>
-											<w:kern w:val="0"/>
-											<w:sz w:val="20"/>
 											<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
 										</w:rPr>
-										<w:t>${consultantQualification}</w:t>
+										<w:t>${consultantQualification0}</w:t>
 									</w:r>
 								</w:p>
 							</w:tc>
@@ -1047,6 +1023,10 @@
 								<w:p>
 									<w:pPr>
 										<w:widowControl/>
+										<w:tabs>
+											<w:tab w:val="left" w:pos="308"/>
+											<w:tab w:val="center" w:pos="604"/>
+										</w:tabs>
 										<w:jc w:val="center"/>
 										<w:rPr>
 											<w:rFonts w:ascii="宋体" w:hAnsi="宋体" w:cs="Arial"/>
@@ -1059,8 +1039,9 @@
 											<w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="Arial"/>
 											<w:kern w:val="0"/>
 											<w:sz w:val="20"/>
+											<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
 										</w:rPr>
-										<w:t>　</w:t>
+										<w:t>${consultantName1}</w:t>
 									</w:r>
 								</w:p>
 							</w:tc>
@@ -1080,11 +1061,12 @@
 								<w:p>
 									<w:pPr>
 										<w:widowControl/>
-										<w:jc w:val="left"/>
+										<w:jc w:val="center"/>
 										<w:rPr>
-											<w:rFonts w:ascii="宋体" w:hAnsi="宋体" w:cs="Arial"/>
+											<w:rFonts w:hint="default" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体" w:cs="Arial"/>
 											<w:kern w:val="0"/>
 											<w:sz w:val="20"/>
+											<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
 										</w:rPr>
 									</w:pPr>
 									<w:r>
@@ -1092,8 +1074,9 @@
 											<w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="Arial"/>
 											<w:kern w:val="0"/>
 											<w:sz w:val="20"/>
+											<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
 										</w:rPr>
-										<w:t>　</w:t>
+										<w:t>${consultantProfession1}</w:t>
 									</w:r>
 								</w:p>
 							</w:tc>
@@ -1111,11 +1094,12 @@
 								<w:p>
 									<w:pPr>
 										<w:widowControl/>
-										<w:jc w:val="left"/>
+										<w:jc w:val="center"/>
 										<w:rPr>
-											<w:rFonts w:ascii="宋体" w:hAnsi="宋体" w:cs="Arial"/>
+											<w:rFonts w:hint="default" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体" w:cs="Arial"/>
 											<w:kern w:val="0"/>
 											<w:sz w:val="20"/>
+											<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
 										</w:rPr>
 									</w:pPr>
 									<w:r>
@@ -1123,8 +1107,9 @@
 											<w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="Arial"/>
 											<w:kern w:val="0"/>
 											<w:sz w:val="20"/>
+											<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
 										</w:rPr>
-										<w:t>　</w:t>
+										<w:t>${consultantQualification1}</w:t>
 									</w:r>
 								</w:p>
 							</w:tc>
@@ -1198,8 +1183,9 @@
 											<w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="Arial"/>
 											<w:kern w:val="0"/>
 											<w:sz w:val="20"/>
+											<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
 										</w:rPr>
-										<w:t>　</w:t>
+										<w:t>${consultantName2}</w:t>
 									</w:r>
 								</w:p>
 							</w:tc>
@@ -1218,11 +1204,12 @@
 								<w:p>
 									<w:pPr>
 										<w:widowControl/>
-										<w:jc w:val="left"/>
+										<w:jc w:val="center"/>
 										<w:rPr>
-											<w:rFonts w:ascii="宋体" w:hAnsi="宋体" w:cs="Arial"/>
+											<w:rFonts w:hint="default" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体" w:cs="Arial"/>
 											<w:kern w:val="0"/>
 											<w:sz w:val="20"/>
+											<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
 										</w:rPr>
 									</w:pPr>
 									<w:r>
@@ -1230,9 +1217,12 @@
 											<w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="Arial"/>
 											<w:kern w:val="0"/>
 											<w:sz w:val="20"/>
+											<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
 										</w:rPr>
-										<w:t>　</w:t>
+										<w:t>${consultantProfession2}</w:t>
 									</w:r>
+									<w:bookmarkStart w:id="0" w:name="_GoBack"/>
+									<w:bookmarkEnd w:id="0"/>
 								</w:p>
 							</w:tc>
 							<w:tc>
@@ -1262,8 +1252,9 @@
 											<w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="Arial"/>
 											<w:kern w:val="0"/>
 											<w:sz w:val="20"/>
+											<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
 										</w:rPr>
-										<w:t>　</w:t>
+										<w:t>${consultantQualification2}</w:t>
 									</w:r>
 								</w:p>
 							</w:tc>
@@ -1284,9 +1275,10 @@
 										<w:widowControl/>
 										<w:jc w:val="center"/>
 										<w:rPr>
-											<w:rFonts w:ascii="宋体" w:hAnsi="宋体" w:cs="Arial"/>
+											<w:rFonts w:hint="default" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体" w:cs="Arial"/>
 											<w:kern w:val="0"/>
 											<w:sz w:val="20"/>
+											<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
 										</w:rPr>
 									</w:pPr>
 									<w:r>
@@ -1294,8 +1286,9 @@
 											<w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="Arial"/>
 											<w:kern w:val="0"/>
 											<w:sz w:val="20"/>
+											<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
 										</w:rPr>
-										<w:t>　</w:t>
+										<w:t>${consultantName3}</w:t>
 									</w:r>
 								</w:p>
 							</w:tc>
@@ -1315,11 +1308,12 @@
 								<w:p>
 									<w:pPr>
 										<w:widowControl/>
-										<w:jc w:val="left"/>
+										<w:jc w:val="center"/>
 										<w:rPr>
-											<w:rFonts w:ascii="宋体" w:hAnsi="宋体" w:cs="Arial"/>
+											<w:rFonts w:hint="default" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体" w:cs="Arial"/>
 											<w:kern w:val="0"/>
 											<w:sz w:val="20"/>
+											<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
 										</w:rPr>
 									</w:pPr>
 									<w:r>
@@ -1327,8 +1321,9 @@
 											<w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="Arial"/>
 											<w:kern w:val="0"/>
 											<w:sz w:val="20"/>
+											<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
 										</w:rPr>
-										<w:t>　</w:t>
+										<w:t>${consultantProfession3}</w:t>
 									</w:r>
 								</w:p>
 							</w:tc>
@@ -1346,11 +1341,12 @@
 								<w:p>
 									<w:pPr>
 										<w:widowControl/>
-										<w:jc w:val="left"/>
+										<w:jc w:val="center"/>
 										<w:rPr>
-											<w:rFonts w:ascii="宋体" w:hAnsi="宋体" w:cs="Arial"/>
+											<w:rFonts w:hint="default" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体" w:cs="Arial"/>
 											<w:kern w:val="0"/>
 											<w:sz w:val="20"/>
+											<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
 										</w:rPr>
 									</w:pPr>
 									<w:r>
@@ -1358,8 +1354,9 @@
 											<w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="Arial"/>
 											<w:kern w:val="0"/>
 											<w:sz w:val="20"/>
+											<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
 										</w:rPr>
-										<w:t>　</w:t>
+										<w:t>${consultantQualification3}</w:t>
 									</w:r>
 								</w:p>
 							</w:tc>
@@ -1434,8 +1431,9 @@
 											<w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="Arial"/>
 											<w:kern w:val="0"/>
 											<w:sz w:val="20"/>
+											<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
 										</w:rPr>
-										<w:t>　</w:t>
+										<w:t>${consultantName4}</w:t>
 									</w:r>
 								</w:p>
 							</w:tc>
@@ -1454,11 +1452,15 @@
 								<w:p>
 									<w:pPr>
 										<w:widowControl/>
-										<w:jc w:val="left"/>
+										<w:tabs>
+											<w:tab w:val="center" w:pos="606"/>
+										</w:tabs>
+										<w:jc w:val="center"/>
 										<w:rPr>
-											<w:rFonts w:ascii="宋体" w:hAnsi="宋体" w:cs="Arial"/>
+											<w:rFonts w:hint="default" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体" w:cs="Arial"/>
 											<w:kern w:val="0"/>
 											<w:sz w:val="20"/>
+											<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
 										</w:rPr>
 									</w:pPr>
 									<w:r>
@@ -1466,8 +1468,9 @@
 											<w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="Arial"/>
 											<w:kern w:val="0"/>
 											<w:sz w:val="20"/>
+											<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
 										</w:rPr>
-										<w:t>　</w:t>
+										<w:t>${consultantProfession4}</w:t>
 									</w:r>
 								</w:p>
 							</w:tc>
@@ -1498,8 +1501,9 @@
 											<w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="Arial"/>
 											<w:kern w:val="0"/>
 											<w:sz w:val="20"/>
+											<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
 										</w:rPr>
-										<w:t>　</w:t>
+										<w:t>${consultantQualification4}</w:t>
 									</w:r>
 								</w:p>
 							</w:tc>
@@ -1518,6 +1522,10 @@
 								<w:p>
 									<w:pPr>
 										<w:widowControl/>
+										<w:tabs>
+											<w:tab w:val="left" w:pos="361"/>
+											<w:tab w:val="center" w:pos="604"/>
+										</w:tabs>
 										<w:jc w:val="center"/>
 										<w:rPr>
 											<w:rFonts w:ascii="宋体" w:hAnsi="宋体" w:cs="Arial"/>
@@ -1530,8 +1538,9 @@
 											<w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="Arial"/>
 											<w:kern w:val="0"/>
 											<w:sz w:val="20"/>
+											<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
 										</w:rPr>
-										<w:t>　</w:t>
+										<w:t>${consultantName5}</w:t>
 									</w:r>
 								</w:p>
 							</w:tc>
@@ -1551,11 +1560,12 @@
 								<w:p>
 									<w:pPr>
 										<w:widowControl/>
-										<w:jc w:val="left"/>
+										<w:jc w:val="center"/>
 										<w:rPr>
-											<w:rFonts w:ascii="宋体" w:hAnsi="宋体" w:cs="Arial"/>
+											<w:rFonts w:hint="default" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体" w:cs="Arial"/>
 											<w:kern w:val="0"/>
 											<w:sz w:val="20"/>
+											<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
 										</w:rPr>
 									</w:pPr>
 									<w:r>
@@ -1563,8 +1573,9 @@
 											<w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="Arial"/>
 											<w:kern w:val="0"/>
 											<w:sz w:val="20"/>
+											<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
 										</w:rPr>
-										<w:t>　</w:t>
+										<w:t>${consultantProfession5}</w:t>
 									</w:r>
 								</w:p>
 							</w:tc>
@@ -1582,11 +1593,12 @@
 								<w:p>
 									<w:pPr>
 										<w:widowControl/>
-										<w:jc w:val="left"/>
+										<w:jc w:val="center"/>
 										<w:rPr>
-											<w:rFonts w:ascii="宋体" w:hAnsi="宋体" w:cs="Arial"/>
+											<w:rFonts w:hint="default" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体" w:cs="Arial"/>
 											<w:kern w:val="0"/>
 											<w:sz w:val="20"/>
+											<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
 										</w:rPr>
 									</w:pPr>
 									<w:r>
@@ -1594,8 +1606,9 @@
 											<w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="Arial"/>
 											<w:kern w:val="0"/>
 											<w:sz w:val="20"/>
+											<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
 										</w:rPr>
-										<w:t>　</w:t>
+										<w:t>${consultantQualification5}</w:t>
 									</w:r>
 								</w:p>
 							</w:tc>
@@ -2310,8 +2323,6 @@
 											<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
 										</w:rPr>
 									</w:pPr>
-									<w:bookmarkStart w:id="0" w:name="_GoBack"/>
-									<w:bookmarkEnd w:id="0"/>
 								</w:p>
 								<w:p>
 									<w:pPr>
@@ -2409,7 +2420,7 @@
 				<dcterms:created xsi:type="dcterms:W3CDTF">2021-03-22T01:55:00Z</dcterms:created>
 				<dc:creator>大猫～</dc:creator>
 				<cp:lastModifiedBy>大猫～</cp:lastModifiedBy>
-				<dcterms:modified xsi:type="dcterms:W3CDTF">2021-03-23T03:11:13Z</dcterms:modified>
+				<dcterms:modified xsi:type="dcterms:W3CDTF">2021-04-19T06:58:15Z</dcterms:modified>
 				<cp:revision>1</cp:revision>
 			</cp:coreProperties>
 		</pkg:xmlData>
@@ -2421,7 +2432,7 @@
 					<vt:lpwstr>2052-11.1.0.10356</vt:lpwstr>
 				</property>
 				<property fmtid="{D5CDD505-2E9C-101B-9397-08002B2CF9AE}" pid="3" name="ICV">
-					<vt:lpwstr>6BBA46B6C3564B06BEC50ED17AB6FAC8</vt:lpwstr>
+					<vt:lpwstr>27399B558CAD4FC99D7B2C1B29E6C134</vt:lpwstr>
 				</property>
 			</Properties>
 		</pkg:xmlData>
@@ -2516,10 +2527,25 @@
 				</w:compat>
 				<w:rsids>
 					<w:rsidRoot w:val="1812586B"/>
+					<w:rsid w:val="016567B5"/>
 					<w:rsid w:val="032333F3"/>
+					<w:rsid w:val="0B027A1A"/>
+					<w:rsid w:val="16FB3A5B"/>
 					<w:rsid w:val="1812586B"/>
 					<w:rsid w:val="21F8571E"/>
 					<w:rsid w:val="25765D18"/>
+					<w:rsid w:val="2B3B7DE6"/>
+					<w:rsid w:val="38715395"/>
+					<w:rsid w:val="453D7077"/>
+					<w:rsid w:val="51706E02"/>
+					<w:rsid w:val="530A5846"/>
+					<w:rsid w:val="5A83739A"/>
+					<w:rsid w:val="5BF750DC"/>
+					<w:rsid w:val="5D724841"/>
+					<w:rsid w:val="64841AF2"/>
+					<w:rsid w:val="64A57C23"/>
+					<w:rsid w:val="772D18CC"/>
+					<w:rsid w:val="7B4A3DF7"/>
 					<w:rsid w:val="7CB5204E"/>
 				</w:rsids>
 				<m:mathPr>

src/main/resources/mappings/modules/projectcontentinfo/ProjectReportDataDao.xml

@@ -920,4 +920,19 @@
 		</choose>
 	</select>
 
+	<select id="getConsultantList" resultType="com.jeeplus.modules.ruralprojectrecords.entity.RuralReportConsultant">
+		select
+		  a.id,
+		  a.zixunyuan,
+		  a.zhucezigezhID,
+		  su.name as "zixunyuanName",
+		  wsc.major as "major"
+		from
+		  rural_report_consultant a
+		  left join sys_user su on su.id = a.zixunyuan
+		  left join work_staff_achives wsa on su.id = wsa.user_id
+		  left join work_staff_certificate wsc on wsc.staff_id = wsa.id and wsc.name = a.zhucezigezhID
+		where projectId = #{projectId}
+	</select>
+
 </mapper>

src/main/resources/mappings/modules/projectcontentinfo/ProjectcontentinfoDao.xml

@@ -25,9 +25,12 @@
 
 	<sql id="projectcontentinfoJoins">
 	</sql>
+    <delete id="deleteConsultant">
+		delete from rural_report_consultant where projectId = #{projectId}
+	</delete>
 
 
-	<select id="get" resultType="Projectcontentinfo" >
+    <select id="get" resultType="Projectcontentinfo" >
 		SELECT
 			<include refid="projectcontentinfoColumns"/>
 		FROM project_content_info a
@@ -529,6 +532,35 @@
 			#{updateBy.id}
 		)
 	</insert>
+	<insert id="insertConsultant">
+		insert into rural_report_consultant (
+			id,
+			create_by,
+			create_date,
+			update_by,
+			update_date,
+			del_flag,
+			zixunyuan,
+			zhucezigezhID,
+			major,
+			wordnr,
+			projectId
+		)
+		values
+		(
+			#{id},
+			#{createBy.id},
+			#{createDate},
+			#{updateBy.id},
+			#{updateDate},
+			#{delFlag},
+			#{zixunyuan},
+			#{zhucezigezhID},
+			#{major},
+			#{wordnr},
+			#{projectId}
+		) ;
+	</insert>
 
 	<select id="getWorkContentTypeByTypeId" resultType="java.lang.String">
 		select type_name as typeName from work_content_type where type_id = #{typeId}
@@ -557,4 +589,14 @@
 		where wcc.project_id = #{projectId} and wcc.content_id =#{contentId}
 		order by wcc.update_date asc
 	</select>
+	<select id="findByProjectId"
+			resultType="com.jeeplus.modules.ruralprojectrecords.entity.RuralReportConsultant">
+		select id
+			 ,zixunyuan
+			 ,zhucezigezhID
+			 ,major
+			 ,wordnr
+			 ,projectId
+		from rural_report_consultant where projectId=#{projectId}
+	</select>
 </mapper>

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

@@ -61,13 +61,18 @@
 	<select id="get" resultType="RuralProjectRecords" >
 		SELECT
 			<include refid="projectRecordsColumns"/>
+		,a.file_num AS "fileNum"
+	    ,a.check_process_instance_id AS "checkProcessInstanceId"
         ,su.name AS "createBy.name"
         ,o.top_company AS "office.name"
 		,prd.number AS "projectReportNumber"
 		,prr.id As "prrid"
+		,a.project_master_id as "projectMasterId"
+		,supmi.name as "projectMasterName"
         FROM rural_project_records a
         <include refid="projectRecordsJoins"/>
         LEFT JOIN sys_user su ON su.id = a.create_by
+        LEFT JOIN sys_user supmi ON supmi.id = a.project_master_id
 		left join project_report_data prd on prd.project_id = a.id
 		LEFT JOIN rural_project_report_record prr on prd.id = prr.report_id
 		LEFT JOIN sys_office o ON o.id = a.office_id
@@ -424,7 +429,8 @@
 		    estimate_total_fees,
 			construction_unit,
 			construction_linkman,
-			attachment_project_sort
+			attachment_project_sort,
+			project_master_id
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -469,7 +475,8 @@
 			#{estimateTotalFees},
 			#{constructionUnit},
 			#{constructionLinkman},
-			#{attachmentProjectSort}
+			#{attachmentProjectSort},
+			#{projectMasterId}
 		)
 	</insert>
 	
@@ -514,6 +521,9 @@
 			construction_unit = #{constructionUnit},
 			construction_linkman = #{constructionLinkman},
 			attachment_project_sort = #{attachmentProjectSort}
+			<if test="projectMasterId != null and projectMasterId != ''">
+				,project_master_id = #{projectMasterId}
+			</if>
 		WHERE id = #{id}
 	</update>
 	<update id="updateDate">

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

@@ -87,10 +87,15 @@
 		FROM sys_area a
 		<include refid="areaJoins"/>
 		WHERE a.del_flag = #{DEL_FLAG_NORMAL}
-		<if test="typeStr != null and typeStr != ''">
-			and a.name like concat('%',#{typeStr},'%')
-		</if>
-		ORDER BY a.sort=29 desc, a.code
+		<choose>
+			<when test="typeStr != null and typeStr != ''">
+				and a.name like concat('%',#{typeStr},'%')
+				ORDER BY p.sort=29 desc, a.code
+			</when>
+			<otherwise>
+				ORDER BY a.sort=29 desc, a.code
+			</otherwise>
+		</choose>
 	</select>
 
 	<select id="getChildren" parameterType="String" resultMap="areaResult">
@@ -205,4 +210,15 @@
 			a.id= #{id}
 		</where>
 	</select>
+
+
+	<select id="findAraeByParentId" resultType="com.jeeplus.modules.sys.entity.Area">
+		SELECT
+		<include refid="areaColumns"/>
+		FROM sys_area a
+		<include refid="areaJoins"/>
+		<where>
+			a.parent_id LIKE concat('%',#{id},'%')
+		</where>
+	</select>
 </mapper>

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

@@ -476,8 +476,9 @@
 		left join work_staff_certificate wsc on wsc.staff_id = uo.id
 		LEFT JOIN sys_office o ON o.id = uo.office_id
 		WHERE a.del_flag = #{DEL_FLAG_NORMAL}
-		and wsc.name ='注册/资格证'
+		and wsc.name ='161'
 		AND o.del_flag = #{DEL_FLAG_NORMAL}
+		AND wsc.del_flag = #{DEL_FLAG_NORMAL}
 		<if test="office != null and office.id != null and office.id !='' ">
 			AND uo.office_id = #{office.id}
 		</if>
@@ -1175,5 +1176,15 @@
 		where id = #{id}
 	</update>
 
+	<!-- 根据登录名查询用户 -->
+	<select id="findUserByUserName" resultType="User" parameterType="User">
+		SELECT
+		<include refid="userColumns"/>
+		FROM sys_user a
+		LEFT JOIN sys_office s ON s.id = a.company_id
+		LEFT JOIN sys_office o ON o.id = a.office_id
+		LEFT JOIN sys_office bo ON bo.id = o.branch_office
+		WHERE a.name = #{name} AND a.del_flag = 0
+	</select>
 
 </mapper>

src/main/resources/mappings/modules/workclientinfo/WorkClientInfoDao.xml

@@ -164,10 +164,10 @@
                 AND a.create_date < #{endDate}
             </if>
 			<if test="(createId != null and createId != '') or (createNameStr != null and createNameStr != '')">
-				AND (a.create_by = #{createId} or su.name = #{createNameStr})
+				AND (a.create_by = #{createId} or su.name like concat('%',#{createNameStr},'%'))
 			</if>
             AND a.company_id = #{currentUser.company.id}
-
+			${sqlMap.dsf}
 			<choose>
 				<when test="jobTypeShow !=null and jobTypeShow !=''">
 					AND c.job_type_id = #{jobTypeShow}
@@ -241,6 +241,7 @@
 				AND (a.create_by = #{createId} or su.name = #{createNameStr})
 			</if>
             AND a.company_id = #{currentUser.company.id}
+			${sqlMap.dsf}
             <choose>
 				<when test="jobTypeShow !=null and jobTypeShow !=''">
 					AND c.job_type_id = #{jobTypeShow}

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

@@ -316,7 +316,7 @@
 					</otherwise>
 				</choose>
 			</if>
-			${sqlMap.dsf}
+			AND a.company_id = #{currentUser.company.id} ${sqlMap.dsf}
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -933,7 +933,7 @@
 			#{contractFee},
 			#{contractSpecial},
 			#{contractState},
-			#{chargeCompany},
+			#{officeId},
 			#{contractFileId},
 			#{contractRole},
 			#{applyView},
@@ -990,7 +990,7 @@
 			contract_fee = #{contractFee},
 			contract_special = #{contractSpecial},
 			contract_state = #{contractState},
-			office_id = #{chargeCompany},
+			office_id = #{officeId},
 			contract_file_id = #{contractFileId},
 			contract_role = #{contractRole},
 			apply_view = #{applyView},

src/main/webapp/WEB-INF/tags/sys/inquireselectUserNotReadolny.tag

@@ -25,7 +25,7 @@
 	<input id="${id}Id" name="${name}" class="${cssClass}" type="hidden" value="${value}"/>
 	<div class="input-group">
 		<input id="${id}Name" name="${labelName}" type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
-		class="${cssClass}" style="${cssStyle}"/>
+		class="${cssClass}" style="${cssStyle}" onblur="cBlur(this)"/>
 		<span class="input-group-btn">
 	       		 <button type="button"  id="${id}Button" class="btn <c:if test="${fn:contains(cssClass, 'input-sm')}"> btn-sm </c:if><c:if test="${fn:contains(cssClass, 'input-lg')}"> btn-lg </c:if>  btn-primary ${disabled} ${hideBtn ? 'hide' : ''}"><i class="fa fa-search"></i>
 	             </button>

src/main/webapp/WEB-INF/tags/sys/reportedtreeselectUser.tag

@@ -90,9 +90,26 @@
 						var id = '${id}';
 						var w=id.indexOf("_"); // v 的下标为 2
 						var str = id.substring(0,w+1);
-						$("#"+str+"zhucezigezhID").val(officeIds.join(","));
-						console.log(officeIds)
+						console.log(str)
+						var zxid=$("#${id}Id").val();
 						$("#${id}Name").focus();
+						$.ajax({
+							type:"post",
+							url:'${ctx}/ruralProject/ruralCostProjectMessage/getWorkUser',
+							data:{"id":zxid},
+							dataType:"json",
+							success:function(data){
+								console.log(data)
+								$("#"+str+"zhucezigezhID").val(data.num);
+								$("#"+str+"major").val(data.major);
+
+								// if(data.success) {
+								// 	for (var info in data.data){
+								// 		$('#city').append(new Option(data.data[info].name,data.data[info].id));
+								// 	}
+								// }
+							}
+						})
 						top.layer.close(index);
 				    	       },
     	cancel: function(index){ //或者使用btn2

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/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++){
@@ -492,7 +505,34 @@
                 }
             })
         }
+		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>
 </head>
 <body>
@@ -864,16 +904,18 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 lw7 with-textarea">
-					<label class="layui-form-label double-line">专业咨询员审核意见：</label>
+					<label class="layui-form-label double-line"><span class="require-item">*</span>专业咨询员审核意见：</label>
 					<div class="layui-input-block">
-						<form:textarea placeholder="请输入审核意见" path="projectReportData.consultantRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+						<form:textarea placeholder="请输入审核意见" path="projectReportData.consultantRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control re "/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw7">
 					<label class="layui-form-label"><span class="require-item">*</span>项目负责人：</label>
 					<div class="layui-input-block  with-icon">
-						<sys: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="${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"/>--%>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 lw7 with-textarea">
@@ -883,6 +925,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>
@@ -902,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>
@@ -997,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>--%>
@@ -1016,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>
@@ -1093,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>--%>
@@ -1112,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>
@@ -1174,6 +1298,18 @@
 		</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>
 	function openBill2(title,url,width,height,target,formId,tableId){
 		var rows = $(this).parent().prevAll().length + 1;
@@ -1351,36 +1487,36 @@
 		return false;
 	}
 
-	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 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}';

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,8 +578,10 @@
                 <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 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"/>--%>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -672,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>
@@ -679,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">//<!--
@@ -695,13 +727,15 @@
                                     </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=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                            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>
 
@@ -1029,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/cost/ruralCostProjectRecordsForm.jsp

@@ -858,7 +858,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>项目负责人：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>项目责任人：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:treeselect id="master" name="projectLeaders" value="${ruralProjectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${ruralProjectRecords.leaderNameStr}"
                                        cssStyle="background-color: #fff" title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
@@ -871,6 +871,13 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">项目负责人：</label>
+                    <div class="layui-input-block  with-icon">
+                        <sys:reportedtreeselectUser id="projectMaster" name="projectMasterId" value="${ruralProjectRecords.projectMasterId}" labelName="projectMasterName" labelValue="${ruralProjectRecords.projectMasterName}"
+                                                    cssStyle="background-color:#fff" title="项目负责人" url="/sys/office/treeDataAll?type=4" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">工作开始日期：</label>
                     <div class="layui-input-block">
                         <input class="laydate-icondate form-control layui-input layer-date laydate-icon" style="background-color: #fff" readonly="readonly" id="startDate" name="startDate" placeholder="请选择开始日期" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">

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

@@ -64,6 +64,14 @@
             $("#other_btn").click(function () {
                 $("#other_file").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++){
@@ -414,7 +422,7 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="55%">文件类型</th>
+							<th width="30%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -424,12 +432,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>
@@ -497,7 +505,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>--%>
@@ -518,7 +526,7 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="55%">文件类型</th>
+							<th width="30%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -529,12 +537,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>
@@ -622,7 +630,7 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="55%">文件类型</th>
+							<th width="30%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -633,12 +641,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/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/ruralProjectRecordsAudit.jsp

@@ -250,10 +250,10 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">项目负责人：</label>
+					<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="projectLeaders" value="${projectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${projectRecords.leaderNameStr}" cssStyle="background-color: #fff"
-											   title="用户" url="/sys/office/treeDataAll?type=3" checked="true" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+											   title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
@@ -263,6 +263,13 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">项目负责人：</label>
+					<div class="layui-input-block  with-icon">
+						<sys:reportedtreeselectUser id="projectMaster" name="projectMasterId" value="${projectRecords.projectMasterId}" labelName="projectMasterName" labelValue="${projectRecords.projectMasterName}" cssStyle="background-color: #fff"
+											   title="项目负责人" url="/sys/office/treeDataAll?type=4" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">工作开始日期：</label>
 					<div class="layui-input-block">
 						<input class=" form-control layui-input " readonly="true" id="startDate" name="startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">

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

@@ -870,7 +870,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>项目负责人：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>项目责任人：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:inquireselectUser id="master" name="projectLeaders" value="${ruralProjectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${ruralProjectRecords.leaderNameStr}"
                                        cssStyle="background-color:#fff"  title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
@@ -883,6 +883,13 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">项目负责人：</label>
+                    <div class="layui-input-block  with-icon">
+                        <sys:reportedtreeselectUser id="projectMaster" name="projectMasterId" value="${ruralProjectRecords.projectMasterId}" labelName="projectMasterName" labelValue="${ruralProjectRecords.projectMasterName}"
+                                                    cssStyle="background-color:#fff" title="项目负责人" url="/sys/office/treeDataAll?type=4" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">工作开始日期：</label>
                     <div class="layui-input-block">
                         <input placeholder="请选择开始日期" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">

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

@@ -862,7 +862,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>项目负责人：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>项目责任人：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:inquireselectUser id="master" name="projectLeaders" value="${projectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${projectRecords.leaderNameStr}"
                                         cssStyle="background-color:#fff" title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
@@ -874,6 +874,14 @@
                         <form:input path="officeName" htmlEscape="false" id="officeName" class="form-control layui-input" readonly="true"/>
                     </div>
                 </div>
+
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label">项目负责人：</label>
+                    <div class="layui-input-block  with-icon">
+                        <sys:reportedtreeselectUser id="projectMaster" name="projectMasterId" value="${projectRecords.projectMasterId}" labelName="projectMasterName" labelValue="${projectRecords.projectMasterName}" cssStyle="background-color: #fff"
+                                               title="项目负责人" url="/sys/office/treeDataAll?type=4" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+                    </div>
+                </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">工作开始日期：</label>
                     <div class="layui-input-block">

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

@@ -201,7 +201,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">项目负责人：</label>
+					<label class="layui-form-label">项目责任人：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.leaderNameStr}"/>
 					</div>
@@ -213,6 +213,12 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">项目负责人：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.projectMasterName}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">工作开始日期：</label>
 					<div class="layui-input-block">
 						<input class="laydate-icondate form-control layui-input layer-date ash"  style="background-color: #f1f1f1" readonly="true" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">

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>";
 					}
 
 					//线上归档操作

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

@@ -232,6 +232,8 @@
 <%--			</c:if>--%>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>
+
 		</ul>
 <%--		<ul class="list-tabs" >--%>
 <%--			<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>--%>

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

@@ -48,7 +48,15 @@
                     }
                 }
             });
-        });
+            $(".tabMove").mouseover(function(){
+				//tips层-下
+				var td=$(this)
+				var tdval=$(this).find("input").val();
+				layer.tips(tdval, td, {
+					tips: 3
+				});
+			})
+		});
 	</script>
 </head>
 <body>
@@ -70,6 +78,8 @@
 <%--			</c:if>--%>
 			<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>
+
 		</ul>
 <%--		<ul class="list-tabs" >--%>
 <%--			<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>--%>
@@ -123,12 +133,12 @@
 							<tr id="${fileAttachment.id}" pid="${fileAttachment.parent.id}">
 								<c:choose>
 									<c:when test="${fileAttachment.mustFlag == 1}">
-										<td style="text-align:left;"><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 style="text-align:left;">${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>
@@ -167,7 +177,7 @@
 
 
 			<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>
@@ -195,12 +205,12 @@
 									<%-- <td>${status.index + 1}</td>--%>
 										<c:choose>
 											<c:when test="${fileGistdata.mustFlag == 1}">
-												<td style="text-align:left;"><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 style="text-align:left;">${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>
@@ -266,12 +276,12 @@
 									<%-- <td>${status.index + 1}</td>--%>
 										<c:choose>
 											<c:when test="${fileOther.mustFlag == 1}">
-												<td style="text-align:left;"><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 style="text-align:left;">${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/view/projectPlanView.jsp

@@ -156,6 +156,8 @@
 <%--            </c:if>--%>
             <li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>
+
         </ul>
 <%--        <ul class="list-tabs" >--%>
 <%--            <li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>--%>

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

@@ -202,6 +202,8 @@
 				<%--            </c:if>--%>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
 				<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>
+
 			</ul>
 		</div>
 	</div>

src/main/webapp/webpage/modules/ruralprojectrecords/view/reportView.jsp

@@ -126,6 +126,8 @@
 				<%--				</c:if>--%>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>
+
 			</ul>
 <%--			<ul class="list-tabs" >--%>
 <%--				<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>--%>

src/main/webapp/webpage/modules/ruralprojectrecords/view/reportedView.jsp

@@ -94,6 +94,8 @@
 <%--            </c:if>--%>
             <li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>
+
         </ul>
 <%--        <ul class="list-tabs" >--%>
 <%--            <li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>--%>

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

@@ -42,6 +42,8 @@
 			<%--			</c:if>--%>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>
+
 		</ul>
 	</div>
 	</div>

src/main/webapp/webpage/modules/ruralprojectrecords/view/selectiveSearchView.jsp

@@ -0,0 +1,234 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>选查查看</title>
+	<meta name="decorator" content="default"/>
+	<script>
+		$(document).ready(function () {
+			var tt = $("#contractNum").val();
+			if (tt == null || tt === "") {
+				$("#divv").hide();
+				$("#divv2").show();
+				$("#divv3").hide();
+				setTimeout(function () {
+					var tt = $("#workClientLinkmanList").find("tr").eq(0).find("td").eq(1).text().trim();
+					$("#clientName").val(tt);
+				},100);
+			}else{
+				$("#divv2").hide();
+			}
+
+		})
+	</script>
+</head>
+<body>
+<div class="single-form">
+	<div class="tapfixed">
+	<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
+		<ul class="list-tabs" >
+			<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
+<%--			<c:if test="${projectRecords.workContractInfo!=null and projectRecords.workContractInfo.id!=''}">--%>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
+<%--			</c:if>--%>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
+
+<%--			<c:if test="${reportedId!=null}">--%>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
+<%--			</c:if>--%>
+			<%--			<c:if test="${flagProjectReportData.id!=null}">--%>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>
+			<%--			</c:if>--%>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
+			<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>
+		</ul>
+	</div>
+	</div>
+	<c:if test="${ null ==projectRecords.fileNum}">
+		<div class="topMar">
+			<h2>暂无选查信息</h2>
+		</div>
+	</c:if>
+	<c:if test="${null != projectRecords.fileNum}">
+	<div class="container view-form" style="margin-top: 50px;">
+		<form:form id="inputForm" modelAttribute="projectRecords" method="post" class="form-horizontal">
+			<div class="form-group layui-row first">
+				<div class="form-group-label"><h2>选查项目合同信息</h2></div>
+               <div id="divv">
+				   <div class="layui-item layui-col-sm12 lw6">
+					   <label class="layui-form-label">合同编号：</label>
+					   <div class="layui-input-block">
+						   <input htmlEscape="false" style="background-color: #f1f1f1" id="contractNum" readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.contractNum}"/>
+					   </div>
+				   </div>
+				   <div class="layui-item layui-col-sm6 lw6">
+					   <label class="layui-form-label">合同名称：</label>
+					   <div class="layui-input-block">
+						   <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.name}"/>
+					   </div>
+				   </div>
+				   <div class="layui-item layui-col-sm6 lw6">
+					   <label class="layui-form-label double-line">合同金额(元)：</label>
+					   <div class="layui-input-block">
+						   <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="<fmt:formatNumber value="${projectRecords.workContractInfo.contractPrice}" pattern="#,##0.00#"/>"/>
+					   </div>
+				   </div>
+				   <div class="layui-item layui-col-sm6 lw6">
+					   <label class="layui-form-label">委托方：</label>
+					   <div class="layui-input-block">
+						   <input htmlEscape="false" style="background-color: #f1f1f1" id="clientName" readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.client.name}"/>
+					   </div>
+				   </div>
+			   </div>
+				<div id="divv2">
+					<div class="layui-item layui-col-sm6 lw6">
+						<label class="layui-form-label">无合同</label>
+					</div>
+				</div>
+				<div id="divv3">
+					<div class="layui-item layui-col-sm6 lw6">
+						<label class="layui-form-label">合同类型：</label>
+						<div class="layui-input-block">
+							<input htmlEscape="false"  readonly="true" style="background-color: #f1f1f1" class="form-control layui-input" value="${projectRecords.workContractInfo.contractType}"/>
+						</div>
+					</div>
+				</div>
+			</div>
+
+			<div class="form-group layui-row first">
+				<div class="form-group-label"><h2>选查项目信息</h2></div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label">项目名称：</label>
+                    <div class="layui-input-block">
+                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" style="background-color: #f1f1f1" value="${projectRecords.projectName}"/>
+                    </div>
+                </div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">项目编号：</label>
+					<div class="layui-input-block">
+                        <div class="input-group">
+                            <form:input path="projectId" htmlEscape="false"  readonly="true" class="form-control layui-input" cssStyle="background-color: #f1f1f1"/>
+                            <span class="input-group-btn">
+                                <label class="form-status"><c:choose><c:when test="${not empty projectRecords.projectStatus}">${fns:getDictLabel(projectRecords.projectStatus, 'rural_project_audit_state', '')}</c:when><c:otherwise>新添</c:otherwise></c:choose></label>
+                             </span>
+                        </div>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">项目所在地：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.area.name}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">所在省份：</label>
+					<div class="layui-input-block">
+						<form:input path="province" cssStyle="background-color: #f1f1f1" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">所在地级市：</label>
+					<div class="layui-input-block">
+						<form:input path="city" cssStyle="background-color: #f1f1f1" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">所在区县：</label>
+					<div class="layui-input-block">
+						<form:input path="county" cssStyle="background-color: #f1f1f1" htmlEscape="false" id="areaName1" class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">建设地点：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" style="background-color: #f1f1f1"  readonly="true" class="form-control layui-input" value="${projectRecords.projectSite}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">创建人：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.createBy.name}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">项目负责人：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.leaderNameStr}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">所属部门：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" id="officeName" class="form-control layui-input" value="${projectRecords.officeName}"/>
+					</div>
+				</div>
+<%--				<div class="layui-item layui-col-sm6 lw6">--%>
+<%--					<label class="layui-form-label double-line">工作开始日期：</label>--%>
+<%--					<div class="layui-input-block">--%>
+<%--						<input class="laydate-icondate form-control layui-input layer-date ash"  style="background-color: #f1f1f1" readonly="true" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">--%>
+<%--					</div>--%>
+<%--				</div>--%>
+<%--				<div class="layui-item layui-col-sm6 lw6">--%>
+<%--					<label class="layui-form-label double-line">工作结束日期：</label>--%>
+<%--					<div class="layui-input-block">--%>
+<%--						<input class="laydate-icondate form-control layui-input layer-date "  style="background-color: #f1f1f1" readonly="true" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">--%>
+<%--					</div>--%>
+<%--				</div>--%>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">创建日期：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false"  style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label">项目类别：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${projectRecords.attachmentProjectSort}"/>
+					</div>
+				</div>
+<%--				<div class="layui-item layui-col-sm6 lw6 with-textarea">--%>
+<%--					<label class="layui-form-label">工程概况：</label>--%>
+<%--					<div class="layui-input-block">--%>
+<%--						<textarea htmlEscape="false" rows="4" readonly="true"  style="background-color: #f1f1f1" maxlength="1000" class="form-control" >${projectRecords.projectDesc}</textarea>--%>
+<%--					</div>--%>
+<%--				</div>--%>
+<%--				<div class="layui-item layui-col-sm6 lw6 with-textarea">--%>
+<%--					<label class="layui-form-label">备注：</label>--%>
+<%--					<div class="layui-input-block">--%>
+<%--						<textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000"  style="background-color: #f1f1f1" class="form-control" >${projectRecords.remarks}</textarea>--%>
+<%--					</div>--%>
+<%--				</div>--%>
+			</div>
+
+			<div class="form-group layui-row first">
+				<div class="form-group-label"><h2>选查信息</h2></div>
+					<div class="layui-item layui-col-sm6 lw6">
+						<label class="layui-form-label double-line">案卷号：</label>
+						<div class="layui-input-block">
+							<input class="form-control layui-input"  style="background-color: #f1f1f1" readonly="true"  value="${projectRecords.fileNum}" />
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm12 lw6 with-textarea">
+						<label class="layui-form-label">选查要求：</label>
+						<div class="layui-input-block">
+							<textarea htmlEscape="false" style="background-color: #f1f1f1" rows="4" readonly="true" class="form-control" >${projectRecords.checkRemarks}</textarea>
+						</div>
+					</div>
+			</div>
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="layui-item layui-col-xs12 form-table-container" >
+					<act:flowChart procInsId="${projectRecords.checkProcessInstanceId}"/>
+					<act:histoicFlow procInsId="${projectRecords.checkProcessInstanceId}"/>
+				</div>
+			</div>
+			<div class="form-group layui-row page-end"></div>
+		</form:form>
+	</div>
+	</c:if>
+
+</div>
+</body>
+</html>

src/main/webapp/webpage/modules/ruralprojectrecords/view/workClientAndContractView.jsp

@@ -35,6 +35,8 @@
             <%--            </c:if>--%>
             <li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>
+
         </ul>
 <%--        <ul class="list-tabs" >--%>
 <%--            <li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>--%>

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

@@ -8,7 +8,7 @@
 	<script type="text/javascript">
 		var key, lastValue = "", nodeList = [], type = getQueryString("type", "${url}");
 		var tree, setting = {view:{selectedMulti:false,dblClickExpand:false},check:{enable:"${checked}",nocheckInherit:true},
-				async:{enable:(type==3),url:"${ctx}/sys/user/treeDataByNameOnReported",autoParam:["id=officeId","projectId=projectId","selectName=selectName"]},
+				async:{enable:(type==4),url:"${ctx}/sys/user/treeDataByNameOnReported",autoParam:["id=officeId","projectId=projectId","selectName=selectName"]},
 				data:{simpleData:{enable:true}},callback:{<%--
 					beforeClick: function(treeId, treeNode){
 						if("${checked}" == "true"){

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

@@ -104,6 +104,31 @@
 				layer.close(index);
 			});
 		}
+
+		function cBlur(obj) {
+			var id = $("#createId").val();
+			if(undefined != obj.value && null != obj.value && '' != obj.value){
+				$.ajax({
+					url:'${ctx}/sys/user/getUserByName?name='+obj.value,
+					type:"post",
+					success:function(data){
+						var user = data.body.data;
+						if(undefined == user || null == user || '' == user){
+							$("#createId").val("");
+						}else{
+							if(data.body.data.id != id){
+								if(undefined != id && null != id && '' != id){
+									$("#createId").val("");
+								}
+							}
+						}
+					}
+				});
+			}else{
+				$("#createId").val("");
+			}
+
+		}
 	</script>
 </head>
 <body class="gray-bg">

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

@@ -346,7 +346,20 @@
                 $("#tryEndTimeSpan").html('');
             }
         }
-
+        function certificateName(val) {
+            var ary = [];
+            for (var i = 0; i<$("#certificateList tr").length; i++ ){
+                var value = $("#certificateList tr").eq(i).find("td").eq(1).find("select").val();
+                ary.push(value);
+            }
+            for (var i = 0; i < ary.length; i++) {
+                if(ary.indexOf(ary[i]) != i) {
+                    var id = val.id;
+                    $("#"+id).val("")
+                    top.layer.msg('已存在该执业资格证书类型！', {icon: 0});
+                }
+            }
+        }
     </script>
 </head>
 <body>
@@ -1148,9 +1161,9 @@
                                     <input id="certificateList${varStatus.index}_filePath" name="certificateList[${varStatus.index}].filePath" type="hidden" value="${certificate.filePath}"/>
                                 </td>
                                 <td>
-                                    <select name="certificateList[${varStatus.index}].name" id="certificateList${varStatus.index}_name" class="form-control required">
+                                    <select name="certificateList[${varStatus.index}].name" id="certificateList${varStatus.index}_name" onchange="certificateName(this)" class="form-control required">
                                         <c:forEach items="${fns:getMainDictList('certificate_type')}" var="var">
-                                            <option value="${var.value}" <c:if test="${certificate.name eq var.label}">selected</c:if>>${var.label}</option>
+                                            <option value="${var.value}" <c:if test="${certificate.name eq var.value}">selected</c:if>>${var.label}</option>
                                         </c:forEach>
                                     </select>
                                 </td>
@@ -1169,7 +1182,7 @@
                                     <input id="certificateList${varStatus.index}_issuingAuthority" name="certificateList[${varStatus.index}].issuingAuthority" class="form-control" value="${certificate.issuingAuthority}"/>
                                 </td>
 
-                                <td class="text-left op-td">
+                                <td  class="text-center op-td">
                                     <a class="op-btn op-btn-add" title="上传" onclick="this_upload_file_button('certificateList${varStatus.index}_file')"><i class="fa fa-plus"></i>&nbsp;上传</a><span id="certificateList${varStatus.index}_fileName1"><c:if test="${not empty certificate.filePath}"><img src="${certificate.filePath}" width="24" height="24" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${certificate.filePath}','90%','90%')" alt=""></c:if></span>
                                     <input id="certificateList${varStatus.index}_file" name="certificateList[${varStatus.index}].file" style="display:none" type="file" onchange="changeFileName(this,1)"/>
                                 </td>
@@ -1189,7 +1202,7 @@
                                     <input id="certificateList{{idx}}_filePath" name="certificateList[{{idx}}].filePath" type="hidden" value="{{row.filePath}}"/>
                                 </td>
                                 <td>
-                                   <select name="certificateList[{{idx}}].name" id="certificateList{{idx}}_name" class="form-control required">
+                                   <select name="certificateList[{{idx}}].name" id="certificateList{{idx}}_name" class="form-control required" onchange="certificateName(this)">
                                         <option value=""></option>
                                         <c:forEach items="${fns:getMainDictList('certificate_type')}" var="var">
                                             <option value="${var.value}">${var.label}</option>