This commit is contained in:
messi
2024-08-21 09:11:12 +08:00
parent 6bf19c391d
commit b5e5a19b69
4 changed files with 596 additions and 1 deletions

View File

@@ -258,7 +258,7 @@
</a-card> </a-card>
<a-card title="换电记录" class="order-card"> <a-card title="换电记录" class="order-card">
<a-spin :spinning="loading"> <a-spin :spinning="loading">
<a-table <a-table
:data-source="EquipmentRecordList" :data-source="EquipmentRecordList"
:columns="columns3" :columns="columns3"

View File

@@ -0,0 +1,150 @@
<!-- 用户编辑弹窗 -->
<template>
<ele-modal
:width="500"
:visible="visible"
:confirm-loading="loading"
:maskClosable="false"
:maxable="maxable"
:title="isUpdate ? '发货' : '发货'"
:body-style="{ paddingBottom: '24px' }"
@update:visible="updateVisible"
@ok="save"
>
<a-form>
<a-form-item label="审核状态">
<a-radio-group
v-model:value="form.auditStatus"
>
<a-radio :value="20">审核通过</a-radio>
<a-radio :value="30">驳回</a-radio>
</a-radio-group>
</a-form-item>
<a-form-item label="返还押金" v-if="form.auditStatus === 20" >
<a-input-number :min="0" :max="9999999" v-model:value="form.refundMoney"/>
<span style="marginleft: 10px"> </span>
</a-form-item>
<a-alert v-if="form.auditStatus === 20" message="审核通过后,订单将变更为已退租状态,并且电池设备自动解绑。" type="warning" />
<a-form-item label="驳回原因" v-if="form.auditStatus === 30">
<a-textarea
:rows="4"
:maxlength="200"
placeholder="仅在驳回时填写"
v-model:value="form.refuseDesc"
/>
</a-form-item>
</a-form>
</ele-modal>
</template>
<script lang="ts" setup>
import {ref, reactive, watch, computed} from 'vue';
import { Form, message } from 'ant-design-vue';
import { useUserStore } from '@/store/modules/user';
import { OrderRefund } from "@/api/order/refund/model";
import { updateOrderRefund } from "@/api/order/refund";
import {assignObject, toDateString} from "ele-admin-pro";
const userStore = useUserStore();
// 当前用户信息
const loginUser = computed(() => userStore.info ?? {});
// 是否是修改
const isUpdate = ref(false);
const useForm = Form.useForm;
const props = defineProps<{
// 弹窗是否打开
visible: boolean;
// 修改回显的数据
data?: OrderRefund;
}>();
const emit = defineEmits<{
(e: 'done'): void;
(e: 'update:visible', visible: boolean): void;
}>();
// 提交状态
const loading = ref(false);
// 是否显示最大化切换按钮
const maxable = ref(true);
// 用户信息
const form = reactive<OrderRefund>({
orderRefundId: undefined,
auditStatus: 20,
orderId: undefined,
refuseDesc: '',
tenantId: undefined
});
// 已上传数据, 可赋初始值用于回显
const images = ref(<any>[]);
/* 更新visible */
const updateVisible = (value: boolean) => {
emit('update:visible', value);
};
// 表单验证规则
const rules = reactive({
equipmentCode: [
{
required: true,
type: 'string',
message: '请输入设备编码',
trigger: 'blur'
}
]
});
const { resetFields, validate, validateInfos } = useForm(form, rules);
/* 保存编辑 */
const save = () => {
validate()
.then(() => {
loading.value = true;
// 去除空格
const data = {
...form,
orderRefundId: props.data?.orderRefundId,
orderId: props.data?.orderId,
tenantId: props.data?.tenantId,
updateTime:toDateString(new Date(), 'yyyy-MM-dd HH:mm:ss'),
};
// 转字符串
updateOrderRefund(data)
.then((msg) => {
loading.value = false;
message.success(msg);
updateVisible(false);
emit('done');
})
.catch((e) => {
loading.value = false;
message.error(e.message);
});
})
.catch(() => {});
};
watch(
() => props.visible,
(visible) => {
if (visible) {
if (props.data) {
loading.value = false;
if(props.data.auditStatus != 10){
assignObject(form, props.data);
}
isUpdate.value = true;
} else {
isUpdate.value = false;
}
} else {
resetFields();
}
}
);
</script>
<style lang="less"></style>

View File

@@ -0,0 +1,140 @@
<!-- 搜索表单 -->
<template>
<a-space :size="10" style="flex-wrap: wrap">
<!-- <a-button-->
<!-- danger-->
<!-- type="primary"-->
<!-- class="ele-btn-icon"-->
<!-- :disabled="selection.length === 0"-->
<!-- @click="removeBatch"-->
<!-- >-->
<!-- <template #icon>-->
<!-- <delete-outlined />-->
<!-- </template>-->
<!-- <span>批量删除</span>-->
<!-- </a-button>-->
<a-input-search
allow-clear
placeholder="请输入关键词"
v-model:value="searchText"
@pressEnter="search"
@search="search"
/>
</a-space>
</template>
<script lang="ts" setup>
import {
PlusOutlined,
EditOutlined,
SearchOutlined,
DeleteOutlined,
UpSquareOutlined,
DownSquareOutlined
} from '@ant-design/icons-vue';
import useSearch from '@/utils/use-search';
import { ref, watch } from 'vue';
import { OrderParam } from '@/api/order/model';
const props = withDefaults(
defineProps<{
// 选中的角色
selection?: [];
}>(),
{}
);
const emit = defineEmits<{
(e: 'search', where?: OrderParam): void;
(e: 'add'): void;
(e: 'remove'): void;
(e: 'advanced'): void;
}>();
// 表单数据
const { where, resetFields } = useSearch<OrderParam>({
orderNo: undefined,
userId: undefined,
payStatus: undefined,
deliveryStatus: undefined,
orderStatus: undefined
});
// 下来选项
const type = ref('orderNo');
// 搜索内容
const searchText = ref('');
// 日期范围选择
const dateRange = ref<[string, string]>(['', '']);
const listType = ref<number>(0);
/* 搜索 */
const search = () => {
const [d1, d2] = dateRange.value ?? [];
if (type.value == 'orderNo') {
where.orderNo = searchText.value;
where.userId = undefined;
}
if (type.value == 'userId') {
where.userId = searchText.value;
where.orderNo = undefined;
}
console.log(where);
emit('search', {
...where,
createTimeStart: d1 ? d1 + ' 00:00:00' : '',
createTimeEnd: d2 ? d2 + ' 23:59:59' : ''
});
};
// 批量删除
const removeBatch = () => {
emit('remove');
};
const handleTabs = (e) => {
resetFields();
const listType = Number(e.target.value);
console.log(listType);
// 全部订单
if (listType == 0) {
console.log('全部订单');
}
// 待发货
if (listType == 1) {
console.log('待发货');
where.payStatus = 20;
where.deliveryStatus = 10;
}
// 待收货
if (listType == 2) {
console.log('待发货');
where.payStatus = 20;
where.deliveryStatus = 20;
where.receiptStatus = 10;
}
// 待付款
if (listType == 3) {
console.log('待付款');
where.payStatus = 10;
}
// 已完成
if (listType == 4) {
console.log('已完成');
where.payStatus = 20;
where.orderStatus = 30;
}
// 已取消
if (listType == 5) {
console.log('已取消');
where.orderStatus = 20;
}
emit('search', {
...where
});
};
watch(
() => props.selection,
() => {}
);
</script>

View File

@@ -0,0 +1,305 @@
<template>
<div class="page">
<div class="ele-body">
<a-card :bordered="false">
<!-- 表格 -->
<ele-pro-table
ref="tableRef"
row-key="orderRefundId"
:columns="columns"
:datasource="datasource"
v-model:selection="selection"
tool-class="ele-toolbar-form"
class="sys-org-table"
:striped="true"
>
<template #toolbar>
<search
@search="reload"
:selection="selection"
@add="openEdit"
@remove="removeBatch"
@advanced="openAdvanced"
/>
</template>
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'goods'">
<template v-if="record.equipment">
<p class="ele-text">{{ record.equipment.equipmentName }}</p>
<p class="ele-text">{{ record.equipment.batteryModel }}</p>
<p class="ele-text">{{ record.equipment.equipmentCode }}</p>
</template>
</template>
<template v-if="column.key === 'deliveryType'">
<span v-if="record.deliveryType === 10">快递配送</span>
<span v-if="record.deliveryType === 20">门店自提</span>
</template>
<template v-if="column.key === 'nickname'">
<User :record="record" />
</template>
<template v-if="column.key === 'expirationDay'">
{{ record.expirationDay }}
</template>
<template v-if="column.key === 'batteryModel'">
{{ record.equipmentGoods?.batteryModel }}
</template>
<template v-if="column.key === 'equipmentCode'">
{{ record.equipment?.equipmentCode }}
</template>
<template v-if="column.key === 'orderSource'">
<span v-if="record.orderSource === 10" color="green"
>普通订单</span
>
<span v-if="record.orderSource === 20" color="red">禁用</span>
<span v-if="record.orderSource === 30" color="red">禁用</span>
</template>
<template v-if="column.key === 'nickname'">
<a-tooltip :title="`用户ID${record.userId}`">
<a-avatar :src="record.avatar" size="small" />
<span style="padding-left: 4px">{{ record.nickname }}</span>
</a-tooltip>
</template>
<template v-if="column.key === 'createTime'">
{{ record.createTime }}
</template>
<template v-if="column.key === 'action'">
<a-space>
<a-button v-if="record.auditStatus == 10" @click="openEdit(record)">审核</a-button>
</a-space>
</template>
<template v-if="column.key === 'updateTime'">
<span v-if="record.auditStatus ===10">-</span>
<span v-else>{{ record.updateTime }}</span>
</template>
</template>
</ele-pro-table>
</a-card>
</div>
<!-- 编辑弹窗 -->
<Edit v-model:visible="showEdit" :data="current" @done="reload" />
</div>
</template>
<script lang="ts" setup>
import { createVNode, ref } from 'vue';
import { message, Modal } from 'ant-design-vue';
import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
import type { EleProTable } from 'ele-admin-pro';
import type {
DatasourceFunction,
ColumnItem
} from 'ele-admin-pro/es/ele-pro-table/types';
import { toDateString } from 'ele-admin-pro';
import Search from './components/search.vue';
import Edit from './components/edit.vue';
import {
pageOrderRefund,
removeOrderRefund,
removeBatchOrderRefund
} from '@/api/order/refund';
import { listOrderPay } from '@/api/order';
import type { OrderRefund, OrderRefundParam } from '@/api/order/refund/model';
const props = defineProps<{
activeKey?: boolean;
data?: any;
}>();
// 表格实例
const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
/* 获取字典数据 */
// const payMethodDict = getDictionaryOptions('payMethod');
// 表格列配置
const columns = ref<ColumnItem[]>([
{
title: '订单号',
dataIndex: 'orderNo',
key: 'orderNo'
},
{
title: '电池型号',
dataIndex: 'batteryModel',
key: 'batteryModel'
},
{
title: '电池编号',
dataIndex: 'equipmentCode',
key: 'equipmentCode'
},
{
title: '所属商户',
dataIndex: 'merchantName',
key: 'merchantName',
sorter: true
},
{
title: '到期时间',
dataIndex: 'expirationTime',
key: 'expirationTime'
},
{
title: '剩余时间',
key: 'expirationDay',
dataIndex: 'expirationDay'
},
{
title: '客户实名',
dataIndex: 'updateTime',
key: 'updateTime',
customRender: ({ text }) => toDateString(text)
},
{
title: '订单金额',
dataIndex: 'payPrice',
key: 'payPrice'
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
customRender: ({ text }) => toDateString(text)
}
]);
// 表格选中数据
const selection = ref<OrderRefund[]>([]);
// 当前编辑数据
const current = ref<OrderRefund | null>(null);
// 是否显示资产详情
const showInfo = ref(false);
// 是否显示编辑弹窗
const showEdit = ref(false);
const deliveryEdit = ref(false);
// 是否显示高级搜索
const showAdvancedSearch = ref(false);
// 表格数据源
const datasource: DatasourceFunction = ({
page,
limit,
where,
orders,
filters
}) => {
// 搜索条件
if (filters.payMethod) {
where.payMethod = filters.payMethod;
}
if (filters.deliveryType) {
where.deliveryType = filters.deliveryType;
}
if (filters.payStatus) {
where.payStatus = filters.payStatus;
}
if (filters.orderSource) {
where.orderSource = filters.orderSource;
}
where.tenantId = localStorage.getItem('tenantId');
where.isRenew = 0;
console.log('isRenew');
return listOrderPay({
...where,
...orders,
page,
limit
});
};
/* 搜索 */
const reload = (where?: OrderRefundParam) => {
console.log(where, '....>>>>111');
selection.value = [];
tableRef?.value?.reload({ where: where });
};
const openDelivery = (row?: OrderRefund) => {
current.value = row ?? null;
deliveryEdit.value = true;
};
/* 打开编辑弹窗 */
const openEdit = (row?: OrderRefund) => {
current.value = row ?? null;
showEdit.value = true;
};
/* 打开用户详情弹窗 */
const openInfo = (row?: OrderRefund) => {
current.value = row ?? null;
showInfo.value = true;
};
/* 打开高级搜索 */
const openAdvanced = () => {
showAdvancedSearch.value = !showAdvancedSearch.value;
};
/* 删除单个 */
const remove = (row: OrderRefund) => {
const hide = message.loading('请求中..', 0);
removeOrderRefund(row.orderRefundId)
.then((msg) => {
hide();
message.success(msg);
reload();
})
.catch((e) => {
hide();
message.error(e.message);
});
};
/* 批量删除 */
const removeBatch = () => {
console.log(selection.value);
if (!selection.value.length) {
message.error('请至少选择一条数据');
return;
}
Modal.confirm({
title: '提示',
content: '确定要删除选中的记录吗?',
icon: createVNode(ExclamationCircleOutlined),
maskClosable: true,
onOk: () => {
const hide = message.loading('请求中..', 0);
removeBatchOrderRefund(selection.value.map((d) => d.orderRefundId))
.then((msg) => {
hide();
message.success(msg);
reload();
})
.catch((e) => {
hide();
message.error(e.message);
});
}
});
};
</script>
<script lang="ts">
export default {
name: 'ShopOrderRefundIndex'
};
</script>
<style lang="less" scoped>
p {
line-height: 0.8;
}
.sys-org-table :deep(.ant-table-body) {
overflow: auto !important;
overflow: overlay !important;
}
.sys-org-table :deep(.ant-table-pagination.ant-pagination) {
padding: 0 4px;
margin-bottom: 0;
}
</style>