客户合同信息

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

@@ -3,7 +3,8 @@ package com.jeeplus.modules.ruralprojectrecords.web;
 import com.google.common.collect.Lists;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.web.BaseController;
-import com.jeeplus.modules.act.service.ActTaskService;
+import com.jeeplus.modules.alterinfo.entity.AlterInfo;
+import com.jeeplus.modules.alterinfo.service.AlterInfoService;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportRecord;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataService;
@@ -14,9 +15,11 @@ import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectMessageServic
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.utils.DictUtils;
-import com.jeeplus.modules.workactivity.service.ActivityService;
-import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
+import com.jeeplus.modules.workbidproject.entity.WorkBidProject;
+import com.jeeplus.modules.workbidproject.service.WorkBidProjectService;
+import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
 import com.jeeplus.modules.workclientinfo.service.WorkClientInfoService;
+import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +27,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -42,9 +46,18 @@ public class RuralProjectViewController extends BaseController {
     private ProjectReportDataService projectReportDataService;
     @Autowired
     private RuralProjectMessageService ruralProjectMessageService;
+    @Autowired
+    private WorkBidProjectService workBidProjectService;
+    @Autowired
+    private AlterInfoService alterInfoService;
+    @Autowired
+    private WorkContractInfoService workContractInfoService;
+    @Autowired
+    private WorkClientInfoService workClientInfoService;
 
     /**
      * 项目查看
+     * 传参：项目id
      * @param projectRecords
      * @param model
      * @return
@@ -57,12 +70,14 @@ public class RuralProjectViewController extends BaseController {
             projectRecordsService.queryProjectDetail(projectRecords);
             ProjectPlanInfo projectPlanInfo = new ProjectPlanInfo();
             projectPlanInfo.setProjectId(projectRecords.getId());
+            if(null != projectRecords.getWorkContractInfo()){
+                if(null != projectRecords.getWorkContractInfo().getContractTypeDoc()){
+                    projectRecords.getWorkContractInfo().setContractType(DictUtils.getMainDictLabel(String.valueOf(projectRecords.getWorkContractInfo().getContractTypeDoc()),"contract_info_type",""));
+                }
+            }
             //获取项目计划信息
             List<ProjectPlanInfo> projectPlanList = projectPlanService.getProjectPlanList(projectPlanInfo);
-            //项目计划附件信息
-            List<WorkClientAttachment> projectPlanAttachment = projectPlanService.getWorkAttachment(projectRecords.getId());
             projectRecords.setProjectPlanList(projectPlanList);
-            projectRecords.setWorkAttachments(projectPlanAttachment);
             List<MainDictDetail> mainDictList = Lists.newArrayList();
             //工程咨询
             if("1".equals(projectRecords.getProjectType())){
@@ -94,7 +109,37 @@ public class RuralProjectViewController extends BaseController {
             }
         }
         model.addAttribute("projectRecords", projectRecords);
-        return "modules/ruralprojectrecords/ruralProjectRecordsView";
+        return "modules/ruralprojectrecords/view/ruralProjectRecordsView";
+    }
+
+    /**
+     * 客户合同信息查看
+     * 传参：合同id
+     */
+    @RequiresPermissions(value={"ruralProject:ruralProjectView:view"})
+    @RequestMapping(value = "workContractView")
+    public String lookForm(WorkContractInfo workContractInfo, Model model) {
+        workContractInfo = workContractInfoService.get(workContractInfo.getId());
+        if("0".equals(workContractInfo.getExt())){
+            WorkBidProject workBidProject = workBidProjectService.get(workContractInfo.getProject().getId());
+            workContractInfo.setProject(workBidProject);
+        }
+        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());
+        }
+        //合同作废信息
+        AlterInfo alterInfo = alterInfoService.getByContractInfo(workContractInfo);
+        model.addAttribute("alterInfo",alterInfo);
+        model.addAttribute("workContractInfo", workContractInfo);
+        return "modules/ruralprojectrecords/view/workClientAndContractView";
     }
 
 }

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

@@ -347,7 +347,11 @@
 				{checkbox: true, fixed: true},
                 {field:'index',align:'center', title: '序号',width:40}
                 ,{field:'projName',align:'center', title: '项目名称',minWidth:200,templet:function(d){
-                        return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
+						if(1 == d.showView && d.showView != undefined){
+							return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
+						}else{
+							return "<span title='"+ d.projName +"'>" +d.projName+ "</span>";
+						}
                     }}
 				,{field:'projId',align:'center', title: '项目编号',  width:150}
                 /*,{field:'projId',align:'center', title: '项目编号',minWidth:150,templet:function(d){
@@ -473,6 +477,9 @@
 							<c:otherwise>"0"</c:otherwise>
 					</c:choose>
 					</shiro:hasPermission>
+					<shiro:hasPermission name="ruralProject:ruralProjectView:view">
+					,"showView":1
+					</shiro:hasPermission>
                 }
                 </c:forEach>
                 </c:if>

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

@@ -21,54 +21,6 @@
 
 		})
 	</script>
-	<script type="text/javascript">
-        function addRow(list, idx, tpl, row){
-            // var idx1 = $("#workClientLinkmanList tr").length;
-            bornTemplete(list, idx, tpl, row, idx);
-        }
-
-        function bornTemplete(list, idx, tpl, row, idx1){
-            $(list).append(Mustache.render(tpl, {
-                idx: idx, delBtn: true, row: row,
-                order:idx1 + 1
-            }));
-            $(list+idx).find("select").each(function(){
-                $(this).val($(this).attr("data-value"));
-            });
-            $(list+idx).find("input[type='checkbox'], input[type='radio']").each(function(){
-                var ss = $(this).attr("data-value").split(',');
-                for (var i=0; i<ss.length; i++){
-                    if($(this).val() == ss[i]){
-                        $(this).attr("checked","checked");
-                    }
-                }
-            });
-        }
-        function seeFile(fileUrl,fileName) {
-            //   location.href = "/followRecord/seeFile";
-            var index = fileName.lastIndexOf(".");
-            var fileType = fileName.substring(index);
-            // debugger
-            if (".pdf" == fileType) {
-                window.open(fileUrl);
-            } else {
-                window.open("${ctx}/isignature/iSignatureDocument/seeFile?fileUrl="+fileUrl+"&fileName="+fileName);
-            }
-        }
-	</script>
-	<script>
-		function initRecordStatus(index,id,dataid,status)
-		{
-			var elem = document.getElementById("status_td_" + index);
-			var st = getAuditState(status);
-			if(st.action)
-				var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=" + id + "&projectReportData.id="+ dataid + "&type="+status+"','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
-			else
-				var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
-
-			elem.innerHTML = xml;
-		}
-	</script>
 </head>
 <body>
 <div class="single-form">
@@ -146,24 +98,6 @@
                         </div>
 					</div>
 				</div>
-				<%--<div class="layui-item layui-col-sm6 lw6">--%>
-					<%--<label class="layui-form-label">规模类型：</label>--%>
-					<%--<div class="layui-input-block">--%>
-						<%--<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.scaleType}"/>--%>
-					<%--</div>--%>
-				<%--</div>--%>
-				<%--<div class="layui-item layui-col-sm6 lw6">--%>
-					<%--<label class="layui-form-label">规模单位：</label>--%>
-					<%--<div class="layui-input-block">--%>
-						<%--<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.scaleUnit}"/>--%>
-					<%--</div>--%>
-				<%--</div>--%>
-				<%--<div class="layui-item layui-col-sm6 lw6">--%>
-					<%--<label class="layui-form-label">规模数量：</label>--%>
-					<%--<div class="layui-input-block">--%>
-						<%--<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.scaleQuantity}"/>--%>
-					<%--</div>--%>
-				<%--</div>--%>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">项目所在地：</label>
 					<div class="layui-input-block">
@@ -236,108 +170,6 @@
 						<input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${projectRecords.attachmentProjectSort}"/>
 					</div>
 				</div>
-				<%--<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">工程结构：</label>
-					<div class="layui-input-block">
-							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectStructure}"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">地上层数：</label>
-					<div class="layui-input-block">
-						<form:input path="onGroundNum" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">底下层数：</label>
-					<div class="layui-input-block">
-						<form:input path="underGroundNum" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">建筑面积或规模：</label>
-					<div class="layui-input-block">
-						<form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input required number" readonly="true"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">计量单位：</label>
-					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.measuringUnit}"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">工程用途：</label>
-					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectUse}"/>
-					</div>
-				</div>--%>
-				<%--<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">预估总投资额(万元)：</label>
-					<div class="layui-input-block">
-						<input value="<fmt:formatNumber value="${projectRecords.estimateTotalFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="estimateTotalFees" class="form-control layui-input required number"  readonly="true"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">咨询标的额(万元)：</label>
-					<div class="layui-input-block">
-						<input value="<fmt:formatNumber value="${projectRecords.totalFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="totalFees" class="form-control layui-input number"  readonly="true"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">其中土建造价(万元)：</label>
-					<div class="layui-input-block">
-						<input   value="<fmt:formatNumber value="${projectRecords.buildingFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="buildingFees" class="form-control layui-input" readonly="true"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">其中安装造价(万元)：</label>
-					<div class="layui-input-block">
-						<input  value="<fmt:formatNumber value="${projectRecords.installFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="installFees" class="form-control layui-input" readonly="true"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">其中土建百分比(%)：</label>
-					<div class="layui-input-block">
-						<form:input path="buildingPercent" htmlEscape="false" id="buildingPercent" class="form-control layui-input" readonly="true"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">其中安装百分比(%)：</label>
-					<div class="layui-input-block">
-						<form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
-					</div>
-				</div>--%>
-				<%--<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">施工单位：</label>
-					<div class="layui-input-block">
-						<form:input path="constructionUnit" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">施工方联系方式：</label>
-					<div class="layui-input-block">
-						<form:input path="constructionLinkman" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
-					</div>
-				</div>--%>
-				<%--<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">单位造价(元)：</label>
-					<div class="layui-input-block">
-						<input value="<fmt:formatNumber value="${projectRecords.unitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="true"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">土建单位造价(元)：</label>
-					<div class="layui-input-block">
-						<input  value="<fmt:formatNumber value="${projectRecords.buildingUnitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="buildingUnitFees" class="form-control layui-input" readonly="true"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">安装单位造价(元)：</label>
-					<div class="layui-input-block">
-						<input  value="<fmt:formatNumber value="${projectRecords.installUnitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="readonly"/>
-					</div>
-				</div>--%>
 				<div class="layui-item layui-col-sm6 lw6 with-textarea">
 					<label class="layui-form-label">工程概况：</label>
 					<div class="layui-input-block">
@@ -432,267 +264,9 @@
 				</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="upTable" class="table table-bordered table-condensed details">
-						<thead>
-						<tr>
-							<th width="25%">报告编号</th>
-							<th width="25%">报告名称</th>
-							<th width="25%">创建日期</th>
-							<th width="25%">状态</th>
-						</tr>
-						</thead>
-						<tbody>
-						<c:choose>
-							<c:when test="${not empty projectRecords.projectReportData}">
-								<c:forEach items="${projectRecords.projectReportData}" var="projectReportData" varStatus="index">
-									<tr>
-										<td><a title="${projectReportData.number}" href="javascript:void(0)" onclick="openDialogView('查看报告详情', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=${projectRecords.id}&view=view','95%', '95%')">
-												${projectReportData.number}
-										</a></td>
-										<td>
-												${projectReportData.name}
-										</td>
-										<td>
-											<fmt:formatDate value="${projectReportData.reportDate}" pattern="yyyy-MM-dd"/>
-										</td>
-										<td class="op-td">
-												&lt;%&ndash;<c:choose>&ndash;%&gt;
-												&lt;%&ndash;<c:when test="${empty projectReportData.status || projectReportData.status eq 1}">&ndash;%&gt;
-												&lt;%&ndash;<div style="text-align: center">&ndash;%&gt;
-												&lt;%&ndash;<a href="javascript:void(0)" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>&ndash;%&gt;
-												&lt;%&ndash;</div>&ndash;%&gt;
-												&lt;%&ndash;</c:when>&ndash;%&gt;
-												&lt;%&ndash;<c:otherwise>&ndash;%&gt;
-												&lt;%&ndash;<div style="text-align: center">&ndash;%&gt;
-												&lt;%&ndash;<a href="javascript:void(0)" onclick="openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=${id}&projectReportData.id=${projectReportData.id}&type=1','95%','95%')" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>&ndash;%&gt;
-												&lt;%&ndash;</div>&ndash;%&gt;
-												&lt;%&ndash;</c:otherwise>&ndash;%&gt;
-												&lt;%&ndash;</c:choose>&ndash;%&gt;
-											<div style="text-align: center" id="status_td_${index.index+1}">
-											</div>
-											<script>
-												initRecordStatus(${index.index+1},"${id}","${projectReportData.id}","${projectReportData.status}");
-											</script>
-										</td>
-									</tr>
-								</c:forEach>
-							</c:when>
-							<c:otherwise>
-								<tr>
-									<td colspan="7">
-										暂无数据
-									</td>
-								</tr>
-							</c:otherwise>
-						</c:choose>
-						</tbody>
-					</table>
-				</div>
-			</div>--%>
-			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>项目计划列表</h2></div>
-				<div class="layui-item layui-col-sm12 lw7">
-					<div class="layui-item nav-btns">
-<%--						<div class="layui-item nav-btns" style="padding-left:0px;">--%>
-<%--							<a class="nav-btn nav-btn-add"--%>
-<%--							   onclick="addRow('#projectPlanList', workClientBankRowIdx, workClientBankTpl);workClientBankRowIdx = workClientBankRowIdx + 1;"--%>
-<%--							   title="新增"><i class="fa fa-plus"></i> 新增</a>--%>
-<%--							<shiro:hasPermission name="project:projectPlan:export">--%>
-<%--								<a class="nav-btn nav-btn-export" title="导出"  onclick="return confirmx('确认要导出该项目计划列表吗？', '${ctx}/project/projectPlan/export?id=${projectRecords.id}');"><i class="fa fa-file-excel-o"></i> 导出</a>--%>
-<%--							</shiro:hasPermission>--%>
-<%--						</div>--%>
-						<table id="bankinfo" class="table table-bordered table-condensed can-edit">
-							<thead>
-							<tr>
-								<th width="60px">编号</th>
-								<th >任务阶段</th>
-								<th >计划开始时间</th>
-								<th >计划结束时间</th>
-								<th >提醒人</th>
-								<th >完成人</th>
-							</tr>
-							</thead>
-							<tbody id="projectPlanList">
-
-							</tbody>
-						</table>
-						<script type="text/template" id="workClientBankTpl">//<!--
-                                <tr id="projectPlanList{{idx}}">
-                                    <td class="hide">
-                                        <input id="projectPlanList{{idx}}_id" name="projectPlanList[{{idx}}].id" type="hidden" readonly="true" value="{{row.id}}"/>
-                                        <input id="projectPlanList{{idx}}_delFlag" name="projectPlanList[{{idx}}].delFlag" type="hidden" readonly="true" value="0"/>
-                                        <input id="projectPlanList{{idx}}_remindId" name="projectPlanList[{{idx}}].remindId" type="hidden" readonly="true" value="{{row.remindId}}"/>
-                                    </td>
-
-                                    <td width="60px">
-                                        <input id="projectPlanList{{idx}}_costNum" name="projectPlanList[{{idx}}].costNum" readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
-                                    </td>
-                                    <td>
-                                        <input id="projectPlanList{{idx}}_projectStage" name="projectPlanList[{{idx}}].projectStage" readonly="true" list ="num" title="{{row.projectStage}}"  value="{{row.projectStage}}" class="form-control required"/>
-                                    </td>
-
-                                    <td>
-                                        <input lay-verify="date" readonly="true" placeholder="yyyy-MM-dd" autocomplete="off" id="projectPlanList{{idx}}_beginDate" name="projectPlanList[{{idx}}].beginDate" style="text-align: center" type="text" value="{{row.beginDate}}"  class="form-control required datetime"/>
-                                    </td>
-                                    <td>
-                                        <input lay-verify="date" readonly="true" placeholder="yyyy-MM-dd" autocomplete="off" id="projectPlanList{{idx}}_endDate" name="projectPlanList[{{idx}}].endDate" style="text-align: center" type="text" value="{{row.endDate}}"  class="form-control required datetime"/>
-                                    </td>
-
-                                    <td>
-                                    	<input id="projectPlanList{{idx}}_remindName" name="remindName" readonly="readonly" style="text-align: center"  value="{{row.remindName}}" type="text" class="form-control contentDetail"/>
-<%--                                        <sys:treeselecttPlanUser  id="projectPlanList{{idx}}_remindName" name="remindName" value="${projectRecords.leaderIds}" labelName="projectPlanList[{{idx}}].remindName" labelValue="{{row.remindName}}"--%>
-<%--                                         title="用户" url="/sys/office/treeDataByPlan?type=3&projectId=${projectRecords.id}" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true" disabled="true"/>--%>
-                                    </td>
-
-                                    <td>
-                                    	<input id="projectPlanList{{idx}}_finishName" name="projectPlanList[{{idx}}].finishId" readonly="readonly" style="text-align: center"  value="{{row.finishName}}" type="text" class="form-control contentDetail"/>
-<%--                                        <sys:treeselecttPlanUser id="projectPlanList{{idx}}_finishName" name="projectPlanList[{{idx}}].finishId" value="${projectRecords.leaderIds}" labelName="projectPlanList[{{idx}}].finishName" labelValue="{{row.finishName}}"--%>
-<%--                                         title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true" disabled="true" />--%>
-                                    </td>
-
-<%--                                    <td class="text-center op-td" width="10">--%>
-<%--                                        {{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#projectPlanList{{idx}}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>{{/delBtn}}--%>
-<%--                                    </td>--%>
-                                </tr>//-->
-						</script>
-					</div>
-				</div>
-			</div>
-			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>项目计划附件信息</h2></div>
-				<div class="layui-item layui-col-xs12 form-table-container" >
-					<table id="listAttachment" class="table table-bordered table-condensed no-bottom-margin details">
-						<thead>
-						<tr>
-							<th width="25%">文件预览</th>
-							<th width="25%">上传人</th>
-							<th width="25%">上传时间</th>
-							<th width="25%">操作</th>
-						</tr>
-						</thead>
-						<tbody id="file_attachment">
-						<c:forEach items="${projectRecords.workAttachments}" var="workClientAttachment" varStatus="status">
-							<tr>
-									<%--<td>${status.index + 1}</td>--%>
-								<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 href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','95%','95%','1')">${workClientAttachment.attachmentName}</a></td>
-											</c:when>
-											<c:otherwise>
-												<td><a href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','95%','95%')">${workClientAttachment.attachmentName}</a></td>
-											</c:otherwise>
-										</c:choose>
-									</c:otherwise>
-								</c:choose>
-								<td>${workClientAttachment.createBy.name}</td>
-								<td><fmt:formatDate value="${workClientAttachment.createDate}" pattern="yyyy-MM-dd"/></td>
-								<td  class="op-td">
-									<a href="javascript:location.href=encodeURI('${ctx}/workcontractinfo/workContractInfo/downLoadAttach?file=${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-									<%--<a href="#" onclick="seeFile('${workClientAttachment.url}','${workClientAttachment.attachmentName}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;查看</a>--%>
-								</td>
-							</tr>
-						</c:forEach>
-						</tbody>
-					</table>
-				</div>
-			</div>
-			<script>
-                var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
-                var workConstructionLinkmanRowIdx = 0, workConstructionLinkmanTpl = $("#workConstructionLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
-                $(document).ready(function() {
-                    var data = ${fns:toJson(projectRecords.workClientLinkmanList)};
-                    for (var i=0; i<data.length; i++){
-                        addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl, data[i]);
-                        workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
-                    }
-                    var dataBank = ${fns:toJson(projectRecords.workConstructionLinkmanList)};
-                    for (var i=0; i<dataBank.length; i++){
-                        addRow('#workConstructionLinkmanList', workConstructionLinkmanRowIdx, workConstructionLinkmanTpl, dataBank[i]);
-                        workConstructionLinkmanRowIdx = workConstructionLinkmanRowIdx + 1;
-                    }
-                });
-
-			</script>
-			<%--<div class="form-group layui-row">
-				<div class="form-group-label"><h2>项目计划列表</h2></div>
-				<div class="layui-item layui-col-sm12 lw7">
-					<div class="layui-item nav-btns">
-						<table id="bankinfo" class="table table-bordered table-condensed can-edit">
-							<thead>
-							<tr>
-								<th width="80px">任务编码</th>
-								<th >任务阶段</th>
-								<th >计划开始时间</th>
-								<th >计划结束时间</th>
-								<th >提醒人</th>
-								<th >完成人</th>
-							</tr>
-							</thead>
-							<tbody id="projectPlanList">
-
-							</tbody>
-						</table>
-						<script type="text/template" id="workClientBankTpl">//<!--
-                                <tr id="projectPlanList{{idx}}">
-                                    <td class="hide">
-                                        <input id="projectPlanList{{idx}}_id" name="projectPlanList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
-                                        <input id="projectPlanList{{idx}}_delFlag" name="projectPlanList[{{idx}}].delFlag" type="hidden" value="0"/>
-                                    </td>
-
-                                    <td width="60px">
-                                        <input id="projectPlanList{{idx}}_costNum" name="projectPlanList[{{idx}}].costNum" readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
-                                    </td>
-                                    <td>
-                                       <input id="projectPlanList{{idx}}_projectStage" name="projectPlanList[{{idx}}].projectStage" readonly="readonly" value="{{row.projectStage}}" type="text" class="form-control contentDetail"/>
-                                    </td>
-
-                                    <td>
-                                        <input lay-verify="date" placeholder="yyyy-MM-dd" autocomplete="off" id="projectPlanList{{idx}}_beginDate" readonly="readonly" name="projectPlanList[{{idx}}].beginDate" type="text" value="{{row.beginDate}}"  class="form-control required datetime"/>
-                                    </td>
-                                    <td>
-                                        <input lay-verify="date" placeholder="yyyy-MM-dd" autocomplete="off" id="projectPlanList{{idx}}_endDate" readonly="readonly" name="projectPlanList[{{idx}}].endDate" type="text" value="{{row.endDate}}"  class="form-control required datetime"/>
-                                    </td>
-
-                                    <td>
-                                        <input id="projectPlanList{{idx}}_remindName" name="projectPlanList[{{idx}}].remindName" readonly="readonly" style="text-align: center"  value="{{row.remindName}}" type="text" class="form-control contentDetail"/>
-                                    </td>
-
-                                    <td>
-                                        <input id="projectPlanList{{idx}}_finishName" name="projectPlanList[{{idx}}].finishName" readonly="readonly" style="text-align: center"  value="{{row.finishName}}" type="text" class="form-control contentDetail"/>
-                                    </td>
-                                </tr>//-->
-						</script>
-					</div>
-				</div>
-			</div>--%>
-
 			<div class="form-group layui-row page-end"></div>
 		</form:form>
 	</div>
 </div>
-<script type="text/javascript">
-	var workClientBankRowIdx = 0,
-			workClientBankTpl = $("#workClientBankTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
-	$(document).ready(function () {
-		var dataBank = ${fns:toJson(projectRecords.projectPlanList)};
-		for (var i = 0; i < dataBank.length; i++) {
-			addRow('#projectPlanList', workClientBankRowIdx+1, workClientBankTpl, dataBank[i]);
-			workClientBankRowIdx = workClientBankRowIdx + 1;
-		}
-	});
-
-</script>
 </body>
 </html>

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

@@ -0,0 +1,495 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+    <title>客户合同信息</title>
+    <meta name="decorator" content="default"/>
+    <script src="${ctxStatic}/layer-v2.3/layui/xmSelect.js" charset="utf-8"></script>
+    <script>
+        $(document).ready(function() {
+            contentDetailTypeShow();
+        });
+    </script>
+</head>
+<body >
+<div class="single-form view-form">
+    <form class="container">
+        <form:form id="inputForm" modelAttribute="workContractInfo"  method="post" class="form-horizontal 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" 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" 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" 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" 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" 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;" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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="${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 href="javascript:void(0)"
+                                                           onclick="preview('预览','${workClientAttachment.url}','95%','95%','1')">${workClientAttachment.attachmentName}</a>
+                                                    </td>
+                                                </c:when>
+                                                <c:otherwise>
+                                                    <td><a href="javascript:void(0)"
+                                                           onclick="preview('预览','${workClientAttachment.url}','95%','95%')">${workClientAttachment.attachmentName}</a>
+                                                    </td>
+                                                </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>
+                                    </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"  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>
+                    <div class="layui-input-block">
+                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.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"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${workContractInfo.contractDate}" pattern="yyyy年MM月dd日"/>"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label ">合同生效日期：</label>
+                    <div class="layui-input-block">
+                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${workContractInfo.effectiveDate}" pattern="yyyy年MM月dd日" type="date" dateStyle="full"/>"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label ">合同终止日期：</label>
+                    <div class="layui-input-block">
+                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${workContractInfo.closingDate}" pattern="yyyy年MM月dd日" type="date" dateStyle="full"/>"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label ">合同类型：</label>
+                    <div class="layui-input-block">
+                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label double-line">合同金额(元)预计金额：</label>
+                    <div class="layui-input-block">
+                        <input htmlEscape="false" id="contractPrice" readonly="true" class="form-control layui-input" value="<fmt:formatNumber value="${workContractInfo.contractPrice}" pattern="#,#00.00"/>"/>
+                    </div>
+                    <shiro:hasPermission name="workcontractinfo:workContractInfo:contractPrice">
+                        <c:if test="${fns:getUser().office.id eq workContractInfo.officeId && workContractInfo.contractState < 10}">
+                            <a onclick="openDialogre('修改合同金额', '${ctx}/workcontractinfo/workContractInfo/formContractPrice?id=${workContractInfo.id}','50%','300px',false,'inputForm')", class="nav-btn nav-btn-add" style="margin-right: 0px;top:0px;right:16px;position: absolute;height:40px;line-height: 40px;"><i class="fa fa-edit"></i> 修改</a>
+                        </c:if>
+                    </shiro:hasPermission>
+                </div>
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label ">对方合同编号：</label>
+                    <div class="layui-input-block">
+                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.anotherContractNum}"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm12">
+                    <label class="layui-form-label">收费标准</label>
+                    <div class="layui-input-block">
+                        <form:checkboxes path="chargeCriterionList" disabled="true" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="label" htmlEscape="false" items="${fns:getMainDictList('charge_criterion')}" />
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm12">
+                    <label class="layui-form-label "></label>
+                    <div class="layui-input-block">
+                        <form:input path="otherDetails" readonly="true" htmlEscape="false" class="form-control layui-input"/>
+                    </div>
+                </div>
+
+                <div class="layui-item layui-col-sm12 with-textarea">
+                    <label class="layui-form-label">合同特别条款：</label>
+                    <div class="layui-input-block">
+                        <textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${workContractInfo.contractSpecial}</textarea>
+                    </div>
+                </div>
+
+                <div class="layui-item layui-col-sm12 with-textarea">
+                    <label class="layui-form-label">备注：</label>
+                    <div class="layui-input-block">
+                        <textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${workContractInfo.remarks}</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="contentTable" class="table table-bordered table-condensed no-bottom-margin details">
+                        <thead>
+                        <tr>
+
+                            <th>文件</th>
+                            <th>上传人</th>
+                            <th>上传时间</th>
+                            <th width="180px">操作</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <c:choose>
+                            <c:when test="${not empty workContractInfo.workAttachments}">
+                                <c:forEach items="${workContractInfo.workAttachments}" var="workClientAttachment" varStatus="status">
+                                    <tr>
+                                            <%--<td>${status.index + 1}</td>--%>
+                                        <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 href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','95%','95%','1')">${workClientAttachment.attachmentName}</a></td>
+                                                    </c:when>
+                                                    <c:otherwise>
+                                                        <td><a href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','95%','95%')">${workClientAttachment.attachmentName}</a></td>
+                                                    </c:otherwise>
+                                                </c:choose>
+                                            </c:otherwise>
+                                        </c:choose>
+                                        <td>${workClientAttachment.createBy.name}</td>
+                                        <td><fmt:formatDate value="${workClientAttachment.createDate}" pattern="yyyy-MM-dd"/></td>
+                                        <td  class="op-td">
+                                            <div class="op-btn-box" >
+                                                <c:set var="signflag" value="${fns:getSysParam('sign_flag',fns:getUser())}"/>
+                                                <c:choose>
+                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'doc')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'docx')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'xls')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'xlsx')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'ppt')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'pptx')}">
+                                                        <a href="javascript:void(0);" onclick="openDialogView('查看电子签章信息', '${ctx}/isignature/iSignatureDocument/form?recordId=${workClientAttachment.id}','95%', '95%')" class="op-btn op-btn-view" ><i class="fa fa-search-plus"></i> 查看</a>
+                                                        <c:choose>
+                                                            <c:when test="${signflag == '是'}">
+                                                                <a href="javascript:location.href='${ctx}/isignature/iSignatureDocument/download?recordId=${workClientAttachment.id}'" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                                            </c:when>
+                                                            <c:otherwise>
+                                                                <a href="javascript:location.href='${ctx}/workcontractinfo/workContractInfo/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workClientAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                                            </c:otherwise>
+                                                        </c:choose>
+                                                    </c:when>
+                                                    <c:otherwise>
+                                                        <a href="javascript:location.href='${ctx}/workcontractinfo/workContractInfo/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workClientAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                                    </c:otherwise>
+                                                </c:choose>
+                                            </div>
+                                        </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 page-end"></div>
+    </form:form>
+    </div>
+</div>
+<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
+<script>
+    function contentDetailTypeShow() {
+        $.ajax({
+            type:'post',
+            url:'${ctx}/workclientinfo/workClientInfo/getJobType',
+            data:{
+                "type":2
+            },
+            success:function(data){
+                if(data.success) {
+                    var data = data.body.list;
+                    var newDataList = data;
+                    var showList = [];
+                    $.ajax({
+                        type:'post',
+                        url:'${ctx}/workclientinfo/workClientInfo/getJobTypeById',
+                        data:{
+                            "id":$("#id").val()
+                        },
+                        success:function(dataListById){
+                            if(dataListById.success) {
+                                var showDataList = dataListById.body.list;
+
+                                for (i in newDataList) {
+                                    for (j in showDataList) {
+                                        if (newDataList[i].value == showDataList[j].value) {
+                                            var newData = {
+                                                "name": newDataList[i].name,
+                                                "value": newDataList[i].value,
+                                                "selected": true
+                                            }
+                                            showList.push(newData);
+                                            data.splice(i,1,newData);
+                                        }
+                                    }
+                                }
+                                xmSelect.render({
+                                    el: '#jobType',
+                                    language: 'zn',
+                                    data:data
+                                })
+                            }
+                        }
+                    })
+                }
+            }
+        })
+    }
+
+    var jobType = xmSelect.render({
+        el: '#jobType',
+        language: 'zn',
+        data: [
+        ]
+    })
+
+
+    document.getElementById('jobType').onblur=function(){
+        var list = [];
+        //获取当前多选选中的值
+        var selectArr = jobType.getValue();
+        for (var i in selectArr){
+            list.push(selectArr[i].value);
+        }
+        $("#jobTypeStr").val(list);
+        console.log(list);
+    }
+</script>
+</body>
+</html>