diff --git a/package.json b/package.json index 85ebee6..60e6624 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ant-design-pro", - "version": "4.5.64", + "version": "4.5.65", "private": true, "description": "An out-of-box UI solution for enterprise applications", "scripts": { diff --git a/src/pages/Setting/batchAuthorization/index.tsx b/src/pages/Setting/batchAuthorization/index.tsx index 540e3c6..18b41a9 100644 --- a/src/pages/Setting/batchAuthorization/index.tsx +++ b/src/pages/Setting/batchAuthorization/index.tsx @@ -7,7 +7,7 @@ import { EllipsisOutlined, MenuFoldOutlined } from "@ant-design/icons"; import type { FormInstance } from "antd"; import { Button, message, Modal, Popconfirm, Row, Space, Spin, Tree } from "antd"; import useRequest from "@ahooksjs/use-request"; -import { getServerpartTree } from "@/services/options"; +import { getServerpartTree, getServerpartTreeNosessoin } from "@/services/options"; import type { ActionType } from "@ant-design/pro-table"; import ProTable from "@ant-design/pro-table"; import LeftSelectTree from "@/pages/reports/settlementAccount/component/leftSelectTree"; @@ -74,11 +74,39 @@ const BatchAuthorization: React.FC<{ currentUser: CurrentUser }> = (props) => { const [selectedRowsInfoList, setSelectedRowsInfoList] = useState() // 这次显示的全部服务区code const [allServerPartCodeList, setAllServerPartCodeList] = useState() - + // 实际显示在左侧的服务区树 + const [treeView, setTreeView] = useState() // 选择的要移除用户id列表 const [selectedDeleteRowKeysList, setSelectedDeleteRowKeysList] = useState() // 选择的要移除用户信息列表 const [selectedDeleteRowsInfoList, setSelectedDeleteRowsInfoList] = useState() + // 加载服务区树 + const { loading: treeLoading, data: treeViews } = useRequest(async () => { + let data: any = await getServerpartTreeNosessoin({ + ProvinceCode: currentUser?.ProvinceCode, + ServerpartType: 1000, + StatisticsType: 1000, + ShowWholePower: true, + }) + // console.log('datadatadatadata', data); + + let list: any = [] + if (data && data.length > 0) { + data.forEach((item: any) => { + // 判断 item这一层已经是片区了 如果item.children 只有一个的话 那就说明 也只有一个服务区 那么就可以判断不显示全部和片区的树形选择层了 + if (item.children && item.children.length === 1) { + list.push(item.children[0]) + } else { + if (item.value !== 89 &&item.value !== 424 && item.value !== 586) { + list.push(item) + } + } + }) + } + + setTreeView(list) + return data + }) const columns: any = [ { @@ -148,7 +176,37 @@ const BatchAuthorization: React.FC<{ currentUser: CurrentUser }> = (props) => { setPrintOut(el); }} >
- + {/* */} + { setCollapsible(!collapsible) }} />} + colSpan={!collapsible ? "300px" : "60px"} + title={!collapsible ? "请选择服务区" : ""} + headerBordered + collapsed={collapsible} + > + {treeView && treeView.length > 0 ? { + const selectedIds = info.checkedNodes.filter(n => n?.type === 1) + setSelectedId(selectedIds.map(n => n?.value)?.toString() || '') + }} + /> : ''} +
= (props) => { const req: any = { USER_STATUS: 1, current: 1, + ServerpartIds: selectedId, pageSize: 999999, USER_PROVINCE: currentUser?.ProvinceCode, keyWord: { diff --git a/src/pages/reports/settlementProjectForNextMonth/index.tsx b/src/pages/reports/settlementProjectForNextMonth/index.tsx index f071435..811c4c0 100644 --- a/src/pages/reports/settlementProjectForNextMonth/index.tsx +++ b/src/pages/reports/settlementProjectForNextMonth/index.tsx @@ -17,6 +17,7 @@ import { handleGetWillSettleProject } from "./service"; import moment from 'moment' import session from "@/utils/session"; import ProjectDetail from "@/pages/BussinessProject/detail"; +import { exportXlsxFromProColumnsExcelJS } from "@/utils/exportExcelFun"; const settlementProjectForNextMonth: React.FC<{ currentUser: CurrentUser }> = (props) => { @@ -286,33 +287,41 @@ const settlementProjectForNextMonth: React.FC<{ currentUser: CurrentUser }> = (p const data = await handleGetWillSettleProject(req) console.log('datadatadatadatadata', data); if (data && data.length > 0) { + let exportList: any = [] + data.forEach((item: any) => { + item.STARTDATEENDDATE = `${item?.STARTDATE ? moment(item?.STARTDATE).format('YYYY/MM/DD') : ""}${item?.ENDDATE ? '-' : ''}${item?.ENDDATE ? moment(item?.ENDDATE).format('YYYY/MM/DD') : ""}` + item.PeriodClosed = item?.PeriodClosed ? '是' : "否" + exportList.push(item) + }) + setReqDetailList(exportList) return { data, success: true } } + setReqDetailList([]) return { data: [], success: true } }} toolbar={{ actions: [ - - - , + // + // + // ,
@@ -1427,11 +1432,13 @@ const ReportTable: React.FC<{ currentUser?: CurrentUser, isComponents?: boolean, 项目到账： {numeral(reduceTableData.RoyaltyProject_Price).format('0,0.00')}
@@ -1440,11 +1447,13 @@ const ReportTable: React.FC<{ currentUser?: CurrentUser, isComponents?: boolean, 差额： {numeral(reduceTableData.Royalty_DiffPrice).format('0,0.00')} @@ -1452,7 +1461,8 @@ const ReportTable: React.FC<{ currentUser?: CurrentUser, isComponents?: boolean, 统计时间： { isComponents ? '' : diff --git a/src/services/options/index.ts b/src/services/options/index.ts index af082c2..7f06668 100644 --- a/src/services/options/index.ts +++ b/src/services/options/index.ts @@ -251,6 +251,20 @@ export async function getServerpartTree(ProvinceCode?: number | string, Serverpa return data.Result_Data.List; } +// 获取服务区树形列表 不走缓存 真实调用 +export async function getServerpartTreeNosessoin(params?: any) { + const data = await request('/BaseInfo/GetServerpartTree', { + method: 'GET', + params + }) + + if (data.Result_Code !== 100) { + return [] + } + + return data.Result_Data.List; +} + /* 获取业主单位树形列表 */ export async function getOwnerUnitTree(DataType?: number | string): Promise { const ownerTree = session.get(`ownerTree_${DataType}`); diff --git a/src/versionEnv.ts b/src/versionEnv.ts index d7d9b67..fc71c48 100644 --- a/src/versionEnv.ts +++ b/src/versionEnv.ts @@ -1,4 +1,4 @@ // 由 scripts/writeVersion.js 自动生成 -export const VERSION = "4.5.64"; -export const GIT_HASH = "5a7f174"; -export const BUILD_TIME = "2025-09-26T03:21:11.008Z"; +export const VERSION = "4.5.65"; +export const GIT_HASH = "e90dabf"; +export const BUILD_TIME = "2025-10-21T01:48:13.490Z";