From 301715cbd60a92a6581967c8df912acf5c03d955 Mon Sep 17 00:00:00 2001 From: lichuanyang <1176537920@qq.com> Date: Tue, 24 Sep 2024 12:23:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=91=8A=E4=BA=8C=E7=BB=B4=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 4 ++ .../reportPrintStatistics/index.ts | 4 +- .../reportPrintStatistics/ReportInfoCT.vue | 18 ++++++- .../reportPrintStatistics/ReportInfoUS.vue | 22 +++++++-- .../reportPrintStatistics/index.vue | 47 ++++++++++++++++--- types/env.d.ts | 2 + 6 files changed, 86 insertions(+), 11 deletions(-) diff --git a/.env b/.env index ffb2aaec..a1f63483 100644 --- a/.env +++ b/.env @@ -23,3 +23,7 @@ VITE_APP_BAIDU_CODE = a1ff8825baa73c3a78eb96aa40325abc VITE_APP_DEFAULT_LOGIN_TENANT = 芋道源码 VITE_APP_DEFAULT_LOGIN_USERNAME = VITE_APP_DEFAULT_LOGIN_PASSWORD = + +# 自定义内容 +# 云胶片 +VITE_BASE_URL_YunJiaoPian='http://114.55.171.231:48081' \ No newline at end of file diff --git a/src/api/applyregistration/reportPrintStatistics/index.ts b/src/api/applyregistration/reportPrintStatistics/index.ts index 36ab3ea9..950198ea 100644 --- a/src/api/applyregistration/reportPrintStatistics/index.ts +++ b/src/api/applyregistration/reportPrintStatistics/index.ts @@ -5,7 +5,9 @@ import request from '@/config/axios' * ReportPrintStatisticsApi */ export const ReportPrintStatisticsApi = { - /* 测试方法 */ + getOrg: async (orgID: any) => { + return await request.get({ url: `/org/org/getone?orgID=` + orgID }) + }, getDeviceList: async () => { return await request.get({ url: `/system/device/getlist` }) }, diff --git a/src/views/applyregistration/reportPrintStatistics/ReportInfoCT.vue b/src/views/applyregistration/reportPrintStatistics/ReportInfoCT.vue index d6797ba0..0196713d 100644 --- a/src/views/applyregistration/reportPrintStatistics/ReportInfoCT.vue +++ b/src/views/applyregistration/reportPrintStatistics/ReportInfoCT.vue @@ -44,6 +44,15 @@

{{ infoParams.diagResults }}

+
+ +
扫码查看云胶片
+

报告医师:{{ infoParams.diagDoctor }} @@ -74,6 +83,11 @@ defineOptions({ name: 'ReportInfoCT' }) **/ /** 导入内容 **/ const infoParams = defineProps({ + showQRcode: { + type: Boolean, + default: false, + required: false + }, id: String, examId: String, regId: String, @@ -95,6 +109,8 @@ const infoParams = defineProps({ }) /** 数据内容 **/ +const VITE_BASE_URL_YunJiaoPian = ref(import.meta.env.VITE_BASE_URL_YunJiaoPian) + const age = computed(() => { let birthdate = infoParams.birthday if (!birthdate) { @@ -152,7 +168,7 @@ onMounted(async () => {}) } .ultrasound-recommendation { - margin-bottom: 90px; + margin-bottom: 174px; } .ultrasound-findings p, diff --git a/src/views/applyregistration/reportPrintStatistics/ReportInfoUS.vue b/src/views/applyregistration/reportPrintStatistics/ReportInfoUS.vue index 9ddf2478..b6f6d0ce 100644 --- a/src/views/applyregistration/reportPrintStatistics/ReportInfoUS.vue +++ b/src/views/applyregistration/reportPrintStatistics/ReportInfoUS.vue @@ -36,8 +36,17 @@

超声提示:

{{ infoParams.diagResults }}

-
-

医生签名:{{ infoParams.reviewDoctor }}

+
+
+ +
扫码查看云胶片
+
+

医生签名:{{ infoParams.reviewDoctor }}

@@ -52,6 +61,11 @@ defineOptions({ name: 'ReportInfoUS' }) **/ /** 导入内容 **/ const infoParams = defineProps({ + showQRcode: { + type: Boolean, + default: false, + required: false + }, id: String, examId: String, regId: String, @@ -73,6 +87,8 @@ const infoParams = defineProps({ }) /** 数据内容 **/ +const VITE_BASE_URL_YunJiaoPian = ref(import.meta.env.VITE_BASE_URL_YunJiaoPian) + const age = computed(() => { let birthdate = infoParams.birthday if (!birthdate) { @@ -148,7 +164,7 @@ onMounted(async () => { } .ultrasound-recommendation { - margin-bottom: 90px; + margin-bottom: 178px; } .ultrasound-findings p, diff --git a/src/views/applyregistration/reportPrintStatistics/index.vue b/src/views/applyregistration/reportPrintStatistics/index.vue index 32af220f..cbb8a4b3 100644 --- a/src/views/applyregistration/reportPrintStatistics/index.vue +++ b/src/views/applyregistration/reportPrintStatistics/index.vue @@ -213,6 +213,7 @@ v-model="activeDrawer" direction="rtl" :with-header="false" + :modal="activeDrawerModal" :size="activeDrawerSize" @opened="drawerOpened" @closed=" @@ -220,6 +221,7 @@ reportsList = [] reportInfoType = '' activeTabName = '' + activeDrawerModal = true activeDrawerSize = '74%' } " @@ -409,10 +411,10 @@
@@ -447,11 +449,11 @@ v-if="index && index > 0" > - +
@@ -467,6 +469,8 @@ import { dateFormatter, dateFormatter2 } from '@/utils/formatTime' import download from '@/utils/download' import { ReportPrintStatisticsApi } from '@/api/applyregistration/reportPrintStatistics' +import { getUserProfile } from '@/api/system/user/profile' +import { ElLoading } from 'element-plus' import ReportInfoCT from './ReportInfoCT.vue' import ReportInfoUS from './ReportInfoUS.vue' @@ -487,9 +491,11 @@ const printBatch = ref() const message = useMessage() const { t } = useI18n() const activeDrawer = ref(false) +const activeDrawerModal = ref(true) const activeDrawerSize = ref('74%') const activeTabName = ref('diagnosisInfo') const reportInfoType = ref('') //us、ct +const showQRcode = ref(false) const diagnosisInfo_readonly = ref(true) const age = ref('') const examItemNameEdit = ref('') @@ -579,13 +585,37 @@ const resetDiagnosisInfo = async () => { infoFormRef.value?.clearValidate() } +const showQRcodeSet = async () => { + showQRcode.value = false + try { + let orgInfo: any = null + let userInfo = await getUserProfile() + if (userInfo && userInfo.orgId) + orgInfo = await ReportPrintStatisticsApi.getOrg(userInfo.orgId.trim()) + if (orgInfo && orgInfo.enableCloudDicom && orgInfo.enableCloudDicom.trim() == '1') + showQRcode.value = true + } catch { + showQRcode.value = false + } +} + /****** 可参考内容 ******/ /** 组件事件 **/ const drawerOpened = async () => { try { if (true && activeTabName && activeTabName.value == 'reportInfoBatch') { - printBatch.value.$el.click() - activeDrawer.value = false + const loading = ElLoading.service({ + lock: true, + text: '打印加载中', + background: 'rgba(0, 0, 0, 0.74)' + }) + nextTick(() => { + setTimeout(() => { + printBatch.value?.$el?.click() //用?防止按键Esc + loading.close() + activeDrawer.value = false + }, 2500) + }) } } finally { } @@ -626,6 +656,7 @@ const getList = async () => { const handleQuery = async () => { queryParams.value.pageNo = 1 getList() + await showQRcodeSet() } const resetQuery = async () => { @@ -654,6 +685,7 @@ const handleRowClick = async (row) => { if (row.deviceType && row.deviceType.trim().toLowerCase() == 'us') reportInfoType.value = 'us' else reportInfoType.value = 'ct' } + await showQRcodeSet() activeTabName.value = 'diagnosisInfo' activeDrawer.value = true } @@ -675,7 +707,9 @@ const handlePrint = async () => { return compare }) reportsList.value = infoList + await showQRcodeSet() activeTabName.value = 'reportInfoBatch' + activeDrawerModal.value = false activeDrawerSize.value = 0.01 activeDrawer.value = true } @@ -685,6 +719,7 @@ const handlePrint = async () => { onMounted(async () => { deviceList.value = await ReportPrintStatisticsApi.getDeviceList() getList() + await showQRcodeSet() }) /** 防空作用域 **/ diff --git a/types/env.d.ts b/types/env.d.ts index 1326e3b4..36f97dbe 100644 --- a/types/env.d.ts +++ b/types/env.d.ts @@ -26,6 +26,8 @@ interface ImportMetaEnv { readonly VITE_DROP_CONSOLE: string readonly VITE_SOURCEMAP: string readonly VITE_OUT_DIR: string + //自定义内容 + readonly VITE_BASE_URL_YunJiaoPian: string } declare global {