Просмотр исходного кода

长者点餐选择菜品增加为3个(糖餐)

xiongxing 1 месяц назад
Родитель
Сommit
6c133299cc

+ 3 - 2
src/views/elderly/restaurant/elderFood-order/index.vue

@@ -21,10 +21,11 @@
       <el-form-item label="房间号" prop="roomNo" label-width="65px">
         <el-input v-model="queryParams.roomNo" clearable class="!w-150px" />
       </el-form-item>
-      <el-form-item label="A/B套餐" prop="extraDishesOption" label-width="80px">
+      <el-form-item label="套餐类型" prop="extraDishesOption" label-width="80px">
         <el-select v-model="queryParams.extraDishesOption" clearable class="!w-150px" placeholder="请选择">
           <el-option label="A套餐" value="A" />
           <el-option label="B套餐" value="B" />
+          <el-option label="糖餐" value="糖" />
         </el-select>
       </el-form-item>
       <el-form-item label="时间段" prop="orderFoodDateRange" label-width="80px">
@@ -104,7 +105,7 @@ const elderFoodOrderColumns = reactive([
     label: '点餐日期',
     field: 'orderFoodDate',
   },
-  { label: 'A/B套餐', field: 'extraDishesOption' },
+  { label: '套餐类型', field: 'extraDishesOption' },
   { label: '附加菜名', field: 'extraDishes' },
 ])
 

+ 37 - 14
src/views/system/food/CateringPlan/AddForm.vue

@@ -153,11 +153,11 @@
             :options="foodLists"
             :props="{ label: 'foodName', value: 'foodName' }"
             multiple
-            :multiple-limit="2"
+            :multiple-limit="3"
             collapse-tags
             collapse-tags-tooltip
             v-model="scope.row.mondayExtra"
-            placeholder="附加菜品(最多2个)"
+            placeholder="附加菜品(最多3个)"
             style="width: 100%; margin-top: 6px"
           />
         </template>
@@ -182,11 +182,11 @@
             :options="foodLists"
             :props="{ label: 'foodName', value: 'foodName' }"
             multiple
-            :multiple-limit="2"
+            :multiple-limit="3"
             collapse-tags
             collapse-tags-tooltip
             v-model="scope.row.tuesdayExtra"
-            placeholder="附加菜品(最多2个)"
+            placeholder="附加菜品(最多3个)"
             style="width: 100%; margin-top: 6px"
           />
         </template>
@@ -211,11 +211,11 @@
             :options="foodLists"
             :props="{ label: 'foodName', value: 'foodName' }"
             multiple
-            :multiple-limit="2"
+            :multiple-limit="3"
             collapse-tags
             collapse-tags-tooltip
             v-model="scope.row.wednesdayExtra"
-            placeholder="附加菜品(最多2个)"
+            placeholder="附加菜品(最多3个)"
             style="width: 100%; margin-top: 6px"
           />
         </template>
@@ -240,11 +240,11 @@
             :options="foodLists"
             :props="{ label: 'foodName', value: 'foodName' }"
             multiple
-            :multiple-limit="2"
+            :multiple-limit="3"
             collapse-tags
             collapse-tags-tooltip
             v-model="scope.row.thursdayExtra"
-            placeholder="附加菜品(最多2个)"
+            placeholder="附加菜品(最多3个)"
             style="width: 100%; margin-top: 6px"
           />
         </template>
@@ -269,11 +269,11 @@
             :options="foodLists"
             :props="{ label: 'foodName', value: 'foodName' }"
             multiple
-            :multiple-limit="2"
+            :multiple-limit="3"
             collapse-tags
             collapse-tags-tooltip
             v-model="scope.row.fridayExtra"
-            placeholder="附加菜品(最多2个)"
+            placeholder="附加菜品(最多3个)"
             style="width: 100%; margin-top: 6px"
           />
         </template>
@@ -298,11 +298,11 @@
             :options="foodLists"
             :props="{ label: 'foodName', value: 'foodName' }"
             multiple
-            :multiple-limit="2"
+            :multiple-limit="3"
             collapse-tags
             collapse-tags-tooltip
             v-model="scope.row.saturdayExtra"
-            placeholder="附加菜品(最多2个)"
+            placeholder="附加菜品(最多3个)"
             style="width: 100%; margin-top: 6px"
           />
         </template>
@@ -327,11 +327,11 @@
             :options="foodLists"
             :props="{ label: 'foodName', value: 'foodName' }"
             multiple
-            :multiple-limit="2"
+            :multiple-limit="3"
             collapse-tags
             collapse-tags-tooltip
             v-model="scope.row.sundayExtra"
-            placeholder="附加菜品(最多2个)"
+            placeholder="附加菜品(最多3个)"
             style="width: 100%; margin-top: 6px"
           />
         </template>
@@ -410,6 +410,28 @@ const isLunchMeal = (mealTimes?: string) => {
   return mealTimes === '中餐' || mealTimes === '午餐'
 }
 
+const normalizeExtraDishes = (bean) => {
+  const extraFields = [
+    'mondayExtra',
+    'tuesdayExtra',
+    'wednesdayExtra',
+    'thursdayExtra',
+    'fridayExtra',
+    'saturdayExtra',
+    'sundayExtra'
+  ]
+
+  extraFields.forEach((field) => {
+    if (!Array.isArray(bean[field])) {
+      bean[field] = []
+      return
+    }
+    if (bean[field].length > 3) {
+      bean[field] = bean[field].slice(0, 3)
+    }
+  })
+}
+
 const createMealItem = (mealTimes: string, indexs?: number) => {
   const base = {
     mealTimes,
@@ -463,6 +485,7 @@ const parseWeekFields = (bean) => {
       bean[field] = []
     }
   })
+  normalizeExtraDishes(bean)
 }
 
 const stringifyWeekFields = (bean) => {