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' }">
-
+
+
+ 公司
+ 子公司
+ 部门
+ 小组
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',