1. 部门调转-部门和新职级

2. 我的信息界面微调
3. 合同界面微调

src/main/java/com/jeeplus/modules/workofficechange/service/WorkOfficeChangeService.java

@@ -184,13 +184,12 @@ public class WorkOfficeChangeService extends CrudService<WorkOfficeChangeDao, Wo
 						workOfficeChangeUserDao.update(workOfficeChangeUser);
 					}
 				}
+				//更新新职级和新部门
 				String userId = workOfficeChangeUser.getUserId();
 				String jobGradeId = workOfficeChangeUser.getJobGrade2().getId();
 				workStaffBasicInfoDao.updateJobGradeByUserId(userId,jobGradeId);
-				String officeId = workOfficeChangeUser.getOldOfficeId();
-				if(officeId!=null){
-					workStaffBasicInfoDao.updateOfficeByUserId(userId,officeId);
-				}
+				String officeId = workOfficeChangeUser.getOfficeId();
+				workStaffBasicInfoDao.updateOfficeByUserId(userId,officeId);
 			}
 		}
 	}

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

@@ -203,6 +203,7 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
             user.setId(workStaffBasicInfo.getUserId());
             user.setName(workStaffBasicInfo.getName());
             user.setMobile(workStaffBasicInfo.getMobile());
+            user.setPhone(workStaffBasicInfo.getPhone());
             user.setLoginName(workStaffBasicInfo.getMobile());
             user.setComId(workStaffBasicInfo.getCompany().getId());
             user.setCompany(workStaffBasicInfo.getCompany());
@@ -228,13 +229,12 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
         workStaffBasicInfo.setAchiveId(workStaffBasicInfo.getId());
         workStaffBasicInfo.setId(staffId);
         super.save(workStaffBasicInfo);
-//        this.saveDetails(workStaffBasicInfo,false);
-//        if (workStaffBasicInfo.getPhone() != null) {
-//            User user = new User();
-//            user.setId(workStaffBasicInfo.getUserId());
-//            user.setPhone(workStaffBasicInfo.getPhone());
-//            userService.updateUser(user);
-//        }
+        if (StringUtils.isNotBlank(workStaffBasicInfo.getPhone())) {
+            User user = new User();
+            user.setId(workStaffBasicInfo.getUserId());
+            user.setPhone(workStaffBasicInfo.getPhone());
+            userService.updateUser(user);
+        }
     }
     public void preSave(WorkStaffBasicInfo workStaffBasicInfo, HttpServletRequest request) throws IOException {
         if(workStaffBasicInfo.getCompany()==null){
@@ -454,6 +454,11 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
     }
 
     public void queryDetails(WorkStaffBasicInfo workStaffBasicInfo){
+        //按照achieveId查询
+        String id = workStaffBasicInfo.getId();
+        if (StringUtils.isNotBlank(id) && StringUtils.isNotBlank(workStaffBasicInfo.getAchiveId())){
+            workStaffBasicInfo.setId(workStaffBasicInfo.getAchiveId());
+        }
         achievementService.query(workStaffBasicInfo);
         certificateService.query(workStaffBasicInfo);
         educationService.query(workStaffBasicInfo);
@@ -466,6 +471,7 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
         titleService.query(workStaffBasicInfo);
         trainingService.query(workStaffBasicInfo);
         queryRelationShips(workStaffBasicInfo);
+        workStaffBasicInfo.setId(id);
     }
 
     public void queryRelationShips(WorkStaffBasicInfo workStaffBasicInfo) {

src/main/resources/mappings/modules/workstaff/WorkStaffEducationDao.xml

@@ -41,9 +41,10 @@
 		<include refid="workStaffEducationJoins"/>
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
-            <if test="staff !=null and staff !=''">
-                AND a.staff_id = #{staff}
-            </if>
+			AND  a.staff_id = #{staff}
+<!--            <if test="staff !=null and staff !=''">-->
+<!--                AND a.staff_id = #{staff}-->
+<!--            </if>-->
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">

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

@@ -369,6 +369,14 @@
                                                                    value="${user.mobile}"/>
                                                         </div>
                                                     </div>
+                                                    <div class="layui-item layui-col-sm12">
+                                                        <label class="layui-form-label">座机：</label>
+                                                        <div class="layui-input-block">
+                                                            <input htmlEscape="false" style="background: #fff;" readonly="true"
+                                                                   class="form-control layui-input"
+                                                                   value="${user.phone}"/>
+                                                        </div>
+                                                    </div>
                                                 </div>
 
                                                 <div class="layui-item layui-col-sm6 lw7">
@@ -420,7 +428,8 @@
                     <div class="col-sm-12" style="padding: 0;">
                         <div class="ibox float-e-margins">
                             <div class="ibox-title">
-                                <div class="ibox-tools">
+                                <div class="form-group-label"><h2>基本信息</h2></div>
+                                <div class="ibox-tools" style="margin-top: -40px">
                                     <a style="display:block;" class="dropdown-toggle" data-toggle="dropdown"
                                        href="javascript:void(0)">
                                         编辑<i class="fa fa-wrench"></i>
@@ -436,7 +445,6 @@
 
                             <div class="ibox-content">
                                 <div class="form-group layui-row first">
-                                    <div class="form-group-label"><h2>基本信息</h2></div>
                                     <div class="layui-item layui-col-sm6 lw7" style="padding-right: 0;">
                                         <div class="layui-item layui-col-sm12">
                                             <label class="layui-form-label"><span class="require-item">*</span>工    号：</label>

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

@@ -26,7 +26,7 @@
 			<div class="layui-item layui-col-sm12">
 				<label class="layui-form-label">姓名：</label>
 				<div class="layui-input-block">
-					<form:input path="name" htmlEscape="false"  maxlength="50"  class="form-control layui-input required" />
+					<form:input path="name" readonly="true" htmlEscape="false"  maxlength="50"  class="form-control layui-input required" />
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm12">

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

@@ -557,12 +557,12 @@
 			<%--创建人--%>
 			<form:hidden path="createBy.name" htmlEscape="false"  readonly="true" value="${fns:getUser().name}" class="form-control "/>
 			<div class="tabs-container">
-				<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>--%>
-					</ul>
-				</div>
+<%--				<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>--%>
+<%--&lt;%&ndash;						<li ><a data-toggle="tab" href="#tab-22"  aria-expanded="false">合同评审信息</a></li>&ndash;%&gt;--%>
+<%--					</ul>--%>
+<%--				</div>--%>
 				<div class="tab-content">
 					<div id="tab-11" class="tab-pane active">
 						<div class="form-group layui-row first lw9">

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

@@ -526,12 +526,12 @@
 
 		<c:set var="status" value="${workContractInfo.act.status}" />
 		<div class="tabs-container">
-			<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>--%>
-				</ul>
-			</div>
+<%--			<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>--%>
+<%--&lt;%&ndash;					<li ><a data-toggle="tab" href="#tab-2"  aria-expanded="false">合同评审信息</a></li>&ndash;%&gt;--%>
+<%--				</ul>--%>
+<%--			</div>--%>
 			<div class="tab-content">
 				<div id="tab-1" class="tab-pane active">
 					<div class="form-group layui-row first lw9">
@@ -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/workContractInfoLookForm.jsp

@@ -116,18 +116,6 @@
 		<form:hidden path="id"/>
 
 		<div class="tabs-container">
-			<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>
-
-				</ul>
-			</div>
-			<%--<ul class="nav nav-tabs">--%>
-				<%--<li class="active"><a data-toggle="tab" href="#tab-11"  aria-expanded="true">合同信息</a>--%>
-				<%--</li>--%>
-				<%--<li class=""><a data-toggle="tab" href="#tab-22"  aria-expanded="false">合同评审信息</a>--%>
-				<%--</li>--%>
-			<%--</ul>--%>
 			<div class="tab-content">
 				<div id="tab-11" class="tab-pane active">
 					<div class="form-group layui-row first lw9">

src/main/webapp/webpage/modules/workofficechange/workOfficeChangeForm.jsp

@@ -462,7 +462,7 @@
                                         </td>
                                          <td>
                                             <sys:treeselectJob id="workOfficeChangeUserList{{idx}}_after" name="workOfficeChangeUserList[{{idx}}].jobGrade2.id" value="${row.jobGrade2.id}" labelName="workOfficeChangeUserList[{{idx}}].jobGrade2.name" labelValue="${row.jobGrade2.name}"
-																title="职级类型" url="/workjobgrade/workJobGrade/treeData"  cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+																title="职级类型" url="/workjobgrade/workJobGrade/treeData"  cssClass="form-control layui-input required" allowClear="true" notAllowSelectParent="true"/>
                                         </td>
                                         <td class="text-center op-td" >
                                             {{#delBtn}}<span class="op-btn op-btn-delete" id="workOfficeChangeUserList{{idx}}_span" onclick="delRow(this, '#workOfficeChangeUserList{{idx}}')" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>{{/delBtn}}

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

@@ -136,7 +136,13 @@
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label"><span class="require-item">*</span>移动电话：</label>
                         <div class="layui-input-block">
-                            <form:input path="mobile" htmlEscape="false" readonly="true" class="form-control layui-input required isPhone"/>
+                            <form:input path="mobile" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
+                        </div>
+                    </div>
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label">座机：</label>
+                        <div class="layui-input-block">
+                            <form:input path="phone" readonly="true" htmlEscape="false"  class="form-control  layui-input"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">