补充提交

ant-design-pro-vue3/README.md

@@ -3,7 +3,7 @@
 ```
 下载依赖
 
-yarn isntall
+yarn install
 
 启动服务
 

ant-design-pro-vue3/src/api/api.js

@@ -4,7 +4,7 @@ const systemPrefix = settings.systemPrefix
 
 export  function getRole(params) {
   return request({
-    url: `${systemPrefix}/automake/controller/system/login/SelectRoleNameController?userno=${params}`,
+    url: `${systemPrefix}/automake/controller/system/login/SelectRoleNameController.do?userno=${params}`,
     method:'post'
   });
 }
@@ -18,14 +18,6 @@ export function login(params) {
     })
 }
 
-export function getMenuDataService(params){
-    return request({
-        url: `${systemPrefix}/workflow/category/list/Auth`,
-        method: 'post',
-        data:params
-    })
-}
-
 export function getRoutes(){
     return request({
         url: `/__umiDev/routes`,

ant-design-pro-vue3/src/api/api.js.bak

@@ -0,0 +1,34 @@
+import settings from '@/settings'
+import request from '@/utils/request'
+const systemPrefix = settings.systemPrefix
+
+export  function getRole(params) {
+  return request({
+    url: `${systemPrefix}/automake/controller/system/login/SelectRoleNameController.do?userno=${params}`,
+    method:'post'
+  });
+}
+
+export function login(params) {
+    let datas = {userno:params.username, pwd:params.password, login_role:params.login_role,loginPage:1}
+    return request({
+        url: `${systemPrefix}/automake/controller/system/login/LoginAction`,
+        method: 'post',
+        data:datas
+    })
+}
+
+export function getMenuDataService(params){
+    return request({
+        url: `${systemPrefix}/workflow/category/list/Auth`,
+        method: 'post',
+        data:params
+    })
+}
+
+export function getRoutes(){
+    return request({
+        url: `/__umiDev/routes`,
+        method: 'get',
+    })
+}

ant-design-pro-vue3/src/api/departTreePanel.js

@@ -0,0 +1,54 @@
+import settings from '@/settings'
+import request from '@/utils/request'
+const systemPrefix = settings.systemPrefix
+
+
+
+export function getRelationInfoNoList(params) {
+    return request(`${systemPrefix}/system/select/options/relationInfoNo.do`, {
+        method: 'post',
+        data: params,
+        requestType: 'form',
+    })
+}
+
+export function getDepartTreeData(params) {
+    return request(`${systemPrefix}/im/dhc/sys/automake/system/department/ReportTreeDataController.do`, {
+        method: 'post',
+        data: params,
+        requestType: 'form',
+
+    })
+}
+
+export function searchTreePanelDataByNodeId(params) {
+    return request(`${systemPrefix}/system/common/action/searchTreePanelDataByNodeId`, {
+        method: 'post',
+        data: params,
+        requestType: 'form',
+    })
+}
+export function getSearchResultByNodeId(params) {
+    return request(`${systemPrefix}/system/common/action/searchTreePanelDataByNodeId`, {
+        method: 'post',
+        data: params,
+        requestType: 'form',
+    })
+}
+
+
+export function fetchSobTreeData(params) {
+    return request(`${systemPrefix}/im/dhc/zz/automake/zzmanage/accounting_manager/generalAccount_manager/ComDepartSobTreeController.do`, {
+        method: 'post',
+        data: params,
+        requestType: 'form',
+    })
+}
+
+export function fetchItemTreeData(params) {
+    return request(`${systemPrefix}/im/dhc/zz/automake/zzmanage/comitem_manager/ComModItemInfoQueryController`, {
+        method: 'post',
+        data: params,
+        requestType: 'form',
+    })
+}

ant-design-pro-vue3/src/api/report.js

@@ -0,0 +1,15 @@
+import settings from '@/settings'
+import request from '@/utils/request'
+const systemPrefix = settings.systemPrefix
+/**
+ * 
+ * @param {*} params 
+ * @returns 
+ */
+export function getReadyReportData(params) {
+    return request(`${systemPrefix}/im/dhc/zz/automake/zzmanage/reporformula_manager/ReadyReportDataController.do`, {
+        method: 'post',
+        data: params,
+        requestType: 'form',
+    })
+}

ant-design-pro-vue3/src/api/treeData.js

@@ -0,0 +1,237 @@
+import settings from '@/settings';
+import request from '@/utils/request';
+import { isEmpty } from '@/utils/validate'
+import { message } from "ant-design-vue";
+import { convertToTree, findNodes } from '@/utils/treeUtil'
+
+const systemPrefix = settings.systemPrefix;
+// 定义一个组合式函数，用于获取和处理树状数据
+export const useTreeData = (props, param) => {
+    // 定义一个异步函数，用于获取树状数据
+    const getTreeData = async () => {
+        let apiParams = {};
+        let apiUrl = '';
+        const { isAsync} = {...props};
+        // 根据不同的 treeType 构建请求参数和 URL
+        switch (props.treeType) {
+            case 'deptTree':
+                apiUrl = '/system/common/action/searchTreeData.do';
+                const {relationNo} = {...props};
+                let {id} = {...param};
+                apiParams = {
+                    tree_type: 'departRight',
+                    isAsync: isAsync,
+                    relation_info_no: relationNo,
+                    id: isEmpty(id)? '' : id,
+                };
+                break;
+            case'sobTree':
+                apiUrl = '/im/dhc/zz/automake/zzmanage/accounting_manager/generalAccount_manager/ComDepartSobTreeController.do';
+                const {brNos} = {...props}
+                apiParams = { 
+                    // tree_type: 'sob_tree',
+                    // isAsync: false,
+                    // searchFlag: '01',
+                    // sts: '1',
+                    opt_type:'search',
+                    tx_br_no: brNos.join(',')
+                };
+                break;
+            case'sobItemTree':
+                apiUrl = '/im/dhc/zz/automake/zzmanage/comitem_manager/ComModItemInfoQueryController.do';
+                const {stddNo,sobNo} = {...props} ;
+                apiParams = { 
+                    type:"sobItemTree",
+                    whereSql: `WHERE STDD_NO = ? AND SOB_NO = ? AND USE_YN ='Y'`,
+                    params:	`${stddNo},${sobNo}`
+                }
+                break;
+            default:
+                break;
+        }
+        try {
+            // 调用 fetchTreeData 函数发送请求
+            const resp = await sendRequest(apiUrl, apiParams);
+            if(isAsync === true){
+                return resp;
+            } else {
+            // 将获取到的数据转换为树状结构
+                return convertToTree(resp);
+            }
+        } catch (error) {
+            message.error(`请求失败: ${error.message}`);
+        }
+    };
+
+    // 定义一个函数，用于发送请求
+    function sendRequest(apiUrl, apiParams) {
+        return request(`${systemPrefix}${apiUrl}`, {
+            method: 'post',
+            data: apiParams,
+            requestType: 'form',
+        });
+    }
+
+    // 封装成树形结构的公共方法
+    function convertToTree(data) {
+        // 用于存储每个节点的映射，键为节点的 id，值为节点对象
+        const nodeMap = {};
+        // 存储根节点的数组
+        const tree = [];
+        const localData = [];
+        // 第一次遍历，将每个节点存储到 nodeMap 中
+        data.forEach(item => {
+            // 为每个节点添加 children 属性，用于存储其子节点
+            item.children = [];
+            // 去重处理， 同一个id只保留一个节点
+            if(isEmpty(nodeMap[item.id])){
+                nodeMap[item.id] = item;
+                localData.push(item);
+
+            }
+        });
+
+        // 第二次遍历，构建树形结构
+        localData.forEach(item => {
+            const pid = item.pid;
+            if (pid === null || pid === undefined || pid === item.id || !nodeMap[pid]) {
+                // 如果 pid 为 null 或 undefined，或者父节点不存在，则将该节点作为根节点
+                tree.push(item);
+            } else {
+                // 否则，将该节点添加到其父节点的 children 数组中
+                nodeMap[pid].children.push(item);
+            }
+        });
+        return tree;
+    }
+
+    return {
+        getTreeData
+    };
+};
+
+
+
+/**
+ * 根据树的类型获取树数据、默认值和默认节点
+ * @param {Object} props - 包含树类型、异步标志等属性的对象
+ * @param {Object} param - 额外的参数对象
+ * @returns {Promise<Object>} - 包含树数据、默认值和默认节点的对象
+ */
+export const getTreeDataByType = async (props, param) => {
+    // 初始化变量
+    let treeData = []; // 存储树数据
+    let defaultValue = ''; // 存储默认值
+    let defaultNode = []; // 存储默认节点
+    let stddNo = ''; // 存储标准编号
+    let apiParams = {}; // 存储请求的参数
+    let apiUrl = ''; // 存储请求的 API 地址
+
+    // 解构出异步标志
+    const { isAsync } = { ...props };
+
+    // 根据不同的树类型构建请求的 API 地址和参数
+    switch (props.treeType) {
+        case 'deptTree': {
+            // 解构出关联编号
+            const { relationNo } = { ...props };
+            // 解构出 ID
+            const { id } = { ...param };
+            apiUrl = '/system/common/action/searchTreeData.do';
+            apiParams = {
+                tree_type: 'departRight',
+                isAsync, // 使用解构出的 isAsync
+                relation_info_no: relationNo,
+                id: isEmpty(id) ? '' : id,
+            };
+            break;
+        }
+        case 'sobTree': {
+            // 解构出分支编号数组
+            const { brNos } = { ...props };
+            apiUrl = '/im/dhc/zz/automake/zzmanage/accounting_manager/generalAccount_manager/ComDepartSobTreeController.do';
+            apiParams = {
+                opt_type: 'search',
+                tx_br_no: brNos.join(','),
+            };
+            break;
+        }
+        case 'sobItemTree': {
+            // 解构出标准编号和子业务编号
+            const { stddNo, sobNo } = { ...props };
+            apiUrl = '/im/dhc/zz/automake/zzmanage/comitem_manager/ComModItemInfoQueryController.do';
+            apiParams = {
+                type: "sobItemTree",
+                whereSql: `WHERE STDD_NO = ? AND SOB_NO = ? AND USE_YN ='Y'`,
+                params: `${stddNo},${sobNo}`,
+            };
+            break;
+        }
+        default:
+            break;
+    }
+
+    try {
+        // 调用发送请求的函数获取响应数据
+        const resp = await sendRequest(apiUrl, apiParams);
+
+        // 根据异步标志处理响应数据
+        if (isAsync) {
+            // 异步模式下直接使用响应数据
+            treeData = resp; 
+        } else {
+            // 非异步模式下将响应数据转换为树状结构
+            treeData = convertToTree(resp);
+        }
+
+        // 根据不同的树类型设置默认值和默认节点
+        switch (props.treeType) {
+            case 'deptTree':
+                if (treeData.length > 0) {
+                    // 去除默认节点的 children 属性
+                    const { children, ...nodeWithoutChildren } = treeData[0];
+                    defaultNode = nodeWithoutChildren;
+                    // 从默认节点中获取默认值
+                    defaultValue = defaultNode[props.fieldNames.key];
+                }
+                break;
+            case 'sobTree':
+                if (treeData.length > 0) {
+                    // 根据属性查找默认节点
+                    defaultNode = findNodes(treeData, 'default_yn', 'Y');
+                    if (!isEmpty(defaultNode) && defaultNode.length > 0) {
+                        // 从默认节点的父节点 ID 中提取标准编号
+                        stddNo = defaultNode[0]['pid'].split('@')[0];
+                        // 从默认节点中获取默认值
+                        defaultValue = [defaultNode[0][props.fieldNames.key]];
+                    }
+                }
+                break;
+            case 'sobItemTree':
+                // 可根据 sobItemTree 的具体需求添加默认值和默认节点的逻辑
+                break;
+            default:
+                break;
+        }
+    } catch (error) {
+        // 处理请求失败的情况，显示错误消息
+        message.error(`请求失败: ${error.message}`);
+    }
+
+    // 返回包含树数据、默认值和默认节点的对象
+    return {
+        treeData,
+        defaultValue,
+        defaultNode,
+        stddNo
+    };
+};
+
+// 定义一个函数，用于发送请求
+function sendRequest (apiUrl, apiParams) {
+    return request(`${systemPrefix}${apiUrl}`, {
+        method: 'post',
+        data: apiParams,
+        requestType: 'form',
+    });
+}

ant-design-pro-vue3/src/api/treeDataApi.js

@@ -0,0 +1,133 @@
+import { isEmpty } from '@/utils/validate';
+import settings from '@/settings';
+import request from '@/utils/request';
+import { message } from "ant-design-vue";
+import { convertToTree, findNodes } from '@/utils/treeUtil';
+const systemPrefix = settings.systemPrefix;
+
+/**
+ * 根据树的类型获取树数据、默认值和默认节点
+ * @param {Object} props - 包含树类型、异步标志等属性的对象
+ * @param {Object} param - 额外的参数对象
+ * @returns {Promise<Object>} - 包含树数据、默认值和默认节点的对象
+ */
+export const getTreeData = async (props, param) => {
+    // 初始化变量
+    let treeData = []; // 存储树数据
+    // let defaultValue = []; // 存储默认值
+    // let defaultNode = []; // 存储默认节点
+    let defaultValue; // 存储默认值
+    let defaultNode; // 存储默认节点
+    let defaultStddNo = ''; // 存储标准编号
+    let apiParams = {}; // 存储请求的参数
+    let apiUrl = ''; // 存储请求的 API 地址
+
+    // 解构出异步标志
+    const { isAsync } = { ...props };
+
+    // 根据不同的树类型构建请求的 API 地址和参数
+    switch (props.treeType) {
+        case 'deptTree': {
+            // 解构出关联编号
+            const { relationNo } = { ...props };
+            // 解构出 ID
+            const { id } = { ...param };
+            apiUrl = '/system/common/action/searchTreeData.do';
+            apiParams = {
+                tree_type: 'departRight',
+                isAsync, // 使用解构出的 isAsync
+                relation_info_no: relationNo,
+                id: isEmpty(id) ? '' : id,
+            };
+            break;
+        }
+        case 'sobTree': {
+            // 解构出分支编号数组
+            const { brNos } = { ...props };
+            apiUrl = '/im/dhc/zz/automake/zzmanage/accounting_manager/generalAccount_manager/ComDepartSobTreeController.do';
+            apiParams = {
+                opt_type: 'search',
+                tx_br_no: brNos.join(','),
+            };
+            break;
+        }
+        case 'sobItemTree': {
+            // 解构出标准编号和子业务编号
+            const { stddNo, sobNo } = { ...props };
+            apiUrl = '/im/dhc/zz/automake/zzmanage/comitem_manager/ComModItemInfoQueryController.do';
+            apiParams = {
+                type: "sobItemTree",
+                whereSql: `WHERE STDD_NO = ? AND SOB_NO = ? AND USE_YN ='Y'`,
+                params: `${stddNo},${sobNo}`,
+            };
+            break;
+        }
+        default:
+            break;
+    }
+
+    try {
+        // 调用发送请求的函数获取响应数据
+        const resp = await sendRequest(apiUrl, apiParams);
+        // 根据异步标志处理响应数据
+        if (isAsync) {
+            // 异步模式下直接使用响应数据
+            treeData = resp; 
+        } else {
+            // 非异步模式下将响应数据转换为树状结构
+            treeData = convertToTree(resp);
+        }
+
+        // 根据不同的树类型设置默认值和默认节点
+        switch (props.treeType) {
+            case 'deptTree':
+                if (treeData.length > 0) {
+                    // 去除默认节点的 children 属性
+                    const { children, ...nodeWithoutChildren } = treeData[0];
+                    //defaultNode.push(nodeWithoutChildren);
+                    defaultNode = [nodeWithoutChildren];
+                    // 从默认节点中获取默认值
+                    defaultValue = [nodeWithoutChildren[props.fieldNames.key]];
+                }
+                break;
+            case 'sobTree':
+                if (treeData.length > 0) {
+                    // 根据属性查找默认节点
+                    defaultNode = findNodes(treeData, 'default_yn', 'Y');
+                    if (!isEmpty(defaultNode) && defaultNode.length > 0) {
+                        // 从默认节点的父节点 ID 中提取标准编号
+                        defaultStddNo = defaultNode[0]['pid'].split('@')[0];
+                        // 从默认节点中获取默认值
+                        // defaultValue = [defaultNode[0][props.fieldNames.key]];
+                        defaultValue = defaultNode[0][props.fieldNames.key];
+                    }
+                }
+                break;
+            case 'sobItemTree':
+                // 可根据 sobItemTree 的具体需求添加默认值和默认节点的逻辑
+                break;
+            default:
+                break;
+        }
+    } catch (error) {
+        // 处理请求失败的情况，显示错误消息
+        message.error(`请求失败: ${error.message}`);
+    }
+
+    // 返回包含树数据、默认值和默认节点的对象
+    return {
+        treeData,
+        defaultValue,
+        defaultNode,
+        defaultStddNo
+    };
+};
+
+// 定义一个函数，用于发送请求
+function sendRequest (apiUrl, apiParams) {
+    return request(`${systemPrefix}${apiUrl}`, {
+        method: 'post',
+        data: apiParams,
+        requestType: 'form',
+    });
+}

ant-design-pro-vue3/src/components/DepartTreePanel/components/DepartTreePanel1.vue

@@ -0,0 +1,338 @@
+<template>
+    <!--1.汇总关系下拉列表-->
+    <div class="relation-dropdown">
+        <span class="relation-label">汇总关系：</span>
+        <a-select v-model:value="relationInfoNo" :options="relationInfoNoOptions" class="relation-select"
+            :allowClear="true">
+        </a-select>
+    </div>
+    <!--2.不同树形结构标签页-->
+    <div style="margin-bottom: -10px">
+        <a-tabs type="card" v-model:activeKey="treeType">
+            <a-tab-pane key="0" tab="账务树">
+            </a-tab-pane>
+            <a-tab-pane key="1" tab="对比树">
+            </a-tab-pane>
+            <a-tab-pane key="2" tab="报送树">
+            </a-tab-pane>
+        </a-tabs>
+    </div>
+    <!--3.搜索框-->
+    <div class="search-dropdown">
+        <a-input v-model:value="searchValue" @input="onInputChange" placeholder="搜索..." :allowClear="true" />
+        <div v-if="searchResultList.length > 0" class="search-select">
+            <div class="search-select-li" v-for=" searchResult in searchResultList" :key="searchResult.id"
+                @click="onOptionClick(searchResult)">
+                {{ searchResult.name }}
+            </div>
+        </div>
+    </div>
+    <!--4.机构树-->
+    <div>
+        <a-tree v-model:expandedKeys="expandedKeys" v-model:selectedKeys="selectedKeys"
+            v-model:checkedKeys="checkedKeys" v-model:loadedKeys="loadedKeys" :load-data="onLoadData"
+            :tree-data="treeData" :fieldNames="fieldNames" checkable @select="onSelect" @expand="onExpand"
+            @check="onCheck" />
+    </div>
+</template>
+
+<script setup>
+//问题汇总:
+//1.机构checked 如何联动下账套， 两个组件不在一块
+//2.机构汇总关系下拉列表属性必填项，如何与查询按钮绑定并校验
+//3.机构汇总关系获取枚举值时,如何获取当前交易的pageInterfaceNo 
+//4.系统日期如何获取到
+//5.机构汇总下拉列表如何获取对应的内部值
+//6.搜索框,需要判断值是否为空的逻辑处理
+//7.控制台报：Tree missing follow keys: '1'
+//8.搜索机构时，因为是单选正常应该只展示自己和自己的上级节点
+//9.查询时获取查询选中的机构列表也存在问题，需要优化，需要与后台呼应上 父节点下叶子节点全部选中，则返回父节点，否则返回选中的子节点
+//10.机构是必填项，如何校验
+
+// 11.当搜索一个节点时，然后展开整个树，再次重新 checked的话，点击查询获取查询节点有存在问题了
+// 12.点击树进行展开，然后再切换树类型或者汇总关系，展开图标消失了，但是数据还是存在
+// 13.增加loadedKeys 或者是移动到组件中，展开叶子节点就无效了
+// 14.机构面板组件封装到组件中，，业务就特别卡顿
+
+// 机构汇总关系双向绑定到页面中
+import { ref } from 'vue'
+import { defineProps, defineExpose, onMounted, watch, nextTick } from 'vue';
+import { getRelationInfoNoList, getDepartTreeData, getSearchResultByNodeId } from '@/api/departTreePanel';
+defineExpose({ getCheckedNodes });
+// 声名接收参数数据
+const props = defineProps({});
+
+// 机构汇总关系双向绑定到页面中
+const relationInfoNo = ref('');
+// 机构汇总关系枚举值, 组件挂载时向后端发起请求
+const relationInfoNoOptions = ref([]);
+// 树形结构标签页值双向绑定到页面中
+const treeType = ref('');
+
+
+// 钩子函数，页面加载完成后首先获取下汇总关系
+onMounted(async () => {
+    // 1.获取机构汇总关系枚举值
+    await getRelationInfoNoOptions();
+});
+// 监听汇总关系和树形结构标签页值,只要值发生变化,重新获取树形结构数据
+watch(() => [relationInfoNo.value, treeType.value,], async (newVal, oldVal) => {
+    // 1.当类型数发生变化时，重新获取树形结构数据
+    if (newVal != oldVal) {
+        await getDeptTreeData();
+    }
+});
+
+// 获取机构汇总关系枚举值及默认值
+async function getRelationInfoNoOptions () {
+    // 清空 relationInfoNoOptions 数组
+    relationInfoNoOptions.value = [];
+    // // 1.获取机构汇总关系枚举值
+    const resp = await getRelationInfoNoList({
+        pageInterfaceNo: 'zzsearch_01_01_02',
+    });
+    // 2.将枚举值添加到 relationInfoNoOptions 中 并设置下拉列表默认值
+    resp.forEach(node => {
+        if (node.item_no === 'AAAAAA') {
+            relationInfoNo.value = node.item_no;
+        }
+        relationInfoNoOptions.value.push({ label: node.item_name, value: node.item_no });
+    });
+    // 3.设置机构树类型的默认值
+    treeType.value = '0';
+}
+
+// 搜索框 start
+// 搜索框触发事件
+const searchValue = ref('');
+const searchResultList = ref([]);
+
+async function onInputChange () {
+    // 1.判断搜索框是否为空,为空则清空 options 数组,重新获取树形结构数据
+    if (!searchValue || searchValue.value.length === 0) {
+        searchResultList.value = [];
+        getDeptTreeData();
+        return;
+    }
+    // 2.获取搜索结果
+    searchResultList.value = await getDepartTreeData({
+        treeSearch: "true",
+        kw: searchValue.value,
+        relation_info_no: relationInfoNo.value,
+        treeType: treeType.value,
+        qryDate: '20231117',
+    });
+}
+
+// 选择搜索下拉列表项(点击事件)回调
+async function onOptionClick (searchResult) {
+    // 1.设置搜索框值
+    searchValue.value = searchResult.name;
+    // 2.点击完成后,隐藏下拉列表设置为空
+    searchResultList.value = [];
+    // 3.重新获取树形结构数据
+    const searchResultList2 = await getSearchResultByNodeId({
+        isAsync: "flase",
+        nodeId: searchResult.dep_no,
+        treeType: treeType.value,
+        relation_info_no: relationInfoNo.value,
+        qryDate: '20231117',
+
+    });
+
+    const treeDataMap = {};
+    searchResultList2.forEach(node => {
+        treeDataMap[node.id] = node;
+    });
+
+    let parentKeys = [];
+    let searchTreeData = [];
+    let searchNode = treeDataMap[searchResult.dep_no];
+    while (true) {
+        const parent = treeDataMap[searchNode.pid];
+        if (parent) {
+            // 父节点存在,则往父节点添加该子节点
+            if (!parent.children) {
+                parent.children = [];
+            }
+            parentKeys.push(parent.id);
+            parent.children.push(searchNode);
+            searchNode = parent;
+        } else {
+            // 父节点不存在,则直接添加到树形结构数据中
+            searchTreeData.push(searchNode);
+            break;
+        }
+    }
+    treeData.value = searchTreeData;
+    // 4.设置默认选中节点
+    nextTick(() => {
+        // 等到数据加载完成后，设置默认选中节点
+        checkedKeys.value = [searchNode.id];
+        expandedKeys.value = parentKeys;
+    });
+
+}
+// 搜索框 send
+
+const fieldNames = {
+    title: 'name',
+    key: 'id',
+};
+const treeData = ref([])// 树的数据
+const expandedKeys = ref([]);// 已展开的节点
+const selectedKeys = ref([]);// 已选中的节点
+const checkedKeys = ref([]);// 已勾选的节点
+const loadedKeys = ref([]); // 已加载子节点的节点
+// 获取机构树数据
+async function getDeptTreeData () {
+    expandedKeys.value = [];
+    selectedKeys.value = [];
+    checkedKeys.value = [];
+    // 清空已加载子节点的节点数组,不然切换树类型或者汇总关系时会导致展开图标消失
+    //loadedKeys.value = [];
+    treeData.value = await getDepartTreeData({
+        isParentType: '&&',
+        page_code: 'cs',
+        isAsync: 'true',
+        relation_info_no: relationInfoNo.value,
+        treeType: treeType.value,
+        qryDate: '20231117',
+    });
+    nextTick(() => {
+        // 等到数据加载完成后，设置默认选中节点
+        checkedKeys.value = [treeData.value[0].id];
+    });
+}
+
+// 节点选中时的回调
+function onSelect (selectedKeys, info) {
+}
+// 节点展开时的回调
+function onExpand (expandedKeys, info) {
+    console.log('wyq---------expandedKeys', expandedKeys);
+}
+// 节点选中时的回调
+function onCheck (checkedKeys, info) {
+}
+// 异步加载数据
+const onLoadData = async (treeNode) => {
+    return new Promise(async (resolve, reject) => {
+        if (treeNode.dataRef.children) {
+            resolve();
+            return;
+        }
+        try {
+            // data.children 是从后端获取的子节点数据
+            treeNode.dataRef.children = await getDepartTreeData({
+                id: treeNode.eventKey,
+                isParentType: "&&",
+                isAsync: "true",
+                page_code: 'cs',
+                relation_info_no: relationInfoNo.value,
+                treeType: treeType.value,
+                qryDate: '20231117',
+            });
+            // 更新 treeData
+            treeData.value = [...treeData.value];
+            resolve();
+        } catch (error) {
+            //console.error('获取数据失败', error);
+            reject(error);
+        }
+    });
+};
+
+
+function getCheckedNodes () {
+    let checkedNodes = [];
+    let allNodes = getAllNodes();
+    if (checkedKeys.value.length === 1) {
+        // 只选中一个节点
+        const node = allNodes.find(n => n.id === checkedKeys.value[0]);
+        checkedNodes.push(node);
+    } else {
+        // 选中多个节点
+        for (let i = 0; i < checkedKeys.value.length; i++) {
+            // 找到当前节点
+            const node = allNodes.find(n => n.id === checkedKeys.value[i]);
+            if (!checkedKeys.value.includes(node.pid)) {
+                // 选择的节点对应的父节点没有被选择， 则添加到结果中
+                checkedNodes.push(node);
+            }
+        }
+    }
+    return checkedNodes;
+}
+
+
+const getAllNodes = (nodes = treeData.value) => {
+    let allNodes = [];
+    const traverse = (nodeList) => {
+        nodeList.forEach(node => {
+            allNodes.push(node); // 收集当前节点
+            if (node.children) {
+                traverse(node.children); // 递归遍历子节点
+            }
+        });
+    };
+    traverse(nodes);
+    return allNodes;
+};
+
+</script>
+<style scoped>
+.relation-dropdown {
+    margin-bottom: 5px;
+}
+
+.relation-label {
+    display: inline-block;
+    vertical-align: middle;
+}
+
+.relation-select {
+    display: inline-block;
+    vertical-align: middle;
+    width: 200px;
+}
+
+.search-dropdown {
+    position: relative;
+    display: inline-block;
+    width: 286px;
+    margin-bottom: 5px
+        /* 设置宽度 */
+}
+
+.search-select {
+    position: absolute;
+    top: calc(100% + 5px);
+    /* 适当调整下拉列表的位置 */
+    left: 0;
+    right: 0;
+    z-index: 1000;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    /* 圆角 */
+    background-color: #fff;
+    max-height: 200px;
+    overflow-y: auto;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
+    /* 添加阴影 */
+}
+
+.search-select-li {
+    padding: 3px 10px;
+    padding-left: 0px;
+    /* 调整内边距 */
+    cursor: pointer;
+}
+
+.search-select-li:hover {
+    background-color: #1890ff;
+    /* 使用主题色 */
+    color: #fff;
+    /* 改变文字颜色 */
+}
+</style>

ant-design-pro-vue3/src/components/DepartTreePanel/index.vue

@@ -0,0 +1,312 @@
+<template>
+    <a-layout style="height: 100vh;">
+        <a-layout-sider ref="sider" :width="siderWidth"
+            style="background-color: #fff; overflow: auto; white-space: nowrap;">
+            <div v-if="showSider">
+                <div class="sider-header">
+                    <div class="sider-header-title" style="display:inline-block;  vertical-align: middle;">机构树面板</div>
+                    <div class="sider-header-tool" style="display:inline-block;  vertical-align: middle;  ">
+                        <DoubleLeftOutlined @click="toggleSider" />
+                    </div>
+                </div>
+                <DepartTreePanel1 ref="departTreePanel"></DepartTreePanel1>
+            </div>
+            <div v-else>
+                <DoubleRightOutlined @click="toggleSider" />
+            </div>
+        </a-layout-sider>
+        <div class="resizer-vertical" @mousedown="startHorizontalResize" @touchstart="startHorizontalResize"
+            style="cursor: col-resize; background-color: #ccc; width: 5px;"></div>
+        <a-layout>
+            <a-layout-header :style="{ flex: '0 0 ' + headerHeight + 'px', padding: 0, backgroundColor: '#fff', }"
+                style="overflow: auto;">
+                <!-- <a-layout-header :style="{ height: 500 + 'px', padding: 0, backgroundColor: '#fff', }"> -->
+
+                <div v-if="showHeader">
+                    <div class="sider-header">
+                        <div class="sider-header-title" style="display:inline-block;  vertical-align: middle;">报表查询
+                        </div>
+                        <div class="sider-header-tool" style="display:inline-block;  vertical-align: middle;  ">
+                            <DoubleLeftOutlined @click="toggleHeader" rotate=90 />
+                        </div>
+                    </div>
+                    <div>
+                        <pro-form-grid>
+                            <pro-input :formItemProps="{ label: '制表日期', prop: 'levelKey' }" placeholder="请输入层级编号"
+                                :allowClear="true">
+                            </pro-input>
+                            <pro-select :formItemProps="{ label: '周期类型', prop: 'useYn' }" placeholder="请选择启用标志"
+                                :allowClear="true">
+                            </pro-select>
+                            <pro-select :formItemProps="{ label: '币种', prop: 'useYn' }" placeholder="请选择启用标志"
+                                :allowClear="true">
+                            </pro-select>
+                            <pro-select :formItemProps="{ label: '账套', prop: 'useYn' }" placeholder="请选择启用标志"
+                                :allowClear="true">
+                            </pro-select>
+                            <pro-select :formItemProps="{ label: '损益上划', prop: 'useYn' }" placeholder="请选择启用标志"
+                                :allowClear="true">
+                            </pro-select>
+                            <pro-select :formItemProps="{ label: '报表调整类型', prop: 'useYn' }" placeholder="请选择启用标志"
+                                :allowClear="true">
+                            </pro-select>
+                            <!-- <pro-select :formItemProps="{ label: '科目级别', prop: 'useYn' }" placeholder="请选择启用标志"
+                            :allowClear="true">
+                        </pro-select>
+                        <pro-select :formItemProps="{ label: '零余额是否打印', prop: 'useYn' }" placeholder="请选择启用标志"
+                            :allowClear="true">
+                        </pro-select> -->
+                        </pro-form-grid>
+                        <pro-form-item>
+                            <pro-button id="queryBtn" @click="fetchReport" :icon="h(SearchOutlined)">查询</pro-button>
+                        </pro-form-item>
+                    </div>
+                </div>
+                <div v-else class="sider-header">
+                    <div class="sider-header-title" style="display:inline-block;  vertical-align: middle;">
+                    </div>
+                    <div class="sider-header-tool" style="display:inline-block;  vertical-align: middle;  ">
+                        <DoubleRightOutlined @click="toggleHeader" rotate=90 />
+                    </div>
+                </div>
+            </a-layout-header>
+            <div class="resizer-horizontal" @mousedown="startVerticalResize" @touchstart="startVerticalResize"
+                style="cursor: row-resize; background-color: #ccc; height: 5px;"></div>
+            <a-layout>
+                <a-layout-content style="height: 100%; background-color: #fff; overflow: auto;">
+                    <!-- <a-layout-content style=" background-color: #deb887; overflow: auto; white-space: nowrap;">
+                    -->
+                    <!--遮罩层-->
+                    <div v-if="dragging" style="  width: 100%; height: 100%;  background: blue; display: block;">
+                    </div>
+                    <a-tabs :size="'small'" v-model:activeKey="activeKey" type="editable-card" @edit="handleTabEdit"
+                        :hideAdd="true">
+                        <a-tab-pane v-for="tab in tabs" :key="tab.key" :tab="tab.title" :closable="tab.closable">
+                            <iframe :ref="el => setIframeRef(el, tab.random)" :data-key="tab.key" frameborder="0"
+                                style="border: none; background: none; width: 100%; height: 400px">
+                            </iframe>
+                        </a-tab-pane>
+                    </a-tabs>
+                </a-layout-content>
+            </a-layout>
+        </a-layout>
+    </a-layout>
+</template>
+
+<script setup lang="jsx">
+import { ref, watch, h, computed, onMounted, nextTick, reactive, onBeforeUnmount } from 'vue';
+import { DoubleRightOutlined, DoubleLeftOutlined, SearchOutlined } from "@ant-design/icons-vue";
+import DepartTreePanel1 from './components/DepartTreePanel1.vue'
+const dragging = ref(false);
+// 查询结果
+const tabs = reactive([]);
+const activeKey = ref('');
+
+onMounted(() => {
+    window.REPORT = {
+        queryAccordAccNOGetLogs: (data) => {
+            // 在这里实现具体的业务逻辑
+            console.log("Data received:", data);
+            // 可以在这里调用其他方法或发送 AJAX 请求处理数据
+        },
+        // 可以继续添加其他方法
+    };
+});
+
+onBeforeUnmount(() => {
+    // 组件销毁前移除 REPORT 对象，避免内存泄漏
+    delete window.REPORT;
+});
+
+function fetchReport () {
+    const data = {
+        reportNameCN: '业务状况表',
+        rpt_date: '20231117',
+        cyc_type: '06',
+    }
+    const random = Math.random().toString().split('.')[1];
+    const divId = `report_result_div${random}`;
+    // Add a new tab
+    const newTab = {
+        title: data.reportNameCN,
+        key: divId,
+        closable: true,
+        random: random
+    };
+    tabs.push(newTab);
+    activeKey.value = divId;
+    nextTick(() => {
+        // const iframe = document.getElementById('reportIframe');
+        const iframe = document.getElementById(`report_result_iframe${random}`);
+
+
+        let url = '/zz-pack/report/query/zz/ywzkb'
+        let html = '<form action="' + url + '" method="post" target="_self" id="postData_form_newZcfzb">' +
+            '<input  name="relation_info_noDepartTreePanel" type="hidden" value="AAAAAA"/>' +
+            '<input  name="rpt_date" type="hidden" value="20231117"/>' +
+            '<input  name="cyc_type" type="hidden" value="06"/>' +
+            '<input  name="cur_no" type="hidden" value="1"/>' +
+            '<input  name="sob_no" type="hidden" value="10"/>' +
+            '<input  name="sh_flag" type="hidden" value=""/>' +
+            '<input  name="adj_type" type="hidden" value=""/>' +
+            '<input  name="acc_lvl" type="hidden" value="4"/>' +
+            '<input  name="zero_print_yn" type="hidden" value="01"/>' +
+            '<input  name="exrate_type" type="hidden" value=""/>' +
+            '<input  name="is_gather" type="hidden" value=""/>' +
+            '<input  name="stdd_no" type="hidden" value="2"/>' +
+            '<input  name="tel_no" type="hidden" value="1"/>' +
+            '<input  name="dep_no" type="hidden" value="1"/>' +
+            '<input  name="rptDepName" type="hidden" value="[1800000009]东华银行"/>' +
+            '<input  name="br_no" type="hidden" value="1"/>' +
+            '<input  name="tab_name" type="hidden" value="v_gl_sub_coll_day1"/>' +
+            '<input  name="reportNameCN" type="hidden" value="业务状况表(年报)人民币20231117"/>' +
+            '<input  name="reportNameEN" type="hidden" value="ywzkb"/>' +
+            '<input  name="reportFileName" type="hidden" value="ywzkb"/>' +
+            '<input  name="title_name" type="hidden" value="业务状况表"/>' +
+            '<input  name="reportModuleName" type="hidden" value="zz"/>' +
+            '<input  name="curName" type="hidden" value="人民币"/>' +
+            '<input  name="timeStamp" type="hidden" value="币种名称"/>' +
+            '<input  name="zero_print_ynSql" type="hidden" value=""/>' +
+            '</form>';
+        iframe.contentWindow.document.write(html);
+        iframe.contentWindow.document.getElementById('postData_form_newZcfzb').submit();
+        iframe.onload = () => {
+            console.log('iframe loaded', random);
+
+        };
+    })
+}
+
+
+function setIframeRef (el, random) {
+    if (el) {
+        el.name = `report_result_iframe${random}`;
+        el.id = `report_result_iframe${random}`;
+    }
+}
+
+function handleTabEdit (targetKey, action) {
+    if (action === 'remove') {
+        const index = tabs.findIndex(tab => tab.key === targetKey);
+        if (index !== -1) {
+            tabs.splice(index, 1);
+            // 关闭当前标签页后,默认选中第一个标签页
+            if (tabs.length > 0) {
+                activeKey.value = tabs[0].key;
+            } else {
+                activeKey.value = null;
+            }
+        }
+    }
+}
+
+const siderWidth = ref(290);//左布局初始宽度
+const headerHeight = ref(220);//顶部布局初始高度
+
+const startX = ref(0);
+const startY = ref(0);
+const startWidth = ref(0);
+const startHeight = ref(0);
+
+function startHorizontalResize (event) {
+    dragging.value = true;
+    startX.value = event.clientX;
+    startWidth.value = siderWidth.value;
+    document.addEventListener('mousemove', onHorizontalMouseMove);
+    document.addEventListener('mouseup', stopHorizontalResize);
+}
+
+function onHorizontalMouseMove (event) {
+    const currentX = event.clientX;
+    const diffX = currentX - startX.value;
+    siderWidth.value = Math.max(startWidth.value + diffX, 0);
+}
+
+function stopHorizontalResize () {
+    dragging.value = false;
+    document.removeEventListener('mousemove', onHorizontalMouseMove);
+    document.removeEventListener('mouseup', stopHorizontalResize);
+}
+
+function startVerticalResize (event) {
+    startY.value = event.clientY;
+    startHeight.value = headerHeight.value;
+    document.addEventListener('mousemove', onVerticalMouseMove);
+    document.addEventListener('mouseup', stopVerticalResize);
+}
+
+function onVerticalMouseMove (event) {
+    const currentY = event.clientY;
+    const diffY = currentY - startY.value;
+    headerHeight.value = Math.max(startHeight.value + diffY, 0);
+}
+
+function stopVerticalResize () {
+    document.removeEventListener('mousemove', onVerticalMouseMove);
+    document.removeEventListener('mouseup', stopVerticalResize);
+}
+
+// 左侧布局显示隐藏
+const showSider = ref(true);
+const showHeader = ref(true);
+function toggleSider () {
+    if (showSider.value) {
+        siderWidth.value = 15;
+    } else {
+        siderWidth.value = 290;
+    }
+    showSider.value = !showSider.value;
+}
+
+function toggleHeader () {
+    if (showHeader.value) {
+        headerHeight.value = 30;
+    } else {
+        headerHeight.value = 220;
+    }
+    showHeader.value = !showHeader.value;
+}
+
+
+</script>
+
+<style>
+.resizer-vertical {
+    user-select: none;
+}
+
+.resizer-horizontal {
+    user-select: none;
+}
+
+
+.sider-header {
+    height: 34px;
+    line-height: 34px;
+    border: 0;
+    background-color: #1890ff;
+    padding: 0 14px;
+    margin: 2px 0;
+    display: flex;
+    position: relative;
+}
+
+.sider-header-title {
+    height: 34px;
+    line-height: 34px;
+    color: #fff;
+    font-weight: bold;
+    font-size: 16px;
+    margin: 0;
+    padding: 0;
+}
+
+.sider-header-tool {
+    right: 10px;
+    width: auto;
+    position: absolute;
+    top: 50%;
+    margin-top: -17px;
+    overflow: hidden;
+}
+</style>

ant-design-pro-vue3/src/components/GlobalFooter/index.vue

@@ -16,7 +16,7 @@ import { isMobile } from '@/utils/device'
 <style lang="less" scoped>
 .footer {
     padding: 0 16px;
-    margin: 48px 0 24px;
+    margin: 5px 0 5px;
     text-align: center;
 
     .links {

ant-design-pro-vue3/src/components/MultiTab/index.vue

@@ -6,7 +6,8 @@
                 <a-tab-pane v-for="page in pages" :key="page.fullPath" :closable="pages.length > 1" style="height: 0">
                     <template #tab>
                         <a-dropdown :trigger="['contextmenu']">
-                            <span :style="{ userSelect: 'none' }">{{ page.meta.customTitle || $t(page.meta.title) }}</span>
+                            <span :style="{ userSelect: 'none' }">{{ page.meta.customTitle || $t(page.meta.title)
+                                }}</span>
                             <template #overlay>
                                 <a-menu @click="({ key, item, domEvent }) => {
                                     closeMenuClick(key, page.fullPath);
@@ -78,6 +79,7 @@ const selectedLastPath = () => {
 
 const onEdit = (targetKey, action) => {
     //proxy[action](targetKey)
+    console.log('multiTab onEdit', targetKey, action)
     remove(targetKey)
 }
 const remove = (targetKey) => {
@@ -133,6 +135,7 @@ const closeAll = (e) => {
     })
 }
 const closeMenuClick = (key: string, route) => {
+    console.log('MultiTab-closeMenuClick', key, route)
     const allFun = { closeAll, closeRight, closeLeft, closeSelf }
     allFun[key](route)
 }
@@ -141,14 +144,21 @@ watch(
     () => router.currentRoute.value,
     (newVal) => {
         activeKey.value = newVal.fullPath
+        console.log('MultiTab -newVal', newVal, newVal.fullPath);
+        console.log('MultiTab -fullPathList', fullPathList);
+
+
         if (fullPathList.indexOf(newVal.fullPath) < 0) {
             fullPathList.push(newVal.fullPath)
-            pages.push(newVal)
+            pages.push(newVal);
+            console.log('MultiTab -pages', pages);
+
         }
     }
 )
 
 watch(activeKey, (newPathKey) => {
+    console.log('MultiTab -activeKey', activeKey, newPathKey);
     router.push({ path: newPathKey })
 })
 </script>

ant-design-pro-vue3/src/components/OpenModelButton/index.vue

@@ -1,9 +1,9 @@
 <template>
     <span>
-        <a-button type="primary" @click="click" v-bind="$attrs">
+        <a-button type="primary" @click="click" @addData="getList" v-bind="$attrs">
             {{ text ?? '打开' }}
         </a-button>
-        <component v-if="visible" :is="is" :visible="visible" @close:modal="visible = false" />
+        <component v-if="visible" :is="is" :visible="visible" @addDataDemo="getList" @close:modal="visible = false" />
     </span>
 </template>
 
@@ -11,6 +11,10 @@
 import { computed } from 'vue';
 import { ref } from 'vue'
 import { useStore } from 'vuex';
+import { message } from "ant-design-vue";
+const emit = defineEmits(['addData']);
+
+
 const store = useStore();
 
 const props = defineProps({
@@ -19,6 +23,7 @@ const props = defineProps({
         required: true
     },
     text: String,
+    beforeShow: [String, Function],
     afterShow: [String, Function],
     payload: Object
 })
@@ -31,18 +36,52 @@ const is = computed(() => {
     }
 })
 
+
 const visible = ref(false)
 function click () {
-    visible.value = true;
-    const afterShow = props.afterShow
-    if (afterShow) {
-        if (typeof afterShow === 'function') {
-            afterShow(props.payload)
-        } else if (typeof afterShow === 'string') {
-            store.dispatch(afterShow, props.payload)
+    const beforeShow = props.beforeShow
+    if (beforeShow) {
+        beforeShowModal();
+    } else {
+        // 先显示页面，再执行异步操作
+        visible.value = true;
+        // 再执行异步操作
+        const afterShow = props.afterShow
+        if (afterShow) {
+            if (typeof afterShow === 'function') {
+                console.log("wyq--afterShow-function" + afterShow)
+                afterShow(props.payload)
+            } else if (typeof afterShow === 'string') {
+                console.log("wyq--afterShow-string" + afterShow)
+                store.dispatch(afterShow, props.payload)
+            }
+        }
+    }
+}
+
+async function beforeShowModal () {
+    try {
+        // 先执行异步操作
+        const beforeShow = props.beforeShow
+        if (typeof beforeShow === 'function') {
+            await beforeShow(props.payload)
+        } else if (typeof beforeShow === 'string') {
+            await store.dispatch(beforeShow, props.payload)
         }
+    } catch (error) {
+        message.error('打开模态框前业务处理失败' + error);
+    } finally {
+        visible.value = true;
     }
 }
+
+
+function getList () {
+    console.log("wyq--OpenModelButton-getList 触发成功了")
+    //this.$emit('addData');
+    emit('addData');
+
+}
 </script>
 
 <style lang="scss" scoped></style>

ant-design-pro-vue3/src/components/ProForm/fields/ProDatePicker/index.vue

@@ -6,7 +6,8 @@
 </template>
 <script>
 import dayjs from 'dayjs';
-import moment from 'moment'
+import 'dayjs/locale/zh-cn';
+// import moment from 'moment'
 export default {
     name: 'ProDatePicker',
     props: {

ant-design-pro-vue3/src/components/ProForm/fields/ProSelect/index.vue

@@ -16,7 +16,7 @@ import {
 export default {
     name: 'ProSelect',
     props: {
-        value: [String, Array],
+        modelValue: [String, Array], // 更改为 modelValue
         optionData: Array,
         readText: {
             type: [String, Array],
@@ -25,19 +25,22 @@ export default {
         readValue: {
             type: [String, Array],
             default: null
-        }
+        },
+        formItemProps: Object, // 定义formItemProps prop
     },
     inject: {
         pageIsReadOnly: {
             default: false
         }
     },
+    emits: ['update:modelValue', 'change', 'select', 'easyUiSelect', 'input'], // 添加 update:modelValue 事件
     watch: {
         //判断下拉框的值是否有改变
         svalue (val, oldVal) {
             const that = this
             if (val != oldVal) {
                 that.$emit('input', this.svalue)
+                that.$emit('update:modelValue', this.svalue) // 确保使用 update:modelValue
                 if (this.$attrs["collapse-tags"] != undefined) {
                     this.$nextTick(() => {
                         //下拉框视口总宽度
@@ -65,8 +68,11 @@ export default {
                 }
             }
         },
-        value (val, oldVal) {
-            this.svalue = this.value
+        modelValue: {
+            immediate: true,
+            handler (newVal) {
+                this.svalue = newVal;
+            }
         },
         optionData (val, oldVal) {
             if (JSON.stringify(val) != JSON.stringify(oldVal)) {
@@ -76,6 +82,7 @@ export default {
 
     },
     mounted () {
+        console.log("wyq-ProSelect mounted", this.$attrs);
         const optionData = this.optionData
         //初始话下拉框的值
         const {
@@ -117,11 +124,13 @@ export default {
         handleChange (data, node, event) {
             // this.$emit('input', data);
             this.$emit('change', data, node, event)
+            this.$emit('update:modelValue', data);  // 确保使用 update:modelValue
         },
         handleSelect (value, option) {
             this.$emit('select', value, option)
             //兼容easyUi写法
             this.$emit('easyUiSelect', { item_no: value, item_name: option.title })
+            this.$emit('update:modelValue', value); // 在选择时也更新 modelValue
         },
         // 设置下拉数据源
         setSelectOptions (data) {
@@ -143,7 +152,7 @@ export default {
     data () {
         return {
             options: [],
-            svalue: this.value
+            svalue: this.modelValue // 初始化 svalue
         }
     }
 }

ant-design-pro-vue3/src/components/ProForm/fields/ProSelect3/index.vue

@@ -0,0 +1,276 @@
+<template>
+    <a-select ref="selectRef" v-model:value="localValue" placeholder="请选择" @change="onChange" @select="onSelect"
+        v-bind="$attrs">
+        <a-select-option v-for="item in localOptions" :key="item[localfieldNames.value]"
+            :value="item[localfieldNames.value]" v-bind="item">
+            {{ item[localfieldNames.label] }}
+        </a-select-option>
+    </a-select>
+</template>
+<script setup lang="jsx">
+import { isEmpty } from '@/utils/validate'
+
+import { getOptions } from '@/api/common'
+import { ref, defineProps, defineExpose, defineEmits, onMounted, onBeforeUnmount, watch, nextTick, computed } from 'vue';
+const emits = defineEmits(['update:value', 'onChange', 'onSelect']);
+const props = defineProps({
+    value: {
+        type: [String, Array, Number],
+        default: '',
+        required: true
+    },
+    url: {
+        type: String,
+        default: ''
+    },
+    tableName: {
+        type: String,
+        default: ''
+    },
+    colName: {
+        type: String,
+        default: ''
+    },
+    options: {
+        type: Array,
+        default: () => []
+    },
+    formItemProps: {
+        type: Object,
+        default: () => { }
+    },
+    selectType: {
+        type: String,
+        default: ''
+    },
+    pageInterfaceNo: {
+        type: String,
+        default: ''
+    },
+    sobNo: {
+        type: String,
+        default: ''
+    },
+    correct: {
+        type: Boolean,
+        default: false
+    },
+    cascadeFlag: {
+        type: Boolean,
+        default: false
+    },
+    fieldNames: {
+        type: Object,
+        default: () => {
+            return {
+                value: 'item_no',
+                label: 'item_name'
+            }
+        }
+    }
+});
+const selectRef = ref(null);
+const localOptions = ref([]);
+const localfieldNames = ref(props.fieldNames);
+const localValue = computed({
+    get: () => {
+        console.log('wyq:pro-select-获取localValue值:', props.value);
+        return props.value;
+    },
+    set: (value) => {
+        console.log('wyq:pro-select-更改localValue值:', value);
+        emits('update:value', value);
+    }
+});
+
+watch(() => props.options, (newOptions) => {
+    localOptions.value = newOptions;
+});
+
+if (props.selectType === 'accLvl') {
+    watch(() => props.sobNo, async () => {
+        // 监听
+        console.log('wyq:pro-select-监听sobNo值:', props.sobNo);
+        await getAccLvlOptionsData();
+    });
+}
+const onSelect = (value, option) => {
+    emits('onSelect', value, option);
+}
+
+const onChange = (value, option) => {
+    console.log('wyq:pro-select-更改localValue值:', value, option);
+    emits('onChange', value, option);
+}
+
+onMounted(async () => {
+    await getLocalOptionsData();
+});
+
+async function getLocalOptionsData () {
+    if (!isEmpty(props.options)) {
+        localOptions.value = props.options;
+    } else if (!isEmpty(props.selectType)) {
+        if (props.selectType === 'relationNo') {
+            await getDepartRelationOptionsData();
+        } else if (props.selectType === 'accLvl') {
+            await getAccLvlOptionsData();
+        } else if (props.selectType === 'curr') {
+            await getCurOptionsData();
+        } else if (props.selectType === 'perSys') {
+            await getPerSysOptionsData();
+        } else if (props.selectType === 'periodic') {
+            await getPeriodicOptionsData();
+        }
+    } else {
+        let queyUrl = '';
+        let params;
+        if (!isEmpty(props.tableName) && !isEmpty(props.colName)) {
+            queyUrl = '/system/select/options/loadTbl'
+            params = {
+                tableName: props.tableName,
+                colName: props.colName
+            }
+        } else {
+            queyUrl = props.url;
+            params = {};
+        }
+        if (queyUrl) {
+            await getOptions(queyUrl, params).then((response) => {
+                if (response != null) {
+                    localOptions.value = response
+                }
+            })
+            if (!isEmpty(localOptions.value) && localOptions.value.length > 0) {
+                const defaultOption = findOptionByField('is_default', 'Y');
+                if (!isEmpty(defaultOption)) {
+                    localValue.value = defaultOption[localfieldNames.value.value];
+                    emits('onSelect', localValue.value, defaultOption);
+                }
+            }
+        }
+    }
+}
+
+async function getAccLvlOptionsData () {
+    if (!isEmpty(props.sobNo)) {
+        let queyUrl = '/system/common/action/serachAccLvl';
+        let params = {
+            sob_no: props.sobNo,
+            addEndFlag: props.addEndFlag
+        }
+        await getOptions(queyUrl, params).then((response) => {
+            if (response != null) {
+                localOptions.value = response
+            }
+        })
+
+        if (!isEmpty(localOptions.value) && localOptions.value.length > 0) {
+            const defaultOption = localOptions.value[localOptions.value.length - 1];
+            if (!isEmpty(defaultOption)) {
+                localValue.value = defaultOption[localfieldNames.value.value];
+                emits('onSelect', localValue.value, defaultOption);
+            }
+        }
+    }
+}
+
+async function getDepartRelationOptionsData () {
+    let queyUrl = '/system/select/options/relationInfoNo.do';
+    let params = {
+        pageInterfaceNo: props.pageInterfaceNo
+    };
+    await getOptions(queyUrl, params).then((response) => {
+        if (response != null) {
+            localOptions.value = response
+        }
+    })
+    if (!isEmpty(localOptions.value) && localOptions.value.length > 0) {
+        const option = findOption("AAAAAA");
+        console.log('wyq:pro-select-获取departRelationOptionsData值:', localOptions.value, option);
+        if (!isEmpty(option)) {
+            localValue.value = option[localfieldNames.value.value];
+            emits('onSelect', localValue.value, option);
+        }
+    }
+}
+
+async function getCurOptionsData () {
+    let queyUrl = '/system/select/options/currencyLoad.do';
+    let params = {
+        correct: props.correct
+    };
+    await getOptions(queyUrl, params).then((response) => {
+        if (response != null) {
+            localOptions.value = response
+        }
+    })
+
+    if (!isEmpty(localOptions.value) && localOptions.value.length > 0) {
+        let defaultValue = '';
+        queyUrl = '/im/dhc/zz/automake/zzmanage/report/GetForeignCurConttroller.do';
+        params = {};
+        await getOptions(queyUrl, params).then((response) => {
+            if (response != null) {
+                defaultValue = response.foreign_cur_no;
+            }
+        })
+        const option = findOption(defaultValue);
+        if (!isEmpty(option)) {
+            localValue.value = option[localfieldNames.value.value];
+            emits('onSelect', localValue.value, option);
+        }
+    }
+}
+
+async function getPerSysOptionsData () {
+    let queyUrl = '/system/select/options/getSystemInfo.do';
+    let params = {
+        cascadeFlag: props.cascadeFlag
+    }
+
+    await getOptions(queyUrl, params).then((response) => {
+        if (response != null) {
+            localOptions.value = response
+            localfieldNames.value = {
+                value: 'ITEM_NO',
+                label: 'ITEM_NAME'
+            }
+        }
+    })
+    console.log('wyq:pro-select-获取getPerSysOptionsData值:', localfieldNames.value);
+
+    console.log('wyq:pro-select-获取getPerSysOptionsData值:', localOptions.value);
+
+}
+
+async function getPeriodicOptionsData () {
+    let queyUrl = '/system/select/options/periodicComponent.do';
+    let params = {
+        cycTypeField: 'zcfzb'
+    }
+    await getOptions(queyUrl, params).then((response) => {
+        if (response != null) {
+            localOptions.value = response
+        }
+    })
+    if (!isEmpty(localOptions.value) && localOptions.value.length > 0) {
+        const defaultOption = findOptionByField('is_default', 'Y');
+        if (!isEmpty(defaultOption)) {
+            const defaultValue = defaultOption[localfieldNames.value.value];
+            localValue.value = defaultValue;
+            console.log('wyq:pro-select-获取CycType值:', defaultValue, defaultOption);
+            emits('onSelect', defaultValue, defaultOption);
+        }
+    }
+}
+
+const findOption = (value) => {
+    return findOptionByField(localfieldNames.value.value, value);
+};
+
+const findOptionByField = (field, value) => {
+    const option = localOptions.value.find(option => option[field] === value);
+    return { ...option }
+};
+</script>

ant-design-pro-vue3/src/components/ProForm/fields/ProSelectTree/index.vue

@@ -15,9 +15,9 @@
                 </pro-tree>
                 <!-- 单选树 -->
                 <pro-tree v-else id="tree-option" ref="selectTree" :accordion="accordion" :data="dataOptions"
-                    v-model:selectedKeys="valueId" :dataList="dataList" :props="props" :node-key="props.key"
-                    :default-expanded-keys="defaultExpandedKey" :show-checkbox="false" :expand-on-click-node="false"
-                    highlight-current :isProSelectTree="true" :expandTier="expandTier"
+                    v-model:selectedKeys="valueId" :dataList="dataList" :props="props" :fieldNames="props"
+                    :node-key="props.key" :default-expanded-keys="defaultExpandedKey" :show-checkbox="false"
+                    :expand-on-click-node="false" highlight-current :isProSelectTree="true" :expandTier="expandTier"
                     proSelectTreeStyle="max-height: 300px;overflow: auto;" @node-click="handleNodeClick" v-bind="$attrs"
                     :filterNodeName="filterNodeName">
                 </pro-tree>
@@ -127,6 +127,11 @@ export default {
             dataList: [], //列表数据
             loading: false,
             visiable: false,
+            props: {
+                title: 'name',
+                key: 'id',
+                children: 'children'
+            }
         }
     },
     mounted () {
@@ -188,9 +193,11 @@ export default {
         //处理下拉数据
         dealData () {
             //处理下拉数据
+            console.log("xxxdealData", this.options);
             const { options, type, url } = this.$attrs
             if (options || !isEmpty(this.options)) {
                 this.dataOptions = options || this.options
+                console.log("xxxdataOptions", this.dataOptions);
             } else {
                 if (type == 'sob_tree') {
                     this.getDepartmentTree("sobTree")

ant-design-pro-vue3/src/components/ProForm/fields/ProSelectTree2/index.vue

@@ -0,0 +1,169 @@
+<template>
+    <h2>下拉树控件</h2>
+    <a-select ref="selectRef" v-model:value="selectedDisplayValue" :open="isDropdownOpen" placeholder="请选择"
+        :allowClear="true" @clear="handleClear" @click="handleSelectClick" style="width: 500px">
+        <template #dropdownRender>
+            <pro-tree3 ref="treeRef" :treeType="treeType" :relationNo="relationNo" v-model:txBrNo="txBrNo"
+                v-model:sobNo="sobNo" v-model:expandedKeys="expandedKeys" v-model:selectedKeys="selectedKeys"
+                v-model:checkedKeys="checkedKeys" @select="onSelect" @expand="onExpand" @check="onCheck"
+                v-bind="$attrs"></pro-tree3>
+        </template>
+    </a-select>
+</template>
+<script setup>
+import { ref, defineProps, defineExpose, onMounted, onBeforeUnmount, watch, nextTick, provide, defineEmits } from 'vue';
+// 定义组件接收的 props
+const props = defineProps({
+    // 树类型
+    treeType: {
+        type: String,
+        required: true
+    },
+    // 机构树汇总关系
+    relationNo: {
+        type: String,
+        default: ''
+    },
+    // 机构
+    txBrNo: {
+        type: String,
+        default: ''
+    },
+    // 账套
+    sobNo: {
+        type: String,
+        default: ''
+    },
+
+    selectedKeys: {
+        type: Array,
+        default: () => []
+    },
+    checkedKeys: {
+        type: Array,
+        default: () => []
+    },
+    expandedKeys: {
+        type: Array,
+        default: () => []
+    }
+});
+// 定义自定义事件，用于通知父组件
+const emits = defineEmits(['update:txBrNo', 'update:sobNo', 'update:selectedKeys', 'update:checkedKeys', 'update:expandedKeys', 'onCheck', 'onSelect', 'onExpand']);
+// 由于 props 是响应式的，直接使用解构赋值
+const { treeType, relationNo, txBrNo, sobNo, selectedKeys, expandedKeys } = props;
+const checkedKeys = ref([...props.checkedKeys]);
+
+// 用于显示在下拉框中的选中值
+const selectedDisplayValue = ref('');
+// 是否显示下拉框
+const isDropdownOpen = ref(false);
+
+// 处理 a-select 清除事件
+const handleClear = () => {
+    console.log('wyq-handleClear', props.checkedKeys);
+    console.log('wyq-handleClear', checkedKeys.value);
+    // wyq-TODO:待实现功能,一进行清理就死循环了
+    // checkedKeys.value = [];
+    selectedDisplayValue.value = '';
+};
+
+// 处理选择框点击事件
+const handleSelectClick = () => {
+    // 清空搜索框 wyq-TODO:实现搜索功能
+    // searchValue.value = '';
+    // searchResultList.value = [];
+    isDropdownOpen.value = true;
+};
+
+
+
+
+const selectRef = ref(null);
+const treeRef = ref(null);
+const handleDocumentClick = (event) => {
+    if (
+        selectRef.value &&
+        treeRef.value &&
+        !selectRef.value.$el.contains(event.target) &&
+        !treeRef.value.$el.contains(event.target)
+    ) {
+        isDropdownOpen.value = false;
+    }
+};
+
+onMounted(() => {
+    document.addEventListener('click', handleDocumentClick);
+});
+
+onBeforeUnmount(() => {
+    document.removeEventListener('click', handleDocumentClick);
+});
+
+// 根据不同类型的树监听相应参数的变化
+if (props.treeType === 'deptTree') {
+    watch(() => props.relationNo, (newRelationNo) => {
+        relationNo = newRelationNo;
+    });
+    watch(txBrNo, (newTxBrNo) => {
+        emits('update:txBrNo', newTxBrNo);
+    });
+} else if (props.treeType === 'sobTree') {
+    watch(() => props.txBrNo, (newtxBrNo) => {
+        txBrNo = newtxBrNo;
+    });
+    watch(sobNo, (newSobNo) => {
+        emits('update:sobNo', newSobNo);
+    });
+} else if (props.treeType === 'sobItemTree') {
+    watch(() => props.sobNo, (newSobNo) => {
+        sobNo = newSobNo;
+    });
+}
+
+watch(() => props.checkedKeys, (newCheckedKeys) => {
+    checkedKeys.value = [...newCheckedKeys];
+});
+watch(() => props.selectedKeys, (newSelectedKeys) => {
+    selectedKeys.value = [...newSelectedKeys];
+});
+watch(() => props.expandedKeys, (newExpandedKeys) => {
+    expandedKeys.value = [...newExpandedKeys];
+});
+
+watch(
+    checkedKeys,
+    (newCheckedKeys) => {
+        console.log('wyq-checkedKeys', newCheckedKeys);
+        emits('update:checkedKeys', newCheckedKeys);
+        //checkedKeys.value = [...newCheckedKeys];
+    }
+);
+watch(
+    selectedKeys,
+    (newSelectedKeys) => {
+        emits('update:selectedKeys', newSelectedKeys);
+    },
+    { deep: true }
+);
+watch(
+    expandedKeys,
+    (newExpandedKeys) => {
+        emits('update:expandedKeys', newExpandedKeys);
+    },
+    { deep: true }
+);
+
+const onCheck = (checkedKeys, info) => {
+    emits('onCheck', checkedKeys, info);
+};
+
+const onSelect = (selectedKeys, info) => {
+    emits('onSelect', selectedKeys, info);
+};
+
+const onExpand = (expandedKeys, info) => {
+    emits('onExpand', expandedKeys, info);
+};
+
+</script>

ant-design-pro-vue3/src/components/ProForm/fields/ProSelectTree3/index.vue

@@ -0,0 +1,381 @@
+<template>
+    <a-select ref="selectRef" v-model:value="localValue" :mode="mode" placeholder="请选择" :tagRender="tagRender"
+        :options="optionData" :fieldNames="optionFieldNames" :maxTagCount=1 :allowClear="true" @clear="onClear"
+        :open="isDropdownOpen" @click="onSelectClick" :showSearch="false">
+        <template #dropdownRender>
+            <div ref="dropdownRef">
+                <pro-tree3 ref="proTreeRef" :tree-data="localTreeData" :fieldNames="fieldNames"
+                    v-model:value="localValue" v-model:stddNo="stddNo" :showCheckbox="showCheckbox" :multiple="multiple"
+                    :isAsync="isAsync" :treeType="treeType" :isStopPropagation="isStopPropagation"
+                    :isClearSearchResult="isClearSearchResult" :isWithoutDsc="isWithoutDsc" @getNodes="getNodes"
+                    @onNode="onNode" v-bind="$attrs">
+                </pro-tree3>
+            </div>
+        </template>
+    </a-select>
+</template>
+<script setup lang="jsx">
+import { isEmpty } from '@/utils/validate'
+import { findNodes } from '@/utils/treeUtil'
+import { getTreeData } from '@/api/treeDataApi';
+import { ref, defineProps, defineEmits, onMounted, onBeforeUnmount, watch, nextTick, computed, h } from 'vue';
+// 定义组件接收的 props
+const props = defineProps({
+    value: {
+        type: [String, Array, Number],
+        required: true
+    },
+    treeType: {
+        type: String,
+        default: ''
+    },
+    isAsync: {
+        type: Boolean,
+        default: false
+    },
+    relationNo: {
+        type: String,
+        default: ''
+    },
+    brNos: {
+        type: Array,
+        default: () => []
+    },
+    stddNo: {
+        type: String,
+        default: ''
+    },
+    sobNo: {
+        type: [String, Array],
+        default: ''
+    },
+    treeData: {
+        type: Array,
+        default: () => []
+    },
+    multiple: {
+        type: Boolean,
+        default: false
+    },
+    showCheckbox: {
+        type: Boolean,
+        default: false
+    },
+    formItemProps: {
+        type: Object,
+        default: () => { }
+    },
+    isStopPropagation: {
+        // 是否阻止冒泡
+        type: Boolean,
+        default: true
+    },
+    isClearSearchResult: {
+        // 是否自动清空搜索结果
+        type: Boolean,
+        default: false
+    },
+    isWithoutDsc: {
+        // 是否不包含后代节点返回
+        type: Boolean,
+        default: false
+    },
+    mode: {
+        type: String,
+        default: 'multiple'
+    },
+    fieldNames: {
+        type: Object,
+        default: () => {
+            return {
+                key: 'id',
+                title: 'name',
+                children: 'children'
+            }
+        }
+    }
+
+});
+const emits = defineEmits(['update:value', 'update:stddNo', 'get-nodes']);
+console.log('wyq:pro-select-tree-接收参数:', props);
+const selectRef = ref(null);
+const dropdownRef = ref(null);
+const proTreeRef = ref(null);
+const isDropdownOpen = ref(false);
+const optionData = ref([]);
+const localTreeData = ref([]);
+const optionFieldNames = {
+    value: props.fieldNames.key,
+    label: props.fieldNames.title,
+};
+const localValue = computed({
+    // 从父组件获取值
+    get: () => {
+        console.log('wyq:pro-select-tree-获取localValue值:', props.value);
+        return props.value;
+    },
+    // 向父组件传递更新
+    set: (value) => {
+        console.log('wyq:pro-select-tree-更改localValue值:', value);
+        emits('update:value', value);
+    }
+});
+
+const stddNo = computed({
+    // 从父组件获取值
+    get: () => {
+        if (props.treeType === 'sobTree') {
+            return props.stddNo;
+        }
+        return '';
+    },
+    // 向父组件传递更新
+    set: (value) => {
+        if (props.treeType === 'sobTree') {
+            emits('update:stddNo', value);
+        }
+    }
+});
+
+function getNodes (value, nodes) {
+    console.log('wyq:pro-select-tree-getNodes 获取节点:', value, nodes);
+    optionData.value = nodes;
+    emits('get-nodes', value, nodes);
+}
+
+function onNode (item) {
+    isDropdownOpen.value = false;
+}
+
+// 点击其他区域隐藏下拉框
+const handleDocumentClick = (event) => {
+    if (
+        selectRef.value &&
+        dropdownRef.value &&
+        !selectRef.value.$el.contains(event.target) &&
+        !dropdownRef.value.contains(event.target)
+    ) {
+        isDropdownOpen.value = false;
+    }
+};
+
+const onClear = () => {
+    // localValue.value = [];
+    console.log('wyq:pro-select-tree-清空选择', Array.isArray(localValue.value) ? [] : '');
+    if (Array.isArray(localValue.value)) {
+        localValue.value = [];
+    } else {
+        const val = '10';
+        localValue.value = val;
+    }
+    //localValue.value = Array.isArray(localValue.value) ? [] : '';
+};
+
+// 处理选择框点击事件
+const onSelectClick = () => {
+    // 清空上一次搜索框内容和结果
+    if (proTreeRef.value) {
+        proTreeRef.value.onClearSearch();
+    }
+    isDropdownOpen.value = true;
+};
+
+
+// 监听shuTreeData变化，更新localTreeData
+watch(() => props.treeData, (newTreeData) => {
+    localTreeData.value = newTreeData;
+});
+
+// 根据不同类型的树监听相应参数的变化
+if (props.treeType === 'deptTree') {
+    watch(() => props.relationNo, async () => {
+        // 监听机构汇总关系发生变化,重新请求机构树
+        await getTreeTypeData();
+    });
+} else if (props.treeType === 'sobTree') {
+    // 监听账套树
+    watch(() => props.brNos, async () => {
+        // TODO : 这个地方可能会被 pro-tree 和 pro-select-tree都调用
+        // 监听机构发生变化,重新请求账套树
+        await getTreeTypeData();
+    });
+} else if (props.treeType === 'sobItemTree') {
+    watch(() => props.sobNo, async () => {
+        // 监听账套发生变化,重新请求科目树
+        await getTreeTypeData();
+    });
+}
+
+// 定义 tagRender 函数
+const tagRender = (props) => {
+    const isLastValue = localValue.value[localValue.value.length - 1] === props.value;
+    return h('span', { class: 'no-wrap' }, [
+        props.label,
+        !isLastValue && ',',
+    ]);
+};
+
+onMounted(async () => {
+    document.addEventListener('click', handleDocumentClick);
+    await getLocalTreeData();
+});
+
+onBeforeUnmount(() => {
+    document.removeEventListener('click', handleDocumentClick);
+});
+
+
+async function getLocalTreeData () {
+    console.log('wyq:pro-select-tree-准备树数据');
+    if (!isEmpty(props.treeData)) {
+        localTreeData.value = props.treeData;
+        if (!isEmpty(props.value)) {
+            const nodes = findNodes(localTreeData, props.fieldNames.key, props.value);
+            optionData.value = nodes;
+            emits('get-nodes', props.value, nodes);
+        }
+    } else if (!isEmpty(props.treeType)) {
+        // 如果 props.treeData 不存在，则请求后端接口获取树数据
+        await getTreeTypeData();
+    }
+}
+
+async function getTreeTypeData () {
+    const { treeData, defaultValue, defaultNode, defaultStddNo } = await getTreeData(props, {});
+    if (!isEmpty(treeData) && treeData.length > 0) {
+        localTreeData.value = treeData;
+
+        // 使用 nextTick 确保在 DOM 更新后执行后续操作
+        // await nextTick();
+
+        if (!isEmpty(defaultValue)) {
+            optionData.value = defaultNode;
+            localValue.value = defaultValue;
+            emits('get-nodes', defaultValue, defaultNode);
+        }
+
+        if (!isEmpty(defaultStddNo) && props.treeType === 'sobTree') {
+            stddNo.value = defaultStddNo;
+        }
+    }
+    console.log('wyq:pro-select-tree-获取树数据完成', treeData);
+}
+
+
+
+// async function prepareTreeData () {
+//     try {
+//         if (!isEmpty(props.treeData)) {
+//             // 如果 props.treeData 存在，则直接使用 props.treeData
+//             localTreeData.value = props.treeData;
+//             // 处理默认值
+//             if (!isEmpty(props.value)) {
+//                 optionData.value = findNodes(localTreeData, props.fieldNames.key, [props.value]);
+//             }
+//         } else if (!isEmpty(props.treeType)) {
+//             // 如果 props.treeData 不存在，则请求后端接口获取树数据
+//             await fetchTreeData();
+//         }
+//     } catch (error) {
+//         // 处理 fetchTreeData 可能抛出的错误
+//         console.error('Error occurred while preparing tree data:', error);
+//     }
+// }
+
+// async function fetchTreeData () {
+//     try {
+//         // 从 useTreeData 中获取 getTreeData 函数
+//         const { getTreeData } = useTreeData(props, {});
+//         // 调用 getTreeData 函数获取树数据
+//         localTreeData.value = await getTreeData();
+
+//         // 如果树数据为空，提前返回
+//         if (isEmpty(localTreeData.value)) {
+//             return;
+//         }
+
+//         // 使用 nextTick 确保在 DOM 更新后执行后续操作
+//         await nextTick();
+
+//         // 计算默认值
+//         const defaultValues = getDefaultValues(localTreeData.value, props);
+
+//         // 如果默认值不为空
+//         if (!isEmpty(defaultValues)) {
+//             if (props.showCheckbox === true) {
+//                 // 复选框模式
+//                 localValue.value = defaultValues;
+//             } else {
+//                 localValue.value = defaultValues;
+//             }
+//         }
+//     } catch (error) {
+//         // 处理 getTreeData 函数调用时可能出现的错误
+//         message.error(`获取数据失败: ${error.message}`);
+//     }
+// }
+
+// // 提取计算默认值的逻辑到单独的函数
+// function getDefaultValues (treeData, props) {
+//     let defaultValues = '';
+//     switch (props.treeType) {
+//         case 'deptTree':
+//             // 机构树默认值为第一个节点
+//             if (treeData.length > 0) {
+//                 defaultValues = [treeData[0][props.fieldNames.key]];
+//                 optionData.value = findNodes(treeData, props.fieldNames.key, [...defaultValues]);
+//             }
+//             break;
+//         case 'sobTree':
+//             // 账套树默认值为default_yn为Y的节点
+//             const defaultNodes = findNodes(treeData, 'default_yn', 'Y');
+//             if (!isEmpty(defaultNodes) && defaultNodes.length > 0) {
+//                 stddNo.value = defaultNodes[0]['pid'].split('@')[0];
+//                 defaultValues = [defaultNodes[0][props.fieldNames.key]];
+//                 optionData.value = [defaultNodes[0]];
+//             }
+//             break;
+//         case 'sobItemTree':
+//             // 科目树无默认值
+//             break;
+//         default:
+//             break;
+//     }
+//     console.log('wyq:pro-select-tree-默认值:', defaultValues, optionData.value);
+//     return defaultValues;
+// }
+</script>
+
+<style scoped>
+.dropdown-content {
+    /* 设置固定的高度和宽度 */
+    max-height: 300px;
+    /* width: 500px; */
+    /* 设置溢出时显示滚动条 */
+    overflow: auto;
+    /* 可以根据需要添加其他样式 */
+    /* border: 1px solid #ccc; */
+    padding: 8px;
+}
+
+.dropdown-content2 {
+    /* 设置固定的高度和宽度 */
+    max-height: 300px;
+    /* width: 500px; */
+    /* 设置溢出时显示滚动条 */
+    overflow: auto;
+    /* 防止内容换行 */
+    white-space: nowrap;
+    /* 当内容宽度超过元素宽度时显示横向滚动条 */
+    overflow-x: auto;
+    /* 可以根据需要添加其他样式 */
+    /* border: 1px solid #ccc; */
+    padding: 8px;
+}
+
+.no-wrap-tag {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+</style>

ant-design-pro-vue3/src/components/ProForm/main.js

@@ -8,7 +8,12 @@ import ProInputNumber from './fields/ProInputNumber/index.vue'
 import ProInputNumberRange from './fields/ProInputNumberRange/index.vue'
 
 import ProSelect from './fields/ProSelect/index.vue'
+import ProSelect3 from './fields/ProSelect3/index.vue'
+
 import ProSelectTree from './fields/ProSelectTree/index.vue'
+//import ProSelectTree2 from './fields/ProSelectTree2/index.vue'
+import ProSelectTree3 from './fields/ProSelectTree3/index.vue'
+
 import ProRadio from './fields/ProRadio/index.vue'
 import ProCascader from './fields/ProCascader/index.vue'
 import ProCheckbox from './fields/ProCheckbox/index.vue'
@@ -29,6 +34,10 @@ ProFormMount.install = function (Vue){
     Vue.component(ProInputNumberRange.name,ProInputNumberRange)
     Vue.component(ProSelect.name,ProSelect)
     Vue.component(ProSelectTree.name,ProSelectTree)
+    Vue.component('ProSelect3',ProSelect3)
+    //Vue.component('ProSelectTree2',ProSelectTree2)
+    Vue.component('ProSelectTree3',ProSelectTree3)
+
     Vue.component(ProRadio.name,ProRadio)
     Vue.component(ProCascader.name,ProCascader)
     Vue.component(ProCheckbox.name,ProCheckbox)

ant-design-pro-vue3/src/components/ProLayout3/index.vue

@@ -0,0 +1,262 @@
+<template>
+    <div :class="['split-container', direction === 'vertical' ? 'vertical' : 'horizontal']">
+        <div class="split-pane" :style="{ flex: firstPaneFlex }">
+            <!-- 如果父组件传递了 firstTitle 则展示标题 -->
+            <div v-if="firstTitle">
+                <div v-if="!firstCollapsed" class="pane-title">
+                    <span style="color: #fff;font-size: 16px; font-weight: bold;">{{ firstTitle }}</span>
+                    <DoubleLeftOutlined class="title-icon" :rotate="direction === 'vertical' ? 90 : 0"
+                        @click="toggleCollapse('first')" />
+                </div>
+                <div v-else class="pane-title">
+                    <span v-if="direction === 'vertical'" style="color: #fff;font-size: 16px; font-weight: bold;">{{
+                        firstTitle }}</span>
+                    <DoubleRightOutlined :rotate="direction === 'vertical' ? 90 : 0" @click="toggleCollapse('first')" />
+                </div>
+            </div>
+            <div>
+                <slot name="first-title"></slot>
+            </div>
+            <div v-show="!firstCollapsed" class="pane-content">
+                <!-- <div v-if="isDragging" style="width: 100%; height: 100%;  background: yellow; display: block;"></div> -->
+                <slot name="first"></slot>
+                <div v-if="isDragging" class="overlay"
+                    style="position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: 10; background: rgba(0, 0, 0, 0);">
+                </div>
+            </div>
+
+        </div>
+        <div class="split-handle" @mousedown="startDrag" @touchstart="startDrag"></div>
+        <div class="split-pane" :style="{ flex: secondPaneFlex }">
+            <!-- 如果父组件传递了 secondTitle 则展示标题 -->
+            <div v-if="secondTitle">
+                <div class="pane-title">
+                    <span>{{ secondTitle }}</span>
+                    <DoubleLeftOutlined class="title-icon" @click="toggleCollapse('first')" />
+                </div>
+            </div>
+            <div class="pane-content">
+                <!-- <div v-if="isDragging" style="width: 100%; height: 100%;  background: blue; display: block;"></div> -->
+                <slot name="second"></slot>
+                <div v-if="isDragging" class="overlay"
+                    style="position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: 10; background: rgba(0, 0, 0, 0);">
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { ref, onMounted, onUnmounted } from 'vue';
+import { DoubleRightOutlined, DoubleLeftOutlined } from "@ant-design/icons-vue";
+
+const props = defineProps({
+    direction: {
+        type: String,
+        default: 'horizontal',
+        // horizontal: 左右布局，vertical: 上下布局
+        validator: (value: string) => ['horizontal', 'vertical'].includes(value)
+    },
+    initialRatio: {
+        type: Number,
+        default: 0.5
+    },
+    firstTitle: {
+        type: String,
+        default: ''
+    },
+    secondTitle: {
+        type: String,
+        default: ''
+    }
+});
+
+const isDragging = ref(false);
+const startX = ref(0);
+const startY = ref(0);
+const firstPaneFlex = ref(props.initialRatio);
+const secondPaneFlex = ref(1 - props.initialRatio);
+
+const containerRef = ref<HTMLDivElement | null>(null);
+
+// 新增折叠状态
+const firstCollapsed = ref(false);
+const secondCollapsed = ref(false);
+
+const toggleCollapse = (pane: 'first' | 'second') => {
+    if (pane === 'first') {
+        firstCollapsed.value = !firstCollapsed.value;
+        if (firstCollapsed.value) {
+            if (props.direction === 'horizontal') {
+                firstPaneFlex.value = 0.02;
+
+            } else {
+                firstPaneFlex.value = 0.07;
+
+            }
+            secondPaneFlex.value = 1 - firstPaneFlex.value;
+            console.log('firstCollapsed', firstPaneFlex.value, secondPaneFlex.value);
+
+        } else {
+            firstPaneFlex.value = props.initialRatio;
+            secondPaneFlex.value = 1 - props.initialRatio;
+        }
+    } else {
+        secondCollapsed.value = !secondCollapsed.value;
+        if (secondCollapsed.value) {
+            secondPaneFlex.value = 0.02;
+            firstPaneFlex.value = 1 - secondPaneFlex.value;
+        } else {
+            secondPaneFlex.value = 1 - props.initialRatio;
+            firstPaneFlex.value = props.initialRatio;
+        }
+    }
+};
+
+
+const startDrag = (event: MouseEvent | TouchEvent) => {
+    event.stopPropagation();
+    event.preventDefault();
+    isDragging.value = true;
+    if (event instanceof MouseEvent) {
+        startX.value = event.clientX;
+        startY.value = event.clientY;
+    } else {
+        startX.value = event.touches[0].clientX;
+        startY.value = event.touches[0].clientY;
+    }
+    document.addEventListener('mousemove', onDrag);
+    document.addEventListener('touchmove', onDrag);
+    document.addEventListener('mouseup', endDrag);
+    document.addEventListener('touchend', endDrag);
+};
+
+const onDrag = (event: MouseEvent | TouchEvent) => {
+    if (!isDragging.value || !containerRef.value) return;
+    const containerRect = containerRef.value.getBoundingClientRect();
+    let delta;
+    if (props.direction === 'horizontal') {
+        const currentX = event instanceof MouseEvent ? event.clientX : event.touches[0].clientX;
+        delta = currentX - startX.value;
+        const totalWidth = containerRect.width;
+        const newFlex = firstPaneFlex.value + delta / totalWidth;
+        if (newFlex > 0 && newFlex < 1) {
+            firstPaneFlex.value = newFlex;
+            secondPaneFlex.value = 1 - newFlex;
+            startX.value = currentX;
+        }
+    } else {
+        const currentY = event instanceof MouseEvent ? event.clientY : event.touches[0].clientY;
+        delta = currentY - startY.value;
+        const totalHeight = containerRect.height;
+        const newFlex = firstPaneFlex.value + delta / totalHeight;
+        if (newFlex > 0 && newFlex < 1) {
+            firstPaneFlex.value = newFlex;
+            secondPaneFlex.value = 1 - newFlex;
+            startY.value = currentY;
+        }
+    }
+};
+
+const endDrag = () => {
+    isDragging.value = false;
+    document.removeEventListener('mousemove', onDrag);
+    document.removeEventListener('touchmove', onDrag);
+    document.removeEventListener('mouseup', endDrag);
+    document.removeEventListener('touchend', endDrag);
+};
+
+onMounted(() => {
+    containerRef.value = document.querySelector('.split-container') as HTMLDivElement;
+});
+
+onUnmounted(() => {
+    document.removeEventListener('mousemove', onDrag);
+    document.removeEventListener('touchmove', onDrag);
+    document.removeEventListener('mouseup', endDrag);
+    document.removeEventListener('touchend', endDrag);
+});
+</script>
+
+<style scoped>
+.split-container {
+    display: flex;
+    width: 100%;
+    height: 100%;
+}
+
+.horizontal {
+    /* 默认为水平方向 */
+    flex-direction: row;
+}
+
+.vertical {
+    /* 垂直方向 */
+    flex-direction: column;
+}
+
+/* .split-pane {
+    overflow: auto;
+} */
+.split-pane {
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+    /* 改为hidden防止双滚动条 */
+    height: 100%;
+}
+
+.split-handle {
+    /*水平方向的拖拽手柄 */
+    cursor: col-resize;
+    background-color: #ccc;
+    width: 5px;
+
+
+}
+
+.vertical .split-handle {
+    /* 垂直方向的拖拽手柄 */
+    cursor: row-resize;
+    height: 5px;
+    width: 100%;
+
+}
+
+.pane-title {
+    height: 34px;
+    padding: 5px 12px;
+    background-color: #1890ff;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    flex-shrink: 0;
+    border-bottom: 1px solid #ddd;
+}
+
+/* .pane-content {
+    overflow: auto;
+} */
+
+.pane-content {
+    flex-grow: 1;
+    overflow: auto;
+    min-height: 0;
+}
+
+.title-icon {
+    /* color: #666;
+    font-size: 12px; */
+    margin-left: 8px;
+
+    transition: transform 0.2s;
+}
+
+.split-handle:hover {
+    background-color: #999;
+}
+
+.split-handle:active {
+    background-color: #666;
+}
+</style>

ant-design-pro-vue3/src/components/ProReport/DepartPanel.vue

@@ -0,0 +1,93 @@
+<template>
+    <!--1-机构汇总关系-->
+    <div>
+        <span>汇总关系：</span>
+        <pro-select3 v-model:value="localRelationNo" @onSelect="onSelect" class="relation-select" placeholder="请选择汇总关系"
+            :allowClear="true" selectType="relationNo" :pageInterfaceNo="pageInterfaceNo">
+        </pro-select3>
+    </div>
+    <!--2-机构树类型-->
+    <div style="margin-bottom: -10px">
+        <a-tabs type="card" v-model:activeKey="localTreeType" :tabBarGutter="5">
+            <a-tab-pane v-for="tab in localTreeTabs" :key="tab.key" :tab="tab.title">
+            </a-tab-pane>
+        </a-tabs>
+    </div>
+    <!--3-机构树-->
+    <pro-tree3 v-model:value="localBrNos" :relationNo="localRelationNo" treeType="deptTree" @getNodes="getNodes"
+        :showCheckbox="true" :isWithoutDsc="true"></pro-tree3>
+</template>
+<script setup lang="jsx">
+import { ref, defineProps, reactive, defineExpose, defineEmits, onMounted, onBeforeUnmount, watch, nextTick, computed } from 'vue';
+const props = defineProps({
+    relationNo: {
+        type: String,
+        default: '',
+        required: true
+    },
+    brNos: {
+        type: Array,
+        default: () => [],
+        required: true
+    },
+    pageInterfaceNo: {
+        type: String,
+        default: 'zzsearch_01_01_02'
+    },
+    // treeType: {
+    //     type: String,
+    //     default: '0'
+    // }
+});
+const emits = defineEmits(['update:brNos', 'update:relationNo', 'get-nodes', 'onSelect']);
+const localTreeType = ref('0');
+const localTreeTabs = [
+    {
+        key: '0',
+        title: '账务树',
+    },
+    {
+        key: '1',
+        title: '对比树',
+    },
+    {
+        key: '2',
+        title: '报送树',
+    }
+];
+
+const localRelationNo = computed({
+    get: () => {
+        return props.relationNo;
+    },
+    set: (value) => {
+        emits('update:relationNo', value);
+    }
+});
+
+const localBrNos = computed({
+    get: () => {
+        return props.brNos;
+    },
+    set: (value) => {
+        emits('update:brNos', value);
+    }
+});
+
+function getNodes (value, nodes) {
+    console.log('DepartPanel-getNodes', value, nodes);
+    emits('get-nodes', value, nodes);
+}
+
+const onSelect = (value, option) => {
+    emits('onSelect', value, option);
+}
+</script>
+
+<style scoped>
+.relation-select {
+    /* display: inline-block; */
+    /* vertical-align: middle; */
+    width: 170px;
+}
+</style>

ant-design-pro-vue3/src/components/ProReport/ResultPanel.vue

@@ -0,0 +1,173 @@
+<template>
+    <div>
+        <a-tabs :size="'small'" v-model:activeKey="activeKey" type="editable-card" @edit="handleTabEdit"
+            :hideAdd="true">
+            <a-tab-pane v-for="tab in tabs" :key="tab.key" :tab="tab.title" :closable="tab.closable">
+                <div style="overflow: auto;">
+                    <iframe :ref="el => setIframeRef(el, tab.random)" :data-key="tab.key" frameborder="0"
+                        style="border: none; background: none; width: 100%; height: 800px">
+                    </iframe>
+                    <!-- <div style="height:100px;">
+                        查询结果<br>
+                        查询结果<br>
+                    </div> -->
+                </div>
+            </a-tab-pane>
+        </a-tabs>
+    </div>
+</template>
+<script setup lang="jsx">
+import settings from '@/settings'
+import { ref, defineProps, reactive, defineExpose, defineEmits, onMounted, onBeforeUnmount, watch, nextTick, computed } from 'vue';
+const props = defineProps({
+});
+const systemPrefix = settings.systemPrefix;
+const activeKey = ref('');
+const tabs = reactive([]);
+function handleTabEdit (targetKey, action) {
+    if (action === 'remove') {
+        const index = tabs.findIndex(tab => tab.key === targetKey);
+        if (index !== -1) {
+            tabs.splice(index, 1);
+            // 关闭当前标签页后,默认选中第一个标签页
+            if (tabs.length > 0) {
+                activeKey.value = tabs[0].key;
+            } else {
+                activeKey.value = null;
+            }
+        }
+    }
+}
+
+const iframeRefPrefix = "iframeRef";
+function setIframeRef (el, random) {
+    if (el) {
+        el.id = `${iframeRefPrefix}${random}`;
+        el.name = `${iframeRefPrefix}${random}`;
+    }
+}
+
+const searchParams = [
+    {
+        relation_info_noDepartTreePanel: 'AAAAAA',
+        rpt_date: '20231117',
+        cyc_type: '06',
+        cur_no: '1',
+        sob_no: '10',
+        sh_flag: '',
+        adj_type: '',
+        acc_lvl: '4',
+        zero_print_yn: '01',
+        exrate_type: '',
+        is_gather: '',
+        stdd_no: '2',
+        tel_no: '1',
+        dep_no: '1',
+        rptDepName: '[1800000009]东华银行',
+        br_no: '1',
+        tab_name: 'v_gl_sub_coll_day1',
+        reportNameCN: '业务状况表(年报)人民币20231117',
+        reportNameEN: 'ywzkb',
+        reportFileName: 'ywzkb',
+        reportModuleName: 'zz',
+        curName: '人民币',
+        timeStamp: '币种名称',
+        title_name: '业务状况表',
+    }
+]
+
+const search = () => {
+    const data = {
+        reportNameCN: '业务状况表',
+        rpt_date: '20231117',
+        cyc_type: '06',
+    }
+    const random = Math.random().toString().split('.')[1];
+    const divId = `report_result_div${random}`;
+    // Add a new tab
+    const newTab = {
+        title: data.reportNameCN,
+        key: divId,
+        closable: true,
+        random: random
+    };
+    tabs.push(newTab);
+    activeKey.value = divId;
+    nextTick(() => {
+        // const iframe = document.getElementById('reportIframe');
+        const iframe = document.getElementById(`${iframeRefPrefix}${random}`);
+        let url = '/zz-pack/report/query/zz/ywzkb'
+        let html = '<form action="' + url + '" method="post" target="_self" id="postData_form_newZcfzb">' +
+            '<input  name="relation_info_noDepartTreePanel" type="hidden" value="AAAAAA"/>' +
+            '<input  name="rpt_date" type="hidden" value="20231117"/>' +
+            '<input  name="cyc_type" type="hidden" value="06"/>' +
+            '<input  name="cur_no" type="hidden" value="1"/>' +
+            '<input  name="sob_no" type="hidden" value="10"/>' +
+            '<input  name="sh_flag" type="hidden" value=""/>' +
+            '<input  name="adj_type" type="hidden" value=""/>' +
+            '<input  name="acc_lvl" type="hidden" value="4"/>' +
+            '<input  name="zero_print_yn" type="hidden" value="01"/>' +
+            '<input  name="exrate_type" type="hidden" value=""/>' +
+            '<input  name="is_gather" type="hidden" value=""/>' +
+            '<input  name="stdd_no" type="hidden" value="2"/>' +
+            '<input  name="tel_no" type="hidden" value="1"/>' +
+            '<input  name="dep_no" type="hidden" value="1"/>' +
+            '<input  name="rptDepName" type="hidden" value="[1800000009]东华银行"/>' +
+            '<input  name="br_no" type="hidden" value="1"/>' +
+            '<input  name="tab_name" type="hidden" value="v_gl_sub_coll_day1"/>' +
+            '<input  name="reportNameCN" type="hidden" value="业务状况表(年报)人民币20231117"/>' +
+            '<input  name="reportNameEN" type="hidden" value="ywzkb"/>' +
+            '<input  name="reportFileName" type="hidden" value="ywzkb"/>' +
+            '<input  name="title_name" type="hidden" value="业务状况表"/>' +
+            '<input  name="reportModuleName" type="hidden" value="zz"/>' +
+            '<input  name="curName" type="hidden" value="人民币"/>' +
+            '<input  name="timeStamp" type="hidden" value="币种名称"/>' +
+            '<input  name="zero_print_ynSql" type="hidden" value=""/>' +
+            '</form>';
+        iframe.contentWindow.document.write(html);
+        iframe.contentWindow.document.getElementById('postData_form_newZcfzb').submit();
+        iframe.onload = () => {
+            console.log('iframe loaded', random);
+        };
+    })
+}
+
+const search2 = (formData) => {
+    console.log('formData', formData);
+}
+
+
+defineExpose({ search, search2 });
+
+
+const searchReport = async (param) => {
+    //1.准备数据
+
+}
+
+const readyReportData = (param) => {
+    const data = {
+
+    }
+}
+
+
+
+const parseParam = (param, key) => {
+    let paramStr = "";
+    // 检查 param 是否是基本数据类型
+    if (typeof param === 'string' || typeof param === 'number' || typeof param === 'boolean') {
+        paramStr += `<input type='hidden' name='${key}' value='${param}'/>`;
+    } else if (param instanceof Object) {
+        // 如果是对象或数组，递归处理每个属性或元素
+        Object.keys(param).forEach(i => {
+            const value = param[i];
+            if (value !== undefined && value !== null && value !== window) {
+                const newKey = key === null || key === undefined ? i : (Array.isArray(param) ? `${key}[${i}]` : `${key}.${i}`);
+                paramStr += parseParam(value, newKey);
+            }
+        });
+    }
+    return paramStr;
+}
+</script>

ant-design-pro-vue3/src/components/ProTree2/index.vue

@@ -0,0 +1,205 @@
+<template>
+    <div>
+        <h2> 子组件, 树类型{{ treeType }}, 机构汇总关系:{{ relationNo }},机构:{{ txBrNo }},账套:{{ sobNo }},选中:{{ checkedKeys }},展开:{{
+            expandedKeys }}</h2>
+        <a-tree :tree-data="treeData" @check="onCheck" v-model:checkedKeys="localCheckedKeys"
+            v-model:expandedKeys="localExpandedKeys" v-bind="$attrs">
+        </a-tree>
+    </div>
+</template>
+
+<script setup>
+import { ref, defineProps, defineExpose, onMounted, watch, nextTick, provide, defineEmits } from 'vue';
+// 定义组件接收的 props
+const props = defineProps({
+    treeType: {
+        type: String,
+        required: true
+    },
+    relationNo: {
+        type: String,
+        default: ''
+    },
+    txBrNo: {
+        type: String,
+        default: ''
+    },
+    sobNo: {
+        type: String,
+        default: ''
+    },
+    checkedKeys: {
+        type: Array,
+        default: () => []
+    },
+    expandedKeys: {
+        type: Array,
+        default: () => []
+    },
+    // 这里假设传递树数据，实际根据你的业务调整
+    treeData: {
+        type: Array,
+        default: () => []
+    }
+});
+
+// 定义自定义事件，用于通知父组件 checkedKeys 变化
+const emits = defineEmits(['onCheck', 'update:txBrNo', 'update:sobNo']);
+
+
+// 本地的 checkedKeys 变量，初始化为父组件传递的值
+const localCheckedKeys = ref([...props.checkedKeys]);
+const localExpandedKeys = ref([...props.expandedKeys]);
+
+// 监听父组件传递的 checkedKeys 变化
+watch(() => props.checkedKeys, (newValue) => {
+    localCheckedKeys.value = [...newValue];
+});
+
+// 监听父组件传递的 checkedKeys 变化
+watch(() => props.expandedKeys, (newValue) => {
+    localExpandedKeys.value = [...newValue];
+});
+
+// 根据不同类型的树监听相应参数的变化
+if (props.treeType === 'deptTree') {
+    watch(() => props.relationNo, async () => {
+        await fetchTreeData();
+    });
+} else if (props.treeType === 'sobTree') {
+    // 监听账套树
+    watch(() => props.txBrNo, async () => {
+        await fetchTreeData();
+    });
+} else if (props.treeType === 'sobItemTree') {
+    watch(() => props.sobNo, async () => {
+        await fetchTreeData();
+    });
+}
+// 树数据
+const treeData = ref([]);
+
+
+const fetchTreeData = async () => {
+    let params = {};
+    let apiUrl = '';
+    switch (props.treeType) {
+        case 'deptTree':
+            // params = { relationNo: props.relationNo };
+            // apiUrl = '/api/deptTree'; // 替换为实际的机构树接口地址
+            if (props.relationNo === 'AAAAAA') {
+                treeData.value = [
+                    {
+                        title: '[811000]马鞍山市汇总',
+                        key: '1',
+                        children: [
+                            {
+                                title: '[811001]马鞍山市花山区',
+                                key: '1-1'
+                            },
+                            {
+                                title: '[811001]马鞍山市雨山区',
+                                key: '1-2'
+                            }
+                        ]
+                    }
+                ];
+                // localCheckedKeys.value = ['1-1'];
+                // localExpandedKeys.value = ['1'];
+            } else {
+                treeData.value = [
+                    {
+                        title: '[812000]当涂市汇总',
+                        key: '2',
+                        children: [
+                            {
+                                title: '[812001]当涂市博望区汇总',
+                                key: '2-1'
+                            },
+                            {
+                                title: '[812001]当涂市和县区汇总',
+                                key: '2-2'
+                            }
+                        ]
+                    }
+                ];
+                // localCheckedKeys.value = ['2-1'];
+                // localExpandedKeys.value = ['2'];
+            }
+            //console.log('wyq-1--------checkedKeys', localExpandedKeys.value);
+            emits('update:txBrNo', localCheckedKeys.value[0]);
+            break;
+        case 'sobTree':
+            params = { txBrNo: props.txBrNo };
+            apiUrl = '/api/sobTree'; // 替换为实际的账套树接口地址
+
+            if (props.txBrNo === '1' || props.txBrNo === '1-1' || props.txBrNo === '1-2') {
+                treeData.value = [
+                    {
+                        title: '新会计准则',
+                        key: '1',
+                        children: [
+                            {
+                                title: '默认账套1',
+                                key: '1-1'
+                            },
+                            {
+                                title: '非默认账套2',
+                                key: '1-2'
+                            }
+                        ]
+                    }
+                ];
+                localCheckedKeys.value = ['1-1'];
+                localExpandedKeys.value = ['1'];
+            } else {
+                treeData.value = [
+                    {
+                        title: '旧会计准则',
+                        key: '2',
+                        children: [
+                            {
+                                title: '默认账套1',
+                                key: '2-1'
+                            },
+                            {
+                                title: '非默认账套2',
+                                key: '2-2'
+                            }
+                        ]
+                    }
+                ];
+                localCheckedKeys.value = ['2-1'];
+                localExpandedKeys.value = ['2'];
+            }
+            emits('update:sobNo', localCheckedKeys.value[0]);
+            break;
+        case 'sobItemTree':
+            params = { sobNo: props.sobNo };
+            apiUrl = '/api/sobItemTree'; // 替换为实际的科目树接口地址
+            break;
+        default:
+            break;
+    }
+
+    // try {
+    //     const response = await axios.get(apiUrl, { params });
+    //     treeData.value = response.data;
+    // } catch (error) {
+    //     console.error('获取树数据失败:', error);
+    // }
+};
+// 初始化时获取树数据
+fetchTreeData();
+
+// 处理树节点勾选变化的事件
+const onCheck = (checkedKeys, info) => {
+    // 触发自定义事件通知父组件 checkedKeys 已更新
+    if (props.treeType === 'deptTree') {
+        emits('update:txBrNo', checkedKeys[0]);
+    } else if (props.treeType === 'sobTree') {
+        emits('update:sobNo', checkedKeys[0]);
+    }
+    emits('onCheck', checkedKeys, info);
+};
+</script>

ant-design-pro-vue3/src/components/ProTree3/index.vue

@@ -0,0 +1,423 @@
+<template>
+    <div>
+        <!-- 搜索框 -->
+        <a-input v-model:value="searchValue" placeholder="请输入关键字进行过滤" />
+        <!-- 搜索结果列表 -->
+        <div class="dropdown-content">
+            <div v-if="searchResultList.length">
+                <div class="search-select-li" v-for="node in searchResultList" :key="node[fieldNames.key]"
+                    @click="onNode(node)">
+                    {{ node[fieldNames.title] }}
+                </div>
+            </div>
+            <!-- 树结构 -->
+            <div v-else>
+                <!-- 等待树数据加载完成后再显示 -->
+                <a-tree v-if="isLocalTreeDataLoaded" :tree-data="localTreeData" :fieldNames="fieldNames"
+                    :checkable="showCheckbox" :multiple="multiple" v-model:selectedKeys="selectedKeys"
+                    v-model:checkedKeys="checkedKeys" v-model:expandedKeys="expandedKeys" @select="onSelect"
+                    @expand="onExpand" :load-data="props.isAsync ? onLoadData : null" v-bind="$attrs">
+                </a-tree>
+                <div v-else>加载中...</div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup>
+import { isEmpty } from '@/utils/validate'
+import { message } from "ant-design-vue";
+import { getTreeData } from '@/api/treeDataApi';
+import { getAnsKeys, getDscKeys, getWithoutDscKeys, delAnsAndDscKeys, findNodes, searchNodes } from '@/utils/treeUtil'
+import { ref, defineProps, defineExpose, defineEmits, onMounted, onBeforeUnmount, watch, nextTick, computed } from 'vue';
+// 1.测试复选框树，checked的变化，为啥机构面板需要特殊写个一个方法呢
+// 2.本地变量的是直接解构赋值 是否有效，还是放到钩子函数： 答：统一放到钩子函数中处理
+
+// 20250303
+// 1. a-select-tree 引用a-tree 通过v-model:value双向绑定了数据, value及时更新了 option还未更新，会影响翻译嘛
+// 解: 通过事件的方式将已经选择的节点传递给父组件,就看父组件加载存在先后问题了，父组件通过事件获取已经选择的节点然后赋值给自己optionData
+// 2. 异步树时,a-select-tree将默认异步根节点通过prop传递给a-tree后 ,后续异步加载时后，opntion需要给到a-select-后续异步加载时后，opntion需要给到a-select-tree的同时，当关闭弹窗后再次打开已经加载一部分数据会重新再加载一次吗
+// 3. 监听不同类型的数据是否需要重新加载数据如汇总关系发生变化重新获取机构， a-select-tree和a-tree都需要处理 但是a-tree需要加一个判断当prop.treeData有数据则不需要处理否则就需要处理，同时获取树数据和默认值方法需要公共起来
+// 解：a-select-tree 根本不会将 relationNo、brNos、sobNo传递给 a-tree 所以根据监控不到
+// 定义组件接收的 props
+const props = defineProps({
+    value: {
+        type: [String, Array, Number],
+        required: true
+    },
+    treeType: {
+        type: String,
+        default: ''
+    },
+    isAsync: {
+        type: Boolean,
+        default: false
+    },
+    relationNo: {
+        type: String,
+        default: ''
+    },
+    brNos: {
+        type: Array,
+        default: () => []
+    },
+    stddNo: {
+        type: String,
+        default: ''
+    },
+    sobNo: {
+        type: [String, Array],
+        default: ''
+    },
+    treeData: {
+        type: Array,
+        default: () => []
+    },
+    formItemProps: {
+        type: Object,
+        default: () => { }
+    },
+    multiple: {
+        type: Boolean,
+        default: false
+    },
+    showCheckbox: {
+        type: Boolean,
+        default: false
+    },
+    isStopPropagation: {
+        // 是否阻止冒泡
+        type: Boolean,
+        default: false
+    },
+    isClearSearchResult: {
+        // 是否自动清空搜索结果
+        type: Boolean,
+        default: true
+    },
+    isWithoutDsc: {
+        // 是否不包含后代节点返回
+        type: Boolean,
+        default: false
+    },
+    fieldNames: {
+        type: Object,
+        default: () => {
+            return {
+                key: 'id',
+                title: 'name',
+                children: 'children'
+            }
+        }
+    }
+});
+// 定义自定义事件，用于通知父组件
+const emits = defineEmits(['update:value', 'update:stddNo', 'get-nodes', 'on-node']);
+console.log('wyq:pro-tree-接收参数:', props);
+// 定义搜索框的值
+const searchValue = ref('');
+// 搜索结果列表
+const searchResultList = ref([]);
+// 树结构数据
+const localTreeData = ref([]);
+// 标记 localTreeData 是否加载完成
+const isLocalTreeDataLoaded = ref(false);
+// 
+const selectedKeys = computed({
+    // 从父组件获取值
+    get: getSelectedKeys,
+    // 向父组件传递更新
+    set: setSelectedKeys
+});
+
+const checkedKeys = computed({
+    // 从父组件获取值
+    get: getCheckedKeys,
+    // 向父组件传递更新
+    set: setCheckedKeys
+});
+
+const expandedKeys = ref([]);
+
+
+function getSelectedKeys () {
+    if (props.showCheckbox === false && !isEmpty(localTreeData.value) && localTreeData.value.length > 0) {
+        console.log('wyq:pro-tree-获取selectedKeys值:', props.value);
+        //return [...props.value];
+        //return Array.isArray(props.value) ? [...props.value] : props.value;
+        return Array.isArray(props.value) ? props.value : [props.value];
+    }
+    return [];
+}
+
+function setSelectedKeys (value) {
+    if (props.showCheckbox === false) {
+        console.log('wyq:pro-tree-更改selectedKeys值:', value);
+        const nodes = findNodes(localTreeData.value, props.fieldNames.key, [...value]);
+        if (props.treeType === 'sobTree') {
+            if (!isEmpty(nodes) && nodes.length > 0) {
+                emits('update:stddNo', nodes[0]['pid'].split('@')[0]);
+            } else {
+                emits('update:stddNo', '');
+            }
+            emits('update:value', value[0]);
+        } else {
+            emits('update:value', value);
+        }
+        console.log('DepartPanel-wyq:pro-tree-更改selectedKeys值:', value, nodes);
+        emits('get-nodes', value, nodes);
+    }
+}
+
+function getCheckedKeys () {
+    if (props.showCheckbox === true && !isEmpty(localTreeData.value) && localTreeData.value.length > 0) {
+        console.log('wyq:pro-tree-获取checkedKeys值:', props.value);
+        //return [...props.value];
+        //return Array.isArray(props.value) ? [...props.value] : props.value;
+        return Array.isArray(props.value) ? props.value : [props.value];
+    }
+    return [];
+}
+
+function setCheckedKeys (value) {
+    if (props.showCheckbox === true) {
+        console.log('wyq:pro-tree-更改checkedKeys值:', value);
+        if (props.isWithoutDsc === true) {
+            const { withoutDesKeys, withoutDesNodes } = getWithoutDscKeys(localTreeData.value, value, props.fieldNames);
+            console.log('wyq:pro-tree-获取withoutDesKeys值:', withoutDesKeys, withoutDesNodes);
+            emits('get-nodes', value, withoutDesNodes);
+            emits('update:value', withoutDesKeys);
+        } else {
+            const nodes = findNodes(localTreeData.value, props.fieldNames.key, [...value]);
+            emits('get-nodes', value, nodes);
+            emits('update:value', value);
+        }
+    }
+}
+
+const onSelect = (keys, info) => {
+    if (props.showCheckbox === true) {
+        const node = { ...info.node };
+        const key = node[props.fieldNames.key];
+        // 得到被选中的所有节点的 key 值
+        console.log('wyq-onSelect-初始', checkedKeys.value);
+        // 处理勾选节点:将勾选节点的子、孙节点全部勾选,这个地方调用下是为了下一步判断的当前点击的是否存在
+        let dscKeys = getDscKeys(localTreeData.value, checkedKeys.value);
+        const index = dscKeys.indexOf(key);
+        console.log('wyq-onSelect-处理后', dscKeys);
+        if (index > -1) {
+            // 如果 key 已存在于 keys 中，则移除
+            console.log('wyq-onSelect-已存在移除', key);
+            // 调用移除节点的方法: 1.需要将移除的节点上级及上上级节点移除 2.需要将移除的节点子、孙节点移除
+            dscKeys = delAnsAndDscKeys(localTreeData.value, key, dscKeys);
+        } else {
+            // 如果 key 不存在于 checkedKeys 中，则添加
+            console.log('wyq-onSelect-不存在添加', key);
+            dscKeys.push(key);
+            // 这个地方再次调用,是因为如果勾选了父节点,需要将父节点下所有子节点全部勾选,所以需要再次处理勾选节点
+            dscKeys = getDscKeys(localTreeData.value, dscKeys);
+        }
+        checkedKeys.value = dscKeys;
+    } else {
+        if (props.multiple === false) {
+            // 单选模式
+            if (props.treeType === 'sobTree') {
+                if (info.node.children && info.node.children.length > 0) {
+                    message.error('请选择账套信息');
+                    nextTick(() => {
+                        selectedKeys.value = [];
+                    });
+                }
+            }
+        }
+    }
+};
+
+const onExpand = (expandedKeys, info) => {
+    if (props.isAsync === true) {
+        // 展开节点时，关闭冒泡不然会影响父组件
+        // TODO 这个地方 与 pro-select-tree有冲突
+        if (props.isStopPropagation === true) {
+            info.nativeEvent.stopPropagation();
+        }
+    }
+}
+
+async function onLoadData (treeNode) {
+    return new Promise(async (resolve, reject) => {
+        if (treeNode.dataRef.children) {
+            resolve();
+            return;
+        }
+        try {
+            const { treeData } = await getTreeData(props, { id: treeNode.eventKey });
+            // data.children 是从后端获取的子节点数据
+            treeNode.dataRef.children = treeData;
+            // 更新 localTreeData
+            localTreeData.value = [...localTreeData.value];
+            resolve();
+        } catch (error) {
+            reject(error);
+        }
+    });
+}
+
+// TODO : 这个地方点击搜索结果, 通知父组件进行关闭下来弹窗, 那再次触发下拉展示的是树结果还是列表？
+function onNode (node) {
+    // 勾选当前节点
+    console.log('wyq:pro-tree-点击搜索结果', node, props.fieldNames);
+    emits('on-node', node);
+    if (props.showCheckbox === true) {
+        checkedKeys.value = [node[props.fieldNames.key]];
+    } else {
+        selectedKeys.value = [node[props.fieldNames.key]];
+    }
+    // 展开父节点和爷节点
+    const parentKeys = getAnsKeys(localTreeData.value, node[props.fieldNames.key], props.fieldNames);
+    //localExpandedKeys.value = [...new Set([...localExpandedKeys.value, ...parentKeys])];
+    expandedKeys.value = [...new Set([...parentKeys])];
+    // TODO 这个地方 与 pro-select-tree有冲突
+    if (props.isClearSearchResult === true) {
+        // 清空搜索框
+        searchValue.value = '';
+        // 清空搜索结果列表
+        searchResultList.value = [];
+    }
+}
+
+const onClearSearch = () => {
+    console.log('wyq:pro-tree-清空搜索结果');
+    // 清空搜索框
+    searchValue.value = '';
+    // 清空搜索结果列表
+    searchResultList.value = [];
+}
+defineExpose({ onClearSearch });
+
+
+// 监听搜索框的值，过滤列表
+watch(searchValue, (value) => {
+    if (value) {
+        searchResultList.value = searchNodes(localTreeData.value, props.fieldNames.title, value);
+    } else {
+        searchResultList.value = [];
+    }
+});
+
+// 监听shuTreeData变化，更新localTreeData
+watch(() => props.treeData, (newTreeData) => {
+    localTreeData.value = newTreeData;
+});
+
+// 根据不同类型的树监听相应参数的变化
+if (props.treeType === 'deptTree') {
+    console.log('wyq:pro-tree-监听机构汇总关系发生变化1', props.relationNo);
+
+    watch(() => props.relationNo, async () => {
+        // 监听机构汇总关系发生变化,重新请求机构树
+        console.log('wyq:pro-tree-监听机构汇总关系发生变化');
+        await getTreeTypeData();
+    });
+} else if (props.treeType === 'sobTree') {
+    // 监听账套树
+    watch(() => props.brNos, async () => {
+        // 监听机构发生变化,重新请求账套树
+        await getTreeTypeData();
+    });
+} else if (props.treeType === 'sobItemTree') {
+    watch(() => props.sobNo, async () => {
+        // 监听账套发生变化,重新请求科目树
+        await getTreeTypeData();
+    });
+}
+
+
+onMounted(async () => {
+    console.log('wyq:pro-tree-挂载');
+    await initLocalTreeData();
+});
+
+async function initLocalTreeData () {
+    console.log('wyq:pro-tree-准备树数据');
+    if (!isEmpty(props.treeData)) {
+        localTreeData.value = props.treeData;
+        if (!isEmpty(props.value)) {
+            setDefaultKeys(props, props.value);
+        }
+    } else if (!isEmpty(props.treeType)) {
+        // 如果 props.treeData 不存在，则请求后端接口获取树数据
+        await getTreeTypeData();
+    }
+    if (isLocalTreeDataLoaded.value === false) {
+        isLocalTreeDataLoaded.value = true;
+    }
+}
+
+async function getTreeTypeData () {
+    const { treeData, defaultValue, defaultStddNo } = await getTreeData(props, {});
+    if (!isEmpty(treeData) && treeData.length > 0) {
+        localTreeData.value = treeData;
+        if (!isEmpty(defaultValue)) {
+            setDefaultKeys(props, defaultValue);
+        }
+        // if (!isEmpty(defaultStddNo) && props.treeType === 'sobTree') {
+        //     emits('update:stddNo', defaultStddNo);
+        // }
+    }
+    console.log('wyq:pro-tree-获取树数据完成', treeData);
+}
+
+// 封装设置选中/勾选键值的逻辑
+const setDefaultKeys = (props, defaultValue) => {
+    if (props.showCheckbox === true) {
+        //checkedKeys.value = [...value];
+        //checkedKeys.value = Array.isArray(defaultValue) ? [...defaultValue] : defaultValue;
+        checkedKeys.value = Array.isArray(defaultValue) ? defaultValue : [defaultValue];
+    } else {
+        //selectedKeys.value = [...value];
+        selectedKeys.value = Array.isArray(defaultValue) ? defaultValue : [defaultValue];
+    }
+};
+</script>
+
+<style scoped>
+.dropdown-content {
+    /* 设置固定的高度和宽度 */
+    max-height: 300px;
+    /* width: 500px; */
+    /* 设置溢出时显示滚动条 */
+    overflow: auto;
+    /* 可以根据需要添加其他样式 */
+    /* border: 1px solid #ccc; */
+    padding: 8px;
+}
+
+.dropdown-content2 {
+    /* 设置固定的高度和宽度 */
+    max-height: 300px;
+    /* width: 500px; */
+    /* 设置溢出时显示滚动条 */
+    overflow: auto;
+    /* 防止内容换行 */
+    white-space: nowrap;
+    /* 当内容宽度超过元素宽度时显示横向滚动条 */
+    overflow-x: auto;
+    /* 可以根据需要添加其他样式 */
+    /* border: 1px solid #ccc; */
+    padding: 8px;
+}
+
+.search-select-li {
+    padding: 3px 10px;
+    padding-left: 0px;
+    /* 调整内边距 */
+    cursor: pointer;
+}
+
+.search-select-li:hover {
+    background-color: #1890ff;
+    /* 使用主题色 */
+    color: #fff;
+    /* 改变文字颜色 */
+}
+</style>

ant-design-pro-vue3/src/components/ReportComponent/components/AccLvlComponent.vue

@@ -0,0 +1,102 @@
+<template>
+    <pro-select v-model:modelValue="internalValue" show-search placeholder="请选择科目级别" :optionData="options"
+        :filter-option="filterOption" @focus="handleFocus" @blur="handleBlur">
+    </pro-select>
+    <div>internalValue: {{ internalValue }}</div>
+</template>
+<script setup>
+import { ref, watch, defineProps, defineEmits } from 'vue';
+const props = defineProps({
+    // 请求参数
+    sobNo: {
+        type: String,
+        default: ''
+    },
+    addEndFlag: {
+        type: String,
+        default: 'false'
+    },
+    accLvl: {
+        type: String,
+        default: ''
+    },
+    formItemProps: Object, // 定义formItemProps prop
+});
+const emit = defineEmits(['update:accLvl']);
+const internalValue = ref(props.accLvl);
+// 监听内部值的变化，向外传递
+watch(internalValue, (newValue) => {
+    console.log('wyq --internalValue change', newValue);
+    emit('update:accLvl', newValue);
+});
+
+// 确保从父组件接收到的 `value` 更新时，内部状态也能同步
+watch(() => props.accLvl, (newValue) => {
+    console.log('wyq --props.accLvl change', newValue);
+
+    if (newValue !== internalValue.value) {
+        internalValue.value = newValue;
+    }
+});
+watch(() => props.sobNo, async (newVal, oldVal) => {
+    console.log('wyq --props.sobNo change', newVal);
+
+    if (newVal != oldVal && newVal != '') {
+        //await getRelationInfoNoOptions();
+        if (newVal == '10') {
+            options.value = [
+                {
+                    item_no: '1',
+                    item_name: '一级科目',
+                },
+                {
+                    item_no: '2',
+                    item_name: '二级科目',
+                },
+                {
+                    item_no: '3',
+                    item_name: '三级科目',
+                },
+                {
+                    item_no: '4',
+                    item_name: '四级科目',
+                }
+            ]
+
+            internalValue.value = '4'
+
+        } else {
+            options.value = [
+                {
+                    item_no: '1',
+                    item_name: '一级科目',
+                },
+                {
+                    item_no: '2',
+                    item_name: '二级科目',
+                },
+                {
+                    item_no: '3',
+                    item_name: '三级科目',
+                }
+            ]
+            internalValue.value = '3'
+        }
+    }
+});
+
+const options = ref([]);
+
+const handleChange = value => {
+    console.log(`selected ${value}`);
+};
+const handleBlur = () => {
+    console.log('blur');
+};
+const handleFocus = () => {
+    console.log('focus');
+};
+const filterOption = (input, option) => {
+    return option.item_name.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+};
+</script>

ant-design-pro-vue3/src/components/ReportComponent/components/DepartPanelComponent.vue

@@ -0,0 +1,362 @@
+<template>
+    <!--1.汇总关系下拉列表-->
+    <div class="relation-dropdown">
+        <span class="relation-label">汇总关系：</span>
+        <a-select v-model:value="relationInfoNo" :options="relationInfoNoOptions" class="relation-select"
+            :allowClear="true">
+        </a-select>
+    </div>
+    <!--2.不同树形结构标签页-->
+    <div style="margin-bottom: -10px">
+        <a-tabs type="card" v-model:activeKey="treeType">
+            <a-tab-pane key="0" tab="账务树">
+            </a-tab-pane>
+            <a-tab-pane key="1" tab="对比树">
+            </a-tab-pane>
+            <a-tab-pane key="2" tab="报送树">
+            </a-tab-pane>
+        </a-tabs>
+    </div>
+    <!--3.搜索框-->
+    <div class="search-dropdown">
+        <a-input v-model:value="searchValue" @input="onInputChange" placeholder="搜索..." :allowClear="true" />
+        <div v-if="searchResultList.length > 0" class="search-select">
+            <div class="search-select-li" v-for=" searchResult in searchResultList" :key="searchResult.id"
+                @click="onOptionClick(searchResult)">
+                {{ searchResult.name }}
+            </div>
+        </div>
+    </div>
+    <!--4.机构树-->
+    <div>
+        <a-tree v-model:expandedKeys="expandedKeys" v-model:selectedKeys="selectedKeys"
+            v-model:checkedKeys="checkedKeys" v-model:loadedKeys="loadedKeys" :load-data="onLoadData"
+            :tree-data="treeData" :fieldNames="fieldNames" checkable @select="onSelect" @expand="onExpand"
+            @check="onCheck" />
+    </div>
+</template>
+
+<script setup>
+//问题汇总:
+//1.机构checked 如何联动下账套， 两个组件不在一块
+//2.机构汇总关系下拉列表属性必填项，如何与查询按钮绑定并校验
+//3.机构汇总关系获取枚举值时,如何获取当前交易的pageInterfaceNo 
+//4.系统日期如何获取到
+//5.机构汇总下拉列表如何获取对应的内部值
+//6.搜索框,需要判断值是否为空的逻辑处理
+//7.控制台报：Tree missing follow keys: '1'
+//8.搜索机构时，因为是单选正常应该只展示自己和自己的上级节点
+//9.查询时获取查询选中的机构列表也存在问题，需要优化，需要与后台呼应上 父节点下叶子节点全部选中，则返回父节点，否则返回选中的子节点
+//10.机构是必填项，如何校验
+
+// 11.当搜索一个节点时，然后展开整个树，再次重新 checked的话，点击查询获取查询节点有存在问题了
+// 12.点击树进行展开，然后再切换树类型或者汇总关系，展开图标消失了，但是数据还是存在
+// 13.增加loadedKeys 或者是移动到组件中，展开叶子节点就无效了
+// 14.机构面板组件封装到组件中，，业务就特别卡顿
+
+// 机构汇总关系双向绑定到页面中
+import { ref } from 'vue'
+import { defineProps, defineExpose, onMounted, watch, nextTick, provide, defineEmits } from 'vue';
+import { getRelationInfoNoList, getDepartTreeData, getSearchResultByNodeId } from '@/api/departTreePanel';
+defineExpose({ getCheckedNodes, getNodes });
+const getCheckedNodesEmit = defineEmits(['get-checkedNodes']);
+// 使用 provide 提供这个方法
+// provide('getNodes', getNodes);
+
+function getNodes (data) {
+    console.log("获取机构树数据成功", data);
+    return {
+        name: "查询组件调用成功",
+    };
+}
+
+
+// 声名接收参数数据
+const props = defineProps({});
+// 机构汇总关系双向绑定到页面中
+const relationInfoNo = ref('');
+// 机构汇总关系枚举值, 组件挂载时向后端发起请求
+const relationInfoNoOptions = ref([]);
+// 树形结构标签页值双向绑定到页面中
+const treeType = ref('');
+
+// 钩子函数，页面加载完成后首先获取下汇总关系
+onMounted(async () => {
+    // 1.获取机构汇总关系枚举值
+    await getRelationInfoNoOptions();
+});
+// 监听汇总关系和树形结构标签页值,只要值发生变化,重新获取树形结构数据
+watch(() => [relationInfoNo.value, treeType.value,], async (newVal, oldVal) => {
+    // 1.当类型数发生变化时，重新获取树形结构数据
+    if (newVal != oldVal) {
+        await getDeptTreeData();
+    }
+});
+
+
+
+// 获取机构汇总关系枚举值及默认值
+async function getRelationInfoNoOptions () {
+    // 清空 relationInfoNoOptions 数组
+    relationInfoNoOptions.value = [];
+    // // 1.获取机构汇总关系枚举值
+    const resp = await getRelationInfoNoList({
+        pageInterfaceNo: 'zzsearch_01_01_02',
+    });
+    // 2.将枚举值添加到 relationInfoNoOptions 中 并设置下拉列表默认值
+    resp.forEach(node => {
+        if (node.item_no === 'AAAAAA') {
+            relationInfoNo.value = node.item_no;
+        }
+        relationInfoNoOptions.value.push({ label: node.item_name, value: node.item_no });
+    });
+    // 3.设置机构树类型的默认值
+    treeType.value = '0';
+}
+
+// 搜索框 start
+// 搜索框触发事件
+const searchValue = ref('');
+const searchResultList = ref([]);
+
+async function onInputChange () {
+    // 1.判断搜索框是否为空,为空则清空 options 数组,重新获取树形结构数据
+    if (!searchValue || searchValue.value.length === 0) {
+        searchResultList.value = [];
+        getDeptTreeData();
+        return;
+    }
+    // 2.获取搜索结果
+    searchResultList.value = await getDepartTreeData({
+        treeSearch: "true",
+        kw: searchValue.value,
+        relation_info_no: relationInfoNo.value,
+        treeType: treeType.value,
+        qryDate: '20231117',
+    });
+}
+
+// 选择搜索下拉列表项(点击事件)回调
+async function onOptionClick (searchResult) {
+    // 1.设置搜索框值
+    searchValue.value = searchResult.name;
+    // 2.点击完成后,隐藏下拉列表设置为空
+    searchResultList.value = [];
+    // 3.重新获取树形结构数据
+    const searchResultList2 = await getSearchResultByNodeId({
+        isAsync: "flase",
+        nodeId: searchResult.dep_no,
+        treeType: treeType.value,
+        relation_info_no: relationInfoNo.value,
+        qryDate: '20231117',
+
+    });
+
+    const treeDataMap = {};
+    searchResultList2.forEach(node => {
+        treeDataMap[node.id] = node;
+    });
+
+    let parentKeys = [];
+    let searchTreeData = [];
+    let searchNode = treeDataMap[searchResult.dep_no];
+    while (true) {
+        const parent = treeDataMap[searchNode.pid];
+        if (parent) {
+            // 父节点存在,则往父节点添加该子节点
+            if (!parent.children) {
+                parent.children = [];
+            }
+            parentKeys.push(parent.id);
+            parent.children.push(searchNode);
+            searchNode = parent;
+        } else {
+            // 父节点不存在,则直接添加到树形结构数据中
+            searchTreeData.push(searchNode);
+            break;
+        }
+    }
+    treeData.value = searchTreeData;
+    // 4.设置默认选中节点
+    nextTick(() => {
+        // 等到数据加载完成后，设置默认选中节点
+        checkedKeys.value = [searchNode.id];
+        expandedKeys.value = parentKeys;
+
+    });
+
+}
+// 搜索框 send
+
+const fieldNames = {
+    title: 'name',
+    key: 'id',
+};
+const treeData = ref([])// 树的数据
+const expandedKeys = ref([]);// 已展开的节点
+const selectedKeys = ref([]);// 已选中的节点
+const checkedKeys = ref([]);// 已勾选的节点
+const loadedKeys = ref([]); // 已加载子节点的节点
+watch(() => checkedKeys.value, (newVal, oldVal) => {
+    // 2.当搜索框值发生变化时,重新获取搜索结果
+    if (newVal != oldVal) {
+        getCheckedNodesEmit('get-checkedNodes', newVal);
+    }
+});
+// 获取机构树数据
+async function getDeptTreeData () {
+    expandedKeys.value = [];
+    selectedKeys.value = [];
+    checkedKeys.value = [];
+    // 清空已加载子节点的节点数组,不然切换树类型或者汇总关系时会导致展开图标消失
+    //loadedKeys.value = [];
+    treeData.value = await getDepartTreeData({
+        isParentType: '&&',
+        page_code: 'cs',
+        isAsync: 'true',
+        relation_info_no: relationInfoNo.value,
+        treeType: treeType.value,
+        qryDate: '20231117',
+    });
+    nextTick(() => {
+        // 等到数据加载完成后，设置默认选中节点
+        checkedKeys.value = [treeData.value[0].id];
+    });
+}
+
+// 节点选中时的回调
+function onSelect (selectedKeys, info) {
+}
+// 节点展开时的回调
+function onExpand (expandedKeys, info) {
+    console.log('wyq---------expandedKeys', expandedKeys);
+}
+// 节点选中时的回调
+function onCheck (checkedKeys, info) {
+    // getCheckedNodesEmit('get-checkedNodes', checkedKeys);
+}
+// 异步加载数据
+const onLoadData = async (treeNode) => {
+    return new Promise(async (resolve, reject) => {
+        if (treeNode.dataRef.children) {
+            resolve();
+            return;
+        }
+        try {
+            // data.children 是从后端获取的子节点数据
+            treeNode.dataRef.children = await getDepartTreeData({
+                id: treeNode.eventKey,
+                isParentType: "&&",
+                isAsync: "true",
+                page_code: 'cs',
+                relation_info_no: relationInfoNo.value,
+                treeType: treeType.value,
+                qryDate: '20231117',
+            });
+            // 更新 treeData
+            treeData.value = [...treeData.value];
+            resolve();
+        } catch (error) {
+            //console.error('获取数据失败', error);
+            reject(error);
+        }
+    });
+};
+
+
+function getCheckedNodes () {
+    let checkedNodes = [];
+    let allNodes = getAllNodes();
+    if (checkedKeys.value.length === 1) {
+        // 只选中一个节点
+        const node = allNodes.find(n => n.id === checkedKeys.value[0]);
+        checkedNodes.push(node);
+    } else {
+        // 选中多个节点
+        for (let i = 0; i < checkedKeys.value.length; i++) {
+            // 找到当前节点
+            const node = allNodes.find(n => n.id === checkedKeys.value[i]);
+            if (!checkedKeys.value.includes(node.pid)) {
+                // 选择的节点对应的父节点没有被选择， 则添加到结果中
+                checkedNodes.push(node);
+            }
+        }
+    }
+    return checkedNodes;
+}
+
+
+const getAllNodes = (nodes = treeData.value) => {
+    let allNodes = [];
+    const traverse = (nodeList) => {
+        nodeList.forEach(node => {
+            allNodes.push(node); // 收集当前节点
+            if (node.children) {
+                traverse(node.children); // 递归遍历子节点
+            }
+        });
+    };
+    traverse(nodes);
+    return allNodes;
+};
+
+
+
+
+
+</script>
+<style scoped>
+.relation-dropdown {
+    margin-bottom: 5px;
+}
+
+.relation-label {
+    display: inline-block;
+    vertical-align: middle;
+}
+
+.relation-select {
+    display: inline-block;
+    vertical-align: middle;
+    width: 200px;
+}
+
+.search-dropdown {
+    position: relative;
+    display: inline-block;
+    width: 286px;
+    margin-bottom: 5px
+        /* 设置宽度 */
+}
+
+.search-select {
+    position: absolute;
+    top: calc(100% + 5px);
+    /* 适当调整下拉列表的位置 */
+    left: 0;
+    right: 0;
+    z-index: 1000;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    /* 圆角 */
+    background-color: #fff;
+    max-height: 200px;
+    overflow-y: auto;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
+    /* 添加阴影 */
+}
+
+.search-select-li {
+    padding: 3px 10px;
+    padding-left: 0px;
+    /* 调整内边距 */
+    cursor: pointer;
+}
+
+.search-select-li:hover {
+    background-color: #1890ff;
+    /* 使用主题色 */
+    color: #fff;
+    /* 改变文字颜色 */
+}
+</style>

ant-design-pro-vue3/src/components/ReportComponent/components/QueryComponent.vue

@@ -0,0 +1,116 @@
+<template>
+    <pro-form label-width="120px" tabsProps="2">
+        <pro-form-grid style="width: 700px" colNum="2">
+
+            <!-- <AccLvlComponent :formItemProps="{ label: '层级编号', prop: 'levelKey' }"></AccLvlComponent> -->
+            <pro-select :formItemProps="{ label: '启用标志111', prop: 'useYn' }" placeholder="请选择启用标志" v-model:value="useYn"
+                :optionData="options" :allowClear="true" tableName="com_usertype_info" colName="use_yn">
+            </pro-select>
+            <pro-select :formItemProps="{ label: '启用标志', prop: 'useYn' }" placeholder="请选择启用标志" :allowClear="true"
+                tableName="com_usertype_info" colName="use_yn">
+            </pro-select>
+            <pro-select :formItemProps="{ label: '启用标志', prop: 'useYn' }" placeholder="请选择启用标志" :allowClear="true"
+                tableName="com_usertype_info" colName="use_yn">
+            </pro-select>
+            <pro-form-item>
+                <pro-button id="queryBtn" @click="search" :icon="h(SearchOutlined)">查询</pro-button>
+            </pro-form-item>
+        </pro-form-grid>
+    </pro-form>
+
+</template>
+
+<script setup>
+import { ref, watch, h, computed, onMounted, nextTick, reactive, onBeforeUnmount, inject, defineEmits, defineProps } from 'vue';
+import { DoubleRightOutlined, DoubleLeftOutlined, SearchOutlined } from "@ant-design/icons-vue";
+const useYn = ref('Y');
+const options = ref([
+    {
+        item_no: 'Y',
+        item_name: '启用',
+    },
+    {
+        item_no: 'N',
+        item_name: '停用',
+    }]);
+// 声名接收参数数据
+const props = defineProps({
+    brNos: String
+});
+
+watch(() => props.brNos, (newVal, oldVal) => {
+    // 2.当搜索框值发生变化时,重新获取搜索结果
+    if (newVal != oldVal) {
+        console.log("wyq-2.brNos发生变化", newVal, oldVal)
+    }
+});
+
+// watch(() => props.brNos.values, (newValue, oldValue) => {
+//     console.log("wyq-2.brNos发生变化", newValue, oldValue)
+
+// });
+
+// 从机构面板中组件中,注入getCheckedNodes方法
+const getNodes = inject('getNodes');
+const emit = defineEmits(['query-report']);
+function queryReport () {
+    let data = {
+        name: 'zhangsan',
+        age: '18',
+        sex: '男'
+    }
+
+    console.log("wyq-1.触发查询")
+    // 调用从 DepartPanelComponent 注入的方法
+    if (getNodes) {
+        const result = getNodes(data);
+        console.log("wyq-2.触发机构面板中的方法获取节点", result)
+    } else {
+        console.error("未找到方法");
+    }
+
+    // 调用从 DepartPanelComponent 注入的方法
+    // if (testProvide) {
+    //     const result = testProvide(data);
+    //     console.log("wyq-2.testProvide", result)
+
+    // } else {
+    //     console.error("aaa未找到方法");
+    // }
+
+    emit('query-report', data);
+
+}
+
+const form = ref(
+    {
+        formDate: null,
+        periodType: null,
+        accountSet: null,
+        currency: null,
+        subjectLevel: null,
+    }
+);
+
+const periodTypes = ref(
+    [
+        { value: 'monthly', label: '月度' },
+        { value: 'quarterly', label: '季度' },
+        { value: 'yearly', label: '年度' },
+    ]
+);
+
+const accountSets = ref([
+    { value: 'account1', label: '账套1' },
+    { value: 'account2', label: '账套2' },
+]);
+
+const subjectLevels = [
+    { value: 'level1', label: '一级科目' },
+    { value: 'level2', label: '二级科目' },
+];
+</script>
+
+<style scoped>
+/* optional: you can add your styles here */
+</style>

ant-design-pro-vue3/src/components/ReportComponent/components/ResultComponent.vue

@@ -0,0 +1,54 @@
+<template>
+    我是查询结果组件
+    {{ resultData }}
+    <pro-form label-width="120px" tabsProps="2">
+        <pro-form-grid style="width: 700px" colNum="2">
+            <SobSelectComponent v-model:accLvl="sobNo" :formItemProps="{ label: '账套', prop: 'levelKey' }">
+            </SobSelectComponent>
+            <AccLvlComponent :sobNo="sobNo" :addEndFlag="addEndFlag" v-model:accLvl="accLvl"
+                :formItemProps="{ label: '科目级别', prop: 'levelKey' }">
+            </AccLvlComponent>
+            <pro-form-item>
+                <pro-button id="queryBtn" @click="search" :icon="h(SearchOutlined)">查询</pro-button>
+            </pro-form-item>
+        </pro-form-grid>
+    </pro-form>
+    <div>sobNo: {{ sobNo }}</div>
+    <div>addEndFlag: {{ addEndFlag }}</div>
+    <div>accLvl: {{ accLvl }}</div>
+
+</template>
+<script setup>
+import { ref, watch, h, computed, onMounted, nextTick, reactive, onBeforeUnmount, provide, defineExpose } from 'vue';
+import { SearchOutlined, RedoOutlined, PlusOutlined, EditOutlined } from "@ant-design/icons-vue";
+
+import AccLvlComponent from './AccLvlComponent.vue';
+import SobSelectComponent from './SobSelectComponent.vue';
+
+const sobNo = ref('');
+const addEndFlag = ref('');
+const accLvl = ref('');
+
+function search () {
+    if (sobNo.value === '') {
+        sobNo.value = '10';
+    } else if (sobNo.value === '10') {
+        sobNo.value = '11';
+    } else {
+        sobNo.value = '10';
+    }
+}
+
+function changSobNo (value) {
+    console.log('wyq-3.接收到sobNo的值', value);
+}
+
+const resultData = ref('');
+defineExpose({ getResultData });
+function getResultData (queryData) {
+    // 这里是获取查询结果数据的逻辑
+    console.log('wyq-4.接收到查询组件传来的数据开始展示结果', queryData);
+    resultData.value = queryData;
+}
+</script>
+<style scoped></style>

ant-design-pro-vue3/src/components/ReportComponent/components/SobSelectComponent.vue

@@ -0,0 +1,164 @@
+<template>
+    <!-- <pro-select v-model:modelValue="internalValue" show-search placeholder="请选择账套级别" :optionData="options"
+        :filter-option="filterOption" @focus="handleFocus" @blur="handleBlur">
+    </pro-select>
+    <div>internalValue: {{ internalValue }}</div> -->
+
+    <pro-select-tree :options="subjectTree" :showCheckbox="false" :props="subjectProps" v-model:value="selectedSubject"
+        @input="onSubjectSelect">
+    </pro-select-tree>
+</template>
+<script setup>
+import { ref, watch, defineProps, defineEmits, onMounted } from 'vue';
+
+
+const subjectTree = ref([
+    {
+        id: '1',
+        name: '科目1',
+        children: [
+            { id: '1-1', name: '科目1-1' },
+            { id: '1-2', name: '科目1-2' }
+        ]
+    },
+    {
+        id: '2',
+        name: '科目2',
+        children: [
+            { id: '2-1', name: '科目2-1' },
+            { id: '2-2', name: '科目2-2' }
+        ]
+    }
+]);
+const subjectProps = {
+    key: 'id',
+    value: 'id',
+    label: 'name',
+    no: 'id',
+    title: 'name',
+    children: 'children',
+    title: 'name',
+    key: 'id',
+};
+const fieldNames = {
+    title: 'name',
+    key: 'id',
+};
+
+const selectedSubject = ref([]);
+function onSubjectSelect (value) {
+    console.log('wyq --onSubjectSelect', value);
+    selectedSubject.value = value;
+}
+
+
+const props = defineProps({
+    txBrNo: {
+        type: String,
+        default: ''
+    },
+    // 请求参数
+    sobNo: {
+        type: String,
+        default: ''
+    },
+    addEndFlag: {
+        type: String,
+        default: 'false'
+    },
+    accLvl: {
+        type: String,
+        default: ''
+    },
+    formItemProps: Object, // 定义formItemProps prop
+});
+const emit = defineEmits(['update:accLvl']);
+const internalValue = ref(props.accLvl);
+
+// 钩子函数，页面加载完成后首先获取下汇总关系
+onMounted(async () => {
+    // 1.获取机构汇总关系枚举值
+    internalValue.value = '10';
+});
+
+// 监听内部值的变化，向外传递
+watch(internalValue, (newValue) => {
+    console.log('wyq --internalValue change', newValue);
+    emit('update:accLvl', newValue);
+});
+
+// 确保从父组件接收到的 `value` 更新时，内部状态也能同步
+watch(() => props.accLvl, (newValue) => {
+    console.log('wyq --props.accLvl change', newValue);
+
+    if (newValue !== internalValue.value) {
+        internalValue.value = newValue;
+    }
+});
+watch(() => props.sobNo, async (newVal, oldVal) => {
+    console.log('wyq --props.sobNo change', newVal);
+
+    if (newVal != oldVal && newVal != '') {
+        //await getRelationInfoNoOptions();
+        if (newVal == '10') {
+            options.value = [
+                {
+                    item_no: '1',
+                    item_name: '一级科目',
+                },
+                {
+                    item_no: '2',
+                    item_name: '二级科目',
+                },
+                {
+                    item_no: '3',
+                    item_name: '三级科目',
+                },
+                {
+                    item_no: '4',
+                    item_name: '四级科目',
+                }
+            ]
+
+            internalValue.value = '4'
+
+        } else {
+            options.value = [
+                {
+                    item_no: '1',
+                    item_name: '一级科目',
+                },
+                {
+                    item_no: '2',
+                    item_name: '二级科目',
+                },
+                {
+                    item_no: '3',
+                    item_name: '三级科目',
+                }
+            ]
+            internalValue.value = '3'
+        }
+    }
+});
+
+const options = ref([{
+    item_no: '10',
+    item_name: '默认账套',
+},
+{
+    item_no: '12',
+    item_name: '非默认账套',
+}]);
+
+
+const handleBlur = () => {
+    console.log('blur');
+};
+const handleFocus = () => {
+    console.log('focus');
+};
+const filterOption = (input, option) => {
+    return option.item_name.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+};
+</script>

ant-design-pro-vue3/src/components/ReportComponent/index.vue

@@ -0,0 +1,277 @@
+<template>
+    <!-- 绑定 ref 到根元素 -->
+    <div ref="container"
+        :class="['pro-split', direction === 'horizontal' ? 'pro-split-horizontal' : 'pro-split-vertical']">
+        <!-- 顶部标题 -->
+        <div v-if="topTitle" class="pro-split-title" :style="{ display: isTopExpanded ? 'flex' : 'none' }">
+            <span>{{ topTitle }}</span>
+            <button v-if="canTopCollapse" @click="toggleTopCollapse">{{ isTopExpanded ? '收起' : '展开' }}</button>
+        </div>
+        <!-- 左侧标题 -->
+        <div v-if="leftTitle" class="pro-split-title pro-split-title-left"
+            :style="{ display: isLeftExpanded ? 'flex' : 'none' }">
+            <span>{{ leftTitle }}</span>
+            <button v-if="canLeftCollapse" @click="toggleLeftCollapse">{{ isLeftExpanded ? '收起' : '展开' }}</button>
+        </div>
+        <div class="pro-split-pane" :style="pane1Style">
+            <slot name="pane1"></slot>
+        </div>
+        <div class="pro-split-handle" :class="{ 'pro-split-handle-floating': dragging }" @mousedown="onHandleMouseDown"
+            :style="handleStyle">
+        </div>
+        <div class="pro-split-pane" :style="pane2Style">
+            <slot name="pane2"></slot>
+        </div>
+        <!-- 底部标题 -->
+        <div v-if="bottomTitle" class="pro-split-title" :style="{ display: isBottomExpanded ? 'flex' : 'none' }">
+            <span>{{ bottomTitle }}</span>
+            <button v-if="canBottomCollapse" @click="toggleBottomCollapse">{{ isBottomExpanded ? '收起' : '展开' }}</button>
+        </div>
+        <!-- 右侧标题 -->
+        <div v-if="rightTitle" class="pro-split-title pro-split-title-right"
+            :style="{ display: isRightExpanded ? 'flex' : 'none' }">
+            <span>{{ rightTitle }}</span>
+            <button v-if="canRightCollapse" @click="toggleRightCollapse">{{ isRightExpanded ? '收起' : '展开' }}</button>
+        </div>
+    </div>
+</template>
+
+<script setup>
+import { ref, onMounted, onUnmounted, defineEmits, defineProps } from 'vue';
+
+const props = defineProps({
+    direction: {
+        type: String,
+        default: 'horizontal',
+        validator: (value) => ['horizontal', 'vertical'].includes(value)
+    },
+    sizeRatio: {
+        type: Number,
+        default: 0.5
+    },
+    topTitle: {
+        type: String,
+        default: ''
+    },
+    leftTitle: {
+        type: String,
+        default: ''
+    },
+    bottomTitle: {
+        type: String,
+        default: ''
+    },
+    rightTitle: {
+        type: String,
+        default: ''
+    },
+    canTopCollapse: {
+        type: Boolean,
+        default: false
+    },
+    canLeftCollapse: {
+        type: Boolean,
+        default: false
+    },
+    canBottomCollapse: {
+        type: Boolean,
+        default: false
+    },
+    canRightCollapse: {
+        type: Boolean,
+        default: false
+    },
+    isTopExpanded: {
+        type: Boolean,
+        default: true
+    },
+    isLeftExpanded: {
+        type: Boolean,
+        default: true
+    },
+    isBottomExpanded: {
+        type: Boolean,
+        default: true
+    },
+    isRightExpanded: {
+        type: Boolean,
+        default: true
+    }
+});
+
+const emits = defineEmits(['update:sizeRatio']);
+
+const dragging = ref(false);
+const startX = ref(0);
+const startY = ref(0);
+const startSizeRatio = ref(props.sizeRatio);
+const tempSizeRatio = ref(props.sizeRatio);
+
+const handle = ref(null);
+const container = ref(null);
+
+const pane1Style = ref({});
+const pane2Style = ref({});
+const handleStyle = ref({});
+
+const isTopExpanded = ref(props.isTopExpanded);
+const isLeftExpanded = ref(props.isLeftExpanded);
+const isBottomExpanded = ref(props.isBottomExpanded);
+const isRightExpanded = ref(props.isRightExpanded);
+
+const toggleTopCollapse = () => {
+    isTopExpanded.value = !isTopExpanded.value;
+};
+
+const toggleLeftCollapse = () => {
+    isLeftExpanded.value = !isLeftExpanded.value;
+};
+
+const toggleBottomCollapse = () => {
+    isBottomExpanded.value = !isBottomExpanded.value;
+};
+
+const toggleRightCollapse = () => {
+    isRightExpanded.value = !isRightExpanded.value;
+};
+
+const updateStyles = () => {
+    if (container.value) {
+        if (props.direction === 'horizontal') {
+            const width = container.value.offsetWidth;
+            const pane1Width = width * tempSizeRatio.value;
+            const pane2Width = width - pane1Width;
+            pane1Style.value = { width: `${pane1Width}px` };
+            pane2Style.value = { width: `${pane2Width}px` };
+        } else {
+            const height = container.value.offsetHeight;
+            const pane1Height = height * tempSizeRatio.value;
+            const pane2Height = height - pane1Height;
+            pane1Style.value = { height: `${pane1Height}px` };
+            pane2Style.value = { height: `${pane2Height}px` };
+        }
+        updateHandleStyle(tempSizeRatio.value);
+    }
+};
+
+const updateHandleStyle = (ratio) => {
+    if (container.value) {
+        if (props.direction === 'horizontal') {
+            const width = container.value.offsetWidth;
+            const pane1Width = width * ratio;
+            handleStyle.value = {
+                left: `${pane1Width}px`,
+                width: '5px', // 设置水平分割线宽度
+                height: '100%' // 设置水平分割线高度
+            };
+        } else {
+            const height = container.value.offsetHeight;
+            const pane1Height = height * ratio;
+            handleStyle.value = {
+                top: `${pane1Height}px`,
+                width: '100%', // 设置垂直分割线宽度
+                height: '5px' // 设置垂直分割线高度
+            };
+        }
+    }
+};
+
+const onHandleMouseDown = (e) => {
+    dragging.value = true;
+    startX.value = e.clientX;
+    startY.value = e.clientY;
+    startSizeRatio.value = props.sizeRatio;
+    tempSizeRatio.value = props.sizeRatio;
+    document.addEventListener('mousemove', onMouseMove);
+    document.addEventListener('mouseup', onMouseUp);
+};
+
+const onMouseMove = (e) => {
+    if (dragging.value) {
+        const deltaX = e.clientX - startX.value;
+        const deltaY = e.clientY - startY.value;
+        if (props.direction === 'horizontal') {
+            const containerWidth = container.value.offsetWidth;
+            const newSizeRatio = startSizeRatio.value + deltaX / containerWidth;
+            tempSizeRatio.value = Math.max(0, Math.min(1, newSizeRatio));
+        } else {
+            const containerHeight = container.value.offsetHeight;
+            const newSizeRatio = startSizeRatio.value + deltaY / containerHeight;
+            tempSizeRatio.value = Math.max(0, Math.min(1, newSizeRatio));
+        }
+        updateHandleStyle(tempSizeRatio.value);
+    }
+};
+
+const onMouseUp = () => {
+    dragging.value = false;
+    document.removeEventListener('mousemove', onMouseMove);
+    document.removeEventListener('mouseup', onMouseUp);
+    emits('update:sizeRatio', tempSizeRatio.value);
+    // 确保更新样式时使用 tempSizeRatio 的值
+    updateStyles();
+};
+
+onMounted(() => {
+    updateStyles();
+});
+
+onUnmounted(() => {
+    document.removeEventListener('mousemove', onMouseMove);
+    document.removeEventListener('mouseup', onMouseUp);
+});
+</script>
+
+<style scoped>
+.pro-split {
+    position: relative;
+    display: flex;
+    width: 100%;
+    height: 100%;
+    flex-direction: column;
+}
+
+.pro-split-title {
+    background-color: #f0f0f0;
+    padding: 8px;
+    font-weight: bold;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+
+.pro-split-title-left {
+    flex-direction: column;
+}
+
+.pro-split-title-right {
+    flex-direction: column;
+}
+
+.pro-split-horizontal {
+    flex-direction: row;
+}
+
+.pro-split-vertical {
+    flex-direction: column;
+}
+
+.pro-split-pane {
+    overflow: auto;
+}
+
+.pro-split-handle {
+    background-color: #d71212;
+    cursor: col-resize;
+    z-index: 1;
+}
+
+.pro-split-vertical .pro-split-handle {
+    cursor: row-resize;
+}
+
+.pro-split-handle-floating {
+    position: absolute;
+    z-index: 2;
+}
+</style>

ant-design-pro-vue3/src/components/SobComponent/components/SobItemLvlComponent.vue

@@ -0,0 +1,8 @@
+<template>
+
+</template>
+
+<script>
+import { ref, watch, h, computed, onMounted, nextTick, reactive, onBeforeUnmount, inject, defineEmits, defineProps } from 'vue';
+const accLvl = ref('');
+</script>

ant-design-pro-vue3/src/components/main.js

@@ -2,8 +2,17 @@ import ProTable from './ProTable/index.vue'
 import TableSelect from './TableSelect/index.vue'
 import ProTabs from './ProTabs/index.jsx'
 import ProTree from './ProTree/index.vue'
+import ProTree2 from './ProTree2/index.vue'
+import ProTree3 from './ProTree3/index.vue'
 import ProDialog from './ProDialog/index.vue'
 import OpenModelButton from './OpenModelButton/index.vue'
+import DepartTreePanel from './DepartTreePanel/index.vue'
+import ReportComponent from './ReportComponent/index.vue'
+import ProLayout3 from './ProLayout3/index.vue'
+
+
+
+
 // import Tinymce from './Tinymce/index.vue'
 
 import {Button, FormItem, TreeSelect, Modal, Upload, Row, Col, Card} from 'ant-design-vue'
@@ -20,10 +29,17 @@ ProComponentsMount.install = function (Vue){
     Vue.component('ProButton',Button)
     Vue.component('ProFormItem',FormItem)
     Vue.component('ProTreeSelect',TreeSelect)
+
     Vue.component('ProModal',Modal)
     Vue.component('ProUpload',Upload)
     Vue.component('ProRow',Row)
     Vue.component('ProCol',Col)
     Vue.component('ProCard',Card)
+    Vue.component('DepartTreePanel',DepartTreePanel)
+    Vue.component('ReportComponent',ReportComponent)
+    Vue.component('ProTree2',ProTree2)
+    Vue.component('ProTree3',ProTree3)
+  Vue.component('ProLayout3',ProLayout3)
+
 }
 export default ProComponentsMount;

ant-design-pro-vue3/src/layouts/BasicLayout.vue

@@ -16,10 +16,16 @@
                 @toggle="toggle" @refresh="onRefresh" />
 
             <!-- layout content -->
+
+            <!-- <a-layout-content
+                :style="{ overflow: 'auto', background: 'blue', padding: '24px', margin: 0, minHeight: '280px' }">
+                <route-view v-if="showRouter" />
+            </a-layout-content> -->
+
             <a-layout-content :style="{
-        height: '100%', margin: '24px 24px 0',
-        paddingTop: fixedHeader ? '64px' : '0',
-    }">
+                height: '100%', margin: '24px 24px 0',
+                paddingTop: fixedHeader ? '64px' : '0',
+            }">
                 <multi-tab v-if="multiTab"></multi-tab>
                 <transition name="page-transition">
                     <section>

ant-design-pro-vue3/src/locales/menu/cn.ts

@@ -46,13 +46,21 @@ export default {
     'welcome': '欢迎',
     'home': '首页',
 
-    'system.title': '系统',
+    'system.title': '系统设置',
     'system.loginedlog.title': '用户管理',
     'system.loginedlog.userOptLog1.title': '用户日志查询',
     'system.loginedlog.onlineUser.title': '在线用户查询',
     'system.zzmanage.title': '参数管理',
     'system.zzmanage.endYear_manager.title': '年结参数维护',
     'system.zzmanage.currencyManager.title': '币种维护',
+    'system.zzmanage.departLevel.title': '机构层级管理',
+    'system.zzmanage.departLevelDef.title': '机构层级管理2',
+    'system.zzmanage.testVue.title': '测试',
+    'system.zzmanage.ywzkbReport.title': '业务状况表',
+    'system.zzmanage.testProSelectTree.title': '测试业务树',
+    'system.zzmanage.testProTree3.title': '测试树组件3',
+    'system.zzmanage.testProSelectTree3.title': '测试下拉树组件3',
+
 
     'workflow.title': '流程管理',
     'workflow.mole.title': '分支流程管理',
@@ -67,4 +75,12 @@ export default {
     'bbhb.bbhbcswh.bbhb_01_01_01.title': '法人信息',
     'bbhb.bbcx.title': '报表查询',
     'bbhb.bbcx.bbhb_03_01.title': '报表查询',
+
+    'example.title': '示例页面',
+    'example.proDatePickerExample.title': '日期选择器',
+    't2000.title': '柜面交易',
+    't2000.t2000.title': '开户',
+    't2001.t2001.title': '子账户开户',
+
+
 }

ant-design-pro-vue3/src/router/commonRoutes.ts

@@ -32,6 +32,7 @@ export default [
     {
         path: '/:path(.*)',
         name: 'NoMatch',
-        component: () => import('@/views/exception/404.vue'),
+        //component: () => import('@/views/exception/404.vue'),
+        component: () => import('@/views/user/Login.vue'),
     }
 ] as Router[]

ant-design-pro-vue3/src/router/exampleRouterMap.ts

@@ -37,18 +37,54 @@ export const example: Router = {
                     name: 'systemzzmanage',
                     meta: { title: 'menu.system.zzmanage.title' },
                     children: [
-                        {   //年结参数维护
-                            path: '/zp/automake/system/zzmanage/endYear_manager',
-                            name: 'endYear_manager',
-                            component: () => import('@/views/endYear_manager/index.vue'),
-                            meta: { title: 'menu.system.zzmanage.endYear_manager.title' },
+                        {   //机构层级管理
+                            path: '/zp/automake/system/zzmanage/departLevel',
+                            name: 'departLevel',
+                            component: () => import('@/views/depart/departLevel.vue'),
+                            meta: { title: 'menu.system.zzmanage.departLevel.title' },
                         },
-                        {   //币种维护
-                            path: '/zp/automake/system/zzmanage/CurrencyManager',
-                            name: 'currencyManager',
-                            component: () => import('@/views/currencyManager/CurrencyManagerView.vue'),
-                            meta: { title: 'menu.system.zzmanage.currencyManager.title' },
+                        {   //机构层级管理2
+                            path: '/zp/automake/system/zzmanage/DepartLevelDef',
+                            name: 'departLevelDef',
+                            component: () => import('@/views/depart/departLevel/DepartLevelDef.vue'),
+                            meta: { title: 'menu.system.zzmanage.departLevelDef.title' },
+                        },
+                        {   //测试
+                            path: '/zp/automake/system/zzmanage/Test',
+                            name: 'testVue',
+                            component: () => import('@/views/depart/departLevel/Test.vue'),
+                            meta: { title: 'menu.system.zzmanage.testVue.title' },
+                        },
+                        // {   //业务状况表
+                        //     path: '/zp/automake/system/zzmanage/YwzkbReport',
+                        //     name: 'testVue',
+                        //     component: () => import('@/views/depart/departLevel/YwzkbReport.vue'),
+                        //     meta: { title: 'menu.system.zzmanage.ywzkbReport.title' },
+                        // },
+                        // {   //测试下拉树组件
+                        //     path: '/zp/automake/system/zzmanage/TestProSelectTree',
+                        //     name: 'testVue',
+                        //     component: () => import('@/views/depart/departLevel/TestProSelectTree.vue'),
+                        //     meta: { title: 'menu.system.zzmanage.testProSelectTree.title' },
+                        // },
+                        // {   //测试树组件
+                        //     path: '/zp/automake/system/zzmanage/TestProTree3',
+                        //     name: 'testVue',
+                        //     component: () => import('@/views/depart/departLevel/TestProTree3.vue'),
+                        //     meta: { title: 'menu.system.zzmanage.testProTree3.title' },
+                        // },
+                        {   //测试下拉树组件
+                            path: '/zp/automake/system/zzmanage/TestProSelectTree3',
+                            name: 'testProSelectTree3',
+                            component: () => import('@/views/depart/departLevel/TestProSelectTree3.vue'),
+                            meta: { title: 'menu.system.zzmanage.testProSelectTree3.title' },
                         }
+                        // {   //币种维护
+                        //     path: '/zp/automake/system/zzmanage/CurrencyManager',
+                        //     name: 'currencyManager',
+                        //     component: () => import('@/views/currencyManager/CurrencyManagerView.vue'),
+                        //     meta: { title: 'menu.system.zzmanage.currencyManager.title' },
+                        // }
                     ]
                 }
 
@@ -131,6 +167,41 @@ export const example: Router = {
                     ]
                 },
             ]
+        },
+        {   //组件测试
+            path: '/zp/example',
+            name: 'example',
+            component: RouteView,
+            meta: { title: 'menu.example.title' },
+            children: [
+                {   //日期选择器
+                    path: '/zp/example/ProDatePickerExample',
+                    name: 'proDatePickerExample',
+                    component: () => import('@/views/example/ProDatePickerExample.vue'),
+                    meta: { title: 'menu.example.proDatePickerExample.title' },
+                }
+            ]
+        }
+        ,
+        {   //柜面
+            path: '/zp/T2000',
+            name: 't2000',
+            component: RouteView,
+            meta: { title: 'menu.t2000.title' },
+            children: [
+                {   //日期选择器
+                    path: '/zp/t2000/T2000',
+                    name: 't2000',
+                    component: () => import('@/views/front/t2000/T2000.vue'),
+                    meta: { title: 'menu.t2000.t2000.title' },
+                },
+                {   //日期选择器
+                    path: '/zp/t2001/T2001',
+                    name: 't2001',
+                    component: () => import('@/views/front/t2001/T2001.vue'),
+                    meta: { title: 'menu.t2001.t2001.title' },
+                }
+            ]
         }
     ]
 }

ant-design-pro-vue3/src/router/routerGuard.ts

@@ -60,9 +60,13 @@ const defaultRoutePath = '/zp'
 // }
 
 export const setupBeforeEach = (router: Router) => {
+    console.log('routerGuard-start')
+
     router.beforeEach((to, from, next) => {
         NProgress.start() // 加载进度条
         setDocumentTitle(to)
+        console.log('routerGuard', ls.get(USER_INFO), ls.get(ROLE_INFO), ls.get(DEPART_INFO), to.path);
+
         if (ls.get(USER_INFO) && ls.get(ROLE_INFO) && ls.get(DEPART_INFO)) {
             /* has token */
             if (to.path === '/user/login') {

ant-design-pro-vue3/src/style/theme.less

@@ -0,0 +1,50 @@
+// @import 'ant-design-vue/lib/style/themes/default.less';
+// @import 'ant-design-vue/dist/antd.dark.less';
+// @root-entry-name: variable;
+
+@white: #fff;
+@black: #000;
+
+html:not(.dark) {
+  @component-background: @white;
+}
+
+// html.dark {
+// }
+
+.setStyle(@className, @propName) {
+  html {
+    &.dark {
+      .@{className} {
+        @{propName}: @black;
+      }
+    }
+
+    &:not(.dark) {
+      .@{className} {
+        @{propName}: @white;
+      }
+    }
+  }
+}
+
+.themeColor(@classNames, @i: 1) when(@i =< length(@classNames)) {
+  @className: extract(@classNames, @i);
+
+  .setStyle(@className, background-color);
+  .setStyle(@className, color);
+
+  .themeColor(@classNames, (@i + 1));
+}
+
+.themeTextColor(@classNames, @i: 1) when(@i =< length(@classNames)) {
+  @className: extract(@classNames, @i);
+  .setStyle(@className, color);
+  .themeColor(@classNames, (@i + 1));
+}
+
+.themeBgColor(@classNames, @i: 1) when(@i =< length(@classNames)) {
+  @className: extract(@classNames, @i);
+  .setStyle(@className, background-color);
+  .themeColor(@classNames, (@i + 1));
+}

ant-design-pro-vue3/src/utils/treeUtil.js

@@ -0,0 +1,361 @@
+import { isEmpty } from '@/utils/validate';
+
+/**
+ * 获取指定节点的父节点和爷节点的 key
+ * @param {Array} treeData - 树形数据数组，每个节点可以包含 children 属性表示子节点
+ * @param {string|number} key - 要查找的目标节点的 key 值
+ * @param {Object} fieldNames - 节点中表示 key 的字段名配置，默认为 { key: 'key' }
+ * @returns {Array} - 包含父节点和爷节点 key 的数组
+ */
+export function getAnsKeys(treeData, key, fieldNames = { key: 'key' }) {
+    const parentKeys = [];
+    // 递归查找目标节点并记录其父节点信息
+    const findNode = (currentNodes, parentKey = null, grandParentKey = null) => {
+        for (const node of currentNodes) {
+            if (node[fieldNames.key] === key) {
+                // 如果存在父节点，添加到结果数组
+                if (parentKey) {
+                    parentKeys.push(parentKey);
+                }
+                // 如果存在爷节点，添加到结果数组
+                if (grandParentKey) {
+                    parentKeys.push(grandParentKey);
+                }
+                return;
+            }
+            if (node.children) {
+                // 递归调用，更新父节点和爷节点信息
+                findNode(node.children, node[fieldNames.key], parentKey);
+            }
+        }
+    };
+    findNode(treeData);
+    return parentKeys;
+}
+
+
+/**
+ * 获取指定节点的子节点和孙节点的 key
+ * @param {Array} treeData - 树形结构数据，每个节点包含 id、children 等属性
+ * @param {Array} keys - 要选中的节点 ID 数组
+ * @returns {Array} - 最终选中的节点 ID 数组
+ */
+export function getDscKeys(treeData, keys) {
+    // 初始化所有节点的选中状态为 false
+    function initSelection(tree) {
+        tree.forEach((node) => {
+            node.selected = false;
+            if (node.children) {
+                initSelection(node.children);
+            }
+        });
+    }
+
+    // 选中父节点时，递归选中其所有子节点
+    function selectParent(node) {
+        node.selected = true;
+        if (node.children) {
+            node.children.forEach((child) => {
+                selectParent(child);
+            });
+        }
+    }
+
+    // 选中子节点时，更新父节点的选中状态
+    function selectChild(node) {
+        node.selected = true;
+        let parent = node.parent;
+        while (parent) {
+            const allChildrenSelected = parent.children.every((child) => child.selected);
+            parent.selected = allChildrenSelected;
+            parent = parent.parent;
+        }
+    }
+
+    // 为所有节点设置 parent 属性
+    function setParent(tree, parent = null) {
+        tree.forEach((node) => {
+            node.parent = parent;
+            if (node.children) {
+                setParent(node.children, node);
+            }
+        });
+    }
+
+    // 根据传入的 key 选中节点
+    function selectNodes(tree, keys) {
+        tree.forEach((node) => {
+            if (keys.includes(String(node.id))) {
+                selectParent(node);
+                selectChild(node);
+            }
+            if (node.children) {
+                selectNodes(node.children, keys);
+            }
+        });
+    }
+
+    // 收集所有选中节点的 id
+    function collectSelectedIds(tree) {
+        const selectedIds = [];
+        const stack = [...tree];
+        while (stack.length > 0) {
+            const node = stack.pop();
+            if (node.selected) {
+                selectedIds.push(node.id);
+            }
+            if (node.children) {
+                stack.push(...node.children);
+            }
+        }
+        return selectedIds;
+    }
+
+    // 初始化选中状态
+    initSelection(treeData);
+    // 设置 parent 属性
+    setParent(treeData);
+    // 处理节点选中逻辑
+    selectNodes(treeData, keys);
+    // 收集选中节点的 id
+    return collectSelectedIds(treeData);
+}
+
+
+export function getWithoutDscKeys (treeData, keys, fieldNames = { key: 'id' }) {
+    let withoutDesKeys = [];
+    let withoutDesNodes = [];
+    const allNodes = getAllNodes(treeData);
+    if (keys.length === 1) {
+        // 只选中一个节点
+        const node = allNodes.find(n => n.id === keys[0]);
+        withoutDesKeys.push(node[fieldNames.key]);
+        withoutDesNodes.push(node);
+    } else {
+        // 选中多个节点
+        for (let i = 0; i < keys.length; i++) {
+            // 找到当前节点
+            const node = allNodes.find(n => n.id === keys[i]);
+            if (!keys.includes(node.pid)) {
+                // 选择的节点对应的父节点没有被选择， 则添加到结果中
+                withoutDesKeys.push(node[fieldNames.key]);
+                withoutDesNodes.push(node);
+            }
+        }
+    }
+    // 返回包含三个数组的对象
+    return {
+        withoutDesKeys,
+        withoutDesNodes
+    };
+}
+
+
+
+/**
+ * 
+ * @param {Array} treeData 
+ * @param {String} targetId 
+ * @param {Array} checkedKeys 
+ * @returns 
+ */
+export function delAnsAndDscKeys(treeData, targetId, checkedKeys) {
+    // 存储需要移除的节点 ID
+    let keysToRemove = [];
+
+    // 递归收集要删除的节点及其所有子节点的 ID
+    function collectKeysToRemove(node) {
+        keysToRemove.push(node.id);
+        if (node.children && node.children.length > 0) {
+            node.children.forEach(child => collectKeysToRemove(child));
+        }
+    }
+
+    // 遍历树结构，找到要删除的节点并收集其及子节点的 ID
+    function traverseTree(nodes) {
+        nodes.forEach(node => {
+            if (Array.isArray(targetId) ? targetId.includes(node.id) : node.id === targetId) {
+                collectKeysToRemove(node);
+            } else if (node.children && node.children.length > 0) {
+                traverseTree(node.children);
+            }
+        });
+    }
+
+    // 递归查找目标节点的所有上级节点的 ID
+    function findParentIds(nodes, target, parents = []) {
+        for (let node of nodes) {
+            if (Array.isArray(target) ? target.includes(node.id) : node.id === target) {
+                return parents;
+            }
+            if (node.children && node.children.length > 0) {
+                const newParents = [...parents, node.id];
+                const found = findParentIds(node.children, target, newParents);
+                if (found.length > 0) {
+                    return found;
+                }
+            }
+        }
+        return [];
+    }
+
+    traverseTree(treeData);
+
+    // 收集目标节点的上级节点 ID 并添加到 keysToRemove 中
+    if (Array.isArray(targetId)) {
+        targetId.forEach(id => {
+            const parentIds = findParentIds(treeData, id);
+            keysToRemove = keysToRemove.concat(parentIds);
+        });
+    } else {
+        const parentIds = findParentIds(treeData, targetId);
+        keysToRemove = keysToRemove.concat(parentIds);
+    }
+
+    // 过滤掉需要移除的节点 ID
+    return checkedKeys.filter(key => !keysToRemove.includes(key));
+}
+
+/**
+ * 在树形数据中查找具有指定字段名和值的节点。
+ * 支持传入单个值或值数组进行匹配。
+ * 匹配成功的节点将去除其 `children` 属性后添加到结果数组中。
+ * 
+ * @param {Array} treeData - 树形数据，是一个包含节点对象的数组。每个节点对象可以有一个 `children` 属性，用于表示子节点数组。
+ * @param {string} fieldName - 要匹配的字段名，即节点对象中的属性名。
+ * @param {string|Array} value - 要匹配的值，可以是单个字符串或字符串数组。
+ * @returns {Array} - 返回一个数组，包含所有匹配到的节点（去除 `children` 属性）。如果传入的 `value` 为空，则返回空数组。
+ */
+export function findNodes (treeData, fieldName, value) {
+    // 如果传入的 value 为空，则直接返回空数组
+    if (!value) return [];
+    // 用于存储找到的匹配节点
+    const result = [];
+    // 遍历树形数据中的每个节点
+    treeData.forEach(node => {
+        // 标记当前节点是否匹配
+        let isMatch = false;
+        // 判断 value 是否为字符串
+        if (typeof value === 'string') {
+            // 如果当前节点的指定字段值等于传入的字符串值，则标记为匹配
+            if (node[fieldName] === value) {
+                isMatch = true;
+            }
+        } 
+        // 判断 value 是否为数组
+        else if (Array.isArray(value)) {
+            // 如果当前节点的指定字段值存在于传入的数组中，则标记为匹配
+            if (value.includes(node[fieldName])) {
+                isMatch = true;
+            }
+        }
+        // 如果当前节点匹配
+        if (isMatch) {
+            // 解构赋值，去除节点的 children 属性
+            const { children, ...nodeWithoutChildren } = node;
+            // 将去除 children 属性的节点添加到结果数组中
+            result.push(nodeWithoutChildren);
+        }
+        // 如果当前节点有子节点
+        if (node.children && node.children.length > 0) {
+            // 递归调用 findNodes 函数，在子节点中继续查找匹配的节点，并将结果添加到结果数组中
+            result.push(...findNodes(node.children, fieldName, value));
+        }
+    });
+    // 返回结果数组
+    return result;
+}
+
+/**
+ * 在树形数据中搜索具有指定字段名且该字段值包含指定搜索值的节点。
+ * 匹配成功的节点将去除其 `children` 属性后添加到结果数组中。
+ * 
+ * @param {Array} treeData - 树形数据，是一个包含节点对象的数组。每个节点对象可以有一个 `children` 属性，用于表示子节点数组。
+ * @param {string} fieldName - 要搜索的字段名，即节点对象中的属性名。
+ * @param {string} value - 要搜索的值，必须是字符串类型。
+ * @returns {Array} - 返回一个数组，包含所有匹配到的节点（去除 `children` 属性）。如果传入的 `value` 为空，则返回空数组。
+ */
+export function searchNodes (treeData, fieldName, value) {
+    // 如果传入的 value 为空，则直接返回空数组
+    if (!value) return [];
+    // 用于存储找到的匹配节点
+    const result = [];
+    // 定义一个递归函数，用于遍历树形数据
+    const traverse = (nodes) => {
+        // 遍历当前层级的所有节点
+        nodes.forEach((node) => {
+            // 如果当前节点的指定字段值包含传入的搜索值
+            if (node[fieldName].includes(value)) {
+                // 解构赋值，去除节点的 children 属性
+                const { children, ...nodeWithoutChildren } = node;
+                // 将去除 children 属性的节点添加到结果数组中
+                result.push(nodeWithoutChildren);
+            }
+            // 如果当前节点有子节点
+            if (node.children && node.children.length > 0) {
+                // 递归调用 traverse 函数，继续遍历子节点
+                traverse(node.children);
+            }
+        });
+    };
+    // 从根节点开始调用 traverse 函数进行遍历
+    traverse(treeData);
+    // 返回结果数组
+    return result;
+};
+
+
+/**
+ * 从树形数据中获取所有节点（去除 children 属性）
+ * @param {Array} treeData - 树形数据数组，每个节点可以包含 children 属性表示子节点
+ * @returns {Array} - 包含所有节点（去除 children 属性）的数组
+ */
+export function getAllNodes(treeData) {
+    let allNodes = [];
+    const traverse = (nodeList) => {
+        nodeList.forEach(node => {
+            const { children, ...nodeWithoutChildren } = node;
+            allNodes.push(nodeWithoutChildren); // 收集当前节点
+            if (node.children) {
+                traverse(node.children); // 递归遍历子节点
+            }
+        });
+    };
+    traverse(treeData);
+    console.log('wyq-treeUtil-getAllNodes',allNodes);
+    return allNodes;
+}
+
+
+
+// 封装成树形结构的公共方法
+export function convertToTree (data) {
+    // 用于存储每个节点的映射，键为节点的 id，值为节点对象
+    const nodeMap = {};
+    // 存储根节点的数组
+    const tree = [];
+    const localData = [];
+    // 第一次遍历，将每个节点存储到 nodeMap 中
+    data.forEach(item => {
+        // 为每个节点添加 children 属性，用于存储其子节点
+        item.children = [];
+        // 去重处理， 同一个id只保留一个节点
+        if (isEmpty(nodeMap[item.id])) {
+            nodeMap[item.id] = item;
+            localData.push(item);
+
+        }
+    });
+    // 第二次遍历，构建树形结构
+    localData.forEach(item => {
+        const pid = item.pid;
+        if (pid === null || pid === undefined || pid === item.id || !nodeMap[pid]) {
+            // 如果 pid 为 null 或 undefined，或者父节点不存在，则将该节点作为根节点
+            tree.push(item);
+        } else {
+            // 否则，将该节点添加到其父节点的 children 数组中
+            nodeMap[pid].children.push(item);
+        }
+    });
+    return tree;
+}

ant-design-pro-vue3/src/views/CurrencyManager/CurrencyManagerView.vue

@@ -6,9 +6,9 @@
                     v-model:value="formData_3f9a9bdc.key" placeholder="请输入" :allowClear="true"></pro-input>
                 <pro-input :ref="(el) => formRefs_3f9a9bdc.name = el" :formItemProps="{ label: '币种名称', prop: 'name' }"
                     v-model:value="formData_3f9a9bdc.name" placeholder="请输入" :allowClear="true"></pro-input>
-                <pro-select :ref="(el) => formRefs_3f9a9bdc.use_yn = el" :formItemProps="{ label: '启用标志', prop: 'use_yn' }"
-                    v-model:value="formData_3f9a9bdc.use_yn" placeholder="请选择" :allowClear="true"
-                    tableName="com_usertype_info" colName="use_yn"></pro-select>
+                <pro-select :ref="(el) => formRefs_3f9a9bdc.use_yn = el"
+                    :formItemProps="{ label: '启用标志', prop: 'use_yn' }" v-model:value="formData_3f9a9bdc.use_yn"
+                    placeholder="请选择" :allowClear="true" tableName="com_usertype_info" colName="use_yn"></pro-select>
                 <pro-form-item>
                     <pro-button id="eaa14d90-c51b-11ea-8654-5d95137760bf" @click="queryHandler6da153cb"
                         :icon="h(SearchOutlined)">查询</pro-button>
@@ -17,13 +17,16 @@
                     <Expand id="ef472ef0-c51b-11ea-8654-5d95137760bf" downText="收起" upText="展开"></Expand>
                 </pro-form-item>
             </pro-form-grid>
+
+            <pro-table ref="tableRef_594bc79c" :columns="columns_594bc79c" :queryRule="queryRule_594bc79c">
+                <template v-slot:header="">
+                    <OpenModelButton id="32ce0e30-c528-11ea-ac8a-91bf0c12e282" :modal="CurrencyManagerInsertView"
+                        afterShow="CurrencyManager/clickInsertOrModifyBtn" text="新增" :icon="h(PlusOutlined)"
+                        type="primary">
+                    </OpenModelButton>
+                </template>
+            </pro-table>
         </pro-form>
-        <pro-table ref="tableRef_594bc79c" :columns="columns_594bc79c" :queryRule="queryRule_594bc79c">
-            <template v-slot:header="">
-                <OpenModelButton id="32ce0e30-c528-11ea-ac8a-91bf0c12e282" :modal="CurrencyManagerInsertView"
-                    afterShow="CurrencyManager/clickInsertOrModifyBtn" text="新增" :icon="h(PlusOutlined)" type="primary">
-                </OpenModelButton>
-            </template></pro-table>
     </div>
 </template>
 <script setup lang="jsx">

ant-design-pro-vue3/src/views/depart/Test.vue

@@ -0,0 +1,298 @@
+<template>
+    <div id="app">
+        <div class="container">
+            <div v-if="showLeftPanel" ref="leftPanel" class="left-panel">
+                <div class="left-panel-header">
+                    <div class="left-panel-title">机构树面板</div>
+                    <div class="left-panel-tool">
+                        <DoubleLeftOutlined @click="toggleShowLeftPanel" />
+                    </div>
+                </div>
+                <div class="left-panel-body">
+                    <span>汇总关系：</span>
+                    <pro-select
+                        style="width: calc(100% - 50px); height: 25px;position: absolute;right: 10px; margin-top: -13px; top:50%;overflow: hidden; "
+                        :allowClear="true">
+                    </pro-select>
+
+                </div>
+
+                <div>
+                    <!-- <a-tabs type="card" v-model:activeKey="activeKey"> -->
+                    <a-tabs type="card">
+                        <a-tab-pane key="1" tab="账务树">Content of Tab Pane 1</a-tab-pane>
+                        <a-tab-pane key="2" tab="对比树">Content of Tab Pane 2</a-tab-pane>
+                        <a-tab-pane key="3" tab="报送树">Content of Tab Pane 3</a-tab-pane>
+                    </a-tabs>
+                </div>
+                <div>
+                    <a-tree :treeData="treeData" :loadData="onLoadData" :multiple="true" :search="searchValue"
+                        @select="onSelect" @deselect="onDeselect" @search="onSearch" />
+                </div>
+
+
+
+
+            </div>
+            <div v-else>
+                <div class="left-panel-header">
+                    <div class="left-panel-tool">
+                        <DoubleRightOutlined @click="toggleShowLeftPanel" />
+                    </div>
+                </div>
+            </div>
+
+            <div class="resizer-horizontal" @mousedown="startDragHorizontal"></div>
+            <div ref="rightPanel" class="right-panel">
+                <div ref="topPane" class="top-pane">
+                    <div>
+                        <div class="left-panel-header">
+                            <div class="left-panel-title">报表查询</div>
+                        </div>
+                        <pro-form-grid>
+                            <pro-input :formItemProps="{ label: '层级编号', prop: 'levelKey' }" placeholder="请输入层级编号"
+                                :allowClear="true">
+                            </pro-input>
+
+                            <pro-select :formItemProps="{ label: '启用标志', prop: 'useYn' }" placeholder="请选择启用标志"
+                                :allowClear="true">
+                            </pro-select>
+                        </pro-form-grid>
+
+                    </div>
+                </div>
+                <div class="resizer-vertical" @mousedown="startDragVertical"></div>
+                <div ref="bottomPane" class="bottom-pane">
+                    <div>底部内容</div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup lang="jsx">
+import { ref, watch, h, computed } from 'vue';
+import { DoubleRightOutlined, DoubleLeftOutlined } from "@ant-design/icons-vue";
+
+const leftPanel = ref(null);
+const rightPanel = ref(null);
+const topPane = ref(null);
+const bottomPane = ref(null);
+
+let startX = ref(0);
+let startY = ref(0);
+
+let initialLeftWidth = ref(0); // 左侧面板初始宽度
+let initialTopHeight = ref(0); // 顶部面板初始高度
+let isResizingHorizontal = ref(false);
+let isResizingVertical = ref(false);
+
+let showLeftPanel = ref(true);
+
+const searchValue = ref('');
+const treeData = [
+    {
+        title: '总公司',
+        key: '0-0',
+        children: [
+            {
+                title: '分公司1',
+                key: '0-0-0',
+                children: []
+            },
+            {
+                title: '分公司2',
+                key: '0-0-1',
+                children: []
+            }
+        ]
+    }
+
+];
+const replaceFields = computed(() => {
+    return {
+        key: 'id',
+        title: 'name',
+        children: 'children'
+    };
+});
+
+function toggleShowLeftPanel () {
+    console.log('wyq--切换左侧面板前', showLeftPanel.value);
+    showLeftPanel.value = !showLeftPanel.value;
+    console.log('wyq--切换左侧面板后', showLeftPanel.value);
+}
+
+function startDragHorizontal (event) {
+    console.log('wyq--开始水平拖动');
+    isResizingHorizontal = true;
+    startX = event.clientX;
+    // 转换为百分比
+    initialLeftWidth = leftPanel.value.offsetWidth / window.innerWidth * 100;
+    document.addEventListener('mousemove', resizeHorizontal);
+    document.addEventListener('mouseup', stopResizeHorizontal);
+}
+
+function resizeHorizontal (event) {
+    console.log('wyq--开始水平拖动-resizeHorizontal',);
+
+    if (!isResizingHorizontal) return;
+    console.log('wyq--进来了没');
+
+    const deltaX = event.clientX - startX;
+    const newLeftWidthPercent = initialLeftWidth + (deltaX / window.innerWidth * 100);
+    const newLeftWidth = (window.innerWidth * newLeftWidthPercent) / 100;
+    console.log('wyq--水平拖动', newLeftWidthPercent, newLeftWidth);
+
+    // 更新左右面板的宽度（使用flex-basis而不是直接设置width，以保持响应式）
+    leftPanel.value.style.flexBasis = `${newLeftWidth}px`;
+    rightPanel.value.style.flexBasis = `calc(100% - ${newLeftWidth}px)`;
+}
+
+function stopResizeHorizontal () {
+    console.log('wyq--开始水平拖动-stopResizeHorizontal');
+    isResizingHorizontal = false;
+    document.removeEventListener('mousemove', resizeHorizontal);
+    document.removeEventListener('mouseup', stopResizeHorizontal);
+}
+
+function startDragVertical (event) {
+    console.log('wyq--开始上下拖动');
+    isResizingVertical = true;
+    startY = event.clientY;
+    initialTopHeight = topPane.value.offsetHeight;
+    document.addEventListener('mousemove', resizeVertical);
+    document.addEventListener('mouseup', stopResizeVertical);
+
+
+}
+
+function resizeVertical (event) {
+    console.log('wyq--开始上下拖动-resizeVertical',);
+
+    if (!isResizingVertical) return;
+    console.log('wyq--进来了没');
+
+    const deltaY = event.clientY - startY;
+    const newHeight = initialTopHeight + deltaY;
+
+    const minHeight = 50; // 最小高度限制
+    const maxHeight = window.innerHeight - minHeight; // 最大高度限制
+    let finalHeight = Math.max(minHeight, Math.min(maxHeight, newHeight));
+    topPane.value.style.height = `${finalHeight}px`;
+    bottomPane.value.style.height = `calc(100% - ${finalHeight}px)`;
+}
+
+function stopResizeVertical () {
+    console.log('wyq--开始上下拖动-stopResizeVertical');
+    isResizingVertical = false;
+    document.removeEventListener('mousemove', resizeVertical);
+    document.removeEventListener('mouseup', stopResizeVertical);
+
+}
+</script>
+
+<style scoped>
+#app {
+    height: 100vh;
+    width: 100vw;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+.container {
+    display: flex;
+    width: 100%;
+    height: 100%;
+}
+
+.left-panel {
+    /* 纵向排列滚动条*/
+    overflow: auto;
+    /* background-color: lightblue; */
+    flex: 1;
+    /* 初始时左面板占10% */
+    flex-basis: 18%;
+}
+
+.resizer-horizontal {
+    width: 5px;
+    cursor: ew-resize;
+    background-color: #ccc;
+    user-select: none;
+}
+
+.right-panel {
+    /* background-color: #e0e0e0; */
+    flex: 1;
+    /* 初始时左面板占90% */
+    flex-basis: 82%;
+}
+
+
+
+.top-pane {
+    /* background-color: blueviolet; */
+    height: 20%;
+}
+
+.resizer-vertical {
+    height: 5px;
+    cursor: ns-resize;
+    background-color: #ccc;
+    user-select: none;
+}
+
+.bottom-pane {
+    background-color: bisque;
+    height: 80%;
+}
+
+.div9 {
+    /* height: 100px; */
+    background-color: #f0f0f0;
+}
+
+.logo {
+    height: 32px;
+    margin: 16px;
+    cursor: pointer;
+}
+
+.left-panel-header {
+    height: 34px;
+    line-height: 34px;
+    border: 0;
+    background-color: #94C8C1;
+    padding: 0 14px;
+    margin: 2px 0;
+    display: flex;
+    position: relative;
+}
+
+.left-panel-title {
+    height: 34px;
+    line-height: 34px;
+    color: #fff;
+    font-weight: bold;
+    font-size: 16px;
+    margin: 0;
+    padding: 0;
+}
+
+.left-panel-tool {
+    right: 10px;
+    width: auto;
+    position: absolute;
+    top: 50%;
+    margin-top: -17px;
+    overflow: hidden;
+}
+
+.left-panel-body {
+    padding: 5px;
+    position: relative;
+
+}
+</style>

ant-design-pro-vue3/src/views/depart/departLevel.vue

@@ -0,0 +1,123 @@
+<template>
+    <div>
+        <pro-form ref="formRef" :model="formData" :rules="formRules" label-width="120px">
+            <pro-form-grid>
+                <pro-input :ref="(el) => formRefs.levelId = el" :formItemProps="{ label: '层级编号', prop: 'levelId' }"
+                    v-model:value="formData.levelId" placeholder="请输入层级编号" :allowClear="true">
+                </pro-input>
+
+                <pro-select :ref="(el) => formRefs.enabledFlag = el"
+                    :formItemProps="{ label: '启用标志', prop: 'enabledFlag' }" v-model:value="formData.enabledFlag"
+                    placeholder="请选择启用标志" :allowClear="true" :options="enabledOptions">
+                </pro-select>
+
+                <pro-form-item>
+                    <pro-button id="queryBtn" @click="query" :icon="h(SearchOutlined)">查询</pro-button>
+                    <pro-button id="resetBtn" @click="reset" :icon="h(RedoOutlined)">重置</pro-button>
+                    <Expand id="expandBtn" downText="收起" upText="展开"></Expand>
+                </pro-form-item>
+
+            </pro-form-grid>
+        </pro-form>
+
+        <pro-table ref="tableRef" :columns="columns" :queryRule="queryRule" :rowSelection="false">
+            <template v-slot:header="">
+                <OpenModelButton :modal="departLevelInsertView" afterShow="CurrencyManager/clickInsertOrModifyBtn"
+                    text="新增" :icon="h(PlusOutlined)" type="primary">
+                </OpenModelButton>
+            </template>
+        </pro-table>
+    </div>
+</template>
+<script setup lang="jsx">
+import { ref, reactive, h, computed } from 'vue';
+import { SearchOutlined, RedoOutlined, PlusOutlined, EditOutlined } from "@ant-design/icons-vue";
+import { useStore } from 'vuex';
+import departLevelInfo from './departLevelInfo.vue';
+const store = useStore();
+const formData = ref({
+    levelId: "",
+    enabledFlag: null
+});
+const formRules = ref({
+    // 添加验证规则
+});
+const formRefs = reactive({
+    levelId: "",
+    enabledFlag: ""
+});
+
+const enabledOptions = [
+    { label: '启用', value: 'Y' },
+    { label: '未启用', value: 'N' }
+];
+
+
+
+function query () {
+    // 查询
+}
+function reset () {
+    // 重置
+}
+function expand () {
+    // 展开/收起
+}
+
+function departLevelInsertView () {
+    // 弹出新增弹窗
+}
+
+
+
+const queryParams = ref({});
+
+// 定义了一个计算属性 departLevelData，它的值来自 Vuex 状态管理中的 departLevel.departLevelData
+// 通过使用 computed，当 store.state.departLevel.departLevelData 发生变化时，departLevelData 会自动更新。这种反应式的特性使得数据在 UI 中保持同步。
+const departLevelData = computed(() => store.state.departLevel.departLevelData);
+
+// 该函数是一个异步函数，用于根据传入的 payload 和 params 请求和返回表格数据。
+// payload参数‌是一个对象，用于在组件之间传递数据。Payload参数包含要传递给组件的数据，这些数据可以是任何类型，包括字符串、数字、布尔值、对象和数组等‌
+async function queryRule (payload, params) {
+    // queryParam 变量用于存储查询参数，如果存在 queryParams（可能是通过 Vue 的响应式引用取得的），则将其值赋予 queryParam。
+    let queryParam = {};
+    if (queryParams) {
+        queryParam = queryParams.value;
+    }
+    // 向后台请求表格数据
+    // 通过调用 Vuex 中的 dispatch 方法发送一个名为 CurrencyManager/queryCurrency 的 action。
+    await store.dispatch('departLevel/queryDepartLevel', {
+        values: {
+            page: payload.pageIndex,
+            rows: payload.pageSize,
+            ...params,
+            ...queryParam
+        }
+    });
+    const resp = departLevelData.value;
+    return {
+        current: payload.pageIndex,
+        pageSize: payload.pageSize,
+        total: resp.total,
+        data: resp.records
+    };
+
+}
+
+// 列定义
+const columns = [
+    {
+        prop: "ActionColumn", label: "操作", width: 150, render: (scope) => {
+            return <div>
+                <OpenModelButton id="651rew123" modal={departLevelInfo} afterShow="departLevel/clickInsertOrModifyBtn" text="修改" icon={h(EditOutlined)} type="primary" payload={scope.record}>
+                </OpenModelButton>
+            </div>
+        },
+        align: "center",
+    },
+    { prop: 'key', title: '层级编号', width: 150 },
+    { prop: 'name', title: '层级名称', width: 150 },
+    { prop: 'use', title: '用途', width: 150 },
+    { prop: 'use_yn', title: '启用标志', width: 150 }
+];
+</script>

ant-design-pro-vue3/src/views/depart/departLevel/DepartLevelDef copy.vue

@@ -0,0 +1,171 @@
+<template>
+    <div>
+        <pro-form ref="formRef" :model="formData" :rules="formRules" label-width="120px">
+            <pro-form-grid>
+                <pro-input :formItemProps="{ label: '层级编号', prop: 'levelKey' }" v-model:value="formData.levelKey"
+                    placeholder="请输入层级编号" :allowClear="true">
+                </pro-input>
+
+                <pro-select :formItemProps="{ label: '启用标志', prop: 'useYn' }" v-model:value="formData.useYn"
+                    placeholder="请选择启用标志" :allowClear="true" :options="enabledOptions">
+                </pro-select>
+
+                <pro-form-item>
+                    <pro-button id="queryBtn" @click="search" :icon="h(SearchOutlined)">查询</pro-button>
+                    <pro-button id="resetBtn" @click="reset" :icon="h(RedoOutlined)">重置</pro-button>
+                    <!-- 问题3： 根本就没有这个组件 -->
+                    <Expand id="expandBtn" downText="收起" upText="展开">
+                    </Expand>
+                </pro-form-item>
+            </pro-form-grid>
+        </pro-form>
+
+        <pro-table ref="tableRef" :columns="columns" :queryRule="queryRule" :rowSelection="false">
+            <template v-slot:header="">
+                <OpenModelButton :modal="DepartLevelInfo" afterShow="DepartLevel/addOrModify" text="新增"
+                    :icon="h(PlusOutlined)" type="primary">
+                </OpenModelButton>
+            </template>
+        </pro-table>
+    </div>
+</template>
+<script setup lang="jsx">
+import { ref, reactive, h, computed } from 'vue';
+import { SearchOutlined, RedoOutlined, PlusOutlined, EditOutlined } from "@ant-design/icons-vue";
+import { useStore } from 'vuex';
+import DepartLevelInfo from './DepartLevelInfo.vue';
+const emit = defineEmits(['close:modal'])
+const store = useStore();
+// 表单组件的引用
+const formRef = ref();
+// 表格组件的引用
+const tableRef = ref();
+// 表单数据
+const formData = ref({
+    // 表单字段的初始值
+    levelKey: "",
+    useYn: ""
+});
+
+// 表单验证规则
+const formRules = ref({
+    // 添加验证规则
+    levelKey: [
+        { required: false, trigger: 'blur' },
+        // 其他校验规则
+    ],
+    useYn: [
+        { required: false, trigger: 'change' },
+        // 其他校验规则
+    ]
+});
+// 定义了一个计算属性 departLevelData，它的值来自 Vuex 状态管理中的 departLevel.departLevelData
+// 通过使用 computed，当 store.state.departLevel.departLevelDefData 发生变化时，departLevelDefData 会自动更新。
+const departLevelDefData = computed(() => store.state.DepartLevel.departLevelDefData);
+const enabledOptions = [
+    { label: '启用', value: 'Y' },
+    { label: '未启用', value: 'N' }
+];
+
+function search () {
+    // 查询
+    // 问题1：为什么要在这里调用 validate 方法？,校验是怎么处理调用的对不对
+    formRef.value.validate().then(values => {
+        //表单校验成功
+        // 这一步会触发 queryRule 函数，使用更新后的查询参数重新请求数据并刷新表格。
+        tableRef.value.reload();
+    });
+}
+
+function reset () {
+    // 调用原生组件的重置表单方法
+    formRef.value.getOrignRef().resetFields();
+}
+
+function departLevelInsertView () {
+    // 弹出新增弹窗
+}
+
+// 该函数是一个异步函数，用于根据传入的 payload 和 params 请求和返回表格数据。
+// payload参数‌是一个对象，用于在组件之间传递数据。Payload参数包含要传递给组件的数据，这些数据可以是任何类型，包括字符串、数字、布尔值、对象和数组等‌
+async function queryRule (payload, params) {
+    // 问题2: params是个啥,而且是一个
+    // queryParam 变量用于存储查询参数，如果存在 queryParams（可能是通过 Vue 的响应式引用取得的），则将其值赋予 queryParam。
+    let queryParams = {
+        page: payload.pageIndex,
+        rows: payload.pageSize,
+        ...params,
+        key: formData.value.levelKey,
+        use_yn: formData.value.useYn
+    };
+
+    // 向后台请求表格数据
+    // 通过调用 Vuex 中的 dispatch 方法发送一个名为 DepartLevel/queryDepartLevelDefData 的 action。
+    await store.dispatch('DepartLevel/queryDepartLevelDefData', {
+        values: {
+            ...queryParams
+        }
+    });
+    // 由于 store.state.DepartLevel.departLevelDefData 是一个响应式引用，
+    // 因此当 store.state.DepartLevel.departLevelDefData 发生变化时，departLevelDefData 也会自动更新。
+    const resp = departLevelDefData.value;
+    return {
+        current: payload.pageIndex,
+        pageSize: payload.pageSize,
+        total: resp.total,
+        data: resp.records
+    };
+}
+
+
+
+var showUseYn = (text, record) => {
+    console.log("wyq", text, record);
+    let value = false;
+    if (record.use_yn == 'Y') {
+        console.log("wyq1", text, record);
+
+        value = true;
+    }
+
+
+    return <a-button type="primary" size="small" onClick={() => changeUseYn(value, record)}>
+        {value ? "启用" : "未启用"}
+    </a-button>
+};
+
+function changeUseYn (value, record) {
+    console.log("changeUseYn", value, record);
+    // let use_yn = 'N';
+    // if (value) {
+    //     use_yn = 'Y';
+    // }
+    // store.dispatch('DepartLevel/updateDepartLevelDefData', {
+    //     values: {
+    //         id: record.id,
+    //         use_yn: use_yn
+    //     }
+    // });
+}
+
+// 列定义
+const columns = [
+    {
+        prop: "ActionColumn", label: "操作", width: 150, render: (scope) => {
+            return <div>
+                <OpenModelButton id="651rew123" modal={DepartLevelInfo} afterShow="DepartLevel/addOrModify"
+                    text="修改" icon={h(EditOutlined)} type="primary" payload={scope.record}>
+                </OpenModelButton>
+            </div>
+        },
+        align: "center",
+    },
+    { prop: 'key', title: '层级编号', width: 150 },
+    { prop: 'name', title: '层级名称', width: 150 },
+    { prop: 'use', title: '用途', width: 150 },
+    {
+        prop: 'use_yn', title: '启用标志', width: 150,
+        render: scop => showUseYn(scop.record.use_yn, scop.record)
+    }
+];
+</script>

ant-design-pro-vue3/src/views/depart/departLevel/DepartLevelDef.vue

@@ -0,0 +1,173 @@
+<template>
+    <div>
+        <pro-form ref="formRef" :model="formData" :rules="formRules" label-width="120px">
+            <pro-form-grid>
+                <pro-input :formItemProps="{ label: '层级编号', prop: 'levelKey' }" v-model:value="formData.levelKey"
+                    placeholder="请输入层级编号" :allowClear="true">
+                </pro-input>
+                <pro-select :formItemProps="{ label: '启用标志', prop: 'useYn' }" v-model:value="formData.useYn"
+                    placeholder="请选择启用标志" :allowClear="true" tableName="com_usertype_info" colName="use_yn">
+                </pro-select>
+
+                <pro-form-item>
+                    <pro-button id="queryBtn" @click="search" :icon="h(SearchOutlined)">查询</pro-button>
+                    <pro-button id="resetBtn" @click="reset" :icon="h(RedoOutlined)">重置</pro-button>
+                    <!-- 问题3： 根本就没有这个组件 -->
+                    <Expand id="expandBtn" downText="收起" upText="展开">
+                    </Expand>
+                </pro-form-item>
+            </pro-form-grid>
+        </pro-form>
+
+        <pro-table ref="tableRef" :columns="columns" :queryRule="queryRule" :rowSelection="false">
+            <template v-slot:header="">
+                <OpenModelButton :modal="DepartLevelInfo" beforeShow="DepartLevel/loadDialogDataData" text="新增"
+                    :icon="h(PlusOutlined)" type="primary" @addData="getList">
+                </OpenModelButton>
+            </template>
+        </pro-table>
+    </div>
+</template>
+<script setup lang="jsx">
+import { ref, watch, h, computed } from 'vue';
+import { SearchOutlined, RedoOutlined, PlusOutlined, EditOutlined } from "@ant-design/icons-vue";
+import { useStore } from 'vuex';
+import DepartLevelInfo from './DepartLevelInfo.vue';
+const emit = defineEmits(['close:modal'])
+const store = useStore();
+// 表单组件的引用
+const formRef = ref();
+// 表格组件的引用
+const tableRef = ref();
+// 表单数据
+const formData = ref({
+    // 表单字段的初始值
+    levelKey: "",
+    useYn: ""
+});
+function getList () {
+    console.log("wyq----getList 触发成功 ");
+}
+// 表单验证规则
+const formRules = ref({
+    // 添加验证规则
+    levelKey: [
+        { required: false, trigger: 'blur' },
+        // 其他校验规则
+    ],
+    useYn: [
+        { required: false, trigger: 'change' },
+        // 其他校验规则
+    ]
+});
+// 定义了一个计算属性 departLevelData，它的值来自 Vuex 状态管理中的 departLevel.departLevelData
+// 通过使用 computed，当 store.state.departLevel.departLevelDefData 发生变化时，departLevelDefData 会自动更新。
+const departLevelDefData = computed(() => store.state.DepartLevel.departLevelDefData);
+
+
+// 监听是否保存数据成功的标志位
+watch(() => store.state.DepartLevel.saveFlag, async (newVal, oldVal) => {
+    if (newVal != oldVal) {
+        search();
+    }
+});
+
+const enabledOptions = [
+    { label: '启用', value: 'Y' },
+    { label: '未启用', value: 'N' }
+];
+
+function search () {
+    // 查询
+    // 问题1：为什么要在这里调用 validate 方法？,校验是怎么处理调用的对不对
+    formRef.value.validate().then(values => {
+        //表单校验成功
+        // 这一步会触发 queryRule 函数，使用更新后的查询参数重新请求数据并刷新表格。
+        tableRef.value.reload();
+    });
+}
+
+function reset () {
+    // 调用原生组件的重置表单方法
+    formRef.value.getOrignRef().resetFields();
+}
+
+// 该函数是一个异步函数，用于根据传入的 payload 和 params 请求和返回表格数据。
+// payload参数‌是一个对象，用于在组件之间传递数据。Payload参数包含要传递给组件的数据，这些数据可以是任何类型，包括字符串、数字、布尔值、对象和数组等‌
+async function queryRule (payload, params) {
+    // 问题2: params是个啥,而且是一个
+    // queryParam 变量用于存储查询参数，如果存在 queryParams（可能是通过 Vue 的响应式引用取得的），则将其值赋予 queryParam。
+    let queryParams = {
+        page: payload.pageIndex,
+        rows: payload.pageSize,
+        ...params,
+        key: formData.value.levelKey,
+        use_yn: formData.value.useYn
+    };
+
+    // 向后台请求表格数据
+    // 通过调用 Vuex 中的 dispatch 方法发送一个名为 DepartLevel/queryDepartLevelDefData 的 action。
+    await store.dispatch('DepartLevel/queryDepartLevelDefData', {
+        values: {
+            ...queryParams
+        }
+    });
+    // 由于 store.state.DepartLevel.departLevelDefData 是一个响应式引用，
+    // 因此当 store.state.DepartLevel.departLevelDefData 发生变化时，departLevelDefData 也会自动更新。
+    const resp = departLevelDefData.value;
+    return {
+        current: payload.pageIndex,
+        pageSize: payload.pageSize,
+        total: resp.total,
+        data: resp.records
+    };
+}
+
+
+
+var showUseYn = (text, record) => {
+    let value = false;
+    if (record.use_yn == 'Y') {
+        value = true;
+    }
+    return <a-button type="primary" size="small" onClick={() => changeUseYn(value, record)}>
+        {value ? "启用" : "未启用"}
+    </a-button>
+};
+
+async function changeUseYn (value, record) {
+    console.log("wyq ------------changeUseYn", value, record);
+    // 调用后台接口修改数据
+    // 调用 Vuex 中的 dispatch 方法发送一个名为 DepartLevel/changeUseYn 的 action。
+    // 这个地方必须等待更新启用标志的操作完成，才能重新查询表格数据。所以设置为同步处理
+    await store.dispatch('DepartLevel/changeUseYn', {
+        values: {
+            no: record.no,
+            use_yn: record.use_yn
+        }
+    });
+    // 回调下查询方法
+    search();
+}
+
+// 列定义
+const columns = [
+    {
+        prop: "ActionColumn", label: "操作", width: 150, render: (scope) => {
+            return <div>
+                <OpenModelButton id="651rew123" modal={DepartLevelInfo} beforeShow="DepartLevel/loadDialogDataData"
+                    text="修改" icon={h(EditOutlined)} type="primary" payload={scope.record}>
+                </OpenModelButton>
+            </div>
+        },
+        align: "center",
+    },
+    { prop: 'key', title: '层级编号', width: 150 },
+    { prop: 'name', title: '层级名称', width: 150 },
+    { prop: 'use', title: '用途', width: 150 },
+    {
+        prop: 'use_yn', title: '启用标志', width: 150,
+        render: scop => showUseYn(scop.record.use_yn, scop.record)
+    }
+];
+</script>

ant-design-pro-vue3/src/views/depart/departLevel/DepartLevelInfo copy.vue

@@ -0,0 +1,179 @@
+<template>
+    <div>
+        <pro-dialog :visible="$attrs.visible" @close="$emit('close:modal')" :title="title" width="70%" :closable="true"
+            :destroyOnClose="true" :maskClosable="true">
+            <template v-slot:footer="">
+                <pro-button id="f3dd65a2-c52b-11ea-87c3-ff36a904ecf1" @click="$emit('close:modal')"
+                    :icon="h(CloseOutlined)">关闭</pro-button>
+                <pro-button id="f3dd65a4-c52b-11ea-87c3-ff36a904ecf2" @click="save"
+                    :icon="h(SaveOutlined)">保存</pro-button>
+            </template>
+
+            <pro-form ref="formRef" :model="formData" :rules="formRules" label-width="120px">
+                <pro-form-grid :header="{ title: '基本信息' }" colNum="4">
+                    <pro-input v-show="false" :formItemProps="{ label: 'no', prop: 'no' }" v-model:value="formData.no"
+                        placeholder="请输入" :allowClear="true">
+                    </pro-input>
+
+                    <pro-input :formItemProps="{ label: '层级编号', prop: 'key' }" v-model:value="formData.key"
+                        placeholder="请输入" :allowClear="true">
+                    </pro-input>
+
+                </pro-form-grid>
+
+
+                <pro-form-grid :header="{ title: '层级信息' }" colNum="3">
+                    <div>
+                        <pro-table ref="tableRef" :columns="columns" :dataSource="departLevelInfoData">
+                            <template v-slot:header="">
+                                <pro-button id=" 4b7facf0-94a4-11ee-9af3-e137392c498c" text="增加一行"
+                                    :icon="h(PlusOutlined)" icon="plus" type="primary"
+                                    @click="addRows">增加一行</pro-button>
+                            </template>
+                        </pro-table>
+                    </div>
+                </pro-form-grid>
+            </pro-form>
+        </pro-dialog>
+    </div>
+</template>
+
+<script setup lang="jsx">
+import { ref, onUnmounted, computed, h, reactive, onMounted } from 'vue';
+import { useStore } from 'vuex';
+import { CloseOutlined, SaveOutlined, DeleteOutlined, PlusOutlined } from "@ant-design/icons-vue";
+import { Modal } from "ant-design-vue";
+const store = useStore();
+// 表单组件的引用
+const formRef = ref();
+const tableRef = ref();
+// 表单验证规则
+const formRules = ref({
+    key: [
+        { required: true, trigger: 'blur' },
+        // 其他校验规则
+    ],
+    brf: [
+        { required: true, trigger: 'blur' },
+        // 其他校验规则
+    ]
+})
+// 表单数据
+const formData = computed(() => store.state.DepartLevel.dialogData);
+const title = computed(() => store.state.DepartLevel.title);
+const departLevelInfoData = computed(() => store.state.DepartLevel.departLevelInfoData);
+const columns = ref([
+    {
+        prop: "ActionColumn",
+        label: "操作",
+        width: "120px",
+        align: "center",
+        render: (scope) => {
+            return <div>
+                <pro-button id="deleteId" onClick={() => deleteRows(scope)} icon={h(DeleteOutlined)}>删除</pro-button>
+            </div>
+        }
+    },
+    { prop: "key", label: "层级编号", align: "center", width: "120px", editing: true },
+    { prop: "name", label: "层级名称", align: "center", width: "120px", editing: true },
+    {
+        prop: "brf", label: "层级功能描述", align: "center", width: "240px", editing: true,
+        rules: [
+            { required: true, message: '请输入层级功能描述', trigger: 'blur' }
+        ]
+    },
+]);
+
+
+onUnmounted(() => {
+    store.dispatch("DepartLevel/cleanData");
+
+});
+
+function save () {
+    //校验表单
+    console.log("wyq-------save-------检验开始");
+    console.log("wyq-------save-------检验开始", formRef.value.validate().values);
+
+    formRef.value.validate().then(values => {
+        for (const [key, value] of Object.entries(values)) {
+            console.log(`表单字段 ${key}: ${value}`);
+        }
+
+        if (values) {
+            console.log('数据校验成功，可以提交');
+            // 执行保存操作
+        } else {
+            console.log('数据校验失败，请检查输入');
+        }
+
+        // 表单校验成功
+        // 执行保存回调
+        console.log("wyq-------save----检验通过", values);
+
+        store.dispatch('DepartLevel/save', {
+            values,
+            closeMethod: () => { emit("close:modal") }
+        });
+        console.log("wyq-------save");
+
+    }).catch(error => {
+        if (error.errorFields) {
+            error.errorFields.forEach(field => {
+                console.log(`字段 ${field.name} 校验失败: ${field.errors.join(', ')}`);
+            });
+        } else {
+            console.log('未知错误:', error);
+        }
+    });
+
+    formRef.value.validate().then(values => {
+
+        for (const [key, value] of Object.entries(values)) {
+            console.log(`表单字段 ${key}: ${value}`);
+        }
+
+        if (values) {
+            console.log('数据校验成功，可以提交');
+            // 执行保存操作
+        } else {
+            console.log('数据校验失败，请检查输入');
+        }
+
+        //表单校验成功
+        //执行保存回调
+        console.log("wyq-------save----检验通过", values);
+
+        store.dispatch('DepartLevel/save', {
+            values,
+            closeMethod: () => { emit("close:modal") }
+        });
+        console.log("wyq-------save");
+
+    });
+}
+
+function addRows () {
+    store.dispatch("DepartLevel/addRows", {});
+}
+function deleteRows (scope) {
+    Modal.confirm({
+        title: '删除确认',
+        content: '确认删除选中的记录',
+        cancelText: '取消',
+        onOk () {
+            store.dispatch('DepartLevel/deleteRows', { ...scope });
+        }
+    });
+}
+// 自定义指令用于聚焦
+const vFocus = {
+    mounted: (el) => {
+        console.log('gzg  vFocus');
+        el.focus();
+        el.querySelector('input')?.focus();
+        el.querySelector('a-input')?.focus();
+
+    }
+};
+</script>

ant-design-pro-vue3/src/views/depart/departLevel/DepartLevelInfo.vue

@@ -0,0 +1,195 @@
+<template>
+    <div>
+        <pro-dialog :visible="$attrs.visible" @close="$emit('close:modal')" :title="title" width="70%" :closable="true"
+            :destroyOnClose="true" :maskClosable="true">
+            <template v-slot:footer="">
+                <pro-button id="f3dd65a2-c52b-11ea-87c3-ff36a904ecf1" @click="$emit('close:modal')"
+                    :icon="h(CloseOutlined)">关闭</pro-button>
+                <pro-button id="f3dd65a4-c52b-11ea-87c3-ff36a904ecf2" @click="save"
+                    :icon="h(SaveOutlined)">保存</pro-button>
+            </template>
+
+            <pro-form ref="formRef" :model="dialogData" :rules="formRules" label-width="120px">
+                <pro-form-grid :header="{ title: '基本信息' }" colNum="4">
+                    <pro-input v-show="false" :formItemProps="{ label: 'no', prop: 'no' }" v-model:value="dialogData.no"
+                        placeholder="请输入" :allowClear="true">
+                    </pro-input>
+
+                    <pro-input :formItemProps="{ label: '层级编号:', prop: 'key' }" v-model:value="dialogData.key"
+                        placeholder="请输入" :allowClear="true">
+                    </pro-input>
+                    <pro-input :formItemProps="{ label: '层级名称:', prop: 'name' }" v-model:value="dialogData.name"
+                        placeholder="请输入" :allowClear="true">
+                    </pro-input>
+                    <pro-input :formItemProps="{ label: '用途:', prop: 'use' }" v-model:value="dialogData.use"
+                        placeholder="请输入" :allowClear="true">
+                    </pro-input>
+                    <pro-select :formItemProps="{ label: '启用标志', prop: 'use_yn' }" disabled="true"
+                        v-model:value="dialogData.use_yn" placeholder="请选择启用标志" :allowClear="true"
+                        tableName="com_usertype_info" colName="use_yn">
+                    </pro-select>
+                </pro-form-grid>
+
+                <pro-form-grid :header="{ title: '层级信息' }" colNum="3">
+                    <div>
+                        <pro-table ref="tableRef" :columns="columns" :dataSource="dialogData.departLevelInfoData">
+                            <template v-slot:header="">
+                                <pro-button id=" 4b7facf0-94a4-11ee-9af3-e137392c498c" text="增加一行"
+                                    :icon="h(PlusOutlined)" icon="plus" type="primary" @click="addRows"
+                                    style="margin-right: 10px;">增加一行</pro-button>
+                                <pro-button id=" 4b7facf0-94a4-11ee-9af3-e137392c498d" text="删除" :icon="h(PlusOutlined)"
+                                    icon="plus" type="primary" @click="deleteRows2">删除</pro-button>
+                            </template>
+                        </pro-table>
+                    </div>
+                </pro-form-grid>
+            </pro-form>
+        </pro-dialog>
+    </div>
+</template>
+
+<script setup lang="jsx">
+import * as service from './services';
+import { ref, onUnmounted, computed, h, reactive, onMounted, watch } from 'vue';
+import { useStore } from 'vuex';
+import { CloseOutlined, SaveOutlined, DeleteOutlined, PlusOutlined } from "@ant-design/icons-vue";
+import { Modal, message } from "ant-design-vue";
+//const emit = defineEmits(['close:modal'])
+const emit = defineEmits(['addDataDemo']);
+
+const store = useStore();
+// 表单组件的引用
+const formRef = ref();
+const tableRef = ref();
+const title = computed(() => store.state.DepartLevel.dialogData.title);
+const dialogData = computed(() => store.state.DepartLevel.dialogData);
+const originalKeyValue = dialogData.value.key;
+// 表单验证规则
+const formRules = ref({
+    key: [
+        { required: true, trigger: 'blur' },
+        {
+            validator: async (rule, value, callback) => {
+                try {
+                    if (originalKeyValue !== value) {
+                        const resp = await service.validateRecord({
+                            sql: `select * from Com_depart_level_info where key = ? `,
+                            param: value
+                        });
+                        if (resp === '0000') {
+                            console.log("wyq-------code2", resp);
+                            return Promise.resolve();
+                        } else {
+                            return Promise.reject(new Error('编号已存在'));
+                        }
+                    }
+                } catch (error) {
+                    message.error('处理失败' + error);
+                    return Promise.reject(new Error('处理失败' + error));
+                }
+            },
+            trigger: 'blur'
+        }
+    ],
+    brf: [
+        { required: true, trigger: 'blur' },
+        // 其他校验规则
+    ]
+});
+
+const columns = ref([
+    {
+        prop: "ActionColumn",
+        label: "操作",
+        width: "120px",
+        align: "center",
+        render: (scope) => {
+            return <div>
+                <pro-button id="deleteId" onClick={() => deleteRows(scope)} icon={h(DeleteOutlined)}>删除</pro-button>
+            </div>
+        }
+    },
+    {
+        prop: "key", label: "层级编号", align: "center", width: "120px", editing: true,
+        rules: [
+            { required: true, message: '请输入层级编号', trigger: 'blur' },
+            {
+                validator: (rule, value, callback) => {
+                    if (!isNumber(value)) {
+                        return Promise.reject(new Error('层级编号请填写大于0的整数'));
+                    } else {
+                        return Promise.resolve();
+
+                    }
+                }
+            }
+        ]
+
+    },
+    { prop: "name", label: "层级名称", align: "center", width: "120px", editing: true },
+    {
+        prop: "brf", label: "层级功能描述", align: "center", width: "240px", editing: true,
+        rules: [
+            { required: true, message: '请输入层级功能描述', trigger: 'blur' }
+        ]
+    },
+]);
+
+function isNumber (value) {
+    // 判断是否为数字、整数、大于0
+    return /^\d+(\.\d+)?$/.test(value) && /^\d+$/.test(value) && value > 0;
+}
+function addRows () {
+    store.dispatch("DepartLevel/addDepartLevelInfoData");
+}
+
+function deleteRows2 (scope) {
+    console.log('wyq------deleteRows1', scope);
+    console.log('wyq------deleteRows2', tableRef.value.getChecked());
+    console.log('wyq------dialogData', dialogData.value.departLevelInfoData.records);
+
+
+    dialogData.value.departLevelInfoData.records = dialogData.value.departLevelInfoData.records.filter(item => !tableRef.value.getChecked().includes(item));
+
+    // tableRef.value.getChecked().forEach(item => {
+    //     console.log('wyq------deleteRows3', item.no);
+
+    //     dialogData.value.departLevelInfoData.records = dialogData.value.departLevelInfoData.records.filter(item1 => item1.no !== item.no);
+
+    // });
+    console.log('wyq------dialogData', dialogData.value.departLevelInfoData.records);
+
+
+}
+
+
+function deleteRows (scope) {
+    Modal.confirm({
+        title: '删除确认',
+        content: '确认删除选中的记录',
+        cancelText: '取消',
+        onOk () {
+            store.dispatch('DepartLevel/deleteDepartLevelInfoData', { ...scope });
+        }
+    });
+}
+
+function save () {
+    console.log('wyqq------save', dialogData.value);
+    console.log('wyq------调用addDataDemo11');
+    emit('addDataDemo');
+    //this.$emit('addDataDemo');
+    // 表单校验成功
+    formRef.value.getOrignRef().validate().then(() => {
+        // 保存数据
+        store.dispatch('DepartLevel/saveDepartLevelInfoData', {
+            closeMethod: () => { emit("close:modal") }
+        });
+    }).catch((error) => {
+        //console.log('error', error);
+        //console.log('error', error.errorFields[0].errors[0]);
+        message.error('提交失败：' + error.errorFields[0].errors[0]);
+    });
+
+}
+</script>

ant-design-pro-vue3/src/views/depart/departLevel/Test.vue

@@ -0,0 +1,251 @@
+<template>
+    <div style="height: 535px; border: 1px solid #ccc;">
+        <pro-layout3 direction="horizontal" :initialRatio=0.21 :firstTitle="'机构树面板'">
+            <!-- <template #first-title>
+                <div>nihao</div>
+            </template> -->
+            <template #first>
+                <div style="background-color: #e0e0e0; padding: 0px; white-space: nowrap;">
+                    <DepartPanel v-model:brNos="formData.brNos" v-model:relationNo="formData.relationNo"
+                        @getNodes="getBrNodes">
+                    </DepartPanel>
+                </div>
+            </template>
+            <template #second>
+                <pro-layout3 direction="vertical" :initialRatio=0.615 :firstTitle="'报表查询'">
+                    <!-- <template #first-title>
+                        <div>报表查询</div>
+                    </template> -->
+                    <template #first>
+                        <div style="background-color: #fff; padding: 5px;">
+                            <pro-form label-width="80px">
+                                <pro-form-grid colNum="2" :style="{ width: '900px' }">
+                                    <!-- :style="{ width: '300px' }" -->
+
+                                    <pro-date-picker :formItemProps="{ label: '制表日期1', prop: 'rptDate' }"
+                                        v-model:value="formData.rptDate" placeholder="请选择制表日期" :allowClear="true">
+                                    </pro-date-picker>
+                                    <pro-select3 :formItemProps="{ label: '周期类型', prop: 'cycType' }"
+                                        v-model:value="formData.cycType" @onSelect="onSelectCycType"
+                                        placeholder="请选择周期类型" :allowClear="true" selectType="periodic">
+                                    </pro-select3>
+                                    <pro-select3 :formItemProps="{ label: '币种', prop: 'curNo' }"
+                                        v-model:value="formData.curNo" @onSelect="onSelectCur" placeholder="请选择币种级别"
+                                        :allowClear="true" selectType="curr">
+                                    </pro-select3>
+                                    <pro-select-tree3 :formItemProps="{ label: '账套', prop: 'sobNo' }" treeType="sobTree"
+                                        v-model:value="formData.sobNo" v-model:stddNo="formData.stddNo"
+                                        :brNos="formData.brNos" :showCheckbox="false" :multiple="false" mode="default">
+                                    </pro-select-tree3>
+                                    <pro-select3 :formItemProps="{ label: '损益上划', prop: 'shFlag' }"
+                                        v-model:value="formData.shFlag" @onSelect="onSelectShFlag"
+                                        placeholder="请选择损益上划类型" :allowClear="true" tableName="gl_rpt_def"
+                                        colName="sh_flag">
+                                    </pro-select3>
+                                    <pro-select3 :formItemProps="{ label: '报表调整类型', prop: 'adjType' }"
+                                        v-model:value="formData.adjType" @onSelect="onSelectAdjType"
+                                        placeholder="请选择报表调整类型" :allowClear="true" tableName="gls_rpt_def"
+                                        colName="adj_type">
+                                    </pro-select3>
+                                    <pro-select3 :formItemProps="{ label: '科目级别', prop: 'accLvl' }"
+                                        v-model:value="formData.accLvl" placeholder="请选择科目级别" :allowClear="true"
+                                        selectType="accLvl" :sobNo="formData.sobNo">
+                                    </pro-select3>
+                                    <pro-select3 :formItemProps="{ label: '零余额是否打印', prop: 'zeroPrintYn' }"
+                                        v-model:value="formData.zeroPrintYn" placeholder="请选择零余额是否打印" :allowClear="true"
+                                        tableName="gl_rpt_def" colName="zero_print_yn">
+                                    </pro-select3>
+                                    <pro-select3 v-show="false" :formItemProps="{ label: '汇率类型', prop: 'exrateType' }"
+                                        v-model:value="formData.exrateType" placeholder="请选择汇率类型" :allowClear="true"
+                                        tableName="exchange_rate_info" colName="exrate_type">
+                                    </pro-select3>
+                                    <pro-form-item>
+                                        <pro-button id="queryBtn" @click="search2"
+                                            :icon="h(SearchOutlined)">查询</pro-button>
+                                    </pro-form-item>
+                                </pro-form-grid>
+                            </pro-form>
+                        </div>
+                    </template>
+                    <template #second>
+                        <div style="background-color: #e0e0e0; padding: 0px;">
+                            <!-- 结果区 -->
+                            <ResultPanel ref="resultPanel"></ResultPanel>
+                        </div>
+                    </template>
+                </pro-layout3>
+            </template>
+        </pro-layout3>
+    </div>
+</template>
+
+<!-- <template>
+    <div style="height: 496px; border: 1px solid #ccc;">
+        <pro-layout3 direction="horizontal" :initialRatio="initialRatio">
+            <template #first>
+                <pro-layout3 direction="vertical" :initialRatio="initialRatio" firstTitle="'第一个面板标题'"
+                    secondTitle="'第二个面板标题'">
+                    <template #first>
+                        <div style="background-color: #e0e0e0; padding: 20px;">
+                            右侧上半区域<br>
+                            右侧上半区域<br>
+                            右侧上半区域<br>
+                            右侧上半区域<br>
+                            右侧上半区域<br>
+                            右侧上半区域<br>
+                            右侧上半区域<br>
+                            右侧上半区域<br>
+                            右侧上半区域<br>
+                            右侧上半区域<br>
+                            右侧上半区域<br>
+                            右侧上半区域<br>
+                        </div>
+                    </template>
+                    <template #second>
+                        <div style="background-color: #d0d0d0; padding: 20px;">
+                            右侧下半区域<br>
+                            右侧下半区域<br>
+                            右侧下半区域<br>
+                            右侧下半区域<br>
+                            右侧下半区域<br>
+                            右侧下半区域<br>
+                            右侧下半区域<br>
+                            右侧下半区域<br>
+                            右侧下半区域<br>
+                            右侧下半区域<br>
+                            右侧下半区域<br>
+                        </div>
+                    </template>
+                </pro-layout3>
+            </template>
+            <template #second>
+                <pro-layout3 direction="vertical" :initialRatio="initialRatio" firstTitle="'第一个面板标题'"
+                    secondTitle="'第二个面板标题'">
+                    <template #first>
+                        <div style="background-color: #e0e0e0; padding: 20px;">
+                            右侧上半区域<br>
+                            右侧上半区域<br>
+                            右侧上半区域<br>
+                            右侧上半区域<br>
+                            右侧上半区域<br>
+                            右侧上半区域<br>
+                            右侧上半区域<br>
+                            右侧上半区域<br>
+                            右侧上半区域<br>
+                            右侧上半区域<br>
+                            右侧上半区域<br>
+                            右侧上半区域<br>
+
+                        </div>
+                    </template>
+                    <template #second>
+                        右侧下半区域<br>
+                        右侧下半区域<br>
+                        右侧下半区域<br>
+                        右侧下半区域<br>
+                        右侧下半区域<br>
+                        右侧下半区域<br>
+                        右侧下半区域<br>
+                        右侧下半区域<br>
+                        右侧下半区域<br>
+                        右侧下半区域<br>
+                        右侧下半区域<br>
+                    </template>
+                </pro-layout3>
+            </template>
+        </pro-layout3>
+    </div>
+</template> -->
+
+<script setup lang="jsx">
+import { message } from "ant-design-vue";
+import { ref, reactive, nextTick, onMounted, onUnmounted, h, } from 'vue';
+import { SearchOutlined, RedoOutlined, PlusOutlined, EditOutlined } from "@ant-design/icons-vue";
+import DepartPanel from '@/components/ProReport/DepartPanel.vue';
+import ResultPanel from '@/components/ProReport/ResultPanel.vue';
+const initialRatio = ref(0.5);
+const resultPanel = ref(null);
+
+const formData = ref({
+    relationNo: '',
+    brNos: [],
+    brName: '',
+    rptDate: '',
+    cycType: '',
+    cycTypeName: '',
+    curNo: '',
+    curName: '',
+    stddNo: '',
+    sobNo: '',
+    shFlag: '',
+    shFlagName: '',
+    adjType: '',
+    adjTypeName: '',
+    accLvl: '',
+    zeroPrintYn: '',
+    exrateType: '',
+    isGather: 'N',
+    telNo: '',
+
+    ptabName: ['v_gl_sub_coll_day'],
+    tabName: ["gls_gl_sub_tmp_sh_adj_q", "gls_gl_sub_tmp_sh_adj", "gls_gl_sub_tmp_sh_adj_h"],
+    reportType: '1',
+    rptType: '',
+
+});
+
+const onSelectCycType = (value, option) => {
+    formData.value.cycTypeName = option.item_name;
+}
+const onSelectCur = (value, option) => {
+    formData.value.curName = option.item_name;
+}
+const onSelectAdjType = (value, option) => {
+    formData.value.adjTypeName = option.item_name;
+}
+const onSelectShFlag = (value, option) => {
+    formData.value.shFlagName = option.item_name;
+}
+
+const getBrNodes = (value, nodes) => {
+    console.log('getBrNodes', value, nodes);
+    if (nodes.length === 1) {
+        formData.value.brName = nodes[0].name;
+    } else {
+        formData.value.brName = '多机构汇总';
+    }
+}
+
+function search () {
+    if (resultPanel.value) {
+        resultPanel.value.search();
+    }
+}
+
+const search2 = () => {
+    // 1.机构及汇总关系校验
+    if (formData.value.relationNo === '') {
+        message.error('请选择汇总关系');
+        return;
+    }
+    if (formData.value.brNos.length === 0) {
+        message.error('请选择机构');
+        return;
+    }
+
+    // 2.表单校验
+    if (formData.value.adjType === '1') {
+        //调整前
+        ptabName = ['gls_gl_sub_day'];
+    } else if (formData.value.adjType === '2') {
+        //调整
+        ptabName = ['v_gl_sub_adj_day'];
+    }
+
+    if (resultPanel.value) {
+        resultPanel.value.search2(formData);
+    }
+}
+
+// 查询报表
+</script>

ant-design-pro-vue3/src/views/depart/departLevel/TestProSelectTree.vue

@@ -0,0 +1,364 @@
+<template>
+    <div>
+        <!-- <pro-input :formItemProps="{ label: '用途:', prop: 'use' }" v-model:value="useYn" placeholder="请输入"
+            :allowClear="true">
+        </pro-input> -->
+
+        <a-select ref="selectRef" v-model:value="selectedDisplayValue" :open="isDropdownOpen" @click="handleSelectClick"
+            placeholder="请选择" :allowClear="true" @clear="handleClear" style="width: 500px">
+            <template #dropdownRender>
+                <div ref="dropdownRef" class="dropdown-content">
+                    <!-- 搜索框 -->
+                    <a-input v-model:value="searchValue" placeholder="搜索..." @input="handleSearch" />
+                    <!-- 搜索结果列表 -->
+                    <div v-if="searchResultList.length">
+                        <a-list :data-source="searchResultList" bordered @itemClick="onItemClick">
+                            <a-list-item v-for="item in searchResultList" :key="item.key" @click="onItemClick(item)">
+                                {{ item.title }}
+                            </a-list-item>
+                        </a-list>
+                    </div>
+                    <!-- 树结构 -->
+                    <a-tree v-else :tree-data="filteredTreeData" :checkable="true" v-model:expandedKeys="expandedKeys"
+                        v-model:selectedKeys="selectedKeys" v-model:checkedKeys="checkedKeys" @select="onSelect"
+                        @expand="onExpand" @check="onCheck" />
+                </div>
+            </template>
+        </a-select>
+        <pro-input :formItemProps="{ label: '用途:', prop: 'use' }" v-model:value="useYn" placeholder="请输入"
+            :allowClear="true">
+        </pro-input>
+    </div>
+    <button @click="changeRelationNo">改变机构汇总关系 relationNo</button>
+    <pro-tree2 v-model:relationNo="relationNo" v-model:txBrNo="txBrNo" treeType="deptTree" :checkable="true"
+        v-model:checkedKeys="testCheckedKeys" v-model:expandedKeys="testExpandedKeys" @onCheck="onCheck1"></pro-tree2>
+    <div>1父组件选中机构{{ txBrNo }}</div>
+    <pro-tree2 v-model:txBrNo="txBrNo" v-model:sobNo="sobNo" treeType="sobTree" :checkable="true"></pro-tree2>
+    <div>1父组件选中账套{{ sobNo }}</div>
+
+
+
+
+
+    <!-- <pro-select-tree2 treeType="sobTree"></pro-select-tree2>
+    <pro-select-tree2 treeType="deptTree"></pro-select-tree2> -->
+
+    <!-- <ProSelectTree2 treeType="sobTree"></ProSelectTree2> -->
+
+    <!-- <pro-tree3 :treeData="treeData" v-treeType="sobTree"model:checkedKeys="testCheckedKeys"
+        v-model:expandedKeys="testExpandedKeys"></pro-tree3>
+    <div>父组件选中{{ testCheckedKeys }}</div>
+    <div>父组件展开{{ testExpandedKeys }}</div> -->
+</template>
+
+<script setup>
+import { ref, onMounted, onBeforeUnmount, onUnmounted, watch } from 'vue';
+
+const relationNo = ref('AAAAAA');
+// 改变机构树 relationNo 的函数
+const testCheckedKeys = ref(['1-1']);
+const testExpandedKeys = ref(['1']);
+const changeRelationNo = () => {
+    if (relationNo.value === 'AAAAAA') {
+        relationNo.value = 'BBBBBB';
+        testCheckedKeys.value = ['2-1'];
+        testExpandedKeys.value = ['2'];
+    } else {
+        relationNo.value = 'AAAAAA';
+        testCheckedKeys.value = ['1-1'];
+        testExpandedKeys.value = ['1'];
+    }
+};
+
+const onCheck1 = (checkedKeys, info) => {
+    console.log('wyq---------checkedKeys', checkedKeys, info);
+    console.log('wyq---------info', info.node.key);
+
+}
+
+const txBrNo = ref('1');
+const sobNo = ref('');
+// const testCheckedKeys = ref([]);// 已勾选的节点
+// testCheckedKeys.value = ['1'];
+// const testExpandedKeys = ref(['1']);// 已勾选的节点
+
+
+
+// 下拉框功能
+// 用于显示在下拉框中的选中值
+const selectedDisplayValue = ref('');
+// 是否显示下拉框
+const isDropdownOpen = ref(false);
+// 处理 a-select 清除事件
+const handleClear = () => {
+    checkedKeys.value = [];
+    selectedDisplayValue.value = '';
+};
+
+// 处理选择框点击事件
+const handleSelectClick = () => {
+    // 清空搜索框
+    searchValue.value = '';
+    searchResultList.value = [];
+    isDropdownOpen.value = true;
+};
+
+// 搜索框功能
+// 搜索框的值
+const searchValue = ref('');
+// 搜索结果列表
+const searchResultList = ref([]);
+// 监听搜索框的值，过滤列表
+watch(searchValue, (value) => {
+    if (value) {
+        const result = [];
+        const traverse = (nodes) => {
+            nodes.forEach((node) => {
+                if (node.title.includes(value)) {
+                    result.push(node);
+                }
+                if (node.children) {
+                    traverse(node.children);
+                }
+            });
+        };
+        traverse(treeData);
+        searchResultList.value = result;
+    } else {
+        searchResultList.value = [];
+    }
+});
+
+const onItemClick = (item) => {
+    //selectedKey.value = item.key; // 记录选中的项
+    //expandedKeys.value = [getParentKey(item.key, gData.value)]; // 展开父节点
+    //autoExpandParent.value = true; // 自动展开父节点
+
+    selectedDisplayValue.value = item.title;
+    checkedKeys.value = [item.key]; // 勾选当前节点
+    // 展开父节点和爷节点
+    const parentKeys = getParentKeys(item.key, treeData);
+    expandedKeys.value = [...new Set([...expandedKeys.value, ...parentKeys])];
+    // 关闭下拉框
+    isDropdownOpen.value = false;
+
+};
+
+// 获取节点的父节点和爷节点的 key
+// 获取节点的父节点和爷节点的 key
+const getParentKeys = (key, nodes) => {
+    const parentKeys = [];
+    // 递归查找目标节点并记录其父节点信息
+    const findNode = (currentNodes, parentKey = null, grandParentKey = null) => {
+        for (const node of currentNodes) {
+            if (node.key === key) {
+                // 如果存在父节点，添加到结果数组
+                if (parentKey) {
+                    parentKeys.push(parentKey);
+                }
+                // 如果存在爷节点，添加到结果数组
+                if (grandParentKey) {
+                    parentKeys.push(grandParentKey);
+                }
+                return;
+            }
+            if (node.children) {
+                // 递归调用，更新父节点和爷节点信息
+                findNode(node.children, node.key, parentKey);
+            }
+        }
+    };
+    findNode(nodes);
+    return parentKeys;
+};
+
+
+// 树功能
+// 选中的树节点的键
+const expandedKeys = ref([]);// 已展开的节点
+const selectedKeys = ref([]);// 已选中的节点
+const checkedKeys = ref([]);// 已勾选的节点
+
+// 示例树结构数据
+const treeData = [
+    {
+        title: 'node 1',
+        key: '1',
+        children: [
+            {
+                title: 'child node 1',
+                key: '1-1'
+            },
+            {
+                title: 'child node 2',
+                key: '1-2'
+            }
+        ]
+    },
+    {
+        title: 'node 2',
+        key: '2',
+        children: [
+            {
+                title: 'child node 1',
+                key: '2-1'
+            },
+            {
+                title: 'child node 2',
+                key: '2-2'
+            },
+            {
+                title: 'child node 3',
+                key: '2-3'
+            },
+            {
+                title: 'child node 4',
+                key: '2-4'
+            },
+            {
+                title: 'child node 5',
+                key: '2-5'
+            }, {
+                title: 'child node 6',
+                key: '2-6'
+            }, {
+                title: 'child node 7',
+                key: '2-7'
+            }, {
+                title: 'child node 8',
+                key: '2-8'
+            }, {
+                title: 'child node 9',
+                key: '2-9'
+            }, {
+                title: 'child node 10',
+                key: '2-10'
+            }, {
+                title: 'child node 11',
+                key: '2-11'
+            }, {
+                title: 'child node 12',
+                key: '2-12'
+            }
+        ]
+    }
+];
+// 过滤后的树结构数据
+const filteredTreeData = ref([...treeData]);
+
+const useYn = ref('');
+
+// 处理搜索框输入
+const handleSearch = () => {
+    if (searchValue.value) {
+        // filteredTreeData.value = filterTreeData(treeData, searchValue.value);
+    } else {
+        //filteredTreeData.value = [...treeData];
+    }
+};
+
+// 递归过滤树结构数据
+const filterTreeData = (data, keyword) => {
+    return data.filter(item => {
+        if (item.title.includes(keyword)) {
+            return true;
+        }
+        if (item.children && item.children.length > 0) {
+            const filteredChildren = filterTreeData(item.children, keyword);
+            if (filteredChildren.length > 0) {
+                return { ...item, children: filteredChildren };
+            }
+        }
+        return false;
+    });
+};
+
+// 点击复选框触发
+const onCheck = (checkedKeys, info) => {
+    console.log('wyq---------checkedKeys', checkedKeys);
+    checkedKeys.value = checkedKeys;
+    updateSelectedDisplayValue();
+};
+
+// 点击树节点触发
+function onSelect (selectedKeys, info) {
+    console.log('wyq---------selectedKeys', selectedKeys);
+}
+// 展开/收起节点时触发
+function onExpand (expandedKeys, info) {
+    console.log('wyq---------expandedKeys', expandedKeys);
+}
+
+
+
+// 更新显示在下拉框中的选中值
+const updateSelectedDisplayValue = () => {
+    const selectedTitles = [];
+    checkedKeys.value.forEach((key) => {
+        const findTitle = (nodes) => {
+            for (const node of nodes) {
+                if (node.key === key) {
+                    return node.title;
+                }
+                if (node.children) {
+                    const childTitle = findTitle(node.children);
+                    if (childTitle) {
+                        return childTitle;
+                    }
+                }
+            }
+            return null;
+        };
+        const title = findTitle(treeData);
+        if (title) {
+            selectedTitles.push(title);
+        }
+    });
+    selectedDisplayValue.value = selectedTitles.join(', ');
+};
+
+
+
+// 处理下拉框展开状态变化
+const handleOpenChange = (open) => {
+    isDropdownOpen.value = open;
+};
+
+// 点击其他区域隐藏下拉框
+const selectRef = ref(null);
+const dropdownRef = ref(null);
+const handleDocumentClick = (event) => {
+    if (
+        selectRef.value &&
+        dropdownRef.value &&
+        !selectRef.value.$el.contains(event.target) &&
+        !dropdownRef.value.contains(event.target)
+    ) {
+        isDropdownOpen.value = false;
+    }
+};
+onMounted(() => {
+    document.addEventListener('click', handleDocumentClick);
+});
+
+onBeforeUnmount(() => {
+    document.removeEventListener('click', handleDocumentClick);
+});
+</script>
+
+<style scoped>
+/* .dropdown-content {
+    padding: 8px;
+} */
+
+.dropdown-content {
+    /* 设置固定的高度和宽度 */
+    max-height: 300px;
+    width: 500px;
+    /* 设置溢出时显示滚动条 */
+    overflow: auto;
+    /* 可以根据需要添加其他样式 */
+    border: 1px solid #ccc;
+    padding: 8px;
+}
+</style>

ant-design-pro-vue3/src/views/depart/departLevel/TestProSelectTree3.vue

@@ -0,0 +1,180 @@
+<template>
+    <h2>测试下拉树组件-vue3</h2>
+
+
+    <pro-button id="queryBtn" @click="onClick">点击</pro-button>
+    <pro-button id="queryBtn" @click="onClick1">点击改变汇总关系</pro-button>
+    <div>汇总:{{ relationNo }}</div>
+
+    <div>机构:{{ brNos }}</div>
+    <div>准则:{{ stddNo }}</div>
+    <div>账套:{{ sobNo }}</div>
+    <div>科目:{{ accNos }}</div>
+    <!-- <div>
+        <pro-tree3 v-model:value="brNos" treeType="deptTree" :showCheckbox="true" :isWithoutDsc="true"></pro-tree3>
+    </div> -->
+    <pro-form label-width="120px">
+        <!-- <pro-form-grid colNum="2"> -->
+        <pro-form-grid>
+
+            <!-- 表单-->
+            <!-- <pro-select3 :formItemProps="{ label: '汇总关系', prop: 'relationNo' }" v-model:value="formData.relationNo"
+                placeholder="请选择汇总关系" :allowClear="true" selectType="relationNo" pageInterfaceNo="zzsearch_01_01_02">
+            </pro-select3>
+
+            <pro-select-tree3 :formItemProps="{ label: '机构', prop: 'brNo' }" treeType="deptTree"
+                v-model:value="formData.brNo" :relationNo="formData.relationNo" :showCheckbox="false" :isAsync="false"
+                :isWithoutDsc="true" @getNodes="getNodes">
+            </pro-select-tree3>
+
+            <pro-select3 :formItemProps="{ label: '交易系统', prop: 'sysNo' }" v-model:value="formData.sysNo"
+                placeholder="请选择交易系统" :allowClear="true" selectType="perSys">
+            </pro-select3>
+
+            <pro-select3 :formItemProps="{ label: '币种', prop: 'curNo' }" v-model:value="formData.curNo"
+                placeholder="请选择币种" :allowClear="true" selectType="curr">
+            </pro-select3> -->
+
+            <pro-select-tree3 :formItemProps="{ label: '账套', prop: 'sobNo' }" treeType="sobTree"
+                v-model:value="formData.sobNo" v-model:stddNo="formData.stddNo" :brNos="formData.brNo"
+                :showCheckbox="false" :multiple="false" mode="default">
+            </pro-select-tree3>
+
+            <!-- <pro-select-tree3 :formItemProps="{ label: '科目', prop: 'accNos' }" treeType="sobItemTree"
+                v-model:value="formData.accNos" :stddNo="formData.stddNo" :sobNo="formData.sobNo" :showCheckbox="true">
+            </pro-select-tree3>
+
+            <pro-select3 :formItemProps="{ label: '科目级别', prop: 'accLvl' }" v-model:value="formData.accLvl"
+                placeholder="请选择科目级别" :allowClear="true" selectType="accLvl" :sobNo="formData.sobNo">
+            </pro-select3> -->
+
+
+
+            <!-- <pro-select3 :formItemProps="{ label: '启用标志', prop: 'useYn' }" v-model:value="useYn" placeholder="请选择启用标志"
+                :allowClear="true" tableName="com_usertype_info" colName="use_yn">
+            </pro-select3>
+            <pro-select3 :formItemProps="{ label: '科目级别', prop: 'accLvl' }" v-model:value="accLvl" placeholder="请选择科目级别"
+                :allowClear="true" selectType="accLvl" sobNo="10">
+            </pro-select3>
+
+            <pro-select3 :formItemProps="{ label: '汇总关系', prop: 'relationNo' }" v-model:value="relationNo"
+                placeholder="请选择汇总关系" :allowClear="true" selectType="relationNo" pageInterfaceNo="zzsearch_01_01_02">
+            </pro-select3>
+
+            <pro-select3 :formItemProps="{ label: '币种', prop: 'curNo' }" v-model:value="curNo" placeholder="请选择币种级别"
+                :allowClear="true" selectType="curr">
+            </pro-select3> -->
+
+            <!-- <pro-select3 :formItemProps="{ label: '系统', prop: 'sysNo' }" v-model:value="sysNo" placeholder="请选择系统级别"
+                :allowClear="true" selectType="perSys">
+            </pro-select3> -->
+            <!-- <pro-select-tree3 :formItemProps="{ label: '机构', prop: 'brNos' }" treeType="deptTree" v-model:value="brNos"
+                :relationNo="relationNo" :showCheckbox="true" :isAsync="false" :isWithoutDsc="true"
+                @getNodes="getNodes">
+            </pro-select-tree3> -->
+
+            <!-- <pro-select-tree3 :formItemProps="{ label: '账套', prop: 'sobNo' }" treeType="sobTree" v-model:value="sobNo"
+                v-model:stddNo="stddNo" :brNos="brNos" :showCheckbox="false" :multiple="false">
+            </pro-select-tree3> -->
+
+            <!-- <pro-select-tree3 :formItemProps="{ label: '科目', prop: 'accNos' }" treeType="sobItemTree"
+                v-model:value="accNos" :stddNo="stddNo" :sobNo="sobNo" :showCheckbox="true">
+            </pro-select-tree3> -->
+
+            <!-- <pro-select-tree3 :formItemProps="{ label: '异步机构', prop: 'asyncbrNos' }" treeType="deptTree"
+                v-model:value="asyncbrNos" :relationNo="relationNo" :showCheckbox="true" :isAsync="true">
+            </pro-select-tree3> -->
+
+            <!-- <pro-select-tree3 :formItemProps="{ label: '其他', prop: 'accNos' }" v-model:value="areaNo"
+                :treeData="areaTreeData" :showCheckbox="false">
+            </pro-select-tree3> -->
+        </pro-form-grid>
+    </pro-form>
+
+    <!--     
+    <pro-select-tree3 treeType="deptTree" v-model:value="brNos" :relationNo="relationNo"
+        :showCheckbox="true"></pro-select-tree3> -->
+    <!-- <pro-select-tree3 treeType="sobTree" v-model:value="sobNo" :brNos="brNos" :showCheckbox="true"></pro-select-tree3> -->
+
+    <!-- <pro-select-tree3 treeType="sobItemTree" v-model:value="accNos" :showCheckbox="true"></pro-select-tree3> -->
+
+
+
+
+
+    <!-- <pro-tree3 :treeData="treeData" v-model:selectedKeys="selectedKeys" treeType="sobTree"></pro-tree3>
+    <pro-tree3 treeType="deptTree" v-model:brNos="brNos" v-model:brKeys="brKeys" :showCheckbox="true"></pro-tree3>
+    <div>1选中的机构外部:{{ brKeys }}</div>
+    <div>2选中的机构内部:{{ brNos }}</div>
+
+    <pro-tree3 treeType="sobTree" v-model:brNos="brNos"></pro-tree3> -->
+
+    <!-- <pro-tree3 treeType="sobItemTree" checkable></pro-tree3> -->
+
+    <!-- <pro-form label-width="120px">
+        <pro-form-grid style="width: 1000px" colNum="2">
+            <pro-select-tree3 :formItemProps="{ label: '机构', prop: 'brNos' }" checkable treeType="deptTree"
+                @expand="expand"></pro-select-tree3>
+            <pro-select-tree3 :formItemProps="{ label: '账套', prop: 'sobNo' }" treeType="sobTree"></pro-select-tree3>
+        </pro-form-grid>
+    </pro-form>
+    <button @click="fetchData">点击</button>
+    <div>返回的数据: {{ treeData }}</div> -->
+</template>
+<script setup>
+import { ref, defineProps, defineExpose, onMounted, onBeforeUnmount, watch, nextTick, provide, defineEmits } from 'vue';
+
+// 表单字段的初始值
+const formData = ref({
+    relationNo: '',
+    brNo: [],
+    sysNo: "",
+    curNo: "",
+    stddNo: "",
+    sobNo: '',
+    accNos: [],
+    accLvl: ""
+});
+
+
+const relationNo = ref('');
+
+// const relationNo = ref('AAAAAA');
+function onClick1 () {
+    // if (relationNo.value === 'AAAAAA') {
+    //     relationNo.value = 'BBBBBB';
+    // } else {
+    //     relationNo.value = 'AAAAAA';
+    // }
+}
+// const brNos = ref(['1']);
+const asyncbrNos = ref(['1']);
+
+// const brNos = ref(['1']);
+const brNos = ref([]);
+
+function getNodes (value, nodes) {
+    console.log('父组件-getNode:', value, nodes);
+}
+function onClick () {
+    if (brNos.value[0] === '1' || brNos.value[0] === '200000') {
+        brNos.value = ['800000'];
+    } else {
+        brNos.value = ['200000'];
+    }
+}
+const stddNo = ref('');
+const sobNo = ref([]);
+const accNos = ref([]);
+
+const curNo = ref('');
+const useYn = ref('');
+const accLvl = ref('');
+const sysNo = ref('');
+
+
+
+const areaNo = ref(['12']);
+const areaTreeData = ref([{ "no": "2", "stdd_no": "2", "sts": "1", "acc_cod_rules_bw": "21", "use_yn": "Y", "name": "新会计准则-1", "pid": "2@", "id": "2@", "show_seqn": "20", "acc_cod_rules_bn": "21", "children": [{ "default_yn": "N", "no": "2", "stdd_no": "12", "sts": "1", "acc_cod_rules_bw": "4/2/2", "use_yn": "Y", "name": "非默认账套-1", "pid": "2@", "id": "12", "show_seqn": "21", "acc_cod_rules_bn": "4/2/2/2", "children": [] }, { "default_yn": "Y", "no": "2", "stdd_no": "10", "sts": "1", "acc_cod_rules_bw": "4/2/2", "use_yn": "Y", "name": "默认账套-1", "pid": "2@", "id": "10", "show_seqn": "22", "acc_cod_rules_bn": "4/2/2/2", "children": [] }] }]);
+
+</script>

ant-design-pro-vue3/src/views/depart/departLevel/TestProTree3.vue

@@ -0,0 +1,5 @@
+<template>
+    <h2>测试树组件-vue3</h2>
+    <div>
+    </div>
+</template>

ant-design-pro-vue3/src/views/depart/departLevel/YwzkbReport.vue

@@ -0,0 +1,8 @@
+<template>
+    <ReportComponent></ReportComponent>
+</template>
+<script setup>
+
+</script>
+
+<style scoped></style>

ant-design-pro-vue3/src/views/depart/departLevel/models/DepartLevel.store copy.ts

@@ -0,0 +1,311 @@
+import { clear, Console } from 'console';
+import * as service from '../services';
+import * as util from "@/utils/index.js";
+import { title } from 'process';
+export default {
+    namespaced: true,
+    state: {
+        // 机构层级定义-列表查询数据
+        departLevelDefData: {
+            current: 1,
+            pageSize: 0,
+            total: 0,
+            records: []
+        },
+        // 机构层级基本-列表查询数据
+        departLevelInfoData: {
+            current: 1,
+            pageSize: 0,
+            total: 0,
+            records: []
+        },
+        //新增或修改的数据
+        dialogData: {},
+
+
+        ////////////////////////////////////////
+
+        // 查询页
+        departLevelData: {
+            current: 1,
+            pageSize: 0,
+            total: 0,
+            records: []
+        },
+        // 表格数据
+        queryParam: {},
+        // list页面查询条件
+        insertOrModify: 1,
+        //新增修改标志：1-新增，2-修改
+
+        //新增修改
+        formData: {},
+        //表单数据
+        title: '',
+        // modal页面标题
+        conversion: {
+            current: 1,
+            pageSize: 0,
+            total: 0,
+            records: []
+        },
+        //折算币种
+        // 启用数据
+        useNo: "",
+        validateFlag: true,
+        searchCurrency: [],
+        // 新增修改页面折算后币种查询条件
+        toCurNo: [],
+
+
+        departLevelInfo: {
+            current: 1,
+            pageSize: 0,
+            total: 0,
+            records: []
+        }
+    },
+    actions: {
+        // 机构层级定义列表查询
+        async queryDepartLevelDefData({ commit }, payload) {
+            // 1.页面查询条件
+            const params = {
+                ...payload.values
+            };
+            // 2.调用接口 获取数据
+            const resp = await service.queryDepartLevelDefData(params);
+            // 3.更新state数据
+            commit("update", {
+                departLevelDefData: {
+                    current: resp.pageNo,
+                    pageSize: resp.pageSize,
+                    total: resp.total,
+                    records: resp.rows
+                }
+            });
+        },
+
+        // 新增或修改
+        async addOrModify({ commit, state }, payload) {
+            // 清理下数据
+            console.log("wyq", payload);
+            // commit("clearDepartLevelInfo");
+            const data = await service.searchCurrency({
+                use_yn: "Y"
+            });
+            if (payload == undefined) {
+                // 新增
+                const tableKey = await service.getTabKeyRule({
+                    tabName: 'currency'
+                });
+                commit("update", {
+                    insertOrModify: 1,
+                    //title: '新增',
+                    formData: {
+                        key: tableKey.value
+                    },
+                    useNo: "",
+                    searchCurrency: data.test,
+                    validateFlag: true,
+                    toCurNo: ''
+                });
+            } else {
+                console.log("wyq:addOrModifyData 前", state.dialogData);
+                // 修改页面
+                // 1.查询层级信息
+                const resp = await service.queryDepartLevelInfoData({
+                    no: payload.no
+                });
+                //resp.rows.forEach(item => item.from_cur_no = payload.name);
+                commit("update",
+                    {
+                        //title: '修改',
+                        dialogData: payload,
+                        departLevelInfoData: {
+                            total: resp.total,
+                            records: resp.rows
+                        },
+
+
+                        insertOrModify: 2,
+                        formData: payload,
+                        useNo: payload.no,
+                        searchCurrency: data.test,
+                        validateFlag: true,
+                        toCurNo: payload.no
+                    });
+                console.log("wyq:addOrModifyData 后", state.dialogData);
+
+            }
+        },
+
+        cleanData({
+            commit,
+            state
+        }) {
+            commit("clearDepartLevelInfo");
+        },
+
+
+        // 新增一行
+        async addRows({
+            commit,
+            state
+        }) {
+            const resp = state.departLevelInfoData;
+            resp.records.push({
+                rowsId: Date.now(),
+                key: '123',
+                name: '321',
+                use_yn: "Y"
+            });
+            // 总行数加1
+            resp.total++;
+            commit("update", {
+                departLevelInfoData: {
+                    total: resp.total,
+                    records: resp.records
+                }
+            });
+        },
+
+        // 删除一行
+        async deleteRows({
+            commit,
+            state
+        }, payload) {
+            const resp = state.departLevelInfoData;
+            if (payload.index) {
+                resp.records.splice(payload.index, 1);
+            }
+            // 总行数加1
+            resp.total--;
+            commit("update", {
+                departLevelInfoData: {
+                    total: resp.total,
+                    records: resp.records
+                }
+            });
+        },
+        // 保存
+        async save({
+            commit,
+            state
+        }, payload) {
+            // const data = state.formData;
+            // if (state.insertOrModify == 1) {
+            //     // 新增
+            //     const tableKey = await service.getTabKeyRule({
+            //         tabName: 'currency'
+            //     });
+            //     data.key = tableKey.value;
+            //     const resp = await service.addDepartLevelDefData(data);
+            //     if (resp.code == 0) {
+            //         commit("update", {
+            //             title: '新增',
+            //             dialogData: {},
+            //             insertOrModify: 1,
+            //             formData: {},
+            //             useNo: "",
+            //             searchCurrency: [],
+            //             validateFlag: true,
+            //             toCurNo: ''
+            //         });
+            //         util.successMessage("新增成功");
+            //     } else {
+            //         util.errorMessage("新增失败");
+            //     }
+            // } else {
+            //     // 修改
+            //     const resp = await service.modifyDepartLevelDefData(data);
+            //     if (resp.code == 0) {
+            //         commit("update", {
+            //             title: '修改',
+            //             dialogData: {},
+            //             insertOrModify: 1,
+            //             formData: {},
+            //             useNo: "",
+            //             searchCurrency: [],
+            //             validateFlag: true,
+            //             toCurNo: ''
+            //         });
+            //         util.successMessage("修改成功");
+            //     } else {
+            //         util.errorMessage("修改失败");
+            //     }
+            // }
+        },
+        ////////////////////////////////////////
+
+
+        // 列表查询
+        async queryDepartLevel({
+            commit,
+            state
+        }, payload) {
+            // 页面查询条件
+            const queryParam = state.queryParam;
+            payload.values = util.initQueryParam(payload, queryParam);
+            const params = {
+                use_yn: "Y",
+                ...payload.values
+            };
+            const data = await service.queryDepartLevelDefData(params);
+            commit("update", {
+                departLevelData: {
+                    current: data.pageNo,
+                    pageSize: data.pageSize,
+                    total: data.total,
+                    records: data.rows
+                },
+                queryParam: payload.values
+            });
+        },
+
+
+
+
+        // 新增一行
+        async addRows2({
+            commit,
+            dispatch,
+            state
+        }, payload) {
+            let conversion = state.conversion;
+            conversion.records.push({
+                rowsId: Date.now(),
+                use_yn: "Y",
+                key: '123',
+                name: '321',
+            });
+            console.log(conversion.records);
+            const name = payload.name;
+            if (name) {
+                conversion.records.forEach(item => {
+                    item.from_cur_no = name;
+                });
+            }
+            commit("update", {
+                conversion
+            });
+        }
+    },
+    mutations: {
+        update(state, payload) {
+            for (let key in payload) {
+                state[key] = payload[key];
+            }
+        },
+        // 清理数据
+        clearDepartLevelInfo(state) {
+            state.departLevelInfo = {
+                current: 1,
+                pageSize: 0,
+                total: 0,
+                records: []
+            },
+                state.title = '',
+                state.dialogData = {}
+        }
+    }
+}

ant-design-pro-vue3/src/views/depart/departLevel/models/DepartLevel.store.ts

@@ -0,0 +1,227 @@
+import * as service from '../services';
+import * as util from "@/utils/index.js";
+import { message } from "ant-design-vue";
+export default {
+    namespaced: true,
+    state: {
+        // 机构层级定义-列表查询条件
+        tableName: 'com_depart_level_info',
+        // 保存按钮状态
+        saveFlag: '0',
+        // 机构层级定义-列表查询数据
+        departLevelDefData: {
+            current: 1,
+            pageSize: 0,
+            total: 0,
+            records: []
+        },
+        //新增或修改的数据
+        dialogData: {
+            no: '',
+            key: '',
+            name: '',
+            use: '',
+            use_yn: 'Y',
+            modalType: '',// 1-新增，2-修改
+            title: '',
+            departLevelInfoData: {
+                current: 1,
+                pageSize: 0,
+                total: 0,
+                records: []
+            }
+        },
+    },
+    actions: {
+        // 机构层级定义列表查询
+        async queryDepartLevelDefData({ state, commit }, payload) {
+            // 1.获取vuex中的departLevelDefData数据
+            const departLevelDefData = state.departLevelDefData;
+            // 2.页面查询条件
+            const params = {
+                ...payload.values
+            };
+            // 2.调用接口 获取数据
+            const resp = await service.queryDepartLevelDefData(params);
+            departLevelDefData.total = resp.total;
+            departLevelDefData.pageSize = resp.pageSize;
+            departLevelDefData.records = resp.rows;
+            // 3.提交下vuex中的departLevelDefData数据
+            commit("update", { departLevelDefData: departLevelDefData });
+        },
+
+        async loadDialogDataData({ state, commit }, payload) {
+            // 1.获取vuex中的dialogData数据
+            const dialogData = state.dialogData;
+            if (payload == undefined) {
+                // 新增对话框数据初始化
+                dialogData.modalType = '1';
+                dialogData.title = '新增';
+                // 2.新增页面获取下机构层级外部编码
+                const resp = await service.getTabKeyRule({
+                    tabName: state.tableName
+                });
+                dialogData.key = resp.num;
+                dialogData.name = '';
+                dialogData.use = '';
+                dialogData.departLevelInfoData.current = 1;
+                dialogData.departLevelInfoData.pageSize = 0;
+                dialogData.departLevelInfoData.total = 0;
+                dialogData.departLevelInfoData.records = [];
+            } else {
+                // 修改对话框数据初始化
+                dialogData.modalType = '2';
+                dialogData.title = '修改';
+                // 2.修改页面查询层级列表信息
+                const resp = await service.queryDepartLevelInfoData({
+                    no: payload.no,
+                    page: 1,
+                    rows: 10
+                });
+                dialogData.no = payload.no;
+                dialogData.key = payload.key;
+                dialogData.name = payload.name;
+                dialogData.use = payload.use;
+                dialogData.use_yn = payload.use_yn;
+                dialogData.departLevelInfoData.current = 1;
+                dialogData.departLevelInfoData.pageSize = resp.pageSize;
+                dialogData.departLevelInfoData.total = resp.total;
+                dialogData.departLevelInfoData.records = resp.rows;
+            }
+            // 3.提交下vuex中的dialogData数据
+            commit("update", { dialogData: dialogData });
+        },
+
+        async queryDepartLevelInfoData({ state, commit }, payload) {
+            // 1.获取vuex中的dialogData数据
+            const dialogData = state.dialogData;
+            // 2.页面查询条件
+            const params = {
+                ...payload.values
+            };
+            // 2.调用接口 获取数据
+            const resp = await service.getDepartLevelInfoList(params);
+            dialogData.departLevelInfoData.total = resp.total;
+            dialogData.departLevelInfoData.records = resp.rows;
+            // 3.提交下vuex中的dialogData数据
+            commit("update", { dialogData: dialogData });
+        },
+
+        async addDepartLevelInfoData({ state, commit }) {
+            // 1.获取vuex中的dialogData数据
+            const dialogData = state.dialogData;
+            dialogData.departLevelInfoData.records.push({
+                no: util.createUniqueString(),
+                key: '',
+                name: '',
+                use_yn: ''
+            });
+            // 总行数加1
+            dialogData.departLevelInfoData.total++;
+            // 4.提交下vuex中的dialogData数据
+            commit("update", { dialogData: dialogData });
+
+        },
+
+        async deleteDepartLevelInfoData({ state, commit }, payload) {
+            // 1.获取vuex中的dialogData数据
+            const dialogData = state.dialogData;
+            if (payload.index) {
+                dialogData.departLevelInfoData.records.splice(payload.index, 1);
+            }
+            // 总行数加1
+            dialogData.departLevelInfoData.total--;
+            // 3.提交下vuex中的dialogData数据
+            commit("update", { dialogData: dialogData });
+        },
+
+        async saveDepartLevelInfoData({ state, commit, dispatch }, payload) {
+            // 1.获取vuex中的dialogData数据
+            const modalType = state.dialogData.modalType;
+            const dialogData = state.dialogData;
+            console.log("wyq:saveDepartLevelInfoData 前 dialogData", dialogData);
+            if (modalType == 1) {
+                console.log("wyq:saveDepartLevelInfoData 新增 dialogData", dialogData);
+                // 新增
+                // 1.新增页面获取下机构层级外部编码
+                if (dialogData.departLevelInfoData.records.length == 0) {
+                    message.error("请至少添加一个层级！");
+                    return;
+                }
+
+                // 2.调用接口 保存数据
+                const params = {
+                    key: dialogData.key,
+                    name: dialogData.name,
+                    use: dialogData.use,
+                    use_yn: dialogData.use_yn,
+                    _backFromClent: 'Y',
+                    data: JSON.stringify(dialogData.departLevelInfoData.records)
+                };
+                try {
+                    await service.insertDepartLevelInfoData(params);
+                    // 查询下数据
+                    // await dispatch('queryDepartLevelDefData', { values: { key: dialogData.key } });
+                    payload.closeMethod();
+                    // 处理成功响应
+                    message.success("新增成功！");
+                } catch (error) {
+                    // 处理异常响应，比如弹窗提示等;
+                    message.error(`请求失败: ${error.message}`);
+                    return
+                }
+            } else {
+                console.log("wyq:saveDepartLevelInfoData 修改 dialogData", dialogData);
+                // 修改
+                // 2.调用接口 修改数据
+                const params = {
+                    i_key: dialogData.key,
+                    i_name: dialogData.name,
+                    i_use: dialogData.use,
+                    no: dialogData.no,
+                    use_yn: dialogData.use_yn,
+                    data: JSON.stringify(dialogData.departLevelInfoData.records)
+                }
+                try {
+                    await service.updateDepartLevelInfoData(params);
+                    // service.queryDepartLevelDefData({ values: {} });
+                    payload.closeMethod();
+                    // 处理成功响应
+                    message.success("修改成功！");
+                } catch (error) {
+                    // 处理异常响应，比如弹窗提示等;
+                    message.error(`请求失败: ${error.message}`);
+                    return
+                }
+            }
+            commit("update", { saveFlag: state.saveFlag === '0' ? '1' : '0' });
+        },
+        async changeUseYn({ state, commit, dispatch }, payload) {
+            console.log("wyq:changeUseYn 前 payload", payload.values.use_yn, payload.values.no);
+            const useYn = payload.values.use_yn;
+            const params = {
+                no: payload.values.no
+            }
+            try {
+                await service.changeUseYn(params);
+                // 处理成功响应
+                if (useYn == 'Y') {
+                    message.success("停用成功");
+                } else {
+                    message.success("启用成功");
+                }
+            } catch (error) {
+                // 处理异常响应，比如弹窗提示等;
+                message.error(`请求失败: ${error.message}`);
+                return
+            }
+        }
+    },
+    mutations: {
+        update(state, payload) {
+            for (let key in payload) {
+                state[key] = payload[key];
+            }
+        },
+    }
+}

ant-design-pro-vue3/src/views/depart/departLevel/services/index.ts

@@ -0,0 +1,137 @@
+import request from "@/utils/request";
+import settings from "@/settings";
+import { message } from "ant-design-vue";
+import { Header } from "ant-design-vue/lib/layout/layout";
+
+const systemPrefix = settings.systemPrefix;
+// 查询机构层级列表
+export function queryDepartLevelDefData(param) {
+    return request(`${systemPrefix}/im/dhc/sys/automake/system/department/param/departlevelListController.do`, {
+        method: 'post',
+        data: param,
+        requestType: 'form'
+    });
+}
+
+export function getDepartLevelInfoList(param) {
+    return request(`${systemPrefix}/automake/controller/system/department/param/QueryDepartLevelInfoController.do`, {
+        method: 'post',
+        data: param,
+        requestType: 'form',
+        headers: {
+            "X-Requested-With": "XMLHttpRequest"
+        }
+    });
+}
+
+export function queryDepartLevelInfoData(param) {
+    return request(`${systemPrefix}/automake/controller/system/department/param/QueryDepartLevelInfoController.do`, {
+        method: 'post',
+        data: param,
+        requestType: 'form',
+        headers: {
+            "X-Requested-With": "XMLHttpRequest"
+        }
+    });
+}
+
+export function validateRecord(param) {
+    return request(`${systemPrefix}/financemanage/validateRecord.do`, {
+        method: 'post',
+        data: param,
+        requestType: 'form',
+        headers: {
+            "X-Requested-With": "XMLHttpRequest"
+        }
+    });
+}
+
+export function insertDepartLevelInfoData(param) {
+    return request(`${systemPrefix}/im/dhc/sys/automake/system/department/param/departlevelInsertController.do`, {
+        method: 'post',
+        data: param,
+        requestType: 'form',
+        headers: { "X-Requested-With": "XMLHttpRequest" }
+    });
+}
+
+export function updateDepartLevelInfoData(param) {
+    return request(`${systemPrefix}/automake/controller/system/department/param/departlevelModifyController.do`, {
+        method: 'post',
+        data: param,
+        requestType: 'form',
+        headers: { "X-Requested-With": "XMLHttpRequest" }
+    });
+}
+
+export function changeUseYn(param) {
+    return request(`${systemPrefix}/im/dhc/sys/automake/system/department/param/departlevelListChangeStsController.do`, {
+        method: 'post',
+        data: param,
+        requestType: 'form',
+        headers: { "X-Requested-With": "XMLHttpRequest" }
+    });
+}
+
+
+export function getTabKeyRule(param) {
+    return request(`${systemPrefix}/system/select/options/getTabKeyRule.do`, {
+        method: 'post',
+        data: param,
+        requestType: 'form'
+    });
+}
+
+export function searchCurrency(param) {
+    return request(`${systemPrefix}/system/select/options/getTabKeyRule.do`, {
+        method: 'post',
+        data: param,
+        requestType: 'form'
+    });
+}
+export function getRelationInfoNoOptions(params) {
+    return request(`${systemPrefix}/system/select/options/relationInfoNo.do`, {
+        method: 'post',
+        data: params,
+        requestType: 'form',
+    })
+}
+
+export function reportTreeDataController(params) {
+    return request(`${systemPrefix}/im/dhc/sys/automake/system/department/ReportTreeDataController.do`, {
+        method: 'post',
+        data: params,
+        requestType: 'form',
+
+    })
+}
+
+export function searchTreePanelDataByNodeI(params) {
+    return request(`${systemPrefix}/system/common/action/searchTreePanelDataByNodeId`, {
+        method: 'post',
+        data: params,
+        requestType: 'form',
+    })
+}
+
+export function searchReport(params) {
+    return request(`${systemPrefix}/im/dhc/zz/automake/zzmanage/reporformula_manager/ReadyReportDataController.do`, {
+        method: 'post',
+        data: params,
+        requestType: 'form',
+    })
+}
+
+export function searchReportResult(params) {
+    return request(`${systemPrefix}/report/query/zz/ywzkb`, {
+        method: 'post',
+        data: params,
+        headers: { "X-Requested-With": "XMLHttpRequest" }
+        // headers: {
+        //     'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
+        //     'Content-Type': 'application/x-www-form-urlencoded',
+        //     'Accept-Language': 'zh-CN,zh;q=0.8,zh-TW;q=0.7,zh-HK;q=0.5,en-US;q=0.3,en;q=0.2'
+        // }
+    })
+
+}

ant-design-pro-vue3/src/views/depart/departLevelInfo.vue

@@ -0,0 +1,172 @@
+<template>
+
+    <div>
+        <pro-dialog :visible="$attrs.visible" @close="$emit('close:modal')" :title="title" width="70%" :closable="true"
+            :destroyOnClose="true" :maskClosable="true">
+            <template v-slot:footer="">
+                <pro-button id="f3dd65a2-c52b-11ea-87c3-ff36a904ecf1" @click="$emit('close:modal')"
+                    :icon="h(CloseOutlined)">关闭</pro-button>
+                <pro-button id="f3dd65a4-c52b-11ea-87c3-ff36a904ecf2" @click="saveHandler_d7fae64c"
+                    :icon="h(SaveOutlined)">保存</pro-button>
+            </template>
+
+            <pro-form ref="formRef_a6c2da04" :model="formData_a6c2da04" :rules="formRules_a6c2da04" label-width="120px">
+                <pro-form-grid :header="{ title: '基本信息' }" colNum="4">
+                    <pro-input v-show="false" :ref="(el) => formRefs_a6c2da04.no = el"
+                        :formItemProps="{ label: 'no', prop: 'no' }" v-model:value="formData_a6c2da04.no"
+                        placeholder="请输入" :allowClear="true">
+                    </pro-input>
+                    <pro-input :ref="(el) => formRefs_a6c2da04.key = el" :formItemProps="{ label: '层级编号', prop: 'key' }"
+                        v-model:value="formData_a6c2da04.key" placeholder="请输入" :allowClear="true"></pro-input>
+                </pro-form-grid>
+            </pro-form>
+
+            <pro-form-grid :header="{ title: '层级信息' }" colNum="3">
+                <div>
+                    <pro-table ref="tableRef_28fa7a23" :columns="columns_28fa7a23" :dataSource="conversion">
+                        <template v-slot:header="">
+                            <pro-button id=" 4b7facf0-94a4-11ee-9af3-e137392c498c" text="增加一行" :icon="h(PlusOutlined)"
+                                icon="plus" type="primary" @click="addRows">增加一行</pro-button>
+                        </template>
+                    </pro-table>
+                </div>
+            </pro-form-grid>
+        </pro-dialog>
+    </div>
+</template>
+
+<script setup lang="jsx">
+import { ref, onMounted, computed, h, useAttrs, watch, reactive } from 'vue';
+import settings from '@/settings';
+import request from '@/utils/request';
+import { useStore } from 'vuex';
+import { CloseOutlined, SaveOutlined, DeleteOutlined, PlusOutlined } from "@ant-design/icons-vue";
+import { Modal } from "ant-design-vue";
+
+const store = useStore();
+const formRefs_a6c2da04 = ref({
+    key: "",
+    name: "",
+    epn: "",
+    sbl: "",
+    show_seqn: "",
+    correct_yn: "",
+    use_yn: "",
+    brf: "",
+    default_yn: "",
+    formtype: "",
+    oldKey: ""
+});
+const formData_a6c2da04 = ref({
+    key: "",
+    name: "",
+    epn: "",
+    sbl: "",
+    show_seqn: "",
+    correct_yn: "N",
+    use_yn: "Y",
+    brf: "",
+    default_yn: "N",
+    formtype: "1",
+    oldKey: ""
+});
+
+
+onMounted(() => {
+    if (formData_a6c2da04.value.name) {
+        //修改
+        formData_a6c2da04.value.formtype = '2';
+        let oldKey = formData_a6c2da04.value.key;
+        formData_a6c2da04.value.oldKey = oldKey;
+    }
+    formData_a6c2da04.value = store.state.departLevel.formData
+});
+
+function saveHandler_d7fae64c () {
+
+}
+function formRules_a6c2da04 () {
+
+}
+
+const conversion = computed(() => store.state.departLevel.conversion);
+const tableRef_28fa7a23 = ref(null);
+
+const columns_28fa7a23 = ref([
+    {
+        prop: "ActionColumn",
+        label: "操作",
+        width: "120px",
+        align: "center",
+        render: (scope) => {
+            return <div>
+                <pro-button id="userDelete" onClick={() => confirmHandler_0c5b805d(scope)} icon={h(DeleteOutlined)}>删除</pro-button>
+            </div>
+        }
+    },
+    { prop: "key", label: "层级编号", align: "center", width: "120px", editing: true },
+    { prop: "name", label: "层级名称", align: "center", width: "120px", editing: true },
+    { prop: "brf", label: "层级功能描述", align: "center", width: "240px", editing: true },
+]);
+
+function confirmHandler_0c5b805d (scope) {
+    Modal.confirm({
+        title: '删除确认',
+        content: '确认删除选中的记录',
+        cancelText: '删除',
+        onOk () {
+            // store.dispatch('CurrencyManager/deleteRows', { ...scope.record });
+        }
+    });
+}
+
+const addRows = () => {
+    store.dispatch("departLevel/addRows", {
+        name: formData_a6c2da04.value.name
+    });
+};
+
+function editRow (item) {
+    console.log("------------------<<editRow>>-------------------");
+    item.editConfig = {
+        el: "input"
+    };
+
+}
+function proTableRowClick (value, row, column) {
+    console.log("------------------<<handleCellClick>>-------------------");
+
+    console.log('Cell clicked:', value, row, column);
+    // 在这里处理单元格点击事件
+}
+function onEditCell (value, row, index, key) {
+    console.log("------------------<<onEditCell>>-------------------");
+
+    console.log('编辑的值:', value);
+    console.log('当前行数据:', row);
+    console.log('当前行索引:', index);
+    console.log('编辑的字段:', key);
+    // 在这里处理编辑事件，例如更新数据等
+}
+function finishEdit (item) {
+    console.log("------------------<<finishEdit>>-------------------");
+
+    item.editing = false;
+    // 此处可添加其他逻辑，例如保存数据
+}
+
+
+const editableData = reactive({});
+const edit = key => {
+    console.log("------------------<<edit>>-------------------");
+
+    editableData[key] = cloneDeep(dataSource.value.filter(item => key === item.key)[0]);
+};
+
+const save = key => {
+    console.log("------------------<<save>>-------------------");
+
+    Object.assign(dataSource.value.filter(item => key === item.key)[0], editableData[key]);
+    delete editableData[key];
+};
+</script>

ant-design-pro-vue3/src/views/depart/models/departLevel.store.ts

@@ -0,0 +1,170 @@
+import { clear } from 'console';
+import * as service from '../services';
+import * as util from "@/utils/index.js";
+export default {
+    namespaced: true,
+    state: {
+        // 查询页
+        departLevelData: {
+            current: 1,
+            pageSize: 0,
+            total: 0,
+            records: []
+        },
+        // 表格数据
+        queryParam: {},
+        // list页面查询条件
+        insertOrModify: 1,
+        //新增修改标志：1-新增，2-修改
+
+        //新增修改
+        formData: {},
+        //表单数据
+        title: '',
+        // modal页面标题
+        conversion: {
+            current: 1,
+            pageSize: 0,
+            total: 0,
+            records: []
+        },
+        //折算币种
+        // 启用数据
+        useNo: "",
+        validateFlag: true,
+        searchCurrency: [],
+        // 新增修改页面折算后币种查询条件
+        toCurNo: [],
+
+
+        departLevelInfo: {
+            current: 1,
+            pageSize: 0,
+            total: 0,
+            records: []
+        }
+    },
+    actions: {
+        // 列表查询
+        async queryDepartLevel({
+            commit,
+            state
+        }, payload) {
+            console.log("wyq--", payload);
+            console.log("wy1q--", state.queryParam.values);
+
+            // 页面查询条件
+            const queryParam = state.queryParam;
+            console.log("wy2q--", queryParam);
+
+            payload.values = util.initQueryParam(payload, queryParam);
+            const params = {
+                use_yn: "Y",
+                ...payload.values
+            };
+            const data = await service.queryDepartLevel(params);
+            commit("update", {
+                departLevelData: {
+                    current: data.pageNo,
+                    pageSize: data.pageSize,
+                    total: data.total,
+                    records: data.rows
+                },
+                queryParam: payload.values
+            });
+        },
+
+
+        // 新增/修改页面打开
+        async clickInsertOrModifyBtn({ commit }, payload) {
+            // 清理下数据
+            commit("clearDepartLevelInfo");
+
+            const conversion = {
+                current: 1,
+                pageSize: 0,
+                total: 0,
+                records: []
+            };
+            const data = await service.searchCurrency({
+                use_yn: "Y"
+            });
+            if (payload == undefined) {
+                // 新增页面
+                const tableKey = await service.getTabKeyRule({
+                    tabName: 'currency'
+                });
+                commit("update", {
+                    insertOrModify: 1,
+                    title: '币种新增',
+                    formData: {
+                        key: tableKey.value
+                    },
+                    conversion,
+                    useNo: "",
+                    searchCurrency: data.test,
+                    validateFlag: true,
+                    toCurNo: ''
+                });
+            } else {
+                // 修改页面
+                console.log(payload.no);
+                const currencyConversion = await service.queryDepartLevelInfo({
+                    no: payload.no
+                });
+                currencyConversion.rows.forEach(item => item.from_cur_no = payload.name);
+                conversion.records = currencyConversion.rows;
+                commit("update", {
+                    insertOrModify: 2,
+                    title: '币种修改',
+                    formData: payload,
+                    conversion,
+                    useNo: payload.no,
+                    searchCurrency: data.test,
+                    validateFlag: true,
+                    toCurNo: payload.no
+                });
+            }
+        },
+        // 新增一行
+        async addRows({
+            commit,
+            dispatch,
+            state
+        }, payload) {
+            let conversion = state.conversion;
+            conversion.records.push({
+                rowsId: Date.now(),
+                use_yn: "Y",
+                key: '123',
+                name: '321',
+            });
+            console.log(conversion.records);
+            const name = payload.name;
+            if (name) {
+                conversion.records.forEach(item => {
+                    item.from_cur_no = name;
+                });
+            }
+            commit("update", {
+                conversion
+            });
+        }
+    },
+    mutations: {
+        update(state, payload) {
+            for (let key in payload) {
+                state[key] = payload[key];
+            }
+        },
+        // 清理数据
+        clearDepartLevelInfo(state) {
+            state.departLevelInfo = {
+                current: 1,
+                pageSize: 0,
+                total: 0,
+                records: []
+            }
+        }
+    }
+}

ant-design-pro-vue3/src/views/depart/services/index.ts

@@ -0,0 +1,38 @@
+import request from "@/utils/request";
+import settings from "@/settings";
+const systemPrefix = settings.systemPrefix;
+// 查询机构层级列表
+export function queryDepartLevel(param) {
+    return request(`${systemPrefix}/im/dhc/sys/automake/system/department/param/departlevelListController.do`, {
+        method: 'post',
+        data: param,
+        requestType: 'form'
+    });
+}
+
+export function getTabKeyRule(param) {
+    return request(`${systemPrefix}/system/select/options/getTabKeyRule.do`, {
+        method: 'post',
+        data: param,
+        requestType: 'form'
+    });
+}
+
+export function searchCurrency(param) {
+    return request(`${systemPrefix}/system/select/options/getTabKeyRule.do`, {
+        method: 'post',
+        data: param,
+        requestType: 'form'
+    });
+}
+
+export function queryDepartLevelInfo(param) {
+    return request(`${systemPrefix}/automake/controller/system/department/param/QueryDepartLevelInfoController.do`, {
+        method: 'post',
+        data: param,
+        requestType: 'form',
+        headers: {
+            "X-Requested-With": "XMLHttpRequest"
+        }
+    });
+}

ant-design-pro-vue3/src/views/depart/test/TestPanel.vue

@@ -0,0 +1,12 @@
+<template>
+    <div id="app">
+        <h2>Test Panel</h2>
+        <div class="content">
+            <LeftPanel />
+        </div>
+    </div>
+</template>
+
+<script>
+
+</script>

ant-design-pro-vue3/src/views/example/ProDatePickerExample.vue

@@ -0,0 +1,49 @@
+<template>
+    <!-- <pro-date-picker :formItemProps="{ label: '制表日期1', prop: 'rptDate' }" v-model:value="formData.rptDate"
+        placeholder="请选择制表日期" :allowClear="true">
+    </pro-date-picker> -->
+    <a-date-picker v-model:value="value1" />
+    <div>你好{{ sysData }}</div>
+    <div>你好{{ UserInfo }}</div>
+    <div>你好{{ day }}</div>
+</template>
+<script setup lang="jsx">
+import ls from '@/utils/Storage'
+import { USER_INFO, GOLBAL_TBSDY } from '@/store/mutation-types'
+
+import { ref, reactive, nextTick, onMounted, onUnmounted, h, } from 'vue';
+const formData = ref({
+    relationNo: '',
+    brNos: [],
+    brName: '',
+    rptDate: '20250318',
+    cycType: '',
+    cycTypeName: '',
+    curNo: '',
+    curName: '',
+    stddNo: '',
+    sobNo: '',
+    shFlag: '',
+    shFlagName: '',
+    adjType: '',
+    adjTypeName: '',
+    accLvl: '',
+    zeroPrintYn: '',
+    exrateType: '',
+    isGather: 'N',
+    telNo: '',
+
+    ptabName: ['v_gl_sub_coll_day'],
+    tabName: ["gls_gl_sub_tmp_sh_adj_q", "gls_gl_sub_tmp_sh_adj", "gls_gl_sub_tmp_sh_adj_h"],
+    reportType: '1',
+    rptType: '',
+
+});
+
+const value1 = ref();
+let sysData = JSON.parse(sessionStorage.getItem('sysDate'))
+const userNoInfo = JSON.parse(sessionStorage.getItem("user"));
+const UserInfo = ls.get(USER_INFO)
+const day = ls.get(GOLBAL_TBSDY)
+</script>
+<style></style>

ant-design-pro-vue3/src/views/front/T2000/T2000.vue

@@ -0,0 +1,7 @@
+<template>
+    <div>T2000</div>
+</template>
+
+<script setup>
+
+</script>

ant-design-pro-vue3/src/views/front/T2001/T2001.vue

@@ -0,0 +1,7 @@
+<template>
+    <div>T2001</div>
+</template>
+
+<script setup>
+
+</script>

ant-design-pro-vue3/vite.config.ts

@@ -101,8 +101,15 @@ export default defineConfig({
             //-----------------------------财务请求代理--------------------------------
             '/zz-pack': {
 
-                target: 'http://localhost:8088/zz-pack/',
-                // target: 'http://172.16.2.162:16001/zz-pack/',
+                // target: 'http://localhost:8090/zz-pack/',
+                target: 'http://192.168.1.206:12206/zz-pack/',
+                changeOrigin: true,
+                rewrite: (path) => path.replace(/^\/zz-pack/, '')
+            },
+            '/zz_rpt': {
+
+                // target: 'http://localhost:8090/zz-pack/',
+                target: 'http://192.168.1.206:12206/zz-pack/',
                 changeOrigin: true,
                 rewrite: (path) => path.replace(/^\/zz-pack/, '')
             },