.umirc.ts

@@ -15,8 +15,8 @@ export default defineConfig({
   proxy: {
     '/api/': {
       // target: 'http://yt:8003',
-      target: 'http://10.39.13.78:8001/',
+      // target: 'http://10.39.13.78:8001/',
-      // target: 'https://test-admin.linyikj.com.cn/',
+      target: 'https://test-admin.linyikj.com.cn/',
       // target: 'https://admin.linyikj.com.cn/',
       // target: 'http://c789629c.natappfree.cc',
 

src/pages/bills/list/modals/BillCreate.tsx

@@ -201,6 +201,12 @@ export default function Create(props: MyBetaModalFormProps) {
                     formItemProps: { ...rulesHelper.number },
                     fieldProps: {
                       showSearch: true,
+                      onChange: () => {
+                        form.setFieldsValue({
+                          asset_units_id: undefined,
+                          asset_floors_id: undefined,
+                        });
+                      },
                     },
                   }),
                 ],

src/pages/bills/list/modals/BillUpdate.tsx

@@ -147,6 +147,12 @@ export default function Update(props: MyBetaModalFormProps) {
                     formItemProps: { ...rulesHelper.number },
                     fieldProps: {
                       showSearch: true,
+                      onChange: () => {
+                        form.setFieldsValue({
+                          asset_units_id: undefined,
+                          asset_floors_id: undefined,
+                        });
+                      },
                     },
                   }),
                 ],

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

@@ -1,7 +1,6 @@
 import { MyButtons, MyColumns, MyProTableProps } from '@/common';
 import { Apis } from '@/gen/Apis';
 
-import { HouseBillsTypeEnum } from '@/gen/Enums';
 import { ProTable } from '@ant-design/pro-components';
 import { Space } from 'antd';
 import { useEffect, useRef } from 'react';
@@ -29,15 +28,11 @@ export default function Index({ ...rest }) {
           )
         }
         toolBarRender={(action) => [
-          (rest?.item.charge_type === HouseBillsTypeEnum.PropertyFee.value ||
+          <ChargeStandardHasHouse
-            rest?.item.charge_type ===
+            item={rest.item}
-              HouseBillsTypeEnum.MaintenanceFund.value) && (
+            reload={action?.reload}
-            <ChargeStandardHasHouse
+            title={'绑房'}
-              item={rest.item}
+          />,
-              reload={action?.reload}
-              title={'绑房'}
-            />
-          ),
         ]}
         search={false}
         columns={[

src/pages/charge/standard/index.tsx

@@ -69,11 +69,6 @@ export default function Index({ title = '收费标准' }) {
             dataIndex: 'name',
             search: false,
           },
-          {
-            title: '关联房屋数',
-            dataIndex: 'house_charge_has_houses_count',
-            search: false,
-          },
           MyColumns.EnumTag({
             title: '收费项',
             dataIndex: 'charge_type',
@@ -153,16 +148,11 @@ export default function Index({ title = '收费标准' }) {
                   reload={action?.reload}
                   title="编辑"
                 />
-                {(item.charge_type === HouseBillsTypeEnum.PropertyFee.value ||
+                <ChargeStandardHasHouse
-                  item.charge_type ===
+                  item={item}
-                    HouseBillsTypeEnum.MaintenanceFund.value) && (
+                  reload={action?.reload}
-                  <ChargeStandardHasHouse
+                  title={'绑房'}
-                    item={item}
+                />
-                    reload={action?.reload}
-                    title={'绑房'}
-                  />
-                )}
-
                 <MyButtons.Delete
                   onConfirm={() =>
                     Apis.HouseCharage.HouseChargeStandards.Delete({

src/pages/charge/tasks/index.tsx

@@ -55,6 +55,11 @@ export default function Index({ title = '账单任务' }) {
             dataIndex: ['asset_project', 'name'],
             search: false,
           },
+          {
+            title: '任务ID',
+            dataIndex: 'id',
+            search: false,
+          },
           MyColumns.EnumTag({
             title: '创建类型',
             dataIndex: 'type',

src/pages/complaint/index.tsx

@@ -39,10 +39,7 @@ export default function Index({ title = '投诉列表' }) {
         {...MyProTableProps.props}
         request={async (params, sort) =>
           MyProTableProps.request(
-            {
+            { ...params, type: HouseWorkOrdersTypeEnum.Complaint.value },
-              ...params,
-              type: [HouseWorkOrdersTypeEnum.Complaint.value],
-            },
             sort,
             Apis.WorkOrder.HouseWorkOrders.List,
           )

src/pages/meter/list/index.tsx

@@ -64,16 +64,6 @@ export default function Index({ title = '仪表管理' }) {
         ]}
         columns={[
           MyColumns.ID(),
-          {
-            title: '机构',
-            dataIndex: ['company', 'name'],
-            search: false,
-          },
-          {
-            title: '项目',
-            dataIndex: ['asset_project', 'name'],
-            search: false,
-          },
           MyColumns.EnumTag({
             title: '类型',
             dataIndex: 'meter_type',
@@ -95,11 +85,6 @@ export default function Index({ title = '仪表管理' }) {
             dataIndex: ['charge_standard', 'name'],
             search: false,
           },
-          {
-            title: '关联房屋数',
-            dataIndex: 'house_meter_has_houses_count',
-            search: false,
-          },
           {
             title: '初始抄表读数',
             dataIndex: 'initial_value',
@@ -120,7 +105,6 @@ export default function Index({ title = '仪表管理' }) {
             dataIndex: 'latest_time',
             search: false,
           },
-
           {
             title: '备注',
             dataIndex: 'remark',

src/pages/order/pay/index.tsx

@@ -47,7 +47,11 @@ export default function Index({ title = '支付明细' }) {
         // ]}
         columns={[
           MyColumns.ID(),
-
+          {
+            title: '支付订单',
+            dataIndex: 'house_orders_id',
+            search: false,
+          },
           MyColumns.EnumTag({
             title: '支付状态',
             dataIndex: 'payment_status',

src/pages/work_order/index.tsx

@@ -41,13 +41,7 @@ export default function Index({ title = '工单管理' }) {
         {...MyProTableProps.props}
         request={async (params, sort) =>
           MyProTableProps.request(
-            {
+            params,
-              ...params,
-              type: [
-                HouseWorkOrdersTypeEnum.Repair.value,
-                HouseWorkOrdersTypeEnum.Incident.value,
-              ],
-            },
             sort,
             Apis.WorkOrder.HouseWorkOrders.List,
           )