diff --git a/src/api/applyregistration/deviceManage/index.ts b/src/api/applyregistration/deviceManage/index.ts index 1e7d20bf..68f11fc6 100644 --- a/src/api/applyregistration/deviceManage/index.ts +++ b/src/api/applyregistration/deviceManage/index.ts @@ -28,7 +28,3 @@ export const DeviceManageApi = { return await request.delete({ url: `/test/device/delete?id=` + id }) }, } - - -/** 防空作用域 **/ -console.log(request) \ No newline at end of file diff --git a/src/api/applyregistration/diagnosisTemplate/index.ts b/src/api/applyregistration/diagnosisTemplate/index.ts index 977d20d6..78225696 100644 --- a/src/api/applyregistration/diagnosisTemplate/index.ts +++ b/src/api/applyregistration/diagnosisTemplate/index.ts @@ -10,7 +10,7 @@ export const DiagnosisTemplateApi = { return await request.get({ url: `/org/org/getlist` }) }, getDoctorList: async () => { - return await request.get({ url: `/doctor/getlist` }) + return await request.get({ url: `/doctor/getAlllist` }) }, getPage: async (params: any) => { return await request.get({ url: `/test/reporttemplate/page`, params }) @@ -28,7 +28,3 @@ export const DiagnosisTemplateApi = { return await request.delete({ url: `/test/reporttemplate/delete?id=` + id }) }, } - - -/** 防空作用域 **/ -console.log(request) \ No newline at end of file diff --git a/src/api/applyregistration/exampartManage/index.ts b/src/api/applyregistration/exampartManage/index.ts index b282b285..c7bddaaf 100644 --- a/src/api/applyregistration/exampartManage/index.ts +++ b/src/api/applyregistration/exampartManage/index.ts @@ -25,7 +25,3 @@ export const ExampartManageApi = { return await request.delete({ url: `/test/exampart/delete?id=` + id }) }, } - - -/** 防空作用域 **/ -console.log(request) \ No newline at end of file diff --git a/src/api/applyregistration/illnessCase/index.ts b/src/api/applyregistration/illnessCase/index.ts index 99ec139f..ad1b50f3 100644 --- a/src/api/applyregistration/illnessCase/index.ts +++ b/src/api/applyregistration/illnessCase/index.ts @@ -16,7 +16,3 @@ export const IllnessCaseApi = { return await request.get({ url: `/tblist/patientexamlist/pageIllnessCase`, params }) } } - - -/** 防空作用域 **/ -console.log(request) \ No newline at end of file diff --git a/src/api/applyregistration/reportPrintStatistics/index.ts b/src/api/applyregistration/reportPrintStatistics/index.ts index 6e451e71..b1bbf6ab 100644 --- a/src/api/applyregistration/reportPrintStatistics/index.ts +++ b/src/api/applyregistration/reportPrintStatistics/index.ts @@ -9,17 +9,10 @@ export const ReportPrintStatisticsApi = { getDeviceList: async () => { return await request.get({ url: `/test/device/getlist` }) }, - getExamitemsList: async () => { - return await request.get({ url: `/examitems/examitems/getlist` }) - }, getPage: async (params: any) => { return await request.get({ url: `/tblist/patientexamlist/pageReportPrintStatistics`, params }) }, - updateExamItemName: async (params: any) => { + updateExamItemName: async (params: any) => { return await request.put({ url: `/tblist/patientexamlist/updateExamItemName`, params }) } } - - -/** 防空作用域 **/ -console.log(request) \ No newline at end of file diff --git a/src/api/applyregistration/reservationInfo/index.ts b/src/api/applyregistration/reservationInfo/index.ts index 8cf89abd..d2be2787 100644 --- a/src/api/applyregistration/reservationInfo/index.ts +++ b/src/api/applyregistration/reservationInfo/index.ts @@ -20,10 +20,5 @@ export const ReservationInfoApi = { }, create: async (data: any) => { return await request.post({ url: `/applyregistration/applyform/createReservationInfo`, data }) - }, - - + } } - -/** 防空作用域 **/ -console.log(request) \ No newline at end of file diff --git a/src/views/applyregistration/deviceManage/DeviceManageForm.vue b/src/views/applyregistration/deviceManage/DeviceManageForm.vue index 4b757743..9a90a3ad 100644 --- a/src/views/applyregistration/deviceManage/DeviceManageForm.vue +++ b/src/views/applyregistration/deviceManage/DeviceManageForm.vue @@ -4,7 +4,7 @@ - + 有效 diff --git a/src/views/applyregistration/deviceManage/index.vue b/src/views/applyregistration/deviceManage/index.vue index e08430ea..e1f86f58 100644 --- a/src/views/applyregistration/deviceManage/index.vue +++ b/src/views/applyregistration/deviceManage/index.vue @@ -4,15 +4,14 @@ - - - + - - + - - + - - + + + - - - - - - - 搜索 - - - 新增 - - + + + 搜索 + + + + + + 新增 + + + + + @@ -119,20 +126,24 @@ - + -
+
- - - - - - - + + + + + + + @@ -194,7 +194,6 @@ onMounted(async () => { console.log(dateFormatter) console.log(message) console.log(t) -console.log(DiagnosisTemplateApi) console.log(formData0) //console.log(null) diff --git a/src/views/applyregistration/diagnosisTemplate/index.vue b/src/views/applyregistration/diagnosisTemplate/index.vue index 9e75c29f..bd9c8d83 100644 --- a/src/views/applyregistration/diagnosisTemplate/index.vue +++ b/src/views/applyregistration/diagnosisTemplate/index.vue @@ -4,15 +4,14 @@ - - + - - 全部 - 公共 + 全部 + 公共 私有 - - - - - 搜索 - - - 新增 - - + + + 搜索 + + + + + + 新增 + + + + + - + - + -
+
@@ -16,7 +16,7 @@ @@ -28,7 +28,7 @@ diff --git a/src/views/applyregistration/exampartManage/index.vue b/src/views/applyregistration/exampartManage/index.vue index 6996d1a1..051bdc32 100644 --- a/src/views/applyregistration/exampartManage/index.vue +++ b/src/views/applyregistration/exampartManage/index.vue @@ -4,15 +4,14 @@ - - + - - + - - - - 搜索 - - - 新增 - - + + + 搜索 + + + + + + 新增 + + + + + - + -
+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 全部 - 门诊 - 住院 - 体检 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 全部 - 阴性 - 阳性 - 重大阳性 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + 全部 + 门诊 + 住院 + 体检 + + + + + + + + - - 搜索 - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
-
-
- - + + + + + + + + + + + + + + + + + + 全部 + 阴性 + 阳性 + 重大阳性 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+ + +
+ + + +
+ + - + @@ -298,9 +319,9 @@ - - - + + +
@@ -323,6 +344,8 @@ const queryFormRef = ref() /** 数据结构 **/ const message = useMessage() const { t } = useI18n() +const activeDrawer = ref(false) +const activeTabName = ref('diagnosisInfo') const diagnosisDesc = ref('') const examitemsDesc = ref('') const deviceList = ref([]) @@ -368,8 +391,6 @@ const getList = async () => { loading.value = true try { const data = await IllnessCaseApi.getPage(queryParams.value) - console.log('---------------------') - console.log(data.list) list_IllnessCase.value = data.list total.value = data.total } finally { @@ -385,6 +406,7 @@ const handleQuery = async () => { const handleRowClick = async (row) => { examitemsDesc.value = row ? row.examDescription : '' diagnosisDesc.value = row ? row.diagResults : '' + activeDrawer.value = true } /** 钩子方法 **/ diff --git a/src/views/applyregistration/reportPrintStatistics/index.vue b/src/views/applyregistration/reportPrintStatistics/index.vue index 5b589c27..6569b779 100644 --- a/src/views/applyregistration/reportPrintStatistics/index.vue +++ b/src/views/applyregistration/reportPrintStatistics/index.vue @@ -1,96 +1,361 @@ @@ -511,10 +547,12 @@ defineOptions({ name: 'ReportPrintStatistics' }) /** 组件引用 **/ const queryFormRef = ref() const infoFormRef = ref() +const infoTableRef = ref() /** 数据结构 **/ const message = useMessage() const { t } = useI18n() +const activeDrawer = ref(false) const activeTabName = ref('diagnosisInfo') const reportInfoType = ref('') //us、ct const diagnosisInfo_readonly = ref(true) @@ -657,12 +695,12 @@ const getList = async () => { } } -const handleQuery = () => { +const handleQuery = async () => { queryParams.value.pageNo = 1 getList() } -const handleRowClick = (row) => { +const handleRowClick = async (row) => { resetDiagnosisInfo() if (row) { infoParams.value = row @@ -674,6 +712,12 @@ const handleRowClick = (row) => { loadimage(row.orgId, row.regId) } else reportInfoType.value = 'ct' } + activeTabName.value = 'diagnosisInfo' + activeDrawer.value = true +} + +const handlePrint = async () => { + console.log(infoTableRef.value.getSelectionRows()) } /** 钩子方法 **/ @@ -704,7 +748,7 @@ console.log(infoParams0) } .item-style { - margin-bottom: 6px; + margin-bottom: 8px; } .item-width { diff --git a/src/views/applyregistration/reservationInfo/index.vue b/src/views/applyregistration/reservationInfo/index.vue index ab9205ff..729a6b51 100644 --- a/src/views/applyregistration/reservationInfo/index.vue +++ b/src/views/applyregistration/reservationInfo/index.vue @@ -1,287 +1,272 @@ @@ -478,9 +463,6 @@ console.log(infoParams0) .el-form-item__label { white-space: nowrap; } -.card-right { - height: 100%; -} .item-style { margin-bottom: 8px; diff --git a/src/views/tblist/patientexamlist/index.vue b/src/views/tblist/patientexamlist/index.vue index 1a371b76..5701429b 100644 --- a/src/views/tblist/patientexamlist/index.vue +++ b/src/views/tblist/patientexamlist/index.vue @@ -1,5 +1,5 @@