From bb2f76772599b3ef30986c71db3c0f99bda383e1 Mon Sep 17 00:00:00 2001
From: zjl <xx@163.com>
Date: Fri, 30 Aug 2024 10:03:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7=E3=80=81?=
 =?UTF-8?q?=E7=A7=9F=E6=88=B7=E3=80=81=E9=83=A8=E9=97=A8=E3=80=81=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/dept/edit.vue     | 28 ++++++++++++++--------------
 src/views/system/dept/index.vue    |  8 +++++++-
 src/views/system/role/columns.ts   |  7 ++++++-
 src/views/system/role/index.vue    |  2 +-
 src/views/system/tenant/columns.ts | 14 +++++++++++---
 src/views/system/user/columns.ts   |  5 +++++
 src/views/system/user/index.vue    |  2 +-
 7 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/src/views/system/dept/edit.vue b/src/views/system/dept/edit.vue
index 7c0f437..173ef93 100644
--- a/src/views/system/dept/edit.vue
+++ b/src/views/system/dept/edit.vue
@@ -11,10 +11,16 @@
         :model="formData"
         label-width="80px"
     >
-      <el-form-item label="部门类型" prop="type">
-          <el-select v-model="formData.type" class="flex-1" clearable placeholder="请选择部门类型">
-            <el-option v-for="(item, index) in optionData.deptTypeList" :key="index" :label="item.name" :value="item.id" />
-          </el-select>
+    <el-form-item
+          label="部门名称"
+          prop="name"
+          :rules="{ required: true, message: '请输入部门名称', trigger: 'blur' }"
+      >
+        <el-input
+            v-model="formData.name"
+            placeholder="请输入部门名称"
+            clearable
+        />
       </el-form-item>
       <el-form-item
           label="父级部门"
@@ -35,16 +41,10 @@
             check-strictly
         />
       </el-form-item>
-      <el-form-item
-          label="部门名称"
-          prop="name"
-          :rules="{ required: true, message: '请输入部门名称', trigger: 'blur' }"
-      >
-        <el-input
-            v-model="formData.name"
-            placeholder="请输入部门名称"
-            clearable
-        />
+      <el-form-item label="部门类型" prop="type">
+          <el-select v-model="formData.type" class="flex-1" clearable placeholder="请选择部门类型">
+            <el-option v-for="(item, index) in optionData.deptTypeList" :key="index" :label="item.name" :value="item.id" />
+          </el-select>
       </el-form-item>
       <el-form-item label="部门排序" prop="sort"  class="flex-1">
         <div>
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 2b5cea9..0423fdc 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -18,11 +18,17 @@
                 :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
         <el-table-column label="部门名称" prop="name" min-width="150" show-overflow-tooltip/>
         <el-table-column align="center" label="部门类型" prop="type" min-width="80">
-          <template #default="{ row }">
+          <!-- <template #default="{ row }">
             <div v-if="row.type ==1">公司</div>
             <div v-else-if="row.type == 2">子公司</div>
             <div v-else-if="row.type == 3">部门</div>
             <div v-else-if="row.type == 4">小组</div>
+          </template> -->
+          <template #default="{ row }">
+            <el-tag v-if="row.type == 1">公司</el-tag>
+            <el-tag v-else-if="row.type == 2" type="success">子公司</el-tag>
+            <el-tag v-else-if="row.type == 3" type="warning">部门</el-tag>
+            <el-tag v-else-if="row.type == 4" type="info">小组</el-tag>
           </template>
         </el-table-column>
         <el-table-column align="center" label="部门排序" prop="sort" min-width="100"/>
diff --git a/src/views/system/role/columns.ts b/src/views/system/role/columns.ts
index d2e11be..3cb6c9f 100644
--- a/src/views/system/role/columns.ts
+++ b/src/views/system/role/columns.ts
@@ -16,9 +16,14 @@ export const columns = [
   {
     label: '角色编码',
     prop: 'code',
+    width: 250,
   },
   {
-    label: '说明',
+    label: '排序',
+    prop: 'sort',
+  },
+  {
+    label: '备注',
     prop: 'note',
   },
   {
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index a203b6f..a989338 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -76,7 +76,7 @@ const authVisible=ref(false)
   const tableRef = ref();
 
   const actionColumn = reactive({
-    width: 250,
+    width: 300,
     label: '操作',
     prop: 'action',
     fixed: 'right',
diff --git a/src/views/system/tenant/columns.ts b/src/views/system/tenant/columns.ts
index 1ded538..61c3481 100644
--- a/src/views/system/tenant/columns.ts
+++ b/src/views/system/tenant/columns.ts
@@ -12,6 +12,7 @@ export const columns = [
   {
     label: '租户名称',
     prop: 'name',
+    width: 150,
   },
   {
     label: '租户编码',
@@ -29,6 +30,7 @@ export const columns = [
   {
     label: '到期时间',
     prop: 'expireTime',
+    width: 180,
   },
   {
     label: '联系人姓名',
@@ -48,12 +50,18 @@ export const columns = [
   {
     label: '联系人邮箱',
     prop: 'contactEmail',
-    width:140
+    width:200
   },
   {
-    label: '联系人网址',
+    label: '租户网址',
     prop: 'contactSite',
-    width:140
+    width:140,
+    render(record) {
+      return h('a', {
+        href: record.row.contactSite,
+        target:"_blank"
+      }, "点击查看网址");
+    },
   },
   {
     label: '状态',
diff --git a/src/views/system/user/columns.ts b/src/views/system/user/columns.ts
index 07724d5..4b6ea11 100644
--- a/src/views/system/user/columns.ts
+++ b/src/views/system/user/columns.ts
@@ -12,10 +12,12 @@ export const columns = [
   {
     label: '登录账号',
     prop: 'username',
+    width: 100,
   },
   {
     label: '用户姓名',
     prop: 'realname',
+    width: 100,
   },
   {
     label: '头像',
@@ -60,14 +62,17 @@ export const columns = [
       }
       return h('span', roleNames || '-');
     },
+    width: 100,
   },
   {
     label: '职级',
     prop: 'levelName',
+    width: 100,
   },
   {
     label: '岗位',
     prop: 'positionName',
+    width: 100,
   },
   {
     label: '部门',
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index ce9879b..c2ea89e 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -117,7 +117,7 @@
 
 
   const actionColumn = reactive({
-    width:360,
+    width:370,
     label: '操作',
     prop: 'action',
     fixed: 'right',