Merge branch 'master' of http://47.107.245.0:3000/xiongxing/kyj-yanglao-web-new

src/views/elderly/restaurant/elderFood-order/index.vue

@@ -9,13 +9,25 @@
       class="-mb-15px"
     >
       <TenantSelect v-model="queryParams.tenantIds" placeholder="请选择院区" prop="tenantIds" />
-      <el-form-item label="楼栋名称" prop="buildName" label-width="80px">
-        <el-input v-model="queryParams.buildName" clearable />
+      <el-form-item label="长者名称" prop="elderName" label-width="70px">
+        <el-input v-model="queryParams.elderName" clearable class="!w-160px" />
       </el-form-item>
-      <el-form-item label="楼层名称" prop="floorName" label-width="80px">
-        <el-input v-model="queryParams.floorName" clearable />
+      <el-form-item label="楼栋名称" prop="buildName" label-width="70px">
+        <el-input v-model="queryParams.buildName" clearable class="!w-160px" />
       </el-form-item>
-      <el-form-item label="时间段" prop="orderFoodDateRange" label-width="60px">
+      <el-form-item label="楼层名称" prop="floorName" label-width="70px">
+        <el-input v-model="queryParams.floorName" clearable class="!w-160px" />
+      </el-form-item>
+      <el-form-item label="房间号" prop="roomNo" label-width="65px">
+        <el-input v-model="queryParams.roomNo" clearable class="!w-160px" />
+      </el-form-item>
+      <el-form-item label="A/B套餐" prop="extraDishesOption" label-width="80px">
+        <el-select v-model="queryParams.extraDishesOption" clearable class="!w-160px" placeholder="请选择">
+          <el-option label="A套餐" value="A" />
+          <el-option label="B套餐" value="B" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="时间段" prop="orderFoodDateRange" label-width="80px">
         <TgDatePicker
           type="daterange"
           v-model="queryParams.orderFoodDateRange"
@@ -72,32 +84,27 @@ const total = ref(0)
 const list = ref<any[]>([])
 const queryFormRef = ref()
 
-const queryParams = reactive({
+const queryParams = reactive<any>({
   pageNo: 1,
   pageSize: 10,
   tenantIds: userStore.orgTenantId,
   buildName:'',
   floorName:'',
+  roomNo: '',
+  elderName: '',
+  extraDishesOption: undefined as string | undefined,
   orderFoodDateRange: [] as string[] | undefined,
   orderFoodStartDate: undefined as string | undefined,
   orderFoodEndDate: undefined as string | undefined
 })
 
-const getWeekText = (dateStr?: string) => {
-  if (!dateStr) return '-'
-  const date = new Date(dateStr)
-  if (Number.isNaN(date.getTime())) return dateStr
-  const weekMap = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']
-  return `${dateStr}（${weekMap[date.getDay()]}）`
-}
-
 const elderFoodOrderColumns = reactive([
   { label: '长者姓名', field: 'elderName' },
   {
     label: '点餐日期',
     field: 'orderFoodDate',
   },
-    // formatter: (_: any, __: any, value: string, row: any) => value || getWeekText(row.orderFoodDate)
+  { label: 'A/B套餐', field: 'extraDishesOption' },
   { label: '附加菜名', field: 'extraDishes' },
 ])