仓库修改

src/views/system/dept/invWarehouse.vue

@@ -29,29 +29,32 @@
         border
         highlight-current-row
         @current-change="handSubInvCurrentChange"
+        row-key="id"
+        :default-expand-all="isExpandAll"
+        :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
       >
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column
-          prop="name" align="center"
+          prop="name"
           label="仓库名称"
         >
         </el-table-column>
         <el-table-column
           prop="code"
-          label="仓库编码" align="center"
+          label="仓库编码"
         >
         </el-table-column>
         <el-table-column
-          prop="parentName" align="center"
+          prop="parentName"
           label="所属部门"
         >
         </el-table-column>
         <el-table-column
-          prop="parentInvName" align="center"
+          prop="parentInvName"
           label="上级仓库"
         >
         </el-table-column>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="操作"  class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button
               type="text"
@@ -458,6 +461,7 @@ export default {
       },
       loading: true,
       list: [],
+      isExpandAll: true,
       total: 0,
       formMap: {
         add: "仓库信息-新增",
@@ -556,7 +560,9 @@ export default {
         .then((response) => {
           this.loading = false;
           this.total = response.data.total;
-          this.list = response.data.list || [];
+          let invlist = response.data.list || [];
+          this.list = this.handleTree(invlist, "code", "parentCode");
+
         })
         .catch(() => {
           this.loading = false;

src/views/system/menu/index.vue

@@ -22,7 +22,9 @@
       <el-form-item>
         <el-button-group>
           <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
+                     v-hasPermi="['system:menu:query']">搜索
+          </el-button>
           <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:menu:add']"
           >新增
           </el-button>
@@ -87,15 +89,18 @@
           <el-button
             type="text"
             @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:menu:edit']"
           >编辑
           </el-button>
           <el-button
             type="text"
+            v-hasPermi="['system:menu:add']"
             @click="handleAdd(scope.row)"
           >新增
           </el-button>
           <el-button
             type="text"
+            v-hasPermi="['system:menu:delete']"
             @click="handleDelete(scope.row)"
           >删除
           </el-button>