diff --git a/src/components/patientRegister/AsbChargeRequest.vue b/src/components/patientRegister/AsbChargeRequest.vue index f1f3a7d..d19bea4 100644 --- a/src/components/patientRegister/AsbChargeRequest.vue +++ b/src/components/patientRegister/AsbChargeRequest.vue @@ -3,9 +3,8 @@
- + @@ -18,8 +17,7 @@ + height="160" highlight-current-row size="small" :row-style="{ height: '25px' }"> @@ -42,8 +40,7 @@
申请单包含项目
+ height="256" highlight-current-row size="small" :row-style="{ height: '25px' }"> @@ -61,7 +58,7 @@
- 收费申请 + 收费申请
关闭 @@ -84,8 +81,8 @@ export default { tabChoosed: '1', tableData: [], //组合项目数据 过滤后显示的数据 selectedData: [], //选中的组合项目 - hisRequestData:[], //收费申请单 - hisRequestDataDetails:[], //收费申请单明细 + hisRequestData: [], //收费申请单 + hisRequestDataDetails: [], //收费申请单明细 }; }, @@ -103,11 +100,11 @@ export default { methods: { initData(patientRegisterId) { - this.tableData=[] - if(!patientRegisterId) return + this.tableData = [] + if (!patientRegisterId) return postapi('/api/app/registerasbitem/GetCanChargeAsbitemsByPatientRegisterId', { patientRegisterId }) .then(res => { - if(res.code > -1){ + if (res.code > -1) { res.data.forEach(e => { e.total = Number(e.chargePrice * e.amount) this.tableData.push(e) @@ -121,36 +118,27 @@ export default { this.selectedData = v; }, - btnSubmit(mergeType) { - let registerCheckIds = []; - let count = (mergeType == '+') ? 2 : 1 - if (this.selectedData.length < count) { - this.$message.warning({ showClose: true, message: `请至少勾选 ${count} 个以上要${mergeType == '+' ? '合并' : '取消合并'}的检查项目!` }); + btnSubmit() { + if (this.selectedData.length == 0) { + this.$message.warning({ showClose: true, message: `请勾选要发送收费申请的检查项目!` }); return; } + let body = { + patientRegisterId: this.patientRegister.id, + registerCheckAsbitems: [] + } + this.selectedData.forEach(e => { - registerCheckIds.push(e.registerCheckId) + body.registerCheckAsbitems.push({ registerCheckAsbitemId: e.registerCheckAsbitemId }) }); - if (mergeType == '+') { - postapi("/api/app/registerasbitem/MergeRegisterAsbitem", { registerCheckIds }).then( - (res) => { - if (res.code != -1) { - console.log("操作成功!"); - this.getAsbItemList(this.id); - } - } - ); - } else { - postapi("/api/app/registerasbitem/cancelmergeregisterasbitem", { registerCheckIds }).then( - (res) => { - if (res.code != -1) { - console.log("操作成功!"); - this.getAsbItemList(this.id); - } + postapi("/api/app/ChargeRequest/Create", body) + .then(res => { + if (res.code > -1) { + this.dataTransOpts.refresh.charge.S++ } - ); - } + }); + }, }, diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue index 9231b20..afa9fda 100644 --- a/src/components/patientRegister/PatientRegisterEdit.vue +++ b/src/components/patientRegister/PatientRegisterEdit.vue @@ -403,7 +403,7 @@ 全免费
- 收费d + 收费
收费申请