From 100079be55493c439bfef2d4792bfa0d9f429bd1 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 29 十月 2024 15:14:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/views/system/user/option.js |   27 +++++++++++++++++++--------
 1 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/Source/plt-web/plt-web-ui/src/views/system/user/option.js b/Source/plt-web/plt-web-ui/src/views/system/user/option.js
index 07f7c2b..890f98b 100644
--- a/Source/plt-web/plt-web-ui/src/views/system/user/option.js
+++ b/Source/plt-web/plt-web-ui/src/views/system/user/option.js
@@ -1,13 +1,14 @@
-export let column = [
+export const column = [
   {
     label: '璐﹀彿',
     prop: 'id',
     search:true,
     sortable:true,
+    editDisabled: true,
     rules: [
       {
         required: true,
-        message: '璇疯緭鍏ュ鍚�',
+        message: '璇疯緭鍏ヨ处鍙�',
         trigger: 'blur'
       }
     ]
@@ -61,28 +62,36 @@
     prop: 'status',
     display:false,
     sortable:true,
-    slot: true,
+    width: 80,
   },
   {
     label: '瀵嗙爜绛栫暐',
     prop: 'pkPasswordStrategyName',
     sortable:true,
     display:false,
+    width: 100
   },
   {
     label: '閿佸畾鐘舵��',
     prop: 'lockFlag',
     sortable:true,
     display:false,
+    width: 100,
   },
   {
     label: '鎵�灞為儴闂�',
-    prop: 'pkDepartmentName',
+    prop: 'pkDepartment',
     align:'center',
+    type:'tree',
+    dicData: [],
+    props: {
+      label: 'name',
+      value: 'oid'
+    },
     search:true,
     sortable:true,
-    searchslot:true,
-    formslot:true,
+    overHidden: true,
+    width:200,
   },
   {
     label: '涓撲笟',
@@ -108,7 +117,8 @@
     prop: 'email',
     sortable:true,
     overHidden: true,
-    row:true
+    row:true,
+    span:24
   },
   {
     label: '鎻忚堪',
@@ -116,6 +126,7 @@
     prop: 'description',
     sortable:true,
     overHidden: true,
+    span:24
   },
   {
     label: '閮ㄩ棬棰嗗',
@@ -126,7 +137,7 @@
   {
     label: '鎵�灞炲瘑绾�',
     prop: 'secretGradeText',
-    sortable:true,
     display:false,
+    width: 80
   },
 ];

--
Gitblit v1.9.3