Merge pull request 'fix:更新金刚区' (#3) from develop into main

Reviewed-on: #3

src/common/components/layout/MyPageContainer.tsx

@@ -257,6 +257,7 @@ export function MyPageContainer({
     <PageContainer
       fixedHeader
       header={{
+        breadcrumb: {},
         title: (
           <Space style={{ fontSize: '12px', cursor: 'pointer', color: '#999' }}>
             <Breadcrumb

src/common/pages/MyLoginPage.tsx

@@ -45,7 +45,7 @@ export function MyLoginPage() {
           title={
             <div style={{ display: 'flex', alignItems: 'center', gap: 12 }}>
               {/* <img src={gcLogo} style={{ height: 30, width: 'auto' }} /> */}
-              <span style={{ color: '#b1b1b1ff', fontSize: 20 }}>|</span>
+              {/* <span style={{ color: '#b1b1b1ff', fontSize: 20 }}>|</span> */}
               <span style={{ color: token.colorTextBase, fontSize: 21 }}>
                 智慧物业管理系统
               </span>

src/pages/asset/houses/index.tsx

@@ -76,11 +76,12 @@ export default function Index({ title = '房屋列表' }) {
           {
             title: '项目名称',
             dataIndex: ['asset_project', 'name'],
-            search: {
+            search: false,
-              transform: (value) => {
+            // search: {
-                return { project_name: value };
+            //   transform: (value) => {
-              },
+            //     return { project_name: value };
-            },
+            //   },
+            // },
           },
           {
             title: '房屋名称',

src/pages/asset/parking_area/index.tsx

@@ -66,11 +66,12 @@ export default function Index({ title = '车场车位' }) {
           {
             title: '项目名称',
             dataIndex: ['asset_project', 'name'],
-            search: {
+            search: false,
-              transform: (value) => {
+            // search: {
-                return { project_name: value };
+            //   transform: (value) => {
-              },
+            //     return { project_name: value };
-            },
+            //   },
+            // },
           },
           {
             title: '车场名称',

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,
           },
           {

src/pages/charge/standard/components/ElectricityFee.tsx

@@ -49,11 +49,12 @@ export default function Index({ title = '电费标准' }) {
         {
           title: '关联项目',
           dataIndex: ['asset_project', 'name'],
-          search: {
+          search: false,
-            transform: (value) => {
+          // search: {
-              return { project_name: value };
+          //   transform: (value) => {
-            },
+          //     return { project_name: value };
-          },
+          //   },
+          // },
         },
         {
           title: '收费名称',

src/pages/charge/standard/components/MaintenanceFund.tsx

@@ -50,11 +50,12 @@ export default function Index({ title = '维修基金标准' }) {
         {
           title: '关联项目',
           dataIndex: ['asset_project', 'name'],
-          search: {
+          search: false,
-            transform: (value) => {
+          // search: {
-              return { project_name: value };
+          //   transform: (value) => {
-            },
+          //     return { project_name: value };
-          },
+          //   },
+          // },
         },
         {
           title: '收费名称',

src/pages/charge/standard/components/PropertyFee.tsx

@@ -50,11 +50,12 @@ export default function Index({ title = '物业费标准' }) {
         {
           title: '关联项目',
           dataIndex: ['asset_project', 'name'],
-          search: {
+          search: false,
-            transform: (value) => {
+          // search: {
-              return { project_name: value };
+          //   transform: (value) => {
-            },
+          //     return { project_name: value };
-          },
+          //   },
+          // },
         },
         {
           title: '收费名称',

src/pages/charge/standard/components/SharedElectricityFee.tsx

@@ -49,11 +49,12 @@ export default function Index({ title = '公摊电费标准' }) {
         {
           title: '关联项目',
           dataIndex: ['asset_project', 'name'],
-          search: {
+          search: false,
-            transform: (value) => {
+          // search: {
-              return { project_name: value };
+          //   transform: (value) => {
-            },
+          //     return { project_name: value };
-          },
+          //   },
+          // },
         },
         {
           title: '收费名称',

src/pages/charge/standard/components/SharedWaterFee.tsx

@@ -49,11 +49,12 @@ export default function Index({ title = '公摊水费标准' }) {
         {
           title: '关联项目',
           dataIndex: ['asset_project', 'name'],
-          search: {
+          search: false,
-            transform: (value) => {
+          // search: {
-              return { project_name: value };
+          //   transform: (value) => {
-            },
+          //     return { project_name: value };
-          },
+          //   },
+          // },
         },
         {
           title: '收费名称',

src/pages/charge/standard/components/WaterFee.tsx

@@ -45,11 +45,12 @@ export default function Index({ title = '水费标准' }) {
         {
           title: '关联项目',
           dataIndex: ['asset_project', 'name'],
-          search: {
+          search: false,
-            transform: (value) => {
+          // search: {
-              return { project_name: value };
+          //   transform: (value) => {
-            },
+          //     return { project_name: value };
-          },
+          //   },
+          // },
         },
         {
           title: '收费名称',

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: {
+            search: false,
-              transform: (value) => {
+            // search: {
-                return { organization_name: value };
+            //   transform: (value) => {
-              },
+            //     return { organization_name: value };
-            },
+            //   },
+            // },
           },
           {
             title: '姓名',

src/pages/customer/archive/components/BasicInfo.tsx

@@ -82,7 +82,7 @@ export default function Show(props: MyBetaModalFormProps) {
       <HouseInfo item={data} reload={loadShow} />
       {id && <SummaryInfo item={{ ...data, id: id }} reload={loadShow} />}
       <ProCard style={{ marginTop: 16 }}>
-        <Tabs type="card" items={items} defaultActiveKey="1" size="small" />
+        <Tabs type="card" items={items} defaultActiveKey="1" />
       </ProCard>
     </>
   );

src/pages/login.tsx

@@ -5,7 +5,7 @@ export default function Login() {
     <div>
       <MyLoginPage />
       <div className="filing_info">
-        XXXX有限公司 |
+        零壹科技有限公司 |
         <a
           href="https://beian.miit.gov.cn/#/Integrated/index"
           target="_blank"

src/pages/meter/index.tsx

@@ -31,7 +31,7 @@ export default function Index({ title = '仪表管理' }) {
     <MyPageContainer
       title={title}
       enableTabs={true}
-      tabKey="resources_page"
+      tabKey="meter_resources_page"
       tabLabel={title}
     >
       <Tabs type="card" defaultActiveKey={activeKey} items={items} />

src/pages/meter/readings/index.tsx

@@ -51,7 +51,7 @@ export default function Index({ title = '抄表数据' }) {
     <MyPageContainer
       title={title}
       enableTabs={true}
-      tabKey="house_meter_readings"
+      tabKey="house_meter_data_readings"
       tabLabel={title}
     >
       <ProTable

src/pages/meter/tasks/index.tsx

@@ -3,7 +3,6 @@ import {
   MyColumns,
   MyPageContainer,
   MyProTableProps,
-  usePageTabs,
 } from '@/common';
 import { Apis } from '@/gen/Apis';
 import {
@@ -16,18 +15,12 @@ import { Space } from 'antd';
 import TaskCreate from './modals/TaskCreate';
 import TaskShow from './modals/TaskShow';
 
-export default function Index({ title = '仪表任务' }) {
+export default function Index({ title = '仪表账单生成' }) {
-  // 注册当前页面为标签页
-  usePageTabs({
-    tabKey: 'house_meter_tasks',
-    tabLabel: title,
-  });
-
   return (
     <MyPageContainer
       title={title}
       enableTabs={true}
-      tabKey="house_charge_tasks"
+      tabKey="house_charge_tasks_bill"
       tabLabel={title}
     >
       <ProTable
@@ -55,6 +48,21 @@ export default function Index({ title = '仪表任务' }) {
             dataIndex: 'generation_method',
             valueEnum: HouseMeterTasksGenerationMethodEnum,
           }),
+          {
+            title: '选择年份',
+            dataIndex: 'bill_year',
+            valueType: 'dateYear',
+            hidden: true,
+          },
+          {
+            title: '选择月份',
+            dataIndex: 'bill_month',
+            valueType: 'dateMonth',
+            hidden: true,
+            fieldProps: {
+              format: 'MM',
+            },
+          },
           // {
           //   title: '收费标准',
           //   dataIndex: ['house_charge_standard', 'name'],
@@ -62,6 +70,7 @@ export default function Index({ title = '仪表任务' }) {
           // },
           {
             title: '账单月份',
+            search: false,
             render: (_, record) => {
               return `${record.bill_year}-${String(record.bill_month).padStart(
                 2,

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,

src/pages/work_order/list/modals/WorkOrderShow.tsx

@@ -39,7 +39,12 @@ export default function WorkOrderShow({
 
   return (
     <>
-      <MyButtons.Default onClick={handleOpen} type={'primary'} title={title} />
+      <MyButtons.Default
+        onClick={handleOpen}
+        disabled={item?.is_visited}
+        type={'primary'}
+        title={title}
+      />
       <Modal
         title={title}
         open={open}

src/pages/work_order/visited/components/IsVisited.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,17 +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: (
-          <WorkOrderShow item={item} title="详情" reload={action?.reload} />
-        ),
-      },
-      'IsVisited',
-    );
-  };
   return (
     <ProTable
       {...MyProTableProps.props}
@@ -144,7 +133,10 @@ export default function Index({ title = '已回访工单' }) {
         // MyColumns.CreatedAt(),
         MyColumns.Option({
           render: (_, item: any, index, action) => (
-            <Space key={index}>{tableRender(item, action)}</Space>
+            <Space key={index}>
+              {' '}
+              <WorkOrderShow item={item} title="详情" reload={action?.reload} />
+            </Space>
           ),
         }),
       ]}

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 && (
-              <WorkOrderShow item={item} title="回访" reload={action?.reload} />
-            )}
-          </>
-        ),
-      },
-      'NoVisited',
-    );
-  };
   return (
     <ProTable
       {...MyProTableProps.props}
@@ -86,10 +71,6 @@ export default function Index({ title = '未回访工单' }) {
           title: '位置信息',
           dataIndex: ['asset_house', 'full_name'],
           render: (_, record) => {
-            const locationConfig =
-              HouseWorkOrdersLocationEnum[
-                record.location as keyof typeof HouseWorkOrdersLocationEnum
-              ];
             return (
               <Space>
                 {record?.asset_house?.full_name
@@ -141,7 +122,9 @@ export default function Index({ title = '未回访工单' }) {
         MyColumns.Option({
           width: 120,
           render: (_, item: any, index, action) => (
-            <Space key={index}>{tableRender(item, action)}</Space>
+            <Space key={index}>
+              <WorkOrderShow item={item} title="回访" reload={action?.reload} />
+            </Space>
           ),
         }),
       ]}

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',