11 changed files with 25 additions and 35 deletions
--- a/src/components/charge/AssociationIdCode.vue
+++ b/src/components/charge/AssociationIdCode.vue
@ -95,9 +95,6 @@ const addIdCode = ()=>{
      show.value = false;
      for (let subItem of tableData.value){
        if (subItem.id === selected.value){
-          if (subItem.idCode == null){
-            subItem.idCode = [];
-          }
          subItem.idCode?.push(idCode);
          break
        }
--- a/src/components/charge/PatientCard.vue
+++ b/src/components/charge/PatientCard.vue
@ -14,20 +14,20 @@
            <span class="avatar-info-age">{{ seeDockerInfo?.patientInfo?.age||0}}岁</span>
          </div>
          <div class="avatar-info-phone-num">
-            <span class="avatar-info-phone">{{ seeDockerInfo.patientInfo?.phone }}</span>
+            <span class="avatar-info-phone">{{ seeDockerInfo?.patientInfo?.phone }}</span>
            <span class="avatar-info-num">就诊次数：<i class="caret-num">{{
-                seeDockerInfo.seeDoctorCount || 0
+                seeDockerInfo?.seeDoctorCount || 0
              }}次</i></span>
          </div>
        </div>
      </div>
      <div class="detail">
        <div>挂号医生:&nbsp;<span
-            class="detail-doctor">{{ seeDockerInfo.dockerName }}-{{ seeDockerInfo?.sectionName }}</span>
+            class="detail-doctor">{{ seeDockerInfo?.dockerName }}-{{ seeDockerInfo?.sectionName }}</span>
        </div>
        <div class="detail-middle">
-          <div>费用类别:&nbsp;<span class="detail-doctor">{{seeDockerInfo.registerType==2?'医保':'自费'}}</span></div>
-          <div>医保卡剩余金额:&nbsp;<span class="detail-balance">{{ seeDockerInfo.patientInfo.socialBalance?seeDockerInfo.patientInfo.socialBalance+"元":"-" }}</span></div>
+          <div>费用类别:&nbsp;<span class="detail-doctor">{{seeDockerInfo?.feeTypeName||'-'}}</span></div>
+          <div>医保卡剩余金额:&nbsp;<span class="detail-balance">{{ seeDockerInfo?.socialBalance }}元</span></div>
        </div>
        <div>上次就诊时间:&nbsp;<span class="detail-doctor">{{
            formatDate(seeDockerInfo?.lastSeeDoctorTime)||'-'
--- a/src/components/charge/TotalPrice.vue
+++ b/src/components/charge/TotalPrice.vue
@ -3,7 +3,7 @@ import Panel from '../common/Panel.vue';
 import {defineEmits, defineModel,defineProps} from 'vue'

 const {status}=defineProps(['status'])
-const emit = defineEmits(['save','deleteItem','openCheckOut',"openSettlement"]);
+const emit = defineEmits(['save','deleteItem','openCheckOut']);
 const save = () => {
  emit('save');
 };
@ -11,12 +11,9 @@ const deleteItem = () => {
  emit('deleteItem');
 };
 const totalAmount = defineModel<any>()
-const openCheckOut= () => {
+const editItem= () => {
  emit('openCheckOut');
 };
-const openSettlement =()=>{
-  emit('openSettlement')
-}
 </script>

 <template>
@ -24,8 +21,8 @@ const openSettlement =()=>{
    <div class="footer">
      <div>总金额：<span class="text icon">￥</span><span class="text">{{ totalAmount || '0' }}</span></div>
      <div class="btn-group" v-if="status">
-        <el-button type="primary" @click="openCheckOut">追溯码</el-button>
-        <el-button type="primary" @click="openSettlement">收费</el-button>
+        <el-button type="primary" disabled>追溯码</el-button>
+        <el-button type="primary" @click="editItem">收费</el-button>
      </div>
    </div>
  </Panel>
--- a/src/components/common/goods/GoodsDetail.vue
+++ b/src/components/common/goods/GoodsDetail.vue
@ -71,7 +71,7 @@
      </el-table-column>
      <el-table-column label="小计">
        <template #default="scope">
-          ￥{{ Math.round(scope.row.selectedNum * scope.row.selectedPrice * 100) / 100  }}
+          ￥{{ scope.row.selectedNum * scope.row.selectedPrice }}
        </template>
      </el-table-column>
      <el-table-column label="操作" v-if="props.status">
@ -159,7 +159,7 @@ const goodsSelect = (row: any) => {
  row.selectedUnit = row.packagingUnit
  row.selectedPrice = row.unitPrice
  row.shouldNumber = 1;
-  row.idCode = row.idCode?row.idCode==""?null:row.idCode.split(","):null
+  row.idCode = row.idCode?.split(",")


  if (goodsDetail.value.find((i: any) => i.id == row.id)) {
@ -200,7 +200,6 @@ const getTotalPrice = () => {
  if (goodsDetail.value) {
    goodsDetail.value.forEach((item: any) => {
      totalPrice += item.selectedNum * item.selectedPrice
-      totalPrice  = Math.round(totalPrice * 100) / 100
    })
  }

--- a/src/components/common/service/ServiceDetail.vue
+++ b/src/components/common/service/ServiceDetail.vue
@ -42,7 +42,7 @@
      </el-table-column>
      <el-table-column label="小计">
        <template #default="scope">
-          ￥{{ Math.round(scope.row.selectedNum * scope.row.selectedPrice * 100) / 100 }}
+          ￥{{ scope.row.selectedNum * scope.row.selectedPrice }}
        </template>
      </el-table-column>
      <el-table-column label="操作" v-if="props.status">
@ -137,7 +137,6 @@ const getTotalPrice = () => {
  if (itemDetail.value) {
    itemDetail.value.forEach((item: any) => {
      totalPrice += item.selectedNum * item.selectedPrice
-      totalPrice  = Math.round(totalPrice * 100) / 100
    })
  }

--- a/src/components/outpatient/MedicalQueue.vue
+++ b/src/components/outpatient/MedicalQueue.vue
@ -23,7 +23,7 @@
      </div>
      <div class="search">
        <img src="/static/images/outpatient/search.png" class="search-icon" alt="搜索图标">
-        <input class="search-input" v-model="search" placeholder="搜索门诊单" style="font-size: 16px" @keydown.enter="searchList">
+        <input class="search-input" v-model="search" placeholder="搜索门诊单" style="font-size: 16px">
      </div>
      <div class="list">
        <ul style="height: 100%">
--- a/src/components/registration/Edit.vue
+++ b/src/components/registration/Edit.vue
@ -245,8 +245,7 @@ const save = () => {
  let data = {
    ...edit_data.value,
    psnNo: socialCard.value?.data?.baseinfo.psn_no,
-    insutype: socialCard.value?.data?.insuinfo[0].insutype,
-    insuBalance : socialCard.value?.data?.insuinfo[0].balc,
+    insutype: socialCard.value?.data?.insuinfo[0].insutype

  }
  form.value.validate((v: any) => {
--- a/src/components/social/reconciliation/DetailList.vue
+++ b/src/components/social/reconciliation/DetailList.vue
@ -1,7 +1,8 @@


 <template>
-<Mask :is-show="show"  :height="600" :width="1300" @close="close">
+<Mask :is-show="show"  :height="600" :width="1200">
+  <CloseBtn @click="close"></CloseBtn>
    <div class="container-wrapper">
      <div class="table">
        <el-table :data="detailList" max-height="500px" highlight-current-row>
@ -38,7 +39,7 @@
 </template>
 <script setup lang="ts">

-import Mask from "@/components/common/Mask.vue";
+import Mask from "@/components/Mask.vue";
 import {nextTick, ref} from "vue";
 import CloseBtn from "@/components/CloseBtn.vue";
 import {reconciliationResult} from "@/assets/config/constants.ts"
--- a/src/views/charge/index.vue
+++ b/src/views/charge/index.vue
@ -26,7 +26,7 @@
                <div>医生：</div>
                <div class="doctor">
                  <el-select
-                      v-model="formData.patientRegistration.organizationDoctorId"
+                      v-model="formData.doctorId"
                      @change="handleChange"
                      clearable
                      style="width: 100%"
@ -54,7 +54,7 @@
                       @totalPriceChange="getOrderTotalPrice" :statusDisabled="statusDisabled==1"></GoodsDetail>
        </div>
        <div class="bottom">
-          <TotalPrice v-model="formData.totalPrice" @save="charge" :status="formData.status ==0" @openSettlement="charge" @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>
@ -190,7 +190,7 @@ const checkTraceCode = (goodsList: any[]) => {
      }else {
        goodsItem.shouldNumber = Math.ceil(goodsItem.selectedNum / goodsItem.minPackagingNumber);
      }
-      goodsItem.idCode = goodsItem.idCode?goodsItem.idCode==""?null:goodsItem.idCode.split(","):null
+      goodsItem.idCode = goodsItem.idCode?.split(",")
    }

    getOrderTotalPrice()
@ -236,10 +236,8 @@ const getOrderTotalPrice = () => {
  formData.value.goodsDetail.forEach((item: any) => {
    totalPrice += item.selectedPrice * item.selectedNum
  })
-  formData.value.preTotalPrice = Math.round(totalPrice * 100) / 100
-  formData.value.totalPrice = Math.round(totalPrice * 100) / 100
-
-
+  formData.value.preTotalPrice = totalPrice
+  formData.value.totalPrice = totalPrice
 }


--- a/src/views/outpatient/index.vue
+++ b/src/views/outpatient/index.vue
@ -163,8 +163,8 @@ const getOrderTotalPrice = () => {
  formData.value.goodsDetail?.forEach((item: any) => {
    totalPrice += item.selectedPrice * item.selectedNum
  })
-  formData.value.preTotalPrice = Math.round((totalPrice * 100) / 100 )
-  formData.value.totalPrice = Math.round((totalPrice * 100) / 100 )
+  formData.value.preTotalPrice = totalPrice
+  formData.value.totalPrice = totalPrice
 }
 const caseRef = ref<any>("")
 const copyForm = (item: any) => {
--- a/src/views/social/update.vue
+++ b/src/views/social/update.vue
@ -53,7 +53,7 @@
 import {ref, reactive, onMounted} from 'vue';
 import {ElNotification, type TabsPaneContext} from 'element-plus'
 import {post} from '@/utils/request.ts'
-import { Loading, SuccessFilled } from '@element-plus/icons-vue';
+
 const format = (percentage: number) => ('正在更新')
 let updt_time = ref(getDate30DaysAgo())
 let current_page = ref(1);