Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web

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.mdtrtCertType = res.mdtrtCertType;
-    socialCard.value.mdtrtCertNo = params.mdtrtCertNo;
+    socialCard.value.mdtrtCertNo = res.mdtrtCertNo;
     socialCard.value.payInfo.selfpay_prop_type = res.insuinfo[0].insutype;
   }).finally(() => {
     isReading.value = false;
@@ -84,13 +84,13 @@ onUnmounted(() => {
   <div class="card-pay">
     <div class="title">
       <div class="left">医保信息</div>
-      <el-button type="primary" @click="socialCard.data=null">退出</el-button>
+      <el-button type="primary" v-if="socialCard.data != null" @click="socialCard.data=null">退出</el-button>
     </div>
     <div class="right">
       <div class="insuinfo" v-if="socialCard.data">
         <div class="line">
           <div class="label">姓名：</div>
-          <div class="info">{{ socialCard.data.baseinfo.psn_name }}</div>
+          <div class="info">{{ socialCard.data.baseinfo?.psn_name }}</div>
         </div>
         <div class="line">
           <div class="label">险种：</div>

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<any>();
+const socialCard = ref<any>({
+  data: null,
+  mdtrtCertType: null,
+  mdtrtCertNo: null,
+  payInfo: {
+  }
+});
 
 const show = ref(false)
 const printReceipt = ref(false);
@@ -71,7 +77,11 @@ const retailOrder = ref<any>(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;

src/components/charge/TotalPrice.vue

@@ -1,8 +1,9 @@
 <script setup lang="ts">
 import Panel from '../common/Panel.vue';
 import {defineEmits, defineModel,defineProps} from 'vue'
+
 const {status}=defineProps(['status'])
-const emit = defineEmits(['save','deleteItem','edit']);
+const emit = defineEmits(['save','deleteItem','openCheckOut']);
 const save = () => {
   emit('save');
 };
@@ -11,7 +12,7 @@ const deleteItem = () => {
 };
 const totalAmount = defineModel<any>()
 const editItem= () => {
-  emit('edit');
+  emit('openCheckOut');
 };
 </script>
 

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) {

src/views/charge/index.vue

@@ -54,7 +54,7 @@
                        @totalPriceChange="getOrderTotalPrice" :statusDisabled="statusDisabled==1"></GoodsDetail>
         </div>
         <div class="bottom">
-          <TotalPrice v-model="formData.totalPrice" @save="charge" :status="formData.status" @openCheckOut ="openCheckoutDetail(formData.goodsDetail,formData.patientRegistration.psnNo)"></TotalPrice>
+          <TotalPrice v-model="formData.totalPrice" @save="charge" :status="formData.status ==0" @openCheckOut ="openCheckoutDetail(formData.goodsDetail,formData.patientRegistration.psnNo)"></TotalPrice>
         </div>
       </el-scrollbar>
     </div>
@@ -70,7 +70,6 @@
   <CheckoutDetail ref="checkoutDetailRef" @confirm ="saveAndCharge"></CheckoutDetail>
   <Settlement
       ref="settlementRef"
-      v-model="socialCard"
       @orderCompleted="orderCompleted"
       @orderCanceled="orderCanceled"
   ></Settlement>
@@ -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<any>({payInfo: {}})
 const formData = ref<any>({
   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)
       })
     })
   }