From 00c657c1f695771d625e28d958bd3e57fb56da58 Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期六, 03 五月 2025 19:46:20 +0800
Subject: [PATCH] feat: 新增发票和评价

---
 ruoyi-ui/src/views/system/order/detail.vue |   55 ++++++++++++++++++++++++++++++-------------------------
 1 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/ruoyi-ui/src/views/system/order/detail.vue b/ruoyi-ui/src/views/system/order/detail.vue
index b2aded4..12c64c6 100644
--- a/ruoyi-ui/src/views/system/order/detail.vue
+++ b/ruoyi-ui/src/views/system/order/detail.vue
@@ -97,44 +97,43 @@
               style="width: 100%"
               :size="isMobile ? 'mini' : 'medium'"
               class="responsive-table">
-              <el-table-column prop="paymentNo" label="鏀舵娴佹按" min-width="120" />
-              <el-table-column prop="paymentTime" label="鏀舵鏃堕棿" min-width="140" />
-              <el-table-column prop="amount" label="閲戦" min-width="100" />
-              <el-table-column prop="method" label="鏂瑰紡" min-width="100" />
-              <el-table-column prop="remark" label="澶囨敞" min-width="120" />
+              <el-table-column prop="id" label="鏀舵娴佹按" min-width="120" />
+              <el-table-column 
+                prop="paidMoneyTime" 
+                label="鏀舵鏃堕棿" 
+                min-width="140"
+                :formatter="(row, column, cellValue) => formatDateTime(cellValue)"
+              />
+              <el-table-column prop="paidMoney" label="閲戦(鍏�)" min-width="100" />
+              <el-table-column prop="vtext" label="鏂瑰紡" min-width="100" />
+              <el-table-column prop="paidMoneyMono" label="澶囨敞" min-width="120" />
             </el-table>
           </el-card>
         </el-col>
       </el-row>
 
-      <!-- 杩愯鎯呭喌 -->
-      <el-row>
-        <el-col :span="24">
+      
+      <!-- 璁㈠崟鎯呭喌 -->
+      <el-row :gutter="20">
+        <!-- 璋冨害淇℃伅 -->
+        <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
           <el-card class="inner-card">
-            <div slot="header">
-              <b>杩愯鎯呭喌</b>
-              <span style="float: right">{{dispatchInfo.carLicense}}</span>
-            </div>
-            <el-table
-              :data="operationInfo"
-              border
-              style="width: 100%"
-              :size="isMobile ? 'mini' : 'medium'"
-              class="responsive-table">
-              <el-table-column prop="status" label="鍑鸿溅鐘舵��" min-width="100" />
-              <el-table-column prop="operator" label="鎿嶄綔浜�" min-width="100" />
-              <el-table-column prop="operateTime" label="鎿嶄綔鏃堕棿" min-width="140" />
-              <el-table-column prop="location" label="鍧愭爣浣嶇疆" min-width="200" show-overflow-tooltip />
-            </el-table>
+            <div slot="header"><b>璇︽儏</b></div>
+            <el-descriptions :column="isMobile ? 1 : 2" border>
+              <el-descriptions-item label="鏈嶅姟璇勪环">{{ otherInfo.serviceOrdVisit }}</el-descriptions-item>
+              <el-descriptions-item label="鍙戠エ鐘舵��">{{ otherInfo.invoiceStatus }}</el-descriptions-item>
+            </el-descriptions>
           </el-card>
         </el-col>
       </el-row>
+
     </el-card>
   </div>
 </template>
 
 <script>
 import { getOrderDetail } from '@/api/system/order'
+import { parseTime } from '@/utils/ruoyi'
 
 export default {
   name: 'OrderDetail',
@@ -147,7 +146,7 @@
       medicalInfo: {},
       dispatchInfo: {},
       paymentInfo: [],
-      operationInfo: [],
+      otherInfo: [],
       screenWidth: document.documentElement.clientWidth // 灞忓箷瀹藉害
     }
   },
@@ -178,7 +177,7 @@
         this.medicalInfo = data.medicalInfo || {}
         this.dispatchInfo = data.dispatchInfo || {}
         this.paymentInfo = data.paymentInfo || []
-        this.operationInfo = data.operationInfo || []
+        this.otherInfo = data.otherInfo || []
 
         console.log(this.orderInfo)
 
@@ -187,6 +186,12 @@
     // 澶勭悊绐楀彛澶у皬鍙樺寲
     handleResize() {
       this.screenWidth = document.documentElement.clientWidth
+    },
+    formatDateTime(time) {
+      if (!time) {
+        return '';
+      }
+      return parseTime(time, '{y}-{m}-{d} {h}:{i}:{s}');
     }
   }
 }

--
Gitblit v1.9.1