Merge branch 'master' of http://115.238.142.158:20182/DL-HNDJ/HNDJ

ruoyi-hndj/src/main/resources/templates/base/staffdevelop/archived.html

@@ -99,7 +99,7 @@
                                 <ul class="ml">
                                     <li class="active bg" style="padding: 0px"><div class="ms"><a data-toggle="tab" href="#tab-101"><i class="fa fa-envelope bc"></i>递交入党申请</a></div>
                                     </li>
-                                    <li class="" th:if="${stafflop.activtitNode} lt 102"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-comments-o"></i>党组织派人谈话</a></div>
+                                    <li class="" style="padding: 0px" th:if="${stafflop.activtitNode} lt 102"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-comments-o"></i>党组织派人谈话</a></div>
                                     <li class="" style="padding: 0px" th:if="${stafflop.activtitNode} ge 102"><div class="ms"><a data-toggle="tab" href="#tab-102"><i class="fa fa-comments-o"></i>党组织派人谈话</a></div>
                                     </li>
                                 </ul>
@@ -258,12 +258,12 @@
                             <div class="tabs-left pl">
                                 <ul class="ml">
                                     <li class="active bg" style="padding: 0px"><div class="ms"><a data-toggle="tab" href="#tab-201"><i class="fa fa-hand-pointer-o bc"></i>推荐和确定入党积极分子</a></div></li>
-                                    <li class="" th:if="${stafflop.activtitNode} lt 202" ><div class="ms"><a style="color: silver;cursor: no-drop;" data-toggle="tab"><i class="fa fa-save"></i>上级党(工)委备案</a></div></li>
+                                    <li class="" th:if="${stafflop.activtitNode} lt 202" style="padding: 0px; margin-top: 40px"><div class="ms"><a style="color: silver;cursor: no-drop;" data-toggle="tab"><i class="fa fa-save"></i>上级党(工)委备案</a></div></li>
                                     <li class="" th:if="${stafflop.activtitNode} ge 202" style="padding: 0px; margin-top: 40px"><div class="ms"><a data-toggle="tab" href="#tab-202"><i class="fa fa-save"></i>上级党(工)委备案</a></div></li>
-                                    <li class="" th:if="${stafflop.activtitNode} lt 203"><div class="ms"><a style="color: silver;cursor: no-drop;" data-toggle="tab" ><i class="fa fa-phone"></i>指定培养联系人</a></div></li>
-                                    <li class="" th:if="${stafflop.activtitNode} ge 203"style="padding: 0px"><div class="ms"><a data-toggle="tab" href="#tab-203"><i class="fa fa-phone"></i>指定培养联系人</a></div></li>
-                                    <li class="" th:if="${stafflop.activtitNode} lt 204"><div class="ms"><a style="color: silver;cursor: no-drop;" data-toggle="tab" ><i class="fa fa-eye"></i>培养考察教育</a></div></li>
-                                    <li class="" th:if="${stafflop.activtitNode} ge 204"style="padding: 0px"><div class="ms"><a data-toggle="tab" href="#tab-204"><i class="fa fa-eye"></i>培养考察教育</a></div></li>
+                                    <li class="" th:if="${stafflop.activtitNode} lt 203" style="padding: 0px"><div class="ms"><a style="color: silver;cursor: no-drop;" data-toggle="tab" ><i class="fa fa-phone"></i>指定培养联系人</a></div></li>
+                                    <li class="" th:if="${stafflop.activtitNode} ge 203" style="padding: 0px"><div class="ms"><a data-toggle="tab" href="#tab-203"><i class="fa fa-phone"></i>指定培养联系人</a></div></li>
+                                    <li class="" th:if="${stafflop.activtitNode} lt 204" style="padding: 0px"><div class="ms"><a style="color: silver;cursor: no-drop;" data-toggle="tab" ><i class="fa fa-eye"></i>培养考察教育</a></div></li>
+                                    <li class="" th:if="${stafflop.activtitNode} ge 204" style="padding: 0px"><div class="ms"><a data-toggle="tab" href="#tab-204"><i class="fa fa-eye"></i>培养考察教育</a></div></li>
                                 </ul>
                                 <div class="tab-content mc">
                                     <div id="tab-201" class="tab-pane ">
@@ -581,13 +581,13 @@
                                 <ul class="ml">
                                     <li class="active bg" style="padding: 0px"><div class="ms"><a data-toggle="tab" href="#tab-301"><i class="fa fa-user bc"></i>讨论确定发展对象</a></div></li>
 
-                                    <li th:if="${stafflop.activtitNode} lt 302"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-save"></i>上级党(工)委备案</a></div></li>
+                                    <li th:if="${stafflop.activtitNode} lt 302" style="padding: 0px"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-save"></i>上级党(工)委备案</a></div></li>
                                     <li th:if="${stafflop.activtitNode} ge 302" style="padding: 0px"><div class="ms"><a data-toggle="tab" href="#tab-302"><i class="fa fa-save"></i>上级党(工)委备案</a></div></li>
-                                    <li th:if="${stafflop.activtitNode} lt 303"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-share"></i>确定入党介绍人</a></div></li>
+                                    <li th:if="${stafflop.activtitNode} lt 303" style="padding: 0px"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-share"></i>确定入党介绍人</a></div></li>
                                     <li th:if="${stafflop.activtitNode} ge 303" style="padding: 0px"><div class="ms"><a data-toggle="tab" href="#tab-303"><i class="fa fa-share"></i>确定入党介绍人</a></div></li>
-                                    <li th:if="${stafflop.activtitNode} lt 304"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-eye"></i>进行政治审查</a></div></li>
+                                    <li th:if="${stafflop.activtitNode} lt 304" style="padding: 0px"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-eye"></i>进行政治审查</a></div></li>
                                     <li th:if="${stafflop.activtitNode} ge 304" class="" style="padding: 0px"><div class="ms"><a data-toggle="tab" href="#tab-304"><i class="fa fa-eye"></i>进行政治审查</a></div></li>
-                                    <li th:if="${stafflop.activtitNode} lt 305"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-institution"></i>开展集中培训</a></div></li>
+                                    <li th:if="${stafflop.activtitNode} lt 305" style="padding: 0px"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-institution"></i>开展集中培训</a></div></li>
                                     <li th:if="${stafflop.activtitNode} ge 305" style="padding: 0px"><div class="ms"><a data-toggle="tab" href="#tab-305"><i class="fa fa-institution"></i>开展集中培训</a></div></li>
                                 </ul>
                                 <div class="tab-content mc">
@@ -971,17 +971,17 @@
                             <div class="tabs-left pl">
                                 <ul class="ml">
                                     <li style="padding: 0px"><div class="ms"><a data-toggle="tab" href="#tab-401"><i class="fa fa-tripadvisor bc"></i>支部委员会审查</a></div></li>
-                                    <li th:if="${stafflop.activtitNode} lt 402"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-angle-double-up"></i>上级党(工)委预审</a></div></li>
+                                    <li th:if="${stafflop.activtitNode} lt 402" style="padding: 0px"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-angle-double-up"></i>上级党(工)委预审</a></div></li>
                                     <li th:if="${stafflop.activtitNode} ge 402" style="padding: 0px"><div class="ms"><a data-toggle="tab" href="#tab-402"><i class="fa fa-angle-double-up"></i>上级党(工)委预审</a></div></li>
-                                    <li th:if="${stafflop.activtitNode} lt 403"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-file-text-o"></i>填写入党志愿书</a></div></li>
+                                    <li th:if="${stafflop.activtitNode} lt 403" style="padding: 0px"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-file-text-o"></i>填写入党志愿书</a></div></li>
                                     <li th:if="${stafflop.activtitNode} ge 403" style="padding: 0px"><div class="ms"><a data-toggle="tab" href="#tab-403"><i class="fa fa-file-text-o"></i>填写入党志愿书</a></div></li>
-                                    <li th:if="${stafflop.activtitNode} lt 404"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-users"></i>支部大会讨论</a></div></li>
+                                    <li th:if="${stafflop.activtitNode} lt 404" style="padding: 0px"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-users"></i>支部大会讨论</a></div></li>
                                     <li th:if="${stafflop.activtitNode} ge 404" style="padding: 0px"><div class="ms"><a data-toggle="tab" href="#tab-404"><i class="fa fa-users"></i>支部大会讨论</a></div></li>
 
-                                    <li th:if="${stafflop.activtitNode} lt 405"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-comments"></i>党工委谈话并审批</a></div></li>
+                                    <li th:if="${stafflop.activtitNode} lt 405" style="padding: 0px"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-comments"></i>党工委谈话并审批</a></div></li>
                                     <li th:if="${stafflop.activtitNode} ge 405" style="padding: 0px"><div class="ms"><a data-toggle="tab" href="#tab-405" ><i class="fa fa-comments"></i>党工委谈话并审批</a></div></li>
 
-                                    <li th:if="${stafflop.activtitNode} lt 406"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-save"></i>区委组织部备案</a></div></li>
+                                    <li th:if="${stafflop.activtitNode} lt 406" style="padding: 0px"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-save"></i>区委组织部备案</a></div></li>
                                     <li th:if="${stafflop.activtitNode} ge 406" style="padding: 0px"><div class="ms"><a data-toggle="tab" href="#tab-406"><i class="fa fa-save"></i>区委组织部备案</a></div></li>
                                 </ul>
                                 <div class="tab-content mc">
@@ -1472,11 +1472,11 @@
                             <div class="tabs-left pl">
                                 <ul class="ml">
                                     <li class=" bg" style="padding: 0px"><div class="ms"><a data-toggle="tab" href="#tab-501"><i class="fa fa-binoculars bc"></i>继续教育考察</a></div></li>
-                                    <li th:if="${stafflop.activtitNode} lt 502"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-user-plus"></i>提出转正申请</a></div></li>
+                                    <li th:if="${stafflop.activtitNode} lt 502" style="padding: 0px"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-user-plus"></i>提出转正申请</a></div></li>
                                     <li th:if="${stafflop.activtitNode} ge 502" style="padding: 0px"><div class="ms"><a data-toggle="tab" href="#tab-502"><i class="fa fa-user-plus"></i>提出转正申请</a></div></li>
-                                    <li th:if="${stafflop.activtitNode} lt 503"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-users"></i>支部大会讨论</a></div></li>
+                                    <li th:if="${stafflop.activtitNode} lt 503" style="padding: 0px"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-users"></i>支部大会讨论</a></div></li>
                                     <li th:if="${stafflop.activtitNode} ge 503" style="padding: 0px"><div class="ms"><a data-toggle="tab" href="#tab-503"><i class="fa fa-users"></i>支部大会讨论</a></div></li>
-                                    <li th:if="${stafflop.activtitNode} lt 504"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-certificate"></i>上级党工委审批</a></div></li>
+                                    <li th:if="${stafflop.activtitNode} lt 504" style="padding: 0px"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-certificate"></i>上级党工委审批</a></div></li>
                                     <li th:if="${stafflop.activtitNode} ge 504" style="padding: 0px"><div class="ms"><a data-toggle="tab" href="#tab-504"><i class="fa fa-certificate"></i>上级党工委审批</a></div></li>
                                 </ul>
                                 <div class="tab-content mc">

ruoyi-hndj/src/main/resources/templates/base/staffdevelop/particulars.html

@@ -266,9 +266,9 @@
                                 <ul class="ml">
                                     <li class="active bg" style="padding: 0px"><div class="ms"><a data-toggle="tab" href="#tab-201"><i class="fa fa-hand-pointer-o bc"></i>推荐和确定入党积极分子</a></div></li>
                                     <li class="" th:if="${stafflop.activtitNode} lt 202"><div class="ms"><a style="color: silver;cursor: no-drop;" data-toggle="tab"><i class="fa fa-save"></i>上级党(工)委备案</a></div></li>
-                                    <li class="" th:if="${stafflop.activtitNode} lt 203"><div class="ms"><a style="color: silver;cursor: no-drop;" data-toggle="tab" ><i class="fa fa-phone"></i>指定培养联系人</a></div></li>
+                                    <li class="" th:if="${stafflop.activtitNode} lt 203" style="padding: 0px; margin-top: 40px"><div class="ms"><a style="color: silver;cursor: no-drop;" data-toggle="tab" ><i class="fa fa-phone"></i>指定培养联系人</a></div></li>
                                     <li class="" th:if="${stafflop.activtitNode} ge 203" style="padding: 0px; margin-top: 40px"><div class="ms"><a data-toggle="tab" href="#tab-203"><i class="fa fa-phone"></i>指定培养联系人</a></div></li>
-                                    <li class="" th:if="${stafflop.activtitNode} lt 204"><div class="ms"><a style="color: silver;cursor: no-drop;" data-toggle="tab" ><i class="fa fa-eye"></i>培养考察教育</a></div></li>
+                                    <li class="" th:if="${stafflop.activtitNode} lt 204" style="padding: 0px"><div class="ms"><a style="color: silver;cursor: no-drop;" data-toggle="tab" ><i class="fa fa-eye"></i>培养考察教育</a></div></li>
                                     <li class="" th:if="${stafflop.activtitNode} ge 204" style="padding: 0px"><div class="ms"><a data-toggle="tab" href="#tab-204"><i class="fa fa-eye"></i>培养考察教育</a></div></li>
                                 </ul>
                                 <div class="tab-content mc">
@@ -592,13 +592,13 @@
                                 <ul class="ml">
                                     <li class="active bg" style="padding: 0px"><div class="ms"><a data-toggle="tab" href="#tab-301"><i class="fa fa-user bc"></i>讨论确定发展对象</a></div></li>
 
-                                    <li th:if="${stafflop.activtitNode} lt 302"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-save"></i>上级党(工)委备案</a></div></li>
+                                    <li th:if="${stafflop.activtitNode} lt 302" style="padding: 0px"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-save"></i>上级党(工)委备案</a></div></li>
                                     <li th:if="${stafflop.activtitNode} ge 302" style="padding: 0px"><div class="ms"><a data-toggle="tab" href="#tab-302"><i class="fa fa-save"></i>上级党(工)委备案</a></div></li>
-                                    <li th:if="${stafflop.activtitNode} lt 303"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-share"></i>确定入党介绍人</a></div></li>
+                                    <li th:if="${stafflop.activtitNode} lt 303" style="padding: 0px"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-share"></i>确定入党介绍人</a></div></li>
                                     <li th:if="${stafflop.activtitNode} ge 303" style="padding: 0px"><div class="ms"><a data-toggle="tab" href="#tab-303"><i class="fa fa-share"></i>确定入党介绍人</a></div></li>
-                                    <li th:if="${stafflop.activtitNode} lt 304"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-eye"></i>进行政治审查</a></div></li>
+                                    <li th:if="${stafflop.activtitNode} lt 304" class="" style="padding: 0px"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-eye"></i>进行政治审查</a></div></li>
                                     <li th:if="${stafflop.activtitNode} ge 304" class="" style="padding: 0px"><div class="ms"><a data-toggle="tab" href="#tab-304"><i class="fa fa-eye"></i>进行政治审查</a></div></li>
-                                    <li th:if="${stafflop.activtitNode} lt 305"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-institution"></i>开展集中培训</a></div></li>
+                                    <li th:if="${stafflop.activtitNode} lt 305" style="padding: 0px"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-institution"></i>开展集中培训</a></div></li>
                                     <li th:if="${stafflop.activtitNode} ge 305" style="padding: 0px"><div class="ms"><a data-toggle="tab" href="#tab-305"><i class="fa fa-institution"></i>开展集中培训</a></div></li>
                                 </ul>
                                 <div class="tab-content mc">
@@ -1007,17 +1007,17 @@
                             <div class="tabs-left pl">
                                 <ul class="ml">
                                     <li style="padding: 0px"><div class="ms"><a data-toggle="tab" href="#tab-401"><i class="fa fa-tripadvisor bc"></i>支部委员会审查</a></div></li>
-                                    <li th:if="${stafflop.activtitNode} lt 402"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-angle-double-up"></i>上级党(工)委预审</a></div></li>
+                                    <li th:if="${stafflop.activtitNode} lt 402" style="padding: 0px"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-angle-double-up"></i>上级党(工)委预审</a></div></li>
                                     <li th:if="${stafflop.activtitNode} ge 402" style="padding: 0px"><div class="ms"><a data-toggle="tab" href="#tab-402"><i class="fa fa-angle-double-up"></i>上级党(工)委预审</a></div></li>
-                                    <li th:if="${stafflop.activtitNode} lt 403"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-file-text-o"></i>填写入党志愿书</a></div></li>
+                                    <li th:if="${stafflop.activtitNode} lt 403" style="padding: 0px"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-file-text-o"></i>填写入党志愿书</a></div></li>
                                     <li th:if="${stafflop.activtitNode} ge 403" style="padding: 0px"><div class="ms"><a data-toggle="tab" href="#tab-403"><i class="fa fa-file-text-o"></i>填写入党志愿书</a></div></li>
-                                    <li th:if="${stafflop.activtitNode} lt 404"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-users"></i>支部大会讨论</a></div></li>
+                                    <li th:if="${stafflop.activtitNode} lt 404" style="padding: 0px"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-users"></i>支部大会讨论</a></div></li>
                                     <li th:if="${stafflop.activtitNode} ge 404" style="padding: 0px"><div class="ms"><a data-toggle="tab" href="#tab-404"><i class="fa fa-users"></i>支部大会讨论</a></div></li>
 
-                                    <li th:if="${stafflop.activtitNode} lt 405"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-comments"></i>党工委谈话并审批</a></div></li>
+                                    <li th:if="${stafflop.activtitNode} lt 405" style="padding: 0px"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-comments"></i>党工委谈话并审批</a></div></li>
                                     <li th:if="${stafflop.activtitNode} ge 405" style="padding: 0px"><div class="ms"><a data-toggle="tab" href="#tab-405" ><i class="fa fa-comments"></i>党工委谈话并审批</a></div></li>
 
-                                    <li th:if="${stafflop.activtitNode} lt 406"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-save"></i>区委组织部备案</a></div></li>
+                                    <li th:if="${stafflop.activtitNode} lt 406" style="padding: 0px"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-save"></i>区委组织部备案</a></div></li>
                                     <li th:if="${stafflop.activtitNode} ge 406" style="padding: 0px"><div class="ms"><a data-toggle="tab" href="#tab-406"><i class="fa fa-save"></i>区委组织部备案</a></div></li>
                                 </ul>
                                 <div class="tab-content mc">
@@ -1533,11 +1533,11 @@
                             <div class="tabs-left pl">
                                 <ul class="ml">
                                     <li class=" bg" style="padding: 0px"><div class="ms"><a data-toggle="tab" href="#tab-501"><i class="fa fa-binoculars bc"></i>继续教育考察</a></div></li>
-                                    <li th:if="${stafflop.activtitNode} lt 502"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-user-plus"></i>提出转正申请</a></div></li>
+                                    <li th:if="${stafflop.activtitNode} lt 502" style="padding: 0px"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-user-plus"></i>提出转正申请</a></div></li>
                                     <li th:if="${stafflop.activtitNode} ge 502" style="padding: 0px"><div class="ms"><a data-toggle="tab" href="#tab-502"><i class="fa fa-user-plus"></i>提出转正申请</a></div></li>
-                                    <li th:if="${stafflop.activtitNode} lt 503"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-users"></i>支部大会讨论</a></div></li>
+                                    <li th:if="${stafflop.activtitNode} lt 503" style="padding: 0px"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-users"></i>支部大会讨论</a></div></li>
                                     <li th:if="${stafflop.activtitNode} ge 503" style="padding: 0px"><div class="ms"><a data-toggle="tab" href="#tab-503"><i class="fa fa-users"></i>支部大会讨论</a></div></li>
-                                    <li th:if="${stafflop.activtitNode} lt 504"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-certificate"></i>上级党工委审批</a></div></li>
+                                    <li th:if="${stafflop.activtitNode} lt 504" style="padding: 0px"><div class="ms"><a style="color: silver;cursor: no-drop;"><i class="fa fa-certificate"></i>上级党工委审批</a></div></li>
                                     <li th:if="${stafflop.activtitNode} ge 504" style="padding: 0px"><div class="ms"><a data-toggle="tab" href="#tab-504"><i class="fa fa-certificate"></i>上级党工委审批</a></div></li>
                                 </ul>
                                 <div class="tab-content mc">