修改耗材绑定商品

This commit is contained in:
2024-07-18 17:31:38 +08:00
9 changed files with 1365 additions and 204 deletions

View File

@@ -10,11 +10,7 @@
<el-form-item label="订单状态">
<el-radio-group v-model="query.status">
<el-radio-button label="">全部</el-radio-button>
<el-radio-button
:label="item.key"
v-for="item in orderEnum.status"
:key="item.key"
>
<el-radio-button :label="item.key" v-for="item in orderEnum.status" :key="item.key">
{{ item.label }}
</el-radio-button>
</el-radio-group>
@@ -22,11 +18,7 @@
<el-form-item label="支付方式">
<el-radio-group v-model="query.payType">
<el-radio-button label="">全部</el-radio-button>
<el-radio-button
:label="item.payType"
v-for="item in payTypes"
:key="item.payType"
>
<el-radio-button :label="item.payType" v-for="item in payTypes" :key="item.payType">
{{ item.payName }}
</el-radio-button>
</el-radio-group>
@@ -42,16 +34,9 @@
<el-radio-button label="month">本月</el-radio-button>
<el-radio-button label="custom">自定义</el-radio-button>
</el-radio-group>
<el-date-picker
v-model="query.createdAt"
type="daterange"
range-separator=""
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
value-format="yyyy-MM-dd HH:mm:ss"
v-if="timeValue == 'custom'"
>
<el-date-picker v-model="query.createdAt" type="daterange" range-separator="至" start-placeholder="开始日期"
end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" value-format="yyyy-MM-dd HH:mm:ss"
v-if="timeValue == 'custom'">
</el-date-picker>
</el-form-item>
@@ -71,11 +56,7 @@
></el-input>
<el-button type="primary" @click="getTableData">查询</el-button>
<el-button @click="resetHandle">重置</el-button>
<el-button
icon="el-icon-download"
v-loading="downloadLoading"
@click="downloadHandle"
>
<el-button icon="el-icon-download" v-loading="downloadLoading" @click="downloadHandle">
<span v-if="!downloadLoading">导出Excel</span>
<span v-else>下载中...</span>
</el-button>
@@ -123,20 +104,12 @@
<el-table-column label="商品信息">
<template v-slot="scope">
<div class="goods_info">
<div
class="row"
v-for="item in scope.row.detailList"
:key="item.id"
>
<div class="row" v-for="item in scope.row.detailList" :key="item.id">
<el-image :src="item.productImg" class="cover" lazy></el-image>
<div class="info">
<div class="name">
{{ item.productName }}
<span
class="refund"
v-if="item.refundNumber"
>(退 - {{ item.refundNumber }})</span
>
<span class="refund" v-if="item.refundNumber">(退 - {{ item.refundNumber }})</span>
</div>
<div class="sku">{{ item.productSkuName }}</div>
</div>
@@ -145,15 +118,12 @@
</template>
</el-table-column>
<el-table-column label="台桌号" prop="tableName"></el-table-column>
<el-table-column label="订单金额">
<el-table-column label="订单金额">
<template v-slot="scope">
<div>{{ scope.row.orderType | orderTypeFilter }}</div>
<div
class="refund"
v-if="
scope.row.orderType == 'return'
"
>
<div class="refund" v-if="
scope.row.orderType == 'return'
">
退款:-¥{{ scope.row.orderAmount }}
</div>
<div v-else>¥{{ scope.row.orderAmount }}</div>
@@ -161,11 +131,9 @@
</el-table-column>
<el-table-column label="状态">
<template v-slot="scope">
<template
v-if="
scope.row.status == 'refund' && scope.row.orderType != 'return'
"
>
<template v-if="
scope.row.status == 'refund' && scope.row.orderType != 'return'
">
<el-tag type="primary">已完成</el-tag>
</template>
<template v-else>
@@ -185,22 +153,15 @@
</el-table-column>
<el-table-column label="操作" width="100">
<template v-slot="scope">
<el-button type="text" @click="$refs.orderDetail.show(scope.row)"
>详情</el-button
>
<el-button type="text" @click="$refs.orderDetail.show(scope.row)">详情</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div class="head-container">
<el-pagination
:total="tableData.total"
:current-page="tableData.page + 1"
:page-size="tableData.size"
@current-change="paginationChange"
@size-change="sizeChange"
layout="total, sizes, prev, pager, next, jumper"
></el-pagination>
<el-pagination :total="tableData.total" :current-page="tableData.page + 1" :page-size="tableData.size"
@current-change="paginationChange" @size-change="sizeChange"
layout="total, sizes, prev, pager, next, jumper"></el-pagination>
</div>
<orderDetail ref="orderDetail" />
</div>
@@ -244,6 +205,7 @@ export default {
payCountTotal: 0
};
},
filters: {
orderTypeFilter(t) {
if (t) {
@@ -271,7 +233,7 @@ export default {
}
},
mounted() {
if(this.$route.query.tableName){
if (this.$route.query.tableName) {
this.query.tableName = this.$route.query.tableName
}
if(this.$route.query.orderNo){
@@ -280,6 +242,13 @@ export default {
this.resetQuery = { ...this.query };
this.tbShopPayTypeGet();
this.getTableData();
// 从商品库存-库存记录-点击订单号跳转过来
if (this.$route.query.orderNo) {
this.query.orderNo = this.$route.query.orderNo
setTimeout(() => {
this.getTableData();
}, 200);
}
},
methods: {
// 获取订单汇总