From 552238172036acf08ccf36134282a06b5e21b936 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 22 五月 2026 18:07:49 +0800
Subject: [PATCH] 代码生成

---
 admin/src/views/business/orderManagement.vue |   41 ++++++++++++++++++++++++++++++++++-------
 1 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/admin/src/views/business/orderManagement.vue b/admin/src/views/business/orderManagement.vue
index 9e88244..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,7 +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 / 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}">
@@ -111,9 +122,11 @@
         </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">
+        <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 && 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>
@@ -125,6 +138,8 @@
     </template>
     <OperaDispatch ref="operaDispatch" @success="handlePageChange" />
     <OperaOrderDetail ref="operaOrderDetail"  @success="handlePageChange"  />
+    <OperaManualRefund ref="operaManualRefund" @success="handlePageChange" />
+    <OperaAbnormal ref="operaAbnormal" @success="handlePageChange" />
   </TableLayout>
 </template>
 
@@ -134,10 +149,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: {
@@ -162,6 +179,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] : ''
@@ -185,8 +205,15 @@
     handleDispatch (row) {
       this.$refs.operaDispatch.open(row)
     },
-    handleOrderDetail (row) {
-      this.$refs.operaOrderDetail.open(row)
+    handleManualRefund (row) {
+      this.$refs.operaManualRefund.open(row)
+    },
+    handleExceptionDispatch (row) {
+      // 寮傚父娲惧崟閫昏緫
+      this.$message.info('寮傚父娲惧崟鍔熻兘寰呭疄鐜�')
+    },
+    handleOrderDetail (id) {
+      this.$refs.operaOrderDetail.open(id)
     }
   }
 }

--
Gitblit v1.9.3