From c89223e74b0a00094639c24bd16c7f3995632f5c Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 12 七月 2024 15:58:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/views/system/user/option.js |   79 +++++++++++++++++++++++++++++----------
 1 files changed, 59 insertions(+), 20 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 0602863..7941331 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,24 +1,66 @@
 export const column = [
   {
-    label: '濮撳悕',
-    prop: 'name',
-    align:'center',
-    search:true,
-    sortable:true
-  }, {
     label: '璐﹀彿',
     prop: 'id',
-    align:'center',
     search:true,
-    sortable:true
+    sortable:true,
+    rules: [
+      {
+        required: true,
+        message: '璇疯緭鍏ュ鍚�',
+        trigger: 'blur'
+      }
+    ]
+  },
+  {
+    label: '濮撳悕',
+    prop: 'name',
+    search:true,
+    sortable:true,
+    rules: [
+      {
+        required: true,
+        message: '璇疯緭鍏ュ鍚�',
+        trigger: 'blur'
+      }
+    ]
+  },
+  {
+    label: '瀵嗙爜',
+    prop: 'password',
+    hide:true,
+    type:'password',
+    change: (val)=>{
+      const confirmPasswordColumn = column.find(item => item.prop === 'confirmPassword');
+      confirmPasswordColumn.disabled = val.value === "";
+    },
+    rules: [
+      {
+        required: true,
+        message: '璇疯緭鍏ュ瘑鐮�',
+        trigger: 'blur'
+      }
+    ]
+  },
+  {
+    label: '纭瀵嗙爜',
+    prop: 'confirmPassword',
+    hide:true,
+    type:'password',
+    disabled:true,
+    rules: [
+      {
+        required: true,
+        message: '璇峰啀娆＄‘璁ゅ瘑鐮�',
+        trigger: 'blur'
+      }
+    ]
   },
   {
     label: '鐘舵��',
     prop: 'status',
-    align: 'center',
     display:false,
     sortable:true,
-    slot: true,
   },
   {
     label: '瀵嗙爜绛栫暐',
@@ -29,7 +71,6 @@
   {
     label: '閿佸畾鐘舵��',
     prop: 'lockFlag',
-    align:'center',
     sortable:true,
     display:false,
   },
@@ -39,20 +80,19 @@
     align:'center',
     search:true,
     sortable:true,
-    searchslot:true,
+    overHidden: true,
+    width:200,
   },
   {
     label: '涓撲笟',
     prop: 'specialties',
-    align:'center',
     sortable:true,
   },
   {
     label: '瑙掕壊',
     prop: 'pkPersonName',
-    align:'center',
     type:'select',
-    dicUrl: 'api/roleQueryController/gridRoles',
+    dicUrl: 'api/roleQueryController/refDataGrid',
     props: {
       label: 'name',
       value: 'oid'
@@ -65,28 +105,27 @@
   {
     label: '鐢靛瓙閭欢',
     prop: 'email',
-    align:'center',
     sortable:true,
+    overHidden: true,
+    row:true
   },
   {
     label: '鎻忚堪',
     type:'textarea',
     prop: 'description',
-    align:'center',
     sortable:true,
+    overHidden: true,
   },
   {
     label: '閮ㄩ棬棰嗗',
     prop: 'isDeptLeader',
-    align:'center',
     sortable:true,
     display:false,
   },
   {
     label: '鎵�灞炲瘑绾�',
     prop: 'secretGradeText',
-    align:'center',
     sortable:true,
     display:false,
-  }
+  },
 ];

--
Gitblit v1.9.3