Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

liuyg

2022-03-02 b6d70fd9329b1c5fee415713e7ca5d9dcab66526

 src/views/securityEquipment/gun.vue

@@ -12,6 +12,7 @@
      :data="data"
      :page.sync="page"
      ref="crudrec"
      :permission="permissionList"
      @on-load="onLoad"
      :table-loading="loading"
      @row-save="rowSave"
@@ -28,6 +29,7 @@
          size="small"
          plain
          icon="el-icon-delete"
          v-if="permission.gun_delete"
          @click="handleDelete"
          >删 除
        </el-button>
@@ -36,6 +38,7 @@
          size="small"
          plain
          icon="el-icon-upload2"
          v-if="permission.gun_import"
          @click="handleImport"
          >批量导入
        </el-button>
@@ -128,7 +131,15 @@
    };
  },
  computed: {
    ...mapGetters(["userInfo"]),
    ...mapGetters(["permission", "userInfo"]),
    permissionList() {
      return {
        addBtn: this.vaildData(this.permission.gun_add, false),
        viewBtn: this.vaildData(this.permission.gun_view, true),
        delBtn: this.vaildData(this.permission.gun_delete, false),
        editBtn: this.vaildData(this.permission.gun_edit, false)
      };
    },
    ids() {
      let ids = [];
      this.selectionList.forEach(ele => {
@@ -148,7 +159,7 @@
      this.useifid = this.userInfo.dept_id;
    }
    //公安局进入
    if (this.userInfo.role_name == "公安管理员") {
    if (this.userInfo.role_name == "公安管理员" || this.userInfo.role_name == "民警") {
      that.option.column[5].dicUrl =
        "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697&jurisdiction=" +
        that.userInfo.jurisdiction;
@@ -321,7 +332,7 @@
      }

      //公安局进入
      if (this.userInfo.role_name == "公安管理员") {
      if (this.userInfo.role_name == "公安管理员" || this.userInfo.role_name == "民警") {
        params["jurisdiction"] = that.userInfo.jurisdiction;
      }
      //保安公司进入