From ea2fb93a0dfcde8f5b66825b20f9d9b835a28acc Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 22 五月 2026 10:54:09 +0800
Subject: [PATCH] 提交
---
admin/src/views/business/orderManagement.vue | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/admin/src/views/business/orderManagement.vue b/admin/src/views/business/orderManagement.vue
index 8ff39a5..af4b106 100644
--- a/admin/src/views/business/orderManagement.vue
+++ b/admin/src/views/business/orderManagement.vue
@@ -57,7 +57,12 @@
>
<el-table-column prop="code" label="璁㈠崟缂栧彿" min-width="160px">
<template slot-scope="{row}">
- <span class="order-no" @click="handleOrderDetail(row)">{{ row.code }}</span>
+ <span class="order-no" @click="handleOrderDetail(row.id)">{{ row.code }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="code" label="鍏宠仈寮傚父璁㈠崟" min-width="160px">
+ <template slot-scope="{row}">
+ <span class="order-no" style="color: red;" @click="handleOrderDetail(row.relationOrderId)">{{ row.relationOrderCode }}</span>
</template>
</el-table-column>
<el-table-column prop="goodsInfo" label="鐗╁搧淇℃伅" min-width="120px"></el-table-column>
@@ -93,10 +98,13 @@
<template slot-scope="{row}">楼{{ (row.overdueAmount / 100).toFixed(2) }}</template>
</el-table-column>
<el-table-column label="寮傚父閲戦" min-width="100px">
- <template slot-scope="{row}">楼{{ ((row.exceptionAmount || 0) / 100).toFixed(2) }}</template>
+ <template slot-scope="{row}">楼{{ ((row.exceptionFee || 0) / 100).toFixed(2) }}</template>
</el-table-column>
<el-table-column label="浼樻儬鍗锋姷鎵�" min-width="100px">
<template slot-scope="{row}">楼{{ ((row.deductionAmount || 0) / 100).toFixed(2) }}</template>
+ </el-table-column>
+ <el-table-column label="闂ㄥ簵淇濈琛ヨ创" min-width="100px">
+ <template slot-scope="{row}">楼{{ ((row.shopCompensationAmount || 0) / 100).toFixed(2) }}</template>
</el-table-column>
<el-table-column prop="statusDesc" label="璁㈠崟鐘舵��" min-width="100px">
<template slot-scope="{row}">
@@ -117,8 +125,8 @@
<el-table-column label="鎿嶄綔" min-width="180" fixed="right">
<template slot-scope="{row}">
<el-button type="text" v-if="row.status === 2" @click="handleDispatch(row)">鎵嬪姩娲惧崟</el-button>
- <el-button type="text" v-if="row.status === 7" @click="handleManualRefund(row)">鎵嬪姩閫�娆�</el-button>
- <el-button type="text" v-if="row.status === 4 && !row.takeShopId && row.exceptionStatus === 0" @click="handleAbnormal(row)">寮傚父娲惧崟</el-button>
+ <el-button type="text" v-if="row.status === 7 && row.exceptionStatus !== 1" @click="handleManualRefund(row)">鎵嬪姩閫�娆�</el-button>
+ <el-button type="text" v-if="row.status === 4 && !row.takeShopId && row.exceptionStatus !== 1" @click="handleAbnormal(row)">寮傚父娲惧崟</el-button>
</template>
</el-table-column>
</el-table>
@@ -204,8 +212,8 @@
// 寮傚父娲惧崟閫昏緫
this.$message.info('寮傚父娲惧崟鍔熻兘寰呭疄鐜�')
},
- handleOrderDetail (row) {
- this.$refs.operaOrderDetail.open(row)
+ handleOrderDetail (id) {
+ this.$refs.operaOrderDetail.open(id)
}
}
}
--
Gitblit v1.9.3