Merge remote-tracking branch 'origin/master'

src/views/canteen/canteenDailyMenu/form.vue

@@ -12,21 +12,9 @@
 				<p v-else>未知类型</p>
 			</el-form-item>
 
-			<!-- <el-form-item label="菜品" prop="spuId">
-				<el-select v-model="spuIds" placeholder="请选择菜品" multiple>
-					<el-option v-for="item in foodList" :key="item.id" :label="item.name" :value="item.id" />
-				</el-select>
-			</el-form-item> -->
-
 			<el-form-item label="选择菜品">
 				<el-button @click="handleClickSelect">选择菜品</el-button>
 			</el-form-item>
-
-			<!-- <el-col :span="12" class="mb20">
-				<el-form-item label="归属时间 1早餐 2午餐 3晚餐" prop="hourType">
-					<el-input v-model="form.hourType" placeholder="请输入归属时间 1早餐 2午餐 3晚餐" />
-				</el-form-item>
-			</el-col> -->
 		</el-form>
 
 		<h1 style="font-size: 16px; font-weight: bold; color: #000000; margin-top: 20px">预览</h1>
@@ -56,32 +44,23 @@
 		</table>
 
 		<template #footer>
-			<span class="dialog-footer">
+			<el-button @click="visible = false">取消</el-button>
-				<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
-				<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
-			</span>
 		</template>
 	</el-dialog>
 
 	<!-- 菜品选择对话框 -->
-	<el-dialog
+	<el-dialog v-model="selectDialogVisible" title="选择菜品" width="60%" :close-on-click-modal="false" draggable>
-		v-model="selectDialogVisible"
-		title="选择菜品"
-		width="60%"
-		:close-on-click-modal="false"
-		draggable
-		@close="() => (selectObjs = [])"
-	>
 		<el-row>
-			<el-form :model="foodQueryForm" ref="queryRef" :inline="true" @keyup.enter="getDataListAndSelect">
+			<el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
 				<el-form-item label="商品名称" prop="name">
-					<el-input placeholder="请输入商品名称" v-model="foodQueryForm.name" />
+					<el-input placeholder="请输入商品名称" v-model="state.queryForm.name" />
 				</el-form-item>
 				<el-form-item label="商品分类" prop="categoryId">
-					<select-ctcg v-model="foodQueryForm.categoryId" style="width: 200px" />
+					<select-ctcg v-model="state.queryForm.categoryId" style="width: 200px" />
 				</el-form-item>
 				<el-form-item>
-					<el-button icon="search" type="primary" @click="getDataListAndSelect">查询</el-button>
+					<el-button icon="search" type="primary" @click="getDataList">查询</el-button>
 					<el-button icon="Refresh" @click="resetQuery">重置</el-button>
 				</el-form-item>
 			</el-form>
@@ -89,17 +68,13 @@
 
 		<el-table
 			ref="foodMultipleTableRef"
-			:data="foodDataList"
+			:data="state.dataList"
 			v-loading="loading"
-			@select="handleSelect"
+			:row-key="(row: any) => row.id"
-			@select-all="handleSelectAll"
-			@selection-change="selectionChangeHandle"
-			:row-key="(row:any) => row.id"
-			:reserve-selection="true"
 			@row-click="rowClick"
 			:row-style="{ cursor: 'pointer' }"
 		>
-			<el-table-column type="selection" width="40" align="center" />
+			<el-table-column type="selection" width="40" reserve-selection align="center" />
 			<el-table-column type="index" label="#" width="50" align="center" />
 			<el-table-column prop="name" label="商品名称" width="100px" align="center" show-overflow-tooltip />
 			<el-table-column prop="categoryId" label="商品分类" width="100px" align="center" show-overflow-tooltip>
@@ -133,190 +108,68 @@
 			<el-table-column prop="salesCount" label="商品销量" align="center" show-overflow-tooltip />
 			<el-table-column prop="createTime" label="创建时间" align="center" show-overflow-tooltip />
 		</el-table>
-		<pagination
+		<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
-			@size-change="sizeChangeHandle"
-			@current-change="currentChangeHandle"
-			v-model:current-page="foodQueryForm.current"
-			v-model:page-size="foodQueryForm.size"
-			:total="total"
-		/>
 
 		<template #footer>
-			<div class="dialog-footer">
+			<el-button @click="selectDialogVisible = false">取消</el-button>
-				<el-button @click="selectDialogVisible = false">取消</el-button>
+			<el-button type="primary" @click="handleSelectDialogConfirm" :disabled="loading">确认</el-button>
-				<el-button type="primary" @click="handleSelectDialogConfirm" :disabled="loading">确认</el-button>
-			</div>
 		</template>
 	</el-dialog>
 </template>
 
 <script setup lang="ts" name="CanteenDailyMenuDialog">
-import { useMessage } from "/@/hooks/message"
+import { addObj, getCanteenDailyMenuList } from "/@/api/canteen/canteenDailyMenu"
-import { useDict } from "/@/hooks/dict"
-import { displayPrice } from "/@/utils/formatMoney"
 import { getAllSimple as getCanteenCategory } from "/@/api/canteen/canteenCategory"
-import { getObj, addObj, putObj, getCanteenDailyMenuList } from "/@/api/canteen/canteenDailyMenu"
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { useMessage } from "/@/hooks/message"
+import { displayPrice } from "/@/utils/formatMoney"
+import { useDict } from "/@/hooks/dict"
 
 const emit = defineEmits(["refresh"])
 
 const imageBaseUrl = import.meta.env.VITE_IMAGE_BASE_PATH
 const { spu_status } = useDict("spu_status")
-const dataFormRef = ref()
-const visible = ref(false)
 const queryRef = ref()
-const selectObjs = ref([]) as any // 表格多选的数据
+const dataFormRef = ref()
-const selectedFood = ref<any>([])
-const loading = ref(false)
 const foodMultipleTableRef = ref<any>() // 菜品多选表格ref
+const visible = ref(false)
 const selectDialogVisible = ref<boolean>(false) // 选择菜品对话框开关
-const categoryOptions = ref<any>([]) // 商品分类选项
 const dataRules = ref({}) // 定义校验规则
 const hoverIndex = ref<number>(-1) // 预览中hover的菜品索引
+const loading = ref(false)
+const categoryOptions = ref<any>([]) // 商品分类选项
 
 // 提交表单数据
 const form = reactive<any>({
-	id: "",
+	merchantId: "",
 	startTime: "",
 	hourType: "",
-	merchantId: "",
 })
-// 选择的菜品的数组ids
+const selectedFood = ref<any>([])
 const spuIds = computed(() => selectedFood.value?.map((item: any) => item.id))
 
-// 菜品查询表单
+const state: BasicTableProps = reactive<BasicTableProps>({
-const foodQueryForm = reactive<any>({
+	queryForm: {
-	current: 1,
+		merchantId: "",
-	size: 20,
+		startTime: "",
-	startTime: "",
+		hourType: "",
-	hourType: undefined,
+	},
+	pageList: getCanteenDailyMenuList,
+	dataList: [],
 })
-// 菜品列表
-const foodDataList = ref<any>([])
-const total = ref(0) // 菜品总数
-
-// 用来单击后保存数据状态
-function handleSelect(selectedRows: any[], row: any) {
-	selectObjs.value.findIndex((item: any) => item.id === row.id) === -1
-		? // selectObjs.value.indexOf(row) === -1
-		  selectObjs.value.push(row)
-		: selectObjs.value.splice(
-				// selectObjs.value.indexOf(row)
-				selectObjs.value.findIndex((item: any) => item.id === row.id),
-				1,
-		  )
-	console.log(selectObjs.value)
-}
-
-// 用来执行全选和反全选的数据状态保存
-function handleSelectAll(selectedRows: any[]) {
-	if (selectedRows.length > 0) {
-		selectedRows.forEach((row: any) => {
-			if (selectObjs.value.indexOf(row) === -1) {
-				selectObjs.value.push(row)
-			}
-		})
-	} else {
-		foodDataList.value.forEach((row: any) => {
-			const index = selectObjs.value.indexOf(row)
-			if (index !== -1) {
-				selectObjs.value.splice(index, 1)
-			}
-		})
-	}
-	console.log(selectObjs.value)
-}
-// 菜品表格多选
-const selectionChangeHandle = (objs: any) => {
-	// selectObjs.value = objs
-}
-
-// 点击表格行
-const rowClick = (row: any) => {
-	selectObjs.value.findIndex((item: any) => item.id === row.id) === -1
-		? // selectObjs.value.indexOf(row) === -1
-		  selectObjs.value.push(row)
-		: selectObjs.value.splice(
-				// selectObjs.value.indexOf(row)
-				selectObjs.value.findIndex((item: any) => item.id === row.id),
-				1,
-		  )
-	console.log(selectObjs.value)
-	foodMultipleTableRef.value.toggleRowSelection(row)
-}
-
-// 清空搜索条件
-const resetQuery = () => {
-	queryRef.value?.resetFields()
-	// 清空多选
-	selectObjs.value = []
-	foodQueryForm.current = 1
-	foodQueryForm.size = 20
-	getDataListAndSelect()
-}
-
-// 分页变化
-const sizeChangeHandle = (val: number) => {
-	foodQueryForm.size = val
-	// 再次发起查询操作
-	getDataListAndSelect()
-}
-const currentChangeHandle = (val: number) => {
-	foodQueryForm.current = val
-	getDataListAndSelect()
-}
-
-// 获取菜品数据并且勾选表格行
-const getDataListAndSelect = async () => {
-	loading.value = true
-
-	// 添加请求参数
-	foodQueryForm.startTime = form.startTime
-	foodQueryForm.hourType = form.hourType
-	foodQueryForm.merchantId = form.merchantId
-
-	const res = await getCanteenDailyMenuList(foodQueryForm).finally(() => (loading.value = false))
-	if (res.code === 0) {
-		foodDataList.value = res.data.records
-		total.value = res.data.total
-
-		// nextTick(() => {
-		// foodDataList.value.forEach((row: any) => {
-		// const index = selectObjs.value.indexOf(row)
-		const target = foodDataList.value.filter((row: any) => selectObjs.value.some((item: any) => row.id === item.id))
-		target.forEach((row: any) => nextTick(() => foodMultipleTableRef.value!.toggleRowSelection(row)))
-
-		// foodMultipleTableRef.value.toggleRowSelection(row, index !== -1)
-		// })
-		// })
-
-		// 转换菜品表格多选的选择状态
-		// if (foodDataList.value && foodDataList.value.length > 0 && selectedFood.value.length > 0) {
-		// 	const target = foodDataList.value.filter((row: any) => selectedFood.value.some((item: any) => row.id === item.id))
-		// 	target.forEach((row: any) => nextTick(() => foodMultipleTableRef.value!.toggleRowSelection(row)))
-		// } else {
-		// 	foodMultipleTableRef.value!.clearSelection()
-		// }
-	}
-}
 
 // 打开弹窗
-const openDialog = (id: string, time?: string, hourType?: number, merchantId?: number) => {
+const openDialog = (merchantId: string, time?: string, hourType?: number) => {
 	visible.value = true
-	form.id = ""
 
 	// 重置表单数据
 	dataFormRef.value?.resetFields()
-	foodQueryForm.current = 1
+	state.queryForm.merchantId = ""
-	foodQueryForm.size = 20
+	state.queryForm.startTime = ""
-	selectObjs.value = []
+	state.queryForm.hourType = ""
 	selectedFood.value = []
-	foodDataList.value = []
+	foodMultipleTableRef.value && foodMultipleTableRef.value.clearSelection()
 
-	// 获取canteenDailyMenu信息
-	if (id) {
-		form.id = id
-		getcanteenDailyMenuData(id)
-	}
 	if (time) {
 		form.startTime = time
 	}
@@ -326,29 +179,17 @@ const openDialog = (id: string, time?: string, hourType?: number, merchantId?: n
 	form.merchantId = merchantId
 }
 
-// 初始化表单数据
+// 点击选择菜品打开对话框
-const getcanteenDailyMenuData = (id: string) => {
-	// 获取数据
-	loading.value = true
-	getObj(id)
-		.then((res: any) => {
-			Object.assign(form, res.data)
-		})
-		.finally(() => {
-			loading.value = false
-		})
-}
-
-// 点击选择菜品
 const handleClickSelect = async () => {
 	queryRef.value?.resetFields()
-	foodQueryForm.current = 1
+	foodMultipleTableRef.value && foodMultipleTableRef.value.clearSelection()
-	foodQueryForm.size = 20
 	selectDialogVisible.value = true
 
-	selectObjs.value = [...selectedFood.value]
+	state.queryForm.merchantId = form.merchantId
+	state.queryForm.startTime = form.startTime
+	state.queryForm.hourType = form.hourType
 
-	await getDataListAndSelect() // 获取菜品数据并且勾选表格行
+	getDataList()
 	// 获取菜品分类
 	try {
 		const res = await getCanteenCategory()
@@ -360,10 +201,25 @@ const handleClickSelect = async () => {
 	}
 }
 
+const { getDataList, currentChangeHandle, sizeChangeHandle } = useTable(state)
+
+// 清空菜品列表搜索条件
+const resetQuery = () => {
+	queryRef.value?.resetFields()
+	getDataList()
+}
+
+// 点击表格行
+const rowClick = (row: any) => {
+	foodMultipleTableRef.value && foodMultipleTableRef.value.toggleRowSelection(row)
+}
+
 // 选择菜品点击确认
 const handleSelectDialogConfirm = () => {
 	selectDialogVisible.value = false
-	selectedFood.value = [...selectObjs.value]
+	const selectedRows = foodMultipleTableRef.value.getSelectionRows()
+	const selectedNewRows = selectedRows.filter((row: any) => !selectedFood.value.some((item: any) => item.id === row.id))
+	selectedFood.value = [...selectedFood.value, ...selectedNewRows]
 }
 
 // 移除预览
@@ -383,8 +239,8 @@ const onSubmit = async () => {
 
 	try {
 		loading.value = true
-		form.id ? await putObj({ ...form, spuIds: spuIds.value }) : await addObj({ ...form, spuIds: spuIds.value })
+		await addObj({ ...form, spuIds: spuIds.value })
-		useMessage().success(form.id ? "修改成功" : "添加成功")
+		useMessage().success("添加成功")
 		visible.value = false
 		emit("refresh")
 	} catch (err: any) {

src/views/canteen/canteenDailyMenu/index.vue

@@ -127,7 +127,7 @@ const addFood = async (hourType: number) => {
 		return
 	}
 	//打开新增框
-	formDialogRef.value.openDialog(null, timedata, hourType, merchantId.value)
+	formDialogRef.value.openDialog(merchantId.value, timedata, hourType)
 }
 //选中具体时间数据
 const timeClick = async (time: string, index: number) => {