gxwebsoft/gxtyzx-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化网站导航模块

Browse Source
This commit is contained in:
赵忠林
2024-08-23 22:28:24 +08:00
parent 1d81fa9270
commit 13832d9de0
964 changed files with 90774 additions and 31362 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/shop/order/components/orderInfo.vue
+13 -8
View File
@@ -30,10 +30,9 @@
label="订单状态"
:labelStyle="{ width: '90px', color: '#808080' }"
>
<a-tag v-if="form.orderStatus == 0">无</a-tag>
<a-tag v-if="form.orderStatus == 0">未使用</a-tag>
<a-tag v-if="form.orderStatus == 1">已付款</a-tag>
<a-tag v-if="form.orderStatus == 2">已取消</a-tag>
<a-tag v-if="form.orderStatus == 3">取消中</a-tag>
<a-tag v-if="form.orderStatus == 3">已取消</a-tag>
<a-tag v-if="form.orderStatus == 4">退款申请中</a-tag>
<a-tag v-if="form.orderStatus == 5">退款被拒绝</a-tag>
<a-tag v-if="form.orderStatus == 6">退款成功</a-tag>
@@ -80,6 +79,7 @@
:labelStyle="{ width: '90px', color: '#808080' }"
>
<template v-if="form.payStatus == 1">
<a-tag v-if="form.payType == 0">余额支付</a-tag>
<a-tag v-if="form.payType == 1">微信支付</a-tag>
<a-tag v-if="form.payType == 2">积分</a-tag>
<a-tag v-if="form.payType == 3">支付宝</a-tag>
@@ -150,7 +150,7 @@
<script lang="ts" setup>
import { ref, reactive, watch } from 'vue';
import { Form } from 'ant-design-vue';
import { Form, message } from "ant-design-vue";
import { assignObject } from 'ele-admin-pro';
import { Order } from '@/api/shop/order/model';
import { ColumnItem } from 'ele-admin-pro/es/ele-pro-table/types';
@@ -159,6 +159,7 @@
CloseOutlined,
CoffeeOutlined
} from '@ant-design/icons-vue';
import { pageOrderInfo } from '@/api/shop/orderInfo';
const useForm = Form.useForm;
@@ -271,16 +272,16 @@
const columns = ref<ColumnItem[]>([
{
title: '商品名称',
title: '场馆名称',
dataIndex: 'merchantName',
key: 'merchantName'
},
{
title: '购买数量',
title: '场地',
dataIndex: 'fieldName'
},
{
title: '商品规格',
title: '预定信息',
dataIndex: 'comments',
key: 'comments'
},
@@ -365,8 +366,12 @@
(visible) => {
if (visible) {
if (props.data) {
loading.value = false;
loading.value = true;
assignObject(form, props.data);
pageOrderInfo({ oid: form.orderId }).then((res) => {
form.orderInfoList = res?.list;
loading.value = false;
});
loadSteps(props.data);
}
} else {
src/views/shop/order/components/search.vue
+155 -60
View File
@@ -1,43 +1,75 @@
<!-- 搜索表单 -->
<template>
<a-space :size="10" style="flex-wrap: wrap">
<SelectMerchantDown
:placeholder="`选择店铺`"
class="input-item"
v-model:value="where.merchantCode"
@change="search"
/>
<a-input-search
allow-clear
v-model:value="where.keywords"
placeholder="请输入关键词"
@search="search"
@pressEnter="search"
/>
<!-- <a-button @click="getCode">生成支付二维码</a-button>-->
<a-button @click="reset">重置</a-button>
</a-space>
<ele-modal
:width="500"
:visible="showQrcode"
:maskClosable="false"
title="使用微信扫一扫完成支付"
:body-style="{ paddingBottom: '28px' }"
@cancel="closeQrcode"
@ok="closeQrcode"
>
<div class="qrcode">
<ele-qr-code-svg v-if="text" :value="text" :size="200" />
<div class="ele-text-secondary">使用微信扫一扫完成支付</div>
</div>
</ele-modal>
<div class="search">
<a-space class="flex items-center" :size="10" style="flex-wrap: wrap">
<span class="text-gray-400">付款状态</span>
<a-radio-group v-model:value="where.payStatus" @change="search">
<a-radio-button :value="0">未付款</a-radio-button>
<a-radio-button :value="1">已付款</a-radio-button>
</a-radio-group>
<span class="text-gray-400">付款方式</span>
<a-radio-group v-model:value="where.payType" @change="search">
<a-radio-button :value="4">现金</a-radio-button>
<a-radio-button :value="0">余额支付</a-radio-button>
<a-radio-button :value="1">微信支付</a-radio-button>
<a-radio-button :value="2">会员卡</a-radio-button>
</a-radio-group>
<span class="text-gray-400">订单状态</span>
<a-radio-group v-model:value="where.orderStatus" @change="search">
<a-radio-button :value="0">未使用</a-radio-button>
<a-radio-button :value="1">已完成</a-radio-button>
<a-radio-button :value="2">已取消</a-radio-button>
<a-radio-button :value="4">退款中</a-radio-button>
<a-radio-button :value="5">退款被拒</a-radio-button>
<a-radio-button :value="6">退款成功</a-radio-button>
</a-radio-group>
<span class="text-gray-400">开票状态</span>
<a-radio-group v-model:value="where.isInvoice" @change="search">
<a-radio-button :value="0">未开票</a-radio-button>
<a-radio-button :value="1">已开票</a-radio-button>
<a-radio-button :value="2">不能开票</a-radio-button>
</a-radio-group>
</a-space>
<a-space :size="10" class="mt-5" style="flex-wrap: wrap">
<SelectMerchant
:placeholder="`选择场馆`"
class="input-item"
v-model:value="where.merchantName"
@done="chooseMerchantId"
/>
<a-range-picker
v-model:value="dateRange"
@change="search"
value-format="YYYY-MM-DD"
class="ele-fluid"
/>
<a-input-search
allow-clear
placeholder="请输入订单号|编号|手机号"
v-model:value="where.keywords"
@pressEnter="search"
@search="search"
style="width: 380px"
/>
<a-button @click="reset">重置</a-button>
<a-button class="ele-btn-icon" :disabled="loading" @click="handleExport">
<template #icon>
<download-outlined />
</template>
<span>导出订单</span>
</a-button>
</a-space>
</div>
</template>
<script lang="ts" setup>
import { ref, watch } from 'vue';
import useSearch from '@/utils/use-search';
import { OrderParam } from '@/api/shop/order/model';
import { getNativeCode } from '@/api/system/payment';
import { ref, watch } from 'vue';
import { utils, writeFile } from 'xlsx';
import { message } from 'ant-design-vue';
import { Merchant } from '@/api/shop/merchant/model';
import { listOrder } from '@/api/shop/order';
import { Order, OrderParam } from '@/api/shop/order/model';
const props = withDefaults(
defineProps<{
@@ -51,17 +83,40 @@
(e: 'search', where?: OrderParam): void;
(e: 'add'): void;
(e: 'remove'): void;
(e: 'batchMove'): void;
(e: 'advanced'): void;
}>();
// 表单数据
const { where, resetFields } = useSearch<OrderParam>({
keywords: ''
type: 1,
createTimeStart: undefined,
createTimeEnd: undefined,
categoryId: undefined,
week: undefined,
keywords: undefined
});
// 请求状态
const loading = ref(false);
// 日期范围选择
const dateRange = ref<[string, string]>(['', '']);
const orders = ref<Order[] | any[]>();
const xlsFileName = ref<string>();
/* 搜索 */
const search = () => {
emit('search', where);
const [d1, d2] = dateRange.value ?? [];
xlsFileName.value = `${d1}至${d2}`;
// where.createTimeStart = d1 ? d1 + ' 00:00:00' : undefined;
// where.createTimeEnd = d2 ? d2 + ' 00:00:00' : undefined;
emit('search', {
...where
});
};
const chooseMerchantId = (data: Merchant) => {
where.merchantId = data.merchantId;
where.merchantName = data.merchantName;
search();
};
/* 重置 */
@@ -70,19 +125,69 @@
search();
};
// 二维码内容
const text = ref('');
const showQrcode = ref(false);
const closeQrcode = () => {
showQrcode.value = !showQrcode.value;
};
const getCode = () => {
getNativeCode({}).then((data) => {
text.value = String(data);
showQrcode.value = true;
});
// 导出
const handleExport = async () => {
loading.value = true;
const array: (string | number)[][] = [
[
'订单号',
'订单编号',
'姓名',
'电话号码',
'订单信息',
'消费金额',
'实付金额',
'下单日期'
]
];
await listOrder(where)
.then((list) => {
orders.value = list;
orders.value?.forEach((d: Order) => {
array.push([
`${d.orderId}`,
`${d.orderNo}`,
`${d.realName}`,
`${d.phone}`,
`${d.comments}`,
`${d.totalPrice}`,
`${d.payPrice}`,
`${d.createTime}`
]);
});
const sheetName = `订单数据导出`;
const workbook = {
SheetNames: [sheetName],
Sheets: {}
};
const sheet = utils.aoa_to_sheet(array);
workbook.Sheets[sheetName] = sheet;
// 设置列宽
sheet['!cols'] = [
{ wch: 10 },
{ wch: 10 },
{ wch: 10 },
{ wch: 10 },
{ wch: 20 },
{ wch: 40 },
{ wch: 10 }
];
message.loading('正在导出...');
setTimeout(() => {
writeFile(
workbook,
`${
where.createTimeEnd ? xlsFileName.value + '_' : ''
}${sheetName}.xlsx`
);
loading.value = false;
}, 2000);
})
.catch((msg) => {
message.error(msg);
loading.value = false;
})
.finally(() => {});
};
watch(
@@ -90,13 +195,3 @@
() => {}
);
</script>
<style lang="less" scoped>
.qrcode {
display: flex;
justify-content: center;
flex-direction: column;
align-items: center;
padding: 40px 0;
}
</style>
src/views/shop/order/index.vue
+10 -20
View File
@@ -27,6 +27,7 @@
</template>
<template v-if="column.key === 'payType'">
<template v-if="record.payStatus == 1">
<a-tag v-if="record.payType == 0">余额支付</a-tag>
<a-tag v-if="record.payType == 1"
><WechatOutlined class="tag-icon" />微信支付</a-tag
>
@@ -144,15 +145,14 @@
{{ record.orderInfoList }}
</template>
<template v-if="column.key === 'orderStatus'">
<span
v-if="record.orderStatus == 0"
class="ele-text-primary"
></span>
<span v-if="record.orderStatus == 0" class="ele-text-primary"
>未使用</span
>
<span v-if="record.orderStatus == 2" class="ele-text-placeholder"
>已取消</span
>
<span v-if="record.orderStatus == 1" class="ele-text-success"
>已付款</span
>已完成</span
>
<span v-if="record.orderStatus == 3" class="ele-text-placeholder"
>已取消</span
@@ -182,8 +182,6 @@
<template v-if="column.key === 'action'">
<a-space>
<a @click="openEdit(record)">详情</a>
<!-- <a-divider type="vertical" />-->
<!-- <a @click="openEdit(record)">编辑</a>-->
</a-space>
</template>
</template>
@@ -202,10 +200,6 @@
ExclamationCircleOutlined,
CheckOutlined,
CloseOutlined,
ClockCircleOutlined,
IdcardOutlined,
WechatOutlined,
CoffeeOutlined,
AlipayCircleOutlined
} from '@ant-design/icons-vue';
import { EleProTable, toDateString } from 'ele-admin-pro';
@@ -215,14 +209,9 @@
} from 'ele-admin-pro/es/ele-pro-table/types';
import Search from './components/search.vue';
import OrderInfo from './components/orderInfo.vue';
import {
pageOrder,
removeOrder,
removeBatchOrder
} from '@/api/booking/order';
import type { Order, OrderParam } from '@/api/booking/order/model';
import { pageOrder, removeOrder, removeBatchOrder } from '@/api/shop/order';
import type { Order, OrderParam } from '@/api/shop/order/model';
import { formatNumber } from 'ele-admin-pro/es';
import { getMerchantId } from '@/utils/common';
// 表格实例
const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
@@ -249,9 +238,10 @@
if (filters) {
where.status = filters.status;
}
// 商城订单
where.type = 0;
// where.sceneType = 'showOrderGoods';
where.merchantId = getMerchantId();
// where.sceneType = 'showOrderInfo';
// where.merchantId = getMerchantId();
return pageOrder({
...where,
...orders,