From 088d20c1f664bae877005b65d4ce5aae7fe7083e Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Thu, 26 Jun 2025 16:21:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/canteen/order/offlineManagement/index.vue       | 8 +++++++-
 src/views/canteen/order/reserveManagement/index.vue       | 8 +++++++-
 src/views/canteen/reportCenter/tradeSumByDishes/index.vue | 6 +++---
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/views/canteen/order/offlineManagement/index.vue b/src/views/canteen/order/offlineManagement/index.vue
index 096de922..516499c3 100644
--- a/src/views/canteen/order/offlineManagement/index.vue
+++ b/src/views/canteen/order/offlineManagement/index.vue
@@ -343,7 +343,13 @@
 
                 <el-descriptions-item>
                     <template slot="label">	订单状态</template>
-                    <dict-tag :options="dict.type.sm_order_status" :value="orderInfoData.orderState"/> 
+                    <span v-if="orderInfoData.orderState==1">已下单</span>
+                    <span v-if="orderInfoData.orderState==2">已完成</span>
+                    <span v-if="orderInfoData.orderState==3&&orderInfoData.payState==3">已退单</span>
+                    <span v-if="orderInfoData.orderState==3&&orderInfoData.payState==4">已取消</span>
+                    <span v-if="orderInfoData.orderState==4">待下单</span>
+                    <span v-if="orderInfoData.orderState==5">部分退单</span> 
+                    <!-- <dict-tag :options="dict.type.sm_order_status" :value="orderInfoData.orderState"/>  -->
                 </el-descriptions-item>
                 <!-- <el-descriptions-item>
                     <template slot="label">	流水号</template>
diff --git a/src/views/canteen/order/reserveManagement/index.vue b/src/views/canteen/order/reserveManagement/index.vue
index 7c8350a8..b43b0b75 100644
--- a/src/views/canteen/order/reserveManagement/index.vue
+++ b/src/views/canteen/order/reserveManagement/index.vue
@@ -326,7 +326,13 @@
 
               <el-descriptions-item>
                   <template slot="label">	订单状态</template> 
-                  <dict-tag :options="dict.type.sm_order_status" :value="orderInfoData.orderState"/> 
+                    <span v-if="orderInfoData.orderState==1">已下单</span>
+                    <span v-if="orderInfoData.orderState==2">已完成</span>
+                    <span v-if="orderInfoData.orderState==3&&orderInfoData.payState==3">已退单</span>
+                    <span v-if="orderInfoData.orderState==3&&orderInfoData.payState==4">已取消</span>
+                    <span v-if="orderInfoData.orderState==4">待下单</span>
+                    <span v-if="orderInfoData.orderState==5">部分退单</span> 
+                  <!-- <dict-tag :options="dict.type.sm_order_status" :value="orderInfoData.orderState"/>  -->
               </el-descriptions-item>
               <el-descriptions-item>
                   <template slot="label">	备注</template>
diff --git a/src/views/canteen/reportCenter/tradeSumByDishes/index.vue b/src/views/canteen/reportCenter/tradeSumByDishes/index.vue
index 22cbacc0..dd713b80 100644
--- a/src/views/canteen/reportCenter/tradeSumByDishes/index.vue
+++ b/src/views/canteen/reportCenter/tradeSumByDishes/index.vue
@@ -77,10 +77,10 @@
                 <span>{{ (scope.row.dinnerConsumeCount/100).toFixed(2) }}</span>
             </template> 
         </el-table-column> 
-        <el-table-column label="夜宵数量" align="center" prop="otherQuantityCount" :show-overflow-tooltip="true" /> 
-        <el-table-column label="夜宵金额" align="center" prop="otherConsumeCount" :show-overflow-tooltip="true" >
+        <el-table-column label="夜宵数量" align="center" prop="midnightSnackQuantityCount" :show-overflow-tooltip="true" /> 
+        <el-table-column label="夜宵金额" align="center" prop="midnightSnackConsumeCount" :show-overflow-tooltip="true" >
             <template slot-scope="scope">
-                <span>{{ (scope.row.otherConsumeCount/100).toFixed(2) }}</span>
+                <span>{{ (scope.row.midnightSnackConsumeCount/100).toFixed(2) }}</span>
             </template> 
         </el-table-column>
       </el-table>