合同相关代码修改

项目归档部分代码开发

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/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/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/RuralProjectViewController.java

@@ -38,7 +38,7 @@ import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workbidproject.entity.WorkBidProject;
 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.service.WorkClientInfoService;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoService;
@@ -230,13 +230,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);
@@ -856,7 +852,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());
 
@@ -866,7 +862,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());
@@ -874,7 +870,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/workcontractinfo/service/WorkContractInfoService.java

@@ -579,10 +579,20 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 		}
 
 		super.save(workContractInfo);
-		//根据合同编号删除所有合同联系人信息
-		workClientLinkmanDao.deleteContractLinkman(workContractInfo.getId());
 
 		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())){

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/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

@@ -427,7 +427,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);
@@ -935,7 +935,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>