From b898e42bd46726a0c25081ca79136911b4ca1b4c Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 27 四月 2026 22:26:34 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
admin/src/views/business/orderManagement.vue | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/admin/src/views/business/orderManagement.vue b/admin/src/views/business/orderManagement.vue
index 94ecf6f..73c1543 100644
--- a/admin/src/views/business/orderManagement.vue
+++ b/admin/src/views/business/orderManagement.vue
@@ -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>
@@ -59,7 +55,7 @@
:data="tableData.list"
stripe
>
- <el-table-column prop="code" label="璁㈠崟缂栧彿" min-width="150px">
+ <el-table-column prop="code" label="璁㈠崟缂栧彿" min-width="160px">
<template slot-scope="{row}">
<span class="order-no" @click="handleOrderDetail(row)">{{ row.code }}</span>
</template>
@@ -94,7 +90,14 @@
<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 ? '宸茬粨绠�' : '鏈粨绠�' }}
@@ -103,7 +106,7 @@
</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 +116,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