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

liuyg

2022-03-02 b6d70fd9329b1c5fee415713e7ca5d9dcab66526

 src/views/desk/notification.vue

@@ -52,7 +52,7 @@
          type="danger"
          size="small"
          icon="el-icon-delete"
          v-if="permission.notice_delete"
          v-if="permission.notification_delete"
          plain
          @click="handleDelete"
          >删 除
@@ -66,7 +66,7 @@
        <el-button
          :size="size"
          :type="type"
          v-if="permission.notice_upload"
          v-if="permission.notification_upload"
          @click="handleUploadPage(row)"
          >附件上传
        </el-button>
@@ -259,10 +259,10 @@
    ...mapGetters(["userInfo", "permission"]),
    permissionList() {
      return {
        addBtn: this.vaildData(this.permission.notice_add, false),
        viewBtn: this.vaildData(this.permission.notice_view, false),
        delBtn: this.vaildData(this.permission.notice_delete, false),
        editBtn: this.vaildData(this.permission.notice_edit, false)
        addBtn: this.vaildData(this.permission.notification_add, false),
        viewBtn: this.vaildData(this.permission.notification_view, false),
        delBtn: this.vaildData(this.permission.notification_delete, false),
        editBtn: this.vaildData(this.permission.notification_edit, false)
      };
    },
    ids() {