合同界面微调

src/main/java/com/jeeplus/modules/sys/web/UserController.java

@@ -532,7 +532,6 @@ public class UserController extends BaseController {
             }
 
             String name = user.getName();
-            workStaffBasicInfo.setName(name);
             if(!name.equals(currentUser.getName())){
                 currentUser.setName(user.getName());
                 workStaffBasicInfo.setName(user.getName());

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

@@ -133,7 +133,7 @@ public class WorkStaffLanguagesService extends CrudService<WorkStaffLanguagesDao
             }
             try {
                 OSSClientUtil ossUtil = new OSSClientUtil();
-                String path = Global.getStaffBasicFilePath()+ DateUtils.formatDate(new Date(), (Object) null)+"/";
+                String path = Global.getStaffBasicFilePath()+ DateUtils.formatDate(new Date(), null)+"/";
                 String newName = System.currentTimeMillis()+"-"+file.getOriginalFilename();
                 ossUtil.uploadFile2OSS(file.getInputStream(),path,newName);
                 return  Global.getAliDownloadUrl() + "/" + path + newName;

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

@@ -428,8 +428,8 @@
                     <div class="col-sm-12" style="padding: 0;">
                         <div class="ibox float-e-margins">
                             <div class="ibox-title">
-                                <div class="form-group-label"><h2>基本信息</h2></div>
-                                <div class="ibox-tools" style="margin-top: -40px">
+                                <h2 style="text-indent: 12px;margin-top: 10px;font-size: 16px;font-weight: bold;border-left: 5px solid #009FFA;">基本信息</h2>
+                                <div class="ibox-tools" style="margin-top: -20px">
                                     <a style="display:block;" class="dropdown-toggle" data-toggle="dropdown"
                                        href="javascript:void(0)">
                                         编辑<i class="fa fa-wrench"></i>

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

@@ -55,14 +55,14 @@
 
 				<c:set var="status" value="${workContractInfo.act.status}" />
 				<div class="tabs-container" style="margin-top: 20px;">
-					<ul class="nav nav-tabs">
+					<%--<ul class="nav nav-tabs">
                         <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>--%>
+&lt;%&ndash;                                <li ><a data-toggle="tab" href="#tab-22"  aria-expanded="false">合同评审信息</a></li>&ndash;%&gt;
                             </ul>
                         </div>
-					</ul>
+					</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/workcontractinfo/workContractCompletionAudit.jsp

@@ -55,14 +55,14 @@
 
 				<c:set var="status" value="${workContractInfo.act.status}" />
 				<div class="tabs-container" style="margin-top: 20px;">
-					<ul class="nav nav-tabs">
+					<%--<ul class="nav nav-tabs">
                         <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>
-					</ul>
+					</ul>--%>
 					<div class="tab-content">
 						<div id="tab-11" class="tab-pane active">
 							<div class="form-group layui-row first lw9">
@@ -331,7 +331,7 @@
                             </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>
@@ -431,7 +431,7 @@
                                             <c:when test="${not empty workContractInfo.workContractReview.workAttachments}">
                                                 <c:forEach items="${workContractInfo.workContractReview.workAttachments}" var="workClientAttachment" varStatus="status">
                                                     <tr>
-                                                            <%--<td>${status.index + 1}</td>--%>
+                                                            &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')
@@ -469,7 +469,7 @@
                                     </table>
                                 </div>
                             </div>
-                        </div>
+                        </div>--%>
                     </div>
                 </div>
                 <div class="form-group layui-row">

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

@@ -50,12 +50,12 @@
 
 				<c:set var="status" value="${workContractInfo.act.status}" />
 				<div class="tabs-container">
-					<div class="layui-tab" id="tabDiv">
+					<%--<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>
+					</div>--%>
 
 					<div class="tab-content">
 						<div id="tab-11" class="tab-pane active">