Merge remote-tracking branch 'origin/1.2.0' into 1.2.0

src/main/java/cn/palmte/work/service/AccountService.java

@@ -68,7 +68,7 @@ public class AccountService {
         queryHelper.addCondition(searchInfo.containsKey("userName"), "u.user_name =?", searchInfo.get("userName"));
         queryHelper.addCondition(searchInfo.containsKey("deptId") &&
                         StrKit.notBlank(searchInfo.get("deptId")) && !"-1".equals(searchInfo.get("deptId")),
-                "u.dept_id =?", searchInfo.get("deptId"));
+                "(u.dept_id =? or d2.id = ? or d3.id = ?)", searchInfo.get("deptId"), searchInfo.get("deptId"), searchInfo.get("deptId"));
         queryHelper.addCondition(searchInfo.containsKey("roleId") &&
                         StrKit.notBlank(searchInfo.get("roleId")) && !"-1".equals(searchInfo.get("roleId")),
                 "u.role_id =?", searchInfo.get("roleId"));

src/main/resources/templates/admin/project_list.ftl

@@ -26,8 +26,9 @@
             border-spacing: 0px;
             border-collapse: collapse;
             border: none;
-            overflow-y: hidden;
+            /*overflow-y: hidden;*/
-            overflow-x: auto;
+            /*overflow-x: auto;*/
+            overflow: auto;
             margin: 0;
         }
 
@@ -45,10 +46,10 @@
         }
         .fixed-list table tbody {
             display: block;
-            width: 100%;
+            /*width: 100%;*/
             max-height: calc(100% - 45px);
-            overflow-y: scroll;
+            /*overflow-y: scroll;*/
-            overflow-x: hidden;
+            /*overflow-x: hidden;*/
             -webkit-overflow-scrolling: touch;
         }
 
@@ -57,13 +58,72 @@
             display: table;
         }
         .fixed-list table thead tr {
-            width: calc(100% - 18px);
+            /*width: calc(100% - 18px);*/
+            width: 100%;
             border-top: 1px solid #ddd;
             border-bottom: none;
         }
         .fixed-list table tbody tr {
             width: 100%;
         }
+
+        /* 调节表格列间距 */
+        table{
+            padding-top: 0 !important;
+        }
+        thead{
+            position: sticky;
+            top: 0;
+            background-color: white;
+            padding-top: 0.5rem;
+            z-index: 999;
+        }
+        thead,tbody{
+            width: 100%;
+        }
+        @media screen and (max-width:1600px) {
+            /*这里实际小于1920分辨率就触发了*/
+            thead,tbody{
+                width: 1640px;
+            }
+        }
+        th,td{
+            box-sizing: content-box;
+            padding-left: 0 !important;
+            padding-right: 0 !important;
+        }
+        td{
+            /*vertical-align: middle !important;*/
+        }
+        .rm20{
+            padding-right: 20px !important;
+        }
+        .rm40{
+            padding-right: 40px !important;
+        }
+        .lm40{
+            padding-left: 40px !important;
+        }
+        .rm50{
+            padding-right: 50px !important;
+        }
+        .sy{
+            width: 20px;
+        }
+        .xh{
+            width: 30px;
+        }
+        .xmbh{
+            /*width: 80px;*/
+        }
+        .xmmc{
+            /*480*/
+            width: 417px;
+        }
+        .cz{
+            /*240*/
+            width: 430px;
+        }
     </style>
 
     <div class="admin-content">
@@ -793,20 +853,20 @@
                         }
                     </style>
                     <table class="am-table am-table-striped am-table-hover table-main">
-                        <thead style="display:block;width: 1888px;">
+                        <thead style="display:block;">
                         <tr class="am-text-nowrap">
-                            <th width="30px">
+                            <th class="rm20 sy">
                                 <input type="checkbox" id="allCheck">
                             </th>
-                            <th class="table-title" width="60px">序号</th>
+                            <th class="table-title xh">序号</th>
-                            <th class="table-title" width="120px">项目编号<i class="am-icon-caret-down" <#if orderTypeStr == "projectNoDown">style="color: red"</#if> onclick="sub_function('projectNoDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "projectNoUp">style="color: red"</#if> onclick="sub_function('projectNoUp')"></i></th>
+                            <th class="table-title xmbh lm40">项目编号<i class="am-icon-caret-down" <#if orderTypeStr == "projectNoDown">style="color: red"</#if> onclick="sub_function('projectNoDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "projectNoUp">style="color: red"</#if> onclick="sub_function('projectNoUp')"></i></th>
-                            <th class="table-title" width="480px">项目名称<i class="am-icon-caret-down" <#if orderTypeStr == "projectNameDown">style="color: red"</#if> onclick="sub_function('projectNameDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "projectNameUp">style="color: red"</#if> onclick="sub_function('projectNameUp')"></i></th>
+                            <th class="table-title xmmc">项目名称<i class="am-icon-caret-down" <#if orderTypeStr == "projectNameDown">style="color: red"</#if> onclick="sub_function('projectNameDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "projectNameUp">style="color: red"</#if> onclick="sub_function('projectNameUp')"></i></th>
-                            <th class="table-title" >项目类型<i class="am-icon-caret-down" <#if orderTypeStr == "projectTypeDown">style="color: red"</#if> onclick="sub_function('projectTypeDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "projectTypeUp">style="color: red"</#if> onclick="sub_function('projectTypeUp')"></i></th>
+                            <th class="table-title rm50" >项目类型<i class="am-icon-caret-down" <#if orderTypeStr == "projectTypeDown">style="color: red"</#if> onclick="sub_function('projectTypeDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "projectTypeUp">style="color: red"</#if> onclick="sub_function('projectTypeUp')"></i></th>
-                            <th class="table-title" >项目阶段</th>
+                            <th class="table-title rm50" >项目阶段</th>
                             <#--<th class="table-title">垫资模式<i class="am-icon-caret-down" <#if orderTypeStr == "underModeDown">style="color: red"</#if> onclick="sub_function('underModeDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "underModeUp">style="color: red"</#if> onclick="sub_function('underModeUp')"></i></th>-->
                             <#--<th class="table-title">垫资利息<i class="am-icon-caret-down" <#if orderTypeStr == "underIntDown">style="color: red"</#if> onclick="sub_function('underIntDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "underIntUp">style="color: red"</#if> onclick="sub_function('underIntUp')"></i></th>-->
                             <#--<th class="table-title">垫资峰值<i class="am-icon-caret-down" <#if orderTypeStr == "underPeakDown">style="color: red"</#if> onclick="sub_function('underPeakDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "underPeakUp">style="color: red"</#if> onclick="sub_function('underPeakUp')"></i></th>-->
-                            <th class="table-title" >项目合同金额<i class="am-icon-caret-down" <#if orderTypeStr == "projectContractDown">style="color: red"</#if> onclick="sub_function('projectContractDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "projectContractUp">style="color: red"</#if> onclick="sub_function('projectContractUp')"></i></th>
+                            <th class="table-title rm50" >项目合同金额<i class="am-icon-caret-down" <#if orderTypeStr == "projectContractDown">style="color: red"</#if> onclick="sub_function('projectContractDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "projectContractUp">style="color: red"</#if> onclick="sub_function('projectContractUp')"></i></th>
                             <#--<th class="table-title">项目毛利<i class="am-icon-caret-down" <#if orderTypeStr == "grossProfitDown">style="color: red"</#if> onclick="sub_function('grossProfitDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "grossProfitUp">style="color: red"</#if> onclick="sub_function('grossProfitUp')"></i></th>-->
                             <#--<th class="table-title">项目毛利率<i class="am-icon-caret-down" <#if orderTypeStr == "grossProfitMarginDown">style="color: red"</#if> onclick="sub_function('grossProfitMarginDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "grossProfitMarginUp">style="color: red"</#if> onclick="sub_function('grossProfitMarginUp')"></i></th>-->
                             <#--<th class="table-title">项目把握度<i class="am-icon-caret-down" <#if orderTypeStr == "certaintyDown">style="color: red"</#if> onclick="sub_function('certaintyDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "certaintyUp">style="color: red"</#if> onclick="sub_function('certaintyUp')"></i></th>-->
@@ -826,33 +886,33 @@
                             <#--<th class="table-title">战略合作对象</th>-->
                             <#--<th class="table-title">项目负责人</th>-->
                             <#--<th class="table-title">审核状态</th>-->
-                            <th class="table-title" >当前审核人</th>
+                            <th class="table-title rm50" >当前审核人</th>
-                            <th class="table-title" >项目创建者</th>
+                            <th class="table-title rm50" >项目创建者</th>
                             <#--<th class="table-title">部门名称</th>-->
                             <#--<th class="table-title">项目周期</th>-->
                             <#--<th class="table-title">最后更新时间</th>-->
-                            <th class="table-title" width="240px">操作</th>
+                            <th class="table-title cz">操作</th>
                         </tr>
                         </thead>
 
-                        <tbody style="display:block;width: 1888px;">
+                        <tbody style="display:block;">
                         <#list pager.list as list>
                             <tr>
-                                <td width="30px">
+                                <td class="rm20 sy">
                                     <input type="checkbox" name="ids" value="${list.id!}" />
                                 </td>
                                 <#--序号-->
-                                <td width="60px">${list.tempId!}</td>
+                                <td class="xh">${list.tempId!}</td>
                                 <#--项目编号-->
-                                <td class="huanhang" width="120px">${list.projectNo!}</td>
+                                <td class="huanhang xmbh lm40">${list.projectNo!}</td>
                                 <#--项目名称-->
-                                <td class="huanhang" width="480px">
+                                <td class="huanhang xmmc">
                                     <a style="cursor: pointer;text-decoration:none" onclick="approve(${list.id})">${list.name!}</a>
                                 </td>
                                 <#--项目类型-->
-                                <td >${list.typeDesc!}</td>
+                                <td class="rm50">${list.typeDesc!}</td>
                                 <#--项目阶段-->
-                                <td>
+                                <td class="rm50">
                                     <#if list.stage??>
                                         <#if list.stage==0>S0-概算立项
                                         <#elseif list.stage==1>S1-项目调研
@@ -875,7 +935,7 @@
                                 <#--垫资峰值-->
                                 <#--<td>${list.advancePeakAmountRound!}</td>-->
                                 <#--项目合同金额-->
-                                <td>${list.contractRound!}</td>
+                                <td class="rm50">${list.contractRound!}</td>
                                 <#--项目毛利-->
                                 <#--<td>${list.grossProfitRound!}</td>-->
                                 <#--项目毛利率-->
@@ -924,9 +984,9 @@
                                 <#--审核状态-->
                                 <#--<td>${list.approveStatusDesc!}</td>-->
                                 <#--当前审核人-->
-                                <td >${list.approveName!}</td>
+                                <td class="rm50">${list.approveName!}</td>
                                 <#--项目创建者-->
-                                <td>${list.creatorName!}</td>
+                                <td class="rm50">${list.creatorName!}</td>
                                 <#--部门名称-->
                                <#-- <td>${list.deptName!}</td>-->
                                 <#--项目周期-->
@@ -934,7 +994,7 @@
                                 <#--最后更新时间-->
                                 <#--<td>${(list.lastUpdateTime?string("yyyy-MM-dd HH:mm:ss"))!}</td>-->
                                 <#--操作-->
-                                <td width="240px">
+                                <td class="cz">
                                     <div class="am-btn-toolbar">
                                         <div class="am-btn-group am-btn-group-xs">
                                             <#if adminId==1>