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

src/components/registration/CardDefault.vue

@@ -6,7 +6,7 @@ import natys from "@/assets/config/directory/antys.json";
 import psnCertTypes from "@/assets/config/directory/psnCertTypes.json";
 import insutypes from "@/assets/config/directory/insutypes.json";
 import {onMounted, onUnmounted, ref} from "vue";
-import {ElMessage} from "element-plus";
+import {ElMessage, ElMessageBox} from "element-plus";
 import {post} from "@/utils/request.ts";
 import type {Request, Response} from "@/utils/ws.ts";
 import {useWsStore} from "@/stores/wsStore.ts";
@@ -67,15 +67,23 @@ const reciceMessage = (response: Response) => {
   }
   getInfoFor1101(params)
 }
-const emit = defineEmits(['socialCardUpdate'])
+const loading = ref(false)
+const emit = defineEmits(['socialCardUpdate', 'close'])
 const getInfoFor1101 = (params: any) => {
+  loading.value = true
   post("social/person/getCustomSocialInfo", {data: params}).then((res: any) => {
     socialCard.value.data = res;
     socialCard.value.mdtrtCertType = params.mdtrtCertType;
     socialCard.value.mdtrtCertNo = params.mdtrtCertNo;
-    emit('socialCardUpdate',socialCard.value)
+    ElMessage({
+      message: "读取成功",
+      type: 'success',
+    });
+    emit('socialCardUpdate', socialCard.value)
+    loading.value = false
   }).finally(() => {
     isReading.value = false;
+    loading.value = false
   })
 }
 
@@ -85,37 +93,32 @@ onMounted(async () => {
 onUnmounted(() => {
   wsStore.removeAllMessageCallback()
 })
+const close = () => {
+  ElMessageBox.confirm("退出识别", "提示", {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    callback: (action: any) => {
+      if (action == "confirm") {
+        socialCard.value.data = null
+        emit('close')
+      }
+      if (action == "cancel") {
+        emit('socialCardUpdate', socialCard.value)
+      }
+
+    },
+  });
+}
 </script>
 
 <template>
-  <div class="card-default">
+  <div class="card-default" style="padding:24px">
     <div class="info" v-if="socialCard.data">
-      <el-descriptions title="医保卡信息" column="2" border>
-        <el-descriptions-item label="姓名">{{ socialCard.data.baseinfo.psn_name }}</el-descriptions-item>
-        <el-descriptions-item label="性别">{{ getKey(gends, socialCard.data.baseinfo.gend) }}</el-descriptions-item>
-        <el-descriptions-item label="年龄">{{ Math.floor(socialCard.data.baseinfo.age) }}</el-descriptions-item>
-        <el-descriptions-item label="民族">{{ getKey(natys, socialCard.data.baseinfo.naty) }}</el-descriptions-item>
-        <el-descriptions-item label="证件类型" span="2">{{
-            getKey(psnCertTypes, socialCard.data.baseinfo.psn_cert_type)
-          }}
-        </el-descriptions-item>
-        <el-descriptions-item label="证件号码" span="2">{{ socialCard.data.baseinfo.certno }}</el-descriptions-item>
-      </el-descriptions>
       <div class="btn-wrapper">
-        <el-button text bg @click="socialCard.data = null">退出医保卡</el-button>
+        <el-button text bg @click="close">退出医保卡</el-button>
-      </div>
-      <div class="insuinfo" v-if="socialCard.data.insuinfo">
-        <el-scrollbar max-height="180">
-          <div class="item" v-for="(item,index) in socialCard.data.insuinfo"><span
-              class="name">账户余额({{ getKey(insutypes, item.insutype) }})</span><span
-              class="value">{{ item.balc.toFixed(2) }}</span></div>
-        </el-scrollbar>
       </div>
     </div>
-    <div class="empty" v-else>
+    <div v-loading="loading" class="empty" v-else>
-      <div class="tip" v-loading="isReading">
-        <img style="width: 100%;height: 226px" src="/static/images/retail/null.png" alt="">
-      </div>
       <div class="btn-wrapper">
         <div class="btn" @click="ReadSocialCard('03')" @keydown.enter.prevent tabindex="-1">医保卡</div>
         <div class="btn" @click="ReadSocialCard('01')" @keydown.enter.prevent tabindex="-1">电子凭证</div>
@@ -149,6 +152,7 @@ onUnmounted(() => {
       font-size: 14px;
       color: #666;
       display: flex;
+      align-items: center;
 
       .name {
         flex: 1;
@@ -182,16 +186,13 @@ onUnmounted(() => {
     }
 
     .btn-wrapper {
+      width: 100%;
       height: 100%;
-      display: flex;
-      margin-top: 24px;
 
       .btn {
-        flex: 1;
         height: 40px;
         background: #FFFFFF;
         border-radius: 8px;
-        border: 1px solid #4D6DE4;
         cursor: pointer;
         font-weight: bold;
         font-size: 16px;
@@ -199,15 +200,19 @@ onUnmounted(() => {
         font-style: normal;
         line-height: 40px;
         text-align: center;
+        padding: 0 24px;
+
         &:hover {
           background: #4D6DE4;
           color: #FFFFFF;
 
         }
+
         &:nth-child(2n) {
-          margin:0 8px;
+          margin: 0 8px;
         }
-        &:last-child{
+
+        &:last-child {
           margin-right: 0;
         }
       }

src/components/registration/Edit.vue

@@ -1,5 +1,6 @@
 <template>
-  <Mask :is-show="isShow" width="800" title="挂号" @close="close" :show-footer="true">
+  <Mask :is-show="isShow" width="800" :height="500" title="挂号" @close="close" :show-footer="true">
+
     <div style="padding:0 24px 24px">
       <el-form
           :model="edit_data"
@@ -14,6 +15,14 @@
             :column="4"
             style="margin-top: 20px"
         >
+          <!--          <el-descriptions-item label="结算方式">-->
+          <!--            <el-form-item prop="gender">-->
+          <!--              <el-radio-group v-model="edit_data.type">-->
+          <!--                <el-radio value="1">医保</el-radio>-->
+          <!--                <el-radio value="2">自费</el-radio>-->
+          <!--              </el-radio-group>-->
+          <!--            </el-form-item>-->
+          <!--          </el-descriptions-item>-->
           <el-descriptions-item label="名称">
             <el-form-item prop="name">
               <el-input v-model="edit_data.name" placeholder="请输入名称" clearable></el-input>
@@ -28,25 +37,25 @@
             </el-form-item>
           </el-descriptions-item>
           <el-descriptions-item label="年龄">
-           <el-form-item prop="age">
+            <el-form-item prop="age">
-             <el-input v-model="edit_data.age" placeholder="请输入年龄"></el-input>
+              <el-input v-model.number="edit_data.age" placeholder="请输入年龄"></el-input>
-           </el-form-item>
+            </el-form-item>
           </el-descriptions-item>
           <el-descriptions-item label="医生">
-           <el-form-item prop="organizationDoctorId">
+            <el-form-item prop="organizationDoctorId">
-             <el-select
+              <el-select
-                 v-model="edit_data.organizationDoctorId"
+                  v-model="edit_data.organizationDoctorId"
-                 placeholder="请选择医生"
+                  placeholder="请选择医生"
-             >
+              >
-               <el-option
+                <el-option
-                   v-for="item in props.doctorList"
+                    v-for="item in props.doctorList"
-                   :key="item.id"
+                    :key="item.id"
-                   :label="item.name"
+                    :label="item.name"
-                   :value="item.id"
+                    :value="item.id"
-               >
+                >
-               </el-option>
+                </el-option>
-             </el-select>
+              </el-select>
-           </el-form-item>
+            </el-form-item>
           </el-descriptions-item>
           <el-descriptions-item label="证件类型">
             <el-form-item prop="certType">
@@ -72,32 +81,38 @@
             </el-form-item>
           </el-descriptions-item>
           <el-descriptions-item label="就诊类型">
-           <el-form-item prop="visitType">
+            <el-form-item prop="visitType">
-             <el-select v-model="edit_data.visitType" placeholder="就诊类型">
+              <el-select v-model="edit_data.visitType" placeholder="就诊类型">
-               <el-option label="初诊" :value="0"></el-option>
+                <el-option label="初诊" :value="0"></el-option>
-               <el-option label="复诊" :value="1"></el-option>
+                <el-option label="复诊" :value="1"></el-option>
-             </el-select>
+              </el-select>
-           </el-form-item>
+            </el-form-item>
           </el-descriptions-item>
           <el-descriptions-item label="备注">
             <el-input v-model="edit_data.memo" placeholder="备注"></el-input>
           </el-descriptions-item>
         </el-descriptions>
-        <div class="content" style="margin-top: 24px">
-          <CardDefault v-model="socialCard" @socialCardUpdate="socialCardUpdate"/>
-        </div>
       </el-form>
     </div>
     <template #footer>
-      <div class="bottom_btn">
+      <div class="bottom">
-        <el-button type="primary" @click="save">保存</el-button>
+        <el-dropdown placement="top-start">
-        <el-button @click="close">取消</el-button>
+          <el-button type="primary" v-if="!isShowCard">读卡</el-button>
-        <el-button v-if="id" type="danger" @click="deleteDetail">删除</el-button>
+          <el-button text v-else>已读卡</el-button>
+          <template #dropdown>
+            <CardDefault v-model="socialCard" @socialCardUpdate="socialCardUpdate"
+                         @close="deleteCard"/>
+          </template>
+        </el-dropdown>
+        <div class="bottom-right">
+          <el-button type="primary" @click="save">保存</el-button>
+          <el-button @click="close">取消</el-button>
+          <el-button v-if="id" type="danger" @click="deleteDetail">删除</el-button>
+        </div>
       </div>
     </template>
   </Mask>
 
-
 </template>
 <script setup lang="ts">
 import {onMounted, ref} from 'vue'
@@ -115,20 +130,20 @@ interface Doctor {
 
 // 定义组件Props
 const props = defineProps({
+  id: {
+    type: Number,
+    default: ''
+  },
   doctorList: {
     type: Array as () => Doctor[], // 明确声明医生列表的类型
     default: () => []
   },
-  id: {
-    type: [String,Number],
-    default: ''
-  },
   doctorId: {
     type: String,
     default: ''
   }
 })
-const certTypeList = ref<any>(Object.entries(psnCertTypes).map(([id, name]) => ({ id, name })));
+const certTypeList = ref<any>(Object.entries(psnCertTypes).map(([id, name]) => ({id, name})));
 const edit_data = ref<any>({})
 const rules = ref<any>({
   name: [
@@ -166,7 +181,6 @@ const close = () => {
   edit_data.value = {}
   emit('close')
 }
-const id = ref<any>(props.id)
 const form = ref()
 const save = () => {
   let data = {
@@ -199,29 +213,45 @@ const save = () => {
 
 }
 const deleteDetail = () => {
-  post('registration/delete', {id:id.value}).then(() => {
+  post('registration/delete', {id: id.value}).then(() => {
     ElMessage.success('删除成功')
     close()
   })
 }
-const socialCardUpdate = (e:any) => {
+
-  edit_data.value=e.data.baseinfo
-  edit_data.value.gender=e.data.baseinfo.gend
-}
 const socialCard: any = ref({
   data: null,
   payInfo: {},
   lastUse: null
 })
+const id = ref<any>(null)
 const init = () => {
   isShow.value = true
   edit_data.value.organizationDoctorId = props.doctorId
+  id.value = props.id
   if (id.value) {
-    post('registration/getById', {id:id.value}).then((res: any) => {
+    post('registration/getById', {id: id.value}).then((res: any) => {
       edit_data.value = res
     })
   }
 }
+const isShowCard = ref<any>(false)
+const socialCardUpdate = (e: any) => {
+  if (e) {
+    isShowCard.value = true
+    edit_data.value = e.data.baseinfo
+    edit_data.value.gender = e.data.baseinfo.gend
+    edit_data.value.name = e.data.baseinfo.psn_name
+    edit_data.value.certType = e.data.baseinfo.psn_cert_type
+    edit_data.value.certNo = e.data.baseinfo.certno
+    edit_data.value.age = Math.floor(e.data.baseinfo.age)
+  }
+
+}
+const deleteCard = () => {
+  isShowCard.value = false
+  edit_data.value = {}
+}
 defineExpose({init})
 </script>
 <style scoped lang="scss">
@@ -233,10 +263,10 @@ defineExpose({init})
   font-size: 18px;
 }
 
-.bottom_btn {
+.bottom {
   height: 100%;
   display: flex;
-  justify-content: flex-end;
+  justify-content: space-between;
   align-items: center;
   padding: 0 24px;
 }

src/views/registration/index.vue

@@ -49,7 +49,7 @@
         </div>
       </div>
     </div>
-    <Edit :id="id" ref="editRef" :doctor-id="doctorId" :doctorList="roleList" @close=" getPatientList"></Edit>
+    <Edit ref="editRef" :id="id" :doctor-id="doctorId" :doctorList="roleList" @close="getPatientList"></Edit>
   </div>
 </template>
 <script setup lang="ts">
@@ -64,8 +64,6 @@ import {formatDate, getToday, formatDateArray} from "@/utils/dateUtils.ts";
 const isShowNum = ref(0)
 const roleList = ref<any>([])
 
-const isShow = ref(false)
-
 onMounted(() => {
   initDoctor()
   getPatientList()
@@ -82,6 +80,7 @@ const handleDateChange = (date: any[]) => {
   getPatientList()
 }
 const getPatientList = () => {
+  id.value = null
   post('registration/list', {
     page: page.value,
     size: size.value,
@@ -99,21 +98,25 @@ const changePage = (page: any) => {
   page.value = page
   getPatientList()
 }
-const id = ref('')
+const id = ref<any>('')
-const doctorId= ref<any>('')
+const doctorId = ref<any>('')
 const rowClick = (row: any) => {
   id.value = row.id
-  nextTick(()=>{
+  nextTick(() => {
     editRef.value?.init()
   })
 }
 const editRef = ref<any>('')
 const openDialog = (item: any) => {
   doctorId.value = item.id
-  nextTick(()=>{
+  nextTick(() => {
     editRef.value?.init()
   })
 }
+const close=()=>{
+  id.value = null
+  getPatientList()
+}
 </script>
 <style scoped lang="scss">
 .container-wrapper {