报餐功能-截止时间1

fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/meal/mealApplication.vue

@@ -4,16 +4,15 @@
     <van-nav-bar title="报餐" left-text="返回"  @click-left="back" fixed  placeholder  left-arrow/>
   </div>
   <div class="meal-application">
-    <!-- 上方tab页签：晚餐/夜宵 -->
+
     <van-tabs v-model:active="mealType" @change="onMealTypeChange">
       <van-tab v-for="item in meals"
                :key="item.id"
-               :title="item.name"
-               :name="item.id"></van-tab>
-
+               :title="item.name + (item.deadlineTime ? ' (申报截止时间:' + item.deadlineTime + ')' : '')"
+               :name="item.id">
+      </van-tab>
     </van-tabs>
 
-    <!-- 下方tab页签：南厂/北厂 -->
     <van-tabs v-model:active="factory" @change="onFactoryChange">
       <van-tab
           v-for="item in factories"
@@ -29,7 +28,6 @@
       <div v-if="qrcodeUrl && qrStatus== 0" class="qrcode-content">
         <img :src="qrcodeUrl" alt="二维码" class="qrcode-image" />
         <p class="qrcode-tip">请扫描此二维码</p>
-
       </div>
       <div v-else-if="qrcodeUrl && qrStatus== 1" class="qrcode-content">
         <img :src="qrcodeUrl" alt="二维码" class="qrcode-image" />
@@ -166,6 +164,7 @@
             return {
               id: item.id,
               name: item.name,
+              deadlineTime: item.deadlineTime,
             }
           })
           // 设置默认选中第一个

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/settings/mealTypeSetting.vue

@@ -15,7 +15,7 @@
       <el-table :data="tableData" border style="width: 100%;">
         <el-table-column  type="index" label="序号" width="80" align="center"></el-table-column>
         <el-table-column prop="name" label="餐别名称" align="center"></el-table-column>
-        <el-table-column prop="deadlineTime" label="申报截止日期" align="center"></el-table-column>
+        <el-table-column prop="deadlineTime" label="申报截止时间" align="center"></el-table-column>
         <el-table-column label="是否启用" width="120" align="center">
           <template slot-scope="scope">
             <el-tag :type="scope.row.isActive === 1 ? 'success' : 'danger'">