Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_enterprises

shuishen

2021-09-01 4da370f500cbabfbeb75f8006b8a3403656c4c5f

 src/views/workreport/workreport.vue

@@ -282,8 +282,7 @@
            this.selectionClear();
          });
        });
      }
      if (this.userInfo.role_name == "公安管理员") {
      } else if (this.userInfo.role_name == "公安管理员") {
        const column = that.findObject(that.option.column, "category");
        var code1 = { code: "workReportCategory" };
        getDictionaryBiz(code1).then((res) => {
@@ -313,8 +312,15 @@
            this.selectionClear();
          });
        });
      } else if (this.userInfo.role_name == "administrator") {
        getListPage(page.currentPage, page.pageSize, params).then((res) => {
          const data = res.data.data;
          this.page.total = data.total;
          this.data = data.records;
          this.loading = false;
          this.selectionClear();
        });
      }

    },
  },
};