From 8e96b820c04571e2db816f2bcb373d7215c143dd Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 24 九月 2024 16:20:32 +0800
Subject: [PATCH] 装机 拆机 仅显示当天的作业
---
src/views/ecg/doctor/DevDismantle.vue | 8 +++++---
src/utils/dateUtil.ts | 8 ++++++++
.env.prod | 2 +-
src/views/ecg/doctor/components/DevInstallPanel.vue | 7 ++++++-
4 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/.env.prod b/.env.prod
index 842ba61..11a812f 100644
--- a/.env.prod
+++ b/.env.prod
@@ -4,7 +4,7 @@
VITE_DEV=false
# 璇锋眰璺緞
-VITE_BASE_URL='http://localhost:48080'
+VITE_BASE_URL='http://api.jh.lihu.com'
# 鏂囦欢涓婁紶绫诲瀷锛歴erver - 鍚庣涓婁紶锛� client - 鍓嶇鐩磋繛涓婁紶锛屼粎鏀寔S3鏈嶅姟
VITE_UPLOAD_TYPE=server
diff --git a/src/utils/dateUtil.ts b/src/utils/dateUtil.ts
index 316b870..66d0012 100644
--- a/src/utils/dateUtil.ts
+++ b/src/utils/dateUtil.ts
@@ -15,4 +15,12 @@
return dayjs(date).format(format)
}
+export function curDayStart() {
+ return dayjs().startOf('date').format(DATE_TIME_FORMAT)
+}
+
+export function curDayEnd() {
+ return dayjs().endOf('date').format(DATE_TIME_FORMAT)
+}
+
export const dateUtil = dayjs
diff --git a/src/views/ecg/doctor/DevDismantle.vue b/src/views/ecg/doctor/DevDismantle.vue
index db8c5f4..bfc89c7 100644
--- a/src/views/ecg/doctor/DevDismantle.vue
+++ b/src/views/ecg/doctor/DevDismantle.vue
@@ -63,7 +63,8 @@
<el-table-column label="id" align="center" prop="id" />
<el-table-column label="鎷嗘満鎯呭喌" align="center" prop="lost" >
<template #default="scope">
- {{scope.row.lost == 1 ? "閬楀け" : "瀹屾垚"}}
+ <span v-if="scope.row.jobType === 20">"宸叉媶鏈�"</span>
+ <span v-if="scope.row.jobType === 40">"宸查仐澶�"</span>
</template>
</el-table-column>
<!-- <el-table-column label="浣滀笟绫诲瀷" align="center" prop="jobType" />-->
@@ -125,6 +126,7 @@
import {dateFormatter} from "@/utils/formatTime";
import {JobRecordApi, JobRecordVO} from "@/api/ecg/jobrecord";
import {isStringEmpty} from "@/utils/stringUtil";
+import {curDayEnd, curDayStart} from "@/utils/dateUtil";
/** 瑁呮満鎷嗘満 琛ㄥ崟 */
defineOptions({ name: 'DevrDismantle' })
@@ -244,13 +246,13 @@
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
- jobType: 1,
+ jobType: [20, 40],
docId: undefined,
docName: undefined,
devId: undefined,
patId: undefined,
patName: undefined,
- jobTime: [],
+ jobTime: [curDayStart(), curDayEnd()],
summary: undefined,
remark: undefined,
createTime: []
diff --git a/src/views/ecg/doctor/components/DevInstallPanel.vue b/src/views/ecg/doctor/components/DevInstallPanel.vue
index 7361809..9a70bf5 100644
--- a/src/views/ecg/doctor/components/DevInstallPanel.vue
+++ b/src/views/ecg/doctor/components/DevInstallPanel.vue
@@ -106,6 +106,7 @@
import {dateFormatter, timeFormatter} from "@/utils/formatTime";
import {JobRecordApi, JobRecordVO} from "@/api/ecg/jobrecord";
import {DeviceApi, DeviceVO} from "@/api/ecg/devmanage";
+import {curDayEnd, curDayStart} from "@/utils/dateUtil";
/** 瑁呮満鎷嗘満 琛ㄥ崟 */
defineComponent({ name: 'DevInstallPanel' })
@@ -212,6 +213,10 @@
remark: undefined
}
formRef.value?.resetFields()
+
+ deviceInfo.value.category = ''
+ deviceInfo.value.brand = ''
+ deviceInfo.value.model = ''
}
const setPatient = (queueVO: QueueVO | undefined) => {
@@ -233,7 +238,7 @@
devId: undefined,
patId: undefined,
patName: undefined,
- jobTime: [],
+ jobTime: [curDayStart(), curDayEnd()],
summary: undefined,
remark: undefined,
createTime: []
--
Gitblit v1.9.3