From c6687f17c14d6b7e50b67fb4e27fc2afebf42f8c Mon Sep 17 00:00:00 2001
From: dengbw <dengbw@shengshi.com.cn>
Date: Thu, 24 Nov 2022 09:38:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E8=B7=9F=E8=A3=82=E5=8F=98?=
 =?UTF-8?q?=E5=9B=A2=E5=8E=BB=E6=8E=89=E6=80=A7=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/components/org-select.vue    |  2 +-
 .../organization/components/org-user-edit.vue | 20 +------------------
 .../organization/components/org-user-list.vue | 11 ++--------
 .../team/components/team-org-select.vue       |  1 +
 .../sylive/team/components/team-user-edit.vue | 20 +------------------
 .../sylive/team/components/team-user-list.vue | 11 ++--------
 6 files changed, 8 insertions(+), 57 deletions(-)

diff --git a/src/views/sylive/organization/components/org-select.vue b/src/views/sylive/organization/components/org-select.vue
index 55c0e11..dc57dc6 100644
--- a/src/views/sylive/organization/components/org-select.vue
+++ b/src/views/sylive/organization/components/org-select.vue
@@ -6,7 +6,7 @@
     :data="data"
     label-key="organizationName"
     value-key="organizationId"
-    default-expand-all
+    :default-expand-all="true"
     :placeholder="placeholder"
     @input="updateValue"
   />
diff --git a/src/views/sylive/organization/components/org-user-edit.vue b/src/views/sylive/organization/components/org-user-edit.vue
index 45d9b88..51b85d9 100644
--- a/src/views/sylive/organization/components/org-user-edit.vue
+++ b/src/views/sylive/organization/components/org-user-edit.vue
@@ -29,17 +29,6 @@
           </el-form-item>
         </el-col>
         <el-col v-bind="styleResponsive ? { sm: 12 } : { span: 12 }">
-          <el-form-item label="性别:" prop="sex">
-            <el-select
-              clearable
-              class="ele-block"
-              v-model="form.sex"
-              placeholder="请选择性别"
-            >
-              <el-option label="男" value="1" />
-              <el-option label="女" value="2" />
-            </el-select>
-          </el-form-item>
           <el-form-item label="姓名:" prop="uname">
             <el-input
               clearable
@@ -82,8 +71,7 @@
         userId: null,
         organizationId: null,
         mobile: '',
-        uname: '',
-        sex: null
+        uname: ''
       };
       return {
         defaultForm,
@@ -126,12 +114,6 @@
               message: '请输入姓名',
               trigger: 'blur'
             }
-          ],
-          sex: [
-            {
-              message: '请选择性别',
-              trigger: 'blur'
-            }
           ]
         },
         // 提交状态
diff --git a/src/views/sylive/organization/components/org-user-list.vue b/src/views/sylive/organization/components/org-user-list.vue
index 9a0ca8c..a134a7d 100644
--- a/src/views/sylive/organization/components/org-user-list.vue
+++ b/src/views/sylive/organization/components/org-user-list.vue
@@ -112,13 +112,6 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
-          {
-            prop: 'sexName',
-            label: '性别',
-            sortable: 'custom',
-            showOverflowTooltip: true,
-            minWidth: 80
-          },
           {
             prop: 'mobile',
             label: '手机号',
@@ -148,14 +141,14 @@
             label: '状态',
             align: 'center',
             sortable: 'custom',
-            width: 80,
+            width: 100,
             resizable: false,
             slot: 'status'
           },
           {
             columnKey: 'action',
             label: '操作',
-            width: 130,
+            width: 160,
             align: 'center',
             resizable: false,
             slot: 'action',
diff --git a/src/views/sylive/team/components/team-org-select.vue b/src/views/sylive/team/components/team-org-select.vue
index e4f15c9..31da0c1 100644
--- a/src/views/sylive/team/components/team-org-select.vue
+++ b/src/views/sylive/team/components/team-org-select.vue
@@ -5,6 +5,7 @@
     :value="value"
     class="ele-fluid"
     :placeholder="placeholder"
+    :default-expand-all="true"
     @input="updateValue"
   >
     <el-option
diff --git a/src/views/sylive/team/components/team-user-edit.vue b/src/views/sylive/team/components/team-user-edit.vue
index 28e0c48..42df9bc 100644
--- a/src/views/sylive/team/components/team-user-edit.vue
+++ b/src/views/sylive/team/components/team-user-edit.vue
@@ -29,17 +29,6 @@
           </el-form-item>
         </el-col>
         <el-col v-bind="styleResponsive ? { sm: 12 } : { span: 12 }">
-          <el-form-item label="性别:" prop="sex">
-            <el-select
-              clearable
-              class="ele-block"
-              v-model="form.sex"
-              placeholder="请选择性别"
-            >
-              <el-option label="男" value="1" />
-              <el-option label="女" value="2" />
-            </el-select>
-          </el-form-item>
           <el-form-item label="姓名:" prop="uname">
             <el-input
               clearable
@@ -86,8 +75,7 @@
         userId: null,
         teamId: null,
         mobile: '',
-        uname: '',
-        sex: null
+        uname: ''
       };
       return {
         defaultForm,
@@ -130,12 +118,6 @@
               message: '请输入姓名',
               trigger: 'blur'
             }
-          ],
-          sex: [
-            {
-              message: '请选择性别',
-              trigger: 'blur'
-            }
           ]
         },
         // 提交状态
diff --git a/src/views/sylive/team/components/team-user-list.vue b/src/views/sylive/team/components/team-user-list.vue
index bca253f..d9b24aa 100644
--- a/src/views/sylive/team/components/team-user-list.vue
+++ b/src/views/sylive/team/components/team-user-list.vue
@@ -116,13 +116,6 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
-          {
-            prop: 'sexName',
-            label: '性别',
-            sortable: 'custom',
-            showOverflowTooltip: true,
-            minWidth: 80
-          },
           {
             prop: 'mobile',
             label: '手机号',
@@ -145,14 +138,14 @@
             label: '状态',
             align: 'center',
             sortable: 'custom',
-            width: 80,
+            width: 100,
             resizable: false,
             slot: 'status'
           },
           {
             columnKey: 'action',
             label: '操作',
-            width: 130,
+            width: 160,
             align: 'center',
             resizable: false,
             slot: 'action',