wuyajie/daoyou_manage_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化订单管理界面及类型定义

Browse Source
This commit is contained in:
钊钊 2024-12-20 13:22:49 +08:00
parent 5d3afa874c
commit 8478c204cc
2 changed files with 105 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/api/manage/orders/types.ts
View File

@ -61,7 +61,7 @@ export interface OrdersVO {
/** /**
* 订单状态 * 订单状态
*/ */
orderStatus: number; orderStatus?: number | string;
/** /**
* 物流名称 * 物流名称
@ -82,7 +82,6 @@ export interface OrdersVO {
* 备注 * 备注
*/ */
remark: string; remark: string;
} }
export interface OrdersForm extends BaseEntity { export interface OrdersForm extends BaseEntity {
@ -144,7 +143,7 @@ export interface OrdersForm extends BaseEntity {
/** /**
* 订单状态 * 订单状态
*/ */
orderStatus?: number; orderStatus?: number | string;
/** /**
* 物流名称 * 物流名称
@ -160,11 +159,9 @@ export interface OrdersForm extends BaseEntity {
* 备注 * 备注
*/ */
remark?: string; remark?: string;
} }
export interface OrdersQuery extends PageQuery { export interface OrdersQuery extends PageQuery {
/** /**
* 订单号 * 订单号
*/ */
@ -235,6 +232,3 @@ export interface OrdersQuery extends PageQuery {
*/ */
params?: any; params?: any;
} }

202
src/views/manage/orders/index.vue
View File

@ -1,44 +1,53 @@
<template> <template>
<div class="p-2"> <div class="p-2">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave"> <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
<div v-show="showSearch" class="mb-[10px]"> :leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]" id="search_div">
<el-card shadow="hover"> <el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true"> <el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="订单号" prop="orderNumber">
<el-input v-model="queryParams.orderNumber" placeholder="请输入订单号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="来源" prop="source">
<el-input v-model="queryParams.source" placeholder="请输入来源" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="商品名称" prop="productName"> <el-form-item label="商品名称" prop="productName">
<el-input v-model="queryParams.productName" placeholder="请输入商品名称" clearable @keyup.enter="handleQuery" /> <el-input class="inputWidth" v-model="queryParams.productName" placeholder="请输入商品名称" clearable
@keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="供应商id" prop="vendorId"> <el-form-item label="订单号" prop="orderNumber">
<el-input v-model="queryParams.vendorId" placeholder="请输入供应商id" clearable @keyup.enter="handleQuery" /> <el-input class="inputWidth" v-model="queryParams.orderNumber" placeholder="请输入订单号" clearable
@keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="用户昵称" prop="userNickname"> <el-form-item label="用户昵称" prop="userNickname">
<el-input v-model="queryParams.userNickname" placeholder="请输入用户昵称" clearable @keyup.enter="handleQuery" /> <el-input class="inputWidth" v-model="queryParams.userNickname" placeholder="请输入用户昵称" clearable
@keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="来源" prop="source">
<el-input class="inputWidth" v-model="queryParams.source" placeholder="请输入来源" clearable
@keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="订单状态" prop="orderStatus">
<el-select class="inputWidth" v-model="queryParams.orderStatus" placeholder="请选择订单状态" clearable>
<el-option v-for="dict in dy_order_status" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<!-- <el-form-item label="供应商id" prop="vendorId">
<el-input v-model="queryParams.vendorId" placeholder="请输入供应商id" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="用户头像路径" prop="userAvatar"> <el-form-item label="用户头像路径" prop="userAvatar">
<el-input v-model="queryParams.userAvatar" placeholder="请输入用户头像路径" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.userAvatar" placeholder="请输入用户头像路径" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="用户手机号" prop="userPhoneNumber"> <el-form-item label="用户手机号" prop="userPhoneNumber">
<el-input v-model="queryParams.userPhoneNumber" placeholder="请输入用户手机号" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.userPhoneNumber" placeholder="请输入用户手机号" clearable
@keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="收货地址" prop="shippingAddress"> <el-form-item label="收货地址" prop="shippingAddress">
<el-input v-model="queryParams.shippingAddress" placeholder="请输入收货地址" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.shippingAddress" placeholder="请输入收货地址" clearable
</el-form-item> @keyup.enter="handleQuery" />
<el-form-item label="订单状态" prop="orderStatus">
<el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态" clearable >
<el-option v-for="dict in dy_order_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="物流名称" prop="logisticsName"> <el-form-item label="物流名称" prop="logisticsName">
<el-input v-model="queryParams.logisticsName" placeholder="请输入物流名称" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.logisticsName" placeholder="请输入物流名称" clearable
@keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="物流单号" prop="logisticsNumber"> <el-form-item label="物流单号" prop="logisticsNumber">
<el-input v-model="queryParams.logisticsNumber" placeholder="请输入物流单号" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.logisticsNumber" placeholder="请输入物流单号" clearable
</el-form-item> @keyup.enter="handleQuery" />
</el-form-item> -->
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button> <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@ -48,125 +57,47 @@
</div> </div>
</transition> </transition>
<el-card shadow="never">
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['manage:orders:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['manage:orders:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['manage:orders:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['manage:orders:export']">导出</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" :data="ordersList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" border :height="autoTableHeight" :data="ordersList"
<el-table-column type="selection" width="55" align="center" /> @selection-change="handleSelectionChange">
<el-table-column label="唯一标识ID" align="center" prop="id" v-if="true" /> <el-table-column label="创建时间" align="center" prop="createTime" width="120">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="订单号" align="center" prop="orderNumber" /> <el-table-column label="订单号" align="center" prop="orderNumber" />
<el-table-column label="来源" align="center" prop="source" /> <el-table-column label="来源" align="center" prop="source" width="80px" />
<el-table-column label="商品名称" align="center" prop="productName" /> <el-table-column label="商品名称" align="center" prop="productName" />
<el-table-column label="商品图片路径" align="center" prop="productImageUrl" width="100"> <el-table-column label="商品图片" align="center" prop="productImageUrl" width="100">
<template #default="scope"> <template #default="scope">
<image-preview :src="scope.row.productImageUrl" :width="50" :height="50" /> <image-preview :src="scope.row.productImageUrl" :width="50" :height="50" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="商品类型" align="center" prop="productType" /> <el-table-column label="商品类型" align="center" prop="productType" />
<el-table-column label="供应商id" align="center" prop="vendorId" />
<el-table-column label="用户昵称" align="center" prop="userNickname" /> <el-table-column label="用户昵称" align="center" prop="userNickname" />
<el-table-column label="用户头像路径" align="center" prop="userAvatar" /> <el-table-column label="用户头像" align="center" prop="userAvatar" />
<el-table-column label="用户手机号" align="center" prop="userPhoneNumber" /> <el-table-column label="用户手机号" align="center" prop="userPhoneNumber" width="120px" />
<el-table-column label="收货地址" align="center" prop="shippingAddress" /> <el-table-column label="收货地址" align="center" prop="shippingAddress" width="200px" />
<el-table-column label="供应商" align="center" prop="vendorId" />
<el-table-column label="订单状态" align="center" prop="orderStatus"> <el-table-column label="订单状态" align="center" prop="orderStatus">
<template #default="scope"> <template #default="scope">
<dict-tag :options="dy_order_status" :value="scope.row.orderStatus" /> <dict-tag :options="dy_order_status" :value="scope.row.orderStatus" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物流名称" align="center" prop="logisticsName" /> <el-table-column label="物流名称" align="center" prop="logisticsName" />
<el-table-column label="物流单号" align="center" prop="logisticsNumber" /> <el-table-column label="物流单号" align="center" prop="logisticsNumber" width="150" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope"> <template #default="scope">
<el-tooltip content="修改" placement="top"> <el-button link type="primary" v-if="scope.row.orderStatus == 0" v-hasPermi="['manage:orders:edit']"
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['manage:orders:edit']"></el-button> @click="handleOrderStatus(scope.row,'1')">发货</el-button>
</el-tooltip> <el-button link type="primary" @click="handleOrderStatus(scope.row,'0')" v-if="scope.row.orderStatus == 1"
<el-tooltip content="删除" placement="top"> v-hasPermi="['manage:orders:edit']">撤销发货</el-button>
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['manage:orders:remove']"></el-button>
</el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" /> <pagination v-show="total > 0" id="table_page" :total="total" v-model:page="queryParams.pageNum"
</el-card> v-model:limit="queryParams.pageSize" @pagination="getList" />
<!-- 添加或修改订单信息对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="ordersFormRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="订单号" prop="orderNumber">
<el-input v-model="form.orderNumber" placeholder="请输入订单号" />
</el-form-item>
<el-form-item label="来源" prop="source">
<el-input v-model="form.source" placeholder="请输入来源" />
</el-form-item>
<el-form-item label="商品名称" prop="productName">
<el-input v-model="form.productName" placeholder="请输入商品名称" />
</el-form-item>
<el-form-item label="商品图片路径" prop="productImage">
<image-upload v-model="form.productImage"/>
</el-form-item>
<el-form-item label="供应商id" prop="vendorId">
<el-input v-model="form.vendorId" placeholder="请输入供应商id" />
</el-form-item>
<el-form-item label="用户昵称" prop="userNickname">
<el-input v-model="form.userNickname" placeholder="请输入用户昵称" />
</el-form-item>
<el-form-item label="用户头像路径" prop="userAvatar">
<el-input v-model="form.userAvatar" placeholder="请输入用户头像路径" />
</el-form-item>
<el-form-item label="用户手机号" prop="userPhoneNumber">
<el-input v-model="form.userPhoneNumber" placeholder="请输入用户手机号" />
</el-form-item>
<el-form-item label="收货地址" prop="shippingAddress">
<el-input v-model="form.shippingAddress" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="订单状态" prop="orderStatus">
<el-radio-group v-model="form.orderStatus">
<el-radio
v-for="dict in dy_order_status"
:key="dict.value"
:value="parseInt(dict.value)"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="物流名称" prop="logisticsName">
<el-input v-model="form.logisticsName" placeholder="请输入物流名称" />
</el-form-item>
<el-form-item label="物流单号" prop="logisticsNumber">
<el-input v-model="form.logisticsNumber" placeholder="请输入物流单号" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</template>
</el-dialog>
</div> </div>
</template> </template>
@ -176,7 +107,7 @@ import { OrdersVO, OrdersQuery, OrdersForm } from '@/api/manage/orders/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { dy_order_status } = toRefs<any>(proxy?.useDict('dy_order_status')); const { dy_order_status } = toRefs<any>(proxy?.useDict('dy_order_status'));
const autoTableHeight = ref(750);
const ordersList = ref<OrdersVO[]>([]); const ordersList = ref<OrdersVO[]>([]);
const buttonLoading = ref(false); const buttonLoading = ref(false);
const loading = ref(true); const loading = ref(true);
@ -329,7 +260,17 @@ const handleAdd = () => {
dialog.visible = true; dialog.visible = true;
dialog.title = "添加订单信息"; dialog.title = "添加订单信息";
} }
/**
* 发货 撤销发货
*/
const handleOrderStatus = async (row: OrdersVO,type:string|number) => {
await proxy?.$modal.confirm('是否确认' + (type == '0' ? '撤销发货' : '发货') + '商品名称为"' + row.productName + '"的数据项？');
row.orderStatus = type;
buttonLoading.value = true;
await updateOrders(row).finally(() => (buttonLoading.value = false));
proxy?.$modal.msgSuccess('操作成功');
getList();
}
/** 修改按钮操作 */ /** 修改按钮操作 */
const handleUpdate = async (row?: OrdersVO) => { const handleUpdate = async (row?: OrdersVO) => {
reset(); reset();
@ -375,5 +316,22 @@ const handleExport = () => {
onMounted(() => { onMounted(() => {
getList(); getList();
nextTick(() => {
autoTableHeight.value = proxy?.autoTableHeight();
});
window.onresize = () => {
autoTableHeight.value = proxy?.autoTableHeight();
};
}); });
</script> </script>
<style lang="scss" scoped>
.el-card :deep(.el-card__body) {
padding-bottom: 0px !important;
}
#table_page {
height: 50px !important;
margin-top: 10px !important;
padding-bottom: 10px !important;
}
</style>