Merge branch 'master' of https://gitee.com/beiwu/cmanager

2024-02-20 12:05:53 +08:00
parent dee682dd6a 5f850ddc4b
commit 960af23f0c
3 changed files with 933 additions and 897 deletions
--- a/src/views/tenant/main/policy/index.vue
+++ b/src/views/tenant/main/policy/index.vue
@@ -33,9 +33,10 @@
                </span>
              </span>
            </el-tree>
+            <!-- v-show="vaildData(permission.tenant_wage_payroll_view, false)" -->
+
            <div class="footer" style="padding-left: 6px">
-              <el-button type="text" icon="el-icon-plus" @click="updateGroups('add')"
-                v-show="vaildData(permission.tenant_wage_payroll_view, false)">
+              <el-button type="text" icon="el-icon-plus" @click="updateGroups('add')">
                新建分组</el-button>
            </div>
          </el-scrollbar>
--- a/src/views/tenant/main/talents/index.vue
+++ b/src/views/tenant/main/talents/index.vue