diff --git a/src/api/system/newdept.js b/src/api/system/newdept.js
new file mode 100644
index 00000000..08adf9e8
--- /dev/null
+++ b/src/api/system/newdept.js
@@ -0,0 +1,95 @@
+import request from '@/utils/request'
+
+// 获取机构树形列表
+export function listOrgTree(query) {
+  return request({
+    url: '/system/newDept/org/treeList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获取机构树（用于部门管理左侧）
+export function listOrgTreeSimple() {
+  return request({
+    url: '/system/newDept/org/tree',
+    method: 'get'
+  })
+}
+
+// 根据机构获取部门列表
+export function listDeptByOrg(orgId, query) {
+  return request({
+    url: `/system/newDept/dept/list/${orgId}`,
+    method: 'get',
+    params: query
+  })
+}
+
+// 新增机构
+export function addOrg(data) {
+  return request({
+    url: '/system/newDept/org',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改机构
+export function updateOrg(data) {
+  return request({
+    url: '/system/newDept/org',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除机构
+export function deleteOrg(orgId) {
+  return request({
+    url: `/system/newDept/org/${orgId}`,
+    method: 'delete'
+  })
+}
+
+// 新增部门
+export function addDept(data) {
+  return request({
+    url: '/system/newDept/dept',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改部门
+export function updateDept(data) {
+  return request({
+    url: '/system/newDept/dept',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除部门
+export function deleteDept(deptId) {
+  return request({
+    url: `/system/newDept/dept/${deptId}`,
+    method: 'delete'
+  })
+}
+
+// 导入机构
+export function importOrg() {
+  return request({
+    url: '/system/newDept/org/import',
+    method: 'post'
+  })
+}
+
+// 导入部门
+export function importDept() {
+  return request({
+    url: '/system/newDept/dept/import',
+    method: 'post'
+  })
+}
diff --git a/src/api/system/user.js b/src/api/system/user.js
index fa78c0e3..cc4374cf 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -164,6 +164,13 @@ export function confirmPassword(password) {
     data:data
   })
 }
+// 根据组织ID获取部门列表（树形结构）
+export function listDeptByOrgId(orgId) {
+  return request({
+    url: `/system/newDept/dept/list/${orgId}`,
+    method: 'get'
+  })
+}
 
 
 
diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
index f1619228..a92604a3 100644
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -92,6 +92,7 @@
       &:hover {
         background-color: rgba(0, 0, 0, 0.06) !important;
         border: 1px solid $base-menu-color-active !important;
+        color: #fff !important;
       }
     }
 
diff --git a/src/views/EquipmentLedger/index.vue b/src/views/EquipmentLedger/index.vue
index b488c1a8..dc1e1ede 100644
--- a/src/views/EquipmentLedger/index.vue
+++ b/src/views/EquipmentLedger/index.vue
@@ -389,6 +389,9 @@
                   <i class="el-icon-view"></i> 查看
                 </el-button>
                 <el-button type="text" icon="el-icon-edit" @click="onHandleEdit(scope.row)"> 编辑 </el-button>
+                <el-button type="text" icon="el-icon-delete" @click="onHandleDelete(scope.row)" style="color: red">
+                  删除
+                </el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -1508,8 +1511,6 @@ export default {
           if (res.code === 200) {
             this.$message.success('删除成功')
             this.getDeviceList()
-          } else {
-            this.$message.error(res.msg || '删除失败')
           }
         } catch (error) {
           this.$message.error('删除失败：' + (error.message || '未知错误'))
diff --git a/src/views/EquipmentUpOrDown/equipment/index.vue b/src/views/EquipmentUpOrDown/equipment/index.vue
index 0d076e58..4f5cce5d 100644
--- a/src/views/EquipmentUpOrDown/equipment/index.vue
+++ b/src/views/EquipmentUpOrDown/equipment/index.vue
@@ -79,16 +79,22 @@
                 <span style="font-size: 20px; font-weight: 800">装备上下架列表</span>
               </el-col>
               <el-col :span="20" >
-                <el-button
+                <el-tooltip
+                  placement="top-start"
+                  content="请选择需要下架的装备后再操作"
+                  :disabled.sync="selectedRows.length !== 0"
+                >
+                  <el-button
                     size="mini"
                     type="danger"
                     class="primary-lease"
                     @click="handleBatchDown"
                     style="float: right;margin-right: 10px"
                     :disabled="selectedRows.length === 0"
-                >
+                  >
                     批量下架
-                </el-button>
+                  </el-button>
+                </el-tooltip>
 
                 <el-button style="float: right;margin-right: 10px" size="mini" @click="equipment" type="primary" class="primary-lease">
                     添加上架装备
diff --git a/src/views/EquipmentUpOrDown/tool/index.vue b/src/views/EquipmentUpOrDown/tool/index.vue
index 92bf704c..5f487ecb 100644
--- a/src/views/EquipmentUpOrDown/tool/index.vue
+++ b/src/views/EquipmentUpOrDown/tool/index.vue
@@ -76,6 +76,11 @@
                 <span style="font-size: 20px; font-weight: 800">工具上下架列表</span>
               </el-col>
               <el-col :span="20">
+                <el-tooltip
+                  placement="top-start"
+                  content="请选择需要下架的工具后再操作"
+                  :disabled.sync="selectedRows.length !== 0"
+                >
                 <el-button
                   size="mini"
                   type="danger"
@@ -86,7 +91,7 @@
                 >
                   批量下架
                 </el-button>
-
+                </el-tooltip>
                 <el-button size="mini"  style="float: right;margin-right: 10px" @click="numberTool" type="primary" class="primary-lease">
                   上架数量工具
                 </el-button>
diff --git a/src/views/screen/components-old/countryMap.vue b/src/views/screen/components-old/countryMap.vue
index 4eb1e353..d13237db 100644
--- a/src/views/screen/components-old/countryMap.vue
+++ b/src/views/screen/components-old/countryMap.vue
@@ -209,10 +209,10 @@ export default {
                         },
                         label: {
                             normal: {
-                                show: false,
+                                show: true,
                                 fontSize: 12,
                                 fontWeight: 500,
-                                color: 'rgba(255,255,255,0.5)',
+                                color: 'rgba(255,255,255,0.8)',
                             },
                             emphasis: {
                                 show: true,
diff --git a/src/views/screen/gwScreen/components/center/index.vue b/src/views/screen/gwScreen/components/center/index.vue
index 824201e8..7d3d873b 100644
--- a/src/views/screen/gwScreen/components/center/index.vue
+++ b/src/views/screen/gwScreen/components/center/index.vue
@@ -34,8 +34,8 @@ export default {
         {
           cityName: '北京市',
           deptName: '北京',
-          value: [116.407396, 39.9042, 350000000],
-          totalValue: 350000000,
+          value: [116.407396, 39.9042, 3500],
+          totalValue: 3500,
           totalEquipmentQuantity: 520,
           configRate: 92,
           lineNum: 80,
@@ -45,8 +45,8 @@ export default {
         {
           cityName: '天津市',
           deptName: '天津',
-          value: [117.190182, 39.125596, 260000000],
-          totalValue: 260000000,
+          value: [117.190182, 39.125596, 2600],
+          totalValue: 2600,
           totalEquipmentQuantity: 480,
           configRate: 90,
           lineNum: 70,
@@ -56,8 +56,8 @@ export default {
         {
           cityName: '上海市',
           deptName: '上海',
-          value: [121.472644, 31.231706, 420000000],
-          totalValue: 420000000,
+          value: [121.472644, 31.231706, 4200],
+          totalValue: 4200,
           totalEquipmentQuantity: 600,
           configRate: 95,
           lineNum: 88,
@@ -67,8 +67,8 @@ export default {
         {
           cityName: '重庆市',
           deptName: '重庆',
-          value: [106.551556, 29.563009, 300000000],
-          totalValue: 300000000,
+          value: [106.551556, 29.563009, 3000],
+          totalValue: 3000,
           totalEquipmentQuantity: 510,
           configRate: 91,
           lineNum: 75,
@@ -79,8 +79,8 @@ export default {
         {
           cityName: '石家庄市',
           deptName: '石家庄',
-          value: [114.514859, 38.042307, 230000000],
-          totalValue: 230000000,
+          value: [114.514859, 38.042307, 2300],
+          totalValue: 2300,
           totalEquipmentQuantity: 450,
           configRate: 89,
           lineNum: 68,
@@ -90,8 +90,8 @@ export default {
         {
           cityName: '太原市',
           deptName: '太原',
-          value: [112.548879, 37.87059, 210000000],
-          totalValue: 210000000,
+          value: [112.548879, 37.87059, 2100],
+          totalValue: 2100,
           totalEquipmentQuantity: 430,
           configRate: 88,
           lineNum: 60,
@@ -101,8 +101,8 @@ export default {
         {
           cityName: '沈阳市',
           deptName: '沈阳',
-          value: [123.431474, 41.805698, 240000000],
-          totalValue: 240000000,
+          value: [123.431474, 41.805698, 2400],
+          totalValue: 2400,
           totalEquipmentQuantity: 455,
           configRate: 89,
           lineNum: 66,
@@ -112,8 +112,8 @@ export default {
         {
           cityName: '长春市',
           deptName: '长春',
-          value: [125.323544, 43.817072, 205000000],
-          totalValue: 205000000,
+          value: [125.323544, 43.817072, 2050],
+          totalValue: 2050,
           totalEquipmentQuantity: 410,
           configRate: 87,
           lineNum: 58,
@@ -123,8 +123,8 @@ export default {
         {
           cityName: '哈尔滨市',
           deptName: '哈尔滨',
-          value: [126.534967, 45.803775, 260000000],
-          totalValue: 260000000,
+          value: [126.534967, 45.803775, 2600],
+          totalValue: 2600,
           totalEquipmentQuantity: 470,
           configRate: 90,
           lineNum: 72,
@@ -135,8 +135,8 @@ export default {
         {
           cityName: '南京市',
           deptName: '南京',
-          value: [118.796877, 32.060255, 380000000],
-          totalValue: 380000000,
+          value: [118.796877, 32.060255, 3800],
+          totalValue: 3800,
           totalEquipmentQuantity: 580,
           configRate: 94,
           lineNum: 85,
@@ -146,8 +146,8 @@ export default {
         {
           cityName: '杭州市',
           deptName: '杭州',
-          value: [120.15507, 30.274084, 360000000],
-          totalValue: 360000000,
+          value: [120.15507, 30.274084, 3600],
+          totalValue: 3600,
           totalEquipmentQuantity: 540,
           configRate: 93,
           lineNum: 82,
@@ -157,8 +157,8 @@ export default {
         {
           cityName: '合肥市',
           deptName: '合肥',
-          value: [117.227239, 31.820586, 280000000],
-          totalValue: 280000000,
+          value: [117.227239, 31.820586, 2800],
+          totalValue: 2800,
           totalEquipmentQuantity: 520,
           configRate: 92,
           lineNum: 80,
@@ -168,8 +168,8 @@ export default {
         {
           cityName: '福州市',
           deptName: '福州',
-          value: [119.296494, 26.074508, 250000000],
-          totalValue: 250000000,
+          value: [119.296494, 26.074508, 2500],
+          totalValue: 2500,
           totalEquipmentQuantity: 485,
           configRate: 90,
           lineNum: 74,
@@ -179,8 +179,8 @@ export default {
         {
           cityName: '南昌市',
           deptName: '南昌',
-          value: [115.892151, 28.676493, 240000000],
-          totalValue: 240000000,
+          value: [115.892151, 28.676493, 2400],
+          totalValue: 2400,
           totalEquipmentQuantity: 465,
           configRate: 89,
           lineNum: 70,
@@ -190,8 +190,8 @@ export default {
         {
           cityName: '济南市',
           deptName: '济南',
-          value: [117.000923, 36.675807, 310000000],
-          totalValue: 310000000,
+          value: [117.000923, 36.675807, 3100],
+          totalValue: 3100,
           totalEquipmentQuantity: 550,
           configRate: 93,
           lineNum: 84,
@@ -202,8 +202,8 @@ export default {
         {
           cityName: '郑州市',
           deptName: '郑州',
-          value: [113.625368, 34.746599, 330000000],
-          totalValue: 330000000,
+          value: [113.625368, 34.746599, 3300],
+          totalValue: 3300,
           totalEquipmentQuantity: 560,
           configRate: 94,
           lineNum: 86,
@@ -213,8 +213,8 @@ export default {
         {
           cityName: '武汉市',
           deptName: '武汉',
-          value: [114.305393, 30.593099, 340000000],
-          totalValue: 340000000,
+          value: [114.305393, 30.593099, 3400],
+          totalValue: 3400,
           totalEquipmentQuantity: 570,
           configRate: 94,
           lineNum: 87,
@@ -224,8 +224,8 @@ export default {
         {
           cityName: '长沙市',
           deptName: '长沙',
-          value: [112.938814, 28.228209, 290000000],
-          totalValue: 290000000,
+          value: [112.938814, 28.228209, 2900],
+          totalValue: 2900,
           totalEquipmentQuantity: 530,
           configRate: 92,
           lineNum: 78,
@@ -236,8 +236,8 @@ export default {
         {
           cityName: '广州市',
           deptName: '广州',
-          value: [113.264435, 23.129163, 420000000],
-          totalValue: 420000000,
+          value: [113.264435, 23.129163, 4200],
+          totalValue: 4200,
           totalEquipmentQuantity: 600,
           configRate: 95,
           lineNum: 90,
@@ -247,8 +247,8 @@ export default {
         {
           cityName: '海口市',
           deptName: '海口',
-          value: [110.33119, 20.031971, 200000000],
-          totalValue: 200000000,
+          value: [110.33119, 20.031971, 2000],
+          totalValue: 2000,
           totalEquipmentQuantity: 400,
           configRate: 86,
           lineNum: 55,
@@ -259,8 +259,8 @@ export default {
         {
           cityName: '成都市',
           deptName: '成都',
-          value: [104.065735, 30.659462, 390000000],
-          totalValue: 390000000,
+          value: [104.065735, 30.659462, 3900],
+          totalValue: 3900,
           totalEquipmentQuantity: 580,
           configRate: 94,
           lineNum: 83,
@@ -270,8 +270,8 @@ export default {
         {
           cityName: '贵阳市',
           deptName: '贵阳',
-          value: [106.630153, 26.647661, 210000000],
-          totalValue: 210000000,
+          value: [106.630153, 26.647661, 2100],
+          totalValue: 2100,
           totalEquipmentQuantity: 440,
           configRate: 88,
           lineNum: 62,
@@ -281,8 +281,8 @@ export default {
         {
           cityName: '昆明市',
           deptName: '昆明',
-          value: [102.833722, 24.88149, 220000000],
-          totalValue: 220000000,
+          value: [102.833722, 24.88149, 2200],
+          totalValue: 2200,
           totalEquipmentQuantity: 450,
           configRate: 88,
           lineNum: 63,
@@ -292,8 +292,8 @@ export default {
         {
           cityName: '西安市',
           deptName: '西安',
-          value: [108.93977, 34.341574, 300000000],
-          totalValue: 300000000,
+          value: [108.93977, 34.341574, 3000],
+          totalValue: 3000,
           totalEquipmentQuantity: 525,
           configRate: 92,
           lineNum: 76,
@@ -304,8 +304,8 @@ export default {
         {
           cityName: '兰州市',
           deptName: '兰州',
-          value: [103.834304, 36.061089, 180000000],
-          totalValue: 180000000,
+          value: [103.834304, 36.061089, 1800],
+          totalValue: 1800,
           totalEquipmentQuantity: 390,
           configRate: 85,
           lineNum: 54,
@@ -315,8 +315,8 @@ export default {
         {
           cityName: '西宁市',
           deptName: '西宁',
-          value: [101.777795, 36.617134, 150000000],
-          totalValue: 150000000,
+          value: [101.777795, 36.617134, 1500],
+          totalValue: 1500,
           totalEquipmentQuantity: 350,
           configRate: 84,
           lineNum: 50,
@@ -326,8 +326,8 @@ export default {
         {
           cityName: '台北市',
           deptName: '台北',
-          value: [121.565418, 25.033964, 300000000],
-          totalValue: 300000000,
+          value: [121.565418, 25.033964, 3000],
+          totalValue: 3000,
           totalEquipmentQuantity: 520,
           configRate: 92,
           lineNum: 78,
@@ -338,8 +338,8 @@ export default {
         {
           cityName: '呼和浩特市',
           deptName: '呼和浩特',
-          value: [111.75199, 40.84149, 160000000],
-          totalValue: 160000000,
+          value: [111.75199, 40.84149, 1600],
+          totalValue: 1600,
           totalEquipmentQuantity: 360,
           configRate: 84,
           lineNum: 52,
@@ -349,8 +349,8 @@ export default {
         {
           cityName: '南宁市',
           deptName: '南宁',
-          value: [108.366543, 22.817002, 210000000],
-          totalValue: 210000000,
+          value: [108.366543, 22.817002, 2100],
+          totalValue: 2100,
           totalEquipmentQuantity: 440,
           configRate: 88,
           lineNum: 62,
@@ -360,8 +360,8 @@ export default {
         {
           cityName: '拉萨市',
           deptName: '拉萨',
-          value: [91.171924, 29.652491, 120000000],
-          totalValue: 120000000,
+          value: [91.171924, 29.652491, 1200],
+          totalValue: 1200,
           totalEquipmentQuantity: 300,
           configRate: 82,
           lineNum: 40,
@@ -371,8 +371,8 @@ export default {
         {
           cityName: '银川市',
           deptName: '银川',
-          value: [106.278179, 38.46637, 150000000],
-          totalValue: 150000000,
+          value: [106.278179, 38.46637, 1500],
+          totalValue: 1500,
           totalEquipmentQuantity: 340,
           configRate: 83,
           lineNum: 48,
@@ -382,8 +382,8 @@ export default {
         {
           cityName: '乌鲁木齐市',
           deptName: '乌鲁木齐',
-          value: [87.616848, 43.825592, 190000000],
-          totalValue: 190000000,
+          value: [87.616848, 43.825592, 1900],
+          totalValue: 1900,
           totalEquipmentQuantity: 380,
           configRate: 85,
           lineNum: 55,
@@ -394,8 +394,8 @@ export default {
         {
           cityName: '香港',
           deptName: '香港',
-          value: [114.173355, 22.320048, 250000000],
-          totalValue: 250000000,
+          value: [114.173355, 22.320048, 2500],
+          totalValue: 2500,
           totalEquipmentQuantity: 420,
           configRate: 88,
           lineNum: 65,
@@ -405,8 +405,8 @@ export default {
         {
           cityName: '澳门',
           deptName: '澳门',
-          value: [113.54909, 22.198951, 160000000],
-          totalValue: 160000000,
+          value: [113.54909, 22.198951, 1600],
+          totalValue: 1600,
           totalEquipmentQuantity: 330,
           configRate: 83,
           lineNum: 48,
@@ -717,7 +717,7 @@ export default {
                 // console.log('🚀 ~ initChart ~ params:', params)
                 const val = params.data.value || []
                 let unit = ''
-                if (this.btnIndex === 1) unit = '亿'
+                if (this.btnIndex === 1) unit = '万元'
                 else if (this.btnIndex === 2) unit = '台'
                 else if (this.btnIndex === 3) unit = '%'
                 return val.length
diff --git a/src/views/screen/wsScreen/components/center/index.vue b/src/views/screen/wsScreen/components/center/index.vue
index b1c8f8a0..976550ad 100644
--- a/src/views/screen/wsScreen/components/center/index.vue
+++ b/src/views/screen/wsScreen/components/center/index.vue
@@ -312,7 +312,7 @@ export default {
               animationEasingUpdate: 'cubicInOut', // 过渡动画的缓动效果。[ default: cubicInOut ]
             },
             label: {
-              show: false,
+              show: true,
               color: '#FFF',
               position: 'top',
               fontSize: 18,
diff --git a/src/views/screen/wsScreenWidescreen/components/center/index.vue b/src/views/screen/wsScreenWidescreen/components/center/index.vue
index 6e3f7975..2130afef 100644
--- a/src/views/screen/wsScreenWidescreen/components/center/index.vue
+++ b/src/views/screen/wsScreenWidescreen/components/center/index.vue
@@ -312,7 +312,7 @@ export default {
               animationEasingUpdate: 'cubicInOut', // 过渡动画的缓动效果。[ default: cubicInOut ]
             },
             label: {
-              show: false,
+              show: true,
               color: '#FFF',
               position: 'top',
               fontSize: 18,
diff --git a/src/views/stockManagement/entryApply/components/AddEquip.vue b/src/views/stockManagement/entryApply/components/AddEquip.vue
index 4e2a6db3..cab8d28f 100644
--- a/src/views/stockManagement/entryApply/components/AddEquip.vue
+++ b/src/views/stockManagement/entryApply/components/AddEquip.vue
@@ -35,7 +35,6 @@
         label-width="120px"
         ref="formRef"
         style="padding: 12px; overflow-y: auto; height: calc(100vh - 180px); width: 100%"
-        label-position="right"
         :model="form"
         :rules="equipRules"
       >
@@ -96,10 +95,12 @@
                 clearable
                 :disabled="isEdit"
               />
+              <!-- <div class="select-box">
+                <div class="no-data">暂无数据</div>
+              </div> -->
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="24">
+
           <el-col :span="6">
             <el-form-item label="规格型号" prop="specificationModel">
               <el-input
@@ -160,8 +161,7 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="24">
+
           <el-col :span="6">
             <el-form-item label="下次维保日期" prop="nextMaintenanceDate">
               <el-date-picker
@@ -212,8 +212,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="24">
+
           <el-col :span="6">
             <el-form-item label="采购日期" prop="purchaseDate">
               <el-date-picker
@@ -517,10 +516,10 @@ export default {
         // manageType: [{ required: true, message: '请选择管理方式', trigger: 'change' }],
         count: [{ required: true, message: '请输入装备数量', trigger: 'blur' }],
         unit: [{ required: true, message: '请输入计数单位', trigger: 'blur' }],
-        purchaseDate: [{ required: true, message: '请选择采购日期', trigger: 'change' }],
-        certificateList: [{ required: true, message: '请上传合格证', trigger: 'change' }],
-        inspectionList: [{ required: true, message: '请上传检测证书', trigger: 'change' }],
-        mainFileList: [{ required: true, message: '请上传图片', trigger: 'change' }],
+        // purchaseDate: [{ required: true, message: '请选择采购日期', trigger: 'change' }],
+        // certificateList: [{ required: true, message: '请上传合格证', trigger: 'change' }],
+        // inspectionList: [{ required: true, message: '请上传检测证书', trigger: 'change' }],
+        // mainFileList: [{ required: true, message: '请上传图片', trigger: 'change' }],
       },
       propertyVoList: [], // 特征属性集合
     }
@@ -757,8 +756,8 @@ export default {
               console.log('🚀 ~ handleSubmit ~ certificates:', certificates)
             } else {
               // 提示
-              this.$message.error('请上传合格证')
-              return
+              // this.$message.error('请上传合格证')
+              // return
             }
             if (this.form.inspectionList) {
               const arr = this.form.inspectionList.split(',')
@@ -772,8 +771,8 @@ export default {
               console.log('🚀 ~ handleSubmit ~ inspectionReports:', inspectionReports)
             } else {
               // 提示
-              this.$message.error('请上传检测证书')
-              return
+              // this.$message.error('请上传检测证书')
+              // return
             }
             if (this.form.purchaseInvoices) {
               const arr = this.form.purchaseInvoices.split(',')
@@ -944,4 +943,28 @@ export default {
 ::v-deep .el-input-number.is-without-controls .el-input__inner {
   text-align: left;
 }
+.select-box {
+  width: 100%;
+  height: 260px;
+  border: 1px solid #dcdcdc;
+  margin-top: 5px;
+  padding: 5px;
+  position: absolute;
+  background-color: #fff;
+  z-index: 999;
+  overflow-y: auto;
+  box-sizing: border-box;
+  border-radius: 4px;
+
+  .no-data {
+    // 居中显示
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    -webkit-transform: translate(-50%, -50%);
+    transform: translate(-50%, -50%);
+    text-align: center;
+    color: #C0C4CC;
+  }
+}
 </style>
diff --git a/src/views/system/dept/index - 副本.vue b/src/views/system/dept/index - 副本.vue
new file mode 100644
index 00000000..c1732b98
--- /dev/null
+++ b/src/views/system/dept/index - 副本.vue	
@@ -0,0 +1,527 @@
+<template>
+    <div class="app-container">
+        <el-form
+            :model="queryParams"
+            ref="queryForm"
+            size="small"
+            :inline="true"
+            v-show="showSearch"
+        >
+          <el-card class="search-box">
+            <el-row style="height: 32px;">
+            <el-form-item label="部门名称" prop="deptName">
+                <el-input
+                    v-model="queryParams.deptName"
+                    placeholder="请输入部门名称"
+                    clearable
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <el-form-item label="状态" prop="status">
+                <el-select
+                    v-model="queryParams.status"
+                    placeholder="部门状态"
+                    clearable
+                >
+                    <el-option
+                        v-for="dict in dict.type.sys_normal_disable"
+                        :key="dict.value"
+                        :label="dict.label"
+                        :value="dict.value"
+                    />
+                </el-select>
+            </el-form-item>
+            <el-form-item style="float: right">
+                <el-button
+                    type="primary"
+                    icon="el-icon-search"
+                    size="mini"
+                    @click="handleQuery"
+                    >查询</el-button
+                >
+                <el-button
+
+                    icon="el-icon-refresh"
+                    size="mini"
+                    @click="resetQuery"
+                    >重置</el-button
+                >
+            </el-form-item>
+            </el-row>
+          </el-card>
+        </el-form>
+
+      <el-card class="content-box">
+        <el-row :gutter="10" class="mb8">
+          <div class="action-bar">
+            <el-col :span="1.5">
+                <el-button
+                    type="primary"
+                    plain
+                    icon="el-icon-plus"
+                    size="mini"
+                    @click="handleAdd"
+                    v-hasPermi="['system:dept:add']"
+                    >新增
+                </el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                    type="info"
+                    plain
+                    icon="el-icon-sort"
+                    size="mini"
+                    @click="toggleExpandAll"
+                    >展开/折叠
+                </el-button>
+            </el-col>
+            <right-toolbar
+                :showSearch.sync="showSearch"
+                @queryTable="getList"
+            ></right-toolbar>
+          </div>
+        </el-row>
+
+        <el-table
+            v-if="refreshTable"
+            v-loading="loading"
+            :data="deptList"
+            row-key="deptId"
+            :default-expand-all="isExpandAll"
+            :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+            height="546"
+        >
+            <el-table-column
+                prop="deptName"
+                label="部门名称"
+                min-width="260"
+            ></el-table-column>
+            <el-table-column
+                prop="orderNum"
+                label="排序"
+                min-width="200"
+            ></el-table-column>
+            <el-table-column prop="status" label="状态" min-width="100">
+                <template slot-scope="scope">
+                    <dict-tag
+                        :options="dict.type.sys_normal_disable"
+                        :value="scope.row.status"
+                    />
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="创建时间"
+                align="center"
+                prop="createTime"
+                min-width="200"
+            >
+                <template slot-scope="scope">
+                    <span>{{ parseTime(scope.row.createTime) }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="操作"
+                align="center"
+                min-width="200"
+                class-name="small-padding fixed-width"
+            >
+                <template slot-scope="scope">
+                    <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-edit"
+                        @click="handleUpdate(scope.row)"
+                        v-hasPermi="['system:dept:edit']"
+                        >修改
+                    </el-button>
+                    <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-plus"
+                        @click="handleAdd(scope.row)"
+                        v-hasPermi="['system:dept:add']"
+                        >新增
+                    </el-button>
+                    <el-button
+                        v-if="scope.row.parentId != 0"
+                        size="mini"
+                        type="text"
+                        icon="el-icon-delete"
+                        @click="handleDelete(scope.row)"
+                        v-hasPermi="['system:dept:remove']"
+                        >删除
+                    </el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <!-- 添加或修改部门对话框 -->
+        <el-dialog
+            :title="title"
+            :visible.sync="open"
+            width="600px"
+            append-to-body
+        >
+            <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+                <el-row>
+                    <el-col :span="24" v-if="form.parentId !== 0">
+                        <el-form-item label="上级部门" prop="parentId">
+                            <treeselect
+                                v-model="form.parentId"
+                                :options="deptOptions"
+                                :normalizer="normalizer"
+                                placeholder="选择上级部门"
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="部门名称" prop="deptName">
+                            <el-input
+                                v-model="form.deptName"
+                                placeholder="请输入部门名称"
+                            />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="显示排序" prop="orderNum">
+                            <el-input-number
+                                v-model="form.orderNum"
+                                controls-position="right"
+                                :min="0"
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="负责人" prop="leader">
+                            <el-input
+                                v-model="form.leader"
+                                placeholder="请输入负责人"
+                                maxlength="20"
+                            />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="联系电话" prop="phone">
+                            <el-input
+                                v-model="form.phone"
+                                placeholder="请输入联系电话"
+                                maxlength="11"
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="邮箱" prop="email">
+                            <el-input
+                                v-model="form.email"
+                                placeholder="请输入邮箱"
+                                maxlength="50"
+                            />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="部门状态">
+                            <el-radio-group v-model="form.status">
+                                <el-radio
+                                    v-for="dict in dict.type.sys_normal_disable"
+                                    :key="dict.value"
+                                    :label="dict.value"
+                                    >{{ dict.label }}
+                                </el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <div v-if="config.addAddress || false">
+                    <el-row>
+                        <el-col :span="8">
+                            <el-form-item label="省" prop="province">
+                                <el-input
+                                    v-model="form.province"
+                                    placeholder="请输入省份"
+                                    maxlength="50"
+                                />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="市" prop="city">
+                                <el-input
+                                    v-model="form.city"
+                                    placeholder="请输入市"
+                                    maxlength="50"
+                                />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="县" prop="district">
+                                <el-input
+                                    v-model="form.district"
+                                    placeholder="请输入县"
+                                    maxlength="50"
+                                />
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                    <el-row>
+                        <el-form-item label="详细地址" prop="address">
+                            <el-input
+                                v-model="form.address"
+                                type="textarea"
+                                maxlength="200"
+                                show-word-limit
+                                placeholder="请输入详细地址"
+                            />
+                        </el-form-item>
+                    </el-row>
+                </div>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="submitForm">确 定</el-button>
+                <el-button @click="cancel">取 消</el-button>
+            </div>
+        </el-dialog>
+      </el-card>
+    </div>
+</template>
+
+<script>
+import {
+    listDept,
+    getDept,
+    delDept,
+    addDept,
+    updateDept,
+    listDeptExcludeChild,
+} from '@/api/system/dept'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+
+export default {
+    name: 'Dept',
+    computed: {
+        config() {
+            return JSON.parse(localStorage.getItem('systemConfig')) // 获取 JSON 对象
+        },
+    },
+    dicts: ['sys_normal_disable'],
+    components: { Treeselect },
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 表格树数据
+            deptList: [],
+            // 部门树选项
+            deptOptions: [],
+            // 弹出层标题
+            title: '',
+            // 是否显示弹出层
+            open: false,
+            // 是否展开，默认全部展开
+            isExpandAll: true,
+            // 重新渲染表格状态
+            refreshTable: true,
+            // 查询参数
+            queryParams: {
+                deptName: undefined,
+                status: undefined,
+            },
+            // 表单参数
+            form: {},
+            // 表单校验
+            rules: {
+                parentId: [
+                    {
+                        required: true,
+                        message: '上级部门不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+                deptName: [
+                    {
+                        required: true,
+                        message: '部门名称不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+                orderNum: [
+                    {
+                        required: true,
+                        message: '显示排序不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+                email: [
+                    {
+                        type: 'email',
+                        message: '请输入正确的邮箱地址',
+                        trigger: ['blur', 'change'],
+                    },
+                ],
+                phone: [
+                    {
+                        pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+                        message: '请输入正确的手机号码',
+                        trigger: 'blur',
+                    },
+                ],
+            },
+        }
+    },
+    created() {
+        this.getList()
+    },
+    methods: {
+        /** 查询部门列表 */
+        getList() {
+            this.loading = true
+            listDept(this.queryParams).then((response) => {
+                this.deptList = this.handleTree(response.data, 'deptId')
+                this.loading = false
+            })
+        },
+        /** 转换部门数据结构 */
+        normalizer(node) {
+            if (node.children && !node.children.length) {
+                delete node.children
+            }
+            return {
+                id: node.deptId,
+                label: node.deptName,
+                children: node.children,
+            }
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false
+            this.reset()
+        },
+        // 表单重置
+        reset() {
+            this.form = {
+                deptId: undefined,
+                parentId: undefined,
+                deptName: undefined,
+                orderNum: undefined,
+                leader: undefined,
+                phone: undefined,
+                email: undefined,
+                status: '0',
+            }
+            this.resetForm('form')
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.getList()
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm('queryForm')
+            this.handleQuery()
+        },
+        /** 新增按钮操作 */
+        handleAdd(row) {
+            this.reset()
+            if (row != undefined) {
+                this.form.parentId = row.deptId
+            }
+            this.open = true
+            this.title = '添加部门'
+            listDept().then((response) => {
+                this.deptOptions = this.handleTree(response.data, 'deptId')
+            })
+        },
+        /** 展开/折叠操作 */
+        toggleExpandAll() {
+            this.refreshTable = false
+            this.isExpandAll = !this.isExpandAll
+            this.$nextTick(() => {
+                this.refreshTable = true
+            })
+        },
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            this.reset()
+            getDept(row.deptId).then((response) => {
+                this.form = response.data
+                this.open = true
+                this.title = '修改部门'
+            })
+            listDeptExcludeChild(row.deptId).then((response) => {
+                this.deptOptions = this.handleTree(response.data, 'deptId')
+            })
+        },
+        /** 提交按钮 */
+        submitForm: function () {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    if (this.form.deptId != undefined) {
+                        updateDept(this.form).then((response) => {
+                            this.$modal.msgSuccess('修改成功')
+                            this.open = false
+                            this.getList()
+                        })
+                    } else {
+                        addDept(this.form).then((response) => {
+                            this.$modal.msgSuccess('新增成功')
+                            this.open = false
+                            this.getList()
+                        })
+                    }
+                }
+            })
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            this.$modal
+                .confirm('是否确认删除名称为"' + row.deptName + '"的数据项？')
+                .then(function () {
+                    return delDept(row.deptId)
+                })
+                .then(() => {
+                    this.getList()
+                    this.$modal.msgSuccess('删除成功')
+                })
+                .catch(() => {})
+        },
+    },
+}
+</script>
+
+<style lang="scss" scoped>
+/* 新增：统一的操作栏容器样式，用于将所有按钮和工具栏放在右侧 */
+.action-bar {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end; /* 关键：整体内容靠右对齐 */
+  gap: 10px; /* 统一设置内部元素的间距 */
+  width: 100%;
+
+}
+
+.search-box {
+  margin-bottom: 20px;
+  border-radius: 8px;
+  padding: 0;
+
+  ::v-deep .el-card__body {
+    padding: 20px !important;
+  }
+}
+
+.table-container {
+  flex: 1;
+  overflow: hidden;
+  margin-bottom: 0;
+  min-height: 0;
+  display: flex;
+  flex-direction: column;
+}
+</style>
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 652c7a89..3a936bd6 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -1,527 +1,904 @@
 <template>
     <div class="app-container">
-        <el-form
-            :model="queryParams"
-            ref="queryForm"
-            size="small"
-            :inline="true"
-            v-show="showSearch"
-        >
-          <el-card class="search-box">
-            <el-row style="height: 32px;">
-            <el-form-item label="部门名称" prop="deptName">
+      <!-- 标签页 -->
+      <el-tabs v-model="activeTab" @tab-click="handleTabClick">
+        <el-tab-pane label="机构" name="org">
+          <!-- 机构管理页面 -->
+          <div class="org-container">
+            <!-- 查询表单 -->
+            <el-form :model="orgQueryParams" ref="orgQueryForm" size="small" :inline="true" label-width="90px" class="query-form">
+              <el-form-item label="机构名称" prop="orgName">
                 <el-input
-                    v-model="queryParams.deptName"
-                    placeholder="请输入部门名称"
-                    clearable
-                    @keyup.enter.native="handleQuery"
-                />
-            </el-form-item>
-            <el-form-item label="状态" prop="status">
-                <el-select
-                    v-model="queryParams.status"
-                    placeholder="部门状态"
-                    clearable
-                >
-                    <el-option
-                        v-for="dict in dict.type.sys_normal_disable"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value"
-                    />
-                </el-select>
-            </el-form-item>
-            <el-form-item style="float: right">
-                <el-button
-                    type="primary"
-                    icon="el-icon-search"
-                    size="mini"
-                    @click="handleQuery"
-                    >查询</el-button
-                >
-                <el-button
-
-                    icon="el-icon-refresh"
-                    size="mini"
-                    @click="resetQuery"
-                    >重置</el-button
-                >
-            </el-form-item>
-            </el-row>
-          </el-card>
-        </el-form>
-
-      <el-card class="content-box" style="height: 750px">
-        <el-row :gutter="10" class="mb8">
-          <div class="action-bar">
-            <el-col :span="1.5">
-                <el-button
-                    type="primary"
-                    plain
-                    icon="el-icon-plus"
-                    size="mini"
-                    @click="handleAdd"
-                    v-hasPermi="['system:dept:add']"
-                    >新增
-                </el-button>
-            </el-col>
-            <el-col :span="1.5">
-                <el-button
-                    type="info"
-                    plain
-                    icon="el-icon-sort"
-                    size="mini"
-                    @click="toggleExpandAll"
-                    >展开/折叠
-                </el-button>
-            </el-col>
-            <right-toolbar
-                :showSearch.sync="showSearch"
-                @queryTable="getList"
-            ></right-toolbar>
-          </div>
-        </el-row>
-
-        <el-table
-            v-if="refreshTable"
-            v-loading="loading"
-            :data="deptList"
-            row-key="deptId"
-            :default-expand-all="isExpandAll"
-            :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-            height="676"
-        >
-            <el-table-column
-                prop="deptName"
-                label="部门名称"
-                min-width="260"
-            ></el-table-column>
-            <el-table-column
-                prop="orderNum"
-                label="排序"
-                min-width="200"
-            ></el-table-column>
-            <el-table-column prop="status" label="状态" min-width="100">
-                <template slot-scope="scope">
-                    <dict-tag
-                        :options="dict.type.sys_normal_disable"
-                        :value="scope.row.status"
-                    />
-                </template>
-            </el-table-column>
-            <el-table-column
-                label="创建时间"
-                align="center"
-                prop="createTime"
-                min-width="200"
-            >
-                <template slot-scope="scope">
-                    <span>{{ parseTime(scope.row.createTime) }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column
-                label="操作"
-                align="center"
-                min-width="200"
-                class-name="small-padding fixed-width"
-            >
-                <template slot-scope="scope">
-                    <el-button
-                        size="mini"
-                        type="text"
-                        icon="el-icon-edit"
-                        @click="handleUpdate(scope.row)"
-                        v-hasPermi="['system:dept:edit']"
-                        >修改
-                    </el-button>
-                    <el-button
-                        size="mini"
-                        type="text"
-                        icon="el-icon-plus"
-                        @click="handleAdd(scope.row)"
-                        v-hasPermi="['system:dept:add']"
-                        >新增
-                    </el-button>
-                    <el-button
-                        v-if="scope.row.parentId != 0"
-                        size="mini"
-                        type="text"
-                        icon="el-icon-delete"
-                        @click="handleDelete(scope.row)"
-                        v-hasPermi="['system:dept:remove']"
-                        >删除
-                    </el-button>
-                </template>
-            </el-table-column>
-        </el-table>
-
-        <!-- 添加或修改部门对话框 -->
-        <el-dialog
-            :title="title"
-            :visible.sync="open"
-            width="600px"
-            append-to-body
-        >
-            <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-                <el-row>
-                    <el-col :span="24" v-if="form.parentId !== 0">
-                        <el-form-item label="上级部门" prop="parentId">
-                            <treeselect
-                                v-model="form.parentId"
-                                :options="deptOptions"
-                                :normalizer="normalizer"
-                                placeholder="选择上级部门"
-                            />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="部门名称" prop="deptName">
-                            <el-input
-                                v-model="form.deptName"
-                                placeholder="请输入部门名称"
-                            />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="显示排序" prop="orderNum">
-                            <el-input-number
-                                v-model="form.orderNum"
-                                controls-position="right"
-                                :min="0"
-                            />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="负责人" prop="leader">
-                            <el-input
-                                v-model="form.leader"
-                                placeholder="请输入负责人"
-                                maxlength="20"
-                            />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="联系电话" prop="phone">
-                            <el-input
-                                v-model="form.phone"
-                                placeholder="请输入联系电话"
-                                maxlength="11"
-                            />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="邮箱" prop="email">
-                            <el-input
-                                v-model="form.email"
-                                placeholder="请输入邮箱"
-                                maxlength="50"
-                            />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="部门状态">
-                            <el-radio-group v-model="form.status">
-                                <el-radio
-                                    v-for="dict in dict.type.sys_normal_disable"
-                                    :key="dict.value"
-                                    :label="dict.value"
-                                    >{{ dict.label }}
-                                </el-radio>
-                            </el-radio-group>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <div v-if="config.addAddress || false">
-                    <el-row>
-                        <el-col :span="8">
-                            <el-form-item label="省" prop="province">
-                                <el-input
-                                    v-model="form.province"
-                                    placeholder="请输入省份"
-                                    maxlength="50"
-                                />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="8">
-                            <el-form-item label="市" prop="city">
-                                <el-input
-                                    v-model="form.city"
-                                    placeholder="请输入市"
-                                    maxlength="50"
-                                />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="8">
-                            <el-form-item label="县" prop="district">
-                                <el-input
-                                    v-model="form.district"
-                                    placeholder="请输入县"
-                                    maxlength="50"
-                                />
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <el-row>
-                        <el-form-item label="详细地址" prop="address">
-                            <el-input
-                                v-model="form.address"
-                                type="textarea"
-                                maxlength="200"
-                                show-word-limit
-                                placeholder="请输入详细地址"
-                            />
-                        </el-form-item>
-                    </el-row>
-                </div>
+                  v-model="orgQueryParams.orgName"
+                  placeholder="请输入"
+                  clearable
+                  style="width: 200px">
+                  <i slot="suffix" class="el-input__icon el-icon-edit"></i>
+                </el-input>
+              </el-form-item>
+              <el-form-item label="主管理员" prop="mainAdmin">
+                <el-input
+                  v-model="orgQueryParams.mainAdmin"
+                  placeholder="请输入"
+                  clearable
+                  style="width: 200px">
+                  <i slot="suffix" class="el-input__icon el-icon-edit"></i>
+                </el-input>
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" size="mini" @click="handleOrgQuery">查询</el-button>
+                <el-button size="mini" @click="resetOrgQuery">重置</el-button>
+              </el-form-item>
             </el-form>
-            <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="submitForm">确 定</el-button>
-                <el-button @click="cancel">取 消</el-button>
-            </div>
-        </el-dialog>
-      </el-card>
-    </div>
-</template>
 
-<script>
-import {
-    listDept,
-    getDept,
-    delDept,
+            <!-- 操作按钮 -->
+            <div class="action-buttons">
+             <!-- <el-button type="primary" size="mini" @click="handleOrgAdd">新增</el-button>
+              <el-button type="warning" size="mini" @click="handleOrgImport">导入</el-button>
+              <el-button type="danger" size="mini" @click="handleOrgDelete">删除</el-button> -->
+            </div>
+
+            <!-- 机构树形表格 -->
+            <el-table
+              v-loading="orgLoading"
+              :data="orgTreeData"
+              row-key="id"
+              :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+              border
+              style="width: 100%">
+              <el-table-column type="index" width="50" align="center">
+                <template slot-scope="scope">
+                  <i class="el-icon-menu" style="cursor: move;"></i>
+                </template>
+              </el-table-column>
+              <el-table-column prop="orgName" label="机构名称" min-width="200"  show-overflow-tooltip></el-table-column>
+              <el-table-column prop="level" label="级别" width="120" align="center">
+                <template slot-scope="scope">
+                  <el-tag v-if="scope.row.level === '一级机构'" type="warning" size="small">一级机构</el-tag>
+                  <el-tag v-else-if="scope.row.level === '二级机构'" type="success" size="small">二级机构</el-tag>
+                  <el-tag v-else-if="scope.row.level === '三级机构'" type="info" size="small">三级机构</el-tag>
+                  <span v-else>{{ scope.row.level }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="mainAdmin" label="主管理员" width="150" align="center" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="subAdmin" label="子管理员" min-width="200" align="center" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="personCount" label="人数" width="100" align="center"></el-table-column>
+              <el-table-column label="操作" width="200" align="center" fixed="right">
+                <template slot-scope="scope">
+                  <el-button
+                    v-if="scope.row.level !== '三级机构'"
+                    type="text"
+                    size="small"
+                    @click="handleAddSubOrg(scope.row)">添加下级机构</el-button>
+                  <el-button type="text" size="small" @click="handleOrgEdit(scope.row)">编辑</el-button>
+                  <el-button type="text" size="small" style="color: #f56c6c;" @click="handleOrgDeleteRow(scope.row)">删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </el-tab-pane>
+
+        <el-tab-pane label="部门" name="dept">
+          <!-- 部门管理页面 -->
+          <div class="dept-container">
+            <div class="dept-layout">
+              <!-- 左侧机构树 -->
+              <div class="org-tree-panel">
+                <div class="tree-search">
+                  <el-input
+                    v-model="orgTreeFilterText"
+                    placeholder="输入机构名称搜索"
+                    prefix-icon="el-icon-search"
+                    size="small"
+                    clearable>
+                  </el-input>
+                </div>
+                <div class="tree-content">
+                  <el-tree
+                    ref="orgTree"
+                    :data="orgTreeList"
+                    :props="{ children: 'children', label: 'orgName' }"
+                    :filter-node-method="filterNode"
+                    node-key="id"
+                    :default-expanded-keys="defaultExpandedKeys"
+                    :highlight-current="true"
+                    @node-click="handleOrgNodeClick">
+                  </el-tree>
+                </div>
+              </div>
+
+              <!-- 右侧部门管理 -->
+              <div class="dept-content-panel">
+                <!-- 查询表单 -->
+                <el-form :model="deptQueryParams" ref="deptQueryForm" size="small" :inline="true" label-width="90px" class="query-form">
+                  <el-form-item label="部门名称" prop="deptName">
+                    <el-input
+                      v-model="deptQueryParams.deptName"
+                      placeholder="请输入"
+                      clearable
+                      style="width: 200px">
+                      <i slot="suffix" class="el-input__icon el-icon-edit"></i>
+                    </el-input>
+                  </el-form-item>
+                  <el-form-item>
+                    <el-button size="mini" @click="resetDeptQuery">重置</el-button>
+                    <el-button type="primary" size="mini" @click="handleDeptQuery">查询</el-button>
+                  </el-form-item>
+                </el-form>
+
+                <!-- 当前选中机构和操作按钮 -->
+                <div class="dept-header">
+                  <div class="current-org">{{ currentSelectedOrg || '请选择机构' }}</div>
+                  <div class="action-buttons">
+                   <el-button type="primary" size="mini" @click="handleDeptAdd">新增</el-button>
+                     <!-- <el-button type="warning" size="mini" @click="handleDeptImport">导入</el-button>
+                    <el-button type="danger" size="mini" @click="handleDeptDelete">删除</el-button> -->
+                  </div>
+                </div>
+
+                <!-- 部门树形表格 -->
+                <el-table
+                  v-loading="deptLoading"
+                  :data="deptTableData"
+                  row-key="id"
+                  :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+                  border
+                  style="width: 100%">
+                  <el-table-column type="index" width="50" align="center">
+                    <template slot-scope="scope">
+                      <i class="el-icon-menu" style="cursor: move;"></i>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="orgName" label="部门名称" min-width="200"  show-overflow-tooltip></el-table-column>
+                  <el-table-column label="操作" width="200" align="center" fixed="right">
+                    <template slot-scope="scope">
+                      <el-button
+                        v-if="!isDeptSecondLevel(scope.row)"
+                        type="text"
+                        size="small"
+                        @click="handleAddSubDept(scope.row)">添加下级</el-button>
+                      <el-button type="text" size="small" style="color: #9c27b0;" @click="handleDeptEdit(scope.row)">编辑</el-button>
+                      <el-button type="text" size="small" style="color: #f56c6c;" @click="handleDeptDeleteRow(scope.row)">删除</el-button>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </div>
+            </div>
+          </div>
+        </el-tab-pane>
+      </el-tabs>
+
+      <!-- 机构新增/编辑对话框 -->
+      <el-dialog
+        :title="orgDialogTitle"
+        :visible.sync="orgDialogVisible"
+        width="600px"
+        @close="resetOrgForm">
+        <el-form ref="orgForm" :model="orgForm" :rules="orgRules" label-width="100px">
+          <el-form-item label="机构名称" prop="orgName">
+            <el-input v-model="orgForm.orgName" placeholder="请输入机构名称" maxlength="50"></el-input>
+          </el-form-item>
+
+          <el-form-item v-if="orgForm.parentId" label="父级机构">
+            <el-input :value="orgForm.parentName" disabled></el-input>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="orgDialogVisible = false">取 消</el-button>
+          <el-button type="primary" @click="submitOrgForm">确 定</el-button>
+        </div>
+      </el-dialog>
+
+      <!-- 部门新增/编辑对话框 -->
+      <el-dialog
+        :title="deptDialogTitle"
+        :visible.sync="deptDialogVisible"
+        width="600px"
+        @close="resetDeptForm">
+        <el-form ref="deptForm" :model="deptForm" :rules="deptRules" label-width="100px">
+          <el-form-item label="部门名称" prop="orgName">
+            <el-input v-model="deptForm.orgName" placeholder="请输入部门名称" maxlength="50"></el-input>
+          </el-form-item>
+          <el-form-item v-if="deptForm.parentId" label="父级部门">
+            <el-input :value="deptForm.parentName" disabled></el-input>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="deptDialogVisible = false">取 消</el-button>
+          <el-button type="primary" @click="submitDeptForm">确 定</el-button>
+        </div>
+      </el-dialog>
+    </div>
+  </template>
+
+  <script>
+  import {
+    listOrgTree,
+    listOrgTreeSimple,
+    listDeptByOrg,
+    addOrg,
+    updateOrg,
+    deleteOrg,
     addDept,
     updateDept,
-    listDeptExcludeChild,
-} from '@/api/system/dept'
-import Treeselect from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+    deleteDept,
+    importOrg,
+    importDept
+  } from '@/api/system/newdept';
 
-export default {
-    name: 'Dept',
-    computed: {
-        config() {
-            return JSON.parse(localStorage.getItem('systemConfig')) // 获取 JSON 对象
-        },
-    },
-    dicts: ['sys_normal_disable'],
-    components: { Treeselect },
+  export default {
+    name: "OrgDeptManagement",
     data() {
-        return {
-            // 遮罩层
-            loading: true,
-            // 显示搜索条件
-            showSearch: true,
-            // 表格树数据
-            deptList: [],
-            // 部门树选项
-            deptOptions: [],
-            // 弹出层标题
-            title: '',
-            // 是否显示弹出层
-            open: false,
-            // 是否展开，默认全部展开
-            isExpandAll: true,
-            // 重新渲染表格状态
-            refreshTable: true,
-            // 查询参数
-            queryParams: {
-                deptName: undefined,
-                status: undefined,
-            },
-            // 表单参数
-            form: {},
-            // 表单校验
-            rules: {
-                parentId: [
-                    {
-                        required: true,
-                        message: '上级部门不能为空',
-                        trigger: 'blur',
-                    },
-                ],
-                deptName: [
-                    {
-                        required: true,
-                        message: '部门名称不能为空',
-                        trigger: 'blur',
-                    },
-                ],
-                orderNum: [
-                    {
-                        required: true,
-                        message: '显示排序不能为空',
-                        trigger: 'blur',
-                    },
-                ],
-                email: [
-                    {
-                        type: 'email',
-                        message: '请输入正确的邮箱地址',
-                        trigger: ['blur', 'change'],
-                    },
-                ],
-                phone: [
-                    {
-                        pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-                        message: '请输入正确的手机号码',
-                        trigger: 'blur',
-                    },
-                ],
-            },
+      return {
+        // 当前激活的标签页
+        activeTab: 'org',
+
+        // ========== 机构管理相关 ==========
+        orgLoading: false,
+        orgQueryParams: {
+          orgName: null,
+          mainAdmin: null,
+          subAdmin: null
+        },
+        orgTreeData: [],
+
+        // ========== 部门管理相关 ==========
+        orgTreeFilterText: '',
+        orgTreeList: [],
+        defaultExpandedKeys: [],
+        currentSelectedOrg: null,
+        currentSelectedOrgId: null,
+        deptLoading: false,
+        deptQueryParams: {
+          deptName: null,
+          mainAdmin: null,
+          subAdmin: null
+        },
+        deptTableData: [],
+
+        // ========== 机构对话框相关 ==========
+        orgDialogVisible: false,
+        orgDialogTitle: '新增机构',
+        orgForm: {
+          id: null,
+          orgName: '',
+          mainAdmin: '',
+          parentId: null,
+          parentName: '',
+          level:''
+        },
+        orgRules: {
+          orgName: [
+            { required: true, message: '请输入机构名称', trigger: 'blur' }
+          ]
+        },
+
+        // ========== 部门对话框相关 ==========
+        deptDialogVisible: false,
+        deptDialogTitle: '新增部门',
+        deptForm: {
+          id: null,
+          orgName: '',
+          parentId: null,
+          parentName: '',
+          orgId: null
+        },
+        deptRules: {
+          orgName: [
+            { required: true, message: '请输入部门名称', trigger: 'blur' }
+          ]
         }
+      };
     },
-    created() {
-        this.getList()
+    watch: {
+      orgTreeFilterText(val) {
+        this.$refs.orgTree.filter(val);
+      }
     },
     methods: {
-        /** 查询部门列表 */
-        getList() {
-            this.loading = true
-            listDept(this.queryParams).then((response) => {
-                this.deptList = this.handleTree(response.data, 'deptId')
-                this.loading = false
-            })
-        },
-        /** 转换部门数据结构 */
-        normalizer(node) {
-            if (node.children && !node.children.length) {
-                delete node.children
+      // ========== 标签页切换 ==========
+      handleTabClick(tab) {
+        if (tab.name === 'org') {
+          // 切换到机构管理
+          this.getOrgList();
+        } else if (tab.name === 'dept') {
+          // 切换到部门管理
+          this.getOrgTree();
+          if (this.currentSelectedOrgId) {
+            this.getDeptList();
+          }
+        }
+      },
+
+      // ========== 机构管理相关方法 ==========
+      // 切换展开/收起
+      toggleExpand(row) {
+        row.expanded = !row.expanded;
+        this.$forceUpdate();
+      },
+
+      // 机构查询
+      handleOrgQuery() {
+        this.getOrgList();
+      },
+
+      // 重置机构查询
+      resetOrgQuery() {
+        this.orgQueryParams = {
+          orgName: null,
+          mainAdmin: null,
+          subAdmin: null
+        };
+        this.getOrgList();
+      },
+
+      // 获取机构列表
+      getOrgList() {
+        this.orgLoading = true;
+        listOrgTree(this.orgQueryParams).then(response => {
+          // 若依框架返回格式：{ code: 200, msg: "操作成功", data: [...] }
+          this.orgTreeData = response.data || [];
+          // 为树形数据添加展开状态
+          this.processOrgTreeData(this.orgTreeData);
+          this.orgLoading = false;
+        }).catch(() => {
+          this.orgLoading = false;
+        });
+      },
+
+      // 处理机构树形数据，添加展开状态
+      processOrgTreeData(data) {
+        if (Array.isArray(data)) {
+          data.forEach(item => {
+            item.expanded = item.expanded !== false; // 默认展开
+            if (item.children && item.children.length > 0) {
+              this.processOrgTreeData(item.children);
             }
-            return {
-                id: node.deptId,
-                label: node.deptName,
-                children: node.children,
+          });
+        }
+      },
+
+      // 新增机构
+      handleOrgAdd() {
+        this.orgDialogTitle = '新增机构';
+        this.orgForm = {
+          id: null,
+          orgName: '',
+          mainAdmin: '',
+          parentId: null,
+          parentName: ''
+        };
+        this.orgDialogVisible = true;
+      },
+
+      // 导入机构
+      handleOrgImport() {
+        this.$modal.msgInfo('导入机构功能');
+        // TODO: 打开导入对话框，调用 importOrg API
+      },
+
+      // 删除机构（批量）
+      handleOrgDelete() {
+        this.$modal.confirm('是否确认删除选中的机构？').then(() => {
+          // TODO: 获取选中的机构ID列表，调用批量删除API
+          this.$modal.msgSuccess('删除成功');
+          this.getOrgList();
+        }).catch(() => {});
+      },
+
+      // 添加下级机构
+      handleAddSubOrg(row) {
+        // 三级机构不能添加下级
+        if (row.level === '三级机构') {
+          this.$message.warning('三级机构不能添加下级机构');
+          return;
+        }
+        this.orgDialogTitle = '添加下级机构';
+        this.orgForm = {
+          id: null,
+          orgName: '',
+          mainAdmin: '',
+          parentId: row.id || row.orgId,
+          parentName: row.orgName,
+          level: row.level
+        };
+        this.orgDialogVisible = true;
+      },
+
+      // 编辑机构
+      handleOrgEdit(row) {
+        this.orgDialogTitle = '编辑机构';
+        this.orgForm = {
+          id: row.id || row.orgId,
+          orgName: row.orgName || '',
+          mainAdmin: row.mainAdmin || '',
+          parentId: row.parentId,
+          parentName: ''
+        };
+        // 如果有父级，查找父级名称
+        if (this.orgForm.parentId) {
+          const parentOrg = this.findOrgById(this.orgTreeData, this.orgForm.parentId);
+          if (parentOrg) {
+            this.orgForm.parentName = parentOrg.orgName;
+          }
+        }
+        this.orgDialogVisible = true;
+      },
+
+      // 查找机构（递归）
+      findOrgById(data, id) {
+        for (let item of data) {
+          if ((item.id || item.orgId) === id) {
+            return item;
+          }
+          if (item.children && item.children.length > 0) {
+            const found = this.findOrgById(item.children, id);
+            if (found) return found;
+          }
+        }
+        return null;
+      },
+
+      // 提交机构表单
+      submitOrgForm() {
+        this.$refs.orgForm.validate(valid => {
+          if (valid) {
+            const formData = {
+              orgName: this.orgForm.orgName,
+              level: this.orgForm.level,
+              mainAdmin: this.orgForm.mainAdmin,
+              parentId: this.orgForm.parentId || null
+            };
+
+            if (this.orgForm.id) {
+              // 编辑
+              formData.id = this.orgForm.id;
+              updateOrg(formData).then(() => {
+                this.$modal.msgSuccess('修改成功');
+                this.orgDialogVisible = false;
+                this.getOrgList();
+              }).catch(() => {});
+            } else {
+              // 新增
+              addOrg(formData).then(() => {
+                this.$modal.msgSuccess('新增成功');
+                this.orgDialogVisible = false;
+                this.getOrgList();
+              }).catch(() => {});
             }
-        },
-        // 取消按钮
-        cancel() {
-            this.open = false
-            this.reset()
-        },
-        // 表单重置
-        reset() {
-            this.form = {
-                deptId: undefined,
-                parentId: undefined,
-                deptName: undefined,
-                orderNum: undefined,
-                leader: undefined,
-                phone: undefined,
-                email: undefined,
-                status: '0',
+          }
+        });
+      },
+
+      // 重置机构表单
+      resetOrgForm() {
+        this.$refs.orgForm && this.$refs.orgForm.resetFields();
+        this.orgForm = {
+          id: null,
+          orgName: '',
+          mainAdmin: '',
+          parentId: null,
+          parentName: ''
+        };
+      },
+
+      // 删除机构（单行）
+      handleOrgDeleteRow(row) {
+        this.$modal.confirm('是否确认删除机构"' + row.orgName + '"？').then(() => {
+          deleteOrg(row.id || row.orgId).then(() => {
+            this.$modal.msgSuccess('删除成功');
+            this.getOrgList();
+          }).catch(() => {});
+        }).catch(() => {});
+      },
+
+      // ========== 部门管理相关方法 ==========
+      // 树节点过滤
+      filterNode(value, data) {
+        if (!value) return true;
+        return data.orgName.indexOf(value) !== -1;
+      },
+
+      // 机构树节点点击
+      handleOrgNodeClick(data) {
+        this.currentSelectedOrg = data.orgName;
+        this.currentSelectedOrgId = data.id || data.orgId;
+        this.getDeptList();
+      },
+
+      // 获取机构树（用于部门管理左侧）
+      getOrgTree() {
+        listOrgTreeSimple().then(response => {
+          // 若依框架返回格式：{ code: 200, msg: "操作成功", data: [...] }
+          this.orgTreeList = response.data || [];
+          // 设置默认展开的节点（展开第一级）
+          if (this.orgTreeList.length > 0) {
+            this.defaultExpandedKeys = this.getFirstLevelKeys(this.orgTreeList);
+            // 如果还没有选中机构，默认选中第一个
+            if (!this.currentSelectedOrgId && this.orgTreeList.length > 0) {
+              const firstNode = this.findFirstLeafNode(this.orgTreeList);
+              if (firstNode) {
+                this.currentSelectedOrg = firstNode.orgName;
+                this.currentSelectedOrgId = firstNode.id || firstNode.orgId;
+                this.getDeptList();
+              }
             }
-            this.resetForm('form')
-        },
-        /** 搜索按钮操作 */
-        handleQuery() {
-            this.getList()
-        },
-        /** 重置按钮操作 */
-        resetQuery() {
-            this.resetForm('queryForm')
-            this.handleQuery()
-        },
-        /** 新增按钮操作 */
-        handleAdd(row) {
-            this.reset()
-            if (row != undefined) {
-                this.form.parentId = row.deptId
+          }
+        }).catch(() => {});
+      },
+
+      // 获取第一级节点的key
+      getFirstLevelKeys(data) {
+        const keys = [];
+        if (Array.isArray(data)) {
+          data.forEach(item => {
+            keys.push(item.id || item.orgId);
+          });
+        }
+        return keys;
+      },
+
+      // 查找第一个叶子节点
+      findFirstLeafNode(data) {
+        if (Array.isArray(data) && data.length > 0) {
+          for (let item of data) {
+            if (!item.children || item.children.length === 0) {
+              return item;
+            } else {
+              const leaf = this.findFirstLeafNode(item.children);
+              if (leaf) return leaf;
             }
-            this.open = true
-            this.title = '添加部门'
-            listDept().then((response) => {
-                this.deptOptions = this.handleTree(response.data, 'deptId')
-            })
-        },
-        /** 展开/折叠操作 */
-        toggleExpandAll() {
-            this.refreshTable = false
-            this.isExpandAll = !this.isExpandAll
-            this.$nextTick(() => {
-                this.refreshTable = true
-            })
-        },
-        /** 修改按钮操作 */
-        handleUpdate(row) {
-            this.reset()
-            getDept(row.deptId).then((response) => {
-                this.form = response.data
-                this.open = true
-                this.title = '修改部门'
-            })
-            listDeptExcludeChild(row.deptId).then((response) => {
-                this.deptOptions = this.handleTree(response.data, 'deptId')
-            })
-        },
-        /** 提交按钮 */
-        submitForm: function () {
-            this.$refs['form'].validate((valid) => {
-                if (valid) {
-                    if (this.form.deptId != undefined) {
-                        updateDept(this.form).then((response) => {
-                            this.$modal.msgSuccess('修改成功')
-                            this.open = false
-                            this.getList()
-                        })
-                    } else {
-                        addDept(this.form).then((response) => {
-                            this.$modal.msgSuccess('新增成功')
-                            this.open = false
-                            this.getList()
-                        })
-                    }
-                }
-            })
-        },
-        /** 删除按钮操作 */
-        handleDelete(row) {
-            this.$modal
-                .confirm('是否确认删除名称为"' + row.deptName + '"的数据项？')
-                .then(function () {
-                    return delDept(row.deptId)
-                })
-                .then(() => {
-                    this.getList()
-                    this.$modal.msgSuccess('删除成功')
-                })
-                .catch(() => {})
-        },
+          }
+        }
+        return null;
+      },
+
+      // 部门查询
+      handleDeptQuery() {
+        this.getDeptList();
+      },
+
+      // 重置部门查询
+      resetDeptQuery() {
+        this.deptQueryParams = {
+          deptName: null,
+          mainAdmin: null,
+          subAdmin: null
+        };
+        this.getDeptList();
+      },
+
+      // 获取部门列表（树形结构）
+      getDeptList() {
+        if (!this.currentSelectedOrgId) {
+          this.$message.warning('请先选择机构');
+          return;
+        }
+        this.deptLoading = true;
+        const queryParams = {
+          ...this.deptQueryParams
+        };
+        listDeptByOrg(this.currentSelectedOrgId, queryParams).then(response => {
+          // 若依框架返回格式：{ code: 200, msg: "操作成功", data: [...] }
+          this.deptTableData = response.data || response.rows || [];
+          // 处理树形数据，添加展开状态和层级信息
+          this.processDeptTreeData(this.deptTableData, 1);
+          this.deptLoading = false;
+        }).catch(() => {
+          this.deptLoading = false;
+        });
+      },
+
+      // 处理部门树形数据，添加展开状态和层级信息
+      processDeptTreeData(data, level = 1) {
+        if (Array.isArray(data)) {
+          data.forEach(item => {
+            item.expanded = item.expanded !== false; // 默认展开
+            item.deptLevel = level; // 设置部门层级
+            if (item.children && item.children.length > 0) {
+              this.processDeptTreeData(item.children, level + 1);
+            }
+          });
+        }
+      },
+
+      // 判断是否为二级部门
+      isDeptSecondLevel(row) {
+        return row.deptLevel === 2;
+      },
+
+      // 新增部门
+      handleDeptAdd() {
+        if (!this.currentSelectedOrgId) {
+          this.$message.warning('请先选择机构，然后再新增部门');
+          return;
+        }
+        this.deptDialogTitle = '新增部门';
+        this.deptForm = {
+          id: null,
+          orgName: '',
+          parentId: null,
+          parentName: '',
+          orgId: this.currentSelectedOrgId
+        };
+        this.deptDialogVisible = true;
+      },
+
+      // 导入部门
+      handleDeptImport() {
+        if (!this.currentSelectedOrgId) {
+          this.$message.warning('请先选择机构');
+          return;
+        }
+        this.$modal.msgInfo('导入部门功能');
+        // TODO: 打开导入对话框，调用 importDept API
+      },
+
+      // 删除部门（批量）
+      handleDeptDelete() {
+        this.$modal.confirm('是否确认删除选中的部门？').then(() => {
+          // TODO: 获取选中的部门ID列表，调用批量删除API
+          this.$modal.msgSuccess('删除成功');
+          this.getDeptList();
+        }).catch(() => {});
+      },
+
+      // 添加下级部门
+      handleAddSubDept(row) {
+        // 二级部门不能添加下级
+        if (this.isDeptSecondLevel(row)) {
+          this.$message.warning('二级部门不能添加下级部门');
+          return;
+        }
+        if (!this.currentSelectedOrgId) {
+          this.$message.warning('请先选择机构');
+          return;
+        }
+        this.deptDialogTitle = '添加下级部门';
+        this.deptForm = {
+          id: null,
+          orgName: '',
+          parentId: row.id || row.orgId,
+          parentName: row.orgName || row.deptName || row.name,
+          orgId: this.currentSelectedOrgId
+        };
+        this.deptDialogVisible = true;
+      },
+
+      // 编辑部门
+      handleDeptEdit(row) {
+        if (!this.currentSelectedOrgId) {
+          this.$message.warning('请先选择机构');
+          return;
+        }
+        this.deptDialogTitle = '编辑部门';
+        this.deptForm = {
+          id: row.id || row.orgId,
+          orgName: row.orgName || row.deptName || row.name || '',
+          parentId: row.parentId,
+          parentName: '',
+          orgId: this.currentSelectedOrgId
+        };
+        // 如果有父级，查找父级名称
+        if (this.deptForm.parentId) {
+          const parentDept = this.findDeptById(this.deptTableData, this.deptForm.parentId);
+          if (parentDept) {
+            this.deptForm.parentName = parentDept.orgName || parentDept.deptName || parentDept.name;
+          }
+        }
+        this.deptDialogVisible = true;
+      },
+
+      // 查找部门（递归）
+      findDeptById(data, id) {
+        for (let item of data) {
+          if ((item.id || item.orgId) === id) {
+            return item;
+          }
+          if (item.children && item.children.length > 0) {
+            const found = this.findDeptById(item.children, id);
+            if (found) return found;
+          }
+        }
+        return null;
+      },
+
+      // 提交部门表单
+      submitDeptForm() {
+        this.$refs.deptForm.validate(valid => {
+          if (valid) {
+            const formData = {
+              orgName: this.deptForm.orgName,
+              parentId: this.deptForm.parentId || null,
+              orgId: this.deptForm.orgId
+            };
+
+            if (this.deptForm.id) {
+              // 编辑
+              formData.id = this.deptForm.id;
+              updateDept(formData).then(() => {
+                this.$modal.msgSuccess('修改成功');
+                this.deptDialogVisible = false;
+                this.getDeptList();
+              }).catch(() => {});
+            } else {
+              // 新增
+              addDept(formData).then(() => {
+                this.$modal.msgSuccess('新增成功');
+                this.deptDialogVisible = false;
+                this.getDeptList();
+              }).catch(() => {});
+            }
+          }
+        });
+      },
+
+      // 重置部门表单
+      resetDeptForm() {
+        this.$refs.deptForm && this.$refs.deptForm.resetFields();
+        this.deptForm = {
+          id: null,
+          orgName: '',
+          parentId: null,
+          parentName: '',
+          orgId: this.currentSelectedOrgId
+        };
+      },
+
+      // 删除部门（单行）
+      handleDeptDeleteRow(row) {
+        const deptName = row.orgName || row.deptName || row.name;
+        this.$modal.confirm('是否确认删除部门"' + deptName + '"？').then(() => {
+          deleteDept(row.id || row.orgId).then(() => {
+            this.$modal.msgSuccess('删除成功');
+            this.getDeptList();
+          }).catch(() => {});
+        }).catch(() => {});
+      }
     },
-}
-</script>
+    mounted() {
+      // 初始化数据
+      this.getOrgList();
+      // 如果默认是部门标签页，也需要加载机构树
+      if (this.activeTab === 'dept') {
+        this.getOrgTree();
+      }
+    }
+  };
+  </script>
 
-<style lang="scss" scoped>
-/* 新增：统一的操作栏容器样式，用于将所有按钮和工具栏放在右侧 */
-.action-bar {
-  display: flex;
-  align-items: center;
-  justify-content: flex-end; /* 关键：整体内容靠右对齐 */
-  gap: 10px; /* 统一设置内部元素的间距 */
-  width: 100%;
-
-}
-
-.search-box {
-  margin-bottom: 20px;
-  border-radius: 8px;
-  padding: 0;
-
-  ::v-deep .el-card__body {
-    padding: 20px !important;
+  <style scoped lang="scss">
+  .app-container {
+    padding: 20px;
+    background: #f0f2f5;
+    min-height: calc(100vh - 84px);
   }
-}
 
-.table-container {
-  flex: 1;
-  overflow: hidden;
-  margin-bottom: 0;
-  min-height: 0;
-  display: flex;
-  flex-direction: column;
-}
-</style>
+  // ========== 机构管理样式 ==========
+  .org-container {
+    background: #fff;
+    padding: 20px;
+    border-radius: 4px;
+  }
+
+  // ========== 部门管理样式 ==========
+  .dept-container {
+    background: #fff;
+    padding: 20px;
+    border-radius: 4px;
+  }
+
+  .dept-layout {
+    display: flex;
+    gap: 20px;
+    height: calc(100vh - 200px);
+  }
+
+  .org-tree-panel {
+    width: 300px;
+    border: 1px solid #e4e7ed;
+    border-radius: 4px;
+    background: #fff;
+    display: flex;
+    flex-direction: column;
+  }
+
+  .tree-search {
+    padding: 10px;
+    border-bottom: 1px solid #e4e7ed;
+  }
+
+  .tree-content {
+    flex: 1;
+    overflow-y: auto;
+    padding: 10px;
+  }
+
+  .dept-content-panel {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+  }
+
+  .dept-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 15px;
+    padding: 10px 0;
+  }
+
+  .current-org {
+    font-size: 16px;
+    font-weight: bold;
+    color: #303133;
+  }
+
+  // ========== 通用样式 ==========
+  .query-form {
+    margin-bottom: 15px;
+    padding: 15px;
+    background: #fafafa;
+    border-radius: 4px;
+  }
+
+  .action-buttons {
+    margin-bottom: 15px;
+
+    .el-button {
+      margin-right: 10px;
+    }
+  }
+
+  // 表格样式调整
+  ::v-deep .el-table {
+    .el-table__row {
+      &:hover {
+        background-color: #f5f7fa;
+      }
+    }
+  }
+
+  // 树节点选中样式
+  ::v-deep .el-tree-node.is-current > .el-tree-node__content {
+    background-color: #ecf5ff;
+    color: #409eff;
+  }
+
+  // 标签页样式
+  ::v-deep .el-tabs {
+    .el-tabs__header {
+      margin-bottom: 20px;
+      background: #fff;
+      padding: 0 20px;
+      border-radius: 4px 4px 0 0;
+    }
+
+    .el-tabs__item {
+      height: 50px;
+      line-height: 50px;
+      font-size: 14px;
+
+      &.is-active {
+        color: #409eff;
+        font-weight: bold;
+      }
+    }
+
+    .el-tabs__active-bar {
+      background-color: #409eff;
+    }
+  }
+
+  // 输入框图标样式
+  ::v-deep .el-input__suffix {
+    .el-icon-edit {
+      color: #909399;
+      cursor: pointer;
+
+      &:hover {
+        color: #409eff;
+      }
+    }
+  }
+  </style>
diff --git a/src/views/system/role/authUser.vue b/src/views/system/role/authUser.vue
index 4c8cd16d..aefb4494 100644
--- a/src/views/system/role/authUser.vue
+++ b/src/views/system/role/authUser.vue
@@ -89,7 +89,7 @@
     </el-table>
 
     <pagination
-      
+
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -196,4 +196,4 @@ export default {
     }
   }
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index fcc44d41..efe4efec 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -1,1042 +1,1074 @@
 <template>
-  <div class="app-container">
+    <div class="app-container">
 
 
-    <el-row :gutter="20">
-      <!--部门数据-->
-      <el-col :span="5" :xs="24">
-        <div class="head-container">
-          <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search"
-                    style="margin-bottom: 20px"
-          />
-        </div>
-        <div class="head-container">
-          <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
-                   :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current
-                   @node-click="handleNodeClick"
-          />
-        </div>
-      </el-col>
-
-
-      <!--用户数据-->
-      <!--    查询条件卡片-->
-
-      <el-col :span="19" :xs="24">
-        <div class="card-container">
-          <div class="card-header query-header">
-            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-                     class="query-form"
-            >
-
-              <el-form-item label="用户名称" prop="userName">
-                <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 230px"
-                          @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-              <el-form-item label="手机号码" prop="phonenumber">
-                <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 230px"
-                          @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-              <el-form-item label="状态" prop="status">
-                <el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 230px">
-                  <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
-                             :value="dict.value"
-                  />
-                </el-select>
-              </el-form-item>
-              <el-form-item label="创建时间">
-                <el-date-picker v-model="dateRange" style="width: 230px" value-format="yyyy-MM-dd" type="daterange"
-                                range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
-                ></el-date-picker>
-              </el-form-item>
-
-
-              <el-form-item class="button-group">
-                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
-                <el-button  icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-              </el-form-item>
-
-
-            </el-form>
+      <el-row :gutter="20">
+        <!--部门数据-->
+        <el-col :span="5" :xs="24">
+          <div class="head-container">
+            <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search"
+                      style="margin-bottom: 20px"
+            />
           </div>
-        </div>
+          <div class="head-container">
+            <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
+                     :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current
+                     @node-click="handleNodeClick"
+            />
+          </div>
+        </el-col>
 
 
-        <!-- 操作按钮和表格卡片 -->
-        <div class="card-container">
-          <div class="card-header operation-header">
-            <el-row :gutter="10" class="mb8 operation-row">
-              <div class="action-bar">
-                <el-col :span="1.5">
-                  <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                             v-hasPermi="['system:user:add']"
-                  >新增
-                  </el-button>
-                </el-col>
-                <el-col :span="1.5">
-                  <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single"
-                             @click="confirmPassword"
+        <!--用户数据-->
+        <!--    查询条件卡片-->
+
+        <el-col :span="19" :xs="24">
+          <div class="card-container">
+            <div class="card-header query-header">
+              <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+                       class="query-form"
+              >
+
+                <el-form-item label="用户名称" prop="userName">
+                  <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 230px"
+                            @keyup.enter.native="handleQuery"
+                  />
+                </el-form-item>
+                <el-form-item label="手机号码" prop="phonenumber">
+                  <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 230px"
+                            @keyup.enter.native="handleQuery"
+                  />
+                </el-form-item>
+                <el-form-item label="状态" prop="status">
+                  <el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 230px">
+                    <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
+                               :value="dict.value"
+                    />
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="创建时间">
+                  <el-date-picker v-model="dateRange" style="width: 230px" value-format="yyyy-MM-dd" type="daterange"
+                                  range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+                  ></el-date-picker>
+                </el-form-item>
+
+
+                <el-form-item class="button-group">
+                  <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
+                  <el-button  icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+                </el-form-item>
+
+
+              </el-form>
+            </div>
+          </div>
+
+
+          <!-- 操作按钮和表格卡片 -->
+          <div class="card-container">
+            <div class="card-header operation-header">
+              <el-row :gutter="10" class="mb8 operation-row">
+                <div class="action-bar">
+                  <el-col :span="1.5">
+                    <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                               v-hasPermi="['system:user:add']"
+                    >新增
+                    </el-button>
+                  </el-col>
+                  <el-col :span="1.5">
+                    <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single"
+                               @click="confirmPassword"
+                               v-hasPermi="['system:user:edit']"
+                    >修改
+                    </el-button>
+                  </el-col>
+                  <el-col :span="1.5">
+                    <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+                               @click="handleDelete"
+                               v-hasPermi="['system:user:remove']"
+                    >删除
+                    </el-button>
+                  </el-col>
+                  <el-col :span="1.5">
+                    <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport"
+                               v-hasPermi="['system:user:import']"
+                    >导入
+                    </el-button>
+                  </el-col>
+                  <el-col :span="1.5">
+                    <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+                               v-hasPermi="['system:user:export']"
+                    >导出
+                    </el-button>
+                  </el-col>
+                  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+                </div>
+              </el-row>
+            </div>
+
+            <el-table v-loading="loading" :data="userList" class="my-table" @selection-change="handleSelectionChange"
+                      :selectable="checkSelectable" :row-class-name="getRowClassName">
+              <el-table-column type="selection" width="50" align="center"/>
+              <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible"/>
+              <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible"
+                               :show-overflow-tooltip="true"
+              />
+              <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible"
+                               :show-overflow-tooltip="true"
+              />
+              <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible"
+                               :show-overflow-tooltip="true"
+              />
+              <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber"
+                               v-if="columns[4].visible"
+                               width="120"
+              >
+                <template slot-scope="scope">
+                  <span>{{ hidePhone(scope.row.phonenumber) }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
+                <template slot-scope="scope">
+                  <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
+                             @change="handleStatusChange(scope.row)"
+                  ></el-switch>
+                </template>
+              </el-table-column>
+
+              <el-table-column label="账号时效" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.isPermanent == 1 ? "长期账号" : "临时账号" }}</span>
+                </template>
+              </el-table-column>
+
+              <el-table-column v-if="config.registersConfig.approvalStatus" label="审批状态" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.approvalStatus == 0 ? "未审批" : "已审批" }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
+                <template slot-scope="scope">
+                  <span>{{ parseTime(scope.row.createTime) }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
+                <template slot-scope="scope"
+                          v-if="!hasSystemOrAuditrRole(scope.row.roles) && scope.row.userId !== 1 &&  scope.row.isBuiltIn !== '0'">
+                  <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                              v-hasPermi="['system:user:edit']"
                   >修改
                   </el-button>
-                </el-col>
-                <el-col :span="1.5">
-                  <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
-                             @click="handleDelete"
+                  <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
                              v-hasPermi="['system:user:remove']"
                   >删除
                   </el-button>
-                </el-col>
-                <el-col :span="1.5">
-                  <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport"
-                             v-hasPermi="['system:user:import']"
-                  >导入
-                  </el-button>
-                </el-col>
-                <el-col :span="1.5">
-                  <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-                             v-hasPermi="['system:user:export']"
-                  >导出
-                  </el-button>
-                </el-col>
-                <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
-              </div>
-            </el-row>
+                  <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
+                               v-hasPermi="['system:user:resetPwd', 'system:user:edit']"
+                  >
+                    <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
+                    <el-dropdown-menu slot="dropdown">
+                      <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
+                                        v-hasPermi="['system:user:resetPwd']"
+                      >重置密码
+                      </el-dropdown-item>
+                      <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
+                                        v-hasPermi="['system:user:edit']"
+                      >分配角色
+                      </el-dropdown-item>
+                      <el-dropdown-item v-if="scope.row.approvalStatus==0" command="approvalStatus"
+                                        icon="el-icon-circle-check"
+                                        v-hasPermi="['system:user:approval']"
+                      >账号审批
+                      </el-dropdown-item>
+                    </el-dropdown-menu>
+                  </el-dropdown>
+                </template>
+              </el-table-column>
+            </el-table>
+
+            <pagination  :total="total" :page.sync="queryParams.pageNum"
+                        :limit.sync="queryParams.pageSize" @pagination="getList"
+            />
+
           </div>
 
-          <el-table v-loading="loading" :data="userList" class="my-table" @selection-change="handleSelectionChange"
-                    :selectable="checkSelectable" :row-class-name="getRowClassName">
-            <el-table-column type="selection" width="50" align="center"/>
-            <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible"/>
-            <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible"
-                             :show-overflow-tooltip="true"
-            />
-            <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible"
-                             :show-overflow-tooltip="true"
-            />
-            <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible"
-                             :show-overflow-tooltip="true"
-            />
-            <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber"
-                             v-if="columns[4].visible"
-                             width="120"
-            >
-              <template slot-scope="scope">
-                <span>{{ hidePhone(scope.row.phonenumber) }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
-              <template slot-scope="scope">
-                <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
-                           @change="handleStatusChange(scope.row)"
-                ></el-switch>
-              </template>
-            </el-table-column>
 
-            <el-table-column label="账号时效" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.isPermanent == 1 ? "长期账号" : "临时账号" }}</span>
-              </template>
-            </el-table-column>
+        </el-col>
 
-            <el-table-column v-if="config.registersConfig.approvalStatus" label="审批状态" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.approvalStatus == 0 ? "未审批" : "已审批" }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
-              <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.createTime) }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
-              <template slot-scope="scope"
-                        v-if="!hasSystemOrAuditrRole(scope.row.roles) && scope.row.userId !== 1 &&  scope.row.isBuiltIn !== '0'">
-                <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                           v-hasPermi="['system:user:edit']"
-                >修改
-                </el-button>
-                <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                           v-hasPermi="['system:user:remove']"
-                >删除
-                </el-button>
-                <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
-                             v-hasPermi="['system:user:resetPwd', 'system:user:edit']"
-                >
-                  <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
-                  <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
-                                      v-hasPermi="['system:user:resetPwd']"
-                    >重置密码
-                    </el-dropdown-item>
-                    <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
-                                      v-hasPermi="['system:user:edit']"
-                    >分配角色
-                    </el-dropdown-item>
-                    <el-dropdown-item v-if="scope.row.approvalStatus==0" command="approvalStatus"
-                                      icon="el-icon-circle-check"
-                                      v-hasPermi="['system:user:approval']"
-                    >账号审批
-                    </el-dropdown-item>
-                  </el-dropdown-menu>
-                </el-dropdown>
-              </template>
-            </el-table-column>
-          </el-table>
 
-          <pagination  :total="total" :page.sync="queryParams.pageNum"
-                      :limit.sync="queryParams.pageSize" @pagination="getList"
-          />
+      </el-row>
 
+
+      <!-- 添加或修改用户配置对话框 -->
+      <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="用户昵称" prop="nickName">
+                <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="手机号码" prop="phonenumber">
+                <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="组织机构" prop="deptId">
+                <treeselect v-model="form.deptId" :searchable="false" :disable-branch-nodes="false"  :options="deptOptions"
+                            :show-count="true" placeholder="请选择归属组织机构" @input="handleDeptChange"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="归属部门">
+                <treeselect
+                  v-model="form.orgId"
+                  :options="orgDeptTree"
+                  placeholder="组织机构下辖部门"
+                  :normalizer="orgDeptNormalizer"
+                />
+              </el-form-item>
+
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
+                <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
+                <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20"
+                          show-password
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="用户性别">
+                <el-select v-model="form.sex" placeholder="请选择性别">
+                  <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
+                             :value="dict.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="状态">
+                <el-radio-group v-model="form.status">
+                  <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{
+                      dict.label
+                    }}
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="岗位">
+                <el-select v-model="form.postIds" multiple placeholder="请选择岗位">
+                  <el-option v-for="item in postOptions" :key="item.postId" :label="item.postName" :value="item.postId"
+                             :disabled="item.status == 1"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="角色" prop="roleIds">
+                <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
+                  <el-option
+                    v-for="item in roleOptions"
+                    :key="item.roleId"
+                    :label="item.roleName"
+                    :value="item.roleId"
+                    :disabled="item.status == 1 || item.roleId === 1"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="登录权限" prop="loginTypeArr">
+                <el-checkbox-group v-model="loginTypeArr">
+                  <el-checkbox v-for="dict in dict.type.sys_login_type" :key="dict.value" :label="dict.value">
+                    {{ dict.label }}
+                  </el-checkbox>
+                </el-checkbox-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="账号时效" prop="isPermanent">
+                <el-radio-group v-model="form.isPermanent">
+                  <el-radio v-for="dict in dict.type.sys_user_permanent" :key="dict.value" :label="dict.value">
+                    {{ dict.label }}
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="备注">
+                <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
         </div>
+      </el-dialog>
 
-
-      </el-col>
-
-
-    </el-row>
-
-
-    <!-- 添加或修改用户配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="用户昵称" prop="nickName">
-              <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :searchable="false" :disable-branch-nodes="true" :options="deptOptions"
-                          :show-count="true" placeholder="请选择归属部门"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="手机号码" prop="phonenumber">
-              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="邮箱" prop="email">
-              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
-              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
-              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20"
-                        show-password
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="用户性别">
-              <el-select v-model="form.sex" placeholder="请选择性别">
-                <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
-                           :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="状态">
-              <el-radio-group v-model="form.status">
-                <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{
-                    dict.label
-                  }}
-                </el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="岗位">
-              <el-select v-model="form.postIds" multiple placeholder="请选择岗位">
-                <el-option v-for="item in postOptions" :key="item.postId" :label="item.postName" :value="item.postId"
-                           :disabled="item.status == 1"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="角色" prop="roleIds">
-              <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
-                <el-option
-                  v-for="item in roleOptions"
-                  :key="item.roleId"
-                  :label="item.roleName"
-                  :value="item.roleId"
-                  :disabled="item.status == 1 || item.roleId === 1"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="登录权限" prop="loginTypeArr">
-              <el-checkbox-group v-model="loginTypeArr">
-                <el-checkbox v-for="dict in dict.type.sys_login_type" :key="dict.value" :label="dict.value">
-                  {{ dict.label }}
-                </el-checkbox>
-              </el-checkbox-group>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="账号时效" prop="isPermanent">
-              <el-radio-group v-model="form.isPermanent">
-                <el-radio v-for="dict in dict.type.sys_user_permanent" :key="dict.value" :label="dict.value">
-                  {{ dict.label }}
-                </el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="备注">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 用户导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-      <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
-                 :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
-                 :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag
-      >
-        <i class="el-icon-upload"></i>
-        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-        <div class="el-upload__tip text-center" slot="tip">
-          <div class="el-upload__tip" slot="tip">
-            <el-checkbox v-model="upload.updateSupport"/>
-            是否更新已经存在的用户数据
+      <!-- 用户导入对话框 -->
+      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+        <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
+                   :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+                   :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag
+        >
+          <i class="el-icon-upload"></i>
+          <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+          <div class="el-upload__tip text-center" slot="tip">
+            <div class="el-upload__tip" slot="tip">
+              <el-checkbox v-model="upload.updateSupport"/>
+              是否更新已经存在的用户数据
+            </div>
+            <span>仅允许导入xls、xlsx格式文件。</span>
+            <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
+                     @click="importTemplate"
+            >下载模板
+            </el-link>
           </div>
-          <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
-                   @click="importTemplate"
-          >下载模板
-          </el-link>
+        </el-upload>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitFileForm">确 定</el-button>
+          <el-button @click="upload.open = false">取 消</el-button>
         </div>
-      </el-upload>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitFileForm">确 定</el-button>
-        <el-button @click="upload.open = false">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
+      </el-dialog>
+    </div>
+  </template>
 
-<script>
-import {
-  listUser,
-  getUser,
-  delUser,
-  addUser,
-  updateUser,
-  resetUserPwd,
-  changeUserStatus,
-  deptTreeSelect, approvalStatus, confirmPassword
-} from '@/api/system/user'
-import {getToken} from '@/utils/auth'
-import Treeselect from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import {validateNewPassword} from '@/utils/validate'
+  <script>
+  import {
+    listUser,
+    getUser,
+    delUser,
+    addUser,
+    updateUser,
+    resetUserPwd,
+    changeUserStatus,
+    deptTreeSelect, approvalStatus, confirmPassword, listDeptByOrgId
+  } from '@/api/system/user'
+  import { listOrgTreeSimple } from '@/api/system/newdept'
+  import {getToken} from '@/utils/auth'
+  import Treeselect from '@riophae/vue-treeselect'
+  import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+  import {validateNewPassword} from '@/utils/validate'
 
-export default {
-  name: 'User',
-  dicts: ['sys_normal_disable', 'sys_user_sex', 'sys_login_type', 'sys_user_permanent'],
-  components: {Treeselect},
-  data() {
-    return {
-      // 1. 存储选中的部门ID（关键）
-      selectedDeptId: undefined,
-      // 2. 存储选中的部门名称（可选，用于回显更友好）
-      selectedDeptName: '',
-      // ... 其他原有变量
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 用户表格数据
-      userList: null,
-      // 弹出层标题
-      title: '',
-      // 部门树选项
-      deptOptions: undefined,
-      // 是否显示弹出层
-      open: false,
-      // 部门名称
-      deptName: undefined,
-      // 默认密码
-      initPassword: undefined,
-      // 日期范围
-      dateRange: [],
-      // 岗位选项
-      postOptions: [],
-      // 角色选项
-      roleOptions: [],
-      // 登录权限数组
-      loginTypeArr: [],
-      // 角色下拉多选限制数量
-      multipleLimit: 1,
-      // 表单参数
-      form: {},
-      defaultProps: {
-        children: 'children',
-        label: 'label'
-      },
-      // 用户导入参数
-      upload: {
-        // 是否显示弹出层（用户导入）
-        open: false,
-        // 弹出层标题（用户导入）
+  export default {
+    name: 'User',
+    dicts: ['sys_normal_disable', 'sys_user_sex', 'sys_login_type', 'sys_user_permanent'],
+    components: {Treeselect},
+    data() {
+      return {
+         orgDeptTree: [],
+        // 1. 存储选中的部门ID（关键）
+        selectedDeptId: undefined,
+        // 2. 存储选中的部门名称（可选，用于回显更友好）
+        selectedDeptName: '',
+        // ... 其他原有变量
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 用户表格数据
+        userList: null,
+        // 弹出层标题
         title: '',
-        // 是否禁用上传
-        isUploading: false,
-        // 是否更新已经存在的用户数据
-        updateSupport: 0,
-        // 设置上传的请求头部
-        headers: {Authorization: 'Bearer ' + getToken()},
-        // 上传的地址
-        url: process.env.VUE_APP_BASE_API + '/system/user/importData'
-      },
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        userName: undefined,
-        phonenumber: undefined,
-        status: undefined,
-        deptId: undefined
-      },
-      // 列信息
-      columns: [
-        {key: 0, label: `用户编号`, visible: true},
-        {key: 1, label: `用户名称`, visible: true},
-        {key: 2, label: `用户昵称`, visible: true},
-        {key: 3, label: `部门`, visible: true},
-        {key: 4, label: `手机号码`, visible: true},
-        {key: 5, label: `状态`, visible: true},
-        {key: 6, label: `创建时间`, visible: true}
-      ],
-      // 表单校验
-      rules: {
-        userName: [
-          {required: true, message: '用户名称不能为空', trigger: 'blur'},
-          {min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur'}
+        // 部门树选项
+        deptOptions: undefined,
+        // 是否显示弹出层
+        open: false,
+        // 部门名称
+        deptName: undefined,
+        // 默认密码
+        initPassword: undefined,
+        // 日期范围
+        dateRange: [],
+        // 岗位选项
+        postOptions: [],
+        // 角色选项
+        roleOptions: [],
+        // 组织选项
+        orgOptions: [],
+        // 登录权限数组
+        loginTypeArr: [],
+        // 角色下拉多选限制数量
+        multipleLimit: 1,
+        // 表单参数
+        form: {
+          orgId: undefined
+        },
+        defaultProps: {
+          children: 'children',
+          label: 'label'
+        },
+        // 用户导入参数
+        upload: {
+          // 是否显示弹出层（用户导入）
+          open: false,
+          // 弹出层标题（用户导入）
+          title: '',
+          // 是否禁用上传
+          isUploading: false,
+          // 是否更新已经存在的用户数据
+          updateSupport: 0,
+          // 设置上传的请求头部
+          headers: {Authorization: 'Bearer ' + getToken()},
+          // 上传的地址
+          url: process.env.VUE_APP_BASE_API + '/system/user/importData'
+        },
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          userName: undefined,
+          phonenumber: undefined,
+          status: undefined,
+          deptId: undefined
+        },
+        // 列信息
+        columns: [
+          {key: 0, label: `用户编号`, visible: true},
+          {key: 1, label: `用户名称`, visible: true},
+          {key: 2, label: `用户昵称`, visible: true},
+          {key: 3, label: `部门`, visible: true},
+          {key: 4, label: `手机号码`, visible: true},
+          {key: 5, label: `状态`, visible: true},
+          {key: 6, label: `创建时间`, visible: true}
         ],
-        nickName: [
-          {required: true, message: '用户昵称不能为空', trigger: 'blur'}
-        ],
-        email: [
-          {
-            type: 'email',
-            message: '请输入正确的邮箱地址',
-            trigger: ['blur', 'change']
-          }
-        ],
-        deptId: [{required: true, message: '请选择归属部门', trigger: 'blur'}],
-        phonenumber: [
-          {required: true, message: '手机号不能为空', trigger: 'blur'},
-          {
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: '请输入正确的手机号码',
-            trigger: 'blur'
-          }
-        ],
-        loginTypeArr: [
-          {required: true, validator: this.validateLoginType, trigger: 'change'}
-        ],
-        password: [
-          {required: true, message: '密码不能为空', trigger: 'blur'},
-          {validator: validateNewPassword, trigger: 'blur'}
-        ],
-        roleIds: [
-          {required: true, message: '请选择角色', trigger: 'change'}
-        ]
-      }
-    }
-  },
-  computed: {
-    config() {
-      return JSON.parse(localStorage.getItem('systemConfig')) || {
-        registersConfig: {
-          phoneRegisters: true,
-          emailRegisters: true,
-          verificationCode: true,
-          approvalStatus: true,
+        // 表单校验
+        rules: {
+          userName: [
+            {required: true, message: '用户名称不能为空', trigger: 'blur'},
+            {min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur'}
+          ],
+          nickName: [
+            {required: true, message: '用户昵称不能为空', trigger: 'blur'}
+          ],
+          deptId: [{required: true, message: '请选择归属部门', trigger: 'blur'}],
+          phonenumber: [
+            {required: true, message: '手机号不能为空', trigger: 'blur'},
+            {
+              pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+              message: '请输入正确的手机号码',
+              trigger: 'blur'
+            }
+          ],
+          loginTypeArr: [
+            {required: true, validator: this.validateLoginType, trigger: 'change'}
+          ],
+          password: [
+            {required: true, message: '密码不能为空', trigger: 'blur'},
+            {validator: validateNewPassword, trigger: 'blur'}
+          ],
+          roleIds: [
+            {required: true, message: '请选择角色', trigger: 'change'}
+          ]
         }
-      }; // 获取 JSON 对象
-    }
-  },
-  watch: {
-    // 根据名称筛选部门树
-    deptName(val) {
-      this.$refs.tree.filter(val)
-    }
-  },
-  created() {
-    this.getList()
-    this.getDeptTree()
-    this.getConfigKey('sys.user.initPassword').then(response => {
-      this.initPassword = response.msg
-    })
-  },
-  methods: {
-    /* 手机号码脱敏 */
-    hidePhone(phone) {
-      if (!phone) return '';
-      return phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2');
-    },
-    /* 表单登录权限自定义校验 */
-    validateLoginType(rule, value, callback) {
-      if (this.loginTypeArr.length > 0) {
-        callback()
-      } else {
-        callback(new Error('请至少选择一个登录权限'))
       }
     },
-    /** 查询用户列表 */
-    getList() {
-      this.loading = true
-      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.userList = response.rows
-          this.total = response.total
-          this.loading = false
-        }
-      )
-    },
-    /** 查询部门下拉树结构 */
-    getDeptTree() {
-      deptTreeSelect().then(response => {
-        this.deptOptions = this.filterTree(response.data)
-      })
-    },
-    filterTree(nodes) {
-      return nodes
-        .map(node => {
-          if (node.children) {
-            node.children = this.filterTree(node.children)
+    computed: {
+      config() {
+        return JSON.parse(localStorage.getItem('systemConfig')) || {
+          registersConfig: {
+            phoneRegisters: true,
+            emailRegisters: true,
+            verificationCode: true,
+            approvalStatus: true,
           }
-          return node
-        })
-        .filter(node => node.status !== '1')
-    },
-    // 筛选节点
-    filterNode(value, data) {
-      if (!value) return true
-      return data.label.indexOf(value) !== -1
-    },
-    // 节点单击事件
-    handleNodeClick(data) {
-      this.queryParams.deptId = data.id
-      this.selectedDeptId = data.id; // 保存ID
-      this.selectedDeptName = data.label; // 保存名称（可选）
-      this.handleQuery()
-    },
-    //用户审批状态修改
-    handleApprovalStatus(row) {
-      this.$modal.confirm('确认要审批' + row.userName + '"用户吗？').then(function () {
-        return approvalStatus({userId: row.userId})
-      }).then(() => {
-        this.$modal.msgSuccess('审批成功')
-        this.getList()
-      }).catch(function () {
-      })
-    },
-    // 用户状态修改
-    handleStatusChange(row) {
-      let text = row.status === '0' ? '启用' : '停用'
-      this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function () {
-        return changeUserStatus(row.userId, row.status)
-      }).then(() => {
-        this.$modal.msgSuccess(text + '成功')
-      }).catch(function () {
-        row.status = row.status === '0' ? '1' : '0'
-      })
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false
-      this.reset()
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        userId: undefined,
-        deptId: undefined,
-        userName: undefined,
-        nickName: undefined,
-        password: undefined,
-        phonenumber: undefined,
-        email: undefined,
-        sex: undefined,
-        status: '0',
-        remark: undefined,
-        postIds: [],
-        roleIds: [],
-        roleId: null,
-        loginType: null
+        }; // 获取 JSON 对象
       }
-      this.resetForm('form')
     },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1
+    watch: {
+      // 根据名称筛选部门树
+      deptName(val) {
+        this.$refs.tree.filter(val)
+      }
+    },
+    created() {
       this.getList()
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = []
-      this.resetForm('queryForm')
-      this.queryParams.deptId = undefined
-      this.selectedDeptId = undefined; // 清空ID
-      this.selectedDeptName = ''; // 清空名称
-
-      this.$refs.tree.setCurrentKey(null)
-      this.handleQuery()
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      // 过滤掉不可选的行（虽然界面上不可选，但为了安全起见还是过滤一次）
-      const validSelection = selection.filter(row => this.checkSelectable(row));
-
-      // 更新选中的roleId数组
-      this.ids = validSelection.map(item => item.userId);
-      // 更新单选和多选状态
-      this.single = validSelection.length !== 1;
-      this.multiple = !validSelection.length;
-    },
-    // 更多操作触发
-    handleCommand(command, row) {
-      switch (command) {
-        case 'handleResetPwd':
-          this.handleResetPwd(row)
-          break
-        case 'handleAuthRole':
-          this.handleAuthRole(row)
-          break
-        case 'approvalStatus':
-          this.handleApprovalStatus(row)
-          break
-        default:
-          break
-      }
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset()
-      this.loginTypeArr.splice(0)
-      getUser().then(response => {
-        this.postOptions = response.posts
-        this.roleOptions = response.roles
-        this.open = true
-        this.title = '添加用户'
-        this.form.password = this.initPassword
-        // 核心：给form.deptId赋值选中的部门ID（treeselect会自动匹配显示）
-        if (this.selectedDeptId) {
-          this.form.deptId = this.selectedDeptId;
-          // 强制触发响应式更新（解决偶发的treeselect不回显问题）
-          this.$nextTick(() => {
-            this.$forceUpdate();
-          });
-        }
+      this.getDeptTree()
+      this.getConfigKey('sys.user.initPassword').then(response => {
+        this.initPassword = response.msg
       })
     },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset()
-      this.loginTypeArr.splice(0)
-      const userId = row.userId || this.ids
-      getUser(userId).then(response => {
-        this.form = response.data
-        const loginType = response.data.loginType
-        if (loginType) {
-          this.loginTypeArr = loginType.split(',')
+    methods: {
+      orgDeptNormalizer(node) {
+        return {
+          id: node.id,
+          label: node.orgName,      // 关键在这里
+          children: node.children
         }
-        this.postOptions = response.posts
-        this.roleOptions = response.roles
-        this.$set(this.form, 'postIds', response.postIds)
-        this.$set(this.form, 'roleIds', response.roleIds)
-        this.open = true
-        this.title = '修改用户'
-        this.form.password = ''
-      })
-    },
-    confirmPassword(row) {
-      this.handleUpdate(row)
-      // this.$prompt('请输入密码,鉴别用户', '提示', {
-      //   confirmButtonText: '确定',
-      //   cancelButtonText: '取消',
-      //   closeOnClickModal: false,
-      //   inputPattern: /^.{8,16}$/,
-      //   inputErrorMessage: '用户密码长度必须介于 8 和 16 之间',
-      //   inputValidator: (value) => {
-      //     // 调用 validateNewPassword 校验
-      //     const errorMessage = function (error) {
-      //       if (error) {
-      //         return error.message;
-      //       } else {
-      //         console.log('验证通过');
-      //       }
-      //     };
-      //     validateNewPassword(null, value, errorMessage);
-      //   }
-      // }).then(({value}) => {
-      //   confirmPassword(value).then(response => {
-      //     this.$modal.msgSuccess('验证成功')
-      //     this.handleUpdate(row)
-      //   })
-      // }).catch(() => {
-      // })
-    },
-    confirmResetPwd(row) {
-      this.$prompt('请输入密码,鉴别用户', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        closeOnClickModal: false,
-        inputPattern: /^.{8,16}$/,
-        inputErrorMessage: '用户密码长度必须介于 8 和 16 之间',
-        inputValidator: (value) => {
-          // 调用 validateNewPassword 校验
-          const errorMessage = function (error) {
-            if (error) {
-              return error.message;
-            } else {
-              console.log('验证通过');
-            }
-          };
-          validateNewPassword(null, value, errorMessage);
+      },
+      /* 手机号码脱敏 */
+      hidePhone(phone) {
+        if (!phone) return '';
+        return phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2');
+      },
+      /* 表单登录权限自定义校验 */
+      validateLoginType(rule, value, callback) {
+        if (this.loginTypeArr.length > 0) {
+          callback()
+        } else {
+          callback(new Error('请至少选择一个登录权限'))
         }
-      }).then(({value}) => {
-        confirmPassword(value).then(response => {
-          this.$modal.msgSuccess('验证成功')
-          this.handleResetPwd(row)
+      },
+      /** 查询用户列表 */
+      getList() {
+        this.loading = true
+        listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+            this.userList = response.rows
+            this.total = response.total
+            this.loading = false
+          }
+        )
+      },
+      /** 查询部门下拉树结构 */
+      getDeptTree() {
+        deptTreeSelect().then(response => {
+          this.deptOptions = this.filterTree(response.data)
         })
-      }).catch(() => {
-      })
-    },
-    /** 重置密码按钮操作 */
-    handleResetPwd(row) {
-      this.$prompt('请输入"' + row.userName + '"的新密码', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        closeOnClickModal: false,
-        inputValidator: (value) => {
-          // 1️⃣ 空值校验
-          if (!value || value.trim() === '') {
-            return '密码不能为空'
-          }
-
-          // 2️⃣ 不能包含空格（任意位置）
-          if (/\s/.test(value)) {
-            return '密码不能包含空格'
-          }
-
-          // 3️⃣ 长度校验
-          if (value.length < 8 || value.length > 16) {
-            return '用户密码长度必须介于 8 和 16 之间'
-          }
-
-          // 4️⃣ 调用原有校验
-          let errorMsg = ''
-          validateNewPassword(null, value, (error) => {
-            if (error) {
-              errorMsg = error.message
+      },
+      filterTree(nodes) {
+        return nodes
+          .map(node => {
+            if (node.children) {
+              node.children = this.filterTree(node.children)
             }
+            return node
           })
-
-          if (errorMsg) {
-            return errorMsg
-          }
-
-          return true
-        }
-      })
-      .then(({ value }) => {
-        resetUserPwd(row.userId, value).then(() => {
-          this.$modal.msgSuccess('修改成功，新密码是：' + value)
+          .filter(node => node.status !== '1')
+      },
+      // 筛选节点
+      filterNode(value, data) {
+        if (!value) return true
+        return data.label.indexOf(value) !== -1
+      },
+      // 节点单击事件
+      handleNodeClick(data) {
+        this.queryParams.deptId = data.id
+        this.selectedDeptId = data.id; // 保存ID
+        this.selectedDeptName = data.label; // 保存名称（可选）
+        this.handleQuery()
+      },
+      // 归属部门变化时，获取归属组织选项
+     handleDeptChange(deptId) {
+       if (!deptId) return;
+       listDeptByOrgId(deptId).then(res => {
+         this.orgDeptTree = res.rows || [];
+         console.log(JSON.stringify( res.rows))
+         console.log("所属组织部门树：", this.orgDeptTree);
+       });
+     },
+      //用户审批状态修改
+      handleApprovalStatus(row) {
+        this.$modal.confirm('确认要审批' + row.userName + '"用户吗？').then(function () {
+          return approvalStatus({userId: row.userId})
+        }).then(() => {
+          this.$modal.msgSuccess('审批成功')
+          this.getList()
+        }).catch(function () {
         })
-      })
-      .catch(() => {})
-    },
-    /** 分配角色操作 */
-    handleAuthRole: function (row) {
-      const userId = row.userId
-      this.$router.push('/system/user-auth/role/' + userId)
-    },
-    /** 提交按钮 */
-    submitForm: function () {
-      this.$refs['form'].validate(valid => {
-        this.form.loginType = this.loginTypeArr.toString()
-        if (valid) {
-          if (this.form.userId != undefined) {
-            updateUser(this.form).then(response => {
-              this.$modal.msgSuccess('修改成功')
-              this.open = false
-              this.getList()
-            })
-          } else {
-            addUser(this.form).then(response => {
-              this.$modal.msgSuccess('新增成功')
-              this.open = false
-              this.getList()
+      },
+      // 用户状态修改
+      handleStatusChange(row) {
+        let text = row.status === '0' ? '启用' : '停用'
+        this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function () {
+          return changeUserStatus(row.userId, row.status)
+        }).then(() => {
+          this.$modal.msgSuccess(text + '成功')
+        }).catch(function () {
+          row.status = row.status === '0' ? '1' : '0'
+        })
+      },
+      // 取消按钮
+      cancel() {
+        this.open = false
+        this.reset()
+      },
+      // 表单重置
+      reset() {
+        this.form = {
+          userId: undefined,
+          deptId: undefined,
+          orgId: undefined,
+          userName: undefined,
+          nickName: undefined,
+          password: undefined,
+          phonenumber: undefined,
+          email: undefined,
+          sex: undefined,
+          status: '0',
+          remark: undefined,
+          postIds: [],
+          roleIds: [],
+          roleId: null,
+          loginType: null
+        }
+        this.orgOptions = []
+        this.resetForm('form')
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1
+        this.getList()
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.dateRange = []
+        this.resetForm('queryForm')
+        this.queryParams.deptId = undefined
+        this.selectedDeptId = undefined; // 清空ID
+        this.selectedDeptName = ''; // 清空名称
+
+        this.$refs.tree.setCurrentKey(null)
+        this.handleQuery()
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        // 过滤掉不可选的行（虽然界面上不可选，但为了安全起见还是过滤一次）
+        const validSelection = selection.filter(row => this.checkSelectable(row));
+
+        // 更新选中的roleId数组
+        this.ids = validSelection.map(item => item.userId);
+        // 更新单选和多选状态
+        this.single = validSelection.length !== 1;
+        this.multiple = !validSelection.length;
+      },
+      // 更多操作触发
+      handleCommand(command, row) {
+        switch (command) {
+          case 'handleResetPwd':
+            this.handleResetPwd(row)
+            break
+          case 'handleAuthRole':
+            this.handleAuthRole(row)
+            break
+          case 'approvalStatus':
+            this.handleApprovalStatus(row)
+            break
+          default:
+            break
+        }
+      },
+      /** 新增按钮操作 */
+      handleAdd() {
+        this.reset()
+        this.loginTypeArr.splice(0)
+        getUser().then(response => {
+          this.postOptions = response.posts
+          this.roleOptions = response.roles
+          this.open = true
+          this.title = '添加用户'
+          this.form.password = this.initPassword
+          // 核心：给form.deptId赋值选中的部门ID（treeselect会自动匹配显示）
+          if (this.selectedDeptId) {
+            this.form.deptId = this.selectedDeptId;
+            // 强制触发响应式更新（解决偶发的treeselect不回显问题）
+            this.$nextTick(() => {
+              this.$forceUpdate();
+              // 触发获取归属组织
+              this.handleDeptChange(this.selectedDeptId);
+            });
+          }
+        })
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+        this.reset()
+        this.loginTypeArr.splice(0)
+        const userId = row.userId || this.ids
+        getUser(userId).then(response => {
+          this.form = response.data
+          const loginType = response.data.loginType
+          if (loginType) {
+            this.loginTypeArr = loginType.split(',')
+          }
+          this.postOptions = response.posts
+          this.roleOptions = response.roles
+          this.$set(this.form, 'postIds', response.postIds)
+          this.$set(this.form, 'roleIds', response.roleIds)
+          this.open = true
+          this.title = '修改用户'
+          this.form.password = ''
+
+          // 修改时也要获取归属组织选项
+          if (this.form.deptId) {
+            this.$nextTick(() => {
+              this.handleDeptChange(this.form.deptId)
             })
           }
-        }
-      })
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const userIds = row.userId || this.ids
-      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function () {
-        return delUser(userIds)
-      }).then(() => {
+        })
+      },
+      confirmPassword(row) {
+        this.handleUpdate(row)
+        // this.$prompt('请输入密码,鉴别用户', '提示', {
+        //   confirmButtonText: '确定',
+        //   cancelButtonText: '取消',
+        //   closeOnClickModal: false,
+        //   inputPattern: /^.{8,16}$/,
+        //   inputErrorMessage: '用户密码长度必须介于 8 和 16 之间',
+        //   inputValidator: (value) => {
+        //     // 调用 validateNewPassword 校验
+        //     const errorMessage = function (error) {
+        //       if (error) {
+        //         return error.message;
+        //       } else {
+        //         console.log('验证通过');
+        //       }
+        //     };
+        //     validateNewPassword(null, value, errorMessage);
+        //   }
+        // }).then(({value}) => {
+        //   confirmPassword(value).then(response => {
+        //     this.$modal.msgSuccess('验证成功')
+        //     this.handleUpdate(row)
+        //   })
+        // }).catch(() => {
+        // })
+      },
+      confirmResetPwd(row) {
+        this.$prompt('请输入密码,鉴别用户', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          closeOnClickModal: false,
+          inputPattern: /^.{8,16}$/,
+          inputErrorMessage: '用户密码长度必须介于 8 和 16 之间',
+          inputValidator: (value) => {
+            // 调用 validateNewPassword 校验
+            const errorMessage = function (error) {
+              if (error) {
+                return error.message;
+              } else {
+                console.log('验证通过');
+              }
+            };
+            validateNewPassword(null, value, errorMessage);
+          }
+        }).then(({value}) => {
+          confirmPassword(value).then(response => {
+            this.$modal.msgSuccess('验证成功')
+            this.handleResetPwd(row)
+          })
+        }).catch(() => {
+        })
+      },
+      /** 重置密码按钮操作 */
+      handleResetPwd(row) {
+        this.$prompt('请输入"' + row.userName + '"的新密码', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          closeOnClickModal: false,
+          inputValidator: (value) => {
+            // 1️⃣ 空值校验
+            if (!value || value.trim() === '') {
+              return '密码不能为空'
+            }
+
+            // 2️⃣ 不能包含空格（任意位置）
+            if (/\s/.test(value)) {
+              return '密码不能包含空格'
+            }
+
+            // 3️⃣ 长度校验
+            if (value.length < 8 || value.length > 16) {
+              return '用户密码长度必须介于 8 和 16 之间'
+            }
+
+            // 4️⃣ 调用原有校验
+            let errorMsg = ''
+            validateNewPassword(null, value, (error) => {
+              if (error) {
+                errorMsg = error.message
+              }
+            })
+
+            if (errorMsg) {
+              return errorMsg
+            }
+
+            return true
+          }
+        })
+        .then(({ value }) => {
+          resetUserPwd(row.userId, value).then(() => {
+            this.$modal.msgSuccess('修改成功，新密码是：' + value)
+          })
+        })
+        .catch(() => {})
+      },
+      /** 分配角色操作 */
+      handleAuthRole: function (row) {
+        const userId = row.userId
+        this.$router.push('/system/user-auth/role/' + userId)
+      },
+      /** 提交按钮 */
+      submitForm: function () {
+        this.$refs['form'].validate(valid => {
+          this.form.loginType = this.loginTypeArr.toString()
+          if (valid) {
+            if (this.form.userId != undefined) {
+              updateUser(this.form).then(response => {
+                this.$modal.msgSuccess('修改成功')
+                this.open = false
+                this.getList()
+              })
+            } else {
+              addUser(this.form).then(response => {
+                this.$modal.msgSuccess('新增成功')
+                this.open = false
+                this.getList()
+              })
+            }
+          }
+        })
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const userIds = row.userId || this.ids
+        this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function () {
+          return delUser(userIds)
+        }).then(() => {
+          this.getList()
+          this.$modal.msgSuccess('删除成功')
+        }).catch(() => {
+        })
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        this.download('system/user/export', {
+          ...this.queryParams
+        }, `user_${new Date().getTime()}.xlsx`)
+      },
+      /** 导入按钮操作 */
+      handleImport() {
+        this.upload.title = '用户导入'
+        this.upload.open = true
+      },
+      /** 下载模板操作 */
+      importTemplate() {
+        this.download('system/user/importTemplate', {}, `user_template_${new Date().getTime()}.xlsx`).then(response => {
+        })
+      },
+      // 文件上传中处理
+      handleFileUploadProgress(event, file, fileList) {
+        this.upload.isUploading = true
+      },
+      // 文件上传成功处理
+      handleFileSuccess(response, file, fileList) {
+        this.upload.open = false
+        this.upload.isUploading = false
+        this.$refs.upload.clearFiles()
+        this.$alert('<div style=\'overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;\'>' + response.msg + '</div>', '导入结果', {dangerouslyUseHTMLString: true})
         this.getList()
-        this.$modal.msgSuccess('删除成功')
-      }).catch(() => {
-      })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('system/user/export', {
-        ...this.queryParams
-      }, `user_${new Date().getTime()}.xlsx`)
-    },
-    /** 导入按钮操作 */
-    handleImport() {
-      this.upload.title = '用户导入'
-      this.upload.open = true
-    },
-    /** 下载模板操作 */
-    importTemplate() {
-      this.download('system/user/importTemplate', {}, `user_template_${new Date().getTime()}.xlsx`).then(response => {
-      })
-    },
-    // 文件上传中处理
-    handleFileUploadProgress(event, file, fileList) {
-      this.upload.isUploading = true
-    },
-    // 文件上传成功处理
-    handleFileSuccess(response, file, fileList) {
-      this.upload.open = false
-      this.upload.isUploading = false
-      this.$refs.upload.clearFiles()
-      this.$alert('<div style=\'overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;\'>' + response.msg + '</div>', '导入结果', {dangerouslyUseHTMLString: true})
-      this.getList()
-    },
-    // 提交上传文件
-    submitFileForm() {
-      this.$refs.upload.submit()
-    },
+      },
+      // 提交上传文件
+      submitFileForm() {
+        this.$refs.upload.submit()
+      },
 
-    hasSystemOrAuditrRole(roles) {
-      if (!roles || !Array.isArray(roles)) {
-        return false; // 如果 roles 为空或不是数组，返回 false
-      }
-      return roles.some(role => role.roleKey === 'systemAdmin' || role.roleKey === 'audit'); // 检查是否存在 roleKey 为 admin 的角色
-    },
+      hasSystemOrAuditrRole(roles) {
+        if (!roles || !Array.isArray(roles)) {
+          return false; // 如果 roles 为空或不是数组，返回 false
+        }
+        return roles.some(role => role.roleKey === 'systemAdmin' || role.roleKey === 'audit'); // 检查是否存在 roleKey 为 admin 的角色
+      },
 
-    // 检查行是否可选
-    checkSelectable(row) {
-      return !(row.userId === 1 || row.isBuiltIn === '0' || this.hasSystemOrAuditrRole(row.roles));
-    },
+      // 检查行是否可选
+      checkSelectable(row) {
+        return !(row.userId === 1 || row.isBuiltIn === '0' || this.hasSystemOrAuditrRole(row.roles));
+      },
 
 
-    getRowClassName(row) {
-      return !this.checkSelectable(row) ? 'disabled-row' : '';
-    },
+      getRowClassName(row) {
+        return !this.checkSelectable(row) ? 'disabled-row' : '';
+      },
 
+    }
   }
-}
-</script>
+  </script>
 
-<style>
-.disabled-row {
-  background-color: #f5f7fa !important;
-  color: #909399;
-  cursor: not-allowed;
-}
+  <style>
+  .disabled-row {
+    background-color: #f5f7fa !important;
+    color: #909399;
+    cursor: not-allowed;
+  }
 
-.disabled-row .el-checkbox__input {
-  cursor: not-allowed !important;
-}
+  .disabled-row .el-checkbox__input {
+    cursor: not-allowed !important;
+  }
 
-.disabled-row:hover td {
-  background-color: #f5f7fa !important;
-}
-</style>
+  .disabled-row:hover td {
+    background-color: #f5f7fa !important;
+  }
+  </style>
 
 
-<style scoped>
-.button-group {
-  margin-left: auto; /* 自动填充左侧空间，使按钮靠右 */
-}
+  <style scoped>
+  .button-group {
+    margin-left: auto; /* 自动填充左侧空间，使按钮靠右 */
+  }
 
 
-.app-container {
-  padding: 20px;
-  background-color: #f5f7fa;
-}
+  .app-container {
+    padding: 20px;
+    background-color: #f5f7fa;
+  }
 
-.card-container {
-  background-color: #fff;
-  border-radius: 4px;
-  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.05);
-  overflow: hidden;
-  margin-bottom: 20px;
-}
+  .card-container {
+    background-color: #fff;
+    border-radius: 4px;
+    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.05);
+    overflow: hidden;
+    margin-bottom: 20px;
+  }
 
-/* 查询条件卡片头部样式 */
-.query-header {
-  padding: 14px;
-  border-bottom: 1px solid #e4e7ed;
-  display: flex;
-  align-items: center;
-  min-height: 60px !important;
-}
+  /* 查询条件卡片头部样式 */
+  .query-header {
+    padding: 14px;
+    border-bottom: 1px solid #e4e7ed;
+    display: flex;
+    align-items: center;
+    min-height: 60px !important;
+  }
 
-.query-form {
-  display: flex;
-  align-items: center;
-  flex-wrap: wrap;
-  width: 100%;
-  gap: 15px;
-}
-
-.query-form .el-form-item {
-  margin-bottom: 0;
-  display: flex;
-  align-items: center;
-}
-
-.query-buttons {
-  display: flex;
-  gap: 10px;
-}
-
-/* 操作按钮卡片头部样式 */
-.operation-header {
-  padding: 14px;
-  border-bottom: 1px solid #e4e7ed;
-  display: flex;
-  align-items: center;
-  min-height: 50px;
-}
-
-.operation-row {
-  display: flex;
-  align-items: center;
-  width: 100%;
-  margin-bottom: 0 !important;
-}
-
-/* 新增：统一的操作栏容器样式，用于将所有按钮和工具栏放在右侧 */
-.action-bar {
-  display: flex;
-  align-items: center;
-  justify-content: flex-end !important; /* 关键：整体内容靠右对齐 */
-  gap: 10px; /* 统一设置内部元素的间距 */
-  width: 100%;
-}
-
-/* 表格样式 */
-.card-container .el-table {
-  width: 100%;
-}
-
-/* 禁用行样式 */
-.disabled-row {
-  background-color: #f5f7fa !important;
-  color: #909399;
-  cursor: not-allowed;
-}
-
-.disabled-row .el-checkbox__input {
-  cursor: not-allowed !important;
-}
-
-.disabled-row:hover td {
-  background-color: #f5f7fa !important;
-}
-
-/* 响应式调整 */
-@media (max-width: 1200px) {
   .query-form {
-    flex-direction: column;
-    align-items: flex-start;
-    gap: 10px;
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    width: 100%;
+    gap: 15px;
   }
 
   .query-form .el-form-item {
-    width: 100%;
+    margin-bottom: 0;
+    display: flex;
+    align-items: center;
   }
 
   .query-buttons {
-    width: 100%;
-    justify-content: flex-end;
-
-
-  }
-
-  .operation-row {
-    flex-direction: column;
+    display: flex;
     gap: 10px;
   }
 
-  /* 在小屏幕上，操作栏自动变为垂直排列并左对齐 */
+  /* 操作按钮卡片头部样式 */
+  .operation-header {
+    padding: 14px;
+    border-bottom: 1px solid #e4e7ed;
+    display: flex;
+    align-items: center;
+    min-height: 50px;
+  }
+
+  .operation-row {
+    display: flex;
+    align-items: center;
+    width: 100%;
+    margin-bottom: 0 !important;
+  }
+
+  /* 新增：统一的操作栏容器样式，用于将所有按钮和工具栏放在右侧 */
   .action-bar {
-    flex-direction: column;
-    align-items: flex-start;
+    display: flex;
+    align-items: center;
+    justify-content: flex-end !important; /* 关键：整体内容靠右对齐 */
+    gap: 10px; /* 统一设置内部元素的间距 */
+    width: 100%;
   }
 
-  .left-buttons {
+  /* 表格样式 */
+  .card-container .el-table {
     width: 100%;
-    justify-content: flex-start;
   }
 
-  .right-toolbar-col {
-    width: 100%;
+  /* 禁用行样式 */
+  .disabled-row {
+    background-color: #f5f7fa !important;
+    color: #909399;
+    cursor: not-allowed;
+  }
+
+  .disabled-row .el-checkbox__input {
+    cursor: not-allowed !important;
+  }
+
+  .disabled-row:hover td {
+    background-color: #f5f7fa !important;
+  }
+
+  /* 响应式调整 */
+  @media (max-width: 1200px) {
+    .query-form {
+      flex-direction: column;
+      align-items: flex-start;
+      gap: 10px;
+    }
+
+    .query-form .el-form-item {
+      width: 100%;
+    }
+
+    .query-buttons {
+      width: 100%;
+      justify-content: flex-end;
+
+
+    }
+
+    .operation-row {
+      flex-direction: column;
+      gap: 10px;
+    }
+
+    /* 在小屏幕上，操作栏自动变为垂直排列并左对齐 */
+    .action-bar {
+      flex-direction: column;
+      align-items: flex-start;
+    }
+
+    .left-buttons {
+      width: 100%;
+      justify-content: flex-start;
+    }
+
+    .right-toolbar-col {
+      width: 100%;
+      justify-content: flex-end;
+    }
+  }
+
+  .pagination-container {
+    padding: 15px 20px;
+    margin-top: 5px;;
+    display: flex;
     justify-content: flex-end;
+    align-items: center;
   }
-}
-
-.pagination-container {
-  padding: 15px 20px;
-  margin-top: 5px;;
-  display: flex;
-  justify-content: flex-end;
-  align-items: center;
-}
-</style>
+  </style>
diff --git a/vue.config.js b/vue.config.js
index 7f3f1daf..c50ac5e2 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -18,7 +18,7 @@ module.exports = {
     // 部署生产环境和开发环境下的URL。
     // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
     // 例如 https://www.bonus.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.bonus.vip/admin/，则设置 baseUrl 为 /admin/。
-    publicPath: process.env.VUE_APP_BASE_API == '/iws/jiju-api' ? '/iws/glweb/' : '/', // 宏源打包时无需更改
+    publicPath: process.env.NODE_ENV === 'production' ? '/iws/glweb/' : '/', // 宏源打包时无需更改
     // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
     outputDir: 'dist',
     // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
@@ -40,8 +40,7 @@ module.exports = {
                 // target: `http://192.168.0.110:18080`,//洪
                 // target: `http://192.168.0.41:28080`,//蒋
                 // target: `http://36.33.26.201:17788/proxyApi`, //测试
-               target: `http://36.33.26.201:21999/prod-api`, //测试
-            //   target: `http://127.0.0.1:28080`,
+                target: `http://36.33.26.201:21999/prod-api`, //测试
                 // target: `http://192.168.137.1:18080`,//
                 changeOrigin: true,
                 pathRewrite: {