Merge remote-tracking branch 'origin/master'

src/views/canteen/canteenDailyMenu/form.vue

@@ -33,12 +33,7 @@
 		<table>
 			<tr class="food">
 				<div class="food_list" @mouseleave="hoverIndex = -1">
-					<td
-						class="food_list_item"
-						v-for="(item, index) in selectedFood"
-						:key="item.id"
-						@mouseenter="hoverIndex = index"
-					>
+					<td class="food_list_item" v-for="(item, index) in selectedFood" :key="item.id" @mouseenter="hoverIndex = index">
 						<el-icon
 							v-show="hoverIndex === index"
 							@click="removeSelectedItem(item.id)"
@@ -157,7 +152,6 @@
 
 <script setup lang="ts" name="CanteenDailyMenuDialog">
 import { useMessage } from "/@/hooks/message"
-import { rule } from "/@/utils/validate"
 import { useDict } from "/@/hooks/dict"
 import { displayPrice } from "/@/utils/formatMoney"
 import { getAllSimple as getCanteenCategory } from "/@/api/canteen/canteenCategory"
@@ -192,7 +186,7 @@ const spuIds = computed(() => selectedFood.value?.map((item: any) => item.id))
 // 菜品查询表单
 const foodQueryForm = reactive<any>({
 	current: 1,
-	size: 10,
+	size: 20,
 	startTime: "",
 	hourType: undefined,
 })
@@ -256,7 +250,7 @@ const resetQuery = () => {
 	// 清空多选
 	selectObjs.value = []
 	foodQueryForm.current = 1
-	foodQueryForm.size = 10
+	foodQueryForm.size = 20
 	getDataListAndSelect()
 }
 
@@ -313,7 +307,7 @@ const openDialog = (id: string, time?: string, hourType?: number, merchantId?: n
 	// 重置表单数据
 	dataFormRef.value?.resetFields()
 	foodQueryForm.current = 1
-	foodQueryForm.size = 10
+	foodQueryForm.size = 20
 	selectObjs.value = []
 	selectedFood.value = []
 	foodDataList.value = []
@@ -349,7 +343,7 @@ const getcanteenDailyMenuData = (id: string) => {
 const handleClickSelect = async () => {
 	queryRef.value?.resetFields()
 	foodQueryForm.current = 1
-	foodQueryForm.size = 10
+	foodQueryForm.size = 20
 	selectDialogVisible.value = true
 
 	selectObjs.value = [...selectedFood.value]

src/views/canteen/canteenOnlineCategory/form.vue

@@ -4,7 +4,7 @@
 			<el-row :gutter="24">
 				<el-col :span="14" class="mb20">
 					<el-form-item label="商户" prop="merchantId">
-						<select-mch v-model="form.merchantId" />
+						<select-mch v-model="form.merchantId" :apiParams="{ types: '1' }" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="14" class="mb20">

src/views/canteen/canteenOnlineSpu/form.vue

@@ -4,7 +4,7 @@
 			<el-row :gutter="24">
 				<el-col :span="14" class="mb20">
 					<el-form-item label="商户" prop="merchantId">
-						<select-mch v-model="form.merchantId" />
+						<select-mch v-model="form.merchantId" :apiParams="{ types: '1' }" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="14" class="mb20">
@@ -50,9 +50,7 @@
 				<el-col :span="24" class="mb20">
 					<el-form-item label="商品状态" prop="status">
 						<el-radio-group v-model="form.status">
-							<el-radio :label="item.value" v-for="(item, index) in spu_status" border :key="index"
-								>{{ item.label }}
-							</el-radio>
+							<el-radio :label="item.value" v-for="(item, index) in spu_status" border :key="index">{{ item.label }} </el-radio>
 						</el-radio-group>
 					</el-form-item>
 				</el-col>