From 4f909fc6544de16ae06a83804e26fed6adb12ecc Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期四, 29 二月 2024 14:54:22 +0800
Subject: [PATCH] qxtj
---
src/views/doctor/checkAll/index.vue | 48 +++++++----
src/views/jmreport/jmreport/zongjianjiankangzheng.vue | 48 ++++++++++++
src/api/doctor/checkAll.js | 11 ++
src/router/index.js | 67 +++++++++-------
src/views/hosp/template/index.vue | 13 ++
5 files changed, 136 insertions(+), 51 deletions(-)
diff --git a/src/api/doctor/checkAll.js b/src/api/doctor/checkAll.js
index a4141ce..690d0a3 100644
--- a/src/api/doctor/checkAll.js
+++ b/src/api/doctor/checkAll.js
@@ -31,6 +31,17 @@
})
}
+
+export function isPdfOrJimu(tjNumber) {
+ return request({
+ url: '/system/report/isPdfOrJimu',
+ method: 'get',
+ params: {
+ tjNumber: tjNumber
+ }
+ })
+}
+
// 鏍规嵁浣撴璁㈠崟鍙疯幏鍙栦綋妫�璇︽儏淇℃伅(骞朵慨鏀圭姸鎬�)鎺ュ彛
export function getTjdetailList(data) {
return request({
diff --git a/src/router/index.js b/src/router/index.js
index d73e016..81e795c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -43,26 +43,26 @@
{
path: '/emer',
component: () => import('@/views/system/emer/index'),
- name:'rmer',
+ name: 'rmer',
meta: { title: '鐭ヨ瘑搴撶鐞� ', icon: 'dashboard', }
},
{
path: '/icd',
component: () => import('@/views/system/icd/index'),
- name:'rmer',
+ name: 'rmer',
meta: { title: '鐤剧梾瀛楀吀 ', icon: 'dashboard', }
},
{
path: '/ssdm',
component: () => import('@/views/system/ssdm/index'),
- name:'rmer',
+ name: 'rmer',
meta: { title: '鐭ヨ瘑搴撶鐞� ', icon: 'dashboard', }
},
{
path: '/notice',
component: () => import('@/views/system/notice/index'),
- name:'rmer',
- meta: { title: '閫氱煡鍏憡 '}
+ name: 'rmer',
+ meta: { title: '閫氱煡鍏憡 ' }
},
]
},
@@ -79,8 +79,8 @@
}
]
},
- // 瀵兼鍗曞拰浣撴鎶ュ憡椤甸潰鏍囩鏍�
- {
+ // 瀵兼鍗曞拰浣撴鎶ュ憡椤甸潰鏍囩鏍�
+ {
path: '/report',
component: Layout,
hidden: true,
@@ -88,50 +88,56 @@
{
path: 'breDailyReport',
component: () => import('@/views/jmreport/jmreport/view'),
- name:'DailyReportReport',
- meta:{title:'瀵兼鍗�',activeMenu:'/bre/DailyReport'},
+ name: 'DailyReportReport',
+ meta: { title: '瀵兼鍗�', activeMenu: '/bre/DailyReport' },
},
{
path: 'viewReport',
component: () => import('@/views/jmreport/jmreport/view'),
- name:'DailyReportReport',
- meta:{title:'浣撴鎶ュ憡',activeMenu:'/bre/viewReport'},
+ name: 'DailyReportReport',
+ meta: { title: '浣撴鎶ュ憡', activeMenu: '/bre/viewReport' },
},
{
path: 'settlement',
component: () => import('@/views/jmreport/jmreport/settlement'),
- name:'DailyReportReport',
- meta:{title:'涓汉缁撹处鍗�',activeMenu:'/bre/settlement'},
+ name: 'DailyReportReport',
+ meta: { title: '涓汉缁撹处鍗�', activeMenu: '/bre/settlement' },
},
{
path: 'charge',
component: () => import('@/views/jmreport/jmreport/charge'),
- name:'DailyReportReport',
- meta:{title:'鏀舵灏忕エ',activeMenu:'/bre/charge'},
+ name: 'DailyReportReport',
+ meta: { title: '鏀舵灏忕エ', activeMenu: '/bre/charge' },
},
{
path: 'refund',
component: () => import('@/views/jmreport/jmreport/refund'),
- name:'DailyReportReport',
- meta:{title:'閫�娆惧皬绁�',activeMenu:'/bre/refund'},
+ name: 'DailyReportReport',
+ meta: { title: '閫�娆惧皬绁�', activeMenu: '/bre/refund' },
},
{
path: 'invoice',
component: () => import('@/views/jmreport/jmreport/invoice'),
- name:'DailyReportReport',
- meta:{title:'鍙戠エ',activeMenu:'/bre/invoice'},
+ name: 'DailyReportReport',
+ meta: { title: '鍙戠エ', activeMenu: '/bre/invoice' },
},
{
path: 'groupReport',
component: () => import('@/views/jmreport/jmreport/groupReport'),
- name:'DailyReportReport',
- meta:{title:'鍥㈤槦鎶ュ憡',activeMenu:'/bre/groupReport '},
+ name: 'DailyReportReport',
+ meta: { title: '鍥㈤槦鎶ュ憡', activeMenu: '/bre/groupReport ' },
},
{
path: 'jiankangzheng',
component: () => import('@/views/jmreport/jmreport/jiankangzheng'),
- name:'DailyReportReport',
- meta:{title:'鍋ュ悍璇佹鏌ヨ〃',activeMenu:'/bre/jiankangzheng '},
+ name: 'DailyReportReport',
+ meta: { title: '鍋ュ悍璇佹鏌ヨ〃', activeMenu: '/bre/jiankangzheng ' },
+ },
+ {
+ path: 'zongjianjiankangzheng',
+ component: () => import('@/views/jmreport/jmreport/zongjianjiankangzheng'),
+ name: 'DailyReportReport',
+ meta: { title: '', activeMenu: '/bre/zongjianjiankangzheng ' },
},
]
},
@@ -140,7 +146,7 @@
component: () => import('@/views/login'),
hidden: true
},
-
+
{
path: '/register',
component: () => import('@/views/register'),
@@ -156,7 +162,7 @@
component: () => import('@/views/error/401'),
hidden: true
},
-
+
{
path: '',
component: Layout,
@@ -191,7 +197,7 @@
component: () => import('@/views/system/dict/index'),
hidden: true
},
-
+
{
path: 'profile',
component: () => import('@/views/system/user/profile/index'),
@@ -341,7 +347,7 @@
// }
// ]
// },
-
+
{
path: '/hosp',
component: Layout,
@@ -352,12 +358,13 @@
path: 'datacomparison',
component: () => import('@/views/hosp/datacomparison/index'),
name: 'Contrast',
- meta: { title: '鏁版嵁瀵规瘮', keepAlive: false
- }
+ meta: {
+ title: '鏁版嵁瀵规瘮', keepAlive: false
+ }
}
]
},
-
+
]
// 闃叉杩炵画鐐瑰嚮澶氭璺敱鎶ラ敊
diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index c41e4dd..9b8f4d9 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -554,6 +554,7 @@
</span>
</el-dialog>
<Packages ref="bbb" :baogao="baogao" />
+
</div>
</template>
@@ -571,7 +572,7 @@
getState,
getforceIn,
gettoPdf,
- getModified,
+ getModified, isPdfOrJimu
} from "@/api/doctor/checkAll";
import { getInfoById } from "@/api/hosp/history";
import { getInfo } from "@/api/login";
@@ -589,7 +590,7 @@
ViewPdf,
Historicalreport,
jianqianwenzhen,
- Packages
+ Packages
},
dicts: [
"dict_tjtype",
@@ -809,25 +810,34 @@
viewReport(row) {
const tjNumber = row.tjNumber;
- const flag = true;
- getPdf(tjNumber, flag).then((response) => {
- if (response.size === 0) {
- const loading = this.$loading({
- lock: true,
- text: "Loading",
- spinner: "el-icon-loading",
- background: "rgba(0, 0, 0, 0.7)",
- });
- setTimeout(() => {
- loading.close();
- }, 3000);
- this.$message.msgSuccess("鎶ュ憡姝ｅ湪鐢熸垚锛岃涓ゅ垎閽熷悗棰勮锛�");
- } else {
- this.dialogVisible = true;
+ isPdfOrJimu(tjNumber).then((response) => {
+ if (response.data.flag == "0") {
+ const flag = true;
+ getPdf(tjNumber, flag).then((response) => {
+ if (response.size === 0) {
+ const loading = this.$loading({
+ lock: true,
+ text: "Loading",
+ spinner: "el-icon-loading",
+ background: "rgba(0, 0, 0, 0.7)",
+ });
+ setTimeout(() => {
+ loading.close();
+ }, 3000);
+ this.$message.msgSuccess("鎶ュ憡姝ｅ湪鐢熸垚锛岃涓ゅ垎閽熷悗棰勮锛�");
+ } else {
+ this.dialogVisible = true;
- this.url = window.webkitURL.createObjectURL(response); //灏嗗悗绔繑鍥炵殑blob鏂囦欢璇诲彇鍑簎rl
+ this.url = window.webkitURL.createObjectURL(response); //灏嗗悗绔繑鍥炵殑blob鏂囦欢璇诲彇鍑簎rl
+ }
+ });
+ } else {
+ let url = response.data.url
+ const params = { url };
+ this.$tab.openPage("鍋ュ悍璇佹鏌ヨ〃", "/report/zongjianjiankangzheng", params);
}
- });
+ })
+
},
Graphicreport() {
diff --git a/src/views/hosp/template/index.vue b/src/views/hosp/template/index.vue
index 6a9089d..2c284dd 100644
--- a/src/views/hosp/template/index.vue
+++ b/src/views/hosp/template/index.vue
@@ -60,10 +60,13 @@
></el-switch>
</template>
</el-table-column>
+ <el-table-column label="鐢熸垚绫诲瀷" align="center" prop="print" />
+ <el-table-column label="鍦板潃" align="center" prop="url" />
<el-table-column label="鏇存柊浜�" align="center" prop="updateBy" />
<el-table-column label="鏇存柊鏃堕棿" align="center" prop="updateTime" />
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" />
<el-table-column label="鍒涘缓浜�" align="center" prop="createBy" />
+
<el-table-column
label="鎿嶄綔"
align="center"
@@ -100,11 +103,17 @@
<el-form-item label="鎻忚堪" prop="remark">
<el-input v-model="form.remark" placeholder="璇疯緭鍏ユ弿杩�" />
</el-form-item>
- <el-form-item label="妯℃澘绫诲瀷" prop="flag">
- <el-select v-model="form.flag" placeholder="璇烽�夋嫨妯℃澘绫诲瀷" clearable>
+ <el-form-item label="妯℃澘绫诲瀷" prop="flag" >
+ <el-select v-model="form.flag" placeholder="璇烽�夋嫨妯℃澘绫诲瀷" clearable disabled>
<el-option v-for="dict in dict.type.report_template_type" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
+ <el-form-item label="鐢熸垚绫诲瀷" prop="print" >
+ <el-input v-model="form.print" placeholder="璇疯緭鍏ユ弿杩�" disabled/>
+ </el-form-item>
+ <el-form-item label="鍦板潃" prop="url" v-if="form.print == '鎶ヨ〃'">
+ <el-input v-model="form.url" placeholder="璇疯緭鍏ユ弿杩�" />
+ </el-form-item>
<!-- <el-form-item label="妯℃澘鐘舵��" prop="open">
<el-switch
v-model="form.open"
diff --git a/src/views/jmreport/jmreport/zongjianjiankangzheng.vue b/src/views/jmreport/jmreport/zongjianjiankangzheng.vue
new file mode 100644
index 0000000..99527f0
--- /dev/null
+++ b/src/views/jmreport/jmreport/zongjianjiankangzheng.vue
@@ -0,0 +1,48 @@
+<template>
+ <div v-loading="loading" :style="'height:' + height" class="app-container">
+ <!-- <el-row style="margin-bottom: 10px;">
+ <el-col :span="1.5">
+ <el-button type="primary" plain icon="el-icon-refresh-right" size="mini" @click="handleRefresh">鍒锋柊</el-button>
+ </el-col>
+ </el-row> -->
+
+ <iframe :src="src" id="reportView" frameborder="no" style="width: 100%; height: 100%" scrolling="auto" />
+ </div>
+</template>
+<script>
+import { getToken } from "@/utils/auth";
+export default {
+ name: "Ureport",
+ data() {
+ return {
+ src: "",
+ height: document.documentElement.clientHeight - 94.5 + "px;",
+ loading: true,
+
+ };
+ },
+ created() {
+ console.log(this.$route.query)
+ this.src =
+ this.$route.query.url +
+ "&token=Bearer " +
+ getToken();
+
+ },
+ methods: {
+ handleRefresh() {
+ document.getElementById("reportView").src =
+ document.getElementById("reportView").src;
+ },
+ },
+ mounted: function () {
+ setTimeout(() => {
+ this.loading = false;
+ }, 230);
+ const that = this;
+ window.onresize = function temp() {
+ that.height = document.documentElement.clientHeight - 94.5 + "px;";
+ };
+ },
+};
+</script>
\ No newline at end of file
--
Gitblit v1.8.0