From b6d70fd9329b1c5fee415713e7ca5d9dcab66526 Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Wed, 02 Mar 2022 09:01:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

---
 src/views/dispatch/dispatch.vue |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/views/dispatch/dispatch.vue b/src/views/dispatch/dispatch.vue
index 5055743..7e44d0f 100644
--- a/src/views/dispatch/dispatch.vue
+++ b/src/views/dispatch/dispatch.vue
@@ -14,6 +14,7 @@
       :data="data"
       :page.sync="page"
       ref="crudrec"
+      :permission="permissionList"
       @on-load="onLoad"
       :table-loading="loading"
       @row-save="rowSave"
@@ -31,6 +32,7 @@
           size="small"
           plain
           icon="el-icon-delete"
+          v-if="permission.dispatch_delete"
           @click="handleDelete"
           >删 除
         </el-button>
@@ -40,6 +42,7 @@
           size="small"
           plain
           icon="el-icon-upload2"
+          v-if="permission.dispatch_import"
           @click="handleImport"
           >批量导入
         </el-button>
@@ -502,7 +505,7 @@
       //赋值
       column.value = that.userInfo.dept_id;
       this.useifid = this.userInfo.dept_id;
-    } else if (roleName == "公安管理员" || roleName == "administrator") {
+    } else if (roleName == "公安管理员" || roleName == "administrator" || roleName == "民警") {
       var columnDept = that.findObject(that.option.column, "deptId");
       columnDept.dicUrl =
         "/api/blade-system/dept/security_lazy-tree?jurisdiction=" +
@@ -516,7 +519,15 @@
     }
   },
   computed: {
-    ...mapGetters(["userInfo"]),
+    ...mapGetters(["permission", "userInfo"]),
+    permissionList() {
+      return {
+        addBtn: this.vaildData(this.permission.dispatch_add, false),
+        viewBtn: this.vaildData(this.permission.dispatch_view, true),
+        delBtn: this.vaildData(this.permission.dispatch_delete, false),
+        editBtn: this.vaildData(this.permission.dispatch_edit, false)
+      };
+    },
     ids() {
       let ids = [];
       this.selectionList.forEach(ele => {
@@ -706,7 +717,7 @@
       if (this.useifid != 266) {
         values["deptId"] = this.useifid;
       }
-      if (this.userInfo.role_name == "公安管理员") {
+      if (this.userInfo.role_name == "公安管理员" || this.userInfo.role_name == "民警") {
         values["jurisdiction"] = that.userInfo.jurisdiction;
       }
       getdata(

--
Gitblit v1.9.3