diff --git a/src/components/common/LocalConfig.vue b/src/components/common/LocalConfig.vue index f5e5c3a..9196085 100644 --- a/src/components/common/LocalConfig.vue +++ b/src/components/common/LocalConfig.vue @@ -4,11 +4,22 @@ 浏览器 /本地设置 + + + + + + + + + + + - - + + @@ -24,7 +35,7 @@ - + @@ -43,6 +54,9 @@ export default { data() { return { LocalConfig: { + normal: { + isDevTool: false, // 壳端是否显示打开调试工具按钮 + }, lisLabel: { // 检验条码打印 MarginTop: 56, // }, @@ -63,7 +77,7 @@ export default { this.LocalConfigInit = deepCopy(this.LocalConfig) let LocalConfig = window.localStorage.getItem("LocalConfig") || null try { - this.LocalConfig = JSON.parse(LocalConfig) || this.LocalConfig + this.LocalConfig = Object.assign({}, this.LocalConfig, JSON.parse(LocalConfig) || {}) } catch (error) { console.log('window.localStorage.getItem("LocalConfig")', error) } @@ -76,9 +90,9 @@ export default { methods: { btnOk() { - window.localStorage.setItem("LocalConfig",JSON.stringify(this.LocalConfig)) + window.localStorage.setItem("LocalConfig", JSON.stringify(this.LocalConfig)) }, - + }, watch: { diff --git a/src/components/customerOrg/customerOrgTree.vue b/src/components/customerOrg/customerOrgTree.vue index 823a75b..059a5d4 100644 --- a/src/components/customerOrg/customerOrgTree.vue +++ b/src/components/customerOrg/customerOrgTree.vue @@ -10,11 +10,7 @@ @node-click="treeclick" highlight-current ref="customerOrgTree">
- - + { + /* postapi(`/api/app/printreport/getpatientregisterguidereport?PatientRegisterId=${this.form.id}`) .then((res) => { if (res.code != -1) { @@ -1512,26 +1512,39 @@ export default { .catch(err => { this.$message.warning({ showClose: true, message: err}); }); - // }); - } else { - - postapi(`/api/app/printreport/getpatientregisterguidereport?PatientRegisterId=${this.form.id}`) - .then((res) => { - if (res.code != -1) { - toOutShell.ReportTable = res.data; - console.log('JSON.stringify(toOutShell)', JSON.stringify(toOutShell)); - return this.$peisAPI.print(JSON.stringify(toOutShell)); + */ + this.$peisAPI.printPre(JSON.stringify(toOutShell)) + .then(res => { + console.log('this.$peisAPI.printPre',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}` }); + }); + } else { + + // postapi(`/api/app/printreport/getpatientregisterguidereport?PatientRegisterId=${this.form.id}`) + // .then((res) => { + // if (res.code != -1) { + // toOutShell.ReportTable = res.data; + // console.log('JSON.stringify(toOutShell)', JSON.stringify(toOutShell)); + // return this.$peisAPI.print(JSON.stringify(toOutShell)); + // } + // }) + this.$peisAPI.print(JSON.stringify(toOutShell)) .then(res => { - //console.log('this.$peisAPI.print',res) - if (JSON.parse(res).code >= 0) { + if (JSON.parse(res).code < 0) { + this.$message.warning({ showClose: true, message: JSON.parse(res).message }); + }else{ //更新打印次数 return postapi('/api/app/patientregister/updatepatientregisterguideprinttimesmany', [this.form.id]) } }) .then(res => { - if (res.code != -1) { + if (res && res.code > -1) { let lfind = arrayExistObj(this.patientRegister.prList, 'id', this.form.id) if (lfind > -1) { if (this.patientRegister.prList[lfind].guidePrintTimes) { @@ -1540,6 +1553,8 @@ export default { this.patientRegister.prList[lfind].guidePrintTimes = 1; } } + }else{ + this.$message.warning({ showClose: true, message: res.message}); } }) .catch(err => { @@ -1551,6 +1566,8 @@ export default { //检验申请 async lisRequest() { + this.$message.warning({ showClose: true, message: '开发中……'}); + /* let isPrintLisRequest = false let res = null if (this.form.id.length < 1) { @@ -1590,6 +1607,7 @@ export default { } //打印检验申请单 this.lisPrint('0003', false); + */ }, //条码打印 @@ -1609,6 +1627,7 @@ export default { ReportCode, token, isBuildImage: 'N', IsUploadPdf: 'N', + BusinessCode:this.form.id, Parameters: [ { Name: 'printer', Value: user }, { Name: 'hisLog', Value: 'pic/hisLog.jpg' }, @@ -1617,45 +1636,38 @@ export default { if (isPreview) { - //http://140.143.162.39:9529/api/app/printreport/getlisrequestreport?PatientRegisterId=3a0d2e90-da68-3746-6775-bf17e5f9b295 - //this.multipleSelection.forEach((item,index) =>{ - postapi(`/api/app/printreport/getlisrequestreport?PatientRegisterId=${this.form.id}`) - .then((res) => { - if (res.code != -1) { - toOutShell.ReportTable = { lisRequest: res.data }; - console.log('JSON.stringify(toOutShell)', JSON.stringify(toOutShell)); - return this.$peisAPI.printPre(JSON.stringify(toOutShell)); + this.$peisAPI.printPre(JSON.stringify(toOutShell)) + .then(res => { + let lres = JSON.parse(res) + console.log('this.$peisAPI.printPre',lres) + if (lres.code < 0) { + console.log('打印检验条码错误',lres.message) + this.$message.warning({ showClose: true, message: lres.message }); } }) - .catch(err => { - this.$message.warning({ showClose: true, message: err}); + .catch((err) => { + console.log('打印检验条码错误', err) + this.$message.warning({ showClose: true, message: `${err}` }); }); - // }); } else { - postapi(`/api/app/printreport/getlisrequestreport?PatientRegisterId=${this.form.id}`) - .then((res) => { - if (res.code != -1) { - toOutShell.ReportTable = { lisRequest: res.data }; - console.log('JSON.stringify(toOutShell)', JSON.stringify(toOutShell)); - return this.$peisAPI.print(JSON.stringify(toOutShell)); + this.$peisAPI.print(JSON.stringify(toOutShell)) + .then(res => { + let lres = JSON.parse(res) + if (res && lres.code > -1) { + return postapi('/api/app/lisrequest/updatelisrequestisprint', { operateType: 1, patientRegisterId: this.form.id }) + }else{ + this.$message.warning({ showClose: true, message: lres.message }); } }) .then(res => { - if (res.code != -1) { - //更新打印状态 /api/app/lisrequest/updatelisrequestisprint - // { - // "operateType": 0, 操作类型（1.按PatientRegisterId 2.按LisRequestId） - // "patientRegisterId": "3fa85f64-5717-4562-b3fc-2c963f66afa6", - // "lisRequestId": "3fa85f64-5717-4562-b3fc-2c963f66afa6" - // } - return postapi('/api/app/lisrequest/updatelisrequestisprint', { operateType: 1, patientRegisterId: this.form.id }) + if(res && res.code < 0){ + this.$message.error({ showClose: true, message: `更新条码打印状态失败，原因：${res.message}` }); } }) .catch(err => { - this.$message.warning({ showClose: true, message: err}); + this.$message.warning({ showClose: true, message: `${err}`}); }); - } }, diff --git a/src/router/index.js b/src/router/index.js index 4f483fc..0a73c25 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -570,10 +570,11 @@ const router = new VueRouter({ routes, }); -router.beforeEach((to, form, next) => { +router.beforeEach((to, from, next) => { + console.log('to,form',to, from) let token = window.sessionStorage.getItem("token"); let tokentype = window.sessionStorage.getItem("tokentype"); - if (to.path === "/login") { + if (to.path == "/login") { if (token != null) { next({ path: "/", diff --git a/src/views/Home.vue b/src/views/Home.vue index 6d4ef0f..4ee0578 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -78,8 +78,8 @@ 退出登录 修改密码 - 本地设置 - 调试工具 + 本地设置 + 调试工具 客户端参数 最小化