From 6db86876eaf29eb5f88daeaa669b7852594afd37 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Sun, 16 Nov 2025 18:32:40 +0800
Subject: [PATCH] charge
---
src/components/doctorCheck/CheckPicture.vue | 5 +-
src/views/charge/charge.vue | 70 +++++++++++++++------
2 files changed, 54 insertions(+), 21 deletions(-)
diff --git a/src/components/doctorCheck/CheckPicture.vue b/src/components/doctorCheck/CheckPicture.vue
index 6fb88b4..c90e429 100644
--- a/src/components/doctorCheck/CheckPicture.vue
+++ b/src/components/doctorCheck/CheckPicture.vue
@@ -420,7 +420,7 @@ export default {
patientName: this.dataTransOpts.tableS.patient_register.patientName,
sexName: this.dataTransOpts.tableS.patient_register.sexName,
age: (this.dataTransOpts.tableS.patient_register.age || '') + '',
- asbitemName: this.doctorCheck.asbitemName
+ asbitemName: this.doctorCheck.checkRequestNo||'temp'
}
// console.log('this.$peisAPI.imageAcquisition', JSON.stringify(toOutShell))
@@ -455,7 +455,8 @@ export default {
this.checkPictures.push({ pictureFilename: baseHead + item.Image })
let fileName = item.FilePath
let dotIndex = fileName.lastIndexOf('\\');
- if (dotIndex > -1) fileName = fileName.substring(dotIndex, fileName.length);
+ let pointIndex = fileName.lastIndexOf('.');
+ if (dotIndex > -1) fileName = fileName.substring(dotIndex + 1, pointIndex || fileName.length);
let body = {
registerCheckId: this.dataTransOpts.tableS.register_check.id,
diff --git a/src/views/charge/charge.vue b/src/views/charge/charge.vue
index 272ca17..f6e1b0f 100644
--- a/src/views/charge/charge.vue
+++ b/src/views/charge/charge.vue
@@ -180,8 +180,7 @@
-
@@ -276,7 +275,8 @@
-
+
查询
@@ -431,7 +431,8 @@ export default {
cardChoosed: {}, //选中卡
winDialog: {
queryCard: false,
- }
+ },
+ charge_normal_card: 1, // 单次收费允许使用多少张充值卡
};
},
@@ -704,11 +705,11 @@ export default {
// 确定选中卡记录
btnOkCard() {
- this.chargePays[this.cardSeq].cardNo = this.cardChoosed.cardNo
+ this.chargePays[this.cardSeq].cardNo = this.cardChoosed.cardNo + ' 余：' + this.cardChoosed.cardBalance
this.chargePays[this.cardSeq].cardRegisterId = this.cardChoosed.id
// 将折扣带回，并触发
- this.form.discount = this.cardChoosed.discount||100
- this.discountToDetails()
+ this.form.discount = this.cardChoosed.discount || 100
+ this.discountToDetails()
this.winDialog.queryCard = false
},
@@ -1241,6 +1242,27 @@ export default {
}
},
+ // 获取系统参数 charge_normal_card 的值
+ getChargeNormalCard() {
+ return new Promise((resolve, reject) => {
+ // 获取系统参数(pacs系统条码类型：0:检查条码，1:人员条码)
+ postapi('/api/app/SysParmValue/GetSysParmValueBySysParmId', { sysParmId: 'charge_normal_card' })
+ .then(res => {
+ if (res.code > -1) {
+ try {
+ this.charge_normal_card = Number(res.data || "1") || 1
+ } catch (error) {
+ console.log('charge_normal_card', error)
+ }
+ }
+ })
+ .finally(() => {
+ resolve()
+ })
+ })
+
+ },
+
//数据初始化
dictInit() {
@@ -1350,17 +1372,27 @@ export default {
*/
//支付方式 /api/app/pay-mode(全部)
- getapi("/api/app/paymode/getlistinisactive").then((res) => {
- if (res.code == 1) {
- this.dict.payMode = res.data;
- //未收费时
- this.chargePaysInit = [];
- this.dict.payMode.forEach(e => {
- this.chargePaysInit.push({ chargeId: null, payModeId: e.id, chargeMoney: 0, cardBillId: null, cardRegisterId: '', cardNo: '' })
- });
- this.chargePays = deepCopy(this.chargePaysInit);
- }
- });
+ this.getChargeNormalCard()
+ .then(() => {
+ return getapi("/api/app/paymode/getlistinisactive")
+ })
+ .then((res) => {
+ if (res.code == 1) {
+ this.dict.payMode = res.data;
+ //未收费时
+ this.chargePaysInit = [];
+ this.dict.payMode.forEach(e => {
+ if(e.id == '05'){
+ for (let index = 0; index < this.charge_normal_card; index++) {
+ this.chargePaysInit.push({ chargeId: null, payModeId: e.id, chargeMoney: 0, cardBillId: null, cardRegisterId: '', cardNo: '' })
+ }
+ }else{
+ this.chargePaysInit.push({ chargeId: null, payModeId: e.id, chargeMoney: 0, cardBillId: null, cardRegisterId: '', cardNo: '' })
+ }
+ });
+ this.chargePays = deepCopy(this.chargePaysInit);
+ }
+ });
// postapi("/api/app/asbitem/getasbitemlist", {}).then((res) => {
// if (res.code == 1) {
@@ -1391,7 +1423,7 @@ export default {
case '卡号':
if (input.value) this.btnQueryCard()
//input.select()
- break;
+ break;
}
}
});