From 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 四月 2026 09:42:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/orderManagement.vue | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/admin/src/views/business/orderManagement.vue b/admin/src/views/business/orderManagement.vue
index 0f6b8ed..996464a 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">
@@ -32,11 +32,7 @@
<el-option label="宸叉帴鍗�" :value="3"></el-option>
<el-option label="娲鹃�佷腑" :value="4"></el-option>
<el-option label="宸插埌搴�/宸查�佽揪" :value="5"></el-option>
- <el-option label="瀛樺湪閫炬湡" :value="6"></el-option>
<el-option label="宸插畬鎴�" :value="7"></el-option>
- <el-option label="璁㈠崟鍏抽棴锛堥��娆撅級" :value="96"></el-option>
- <el-option label="鍙栨秷閫炬湡" :value="97"></el-option>
- <el-option label="鍙栨秷涓�" :value="98"></el-option>
<el-option label="宸插彇娑�" :value="99"></el-option>
</el-select>
</el-form-item>
@@ -68,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>
@@ -85,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.urgentAmount / 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>
@@ -94,16 +95,25 @@
<el-table-column label="寮傚父閲戦" min-width="100px">
<template slot-scope="{row}">楼{{ (row.exceptionAmount / 100).toFixed(2) }}</template>
</el-table-column>
- <el-table-column label="缁撶畻鐘舵��" min-width="100px">
+ <el-table-column prop="statusDesc" label="璁㈠崟鐘舵��" min-width="100px">
+ <template slot-scope="{row}">
+ <span :style="{ color: row.status <7 ? '#e6a23c' : (row.status ===7 ? '#67c23a' : 'grey' )}">
+ {{ row.statusDesc }}
+ </span>
+ </template>
+ </el-table-column>
+ <el-table-column label="缁撶畻鐘舵��" min-width="100px">
<template slot-scope="{row}">
<span :style="{ color: row.settlementStatus === 1 ? '#67c23a' : '#e6a23c' }">
{{ row.settlementStatus === 1 ? '宸茬粨绠�' : '鏈粨绠�' }}
</span>
</template>
</el-table-column>
+ <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="120" fixed="right">
<template slot-scope="{row}">
- <el-button type="text" @click="handleDispatch(row)">鎵嬪姩娲惧崟</el-button>
+ <el-button type="text" v-if="row.status ===2" @click="handleDispatch(row)">鎵嬪姩娲惧崟</el-button>
</template>
</el-table-column>
</el-table>
@@ -113,8 +123,8 @@
:pagination="tableData.pagination"
></pagination>
</template>
- <OperaDispatch ref="operaDispatch" />
- <OperaOrderDetail ref="operaOrderDetail" />
+ <OperaDispatch ref="operaDispatch" @success="handlePageChange" />
+ <OperaOrderDetail ref="operaOrderDetail" @success="handlePageChange" />
</TableLayout>
</template>
--
Gitblit v1.9.3