Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web

src/views/ops/menu.vue

@@ -4,10 +4,23 @@
       <div class="left-panel">
         <el-button type="primary" icon="el-icon-plus" @click="addMenu"></el-button>
       </div>
+      <div class="right-panel">
+        <el-input
+          v-model="query.search"
+          placeholder="名称/权限标识"
+          clearable
+          @keyup.enter="handleQuery"
+        ></el-input>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          @click="handleQuery"
+        ></el-button>
+      </div>
     </el-header>
     <el-main class="nopadding">
-      <scTable ref="table" :isTree="true" :apiObj="apiObj" :params="params" row-key="id"
+      <scTable ref="table" :isTree="true" :apiObj="apiObj" :params="params" :query="query" row-key="id"
-        @selection-change="selectionChange" hidePagination>
+        @selection-change="selectionChange" hidePagination @dataChange="updateOptions">
         <!-- <el-table-column type="selection" width="50"></el-table-column> -->
         <el-table-column label="#" type="index" width="50"></el-table-column>
         <el-table-column label="菜单名称" prop="name" min-width="200"></el-table-column>
@@ -40,9 +53,9 @@
     <el-form :model="addForm" :rules="rules" ref="addForm" label-width="100px" label-position="right">
       <el-form-item label="类型" prop="type">
         <el-radio-group v-model="addForm.type">
-          <el-radio :label="10">目录</el-radio>
+          <el-radio :label="10">模块</el-radio>
-          <el-radio :label="20">菜单</el-radio>
+          <el-radio :label="20">页面</el-radio>
-          <el-radio :label="30">按钮</el-radio>
+          <el-radio :label="30">接口</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="名称" prop="name">
@@ -77,15 +90,13 @@ export default {
   name: "dept",
   data() {
     return {
+      query: {},
       dialog: {
         save: false,
         permission: false,
       },
       apiObj: this.$API.system.permission.list,
       selection: [],
-      search: {
-        keyword: null,
-      },
       params: {
         page: 0,
       },
@@ -112,9 +123,9 @@ export default {
         type: [{ required: true, message: "请选择类型" }],
       },
       types: {
-        10: "目录",
+        10: "模块",
-        20: "菜单",
+        20: "页面",
-        30: "按钮",
+        30: "接口",
       },
       groupsProps: {
         // value: "id",
@@ -129,19 +140,15 @@ export default {
   },
 
   mounted() {
-    this.getGroup();
     this.getPermCodes();
   },
   methods: {
+    updateOptions(data) {
+      this.group = genTree(data)
+    },
     getPermCodes() {
       this.permCodes = this.$API.system.permission.codes.req();
     },
-    //加载树数据
-    async getGroup() {
-      var res = await this.$API.system.permission.list.req({ page: 0 });
-      this.group = genTree(res);
-    },
-
     //添加
     addMenu() {
       this.type = "add";