diff --git a/src/views/admin/system/user/index.vue b/src/views/admin/system/user/index.vue index 94c5dfb..82b2ed9 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 @@ -255,7 +254,7 @@ const state: BasicTableProps = reactive({ phone: "", isDeepDept: false, }, - 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' }" > @@ -112,7 +114,7 @@ @@ -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()