From a59ff44b2eaa7020f0529632d9ec064c4dc38e27 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 28 四月 2026 22:08:46 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
admin/src/views/business/orderManagement.vue | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/admin/src/views/business/orderManagement.vue b/admin/src/views/business/orderManagement.vue
index 73c1543..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">
@@ -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>
@@ -80,6 +82,9 @@
</el-table-column>
<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>
@@ -104,6 +109,8 @@
</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" v-if="row.status ===2" @click="handleDispatch(row)">鎵嬪姩娲惧崟</el-button>
--
Gitblit v1.9.3