From ec10ac7a0b3a5f728d18e2f566340d019cc0ef65 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Tue, 03 Feb 2026 13:37:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/organizational/agenciesManagement/index.vue | 57 ++-------------------------------------------------------
1 files changed, 2 insertions(+), 55 deletions(-)
diff --git a/applications/task-work-order/src/views/orderView/organizational/agenciesManagement/index.vue b/applications/task-work-order/src/views/orderView/organizational/agenciesManagement/index.vue
index 549eab1..8f966d8 100644
--- a/applications/task-work-order/src/views/orderView/organizational/agenciesManagement/index.vue
+++ b/applications/task-work-order/src/views/orderView/organizational/agenciesManagement/index.vue
@@ -22,20 +22,13 @@
</el-form-item>
<el-form-item label="所属区划" prop="areaCode">
- <el-tree-select
+ <RegionSelect
class="gd-select gray"
- popper-class="gd-tree-select-popper"
v-model="searchParams.areaCode"
- node-key="id"
- :props="treeSelectProps"
placeholder="请选择"
clearable
filterable
@change="handleSearch"
- :check-strictly="true"
- lazy
- :load="loadRegionNode"
- :render-after-expand="false"
/>
</el-form-item>
@@ -146,13 +139,13 @@
import { onMounted, ref, provide, nextTick } from 'vue'
import { ElMessage, ElMessageBox, ElUpload } from 'element-plus'
import FormDiaLog from './FormDiaLog.vue'
+import RegionSelect from '@/components/RegionSelect/main.vue'
import {
agenciesPageApi,
agenciesRemoveApi,
agenciesImportApi,
agenciesExportApi,
agenciesExportTemplateApi,
- regionLazyTreeApi,
agenciesSubmitApi
} from './agenciesApi'
import { getDictionaryByCode } from '@/api/system/dictbiz'
@@ -176,17 +169,6 @@
const regionOptions = ref([]) // 区域选项
const dictObj = ref({}) // 字典对象
const selectedFiles = ref([]) // 勾选的文件列表
-
-// 树形选择器配置
-const treeSelectProps = {
- value: 'id',
- label: 'name',
- children: 'children',
- // 添加isLeaf配置,告诉组件如何判断叶子节点
- isLeaf: (data, node) => {
- return data.leaf === true
- }
-}
// 导入机构相关
const isShowImportView = ref(false)
const importFileName = ref('')
@@ -214,41 +196,6 @@
getDictionaryByCode('institutionStatus').then(res => {
dictObj.value = res.data.data
})
-}
-
-// 懒加载获取区域节点数据
-async function loadRegionNode(node, resolve) {
- try {
- // 限制只加载两级,当前节点 level >= 1 时不加载子节点
- if (node.level >= 2) {
- resolve([])
- return
- }
-
- // 初始化加载时传递 code 参数,加载子节点时传递 parentCode 参数
- const params = node.data?.id ? { parentCode: node.data.id } : { code: '360800000000' }
- const res = await regionLazyTreeApi(params)
- const nodes = res?.data?.data || []
-
- // 处理返回的节点数据
- const processedNodes = nodes.map(item => {
- // 判断是否为叶子节点:如果是第二级(node.level === 1)则为叶子节点
- const isLeaf = node.level === 1
-
- return {
- id: item.id || item.value,
- name: item.name || item.title || item.label,
- hasChildren: item.hasChildren || false,
- // 关键:设置leaf属性,告知Tree组件该节点是否为叶子节点
- leaf: isLeaf
- }
- })
-
- resolve(processedNodes)
- } catch (error) {
- console.error('获取区域数据失败:', error)
- resolve([])
- }
}
// 获取列表
async function getList() {
--
Gitblit v1.9.3