1. 修复投标合同表单不显示某些属性

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

@@ -37,6 +37,8 @@ import com.jeeplus.modules.workactivity.service.ActivityService;
 import com.jeeplus.modules.workactivity.service.WorkActivityProcessService;
 import com.jeeplus.modules.workactivitymenu.entity.WorkActivityMenu;
 import com.jeeplus.modules.workactivitymenu.service.WorkActivityMenuService;
+import com.jeeplus.modules.workbidproject.dao.WorkBidProjectDao;
+import com.jeeplus.modules.workbidproject.entity.WorkBidProject;
 import com.jeeplus.modules.workclientinfo.dao.WorkClientAttachmentDao;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
@@ -141,9 +143,19 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 	private WorkClientInfoService workClientInfoService;
 	@Autowired
 	private WorkContractListInfoDao workContractListInfoDao;
+	@Autowired
+	private WorkBidProjectDao workBidProjectDao;
 
 	public WorkContractInfo get(String id) {
 		WorkContractInfo workContractInfo = super.get(id);
+		/*合同投标项目，则查投标。不是投标项目，不去查*/
+		if (workContractInfo != null && "0".equals(workContractInfo.getExt()) && workContractInfo.getProject()!=null && StringUtils.isNotBlank(workContractInfo.getProject().getId())) {
+			WorkBidProject workBidProject = workBidProjectDao.get(workContractInfo.getProject().getId());
+			if (workBidProject != null) {
+				workContractInfo.setProject(workBidProject);
+				workContractInfo.setProjectName(workBidProject.getProjectName());
+			}
+		}
 
 		if(workContractInfo != null){
 			WorkClientAttachment workClientAttachment = new WorkClientAttachment();

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

@@ -694,6 +694,12 @@ public class WorkContractInfoController extends BaseController {
     public String lookForma(WorkContractInfo workContractInfo, Model model) {
         //合同作废信息
         AlterInfo alterInfo = alterInfoService.getByContractInfo(workContractInfo);
+        WorkContractInfo old = workContractInfo.getOldWorkContractInfo();
+        if("0".equals(old.getExt())){
+            WorkBidProject bid = workBidProjectService.get(old.getProject().getId());
+            old.setProject(bid);
+            old.setProjectName(bid.getProjectName());
+        }
         model.addAttribute("alterInfo",alterInfo);
         model.addAttribute("workContractInfo", workContractInfo);
         return "modules/workcontractinfo/workContractInfoLookForma";

src/main/java/com/jeeplus/modules/workstaff/service/WorkStaffBasicInfoService.java

@@ -212,9 +212,6 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
         }else{
             userService.insertRole(workStaffBasicInfo);
         }
-        //需要逻辑删除数据库中档案表id关联的教育经历等信息
-//        workStaffBasicInfo.setId(workStaffBasicInfo.getAchiveId());
-//        this.deleteDetailById(workStaffBasicInfo);
 	}
 
     /**
@@ -238,8 +235,6 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
 //            user.setPhone(workStaffBasicInfo.getPhone());
 //            userService.updateUser(user);
 //        }
-        //需要逻辑删除数据库中员工id关联的教育经历等信息
-//        this.deleteDetailById(workStaffBasicInfo);
     }
     public void preSave(WorkStaffBasicInfo workStaffBasicInfo, HttpServletRequest request) throws IOException {
         if(workStaffBasicInfo.getCompany()==null){

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

@@ -77,7 +77,6 @@
 		SELECT
 		a.id AS "id",
 		a.project_id AS "project.id",
-		a.project_name AS "project.name",
 		a.ext AS  "ext",
 		u.name AS "createBy.name",
 		a.create_by AS "createBy.id",

src/main/webapp/webpage/modules/projectrecord/projectRecordsForm.jsp

@@ -118,7 +118,10 @@
                     var newClientId  = data.client.id;
                     if(clientId != newClientId){
                         $("#workClientLinkmanList tr").remove();
-                        setLinkMan(newClientId);
+                        if(isMasterClient){
+                            setLinkMan(newClientId);
+                            isMasterClient = false;
+                        }
                     }
                     // console.log("clientId------newClientId");
                     // console.log(clientId+"------"+newClientId);

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

@@ -529,7 +529,7 @@
 			<div class="layui-tab" id="tabDiv">
 				<ul class="layui-tab-title" >
 					<li class="active"><a data-toggle="tab" href="#tab-1"  aria-expanded="true">合同信息</a></li>
-					<li ><a data-toggle="tab" href="#tab-2"  aria-expanded="false">合同评审信息</a></li>
+<%--					<li ><a data-toggle="tab" href="#tab-2"  aria-expanded="false">合同评审信息</a></li>--%>
 				</ul>
 			</div>
 			<div class="tab-content">
@@ -858,167 +858,167 @@
 				</div>
 					<div class="form-group layui-row page-end"></div>
 				</div>
-				<div id="tab-2" class="tab-pane">
-					<div class="form-group layui-row first lw14">
-						<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.workContractReview.timeRequirements}"/>
-							</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.workContractReview.specialRequirements}"/>
-							</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="<c:choose><c:when test="${workContractInfo.workContractReview.isLegitimate eq 1}">是</c:when><c:otherwise>否</c:otherwise></c:choose>"/>
-							</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"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.credibility eq 1}">低</c:when><c:when test="${workContractInfo.workContractReview.credibility eq 2}">中</c:when><c:otherwise>高</c:otherwise></c:choose>"/>
-							</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="<c:choose><c:when test="${workContractInfo.workContractReview.preliminaryRiskAssessmen eq 1}">低</c:when><c:when test="${workContractInfo.workContractReview.preliminaryRiskAssessmen eq 2}">高</c:when><c:otherwise>中</c:otherwise></c:choose>"/>
-							</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"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.serviceObjectIndustry eq 1}">正常</c:when><c:otherwise>不正常</c:otherwise></c:choose>"/>
-							</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"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isProperAcquisition eq 1}">是</c:when><c:otherwise>否</c:otherwise></c:choose>"/>
-							</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"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isUserQualified eq 1}">是</c:when><c:otherwise>否</c:otherwise></c:choose>"/>
-							</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"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isLegitimate eq 1}">需要</c:when><c:otherwise>不需要</c:otherwise></c:choose>"/>
-							</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"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isEquipmentMeetRequirements eq 1}">需要</c:when><c:otherwise>不需要</c:otherwise></c:choose>"/>
-							</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"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isTimeMeetRequirements eq 1}">需要</c:when><c:otherwise>不需要</c:otherwise></c:choose>"/>
-							</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"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isContractSignature eq 1}">需要</c:when><c:otherwise>不需要</c:otherwise></c:choose>"/>
-							</div>
-						</div>
-						<div class="layui-item layui-col-sm12">
-							<label class="layui-form-label">备注信息：</label>
-							<div class="layui-input-block">
-								<textarea htmlEscape="false" rows="4" readonly="true" maxlength="500" class="form-control" >${workContractInfo.workContractReview.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="contentTable2" 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.workContractReview.workAttachments}">
-										<c:forEach items="${workContractInfo.workContractReview.workAttachments}" var="workClientAttachment" >
-											<tr>
-												<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('${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('${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>
+<%--				<div id="tab-2" class="tab-pane">--%>
+<%--					<div class="form-group layui-row first lw14">--%>
+<%--						<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.workContractReview.timeRequirements}"/>--%>
+<%--							</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.workContractReview.specialRequirements}"/>--%>
+<%--							</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="<c:choose><c:when test="${workContractInfo.workContractReview.isLegitimate eq 1}">是</c:when><c:otherwise>否</c:otherwise></c:choose>"/>--%>
+<%--							</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"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.credibility eq 1}">低</c:when><c:when test="${workContractInfo.workContractReview.credibility eq 2}">中</c:when><c:otherwise>高</c:otherwise></c:choose>"/>--%>
+<%--							</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="<c:choose><c:when test="${workContractInfo.workContractReview.preliminaryRiskAssessmen eq 1}">低</c:when><c:when test="${workContractInfo.workContractReview.preliminaryRiskAssessmen eq 2}">高</c:when><c:otherwise>中</c:otherwise></c:choose>"/>--%>
+<%--							</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"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.serviceObjectIndustry eq 1}">正常</c:when><c:otherwise>不正常</c:otherwise></c:choose>"/>--%>
+<%--							</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"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isProperAcquisition eq 1}">是</c:when><c:otherwise>否</c:otherwise></c:choose>"/>--%>
+<%--							</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"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isUserQualified eq 1}">是</c:when><c:otherwise>否</c:otherwise></c:choose>"/>--%>
+<%--							</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"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isLegitimate eq 1}">需要</c:when><c:otherwise>不需要</c:otherwise></c:choose>"/>--%>
+<%--							</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"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isEquipmentMeetRequirements eq 1}">需要</c:when><c:otherwise>不需要</c:otherwise></c:choose>"/>--%>
+<%--							</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"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isTimeMeetRequirements eq 1}">需要</c:when><c:otherwise>不需要</c:otherwise></c:choose>"/>--%>
+<%--							</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"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isContractSignature eq 1}">需要</c:when><c:otherwise>不需要</c:otherwise></c:choose>"/>--%>
+<%--							</div>--%>
+<%--						</div>--%>
+<%--						<div class="layui-item layui-col-sm12">--%>
+<%--							<label class="layui-form-label">备注信息：</label>--%>
+<%--							<div class="layui-input-block">--%>
+<%--								<textarea htmlEscape="false" rows="4" readonly="true" maxlength="500" class="form-control" >${workContractInfo.workContractReview.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="contentTable2" 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.workContractReview.workAttachments}">--%>
+<%--										<c:forEach items="${workContractInfo.workContractReview.workAttachments}" var="workClientAttachment" >--%>
+<%--											<tr>--%>
+<%--												<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('${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('${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>--%>
 
 			</div>
 		</div>

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

@@ -53,7 +53,7 @@
 					<div class="layui-tab" id="tabDiv">
 						<ul class="layui-tab-title" >
 							<li class="active"><a data-toggle="tab" href="#tab-11"  aria-expanded="true">合同信息</a></li>
-							<li ><a data-toggle="tab" href="#tab-22"  aria-expanded="false">合同评审信息</a></li>
+<%--							<li ><a data-toggle="tab" href="#tab-22"  aria-expanded="false">合同评审信息</a></li>--%>
 						</ul>
 					</div>
 
@@ -351,170 +351,170 @@
 								</div>
 							</div>
 						</div>
-						<div id="tab-22" class="tab-pane">
+<%--						<div id="tab-22" class="tab-pane">--%>
 
-							<div class="form-group layui-row first lw14">
-								<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.workContractReview.timeRequirements}"/>
-									</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.workContractReview.specialRequirements}"/>
-									</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="<c:choose><c:when test="${workContractInfo.workContractReview.isLegitimate eq 1}">是</c:when><c:otherwise>否</c:otherwise></c:choose>"/>
-									</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"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.credibility eq 1}">低</c:when><c:when test="${workContractInfo.workContractReview.credibility eq 2}">中</c:when><c:otherwise>高</c:otherwise></c:choose>"/>
-									</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="<c:choose><c:when test="${workContractInfo.workContractReview.preliminaryRiskAssessmen eq 1}">低</c:when><c:when test="${workContractInfo.workContractReview.preliminaryRiskAssessmen eq 2}">高</c:when><c:otherwise>中</c:otherwise></c:choose>"/>
-									</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"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.serviceObjectIndustry eq 1}">正常</c:when><c:otherwise>不正常</c:otherwise></c:choose>"/>
-									</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"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isProperAcquisition eq 1}">是</c:when><c:otherwise>否</c:otherwise></c:choose>"/>
-									</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"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isUserQualified eq 1}">是</c:when><c:otherwise>否</c:otherwise></c:choose>"/>
-									</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"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isLegitimate eq 1}">需要</c:when><c:otherwise>不需要</c:otherwise></c:choose>"/>
-									</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"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isEquipmentMeetRequirements eq 1}">需要</c:when><c:otherwise>不需要</c:otherwise></c:choose>"/>
-									</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"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isTimeMeetRequirements eq 1}">需要</c:when><c:otherwise>不需要</c:otherwise></c:choose>"/>
-									</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"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isContractSignature eq 1}">需要</c:when><c:otherwise>不需要</c:otherwise></c:choose>"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm12">
-									<label class="layui-form-label">备注信息：</label>
-									<div class="layui-input-block">
-										<textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${workContractInfo.workContractReview.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="contentTable2" 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.workContractReview.workAttachments}">
-												<c:forEach items="${workContractInfo.workContractReview.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="${ctx}/isignature/iSignatureDocument/sign?recordId=${workClientAttachment.id}" class="op-btn op-btn-sign" target="_blank">签章</a>
-                                                                        <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('${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('${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>
+<%--							<div class="form-group layui-row first lw14">--%>
+<%--								<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.workContractReview.timeRequirements}"/>--%>
+<%--									</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.workContractReview.specialRequirements}"/>--%>
+<%--									</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="<c:choose><c:when test="${workContractInfo.workContractReview.isLegitimate eq 1}">是</c:when><c:otherwise>否</c:otherwise></c:choose>"/>--%>
+<%--									</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"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.credibility eq 1}">低</c:when><c:when test="${workContractInfo.workContractReview.credibility eq 2}">中</c:when><c:otherwise>高</c:otherwise></c:choose>"/>--%>
+<%--									</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="<c:choose><c:when test="${workContractInfo.workContractReview.preliminaryRiskAssessmen eq 1}">低</c:when><c:when test="${workContractInfo.workContractReview.preliminaryRiskAssessmen eq 2}">高</c:when><c:otherwise>中</c:otherwise></c:choose>"/>--%>
+<%--									</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"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.serviceObjectIndustry eq 1}">正常</c:when><c:otherwise>不正常</c:otherwise></c:choose>"/>--%>
+<%--									</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"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isProperAcquisition eq 1}">是</c:when><c:otherwise>否</c:otherwise></c:choose>"/>--%>
+<%--									</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"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isUserQualified eq 1}">是</c:when><c:otherwise>否</c:otherwise></c:choose>"/>--%>
+<%--									</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"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isLegitimate eq 1}">需要</c:when><c:otherwise>不需要</c:otherwise></c:choose>"/>--%>
+<%--									</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"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isEquipmentMeetRequirements eq 1}">需要</c:when><c:otherwise>不需要</c:otherwise></c:choose>"/>--%>
+<%--									</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"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isTimeMeetRequirements eq 1}">需要</c:when><c:otherwise>不需要</c:otherwise></c:choose>"/>--%>
+<%--									</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"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isContractSignature eq 1}">需要</c:when><c:otherwise>不需要</c:otherwise></c:choose>"/>--%>
+<%--									</div>--%>
+<%--								</div>--%>
+<%--								<div class="layui-item layui-col-sm12">--%>
+<%--									<label class="layui-form-label">备注信息：</label>--%>
+<%--									<div class="layui-input-block">--%>
+<%--										<textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${workContractInfo.workContractReview.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="contentTable2" 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.workContractReview.workAttachments}">--%>
+<%--												<c:forEach items="${workContractInfo.workContractReview.workAttachments}" var="workClientAttachment" varStatus="status">--%>
+<%--													<tr>--%>
+<%--															&lt;%&ndash;<td>${status.index + 1}</td>&ndash;%&gt;--%>
+<%--														<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="${ctx}/isignature/iSignatureDocument/sign?recordId=${workClientAttachment.id}" class="op-btn op-btn-sign" target="_blank">签章</a>--%>
+<%--                                                                        <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('${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('${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>--%>
 					</div>
 				</div>