From 777bcb6c5660c0ed14d85207377b62b779d81dde Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 20 五月 2026 23:08:55 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
admin/src/views/business/orderManagement.vue | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/admin/src/views/business/orderManagement.vue b/admin/src/views/business/orderManagement.vue
index 73c1543..8ff39a5 100644
--- a/admin/src/views/business/orderManagement.vue
+++ b/admin/src/views/business/orderManagement.vue
@@ -20,7 +20,7 @@
<el-form-item label="绫诲瀷" prop="type">
<el-select v-model="searchForm.type" clearable placeholder="璇烽�夋嫨绫诲瀷" @change="search">
<el-option label="灏卞湴瀛樺彇" :value="0"></el-option>
- <el-option label="寮傚湴瀛樺彇" :value="1"></el-option>
+ <el-option label="鍚屽煄瀵勯��" :value="1"></el-option>
</el-select>
</el-form-item>
<el-form-item label="璁㈠崟鐘舵��" prop="status">
@@ -64,11 +64,13 @@
<el-table-column label="绫诲瀷" min-width="80px">
<template slot-scope="{row}">
<span v-if="row.type === 0">灏卞湴瀛樺彇</span>
- <span v-else-if="row.type === 1">寮傚湴瀛樺彇</span>
+ <span v-else-if="row.type === 1">鍚屽煄瀵勯��</span>
<span v-else>-</span>
</template>
</el-table-column>
- <el-table-column prop="orderLevel" label="璁㈠崟绾у埆" min-width="80px"></el-table-column>
+ <el-table-column prop="isUrgent" label="璁㈠崟绾у埆" min-width="80px">
+ <template slot-scope="{row}"><span v-if="row.type ===1">{{ row.isUrgent === 1?'鏋侀�熻揪':'鏍囬�熻揪' }}</span></template>
+ </el-table-column>
<el-table-column label="鐗╁搧淇濊垂锛堝厓锛�" min-width="120px">
<template slot-scope="{row}">楼{{ (row.declaredFee / 100).toFixed(2) }}</template>
</el-table-column>
@@ -81,6 +83,9 @@
<el-table-column label="瀹炰粯鐜伴噾锛堝厓锛�" min-width="120px">
<template slot-scope="{row}">楼{{ (row.payAmount / 100).toFixed(2) }}</template>
</el-table-column>
+ <el-table-column label="鍔犳�ヨ垂锛堝厓锛�" min-width="120px">
+ <template slot-scope="{row}"><span v-if="row.type ===1 ">楼{{ (row.platformRewardAmount / 100).toFixed(2) }}</span></template>
+ </el-table-column>
<el-table-column label="閫�娆鹃噾棰濓紙鍏冿級" min-width="120px">
<template slot-scope="{row}">楼{{ (row.refundAmount / 100).toFixed(2) }}</template>
</el-table-column>
@@ -88,7 +93,10 @@
<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 / 100).toFixed(2) }}</template>
+ <template slot-scope="{row}">楼{{ ((row.exceptionAmount || 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 prop="statusDesc" label="璁㈠崟鐘舵��" min-width="100px">
<template slot-scope="{row}">
@@ -104,9 +112,13 @@
</span>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" min-width="120" fixed="right">
+ <el-table-column prop="payTime" label="鏀粯鏃堕棿" min-width="150px"> </el-table-column>
+ <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" min-width="150px"> </el-table-column>
+ <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 === 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>
</template>
</el-table-column>
</el-table>
@@ -118,6 +130,8 @@
</template>
<OperaDispatch ref="operaDispatch" @success="handlePageChange" />
<OperaOrderDetail ref="operaOrderDetail" @success="handlePageChange" />
+ <OperaManualRefund ref="operaManualRefund" @success="handlePageChange" />
+ <OperaAbnormal ref="operaAbnormal" @success="handlePageChange" />
</TableLayout>
</template>
@@ -127,10 +141,12 @@
import Pagination from '@/components/common/Pagination'
import OperaDispatch from '@/components/business/OperaDispatch'
import OperaOrderDetail from '@/components/business/OperaOrderDetail'
+import OperaManualRefund from '@/components/business/OperaManualRefund'
+import OperaAbnormal from '@/components/business/OperaAbnormal'
export default {
name: 'OrderManagement',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaDispatch, OperaOrderDetail },
+ components: { TableLayout, Pagination, OperaDispatch, OperaOrderDetail, OperaManualRefund, OperaAbnormal },
data () {
return {
searchForm: {
@@ -155,6 +171,9 @@
this.search()
},
methods: {
+ handleAbnormal (row) {
+ this.$refs.operaAbnormal.open('寮傚父娲惧崟', row)
+ },
handleDateChange (val) {
this.searchForm.createStartTime = val ? val[0] : ''
this.searchForm.createEndTime = val ? val[1] : ''
@@ -178,6 +197,13 @@
handleDispatch (row) {
this.$refs.operaDispatch.open(row)
},
+ handleManualRefund (row) {
+ this.$refs.operaManualRefund.open(row)
+ },
+ handleExceptionDispatch (row) {
+ // 寮傚父娲惧崟閫昏緫
+ this.$message.info('寮傚父娲惧崟鍔熻兘寰呭疄鐜�')
+ },
handleOrderDetail (row) {
this.$refs.operaOrderDetail.open(row)
}
--
Gitblit v1.9.3