diff --git a/src/views/yunxinwei/order/components/order-info.vue b/src/views/yunxinwei/order/components/order-info.vue index 8b2ef84..5c90fea 100644 --- a/src/views/yunxinwei/order/components/order-info.vue +++ b/src/views/yunxinwei/order/components/order-info.vue @@ -258,11 +258,10 @@ - - + @@ -413,7 +412,7 @@ import {listEquipmentOrderGoods} from '@/api/apps/equipment/order/goods'; import {EquipmentOrderGoods} from '@/api/apps/equipment/order/goods/model'; import * as EquipmentApi from '@/api/apps/equipment'; import * as EquipmentRecordApi from '@/api/apps/equipment/record'; -import {ColumnItem} from 'ele-admin-pro/es/ele-pro-table/types'; +import {ColumnItem, DatasourceFunction} from 'ele-admin-pro/es/ele-pro-table/types'; import {listOrder, listOrderPay} from '@/api/order'; import {CopyOutlined} from '@ant-design/icons-vue'; import {EquipmentRecord} from '@/api/apps/equipment/record/model'; @@ -708,6 +707,7 @@ const getRenewOrder = () => { if (order.orderId > 28798) { listOrderPay({ rentOrderId: order.orderId, + payStatus: 20, sort: ' create_time asc' }).then((data) => { renewOrderList.value = data; @@ -726,14 +726,31 @@ const getRenewOrder = () => { }; -const getEquipmentRecordList = () => { - EquipmentRecordApi.listEquipmentRecord({ - orderId: order.orderId, - userId: order.userId - }).then((data) => { - equipmentRecordList.value = data; - }); -}; +// const getEquipmentRecordList = () => { +// EquipmentRecordApi.pageEquipmentRecord({ +// orderId: order.orderId, +// userId: order.userId +// }).then((data) => { + +// }); +// }; + +// 表格数据源 + const datasource3: DatasourceFunction = ({ + page, + limit, + where, + orders + }) => { + where.orderId = order.orderId + where.userId = order.userId + return EquipmentRecordApi.pageEquipmentRecord({ + ...where, + ...orders, + page, + limit + }); + }; const expirationDay = (order) => { const setTime = new Date(order.expirationTime); @@ -777,7 +794,7 @@ watch( getEquipmentOrderGoods(); getRenewOrder(); getEquipment(); - getEquipmentRecordList(); + // getEquipmentRecordList(); } } else { resetFields(); diff --git a/src/views/yunxinwei/withdraw/index.vue b/src/views/yunxinwei/withdraw/index.vue index f24e651..bad9402 100644 --- a/src/views/yunxinwei/withdraw/index.vue +++ b/src/views/yunxinwei/withdraw/index.vue @@ -148,10 +148,15 @@ sorter: true }, { - title: '用户', + title: '提现用户', dataIndex: 'nickname', key: 'nickname' }, + { + title: '手机号', + dataIndex: 'userPhone', + key: 'userPhone' + }, { title: '收入卡类型', dataIndex: 'cardTypeDis',