From 4da370f500cbabfbeb75f8006b8a3403656c4c5f Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 01 Sep 2021 16:33:17 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_enterprises
---
src/views/workreport/workreport.vue | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/views/workreport/workreport.vue b/src/views/workreport/workreport.vue
index f28bb3c..a33eec1 100644
--- a/src/views/workreport/workreport.vue
+++ b/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();
+ });
}
-
},
},
};
--
Gitblit v1.9.3