diff --git a/web_client/src/views/history/components/scaleInfor.vue b/web_client/src/views/history/components/scaleInfor.vue
index 9850337..8858df5 100644
--- a/web_client/src/views/history/components/scaleInfor.vue
+++ b/web_client/src/views/history/components/scaleInfor.vue
@@ -22,21 +22,21 @@
导出(医生版)
打印(医生版)
导出(阳性版)
@@ -405,7 +405,7 @@ export default {
this.$router.go(-1);
},
// 报告单报出
- async handleExport(_type) {
+ async handleExport(_type, _printFlat) {
this.type = _type;
let params = {
evaluationId: this.reportDetail1.patient.evaluationId,
@@ -423,8 +423,8 @@ export default {
const { code, msg, data } = res;
if (code === 200) {
- // 是否是打印
- if (!this.open) {
+ // 是否是打印 true为导出不打印
+ if (_printFlat) {
// 导出下载
window.open(this.apiUrl + data.path);
} else {
@@ -494,7 +494,8 @@ export default {
handlePrinting(_type) {
this.type = _type;
this.timestamp = new Date().getTime();
- this.open = true;
+ // this.open = true;
+ this.handleExport(this.type);
},
// 调用打印方法
handleInvoke(_path) {
diff --git a/web_client/src/views/history/components/scaleInforCopy.vue b/web_client/src/views/history/components/scaleInforCopy.vue
index eb6c6f9..7bc7ee5 100644
--- a/web_client/src/views/history/components/scaleInforCopy.vue
+++ b/web_client/src/views/history/components/scaleInforCopy.vue
@@ -21,21 +21,21 @@
导出(医生版)
打印(医生版)
导出(阳性版)
@@ -213,7 +213,7 @@
检查日期
{{
$moment(reportDetail1.patient.checkTime - 0).format(
- "YYYY-MM-DD HH:mm"
+ "YYYY-MM-DD HH:mm",
)
}}
@@ -408,7 +408,7 @@ export default {
this.$router.go(-1);
},
// 报告单报出
- async handleExport(_type) {
+ async handleExport(_type, _printFlat) {
this.type = _type;
let params = {
evaluationId: this.reportDetail1.patient.evaluationId,
@@ -426,14 +426,14 @@ export default {
const { code, msg, data } = res;
if (code === 200) {
- // 是否是打印
- if (!this.open) {
+ // 是否是打印 true为导出不打印
+ if (_printFlat) {
// 导出下载
window.open(this.apiUrl + data.path);
} else {
this.open = false;
this.handleInvoke(
- `${this.apiUrl}${data.path}?time${new Date().getTime()}`
+ `${this.apiUrl}${data.path}?time${new Date().getTime()}`,
);
}
this.$forceUpdate();
@@ -497,7 +497,8 @@ export default {
handlePrinting(_type) {
this.type = _type;
this.timestamp = new Date().getTime();
- this.open = true;
+ // this.open = true;
+ this.handleExport(this.type);
},
// 调用打印方法
handleInvoke(_path) {
@@ -514,7 +515,7 @@ export default {
}
this.reportPath = _path;
var iframe = document.getElementById(
- "reportPartIframe" + this.timestamp
+ "reportPartIframe" + this.timestamp,
);
iframe.onload = () => {
iframe.contentWindow.print();