From 937fdf799ac94768d768231d82251199bfb35882 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Wed, 30 Jul 2025 09:14:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/canteen/dish/menu/index.vue | 7 ++++---
 src/views/system/user/index.vue       | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/views/canteen/dish/menu/index.vue b/src/views/canteen/dish/menu/index.vue
index 587832ef..5c1029ac 100644
--- a/src/views/canteen/dish/menu/index.vue
+++ b/src/views/canteen/dish/menu/index.vue
@@ -146,7 +146,7 @@
             <el-table-column label="菜品数量" align="center" prop="dishesCount" v-if="activeName=='pageRecipe'"/>
             <el-table-column label="菜谱生效日期" align="center" prop="applyDateStringList" v-if="activeName=='pageRecipe'">
                 <template slot-scope="scope" v-if="activeName=='pageRecipe'">
-                    <el-popover placement="top" width="400">
+                    <el-popover placement="top" width="400" v-if="scope.row.applyDateStringList&&scope.row.applyDateStringList.length>0">
                         <div style="width: 100%;padding: 10px;border-bottom: 1px solid #ccc;margin-bottom: 10px;">
                             {{currentMonth}}
                         </div>
@@ -154,10 +154,11 @@
                             <div  v-for="(item,index) in currentWeekList" :key="index" style="width: 14%;text-align: center;">{{item}}</div>
                         </div>
                         <div style="width: 100%;display: flex;align-items: center;margin-bottom: 10px;flex-wrap: wrap;">
-                            <div v-for="(item,index) in monthDaysList" :key="index" :class="scope.row.applyDateStringList.findIndex(v=>v==item)>-1 ? 'dateTable2' : 'dateTable'" class="" >{{item}}</div>
+                            <div v-for="(item,index) in monthDaysList" :key="index" :class="scope.row.applyDateStringList.findIndex(v=>v==item)>-1 ? 'dateTable2' : 'dateTable'">{{item}}</div>
                         </div>
-                    <div style="color: #1890ff;cursor: pointer;" slot="reference">查看详情</div>
+                        <div style="color: #1890ff;cursor: pointer;" slot="reference">查看详情</div>
                     </el-popover>
+                    <span v-else>无</span>
                 </template>
             </el-table-column>
             <!-- <el-table-column label="用户范围" align="center" prop="effName" v-if="activeName=='pageRecipe'"/> -->
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index f1157c9f..cf529c3f 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -410,7 +410,7 @@
                             <el-input
                                 v-model="form.userCode"
                                 placeholder="请输入用户编码"
-                                maxlength="30"
+                                maxlength="30" @input="(v)=>(form.userCode=v.replace(/[^\d]/g,''))"
                             />
                         </el-form-item>
                     </el-col>