From 6dfeb5a9e276e80819445229f126d572c16101e1 Mon Sep 17 00:00:00 2001
From: ctw <>
Date: Sun, 19 Jan 2025 17:41:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AF=8F=E6=AC=A1=E8=8F=9C=E5=93=81=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=B7=BB=E5=8A=A0=E7=82=B9=E5=87=BB=E8=A1=8C=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/admin/system/user/index.vue       |  3 +--
 src/views/canteen/canteenDailyMenu/form.vue | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/views/admin/system/user/index.vue b/src/views/admin/system/user/index.vue
index 314e2f9..be71f33 100644
--- a/src/views/admin/system/user/index.vue
+++ b/src/views/admin/system/user/index.vue
@@ -240,7 +240,6 @@ const excelUploadRef = ref()
 const queryRef = ref()
 const showSearch = ref(true)
 const inputPassword = ref()
-const isQueryAll = ref(false) // 是否查全部
 
 // 多选rows
 const selectObjs = ref([]) as any
@@ -254,7 +253,7 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 		username: "",
 		phone: "",
 	},
-	pageList: async () => await pageList(isQueryAll.value ? { ...state.queryForm, deptId: "" } : state.queryForm),
+	pageList: pageList,
 })
 const { getDataList, currentChangeHandle, sizeChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
diff --git a/src/views/canteen/canteenDailyMenu/form.vue b/src/views/canteen/canteenDailyMenu/form.vue
index 96825e9..17e878e 100644
--- a/src/views/canteen/canteenDailyMenu/form.vue
+++ b/src/views/canteen/canteenDailyMenu/form.vue
@@ -101,6 +101,8 @@
 			@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="index" label="#" width="50" align="center" />
@@ -112,7 +114,7 @@
 			</el-table-column>
 			<el-table-column prop="picUrl" label="商品封面图" align="center" show-overflow-tooltip>
 				<template #default="scope">
-					<preview-image :src="scope.row.picUrl" />
+					<preview-image @click.stop :src="scope.row.picUrl" />
 				</template>
 			</el-table-column>
 			<el-table-column prop="sort" label="排序字段" align="center" show-overflow-tooltip />
@@ -234,6 +236,20 @@ 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()