diff --git a/src/components/doctorCheck/ButtonList.vue b/src/components/doctorCheck/ButtonList.vue index d0aa1af..f2e66b3 100644 --- a/src/components/doctorCheck/ButtonList.vue +++ b/src/components/doctorCheck/ButtonList.vue @@ -523,6 +523,7 @@ export default { let token = window.sessionStorage.getItem('token'); let user = window.sessionStorage.getItem('user'); let toOutShell = { + isBuildImage:'N', ReportCode, token, preViewCanPrint: this.doctorCheck.prBase.isAudit, //this.dataTransOpts.tableS.patient_register.isAudit Parameters: [ diff --git a/src/components/patientRegister/LisRequest.vue b/src/components/patientRegister/LisRequest.vue index 92b861c..eae12ea 100644 --- a/src/components/patientRegister/LisRequest.vue +++ b/src/components/patientRegister/LisRequest.vue @@ -193,6 +193,7 @@ export default { let user = window.sessionStorage.getItem("user"); let toOutShell = { ReportCode, + isBuildImage:'N', token, Parameters: [ { Name: "printer", Value: user }, diff --git a/src/components/patientRegister/PatientLis.vue b/src/components/patientRegister/PatientLis.vue index 5d0e3e4..b251523 100644 --- a/src/components/patientRegister/PatientLis.vue +++ b/src/components/patientRegister/PatientLis.vue @@ -543,9 +543,9 @@ export default { patientRegisterNo: this.patientRegister.query.patientRegisterNo, }; - console.log("/api/app/patientregister/getlistinfilter", body); + console.log("/api/app/LisRequest/GetListInFilter", body); - postapi("/api/app/patientregister/getlistinfilter", body) + postapi("/api/app/LisRequest/GetListInFilter", body) .then(res => { if (res.code != -1) { // 刷新最大记录数 @@ -677,6 +677,7 @@ export default { let toOutShell = { ReportCode, token, + isBuildImage:'N', preViewCanPrint: "N", Parameters: [ { Name: "printer", Value: user }, @@ -783,6 +784,7 @@ export default { let toOutShell = { ReportCode, token, + isBuildImage:'N', preViewCanPrint: "Y", Parameters: [ { Name: "printer", Value: user }, diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue index 47c3297..c729d67 100644 --- a/src/components/patientRegister/PatientRegisterEdit.vue +++ b/src/components/patientRegister/PatientRegisterEdit.vue @@ -1488,6 +1488,7 @@ export default { let user = window.sessionStorage.getItem('user'); let toOutShell = { ReportCode, token, + isBuildImage:'N', preViewCanPrint: 'N', Parameters: [ { Name: 'printer', Value: user }, @@ -1605,6 +1606,7 @@ export default { let user = window.sessionStorage.getItem('user'); let toOutShell = { ReportCode, token, + isBuildImage:'N', Parameters: [ { Name: 'printer', Value: user }, { Name: 'hisLog', Value: 'pic/hisLog.jpg' }, diff --git a/src/components/patientRegister/PatientRegisterEditBak240401.vue b/src/components/patientRegister/PatientRegisterEditBak240401.vue index 8c5d9de..d5a54fe 100644 --- a/src/components/patientRegister/PatientRegisterEditBak240401.vue +++ b/src/components/patientRegister/PatientRegisterEditBak240401.vue @@ -1447,6 +1447,7 @@ export default { let user = window.sessionStorage.getItem('user'); let toOutShell = { ReportCode, token, + isBuildImage:'N', preViewCanPrint: 'N', Parameters: [ { Name: 'printer', Value: user }, @@ -1564,6 +1565,7 @@ export default { let user = window.sessionStorage.getItem('user'); let toOutShell = { ReportCode, token, + isBuildImage:'N', Parameters: [ { Name: 'printer', Value: user }, { Name: 'hisLog', Value: 'pic/hisLog.jpg' }, diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue index ef92848..8b9768a 100644 --- a/src/components/patientRegister/PatientRegisterList.vue +++ b/src/components/patientRegister/PatientRegisterList.vue @@ -382,6 +382,7 @@ export default { let toOutShell = { ReportCode, token, + isBuildImage:'N', preViewCanPrint: "N", Parameters: [ { Name: "printer", Value: user }, @@ -942,35 +943,35 @@ export default { let row = { ...this.rClickRow }; let items = [] //菜单项 - if (checkPagePriv(this.pagePriv.privs, '发送检验申请')) + if (checkPagePriv(this.pagePriv.privs, '发送检验申请') && row.completeFlag != '0') items.push({ label: "发送检验申请", onClick: () => { this.lisRequest(row.id); }, }) - if (checkPagePriv(this.pagePriv.privs, '预览检验条码')) + if (checkPagePriv(this.pagePriv.privs, '预览检验条码') && row.completeFlag != '0') items.push({ label: "预览检验条码", onClick: () => { this.lisPrint(row.id, "0002", true); }, }) - if (checkPagePriv(this.pagePriv.privs, '打印检验条码')) + if (checkPagePriv(this.pagePriv.privs, '打印检验条码') && row.completeFlag != '0') items.push({ label: "打印检验条码", onClick: () => { this.lisPrint(row.id, "0002", false); }, }) - if (checkPagePriv(this.pagePriv.privs, '预览Pacs条码')) + if (checkPagePriv(this.pagePriv.privs, '预览Pacs条码') && row.completeFlag != '0') items.push({ label: "预览Pacs条码", onClick: () => { this.pacsPrint(row.id, "0004", true); }, }) - if (checkPagePriv(this.pagePriv.privs, '打印Pacs条码')) + if (checkPagePriv(this.pagePriv.privs, '打印Pacs条码') && row.completeFlag != '0') items.push({ label: "打印Pacs条码", onClick: () => { @@ -1099,6 +1100,7 @@ export default { let toOutShell = { ReportCode, token, + isBuildImage:'N', preViewCanPrint: "N", Parameters: [ { Name: "printer", Value: user }, @@ -1205,6 +1207,7 @@ export default { let toOutShell = { ReportCode, token, + isBuildImage:'N', preViewCanPrint: "Y", Parameters: [ { Name: "printer", Value: user }, diff --git a/src/components/report/BtnReport.vue b/src/components/report/BtnReport.vue index 299d48b..0d39117 100644 --- a/src/components/report/BtnReport.vue +++ b/src/components/report/BtnReport.vue @@ -18,7 +18,7 @@ import moment from "moment"; import { mapState } from "vuex"; import { getapi, postapi, putapi, deletapi } from "@/api/api"; -import { arrayExistObj, deepCopy,parseID } from "../../utlis/proFunc"; +import { arrayExistObj, deepCopy, parseID } from "../../utlis/proFunc"; //import PatientRegisterList from "../doctorCheck/PatientRegisterList.vue"; export default { @@ -95,7 +95,6 @@ export default { this.$message.warning("请先选择记录!") return } - this.dataTransOpts.tableS.patient_register.completeFlag = '2' }, @@ -119,7 +118,9 @@ export default { let user = window.sessionStorage.getItem('user'); let toOutShell = { ReportCode, token, + isBuildImage: 'N', preViewCanPrint: this.patientRegister.patientRegisterRd.isAudit, + BusinessCode: this.patientRegister.patientRegisterId, Parameters: [ { Name: 'printer', Value: user }, { Name: 'hisLog', Value: 'pic/hisLog.jpg' }, @@ -129,23 +130,40 @@ export default { ], }; - try { - let res = await postapi(`/api/app/printreport/getpeisreport?PatientRegisterId=${this.patientRegister.patientRegisterId}`) - toOutShell.ReportTable = res.data - - if (isPreview) { - this.$peisAPI.printPre(JSON.stringify(toOutShell)); - } else { - this.$peisAPI.print(JSON.stringify(toOutShell)).then(res => { - if (res.code != -1) { - //更新打印次数 - return postapi('/api/app/patientregister/updatepatientregisterguideprinttimesmany', [this.patientRegister.patientRegisterId]) + + // let res = await postapi(`/api/app/printreport/getpeisreport?PatientRegisterId=${this.patientRegister.patientRegisterId}`) + // toOutShell.ReportTable = res.data + if (isPreview) { + this.$peisAPI.printPre(JSON.stringify(toOutShell)) + .then(res => { + if (JSON.parse(res).code < 0) { + this.$message.warning({ showClose: true, message: JSON.parse(res).message }); } + }) + .catch((err) => { + console.log('预览体检报告错误', err) + this.$message.warning({ showClose: true, message: `${err}` }); }); - } - } catch (error) { - this.$message.warning(error); + } else { + this.$peisAPI.print(JSON.stringify(toOutShell)) + .then(res => { + if (JSON.parse(res).code < 0) { + this.$message.warning({ showClose: true, message: JSON.parse(res).message }); + } else { + return postapi('/api/app/patientregister/updatepatientregisterguideprinttimesmany', [this.patientRegister.patientRegisterId]); + } + }) + .then(res => { + if (res && res.code < 0) { + this.$message.error({ showClose: true, message: `${res.message}` }); + } + }) + .catch((err) => { + console.log('打印体检报告错误', err) + this.$message.error({ showClose: true, message: `${err}` }); + }); + } }, diff --git a/src/components/report/PatientRegisterListNobtn.vue b/src/components/report/PatientRegisterListNobtn.vue index f8823c8..0ef1415 100644 --- a/src/components/report/PatientRegisterListNobtn.vue +++ b/src/components/report/PatientRegisterListNobtn.vue @@ -231,6 +231,7 @@ export default { let user = window.sessionStorage.getItem('user'); let toOutShell = { ReportCode, token, + isBuildImage:'N', preViewCanPrint: 'N', Parameters: [ { Name: 'printer', Value: user }, @@ -845,6 +846,7 @@ export default { let user = window.sessionStorage.getItem('user'); let toOutShell = { ReportCode, token, + isBuildImage:'N', preViewCanPrint: 'N', Parameters: [ { Name: 'printer', Value: user }, @@ -907,6 +909,7 @@ export default { let user = window.sessionStorage.getItem('user'); let toOutShell = { ReportCode, token, + isBuildImage:'N', preViewCanPrint: 'Y', Parameters: [ { Name: 'printer', Value: user }, diff --git a/src/components/sumDoctorCheck/ButtonList.vue b/src/components/sumDoctorCheck/ButtonList.vue index a7c93c4..897e70a 100644 --- a/src/components/sumDoctorCheck/ButtonList.vue +++ b/src/components/sumDoctorCheck/ButtonList.vue @@ -306,6 +306,7 @@ export default { let user = window.sessionStorage.getItem('user'); let toOutShell = { ReportCode, token, + isBuildImage:'N', preViewCanPrint: this.dataTransOpts.tableS.patient_register.isAudit, Parameters: [ { Name: 'printer', Value: user }, diff --git a/src/views/Home.vue b/src/views/Home.vue index d734197..02babbf 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -55,8 +55,6 @@ - -
diff --git a/src/views/charge/charge.vue b/src/views/charge/charge.vue index 2c192dd..832a5b7 100644 --- a/src/views/charge/charge.vue +++ b/src/views/charge/charge.vue @@ -1004,6 +1004,7 @@ export default { let user = window.sessionStorage.getItem('user'); let toOutShell = { ReportCode, token, + isBuildImage:'N', preViewCanPrint: 'Y', Parameters: [ { Name: 'printer', Value: user },