diff --git a/public/favicon.ico b/public/favicon.ico index fb583f4..47dadd5 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/common/components/layout/MyPageContainer.tsx b/src/common/components/layout/MyPageContainer.tsx index 2b847dc..bb6e7eb 100644 --- a/src/common/components/layout/MyPageContainer.tsx +++ b/src/common/components/layout/MyPageContainer.tsx @@ -257,6 +257,7 @@ export function MyPageContainer({ {/* */} - | + {/* | */} 智慧物业管理系统 diff --git a/src/pages/asset/houses/index.tsx b/src/pages/asset/houses/index.tsx index a926d1d..f7db7b3 100644 --- a/src/pages/asset/houses/index.tsx +++ b/src/pages/asset/houses/index.tsx @@ -76,11 +76,12 @@ export default function Index({ title = '房屋列表' }) { { title: '项目名称', dataIndex: ['asset_project', 'name'], - search: { - transform: (value) => { - return { project_name: value }; - }, - }, + search: false, + // search: { + // transform: (value) => { + // return { project_name: value }; + // }, + // }, }, { title: '房屋名称', diff --git a/src/pages/asset/parking_area/index.tsx b/src/pages/asset/parking_area/index.tsx index 93ec10c..59cd991 100644 --- a/src/pages/asset/parking_area/index.tsx +++ b/src/pages/asset/parking_area/index.tsx @@ -66,11 +66,12 @@ export default function Index({ title = '车场车位' }) { { title: '项目名称', dataIndex: ['asset_project', 'name'], - search: { - transform: (value) => { - return { project_name: value }; - }, - }, + search: false, + // search: { + // transform: (value) => { + // return { project_name: value }; + // }, + // }, }, { title: '车场名称', diff --git a/src/pages/bills/order_online/index.tsx b/src/pages/bills/order_online/index.tsx index c73acbd..5c0d9f6 100644 --- a/src/pages/bills/order_online/index.tsx +++ b/src/pages/bills/order_online/index.tsx @@ -166,17 +166,17 @@ export default function Index({ title = '线上收款单' }) { }, { title: '收款账户', - dataIndex: ['receipt_account', 'company_name'], + dataIndex: 'accept_name', // search: false, }, { title: '收款银行', - dataIndex: ['receipt_account', 'company_bank'], + dataIndex: 'accept_bank', // search: false, }, { title: '收款账号', - dataIndex: ['receipt_account', 'company_account'], + dataIndex: 'accept_account', // search: false, }, { diff --git a/src/pages/charge/standard/components/ElectricityFee.tsx b/src/pages/charge/standard/components/ElectricityFee.tsx index 7ca08aa..e6a8c64 100644 --- a/src/pages/charge/standard/components/ElectricityFee.tsx +++ b/src/pages/charge/standard/components/ElectricityFee.tsx @@ -49,11 +49,12 @@ export default function Index({ title = '电费标准' }) { { title: '关联项目', dataIndex: ['asset_project', 'name'], - search: { - transform: (value) => { - return { project_name: value }; - }, - }, + search: false, + // search: { + // transform: (value) => { + // return { project_name: value }; + // }, + // }, }, { title: '收费名称', diff --git a/src/pages/charge/standard/components/MaintenanceFund.tsx b/src/pages/charge/standard/components/MaintenanceFund.tsx index f74324a..a32008c 100644 --- a/src/pages/charge/standard/components/MaintenanceFund.tsx +++ b/src/pages/charge/standard/components/MaintenanceFund.tsx @@ -50,11 +50,12 @@ export default function Index({ title = '维修基金标准' }) { { title: '关联项目', dataIndex: ['asset_project', 'name'], - search: { - transform: (value) => { - return { project_name: value }; - }, - }, + search: false, + // search: { + // transform: (value) => { + // return { project_name: value }; + // }, + // }, }, { title: '收费名称', diff --git a/src/pages/charge/standard/components/PropertyFee.tsx b/src/pages/charge/standard/components/PropertyFee.tsx index 1ca4f9e..d9dad37 100644 --- a/src/pages/charge/standard/components/PropertyFee.tsx +++ b/src/pages/charge/standard/components/PropertyFee.tsx @@ -50,11 +50,12 @@ export default function Index({ title = '物业费标准' }) { { title: '关联项目', dataIndex: ['asset_project', 'name'], - search: { - transform: (value) => { - return { project_name: value }; - }, - }, + search: false, + // search: { + // transform: (value) => { + // return { project_name: value }; + // }, + // }, }, { title: '收费名称', diff --git a/src/pages/charge/standard/components/SharedElectricityFee.tsx b/src/pages/charge/standard/components/SharedElectricityFee.tsx index 250bf97..ddf6ef2 100644 --- a/src/pages/charge/standard/components/SharedElectricityFee.tsx +++ b/src/pages/charge/standard/components/SharedElectricityFee.tsx @@ -49,11 +49,12 @@ export default function Index({ title = '公摊电费标准' }) { { title: '关联项目', dataIndex: ['asset_project', 'name'], - search: { - transform: (value) => { - return { project_name: value }; - }, - }, + search: false, + // search: { + // transform: (value) => { + // return { project_name: value }; + // }, + // }, }, { title: '收费名称', diff --git a/src/pages/charge/standard/components/SharedWaterFee.tsx b/src/pages/charge/standard/components/SharedWaterFee.tsx index 6cceb2d..f556bcb 100644 --- a/src/pages/charge/standard/components/SharedWaterFee.tsx +++ b/src/pages/charge/standard/components/SharedWaterFee.tsx @@ -49,11 +49,12 @@ export default function Index({ title = '公摊水费标准' }) { { title: '关联项目', dataIndex: ['asset_project', 'name'], - search: { - transform: (value) => { - return { project_name: value }; - }, - }, + search: false, + // search: { + // transform: (value) => { + // return { project_name: value }; + // }, + // }, }, { title: '收费名称', diff --git a/src/pages/charge/standard/components/WaterFee.tsx b/src/pages/charge/standard/components/WaterFee.tsx index cc5f7be..ebd5e6f 100644 --- a/src/pages/charge/standard/components/WaterFee.tsx +++ b/src/pages/charge/standard/components/WaterFee.tsx @@ -45,11 +45,12 @@ export default function Index({ title = '水费标准' }) { { title: '关联项目', dataIndex: ['asset_project', 'name'], - search: { - transform: (value) => { - return { project_name: value }; - }, - }, + search: false, + // search: { + // transform: (value) => { + // return { project_name: value }; + // }, + // }, }, { title: '收费名称', diff --git a/src/pages/company/employees/index.tsx b/src/pages/company/employees/index.tsx index f5842c3..200159c 100644 --- a/src/pages/company/employees/index.tsx +++ b/src/pages/company/employees/index.tsx @@ -11,6 +11,7 @@ import { ProTable } from '@ant-design/pro-components'; import { Dropdown, Space } from 'antd'; import Change from './modals/Change'; +import { Selects } from '@/components/Select'; import EmployeeCreate from './modals/EmployeeCreate'; import EmployeeUpdate from './modals/EmployeeUpdate'; import Role from './modals/Role'; @@ -96,14 +97,24 @@ export default function Index({ title = '员工管理' }) { MyColumns.ID({ search: false, }), + Selects?.OrganizationsTree({ + title: '选择组织', + key: 'organizations_id', + search: { + transform: (value) => { + return { organizations_id: value[value.length - 1] }; + }, + }, + }), { title: '所在组织', dataIndex: 'organization_path', - search: { - transform: (value) => { - return { organization_name: value }; - }, - }, + search: false, + // search: { + // transform: (value) => { + // return { organization_name: value }; + // }, + // }, }, { title: '姓名', diff --git a/src/pages/customer/archive/components/BasicInfo.tsx b/src/pages/customer/archive/components/BasicInfo.tsx index a4882d6..349324f 100644 --- a/src/pages/customer/archive/components/BasicInfo.tsx +++ b/src/pages/customer/archive/components/BasicInfo.tsx @@ -82,7 +82,7 @@ export default function Show(props: MyBetaModalFormProps) { {id && } - + ); diff --git a/src/pages/login.tsx b/src/pages/login.tsx index 5518576..9812ed3 100644 --- a/src/pages/login.tsx +++ b/src/pages/login.tsx @@ -5,7 +5,7 @@ export default function Login() {
- XXXX有限公司 | + 零壹科技有限公司 | diff --git a/src/pages/meter/readings/index.tsx b/src/pages/meter/readings/index.tsx index 2493576..a8e03d0 100644 --- a/src/pages/meter/readings/index.tsx +++ b/src/pages/meter/readings/index.tsx @@ -51,7 +51,7 @@ export default function Index({ title = '抄表数据' }) { { return `${record.bill_year}-${String(record.bill_month).padStart( 2, diff --git a/src/pages/work_order/evaluated/index.tsx b/src/pages/work_order/evaluated/index.tsx index b06eb75..9292db3 100644 --- a/src/pages/work_order/evaluated/index.tsx +++ b/src/pages/work_order/evaluated/index.tsx @@ -51,6 +51,8 @@ export default function Index({ title = '客户评价' }) { Apis.WorkOrder.HouseWorkOrders.List, ) } + headerTitle="评价列表" + search={false} columns={[ MyColumns.ID({ search: false, diff --git a/src/pages/work_order/list/modals/WorkOrderShow.tsx b/src/pages/work_order/list/modals/WorkOrderShow.tsx index 6d4ef01..39c5e63 100644 --- a/src/pages/work_order/list/modals/WorkOrderShow.tsx +++ b/src/pages/work_order/list/modals/WorkOrderShow.tsx @@ -39,7 +39,12 @@ export default function WorkOrderShow({ return ( <> - + { - return getCurrentPermissions( - { - show: ( - - ), - }, - 'IsVisited', - ); - }; return ( ( - {tableRender(item, action)} + + {' '} + + ), }), ]} diff --git a/src/pages/work_order/visited/components/NoVisited.tsx b/src/pages/work_order/visited/components/NoVisited.tsx index 27bf401..96aa09c 100644 --- a/src/pages/work_order/visited/components/NoVisited.tsx +++ b/src/pages/work_order/visited/components/NoVisited.tsx @@ -1,4 +1,4 @@ -import { MyColumns, MyProTableProps, useCurrentPermissions } from '@/common'; +import { MyColumns, MyProTableProps } from '@/common'; import { Selects } from '@/components/Select'; import { Apis } from '@/gen/Apis'; import { @@ -11,21 +11,6 @@ import { Space } from 'antd'; import WorkOrderShow from '../../list/modals/WorkOrderShow'; export default function Index({ title = '未回访工单' }) { - const getCurrentPermissions = useCurrentPermissions(); - let tableRender = (item: any, action: any) => { - return getCurrentPermissions( - { - show: ( - <> - {item.is_visited === 0 && ( - - )} - - ), - }, - 'NoVisited', - ); - }; return ( { - const locationConfig = - HouseWorkOrdersLocationEnum[ - record.location as keyof typeof HouseWorkOrdersLocationEnum - ]; return ( {record?.asset_house?.full_name @@ -141,7 +122,9 @@ export default function Index({ title = '未回访工单' }) { MyColumns.Option({ width: 120, render: (_, item: any, index, action) => ( - {tableRender(item, action)} + + + ), }), ]} diff --git a/src/pages/work_order/visited/index.tsx b/src/pages/work_order/visited/index.tsx index ea0c40e..51907ac 100644 --- a/src/pages/work_order/visited/index.tsx +++ b/src/pages/work_order/visited/index.tsx @@ -1,5 +1,5 @@ import { MyPageContainer } from '@/common'; -import { useNavigate, useSearchParams } from '@umijs/max'; +import { useSearchParams } from '@umijs/max'; import type { TabsProps } from 'antd'; import { Tabs } from 'antd'; import { useEffect, useState } from 'react'; @@ -9,7 +9,7 @@ import NoVisited from './components/NoVisited'; export default function Index({ title = '工单回访' }) { const [searchParams] = useSearchParams(); const [activeKey, setActiveKey] = useState('1'); - const navigate = useNavigate(); + const items: TabsProps['items'] = [ { key: 'NoVisited',