Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud

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
@@ -255,7 +254,7 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 		phone: "",
 		isDeepDept: false,
 	},
-	pageList: async () => await pageList(isQueryAll.value ? { ...state.queryForm, deptId: "" } : state.queryForm),
+	pageList: pageList,
 })
 const { getDataList, currentChangeHandle, sizeChangeHandle, downBlobFile, tableStyle } = useTable(state)
 

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()