diff --git a/src/components/charge/CardPay.vue b/src/components/charge/CardPay.vue
index 8af771e..af464de 100644
--- a/src/components/charge/CardPay.vue
+++ b/src/components/charge/CardPay.vue
@@ -65,8 +65,8 @@ const reciceMessage = (response: Response) => {
const getInfoFor1101 = (params: any) => {
post("social/person/getCustomSocialInfo", {data: params}).then((res: any) => {
socialCard.value.data = res;
- socialCard.value.mdtrtCertType = params.mdtrtCertType;
- socialCard.value.mdtrtCertNo = params.mdtrtCertNo;
+ socialCard.value.mdtrtCertType = res.mdtrtCertType;
+ socialCard.value.mdtrtCertNo = res.mdtrtCertNo;
socialCard.value.payInfo.selfpay_prop_type = res.insuinfo[0].insutype;
}).finally(() => {
isReading.value = false;
@@ -84,13 +84,13 @@ onUnmounted(() => {
姓名:
-
{{ socialCard.data.baseinfo.psn_name }}
+
{{ socialCard.data.baseinfo?.psn_name }}
险种:
diff --git a/src/components/charge/Settlement.vue b/src/components/charge/Settlement.vue
index 032a08f..1bdeb3e 100644
--- a/src/components/charge/Settlement.vue
+++ b/src/components/charge/Settlement.vue
@@ -62,7 +62,13 @@ import PersonalPayment from "@/components/charge/PersonalPayment.vue";
import {ElMessage} from "element-plus";
const wsStore = useWsStore();
-const socialCard = defineModel
();
+const socialCard = ref({
+ data: null,
+ mdtrtCertType: null,
+ mdtrtCertNo: null,
+ payInfo: {
+ }
+});
const show = ref(false)
const printReceipt = ref(false);
@@ -71,7 +77,11 @@ const retailOrder = ref(null);
const init = async (code: any, psnNo: any) => {
retailOrder.value = await post("charge/getByCode", {code: code});
if (psnNo != null){
- socialCard.value = await post("social/person/getSocialInfoByPsnNo", {psnNo: psnNo});
+ let result:any= await post("social/person/getSocialInfoByPsnNo", {psnNo: psnNo});
+ socialCard.value.data = result;
+ socialCard.value.mdtrtCertType = result.mdtrtCertType;
+ socialCard.value.mdtrtCertNo = result.mdtrtCertNo;
+ socialCard.value.payInfo.selfpay_prop_type = result.insuinfo[0].insutype;
}
show.value = true;
@@ -82,7 +92,7 @@ const changePriceType = (type: any, index: any) => {
payType.value = type;
selectedIndex.value = index
}
-const emit = defineEmits(['orderComplete', 'orderCanceled'])
+const emit = defineEmits(['orderCompleted', 'orderCanceled'])
const completeSettlement = () => {
if (!retailOrder.value) {
return;
@@ -106,7 +116,7 @@ const completeSettlement = () => {
const orderCompleted = () => {
show.value = false;
ElMessage.success("保存成功")
- emit('orderComplete', printReceipt.value)
+ emit('orderCompleted', printReceipt.value)
}
const orderCanceled = () => {
show.value = false;
diff --git a/src/components/charge/TotalPrice.vue b/src/components/charge/TotalPrice.vue
index 7dacb83..9dfbeff 100644
--- a/src/components/charge/TotalPrice.vue
+++ b/src/components/charge/TotalPrice.vue
@@ -1,8 +1,9 @@
diff --git a/src/components/registration/Edit.vue b/src/components/registration/Edit.vue
index 2b89a8d..06caf0e 100644
--- a/src/components/registration/Edit.vue
+++ b/src/components/registration/Edit.vue
@@ -246,6 +246,7 @@ const save = () => {
...edit_data.value,
psnNo: socialCard.value?.data?.baseinfo.psn_no,
insutype: socialCard.value?.data?.insuinfo[0].insutype
+
}
form.value.validate((v: any) => {
if (v) {
diff --git a/src/views/charge/index.vue b/src/views/charge/index.vue
index 12e6f1c..07b249e 100644
--- a/src/views/charge/index.vue
+++ b/src/views/charge/index.vue
@@ -54,7 +54,7 @@
@totalPriceChange="getOrderTotalPrice" :statusDisabled="statusDisabled==1">
-
+
@@ -70,7 +70,6 @@
@@ -96,7 +95,6 @@ import {apiConfig} from "@/assets/config/apiConfig.ts";
import CheckoutDetail from "@/components/charge/CheckoutDetail.vue";
import {ElMessage} from "element-plus";
-const socialCard = ref
({payInfo: {}})
const formData = ref({
patientInfo: {},
diagnosisMedicalRecord: {},
@@ -159,7 +157,7 @@ const checkTraceCode = (goodsList: any[]) => {
post('charge/save', {data: {...formData.value, doctorId: doctorId.value}}).then((res: any) => {
formData.value.code = res
nextTick(() => {
- settlementRef.value?.init(res)
+ settlementRef.value?.init(res, formData.value.patientRegistration.psnNo)
})
})
}