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

---
 Source/plt-web/plt-web-ui/src/views/system/user/option.js |   70 ++++++++++++++++++++++++++---------
 1 files changed, 52 insertions(+), 18 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 58c46e3..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
@@ -1,14 +1,14 @@
-export let column = [
+export const column = [
   {
     label: '璐﹀彿',
     prop: 'id',
-    align:'center',
     search:true,
     sortable:true,
+    width:110,
     rules: [
       {
         required: true,
-        message: '璇疯緭鍏ュ鍚�',
+        message: '璇疯緭鍏ヨ处鍙�',
         trigger: 'blur'
       }
     ]
@@ -16,9 +16,9 @@
   {
     label: '濮撳悕',
     prop: 'name',
-    align:'center',
     search:true,
     sortable:true,
+    overHidden: true,
     rules: [
       {
         required: true,
@@ -61,45 +61,60 @@
   {
     label: '鐘舵��',
     prop: 'status',
-    align: 'center',
     display:false,
     sortable:true,
-    slot: true,
+    width: 70,
   },
   {
     label: '瀵嗙爜绛栫暐',
     prop: 'pkPasswordStrategyName',
     sortable:true,
     display:false,
+    width: 90
   },
   {
     label: '閿佸畾鐘舵��',
     prop: 'lockFlag',
-    align:'center',
     sortable:true,
     display:false,
+    width: 90,
+  },
+  {
+    label: '鎵�灞為儴闂�',
+    prop: 'pkDepartment',
+    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,
-    searchslot:true,
-    row: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'
@@ -112,28 +127,47 @@
   {
     label: '鐢靛瓙閭欢',
     prop: 'email',
-    align:'center',
     sortable:true,
+    overHidden: true,
+    row:true,
+    span:24
   },
   {
     label: '鎻忚堪',
     type:'textarea',
     prop: 'description',
-    align:'center',
     sortable:true,
+    overHidden: true,
+    span:24
   },
   {
     label: '閮ㄩ棬棰嗗',
     prop: 'isDeptLeader',
-    align:'center',
     sortable:true,
     display:false,
+    width: 90,
+    formatter:function (row, value){
+      if(value=='涓嶆槸'){
+        return "鍚�"
+      }
+      return value
+    }
   },
   {
     label: '鎵�灞炲瘑绾�',
-    prop: 'secretGradeText',
-    align:'center',
+    prop: 'secretGrade',
+    width: 110,
+    overHidden: true,
     sortable:true,
-    display:false,
+    type: 'select',
+    dicUrl: 'api/webEnumController/getEnum?comboxKey=usersecurityenum',
+    props: {
+      label: 'value',
+      value: 'key',
+      res: "obj",
+    },
+    // formatter:(row,value,label)=>{
+    //   return row.secretGrade === 0 ? '' : label;
+    // }
   },
 ];

--
Gitblit v1.9.3