From 3ba79fc36cf9ac31b9ff2b326cc2ba9ecb9cb794 Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期五, 22 七月 2022 20:57:13 +0800
Subject: [PATCH] 提交代码

---
 src/views/basics/organization/index.vue |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/views/basics/organization/index.vue b/src/views/basics/organization/index.vue
index 946b4f6..f8003a8 100644
--- a/src/views/basics/organization/index.vue
+++ b/src/views/basics/organization/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
       <el-form-item label="鏈烘瀯鍚嶇О" prop="name">
         <el-input
             v-model="queryParams.name"
@@ -33,19 +33,21 @@
         v-loading="loading"
         :data="organizationList"
         row-key="id"
+        height="calc(100vh - 210px)"
         default-expand-all
         :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
-      <el-table-column label="鏈烘瀯鍚嶇О" align="center" prop="name"/>
-      <el-table-column label="鏈烘瀯缂栧彿" prop="code"/>
-      <el-table-column label="鏄剧ず椤哄簭" align="center" prop="orderNum"/>
-      <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="鏈烘瀯鍚嶇О" align="left" prop="name" show-overflow-tooltip/>
+      <el-table-column label="鏈烘瀯缂栧彿" align="left" width="150" prop="code" show-overflow-tooltip/>
+      <el-table-column label="鏄剧ず椤哄簭" width="80" align="center" prop="orderNum"/>
+      <el-table-column label="鎿嶄綔" align="center" width="180" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
               size="mini"
               type="text"
               icon="el-icon-edit"
               @click="handleUpdate(scope.row)"
+              v-hasPermi="['oa:organization:edit']"
           >淇敼
           </el-button>
           <el-button
@@ -60,6 +62,7 @@
               type="text"
               icon="el-icon-delete"
               @click="handleDelete(scope.row)"
+              v-hasPermi="['oa:organization:remove']"
           >鍒犻櫎
           </el-button>
         </template>
@@ -181,7 +184,7 @@
     },
     /** 鏌ヨ楂樻牎缁勭粐鏈烘瀯涓嬫媺鏍戠粨鏋� */
     getTreeselect() {
-      listOrganization().then(response => {
+      listOrganization({schoolId: this.schoolId}).then(response => {
         this.organizationOptions = [];
         const data = {id: 0, name: '椤剁骇鑺傜偣', children: []};
         data.children = this.handleTree(response.data, "id", "parentId");
@@ -276,7 +279,7 @@
     },
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
-      this.$modal.confirm('鏄惁纭鍒犻櫎楂樻牎缁勭粐鏈烘瀯缂栧彿涓�"' + row.id + '"鐨勬暟鎹」锛�').then(() => {
+      this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(() => {
         this.loading = true;
         return delOrganization(row.id);
       }).then(() => {

--
Gitblit v1.9.1