From 73032dfe709d947f7d941eb5d49eac8af4946868 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Wed, 12 Mar 2025 17:23:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E8=B0=B1=E7=AE=A1=E7=90=862?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dish/menu/index.vue | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/views/dish/menu/index.vue b/src/views/dish/menu/index.vue
index 82910601..0156b32e 100644
--- a/src/views/dish/menu/index.vue
+++ b/src/views/dish/menu/index.vue
@@ -75,30 +75,39 @@
   
         <el-table v-loading="loading" :data="tableListData" height="800">
             <el-table-column label="序号" align="center" width="80" type="index">
-                  <template slot-scope="scope">
-                      <span>{{(queryParams.pageNum - 1) * 10 + scope.$index + 1}}</span>
-                  </template>
+                <template slot-scope="scope">
+                    <span>{{(queryParams.pageNum - 1) * 10 + scope.$index + 1}}</span>
+                </template>
             </el-table-column>
             <el-table-column label="区域名称" align="center" prop="areaName" />
             <el-table-column label="食堂名称" align="center" prop="canteenName" />
             <el-table-column label="档口名称" align="center" prop="stallName" />
             <el-table-column label="菜谱名称" align="center" prop="recipeName" />
 
-            <el-table-column v-for="item in mealTimeList" :key="item.mealtimeType" :label="item.mealtimeName" align="center">
+            <el-table-column v-for="item in mealTimeList" :key="item.mealtimeType" :label="item.mealtimeName" align="center" v-if="activeName=='currentRecipe'">
                 <template slot-scope="scope">
                     <div v-if="scope.row.detail&&scope.row.detail.details.length>0">
                         <div v-for="subItem in scope.row.detail.details" :key="subItem.detailId">
                             <div v-if="subItem.mealtimeType==item.mealtimeType">
-                                <span v-for="lastItem in subItem.dishesList" :key="lastItem.dishesId">{{ lastItem.typeName }}</span>
+                                <div v-for="lastItem in subItem.dishesList" :key="lastItem.dishesId">{{ lastItem.dishesName }}</div>
                             </div>
                         </div> 
                     </div>
                     
                 </template>
             </el-table-column> 
-            <el-table-column label="菜谱更新时间" align="center" prop="uptime" />
+            <el-table-column label="菜谱更新时间" align="center" prop="uptime" v-if="activeName=='currentRecipe'"/>
 
-            
+            <el-table-column label="菜谱类型" align="center" prop="recipeType" v-if="activeName=='pageRecipe'"> 
+                <template slot-scope="scope">
+                    <span v-if="scope.row.recipeType==1">指定日期菜谱</span>
+                    <span v-if="scope.row.recipeType==2">每日循环菜谱</span>
+                    <span v-if="scope.row.recipeType==3">每周循环菜谱</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="菜品数量" align="center" prop="dishesCount" v-if="activeName=='pageRecipe'"/>
+            <el-table-column label="菜谱生效时间" align="center" prop="applyDateStringList" v-if="activeName=='pageRecipe'"/>
+            <el-table-column label="用户范围" align="center" prop="effName" v-if="activeName=='pageRecipe'"/>
             
             <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">
             <template slot-scope="scope">