Merge pull request 'develop' (#17) from develop into main

Reviewed-on: https://code.juyouwu.cn/pay/pay-admin/pulls/17

src/common/libs/umi/layoutConfig.tsx

@@ -41,9 +41,10 @@ export const LayoutConfig: RuntimeConfig['layout'] = () => {
     avatarProps: {
       render: () => <AvatarProps user={snap.session.user} />,
     },
-    waterMarkProps: {
+    //水印设置
-      content: snap.session.user?.username,
+    // waterMarkProps: {
-    },
+    //   content: snap.session.user?.username,
+    // },
     collapsedButtonRender: false,
     token: {
       bgLayout: '#eef0f3',

src/components/Select.tsx

@@ -585,11 +585,12 @@ export const Selects = {
       formItemProps: { ...(required ? rulesHelper.number : {}) },
 
       request: async (params) => {
+        console.log(params, '1111');
         let res = await Apis.Meter.HouseMeters.List({
-          keywords: params?.KeyWords,
+          ...params,
           asset_projects_id: params?.asset_projects_id,
           charge_standards_id: params?.house_charge_standards_id,
-          ...params,
+          name: params?.keyWords || undefined,
         });
         res?.data?.map((l: any) => {
           l.label = l.id + ':' + l.name;

src/pages/bills/summary/show/$id.tsx

@@ -13,6 +13,7 @@ export default function Show({ title = '账单详情' }) {
   const { id } = useParams<{ id: string }>();
   const [data, setShow] = useState<any>({});
 
+  console.log(data, 'pppp');
   // 注册标签页
   const { addTab } = usePageTabs({
     tabKey: `bill-detail-${id}`,
@@ -43,29 +44,19 @@ export default function Show({ title = '账单详情' }) {
       label: '欠费账单',
       key: '1',
       closable: false,
-      children: (
+      children: <UnpaidBill item={{ ...data, asset_houses_id: id }} />,
-        <UnpaidBill
-          item={{ ...data, asset_houses_id: data?.asset_houses_id }}
-        />
-      ),
     },
     {
       label: '已付账单',
       key: '2',
       closable: false,
-      children: (
+      children: <PaidBill item={{ ...data, asset_houses_id: id }} />,
-        <PaidBill item={{ ...data, asset_houses_id: data?.asset_houses_id }} />
-      ),
     },
     {
       label: '作废账单',
       key: '3',
       closable: false,
-      children: (
+      children: <CancelledBill item={{ ...data, asset_houses_id: id }} />,
-        <CancelledBill
-          item={{ ...data, asset_houses_id: data?.asset_houses_id }}
-        />
-      ),
     },
   ];
 

src/pages/meter/bills/index.tsx

@@ -96,7 +96,7 @@ export default function Index({ title = '仪表账单' }) {
                   isConfirm
                   description="确认执行此任务吗？"
                   onConfirm={() =>
-                    Apis.HouseCharage.HouseChargeTaskDetails.CreateHouseBill({
+                    Apis.Meter.HouseMeterTaskDetails.CreateMeterBill({
                       id: item.id,
                     }).then(() => action?.reload())
                   }

src/pages/meter/tasks/index.tsx

@@ -35,7 +35,7 @@ export default function Index({ title = '仪表任务' }) {
           MyProTableProps.request(params, sort, Apis.Meter.HouseMeterTasks.List)
         }
         toolBarRender={(action) => [
-          <TaskCreate key="Create" reload={action?.reload} title="账单任务" />,
+          <TaskCreate key="Create" reload={action?.reload} title="仪表任务" />,
         ]}
         columns={[
           MyColumns.ID(),

src/pages/meter/tasks/modals/TaskCreate.tsx

@@ -208,6 +208,9 @@ export default function Create(props: MyBetaModalFormProps) {
                               key: 'data_id',
                               colProps: { span: 24 },
                               formItemProps: { ...rulesHelper.text },
+                              fieldProps: {
+                                showSearch: true,
+                              },
                             }),
                           ]
                         : [];

src/pages/moments/classification/modals/Create.tsx

@@ -7,8 +7,9 @@ import {
 import { MomentSelect } from '@/components/MomentCategories';
 import { Apis } from '@/gen/Apis';
 import { BetaSchemaForm } from '@ant-design/pro-components';
-import { message } from 'antd';
+import { Form, message } from 'antd';
 export default function Create(props: MyBetaModalFormProps) {
+  const [form] = Form.useForm();
   return (
     <BetaSchemaForm<ApiTypes.Customer.CustomerMomentCategories.Store>
       {...MyModalFormProps.props}
@@ -16,6 +17,12 @@ export default function Create(props: MyBetaModalFormProps) {
       wrapperCol={{ span: 24 }}
       width="500px"
       trigger={<MyButtons.Create title={`添加${props.title}`} />}
+      key={new Date().getTime()}
+      onOpenChange={(open: any) => {
+        if (open) {
+          form.resetFields(); // 清空表单数据
+        }
+      }}
       onFinish={async (values) =>
         Apis.Customer.CustomerMomentCategories.Store(values)
           .then(() => {