From 3de45ef2a3a6bd967a16bb198af3945904a1d29f Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Tue, 29 Apr 2025 13:17:21 +0800
Subject: [PATCH 1/3] dev

---
 public/static/images/menu_icon/6-actvie.png | Bin 1389 -> 0 bytes
 public/static/images/menu_icon/6.png        | Bin 1404 -> 1429 bytes
 src/components/registration/CardDefault.vue |  71 ++++++------
 src/components/registration/Edit.vue        | 114 ++++++++++++--------
 4 files changed, 109 insertions(+), 76 deletions(-)
 delete mode 100644 public/static/images/menu_icon/6-actvie.png

diff --git a/public/static/images/menu_icon/6-actvie.png b/public/static/images/menu_icon/6-actvie.png
deleted file mode 100644
index 89186a61f9cb31384d3947e9d93e177bd8c42ff3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1389
zcmV-z1(N!SP)<h;3K|Lk000e1NJLTq001-q001-y1^@s6#dsU*00001b5ch_0Itp)
z=>Px)CrLy>RA@u(SZiz)RTw>YhPF^`DSflutrRTQ2c$-WqDj-JAlBWL#9$C#Ks3g-
z+ZT=eP)tFi#8N|cm!c#!Q4B`lNA0whfby_D8WZ$~8c9Tp>@EfRZf)sqcjoHdwuV62
zxqElpm}c+a`<-*X^L;bl%)JD&Y>`>!2T?=+_l`z86z$LqS0MVx&2Yg(mWy`i+LD=V
zu9pbNW&n2shzq%-;{YFk(*)Sx<S_0P<OsmR=ny5AGEW02HieVGbyz|U+>>m0uBL`)
zBD}(eET!(ZK=7J~s2+v_b<GZAwO-s*`$C4yHrF!*<P#A=ZVV+aD$cA1?)ZtokPVqj
z+$)KM6JfkByg7~mbd};To#F+A{0^DRE@Ts`{Qw{%6p=7udt_+$H9E5Y;N{@%(7NKw
zH;>A`ZvialC67?tnYmu?{fG7~8Q|gLGE`GTrPDp0#(zhvg@-iqG4$x%i^ifuhlr}j
z&1J|^>Z%1HLQ_XC0p5KAx~IuuD%FeEHDtAUHdD}$r;VPl&^{$4iZiP|7&fS(q6&Au
ztbz@J7@-6r5Asvc2b&!xmeZ6gs3EJ(bA*CE8u`4!U?e!E*o~`&3|VaMJ^)EP@+Iq&
zke3sSoejP4T=w%oupm)}Z9@{ydB*UuGRTDi(62a*3j__h{sc%4kJ5)bGLf1j<6^fT
z)pcDM91i{~78^tGPI)SFvt!Xapkm{;i###_Xouo3EfzH7*$L3CJW7T4#-r-_@xq<y
z@Zoi5H+*As>gSvQTQ?=+f&6)a{k;eK(fZ9Wj|>QCZIi?Fs*s^|m9BZ-G4dTH$mda8
zza{}2iV_2%Z9iVYu8(>_r||TGH4#rfk`Rb%`Fa>19Pa0#XNQAd;Uz1SeTESsLkwiu
zav_!awBrO=#-m#C>;gQrB0dm$_}I{O@5ZW?@vuET-pQZNc(MKcZfJZ5h2K?mtl*3K
zoS@I9?std@KW6Jpn*;3xK=0HuCCdamic_#Gcl@m9{InlOzaM{`mM@LN_E%ECV%(Sf
zsD7^tBUgCb&<;OHL94^)*3;)Q#7L~=molh2b^-*q>yh3xPr|!ZX)tBXfvO?Uh3-BT
zwN+_gdqcw-w$yb61_;M;$+BF~xO?F_j@ZyntVP8gnX(*n62NVG<QXY4c2%Wgeu9LN
zQHsAuG^8iXP*sX;dwTH8S+5=i+wUYQEoiDYo#hE;G29)RB(#>EH&7xmQ@MH~OK*wA
z+hwU>BYJY#5A@;7_8Y#_S5scrWT~)ax8XNEovZglHpIZ@N>>)~6L#=gq9>N07l-1f
zk}x+;!e>VY(bC2>o_i%q3qN<7e%9l^c3;R4BYC3OW71^p6z_+ZH!%tfP$E6tVmF-T
z#f06VNrH(JEbG)F5%DQ7LjYDQ4r9A0pKymJ1=m(|E>cyMnaUPTVgfg!L0Z$|Ftmlk
z6Sg5H{&?kIi)FujiULN#WJW20x!G>~N)Z1aEFy*&o3+?=E0xGe5M+gzln<1yRh*{Q
z5OGt6N6ZjoFDh{_l_ju|zK}CHKd7`$aT?ftMMPFa4Y7<Yr5Ex*DEm#y)X7i<!3M={
zJQxut6C@Eg6d38Y&O0=y>@qU_2FYq5*r?cz`y*+FaZQV%z@R8Qf0sn1;{ejGNm>OZ
zFN<9B@|d4CLxDk2eklW*|4nu;L4o-aNV^8@jbN7?JV^(OnN~yLCMSZA8WO46Ok$!P
vn#pR5Xhl0DQni`HL_0K-)fUm3bshQ#qC$;Clm6SO00000NkvXXu0mjfzZH&p

diff --git a/public/static/images/menu_icon/6.png b/public/static/images/menu_icon/6.png
index 73d9a75800d49df09f5e74b4e656afb568c19b88..baf4d78d6887de5fe7b142309a41d2ce1efaeada 100644
GIT binary patch
delta 1397
zcmV-*1&aFo3Y80xF@H}<L_t(&L+zPqtX)$S$A5p*2ZT^!rZoK^nrMkODiS0VDT0_%
z5sJ1xC{jd1m8MA55SmaLF~m?(Lr`i6iHLcsm}0KRJVX>9Ow0b)KF!JX-n;kQbMpGq
z+?Di0@7a6p_1|l)|6Xf7v6hL}GCcGE4Rw$9Jk;~hAm2bQ<bOK3@QBzDI2t$%7!7Qb
z_k9h#1v~;gAnCVG^i^5YsD~oL`lbT2fUVmY@-1*_TDL$_R55y>wT%Iah>d~Uful+X
z{t3JSe35_K5f}@sUt04ZaFV27n*h}apomy68TuG-U^eO};BsK0q+iO0M#Lt-X~2cR
z=K0&xz#)?Us(%ZrDL_{O=VfEw1dfojVj$xpVuzGp4*`4Rbyp`Zox8>XMZ`$p-5f@r
z0plcn--%%nu|@LC%fK$lV-C+zl0NKYZ+~lQdnh7q0M5t<IBb?yF(@Jq0-nfwOb~^x
zDr#1*tpzBv+LxJ@mq{{3SC)u)0~iB*lk#pmN&i$<l7BbU1>`&^7;KKDncWx?5wn3}
z?{G=WyV2u4bpee7Udo40mUL@3hD5~4K(Tkcq!+u<(*&SBf!FfkQzR|y#*m0GjTd{z
zN_w>$Jxu`G4Dg#{nJejnZVZWtD}Z9}FiC~Z%Ia!`oKK4gC-PRndy;mmY{7pz-T}P#
zJ4x2nwSP1LXfAMmwxAo@J~+KykLUgKBo(^40@Vbdoq$h(b%C$^@~5}Ng=brd2z%po
zQ#D|!9wF)Twi^dnP#aJVJ6FvY=W~|1b&zC`{YpfPNR`3j++KLy>{NBTO0OkN0a_>b
zIEQ9yT##O7DsC-<B4SJ6lw6#;P_;PZCf0dSi+@{a1W@*p+lK|fq|z1t0oY@%@hm$7
zyQfNggVLJ2QiU*WNVN~;7>S6<z?@Q-+FuB{dz~rimRd2^vbix2wSaPe<o5dnz}5Kh
z{M`xv5pa(~w2A(w^)ea-6cHN%uJ4M*t=;AO0bSALY@s%wh#2J-Iz6n%CK51(cO%ZR
zdw)}3bcdw(yHQY^6e7Z2aGQO4qFl3F6XLh%M&KezKX;?BD-T7)uE3MP_N7Ce8>V09
zNvE~gu$*6}d%sJCxFwk&>4U1EDg%lLH)2l#HpXIFo-XORs)x4_$^I$#u6G-rfB!Lq
zawXBRR00$co901b!CG#=&#J>#IS1!wuYXR-ls_#a@StUkB!lZnssdUB9G5lEPi6k}
zzD|h<12%2DzFXQ~=tRVc>AkuM@TAppjHJcs;;seG&c8h>$+|j{jsZo)UU_I}#csg%
zk>p9uYRU6C&)fX37$!Q=J%DtgyLffG;7Z{-R|uu;4&D7s1`*+lcox_<e?LHy|9{_B
zssMU8-@3=Pqb0rF0>%&Moq00a*TKI7^MLyj5!?p&f(o(cPfe|Z*Q}B}9y5g--1CwO
za07zs2v9EbU8;D!U--jYz<8d0O(}Fd0lft9e9o14e{=4?-Kk2tsxK=e!k+aTXBjE!
z<906U6i|7Haby}-dE!~z<iuQQ7k@u_P&i4_s#!yxdAn(wQ3C8wPW0m?c?{gAM1+~|
znf!5vBwt!19=bc%WzHG*{3}a<&dhY{pKb=uDThvJ-L^T=$0uTOD9tKzY5+j434Z|0
zu1nG-`SKb8<i8*|=KnWLOfxlC2`+m+mE?7eN}8;`kS42pd)%BDuy~{TJ#M4ZkaPYx
z4?HDZ(x}Dll}*Ss;>r|qMMGE{kVDK3+?tf-l8OhtHX#40#H>|3fP)Rp1Tt09{p}9!
zDCF8H8A{)KfQFJc`m&|xp`M2Z`38C+H^>)W`M7@pP9dR0bwDhf00000NkvXXu0mjf
DCOfGO

delta 1372
zcmV-i1*7_v3;YU@F@H8mL_t(&L+w~ss9jYMUCXXmvG*Rk=!c1kXf!d2iADucu%aeG
zF#2I3B1%B?BM<|EiJ}-$6d~$|ieL%$u80sTwg{2fHFmKr_lk4id2`P_=j?mmMILv)
z-n(bd%w98l&#c+R2osJlJQx7_zh`uip+ScF9D%`+>vO;xyMG&Gs5NAgW&t=Kz@Y%v
zZyeHp6@CZsI)J-K-kfP;wOV$DBw2Scfb+W9KpWkA0Gv(o?;N|`0J;vqRpIno01pB9
zEoT#v+35hb3jGBnFVC@+1xV7F0PYTlKL8j@@|~Ow6graj0`M|`E#tSDBz*!JNn=2g
z#sYXMqWTwr6MslP+Q@6kVoBoxECsM`%Kje!CXsxmiS0&!B<%v=RRG(DlS@e6(8OWY
zT1hhi+!pJ;0WgN-M^$>o_u7CYZJZ+Z0)T@<c`?bEbsaTXCusqIOGD>90Ed(OzK)Gr
zfF!L2;DJ<HeQ_<%0yvhWk44WV{5|O79L66{Cu15(AAj+VQWwyC07cbV4q!CNud9rA
z^F3v0lQ<Cvg`Gvo=S5XED*;Jz(=4jZj{wGze5=ZEFTP9KHSX*-VQ)6cn>yL<2uRW)
zVbE2_jqW6p5BFlTb!|u*2jI!5s(+>`cmzoornXWA$mMuSXwD(&qt|zlbe3sRI9^I}
zaxS3n0Do)_U<FB+>{5|*s~aqUQ%JsF2eqW_;y5oOd1ZzDWdMAiR*~Ey7tqH5b`MH3
zisXtiL#coG+fIpxxo5b{b}Sl_HU!|Nc^H6|BzNp!+W<ZRuqlA$B=^V#G!MWPq3o!S
zC;53hV=Z*(MF0~?w&iv~Z0~b6!`6jmEIX>5*?+^BSUaEOoLoSTqBrN_U~!W>n&cNH
zpynn9e@%Q_0^oF#YF#U7XrLC7ytu^PMk(9A$4AEZx1(kJk_E_0lFWczWr}`a5^7Li
zm2Bcp0O!QFd98P&h1!%h%mjJ^0IsML!`26BA4ip)kYX>DeJDU}9fb6NP;?(UrrkY}
z<bM+Xn7_x`StM6;Gf5L7;$BlqX(X)|%w%fVa5FcUPpgVeEkLmu6H>G6{lciL&V+Pa
zOd$Uwl3W>mRK3={W11^vY5^}r)hs2QlGXumzk6O7wVuJaC{#*qKmp2S_Gtk7gylEl
z^1HmZf^v2AeB&<fnaM-oZk@&gNoxb}#D98P82c>1d{~Jj7Bm7BpmqpQdxs6b1(>L=
zY6HrZ$ys%ADP%_KX}7moYXW?S$M5*|W!%+w>w@vR#()Bpdxm?+p5g4Z7{=D1_>v~2
z`N<C-9zU)nxu^{o@57C`7)P8<7oInpfXN0Fpmq*WK3bMn(!H5X(#NZjq)NIFz<=ye
za!}mEocYF*m7&5*Ot8+B?}o*fehNvm@>-Gx$Lj%H7K^Rtp!n`(Nmqa(QwC#D1=o8%
zWov4BwfU)PN2#I>eK~ToJdWgZReGJicMT{&nOhl@xtzrlttZT%%bZKP+IK3xn<DwK
z<%w><ShpvD0+gSjT+$1Y>A#OpynkyAnj*>5Z!wDa)%0YNk8}&Br+@;~r~tKnY|as%
zPV(0w_s(PVjq$&m?x`gGUeOcjS%!vec;DzfZo(Eb<rB@k;~o5#I2nHMID_Q9JwXyi
zdJZTuwSRyr-U3#p9%CLhI{bQ^KbK@Nh4u{7umB2B2L?+wu^lST%mq2myj68j4;!EW
zWkTyp=68wBg4@mQ^vF?X)1B4~E1+&Sm!m%bloPdn>I^c}&uHiP8e}LZYW>t1WT>Cf
e&ha(kGV~8)yRt-8fTf%O0000<MNUMnLSTabR*b;_

diff --git a/src/components/registration/CardDefault.vue b/src/components/registration/CardDefault.vue
index 0d3de58..2ca2756 100644
--- a/src/components/registration/CardDefault.vue
+++ b/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>
-      </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>
+        <el-button text bg @click="close">退出医保卡</el-button>
       </div>
     </div>
-    <div 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 v-loading="loading" class="empty" v-else>
       <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;
         }
       }
diff --git a/src/components/registration/Edit.vue b/src/components/registration/Edit.vue
index 6f61266..a012425 100644
--- a/src/components/registration/Edit.vue
+++ b/src/components/registration/Edit.vue
@@ -1,6 +1,7 @@
 <template>
-  <Mask :is-show="isShow" width="800" title="挂号" @close="close" :show-footer="true">
-    <div style="padding:0 24px 24px">
+  <Mask :is-show="isShow" width="800" :height="500" title="挂号" @close="close" :show-footer="true">
+
+    <div style="padding:0 24px 24px" v-loading="isShowCard">
       <el-form
           :model="edit_data"
           label-width="auto"
@@ -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-input v-model="edit_data.age" placeholder="请输入年龄"></el-input>
-           </el-form-item>
+            <el-form-item prop="age">
+              <el-input v-model.number="edit_data.age" placeholder="请输入年龄"></el-input>
+            </el-form-item>
           </el-descriptions-item>
           <el-descriptions-item label="医生">
-           <el-form-item prop="organizationDoctorId">
-             <el-select
-                 v-model="edit_data.organizationDoctorId"
-                 placeholder="请选择医生"
-             >
-               <el-option
-                   v-for="item in props.doctorList"
-                   :key="item.id"
-                   :label="item.name"
-                   :value="item.id"
-               >
-               </el-option>
-             </el-select>
-           </el-form-item>
+            <el-form-item prop="organizationDoctorId">
+              <el-select
+                  v-model="edit_data.organizationDoctorId"
+                  placeholder="请选择医生"
+              >
+                <el-option
+                    v-for="item in props.doctorList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
           </el-descriptions-item>
           <el-descriptions-item label="证件类型">
             <el-form-item prop="certType">
@@ -72,32 +81,37 @@
             </el-form-item>
           </el-descriptions-item>
           <el-descriptions-item label="就诊类型">
-           <el-form-item prop="visitType">
-             <el-select v-model="edit_data.visitType" placeholder="就诊类型">
-               <el-option label="初诊" :value="0"></el-option>
-               <el-option label="复诊" :value="1"></el-option>
-             </el-select>
-           </el-form-item>
+            <el-form-item prop="visitType">
+              <el-select v-model="edit_data.visitType" placeholder="就诊类型">
+                <el-option label="初诊" :value="0"></el-option>
+                <el-option label="复诊" :value="1"></el-option>
+              </el-select>
+            </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">
-        <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 class="bottom">
+        <el-dropdown placement="top-start">
+          <el-button type="primary">读卡</el-button>
+          <template #dropdown>
+            <CardDefault v-model="socialCard" @socialCardUpdate="socialCardUpdate"
+                         @close="edit_data={}"/>
+          </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'
@@ -120,7 +134,7 @@ const props = defineProps({
     default: () => []
   },
   id: {
-    type: [String,Number],
+    type: [String, Number],
     default: ''
   },
   doctorId: {
@@ -128,7 +142,7 @@ const props = defineProps({
     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: [
@@ -199,15 +213,12 @@ 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: {},
@@ -217,11 +228,28 @@ const init = () => {
   isShow.value = true
   edit_data.value.organizationDoctorId = props.doctorId
   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 openCard = () => {
+  isShowCard.value = true
+}
+const socialCardUpdate = (e: any) => {
+  isShowCard.value = true
+  if(e){
+    isShowCard.value = false
+    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)
+  }
+
+}
 defineExpose({init})
 </script>
 <style scoped lang="scss">
@@ -233,10 +261,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;
 }

From 46447bf75dee9e36a5214fe26e1257e08512ec17 Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Tue, 29 Apr 2025 13:18:24 +0800
Subject: [PATCH 2/3] dev

---
 public/static/images/menu_icon/6-active.png | Bin 0 -> 1366 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 public/static/images/menu_icon/6-active.png

diff --git a/public/static/images/menu_icon/6-active.png b/public/static/images/menu_icon/6-active.png
new file mode 100644
index 0000000000000000000000000000000000000000..46be7c1970299f941859d4532e4684c3ffc61b54
GIT binary patch
literal 1366
zcmV-c1*!UpP)<h;3K|Lk000e1NJLTq001-q001-y1^@s6#dsU*00001b5ch_0Itp)
z=>Px)5J^NqRA@u(nR|#-Wf;bv_dB!BW}4(e>du)o#6Z|TlFfu5kfIjdoh=G0$t<E)
z*F0;H8$sEQwFF(&8F$+#=>m2^OqsKnvY?`%C<O^5sU+Q**<GbwD%Wx^^SyP{jd7gu
zT)s0UG6(jr?|q;5`MuxS^Ie8;kv(*g@t_2Bq0eY(hDtN^A9tYi$~kFxq@iyz%H<tk
zL;zd^VAh$uegOMHFh?c@KHT%t%o9%Z+{E}iLrisR)2oQ61>l)BMvfA&F%b`S0K{%g
zpD)%opk-^0O*yHJz761ZH|B_GS5TI%+|ho;u$#O>vAzH;j&fk?P`Vq8o4uG~;M3uX
z(2~!iH0~uoJI5EGdL#J)gPK*$Fz|9`TwkxEVdW|V)iovO5z_$xWr}9TG7?qYZTgQY
zI_f}1s-1vF6%!M=MCeGwbR{iCAf||sPG^0V6}f1jx}q`^jgs^#qy%*9nsiud-0QV?
zzPyYSbGq9qk9gHo16r3{Bqe?0wRpZfmbkvNP5;`frV>zXQ(v`Uxz}s)ym>-iXKuOj
zJFl8*K#fN(7XfX^Yw>(}qXDk?cvIN3rV@~4C}N}r0L<_S>X;eVm9&(B>Y9?z6Vu~<
z01^1bL_Dmdr3|$6;lA0LkcR+hicnJ1w7I)C&pNE4qYQNVwM%XU=xG%r06$~K!!2qW
zK5Ts~1JNjpeZQtn5SDs0)Kgs%s#94||J`kPG;mIub$l4n#yS{$j~h(_Z4YM3R$oxZ
zhirg)BmDq_TODkN`oXlp+#1^ErU7=bzWfj67O~DpQ-)FzVp>j&c}$pN#Sr5#6Mkai
z_lBqIrXS~@+}geZ-Lih*(%?xM7J{eSb<!G_l7>dgMbgi^1!bVxrrs)zX(fa11TfnP
z$hk563rKt*1-;X?x$*~Z8mF^71Jyj5oIYuso&)d@0HI<cD_0WuRiTYPwR`hbzj@L0
z1XTM--+V12_b{M)De54n7c6Sbt(6BI#GV!68mQh#FJSN|04m%Ta~VG<Nz`=3D)+g`
za|N`l;n1{`!Qg)2^jFJ|hk=BYqA3u_OoOBy3|yV1n+!-S*wv;FI<4gjC}O1E2XL2-
z_!xs<17jzXmJ#4ufSUkZl9R_wXzh%JS|%<U>y1<+1MNBQP^THwts7WJk7J<7y55D5
z;#(WlgObFG+}Gqbqjzow;tc?c&*Yx~^L^&l@XiUnhK9Xm{lS?%0B*{yL4+F<G5s?q
zM9zVXRKnVa77`_JTQGp;9h<^`<&T-TCPpI(zBjQY{QX3nwSJY4WOg#RrhxueW?a9)
zH=z1;M`y4cvo6}tX#fMi3*x&IvG7OP1y6lEm{*Szp6!Y2sX}I~&wtq%brWIH`3zHr
z=Ox<1Kife$nxTl1y8oX=^UVTcPnvPvT8~aW%c2J+jSNoPz`zp#0s#L3LbDmuU(dai
zUt*;60Amjb^X-f>;jzw`{)%0kL!jil04>ieM!e08g&(xW>eu#O%OouDsywk@2vF-N
z{`@i%oEiv@j@N>*2|%Tt$ur|!W?Zkci**Q;vOWe23y3iYZ$UzUu)@K~)%xkg`g6Iv
zpaW(+l&?`|*>VV!?sxEek6rUr$B&zF{W3cdhd`<00H)Z96?y!K8P{zWbVopSM!K26
zQ2>*RY`T#AAedKWuUmzekN?SGvC2A{p<)#;hHeR{7+v*Kvou3~cC#2-r5P$lSN+ud
Y8&G+kMCKd{pa1{>07*qoM6N<$f`M?3kpKVy

literal 0
HcmV?d00001


From 5caab6347d9000782dc83df4b55eca476dd9116f Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Tue, 29 Apr 2025 13:44:33 +0800
Subject: [PATCH 3/3] dev

---
 src/components/registration/Edit.vue | 30 +++++++++++++++-------------
 src/views/registration/index.vue     | 17 +++++++++-------
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/src/components/registration/Edit.vue b/src/components/registration/Edit.vue
index a012425..a3d360c 100644
--- a/src/components/registration/Edit.vue
+++ b/src/components/registration/Edit.vue
@@ -1,7 +1,7 @@
 <template>
   <Mask :is-show="isShow" width="800" :height="500" title="挂号" @close="close" :show-footer="true">
 
-    <div style="padding:0 24px 24px" v-loading="isShowCard">
+    <div style="padding:0 24px 24px">
       <el-form
           :model="edit_data"
           label-width="auto"
@@ -97,10 +97,11 @@
     <template #footer>
       <div class="bottom">
         <el-dropdown placement="top-start">
-          <el-button type="primary">读卡</el-button>
+          <el-button type="primary" v-if="!isShowCard">读卡</el-button>
+          <el-button text v-else>已读卡</el-button>
           <template #dropdown>
             <CardDefault v-model="socialCard" @socialCardUpdate="socialCardUpdate"
-                         @close="edit_data={}"/>
+                         @close="deleteCard"/>
           </template>
         </el-dropdown>
         <div class="bottom-right">
@@ -129,14 +130,14 @@ 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: ''
@@ -180,7 +181,6 @@ const close = () => {
   edit_data.value = {}
   emit('close')
 }
-const id = ref<any>(props.id)
 const form = ref()
 const save = () => {
   let data = {
@@ -224,9 +224,11 @@ const socialCard: any = ref({
   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) => {
       edit_data.value = res
@@ -234,13 +236,9 @@ const init = () => {
   }
 }
 const isShowCard = ref<any>(false)
-const openCard = () => {
-  isShowCard.value = true
-}
 const socialCardUpdate = (e: any) => {
-  isShowCard.value = true
-  if(e){
-    isShowCard.value = false
+  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
@@ -250,6 +248,10 @@ const socialCardUpdate = (e: any) => {
   }
 
 }
+const deleteCard = () => {
+  isShowCard.value = false
+  edit_data.value = {}
+}
 defineExpose({init})
 </script>
 <style scoped lang="scss">
diff --git a/src/views/registration/index.vue b/src/views/registration/index.vue
index 8b75d40..e2ad882 100644
--- a/src/views/registration/index.vue
+++ b/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 doctorId= ref<any>('')
+const id = 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 {