Merge branch 'xym' into dev

src/pages/authority/roles.vue

@@ -50,6 +50,12 @@ export default {
     showDialog() {
       this.$refs.dialog.show();
     },
+    editItem(item) {
+      this.$router.push(`/authority/roles/edit/${item.id}`);
+    },
+    allotItem(item) {
+      this.$router.push(`/authority/roles/allot/${item.id}`);
+    },
     deleteItem(item) {
       this.dialogInfo.title = "";
       this.dialogInfo.msg = "确认删除当前角色";
@@ -67,9 +73,7 @@ export default {
         label: "角色类型",
         prop: "name",
         type: "button",
-        callback(item) {
-          console.log("查看详情 - " + item.name);
-        },
+        callback: this.editItem,
       },
       {
         label: "创建人",
@@ -91,9 +95,7 @@ export default {
         actionList: [
           {
             label: "分配权限",
-            callback(item) {
-              console.log("分配权限 - " + item.name);
-            },
+            callback: this.allotItem,
           },
           {
             label: "删除",

src/pages/authority/users.vue

 <template>
   <div class="users_list">
     <apass-list
-      @list-action="listAction"
       search-placeholder="请输入关键字"
       :list-total="listTotal"
+      @list-action="initDatas"
     >
       <el-breadcrumb separator="/" slot="breadcrumb">
         <el-breadcrumb-item to="/authority">权限管理</el-breadcrumb-item>
@@ -185,8 +185,29 @@ export default {
     showDialog: false,
   }),
   methods: {
-    listAction(value) {
-      console.log(value);
+    initDatas(filter) {
+      // console.log(filter);
+
+      this.$http
+        .get("/apaas/backmgt/user/list", {
+          params: {
+            keyword: filter.keyword,
+            limit: filter.page,
+            page: filter.size,
+            user_id: "ym",
+            user_name: "",
+            department_id: "",
+            state: 1,
+          },
+        })
+        .then(({ data }) => {
+          console.log(data);
+          // this.listTotal = data.data.total;
+          // this.listData = data.data.data;
+        })
+        .catch((error) => {
+          console.log(error);
+        });
     },
     setRole(item) {
       console.log("setRole " + item.name);