From 6e70fb46f7b5fd910cc317ba84ef4c8cb93f9ef8 Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期四, 02 一月 2025 09:59:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/views/system/user/option.js |   36 ++++++++++++++++++++++++++++++------
 1 files changed, 30 insertions(+), 6 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 0abfc0a..bacc89c 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
@@ -4,6 +4,7 @@
     prop: 'id',
     search:true,
     sortable:true,
+    width:110,
     rules: [
       {
         required: true,
@@ -17,6 +18,7 @@
     prop: 'name',
     search:true,
     sortable:true,
+    overHidden: true,
     rules: [
       {
         required: true,
@@ -61,21 +63,21 @@
     prop: 'status',
     display:false,
     sortable:true,
-    width: 80,
+    width: 70,
   },
   {
     label: '瀵嗙爜绛栫暐',
     prop: 'pkPasswordStrategyName',
     sortable:true,
     display:false,
-    width: 100
+    width: 90
   },
   {
     label: '閿佸畾鐘舵��',
     prop: 'lockFlag',
     sortable:true,
     display:false,
-    width: 100,
+    width: 90,
   },
   {
     label: '鎵�灞為儴闂�',
@@ -83,10 +85,21 @@
     align:'center',
     type:'tree',
     dicData: [],
+    hide:true,
     props: {
       label: 'name',
       value: 'oid'
     },
+    search:true,
+    sortable:true,
+    overHidden: true,
+    width:200,
+  },
+  {
+    label: '鎵�灞為儴闂�',
+    prop: 'pkDepartmentName',
+    align:'center',
+    display: false,
     search:true,
     sortable:true,
     overHidden: true,
@@ -132,12 +145,20 @@
     prop: 'isDeptLeader',
     sortable:true,
     display:false,
+    width: 90,
+    formatter:function (row, value){
+      if(value=='涓嶆槸'){
+        return "鍚�"
+      }
+      return value
+    }
   },
   {
     label: '鎵�灞炲瘑绾�',
-    prop: 'secretGradeText',
-    width: 80,
-    sortable: true,
+    prop: 'secretGrade',
+    width: 110,
+    overHidden: true,
+    sortable:true,
     type: 'select',
     dicUrl: 'api/webEnumController/getEnum?comboxKey=usersecurityenum',
     props: {
@@ -145,5 +166,8 @@
       value: 'key',
       res: "obj",
     },
+    // formatter:(row,value,label)=>{
+    //   return row.secretGrade === 0 ? '' : label;
+    // }
   },
 ];

--
Gitblit v1.9.3