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

liuyg

2022-03-02 b6d70fd9329b1c5fee415713e7ca5d9dcab66526

 src/views/licenseApproval/crossRegion.vue

@@ -37,7 +37,7 @@
          size="small"
          icon="el-icon-delete"
          plain
          v-if="permission.permit_delete"
          v-if="permission.licenseApproval_crossRegion_delete"
          @click="handleDelete"
          >删 除
        </el-button>
@@ -48,6 +48,7 @@
          :size="size"
          :type="type"
          class="zhengJian-icon"
          v-if="permission.licenseApproval_crossRegion_upload"
          @click.stop="handleCredentials(row)"
          >附件
        </el-button>
@@ -56,7 +57,7 @@
          :size="size"
          :type="type"
          @click.stop="rowDel(row)"
          v-if="row.type == '2' && userData == '0'"
          v-if="row.type == '2' && userData == '0' && permission.licenseApproval_crossRegion_audit"
          >备案审批
        </el-button>
        <el-button
@@ -64,7 +65,7 @@
          :size="size"
          :type="type"
          @click.stop="viewLicense(row)"
          v-if="row.type == '0'"
          v-if="row.type == '0' && permission.licenseApproval_crossRegion_print"
          >打印备案证
        </el-button>
      </template>
@@ -166,7 +167,7 @@
  remove
} from "@/api/licenseApproval/recordk";
import { mapGetters } from "vuex";
import { column } from "./column";
import { column1 } from "./column";
export default {
  data() {
    return {
@@ -210,7 +211,7 @@
        viewBtn: true,
        selection: true,
        dialogClickModal: false,
        column: column,
        column: column1,
        ...this.$store.state.control.clearOtherBut
      },
      data: [],
@@ -221,10 +222,10 @@
    ...mapGetters(["permission", "userInfo"]),
    permissionList() {
      return {
        addBtn: this.vaildData(this.permission.permit_add, false),
        viewBtn: this.vaildData(this.permission.permit_view, true),
        delBtn: this.vaildData(this.permission.permit_delete, false),
        editBtn: this.vaildData(this.permission.permit_edit, false)
        addBtn: this.vaildData(this.permission.licenseApproval_crossRegion_add, false),
        viewBtn: this.vaildData(this.permission.licenseApproval_crossRegion_view, true),
        delBtn: this.vaildData(this.permission.licenseApproval_crossRegion_delete, false),
        editBtn: this.vaildData(this.permission.licenseApproval_crossRegion_edit, false)
      };
    },
    ids() {
@@ -246,7 +247,7 @@
        return;
      }
      var gonganj = "";
      if (this.userInfo.role_name == "公安管理员") {
      if (this.userInfo.role_name == "公安管理员" || this.userInfo.role_name == "民警") {
        let test = /派出所$/g;
        if (test.test(this.userInfo.list.name)) {
          gonganj = "2";