Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecords.java
#	src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectViewController.java
#	src/main/java/com/jeeplus/modules/workclientinfo/entity/WorkClientLinkman.java

src/main/java/com/jeeplus/modules/projectAccessory/service/ProjectTemplateService.java

@@ -332,7 +332,7 @@ public class ProjectTemplateService extends TreeService<ProjectTemplateDao, Proj
             info.setWorkAttachments(attachments);
             //判断是否为必填项，若为必填项则添加必填判定字段
             if(info.getRequiredStage() == projectTemplateInfo.getRequiredStage()){
-                info.setMustFlag(1);
+                //info.setMustFlag(1);
                 //判定必填项的下的是否有附件信息
                 if (attachments.size()!=0){
                     info.setFileFlag(1);
@@ -342,7 +342,7 @@ public class ProjectTemplateService extends TreeService<ProjectTemplateDao, Proj
                 info.setFileFlag(0);
             }
             if (("咨询效果评价表").equals(info.getAttachName()) && projectTemplateInfo.isFlag()){
-                info.setMustFlag(1);
+                //info.setMustFlag(1);
                 //判定必填项的下的是否有附件信息
                 if (attachments.size()!=0){
                     info.setFileFlag(1);
@@ -743,7 +743,7 @@ public class ProjectTemplateService extends TreeService<ProjectTemplateDao, Proj
             }
             //判断是否为必填项，若为必填项则添加必填判定字段
             if(info.getRequiredStage() == projectTemplateInfo.getRequiredStage() || (null != projectTemplateInfo.getRequiredStageList() && projectTemplateInfo.getRequiredStageList().contains(info.getRequiredStage()))){
-                info.setMustFlag(1);
+                //info.setMustFlag(1);
                 //判定必填项的下的是否有附件信息
                 if (attachments.size()!=0){
                     info.setFileFlag(1);
@@ -753,7 +753,7 @@ public class ProjectTemplateService extends TreeService<ProjectTemplateDao, Proj
                 info.setFileFlag(0);
             }
             if (("咨询效果评价表").equals(info.getAttachName()) && projectTemplateInfo.isFlag()){
-                info.setMustFlag(1);
+                //info.setMustFlag(1);
                 //判定必填项的下的是否有附件信息
                 if (attachments.size()!=0){
                     info.setFileFlag(1);
@@ -761,7 +761,7 @@ public class ProjectTemplateService extends TreeService<ProjectTemplateDao, Proj
             }
             if(StringUtils.isNotBlank(screenType) && screenType.contains("其他资料") && "其他资料".equals(info.getAttachName())){
                 if (screenType.contains("其他资料")){
-                    info.setMustFlag(1);
+                    //info.setMustFlag(1);
                     //判定必填项的下的是否有附件信息
                     if (null != info.getWorkAttachments() && info.getWorkAttachments().size()!=0){
                         info.setFileFlag(1);
@@ -984,7 +984,7 @@ public class ProjectTemplateService extends TreeService<ProjectTemplateDao, Proj
             info.setWorkAttachments(attachments);
             //判断是否为必填项，若为必填项则添加必填判定字段
             if(projectTemplateInfo.getRequiredStageList().indexOf(info.getRequiredStage()) != -1){
-                info.setMustFlag(1);
+                //info.setMustFlag(1);
                 //判定必填项的下的是否有附件信息
                 if (attachments.size()!=0){
                     info.setFileFlag(1);

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

@@ -74,6 +74,7 @@ public class ProjectReportRecord extends ActEntity<ProjectReportRecord> {
 	private Integer type;//(1：ProjectReportRecord  2：RuralProjectReportRecord)
 	private Integer recordAuditType;//归档状态（1：总审驳回，2：归档管理员驳回）
 	private String infoId;
+	private String recordRemarks;	//归档内容
 
 	public Integer getType() {
 		return type;
@@ -480,4 +481,12 @@ public class ProjectReportRecord extends ActEntity<ProjectReportRecord> {
 	public void setProjectContentDataId(String projectContentDataId) {
 		this.projectContentDataId = projectContentDataId;
 	}
+
+	public String getRecordRemarks() {
+		return recordRemarks;
+	}
+
+	public void setRecordRemarks(String recordRemarks) {
+		this.recordRemarks = recordRemarks;
+	}
 }

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

@@ -310,6 +310,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private String caseStatus;				//案例项目的状态
 	private String caseProcessId;			//案例项目的流程id
 	private String ziXunBDE;			//上报中的咨询标的额
+	private String companyType;			//公司类型（1：赣能；2：东兴）
 
 
 
@@ -2264,4 +2265,12 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setReviewerPerson(String reviewerPerson) {
 		this.reviewerPerson = reviewerPerson;
 	}
+
+	public String getCompanyType() {
+		return companyType;
+	}
+
+	public void setCompanyType(String companyType) {
+		this.companyType = companyType;
+	}
 }

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

@@ -212,10 +212,10 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
         if(projectRecords!=null){
             String cid = projectRecords.getWorkContractInfo().getId();
             WorkContractInfo workContractInfo = contractInfoService.get(cid);
-            if(null != workContractInfo) {
+            /*if(null != workContractInfo) {
                 WorkClientInfo workClientInfo = workClientInfoService.get(workContractInfo.getClient().getId());
                 workContractInfo.setClient(workClientInfo);
-            }
+            }*/
             projectRecords.setWorkContractInfo(workContractInfo);
         }
         return projectRecords;

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

@@ -49,7 +49,6 @@ import com.jeeplus.modules.workactivitymenu.entity.WorkActivityMenu;
 import com.jeeplus.modules.workactivitymenu.service.WorkActivityMenuService;
 import com.jeeplus.modules.workclientinfo.dao.WorkClientAttachmentDao;
 import com.jeeplus.modules.workclientinfo.dao.WorkClientLinkmanDao;
-import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
 import com.jeeplus.modules.workclientinfo.service.WorkClientInfoService;
 import com.jeeplus.modules.workcontent.web.WorkContentTypeController;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
@@ -162,10 +161,10 @@ public class RuralProjectMessageNewTwoService extends CrudService<RuralProjectMe
         if(projectRecords!=null){
             String cid = projectRecords.getWorkContractInfo().getId();
             WorkContractInfo workContractInfo = contractInfoService.get(cid);
-            if(null != workContractInfo) {
+            /*if(null != workContractInfo) {
                 WorkClientInfo workClientInfo = workClientInfoService.get(workContractInfo.getClient().getId());
                 workContractInfo.setClient(workClientInfo);
-            }
+            }*/
             projectRecords.setWorkContractInfo(workContractInfo);
         }
         return projectRecords;
@@ -239,9 +238,6 @@ public class RuralProjectMessageNewTwoService extends CrudService<RuralProjectMe
                     }
                 }
             }
-            //修改项目开始时间和结束时间
-            System.out.println(ruralProjectRecords.getStartDate());
-            System.out.println(ruralProjectRecords.getEndingDate());
             if(null != ruralProjectRecords.getStartDate() && null != ruralProjectRecords.getEndingDate()){
                 ruralProjectRecordsService.updateDate(ruralProjectRecords);
             }

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

@@ -2003,7 +2003,7 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			info.setWorkAttachments(attachments);
 			//判断是否为必填项，若为必填项则添加必填判定字段
 			if(info.getRequiredStage() == projectTemplateInfo.getRequiredStage()){
-				info.setMustFlag(1);
+				//info.setMustFlag(1);
 			} else {
 				info.setMustFlag(0);
 			}

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

@@ -1320,6 +1320,8 @@ public class RuralCostProjectMessageNewController extends BaseController {
         if (!beanValidator(model, projectReportRecord)){
             return form(projectReportRecord, model);
         }
+        //获取项目信息
+        RuralProjectRecords ruralProjectRecords = projectRecordsService.get(projectReportRecord.getReport().getProject().getId());
         try {
             //获取创建者信息
             User user = projectReportRecord.getCreateBy();
@@ -1357,6 +1359,11 @@ public class RuralCostProjectMessageNewController extends BaseController {
             addMessage(redirectAttributes, "保存报告归档暂存失败");
             logger.error("保存报告归档暂存失败",e);
         }
+        if("1".equals(ruralProjectRecords.getProjectType())){
+            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+        }else if("2".equals(ruralProjectRecords.getProjectType())){
+            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+        }
         return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
     }
 
@@ -1368,6 +1375,8 @@ public class RuralCostProjectMessageNewController extends BaseController {
         if (!beanValidator(model, projectReportRecord)){
             return form(projectReportRecord, model);
         }
+        //获取项目信息
+        RuralProjectRecords ruralProjectRecords = projectRecordsService.get(projectReportRecord.getReport().getProject().getId());
         try {
             //获取创建者信息
             User user = projectReportRecord.getCreateBy();
@@ -1412,6 +1421,11 @@ public class RuralCostProjectMessageNewController extends BaseController {
             addMessage(redirectAttributes, "保存报告归档失败");
             logger.error("保存报告归档失败",e);
         }
+        if("1".equals(ruralProjectRecords.getProjectType())){
+            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+        }else if("2".equals(ruralProjectRecords.getProjectType())){
+            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+        }
         return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
     }
 

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

@@ -161,57 +161,6 @@ public class RuralCostProjectMessageNewTwoController extends BaseController {
         //文件处理
         projectTemplateService.disposeProjectTemplateFile(mainDictDetails,relateInfo,engineeringId,ruralProjectRecords,projectReportRecord,"1000");
 
-        /*for (MainDictDetail mainDict : mainDictDetails) {
-            relateInfo.setAttachType(mainDict.getValue());
-            switch (mainDict.getValue()) {
-                case "11":
-                    List<ProjectTemplateInfo> fileAttachmentList = projectTemplateService.getProjectTemplateList(relateInfo);
-                    for (ProjectTemplateInfo info: fileAttachmentList) {
-                        info.setAttachTypes(info.getAttachTypes().toLowerCase());
-                        if(engineeringId.equals(ruralProjectRecords.getEngineeringType())){
-                            if("审定单".equals(info.getAttachName()) || "咨询报告书正文（含附件）  附件一：工程预算或结算汇总表 附件二：编制或审核说明 附件三：工程预算或结算审定单 附件四：工程预算或结算书".equals(info.getAttachName()) ){
-                                if(!info.getAttachTypes().contains("zip")){
-                                    info.setAttachTypes(info.getAttachTypes()+",zip");
-                                }
-                                if(!info.getAttachTypes().contains("rar")){
-                                    info.setAttachTypes(info.getAttachTypes()+",rar");
-                                }
-                            }
-                        }
-                    }
-                    projectReportRecord.setFileAttachmentList(fileAttachmentList);
-                    break;
-                case "12":
-                    List<ProjectTemplateInfo> projectTemplateList = projectTemplateService.getProjectTemplateList(relateInfo);
-                    for (ProjectTemplateInfo info: projectTemplateList) {
-                        info.setAttachTypes(info.getAttachTypes().toLowerCase());
-                        if(engineeringId.equals(ruralProjectRecords.getEngineeringType())){
-                            if("投标文件、中标通知书、工程承包合同（协议书记专用条款部分）、补充协议".equals(info.getAttachName()) || "送审工程预算、结算书".equals(info.getAttachName()) ){
-                                if(!info.getAttachTypes().contains("zip")){
-                                    info.setAttachTypes(info.getAttachTypes()+",zip");
-                                }
-                                if(!info.getAttachTypes().contains("rar")){
-                                    info.setAttachTypes(info.getAttachTypes()+",rar");
-                                }
-                            }
-                        }
-                    }
-                    projectReportRecord.setFileGistdataList(projectTemplateList);
-                    break;
-                case "13":
-                    BigDecimal submitScale = ruralProjectRecords.getSubmitScale();
-                    // 送审金额大于等于1000万时
-                    if(submitScale.compareTo(BigDecimal.valueOf(1000))!=-1){
-                        relateInfo.setFlag(true);
-                    }else {
-                        relateInfo.setFlag(false);
-                    }
-                    projectReportRecord.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
-                    break;
-            }
-
-        }*/
-
         if(null != projectContractInfo){
             if(projectContractInfo.getWorkClientInfoList().size()>0){
                 model.addAttribute("workClientInfoName", projectContractInfo.getWorkClientInfoList().get(0).getName());

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

@@ -37,6 +37,7 @@ import com.jeeplus.modules.workbidproject.service.WorkBidProjectService;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
+import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workclientinfo.service.WorkClientInfoService;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoService;
@@ -252,13 +253,9 @@ public class RuralProjectViewController extends BaseController {
         if(StringUtils.isNotBlank(workContractInfo.getChargeCriterion())){
             workContractInfo.setChargeCriterionList(Arrays.asList(workContractInfo.getChargeCriterion().split(",")));
         }
-        //查询合同对应委托方客户信息
-        if(null != workContractInfo.getClient()){
-            WorkClientInfo clientInfo = workClientInfoService.get(workContractInfo.getClient().getId());
-            model.addAttribute("workClientInfo", clientInfo);
-            model.addAttribute("bankSize",clientInfo.getWorkClientBankList().size());
-            model.addAttribute("linkManSize",clientInfo.getWorkClientLinkmanList().size());
-            model.addAttribute("attachmentSize",clientInfo.getWorkAttachments().size());
+        if(StringUtils.isNotBlank(workContractInfo.getId())){
+            List<WorkClientLinkman> clientList = workContractInfoService.getClientList(workContractInfo.getId());
+            model.addAttribute("clientList",clientList);
         }
         //合同作废信息
         AlterInfo alterInfo = alterInfoService.getByContractInfo(workContractInfo);
@@ -878,7 +875,7 @@ public class RuralProjectViewController extends BaseController {
                 reviewId="3";
             }
         }
-        List<WorkReviewAudit> workReviewAudits = projectContentDataService.findListReview(reviewId,"紧急项目");
+        //List<WorkReviewAudit> workReviewAudits = projectContentDataService.findListReview(reviewId,"紧急项目");
         //展示
         ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(projectRecords.getId());
 
@@ -888,7 +885,7 @@ public class RuralProjectViewController extends BaseController {
         workReviewAudit.setType(type);
         workReviewAudit.setReportId(projectReportData.getId());
         List<WorkReviewAudit> audits = workReviewStandardService.findAuditList(workReviewAudit);
-        for(WorkReviewAudit reviewAudit:workReviewAudits){
+        /*for(WorkReviewAudit reviewAudit:workReviewAudits){
             for (WorkReviewAudit audit:audits){
                 if (reviewAudit.getId().equals(audit.getStandardId())){
                     reviewAudit.setDeductOption(audit.getDeductOption());
@@ -896,7 +893,7 @@ public class RuralProjectViewController extends BaseController {
                 }
             }
         }
-        model.addAttribute("list", workReviewAudits);
+        model.addAttribute("list", workReviewAudits);*/
         model.addAttribute("projectReportRecord", projectReportRecord);
         model.addAttribute("project", projectReportRecord.getReport().getProject());
         return "modules/ruralprojectrecords/view/projectReportRecordView";

src/main/java/com/jeeplus/modules/workclientinfo/dao/WorkClientInfoDao.java

@@ -29,7 +29,7 @@ public interface WorkClientInfoDao extends CrudDao<WorkClientInfo> {
 
     int countByUscCode(String uscCode);
     Integer queryCount(WorkClientInfo workClientInfo);
-
+    //查询客户
     List<WorkClientInfo> findAll(WorkClientInfo workClientInfo);
     int queryAllCount(WorkClientInfo workClientInfo);
 
@@ -60,4 +60,6 @@ public interface WorkClientInfoDao extends CrudDao<WorkClientInfo> {
      * @return
      */
     WorkClientInfo getByName(String name);
+
+
 }

src/main/java/com/jeeplus/modules/workclientinfo/dao/WorkClientLinkmanDao.java

@@ -6,10 +6,8 @@ package com.jeeplus.modules.workclientinfo.dao;
 import com.jeeplus.common.persistence.CrudDao;
 import com.jeeplus.common.persistence.annotation.MyBatisDao;
 import com.jeeplus.modules.workbidproject.entity.WorkBidProject;
-import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientJobTypeInfo;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
-import com.jeeplus.modules.workcontent.entity.WorkContentInvestmentCost;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -38,6 +36,14 @@ public interface WorkClientLinkmanDao extends CrudDao<WorkClientLinkman> {
 
     List<WorkClientLinkman> queryLinkManByClientId(String id);
 
+    /***
+     * 添加联系人
+     * @param workClientLinkman
+     * @return
+     */
+    int insertLinkman(WorkClientLinkman workClientLinkman);
+
+    public int deleteContractLinkman(String contractId);
     /**
      * 无合同状态下，添加委托方联系人，查询该公司下所有客户
      * @param workClientLinkman
@@ -54,4 +60,5 @@ public interface WorkClientLinkmanDao extends CrudDao<WorkClientLinkman> {
     void jobTypeDelete(String workClientId);
     //根据客户信息表id查出来对应的联系人信息
     List<WorkClientLinkman> getLinkMan(WorkClientLinkman workClientLinkman);
+
 }

src/main/java/com/jeeplus/modules/workclientinfo/entity/WorkClientLinkman.java

@@ -30,6 +30,17 @@ public class WorkClientLinkman extends DataEntity<WorkClientLinkman> {
 	private List<String> clientIds;
 	private String uscCode;
 	private String createName;   //创建人
+	private  String contractNum;
+	private  String contractId;
+
+
+	public String getContractNum() {
+		return contractNum;
+	}
+
+	public void setContractNum(String contractNum) {
+		this.contractNum = contractNum;
+	}
 	private String projectPersonId;//联系人id
 	public WorkClientLinkman() {
 		super();
@@ -156,6 +167,14 @@ public class WorkClientLinkman extends DataEntity<WorkClientLinkman> {
 		this.createName = createName;
 	}
 
+	public String getContractId() {
+		return contractId;
+	}
+
+	public void setContractId(String contractId) {
+		this.contractId = contractId;
+	}
+
 	public String getProjectPersonId() {
 		return projectPersonId;
 	}

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

@@ -191,6 +191,7 @@ public class WorkClientInfoService extends CrudService<WorkClientInfoDao, WorkCl
         return workattachmentService.getAttachmentList(workClientAttachment);
     }
 
+
     /**
      * 获取一个客户信息
      * @param page 分页对象
@@ -389,7 +390,7 @@ public class WorkClientInfoService extends CrudService<WorkClientInfoDao, WorkCl
      * @param workClientInfo
      */
 	@Transactional(readOnly = false)
-	public void save(WorkClientInfo workClientInfo) {
+	public void save(WorkClientInfo workClientInfo,WorkContractInfo workContractInfo) {
 	    //判定是否为修改类型
 	    boolean flag = false;
 	    if(StringUtils.isNotBlank(workClientInfo.getId())){
@@ -437,6 +438,8 @@ public class WorkClientInfoService extends CrudService<WorkClientInfoDao, WorkCl
                 workClientLinkman.setClientId(workClientInfo);
 				if (StringUtils.isBlank(workClientLinkman.getId())){
 					workClientLinkman.preInsert();
+//					WorkClientLinkman wl = new WorkClientLinkman();
+//					wl.setContractId(workClientInfo.getId());
 					workClientLinkmanDao.insert(workClientLinkman);
 				}else{
 					workClientLinkman.preUpdate();

src/main/java/com/jeeplus/modules/workcontractinfo/dao/WorkContractInfoDao.java

@@ -3,12 +3,12 @@
  */
 package com.jeeplus.modules.workcontractinfo.dao;
 
-import afu.org.checkerframework.checker.igj.qual.I;
 import com.jeeplus.common.persistence.CrudDao;
 import com.jeeplus.common.persistence.annotation.MyBatisDao;
 import com.jeeplus.modules.statement.entity.StatementCompanyComprehensiveInfo;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
+import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractAnnex;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractListInfo;
@@ -107,6 +107,22 @@ public interface WorkContractInfoDao extends CrudDao<WorkContractInfo> {
      */
     WorkContractInfo getByContractNum(String contractNum);
 
+    WorkContractInfo getContractInfoByNum(WorkContractInfo contract);
+    /**
+     * 查找联系人
+     * @param contractNum
+     * @return
+     */
+    List<WorkClientLinkman> getList(String contractId);
+    /**
+     * 修改联系人信息
+     * @param workClientLinkman
+     * @return
+     */
+    int updateLinkman(WorkClientLinkman workClientLinkman);
+
+
+
     //公司级 查询合同信息
     List<WorkContractInfo> findContractStatementPage(@Param("workContractInfo")WorkContractInfo workContractInfo,@Param("officeIdd") String officeIdd, @Param("beginDate")String beginDate, @Param("endDate")String endDate,@Param("contractRecordState")String contractRecordState);
     //公司级 查询合同信息的条数

src/main/java/com/jeeplus/modules/workcontractinfo/entity/WorkContractInfo.java

@@ -9,11 +9,13 @@ import com.google.common.collect.Lists;
 import com.jeeplus.common.persistence.ActEntity;
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
 import com.jeeplus.modules.alterinfo.entity.AlterInfo;
+import com.jeeplus.modules.sys.entity.Area;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.workbidproject.entity.WorkBidProject;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
+import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workfullmanage.entity.WorkFullRecord;
 import com.jeeplus.modules.workinvoicedetail.entity.WorkInvoiceDetail;
 import org.activiti.engine.history.HistoricProcessInstance;
@@ -61,7 +63,11 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 	private String clientName;		// 主委托方名称
 	private String telephone;
 	private String uscCode;
+	private Area area;		// 地区Id
+	private Integer hasUscc; //是否拥有统一社会信用代码
 	private WorkClientInfo workClientInfo; //客户管理
+	private WorkClientLinkman workClientLinkman;        //联系人信息
+	private List<WorkClientLinkman> workClientLinkmanList = Lists.newArrayList();		// 子表列表
 	private List<WorkClientInfo> workClientInfoList = Lists.newArrayList(); //委托方列表
 	private Date contractDate;			// 签订日期
 	private Date effectiveDate;			// 合同生效日期
@@ -166,6 +172,22 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 	private String contractRecordState;   //归档状态
 	private String overDueStatus;   //归档状态
 
+	public List<WorkClientLinkman> getWorkClientLinkmanList() {
+		return workClientLinkmanList;
+	}
+
+	public void setWorkClientLinkmanList(List<WorkClientLinkman> workClientLinkmanList) {
+		this.workClientLinkmanList = workClientLinkmanList;
+	}
+
+	public WorkClientLinkman getWorkClientLinkman() {
+		return workClientLinkman;
+	}
+
+	public void setWorkClientLinkman(WorkClientLinkman workClientLinkman) {
+		this.workClientLinkman = workClientLinkman;
+	}
+
 	public String getTelephone() {
 		return telephone;
 	}
@@ -213,7 +235,13 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 	public void setBeginInvestmentAmount(String beginInvestmentAmount) {
 		this.beginInvestmentAmount = beginInvestmentAmount;
 	}
+	public Integer getHasUscc() {
+		return hasUscc;
+	}
 
+	public void setHasUscc(Integer hasUscc) {
+		this.hasUscc = hasUscc;
+	}
 	public String getEndInvestmentAmount() {
 		return endInvestmentAmount;
 	}
@@ -427,7 +455,9 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 	public WorkClientInfo getClient() {
 		return client;
 	}
-
+	public WorkClientLinkman getLinkman(){
+		return workClientLinkman;
+	}
 	public void setClient(WorkClientInfo client) {
 		this.client = client;
 	}

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

@@ -257,7 +257,7 @@ public class WorkContractBorrowService extends CrudService<WorkContractBorrowDao
 	public String auditSave(WorkCntractBorrow workCntractBorrow,List<User> auditUsers) {
 			String userName = UserUtils.get(workCntractBorrow.getCreateBy().getId()).getName();
 			Office office = officeService.get(workCntractBorrow.getOfficeId());
-			String str =  "主委托方："+workCntractBorrow.getWorkContractInfo().getClient().getName()+",申请人:"+userName+",所属部门:"+office.getName();
+			String str =  "主委托方："+workCntractBorrow.getWorkContractInfo().getClientName()+",申请人:"+userName+",所属部门:"+office.getName();
 			String title = "合同名称:"+workCntractBorrow.getWorkContractInfo().getName();
 			// 对不同环节的业务逻辑进行操作
 			String taskDefKey = workCntractBorrow.getAct().getTaskDefKey();

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

@@ -8,7 +8,9 @@ import com.jeeplus.common.config.Global;
 import com.jeeplus.common.oss.OSSClientUtil;
 import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.service.CrudService;
-import com.jeeplus.common.utils.*;
+import com.jeeplus.common.utils.IdGen;
+import com.jeeplus.common.utils.MenuStatusEnum;
+import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.act.utils.ActUtils;
@@ -43,8 +45,10 @@ import com.jeeplus.modules.workbidproject.dao.WorkBidProjectDao;
 import com.jeeplus.modules.workbidproject.entity.WorkBidProject;
 import com.jeeplus.modules.workclientinfo.dao.WorkClientAttachmentDao;
 import com.jeeplus.modules.workclientinfo.dao.WorkClientInfoDao;
+import com.jeeplus.modules.workclientinfo.dao.WorkClientLinkmanDao;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
+import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workclientinfo.service.WorkClientInfoService;
 import com.jeeplus.modules.workcontractinfo.dao.*;
 import com.jeeplus.modules.workcontractinfo.entity.*;
@@ -68,14 +72,15 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
-import java.awt.*;
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.List;
 
 /**
  * 合同管理Service
@@ -149,9 +154,21 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 	private WorkContractBorrowDao workContractBorrowDao;
 	@Autowired
 	private StatementCompanyComprehensiveService statementCompanyComprehensiveService;
+	@Autowired
+	private WorkClientLinkmanDao workClientLinkmanDao;
 
 	private static byte[] SYN_BYTE = new byte[0];
 
+	/**
+	 * 通过contractNum查询联系人
+	 * @param contractNum
+	 * @return
+	 */
+	public  List<WorkClientLinkman> getClientList(String contractNum){
+		return workContractInfoDao.getList(contractNum);
+
+
+	}
 	public WorkContractInfo get(String id) {
 		WorkContractInfo workContractInfo = super.get(id);
 		/*合同投标项目，则查投标。不是投标项目，不去查*/
@@ -243,7 +260,6 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 		}
 		return workContractInfo;
 	}
-
 	/**
 	 * 仅查询合同信息
 	 * @param id
@@ -253,6 +269,15 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 		WorkContractInfo workContractInfo = super.get(id);
 		return workContractInfo;
 	}
+	/**
+	 * 仅查询合同信息
+	 * @param id
+	 * @return
+	 */
+	public WorkContractInfo getContractInfoByNum(WorkContractInfo contract) {
+		WorkContractInfo workContractInfo = dao.getContractInfoByNum(contract);
+		return workContractInfo;
+	}
 	public String getTotal(String id) {
 		WorkContractInfo workContractInfo = super.get(id);
 		String str = "";
@@ -554,6 +579,31 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 		}
 
 		super.save(workContractInfo);
+
+		List<WorkClientLinkman> linkmanList = workContractInfo.getWorkClientLinkmanList();
+		Set<String> setName = new HashSet();
+		if(linkmanList.size()>0){
+			for (WorkClientLinkman info : linkmanList) {
+				if(StringUtils.isNotBlank(info.getName())){
+					setName.add(info.getName());
+				}
+			}
+			if(setName.size()>0){
+				//根据合同编号删除所有合同联系人信息
+				workClientLinkmanDao.deleteContractLinkman(workContractInfo.getId());
+			}
+		}
+		//添加合同联系人信息
+		for (WorkClientLinkman clientLinkman : linkmanList) {
+			if(StringUtils.isBlank(clientLinkman.getName())){
+				continue;
+			}
+			clientLinkman.setContractNum(workContractInfo.getContractNum());
+			clientLinkman.setContractId(workContractInfo.getId());
+			clientLinkman.preInsert();
+			workClientLinkmanDao.insertLinkman(clientLinkman);
+
+		}
 		for (WorkClientAttachment workClientAttachment : workContractInfo.getWorkAttachments()){
 			if (workClientAttachment.getId() == null){
 				continue;
@@ -571,6 +621,7 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 			}else{
 				workClientAttachmentDao.delete(workClientAttachment);
 			}
+
 		}
 	}
 	@Transactional(readOnly = false)
@@ -623,7 +674,7 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 		}
 	}
 	@Transactional(readOnly = false)
-	public synchronized String save(WorkContractInfo workContractInfo,Map<String, Object> variables, String contextPath,String urls) {
+	public synchronized String save(WorkClientLinkman workClientLinkman,WorkContractInfo workContractInfo,Map<String, Object> variables, String contextPath,String urls) {
 		long begin = System.currentTimeMillis();
 		String processInstanceId = workContractInfo.getProcessInstanceId();
 		String contractTypeCode = workContractInfo.getContractTypeDoc();
@@ -636,226 +687,40 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 				  contractTypeId = mainDictDetail.getValue();
 			}
 		}
-		if (StringUtils.isBlank(workContractInfo.getContractNum())) {
-			//根据合同类型生成合同编号
-			String type = null;
-			if("100".equals(contractTypeId)){
-				type = WorkContractInfo.SERIAL_CONSULT;
-			}else if("101".equals(contractTypeId)){
-				type = WorkContractInfo.SERIAL_CHECK;
-			}else if("102".equals(contractTypeId)){
-				type = WorkContractInfo.SERIAL_AGENCY;
-			}else if("103".equals(contractTypeId)){
-				type = WorkContractInfo.SERIAL_AUDIT;
-			}else {
-				type = WorkContractInfo.SERIAL_ELST;
-			}
-			synchronized (SYN_BYTE){
-				workContractInfo.setContractNum(serialNumTplService.genSerialNum(UserUtils.get(workContractInfo.getCreateBy().getId()).getCompany(), type).replace("TYPE",contractType));
-			}
-
-
-			/*//生成合同编号
-			workContractInfo.setContractNum(serialNumTplService.genSerialNumNotNum(UserUtils.get(workContractInfo.getCreateBy().getId()).getCompany(), WorkContractInfo.SERIAL_CONSULT).replace("TYPE",contractType));
-			//根据当前合同编号查询对应最后一条合同编号
-			String contractLastNumStr = dao.getContractLastNum(workContractInfo.getContractNum());
-			if(StringUtils.isNotBlank(contractLastNumStr)) {
-				//获取最新的后缀编号
-				Integer num = Integer.parseInt(contractLastNumStr.substring(workContractInfo.getContractNum().length(), contractLastNumStr.length())) + 1;
-				//更新合同编号
-				workContractInfo.setContractNum(workContractInfo.getContractNum() + String.format("%04d", num));
-			}else {
-				//更新合同编号
-				workContractInfo.setContractNum(workContractInfo.getContractNum() + String.format("%04d", 1));
-			}*/
-			long end2 = System.currentTimeMillis();
-			logger.info("合同送审-项目编码设置任务结束，共耗时：[" + (end2-begin) / 1000 + "]秒");
-		}
-		long begin2 = System.currentTimeMillis();
-		if (StringUtils.isBlank(workContractInfo.getContractNumPath())) {
-			String num=workContractInfo.getContractNum();
-			long time = System.currentTimeMillis();
-			String picNamePhoto = time + ".png";
-			ByteArrayOutputStream byteArrayOutputStream=new ByteArrayOutputStream();
-			WordToPic.TextToAliyunPic(num, 500, 80, 25,new Color(0,188,212), byteArrayOutputStream);
-
-			byte[] buf = byteArrayOutputStream.toByteArray();
-			ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(buf);
-			OSSClientUtil ossUtil = new OSSClientUtil();
-			ossUtil.uploadFile2OSS(byteArrayInputStream, Global.getContractNumPath(), picNamePhoto);
-			workContractInfo.setContractNumPath(Global.getAliyunUrl()+"/"+Global.getContractNumPath()+picNamePhoto);
-		}
-		workContractInfo.setContractState("2");
-		this.save(workContractInfo);
-		Office office = UserUtils.getUser().getOffice();
-		String title = "合同【"+workContractInfo.getName() +"】登记待审批";
-		String str = "合同【"+workContractInfo.getName() +"】登记待审批，合同编号："+workContractInfo.getContractNum();
-		identityService.setAuthenticatedUserId(workContractInfo.getCreateBy().getId());
-		String businessKey = workContractInfo.getId().toString();
-		WorkActivityMenu workActivityMenu = workActivityMenuService.findByParentAndOffice("zth3125f1f194c82bdea93555c750905", office);
-		// 启动流程
-		String processType = workActivityMenu.getProcessType();
-		StringBuffer buffer = new StringBuffer();
-		Activity activity = new Activity();
-		WorkProjectNotify workProjectNotify = UtilNotify
-				.saveNotify(workContractInfo.getId(),
-						null,
-						workContractInfo.getCompanyId(),
-						title,
-						str,
-						"16",
-						"0",
-						"待审批",
-						""
-				);
-		List<User> users = new ArrayList<>();
-		String officeId = UserUtils.getSelectOffice().getId();
-		List<User>  bmzrs = UserUtils.getByRoleActivityEnname("bmzr",2,office.getId(),"2",workContractInfo.getCreateBy());
-//		List<User>  scyfglbzrs = UserUtils.getByRoleActivityEnname("scyfglbzr",1,office.getId(),"2",workContractInfo.getCreateBy());
-//		List<User>  fglds = UserUtils.getByRoleActivityEnname("scfgld",3,office.getId(),"2",workContractInfo.getCreateBy());
-		long end3 = System.currentTimeMillis();
-		logger.info("合同送审-查找人员审核任务结束，共耗时：[" + (end3-begin2) / 1000 + "]秒");
-		long begin3 = System.currentTimeMillis();
-		if (StringUtils.isNotBlank(workActivityMenu.getId())) {
-			workProjectNotify.setNotifyRole("");
-			workActivityMenu = workActivityMenuService.get(workActivityMenu.getId());
-			List<Activity> activities = workActivityMenu.getActivities();
-			for (Activity a : activities) {
-				String encount = a.getEncount();
-				String enlist = a.getEnlist();
-				if (a.getRole() != null && StringUtils.isNotBlank(a.getRole().getEnname())) {
-					List enusers = UserUtils.getByRoleActivityEnnames(a.getRole().getEnname(), office.getId(), "2", workContractInfo.getCreateBy());
-					if (enusers.size() == 0) {
-						workContractInfo.setContractState("1");
-						this.save(workContractInfo);
-						return "流程审批人不能为空,角色部门负责人下无用户,请联系管理员！";
-					}
-					variables.put(enlist, enusers);
-					variables.put(encount, enusers.size());
-				}
-				if (a.getDelFlag().equals("0") && a.getCount() == 1) {
-					activity = a;
-				}
-			}
-			buffer.append(activity.getRole().getEnname());
-			if (activity != null && StringUtils.isNotBlank(activity.getId())) {
-				//角色审批
-				if (StringUtils.isNotBlank(activity.getRole().getEnname())) {
-					users = UserUtils.getByRoleActivityEnnames(activity.getRole().getEnname(), office.getId(), "2", workContractInfo.getCreateBy());
-				}
-				//人员审批
-				if (StringUtils.isNotBlank(activity.getUser().getId())) {
-					users.add(activity.getUser());
-				}
-			}
-			workProjectNotify.setId("");
-		} else {
-			processType = "contractCheck";
-			if(bmzrs==null||bmzrs.size()==0){
-				workContractInfo.setContractState("1");
-				this.save(workContractInfo);
-				return "流程审批人不能为空,角色部门负责人下无用户,请联系管理员！";
-			}
-			variables.put("bmzrList", bmzrs);
-			variables.put("bmzrCount",bmzrs.size());
-			users.addAll(bmzrs);
-		}
-
-		for (User u : users) {
-			workProjectNotify.setUser(u);
-			workProjectNotify.setId("");
-			workProjectNotify.setNotifyRole("部门主任审批");
-			workProjectNotifyService
-					.save(workProjectNotify);
-			Map<String,Object> extras = new HashMap<>();
-			extras.put("type","7002");
-			extras.put("id",workProjectNotify.getId());
-			extras.put("procDefKey","16");
-			UserUtils.pushInfoToApp(title,str,extras,u.getId());
-			UserUtils.pushIm(u.getId(),str);
-		}
-		variables.put("type", processType);
-		variables.put("busId", businessKey);
-//		variables.put("count",users.size());
-//		variables.put("assigneeList",users);
-		variables.put("title", "合同名称:" + workContractInfo.getName());//设置标题；
-		long s1 = System.currentTimeMillis();
-		ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(processType, businessKey, variables);
-		long s2 = System.currentTimeMillis();
-		workContractInfo.setProcessInstance(processInstance);
-		if (StringUtils.isNotBlank(processInstanceId)) {
-			workActivityProcessService.updateProcessInstanceId(processInstance.getId(),processInstanceId);
-			workActivityProcessService.deleteProcessInstanceId(processInstanceId);
-			workActivityProcessService.deleteProcessIdAuditUsers(processInstanceId);
-		}
-		// 更新流程实例ID
-		workContractInfo.setProcessInstanceId(processInstance.getId());
-		workContractInfoDao.updateProcessInstanceId(workContractInfo);
-		//通知添加流程实例ID
-		workProjectNotify.setProcessInstanceId(processInstance.getId());
-		workProjectNotifyService.save(workProjectNotify);
-
-		List<Activity> list = workActivityMenu.getActivities();
-		if (list != null && list.size() != 0) {
-			workActivityProcessService.saveList(list, processInstance.getId());
-		} else {
-			WorkActivityProcess workActivityProcess = new WorkActivityProcess();
-			workActivityProcess.setProcessKey("contractCheck");
-			workActivityProcess.setCount(1);
-			workActivityProcess.setProcessInstanceId(processInstance.getId());
-			workActivityProcess.setIsApproval("0");
-			workActivityProcessService.save(workActivityProcess);
-//			workActivityProcess.setCount(2);
-//			workActivityProcess.setId("");
-//			workActivityProcessService.save(workActivityProcess);
-//			workActivityProcess.setCount(3);
-//			workActivityProcess.setId("");
-//			workActivityProcessService.save(workActivityProcess);
-			workActivityProcessService.insertAuditsByType(bmzrs,processInstance.getId(),1,1);
-//			workActivityProcessService.insertAuditsByType(scyfglbzrs,processInstance.getId(),2,0);
-//			workActivityProcessService.insertAuditsByType(fglds,processInstance.getId(),3,0);
-		}
-		long end = System.currentTimeMillis();
-		logger.info("合同送审任务结束，共耗时：[" + (end-begin) / 1000 + "]秒,流程启动时间："+(s2-s1)+"ms");
-		return "";
-	}
-
-	@Transactional(readOnly = false)
-	public synchronized String newSave( WorkClientInfo workClientInfo,WorkContractInfo workContractInfo,Map<String, Object> variables, String contextPath,String urls) {
-		long begin = System.currentTimeMillis();
-		String processInstanceId = workContractInfo.getProcessInstanceId();
-		String contractTypeCode = workContractInfo.getContractTypeDoc();
-		String contractType = "";
-		String contractTypeId = "";
-		List<MainDictDetail> list1 = DictUtils.getMainDictList("contract_info_type");
-		for(MainDictDetail mainDictDetail:list1){
-			if(mainDictDetail.getValue().equals(contractTypeCode)){
-				contractType = mainDictDetail.getLabel();
-				contractTypeId = mainDictDetail.getValue();
-			}
-		}
-		if (StringUtils.isBlank(workContractInfo.getContractNum())) {
-			//根据合同类型生成合同编号
-			String type = null;
-			if("100".equals(contractTypeId)){
-				type = WorkContractInfo.SERIAL_CONSULT;
-			}else if("101".equals(contractTypeId)){
-				type = WorkContractInfo.SERIAL_CHECK;
-			}else if("102".equals(contractTypeId)){
-				type = WorkContractInfo.SERIAL_AGENCY;
-			}else if("103".equals(contractTypeId)){
-				type = WorkContractInfo.SERIAL_AUDIT;
-			}else {
-				type = WorkContractInfo.SERIAL_ELST;
-			}
-			System.out.println("=============================****************************************************");
-			workClientInfoDao.insert(workClientInfo);
+//		WorkClientLinkman temp = workContractInfo.getWorkClientLinkman();
+//		temp.preInsert();
+//		temp.setContractNum(workContractInfo.getContractNum());
+//		System.out.println("------------------------------->" + workClientLinkmanDao.insertLinkman(temp));
+		workContractInfo.preInsert();
+		System.out.println("------------------------------>" + workContractInfoDao.insert(workContractInfo));
+		//获取联系人信息并添加
+		List<WorkClientLinkman> linkmanList = workContractInfo.getWorkClientLinkmanList();
+		for (WorkClientLinkman clientLinkman : linkmanList) {
+			clientLinkman.setContractNum(workContractInfo.getContractNum());
+			clientLinkman.preInsert();
+			workClientLinkmanDao.insertLinkman(clientLinkman);
+
+		}
+//		if (StringUtils.isBlank(workContractInfo.getContractNum())) {
+//			//根据合同类型生成合同编号
+//			String type = null;
+//			if("100".equals(contractTypeId)){
+//				type = WorkContractInfo.SERIAL_CONSULT;
+//			}else if("101".equals(contractTypeId)){
+//				type = WorkContractInfo.SERIAL_CHECK;
+//			}else if("102".equals(contractTypeId)){
+//				type = WorkContractInfo.SERIAL_AGENCY;
+//			}else if("103".equals(contractTypeId)){
+//				type = WorkContractInfo.SERIAL_AUDIT;
+//			}else {
+//				type = WorkContractInfo.SERIAL_ELST;
+//			}
 //			synchronized (SYN_BYTE){
 //				workContractInfo.setContractNum(serialNumTplService.genSerialNum(UserUtils.get(workContractInfo.getCreateBy().getId()).getCompany(), type).replace("TYPE",contractType));
 //			}
-
-
-//			//生成合同编号
+//
+//
+//			/*//生成合同编号
 //			workContractInfo.setContractNum(serialNumTplService.genSerialNumNotNum(UserUtils.get(workContractInfo.getCreateBy().getId()).getCompany(), WorkContractInfo.SERIAL_CONSULT).replace("TYPE",contractType));
 //			//根据当前合同编号查询对应最后一条合同编号
 //			String contractLastNumStr = dao.getContractLastNum(workContractInfo.getContractNum());
@@ -867,7 +732,7 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 //			}else {
 //				//更新合同编号
 //				workContractInfo.setContractNum(workContractInfo.getContractNum() + String.format("%04d", 1));
-//			}
+//			}*/
 //			long end2 = System.currentTimeMillis();
 //			logger.info("合同送审-项目编码设置任务结束，共耗时：[" + (end2-begin) / 1000 + "]秒");
 //		}
@@ -884,7 +749,7 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 //			OSSClientUtil ossUtil = new OSSClientUtil();
 //			ossUtil.uploadFile2OSS(byteArrayInputStream, Global.getContractNumPath(), picNamePhoto);
 //			workContractInfo.setContractNumPath(Global.getAliyunUrl()+"/"+Global.getContractNumPath()+picNamePhoto);
-		}
+//		}
 		workContractInfo.setContractState("5");
 		this.save(workContractInfo);
 //		Office office = UserUtils.getUser().getOffice();
@@ -903,7 +768,7 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 //						workContractInfo.getCompanyId(),
 //						title,
 //						str,
-//						"143",
+//						"16",
 //						"0",
 //						"待审批",
 //						""
@@ -912,8 +777,7 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 //		String officeId = UserUtils.getSelectOffice().getId();
 //		List<User>  bmzrs = UserUtils.getByRoleActivityEnname("bmzr",2,office.getId(),"2",workContractInfo.getCreateBy());
 ////		List<User>  scyfglbzrs = UserUtils.getByRoleActivityEnname("scyfglbzr",1,office.getId(),"2",workContractInfo.getCreateBy());
-//		//获取总经理人员信息
-//		List<User>  zjls = UserUtils.getByRoleActivityEnname("zjl",3,office.getId(),"2",workContractInfo.getCreateBy());
+////		List<User>  fglds = UserUtils.getByRoleActivityEnname("scfgld",3,office.getId(),"2",workContractInfo.getCreateBy());
 //		long end3 = System.currentTimeMillis();
 //		logger.info("合同送审-查找人员审核任务结束，共耗时：[" + (end3-begin2) / 1000 + "]秒");
 //		long begin3 = System.currentTimeMillis();
@@ -951,17 +815,12 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 //			}
 //			workProjectNotify.setId("");
 //		} else {
-//			processType = "newContractAudit";
+//			processType = "contractCheck";
 //			if(bmzrs==null||bmzrs.size()==0){
 //				workContractInfo.setContractState("1");
 //				this.save(workContractInfo);
 //				return "流程审批人不能为空,角色部门负责人下无用户,请联系管理员！";
 //			}
-//			if(zjls==null||zjls.size()==0){
-//				workContractInfo.setContractState("1");
-//				this.save(workContractInfo);
-//				return "流程总经理审批人不能为空,总经理审批人下无用户,请联系管理员！";
-//			}
 //			variables.put("bmzrList", bmzrs);
 //			variables.put("bmzrCount",bmzrs.size());
 //			users.addAll(bmzrs);
@@ -976,7 +835,7 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 //			Map<String,Object> extras = new HashMap<>();
 //			extras.put("type","7002");
 //			extras.put("id",workProjectNotify.getId());
-//			extras.put("procDefKey","143");
+//			extras.put("procDefKey","16");
 //			UserUtils.pushInfoToApp(title,str,extras,u.getId());
 //			UserUtils.pushIm(u.getId(),str);
 //		}
@@ -999,7 +858,6 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 //		workContractInfoDao.updateProcessInstanceId(workContractInfo);
 //		//通知添加流程实例ID
 //		workProjectNotify.setProcessInstanceId(processInstance.getId());
-//		workProjectNotify.setWapBeginDate(new Date());
 //		workProjectNotifyService.save(workProjectNotify);
 //
 //		List<Activity> list = workActivityMenu.getActivities();
@@ -1007,19 +865,45 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 //			workActivityProcessService.saveList(list, processInstance.getId());
 //		} else {
 //			WorkActivityProcess workActivityProcess = new WorkActivityProcess();
-//			workActivityProcess.setProcessKey("newContractAudit");
+//			workActivityProcess.setProcessKey("contractCheck");
 //			workActivityProcess.setCount(1);
 //			workActivityProcess.setProcessInstanceId(processInstance.getId());
 //			workActivityProcess.setIsApproval("0");
 //			workActivityProcessService.save(workActivityProcess);
-//			workActivityProcess.setCount(2);
-//			workActivityProcessService.insert(workActivityProcess);
+////			workActivityProcess.setCount(2);
+////			workActivityProcess.setId("");
+////			workActivityProcessService.save(workActivityProcess);
+////			workActivityProcess.setCount(3);
+////			workActivityProcess.setId("");
+////			workActivityProcessService.save(workActivityProcess);
 //			workActivityProcessService.insertAuditsByType(bmzrs,processInstance.getId(),1,1);
-//			workActivityProcessService.insertAuditsByType(zjls,processInstance.getId(),2,0);
+////			workActivityProcessService.insertAuditsByType(scyfglbzrs,processInstance.getId(),2,0);
 ////			workActivityProcessService.insertAuditsByType(fglds,processInstance.getId(),3,0);
 //		}
 //		long end = System.currentTimeMillis();
 //		logger.info("合同送审任务结束，共耗时：[" + (end-begin) / 1000 + "]秒,流程启动时间："+(s2-s1)+"ms");
+//
+		return "";
+	}
+
+	@Transactional(readOnly = false)
+	public synchronized String newSave( WorkClientLinkman workClientLinkman,WorkContractInfo workContractInfo,Map<String, Object> variables, String contextPath,String urls) {
+		long begin = System.currentTimeMillis();
+		String processInstanceId = workContractInfo.getProcessInstanceId();
+		String contractTypeCode = workContractInfo.getContractTypeDoc();
+		String contractType = "";
+		String contractTypeId = "";
+		List<MainDictDetail> list1 = DictUtils.getMainDictList("contract_info_type");
+		for(MainDictDetail mainDictDetail:list1){
+			if(mainDictDetail.getValue().equals(contractTypeCode)){
+				contractType = mainDictDetail.getLabel();
+				contractTypeId = mainDictDetail.getValue();
+			}
+		}
+
+
+		workContractInfo.setContractState("5");
+		this.save(workContractInfo);
 		return "";
 	}
 
@@ -1141,6 +1025,9 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 		page.setList(dao.findListByclient(client));
 		return page;
 	}
+
+
+
 	public WorkContractInfo getByProcessInstanceId(String processInstanceId){
 		WorkContractInfo workClientInfo = workContractInfoDao.getByProcessInstanceId(processInstanceId);
 		return workClientInfo;
@@ -3291,18 +3178,18 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 	public void updateWorkContractInfo(WorkContractInfo workContractInfo) {
 		String contractId = workContractInfo.getId();
 		WorkClientInfo client = workContractInfo.getClient();
-		WorkClientInfo clientInfo = workClientInfoService.get(client.getId());
-		//根据客户信息查询委托方联系人信息
-		if(workContractInfo.getWorkClientInfoList().size()==0){
-			WorkClientInfo workClientInfo = new WorkClientInfo();
-			workClientInfo.setId(clientInfo.getId());
-			workClientInfo.setName(clientInfo.getName());
-			workClientInfo.setCompanyType(DictUtils.getMainDictLabel(clientInfo.getCompanyType(),"company_type",""));
-			workClientInfo.setCompanyIndustry(DictUtils.getMainDictLabel(clientInfo.getCompanyIndustry(),"company_industry",""));
-			workClientInfo.setArea(clientInfo.getArea());
-			workContractInfo.getWorkClientInfoList().add(workClientInfo);
-		}
-
+//			WorkClientInfo clientInfo = workClientInfoService.get(client.getId());
+
+//根据客户信息查询委托方联系人信息
+//		if(workContractInfo.getWorkClientInfoList().size()==0){
+//			WorkClientInfo workClientInfo = new WorkClientInfo();
+//			workClientInfo.setId(clientInfo.getId());
+//			workClientInfo.setName(clientInfo.getName());
+//			workClientInfo.setCompanyType(DictUtils.getMainDictLabel(clientInfo.getCompanyType(),"company_type",""));
+//			workClientInfo.setCompanyIndustry(DictUtils.getMainDictLabel(clientInfo.getCompanyIndustry(),"company_industry",""));
+//			workClientInfo.setArea(clientInfo.getArea());
+//			workContractInfo.getWorkClientInfoList().add(workClientInfo);
+//		}
 		WorkContractClient workContractClient1 = new WorkContractClient();
 		workContractClient1.setContractId(contractId);
 		List<WorkContractClient> list1 =workContractClientService.findList(workContractClient1);

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

@@ -37,6 +37,7 @@ import com.jeeplus.modules.workactivity.service.ActivityService;
 import com.jeeplus.modules.workclientinfo.dao.WorkClientAttachmentDao;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
+import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workclientinfo.service.WorkClientInfoService;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfoCopy;
@@ -799,7 +800,7 @@ public class WorkContractInfoAlterController extends BaseController {
      */
 //	@RequiresPermissions(value={"workcontractinfo:workContractInfo:add","workcontractinfo:workContractInfo:edit"},logical=Logical.OR)
     @RequestMapping(value = "save")
-    public String save(WorkContractInfo workContractInfo, Model model,
+    public String save(WorkClientLinkman workClientLinkman,WorkContractInfo workContractInfo, Model model,
                        RedirectAttributes redirectAttributes) throws Exception {
         if (!beanValidator(model, workContractInfo)) {
             return form(workContractInfo, model);
@@ -880,7 +881,7 @@ public class WorkContractInfoAlterController extends BaseController {
                 //将编辑表单中的非NULL值覆盖数据库记录中的值
                 MyBeanUtils.copyBeanNotNull2Bean(workContractInfo, t);
                 t.setContractState("2");
-                workContractInfoService.save(t, variables,contextPath,url);//保存
+                workContractInfoService.save(workClientLinkman,t, variables,contextPath,url);//保存
                 WorkContractReview workContractReview = workContractInfo.getWorkContractReview();
                 workContractReviewService.save(workContractReview);
                 addMessage(redirectAttributes, "修改保存合同管理成功");
@@ -907,7 +908,7 @@ public class WorkContractInfoAlterController extends BaseController {
                 }
                 workContractInfo.setWorkAttachments(list1);
                 workContractInfo.setContractState("2");
-                workContractInfoService.save(workContractInfo, variables,contextPath,url);//保存
+                workContractInfoService.save(workClientLinkman,workContractInfo, variables,contextPath,url);//保存
                 WorkContractReview workContractReview = workContractInfo.getWorkContractReview();
                 String id = workContractInfo.getId();
                 workContractReview.setContractId(id);
@@ -1024,7 +1025,7 @@ public class WorkContractInfoAlterController extends BaseController {
      * @return
      */
     @RequestMapping(value = "startposs")
-    public String startposs(WorkContractInfo workContractInfo, HttpServletRequest request, HttpServletResponse response, Model model, RedirectAttributes redirectAttributes)throws Exception {
+    public String startposs(WorkClientLinkman workClientLinkman,WorkContractInfo workContractInfo, HttpServletRequest request, HttpServletResponse response, Model model, RedirectAttributes redirectAttributes)throws Exception {
         String url = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort();
         String contextPath = request.getContextPath();
         Role role = UserUtils.getSelectRole().get(0);
@@ -1040,7 +1041,7 @@ public class WorkContractInfoAlterController extends BaseController {
         t.setContractState("2");
         t.preUpdate();
         workContractInfoService.update(t);
-        workContractInfoService.save(t,variables,contextPath,url);
+        workContractInfoService.save(workClientLinkman,t,variables,contextPath,url);
         addMessage(redirectAttributes, "启动流程成功");
         return "redirect:"+Global.getAdminPath()+"/workinvoice/workInvoice/?repage";
     }

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

@@ -6,37 +6,25 @@ package com.jeeplus.modules.workcontractinfo.web;
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.google.zxing.aztec.decoder.Decoder;
 import com.jeeplus.common.beanvalidator.BeanValidators;
 import com.jeeplus.common.bos.BOSClientUtil;
 import com.jeeplus.common.config.Global;
-import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.oss.OSSClientUtil;
 import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.utils.DateUtils;
-import com.jeeplus.common.utils.IdGen;
 import com.jeeplus.common.utils.MyBeanUtils;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.common.web.BaseController;
-import com.jeeplus.common.websocket.onchat.ChatServerPool;
 import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.act.utils.ActUtils;
 import com.jeeplus.modules.alterinfo.entity.AlterInfo;
 import com.jeeplus.modules.alterinfo.service.AlterInfoService;
-import com.jeeplus.modules.contractclient.entity.WorkContractClient;
-import com.jeeplus.modules.contractclient.service.WorkContractClientService;
-import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
-import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectReportInfo;
-import com.jeeplus.modules.sys.entity.Area;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.Role;
 import com.jeeplus.modules.sys.entity.User;
-import com.jeeplus.modules.sys.service.OfficeService;
-import com.jeeplus.modules.sys.service.WorkattachmentService;
-import com.jeeplus.modules.sys.utils.RoleActivityEnname;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.sysimportinfo.entity.SysImportInfo;
 import com.jeeplus.modules.sysimportinfo.service.SysImportInfoService;
@@ -48,9 +36,12 @@ import com.jeeplus.modules.workbidproject.service.WorkBidProjectService;
 import com.jeeplus.modules.workclientinfo.dao.WorkClientAttachmentDao;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
+import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workclientinfo.service.WorkClientInfoService;
-import com.jeeplus.modules.workcontractinfo.dao.WorkContractInfoCopyDao;
-import com.jeeplus.modules.workcontractinfo.entity.*;
+import com.jeeplus.modules.workcontractinfo.entity.WorkCntractBorrow;
+import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
+import com.jeeplus.modules.workcontractinfo.entity.WorkContractListInfo;
+import com.jeeplus.modules.workcontractinfo.entity.WorkContractReview;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoService;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoTookDisposeService;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractReviewService;
@@ -121,6 +112,7 @@ public class WorkContractInfoController extends BaseController {
     private WorkProjectNotifyService workProjectNotifyService;
     @Autowired
     private WorkContractRecordService workContractRecordService;
+    @Autowired
 
     @ModelAttribute
     public WorkContractInfo get(@RequestParam(required = false) String id) {
@@ -134,7 +126,6 @@ public class WorkContractInfoController extends BaseController {
         }
         return entity;
     }
-
     /**
      * 合同管理列表页面
      */
@@ -177,7 +168,6 @@ public class WorkContractInfoController extends BaseController {
         //workContractInfo.setIsTotal("1");
         Page<WorkContractInfo> page = workContractInfoService.findPage(new Page<WorkContractInfo>(request, response), workContractInfo);
         List<WorkContractInfo> list = page.getList();
-
         //查询所有和当前登陆人有关的项目的审核
         WorkProjectNotify workProjectNotify = new WorkProjectNotify();
         workProjectNotify.setUser(UserUtils.getUser());
@@ -552,17 +542,16 @@ public class WorkContractInfoController extends BaseController {
         if(StringUtils.isNotBlank(workContractInfo.getChargeCriterion())){
             workContractInfo.setChargeCriterionList(Arrays.asList(workContractInfo.getChargeCriterion().split(",")));
         }
-//        workClientInfo.setName(request.getParameter("name"));//客户名称
-//        workClientInfo.setUscCode(request.getParameter("uscCode"));//统一社会信用代码
-//        workClientInfo.setJobTypeStr(request.getParameter("JobTypeStr"));//代表方
-//        workClientInfo.setTelephone(request.getParameter("telephone"));
-//        workClientInfo.setLinkname(request.getParameter("linkname"));//联系人姓名
-//        workClientInfo.setPosition(request.getParameter("position"));//职务
-//        workClientInfo.setQq(request.getParameter("qq"));//QQ
-//        workClientInfo.setLinkPhone(request.getParameter("linkPhone"));//联系人电话
-//        workClientInfo.setLinkMobile(request.getParameter("linkMobile"));//手机
-//        workClientInfo.setEmail(request.getParameter("email"));
-//        workClientInfoService.save(workClientInfo);//保存客户信息
+        workContractInfo.setWorkClientLinkmanList(workContractInfoService.getClientList(workContractInfo.getId()));
+        if(StringUtils.isBlank(workContractInfo.getCompany())){
+            workContractInfo.setCompany("0");
+        }
+        if(null == workContractInfo.getHasUscc()){
+            workContractInfo.setHasUscc(1);
+        }
+//        workContractInfo.getWorkClientLinkmanList().forEach(w->{
+//            System.out.println(w.getName() + "---" + w.getEmail());
+//        });
         model.addAttribute("workContractInfo", workContractInfo);
         return "modules/workcontractinfo/newWorkContract/" + view;
     }
@@ -575,6 +564,9 @@ public class WorkContractInfoController extends BaseController {
         if(StringUtils.isNotBlank(workContractInfo.getChargeCriterion())){
             workContractInfo.setChargeCriterionList(Arrays.asList(workContractInfo.getChargeCriterion().split(",")));
         }
+        //获得联系人集合
+        workContractInfo.setWorkClientLinkmanList(workContractInfoService.getClientList(workContractInfo.getId()));
+//        System.out.println(workContractInfoService.getClientList(workContractInfo.getContractNum()));
         model.addAttribute("workContractInfo", workContractInfo);
         return "modules/workcontractinfo/workContractInfoAdminForm";
     }
@@ -890,10 +882,13 @@ public class WorkContractInfoController extends BaseController {
         if(StringUtils.isNotBlank(workContractInfo.getChargeCriterion())){
             workContractInfo.setChargeCriterionList(Arrays.asList(workContractInfo.getChargeCriterion().split(",")));
         }
+        List<WorkClientLinkman> clientList = workContractInfoService.getClientList(workContractInfo.getId());
+
         //合同作废信息
         AlterInfo alterInfo = alterInfoService.getByContractInfo(workContractInfo);
         model.addAttribute("alterInfo",alterInfo);
         model.addAttribute("workContractInfo", workContractInfo);
+        model.addAttribute("clientList",clientList);
         return "modules/workcontractinfo/workContractInfoLookForm";
     }
     @RequestMapping(value = "lookForma")
@@ -940,7 +935,7 @@ public class WorkContractInfoController extends BaseController {
      */
 //	@RequiresPermissions(value={"workcontractinfo:workContractInfo:add","workcontractinfo:workContractInfo:edit"},logical=Logical.OR)
     @RequestMapping(value = "save")
-    public String save(WorkContractInfo workContractInfo, Model model,
+    public String save(WorkClientLinkman workClientLinkman,WorkContractInfo workContractInfo, Model model,
                        RedirectAttributes redirectAttributes) throws Exception {
         if (!beanValidator(model, workContractInfo)) {
             return form(workContractInfo, model);
@@ -971,6 +966,7 @@ public class WorkContractInfoController extends BaseController {
                 }
                 workContractInfo.setWorkAttachments(list1);
                 WorkContractInfo t = workContractInfoService.get(workContractInfo.getId());//从数据库取出记录的值
+                System.out.println("=============================="+t.getClientName());
 //                status =2,审核中。status=5,审核已通过
                 if (t.getContractState().equals("2")) {
                     addMessage(redirectAttributes, "审核中的合同不能修改");
@@ -986,7 +982,7 @@ public class WorkContractInfoController extends BaseController {
                 t.setRecordState("1");
                 t.setSignatureStatus("1");
                 workContractInfoService.save(t);
-                workContractInfoService.updateWorkContractInfo(workContractInfo);
+//                workContractInfoService.updateWorkContractInfo(workContractInfo);
 
 //                合同评价信息，
 //                WorkContractReview workContractReview = workContractInfo.getWorkContractReview();
@@ -994,10 +990,10 @@ public class WorkContractInfoController extends BaseController {
 //                workContractReview.setContractName(workContractInfo.getName());
 //                workContractReviewService.save(workContractReview);
                 Map<String, Object> variables = new HashMap<String, Object>();
-                t.setContractState("2");
-                String str=workContractInfoService.save(t, variables,contextPath,url);//保存
+                t.setContractState("5");
+                String str=workContractInfoService.save(workClientLinkman,t, variables,contextPath,url);//保存
                 if (StringUtils.isNotBlank(str)){
-                    addMessage(redirectAttributes, "合同申请提交失败:"+str);
+                    addMessage(redirectAttributes, "合同提交失败:"+str);
                 }else {
                     addMessage(redirectAttributes, "修改保存合同管理成功");
                 }
@@ -1023,11 +1019,11 @@ public class WorkContractInfoController extends BaseController {
                     }
                 }
                 workContractInfo.setWorkAttachments(list1);
-                workContractInfo.setContractState("1");
+                workContractInfo.setContractState("5");
                 workContractInfo.setRecordState("1");
                 workContractInfo.setSignatureStatus("1");
                 workContractInfoService.save(workContractInfo);//暂存
-                workContractInfoService.updateWorkContractInfo(workContractInfo);
+//                workContractInfoService.updateWorkContractInfo(workContractInfo);
 
                 /* 合同评价信息
                 WorkContractReview workContractReview = workContractInfo.getWorkContractReview();
@@ -1039,7 +1035,7 @@ public class WorkContractInfoController extends BaseController {
 
                 workContractInfo.setContractState("2");
                 Map<String, Object> variables = new HashMap<String, Object>();
-               String str= workContractInfoService.save(workContractInfo, variables,contextPath,url);//保存
+               String str= workContractInfoService.save(workClientLinkman,workContractInfo, variables,contextPath,url);//保存
                 if (StringUtils.isNotBlank(str)){
                     addMessage(redirectAttributes, "合同申请提交失败:"+str);
                 }else {
@@ -1061,7 +1057,7 @@ public class WorkContractInfoController extends BaseController {
      */
 //	@RequiresPermissions(value={"workcontractinfo:workContractInfo:add","workcontractinfo:workContractInfo:edit"},logical=Logical.OR)
     @RequestMapping(value = "newSave")
-    public String newSave(WorkContractInfo workContractInfo, Model model,
+    public String newSave(WorkContractInfo workContractInfo, Model model,WorkClientLinkman workClientLinkman,
                        RedirectAttributes redirectAttributes,WorkClientInfo workClientInfo) throws Exception {
         if (!beanValidator(model, workContractInfo)) {
             return form(workContractInfo, model);
@@ -1079,7 +1075,17 @@ public class WorkContractInfoController extends BaseController {
                 workContractInfo.setTotalContractId("0");
                 //workContractInfo.setCommonFlag(IdGen.uuid());
             }
+
+
             if (!workContractInfo.getIsNewRecord()) {
+
+                //查询合同编号是否在数据库中已存在。若存在，则进行抛出
+                WorkContractInfo contractInfoByNum = workContractInfoService.getContractInfoByNum(workContractInfo);//从数据库取出记录的值
+                if(null != contractInfoByNum){
+                    addMessage(redirectAttributes, "合同编号已存在，无法进行添加");
+                    return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
+                }
+
                 List<WorkClientAttachment> list = workContractInfo.getWorkAttachments();
                 List<WorkClientAttachment> list1 = new ArrayList<>();
                 List<WorkClientAttachment> list2 = new ArrayList<>();
@@ -1107,7 +1113,7 @@ public class WorkContractInfoController extends BaseController {
                 t.setRecordState("1");
                 t.setSignatureStatus("1");
                 workContractInfoService.save(t);
-                workContractInfoService.updateWorkContractInfo(workContractInfo);
+//                workContractInfoService.updateWorkContractInfo(workContractInfo);
 
 //                合同评价信息，
 //                WorkContractReview workContractReview = workContractInfo.getWorkContractReview();
@@ -1115,8 +1121,8 @@ public class WorkContractInfoController extends BaseController {
 //                workContractReview.setContractName(workContractInfo.getName());
 //                workContractReviewService.save(workContractReview);
                 Map<String, Object> variables = new HashMap<String, Object>();
-                t.setContractState("2");
-                String str=workContractInfoService.newSave(workClientInfo,t, variables,contextPath,url);//保存
+                t.setContractState("5");
+                String str=workContractInfoService.newSave(workClientLinkman,t, variables,contextPath,url);//保存
                 if (StringUtils.isNotBlank(str)){
                     addMessage(redirectAttributes, "合同申请提交失败:"+str);
                 }else {
@@ -1147,14 +1153,10 @@ public class WorkContractInfoController extends BaseController {
                 workContractInfo.setContractState("1");
                 workContractInfo.setRecordState("1");
                 workContractInfo.setSignatureStatus("1");
-                Area area = new Area();
-                area.setId("9AF3266E03384019BFE935DD9F35332F");
-                area.setName("南京");
-                workClientInfo.setArea(area);
-                workClientInfoService.save(workClientInfo);
                 workContractInfoService.save(workContractInfo);//提交
-                workContractInfoService.updateWorkContractInfo(workContractInfo);
 
+//                workContractInfoService.updateWorkContractInfo(workContractInfo);
+//                workContractInfoService.get(workContractInfo);
                 /* 合同评价信息
                 WorkContractReview workContractReview = workContractInfo.getWorkContractReview();
                 String id = workContractInfo.getId();
@@ -1163,9 +1165,10 @@ public class WorkContractInfoController extends BaseController {
                 workContractReview.setContractName(workContractInfo.getName());
                 workContractReviewService.save(workContractReview);*/
 
-                workContractInfo.setContractState("2");
+                workContractInfo.setContractState("5");
                 Map<String, Object> variables = new HashMap<String, Object>();
-               String str= workContractInfoService.newSave(workClientInfo,workContractInfo, variables,contextPath,url);//保存
+//                workClientLinkman.setContractId(workContractInfo.getId());
+               String str= workContractInfoService.newSave(workClientLinkman,workContractInfo, variables,contextPath,url);//保存
                 if (StringUtils.isNotBlank(str)){
                     addMessage(redirectAttributes, "合同申请提交失败:"+str);
                 }else {
@@ -1209,6 +1212,7 @@ public class WorkContractInfoController extends BaseController {
         if (!beanValidator(model, workContractInfo)){
             return form(workContractInfo, model);
         }
+        String url = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort();
         //判断是否有总合同
         if(!Strings.isNullOrEmpty(workContractInfo.getTotalContractId()) && !"0".equals(workContractInfo.getTotalContractId())){
             workContractInfo.setIsTotalName("子合同");
@@ -1219,7 +1223,17 @@ public class WorkContractInfoController extends BaseController {
             workContractInfo.setTotalContractId("0");
             //workContractInfo.setCommonFlag(IdGen.uuid());
         }
+
         if(!workContractInfo.getIsNewRecord()){//编辑表单保存
+
+
+            //查询合同编号是否在数据库中已存在。若存在，则进行抛出
+            WorkContractInfo contractInfoByNum = workContractInfoService.getContractInfoByNum(workContractInfo);//从数据库取出记录的值
+            if(null != contractInfoByNum){
+                addMessage(redirectAttributes, "合同编号已存在，无法进行添加");
+                return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
+            }
+
             List<WorkClientAttachment> list = workContractInfo.getWorkAttachments();
             List<WorkClientAttachment> list1 = new ArrayList<>();
             List<WorkClientAttachment> list2 = new ArrayList<>();
@@ -1248,7 +1262,7 @@ public class WorkContractInfoController extends BaseController {
             }*/
 
             workContractInfoService.save(t);//保存
-            workContractInfoService.updateWorkContractInfo(workContractInfo);
+//            workContractInfoService.updateWorkContractInfo(workContractInfo);
             WorkContractReview workContractReview = workContractInfo.getWorkContractReview();
             if(workContractReview != null){
                 workContractReview.setWorkAttachments(list2);
@@ -1289,6 +1303,7 @@ public class WorkContractInfoController extends BaseController {
 //            workContractReview.setWorkAttachments(list2);
 //            workContractReview.setContractName(workContractInfo.getName());
 //            workContractReviewService.save(workContractReview);
+
             addMessage(redirectAttributes, "暂存合同管理成功");
         }
         return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
@@ -1325,13 +1340,14 @@ public class WorkContractInfoController extends BaseController {
         WorkContractInfo t = workContractInfoService.get(workContractInfo.getId());//从数据库取出记录的值
         //将编辑表单中的非NULL值覆盖数据库记录中的值
         MyBeanUtils.copyBeanNotNull2Bean(workContractInfo, t);
+
         workContractInfoService.save(t);//保存
-        workContractInfoService.updateWorkContractInfo(workContractInfo);
+//        workContractInfoService.updateWorkContractInfo(workContractInfo);
         //admin修改合同归档案卷号
         //如果案卷号不为空 则进行修改，否则不修改
-        if(StringUtils.isNotBlank(workContractInfo.getFileNum()) && StringUtils.isNotBlank(workContractInfo.getFileNumTow())){
-            workContractInfoService.updateWorkContractRecord(workContractInfo);
-        }
+//        if(StringUtils.isNotBlank(workContractInfo.getFileNum()) && StringUtils.isNotBlank(workContractInfo.getFileNumTow())){
+//            workContractInfoService.updateWorkContractRecord(workContractInfo);
+//        }
         addMessage(redirectAttributes, "修改合同管理成功");
         return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
     }
@@ -1735,6 +1751,7 @@ public class WorkContractInfoController extends BaseController {
         return "modules/sys/gridselectAhref";
     }
 
+
     @RequestMapping(value = "getProcess")
     public String getProcess(WorkContractInfo workContractInfo,String auditType, Model model,HttpServletRequest request) throws UnsupportedEncodingException {
 //        String auditType = request.getParameter("auditType");

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

@@ -38,6 +38,7 @@ import com.jeeplus.modules.workactivity.service.ActivityService;
 import com.jeeplus.modules.workclientinfo.dao.WorkClientAttachmentDao;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
+import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workclientinfo.service.WorkClientInfoService;
 import com.jeeplus.modules.workcontractinfo.dao.WorkContractInfoCopyDao;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
@@ -872,7 +873,7 @@ public class WorkContractInfoInvalidateController extends BaseController {
      */
 //	@RequiresPermissions(value={"workcontractinfo:workContractInfo:add","workcontractinfo:workContractInfo:edit"},logical=Logical.OR)
     @RequestMapping(value = "save")
-    public String save(WorkContractInfo workContractInfo, Model model,
+    public String save(WorkClientLinkman workClientLinkman,WorkContractInfo workContractInfo, Model model,
                        RedirectAttributes redirectAttributes) throws Exception {
         if (!beanValidator(model, workContractInfo)) {
             return form(workContractInfo, model);
@@ -968,7 +969,7 @@ public class WorkContractInfoInvalidateController extends BaseController {
                     addMessage(redirectAttributes, "合同申请提交失败:"+"流程审批人不能为空,角色盖章人下无用户,请联系管理员！");
                     return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
                 }
-                workContractInfoService.save(t, variables,contextPath,url);//保存
+                workContractInfoService.save(workClientLinkman,t, variables,contextPath,url);//保存
                 workContractInfoService.updateWorkContractInfo(workContractInfo);
                 WorkContractReview workContractReview = workContractInfo.getWorkContractReview();
                 workContractReview.setContractName(t.getName());
@@ -1060,7 +1061,7 @@ public class WorkContractInfoInvalidateController extends BaseController {
                     addMessage(redirectAttributes, "合同申请提交失败:"+"流程审批人不能为空,角色盖章人下无用户,请联系管理员！");
                     return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
                 }
-                workContractInfoService.save(workContractInfo, variables,contextPath,url);//保存
+                workContractInfoService.save(workClientLinkman,workContractInfo, variables,contextPath,url);//保存
                 workContractInfoService.updateWorkContractInfo(workContractInfo);
                 WorkContractReview workContractReview = workContractInfo.getWorkContractReview();
                 String id = workContractInfo.getId();
@@ -1184,7 +1185,7 @@ public class WorkContractInfoInvalidateController extends BaseController {
      * @return
      */
     @RequestMapping(value = "startposs")
-    public String startposs(WorkContractInfo workContractInfo, HttpServletRequest request, HttpServletResponse response, Model model, RedirectAttributes redirectAttributes)throws Exception {
+    public String startposs(WorkClientLinkman workClientLinkman,WorkContractInfo workContractInfo, HttpServletRequest request, HttpServletResponse response, Model model, RedirectAttributes redirectAttributes)throws Exception {
         String url = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort();
         String contextPath = request.getContextPath();
         Role role = UserUtils.getSelectRole().get(0);
@@ -1200,7 +1201,7 @@ public class WorkContractInfoInvalidateController extends BaseController {
         t.setContractState("2");
         t.preUpdate();
         workContractInfoService.update(t);
-        workContractInfoService.save(t,variables,contextPath,url);
+        workContractInfoService.save(workClientLinkman,t,variables,contextPath,url);
         addMessage(redirectAttributes, "启动流程成功");
         return "redirect:"+Global.getAdminPath()+"/workinvoice/workInvoice/?repage";
     }
@@ -1228,6 +1229,7 @@ public class WorkContractInfoInvalidateController extends BaseController {
         return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
     }
 
+
     /**
      * 删除合同管理
      */

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

@@ -33,6 +33,7 @@ public class WorkContractReportController extends BaseController {
     @Autowired
     private WorkContractReportService workContractReportService;
 
+
     /**
      * 合同管理列表页面
      */

src/main/java/com/jeeplus/modules/workcontractrecord/service/WorkContractRecordService.java

@@ -480,7 +480,7 @@ public class WorkContractRecordService extends CrudService<WorkContractRecordDao
 	public String auditSave(WorkContractRecord workContractRecord,List<User> auditUsers) {
 			String userName = UserUtils.get(workContractRecord.getCreateBy().getId()).getName();
 			Office office = officeService.get(workContractRecord.getOfficeId());
-			String str =  "归档申请编号："+workContractRecord.getRecordNum()+",主委托方："+workContractRecord.getWorkContractInfo().getClient().getName()+",申请人:"+userName+",所属部门:"+office.getName();
+			String str =  "归档申请编号："+workContractRecord.getRecordNum()+",主委托方："+workContractRecord.getWorkContractInfo().getClientName()+",申请人:"+userName+",所属部门:"+office.getName();
 			String title = "合同名称:"+workContractRecord.getWorkContractInfo().getName();
 			// 对不同环节的业务逻辑进行操作
 			String taskDefKey = workContractRecord.getAct().getTaskDefKey();

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

@@ -103,6 +103,7 @@ import com.jeeplus.modules.workchangejob.service.WorkChangeJobService;
 import com.jeeplus.modules.workchangejob.service.WorkChangeJobUserService;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
+import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workclientinfo.service.WorkClientInfoService;
 import com.jeeplus.modules.workcontractinfo.entity.WorkCntractBorrow;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
@@ -4058,7 +4059,10 @@ public class WorkProjectNotifyController extends BaseController {
 					//收费标准
 					//查询合同对应委托方客户信息
 					if(null != workContractInfo){
-						WorkClientInfo clientInfo = workClientInfoService.get(workContractInfo.getClient().getId());
+
+						List<WorkClientLinkman> clientList = workContractInfoService.getClientList(workContractInfo.getId());
+						model.addAttribute("clientList",clientList);
+						/*WorkClientInfo clientInfo = workClientInfoService.get(workContractInfo.getClient().getId());
 						model.addAttribute("workClientInfo", clientInfo);
 						if(StringUtils.isNotBlank(workContractInfo.getChargeCriterion())){
 							//收费标准
@@ -4068,7 +4072,7 @@ public class WorkProjectNotifyController extends BaseController {
 								chargeCriterionList.add(biao[i]);
 							}
 							projectcontentinfo.setChargeCriterionList(chargeCriterionList);
-						}
+						}*/
 					}
 					ruralProjectRecordsService.queryProjectDetail(ruralProjectRecords);
 					//工程咨询
@@ -5038,7 +5042,10 @@ public class WorkProjectNotifyController extends BaseController {
 					//收费标准
 					//查询合同对应委托方客户信息
 					if (null != workContractInfo) {
-						WorkClientInfo clientInfo = workClientInfoService.get(workContractInfo.getClient().getId());
+
+						List<WorkClientLinkman> clientList = workContractInfoService.getClientList(workContractInfo.getId());
+						model.addAttribute("clientList",clientList);
+						/*WorkClientInfo clientInfo = workClientInfoService.get(workContractInfo.getClient().getId());
 						model.addAttribute("workClientInfo", clientInfo);
 						if (StringUtils.isNotBlank(workContractInfo.getChargeCriterion())) {
 							//收费标准
@@ -5048,7 +5055,7 @@ public class WorkProjectNotifyController extends BaseController {
 								chargeCriterionList.add(biao[i]);
 							}
 							projectcontentinfo.setChargeCriterionList(chargeCriterionList);
-						}
+						}*/
 					}
 					ruralProjectRecordsService.queryProjectDetail(ruralProjectRecords);
 					//工程咨询
@@ -5662,7 +5669,7 @@ public class WorkProjectNotifyController extends BaseController {
 					//获取合同信息
 					WorkContractInfo workContractInfo=this.queryWorkContract(ruralProjectRecords.getId());
 					if(null != workContractInfo){
-						WorkClientInfo clientInfo = workClientInfoService.get(workContractInfo.getClient().getId());
+						/*WorkClientInfo clientInfo = workClientInfoService.get(workContractInfo.getClient().getId());
 						model.addAttribute("workClientInfo", clientInfo);
 						if(StringUtils.isNotBlank(workContractInfo.getChargeCriterion())){
 							//收费标准
@@ -5672,7 +5679,10 @@ public class WorkProjectNotifyController extends BaseController {
 								chargeCriterionList.add(biao[i]);
 							}
 							projectReportRecord.setChargeCriterionList(chargeCriterionList);
-						}
+						}*/
+
+						List<WorkClientLinkman> clientList = workContractInfoService.getClientList(workContractInfo.getId());
+						model.addAttribute("clientList",clientList);
 					}
 
 					Act act = getByAct(projectReportRecord.getProcessInstanceId());

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

@@ -31,7 +31,8 @@
 		a.reference_attachment_id as "referenceAttachmentId",
 		a.catalogue_attachment_id as "catalogueAttachmentId",
 		a.record_audit_type as "recordAuditType",
-		a.project_content_data_id as "projectContentDataId"
+		a.project_content_data_id as "projectContentDataId",
+		a.record_remarks as "recordRemarks"
 	</sql>
 
 	<sql id="projectMaterialDefectRecordColumns">
@@ -104,7 +105,7 @@
 		<include refid="projectReportRecordColumns"/>,
 		wci.contract_num AS "contractNum",
 		wci.name AS "contractName",
-		wct.name AS "clientName",
+		wci.clientName AS "clientName",
 		d.report_date AS "report.reportDate",
 		r.project_name AS "projectName",
 		r.project_id AS "projectNum"

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

@@ -1258,7 +1258,8 @@
 		number_count,
 		sign_cost_one,
 		sign_cost_two,
-		process_instance_id
+		process_instance_id,
+		record_remarks
 		) VALUES (
 		#{id},
 		#{createBy.id},
@@ -1279,7 +1280,8 @@
 		#{numberCount},
 		#{signCostOne.id},
 		#{signCostTwo.id},
-		#{processInstanceId}
+		#{processInstanceId},
+		#{recordRemarks}
 		)
 	</insert>
 	<insert id="insertProjectMaterialDefectRecord">
@@ -1331,7 +1333,8 @@
 		number_count = #{numberCount},
 		sign_cost_one = #{signCostOne.id},
 		sign_cost_two = #{signCostTwo.id},
-		process_instance_id = #{processInstanceId}
+		process_instance_id = #{processInstanceId},
+		record_remarks = #{recordRemarks}
 		WHERE id = #{id}
 	</update>
 	<update id="updateProjectMaterialDefectRecord">

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

@@ -352,8 +352,52 @@
 			)
 		</foreach>
 	</insert>
+	<insert id="insertLinkman">
+			INSERT INTO work_client_linkman(
+			id,
+			name,
+			position,
+			qq,
+			link_phone,
+			link_mobile,
+			email,
+			is_default,
+			create_by,
+			create_date,
+			update_by,
+			update_date,
+			del_flag,
+			client_id,
+			office,
+			contract_num,
+			contract_id
+		) VALUES (
+			#{id},
+			#{name},
+			#{position},
+			#{qq},
+			#{linkPhone},
+			#{linkMobile},
+			#{email},
+			#{isDefault},
+			#{createBy.id},
+			#{createDate},
+			#{updateBy.id},
+			#{updateDate},
+			#{delFlag},
+			#{clientId.id},
+			#{office},
+			#{contractNum},
+			#{contractId}
+
+		)
+	</insert>
+
+    <delete id="deleteContractLinkman">
+		delete from work_client_linkman where contract_id =#{contractId}
+	</delete>
 
-	<delete id="jobTypeDelete">
+    <delete id="jobTypeDelete">
 		delete from work_client_job_type_info where work_client_id =#{workClientId}
 	</delete>
 
@@ -370,4 +414,8 @@
 
 
 	</select>
+	<delete id="deleteLinkman">
+delete  from work_client_linkman
+where id= #{id}
+	</delete>
 </mapper>

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

@@ -255,6 +255,7 @@
 		a.contractTypeDoc AS "contractTypeDoc",
 		a.process_instance_id AS "processInstanceId",
 		client.name AS "client.name",
+		a.clientName AS "clientName",
 		a.is_total AS "isTotal",
 		a.total_contract_id AS "totalContractId",
 		a.common_flag AS "commonFlag",

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

@@ -41,6 +41,7 @@
 		a.contractTypeDoc AS "contractTypeDoc",
 		a.process_instance_id AS "processInstanceId",
 		client.name AS "client.name",
+		a.clientName AS "clientName",
 		a.is_total AS "isTotal",
 		a.total_contract_id AS "totalContractId",
 		a.common_flag AS "commonFlag",
@@ -87,6 +88,7 @@
 		    a.alter_type AS "alterType",
 		    a.times AS "times",
 			client.name AS "client.name"
+		a.clientName AS "clientName",
 		FROM work_contract_info_copy a
 		<include refid="workContractInfoJoins"/>
 		WHERE a.id = #{id}
@@ -109,6 +111,7 @@
 		a.alter_type AS "alterType",
 		a.times AS "times",
 		client.name AS "client.name"
+		a.clientName AS "clientName",
 		FROM work_contract_info_copy a
 		<include refid="workContractInfoJoins"/>
 		WHERE a.alterbefore_id = #{alterBeforeId} and a.del_flag = 0
@@ -173,6 +176,7 @@
 		a.contractTypeDoc AS "contractTypeDoc",
 		a.another_contract_num AS "anotherContractNum",
 		client.name AS "client.name",
+		a.clientName AS "clientName",
 		a.is_total AS "isTotal",
 		a.total_contract_id AS "totalContractId",
 		a.status AS "status",
@@ -294,6 +298,7 @@
 		a.contractTypeDoc AS "contractTypeDoc",
 		a.another_contract_num AS "anotherContractNum",
 		client.name AS "client.name",
+		a.clientName AS "clientName",
 		a.is_total AS "isTotal",
 		a.total_contract_id AS "totalContractId",
 		a.status AS "status",
@@ -850,6 +855,7 @@
 		a.company_id as companyId,
 		a.office_id AS "officeId"
 		client.name AS "client.name",
+		a.clientName AS "clientName",
 		a.contractTypeDoc,
 		a.contractFeeDoc,
 		a.charge_company_name AS "chargeCompanyName",

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

@@ -37,10 +37,13 @@
 		a.contract_role AS  "contractRole",
 		a.apply_view AS  "applyView",
 		a.company_id AS "companyId",
+		a.company as company,
 		a.contractFeeDoc AS "contractFeeDoc",
 		a.contractTypeDoc AS "contractTypeDoc",
 		a.process_instance_id AS "processInstanceId",
 		client.name AS "client.name",
+		a.clientName AS "clientName",
+		a.telephone AS "telephone",
 		a.is_total AS "isTotal",
 		a.total_contract_id AS "totalContractId",
 		a.common_flag AS "commonFlag",
@@ -61,6 +64,8 @@
 		a.completion_status AS "completionStatus",
 		a.signature_status as "signatureStatus",
 		a.office_id AS "officeId",
+		a.uscCode AS "uscCode",
+		a.hasUscc  AS "hasUscc"
 		(select count(1) from work_contract_info c where c.total_contract_id = a.id)  cnt,
 		a.contract_information AS "contractInformation",
 		a.describe_content AS "describeContent",
@@ -111,11 +116,15 @@
 		a.apply_view AS "applyView",
 		a.process_instance_id AS "processInstanceId",
 		a.company_id as companyId,
+		a.company as company,
 		a.contractFeeDoc AS "contractFeeDoc",
 		a.contractTypeDoc AS "contractTypeDoc",
 		a.another_contract_num AS "anotherContractNum",
 		client.name AS "client.name",
-		client.telephone AS "client.telephone",
+		a.clientName AS "clientName",
+		a.telephone AS "telephone",
+		a.uscCode AS "uscCode",
+		a.hasUscc  AS "hasUscc",
 		a.is_total AS "isTotal",
 		a.total_contract_id AS "totalContractId",
 		a.status AS "status",
@@ -176,7 +185,11 @@
 		a.alterbefore_id AS "alterBeforeId",
 		a.alter_sign AS "alterSign",
 		a.record_state AS "recordState",
-		client.name AS "client.name"
+		client.name AS "client.name",
+		a.telephone AS "telephone",
+		a.uscCode AS "uscCode",
+		a.hasUscc  AS "hasUscc",
+		a.clientName AS "clientName",
 		FROM work_contract_info a
 		<include refid="workContractInfoJoins"/>
 		WHERE a.alterbefore_id = #{alterBeforeId} and a.del_flag = 0 and contract_state is null
@@ -242,7 +255,10 @@
 		a.contractTypeDoc AS "contractTypeDoc",
 		a.another_contract_num AS "anotherContractNum",
 		client.name AS "client.name",
-		client.name as "clientName",
+		a.clientName AS "clientName",
+		a.telephone AS "telephone",
+		a.uscCode AS "uscCode",
+		a.hasUscc  AS "hasUscc",
 		a.is_total AS "isTotal",
 		a.total_contract_id AS "totalContractId",
 		a.status AS "status",
@@ -282,11 +298,11 @@
 			<if test="id != null and id != ''">
 				AND a.id = #{id}
 			</if>
-			<if test="client != null and client.id != null and client.id != ''">
-				AND a.client_id = #{client.id}
-			</if>
-			<if test="client != null and client.name != null and client.name != ''">
-				AND client.name LIKE concat('%',#{client.name},'%')
+<!--			<if test="client != null and client.id != null and client.id != ''">-->
+<!--				AND a.client_id = #{client.id}-->
+<!--			</if>-->
+			<if test="clientName != null and clientName != ''">
+				AND clientName LIKE concat('%',#{clientName},'%')
 			</if>
 			<if test="beginContractDate != null and endContractDate != null and beginContractDate != '' and endContractDate != ''">
 				AND a.contract_date BETWEEN #{beginContractDate} AND #{endContractDate}
@@ -455,6 +471,10 @@
 		a.contractTypeDoc AS "contractTypeDoc",
 		a.another_contract_num AS "anotherContractNum",
 		client.name AS "client.name",
+		a.clientName AS "clientName",
+		a.telephone AS "telephone",
+		a.uscCode AS "uscCode",
+		a.hasUscc  AS "hasUscc",
 		a.is_total AS "isTotal",
 		a.total_contract_id AS "totalContractId",
 		a.status AS "status",
@@ -553,6 +573,10 @@
 		a.contractTypeDoc AS "contractTypeDoc",
 		a.another_contract_num AS "anotherContractNum",
 		client.name AS "client.name",
+		a.clientName AS "clientName",
+		a.telephone AS "telephone",
+		a.uscCode AS "uscCode",
+		a.hasUscc  AS "hasUscc",
 		a.is_total AS "isTotal",
 		a.total_contract_id AS "totalContractId",
 		a.status AS "status",
@@ -674,6 +698,10 @@
 		a.contractTypeDoc AS "contractTypeDoc",
 		a.another_contract_num AS "anotherContractNum",
 		client.name AS "client.name",
+		a.clientName AS "clientName",
+		a.telephone AS "telephone",
+		a.uscCode AS "uscCode",
+		a.hasUscc  AS "hasUscc",
 		a.is_total AS "isTotal",
 		a.total_contract_id AS "totalContractId",
 		a.status AS "status",
@@ -795,6 +823,10 @@
 		a.contractTypeDoc AS "contractTypeDoc",
 		a.another_contract_num AS "anotherContractNum",
 		client.name AS "client.name",
+		a.clientName AS "clientName",
+		a.telephone AS "telephone",
+		a.uscCode AS "uscCode",
+		a.hasUscc  AS "hasUscc",
 		a.is_total AS "isTotal",
 		a.total_contract_id AS "totalContractId",
 		a.status AS "status",
@@ -938,7 +970,12 @@
 			charge_criterion,
 			other_details,
 			contract_information,
-			describe_content
+			describe_content,
+			company,
+			clientName,
+			telephone,
+			uscCode,
+			hasUscc
 		) VALUES (
 			#{id},
 			#{project.id},
@@ -997,7 +1034,12 @@
 			#{chargeCriterion},
 			#{otherDetails},
 			#{contractInformation},
-			#{describeContent}
+			#{describeContent},
+			#{company},
+			#{clientName},
+			#{telephone},
+			#{uscCode},
+			#{hasUscc}
 		)
 	</insert>
 
@@ -1014,6 +1056,9 @@
 			effective_date = #{effectiveDate},
 			closing_date = #{closingDate},
 			name = #{name},
+			telephone = #{telephone},
+			uscCode = #{uscCode},
+			hasUscc =#{hasUscc},
 			contract_category = #{contractCategory},
 			contract_num = #{contractNum},
 			contract_price = #{contractPrice},
@@ -1050,6 +1095,8 @@
 			alterbefore_id = #{alterBeforeId},
 			completion_status = #{completionStatus},
 			sort = #{sort},
+			company= #{company},
+			clientName= #{clientName},
 			signature_status=#{signatureStatus},
 			contract_num_path=#{contractNumPath},
 			charge_criterion=#{chargeCriterion},
@@ -1113,6 +1160,41 @@
 		</foreach>
 
 	</insert>
+<!--	<insert id="insertLinkman">-->
+<!--		INSERT INTO work_client_linkman(-->
+<!--			id,-->
+<!--			name,-->
+<!--			position,-->
+<!--			qq,-->
+<!--			link_phone,-->
+<!--			link_mobile,-->
+<!--			email,-->
+<!--			is_default,-->
+<!--			create_by,-->
+<!--			create_date,-->
+<!--			update_by,-->
+<!--			update_date,-->
+<!--			del_flag,-->
+<!--			client_id,-->
+<!--			office-->
+<!--		) VALUES (-->
+<!--			#{id},-->
+<!--			#{name},-->
+<!--			#{position},-->
+<!--			#{qq},-->
+<!--			#{linkPhone},-->
+<!--			#{linkMobile},-->
+<!--			#{email},-->
+<!--			#{isDefault},-->
+<!--			#{createBy.id},-->
+<!--			#{createDate},-->
+<!--			#{updateBy.id},-->
+<!--			#{updateDate},-->
+<!--			#{delFlag},-->
+<!--			#{clientId.id},-->
+<!--			#{office}-->
+<!--		)-->
+<!--	</insert>-->
 
 
 	<!-- 根据实体名称和字段名称和字段值获取唯一记录 -->
@@ -1241,6 +1323,10 @@
 		a.process_instance_id AS "processInstanceId",
 		a.company_id as companyId,
 		client.name AS "client.name",
+		a.clientName AS "clientName",
+		a.telephone AS "telephone",
+		a.uscCode AS "uscCode",
+		a.hasUscc  AS "hasUscc",
 		a.contractTypeDoc,
 		a.contractFeeDoc,
 		a.charge_company_name AS "chargeCompanyName",
@@ -1397,7 +1483,10 @@
 		a.contractTypeDoc AS "contractTypeDoc",
 		a.another_contract_num AS "anotherContractNum",
 		client.name AS "client.name",
-		client.telephone AS "client.telephone",
+		a.clientName AS "clientName",
+		a.telephone AS "telephone",
+		a.uscCode AS "uscCode",
+		a.hasUscc  AS "hasUscc",
 		a.is_total AS "isTotal",
 		a.total_contract_id AS "totalContractId",
 		a.status AS "status",
@@ -1432,11 +1521,109 @@
 		limit 1
 	</select>
 
+
+	<select id="getContractInfoByNum" resultType="WorkContractInfo" >
+		SELECT
+		a.id AS "id",
+		a.project_id AS "project.id",
+		a.ext AS  "ext",
+		u.name AS "createBy.name",
+		a.create_by AS "createBy.id",
+		a.create_date AS "createDate",
+		a.update_by AS "updateBy.id",
+		a.update_date AS "updateDate",
+		a.del_flag AS "delFlag",
+		a.remarks AS "remarks",
+		a.client_id AS "client.id",
+		a.contract_date AS "contractDate",
+		a.effective_date AS "effectiveDate",
+		a.closing_date AS "closingDate",
+		a.name AS "name",
+		a.contract_num_path AS "contractNumPath",
+		a.create_name AS "createName",
+		a.contract_category AS "contractCategory",
+		a.contract_num AS "contractNum",
+		a.contract_price AS "contractPrice",
+		a.contract_opposite AS "contractOpposite",
+		a.contract_type AS "contractType",
+		a.contract_fee AS "contractFee",
+		a.contract_special AS "contractSpecial",
+		a.contract_state AS "contractState",
+		a.office_id AS "chargeCompany",
+		a.charge_company_name AS "chargeCompanyName",
+		a.contract_file_id AS "contractFileId",
+		a.contract_role AS "contractRole",
+		a.apply_view AS "applyView",
+		a.process_instance_id AS "processInstanceId",
+		a.company_id as companyId,
+		a.contractFeeDoc AS "contractFeeDoc",
+		a.contractTypeDoc AS "contractTypeDoc",
+		a.another_contract_num AS "anotherContractNum",
+		client.name AS "client.name",
+		a.clientName AS "clientName",
+		a.telephone AS "telephone",
+		a.uscCode AS "uscCode",
+		a.hasUscc  AS "hasUscc",
+		a.is_total AS "isTotal",
+		a.total_contract_id AS "totalContractId",
+		a.status AS "status",
+		a.investment_scale AS "investmentScale",
+		a.summary_payment AS "summaryPayment",
+		a.investment_amount AS "investmentAmount",
+		a.create_bys AS "createBys",
+		a.construction_project_type AS "constructionProjectType",
+		a.invalidate_process_instance_id AS "invalidateProcessInstanceId",
+		a.alter_process_instance_id AS "alterProcessInstanceId",
+		a.invalidate_status AS "invalidateStatus",
+		a.invalidate_user AS "invalidateUserId",
+		a.alter_state AS "alterState",
+		a.alter_sign AS "alterSign",
+		a.record_state AS "recordState",
+		a.alterbefore_id AS "alterBeforeId",
+		a.completion_status AS "completionStatus",
+		a.common_flag AS "commonFlag",
+		a.office_id AS "officeId",
+		a.signature_status as "signatureStatus",
+		a.charge_criterion as "chargeCriterion",
+		a.other_details as "otherDetails",
+		a.contract_information as "contractInformation",
+		wcr.file_num as "fileNum",
+		wcr.file_num_tow as "fileNumTow",
+		a.describe_content AS "describeContent"
+		FROM work_contract_info a
+		<include refid="workContractInfoJoins"/>
+		LEFT JOIN work_contract_record wcr ON wcr.contract_info_id = a.id
+		WHERE a.contract_num = #{contractNum}
+		and a.id != #{id}
+		order by a.id
+		limit 1
+	</select>
+
 	<update id="updateContractRecordStatus">
 		UPDATE work_contract_info SET
 		contract_record_state = #{contractRecordState}
 		WHERE id = #{id}
 	</update>
+	<update id="updateLinkman">
+UPDATE work_client_linkman SET
+			name = #{name},
+			position = #{position},
+			qq = #{qq},
+			link_phone = #{linkPhone},
+			link_mobile = #{linkMobile},
+			email = #{email},
+			is_default = #{isDefault},
+			update_by = #{updateBy.id},
+			update_date = #{updateDate},
+			client_id = #{clientId.id},
+			office = #{office}
+		WHERE id = #{id}
+
+
+
+
+	</update>
+
 
 	<select id="findContractStatementPage" resultType="WorkContractInfo">
 		SELECT
@@ -1475,7 +1662,10 @@
 		a.contractTypeDoc AS "contractTypeDoc",
 		a.another_contract_num AS "anotherContractNum",
 		client.name AS "client.name",
-		client.name as "clientName",
+		a.clientName AS "clientName",
+		a.telephone AS "telephone",
+		a.uscCode AS "uscCode",
+		a.hasUscc  AS "hasUscc",
 		a.is_total AS "isTotal",
 		a.total_contract_id AS "totalContractId",
 		a.status AS "status",
@@ -1535,8 +1725,8 @@
 			<if test="workContractInfo.client != null and workContractInfo.client.id != null and workContractInfo.client.id != ''">
 				AND a.client_id = #{workContractInfo.client.id}
 			</if>
-			<if test="workContractInfo.client != null and workContractInfo.client.name != null and workContractInfo.client.name != ''">
-				AND client.name LIKE concat('%',#{workContractInfo.client.name},'%')
+			<if test="workContractInfo.clientName != null and workContractInfo.clientName != ''">
+				AND clientName LIKE concat('%',#{workContractInfo.clientName},'%')
 			</if>
 			<if test="workContractInfo.beginContractDate != null and workContractInfo.endContractDate != null and workContractInfo.beginContractDate != '' and workContractInfo.endContractDate != ''">
 				AND a.contract_date BETWEEN #{workContractInfo.beginContractDate} AND #{workContractInfo.endContractDate}
@@ -1718,7 +1908,7 @@
 		a.contractTypeDoc AS "contractTypeDoc",
 		a.another_contract_num AS "anotherContractNum",
 		client.name AS "client.name",
-		client.name as "clientName",
+		a.clientName AS "clientName",
 		a.is_total AS "isTotal",
 		a.total_contract_id AS "totalContractId",
 		a.status AS "status",
@@ -1904,7 +2094,7 @@
 		a.contractTypeDoc AS "contractTypeDoc",
 		a.another_contract_num AS "anotherContractNum",
 		client.name AS "client.name",
-		client.name as "clientName",
+		a.clientName AS "clientName",
 		a.is_total AS "isTotal",
 		a.total_contract_id AS "totalContractId",
 		a.status AS "status",
@@ -2149,7 +2339,7 @@
 		a.contractTypeDoc AS "contractTypeDoc",
 		a.another_contract_num AS "anotherContractNum",
 		client.name AS "client.name",
-		client.name as "clientName",
+		a.clientName AS "clientName",
 		a.is_total AS "isTotal",
 		a.total_contract_id AS "totalContractId",
 		a.status AS "status",
@@ -2299,4 +2489,12 @@
 			</if>
 		</where>
 	</select>
+
+	<select id="getList" resultType="com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman">
+		SELECT name,position,qq,link_phone,link_mobile,email,office FROM `work_client_linkman`
+		where contract_id = #{contractId}
+
+	</select>
+
+
 </mapper>

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

@@ -19,6 +19,7 @@
 		a.effective_date AS "effectiveDate",
 		a.closing_date AS "closingDate",
 		a.name AS "name",
+		a.clientName AS "clientName",
 		a.contract_num AS "contractNum",
 		a.contract_price AS "contractPrice",
 		a.another_contract_num AS "anotherContractNum",
@@ -60,6 +61,7 @@
 		,year(a.contract_date) as "year"
 		,a.client_id AS "client.id"
 		,client.name AS "client.name"
+		,a.clientName AS "clientName",
 		,ifnull(wcr.status,0) as "contrractRecordStatus"
 		,ifnull(wcr.file_num,"") as "recordNum"
 		,wcr.id as "contrractRecordId"
@@ -101,7 +103,7 @@
 			</if>
 			/*客户名称*/
 			<if test="clientName != null and clientName!= ''">
-				AND client.name like  concat('%',#{clientName},'%')
+				AND a.clientName like  concat('%',#{clientName},'%')
 			</if>
 			/*合同名称*/
 			<if test="name != null and name != ''">

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

@@ -110,10 +110,8 @@
 							<li class="active"><a>基本信息</a><span class="hide">projectInfo</span></li>
 							<li><a>子项目列表</a><span class="hide">subProjectInfo</span></li>
 							<li><a>合同信息</a><span class="hide">workContractInfo</span></li>
-							<li><a>客户信息</a><span class="hide">workClientInfo</span></li>
 							<li><a>项目计划信息</a><span class="hide">planView</span></li>
 							<li><a>质量复核信息</a><span class="hide">qualityView</span></li>
-							<li><a>报告签发信息</a><span class="hide">issueView</span></li>
 							<li><a>档案信息</a><span class="hide">AccessoryView</span></li>
 						</ul>
 					</div>
@@ -287,16 +285,40 @@
 						</c:when>
 						<c:otherwise>
 							<div class="form-group layui-row first lw9">
+								<div class="form-group-label"><h2>客户信息</h2></div>
 								<div class="layui-item layui-col-sm6">
-									<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="${workContractInfo.name}"/>
+										<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.clientName}"/>
+									</div>
+								</div>
+								<div class="layui-item layui-col-sm6">
+									<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="${workContractInfo.telephone}"/>
 									</div>
 								</div>
 								<div class="layui-item layui-col-sm6">
-									<label class="layui-form-label ">客户名称：</label>
+									<label class="layui-form-label double-line">拥有统一社会信用代码：</label>
+									<div class="layui-input-block">
+										<input type="radio" name="hasUscc" value="1" title="是" disabled <c:if test="${workContractInfo.hasUscc=='1'}">checked</c:if>>
+										<input type="radio" name="hasUscc" value="2" title="否" disabled <c:if test="${workContractInfo.hasUscc=='2'}">checked</c:if> >
+									</div>
+								</div>
+								<div class="layui-item layui-col-sm6">
+									<br>
+									<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="${workContractInfo.client.name}"/>
+										<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.uscCode}"/>
+									</div>
+								</div>
+							</div>
+							<div class="form-group layui-row first lw9">
+								<div class="form-group-label"><h2>合同基础信息</h2></div>
+								<div class="layui-item layui-col-sm6">
+									<label class="layui-form-label ">合同名称：</label>
+									<div class="layui-input-block">
+										<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.name}"/>
 									</div>
 								</div>
 								<div class="layui-item layui-col-sm6">
@@ -377,6 +399,41 @@
 									</div>
 								</div>
 							</div>
+
+							<div class="form-group layui-row">
+								<div class="form-group-label"><h2>联系人信息</h2></div>
+								<div class="layui-item layui-col-xs12 form-table-container" >
+									<table id="contentTable" class="table table-bordered table-condensed no-bottom-margin details">
+										<thead>
+										<tr>
+											<th class="hide"></th>
+											<th width="150px">联系人姓名</th>
+											<th >部门</th>
+											<th width="150px">职务</th>
+											<th width="150px">QQ</th>
+											<th width="150px">联系方式1</th>
+											<th width="150px">联系方式2</th>
+											<th width="150px">E-mail</th>
+										</tr>
+										</thead>
+										<tbody id="workClientLinkmanList">
+										<c:forEach items="${clientList}" var="workClientLinkman" varStatus="status">
+											<tr>
+												<td class="hide">${status.index + 1}</td>
+												<td >${workClientLinkman.name}</td>
+												<td >${workClientLinkman.office}</td>
+												<td >${workClientLinkman.position}</td>
+												<td >${workClientLinkman.qq}</td>
+												<td >${workClientLinkman.linkPhone}</td>
+												<td >${workClientLinkman.linkMobile}</td>
+												<td >${workClientLinkman.email}</td>
+											</tr>
+										</c:forEach>
+										</tbody>
+									</table>
+								</div>
+							</div>
+
 							<div class="form-group layui-row">
 								<div class="form-group-label"><h2>合同附件表</h2></div>
 								<div class="layui-item layui-col-xs12 form-table-container" >
@@ -460,190 +517,6 @@
 						</c:otherwise>
 					</c:choose>
 				</div>
-				<div class="form-group layui-row first hide" id="workClientInfo">
-					<c:choose>
-						<c:when test="${workContractInfo==null}">
-							无客户信息
-						</c:when>
-						<c:otherwise>
-							<div class="form-group layui-row first">
-								<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="${workClientInfo.name}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm6 lw7">
-									<label class="layui-form-label double-line">拥有统一社会信用代码：</label>
-									<div class="layui-input-block">
-						<span class="radio-box">&nbsp;&nbsp;
-							<input type="radio" class="usccClass" name="hasUscc" label="是" disabled="true" <c:if test="${workClientInfo.hasUscc eq 1}">checked="true"</c:if> />是
-							&nbsp;&nbsp;
-							<input type="radio" class="usccClass" name="hasUscc" label="否" disabled="true" <c:if test="${workClientInfo.hasUscc eq 2}">checked="true"</c:if> />否
-						</span>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm6 lw7">
-									<label class="layui-form-label double-line">统一社会信用代码：</label>
-									<div class="layui-input-block">
-										<input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${workClientInfo.uscCode}"/>
-									</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="${fns:getMainDictLabel(workClientInfo.companyType, 'company_type', '')}"/>
-									</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="${fns:getMainDictLabel(workClientInfo.companyIndustry, 'company_industry', '')}"/>
-									</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="<c:set value="${fn:split(workClientInfo.clientType, ',') }" var="clientTypes" /><c:forEach items="${clientTypes}" var="cType" varStatus="status">${fns:getMainDictLabel(cType, 'client_type', '')}<c:if test="${!status.last}">, </c:if></c:forEach>"/>
-									</div>
-								</div>
-									<%--            <div class="layui-item layui-col-sm6 lw7">--%>
-									<%--                <label class="layui-form-label">代表方：</label>--%>
-									<%--                <div class="layui-input-block">--%>
-									<%--                    <div class="input-group">--%>
-									<%--                        <div >--%>
-									<%--                            <div id="jobType" style="pointer-events: none;background-color: #f1f1f1" class="xm-select-demo" tabindex="0" contenteditable="true"></div>--%>
-									<%--                        </div>--%>
-									<%--                    </div>--%>
-									<%--                </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="${workClientInfo.lawerPresint}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm6 lw7">
-									<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="${workClientInfo.zipCode}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm6 lw7">
-									<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="${workClientInfo.fax}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm6 lw7">
-									<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="${workClientInfo.telephone}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm6 lw7">
-									<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="${workClientInfo.companyUrl}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm6 lw7">
-									<label class="layui-form-label">所在地区：</label>
-									<div class="layui-input-block with-icon">
-										<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workClientInfo.area.name}"/>
-									</div>
-								</div>
-
-								<div class="layui-item layui-col-sm12 lw7">
-									<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="${workClientInfo.registerAddress}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm12 lw7">
-									<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="${workClientInfo.address}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm12 lw7">
-									<label class="layui-form-label">开户行信息：</label>
-									<div class="layui-input-block">
-
-										<table id="bankinfo" class="table table-bordered table-condensed details">
-											<thead>
-											<tr>
-												<th width="80px">序号</th>
-												<th ><%--<font color="red">*</font>--%>开户银行</th>
-												<th width="400px;"><%--<font color="red">*</font>--%>开户账号</th>
-
-											</tr>
-											</thead>
-											<tbody id="workClientBankList">
-											<c:forEach items="${workClientInfo.workClientBankList}" var="workClientBank" varStatus="status">
-												<tr>
-													<td>${status.index + 1}</td>
-													<td>${workClientBank.ourBank}</td>
-													<td>${workClientBank.bankNumber}</td>
-												</tr>
-											</c:forEach>
-											<c:if test="${bankSize == 0}">
-												<tr>
-													<td colspan="3">暂无数据</td>
-												</tr>
-											</c:if>
-											</tbody>
-										</table>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm12 with-textarea lw7">
-									<label class="layui-form-label">单位简介：</label>
-									<div class="layui-input-block">
-										<textarea htmlEscape="false" style="background-color: #f1f1f1" rows="4" readonly="true" maxlength="1000" class="form-control" >${workClientInfo.unitIntroduction}</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" >
-									<table id="clientTable" class="table table-bordered table-condensed no-bottom-margin details">
-										<thead>
-										<tr>
-											<th class="hide"></th>
-											<th width="150px">联系人姓名</th>
-											<th >部门</th>
-											<th width="150px">职务</th>
-											<th width="150px">QQ</th>
-											<th width="150px">联系方式1</th>
-											<th width="150px">联系方式2</th>
-											<th width="150px">E-mail</th>
-										</tr>
-										</thead>
-										<tbody id="workClientLinkmanList">
-										<c:forEach items="${workClientInfo.workClientLinkmanList}" var="workClientLinkman" varStatus="status">
-											<tr>
-												<td class="hide">${status.index + 1}</td>
-												<td >${workClientLinkman.name}</td>
-												<td >${workClientLinkman.office}</td>
-												<td >${workClientLinkman.position}</td>
-												<td >${workClientLinkman.qq}</td>
-												<td >${workClientLinkman.linkPhone}</td>
-												<td >${workClientLinkman.linkMobile}</td>
-												<td >${workClientLinkman.email}</td>
-											</tr>
-										</c:forEach>
-										<c:if test="${linkManSize == 0}">
-											<tr>
-												<td colspan="8">暂无数据</td>
-											</tr>
-										</c:if>
-										</tbody>
-									</table>
-								</div>
-							</div>
-						</c:otherwise>
-					</c:choose>
-				</div>
 				<div class="form-group layui-row first hide" id="planView">
 					<div class="form-group layui-row">
 						<div class="form-group-label"><h2>项目计划信息</h2></div>
@@ -1005,166 +878,6 @@
 
 					</c:if>
 				</div>
-				<div class="form-group layui-row first hide" id="issueView">
-					<c:if test="${projectRecords.submitMoney=='1'}">
-						<div class="topMar">
-							<h2>B级紧急项目无报告签发信息</h2>
-						</div>
-					</c:if>
-					<c:if test="${projectRecords.submitMoney=='2'}">
-						<div class="form-group layui-row first lw12">
-							<div class="form-group-label">
-									<%--							<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载模板</a></div>--%>
-								<h2>质量复核信息</h2>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">报告号：</label>
-								<div class="layui-input-block with-icon">
-									<form:input id="reviewFee" path="projectReportData.number" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">送审价(元)：</label>
-								<div class="layui-input-block with-icon">
-									<form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">审定价(元)：</label>
-								<div class="layui-input-block with-icon">
-									<form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">合同类别：</label>
-								<div class="layui-input-block with-icon">
-									<div style="overflow: hidden">
-										<input type="radio" title="金额合同" lay-filter="jine"  id="jineer" value="0"  disabled <c:if test="${projectcontentinfo.projectReportData.contractCategory=='0'}">checked</c:if>>
-										<input type="radio" title="费率合同" lay-filter="jine" id="jineer1" value="1" disabled <c:if test="${projectcontentinfo.projectReportData.contractCategory=='1'}">checked</c:if>>
-											<%--							<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input number"/>--%>
-									</div>
-									<span style="font-size: 12px;color: red;">施工合同</span>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">合同价(元)：</label>
-								<div class="layui-input-block with-icon">
-									<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false" readonly="true" class="form-control layui-input number"/>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6" style="display: none;">
-								<label class="layui-form-label">费率(%)：</label>
-								<div class="layui-input-block with-icon">
-									<form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">核增核减额(元)：</label>
-								<div class="layui-input-block with-icon">
-									<form:input id="verifyFee" path="projectReportData.verifyFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">核增核减率(%)：</label>
-								<div class="layui-input-block with-icon">
-									<form:input id="verifyRate" path="projectReportData.verifyRate" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">咨询标的额(元)：</label>
-								<div class="layui-input-block with-icon">
-									<form:input id="consultFee" path="projectReportData.consultFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">土建造价(元)：</label>
-								<div class="layui-input-block with-icon">
-									<form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">安装造价(元)：</label>
-								<div class="layui-input-block with-icon">
-									<form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">土建比例(%)：</label>
-								<div class="layui-input-block with-icon">
-									<form:input id="buildingRate" path="projectReportData.buildingRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">安装比例(%)：</label>
-								<div class="layui-input-block with-icon">
-									<form:input id="installRate" path="projectReportData.installRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
-								</div>
-							</div>
-
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">工作开始日期：</label>
-								<div class="layui-input-block with-icon">
-									<input class=" form-control layui-input" readonly="readonly"  value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">工作结束日期：</label>
-								<div class="layui-input-block with-icon">
-									<input class=" form-control layui-input" readonly="readonly" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6 lw7">
-								<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
-								<div class="layui-input-block">
-									<form:input path="projectReportData.ZiXunShouRu"  readonly="true" cssStyle="background-color: #f1f1f1" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
-								</div>
-							</div>
-						</div>
-						<div style="overflow: hidden">
-							<div class="form-group-label">
-								<h2>报告签发复核内容</h2>
-							</div>
-							<div>
-								<div class="layui-item layui-col-xs12" >
-									<table id="treeTable2" class="table table-bordered table-condensed details no-bottom-margin">
-										<thead>
-										<tr>
-											<th width="40%">符合内容及评分标准</th>
-											<th width="10%">自校</th>
-											<th >意见</th>
-										</tr>
-										</thead>
-										<tbody>
-										<c:forEach items="${datalistTwo}" var="workReviewAudit" varStatus="index">
-											<tr id="${workReviewAudit.id}" pid="${workReviewAudit.parent.id}">
-													<%--<td title="${workReviewAudit.orderNum}">--%>
-													<%--${workReviewAudit.orderNum}--%>
-													<%--</td>--%>
-												<td title="${workReviewAudit.standardDetail}">
-														${workReviewAudit.standardDetail}
-												</td>
-												<td>
-													<i class="fa fa-check"></i>
-												</td>
-													<%--									<td class="input-td">--%>
-													<%--										<input id="maxDeduct" readonly="true" htmlEscape="false" class="form-control layui-input" style="background-color: #fff;text-align: center" value="${workReviewAudit.maxDeduct}" />--%>
-													<%--									</td>--%>
-													<%--									<td class="input-td">--%>
-													<%--										<input id="deduct" style="text-align: center;background-color: #fff" htmlEscape="false" readonly="true" class="form-control layui-input" value="${workReviewAudit.deduct}">--%>
-													<%--									</td>--%>
-												<td class="input-td">
-													<input id="deductOpinion" style="text-align: center;background-color: #fff" title="${workReviewAudit.deductOption}" readonly="true" name="deductOpinion" value="${workReviewAudit.deductOption}" onclick="readOpenInfo(this.value)" class="form-control layui-input"/>
-												</td>
-											</tr>
-										</c:forEach>
-										</tbody>
-									</table>
-								</div>
-							</div>
-						</div>
-
-					</c:if>
-				</div>
 				<div class="form-group layui-row first hide" id="AccessoryView">
 					<div class="form-group layui-row">
 						<div class="form-group-label"><h2>成果文件</h2></div>

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

@@ -310,6 +310,12 @@
 						<form:input id="cBName" path="createBy.name" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
 					</div>
 				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label"><span class="require-item">*</span>归档编号：</label>
+					<div class="layui-input-block">
+						<form:input id="recordNum" path="recordNum" htmlEscape="false" maxlength="64" class="form-control layui-input judgment"/>
+					</div>
+				</div>
 				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>申请日期：</label>
 					<div class="layui-input-block">
@@ -334,7 +340,13 @@
 						<input id="recordDate" name="recordDate"  htmlEscape="false" readonly="true" class="form-control  layui-input" value="<fmt:formatDate value="${projectReportRecord.createDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm12  with-textarea">
+				<div class="layui-item layui-col-sm6  with-textarea">
+					<label class="layui-form-label">归档内容：</label>
+					<div class="layui-input-block">
+						<form:textarea placeholder="请输入归档内容:" path="recordRemarks" htmlEscape="false" rows="4" maxlength="255" class="form-control "/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6  with-textarea">
 					<label class="layui-form-label">说明：</label>
 					<div class="layui-input-block">
 						<form:textarea placeholder="请输入说明:" path="remarks" htmlEscape="false" rows="4" maxlength="255" class="form-control "/>

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

@@ -354,6 +354,12 @@
                         </div>
                     </div>--%>
 				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label"><span class="require-item">*</span>归档编号：</label>
+					<div class="layui-input-block">
+						<form:input id="recordNum" path="recordNum" htmlEscape="false" maxlength="64" class="form-control layui-input judgment"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">归档时间：</label>
 					<div class="layui-input-block">
 						<input id="recordDate" name="recordDate"  htmlEscape="false" readonly="true" class="form-control  layui-input" value="<fmt:formatDate value="${projectReportRecord.createDate}" pattern="yyyy-MM-dd"/>"/>
@@ -366,7 +372,13 @@
 							   value="<fmt:formatDate value="${projectReportRecord.accomplishDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
 					</div>
 				</div>--%>
-				<div class="layui-item layui-col-sm12  with-textarea">
+				<div class="layui-item layui-col-sm6  with-textarea">
+					<label class="layui-form-label">归档内容：</label>
+					<div class="layui-input-block">
+						<form:textarea placeholder="请输入归档内容:" path="recordRemarks" htmlEscape="false" rows="4" maxlength="255" class="form-control "/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6  with-textarea">
 					<label class="layui-form-label">说明：</label>
 					<div class="layui-input-block">
 						<form:textarea placeholder="请输入说明" path="remarks" htmlEscape="false" rows="4" maxlength="255" class="form-control "/>

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

@@ -437,7 +437,7 @@
                     $("#otherDetails").val(data.otherDetails);
                     $("#contractPrice").val(data.contractPrice);
                     formatNum($("#contractPrice"));
-                    $("#contractClientName").val(data.client.name);
+                    $("#contractClientName").val(data.clientName);
                     $("#contractClientId").val(data.client.id);
                     $("#constructionProjectType").val(data.contractType);
                     $("#linkmanId").val(data.workClinetInfoIds);
@@ -945,7 +945,7 @@
                        <div class="layui-item layui-col-sm6 lw7">
                            <label class="layui-form-label">委托方：</label>
                            <div class="layui-input-block">
-                               <input htmlEscape="false"  readonly="true" id="contractClientName" name="workContractInfo.client.name" class="form-control layui-input" value="${ruralProjectRecords.workContractInfo.client.name}"/>
+                               <input htmlEscape="false"  readonly="true" id="contractClientName" name="workContractInfo.clientName" class="form-control layui-input" value="${ruralProjectRecords.workContractInfo.clientName}"/>
                            </div>
                        </div>
                    </div>

src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordForm.jsp

@@ -189,13 +189,13 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>报告号：</label>
 					<div class="layui-input-block">
-						<form:input id="reportNumber" path="report.number" htmlEscape="false"   readonly="true" class="form-control layui-input required"/>
+						<form:input id="reportNumber" path="report.number" htmlEscape="false"   readonly="true" class="form-control layui-input judgment"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>报告日期：</label>
 					<div class="layui-input-block">
-						<input id="reportDate" name="report.reportDate"  htmlEscape="false" readonly="true" class="form-control  layui-input required" value="<fmt:formatDate value="${projectReportRecord.report.reportDate}" pattern="yyyy-MM-dd"/>"/>
+						<input id="reportDate" name="report.reportDate"  htmlEscape="false" readonly="true" class="form-control  layui-input judgment" value="<fmt:formatDate value="${projectReportRecord.report.reportDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
@@ -219,29 +219,41 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">项目编号：</label>
 					<div class="layui-input-block">
-						<input id="projectNum" name="projectNum"  htmlEscape="false" readonly="true" class="form-control  layui-input required" value="${projectReportRecord.report.project.projectId}"/>
+						<input id="projectNum" name="projectNum"  htmlEscape="false" readonly="true" class="form-control  layui-input judgment" value="${projectReportRecord.report.project.projectId}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>项目名称：</label>
 					<div class="layui-input-block">
-						<input id="projectName" name="projectName"  htmlEscape="false" readonly="true" class="form-control  layui-input required" value="${projectReportRecord.report.project.projectName}"/>
+						<input id="projectName" name="projectName"  htmlEscape="false" readonly="true" class="form-control  layui-input judgment" value="${projectReportRecord.report.project.projectName}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>归档申请人：</label>
 					<div class="layui-input-block">
-						<form:input id="cBName" path="createBy.name" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
+						<form:input id="cBName" path="createBy.name" htmlEscape="false" readonly="true" class="form-control  layui-input judgment"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label"><span class="require-item">*</span>归档编号：</label>
+					<div class="layui-input-block">
+						<form:input id="recordNum" path="recordNum" htmlEscape="false" maxlength="64" class="form-control layui-input judgment"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">归档时间：</label>
 					<div class="layui-input-block">
-						<input id="recordDate" name="recordDate"  htmlEscape="false" readonly="true" class="laydate-icondate form-control layer-date required layui-input laydate-icon"
+						<input id="recordDate" name="recordDate"  htmlEscape="false" readonly="true" class="laydate-icondate form-control layer-date judgment layui-input laydate-icon"
 							   value="<fmt:formatDate value="${projectReportRecord.createDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm12  with-textarea">
+				<div class="layui-item layui-col-sm6  with-textarea">
+					<label class="layui-form-label">归档内容：</label>
+					<div class="layui-input-block">
+						<form:textarea placeholder="请输入归档内容:" path="recordRemarks" htmlEscape="false" rows="4" maxlength="255" class="form-control "/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6  with-textarea">
 					<label class="layui-form-label">说明：</label>
 					<div class="layui-input-block">
 						<form:textarea placeholder="请输入说明:" path="remarks" htmlEscape="false" rows="4" maxlength="255" class="form-control "/>

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

@@ -429,7 +429,7 @@
                     $("#otherDetails").val(data.otherDetails);
                     $("#contractPrice").val(data.contractPrice);
                     formatNum($("#contractPrice"));
-                    $("#contractClientName").val(data.client.name);
+                    $("#contractClientName").val(data.clientName);
                     $("#contractClientId").val(data.client.id);
                     $("#constructionProjectType").val(data.contractType);
                     $("#linkmanId").val(data.workClinetInfoIds);
@@ -940,7 +940,7 @@
                        <div class="layui-item layui-col-sm6 lw7">
                            <label class="layui-form-label">委托方：</label>
                            <div class="layui-input-block">
-                               <input htmlEscape="false"  readonly="true" id="contractClientName" name="workContractInfo.client.name" class="form-control layui-input" value="${ruralProjectRecords.workContractInfo.client.name}"/>
+                               <input htmlEscape="false"  readonly="true" id="contractClientName" name="workContractInfo.clientName" class="form-control layui-input" value="${ruralProjectRecords.workContractInfo.clientName}"/>
                            </div>
                        </div>
                    </div>

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

@@ -266,10 +266,8 @@
 							<li class="active"><a>基本信息</a><span class="hide">projectInfo</span></li>
 							<li><a>子项目列表</a><span class="hide">subProjectInfo</span></li>
 							<li><a>合同信息</a><span class="hide">workContractInfo</span></li>
-							<li><a>客户信息</a><span class="hide">workClientInfo</span></li>
 							<li><a>项目计划信息</a><span class="hide">planView</span></li>
 							<li><a>质量复核信息</a><span class="hide">qualityView</span></li>
-							<li><a>报告签发信息</a><span class="hide">issueView</span></li>
 							<li><a>档案信息</a><span class="hide">AccessoryView</span></li>
 						</ul>
 					</div>
@@ -441,8 +439,37 @@
 						<c:when test="${workContractInfo==null}">
 							无合同信息
 						</c:when>
-						<c:otherwise>
+						<c:otherwise><div class="form-group layui-row first lw9">
+							<div class="form-group-label"><h2>客户信息</h2></div>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">客户名称：</label>
+								<div class="layui-input-block">
+									<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.clientName}"/>
+								</div>
+							</div>
+							<div class="layui-item layui-col-sm6">
+								<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="${workContractInfo.telephone}"/>
+								</div>
+							</div>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label double-line">拥有统一社会信用代码：</label>
+								<div class="layui-input-block">
+									<input type="radio" name="hasUscc" value="1" title="是" disabled <c:if test="${workContractInfo.hasUscc=='1'}">checked</c:if>>
+									<input type="radio" name="hasUscc" value="2" title="否" disabled <c:if test="${workContractInfo.hasUscc=='2'}">checked</c:if> >
+								</div>
+							</div>
+							<div class="layui-item layui-col-sm6">
+								<br>
+								<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="${workContractInfo.uscCode}"/>
+								</div>
+							</div>
+						</div>
 							<div class="form-group layui-row first lw9">
+								<div class="form-group-label"><h2>合同基础信息</h2></div>
 								<div class="layui-item layui-col-sm6">
 									<label class="layui-form-label ">合同名称：</label>
 									<div class="layui-input-block">
@@ -450,12 +477,6 @@
 									</div>
 								</div>
 								<div class="layui-item layui-col-sm6">
-									<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="${workContractInfo.client.name}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm6">
 									<label class="layui-form-label "><span class="require-item">*</span>签订日期：</label>
 									<div class="layui-input-block">
 										<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${workContractInfo.contractDate}" pattern="yyyy年MM月dd日"/>"/>
@@ -533,6 +554,41 @@
 									</div>
 								</div>
 							</div>
+
+							<div class="form-group layui-row">
+								<div class="form-group-label"><h2>联系人信息</h2></div>
+								<div class="layui-item layui-col-xs12 form-table-container" >
+									<table id="contentTable" class="table table-bordered table-condensed no-bottom-margin details">
+										<thead>
+										<tr>
+											<th class="hide"></th>
+											<th width="150px">联系人姓名</th>
+											<th >部门</th>
+											<th width="150px">职务</th>
+											<th width="150px">QQ</th>
+											<th width="150px">联系方式1</th>
+											<th width="150px">联系方式2</th>
+											<th width="150px">E-mail</th>
+										</tr>
+										</thead>
+										<tbody id="workClientLinkmanList">
+										<c:forEach items="${clientList}" var="workClientLinkman" varStatus="status">
+											<tr>
+												<td class="hide">${status.index + 1}</td>
+												<td >${workClientLinkman.name}</td>
+												<td >${workClientLinkman.office}</td>
+												<td >${workClientLinkman.position}</td>
+												<td >${workClientLinkman.qq}</td>
+												<td >${workClientLinkman.linkPhone}</td>
+												<td >${workClientLinkman.linkMobile}</td>
+												<td >${workClientLinkman.email}</td>
+											</tr>
+										</c:forEach>
+										</tbody>
+									</table>
+								</div>
+							</div>
+
 							<div class="form-group layui-row">
 								<div class="form-group-label"><h2>合同附件表</h2></div>
 								<div class="layui-item layui-col-xs12 form-table-container" >
@@ -659,190 +715,6 @@
 						</c:otherwise>
 					</c:choose>
 				</div>
-				<div class="form-group layui-row first hide" id="workClientInfo">
-					<c:choose>
-						<c:when test="${workContractInfo==null}">
-							无客户信息
-						</c:when>
-						<c:otherwise>
-							<div class="form-group layui-row first">
-								<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="${workClientInfo.name}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm6 lw7">
-									<label class="layui-form-label double-line">拥有统一社会信用代码：</label>
-									<div class="layui-input-block">
-						<span class="radio-box">&nbsp;&nbsp;
-							<input type="radio" class="usccClass" name="hasUscc" label="是" disabled="true" <c:if test="${workClientInfo.hasUscc eq 1}">checked="true"</c:if> />是
-							&nbsp;&nbsp;
-							<input type="radio" class="usccClass" name="hasUscc" label="否" disabled="true" <c:if test="${workClientInfo.hasUscc eq 2}">checked="true"</c:if> />否
-						</span>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm6 lw7">
-									<label class="layui-form-label double-line">统一社会信用代码：</label>
-									<div class="layui-input-block">
-										<input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${workClientInfo.uscCode}"/>
-									</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="${fns:getMainDictLabel(workClientInfo.companyType, 'company_type', '')}"/>
-									</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="${fns:getMainDictLabel(workClientInfo.companyIndustry, 'company_industry', '')}"/>
-									</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="<c:set value="${fn:split(workClientInfo.clientType, ',') }" var="clientTypes" /><c:forEach items="${clientTypes}" var="cType" varStatus="status">${fns:getMainDictLabel(cType, 'client_type', '')}<c:if test="${!status.last}">, </c:if></c:forEach>"/>
-									</div>
-								</div>
-									<%--            <div class="layui-item layui-col-sm6 lw7">--%>
-									<%--                <label class="layui-form-label">代表方：</label>--%>
-									<%--                <div class="layui-input-block">--%>
-									<%--                    <div class="input-group">--%>
-									<%--                        <div >--%>
-									<%--                            <div id="jobType" style="pointer-events: none;background-color: #f1f1f1" class="xm-select-demo" tabindex="0" contenteditable="true"></div>--%>
-									<%--                        </div>--%>
-									<%--                    </div>--%>
-									<%--                </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="${workClientInfo.lawerPresint}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm6 lw7">
-									<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="${workClientInfo.zipCode}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm6 lw7">
-									<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="${workClientInfo.fax}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm6 lw7">
-									<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="${workClientInfo.telephone}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm6 lw7">
-									<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="${workClientInfo.companyUrl}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm6 lw7">
-									<label class="layui-form-label">所在地区：</label>
-									<div class="layui-input-block with-icon">
-										<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workClientInfo.area.name}"/>
-									</div>
-								</div>
-
-								<div class="layui-item layui-col-sm12 lw7">
-									<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="${workClientInfo.registerAddress}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm12 lw7">
-									<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="${workClientInfo.address}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm12 lw7">
-									<label class="layui-form-label">开户行信息：</label>
-									<div class="layui-input-block">
-
-										<table id="bankinfo2" class="table table-bordered table-condensed details">
-											<thead>
-											<tr>
-												<th width="80px">序号</th>
-												<th ><%--<font color="red">*</font>--%>开户银行</th>
-												<th width="400px;"><%--<font color="red">*</font>--%>开户账号</th>
-
-											</tr>
-											</thead>
-											<tbody id="workClientBankList">
-											<c:forEach items="${workClientInfo.workClientBankList}" var="workClientBank" varStatus="status">
-												<tr>
-													<td>${status.index + 1}</td>
-													<td>${workClientBank.ourBank}</td>
-													<td>${workClientBank.bankNumber}</td>
-												</tr>
-											</c:forEach>
-											<c:if test="${bankSize == 0}">
-												<tr>
-													<td colspan="3">暂无数据</td>
-												</tr>
-											</c:if>
-											</tbody>
-										</table>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm12 with-textarea lw7">
-									<label class="layui-form-label">单位简介：</label>
-									<div class="layui-input-block">
-										<textarea htmlEscape="false" style="background-color: #f1f1f1" rows="4" readonly="true" maxlength="1000" class="form-control" >${workClientInfo.unitIntroduction}</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" >
-									<table id="clientTable" class="table table-bordered table-condensed no-bottom-margin details">
-										<thead>
-										<tr>
-											<th class="hide"></th>
-											<th width="150px">联系人姓名</th>
-											<th >部门</th>
-											<th width="150px">职务</th>
-											<th width="150px">QQ</th>
-											<th width="150px">联系方式1</th>
-											<th width="150px">联系方式2</th>
-											<th width="150px">E-mail</th>
-										</tr>
-										</thead>
-										<tbody id="workClientLinkmanList">
-										<c:forEach items="${workClientInfo.workClientLinkmanList}" var="workClientLinkman" varStatus="status">
-											<tr>
-												<td class="hide">${status.index + 1}</td>
-												<td >${workClientLinkman.name}</td>
-												<td >${workClientLinkman.office}</td>
-												<td >${workClientLinkman.position}</td>
-												<td >${workClientLinkman.qq}</td>
-												<td >${workClientLinkman.linkPhone}</td>
-												<td >${workClientLinkman.linkMobile}</td>
-												<td >${workClientLinkman.email}</td>
-											</tr>
-										</c:forEach>
-										<c:if test="${linkManSize == 0}">
-											<tr>
-												<td colspan="8">暂无数据</td>
-											</tr>
-										</c:if>
-										</tbody>
-									</table>
-								</div>
-							</div>
-						</c:otherwise>
-					</c:choose>
-				</div>
 				<div class="form-group layui-row first hide" id="planView">
 					<div class="form-group layui-row">
 						<div class="form-group-label"><h2>项目计划信息</h2></div>
@@ -1256,11 +1128,6 @@
 						<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
 					</div>
 				</div>
-				<div class="form-group layui-row first hide" id="issueView">
-					<div class="topMar">
-						<h2>暂无报告签发信息</h2>
-					</div>
-				</div>
 				<div class="form-group layui-row first hide" id="AccessoryView">
 					<div class="form-group layui-row">
 						<div class="form-group-label"><h2>成果文件</h2></div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageAuditTwo.jsp

@@ -244,7 +244,6 @@
 							<li class="active"><a>基本信息</a><span class="hide">projectInfo</span></li>
 							<li><a>子项目列表</a><span class="hide">subProjectInfo</span></li>
 							<li><a>合同信息</a><span class="hide">workContractInfo</span></li>
-							<li><a>客户信息</a><span class="hide">workClientInfo</span></li>
 							<li><a>项目计划信息</a><span class="hide">planView</span></li>
 							<li><a>质量复核信息</a><span class="hide">qualityView</span></li>
 							<li><a>报告签发信息</a><span class="hide">issueView</span></li>
@@ -619,190 +618,6 @@
 						</c:otherwise>
 					</c:choose>
 				</div>
-				<div class="form-group layui-row first hide" id="workClientInfo">
-					<c:choose>
-						<c:when test="${workContractInfo==null}">
-							无客户信息
-						</c:when>
-						<c:otherwise>
-							<div class="form-group layui-row first">
-								<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="${workClientInfo.name}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm6 lw7">
-									<label class="layui-form-label double-line">拥有统一社会信用代码：</label>
-									<div class="layui-input-block">
-						<span class="radio-box">&nbsp;&nbsp;
-							<input type="radio" class="usccClass" name="hasUscc" label="是" disabled="true" <c:if test="${workClientInfo.hasUscc eq 1}">checked="true"</c:if> />是
-							&nbsp;&nbsp;
-							<input type="radio" class="usccClass" name="hasUscc" label="否" disabled="true" <c:if test="${workClientInfo.hasUscc eq 2}">checked="true"</c:if> />否
-						</span>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm6 lw7">
-									<label class="layui-form-label double-line">统一社会信用代码：</label>
-									<div class="layui-input-block">
-										<input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${workClientInfo.uscCode}"/>
-									</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="${fns:getMainDictLabel(workClientInfo.companyType, 'company_type', '')}"/>
-									</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="${fns:getMainDictLabel(workClientInfo.companyIndustry, 'company_industry', '')}"/>
-									</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="<c:set value="${fn:split(workClientInfo.clientType, ',') }" var="clientTypes" /><c:forEach items="${clientTypes}" var="cType" varStatus="status">${fns:getMainDictLabel(cType, 'client_type', '')}<c:if test="${!status.last}">, </c:if></c:forEach>"/>
-									</div>
-								</div>
-									<%--            <div class="layui-item layui-col-sm6 lw7">--%>
-									<%--                <label class="layui-form-label">代表方：</label>--%>
-									<%--                <div class="layui-input-block">--%>
-									<%--                    <div class="input-group">--%>
-									<%--                        <div >--%>
-									<%--                            <div id="jobType" style="pointer-events: none;background-color: #f1f1f1" class="xm-select-demo" tabindex="0" contenteditable="true"></div>--%>
-									<%--                        </div>--%>
-									<%--                    </div>--%>
-									<%--                </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="${workClientInfo.lawerPresint}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm6 lw7">
-									<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="${workClientInfo.zipCode}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm6 lw7">
-									<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="${workClientInfo.fax}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm6 lw7">
-									<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="${workClientInfo.telephone}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm6 lw7">
-									<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="${workClientInfo.companyUrl}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm6 lw7">
-									<label class="layui-form-label">所在地区：</label>
-									<div class="layui-input-block with-icon">
-										<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workClientInfo.area.name}"/>
-									</div>
-								</div>
-
-								<div class="layui-item layui-col-sm12 lw7">
-									<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="${workClientInfo.registerAddress}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm12 lw7">
-									<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="${workClientInfo.address}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm12 lw7">
-									<label class="layui-form-label">开户行信息：</label>
-									<div class="layui-input-block">
-
-										<table id="bankinfo2" class="table table-bordered table-condensed details">
-											<thead>
-											<tr>
-												<th width="80px">序号</th>
-												<th ><%--<font color="red">*</font>--%>开户银行</th>
-												<th width="400px;"><%--<font color="red">*</font>--%>开户账号</th>
-
-											</tr>
-											</thead>
-											<tbody id="workClientBankList">
-											<c:forEach items="${workClientInfo.workClientBankList}" var="workClientBank" varStatus="status">
-												<tr>
-													<td>${status.index + 1}</td>
-													<td>${workClientBank.ourBank}</td>
-													<td>${workClientBank.bankNumber}</td>
-												</tr>
-											</c:forEach>
-											<c:if test="${bankSize == 0}">
-												<tr>
-													<td colspan="3">暂无数据</td>
-												</tr>
-											</c:if>
-											</tbody>
-										</table>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm12 with-textarea lw7">
-									<label class="layui-form-label">单位简介：</label>
-									<div class="layui-input-block">
-										<textarea htmlEscape="false" style="background-color: #f1f1f1" rows="4" readonly="true" maxlength="1000" class="form-control" >${workClientInfo.unitIntroduction}</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" >
-									<table id="clientTable" class="table table-bordered table-condensed no-bottom-margin details">
-										<thead>
-										<tr>
-											<th class="hide"></th>
-											<th width="150px">联系人姓名</th>
-											<th >部门</th>
-											<th width="150px">职务</th>
-											<th width="150px">QQ</th>
-											<th width="150px">联系方式1</th>
-											<th width="150px">联系方式2</th>
-											<th width="150px">E-mail</th>
-										</tr>
-										</thead>
-										<tbody id="workClientLinkmanList">
-										<c:forEach items="${workClientInfo.workClientLinkmanList}" var="workClientLinkman" varStatus="status">
-											<tr>
-												<td class="hide">${status.index + 1}</td>
-												<td >${workClientLinkman.name}</td>
-												<td >${workClientLinkman.office}</td>
-												<td >${workClientLinkman.position}</td>
-												<td >${workClientLinkman.qq}</td>
-												<td >${workClientLinkman.linkPhone}</td>
-												<td >${workClientLinkman.linkMobile}</td>
-												<td >${workClientLinkman.email}</td>
-											</tr>
-										</c:forEach>
-										<c:if test="${linkManSize == 0}">
-											<tr>
-												<td colspan="8">暂无数据</td>
-											</tr>
-										</c:if>
-										</tbody>
-									</table>
-								</div>
-							</div>
-						</c:otherwise>
-					</c:choose>
-				</div>
 				<div class="form-group layui-row first hide" id="planView">
 					<div class="form-group layui-row">
 						<div class="form-group-label"><h2>项目计划信息</h2></div>

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

@@ -253,11 +253,11 @@
 			<li ><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
-            <li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
+            <%--<li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>--%>
 			<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/formRecordModify?id=${projectRecords.id}">归档信息</a></li>
 			<%--<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
-			<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>
+			<%--<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>--%>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
 
 		</ul>

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

@@ -77,11 +77,11 @@
 			<li ><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
-			<li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
+			<%--<li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>--%>
 			<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/formRecordModify?id=${projectRecords.id}">归档信息</a></li>
 <%--			<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
-			<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>
+			<%--<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>--%>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
 
 		</ul>

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

@@ -147,11 +147,11 @@
             <li ><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
             <li class="active"><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
-            <li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
+            <%--<li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>--%>
             <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/formRecordModify?id=${projectRecords.id}">归档信息</a></li>
 <%--            <li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
-            <li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>
+            <%--<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>--%>
             <li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
         </ul>
     </div>

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

@@ -193,11 +193,11 @@
 				<li ><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
-				<li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
+				<%--<li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>--%>
 				<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 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>--%>
-				<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>
+				<%--<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>--%>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
 
 			</ul>
@@ -339,7 +339,7 @@
 					</div>
 				</div>
 			</div>
-			<div>
+			<%--<div>
 				<div class="form-group-label">
 					<h2>电子归档复核内容</h2>
 				</div>
@@ -348,14 +348,14 @@
 						<table id="treeTable2" class="table table-bordered table-condensed reviews no-bottom-margin">
 							<thead>
 							<tr>
-									<%--<th width="25%">序号</th>--%>
+									&lt;%&ndash;<th width="25%">序号</th>&ndash;%&gt;
 								<th width="40%">符合内容及评分标准</th>
 								<th width="10%">自校</th>
-									<%--								<th width="10%">最高分</th>--%>
-									<%--								<th width="10%">扣分</th>--%>
+									&lt;%&ndash;								<th width="10%">最高分</th>&ndash;%&gt;
+									&lt;%&ndash;								<th width="10%">扣分</th>&ndash;%&gt;
 								<th >意见</th>
 
-									<%--<th width="15%">操作</th>--%>
+									&lt;%&ndash;<th width="15%">操作</th>&ndash;%&gt;
 							</tr>
 							</thead>
 							<tbody>
@@ -376,7 +376,7 @@
 						</table>
 					</div>
 				</div>
-			</div>
+			</div>--%>
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>审批流程</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >

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

@@ -303,11 +303,11 @@
 				<li><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
 				<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
-				<li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
+				<%--<li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>--%>
 				<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/formRecordModify?id=${projectRecords.id}">归档信息</a></li>
 <%--				<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
-				<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>
+				<%--<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>--%>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
 
 			</ul>

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

@@ -119,11 +119,11 @@
             <li ><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
-            <li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
+            <%--<li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>--%>
             <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/formRecordModify?id=${projectRecords.id}">归档信息</a></li>
 <%--            <li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
-            <li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>
+            <%--<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>--%>
             <li class="active"><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
 
         </ul>

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

@@ -95,11 +95,11 @@
 			<li><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
-			<li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
+			<%--<li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>--%>
 			<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/formRecordModify?id=${projectRecords.id}">归档信息</a></li>
 <%--			<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
-			<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>
+			<%--<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>--%>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
 		</ul>
 	</div>
@@ -136,7 +136,7 @@
 				   <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}"/>
+						   <input htmlEscape="false" style="background-color: #f1f1f1" id="clientName" readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.clientName}"/>
 					   </div>
 				   </div>
 			   </div>

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

@@ -26,11 +26,11 @@
             <li  class="active"><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
-            <li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
+            <%--<li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>--%>
             <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/formRecordModify?id=${projectRecords.id}">归档信息</a></li>
 <%--            <li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
-            <li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>
+            <%--<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>--%>
             <li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
         </ul>
     </div>
@@ -43,299 +43,42 @@
     <c:if test="${workContractInfo.id!=null}">
     <div class="container" style="margin-top: 50px;">
         <form:form id="inputForm" modelAttribute="workContractInfo"  method="post" class="layui-form">
-        <div class="form-group layui-row first">
-            <input type="hidden" id="id" value="${workClientInfo.id}">
-            <div class="form-group-label"><h2>委托方信息</h2></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="${workClientInfo.name}"/>
-                </div>
-            </div>
-            <div class="layui-item layui-col-sm6 lw7">
-                <label class="layui-form-label double-line">拥有统一社会信用代码：</label>
-                <div class="layui-input-block">
-                    <span class="radio-box">&nbsp;&nbsp;
-                        <input type="radio" class="usccClass" name="hasUscc" label="是" disabled="true" <c:if test="${workClientInfo.hasUscc eq 1}">checked="true"</c:if> />是
-                        &nbsp;&nbsp;
-                        <input type="radio" class="usccClass" name="hasUscc" label="否" disabled="true" <c:if test="${workClientInfo.hasUscc eq 2}">checked="true"</c:if> />否
-                    </span>
-                </div>
-            </div>
-            <div class="layui-item layui-col-sm6 lw7">
-                <label class="layui-form-label double-line">统一社会信用代码：</label>
-                <div class="layui-input-block">
-                    <input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${workClientInfo.uscCode}"/>
-                </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="${fns:getMainDictLabel(workClientInfo.companyType, 'company_type', '')}"/>
-                </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="${fns:getMainDictLabel(workClientInfo.companyIndustry, 'company_industry', '')}"/>
-                </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="<c:set value="${fn:split(workClientInfo.clientType, ',') }" var="clientTypes" /><c:forEach items="${clientTypes}" var="cType" varStatus="status">${fns:getMainDictLabel(cType, 'client_type', '')}<c:if test="${!status.last}">, </c:if></c:forEach>"/>
-                </div>
-            </div>
-<%--            <div class="layui-item layui-col-sm6 lw7">--%>
-<%--                <label class="layui-form-label">代表方：</label>--%>
-<%--                <div class="layui-input-block">--%>
-<%--                    <div class="input-group">--%>
-<%--                        <div >--%>
-<%--                            <div id="jobType" style="pointer-events: none;background-color: #f1f1f1" class="xm-select-demo" tabindex="0" contenteditable="true"></div>--%>
-<%--                        </div>--%>
-<%--                    </div>--%>
-<%--                </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="${workClientInfo.lawerPresint}"/>
-                </div>
-            </div>
-            <div class="layui-item layui-col-sm6 lw7">
-                <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="${workClientInfo.zipCode}"/>
-                </div>
-            </div>
-            <div class="layui-item layui-col-sm6 lw7">
-                <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="${workClientInfo.fax}"/>
-                </div>
-            </div>
-            <div class="layui-item layui-col-sm6 lw7">
-                <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="${workClientInfo.telephone}"/>
-                </div>
-            </div>
-            <div class="layui-item layui-col-sm6 lw7">
-                <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="${workClientInfo.companyUrl}"/>
-                </div>
-            </div>
-            <div class="layui-item layui-col-sm6 lw7">
-                <label class="layui-form-label">所在地区：</label>
-                <div class="layui-input-block with-icon">
-                    <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workClientInfo.area.name}"/>
-                </div>
-            </div>
-
-            <div class="layui-item layui-col-sm12 lw7">
-                <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="${workClientInfo.registerAddress}"/>
-                </div>
-            </div>
-            <div class="layui-item layui-col-sm12 lw7">
-                <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="${workClientInfo.address}"/>
+            <div id="tab-12" class="tab-pane active">
+                <div class="form-group-label"><h2>客户基础信息</h2>
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <br>
+                        <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="${workContractInfo.clientName}"/>
+                        </div>
+                    </div>
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <br>
+                        <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="${workContractInfo.telephone}"/>
+                        </div>
+                    </div>
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label double-line">拥有统一社会信用代码：</label>
+                        <div class="layui-input-block">
+                            <input type="radio" name="hasUscc" value="1" title="是" disabled <c:if test="${workContractInfo.hasUscc=='1'}">checked</c:if>>
+                            <input type="radio" name="hasUscc" value="2" title="否" disabled <c:if test="${workContractInfo.hasUscc=='2'}">checked</c:if> >
+                        </div>
+                    </div>
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <br>
+                        <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="${workContractInfo.uscCode}"/>
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="layui-item layui-col-sm12 lw7">
-                <label class="layui-form-label">开户行信息：</label>
-                <div class="layui-input-block">
 
-                    <table id="bankinfo" class="table table-bordered table-condensed details">
-                        <thead>
-                        <tr>
-                            <th width="80px">序号</th>
-                            <th ><%--<font color="red">*</font>--%>开户银行</th>
-                            <th width="400px;"><%--<font color="red">*</font>--%>开户账号</th>
-
-                        </tr>
-                        </thead>
-                        <tbody id="workClientBankList">
-                        <c:forEach items="${workClientInfo.workClientBankList}" var="workClientBank" varStatus="status">
-                            <tr>
-                                <td>${status.index + 1}</td>
-                                <td>${workClientBank.ourBank}</td>
-                                <td>${workClientBank.bankNumber}</td>
-                            </tr>
-                        </c:forEach>
-                        <c:if test="${bankSize == 0}">
-                            <tr>
-                                <td colspan="3">暂无数据</td>
-                            </tr>
-                        </c:if>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-            <div class="layui-item layui-col-sm12 with-textarea lw7">
-                <label class="layui-form-label">单位简介：</label>
-                <div class="layui-input-block">
-                    <textarea htmlEscape="false" style="background-color: #f1f1f1" rows="4" readonly="true" maxlength="1000" class="form-control" >${workClientInfo.unitIntroduction}</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" >
-                <table id="clientTable" class="table table-bordered table-condensed no-bottom-margin details">
-                    <thead>
-                    <tr>
-                        <th class="hide"></th>
-                        <th width="150px">联系人姓名</th>
-                        <th >部门</th>
-                        <th width="150px">职务</th>
-                        <th width="150px">QQ</th>
-                        <th width="150px">联系方式1</th>
-                        <th width="150px">联系方式2</th>
-                        <th width="150px">E-mail</th>
-                    </tr>
-                    </thead>
-                    <tbody id="workClientLinkmanList">
-                    <c:forEach items="${workClientInfo.workClientLinkmanList}" var="workClientLinkman" varStatus="status">
-                        <tr>
-                            <td class="hide">${status.index + 1}</td>
-                            <td >${workClientLinkman.name}</td>
-                            <td >${workClientLinkman.office}</td>
-                            <td >${workClientLinkman.position}</td>
-                            <td >${workClientLinkman.qq}</td>
-                            <td >${workClientLinkman.linkPhone}</td>
-                            <td >${workClientLinkman.linkMobile}</td>
-                            <td >${workClientLinkman.email}</td>
-                        </tr>
-                    </c:forEach>
-                    <c:if test="${linkManSize == 0}">
-                        <tr>
-                            <td colspan="8">暂无数据</td>
-                        </tr>
-                    </c:if>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-        <div class="form-group layui-row">
-            <div class="form-group-label"><h2>附件信息</h2></div>
-            <div class="layui-item layui-col-xs12 form-table-container" >
-                <table id="contentTable1" class="table table-bordered table-condensed details">
-                    <thead>
-                    <tr>
-                        <%-- <th>序号</th>--%>
-                        <th>文件预览</th>
-                        <th>上传人</th>
-                        <th>上传时间</th>
-                        <th width="150px">操作</th>
-                    </tr>
-                    </thead>
-                    <tbody id="workClientAttachmentList">
-                    <c:choose>
-                        <c:when test="${not empty workClientInfo.workAttachments}">
-                            <c:forEach items="${workClientInfo.workAttachments}" var="workClientAttachment"
-                                       varStatus="status">
-                                <tr>
-                                        <%-- <td>${status.index + 1}</td>--%>
-                                            <c:choose>
-                                                <c:when test="${workClientInfo.uploadMode == 2}">
-                                                    <c:choose>
-                                                        <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                            <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                                        </c:when>
-                                                        <c:otherwise>
-                                                            <c:choose>
-                                                                <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                                    <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
-                                                                </c:when>
-                                                                <c:otherwise>
-                                                                    <c:choose>
-                                                                        <c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
-                                                                               or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                                               or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                                               or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                            <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
-                                                                        </c:when>
-                                                                        <c:otherwise>
-                                                                            <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
-                                                                        </c:otherwise>
-                                                                    </c:choose>
-                                                                </c:otherwise>
-                                                            </c:choose>
-                                                        </c:otherwise>
-                                                    </c:choose>
-                                                </c:when>
-                                                <c:otherwise>
-                                                    <c:choose>
-                                                        <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                            <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                                        </c:when>
-                                                        <c:otherwise>
-                                                            <c:choose>
-                                                                <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                                    <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
-                                                                </c:when>
-                                                                <c:otherwise>
-                                                                    <c:choose>
-                                                                        <c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
-                                                                               or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                                               or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                                               or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                            <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
-                                                                        </c:when>
-                                                                        <c:otherwise>
-                                                                            <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
-                                                                        </c:otherwise>
-                                                                    </c:choose>
-                                                                </c:otherwise>
-                                                            </c:choose>
-                                                        </c:otherwise>
-                                                    </c:choose>
-                                                </c:otherwise>
-                                            </c:choose>
-
-                                    <td>${workClientAttachment.createBy.name}</td>
-                                    <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
-                                    <td class="op-td">
-                                        <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workClientAttachment.url}'));"
-                                           class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-                                        <c:if test="${workClientAttachment.collectFlag != 1}">
-                                            <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
-                                        </c:if>
-                                    </td>
-                                </tr>
-                            </c:forEach>
-                        </c:when>
-                        <c:otherwise>
-                            <tr>
-                                <td colspan="4" align="center">暂无数据</td>
-                            </tr>
-                        </c:otherwise>
-                    </c:choose>
-                    </tbody>
-                </table>
-            </div>
-        </div>
             <div class="form-group layui-row first lw9">
                 <div class="form-group-label"><h2>合同信息</h2></div>
-                <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label ">客户名称：</label>
-                    <div class="layui-input-block">
-                        <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.client.name}"/>
-                    </div>
-                </div>
 
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label ">合同名称：</label>
@@ -344,7 +87,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label "><span class="require-item">*</span>签订日期：</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="<fmt:formatDate value="${workContractInfo.contractDate}" pattern="yyyy年MM月dd日"/>"/>
                     </div>
@@ -378,6 +121,15 @@
                         </c:if>
                     </shiro:hasPermission>
                 </div>
+
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label">单位：</label>
+                    <div class="layui-input-block">
+                        <input type="radio" name="company" value="0" title="东兴" disabled <c:if test="${workContractInfo.company=='0'}">checked</c:if>>
+                        <input type="radio" name="company" value="1" title="赣能" disabled <c:if test="${workContractInfo.company=='1'}">checked</c:if> >
+                    </div>
+                </div>
+
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label ">对方合同编号：</label>
                     <div class="layui-input-block">
@@ -412,6 +164,45 @@
                 </div>
             </div>
             <div class="form-group layui-row">
+                <div class="form-group-label"><h2>联系人信息</h2></div>
+                <div class="layui-item layui-col-xs12 form-table-container" >
+                    <table id="clientTable" class="table table-bordered table-condensed no-bottom-margin details">
+                        <thead>
+                        <tr>
+                            <th class="hide"></th>
+                            <th width="150px">联系人姓名</th>
+                            <th >部门</th>
+                            <th width="150px">职务</th>
+                            <th width="150px">QQ</th>
+                            <th width="150px">联系方式1</th>
+                            <th width="150px">联系方式2</th>
+                            <th width="150px">E-mail</th>
+                        </tr>
+                        </thead>
+                        <tbody id="workClientLinkmanList">
+                        <c:forEach items="${clientList}" var="workClientLinkman" varStatus="status">
+                            <tr>
+                                <td class="hide">${status.index + 1}</td>
+                                <td >${workClientLinkman.name}</td>
+                                <td >${workClientLinkman.office}</td>
+                                <td >${workClientLinkman.position}</td>
+                                <td >${workClientLinkman.qq}</td>
+                                <td >${workClientLinkman.linkPhone}</td>
+                                <td >${workClientLinkman.linkMobile}</td>
+                                <td >${workClientLinkman.email}</td>
+                            </tr>
+                        </c:forEach>
+                        <c:if test="${linkManSize == 0}">
+                            <tr>
+                                <td colspan="8">暂无数据</td>
+                            </tr>
+                        </c:if>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+
+            <div class="form-group layui-row">
                 <div class="form-group-label"><h2>合同附件表</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container" >
                     <table id="contentTable" class="table table-bordered table-condensed no-bottom-margin details">
@@ -534,13 +325,6 @@
                     </table>
                 </div>
             </div>
-            <div class="form-group layui-row">
-                <div class="form-group-label"><h2>审批流程</h2></div>
-                <div class="layui-item layui-col-xs12 form-table-container" >
-                    <act:flowChart procInsId="${workContractInfo.processInstanceId}"/>
-                    <act:histoicFlow procInsId="${workContractInfo.processInstanceId}"/>
-                </div>
-            </div>
         <div class="form-group layui-row page-end"></div>
     </form:form>
     </div>

src/main/webapp/webpage/modules/workContractBorrow/workContractBorrowAudit.jsp

@@ -95,7 +95,7 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">用户名称：</label>
 					<div class="layui-input-block">
-						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${workContractBorrow.workContractInfo.client.name}"/>
+						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${workContractBorrow.workContractInfo.clientName}"/>
 					</div>
 				</div>
 				<%--<div class="layui-item layui-col-sm6">
@@ -191,13 +191,13 @@
 				<h2>审批意见</h2>
 			</div>
 			<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
-			<div class="form-group layui-row">
+			<%--<div class="form-group layui-row">
 				<div class="form-group-label"><h2>审批流程</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
 					<act:flowChart procInsId="${workContractRecord.act.procInsId}"/>
 					<act:histoicFlow procInsId="${workContractRecord.act.procInsId}"/>
 				</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" >

src/main/webapp/webpage/modules/workContractBorrow/workContractBorrowForm.jsp

@@ -93,7 +93,7 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">客户名称：</label>
 					<div class="layui-input-block">
-						<form:input id="cName" path="workContractInfo.client.name" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
+						<form:input id="cName" path="workContractInfo.clientName" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
 					</div>
 				</div>
 				<%--<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/workContractBorrow/workContractBorrowView.jsp

@@ -96,7 +96,7 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">用户名称：</label>
 					<div class="layui-input-block">
-						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${workContractBorrow.workContractInfo.client.name}"/>
+						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${workContractBorrow.workContractInfo.clientName}"/>
 					</div>
 				</div>
 				<%--<div class="layui-item layui-col-sm6">

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

@@ -38,6 +38,13 @@
 						parent.layer.msg("未选择收费标准!", {icon: 5});
 						return false;
 					}
+
+					var leng1 = $("#workClientLinkmanList tr").length;
+					if (leng1<=0 ){
+						top.layer.msg("请添加联系人信息！", {icon: 0});
+						return false;
+					}
+
                     //送审
 					var flags=judgment();
 					if (flags){
@@ -68,6 +75,17 @@
             return false;
         }
         $(document).ready(function() {
+
+
+			var span = '${workContractInfo.hasUscc}';
+			if("2"==span){
+				$(".companyType_uscCode").hide();
+				$('input[name="uscCode"]').val("");
+			}else {
+				$(".companyType_uscCode").show();
+			}
+
+
 			var chargeCriterionH = $("#chargeCriterionH").val();
 			/*if(chargeCriterionH.indexOf("4")!=-1){
 				// document.getElementById("otherDetails").readOnly=false
@@ -183,10 +201,14 @@
         });
 
         function addRow(list, idx, tpl, row){
-            var idx1 = $("#workClientInfoList tr").length;
-            if(list == '#workClientInfoList' && idx1 < 100){
+            var idx1 = $("#workClientBankList tr").length;
+            if(list == '#workClientBankList'){
                 bornTemplete(list, idx, tpl, row, idx1);
             }
+            var idx2 = $("#workClientLinkmanList tr").length;
+            if(list == '#workClientLinkmanList'){
+                bornTemplete(list, idx, tpl, row, idx2);
+            }
         }
         function bornTemplete(list, idx, tpl, row, idx1){
             $(list).append(Mustache.render(tpl, {
@@ -641,6 +663,7 @@
 <body>
 <div class="single-form">
 	<div class="container">
+		<%--@elvariable id="workContractInfo" type=""--%>
 		<form:form id="inputForm" modelAttribute="workContractInfo" enctype="multipart/form-data"  action ="${ctx}/workcontractinfo/workContractInfo/newSave" method="post" class="form-horizontal layui-form">
 			<form:hidden path="id"/>
 			<%--创建人--%>
@@ -662,7 +685,7 @@
 									<br>
 									<label class="layui-form-label"><span class="require-item">*</span>客户名称：&nbsp;&nbsp;</label>
 									<div class="layui-input-block">
-										<form:input path="workClientInfo.name" placeholder="请输入客户名称" htmlEscape="false" id=""  class="form-control required layui-input"/>
+										<form:input path="clientName" placeholder="请输入客户名称" htmlEscape="false" id=""  class="form-control judgment layui-input"/>
 										<span id="ph" style="color:#cc5965"></span>
 									</div>
 									<div id="fuzzyQuerySelect"
@@ -674,35 +697,26 @@
 									<br>
 									<label class="layui-form-label"><span class="require-item">*</span>公司电话：</label>
 									<div class="layui-input-block">
-										<form:input path="telephone" placeholder="请输入公司电话" htmlEscape="false" id="telephone" class="form-control required layui-input"/>
+										<form:input path="telephone" placeholder="请输入公司电话" htmlEscape="false" id="telephone" class="form-control judgment layui-input"/>
 
 									</div>
 								</div>
 								<div class="layui-item layui-col-sm6 lw7">
 									<label class="layui-form-label double-line"><span class="require-item">*</span>拥有统一社会信用代码：</label>
 									<div class="layui-input-block">&nbsp;&nbsp;
-										<form:radiobutton id="hasUscc" class="" name="hasUscc" path="" lay-filter="hasUscc" value="1" label="是" checked="true" />
-										<form:radiobutton id="hasUscc" class="" name="hasUscc" path="" lay-filter="hasUscc" value="2" label="否" />
+										<input type="radio" name="hasUscc" value="1" title="是"  lay-filter="hasUscc" <c:if test="${workContractInfo.hasUscc=='1'}">checked</c:if>>
+										<input type="radio" name="hasUscc" value="2" title="否"  lay-filter="hasUscc" <c:if test="${workContractInfo.hasUscc=='2'}">checked</c:if> >
 									</div>
 								</div>
 								<div class="layui-item layui-col-sm6 lw7 companyType_uscCode">
 									<br>
 									<label class="layui-form-label double-line"><span class="require-item">*</span>统一社会信用代码：</label>
 									<div class="layui-input-block">
-										<form:input path="uscCode" placeholder="请输入统一社会信用代码" htmlEscape="false" id="uscCode"   class="form-control required isUscCode layui-input"/>
+										<form:input path="uscCode" placeholder="请输入统一社会信用代码" htmlEscape="false" id="uscCode"   class="form-control judgment isUscCode layui-input"/>
 										<input type="hidden" id="oldUscCode" value=""/>
 										<span id="uscPh" style="color:#cc5965"></span>
 									</div>
 								</div>
-<%--								<div class="layui-item layui-col-sm6 lw7 companyType_uscCode">--%>
-<%--									<br>--%>
-<%--									<label class="layui-form-label double-line"><span class="require-item">*</span>统一社会信用代码：</label>--%>
-<%--									<div>--%>
-<%--										<form:input path="" name="uscCode" placeholder="统一社会信用代码" htmlEscape="false" id="uscCode" class="form-control required layui-input"/>--%>
-<%--										<input type="hidden" id="oldUscCode" value="${workClientInfo.uscCode}"/>--%>
-<%--										<span id="uscPh" style="color:#cc5965"></span>--%>
-<%--									</div>--%>
-<%--								</div><br>--%>
 							</div>
 						</div>
 					</div>
@@ -720,15 +734,16 @@
 									<label for="ext1">非投标项目</label>
 								</div>
 							</div>--%>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label"><span class="require-item">*</span>客户名称：</label>
-								<div class="layui-input-block with-icon" <%--style="margin-right:95px;"--%>>
-									<sys:gridselectclien1 url="${ctx}/workcontractinfo/workContractInfo/selectclientAhref" id="client" name="client.id"  value="${workContractInfo.client.id}"  title="选择客户" labelName="client.name"
-													cssStyle="background-color:#fff" labelValue="${workContractInfo.client.name}" cssClass="form-control layui-input judgment" fieldLabels="客户名称" fieldKeys="name" searchLabel="客户名称" searchKey="name" searchLabel1="联系人" searchKey1="workLinkName"></sys:gridselectclien1>
+<%--							<div class="layui-item layui-col-sm6">--%>
+<%--								<label class="layui-form-label"><span class="require-item">*</span>客户名称：</label>--%>
+<%--								<div class="layui-input-block with-icon" &lt;%&ndash;style="margin-right:95px;"&ndash;%&gt;>--%>
+<%--									<sys:gridselectclien1 url="${ctx}/workcontractinfo/workContractInfo/selectclientAhref" id="client" name="client.id"  value="${workContractInfo.client.id}"  title="选择客户" labelName="client.name"--%>
+<%--													cssStyle="background-color:#fff" labelValue="${workContractInfo.client.name}" cssClass="form-control layui-input judgment" fieldLabels="客户名称" fieldKeys="name" searchLabel="客户名称" searchKey="name" searchLabel1="联系人" searchKey1="workLinkName"></sys:gridselectclien1>--%>
+
+<%--								</div>--%>
+<%--								&lt;%&ndash;<a href="javascript:void(0)" onclick="openBill('新增客户管理', '${ctx}/workclientinfo/workClientInfo/form?param=2','90%','90%',false,'inputForm')" class="nav-btn nav-btn-add" style="margin-right: 0px;top:0px;right:16px;position: absolute;height:40px;line-height: 40px;"><i class="fa fa-plus"></i> 新增</a>&ndash;%&gt;--%>
+<%--							</div>--%>
 
-								</div>
-								<%--<a href="javascript:void(0)" onclick="openBill('新增客户管理', '${ctx}/workclientinfo/workClientInfo/form?param=2','90%','90%',false,'inputForm')" class="nav-btn nav-btn-add" style="margin-right: 0px;top:0px;right:16px;position: absolute;height:40px;line-height: 40px;"><i class="fa fa-plus"></i> 新增</a>--%>
-							</div>
 							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label"><span class="require-item">*</span>合同名称：</label>
 								<div class="layui-input-block">
@@ -736,6 +751,12 @@
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
+								<div class="layui-input-block">
+									<form:input path="contractNum" placeholder="请输入合同编号" htmlEscape="false" class="form-control judgment layui-input"/>
+								</div>
+							</div>
+							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label"><span class="require-item">*</span>签订日期：</label>
 								<div class="layui-input-block">
 									<input placeholder="请选择签订日期" style="background-color: #fff" class="laydate-icondate layui-input form-control layer-date laydate-icon judgment" readonly="readonly" id="contractDate" name="contractDate" value="<fmt:formatDate value="${workContractInfo.contractDate}" pattern="yyyy-MM-dd"/>">
@@ -769,12 +790,6 @@
 									<input type="radio" title="金额合同" lay-filter="jine" name="contractInformation" checked id="jine" value="0" <c:if test="${workContractInfo.contractInformation=='0'}">checked</c:if>>
 									<input type="radio" title="费率合同" lay-filter="jine" name="contractInformation" id="jine1" value="1" <c:if test="${workContractInfo.contractInformation=='1'}">checked</c:if>>
 								</div>
-								<br>
-								<label class="layui-form-label double-line"><span class="require-item">*</span>单位：</label>
-								<div class="layui-input-block">
-									<input type="radio" name="company" value="0" title="东兴"<c:if test="${workContractInfo.company=='0'}">checked</c:if>>
-									<input type="radio" name="company" value="1" title="赣能"<c:if test="${workContractInfo.company=='1'}">checked</c:if> >
-								</div>
 							</div>
 							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label double-line"><span class="require-item">*</span>合同金额 (元)<br/>预计金额：</label>
@@ -782,10 +797,12 @@
 									<form:input path="contractPrice" id="contractPrice" htmlEscape="false"  placeholder="请输入合同金额/预计金额"   pattern="#.00" class="form-control judgment number  layui-input"/>
 								</div>
 							</div>
+
 							<div class="layui-item layui-col-sm6">
-								<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">
-									<form:input path="contractNum" placeholder="请输入合同编号" htmlEscape="false" class="form-control layui-input"/>
+									<input type="radio" name="company" value="0" title="东兴"<c:if test="${workContractInfo.company=='0'}">checked</c:if>>
+									<input type="radio" name="company" value="1" title="赣能"<c:if test="${workContractInfo.company=='1'}">checked</c:if> >
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6">
@@ -916,30 +933,30 @@
 
 							</div>
 						</div>--%>
-						<div class="form-group layui-row">
-							<div class="form-group-label"><h2>联系人信息</h2></div>
+                        <div class="form-group layui-row">
+                            <div class="form-group-label"><h2>联系人信息</h2></div>
 							<div class="layui-item nav-btns">
 								<a class="nav-btn nav-btn-add"
 								   onclick="addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl);workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;"
 								   title="新增"><i class="fa fa-plus"></i> 新增</a>
 							</div>
-							<div class="layui-item layui-col-xs12 form-table-container">
-								<table id="contentTable" class="table table-bordered table-condensed can-edit">
-									<thead>
-									<tr>
-										<th class="hide"></th>
-										<th width="100px"><font color="red">*</font>联系人姓名</th>
-										<th width="100px">部门</th>
-										<th width="100px">职务</th>
-										<th width="100px">QQ</th>
-										<th width="100px">联系方式1</th>
-										<th width="100px">联系方式2</th>
-										<th width="150px">E-mail</th>
-										<th width="100px">操作</th>
-									</tr>
-									</thead>
-									<tbody id="workClientLinkmanList">
-										<%--<c:forEach items="${workClientInfo.workClientLinkmanList}" var="workClientLinkman" varStatus="status">
+                            <div class="layui-item layui-col-xs12 form-table-container">
+                                <table id="contentTable" class="table table-bordered table-condensed can-edit">
+                                    <thead>
+                                    <tr>
+                                        <th class="hide"></th>
+                                        <th width="100px"><font color="red">*</font>联系人姓名</th>
+                                        <th width="100px">部门</th>
+                                        <th width="100px">职务</th>
+                                        <th width="100px">QQ</th>
+                                        <th width="100px">联系方式1</th>
+                                        <th width="100px">联系方式2</th>
+                                        <th width="150px">E-mail</th>
+                                        <th width="100px">操作</th>
+                                    </tr>
+                                    </thead>
+                                    <tbody id="workClientLinkmanList">
+                                       <c:forEach items="${workContractInfo.workClientLinkmanList}" var="workClientLinkman" varStatus="status">
                                             <tr>
                                                    <td class="hide">
                                                        <input id="workClientLinkmanList${status.index + 1}_id"
@@ -947,31 +964,31 @@
                                                               value="${workClientLinkman.id}"/>
                                                        <input id="workClientLinkmanList${status.index + 1}_delFlag"
                                                               name="workClientLinkmanList[${status.index + 1}].delFlag" type="hidden"
-                                                              value="0" readonly/>
+                                                              value="0" />
                                                    </td>
                                                    <td><input id="workClientLinkmanList${status.index + 1}_name"
                                                               name="workClientLinkmanList[${status.index + 1}].name" type="text"
-                                                              value="${workClientLinkman.name}" readonly class="form-control required"/></td>
+                                                              value="${workClientLinkman.name}"  class="form-control required"/></td>
                                                    <td><input id="workClientLinkmanList${status.index + 1}_office"
                                                               name="workClientLinkmanList[${status.index + 1}].office" type="text"
-                                                              value="${workClientLinkman.office}" readonly class="form-control "/></td>
+                                                              value="${workClientLinkman.office}"  class="form-control "/></td>
                                                    <td><input  id="workClientLinkmanList${status.index + 1}_position"
                                                               name="workClientLinkmanList[${status.index + 1}].position" type="text"
-                                                              value="${workClientLinkman.position}" readonly class="form-control "/></td>
+                                                              value="${workClientLinkman.position}"  class="form-control "/></td>
                                                    <td><input id="workClientLinkmanList${status.index + 1}_qq"
                                                               name="workClientLinkmanList[${status.index + 1}].qq"
-                                                              type="text" value="${workClientLinkman.qq}" readonly class="form-control digits"/>
+                                                              type="text" value="${workClientLinkman.qq}"  class="form-control digits"/>
                                                    </td>
                                                    <td><input  id="workClientLinkmanList${status.index + 1}_linkMobile"
                                                               name="workClientLinkmanList[${status.index + 1}].linkMobile" type="text"
-                                                              value="${workClientLinkman.linkMobile}" readonly class="form-control isPhone"/></td>
+                                                              value="${workClientLinkman.linkMobile}"  class="form-control isPhone"/></td>
                                                    <td><input placeholder="请输入联系方式2" id="workClientLinkmanList${status.index + 1}_linkPhone"
                                                               name="workClientLinkmanList[${status.index + 1}].linkPhone" type="text"
-                                                              value="${workClientLinkman.linkPhone}" readonly class="form-control isTel"/></td>
+                                                              value="${workClientLinkman.linkPhone}"  class="form-control isTel"/></td>
                                                    <td><input  id="workClientLinkmanList{{idx}}_email"
                                                               name="workClientLinkmanList[${status.index + 1}].email" type="text"
                                                               value="${workClientLinkman.email}"
-                                                              class="form-control email" readonly/></td>
+                                                              class="form-control email" /></td>
                                                    <td class="text-center op-td">
                                                     <span class="op-btn op-btn-delete"
                                                           onclick="delRow(this, '#workClientLinkmanList${status.index + 1}')"
@@ -979,10 +996,10 @@
                                                             class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>
                                                    </td>
                                             </tr>
-                                        </c:forEach>--%>
-									</tbody>
-								</table>
-								<script type="text/template" id="workClientLinkmanTpl">//<!--
+                                        </c:forEach>
+                                    </tbody>
+                                </table>
+                                <script type="text/template" id="workClientLinkmanTpl">//<!--
             <tr id="workClientLinkmanList{{idx}}">
                 <td class="hide">
                     <input id="workClientLinkmanList{{idx}}_id" name="workClientLinkmanList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
@@ -1023,28 +1040,29 @@
                     {{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#workClientLinkmanList{{idx}}')" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>{{/delBtn}}
                 </td>
             </tr>//-->
-								</script>
-								<script type="text/javascript">
-									var workClientLinkmanRowIdx = 0,
-											workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
-									var workClientBankRowIdx = 0,
-											workClientBankTpl = $("#workClientBankTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
-									$(document).ready(function () {
-										var data = ${fns:toJson(workClientInfo.workClientLinkmanList)};
-										for (var i = 0; i < data.length; i++) {
-											addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl, data[i]);
-											workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
-										}
-										var dataBank = ${fns:toJson(workClientInfo.workClientBankList)};
-										for (var i = 0; i < dataBank.length; i++) {
-											addRow('#workClientBankList', workClientBankRowIdx, workClientBankTpl, dataBank[i]);
-											workClientBankRowIdx = workClientBankRowIdx + 1;
-										}
-									});
 
-								</script>
-							</div>
-						</div>
+                                </script>
+                                <script type="text/javascript">
+                                    var workClientLinkmanRowIdx = 0,
+                                        workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
+                                    var workClientBankRowIdx = 0,
+                                        workClientBankTpl = $("#workClientBankTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
+                                    $(document).ready(function () {
+                                        var data = ${fns:toJson(workClientInfo.workClientLinkmanList)};
+                                        for (var i = 0; i < data.length; i++) {
+                                            addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl, data[i]);
+                                            workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
+                                        }
+                                        var dataBank = ${fns:toJson(workClientInfo.workClientBankList)};
+                                        for (var i = 0; i < dataBank.length; i++) {
+                                            addRow('#workClientBankList', workClientBankRowIdx, workClientBankTpl, dataBank[i]);
+                                            workClientBankRowIdx = workClientBankRowIdx + 1;
+                                        }
+                                    });
+
+                                </script>
+                            </div>
+                        </div>
 						<div class="form-group layui-row">
 							<div class="form-group-label"><h2>合同附件信息</h2></div>
 							<div class="layui-item nav-btns">

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

@@ -143,12 +143,6 @@
 			}
         });
 
-        function addRow(list, idx, tpl, row){
-            var idx1 = $("#workClientInfoList tr").length;
-            if(list == '#workClientInfoList' && idx1 < 100){
-                bornTemplete(list, idx, tpl, row, idx1);
-            }
-        }
         function bornTemplete(list, idx, tpl, row, idx1){
             $(list).append(Mustache.render(tpl, {
                 idx: idx, delBtn: true, row: row,
@@ -194,8 +188,7 @@
                 $("#workClientInfoList tr").eq(i).find("td").eq(1).html(i + 1);
             }*/
         }
-
-        function getRandom(){
+		function getRandom(){
             var GetRandomn = 1;
             //js生成时间戳
             var timestamp=new Date().getTime();
@@ -275,6 +268,16 @@
                 }
             });
         }
+		function addRow(list, idx, tpl, row){
+			var idx1 = $("#workClientBankList tr").length;
+			if(list == '#workClientBankList'){
+				bornTemplete(list, idx, tpl, row, idx1);
+			}
+			var idx2 = $("#workClientLinkmanList tr").length;
+			if(list == '#workClientLinkmanList'){
+				bornTemplete(list, idx, tpl, row, idx2);
+			}
+		}
         function openBill2(title,url,width,height,target,formId){
             var frameIndex = parent.layer.getFrameIndex(window.name);
             var urls = url+"&index="+frameIndex;
@@ -339,29 +342,29 @@
                     }
                 }
             });
-            if(validateForm.form()){
-                $($document.getElementById(inputForm)).ajaxSubmit({
-                    success:function(data) {
-                        var d = data;
-                        if(d.msg == "false"){
-                            parent.layer.msg("保存客户信息异常!",{icon:2});
-                            return false;
-                        }
-                        $("#clientId").val(d.id);
-                        $("#clientName").val(d.name);
-                        addRow('#workClientInfoList', workClientInfoListRowIdx, workClientInfoListTpl);workClientInfoListRowIdx = workClientInfoListRowIdx + 1;
-                        var row = workClientInfoListRowIdx - 1 ;
-                        $("#"+"workClientInfoList"+row+"_id").val(d.id);
-                        $("#"+"workClientInfoList"+row+"_name").val(d.name);
-                        $("#"+"workClientInfoList"+row+"_companyType").val(d.companyType);
-                        $("#"+"workClientInfoList"+row+"_companyIndustry").val(d.companyIndustry);
-                        $("#"+"workClientInfoList"+row+"_area").val(d.areaName);
-                        //$("#"+"workClientInfoList"+row+"_td").hide();
-                        parent.layer.msg(d.str,{icon:1});
-                        top.layer.close(index)
-                    }
-                });
-            }
+			if(validateForm.form()){
+				$($document.getElementById(inputForm)).ajaxSubmit({
+					success:function(data) {
+						var d = data;
+						if(d.msg == "false"){
+							parent.layer.msg("保存客户信息异常!",{icon:2});
+							return false;
+						}
+						$("#clientId").val(d.id);
+						$("#clientName").val(d.name);
+						addRow('#workClientInfoList', workClientInfoListRowIdx, workClientInfoListTpl);workClientInfoListRowIdx = workClientInfoListRowIdx + 1;
+						var row = workClientInfoListRowIdx - 1 ;
+						$("#"+"workClientInfoList"+row+"_id").val(d.id);
+						$("#"+"workClientInfoList"+row+"_name").val(d.name);
+						$("#"+"workClientInfoList"+row+"_companyType").val(d.companyType);
+						$("#"+"workClientInfoList"+row+"_companyIndustry").val(d.companyIndustry);
+						$("#"+"workClientInfoList"+row+"_area").val(d.areaName);
+						//$("#"+"workClientInfoList"+row+"_td").hide();
+						parent.layer.msg(d.str,{icon:1});
+						top.layer.close(index)
+					}
+				});
+			}
         }
         function formSubmit2($document,inputForm,index){
             var validateForm = $($document.getElementById(inputForm)).validate({
@@ -591,6 +594,47 @@
 				<div class="tab-content">
 					<div id="tab-11" class="tab-pane active">
 						<div class="form-group layui-row first lw9">
+							<div class="form-group-label"><h2>客户基础信息</h2>
+								<div class="layui-item layui-col-sm6 lw7" id="">
+									<br>
+									<label class="layui-form-label"><span class="require-item">*</span>客户名称：&nbsp;&nbsp;</label>
+									<div class="layui-input-block">
+										<form:input path="clientName" placeholder="请输入客户名称" htmlEscape="false" id=""  class="form-control required layui-input"/>
+										<span id="ph" style="color:#cc5965"></span>
+									</div>
+									<div id="fuzzyQuerySelect"
+										 style="z-index:1;display:none;background-color:white; position: absolute; width:333px;left:120px; border: 1px solid gray;">
+									</div>
+								</div>
+
+								<div class="layui-item layui-col-sm6 lw7">
+									<br>
+									<label class="layui-form-label"><span class="require-item">*</span>公司电话：</label>
+									<div class="layui-input-block">
+										<form:input path="telephone" placeholder="请输入公司电话" htmlEscape="false" id="telephone" class="form-control required layui-input"/>
+
+									</div>
+								</div>
+								<div class="layui-item layui-col-sm6 lw7">
+									<label class="layui-form-label double-line"><span class="require-item">*</span>拥有统一社会信用代码：</label>
+									<div class="layui-input-block">&nbsp;&nbsp;
+										<form:radiobutton id="hasUscc" class="" name="hasUscc" path="" lay-filter="hasUscc" value="1" label="是" checked="true" />
+										<form:radiobutton id="hasUscc" class="" name="hasUscc" path="" lay-filter="hasUscc" value="2" label="否" />
+									</div>
+								</div>
+								<div class="layui-item layui-col-sm6 lw7 companyType_uscCode">
+									<br>
+									<label class="layui-form-label double-line"><span class="require-item">*</span>统一社会信用代码：</label>
+									<div class="layui-input-block">
+										<form:input path="uscCode" placeholder="请输入统一社会信用代码" htmlEscape="false" id="uscCode"   class="form-control required isUscCode layui-input"/>
+										<input type="hidden" id="oldUscCode" value=""/>
+										<span id="uscPh" style="color:#cc5965"></span>
+									</div>
+								</div>
+							</div>
+						</div>
+
+						<div class="form-group layui-row first lw9">
 							<div class="form-group-label"><h2>合同基础信息</h2></div>
 							<%--<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label"><span class="require-item">*</span>合同来源：</label>
@@ -601,15 +645,15 @@
 									<label for="ext1">非投标项目</label>
 								</div>
 							</div>--%>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label"><span class="require-item">*</span>客户名称：</label>
-								<div class="layui-input-block with-icon" style="margin-right:95px;">
-									<sys:gridselectclien1 url="${ctx}/workcontractinfo/workContractInfo/selectclientAhref" id="client" name="client.id"  value="${workContractInfo.client.id}"  title="选择客户" labelName="client.name"
-														  labelValue="${workContractInfo.client.name}" cssClass="form-control layui-input required" fieldLabels="客户名称" fieldKeys="name" searchLabel="客户名称" searchKey="name" searchLabel1="联系人" searchKey1="workLinkName"></sys:gridselectclien1>
-
-								</div>
-								<a href="javascript:void(0)" onclick="openBill('新增客户管理', '${ctx}/workclientinfo/workClientInfo/form?param=2','90%','90%',false,'inputForm')" class="nav-btn nav-btn-add" style="margin-right: 0px;top:0px;right:16px;position: absolute;height:40px;line-height: 40px;"><i class="fa fa-plus"></i> 新增</a>
-							</div>
+<%--							<div class="layui-item layui-col-sm6">--%>
+<%--								<label class="layui-form-label"><span class="require-item">*</span>客户名称：</label>--%>
+<%--								<div class="layui-input-block with-icon" style="margin-right:95px;">--%>
+<%--&lt;%&ndash;									<sys:gridselectclien1 url="${ctx}/workcontractinfo/workContractInfo/selectclientAhref" id="client" name="client.id"  value="${clientName}"  title="选择客户" labelName="client.name"&ndash;%&gt;--%>
+<%--&lt;%&ndash;														  labelValue="${workContractInfo.client.name}" cssClass="form-control layui-input required" fieldLabels="客户名称" fieldKeys="name" searchLabel="客户名称" searchKey="name" searchLabel1="联系人" searchKey1="workLinkName"></sys:gridselectclien1>&ndash;%&gt;--%>
+<%--										<form:input path="clientName" placeholder="${workContractInfo.clientName}" htmlEscape="false" id="clientName"   class="form-control required isUscCode layui-input"/>--%>
+<%--								</div>--%>
+<%--&lt;%&ndash;								<a href="javascript:void(0)" onclick="openBill('新增客户管理', '${ctx}/workclientinfo/workClientInfo/form?param=2','90%','90%',false,'inputForm')" class="nav-btn nav-btn-add" style="margin-right: 0px;top:0px;right:16px;position: absolute;height:40px;line-height: 40px;"><i class="fa fa-plus"></i> 新增</a>&ndash;%&gt;--%>
+<%--							</div>--%>
 							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label"><span class="require-item">*</span>合同名称：</label>
 								<div class="layui-input-block readOnlyFFF">
@@ -617,6 +661,12 @@
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
+								<div class="layui-input-block">
+									<form:input path="contractNum" htmlEscape="false" class="form-control layui-input"/>
+								</div>
+							</div>
+							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label"><span class="require-item">*</span>签订日期：</label>
 								<div class="layui-input-block readOnlyFFF">
 									<input class="laydate-icondate layui-input form-control layer-date laydate-icon required" readonly id="contractDate" name="contractDate" value="<fmt:formatDate value="${workContractInfo.contractDate}" pattern="yyyy-MM-dd"/>">
@@ -648,6 +698,12 @@
 								<div class="layui-input-block">
 									<input type="radio" title="金额合同" lay-filter="jine" name="contractInformation" checked id="jine" value="0" <c:if test="${workContractInfo.contractInformation=='0'}">checked</c:if>>
 									<input type="radio" title="费率合同" lay-filter="jine" name="contractInformation" id="jine1" value="1" <c:if test="${workContractInfo.contractInformation=='1'}">checked</c:if>>
+<%--								<br>--%>
+<%--									<label class="layui-form-label double-line"><span class="require-item">*</span>单位：</label>--%>
+<%--									<div class="layui-input-block">--%>
+<%--										<input type="radio" name="company" value="0" title="东兴"<c:if test="${workContractInfo.company=='0'}">checked</c:if>>--%>
+<%--										<input type="radio" name="company" value="1" title="赣能"<c:if test="${workContractInfo.company=='1'}">checked</c:if> >--%>
+<%--									</div>--%>
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6">
@@ -657,6 +713,13 @@
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label"><span class="require-item">*</span>单位：</label>
+								<div class="layui-input-block">
+									<input type="radio" name="company" value="0" title="东兴"<c:if test="${workContractInfo.company=='0'}">checked</c:if>>
+									<input type="radio" name="company" value="1" title="赣能"<c:if test="${workContractInfo.company=='1'}">checked</c:if> >
+								</div>
+							</div>
+							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label">对方合同编号：</label>
 								<div class="layui-input-block">
 									<form:input path="anotherContractNum" htmlEscape="false" class="form-control layui-input"/>
@@ -701,7 +764,141 @@
 								</div>
 							</div>
 						</div>
-						<%--<div class="form-group layui-row">
+						<div class="form-group layui-row">
+							<div class="form-group-label"><h2>联系人信息</h2></div>
+							<div class="layui-item nav-btns">
+								<a class="nav-btn nav-btn-add"
+								   onclick="addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl);workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;"
+								   title="新增"><i class="fa fa-plus"></i> 新增</a>
+							</div>
+							<div class="layui-item layui-col-xs12 form-table-container">
+								<table id="contentTable" class="table table-bordered table-condensed can-edit">
+									<thead>
+									<tr>
+										<th class="hide"></th>
+										<th width="100px"><font color="red">*</font>联系人姓名</th>
+										<th width="100px">部门</th>
+										<th width="100px">职务</th>
+										<th width="100px">QQ</th>
+										<th width="100px">联系方式1</th>
+										<th width="100px">联系方式2</th>
+										<th width="150px">E-mail</th>
+										<th width="100px">操作</th>
+									</tr>
+									</thead>
+									<tbody id="workClientLinkmanList">
+										<c:forEach items="${workContractInfo.workClientLinkmanList}" var="workClientLinkman" varStatus="status">
+                                            <tr>
+                                                   <td class="hide">
+                                                       <input id="workClientLinkmanList${status.index + 1}_id"
+                                                              name="workClientLinkmanList[${status.index + 1}].id" type="hidden"
+                                                              value="${workClientLinkman.id}"/>
+                                                       <input id="workClientLinkmanList${status.index + 1}_delFlag"
+                                                              name="workClientLinkmanList[${status.index + 1}].delFlag" type="hidden"
+                                                              value="0" />
+                                                   </td>
+                                                   <td><input id="workClientLinkmanList${status.index + 1}_name"
+                                                              name="workClientLinkmanList[${status.index + 1}].name" type="text"
+                                                              value="${workClientLinkman.name}"  class="form-control required"/></td>
+                                                   <td><input id="workClientLinkmanList${status.index + 1}_office"
+                                                              name="workClientLinkmanList[${status.index + 1}].office" type="text"
+                                                              value="${workClientLinkman.office}"  class="form-control "/></td>
+                                                   <td><input  id="workClientLinkmanList${status.index + 1}_position"
+                                                              name="workClientLinkmanList[${status.index + 1}].position" type="text"
+                                                              value="${workClientLinkman.position}"  class="form-control "/></td>
+                                                   <td><input id="workClientLinkmanList${status.index + 1}_qq"
+                                                              name="workClientLinkmanList[${status.index + 1}].qq"
+                                                              type="text" value="${workClientLinkman.qq}"  class="form-control digits"/>
+                                                   </td>
+                                                   <td><input  id="workClientLinkmanList${status.index + 1}_linkMobile"
+                                                              name="workClientLinkmanList[${status.index + 1}].linkMobile" type="text"
+                                                              value="${workClientLinkman.linkMobile}"  class="form-control isPhone"/></td>
+                                                   <td><input placeholder="请输入联系方式2" id="workClientLinkmanList${status.index + 1}_linkPhone"
+                                                              name="workClientLinkmanList[${status.index + 1}].linkPhone" type="text"
+                                                              value="${workClientLinkman.linkPhone}"  class="form-control isTel"/></td>
+                                                   <td><input  id="workClientLinkmanList{{idx}}_email"
+                                                              name="workClientLinkmanList[${status.index + 1}].email" type="text"
+                                                              value="${workClientLinkman.email}"
+                                                              class="form-control email" /></td>
+                                                   <td class="text-center op-td">
+                                                    <span class="op-btn op-btn-delete"
+                                                          onclick="delRow(this, '#workClientLinkmanList${status.index + 1}')"
+                                                          title="删除" ><i
+                                                            class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>
+                                                   </td>
+                                            </tr>
+                                        </c:forEach>
+									</tbody>
+								</table>
+
+								<script type="text/template" id="workClientLinkmanTpl">//<!--
+            <tr id="workClientLinkmanList{{idx}}">
+                <td class="hide">
+                    <input id="workClientLinkmanList{{idx}}_id" name="workClientLinkmanList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
+                    <input id="workClientLinkmanList{{idx}}_delFlag" name="workClientLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
+                </td>
+
+                <td>
+                    <input  placeholder="请输入联系人姓名" id="workClientLinkmanList{{idx}}_name" name="workClientLinkmanList[{{idx}}].name" type="text" value="{{row.name}}"    class="form-control required"/>
+                </td>
+                <td>
+                    <input placeholder="请输入部门" id="workClientLinkmanList{{idx}}_office" name="workClientLinkmanList[{{idx}}].office" type="text" value="{{row.office}}"    class="form-control "/>
+                </td>
+                <td>
+                    <input placeholder="请输入职务" id="workClientLinkmanList{{idx}}_position" name="workClientLinkmanList[{{idx}}].position" type="text" value="{{row.position}}"    class="form-control "/>
+                </td>
+
+
+                <td>
+                    <input placeholder="请输入QQ" id="workClientLinkmanList{{idx}}_qq" name="workClientLinkmanList[{{idx}}].qq" type="text" value="{{row.qq}}"    class="form-control digits"/>
+                </td>
+
+
+                <td>
+                    <input placeholder="请输入联系方式1" id="workClientLinkmanList{{idx}}_linkPhone" name="workClientLinkmanList[{{idx}}].linkPhone" type="text" value="{{row.linkPhone}}"    class="form-control isTel"/>
+                </td>
+
+
+                <td>
+                    <input placeholder="请输入联系方式2" id="workClientLinkmanList{{idx}}_linkMobile" name="workClientLinkmanList[{{idx}}].linkMobile" type="text" value="{{row.linkMobile}}"    class="form-control isPhone"/>
+                </td>
+
+
+                <td>
+                    <input placeholder="请输入E-mail" id="workClientLinkmanList{{idx}}_email" name="workClientLinkmanList[{{idx}}].email" type="text" value="{{row.email}}"    class="form-control email"/>
+                </td>
+
+                <td class="text-center op-td" >
+                    {{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#workClientLinkmanList{{idx}}')" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>{{/delBtn}}
+                </td>
+            </tr>//-->
+								</script>
+								<script type="text/javascript">
+									var workClientLinkmanRowIdx = 0,
+											workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
+									var workClientBankRowIdx = 0,
+											workClientBankTpl = $("#workClientBankTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
+									$(document).ready(function () {
+										var data = ${fns:toJson(workClientLinkmanList)};
+										console.log(data);
+										for (var i = 0; i < data.length; i++) {
+											addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl, data[i]);
+											workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
+										}
+
+										var dataBank = ${fns:toJson(workClientInfo.workClientBankList)};
+										for (var i = 0; i < dataBank.length; i++) {
+											addRow('#workClientBankList', workClientBankRowIdx, workClientBankTpl, dataBank[i]);
+											workClientBankRowIdx = workClientBankRowIdx + 1;
+										}
+									});
+
+								</script>
+							</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 nav-btns">
 								<a href="javascript:void(0)" onclick="openBill2('新增客户管理', '${ctx}/workclientinfo/workClientInfo/formType?param=1','90%','90%',false,'inputForm')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增客户</a>
@@ -998,6 +1195,13 @@
 			})
 		});
 	</script>
+	<script type="text/javascript">
+		var workClientInfoListRowIdx = 0,
+				workClientInfoListTpl = $("#workClientInfoListTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
+		if ($("#id").val() || $("#aId").val()) {
+			workClientInfoListRowIdx = ${fn:length(workContractInfo.workClientInfoList)};
+		}
+	</script>
 </div>
 </body>
 </html>

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

@@ -93,7 +93,7 @@
                 maxmin: false, //开启最大化最小化按钮
                 skin:"three-btns",
                 content: url ,
-                btn: ['送审','暂存','关闭'],
+                btn: ['提交','暂存','关闭'],
                 btn1: function(index, layero){
                     var body = top.layer.getChildFrame('body', index);
                     var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
@@ -145,7 +145,7 @@
                 maxmin: false, //开启最大化最小化按钮
                 skin:"three-btns",
                 content: url ,
-                btn: ['送审','关闭'],
+                btn: ['提交','关闭'],
                 btn1: function(index, layero){
                     var body = top.layer.getChildFrame('body', index);
                     var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
@@ -218,7 +218,7 @@
                 maxmin: false, //开启最大化最小化按钮
                 content: url ,
                 skin:"three-btns",
-                btn: ['送审','暂存','关闭'],
+                btn: ['提交','暂存','关闭'],
                 btn1: function(index, layero){
                     var body = top.layer.getChildFrame('body', index);
                     var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
@@ -273,7 +273,7 @@
                 maxmin: true, //开启最大化最小化按钮
                 skin:"two-btns",
                 content: url,
-                btn: ['送审', /*'撤回',*/ '关闭'],
+                btn: ['提交', /*'撤回',*/ '关闭'],
                 btn1: function (index, layero) {
                     var body = top.layer.getChildFrame('body', index);
                     var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
@@ -397,7 +397,7 @@
                 maxmin: false, //开启最大化最小化按钮
                 skin:"three-btns",
                 content: url ,
-                btn: ['送审','关闭'],
+                btn: ['提交','关闭'],
                 btn1: function(index, layero){
                     var body = top.layer.getChildFrame('body', index);
                     var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
@@ -434,7 +434,7 @@
 			   maxmin: false, //开启最大化最小化按钮
 			   skin: 'two-btns',
 			   content: url ,
-			   btn: ['送审','关闭'],
+			   btn: ['提交','关闭'],
 			   yes: function(index, layero){
 				   var body = top.layer.getChildFrame('body', index);
 				   var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
@@ -550,7 +550,7 @@
 					<div class="layui-item query athird">
 						<label class="layui-form-label">客户名称：</label>
 						<div class="layui-input-block with-icon">
-							<form:input path="client.name" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+							<form:input path="clientName" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
 						</div>
 					</div>
 					<div class="layui-item query athird">
@@ -677,10 +677,14 @@
                         return "<a class=\"attention-info\" title=\""+d.contractName+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同管理', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.id + "','95%', '95%')\">" + d.contractName + "</a>";
                     }}
                 ,{field:'recordNum',align:'center', title: '案卷号',minWidth:200,templet:function(d){
-                        return "<a class=\"attention-info\" title=\""+d.recordNum+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同归档信息', '${ctx}/workcontractrecord/workContractRecord/form?id=" + d.contrractRecordId + "&tabId=1','95%', '95%')\">" + d.recordNum + "</a>";
+						return "<p class=\"attention-info\" title=\""+d.recordNum+"\" "+
+								">" +
+								d.recordNum + "</p>";
                     }}
                 ,{field:'clientName',align:'center', title: '客户名称',minWidth:160,templet:function(d){
-                        return "<a class=\"attention-info\" title=\""+d.clientName+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看客户管理', '${ctx}/workclientinfo/workClientInfo/detail?id=" + d.clientId +"','95%', '95%')\">" + d.clientName + "</a>";
+						return "<p class=\"attention-info\" title=\""+d.clientName+"\" " +
+								" >"
+								+ d.clientName + "</p>";
                     }}
                 ,{field:'contractPrice', align:'center',title: '合同金额(元)',width:100,templet:function(d){
                         return "<span title='"+ d.contractPrice2 +"'>" + d.contractPrice2 + "</span>";
@@ -853,7 +857,7 @@
                     ,"id":"${workContractInfo.id}"
                     ,"contractName":"${workContractInfo.name}"
 					,"clientId":"${workContractInfo.client.id}"
-                    ,"clientName":"${workContractInfo.client.name}"
+                    ,"clientName":"${workContractInfo.clientName}"
                     ,"clientType":"${fns:getMainDictLabel(workContractInfo.contractType, 'contract_type', '')}"
                     ,"contractPrice":"${workContractInfo.contractPrice}"
                     ,"contractPrice2":"<fmt:formatNumber value="${workContractInfo.contractPrice}" pattern="#,#00.00"/>"

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

@@ -550,7 +550,7 @@
 					<div class="layui-item query athird">
 						<label class="layui-form-label">客户名称：</label>
 						<div class="layui-input-block with-icon">
-							<form:input path="client.name" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+							<form:input path="clientName" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
 						</div>
 					</div>
 					<div class="layui-item query athird">
@@ -681,10 +681,14 @@
                         return "<a class=\"attention-info\" title=\""+d.contractName+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同管理', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.id + "','95%', '95%')\">" + d.contractName + "</a>";
                     }}
                 ,{field:'recordNum',align:'center', title: '案卷号',minWidth:200,templet:function(d){
-                        return "<a class=\"attention-info\" title=\""+d.recordNum+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同归档信息', '${ctx}/workcontractrecord/workContractRecord/form?id=" + d.contrractRecordId + "&tabId=1','95%', '95%')\">" + d.recordNum + "</a>";
+                        return "<p class=\"attention-info\" title=\""+d.recordNum+"\" "+
+								">" +
+								d.recordNum + "</p>";
                     }}
                 ,{field:'clientName',align:'center', title: '客户名称',minWidth:160,templet:function(d){
-                        return "<a class=\"attention-info\" title=\""+d.clientName+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看客户管理', '${ctx}/workclientinfo/workClientInfo/detail?id=" + d.clientId +"','95%', '95%')\">" + d.clientName + "</a>";
+                        return "<p class=\"attention-info\" title=\""+d.clientName+"\" " +
+								" >"
+								+ d.clientName + "</p>";
                     }}
                 ,{field:'contractPrice', align:'center',title: '合同金额(元)',width:100,templet:function(d){
                         return "<span title='"+ d.contractPrice2 +"'>" + d.contractPrice2 + "</span>";
@@ -866,7 +870,7 @@
                     ,"id":"${workContractInfo.id}"
                     ,"contractName":"${workContractInfo.name}"
 					,"clientId":"${workContractInfo.client.id}"
-                    ,"clientName":"${workContractInfo.client.name}"
+                    ,"clientName":"${workContractInfo.clientName}"
                     ,"clientType":"${fns:getMainDictLabel(workContractInfo.contractType, 'contract_type', '')}"
                     ,"contractPrice":"${workContractInfo.contractPrice}"
                     ,"contractPrice2":"<fmt:formatNumber value="${workContractInfo.contractPrice}" pattern="#,#00.00"/>"

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

@@ -131,20 +131,59 @@
 
 		<div class="tabs-container">
 			<div class="tab-content">
+				<div id="tab-12" class="tab-pane active">
+					<div class="form-group-label"><h2>客户基础信息</h2>
+						<div class="layui-item layui-col-sm6 lw7">
+							<br>
+							<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="${workContractInfo.clientName}"/>
+							</div>
+						</div>
+						<div class="layui-item layui-col-sm6 lw7">
+							<br>
+							<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="${workContractInfo.telephone}"/>
+							</div>
+						</div>
+						<div class="layui-item layui-col-sm6 lw7">
+							<label class="layui-form-label double-line">拥有统一社会信用代码：</label>
+							<div class="layui-input-block">
+								<input type="radio" name="hasUscc" value="1" title="是" disabled <c:if test="${workContractInfo.hasUscc=='1'}">checked</c:if>>
+								<input type="radio" name="hasUscc" value="2" title="否" disabled <c:if test="${workContractInfo.hasUscc=='2'}">checked</c:if> >
+							</div>
+						</div>
+						<div class="layui-item layui-col-sm6 lw7">
+							<br>
+							<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="${workContractInfo.uscCode}"/>
+							</div>
+						</div>
+					</div>
+
+				</div>
 				<div id="tab-11" class="tab-pane active">
 					<div class="form-group layui-row first lw9">
 						<div class="form-group-label"><h2>项目合同信息</h2></div>
+<%--						<div class="layui-item layui-col-sm6">--%>
+<%--							<label class="layui-form-label ">客户名称：</label>--%>
+<%--							<div class="layui-input-block">--%>
+<%--								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.clientName}"/>--%>
+<%--							</div>--%>
+<%--						</div>--%>
+
 						<div class="layui-item layui-col-sm6">
-							<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="${workContractInfo.client.name}"/>
+								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.name}"/>
 							</div>
 						</div>
-
 						<div class="layui-item layui-col-sm6">
-							<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="${workContractInfo.name}"/>
+								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.contractNum}"/>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6">
@@ -189,6 +228,14 @@
 <%--								</c:if>--%>
 <%--							</shiro:hasPermission>--%>
 						</div>
+
+						<div class="layui-item layui-col-sm6">
+							<label class="layui-form-label"><span class="require-item">*</span>单位：</label>
+							<div class="layui-input-block">
+								<input type="radio" name="company" value="0" title="东兴" disabled <c:if test="${workContractInfo.company=='0'}">checked</c:if>>
+								<input type="radio" name="company" value="1" title="赣能" disabled <c:if test="${workContractInfo.company=='1'}">checked</c:if> >
+							</div>
+						</div>
 						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label ">对方合同编号：</label>
 							<div class="layui-input-block">
@@ -374,6 +421,44 @@
 						</div>
 					</c:if>--%>
 					<div class="form-group layui-row">
+						<div class="form-group-label"><h2>联系人信息</h2></div>
+						<div class="layui-item layui-col-xs12 form-table-container" >
+							<table id="contentTable" class="table table-bordered table-condensed no-bottom-margin details">
+								<thead>
+								<tr>
+									<th class="hide"></th>
+									<th width="150px">联系人姓名</th>
+									<th >部门</th>
+									<th width="150px">职务</th>
+									<th width="150px">QQ</th>
+									<th width="150px">联系方式1</th>
+									<th width="150px">联系方式2</th>
+									<th width="150px">E-mail</th>
+								</tr>
+								</thead>
+								<tbody id="workClientLinkmanList">
+								<c:forEach items="${clientList}" var="workClientLinkman" varStatus="status">
+									<tr>
+										<td class="hide">${status.index + 1}</td>
+										<td >${workClientLinkman.name}</td>
+										<td >${workClientLinkman.office}</td>
+										<td >${workClientLinkman.position}</td>
+										<td >${workClientLinkman.qq}</td>
+										<td >${workClientLinkman.linkPhone}</td>
+										<td >${workClientLinkman.linkMobile}</td>
+										<td >${workClientLinkman.email}</td>
+									</tr>
+								</c:forEach>
+<%--								<c:if test="${linkManSize == 0}">--%>
+<%--									<tr>--%>
+<%--										<td colspan="8">暂无数据</td>--%>
+<%--									</tr>--%>
+<%--								</c:if>--%>
+								</tbody>
+							</table>
+						</div>
+					</div>
+					<div class="form-group layui-row">
 						<div class="form-group-label"><h2>合同附件表</h2></div>
 						<div class="layui-item layui-col-xs12 form-table-container" >
 							<table id="contentTable" class="table table-bordered table-condensed no-bottom-margin details">

src/main/webapp/webpage/modules/workcontractrecord/workContractRecordAudit.jsp

@@ -128,7 +128,7 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">客户名称：</label>
 					<div class="layui-input-block">
-						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${workContractRecord.workContractInfo.client.name}"/>
+						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${workContractRecord.workContractInfo.clientName}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
@@ -175,6 +175,13 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">单位：</label>
+					<div class="layui-input-block">
+						<input type="radio" name="workContractRecord.workContractInfo.company" value="0" title="东兴" disabled <c:if test="${workContractRecord.workContractInfo.company=='0'}">checked</c:if>>
+						<input type="radio" name="workContractRecord.workContractInfo.company" value="1" title="赣能" disabled <c:if test="${workContractRecord.workContractInfo.company=='1'}">checked</c:if> >
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
 					<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="${workContractRecord.workContractInfo.anotherContractNum}"/>
@@ -239,7 +246,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label double-line"><span class="require-item">*</span>确认案卷号：</label>
+					<label class="layui-form-label"><span class="require-item">*</span>确认案卷号：</label>
 					<div class="layui-input-block">
 						<input id="fileNumTow" placeholder="请输入确认案卷号" name="fileNumTow" type="text"  class="layui-input form-control" equalTo="#fileNum"/>
 					</div>

src/main/webapp/webpage/modules/workcontractrecord/workContractRecordForm.jsp

@@ -198,14 +198,14 @@
 			<input type="hidden" id="chargeCriterionH" value="${workContractRecord.workContractInfo.chargeCriterion}">
 			<div class="form-group layui-row first lw8">
 				<div class="form-group-label"><h2>基础信息</h2></div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>客户名称：</label>
 					<div class="layui-input-block with-icon">
 						<sys:gridselectclien1 url="${ctx}/workcontractinfo/workContractInfo/selectclientAhref" id="client" name="workContractInfo.client.id"  value="${workContractRecord.workContractInfo.client.id}"  title="选择客户" labelName="workContractInfo.client.name"
 											  cssStyle="background-color:#fff" labelValue="${workContractRecord.workContractInfo.client.name}" cssClass="form-control layui-input required" fieldLabels="客户名称" fieldKeys="name" searchLabel="客户名称" searchKey="name" searchLabel1="联系人" searchKey1="workLinkName"></sys:gridselectclien1>
 
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>合同名称：</label>
 					<div class="layui-input-block">
@@ -231,15 +231,6 @@
 						<input placeholder="请输入合同终止日期" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="closingDate" name="workContractInfo.closingDate" value="<fmt:formatDate value="${workContractRecord.workContractInfo.closingDate}" pattern="yyyy-MM-dd"/>">
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 ">
-					<label class="layui-form-label"><span class="require-item">*</span>合同类型：</label>
-					<div class="layui-input-block readOnlyFFF">
-						<form:select path="workContractInfo.contractTypeDoc" id="contractTypeDoc" cssClass="form-control required simple-select">
-							<form:option value="" label=""/>
-							<form:options items="${fns:getMainDictList('contract_info_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-						</form:select>
-					</div>
-				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label double-line"><span class="require-item">*</span>合同金额类别：</label>
 					<div class="layui-input-block">
@@ -254,6 +245,22 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label"><span class="require-item">*</span>单位：</label>
+					<div class="layui-input-block">
+						<input type="radio" name="company" value="0" title="东兴" disabled <c:if test="${workContractRecord.workContractInfo.company=='0'}">checked</c:if>>
+						<input type="radio" name="company" value="1" title="赣能" disabled <c:if test="${workContractRecord.workContractInfo.company=='1'}">checked</c:if> >
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 ">
+					<label class="layui-form-label"><span class="require-item">*</span>合同类型：</label>
+					<div class="layui-input-block readOnlyFFF">
+						<form:select path="workContractInfo.contractTypeDoc" id="contractTypeDoc" cssClass="form-control required simple-select">
+							<form:option value="" label=""/>
+							<form:options items="${fns:getMainDictList('contract_info_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+						</form:select>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">对方合同编号：</label>
 					<div class="layui-input-block">
 						<form:input path="workContractInfo.anotherContractNum" placeholder="请输入对方合同编号" htmlEscape="false" class="form-control layui-input"/>

src/main/webapp/webpage/modules/workcontractrecord/workContractRecordModifyApply.jsp

@@ -143,14 +143,14 @@
 			<input type="hidden" id="chargeCriterionH" value="${workContractRecord.workContractInfo.chargeCriterion}">
 			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>基础信息</h2></div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>客户名称：</label>
 					<div class="layui-input-block with-icon">
 						<sys:gridselectclien1 url="${ctx}/workcontractinfo/workContractInfo/selectclientAhref" id="client" name="workContractInfo.client.id"  value="${workContractRecord.workContractInfo.client.id}"  title="选择客户" labelName="workContractInfo.client.name"
 											  cssStyle="background-color:#fff" labelValue="${workContractRecord.workContractInfo.client.name}" cssClass="form-control layui-input required" fieldLabels="客户名称" fieldKeys="name" searchLabel="客户名称" searchKey="name" searchLabel1="联系人" searchKey1="workLinkName"></sys:gridselectclien1>
 
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>合同名称：</label>
 					<div class="layui-input-block">
@@ -175,15 +175,6 @@
 						<input placeholder="请输入合同终止日期" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="closingDate" name="workContractInfo.closingDate" value="<fmt:formatDate value="${workContractRecord.workContractInfo.closingDate}" pattern="yyyy-MM-dd"/>">
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 ">
-					<label class="layui-form-label"><span class="require-item">*</span>合同类型：</label>
-					<div class="layui-input-block readOnlyFFF">
-						<form:select path="workContractInfo.contractTypeDoc" id="contractTypeDoc" cssClass="form-control required simple-select">
-							<form:option value="" label=""/>
-							<form:options items="${fns:getMainDictList('contract_info_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-						</form:select>
-					</div>
-				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label double-line"><span class="require-item">*</span>合同金额类别：</label>
 					<div class="layui-input-block">
@@ -198,6 +189,22 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label"><span class="require-item">*</span>单位：</label>
+					<div class="layui-input-block">
+						<input type="radio" name="company" value="0" title="东兴" disabled <c:if test="${workContractRecord.workContractInfo.company=='0'}">checked</c:if>>
+						<input type="radio" name="company" value="1" title="赣能" disabled <c:if test="${workContractRecord.workContractInfo.company=='1'}">checked</c:if> >
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 ">
+					<label class="layui-form-label"><span class="require-item">*</span>合同类型：</label>
+					<div class="layui-input-block readOnlyFFF">
+						<form:select path="workContractInfo.contractTypeDoc" id="contractTypeDoc" cssClass="form-control required simple-select">
+							<form:option value="" label=""/>
+							<form:options items="${fns:getMainDictList('contract_info_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+						</form:select>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label double-line">对方合同编号：</label>
 					<div class="layui-input-block">
 						<form:input path="workContractInfo.anotherContractNum" placeholder="请输入对方合同编号" htmlEscape="false" class="form-control layui-input"/>

src/main/webapp/webpage/modules/workcontractrecord/workContractView.jsp

@@ -93,14 +93,53 @@
 		<form:form id="inputForm" modelAttribute="workContractRecord" action="${ctx}/workcontractrecord/workContractRecord/save" method="post" class="form-horizontal layui-form">
 		<form:hidden path="id"/>
 
+			<div id="tab-12" class="tab-pane active">
+				<div class="form-group-label"><h2>客户基础信息</h2>
+					<div class="layui-item layui-col-sm6 lw7">
+						<br>
+						<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="${workContractRecord.workContractInfo.clientName}"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6 lw7">
+						<br>
+						<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="${workContractRecord.workContractInfo.telephone}"/>
+						</div>
+					</div>
+					<%--<div class="layui-item layui-col-sm6 lw7">
+						<br>
+						<label class="layui-form-label double-line">拥有统一社会信用代码：</label>
+						<div class="layui-input-block">
+                    <span class="radio-box">&nbsp;&nbsp;
+                        <input type="radio" class="usccClass" name="hasUscc" label="是" disabled="true" <c:if test="${workContractRecord.workContractInfo.hasUscc eq 1}">checked="true"</c:if> />是
+                        &nbsp;&nbsp;
+                        <input type="radio" class="usccClass" name="hasUscc" label="否" disabled="true" <c:if test="${workContractRecord.workContractInfo.hasUscc eq 2}">checked="true"</c:if> />否
+                    </span>
+						</div>
+					</div>--%>
+					<div class="layui-item layui-col-sm6 lw7">
+						<br>
+						<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="${workContractRecord.workContractInfo.uscCode}"/>
+						</div>
+					</div>
+				</div>
+
+			</div>
+
+
 			<div class="form-group layui-row first lw8">
 				<div class="form-group-label"><h2>基础信息</h2></div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">客户名称：</label>
 					<div class="layui-input-block">
-						<input  htmlEscape="false" readonly="true" style="background-color: #f1f1f1" class="form-control  layui-input" value="${workContractRecord.workContractInfo.client.name}"/>
+						<input  htmlEscape="false" readonly="true" style="background-color: #f1f1f1" class="form-control  layui-input" value="${workContractRecord.workContractInfo.clientName}"/>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">合同名称：</label>
 					<div class="layui-input-block with-icon">
@@ -126,12 +165,6 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<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="${fns:getMainDictLabel(workContractRecord.workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label double-line"><span class="require-item">*</span>合同金额类别：</label>
 					<div class="layui-input-block">
 						<input type="radio" title="金额合同" lay-filter="jine" name="contractInformation" disabled id="jine" value="0" <c:if test="${workContractRecord.workContractInfo.contractInformation=='0'}">checked</c:if>>
@@ -145,6 +178,19 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label"><span class="require-item">*</span>单位：</label>
+					<div class="layui-input-block">
+						<input type="radio" name="company" value="0" title="东兴" disabled <c:if test="${workContractRecord.workContractInfo.company=='0'}">checked</c:if>>
+						<input type="radio" name="company" value="1" title="赣能" disabled <c:if test="${workContractRecord.workContractInfo.company=='1'}">checked</c:if> >
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<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="${fns:getMainDictLabel(workContractRecord.workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
 					<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="${workContractRecord.workContractInfo.anotherContractNum}"/>