diff --git a/SafeCampus.WEB/src/views/attendance/studentsReturn/components/returnConfirm/index.vue b/SafeCampus.WEB/src/views/attendance/studentsReturn/components/returnConfirm/index.vue index 5984390..f792cd6 100644 --- a/SafeCampus.WEB/src/views/attendance/studentsReturn/components/returnConfirm/index.vue +++ b/SafeCampus.WEB/src/views/attendance/studentsReturn/components/returnConfirm/index.vue @@ -120,6 +120,7 @@ async function personConfirm(list:any, msg: string) { } }) await useHandleData(attendanceApi.add, list, msg); + propsInfo.successful() RefreshTable(); //刷新表格 } /** 关闭表单*/ diff --git a/SafeCampus.WEB/src/views/attendance/studentsReturn/components/returnDetail/index.vue b/SafeCampus.WEB/src/views/attendance/studentsReturn/components/returnDetail/index.vue new file mode 100644 index 0000000..181acb6 --- /dev/null +++ b/SafeCampus.WEB/src/views/attendance/studentsReturn/components/returnDetail/index.vue @@ -0,0 +1,128 @@ + + + + + + + \ No newline at end of file diff --git a/SafeCampus.WEB/src/views/attendance/studentsReturn/index.vue b/SafeCampus.WEB/src/views/attendance/studentsReturn/index.vue index 8aeb719..53d4529 100644 --- a/SafeCampus.WEB/src/views/attendance/studentsReturn/index.vue +++ b/SafeCampus.WEB/src/views/attendance/studentsReturn/index.vue @@ -47,10 +47,12 @@ + + @@ -59,6 +61,7 @@ import { userManageDormitoryApi } from "@/api"; import { ColumnProps, ProTableInstance } from "@/components/ProTable/interface"; import { FormOptEnum } from "@/enums"; import ReturnConfirm from "./components/returnConfirm/index.vue"; +import ReturnDetail from "./components/returnDetail/index.vue"; const proTable = ref(); /**左侧楼栋**/ import TreeFilter from "@/components/TreeFilter/index.vue"; @@ -137,6 +140,7 @@ const columns: ColumnProps[] = [ { prop: "operation", label: "操作", width: 250, fixed: "right" } ]; const ReturnConfirmRef = ref | null>(null); +const ReturnDetailRef = ref | null>(null); /** * 人工确认 * @param opt 操作类型 @@ -153,6 +157,17 @@ function onOpen(opt: FormOptEnum, record = {}) { break; } } +function onOpen1(opt: FormOptEnum, record = {}) { + switch (opt) { + case FormOptEnum.VIEW: + ReturnDetailRef.value?.onOpen({ + opt: opt, + record: { ...record, ReturnTime: ReturnTime.value || ReturnTimeDefault }, + successful: RefreshTable + }); + break; + } +} // 刷新表格 const RefreshTable = () => { proTable.value?.refresh();