Browse Source

Merge branch 'master' of http://smartcost.in.8866.org:26903/S.H.I.E.L.D./CLDV2.0

chente 5 năm trước cách đây
mục cha
commit
3977fefa1b
6 tập tin đã thay đổi với 2099 bổ sung6 xóa
  1. 1078 0
      staff-affixation.html
  2. 1 1
      staff-employee.html
  3. 2 2
      staff-guanaitong.html
  4. 1 1
      staff-set-job.html
  5. 2 2
      staff-tax.html
  6. 1015 0
      staff-welfare.html

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1078 - 0
staff-affixation.html


+ 1 - 1
staff-employee.html

@@ -142,7 +142,7 @@
                                 </a>
                                 <ul>
                                     <li>
-                                        <a href="#" title="Analytics Dashboard" data-filter-tags="application intel analytics dashboard">
+                                        <a href="staff-affixation.html" title="Analytics Dashboard" data-filter-tags="application intel analytics dashboard">
                                             <span class="nav-link-text">附加收支项</span>
                                         </a>
                                     </li>

+ 2 - 2
staff-guanaitong.html

@@ -142,7 +142,7 @@
                                 </a>
                                 <ul>
                                     <li>
-                                        <a href="#" title="Analytics Dashboard" data-filter-tags="application intel analytics dashboard">
+                                        <a href="staff-affixation.html" title="Analytics Dashboard" data-filter-tags="application intel analytics dashboard">
                                             <span class="nav-link-text">附加收支项</span>
                                         </a>
                                     </li>
@@ -624,7 +624,7 @@
       </div>
     </div>
   </div>
-  <!-- BEGIN 员工详情弹窗-->
+  <!-- BEGIN 关爱通详情弹窗-->
   <div class="modal fade" id="staff-guanaitong-detail" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static">
     <div class="modal-dialog modal-xl">
       <div class="modal-content">

+ 1 - 1
staff-set-job.html

@@ -142,7 +142,7 @@
                                 </a>
                                 <ul>
                                     <li>
-                                        <a href="#" title="Analytics Dashboard" data-filter-tags="application intel analytics dashboard">
+                                        <a href="staff-affixation.html" title="Analytics Dashboard" data-filter-tags="application intel analytics dashboard">
                                             <span class="nav-link-text">附加收支项</span>
                                         </a>
                                     </li>

+ 2 - 2
staff-tax.html

@@ -142,7 +142,7 @@
                                 </a>
                                 <ul>
                                     <li>
-                                        <a href="#" title="Analytics Dashboard" data-filter-tags="application intel analytics dashboard">
+                                        <a href="staff-affixation.html" title="Analytics Dashboard" data-filter-tags="application intel analytics dashboard">
                                             <span class="nav-link-text">附加收支项</span>
                                         </a>
                                     </li>
@@ -566,7 +566,7 @@
       </div>
     </div>
   </div>
-  <!-- BEGIN 员工详情弹窗-->
+  <!-- BEGIN 六项专项扣除详情弹窗-->
   <div class="modal fade" id="staff-tax-detail" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static">
     <div class="modal-dialog modal-xl">
       <div class="modal-content">

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1015 - 0
staff-welfare.html