From 6c7616d52060acd3dbde8f56043a15f1738e2fe2 Mon Sep 17 00:00:00 2001 From: ChenQiuYu Date: Tue, 27 May 2025 10:24:29 +0800 Subject: [PATCH] dev --- .../static}/iconfont/iconfont.css | 9 +++-- public/static/iconfont/iconfont.ttf | Bin 0 -> 2828 bytes public/static/iconfont/iconfont.woff | Bin 0 -> 1884 bytes src/assets/iconfont/iconfont.ttf | Bin 2556 -> 0 bytes src/assets/iconfont/iconfont.woff | Bin 1740 -> 0 bytes src/assets/scss/main.scss | 37 ++++++++++++++++++ src/components/inventory/goods/Edit.vue | 3 +- src/components/inventory/goods/SocialInfo.vue | 26 ++++++------ src/components/outpatient/MedicalHistory.vue | 1 - src/components/outpatient/MedicalQueue.vue | 14 ++++++- src/components/outpatient/Settlement.vue | 2 +- src/components/registration/Edit.vue | 12 +++++- src/main.ts | 2 +- src/views/outpatient/index.vue | 7 +++- 14 files changed, 89 insertions(+), 24 deletions(-) rename {src/assets => public/static}/iconfont/iconfont.css (74%) create mode 100644 public/static/iconfont/iconfont.ttf create mode 100644 public/static/iconfont/iconfont.woff delete mode 100644 src/assets/iconfont/iconfont.ttf delete mode 100644 src/assets/iconfont/iconfont.woff diff --git a/src/assets/iconfont/iconfont.css b/public/static/iconfont/iconfont.css similarity index 74% rename from src/assets/iconfont/iconfont.css rename to public/static/iconfont/iconfont.css index db80712..aa1d1ff 100644 --- a/src/assets/iconfont/iconfont.css +++ b/public/static/iconfont/iconfont.css @@ -1,8 +1,7 @@ @font-face { font-family: "iconfont"; /* Project id 4921806 */ - src: - url('iconfont.woff?t=1747990278440') format('woff'), - url('iconfont.ttf?t=1747990278440') format('truetype'); + src: url('iconfont.woff?t=1748312335696') format('woff'), + url('iconfont.ttf?t=1748312335696') format('truetype'); } .iconfont { @@ -13,6 +12,10 @@ -moz-osx-font-smoothing: grayscale; } +.icon-yuyueh:before { + content: "\e60d"; +} + .icon-yuyue:before { content: "\e606"; } diff --git a/public/static/iconfont/iconfont.ttf b/public/static/iconfont/iconfont.ttf new file mode 100644 index 0000000000000000000000000000000000000000..b2f6fd7b80599c2a80f82d782d8173d148fe2afe GIT binary patch literal 2828 zcmd^B?Qc_67=O;a?Y-@`+pb-2$IIAC=h}^R-PW}o>&BdnZ6RzKFJl%m16_OD4!gE= z?Vw1)e8Yfb7!zVlgb4Bl69X6%Vq%Qn41^CFNsNg>V@T1728|d$xX$O?d&{!Hf8e<} z=lq_xbDo!T@3}w#pd99ag|?wRd$-!&Y&Zr$HY0azbWf|Nr)K0`q|YFIFgzVf59~<{ z05Ce_-Hj#k(VfX#e*m!m0BCyRQYg}V=l*)s{SmuAjtu?>_6@|JVSgq*ojqCuOG{|` z0O^`UDjZ^ynsK!M8R^RD(9tvzVIRuZAZ<&ArlracdaeQJytrp9otnwseeo9&pzJ-A zrvZIu=a%MRLW8R=EolhltZ2N2lnXbAf=4xKy}YxUz7Q)^;_G znx#h2X8EB35!{u-^>AN8v+#d!6>tbnK5T5YxP9M9RE4yVK0>Bq-T zX$zHjDD9;Z=hK)~^(L?1W8FYHJXQ~i4C$)JHb?3`%Y=<$0U48#vi%sU$!o%0h1zFLOy zBhd(TArk$)1p01>bs_S-AR*c8AkfFIub}=$?;s`0DK(*1*?G8oUnYMvT)`OJrHSqV2;nA#D}e z!IrxAc7w%YEPiaXkVcn{jMlXjrSs=)u0~=ZjLTNMUgsjjRYyjVB^ry@4WeiuqehWD zlyzi|#prg|wY1ccnZ}m73m1%**A=7URmznucF|G!wz78SBfN3&3s2B>#T5%j><;P| zdWA8u<%+o?V~U&B%r4IXusp6_39Y>+kon`K!DM&&+G51KaBD8g0wk!KT4; z$A?HY%U4#i>vqk5INCP4!K>w*O(V^d-rk)1B4-jD*Eo)C-&EyvZyy@n+263)RAU-@ zZAW*fu9D|<&u-iM&Ox)y+}Aw(!oFQ&-VL>`ri+|lqTfAQ(;)L5*q{&dP)m3NQ;&5N zEu3Qu@%p=o2mNC_=s%XxjU!X-w^sYSetf;KiWr`ov14fsgdNoD7%_5YbmILsQLNCj zd^uAUeCgEjpqVi)zM|K$*2wAM{TF1RUe8*B`IGseg{dSi)~MfcDlUU@BB;0=93iFNhwoWW@a|#$!4RrXeKpn8^rabL?UHNXHtixaMm5qX48Sz zR=N-6yThqz=!XnQ5P~d@5j-T5kjHTf!jOU_MCCF21ic%zV~~RcT4tV*uC^XW?F`JI z9$nK0?cm1WnblfDsFjp8S9>#q*GUY^m>F_EB6d1=ENIRsSUPB!Sq51*Eb=xK0?g z-4K_p(hz`Fd`j_@^xblt)9QPIRj2=5Pis732un0XOE|*g9}<_(<#SS8D^G^Qx#Y22 fHk3LR&xMjP_Rv&F*o_HCoRIoc>AYbD)ei6nnz`Ga(!uOOmB1jAd{L%^2&8A^Xx{EF*+WD6%i5d2M4z zWE&$+M4gypNlii;$ridAapryWo`2r^y1v)%_x(Kg{kwn9b6w9Ji@A6afB;|!cmhI) zs}SOU{&4^Qamm@m8~`AKAT`fN|E=1(_x24}~+4wJRZn;=@6f33?K^vaOs$ ztO7#f{Q-avtc9uq0KbU?ada!t5AO>AFdZ=O3@8Il)~6GJAOso60Td`Df%njxfuT`x zAWH|m1SnZqfX537BOKfC^%j5%8jA7QmVJ#kyD`PN584T7)R7OflwY<4rpTCaJ5|FJ+ z)78VlAVJOQ2!V>$UZat>oBb&%DO?c?MTg>JR>#DEge$`Oab;_i0b!;N!m83HOSGmu z{rayu_85fI?u6shOr%%MK_10yj8rSNl04M9ge*%rwO#{F#9QV@G;ztn+s3E~sFXdn zh5cixO?&R?#%4qRC~MpB(VYI{&*#S5+MZevy}tl+`dpMF zqG}K?S9=;yCf1&4%rQYQD`cjo2RKIX1NmVTJn>Cp)h+y zzHP4oX~u_^{Qz$PA^&Pv1HcJbYYZK^gEp*K?HVw*t`w_m>RkBalR|S`%Vm4XT!o!A z^+s-o@)_x!sRNJkYa0g<{P43G2N&CBImk*>$_edykN(ntvEKF|da}K(>ipZRDSq06 zq49yX3;nI_ERNWWr)ReBj>{yLXMiaM7)T^C?Dk0>!aMD#z716|SX$^gzOjnjny!(c zbzU;5C+D}~RcmJPw?T#05Pe=93ZHT$9Z*hA@aF4(`YEz1VdFE%EYJ z=c38-*_Z4lzp)6zf)4>xG5s4AYxb~urLb=kp63I-TG;mxe;qj9`MzIT;2rJP^@GhV zd6IKBXV+M&REU~`u4ng!bLWubsk0SV59SXZ@8UGvDtfi4@SYiq+XoO>;3O(SEx6Iz z^yrm{S9no_*Q!Zls(QZkHg_0i#(qDe25?%Q0n440oMJD7=Q&ag7`xE_)!0xgA3U7!{Gslio!CVIXr`h zGlc@897q`0hfFy~WSWVRD+luV3)L>y=?A&0s~sQNFSMpQRMl4rv@KuinD)@NW*OS$ z<%=x|t^`JATgT5>K&^V-%!aZ1O5{d>b=u9FU%NkP%?>KJ-O=o1)P@)B70@tAlFijw z72)N34dGDjI58rfFf3A$Jk&^z#Ur157j2%0S2A5bUt^kbuXbh#>_C_0m)E=>#+0$S&{nwN=OHC{5yv`|0|H9^*DX^aZ5J+a_u{3yQw=AH?tN zT{U9K4rBTIkePxox5Mx2LjttmUr6PYEJ_K5Oevz|Qpzc5DNXcty8bU|61H0scb8p? r?kX+2`4y@xKhO*CQ~3&ipmGnGHKe}e!isLFnOMN#fKZ>*ufTr+EAvZb literal 0 HcmV?d00001 diff --git a/src/assets/iconfont/iconfont.ttf b/src/assets/iconfont/iconfont.ttf deleted file mode 100644 index 31dec3822b5ea2a4166eb128d21f3a5d5417ab1a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2556 zcmd^B|8G-O6hG&^_Pusn+jZ;fCb0FBg3Qj$psKj3e!^W67dB^&$)-sax> zIiGvZx#ym9ds{#NsD)YJp=Wf@-p%sc?I!?mJ+Tv^J>9;+RXaZ<`8>%7Bk6GNjC|n% z0H-7F+eE4qe{X!{&j9>y)ORIg;b`Y~jYiV_lX@UYg!l)4hVYlvpG~F<$D3hsk!ir!rUXSj%>dt*_;j^&!G(_XuX+aITKFD>OUU52_SlC&qOXeQ~1g4nFcVvPwNSw z*!kJTS(wt1*TqF0GG<8=6o%MF`wy=junhhUwG=wFyL<1kxRjYpPw9|qM2df7=4U6${V@0D)DNoAG zu-a*&J?RDjP@Wl$CpFun#4;})n(6e!>)-{F>y%9C%0l^S`C9q<{2f-+r4nhW4N1HD zVKM1wH=gAg*}4Dktxie6n3e{rLz%L|I?H?cs@hpi%GcD+YE{0jc2=|bJ8IW%?kn&$ zJiu-E33=fEyV=dq1slnwQ#7L}*qU0g$?oeP!v28Y?M1hXce-6}m%l&IAMiEVo9s4G z5QWAztKa1mBz60W0*V^j}8nD4n*S*s$lrGsnE=+Jv^%PM5o{O|se7 zQFwj0uCL80w9qt!?S7YgHJ#JiippA>s@-Sx2S~O{e6Y*W+iSMjES1kKHtg`o7;19I-T@A%1pwq?TqNwOheC@)#(QGzyb{Z@9jV4or$%I8V zHkc}pOf|}aabdp3q<%m7Q@jB-0JOVZP79imYUp-R5m{kdIms>xtw<&9^Lsg^@S;G) zrL6b@{Z#*epD*1Its?qPpBvcH=G5uCo(ZlAUOYL9O}toN&#xGt`!v)OYVqp@_nMuZ zhx|iD?-jvna@`aJzISb-+q-=e&y>*p!;`EM<{f2r`G(5Lu?*|7P8{2R&r-=yIh z=!C5rt|gB-_WJ7B@2Lyk)G$IlT-PuMX81zGJn`RXSV#C54eP-U_cSaJzo6k7*oP(! z*MbWpBl%dk5R1x(O7e6hn~7&Lh3dRJmMEse`Knl*_r>xv)7gyN>+Pvhqp?gZUv)Ec zG~p{0;&MEnP0K;@7fYqGaxR}e9E%jZ$wDDF(A~}UVZ1kzO~VM}AqHV6&={platKN^ zPD2E;kb$@|7M_rIlXe1%kRr?c6RXRu_mOrUW=N0ul%W^A^fSI(Ym~GyistfYX5c98 z=A#%36p>6lPoC0*f?9kriX=r?rUJ6H!{jGI+FnR1Ryi1eZu(TuQ`Pq>=S*wg6RJA< zzwxvtAcs8aP>%wNpf43m#hCd>F>|6=2xm_ui{VUyKRg{a?WQ~vPQ^yDxsrK_)JuN< E1t-9q@Bjb+ diff --git a/src/assets/iconfont/iconfont.woff b/src/assets/iconfont/iconfont.woff deleted file mode 100644 index 0d2c7029d53c17198134cd641adc4e1925cbe921..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1740 zcmY+E2{hZ;9>@P#iH0IxMYR>BN_mnHjM7$XDOE2zv}&nrEite5AeJGKCZbfu(y7>W zA?l?;EnP+}t;#TFT1+W3F&$b<(MD&Krp^4#n{(cI_ngnU_xruS-~HWl@3}XH?BxYO z0I(s4fGwLnO7&m8IsX54G~nbB0Dx$Mt_w&YE^kj7IRI}5dLE$OgzCD(uZ$5*ivv9& zs99h?AixzZN1jiO0LLl-fJy)W<}W&7JjOgnI|~5t1~85Y;%GgHK`}uS^rk?)3&dPQ z0TVEzS!~b)a{&VoEEZ6!&&M*rID{^!bvA*%hoYltY_Ki@2Wk@#9K-+!jG;xJ13fpe zHV8CQ_nNCLE;bR|7m@?U90Q4by4NO(UBRH9rBbKq1geZdO^9Db(WVD|Y~+kWI+ex& z3SI5WiF@r2h`6wR*mupGC>>k`PY4ApToB&CW-g6Jt?2IluDg3w&Ju9BwI)aGyCMkm z8Q`Lw%+8*QfJ8~H&>B_E-|m-By?w~#a@Td-&HS(GdFo++G+%8JyJAVygW|iPJt$Kr zJ!~Eydz9uHe2Lv`U@Y&kAWf+7<2+0_RbaCPHEj_s1Kvx9Q+iv6pGGRxrfZe{G4sqs*%~cs@V|p%+p+p zU2#UFAdmPPJXyJG7!z8vv_H)yD|+V{X3lx-d}%Q^QOn5G%>vc$L%^0@2x4fO7S$mA z%pkH#E{@H<`?sK zMoynrDV@#)he{2P9?koG)+DP)sb_D5DBJaj$# zVeR0+VFamXEIs*)t|^64LkfV0ONl==ZYcRmr(xQ|yH zXVEm*xG0`zLXn>ZC&rS;DD79Wc@Yj%SEIcyxZ}5d7VdXO!NZRGUi??>jl5egtGr*& zH($5ZcVwfxd|P&uo;w}g->^ef;?gT%rA?WdX{zt~c#!h_Z!<#oSyG*>5`=y-)DW6$ z!7=+j-Bzb(OG)2skbE66tXLb^;MSlDCtuhW)Hk*N@#gU{%DG4el8x)eXCb5{Tw%o%Dy1z3ep)M`GX-%B$Sw1P=ZY9(^tQ(uJNL|B;^RIlY zUs04-uD;AYt~glgz{MY&*x-+xj>8#$946`e1 z8D=^ayE|Uf^IT4F0?qYWH_8`!KSKKNneS%3Tz)a~+_=s16q(|^o47DJvYJi{C=!N; zX0?Tn#KY}8N^kxYGyKDYrJ`9WM&eu7aV00uno&2}trxG1M@=ukA5O&-7buHX@TGg+ zInDP~g@BLr@AnDNY0a%|?^KQyqt0Ng+qBQzsw4K3TCGmo=Jm=8_YIGWGS>n;pP;k; zmlN|r(XHFp`_@GBG}ef-+mfRV)I3I>|7%Sel}e?3P*)?4n-KtWPpBc71_0r}BVZZg z4FP|qzw1&NZ^1wSVu5=FJ%SXdsRv3JNhZn)A%Wi{7c@?l8{>FD7Dt=_=bP2bN_yIm-L5 zZ72Hnv=&)+c3+Dt-6)okGq*`=bF1PiH*Uqj@N7&>3!`7BD(i6*KZUlnUYa5#CAp<;>JyyB8!Qi4K#JlgwuW*O%D^ztb_~C5h`(M@m^> z5^wm#_W8g`MtR2lIcG!3fY?Jj_116W4MXBKoij3)?PABIXznmmA5E<#@);HGG{Mf_ zv`o=odU&!T*RL)k9EHJA>Ll`9`+&qGfo}_C4TqWCd)Aw}->=}Gl*JQCEbEv-@dZ*z z$oD?tzTsRF<%-Hgd{L?B zlBkl~)^ewXRC-%Ry4`rkocM6xH4+hD>1=H;a { } let save = async (isClose: Boolean) => { try { - await formRef.value.validate() + const isOk = await formRef.value.validate() + if (!isOk) return if (!edit_data.value.purchaseUnitPrice || edit_data.value.purchaseUnitPrice < 1) { ElMessage.error('参考进价不能为空或小于1'); return diff --git a/src/components/inventory/goods/SocialInfo.vue b/src/components/inventory/goods/SocialInfo.vue index 275ae15..5aaf9b6 100644 --- a/src/components/inventory/goods/SocialInfo.vue +++ b/src/components/inventory/goods/SocialInfo.vue @@ -8,7 +8,7 @@
{{ hilistInfo.name }} - {{ hilistInfo.json?.category ? '[' + hilistInfo.json.category + ']' : '-' }} + {{ hilistInfo.json?.category ? '[' + hilistInfo.json.category + ']' : '' }}
{{ hilistInfo.code }} @@ -86,17 +86,16 @@ onMounted(() => { .hilist-code { cursor: pointer; width: 100%; - height: 25px; - border: 1px #ddd solid; + height: 38px; display: flex; justify-content: space-between; align-items: center; - padding: 8px; - border-radius: 10px; + padding: 16px; + border-radius: 6px; + border: 1px solid #EAEAEC; .name { display: flex; - } .code { @@ -107,14 +106,15 @@ onMounted(() => { } .hilist-detail { - padding: base.$padding-base; - margin-top: 3px;; + padding: 16px; + margin-top: 8px; width: 100%; - height: 250px; - border: 1px base.$border-color-base solid; font-size: 12px; - border-radius: 8px; + background: #F5F6F7; + border-radius: 6px; + border: 1px solid #EAEAEC; + display: flex; + flex-direction: column; + justify-content: space-between; } - - \ No newline at end of file diff --git a/src/components/outpatient/MedicalHistory.vue b/src/components/outpatient/MedicalHistory.vue index afd51a3..2b965d5 100644 --- a/src/components/outpatient/MedicalHistory.vue +++ b/src/components/outpatient/MedicalHistory.vue @@ -34,7 +34,6 @@ const props = defineProps({ default: 0 } }) -console.log(props.status) const list = ref([]) const init = (patientId: any) => { post("medical/record/listByPatient", {patientId: patientId}).then((res: any) => { diff --git a/src/components/outpatient/MedicalQueue.vue b/src/components/outpatient/MedicalQueue.vue index 8692d26..5a082df 100644 --- a/src/components/outpatient/MedicalQueue.vue +++ b/src/components/outpatient/MedicalQueue.vue @@ -209,7 +209,14 @@ const clickLi = (item: any, showBox: any = true) => { } const changeCurItemOrStatus = (item: any, status: any) => { curStatus.value = status - if (item != null) { + curItem.value = item + clickTab({status: status}) + if (status == 1) { + // selectedDate.value = formatDate(item.appointmentTime) + init() + return + } + if (item != null && status != 1) { clickLi(item); } init() @@ -218,6 +225,11 @@ defineExpose({changeCurItemOrStatus}) watch(() => curStatus.value, () => { init() // 重新初始化数据 }) +const formatDate = (isoStr: any) => { + if (!isoStr) return '' + const date = new Date(isoStr); + return `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}`; +} const setDateTip = () => { const seletctedDateObj = new Date(selectedDate.value); //如果选择的日期是今天 diff --git a/src/components/outpatient/Settlement.vue b/src/components/outpatient/Settlement.vue index 25e5367..f813114 100644 --- a/src/components/outpatient/Settlement.vue +++ b/src/components/outpatient/Settlement.vue @@ -20,7 +20,7 @@ const editItem= () => {
总金额：￥{{ totalAmount || '0' }}
- 取消接诊 + 取消接诊 完成接诊
diff --git a/src/components/registration/Edit.vue b/src/components/registration/Edit.vue index 70fc1c7..38ed523 100644 --- a/src/components/registration/Edit.vue +++ b/src/components/registration/Edit.vue @@ -141,7 +141,9 @@ style="width: 50%" />
- {{ + {{ isBtnShow ? '挂号' : '预约' }}
@@ -202,9 +204,9 @@ 退出医保
+ 取消 退号 保存 - 取消
@@ -452,6 +454,7 @@ const changeLoading = (e: any) => { } const isBtnShow = ref(true) const changeBtn = () => { + if (edit_data.value.status == 1 || edit_data.value.status == 3 || edit_data.value.status == 0) return isBtnShow.value = !isBtnShow.value if (isBtnShow.value) { time.value = '' @@ -547,4 +550,9 @@ defineExpose({init}) :deep(.el-form-item) { margin-bottom: 2px !important; } + +.disabled { + cursor: not-allowed; + background: rgba(#4D6DE4,.5); +} \ No newline at end of file diff --git a/src/main.ts b/src/main.ts index 285f36c..2df7930 100644 --- a/src/main.ts +++ b/src/main.ts @@ -3,7 +3,7 @@ import './assets/scss/main.scss' import {createApp} from 'vue' import ElementPlus from 'element-plus' import 'element-plus/dist/index.css' -import '../src/assets/iconfont/iconfont.css' +import '../public/static/iconfont/iconfont.css' import {createPinia} from 'pinia' import App from './App.vue' diff --git a/src/views/outpatient/index.vue b/src/views/outpatient/index.vue index ab6fadb..5abe4cd 100644 --- a/src/views/outpatient/index.vue +++ b/src/views/outpatient/index.vue @@ -148,7 +148,12 @@ const clickItem = (item: any) => { const medicalQueueRef = ref(); const cancelReception = () => { post(apiConfig.RegistrationChangeStatus, {id: registerId.value, status: 1}).then((res: any) => { - medicalQueueRef.value?.changeCurItemOrStatus(res, 1); + nextTick(() => { + medicalQueueRef.value?.changeCurItemOrStatus(res, 1); + initFormData() + medicalHistoryRef.value?.clearList(); + patientCardRef.value?.clear(); + }) }) } const changeTab = (e: any) => {