+ {record.attachments.map((item: any, index: number) => {
+ if (item.type && item.type.includes('image')) {
+ return (
+
+ );
+ },
+ },
+ {
+ title: '创建时间',
+ dataIndex: 'created_at',
+ valueType: 'dateTime',
+ search: false,
+ width: 160,
+ },
+ MyColumns.UpdatedAt(),
+ MyColumns.Option({
+ render: (_, item: any, index, action) => (
+
+ {text}
+
+ ),
+ },
+ {
+ title: '附件',
+ dataIndex: 'attachments',
+ search: false,
+ render: (_, record) => {
+ if (
+ !Array.isArray(record.attachments) ||
+ record.attachments.length === 0
+ ) {
+ return '无附件';
+ }
+ return (
+
+ {record.attachments.map((item: any, index: number) => {
+ if (item.type && item.type.includes('image')) {
+ return (
+
+ );
+ },
+ },
+ MyColumns.EnumTag({
+ title: '分配状态',
+ dataIndex: 'assign_status',
+ valueEnum: HouseWorkOrdersAssignStatusEnum,
+ }),
+ MyColumns.EnumTag({
+ title: '优先级',
+ dataIndex: 'level',
+ valueEnum: HouseWorkOrdersLevelEnum,
+ }),
+ {
+ title: '处理人',
+ dataIndex: ['assign_employee', 'name'],
+ search: false,
+ render: (_, record) => {
+ return `${record?.assign_employee?.name || ''}-${
+ record?.assign_employee?.phone || ''
+ }`;
+ },
+ },
+ MyColumns.CreatedAt(),
+ MyColumns.Option({
+ render: (_, item: any, index, action) => (
+
+ {record.attachments.map((item: any, index: number) => {
+ if (item.type && item.type.includes('image')) {
+ return (
+
+ );
+ },
+ },
+ ]}
+ />
+ {/* 员工头像
-
员工的名字
- 此处显示“发送文案”输入的文案
+ 员工名字
+ 此处显示“发送文案”
@@ -31,8 +31,8 @@ export default function infoPreview(props: MyBetaModalFormProps) {
员工头像
-
员工的名字
- 此处显示“发送文案”输入的文案
+ 员工名字
+ 此处显示“发送文案”
@@ -55,9 +55,9 @@ export default function infoPreview(props: MyBetaModalFormProps) {
-
封面图
+ 封面
- 此处显示“链接标题”输入的文案，文案字数多时可以换行显示
+ 此处显示“链接标题”，字数较多时自动换行显示
{i?.title}
+
+
-
+
{...MyModalFormProps.props}
title={`添加${props.title}`}
wrapperCol={{ span: 24 }}
- width="800px"
+ // width="1200px"
form={form}
layoutType="Form"
trigger={
- //
- // Apis.Common.Admins.Delete({ id: item.id }).then(() =>
- // action?.reload(),
- // )
- // }
- // />
- //
- // ),
- // }),
+ MyColumns.Option({
+ render: (_, item: any, index, action) => (
+
+
+ Apis.HouseOrder.HouseOrders.Delete({ id: item.id }).then(
+ () => action?.reload(),
+ )
+ }
+ />
+
+ ),
+ }),
]}
/>
diff --git a/src/pages/order/list/modals/Payments.tsx b/src/pages/order/list/modals/Payments.tsx
new file mode 100644
index 0000000..7038b7e
--- /dev/null
+++ b/src/pages/order/list/modals/Payments.tsx
@@ -0,0 +1,79 @@
+import { MyBetaModalFormProps, MyColumns, MyProTableProps } from '@/common';
+import { MyModal } from '@/components/MyModal';
+import { Apis } from '@/gen/Apis';
+import {
+ HouseOrdersOrderStatusEnum,
+ HouseOrdersPaymentMethodEnum,
+} from '@/gen/Enums';
+import { ProTable } from '@ant-design/pro-components';
+import { useNavigate } from '@umijs/max';
+
+export default function TaskShow(props: MyBetaModalFormProps) {
+ const navigate = useNavigate();
+ return (
+
+ MyProTableProps.request(
+ { ...params, house_orders_id: props?.item?.id },
+ sort,
+ Apis.HouseOrder.HouseOrderPayments.List,
+ )
+ }
+ // options={false}
+ columns={[
+ MyColumns.ID(),
+ MyColumns.EnumTag({
+ title: '支付状态',
+ dataIndex: 'payment_status',
+ valueEnum: HouseOrdersOrderStatusEnum,
+ }),
+ MyColumns.EnumTag({
+ title: '支付方式',
+ dataIndex: 'payment_method',
+ valueEnum: HouseOrdersPaymentMethodEnum,
+ }),
+ {
+ title: '账单金额',
+ dataIndex: 'amount',
+ render: (value: any) => `${value / 100}元`,
+ search: false,
+ },
+ {
+ title: '实际金额',
+ dataIndex: 'actual_amount',
+ render: (value: any) => `${value / 100}元`,
+ search: false,
+ },
+
+ {
+ title: '支付人',
+ render: (record: any) =>
+ `${record?.customer?.name || ''}${
+ record?.customer?.phone || ''
+ }`,
+
+ search: false,
+ },
+ {
+ title: '备注',
+ dataIndex: 'remark',
+ search: false,
+ },
+ {
+ title: '支付单号',
+ dataIndex: 'payment_no',
+ search: false,
+ },
+ MyColumns.UpdatedAt(),
+ ]}
+ />
+ }
+ />
+ );
+}
diff --git a/src/pages/order/payments/index.tsx b/src/pages/order/pay/index.tsx
similarity index 57%
rename from src/pages/order/payments/index.tsx
rename to src/pages/order/pay/index.tsx
index e29c361..af1a54b 100644
--- a/src/pages/order/payments/index.tsx
+++ b/src/pages/order/pay/index.tsx
@@ -5,6 +5,10 @@ import {
usePageTabs,
} from '@/common';
import { Apis } from '@/gen/Apis';
+import {
+ HouseOrdersOrderStatusEnum,
+ HouseOrdersPaymentMethodEnum,
+} from '@/gen/Enums';
import { ProTable } from '@ant-design/pro-components';
export default function Index({ title = '支付明细' }) {
@@ -18,7 +22,7 @@ export default function Index({ title = '支付明细' }) {
- //
- // Apis.Common.Admins.Delete({ id: item.id }).then(() =>
- // action?.reload(),
- // )
- // }
- // />
- //
- // ),
- // }),
+ MyColumns.UpdatedAt(),
]}
/>
diff --git a/src/pages/work_order/index.tsx b/src/pages/work_order/index.tsx
index ecf4225..7095fa8 100644
--- a/src/pages/work_order/index.tsx
+++ b/src/pages/work_order/index.tsx
@@ -41,7 +41,13 @@ 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,
)