新增商品前台交互完善

This commit is contained in:
SjS 2025-06-11 18:12:25 +08:00
parent d4918d6c18
commit e6e0e6be6b
4 changed files with 961 additions and 0 deletions

44
src/api/bst/goodsOrder.js Normal file
View File

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询商品订单列表
export function listGoodsOrder(query) {
return request({
url: '/bst/goodsOrder/list',
method: 'get',
params: query
})
}
// 查询商品订单详细
export function getGoodsOrder(id) {
return request({
url: '/bst/goodsOrder/' + id,
method: 'get'
})
}
// 新增商品订单
export function addGoodsOrder(data) {
return request({
url: '/bst/goodsOrder',
method: 'post',
data: data
})
}
// 修改商品订单
export function updateGoodsOrder(data) {
return request({
url: '/bst/goodsOrder',
method: 'put',
data: data
})
}
// 删除商品订单
export function delGoodsOrder(id) {
return request({
url: '/bst/goodsOrder/' + id,
method: 'delete'
})
}

View File

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询订单SKU列表
export function listGoodsOrderSku(query) {
return request({
url: '/bst/goodsOrderSku/list',
method: 'get',
params: query
})
}
// 查询订单SKU详细
export function getGoodsOrderSku(id) {
return request({
url: '/bst/goodsOrderSku/' + id,
method: 'get'
})
}
// 新增订单SKU
export function addGoodsOrderSku(data) {
return request({
url: '/bst/goodsOrderSku',
method: 'post',
data: data
})
}
// 修改订单SKU
export function updateGoodsOrderSku(data) {
return request({
url: '/bst/goodsOrderSku',
method: 'put',
data: data
})
}
// 删除订单SKU
export function delGoodsOrderSku(id) {
return request({
url: '/bst/goodsOrderSku/' + id,
method: 'delete'
})
}

View File

@ -0,0 +1,502 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="订单号" prop="orderNo">
<el-input
v-model="queryParams.orderNo"
placeholder="请输入订单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="下单用户" prop="userName">
<el-input
v-model="queryParams.userName"
placeholder="请输入下单用户名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="支付单号" prop="payNo">
<el-input
v-model="queryParams.payNo"
placeholder="请输入支付单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="订单状态" prop="status">
<el-select
v-model="queryParams.status"
placeholder="请选择订单状态"
clearable
@keyup.enter.native="handleQuery"
>
<el-option
v-for="item in dict.type.order_status"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-has-permi="['bst:order:remove']"
>删除
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-has-permi="['bst:order:export']"
>导出
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange"
:default-sort="defaultSort" @sort-change="onSortChange">
<el-table-column type="selection" width="55" align="center"/>
<template v-for="column of showColumns">
<el-table-column
:key="column.key"
:label="column.label"
:prop="column.key"
:align="column.align"
:min-width="column.minWidth"
:sort-orders="orderSorts"
:sortable="column.sortable"
:show-overflow-tooltip="column.overflow"
:width="column.width"
>
<template slot-scope="d">
<template v-if="column.key === 'id'">
{{ d.row[column.key] }}
</template>
<template v-else-if="column.key === 'suitAmount'">
套餐金额<b>{{ d.row.suitAmount | fix2 | dv }}</b>
</template>
<template v-else-if="column.key === 'suitNum'">
爆灯次数<b>{{ d.row.suitNum | dv }}</b>
</template>
<template v-else-if="column.key === 'status'">
<dict-tag :options="dict.type.order_status" :value="d.row.status" size="mini" style="margin-left: 4px;"/>
</template>
<template v-else-if="column.key === 'userName'">
<div v-if="d.row.userName != null">
<i class="el-icon-user"/>
<user-link :id="d.row.userId" :text="d.row.userName" size="mini"/>
</div>
<div v-if="d.row.phoneNumber != null">
<i class="el-icon-phone"/>
<user-link :id="d.row.userId" :text="d.row.phoneNumber" size="mini"/>
</div>
</template>
<template v-else-if="column.key === 'storeName'">
<div v-if="d.row.storeName != null">
<i class="el-icon-takeaway-box"/>
<store-link :id="d.row.storeId" :name="d.row.storeName" size="mini"/>
</div>
</template>
<template v-else-if="column.key === 'payAmount'">
<div>
<el-row :gutter="8">
<!-- 实收信息 -->
<el-col :span="24" v-if="d.row.payedAmount">
<div style="color: green; line-height: 24px">
<span style="font-weight: 500">实收</span>
<span style="font-weight: bold">
{{ d.row.payedAmount - d.row.payRefunded - d.row.payRefunding | fix2 | dv }}
</span>
</div>
</el-col>
<!-- 退款信息 -->
<el-col :span="24" v-if="d.row.payRefunded || d.row.payRefunding || d.row.refundNum">
<div style="color: red; line-height: 24px; margin-top: 4px">
<span style="font-weight: 500">退款</span>
<span style="font-weight: bold">
{{ d.row.payRefunded | fix2 | dv }}
</span>
<template v-if="d.row.payRefunding">
<span style="margin-left: 8px">(退款中{{ d.row.payRefunding | fix2 | dv }} )</span>
</template>
</div>
</el-col>
</el-row>
</div>
</template>
<template v-else>
{{ d.row[column.key] }}
</template>
</template>
</el-table-column>
</template>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-wallet"
@click="handleRefund(scope.row)"
v-has-permi="['bst:order:refund']"
v-show="OrderStatus.canRefund().includes(scope.row.status)"
>退款
</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<order-refund-dialog :id="row.id" :visible.sync="showRefundDialog" @success="getList"/>
</div>
</template>
<script>
import {listOrder, getOrder, delOrder, addOrder, updateOrder} from "@/api/bst/order";
import {$showColumns} from '@/utils/mixins';
import FormCol from "@/components/FormCol/index.vue";
import UserLink from "@/views/system/user/UserLink.vue";
import CollapsePanel from "@/components/CollapsePanel/index.vue";
import {OrderStatus} from "@/utils/enums";
import OrderRefundDialog from "@/views/bst/order/components/OrderRefundDialog.vue";
import Store from "@/views/bst/store/index.vue";
import StoreLink from "@/views/bst/store/StoreLink.vue";
import {listGoodsOrder} from "@/api/bst/goodsOrder";
//
const defaultSort = {
prop: "createTime",
order: "descending"
}
export default {
name: "Order",
computed: {
OrderStatus() {
return OrderStatus
}
},
mixins: [$showColumns],
dicts: ['goods_order_status'],
props: {
query: {
type: Object,
default: () => ({})
}
},
components: {StoreLink, Store, CollapsePanel, UserLink, FormCol, OrderRefundDialog},
data() {
return {
span: 24,
//
columns: [
{
key: 'orderNo',
visible: true,
label: '订单号',
minWidth: null,
sortable: true,
overflow: false,
align: 'center',
width: "170"
},
{
key: 'suitAmount',
visible: true,
label: '套餐金额',
minWidth: null,
sortable: true,
overflow: false,
align: 'center',
width: '200'
},
{
key: 'suitNum',
visible: true,
label: '爆灯次数',
minWidth: null,
sortable: true,
overflow: false,
align: 'center',
width: "200"
},
{
key: 'userName',
visible: true,
label: '下单用户',
minWidth: null,
sortable: true,
overflow: false,
align: 'center',
width: '200'
},
{
key: 'storeName',
visible: true,
label: '下单店铺',
minWidth: null,
sortable: true,
overflow: false,
align: 'center',
width: '200'
},
{
key: 'payAmount',
visible: true,
label: '支付金额',
minWidth: null,
sortable: true,
overflow: false,
align: 'center',
width: '240'
},
{
key: 'status',
visible: true,
label: '订单状态',
minWidth: null,
sortable: true,
overflow: false,
align: 'center',
width: '120'
},
{
key: 'createTime',
visible: true,
label: '创建时间',
minWidth: null,
sortable: true,
overflow: false,
align: 'center',
width: '200'
},
],
//
orderSorts: ['ascending', 'descending', null],
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
orderList: [],
//
title: "",
//
open: false,
defaultSort,
//
queryParams: {
pageNum: 1,
pageSize: 20,
orderByColumn: defaultSort.prop,
isAsc: defaultSort.order,
orderNo: null,
storeId: null,
storeName: null,
userId: null,
payId: null,
payAmount: null,
mark: null,
status: null,
suitId: null,
suitName: null,
suitNum: null,
suitAmount: null,
cancelRemark: null,
payExpireTime: null
},
row: {},
showRefundDialog: false,
//
form: {},
//
rules: {
orderNo: [
{required: true, message: "订单号不能为空", trigger: "blur"}
],
storeId: [
{required: true, message: "店铺ID不能为空", trigger: "blur"}
],
userId: [
{required: true, message: "用户ID不能为空", trigger: "blur"}
],
payAmount: [
{required: true, message: "支付金额不能为空", trigger: "blur"}
],
createTime: [
{required: true, message: "创建时间不能为空", trigger: "blur"}
],
suitId: [
{required: true, message: "套餐ID不能为空", trigger: "blur"}
],
payExpireTime: [
{required: true, message: "支付超时时间不能为空", trigger: "blur"}
]
}
};
},
created() {
this.queryParams = {
...this.queryParams,
...this.query
}
this.getList();
},
methods: {
handleRefund(row) {
this.row = row;
this.showRefundDialog = true;
},
/** 当排序按钮被点击时触发 **/
onSortChange(column) {
if (column.order == null) {
this.queryParams.orderByColumn = defaultSort.prop;
this.queryParams.isAsc = defaultSort.order;
} else {
this.queryParams.orderByColumn = column.prop;
this.queryParams.isAsc = column.order;
}
this.getList();
},
/** 查询订单列表列表 */
getList() {
this.loading = true;
listGoodsOrder(this.queryParams).then(response => {
this.orderList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
id: null,
orderNo: null,
storeId: null,
storeName: null,
userId: null,
payId: null,
payAmount: null,
mark: null,
status: null,
createTime: null,
suitId: null,
suitName: null,
suitNum: null,
suitAmount: null,
cancelRemark: null,
payExpireTime: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加订单列表";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getOrder(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改订单列表";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateOrder(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addOrder(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除订单列表编号为"' + ids + '"的数据项?').then(function () {
return delOrder(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {
});
},
/** 导出按钮操作 */
handleExport() {
this.download('bst/goodsOrder/export', {
...this.queryParams
}, `order_${new Date().getTime()}.xlsx`)
}
}
};
</script>

View File

@ -0,0 +1,371 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="主键" prop="id">
<el-input
v-model="queryParams.id"
placeholder="请输入主键"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="订单ID" prop="orderId">
<el-input
v-model="queryParams.orderId"
placeholder="请输入订单ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="SKU ID" prop="skuId">
<el-input
v-model="queryParams.skuId"
placeholder="请输入SKU ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="SKU数量" prop="number">
<el-input
v-model="queryParams.number"
placeholder="请输入SKU数量"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="SKU金额" prop="price">
<el-input
v-model="queryParams.price"
placeholder="请输入SKU金额"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="SKU图片" prop="picture">
<el-input
v-model="queryParams.picture"
placeholder="请输入SKU图片"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-has-permi="['bst:goodsOrderSku:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-has-permi="['bst:goodsOrderSku:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-has-permi="['bst:goodsOrderSku:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="goodsOrderSkuList" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="onSortChange">
<el-table-column type="selection" width="55" align="center" />
<template v-for="column of showColumns">
<el-table-column
:key="column.key"
:label="column.label"
:prop="column.key"
:align="column.align"
:min-width="column.minWidth"
:sort-orders="orderSorts"
:sortable="column.sortable"
:show-overflow-tooltip="column.overflow"
:width="column.width"
>
<template slot-scope="d">
<template v-if="column.key === 'id'">
{{d.row[column.key]}}
</template>
<template v-else>
{{d.row[column.key]}}
</template>
</template>
</el-table-column>
</template>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-has-permi="['bst:goodsOrderSku:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-has-permi="['bst:goodsOrderSku:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改订单SKU对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<form-col :span="span" label="订单ID" prop="orderId">
<el-input v-model="form.orderId" placeholder="请输入订单ID" />
</form-col>
<form-col :span="span" label="SKU ID" prop="skuId">
<el-input v-model="form.skuId" placeholder="请输入SKU ID" />
</form-col>
<form-col :span="span" label="SKU数量" prop="number">
<el-input v-model="form.number" placeholder="请输入SKU数量" />
</form-col>
<form-col :span="span" label="SKU金额" prop="price">
<el-input v-model="form.price" placeholder="请输入SKU金额" />
</form-col>
<form-col :span="span" label="SKU图片" prop="picture">
<el-input v-model="form.picture" placeholder="请输入SKU图片" />
</form-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listGoodsOrderSku, getGoodsOrderSku, delGoodsOrderSku, addGoodsOrderSku, updateGoodsOrderSku } from "@/api/bst/goodsOrderSku";
import { $showColumns } from '@/utils/mixins';
import FormCol from "@/components/FormCol/index.vue";
//
const defaultSort = {
prop: "createTime",
order: "descending"
}
export default {
name: "GoodsOrderSku",
mixins: [$showColumns],
components: {FormCol},
data() {
return {
span: 24,
//
columns: [
{key: 'id', visible: true, label: '主键', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'orderId', visible: true, label: '订单ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'specValue', visible: true, label: '规格值JSON', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'skuId', visible: true, label: 'SKU ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'number', visible: true, label: 'SKU数量', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'price', visible: true, label: 'SKU金额单位', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'picture', visible: true, label: 'SKU图片', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
],
//
orderSorts: ['ascending', 'descending', null],
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
// SKU
goodsOrderSkuList: [],
//
title: "",
//
open: false,
defaultSort,
//
queryParams: {
pageNum: 1,
pageSize: 20,
orderByColumn: defaultSort.prop,
isAsc: defaultSort.order,
id: null,
orderId: null,
specValue: null,
skuId: null,
number: null,
price: null,
picture: null
},
//
form: {},
//
rules: {
orderId: [
{ required: true, message: "订单ID不能为空", trigger: "blur" }
],
specValue: [
{ required: true, message: "规格值JSON不能为空", trigger: "blur" }
],
skuId: [
{ required: true, message: "SKU ID不能为空", trigger: "blur" }
],
number: [
{ required: true, message: "SKU数量不能为空", trigger: "blur" }
],
price: [
{ required: true, message: "SKU金额不能为空", trigger: "blur" }
],
}
};
},
created() {
this.getList();
},
methods: {
/** 当排序按钮被点击时触发 **/
onSortChange(column) {
if (column.order == null) {
this.queryParams.orderByColumn = defaultSort.prop;
this.queryParams.isAsc = defaultSort.order;
} else {
this.queryParams.orderByColumn = column.prop;
this.queryParams.isAsc = column.order;
}
this.getList();
},
/** 查询订单SKU列表 */
getList() {
this.loading = true;
listGoodsOrderSku(this.queryParams).then(response => {
this.goodsOrderSkuList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
id: null,
orderId: null,
specValue: null,
skuId: null,
number: null,
price: null,
picture: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加订单SKU";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getGoodsOrderSku(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改订单SKU";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateGoodsOrderSku(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addGoodsOrderSku(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除订单SKU编号为"' + ids + '"的数据项?').then(function() {
return delGoodsOrderSku(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('bst/goodsOrderSku/export', {
...this.queryParams
}, `goodsOrderSku_${new Date().getTime()}.xlsx`)
}
}
};
</script>