Merge branch 'develop' of ssh://code.juyouwu.cn:2222/pay/pay-admin into develop

* 'develop' of ssh://code.juyouwu.cn:2222/pay/pay-admin:
  fix： 优化页面

.umirc.ts

@@ -15,11 +15,11 @@ export default defineConfig({
   proxy: {
     '/api/': {
       // target: 'http://yt:8003',
-      // target: 'http://10.39.13.80:8001',
       // target: 'http://10.39.13.78:8001/',
-      target: 'https://test-admin.linyikj.com.cn/',
+      // target: 'https://test-admin.linyikj.com.cn/',
-      // target: 'http://we6f9c65.natappfree.cc',
+
-      // target: 'https://loanos-test.nchl.net/',
+      target: 'https://admin.linyikj.com.cn/',
+
       changeOrigin: true,
       pathRewrite: { '^': '' },
     },

src/pages/asset/houses/index.tsx

@@ -12,7 +12,7 @@ import {
 } from '@/gen/Enums';
 import { ProCard, ProTable } from '@ant-design/pro-components';
 import { useNavigate } from '@umijs/max';
-import { message, Space, Typography } from 'antd';
+import { Alert, message, Space, Typography } from 'antd';
 import { useCallback, useMemo, useRef, useState } from 'react';
 import BuildingsCreate from './modals/BuildingsCreate';
 import AssetBuildingsUpdate from './modals/BuildingsUpdate';
@@ -165,7 +165,7 @@ export default function Index({ title = '项目列表' }) {
             <MyButtons.View
               title="配置"
               onClick={() => {
-                navigate(`/asset/id/${item.id}`);
+                navigate(`/asset/list/show/${item.id}`);
               }}
             />
           </Space>
@@ -301,14 +301,14 @@ export default function Index({ title = '项目列表' }) {
   return (
     <MyPageContainer title={title}>
       <ProCard
-      // title={
+        title={
-      //   <Alert
+          <Alert
-      //     message="操作提示：在楼栋下添加单元，在单元下添加房屋！"
+            message="操作提示：可在项目中添加楼栋，在楼栋中添加单元，在单元中添加房屋！"
-      //     type="info"
+            type="info"
-      //     showIcon
+            showIcon
-      //     style={{ margin: 0 }}
+            style={{ margin: 0 }}
-      //   />
+          />
-      // }
+        }
       >
         <Space align="start" size="large" style={{ width: '100%' }}>
           <div style={{ flex: 1 }}>
@@ -326,9 +326,9 @@ export default function Index({ title = '项目列表' }) {
               //   collapsed: false,
               //   collapseRender: false,
               // }}
-              actionRef={actionBuildingsRef}
+              actionRef={actionAssetRef}
               rowClassName={(record: any) => {
-                return selectedBuilding?.id === record?.id
+                return selectedAsset?.id === record?.id
                   ? 'ant-table-row-selected'
                   : '';
               }}

src/pages/asset/list/components/ConvenienceServices.tsx

@@ -4,8 +4,8 @@ import { ConvenienceServicesTypeEnum } from '@/gen/Enums';
 import { ProTable } from '@ant-design/pro-components';
 import { Space } from 'antd';
 import { useEffect, useRef } from 'react';
-import ServiceCreate from '../../convenience_services/modals/ServiceCreate';
+import ServiceCreate from '../../services/modals/ServiceCreate';
-import ServiceUpdate from '../../convenience_services/modals/ServiceUpdate';
+import ServiceUpdate from '../../services/modals/ServiceUpdate';
 
 export default function Index({ ...rest }) {
   const actionLooks = useRef<any>();

src/pages/company/accounts/index.tsx

@@ -52,7 +52,7 @@ export default function Index({ title = '账号管理' }) {
             search: false,
           },
           {
-            title: '收款账号名称',
+            title: '收款户名',
             dataIndex: 'company_name',
           },
           {

src/pages/company/accounts/modals/ReceiptAccountCreate.tsx

@@ -54,7 +54,7 @@ export default function Create(props: MyBetaModalFormProps) {
             ]),
         {
           key: 'company_name',
-          title: '收款账户名称',
+          title: '收款户名',
           colProps: { span: 24 },
           formItemProps: { ...rulesHelper.text },
         },

src/pages/company/accounts/modals/ReceiptAccountUpdate.tsx

@@ -43,7 +43,7 @@ export default function Update(props: MyBetaModalFormProps) {
       columns={[
         {
           key: 'company_name',
-          title: '收款账户名称',
+          title: '收款户名',
           colProps: { span: 24 },
           formItemProps: { ...rulesHelper.text },
         },

src/pages/company/list/index.tsx

@@ -10,8 +10,8 @@ import { ProTable } from '@ant-design/pro-components';
 import { useNavigate } from '@umijs/max';
 import { Space } from 'antd';
 import CompanyCreate from './modals/CompanyCreate';
+import CompanyShow from './modals/CompanyShow';
 import CompanyUpdate from './modals/CompanyUpdate';
-import ComponentsInfo from './table/ComponentsInfo';
 
 export default function Index({ title = '机构列表' }) {
   const navigate = useNavigate();
@@ -39,15 +39,15 @@ export default function Index({ title = '机构列表' }) {
         ]}
         columns={[
           MyColumns.ID(),
+          {
+            title: '机构名称',
+            dataIndex: 'name',
+          },
           {
             title: '机构简称',
             dataIndex: 'short_name',
             search: false,
           },
-          {
-            title: '企业名称',
-            dataIndex: 'name',
-          },
           // MyColumns.EnumTag({
           //   title: '类型',
           //   dataIndex: 'merchant_type',
@@ -63,11 +63,7 @@ export default function Index({ title = '机构列表' }) {
           MyColumns.Option({
             render: (_, item: any, index, action) => (
               <Space key={index}>
-                <ComponentsInfo
+                <CompanyShow item={item} title="查看" reload={action?.reload} />
-                  item={item}
-                  title="查看"
-                  reload={action?.reload}
-                />
                 <CompanyUpdate
                   item={{ ...item, type: 'link' }}
                   title="机构"

src/pages/company/list/modals/CompanyCreate.tsx

@@ -40,15 +40,15 @@ export default function Create(props: MyBetaModalFormProps) {
       }
       columns={[
         {
-          key: 'short_name',
+          key: 'name',
-          title: '机构简称',
+          title: '机构名称',
-          colProps: { span: 6 },
+          colProps: { span: 14 },
           formItemProps: { ...rulesHelper.text },
         },
         {
-          key: 'name',
+          key: 'short_name',
-          title: '企业名称',
+          title: '机构简称',
-          colProps: { span: 18 },
+          colProps: { span: 10 },
           formItemProps: { ...rulesHelper.text },
         },
         {

src/pages/company/list/modals/CompanyShow.tsx

@@ -1,6 +1,5 @@
-import { MyBetaModalFormProps, renderTextHelper } from '@/common';
+import { MyBetaModalFormProps } from '@/common';
 import { MyModal } from '@/components/MyModal';
-import { CompaniesMerchantTypeEnum } from '@/gen/Enums';
 import { ProCard, ProDescriptions } from '@ant-design/pro-components';
 import { Space } from 'antd';
 
@@ -9,14 +8,11 @@ export default function info(props: MyBetaModalFormProps) {
     <MyModal
       title={props.title || '查看'}
       type={props.item?.type || 'primary'}
-      width="1000px"
+      width="800px"
       node={
         <Space direction="vertical" style={{ width: '100%' }}>
           <ProCard extra={props.extra}>
-            <ProDescriptions bordered>
+            <ProDescriptions bordered column={2}>
-              <ProDescriptions.Item label="机构简称">
-                {props?.item?.short_name}
-              </ProDescriptions.Item>
               <ProDescriptions.Item label="机构名称" span={2}>
                 <Space>
                   {props?.item?.name}
@@ -27,28 +23,28 @@ export default function info(props: MyBetaModalFormProps) {
                   /> */}
                 </Space>
               </ProDescriptions.Item>
-              <ProDescriptions.Item label="商户类型">
+              <ProDescriptions.Item label="机构简称">
+                {props?.item?.short_name}
+              </ProDescriptions.Item>
+              {/* <ProDescriptions.Item label="商户类型">
                 <renderTextHelper.Tag
                   Enums={CompaniesMerchantTypeEnum}
                   value={props?.item?.merchant_type}
                   key="merchant_type"
                 />
-              </ProDescriptions.Item>
+              </ProDescriptions.Item> */}
 
               <ProDescriptions.Item label="营业执照号" span={2}>
                 {props?.item?.business_license_number}
               </ProDescriptions.Item>
 
-              <ProDescriptions.Item label="联系人姓名">
+              <ProDescriptions.Item label="联系人">
-                {props?.item?.contact_name}
+                {props?.item?.contact_name}: {props?.item?.contact_phone}
               </ProDescriptions.Item>
-              <ProDescriptions.Item label="联系人手机">
+              <ProDescriptions.Item label="联系邮箱">
-                {props?.item?.contact_phone}
-              </ProDescriptions.Item>
-              <ProDescriptions.Item label="联系人邮箱">
                 {props?.item?.contact_email}
               </ProDescriptions.Item>
-              <ProDescriptions.Item label="机构地址">
+              <ProDescriptions.Item label="机构地址" span={2}>
                 {props?.item?.province || ''}
                 {props?.item?.city || ''}
                 {props?.item?.district || ''}

src/pages/company/list/modals/CompanyUpdate.tsx

@@ -45,15 +45,15 @@ export default function Update(props: MyBetaModalFormProps) {
       }
       columns={[
         {
-          key: 'short_name',
+          key: 'name',
-          title: '机构简称',
+          title: '机构名称',
-          colProps: { span: 6 },
+          colProps: { span: 14 },
           formItemProps: { ...rulesHelper.text },
         },
         {
-          key: 'name',
+          key: 'short_name',
-          title: '企业名称',
+          title: '机构简称',
-          colProps: { span: 18 },
+          colProps: { span: 10 },
           formItemProps: { ...rulesHelper.text },
         },
         {

src/pages/company/list/show/$id.tsx

@@ -5,11 +5,11 @@ import { useParams } from '@umijs/max';
 import { Space, Tabs } from 'antd';
 import { useEffect, useState } from 'react';
 
+import ComponentsInfo from '../modals/CompanyShow';
 import CompanyUpdate from '../modals/CompanyUpdate';
 import CompanyApps from '../table/Apps';
 import Assets from '../table/Assets';
 import Brands from '../table/Brands';
-import ComponentsInfo from '../table/ComponentsInfo';
 import Employees from '../table/Employees';
 import Organizations from '../table/Organizations';
 import Positions from '../table/Positions';

src/pages/company/list/table/Brands.tsx

@@ -30,11 +30,10 @@ export default function PropertyBrands(props: MyBetaModalFormProps) {
             title="品牌"
           />,
         ]}
-        // search={false}
+        search={false}
         // options={false}
         columns={[
           MyColumns.ID(),
-
           {
             title: '物业名称',
             dataIndex: 'name',

src/pages/company/list/table/ReceiptAccounts.tsx

@@ -7,8 +7,8 @@ import {
 import { Apis } from '@/gen/Apis';
 import { ProTable } from '@ant-design/pro-components';
 import { Space } from 'antd';
-import ReceiptAccountCreate from '../../receipt_accounts/modals/ReceiptAccountCreate';
+import ReceiptAccountCreate from '../../accounts/modals/ReceiptAccountCreate';
-import ReceiptAccountUpdate from '../../receipt_accounts/modals/ReceiptAccountUpdate';
+import ReceiptAccountUpdate from '../../accounts/modals/ReceiptAccountUpdate';
 
 export default function ReceiptAccounts(props: MyBetaModalFormProps) {
   return (

src/pages/company/organizations/index.tsx

@@ -43,7 +43,7 @@ export default function Index({ title = '组织列表' }) {
           <OrganizationCreate
             key="Create"
             reload={action?.reload}
-            title={title}
+            title={'组织'}
           />,
         ]}
         columns={[

src/pages/house_charge_tasks/index.tsx

@@ -46,12 +46,21 @@ export default function Index({ title = '任务结果' }) {
             dataIndex: 'house_charge_tasks_id',
             search: false,
           },
-          MyColumns.ID(),
           MyColumns.EnumTag({
             title: '任务状态',
             dataIndex: 'status',
             valueEnum: HouseChargeTaskDetailsStatusEnum,
           }),
+          {
+            title: '账单ID',
+            dataIndex: 'id',
+            search: false,
+          },
+          {
+            title: '关联对象',
+            dataIndex: 'full_name',
+            search: false,
+          },
           {
             title: '账单月份',
             render: (_, record) => {
@@ -60,15 +69,15 @@ export default function Index({ title = '任务结果' }) {
           },
           {
             title: '计费开始日期',
-            dataIndex: 'start_date',
+            dataIndex: ['house_charge_task', 'start_date'],
             search: false,
           },
           {
             title: '计费结束日期',
-            dataIndex: 'end_date',
+            dataIndex: ['house_charge_task', 'end_date'],
             search: false,
           },
-          MyColumns.UpdatedAt(),
+          // MyColumns.UpdatedAt(),
           MyColumns.CreatedAt(),
           MyColumns.Option({
             render: (_, item: any, index, action) => (

src/pages/house_order/index.tsx

@@ -60,7 +60,7 @@ export default function Index({ title = '支付明细' }) {
           }),
 
           {
-            title: '订单编号',
+            title: '收款单号',
             dataIndex: 'order_code',
             search: false,
           },

src/pages/system/sys_roles/index.tsx

@@ -37,7 +37,7 @@ export default function Index({ title = '角色' }) {
         ]}
         columns={[
           MyColumns.ID(),
-          { dataIndex: 'guard_name', title: 'guard_name', search: false },
+          // { dataIndex: 'guard_name', title: 'guard_name', search: false },
           { dataIndex: 'name', title: '名称' },
           {
             title: '颜色',