fix趋势图,订单导出

This commit is contained in:
messi
2024-08-27 17:11:27 +08:00
parent c0067c7db1
commit fadae0d7ac
4 changed files with 48 additions and 20 deletions

View File

@@ -752,7 +752,8 @@ const getRenewOrder = () => {
listOrderPay({
rentOrderId: order.orderId,
payStatus: 20,
sort: ' create_time asc'
sort: ' create_time asc',
limit:1
}).then((data) => {
renewOrderList.value = data;
loading.value = false;
@@ -762,6 +763,7 @@ const getRenewOrder = () => {
rentOrderId: order.orderId,
payStatus: 20,
sort: 'create_time asc',
limit:1
}).then((data) => {
renewOrderList.value = data;
loading.value = false;
@@ -773,7 +775,8 @@ const getRenewOrder = () => {
const getEquipmentRecordList = () => {
EquipmentRecordApi.pageEquipmentRecord({
orderId: order.orderId,
userId: order.userId
userId: order.userId,
limit:1
}).then((data) => {
EquipmentRecordList.value = data.list;
});

View File

@@ -517,12 +517,14 @@
const array: (string | number)[][] = [
[
'订单号',
'下单日期',
'电池型号',
'电池编号',
'所属商户',
'到期时间',
'剩余天数',
'买家',
'客户实名',
'订单金额',
'交易状态'
]
@@ -533,17 +535,37 @@
var equipmentCode = d.equipment ? d.equipment.equipmentCode : '';
var orderStatus = '';
if (d.payStatus == 10) {
orderStatus = '待付款';
} else {
if (d.receiptStatus == 10) {
orderStatus = '待收货';
}
if (d.receiptStatus == 20) {
orderStatus = '已收货';
}
if (d.receiptStatus == 21) {
orderStatus = '退租中';
}
if (d.receiptStatus == 30) {
orderStatus = '已退租';
}
}
array.push([
`${d.orderNo}`,
`${d.createTime}`,
`${d.equipmentGoods.batteryModel}`,
`${equipmentCode}`,
`${d.merchantName}`,
`${d.expirationTime}`,
`${d.expirationDay}`,
`${d.restDay}`,
`${username}`,
`${d.totalPrice}`,
`${d.realName}`,
`${d.totalPayPrice}`,
`${d.orderStatus}`
`${orderStatus}`
]);
});
const sheetName = '设备列表';