diff --git a/src/components/patientRegister/AsbChargeRequest.vue b/src/components/patientRegister/AsbChargeRequest.vue new file mode 100644 index 0000000..5796023 --- /dev/null +++ b/src/components/patientRegister/AsbChargeRequest.vue @@ -0,0 +1,164 @@ + + + + diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue index 14df26f..e4a7a2d 100644 --- a/src/components/patientRegister/PatientRegisterEdit.vue +++ b/src/components/patientRegister/PatientRegisterEdit.vue @@ -371,7 +371,7 @@ 检验单申请
- 条码打印 + 条码打印
条码补打 @@ -389,16 +389,19 @@
- 全个人支付 + 全个人支付
- 全单位支付 + 全单位支付
- 全免费 + 全免费
- 收费 + 收费 +
+
+ 收费申请
+ + + @@ -510,6 +519,7 @@ import Camera from "./Camera.vue"; import PatientRegisterItem from "./PatientRegisterItem.vue"; import LisRequest from "./LisRequest.vue"; import MergeAsbitem from "./MergeAsbitem.vue"; +import AsbChargeRequest from "./AsbChargeRequest.vue"; import Charge from "../../views/charge/charge.vue"; import PatientRegisterEditQuery from "../../components/patientRegister/PatientRegisterEditQuery.vue"; @@ -521,6 +531,7 @@ export default { MergeAsbitem, PatientRegisterItem, Charge, + AsbChargeRequest, PatientRegisterEditQuery }, // isDoctor: '0:标准人员登记/1:医生诊台登记(可修改单位)' @@ -1638,7 +1649,7 @@ export default { //条码打印 lisPrint(ReportCode, isPreview) { - if (this.form.id.length < 1) { + if (!this.form.id) { this.$message.info({ showClose: true, message: "人员信息尚未保存，不可执行此操作！"}); return; } @@ -1659,8 +1670,6 @@ export default { { Name: 'hisLog', Value: 'pic/hisLog.jpg' }, ], }; - - if (isPreview) { this.$peisAPI.printPre(JSON.stringify(toOutShell)) .then(res => { @@ -1676,10 +1685,10 @@ export default { this.$message.warning({ showClose: true, message: `${err}` }); }); } else { - this.$peisAPI.print(JSON.stringify(toOutShell)) .then(res => { let lres = JSON.parse(res) + console.log('打印检验条码', lres) if (res && lres.code > -1) { return postapi('/api/app/lisrequest/updatelisrequestisprint', { operateType: 1, patientRegisterId: this.form.id }) }else{ @@ -1717,12 +1726,39 @@ export default { this.patientRegister.mergeAsbitemVisble = true; }, - async toCharge(patientRegisterNo) { + btnPayTypeFlag(payTypeFlag){ + this.dataTransOpts.tableM.register_check_asbitem.forEach(e => { + if(e.isCharge == 'N') e.payTypeFlag = payTypeFlag + }); + }, - if (!patientRegisterNo) { + async getAsb(id){ + let err = '' + try { + let res = await getapi(`/api/app/registerasbitem/getlistinpatientregisterid?PatientRegisterId=${id}`) + if(res.code > -1){ + this.dataTransOpts.tableM.register_check_asbitem = res.data + }else{ + err = res.message + } + } catch (error) { + err = `${error}` + } + return err + }, + + async toCharge(form) { + + if (!form.patientRegisterNo) { this.$message.warning({ showClose: true, message: "请先保存人员信息！"}) return } + + let err = await this.getAsb(form.id) + if(err){ + this.$message.error(err) + return + } let chargeMoney = Number(0) //支付方式,比如是0自费、2免费、1单位支付 @@ -1735,14 +1771,41 @@ export default { } //多次重复点击时，刷新处理 - this.chargePatientRegisterNo = patientRegisterNo - setTimeout(() => { - this.dataTransOpts.refresh.charge.S++ - }, 10) + this.chargePatientRegisterNo = form.patientRegisterNo + this.dataTransOpts.refresh.charge.S++ this.dialogWin.charge = true }, + // 收费申请 + async chargeRequest(patientRegisterId){ + if (!patientRegisterId) { + this.$message.warning({ showClose: true, message: "请先保存人员信息！"}) + return + } + + let err = await this.getAsb(patientRegisterId) + if(err){ + this.$message.error(err) + return + } + + let chargeMoney = Number(0) + //支付方式,比如是0自费、2免费、1单位支付 + this.dataTransOpts.tableM.register_check_asbitem.forEach(e => { + if (e.payTypeFlag == '0' && e.isCharge == 'N') chargeMoney += Number(e.total) + }); + if (chargeMoney == 0) { + this.$message.warning({ showClose: true, message: '没有可收费的记录！' }) + return + } + + // 显示 + this.dataTransOpts.refresh.charge.S++ + this.dialogWin.AsbChargeRequest = true + + }, + //关闭收费窗口时，刷新收费状态信息 closeDialogCharge() { // this.prAsbOpraOpts.prAsbQuery++ diff --git a/src/components/patientRegister/PatientRegisterItem.vue b/src/components/patientRegister/PatientRegisterItem.vue index 79519fa..4d3cb57 100644 --- a/src/components/patientRegister/PatientRegisterItem.vue +++ b/src/components/patientRegister/PatientRegisterItem.vue @@ -1128,22 +1128,7 @@ export default { } }, - //按钮更新支付方式 - "prAsbOpraOpts.payTypeFlag": { - // immediate: true, // 立即执行 - // deep: true, // 深度监听复杂类型内变化 - handler(newVal, oldVal) { - if (newVal != oldVal && newVal != '') { - this.dataTransOpts.tableM.register_check_asbitem.forEach(e => { - e.payTypeFlag = newVal; - return e; - }); - // this.onSubmit('调整支付方式'); - } - } - }, - - //更换分组 + //更换分组 "prAsbOpraOpts.prAsbGroup": { // immediate: true, // 立即执行 // deep: true, // 深度监听复杂类型内变化 diff --git a/src/components/report/BtnReport.vue b/src/components/report/BtnReport.vue index 6813feb..98d89d7 100644 --- a/src/components/report/BtnReport.vue +++ b/src/components/report/BtnReport.vue @@ -80,6 +80,7 @@ export default { let toOutShell = { ReportCode, token, isBuildImage: 'N', + IsUploadPdf: 'N', preViewCanPrint: this.dataTransOpts.tableS.patient_register.isAudit, BusinessCode: this.dataTransOpts.tableS.patient_register.id, Parameters: [ diff --git a/src/store/index.js b/src/store/index.js index 64a4cca..3776505 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -379,6 +379,7 @@ export default new Vuex.Store({ PatientRegisterEditGroupBatch: false, //批量调整分组 MenuPageSet: false, // 设置角色菜单权限 LocalConfig: false, // 设置窗口 + AsbChargeRequest: false, // 收费申请 } }, diff --git a/src/views/doctorCheck/unitphysicalexamination.vue b/src/views/doctorCheck/unitphysicalexamination.vue index a72e125..c7b3d5c 100644 --- a/src/views/doctorCheck/unitphysicalexamination.vue +++ b/src/views/doctorCheck/unitphysicalexamination.vue @@ -8,8 +8,7 @@
-
+ ">
体检单位： - - + +
报表格式： - +
- 查询 + 查询
- 导出excel + 导出excel
- 打印 + 打印
-
- +
+ - +