Merge branch 'master' of http://192.168.0.105:10010/r/jfptweb-publicSecurity

liuyg

2021-11-04 3ed8a9e0bb97bf25955a10d2771084e6a92bba27

 src/views/examination/examination.vue

@@ -215,6 +215,7 @@
        searchShow: true,
        searchMenuSpan: 6,
        border: true,
        menu: false,
        index: true,
        selection: true,
        viewBtn: true,
@@ -225,8 +226,9 @@
            label: "登录账号",
            prop: "account",
            search: true,
            searchSpan: 4,
            display: false,
            width: 100
            width: 120
          },
          // {
          //   label: "所属客户",
@@ -238,9 +240,10 @@
          {
            label: "姓名",
            prop: "realName",
            searchSpan: 4,
            search: true,
            display: false,
            width: 80
            width: 110
          },
          {
            label: "性别",
@@ -252,25 +255,27 @@
            label: "身份证号",
            prop: "cardid",
            display: false,
            search: true,
            searchSpan: 5,
            width: 160,
          },
          {
            label: "联系方式",
            prop: "phone",
            display: false,
            width: 100
            width: 130
          },
          // {
          //   label: "所属角色",
          //   prop: "roleName",
          //   slot: true,
          //   display: false,
          // },
          {
            label: "所属角色",
            prop: "roleName",
            slot: true,
            display: false,
          },
          {
            label: "工作单位",
            label: "组织机构",
            prop: "deptName",
            slot: true,
            display: false,
            width: 260,
          },
          //   {
          //     label: "行政区",
@@ -296,10 +301,11 @@
          {
            label: "审查状态",
            prop: "examination_type",
            width: 70,
            width: 100,
            slot: true,
            search: true,
            display: false,
            searchSpan: 4,
            type: "select",
            dicData: [
              {
@@ -316,12 +322,12 @@
            label: "审查明细",
            prop: "examination_mx",
            display: false,
            width: 70
          },
          {
            label: "审查时间",
            prop: "auditTime",
            display: false,
            width: 160,
          },
          {
            label: "工作状态",
@@ -717,10 +723,10 @@
    ...mapGetters(["userInfo", "permission"]),
    permissionList() {
      return {
        addBtn: this.vaildData(this.permission.examination_add, true),
        addBtn: this.vaildData(this.permission.examination_add, false),
        viewBtn: this.vaildData(this.permission.examination_view, false),
        delBtn: this.vaildData(this.permission.examination_delete, true),
        editBtn: this.vaildData(this.permission.examination_edit, true),
        delBtn: this.vaildData(this.permission.examination_delete, false),
        editBtn: this.vaildData(this.permission.examination_edit, false),
      };
    },
    platformPermissionList() {