flat: 权限

src/views/tenant/main/label/index.vue

@@ -31,7 +31,7 @@
                              size="mini" @click="() => updateGroups('edit', data)">
                   </el-button>
                   <el-button icon="el-icon-delete"
-                     v-if="vaildData(permission.tenant_main_label_index_delete, false)"
+                     v-if="vaildData(permission.tenant_main_label_index_groupdelete, false)"
                      type="text" size="mini" @click="() => removeGroups(data)">
                   </el-button>
                 </span>
@@ -43,6 +43,7 @@
               <el-button
                 type="text"
                 icon="el-icon-plus"
+                v-if="vaildData(permission.tenant_main_label_index_groupadd, false)"
                 @click="updateGroups('add')">
                 新建分组</el-button>
             </div>
@@ -251,14 +252,8 @@ export default {
       return {
         addBtn: this.vaildData(this.permission.tenant_main_label_index_add, false),
         viewBtn: true,
-        delBtn: this.vaildData(
-          this.permission.tenant_main_label_index_edit,
-          false
-        ),
-        editBtn: this.vaildData(
-          this.permission.tenant_main_label_index_edit,
-          false
-        ),
+        delBtn: this.vaildData(this.permission.tenant_main_label_index_del, false),
+        editBtn: this.vaildData(this.permission.tenant_main_label_index_edit, false),
       };
     },
     ids() {

src/views/tenant/main/policy/index.vue

@@ -26,16 +26,20 @@
                 </span>
                 <!-- </el-tooltip> -->
                 <span v-show="data.id && data.id !== '0'" style="flex-basis: 20%">
-                  <el-button type="text" icon="el-icon-edit" size="mini" @click="() => updateGroups('edit', data)">
+                  <el-button type="text" icon="el-icon-edit" size="mini"
+                             v-if="vaildData(permission.tenant_main_policy_index_groupedit, false)"
+                             @click="() => updateGroups('edit', data)">
                   </el-button>
-                  <el-button icon="el-icon-delete" type="text" size="mini" @click="() => removeGroups(data)">
+                  <el-button icon="el-icon-delete" type="text" size="mini" @click="() => removeGroups(data)"
+                             v-if="vaildData(permission.tenant_main_policy_index_groupdel, false)">
                   </el-button>
                 </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')">新建分组</el-button>
+              <el-button type="text" icon="el-icon-plus" v-if="vaildData(permission.tenant_main_policy_index_groupadd, false)"
+                  @click="updateGroups('add')">新建分组</el-button>
             </div>
           </el-scrollbar>
         </div>
@@ -136,9 +140,9 @@
 <!--            <el-button type="success" size="small" plain icon="el-icon-plus" @click="handleImport"-->
 <!--              v-show="vaildData(permission.tenant_talents_groupadd, false)">导入</el-button>-->
             <el-button type="warning" size="small" plain :disabled="!selectionList.length" icon="el-icon-sort"
-              @click="handleTransfer">转移分组</el-button>
+              @click="handleTransfer" v-show="vaildData(permission.tenant_main_policy_transfergroup, false)">转移分组</el-button>
             <el-button type="danger" size="small" icon="el-icon-delete" @click="handleDelete"
-              :disabled="!selectionList.length" plain v-show="vaildData(permission.tenant_talents_groupdelete, false)">
+              :disabled="!selectionList.length" plain v-show="vaildData(permission.tenant_main_policy_index_del, false)">
               删除</el-button>
           </template>
           <template slot="name" slot-scope="{row}">
@@ -279,16 +283,10 @@ export default {
     ...mapGetters(["permission"]),
     permissionList() {
       return {
-        addBtn: this.vaildData(this.permission.tenant_talents_groupadd, false),
+        addBtn: this.vaildData(this.permission.tenant_main_policy_index_add, false),
         viewBtn: true,
-        delBtn: this.vaildData(
-          this.permission.tenant_talents_groupdelete,
-          false
-        ),
-        editBtn: this.vaildData(
-          this.permission.tenant_talents_groupedit,
-          false
-        ),
+        delBtn: this.vaildData(this.permission.tenant_main_policy_index_del, false),
+        editBtn: this.vaildData(this.permission.tenant_main_policy_index_edit, false),
       };
     },
     ids() {

src/views/tenant/main/serve/index.vue

@@ -20,15 +20,21 @@
                   （{{ data.sumNum }}个）
                 </span>
                 <span v-show="data.id && data.id !== '0'" style="flex-basis: 20%">
-                  <el-button type="text" icon="el-icon-edit" size="mini" @click="() => updateGroups('edit', data)">
+                  <el-button type="text" icon="el-icon-edit" size="mini"
+                             v-if="vaildData(permission.tenant_main_serve_index_groupedit, false)"
+                             @click="() => updateGroups('edit', data)">
                   </el-button>
-                  <el-button icon="el-icon-delete" type="text" size="mini" @click="() => removeGroups(data)">
+                  <el-button icon="el-icon-delete" type="text" size="mini"
+                             v-if="vaildData(permission.tenant_main_serve_index_groupdel, false)"
+                             @click="() => removeGroups(data)">
                   </el-button>
                 </span>
               </span>
             </el-tree>
             <div class="footer" style="padding-left: 6px">
-              <el-button type="text" icon="el-icon-plus" @click="updateGroups('add')">新建分组</el-button>
+              <el-button type="text" icon="el-icon-plus"
+                         v-if="vaildData(permission.tenant_main_serve_index_groupadd, false)"
+                         @click="updateGroups('add')">新建分组</el-button>
             </div>
           </el-scrollbar>
         </div>
@@ -99,7 +105,8 @@
           </template>
           <!--自定义按钮-->
           <template slot="menuLeft">
-            <el-button type="primary" size="small" icon="el-icon-delete" @click="() => { $refs.crud.rowAdd(); selectPolicyTree = []}">
+            <el-button type="primary" size="small" icon="el-icon-delete" @click="() => { $refs.crud.rowAdd(); selectPolicyTree = []}"
+                       v-if="vaildData(permission.tenant_main_serve_index_add, false)">
               新增</el-button>
             <el-button type="danger" size="small" icon="el-icon-delete" @click="handleDelete"
               :disabled="!selectionList.length" plain v-show="vaildData(permission.tenant_talents_groupdelete, false)">
@@ -122,6 +129,7 @@
             <el-button type="text"
              icon="el-icon-document"
              size="small"
+             v-show="vaildData(permission.tenant_main_serve_index_pushserve, false)"
              @click="selectPushService(row)"
             >推送服务</el-button>
             <el-button type="text"
@@ -133,12 +141,14 @@
              v-if="row.status == 0"
              icon="el-icon-video-play"
              size="small"
+             v-show="vaildData(permission.tenant_main_serve_index_off, false)"
              @click="playServe(row)"
             >启用</el-button>
             <el-button type="text"
              v-if="row.status == 1"
              icon="el-icon-video-pause"
              size="small"
+             v-show="vaildData(permission.tenant_main_serve_index_off, false)"
              @click="pauseServe(row)"
             >关闭</el-button>
           </template>
@@ -472,16 +482,10 @@ export default {
     ...mapGetters(["permission"]),
     permissionList() {
       return {
-        addBtn: this.vaildData(this.permission.tenant_talents_groupadd, false),
+        addBtn: this.vaildData(this.permission.tenant_main_serve_index_add, false),
         viewBtn: true,
-        delBtn: this.vaildData(
-          this.permission.tenant_talents_groupdelete,
-          false
-        ),
-        editBtn: this.vaildData(
-          this.permission.tenant_talents_groupedit,
-          false
-        ),
+        delBtn: this.vaildData(this.permission.tenant_main_serve_index_del,false),
+        editBtn: this.vaildData(this.permission.tenant_main_serve_index_edit, false ),
       };
     },
     ids() {

src/views/tenant/main/talents/certain/index.vue

@@ -26,16 +26,22 @@
                 </span>
                 <!-- </el-tooltip> -->
                 <span v-show="data.id && data.id !== '0'" style="flex-basis: 20%">
-                  <el-button type="text" icon="el-icon-edit" size="mini" @click="() => updateGroups('edit', data)">
+                  <el-button type="text" icon="el-icon-edit" size="mini"
+                             v-if="vaildData(permission.tenant_main_talents_certain_index_groupedit, false)"
+                             @click="() => updateGroups('edit', data)">
                   </el-button>
-                  <el-button icon="el-icon-delete" type="text" size="mini" @click="() => removeGroups(data)">
+                  <el-button icon="el-icon-delete" type="text" size="mini"
+                             v-if="vaildData(permission.tenant_main_talents_certain_index_groupdelete, false)"
+                             @click="() => removeGroups(data)">
                   </el-button>
                 </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')">新建分组</el-button>
+              <el-button type="text" icon="el-icon-plus"
+                         v-if="vaildData(permission.tenant_main_talents_certain_index_groupadd, false)"
+                         @click="updateGroups('add')">新建分组</el-button>
             </div>
           </el-scrollbar>
         </div>
@@ -94,9 +100,9 @@
             <el-button type="success" size="small" plain icon="el-icon-plus" @click="handleImport"
               v-show="vaildData(permission.tenant_talents_groupadd, false)">导入</el-button>
             <el-button type="warning" size="small" plain :disabled="!selectionList.length" icon="el-icon-sort"
-              @click="handleTransfer">转移分组</el-button>
+              @click="handleTransfer" v-show="vaildData(permission.tenant_main_talents_certain_index_transfergroup, false)">转移分组</el-button>
             <el-button type="danger" size="small" icon="el-icon-delete" @click="handleDelete"
-              :disabled="!selectionList.length" plain v-show="vaildData(permission.tenant_talents_groupdelete, false)">
+              :disabled="!selectionList.length" plain v-show="vaildData(permission.tenant_main_talents_certain_index_transfergroup, false)">
               删除</el-button>
           </template>
           <template slot="name" slot-scope="{row}">
@@ -203,17 +209,10 @@ export default {
     ...mapGetters(["permission"]),
     permissionList() {
       return {
-        addBtn: this.vaildData(this.permission.tenant_talents_groupadd, false),
+        addBtn: this.vaildData(this.permission.tenant_main_talents_certain_index_add, false),
         viewBtn: true,
-        delBtn: this.vaildData(
-          this.permission.tenant_talents_groupdelete,
-          false
-        ),
-        editBtn: this.vaildData(
-          this.permission.tenant_talents_groupedit,
-          false
-        ),
-      };
+        delBtn: this.vaildData( this.permission.tenant_main_talents_certain_index_delete, false),
+        editBtn: this.vaildData( this.permission.tenant_main_talents_certain_index_edit,false)};
     },
     ids() {
       let ids = [];
@@ -494,7 +493,7 @@ export default {
     },
     /*加载分组*/
     initDept(groupId) {
-      getDept().then((res) => {
+      getDept({groupType: 1}).then((res) => {
         const data = res.data.data.list;
         this.treeData = data;
         let treeDataOne = {
@@ -894,11 +893,16 @@ export default {
     },
     /*加载人才列表 */
     onLoad(page, params = {}) {
+      const paramsd = {
+        ...params,
+        ...this.query,
+        groupType: 0
+      }
       this.loading = true;
       getList(
         page.currentPage,
         page.pageSize,
-        Object.assign(params, this.query),
+        paramsd,
         this.tenantId
       ).then((res) => {
         res.data.data.records.forEach(item => {

src/views/tenant/main/talents/latent/index.vue

@@ -26,16 +26,22 @@
                 </span>
                 <!-- </el-tooltip> -->
                 <span v-show="data.id && data.id !== '0'" style="flex-basis: 20%">
-                  <el-button type="text" icon="el-icon-edit" size="mini" @click="() => updateGroups('edit', data)">
+                  <el-button type="text" icon="el-icon-edit" size="mini"
+                             v-if="vaildData(permission.tenant_main_talents_latent_index_groupedit, false)"
+                             @click="() => updateGroups('edit', data)">
                   </el-button>
-                  <el-button icon="el-icon-delete" type="text" size="mini" @click="() => removeGroups(data)">
+                  <el-button icon="el-icon-delete" type="text" size="mini"
+                             v-if="vaildData(permission.tenant_main_talents_latent_index_groupdelete, false)"
+                             @click="() => removeGroups(data)">
                   </el-button>
                 </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')">新建分组</el-button>
+              <el-button type="text" icon="el-icon-plus"
+                         v-if="vaildData(permission.tenant_main_talents_latent_index_groupadd, false)"
+                         @click="updateGroups('add')">新建分组</el-button>
             </div>
           </el-scrollbar>
         </div>
@@ -94,9 +100,9 @@
             <el-button type="success" size="small" plain icon="el-icon-plus" @click="handleImport"
               v-show="vaildData(permission.tenant_talents_groupadd, false)">导入</el-button>
             <el-button type="warning" size="small" plain :disabled="!selectionList.length" icon="el-icon-sort"
-              @click="handleTransfer">转移分组</el-button>
+              @click="handleTransfer" v-show="vaildData(permission.tenant_main_talents_latent_index_tansfergroup, false)">转移分组</el-button>
             <el-button type="danger" size="small" icon="el-icon-delete" @click="handleDelete"
-              :disabled="!selectionList.length" plain v-show="vaildData(permission.tenant_talents_groupdelete, false)">
+              :disabled="!selectionList.length" plain  v-show="vaildData(permission.tenant_main_talents_latent_index_tansfergroup, false)">
               删除</el-button>
           </template>
           <template slot="name" slot-scope="{row}">
@@ -203,16 +209,10 @@ export default {
     ...mapGetters(["permission"]),
     permissionList() {
       return {
-        addBtn: this.vaildData(this.permission.tenant_talents_groupadd, false),
+        addBtn: this.vaildData(this.permission.tenant_main_talents_latent_index_add, false),
         viewBtn: true,
-        delBtn: this.vaildData(
-          this.permission.tenant_talents_groupdelete,
-          false
-        ),
-        editBtn: this.vaildData(
-          this.permission.tenant_talents_groupedit,
-          false
-        ),
+        delBtn: this.vaildData( this.permission.tenant_main_talents_latent_index_del, false),
+        editBtn: this.vaildData(this.permission.tenant_main_talents_latent_index_edit, false),
       };
     },
     ids() {
@@ -494,7 +494,7 @@ export default {
     },
     /*加载分组*/
     initDept(groupId) {
-      getDept().then((res) => {
+      getDept({groupType: 0}).then((res) => {
         const data = res.data.data.list;
         this.treeData = data;
         let treeDataOne = {
@@ -894,11 +894,16 @@ export default {
     },
     /*加载人才列表 */
     onLoad(page, params = {}) {
+      const paramsd = {
+        ...params,
+        ...this.query,
+        groupType: 0
+      }
       this.loading = true;
       getList(
         page.currentPage,
         page.pageSize,
-        Object.assign(params, this.query),
+        paramsd,
         this.tenantId
       ).then((res) => {
         res.data.data.records.forEach(item => {

src/views/util/post-view.vue

@@ -122,7 +122,7 @@
           <el-row>
             <el-col span="12">
               <el-form-item label="企业名称：">{{
-                model.companyName
+                model.jobCompanyName
               }}</el-form-item>
             </el-col>
             <el-col span="12">