From c76436e1cee1c902c265a1e5766a20811443e790 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Wed, 10 Sep 2025 11:15:32 +0800
Subject: [PATCH 01/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_hr_attendance/security/planning_group.xml |   2 +-
 .../views/hr_attendance_views.xml                |   8 ++++----
 yuthon_hr_employee_approval/views/menuitem.xml   |  10 +++++-----
 yuthon_property/static/others/rent_temp.xlsx     | Bin 0 -> 9749 bytes
 .../wizard/initialize_wizard_views.xml           |   2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 yuthon_property/static/others/rent_temp.xlsx

diff --git a/yuthon_hr_attendance/security/planning_group.xml b/yuthon_hr_attendance/security/planning_group.xml
index 9d35897ed..6d1edea1b 100644
--- a/yuthon_hr_attendance/security/planning_group.xml
+++ b/yuthon_hr_attendance/security/planning_group.xml
@@ -12,7 +12,7 @@
             <field name="domain_force">[('company_id', 'in', company_ids)]</field>
         </record>
         <record id="module_he_attendance_sign" model="ir.module.category">
-            <field name="name">考勤记录详情组</field>
+            <field name="name">考勤记录详情/修正组</field>
         </record>
         <record id="group_he_attendance_sign_manager" model="res.groups">
             <field name="name">管理员</field>
diff --git a/yuthon_hr_attendance/views/hr_attendance_views.xml b/yuthon_hr_attendance/views/hr_attendance_views.xml
index 874641723..1f29ada92 100644
--- a/yuthon_hr_attendance/views/hr_attendance_views.xml
+++ b/yuthon_hr_attendance/views/hr_attendance_views.xml
@@ -9,7 +9,7 @@
                   decoration-danger="is_workflow or is_approval"
                   editable="bottom">
                 <header>
-                    <button name="compute_company_id" string="公司更新" type="object" class="btn btn-primary"/>
+<!--                    <button name="compute_company_id" string="公司更新" type="object" class="btn btn-primary"/>-->
 <!--                    <button name="button_all" string="班次更新" type="object" class="btn btn-primary"/>-->
                         <button name="compute_attendance_ids" string="重新计算" type="object" class="btn btn-primary"/>
                         <button name="state_fix" string="状态修正" type="object" class="btn btn-primary" groups="yuthon_hr_attendance.group_he_attendance_sign_manager"/>
@@ -157,14 +157,14 @@
         <field name="binding_model_id" ref="yuthon_hr_attendance.model_hr_attendance"/>
         <field name="state">code</field>
         <field name="code">action = model.button_batch_correct()</field>
-        <field name="groups_id" eval="[(4, ref('base.group_system'))]"/>
+        <field name="groups_id" eval="[(4, ref('yuthon_hr_attendance.group_he_attendance_sign_manager'))]"/>
     </record>
     <record id="action_update_shift" model="ir.actions.server">
         <field name="name">批量更新班次</field>
         <field name="model_id" ref="yuthon_hr_attendance.model_hr_attendance"/>
         <field name="binding_model_id" ref="yuthon_hr_attendance.model_hr_attendance"/>
         <field name="state">code</field>
-        <field name="groups_id" eval="[(4, ref('base.group_system'))]"/>
+        <field name="groups_id" eval="[(4, ref('yuthon_hr_attendance.group_he_attendance_sign_manager'))]"/>
     </record>
     <record id="action_update_abnormal_shift" model="ir.actions.server">
         <field name="name">批量更新异常</field>
@@ -172,6 +172,6 @@
         <field name="binding_model_id" ref="yuthon_hr_attendance.model_hr_attendance"/>
         <field name="state">code</field>
         <field name="code">action = model.update_abnormal()</field>
-        <field name="groups_id" eval="[(4, ref('base.group_system'))]"/>
+        <field name="groups_id" eval="[(4, ref('yuthon_hr_attendance.group_he_attendance_sign_manager'))]"/>
     </record>
 </odoo>
diff --git a/yuthon_hr_employee_approval/views/menuitem.xml b/yuthon_hr_employee_approval/views/menuitem.xml
index ff0d8f616..b12a5cda6 100644
--- a/yuthon_hr_employee_approval/views/menuitem.xml
+++ b/yuthon_hr_employee_approval/views/menuitem.xml
@@ -12,6 +12,11 @@
                   parent="hr_process_work_job"
                   action="yuthon_recruitment_approval_action"
                   sequence="1"/>
+        <menuitem id="hr_menu_message_login"
+                  name="个人信息登记表"
+                  parent="hr_process_work_job"
+                  action="yuthon_message_login_action"
+                  sequence="2"/>
         <menuitem id="hr_menu_interview_approval"
                   name="面试信息表"
                   parent="hr_process_work_job"
@@ -22,11 +27,6 @@
                   parent="hr_process_work_job"
                   action="yuthon_onboard_approval_action"
                   sequence="5"/>
-        <menuitem id="hr_menu_message_login"
-                  name="个人信息登记表"
-                  parent="hr_process_work_job"
-                  action="yuthon_message_login_action"
-                  sequence="7"/>
          <menuitem id="hr_menu_prepare_approval"
                   name="编制调整申请表"
                   parent="hr_process_work_job"
diff --git a/yuthon_property/static/others/rent_temp.xlsx b/yuthon_property/static/others/rent_temp.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..f208fd4427b58f9eac27a1aa65d2bc6eb35ec539
GIT binary patch
literal 9749
zcma)C1yo#1(#GB09fG^NI|O%kpTRu@mk`_nL4yS+XmI!71b27W5cnb4eR;{g-ShW3
z(=(^1zOKGs->TcUs+8owA>crsTd3li@bmY-8|>2$Gk~d*69DMUr1T_)@iYMQL#&Z&
zwwxIh1cV(71O(;pV#Yuqqldj+dThHaI17fvb-*LaCjc7*nF=dSKo}pijw>M>V6IIb
zEpB`Cj)BpI^ak4D0-$z}z=l5hvEIqu@MyE;93~Txnp(XQSW8t9?<fh2V=iZ}!PBgj
z5fw!ZORYd-YfDm~3**9gb?vcQ3LcFI7LG}^;qrFJA`-GDL^8y&TET^OA3xmjg3h8?
zmX5n}FCR3}F4a5~ffFV_$Z4Ym-rDAU&CT-ocu^FS9%CIN82qaPz0$-kkGy(Xtc~;4
z-Svmys#QKA@YzLu>BGPkhG88gD*@O$P6NTb4IQW*Jm)#t^1Sw$h3@gu{W-{swePp5
zhnI|utMqrfrOBN;O8ej}yWq+PP>lgysBiT<@_O((Jk_P6{XkxZv<ZlHC~&{w0Lf1m
zYk63!-__*$cI$8o`8&I4#rKWkPwW~$v5We5c1;0J=FjxLjZ;wUWJU?TmR=w|6ReCc
z3X=?{do_uf7()$KS#@A-i^`W|FWqR?t^FBNaXdt=Linube97mW--%`UBdr(ozFDbU
z0u_WrmM25*Qo@d7O&F8%2LD8WdQAx0VS6@@fDm1Mzo-4`(pRXG<dq!ZamMX@aouBu
zsLFL+r6J1p?7;f6QWHVFLn!<n!&xYxWFMr)$~&WsRV<t||1c!!cIaHsDs^ZS0x?Lq
zYIkl0mHYKeqr`7j*{YI?l;4+vxCqyxW&^I*R+e~paMJQ+Qf08oH(s8epB-g;+t9l<
z(jkRm1#B;Xo!8`Pipnsg*BzF&k>@R%biX$Y2`;A$+ZXtLcTatC?6l%~>P;O+4KeWT
zMrzaA$+=O7BsJC!FJAk79A^KSHFs6A+n$Uceg#uu=fNX-0S_*EG|1eh;CGA*{NE{$
zEHNIWeWD!oiE{McD0g*s0oXs2o)@bx*U5|#at!$>*6*7d%`wkA7xfCU3m($7PG#JM
zj$KA(d>7@h5!X2adueBLwTYkqn5X|v9jRReXWlju49x@urrUMCSRXEfhzke{wvRW(
z8K^-9DP`Qw+t?y|^p+^tvAM!uiaITz*?Ap~bnse~lk>uMlPjI`ljAFPzTC#L?VNF+
zI8h#PmJD)1?E*@IR^ZBzF5!Y<Z0XhuzD8gEC<87z!PVZZ_%eX%iALq8A{>jDua2;=
zRFILDr(kQ8J=Iy8RKxr3D3Jxskp4Eg<*!s71ol@nI&VzU`_G&*;tQ#Zy!=1#cMPUt
zl?)Y!#V8oCUCB!aw5-E6Slz2yxuG`r)}IT^hc}w+g}TuVAqz#|1_y;ad?d|_>}j3N
zny49W9TEh2ruLs*3iuPX9(F&R$v+Dq{S<HqIN3T|nVY-(>3Ak=_kE(C_NW&M1O(?l
zWPd<do;NE|T^}${g5jH4{rK9WTxi^fBSO`+|C8Hzu1)3$#5ztl4zl$7hj03A!*-qn
zIz(V0&cn@mNM@dXSdhFdd7tUg37}CWOLAE^HwD{;S^$789BZ+G1dLB+u&<2qmdlq~
zb-$_*x(ug?WGU@IZ1<?WVV-2S4A>FYC<#iGrxii)De^6(>z3Y=&Vi9qW=DivrM!ZJ
zzr;g)Xa4@v+gz!3*>wpFx-kEH*I~NFqVx&P-Mom&ifPVF#R&XXr?EG^f%gyvvNrGD
zy_QA2n+$1ef<N~9hT%eT5p4pSgVehR6+}0)5QV+aRDW0t%W|$+P_~~{<{~^u^+wTu
zO}lUCuJA1ez6p#0!y+tyF|bCSM{SHqK!slJM6BtCz%<1@Ec5+T1Dj;XK}%(Ta;HiK
zoa9$9J{n}K8wl0dDL0T}>B7|)wH6YwE0-907xUe(Ng-gEP#e}c=f1w%(#}pW-_S~_
zp?`HcxdEF2eeTfM$*@seLX5k-4aJHNZHgZ_00yy&4eQYSHkQOPvmQIGr@e5VIj2ls
zfnGBl-gj~|yIjB*!m;6y_Iqu%*z)MQ4D&8~;b`K{dI*xQTxK)rUGCE`6)|L$VxaCT
zO5TkvS!iE;-!rJYlBe-;Kw$lRnPljKp39D|*TrKX{P$D7Ozq|JB-yVpOAsgiWnsRR
zYZ7)0a)$?j>27aUND!+E)T<F*t|-ot2qK_55?2zDN&0qKgw-FC3nHPe3!3nW%io2)
z6zi&v_8=g$@a>A1dOgo{nR1PKqB0ZlcEL4dt`>V1yOGTMD!5R9iGx-Pip+?+BJ<3B
z(ho=bbKG&R|8zg1^G&D`kVqM1MP7E|Ra@|ttuB}Ka?GIN=pOQaH;CtF?2|#bSee_K
z|M83sy8DK30|^4s@^qg+yQIIwehB}#%MZ1`MB{T{w343+MQ$w}QGDrjo3g99-4k`6
zSC6mV8<Tk-i9h0D#@F}-u||r5LR>^IrruFlI8S3u<smhgj9TRpGUKqnOOYT4D=5oG
zku77{`xSBP^?fXzCNTv&cefr&5@*MFH#Gu~*Ni+)5pVVI)pdsh4ovtsY7Tw(TVRxg
zhwJ0_>#{5X+;s?OlFSH!Nf=X_s^)Y;mLOva#!m<ZC-y@g0TfMV{lj4&*hbSv)15G;
z+|b0wnWdG%Y>qQ7I=%-FBSCh5#IP}v_IzpGMb|b~oh$g}vz0Q@d$Ktgk?XMZ%TsV%
zC=6IwVm#wqzt!P~M8fK1c;(L`U*q=o3>lN*BlFD#USuLf$j~L)<hd#BOoPx)JEnUT
zeEo=d#}0xRx{_bnJ@#3*ygHTVE7&`!=%ZnW&kL?6Ne^<iobH2P0t*jTIQn+VOIG)%
zEE?C=IQmwKZExh1>1;FzzT=sl)NuF|=vb@sAsGak$d2#g@kR{PC~`<)$FO_|HSlOw
z-6N`YzCnYuqb|(L$Ei~D3Qx-V7U{lPEUHW)gV*O7(rX1%ZBHr-^&UdX3{8#$dakqY
z&LJek#9mqfJB;+jJG&ra3m7=#kC#*D#|8p^cuigp8~3YK=b=IwLS8NpC(s`TQTfGp
zyRdw2zZCfSTq>V@n<zIFd{~Ia=6py#7J9fX7`Ydw&dHNtYVkPRuX@4Ma=%drAogB?
zCP1|F$fVGM;5yL;zM))6LyENJAv&3k-{}qGMx%yWB$^_`<!i%t7Wb{Eatm}16?;4Z
zE&p=FS9@h57~jQqe#!0lx;Ju+YJCYrPt#c&^=M=~+|Nm{%CQcG_wvi4=*RfEVfw%_
z86R3*7Ple(Z0ba-09AVM%eM+FS03)sC@;!-&HCOMnc^;xi=d+dr0>jDP^@WOq|y2Y
z7c5C~=fc07rf2mRj_h*^y2dJ@gn30Co9+dj;-$(Y+^AhCiypovCdK_0dGO_Sw8u3l
zNd6_Wxrk*@@Jau|#!7kO#r~+^y|qyOd6$HfOuk^cR2U2Xti^;zWZY2bVJv%XC2<&y
z5(eZ8`MZ_gp;DAfBv0Yp9+zd(8JX)VNgzINf&F+K$=+b3x05F#TWD)D4<UI;BZ7--
zf#C~^#kr<02*-17<oqjLy8NMZU%b$d{AP0It&%c~3L`El_w++wO=ox3wTJ<VHvL+d
zm~>fOtZQ)D=k1$s74N-|S+c8NY-13^Hh;&exQlFHE)2R5LC1!!qz{o&@5x$hSKy{K
zqavGTM-}OTAVBVXTQmvHE9Vf^yXB!>r1`;$#a}S4Bgm^ET<{~KTGCLs^9KXdoH$T9
z_&_6al(wsE)TDh$B1P!1wOCe`<cjYVnT8Vu9wG3Vj0wd+jK}EuJgdq$VCvj%fi)1y
z9fMZXm|0w#oS@SmfhZnfjbhRQatv0_6oHb<(-*zPOs|g<t+Kx%KTewvjf@4ES_W^m
ztUp!;L4iYkiFW-#af}<H*y<Gnx8CGIs}dLG%f%*T2mfS7<WrBx&~b}=j+}ZUgL92e
z3*j^aeqMMemmUCVmJJQ<6h^3&c-v_!9%%X`yq=~yo#!P}I02CA7!CK@B%wXAGbt+A
z3X5D!KgC4M9GhyFUF&N=v4LiFxow6ce?AIKJx>r_2l!@KD#{VE)QJ;~AHTA_hIh?L
zUCDdBOU)tt)!-)AEp`6a&ND^F`D;rvYaOTNj766!HPRBhPG$xMFEFpB(j!2)3q;K=
z!2*;MUi<I&VQ<+D2Bsyy*9r{RfwRZs-8WFS4MD`8?mZM8z^}iKlN>Wow3tAJjO(>C
z3z73$9I!1*(dFA3s@S2Y`^d1Hf;qTq!m`-mHdrJPW_(#!%K9E+uFWG-lKWbO1Go-O
ze=0{zHdWdrSZ~`jR+Px-2IiKa30C`lh($rW2`1Nk&S{dvew75+j#zFxS9{niOJM_F
zL+AKy-yU>EDYt0mGe)!R`7q>$hBmy|diT}KDv8HZqesX#sO#*(>eT^P$vkF4;lQg$
zh~LkyN^-qOs846t_@~eFE85e8!r98$$=poU#mU;i()sy3WIy^vwu>1B`lNA%FKA&=
z4LN7r0y*Gi7Bb3QJwvsOy~^19(pQP@h(V&R1`?C0c(R*H{h4Hz@RneGERg`_<j4CI
zT%0=Jm@cDC3$nGLz(EFRumK+;@sjoS^uy9T4wxVcdJ-1P$-q#xHckUQU~o*<JM)gf
z?1Wt?(GFy5QSmng2^^mWtAhHdEC?yaBjbdF5(X$F>7uG4(9l?5d@|T}+g)Ltunsp}
z&bdrA#b*+=Fr|vPS>m&Ky`5vb7*j8|E$)yrkCThIIi}+68-zHfq>+UlEIEjF+KW?N
z)LreOhrdi>HxSHTaWH(jIcjtlEKVD@SS-DqGOe10a-E-Gx^|o9pWeG0@tx$yeEe}n
z{q;VZ>xu5Y@kAdA1PBQ7uVbYN0ATy$eM?mzkjDJuG--4zz!DQ3Oq~lyX_c5-Bs<~a
zok~y-QEWs$kNYnF`}Hi!xMCVr2IKY3g6Xm|)0;GB?W|)GOmzOXqtSL44>FaWXwX+n
z-GR80vZ@*5qCl7vWThL6+tbb*tg}m!E;?2)JxK29hE(*NI0D(CkQ^`vMOIR|A_dxL
zadkASA}0`itS;yGG&D5p_39~uf_P+uT41r#ij=^`2x;m<&Jj(XVzq)KqSQBKsT>3$
zu6ZG_FO2s2ll7=QKKE&Xe)|e8UcBd@lt1C@uPl;iP#`acw-PHOfe2`WAonclK&Kn}
zDCER1pQNcvlqXXn<PBBh)oCAL)1#`~TA{WLdL=nLQ@>=A=}+ivzw!Q~>1H2acs?ol
zlz3N~l%O`3J{uYS@etoo-Fvok(qol6<(&aE9g1kQ*-;eV=~JJ<*HtZ=4dFW!+OPdW
z;<a}oeE`f+iyq8wzLqE<6Q@RK-5>g2a5d<^Tr*6cuq;l|e|v<LWfqPhYvz>_7FX^3
z%@%S2*Sg4mFP=TEMz7k&`ArY@1)K!~(E58c{MLM5t<%Q`;?sURH&B88)0P*fSH@NI
z7aL3E?#l*iEgMr*ks9A`ix1r{UF#mk^+g`6sae>#2B#D<T!hZgxPG@Om3da@Bm@wU
zIYST-#DCe8i>ICW4`W)?vyWboB=n2!a<AYFzz+LzXHD$W+zhO9PokBeCIck}jqqt)
z;(I!??_cJ-OC*9>!(c$dLc*veQkRN)h#*miN#<F%%DXvVN0hhuS=fyXdELhh3f{~~
z3(WI9ZZ8k{WpI@fAnNTV9YzxZX3D6OHzUlD8x2NqiK^+An~gPeF|7%-Ix{xC#2WQ^
zYI_subPc}`Y;kkD9qxzL5=yt3a64!s1sYW=7r$)`y=ucVypp^^d9~~P&<3|MB~<uU
zs>S}YC(LT)tD3gMBvcYx2?`Q^paUuu_~7HIncAUOU@Rv0x2S!H-V{v<JQpqlAsnxk
zn&W^XsTNenkY0#=|B1`y%4uXq@Z!|zV?KSp?CkNv+bafW&)z~id!!fO&M1+2Wn8#W
zhY>`6aeYkX*DD`XV#CG=%b{%+5?V<0@3!*f&J=bzF77*Nzg=B&Q5l@*B;L1Ewz#Sm
zO_C|o8@gsNk=`w1NB4o#QJtdGah#IhDoMlI8-y$EnR^Zk-ubV;+LW!0z2koj`ZVK>
zdfio?o&K@al3Er1Lu1YCbqIT35ty>1VJ&AbK&Fl!yC^(>Z1PfXBpFPYPaM||R|h;T
zAtmE}@3soMelmMAIy(+UR6%MPhzTo)L;ym6r$x@%_js-RF;ONhSNa_JY94bUVO3~C
zoOcV48k>zt$_O5!mbq907UPz+I%=j)dcS_92E`JIR)<tuR=JRSw%s;$$B;A@GO+iZ
zreUq;d-j6{bKdy)q>@c|Bz-7a4pp`^#Ek_Bb$|AW4x85yHiMn8>w|?$_FV3p!5U`-
z@Cx_KWcsP7LeA!2o7KQ*wYu350u|Ff%~Y7fu<^#gV(GxM26OBU*3lzOi~2LM+EiAw
zrN^^e1QJZYZEQ^q@sd0-w?%JQ^FKsZ@QCf$#_uKH!A3Nmd|jmXHery)cSW~1BEngg
zC7^PfS0J}r1p2xsrxvovs~~XWC{&2MGsD+R?7GR{+lWJQHD@4iV9y1?RN|8w`a`MY
zS2x1%x^GJqO-Bw6N+q#KK78iY_U7yP<cRatC32s#Lja2$5()2qAUQ3>xH>_yc#73U
zLA&{$w~wnjX-r83(Q{TwVXoZ&#-e$th%TgvZqNZt^p=jb%0L^Cf_rNV%SP_UVBC|Q
zu{pifliE4dXDIh$*x9+ChslmT)fVZ8fW<~R<&X!O)ol&#*4}h#+FwWmWo(cnj<0wY
zk`Fo^Lw$bT%<Cdl2)5S(t<bhcD)nU_`j~SmmTNin8;RS5$K8>T#+KXgvyJnxAu4RD
zYi6BGzyVgDPqf}p=d^~QVT~B2m*~SH8K={w!qigvV>9ATDrLubJ7|}HYmnAa7vfsK
z(@ny0R@Ci4y^e}_$hJ$eRgNR;Eu#?0aFvP3;S2!Hk(Lr9m=UmK4FkuGhLyfSr8-;m
zP(*c1pB}4_1ME4emKP(go#$*xxB-C(%@Ue$5g{?z)L5b+Sw=9p5fU@fmY?6u^(kRg
z#gbB6k&B&v;=F2tEphGjKp^jD#$adq%r3*{ECZ3WHI7lkQP2{$nL<TRwk82>l{BKt
z6wDD^e0<C4++8&ZqY7=7Q+C)etvqn^N=Q+Pcg_nqX?X?K#)w$07+H&-C6(feNG!8Q
z%A}i?v`>HleTAZtX)gq9usUpjFXz+-3hs?mPMz+(A~Nj9d%IwYzG1q%fvA=R;Nwmo
zzdn>kzS~VbhIHd<YgAOK^|e+%mGp<trghOg3sgrcSSzK&?)b>Ngy>AFW=>0|qNArR
zbKfd}dobS;UMD}+U{coL#Dez$Yt_Vhh&^n@VUDB&-l0gvXNbd6&Z+_@GbexF<QBt1
zj47puxzfFzJ%oogyGIGU3OHDUIM~e~U!I^RmS7{n0dJ!x<CBt4%8ne&p(k=3VO?s(
zO5sLp6w6sSN^Mryq(|L>G^9lX!>A6o_x&!xWSp;HQb(ZM3^*F-1vi&==}F4~DT*GS
zo$$G%M^R?bQz>vThb(?$B{qb!k!4o<VJFgFFr^79no>PZ#{NW0h4S43X!NF<iuotV
z0Rn7cIcdtxNwnI8E*Ztu9@e~~m69Yq=xli%r}~XJXX~1cPp<E(H-OqpU7c&6s^5in
znp>+P7noZ+BfpW$b-dMe<<`|uVVDgo&if+pKIy3=V3bSq=4N>6>cf&buYo#APaP_g
z{n2VQz5S6fd0FDW1}jjfzh-#b9K`W!XIXyT8bd8iHcU;9y4%+O0Bt8x+&@G>9m;(}
zboxS7-K>;Ia6O!k^$k|@VNjLG7#|zp4N{Bl*m$$c&h4;ng=~)<nNclfn*~hMEnQ{7
z>oIJB2#f92Z|_??GF}#<&RGS6fsq<<%AM#^uDzDoIk0PF^}V~eIOU6s`5wOBfh3Ct
zwvs|p@3(zh^=-oN{{EnOS<);EQA`qvOv;->l&9eF6~FJ@L>LHY@<4lm>DFe`&H6Tp
z+10fc%wC5Qp3kIdhQ+|n75J@GEc;|>R>I9i8$YFTbhe00#`sF<4s7b<f`IqQ?ZI?3
z84vZQ3Z7HF?=a%TOF=<_+qHw${x{c4Jn02e{W0U~h*jsTmXCM)v(4`0{?ts$U@0nS
zUHcdPhWV|Y?pNQutF9lh#<JzxM`O=>ol}Pe>)o$biOJyj^}AzW7X9vS$dw%2zOgVN
zmP#?N?TPxJIHF-t0(+f#BZZA8MahI!rMpbUQ9~Fg0&+-Ek&z{E>SACbLd5w6v(&LZ
zKb%8PG_vqw5D~>Vs7N3A;>oR|f|8S=_V;HRzUPmW@sMvj5f^6twsUpxGCKd-kE_|+
z@~YjEg&`VV9fun17J^|QLq0~`I6dS0`O?9aAGxE)Ybi1LsM=xhS9d$wdKmx?HByTF
z%=cZJp6rF9?C%#JX3q;=nxGNE7oosUj0g&R?<H)zx#;h#LS7d7zS)aWYXq?kMarml
zYpbF@VAg30$*T}Ry?1Npac?Dh&we(0k`mw$Dva;X<Jhd`Y1BSz1sbSU-em_|js*+R
z17k%_Q7c#C^zqJxo&WUw>!gds0KJnXJh6TilnaOubR&NWXWnV5fo{S%MVEjWt)~#S
z@GQsg<VxxUsTHoP@wS(K0q2rcE8EUvs3VCRH0|f##^{Bw6^b-XI9H%JCmSkUF+3nm
zM9&Z#xZi-LF?QL}YEa`7RW+bgeKdFiZtRI}<a-5w0)4EIgpH*;ffJ^`fU7XUg<(nC
z!yE|dwbKuq{W<OaPr=n#-QK=DaE6_^>!_Uv%boQV<j=_pL(8Km$E{H#ie?1bOln#l
z0CB{GW@fk!7$hX9;OW@a)QtKb`lj$m4%=BZv!V>XIrh48AtYpWMUJLRK|z4Jo^s^f
zP7Vi-nT4KSTm)qdar(xF3)&)e+-OPK)<GZWN6Q{=?EqE6g>a%W;2F1+mv;NRkc*D7
za42537+)*0vfuz!Z;pW=9+}>|<M*o(!Hju(QcvdW0eMbthy{L0Cwe2d9zVI)1qNNG
z|B-SUqg~AxEfw3Qn4B)_!6J~^LEsGu7UnR71<gLie)~9`7Jp^V$BFZe;wiN&y_Ig8
zFucbO>lg8IRBEmCQH&~pk#$Nn+pJ~6tj73L&@K-}!X8zDMu5V?isZd%qiAONEvFu^
zcyZw<rz)5^3|`LA*})UkVybM^Qbp&jToqZT=LN!7@-FnuNVw>|P7er1_oWnWAja7X
zS5x<bF%`b428SJWUx0gg!(xoCy7m!{x2q~AqPjPJ587m(0Jg(%@Odm~OUcm}v5}fe
z7v=zj){`BU(tFYc3;S=&r%RD<)>&+IPTK;z(QDa>$O;mV_#U`-JdVsju+2i}R<b?u
z{B0=*)*aP#Jn2CuKNH;y_eGhnkm^$*D%(Uwx|Gro?r$=e?UKYW6XI*K<Guth=1i6R
zFlDWdpZ{5RicjZ5!{RQrx+y@H#XV7@cxiSR&W=@ySru{iZP6e&DJsnjVumvRmw1VF
zzHM1bwjr&V%l=m?y+c;fhh<y`u)AmEQA(_{QU*cZt28RWp$Q*phzOcf3Q4@xKHdt2
zUN>*eQr~&P-nElS8OE_|dUr7QNhuDfm-Ca<n0Wj>r8w2@SIR(F1agxbIt3qSyx8XS
z{K`hlqN${&iK4w!{c^m^bbTvTUcSc0e9~g4ZF`Ux4HvK0rN>6xE1T>l5u9!XN{H$1
zdS-(6x4&1cBI1wkU+6Y=H0eob#;#;d3ENjtv*vI{F>Nm23H|pV^HZ(_#L&sy?$2b3
zH@92U<I{i3PYD(HzhoGnB}?N*p5p~Q#{tJETP+Iin5eTZOk@WNX1=de<R3?=(BrfZ
zTbf0b=_ebYqu<?br7ioIHR3Ol7_j6=H3hgT2M7cD+**`Rd_1%k1Efour@%ecfE^Hx
zduJx!f&#br6XqBxV)cDgMp;AoXyUEMcGZ-GGx<0q3V4J}$pbl?9h4jf&Ln#>iIf!h
zyO(Igyc?k$xr3W-0f3_Y;T3^*AH+u3=r+`1(_QUiFe3wfKFqYDTuMMe@r*dR3JxB-
z%Z8SeS}-6==mn>!Ml5XVwK~$j>(x^vj-br?aw|MBvE9)gJEmJbD9sy0nX~^$!P?uk
zk>n}JVJPi%#!&43-?{u(!2X};?6aG7I(VY7;fYSXr|+jY%uliBY}UU+3IAeO!RAN)
zHh4*7s3j>qNkw+UPL_23tHA4+o}_RF*e@5ob>%=(N0MB800aQ4`TC3W{Nf0A7?b=Y
zba@u7EXs~TMe{L+4|}=$OOmjfIxiR^OnK>wVgR5Pz-=|0+;<r(?sl5n#?os^)6Y%7
zfk~P(lFpf{?40y5UO6rB=$T#R{5<GM%M23$W^S`D$e29Ki^pTaxmvCpw4v>=3?^~u
zHS0d`Fv$WW?e<JYR`R~V)9d0MzVy)+=Ye^B75c$xBTm~6;45<eQj;Vn!D3s4sZ@kz
zQo=scv+#8-G9LFR=Cgy|sn*}$s|!zcoGqUMEr?Hvjpw9>t{A|<#oWQgP|Xu)?yUbD
zY$;6`R0Lze2)U+e>CDw-Qw17F8XK*ef23FgpS)^gzevgmIJwH8F#;3uk4%%{J-lsw
zyl+O3q_d5n6rWt0Dlxp&0#)?NTP(34j!!<zz)T5J?eKu+&;|cAc5-LKtPR~3P(=8(
zM23bR81)I1uHp=o;ETL(HQ5;Rum_40qeUCQyP1!%S#Cw;oem-=0e`z1y*zD(=7sk<
zMSzF~zXMinNoqJsWD;4dYKzO>YZV7rO!X~}nVr{MW`U<4g50*;+iH*A=7j5ruwbz?
z!^v^hpE(iu3M+;bwW>$WTugjS62^m<Lsc8CEfG%iry!+56v}uslOtYrx?%iKduOr+
z7GIalhK!e_y(ND$0JIZ_xXd6+mp+j1MG>L41Bv69%D6fzBzV(&8T%FLVNn=MKt$2y
z<Lhlet22o97R1S5?`^^L`EW&NHO=J!+~M%bHiPJ#Z_)13WlL;rD}B>>`?)FSJ(Q9h
zC>X|%c;U~Ijz4$iX>&k8K}eo@qo?j4_UY#Y|D48s_BcP=b9G2R;V=L5yV5^B&@<+z
z(!;+nKP={dDSI}_pY2)MbNgG>%J2IAtXp{&{;BW9-(ml%V)>JzKkG7np@W}p>A#fz
zyGr9v_@6Zfzu-4d9^)7MuZn~Jb<xk6^q=kdqE(;bmQU{He*u1H36uD5{^`$!{^`h`
z_55Us|L?H>aBF|g^JifC*F4ovF|~gRQ~x=`pJBLPGr&9*#yrpPS5WT%f9+<_KcN54
zx&D5K{F!zArSZ+*VZU;)e=hmYQ1Y({uAhn<o|gP~+Wyy~pGzTrw&xvo`MJZt6-NBN
l@;^%>p0Pi7E$ct9zX~Ok<RE_-E9z6F5%iPX4e2xP{{Seq*wg?3

literal 0
HcmV?d00001

diff --git a/yuthon_property/wizard/initialize_wizard_views.xml b/yuthon_property/wizard/initialize_wizard_views.xml
index baddaca2a..85212c583 100644
--- a/yuthon_property/wizard/initialize_wizard_views.xml
+++ b/yuthon_property/wizard/initialize_wizard_views.xml
@@ -3,7 +3,7 @@
     <record id="initialize_template_downloads_action" model="ir.actions.act_url">
         <field name="name">初始化模板下载</field>
         <field name="target">self</field>
-        <field name="url">.</field>
+        <field name="url">/yuthon_property/static/others/rent_temp.xlsx</field>
     </record>
     <record id="initialize_wizard_form" model="ir.ui.view">
         <field name="name">审批意见弹窗</field>

From 6583c5817f2884c13d98e74ae353b401114c950e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Wed, 10 Sep 2025 11:34:54 +0800
Subject: [PATCH 02/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_base/controllers/main.py               |  2 +-
 .../assets/ClockInStatistics-iXdu-bYU.js      |  1 +
 .../static/webh5/assets/HomeView-B12pd-6u.js  |  1 +
 .../static/webh5/assets/Journey-i8wtFFe-.js   |  1 +
 .../static/webh5/assets/Notice-DeLRV3hn.js    |  1 +
 .../static/webh5/assets/Salary-_DcRmXnI.js    |  1 +
 .../static/webh5/assets/index-BJ3ARmPk.js     |  1 +
 .../static/webh5/assets/index-CimcMLIq.js     | 26 +++++++++++++++++++
 .../static/webh5/assets/requests-DdoUQiv8.js  |  6 +++++
 yuthon_base/static/webh5/index.html           |  4 +--
 yuthon_hr_attendance/models/hr_attendance.py  |  2 +-
 11 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 yuthon_base/static/webh5/assets/ClockInStatistics-iXdu-bYU.js
 create mode 100644 yuthon_base/static/webh5/assets/HomeView-B12pd-6u.js
 create mode 100644 yuthon_base/static/webh5/assets/Journey-i8wtFFe-.js
 create mode 100644 yuthon_base/static/webh5/assets/Notice-DeLRV3hn.js
 create mode 100644 yuthon_base/static/webh5/assets/Salary-_DcRmXnI.js
 create mode 100644 yuthon_base/static/webh5/assets/index-BJ3ARmPk.js
 create mode 100644 yuthon_base/static/webh5/assets/index-CimcMLIq.js
 create mode 100644 yuthon_base/static/webh5/assets/requests-DdoUQiv8.js

diff --git a/yuthon_base/controllers/main.py b/yuthon_base/controllers/main.py
index a646d8663..43d0e7ca5 100644
--- a/yuthon_base/controllers/main.py
+++ b/yuthon_base/controllers/main.py
@@ -14,7 +14,7 @@ class YuthonBase(http.Controller):
         self.jinja_env = Environment(loader=FileSystemLoader(template_path),
                                      autoescape=True)
     # http://82.156.218.102/webh5#/notice?id=64
-    @http.route('/webh5', type='http', auth='public', methods=['GET'], csrf=False)
+    @http.route('/webh5', type='http', auth='none', methods=['GET'], csrf=False)
     def index(self):
         t = self.jinja_env.get_template('webh5/index.html')
         return Response(t.render(), mimetype='text/html')
diff --git a/yuthon_base/static/webh5/assets/ClockInStatistics-iXdu-bYU.js b/yuthon_base/static/webh5/assets/ClockInStatistics-iXdu-bYU.js
new file mode 100644
index 000000000..237e77bde
--- /dev/null
+++ b/yuthon_base/static/webh5/assets/ClockInStatistics-iXdu-bYU.js
@@ -0,0 +1 @@
+import{o as ne,q as kt,w as ae,d as re,K as mt,c as at,M as Vt,N as oe,O as qt,v as X,n as st,I as St,p as ie,L as le,j as gt,m as ht,t as q,y as Ct,Q as se,l as Ut,R as ce,G as Mt,b as Zt,S as ue,z as wt,H as Rt,T as Tt,U as de,P as fe,V as he,E as It,r as $t,W as me,a as ge,X as ve,k as ye,Y as De,Z as be,B as we,C as _e,D as xe}from"./requests-DdoUQiv8.js";/* empty css              */import{r as Z,o as Jt,n as Yt,w as _t,d as it,g as e,v as ke,z as Se,c as z,m as Kt,_ as Me,a as pt,u as $e,h as Fe,i as J,q as At,k as ot,A as Ht,l as Ft,t as ct}from"./index-CimcMLIq.js";const Ce=(t,a)=>{const r=Z(),v=()=>{r.value=kt(t).height};return Jt(()=>{Yt(v)}),ne(()=>Yt(v)),_t([ae,re],v),r},[Te,ut]=at("button"),Oe=mt({},qt,{tag:X("button"),text:String,icon:String,type:X("default"),size:X("normal"),color:String,block:Boolean,plain:Boolean,round:Boolean,square:Boolean,loading:Boolean,hairline:Boolean,disabled:Boolean,iconPrefix:String,nativeType:X("button"),loadingSize:st,loadingText:String,loadingType:String,iconPosition:X("left")});var Be=it({name:Te,props:Oe,emits:["click"],setup(t,{emit:a,slots:r}){const v=Vt(),B=()=>r.loading?r.loading():e(le,{size:t.loadingSize,type:t.loadingType,class:ut("loading")},null),x=()=>{if(t.loading)return B();if(r.icon)return e("div",{class:ut("icon")},[r.icon()]);if(t.icon)return e(St,{name:t.icon,class:ut("icon"),classPrefix:t.iconPrefix},null)},b=()=>{let f;if(t.loading?f=t.loadingText:f=r.default?r.default():t.text,f)return e("span",{class:ut("text")},[f])},C=()=>{const{color:f,plain:M}=t;if(f){const c={color:M?f:"white"};return M||(c.background=f),f.includes("gradient")?c.border=0:c.borderColor=f,c}},O=f=>{t.loading?ie(f):t.disabled||(a("click",f),v())};return()=>{const{tag:f,type:M,size:c,block:P,round:m,plain:u,square:$,loading:F,disabled:_,hairline:R,nativeType:W,iconPosition:j}=t,G=[ut([M,c,{plain:u,block:P,round:m,square:$,loading:F,disabled:_,hairline:R}]),{[oe]:R}];return e(f,{type:W,class:G,style:C(),disabled:_,onClick:O},{default:()=>[e("div",{class:ut("content")},[j==="left"&&x(),b(),j==="right"&&x()])]})}}});const Pe=gt(Be);at("picker-toolbar");const Ee={title:String,cancelButtonText:String,confirmButtonText:String};let Re=0;function Ie(){const t=ke(),{name:a="unknown"}=t?.type||{};return`${a}-${++Re}`}function Ye(){const t=Z([]),a=[];return Se(()=>{t.value=[]}),[t,v=>(a[v]||(a[v]=B=>{t.value[v]=B}),a[v])]}const Qt=mt({loading:Boolean,readonly:Boolean,allowHtml:Boolean,optionHeight:ht(44),showToolbar:q,swipeDuration:ht(1e3),visibleOptionNum:ht(6)},Ee);mt({},Qt,{columns:Ct(),modelValue:Ct(),toolbarPosition:X("top"),columnsFieldNames:Object});const[pe,N,nt]=at("calendar"),Ae=t=>nt("monthTitle",t.getFullYear(),t.getMonth()+1);function lt(t,a){const r=t.getFullYear(),v=a.getFullYear();if(r===v){const B=t.getMonth(),x=a.getMonth();return B===x?0:B>x?1:-1}return r>v?1:-1}function U(t,a){const r=lt(t,a);if(r===0){const v=t.getDate(),B=a.getDate();return v===B?0:v>B?1:-1}return r}const dt=t=>new Date(t),zt=t=>Array.isArray(t)?t.map(dt):dt(t);function Pt(t,a){const r=dt(t);return r.setDate(r.getDate()+a),r}function Et(t,a){const r=dt(t);return r.setMonth(r.getMonth()+a),r.getDate()!==t.getDate()&&r.setDate(0),r}function Xt(t,a){const r=dt(t);return r.setFullYear(r.getFullYear()+a),r.getDate()!==t.getDate()&&r.setDate(0),r}const Ot=t=>Pt(t,-1),Bt=t=>Pt(t,1),Nt=t=>Et(t,-1),Wt=t=>Et(t,1),Gt=t=>Xt(t,-1),jt=t=>Xt(t,1),yt=()=>{const t=new Date;return t.setHours(0,0,0,0),t};function He(t){const a=t[0].getTime();return(t[1].getTime()-a)/(1e3*60*60*24)+1}function ze(t,a=0){const r=new Date(t.getFullYear(),t.getMonth()+1,0),v=a+t.getDate()-1,B=a+r.getDate()-1;return Math.floor(v/7)===Math.floor(B/7)}mt({},Qt,{modelValue:Ct(),filter:Function,formatter:{type:Function,default:(t,a)=>a}});const Ne=(t,a)=>32-new Date(t,a-1,32).getDate(),[We]=at("calendar-day");var Ge=it({name:We,props:{item:Ut(Object),color:String,index:Number,offset:se(0),rowHeight:String},emits:["click","clickDisabledDate"],setup(t,{emit:a,slots:r}){const v=z(()=>{const{item:f,index:M,color:c,offset:P,rowHeight:m}=t,u={height:m};if(f.type==="placeholder")return u.width="100%",u;if(M===0&&(u.marginLeft=`${100*P/7}%`),c)switch(f.type){case"end":case"start":case"start-end":case"multiple-middle":case"multiple-selected":u.background=c;break;case"middle":u.color=c;break}return f.date&&ze(f.date,P)&&(u.marginBottom=0),u}),B=()=>{t.item.type!=="disabled"?a("click",t.item):a("clickDisabledDate",t.item)},x=()=>{const{topInfo:f}=t.item;if(f||r["top-info"])return e("div",{class:N("top-info")},[r["top-info"]?r["top-info"](t.item):f])},b=()=>{const{bottomInfo:f}=t.item;if(f||r["bottom-info"])return e("div",{class:N("bottom-info")},[r["bottom-info"]?r["bottom-info"](t.item):f])},C=()=>r.text?r.text(t.item):t.item.text,O=()=>{const{item:f,color:M,rowHeight:c}=t,{type:P}=f,m=[x(),C(),b()];return P==="selected"?e("div",{class:N("selected-day"),style:{width:c,height:c,background:M}},[m]):m};return()=>{const{type:f,className:M}=t.item;return f==="placeholder"?e("div",{class:N("day"),style:v.value},null):e("div",{role:"gridcell",style:v.value,class:[N("day",f),M],tabindex:f==="disabled"?void 0:-1,onClick:B},[O()])}}});const[je]=at("calendar-month"),Le={date:Ut(Date),type:String,color:String,minDate:Date,maxDate:Date,showMark:Boolean,rowHeight:st,formatter:Function,lazyRender:Boolean,currentDate:[Date,Array],allowSameDay:Boolean,showSubtitle:Boolean,showMonthTitle:Boolean,firstDayOfWeek:Number};var Ve=it({name:je,props:Le,emits:["click","clickDisabledDate"],setup(t,{emit:a,slots:r}){const[v,B]=ce(),x=Z(),b=Z(),C=Ce(b),O=z(()=>Ae(t.date)),f=z(()=>Mt(t.rowHeight)),M=z(()=>{const g=t.date.getDate(),T=(t.date.getDay()-g%7+8)%7;return t.firstDayOfWeek?(T+7-t.firstDayOfWeek)%7:T}),c=z(()=>Ne(t.date.getFullYear(),t.date.getMonth()+1)),P=z(()=>v.value||!t.lazyRender),m=()=>O.value,u=g=>{const y=T=>t.currentDate.some(A=>U(A,T)===0);if(y(g)){const T=Ot(g),A=Bt(g),d=y(T),i=y(A);return d&&i?"multiple-middle":d?"end":i?"start":"multiple-selected"}return""},$=g=>{const[y,T]=t.currentDate;if(!y)return"";const A=U(g,y);if(!T)return A===0?"start":"";const d=U(g,T);return t.allowSameDay&&A===0&&d===0?"start-end":A===0?"start":d===0?"end":A>0&&d<0?"middle":""},F=g=>{const{type:y,minDate:T,maxDate:A,currentDate:d}=t;if(T&&U(g,T)<0||A&&U(g,A)>0)return"disabled";if(d===null)return"";if(Array.isArray(d)){if(y==="multiple")return u(g);if(y==="range")return $(g)}else if(y==="single")return U(g,d)===0?"selected":"";return""},_=g=>{if(t.type==="range"){if(g==="start"||g==="end")return nt(g);if(g==="start-end")return`${nt("start")}/${nt("end")}`}},R=()=>{if(t.showMonthTitle)return e("div",{class:N("month-title")},[r["month-title"]?r["month-title"]({date:t.date,text:O.value}):O.value])},W=()=>{if(t.showMark&&P.value)return e("div",{class:N("month-mark")},[t.date.getMonth()+1])},j=z(()=>{const g=Math.ceil((c.value+M.value)/7);return Array(g).fill({type:"placeholder"})}),G=z(()=>{const g=[],y=t.date.getFullYear(),T=t.date.getMonth();for(let A=1;A<=c.value;A++){const d=new Date(y,T,A),i=F(d);let o={date:d,type:i,text:A,bottomInfo:_(i)};t.formatter&&(o=t.formatter(o)),g.push(o)}return g}),V=z(()=>G.value.filter(g=>g.type==="disabled")),tt=(g,y)=>{if(x.value){const T=kt(x.value),A=j.value.length,i=(Math.ceil((y.getDate()+M.value)/7)-1)*T.height/A;ue(g,T.top+i+g.scrollTop-kt(g).top)}},K=(g,y)=>e(Ge,{item:g,index:y,color:t.color,offset:M.value,rowHeight:f.value,onClick:T=>a("click",T),onClickDisabledDate:T=>a("clickDisabledDate",T)},wt(r,["top-info","bottom-info","text"])),rt=()=>e("div",{ref:x,role:"grid",class:N("days")},[W(),(P.value?G:j).value.map(K)]);return Zt({getTitle:m,getHeight:()=>C.value,setVisible:B,scrollToDate:tt,disabledDays:V}),()=>e("div",{class:N("month"),ref:b},[R(),rt()])}});const[qe]=at("calendar-header");var Ue=it({name:qe,props:{date:Date,minDate:Date,maxDate:Date,title:String,subtitle:String,showTitle:Boolean,showSubtitle:Boolean,firstDayOfWeek:Number,switchMode:X("none")},emits:["clickSubtitle","panelChange"],setup(t,{slots:a,emit:r}){const v=z(()=>t.date&&t.minDate&&lt(Nt(t.date),t.minDate)<0),B=z(()=>t.date&&t.minDate&&lt(Gt(t.date),t.minDate)<0),x=z(()=>t.date&&t.maxDate&&lt(Wt(t.date),t.maxDate)>0),b=z(()=>t.date&&t.maxDate&&lt(jt(t.date),t.maxDate)>0),C=()=>{if(t.showTitle){const m=t.title||nt("title"),u=a.title?a.title():m;return e("div",{class:N("header-title")},[u])}},O=m=>r("clickSubtitle",m),f=m=>r("panelChange",m),M=m=>{const u=t.switchMode==="year-month",$=a[m?"next-month":"prev-month"],F=a[m?"next-year":"prev-year"],_=m?x.value:v.value,R=m?b.value:B.value,W=m?"arrow":"arrow-left",j=m?"arrow-double-right":"arrow-double-left",G=()=>f((m?Wt:Nt)(t.date)),V=()=>f((m?jt:Gt)(t.date)),tt=e("view",{class:N("header-action",{disabled:_}),onClick:_?void 0:G},[$?$({disabled:_}):e(St,{class:{[Rt]:!_},name:W},null)]),K=u&&e("view",{class:N("header-action",{disabled:R}),onClick:R?void 0:V},[F?F({disabled:R}):e(St,{class:{[Rt]:!R},name:j},null)]);return m?[tt,K]:[K,tt]},c=()=>{if(t.showSubtitle){const m=a.subtitle?a.subtitle({date:t.date,text:t.subtitle}):t.subtitle,u=t.switchMode!=="none";return e("div",{class:N("header-subtitle",{"with-switch":u}),onClick:O},[u?[M(),e("div",{class:N("header-subtitle-text")},[m]),M(!0)]:m])}},P=()=>{const{firstDayOfWeek:m}=t,u=nt("weekdays"),$=[...u.slice(m,7),...u.slice(0,m)];return e("div",{class:N("weekdays")},[$.map(F=>e("span",{class:N("weekday")},[F]))])};return()=>e("div",{class:N("header")},[C(),c(),P()])}});const Ze={show:Boolean,type:X("single"),switchMode:X("none"),title:String,color:String,round:q,readonly:Boolean,poppable:q,maxRange:ht(null),position:X("bottom"),teleport:[String,Object],showMark:q,showTitle:q,formatter:Function,rowHeight:st,confirmText:String,rangePrompt:String,lazyRender:q,showConfirm:q,defaultDate:[Date,Array],allowSameDay:Boolean,showSubtitle:q,closeOnPopstate:q,showRangePrompt:q,confirmDisabledText:String,closeOnClickOverlay:q,safeAreaInsetTop:Boolean,safeAreaInsetBottom:q,minDate:{type:Date,validator:Tt},maxDate:{type:Date,validator:Tt},firstDayOfWeek:{type:st,default:0,validator:t=>t>=0&&t<=6}};var Je=it({name:pe,props:Ze,emits:["select","confirm","unselect","monthShow","overRange","update:show","clickSubtitle","clickDisabledDate","clickOverlay","panelChange"],setup(t,{emit:a,slots:r}){const v=z(()=>t.switchMode!=="none"),B=z(()=>!t.minDate&&!v.value?yt():t.minDate),x=z(()=>!t.maxDate&&!v.value?Et(yt(),6):t.maxDate),b=(n,l=B.value,D=x.value)=>l&&U(n,l)===-1?l:D&&U(n,D)===1?D:n,C=(n=t.defaultDate)=>{const{type:l,allowSameDay:D}=t;if(n===null)return n;const w=yt();if(l==="range"){Array.isArray(n)||(n=[]),n.length===1&&U(n[0],w)===1&&(n=[]);const p=B.value,H=x.value,L=b(n[0]||w,p,H?D?H:Ot(H):void 0),I=b(n[1]||(D?w:Bt(w)),p?D?p:Bt(p):void 0);return[L,I]}return l==="multiple"?Array.isArray(n)?n.map(p=>b(p)):[b(w)]:((!n||Array.isArray(n))&&(n=w),b(n))},O=()=>{const n=Array.isArray(c.value)?c.value[0]:c.value;return n||b(yt())};let f;const M=Z(),c=Z(C()),P=Z(O()),m=Z(),[u,$]=Ye(),F=z(()=>t.firstDayOfWeek?+t.firstDayOfWeek%7:0),_=z(()=>{const n=[];if(!B.value||!x.value)return n;const l=new Date(B.value);l.setDate(1);do n.push(new Date(l)),l.setMonth(l.getMonth()+1);while(lt(l,x.value)!==1);return n}),R=z(()=>{if(c.value){if(t.type==="range")return!c.value[0]||!c.value[1];if(t.type==="multiple")return!c.value.length}return!c.value}),W=()=>c.value,j=()=>{const n=he(M.value),l=n+f,D=_.value.map((I,Y)=>u.value[Y].getHeight()),w=D.reduce((I,Y)=>I+Y,0);if(l>w&&n>0)return;let p=0,H;const L=[-1,-1];for(let I=0;I<_.value.length;I++){const Y=u.value[I];p<=l&&p+D[I]>=n&&(L[1]=I,H||(H=Y,L[0]=I),u.value[I].showed||(u.value[I].showed=!0,a("monthShow",{date:Y.date,title:Y.getTitle()}))),p+=D[I]}_.value.forEach((I,Y)=>{const Q=Y>=L[0]-1&&Y<=L[1]+1;u.value[Y].setVisible(Q)}),H&&(m.value=H)},G=n=>{v.value?P.value=n:$t(()=>{_.value.some((l,D)=>lt(l,n)===0?(M.value&&u.value[D].scrollToDate(M.value,n),!0):!1),j()})},V=()=>{if(!(t.poppable&&!t.show))if(c.value){const n=t.type==="single"?c.value:c.value[0];Tt(n)&&G(n)}else v.value||$t(j)},tt=()=>{t.poppable&&!t.show||(v.value||$t(()=>{f=Math.floor(kt(M).height)}),V())},K=(n=C())=>{c.value=n,V()},rt=n=>{const{maxRange:l,rangePrompt:D,showRangePrompt:w}=t;return l&&He(n)>+l?(w&&It(D||nt("rangePrompt",l)),a("overRange"),!1):!0},g=n=>{P.value=n,a("panelChange",{date:n})},y=()=>{var n;return a("confirm",(n=c.value)!=null?n:zt(c.value))},T=(n,l)=>{const D=w=>{c.value=w,a("select",zt(w))};if(l&&t.type==="range"&&!rt(n)){D([n[0],Pt(n[0],+t.maxRange-1)]);return}D(n),l&&!t.showConfirm&&y()},A=(n,l,D)=>{var w;return(w=n.find(p=>U(l,p.date)===-1&&U(p.date,D)===-1))==null?void 0:w.date},d=z(()=>u.value.reduce((n,l)=>{var D,w;return n.push(...(w=(D=l.disabledDays)==null?void 0:D.value)!=null?w:[]),n},[])),i=n=>{if(t.readonly||!n.date)return;const{date:l}=n,{type:D}=t;if(D==="range"){if(!c.value){T([l]);return}const[w,p]=c.value;if(w&&!p){const H=U(l,w);if(H===1){const L=A(d.value,w,l);if(L){const I=Ot(L);U(w,I)===-1?T([w,I]):T([l])}else T([w,l],!0)}else H===-1?T([l]):t.allowSameDay&&T([l,l],!0)}else T([l])}else if(D==="multiple"){if(!c.value){T([l]);return}const w=c.value,p=w.findIndex(H=>U(H,l)===0);if(p!==-1){const[H]=w.splice(p,1);a("unselect",dt(H))}else t.maxRange&&w.length>=+t.maxRange?It(t.rangePrompt||nt("rangePrompt",t.maxRange)):T([...w,l])}else T(l,!0)},o=n=>a("clickOverlay",n),h=n=>a("update:show",n),s=(n,l)=>{const D=l!==0||!t.showSubtitle;return e(Ve,Kt({ref:v.value?m:$(l),date:n,currentDate:c.value,showMonthTitle:D,firstDayOfWeek:F.value,lazyRender:v.value?!1:t.lazyRender,maxDate:x.value,minDate:B.value},wt(t,["type","color","showMark","formatter","rowHeight","showSubtitle","allowSameDay"]),{onClick:i,onClickDisabledDate:w=>a("clickDisabledDate",w)}),wt(r,["top-info","bottom-info","month-title","text"]))},k=()=>{if(r.footer)return r.footer();if(t.showConfirm){const n=r["confirm-text"],l=R.value,D=l?t.confirmDisabledText:t.confirmText;return e(Pe,{round:!0,block:!0,type:"primary",color:t.color,class:N("confirm"),disabled:l,nativeType:"button",onClick:y},{default:()=>[n?n({disabled:l}):D||nt("confirm")]})}},S=()=>e("div",{class:[N("footer"),{"van-safe-area-bottom":t.safeAreaInsetBottom}]},[k()]),E=()=>{var n,l;return e("div",{class:N()},[e(Ue,{date:(n=m.value)==null?void 0:n.date,maxDate:x.value,minDate:B.value,title:t.title,subtitle:(l=m.value)==null?void 0:l.getTitle(),showTitle:t.showTitle,showSubtitle:t.showSubtitle,switchMode:t.switchMode,firstDayOfWeek:F.value,onClickSubtitle:D=>a("clickSubtitle",D),onPanelChange:g},wt(r,["title","subtitle","prev-month","prev-year","next-month","next-year"])),e("div",{ref:M,class:N("body"),onScroll:v.value?void 0:j},[v.value?s(P.value,0):_.value.map(s)]),S()])};return _t(()=>t.show,tt),_t(()=>[t.type,t.minDate,t.maxDate,t.switchMode],()=>K(C(c.value))),_t(()=>t.defaultDate,n=>{K(n)}),Zt({reset:K,scrollToDate:G,getSelectedDate:W}),de(tt),()=>t.poppable?e(fe,{show:t.show,class:N("popup"),round:t.round,position:t.position,closeable:t.showTitle||t.showSubtitle,teleport:t.teleport,closeOnPopstate:t.closeOnPopstate,safeAreaInsetTop:t.safeAreaInsetTop,closeOnClickOverlay:t.closeOnClickOverlay,onClickOverlay:o,"onUpdate:show":h},{default:E}):E()}});const Ke=gt(Je),[Qe,Dt]=at("empty"),Xe={image:X("default"),imageSize:[Number,String,Array],description:String};var tn=it({name:Qe,props:Xe,setup(t,{slots:a}){const r=()=>{const _=a.description?a.description():t.description;if(_)return e("p",{class:Dt("description")},[_])},v=()=>{if(a.default)return e("div",{class:Dt("bottom")},[a.default()])},B=Ie(),x=_=>`${B}-${_}`,b=_=>`url(#${x(_)})`,C=(_,R,W)=>e("stop",{"stop-color":_,offset:`${R}%`,"stop-opacity":W},null),O=(_,R)=>[C(_,0),C(R,100)],f=_=>[e("defs",null,[e("radialGradient",{id:x(_),cx:"50%",cy:"54%",fx:"50%",fy:"54%",r:"297%",gradientTransform:"matrix(-.16 0 0 -.33 .58 .72)","data-allow-mismatch":"attribute"},[C("#EBEDF0",0),C("#F2F3F5",100,.3)])]),e("ellipse",{fill:b(_),opacity:".8",cx:"80",cy:"140",rx:"46",ry:"8","data-allow-mismatch":"attribute"},null)],M=()=>[e("defs",null,[e("linearGradient",{id:x("a"),x1:"64%",y1:"100%",x2:"64%","data-allow-mismatch":"attribute"},[C("#FFF",0,.5),C("#F2F3F5",100)])]),e("g",{opacity:".8","data-allow-mismatch":"children"},[e("path",{d:"M36 131V53H16v20H2v58h34z",fill:b("a")},null),e("path",{d:"M123 15h22v14h9v77h-31V15z",fill:b("a")},null)])],c=()=>[e("defs",null,[e("linearGradient",{id:x("b"),x1:"64%",y1:"97%",x2:"64%",y2:"0%","data-allow-mismatch":"attribute"},[C("#F2F3F5",0,.3),C("#F2F3F5",100)])]),e("g",{opacity:".8","data-allow-mismatch":"children"},[e("path",{d:"M87 6c3 0 7 3 8 6a8 8 0 1 1-1 16H80a7 7 0 0 1-8-6c0-4 3-7 6-7 0-5 4-9 9-9Z",fill:b("b")},null),e("path",{d:"M19 23c2 0 3 1 4 3 2 0 4 2 4 4a4 4 0 0 1-4 3v1h-7v-1l-1 1c-2 0-3-2-3-4 0-1 1-3 3-3 0-2 2-4 4-4Z",fill:b("b")},null)])],P=()=>e("svg",{viewBox:"0 0 160 160"},[e("defs",{"data-allow-mismatch":"children"},[e("linearGradient",{id:x(1),x1:"64%",y1:"100%",x2:"64%"},[C("#FFF",0,.5),C("#F2F3F5",100)]),e("linearGradient",{id:x(2),x1:"50%",x2:"50%",y2:"84%"},[C("#EBEDF0",0),C("#DCDEE0",100,0)]),e("linearGradient",{id:x(3),x1:"100%",x2:"100%",y2:"100%"},[O("#EAEDF0","#DCDEE0")]),e("radialGradient",{id:x(4),cx:"50%",cy:"0%",fx:"50%",fy:"0%",r:"100%",gradientTransform:"matrix(0 1 -.54 0 .5 -.5)"},[C("#EBEDF0",0),C("#FFF",100,0)])]),e("g",{fill:"none"},[M(),e("path",{fill:b(4),d:"M0 139h160v21H0z","data-allow-mismatch":"attribute"},null),e("path",{d:"M80 54a7 7 0 0 1 3 13v27l-2 2h-2a2 2 0 0 1-2-2V67a7 7 0 0 1 3-13z",fill:b(2),"data-allow-mismatch":"attribute"},null),e("g",{opacity:".6","stroke-linecap":"round","stroke-width":"7","data-allow-mismatch":"children"},[e("path",{d:"M64 47a19 19 0 0 0-5 13c0 5 2 10 5 13",stroke:b(3)},null),e("path",{d:"M53 36a34 34 0 0 0 0 48",stroke:b(3)},null),e("path",{d:"M95 73a19 19 0 0 0 6-13c0-5-2-9-6-13",stroke:b(3)},null),e("path",{d:"M106 84a34 34 0 0 0 0-48",stroke:b(3)},null)]),e("g",{transform:"translate(31 105)"},[e("rect",{fill:"#EBEDF0",width:"98",height:"34",rx:"2"},null),e("rect",{fill:"#FFF",x:"9",y:"8",width:"80",height:"18",rx:"1.1"},null),e("rect",{fill:"#EBEDF0",x:"15",y:"12",width:"18",height:"6",rx:"1.1"},null)])])]),m=()=>e("svg",{viewBox:"0 0 160 160"},[e("defs",{"data-allow-mismatch":"children"},[e("linearGradient",{x1:"50%",x2:"50%",y2:"100%",id:x(5)},[O("#F2F3F5","#DCDEE0")]),e("linearGradient",{x1:"95%",y1:"48%",x2:"5.5%",y2:"51%",id:x(6)},[O("#EAEDF1","#DCDEE0")]),e("linearGradient",{y1:"45%",x2:"100%",y2:"54%",id:x(7)},[O("#EAEDF1","#DCDEE0")])]),M(),c(),e("g",{transform:"translate(36 50)",fill:"none"},[e("g",{transform:"translate(8)"},[e("rect",{fill:"#EBEDF0",opacity:".6",x:"38",y:"13",width:"36",height:"53",rx:"2"},null),e("rect",{fill:b(5),width:"64",height:"66",rx:"2","data-allow-mismatch":"attribute"},null),e("rect",{fill:"#FFF",x:"6",y:"6",width:"52",height:"55",rx:"1"},null),e("g",{transform:"translate(15 17)",fill:b(6),"data-allow-mismatch":"attribute"},[e("rect",{width:"34",height:"6",rx:"1"},null),e("path",{d:"M0 14h34v6H0z"},null),e("rect",{y:"28",width:"34",height:"6",rx:"1"},null)])]),e("rect",{fill:b(7),y:"61",width:"88",height:"28",rx:"1","data-allow-mismatch":"attribute"},null),e("rect",{fill:"#F7F8FA",x:"29",y:"72",width:"30",height:"6",rx:"1"},null)])]),u=()=>e("svg",{viewBox:"0 0 160 160"},[e("defs",null,[e("linearGradient",{x1:"50%",x2:"50%",y2:"100%",id:x(8),"data-allow-mismatch":"attribute"},[O("#EAEDF1","#DCDEE0")])]),M(),c(),f("c"),e("path",{d:"m59 60 21 21 21-21h3l9 9v3L92 93l21 21v3l-9 9h-3l-21-21-21 21h-3l-9-9v-3l21-21-21-21v-3l9-9h3Z",fill:b(8),"data-allow-mismatch":"attribute"},null)]),$=()=>e("svg",{viewBox:"0 0 160 160"},[e("defs",{"data-allow-mismatch":"children"},[e("linearGradient",{x1:"50%",y1:"100%",x2:"50%",id:x(9)},[O("#EEE","#D8D8D8")]),e("linearGradient",{x1:"100%",y1:"50%",y2:"50%",id:x(10)},[O("#F2F3F5","#DCDEE0")]),e("linearGradient",{x1:"50%",x2:"50%",y2:"100%",id:x(11)},[O("#F2F3F5","#DCDEE0")]),e("linearGradient",{x1:"50%",x2:"50%",y2:"100%",id:x(12)},[O("#FFF","#F7F8FA")])]),M(),c(),f("d"),e("g",{transform:"rotate(-45 113 -4)",fill:"none","data-allow-mismatch":"children"},[e("rect",{fill:b(9),x:"24",y:"52.8",width:"5.8",height:"19",rx:"1"},null),e("rect",{fill:b(10),x:"22.1",y:"67.3",width:"9.9",height:"28",rx:"1"},null),e("circle",{stroke:b(11),"stroke-width":"8",cx:"27",cy:"27",r:"27"},null),e("circle",{fill:b(12),cx:"27",cy:"27",r:"16"},null),e("path",{d:"M37 7c-8 0-15 5-16 12",stroke:b(11),"stroke-width":"3",opacity:".5","stroke-linecap":"round",transform:"rotate(45 29 13)"},null)])]),F=()=>{var _;if(a.image)return a.image();const R={error:u,search:$,network:P,default:m};return((_=R[t.image])==null?void 0:_.call(R))||e("img",{src:t.image},null)};return()=>e("div",{class:Dt()},[e("div",{class:Dt("image"),style:me(t.imageSize)},[F()]),r(),v()])}});const en=gt(tn),[te,nn]=at("grid"),an={square:Boolean,center:q,border:q,gutter:st,reverse:Boolean,iconSize:st,direction:String,clickable:Boolean,columnNum:ht(4)},ee=Symbol(te);var rn=it({name:te,props:an,setup(t,{slots:a}){const{linkChildren:r}=ge(ee);return r({props:t}),()=>{var v;return e("div",{style:{paddingLeft:Mt(t.gutter)},class:[nn(),{[ve]:t.border&&!t.gutter}]},[(v=a.default)==null?void 0:v.call(a)])}}});const on=gt(rn),[ln,bt]=at("grid-item"),sn=mt({},qt,{dot:Boolean,text:String,icon:String,badge:st,iconColor:String,iconPrefix:String,badgeProps:Object});var cn=it({name:ln,props:sn,setup(t,{slots:a}){const{parent:r,index:v}=ye(ee),B=Vt();if(!r)return;const x=z(()=>{const{square:M,gutter:c,columnNum:P}=r.props,m=`${100/+P}%`,u={flexBasis:m};if(M)u.paddingTop=m;else if(c){const $=Mt(c);u.paddingRight=$,v.value>=+P&&(u.marginTop=$)}return u}),b=z(()=>{const{square:M,gutter:c}=r.props;if(M&&c){const P=Mt(c);return{right:P,bottom:P,height:"auto"}}}),C=()=>{if(a.icon)return e(be,Kt({dot:t.dot,content:t.badge},t.badgeProps),{default:a.icon});if(t.icon)return e(St,{dot:t.dot,name:t.icon,size:r.props.iconSize,badge:t.badge,class:bt("icon"),color:t.iconColor,badgeProps:t.badgeProps,classPrefix:t.iconPrefix},null)},O=()=>{if(a.text)return a.text();if(t.text)return e("span",{class:bt("text")},[t.text])},f=()=>a.default?a.default():[C(),O()];return()=>{const{center:M,border:c,square:P,gutter:m,reverse:u,direction:$,clickable:F}=r.props,_=[bt("content",[$,{center:M,square:P,reverse:u,clickable:F,surround:c&&m}]),{[De]:c}];return e("div",{class:[bt({square:P})],style:x.value},[e("div",{role:F?"button":void 0,class:_,style:b.value,tabindex:F?0:void 0,onClick:B},[f()])])}}});const un=gt(cn),dn=(t,a)=>we("/yuthon/app/att",{selected_month:t,user_id:a});function fn(t){return t&&t.__esModule&&Object.prototype.hasOwnProperty.call(t,"default")?t.default:t}var xt={exports:{}},hn=xt.exports,Lt;function mn(){return Lt||(Lt=1,(function(t,a){(function(r,v){t.exports=v()})(hn,(function(){var r=1e3,v=6e4,B=36e5,x="millisecond",b="second",C="minute",O="hour",f="day",M="week",c="month",P="quarter",m="year",u="date",$="Invalid Date",F=/^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/,_=/\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g,R={name:"en",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),ordinal:function(d){var i=["th","st","nd","rd"],o=d%100;return"["+d+(i[(o-20)%10]||i[o]||i[0])+"]"}},W=function(d,i,o){var h=String(d);return!h||h.length>=i?d:""+Array(i+1-h.length).join(o)+d},j={s:W,z:function(d){var i=-d.utcOffset(),o=Math.abs(i),h=Math.floor(o/60),s=o%60;return(i<=0?"+":"-")+W(h,2,"0")+":"+W(s,2,"0")},m:function d(i,o){if(i.date()<o.date())return-d(o,i);var h=12*(o.year()-i.year())+(o.month()-i.month()),s=i.clone().add(h,c),k=o-s<0,S=i.clone().add(h+(k?-1:1),c);return+(-(h+(o-s)/(k?s-S:S-s))||0)},a:function(d){return d<0?Math.ceil(d)||0:Math.floor(d)},p:function(d){return{M:c,y:m,w:M,d:f,D:u,h:O,m:C,s:b,ms:x,Q:P}[d]||String(d||"").toLowerCase().replace(/s$/,"")},u:function(d){return d===void 0}},G="en",V={};V[G]=R;var tt="$isDayjsObject",K=function(d){return d instanceof T||!(!d||!d[tt])},rt=function d(i,o,h){var s;if(!i)return G;if(typeof i=="string"){var k=i.toLowerCase();V[k]&&(s=k),o&&(V[k]=o,s=k);var S=i.split("-");if(!s&&S.length>1)return d(S[0])}else{var E=i.name;V[E]=i,s=E}return!h&&s&&(G=s),s||!h&&G},g=function(d,i){if(K(d))return d.clone();var o=typeof i=="object"?i:{};return o.date=d,o.args=arguments,new T(o)},y=j;y.l=rt,y.i=K,y.w=function(d,i){return g(d,{locale:i.$L,utc:i.$u,x:i.$x,$offset:i.$offset})};var T=(function(){function d(o){this.$L=rt(o.locale,null,!0),this.parse(o),this.$x=this.$x||o.x||{},this[tt]=!0}var i=d.prototype;return i.parse=function(o){this.$d=(function(h){var s=h.date,k=h.utc;if(s===null)return new Date(NaN);if(y.u(s))return new Date;if(s instanceof Date)return new Date(s);if(typeof s=="string"&&!/Z$/i.test(s)){var S=s.match(F);if(S){var E=S[2]-1||0,n=(S[7]||"0").substring(0,3);return k?new Date(Date.UTC(S[1],E,S[3]||1,S[4]||0,S[5]||0,S[6]||0,n)):new Date(S[1],E,S[3]||1,S[4]||0,S[5]||0,S[6]||0,n)}}return new Date(s)})(o),this.init()},i.init=function(){var o=this.$d;this.$y=o.getFullYear(),this.$M=o.getMonth(),this.$D=o.getDate(),this.$W=o.getDay(),this.$H=o.getHours(),this.$m=o.getMinutes(),this.$s=o.getSeconds(),this.$ms=o.getMilliseconds()},i.$utils=function(){return y},i.isValid=function(){return this.$d.toString()!==$},i.isSame=function(o,h){var s=g(o);return this.startOf(h)<=s&&s<=this.endOf(h)},i.isAfter=function(o,h){return g(o)<this.startOf(h)},i.isBefore=function(o,h){return this.endOf(h)<g(o)},i.$g=function(o,h,s){return y.u(o)?this[h]:this.set(s,o)},i.unix=function(){return Math.floor(this.valueOf()/1e3)},i.valueOf=function(){return this.$d.getTime()},i.startOf=function(o,h){var s=this,k=!!y.u(h)||h,S=y.p(o),E=function(I,Y){var Q=y.w(s.$u?Date.UTC(s.$y,Y,I):new Date(s.$y,Y,I),s);return k?Q:Q.endOf(f)},n=function(I,Y){return y.w(s.toDate()[I].apply(s.toDate("s"),(k?[0,0,0,0]:[23,59,59,999]).slice(Y)),s)},l=this.$W,D=this.$M,w=this.$D,p="set"+(this.$u?"UTC":"");switch(S){case m:return k?E(1,0):E(31,11);case c:return k?E(1,D):E(0,D+1);case M:var H=this.$locale().weekStart||0,L=(l<H?l+7:l)-H;return E(k?w-L:w+(6-L),D);case f:case u:return n(p+"Hours",0);case O:return n(p+"Minutes",1);case C:return n(p+"Seconds",2);case b:return n(p+"Milliseconds",3);default:return this.clone()}},i.endOf=function(o){return this.startOf(o,!1)},i.$set=function(o,h){var s,k=y.p(o),S="set"+(this.$u?"UTC":""),E=(s={},s[f]=S+"Date",s[u]=S+"Date",s[c]=S+"Month",s[m]=S+"FullYear",s[O]=S+"Hours",s[C]=S+"Minutes",s[b]=S+"Seconds",s[x]=S+"Milliseconds",s)[k],n=k===f?this.$D+(h-this.$W):h;if(k===c||k===m){var l=this.clone().set(u,1);l.$d[E](n),l.init(),this.$d=l.set(u,Math.min(this.$D,l.daysInMonth())).$d}else E&&this.$d[E](n);return this.init(),this},i.set=function(o,h){return this.clone().$set(o,h)},i.get=function(o){return this[y.p(o)]()},i.add=function(o,h){var s,k=this;o=Number(o);var S=y.p(h),E=function(D){var w=g(k);return y.w(w.date(w.date()+Math.round(D*o)),k)};if(S===c)return this.set(c,this.$M+o);if(S===m)return this.set(m,this.$y+o);if(S===f)return E(1);if(S===M)return E(7);var n=(s={},s[C]=v,s[O]=B,s[b]=r,s)[S]||1,l=this.$d.getTime()+o*n;return y.w(l,this)},i.subtract=function(o,h){return this.add(-1*o,h)},i.format=function(o){var h=this,s=this.$locale();if(!this.isValid())return s.invalidDate||$;var k=o||"YYYY-MM-DDTHH:mm:ssZ",S=y.z(this),E=this.$H,n=this.$m,l=this.$M,D=s.weekdays,w=s.months,p=s.meridiem,H=function(Y,Q,ft,vt){return Y&&(Y[Q]||Y(h,k))||ft[Q].slice(0,vt)},L=function(Y){return y.s(E%12||12,Y,"0")},I=p||function(Y,Q,ft){var vt=Y<12?"AM":"PM";return ft?vt.toLowerCase():vt};return k.replace(_,(function(Y,Q){return Q||(function(ft){switch(ft){case"YY":return String(h.$y).slice(-2);case"YYYY":return y.s(h.$y,4,"0");case"M":return l+1;case"MM":return y.s(l+1,2,"0");case"MMM":return H(s.monthsShort,l,w,3);case"MMMM":return H(w,l);case"D":return h.$D;case"DD":return y.s(h.$D,2,"0");case"d":return String(h.$W);case"dd":return H(s.weekdaysMin,h.$W,D,2);case"ddd":return H(s.weekdaysShort,h.$W,D,3);case"dddd":return D[h.$W];case"H":return String(E);case"HH":return y.s(E,2,"0");case"h":return L(1);case"hh":return L(2);case"a":return I(E,n,!0);case"A":return I(E,n,!1);case"m":return String(n);case"mm":return y.s(n,2,"0");case"s":return String(h.$s);case"ss":return y.s(h.$s,2,"0");case"SSS":return y.s(h.$ms,3,"0");case"Z":return S}return null})(Y)||S.replace(":","")}))},i.utcOffset=function(){return 15*-Math.round(this.$d.getTimezoneOffset()/15)},i.diff=function(o,h,s){var k,S=this,E=y.p(h),n=g(o),l=(n.utcOffset()-this.utcOffset())*v,D=this-n,w=function(){return y.m(S,n)};switch(E){case m:k=w()/12;break;case c:k=w();break;case P:k=w()/3;break;case M:k=(D-l)/6048e5;break;case f:k=(D-l)/864e5;break;case O:k=D/B;break;case C:k=D/v;break;case b:k=D/r;break;default:k=D}return s?k:y.a(k)},i.daysInMonth=function(){return this.endOf(c).$D},i.$locale=function(){return V[this.$L]},i.locale=function(o,h){if(!o)return this.$L;var s=this.clone(),k=rt(o,h,!0);return k&&(s.$L=k),s},i.clone=function(){return y.w(this.$d,this)},i.toDate=function(){return new Date(this.valueOf())},i.toJSON=function(){return this.isValid()?this.toISOString():null},i.toISOString=function(){return this.$d.toISOString()},i.toString=function(){return this.$d.toUTCString()},d})(),A=T.prototype;return g.prototype=A,[["$ms",x],["$s",b],["$m",C],["$H",O],["$W",f],["$M",c],["$y",m],["$D",u]].forEach((function(d){A[d[1]]=function(i){return this.$g(i,d[0],d[1])}})),g.extend=function(d,i){return d.$i||(d(i,T,g),d.$i=!0),g},g.locale=rt,g.isDayjs=K,g.unix=function(d){return g(1e3*d)},g.en=V[G],g.Ls=V,g.p={},g}))})(xt)),xt.exports}var gn=mn();const et=fn(gn),vn={class:"clock-in-page"},yn={class:"stat red"},Dn={class:"stat red"},bn={class:"stat red"},wn={class:"stat red"},_n={class:"stat green"},xn={class:"stat green"},kn={class:"calendar-card"},Sn={__name:"ClockInStatistics",setup(t){const a=pt({is_late_card:0,is_early_card:0,is_no_card:0,is_no_work:0,is_holiday:0,is_abnormal:0}),r=pt({state:"",group:"",check_in:"",check_out:""}),v=Z(et().year()),B=Z(et().month()+1),x=et().subtract(1,"year").toDate(),b=et().add(1,"year").endOf("year").toDate();Z(1);const C=Z([]),O=Z([]),f=Z(1),M=async(u,$)=>{const F=et(`${u}-${$}`).format("YYYY-MM");console.log("请求月份数据",F);let _=await dn(F,f.value);Object.assign(a,_.data.current_month.banner_rote||{}),C.value=(_.data.current_month.holiday_data?.holiday_list||[]).map(R=>et(R).format("YYYY/MM/DD")),O.value=(_.data.current_month.attendance_data||[]).map(R=>({...R,date:et(R.date).format("YYYY/MM/DD")}))},c=u=>{const $=et(u.date).format("YYYY/MM/DD"),F=O.value.find(_=>_.date===$);return F&&(F.color_select===1?(u.bottomInfo="✔",u.className="att-green"):F.color_select===2?(u.bottomInfo="✘",u.className="att-red"):F.color_select===3&&(u.bottomInfo="休",u.className="att-gray")),C.value.includes($)&&(u.topInfo="休",u.className="att-blue"),u},P=u=>{console.log(u),M(u.date.getFullYear(),u.date.getMonth()+1)},m=u=>{const $=et(u).format("YYYY/MM/DD"),F=O.value.find(_=>_.date===$);F?(r.state="true",r.group=F.class.join(""),r.check_in=F.check_in,r.check_out=F.check_out):r.state=""};return Jt(async()=>{const u=$e(),$=parseInt(u.query.user_id);f.value=$,M(v.value,B.value)}),(u,$)=>{const F=un,_=on,R=Ke,W=xe,j=_e,G=en;return Ft(),Fe("div",vn,[e(_,{"column-num":4,border:!1,class:"stats-grid"},{default:ot(()=>[e(F,null,{default:ot(()=>[J("div",yn,ct(a.is_late_card),1),$[0]||($[0]=J("div",null,"迟到",-1))]),_:1,__:[0]}),e(F,null,{default:ot(()=>[J("div",Dn,ct(a.is_early_card),1),$[1]||($[1]=J("div",null,"早退",-1))]),_:1,__:[1]}),e(F,null,{default:ot(()=>[J("div",bn,ct(a.is_no_card),1),$[2]||($[2]=J("div",null,"缺卡",-1))]),_:1,__:[2]}),e(F,null,{default:ot(()=>[J("div",wn,ct(a.is_no_work),1),$[3]||($[3]=J("div",null,"旷工",-1))]),_:1,__:[3]}),e(F,null,{default:ot(()=>[J("div",_n,ct(a.is_holiday),1),$[4]||($[4]=J("div",null,"请假",-1))]),_:1,__:[4]}),e(F,null,{default:ot(()=>[J("div",xn,ct(a.is_abnormal),1),$[5]||($[5]=J("div",null,"异常",-1))]),_:1,__:[5]})]),_:1}),J("div",kn,[e(R,{"switch-mode":"year-month",poppable:!1,"show-confirm":!1,"min-date":Ht(x),"max-date":Ht(b),formatter:c,onSelect:m,onPanelChange:P},null,8,["min-date","max-date"])]),r.state==="true"?(Ft(),At(j,{key:0,inset:""},{default:ot(()=>[e(W,{title:"班组",value:r.group},null,8,["value"]),e(W,{title:"签到时间",value:r.check_in},null,8,["value"]),e(W,{title:"签离时间",value:r.check_out},null,8,["value"])]),_:1})):(Ft(),At(G,{key:1,description:"暂无打卡记录",image:"search"}))])}}},Cn=Me(Sn,[["__scopeId","data-v-d93721b0"]]);export{Cn as default};
diff --git a/yuthon_base/static/webh5/assets/HomeView-B12pd-6u.js b/yuthon_base/static/webh5/assets/HomeView-B12pd-6u.js
new file mode 100644
index 000000000..77d70037f
--- /dev/null
+++ b/yuthon_base/static/webh5/assets/HomeView-B12pd-6u.js
@@ -0,0 +1 @@
+import{_ as e}from"./index-CimcMLIq.js";const r={};function c(n,t){return null}const o=e(r,[["render",c]]);export{o as default};
diff --git a/yuthon_base/static/webh5/assets/Journey-i8wtFFe-.js b/yuthon_base/static/webh5/assets/Journey-i8wtFFe-.js
new file mode 100644
index 000000000..a03e55a53
--- /dev/null
+++ b/yuthon_base/static/webh5/assets/Journey-i8wtFFe-.js
@@ -0,0 +1 @@
+import{B as _,E as i,C as d,D as v}from"./requests-DdoUQiv8.js";import{_ as p,r as h,o as m,u as y,h as f,i as l,g as a,t,k,l as g}from"./index-CimcMLIq.js";const w=r=>_("/yuthon/yuthon/will/task",{id:r}),x={class:"container"},B={class:"meeting-header"},C={class:"title"},q={class:"time"},D={class:"location"},E={__name:"Journey",setup(r){const u=y(),e=h({});return m(async()=>{try{const s=parseInt(u.query.id),n=await w(s);e.value=n.data}catch(s){i("获取任务详情失败"),console.error(s)}}),(s,n)=>{const o=v,c=d;return g(),f("div",x,[l("div",B,[l("div",C,t(e.value.name),1),l("div",q,t(e.value.start_date)+" "+t(e.value.start_date_week)+" "+t(e.value.request_hour_from)+" - "+t(e.value.request_hour_to),1),l("div",D,"地址: "+t(e.value.address),1)]),a(c,null,{default:k(()=>[a(o,{title:"组织人",value:e.value.user_id},null,8,["value"]),a(o,{title:"参与人",value:"共"+(e.value.employee_ids?.length||0)+"人"},null,8,["value"]),a(o,{title:"描述",value:e.value.remarks},null,8,["value"]),a(o,{title:"任务编号",value:e.value.code},null,8,["value"])]),_:1})])}}},N=p(E,[["__scopeId","data-v-0aa7162a"]]);export{N as default};
diff --git a/yuthon_base/static/webh5/assets/Notice-DeLRV3hn.js b/yuthon_base/static/webh5/assets/Notice-DeLRV3hn.js
new file mode 100644
index 000000000..34b82c4df
--- /dev/null
+++ b/yuthon_base/static/webh5/assets/Notice-DeLRV3hn.js
@@ -0,0 +1 @@
+import{t as z,m as L,n as ie,c as ne,u as Ce,a as Re,b as se,w as Se,d as Pe,e as ze,o as $e,f as Ie,g as J,i as ge,p as oe,h as E,j as fe,k as Ye,l as Q,r as Me,L as Xe,q as Te,s as Ee,v as he,x as we,y as Be,z as De,P as ke,H as Ae,I as He,A as Ze,B as We,C as Le,D as Ne,E as _e}from"./requests-DdoUQiv8.js";/* empty css              */import{d as le,r as Y,a as ce,c as P,w as $,o as re,b as je,e as Fe,f as Ue,g as S,n as me,m as Ve,_ as qe,u as Ge,h as ve,i as X,j as Ke,t as ee,k as ye,l as te,F as Je,p as Qe,q as et}from"./index-CimcMLIq.js";import{I as tt}from"./index-BJ3ARmPk.js";const[pe,ae]=ne("swipe"),at={loop:z,width:ie,height:ie,vertical:Boolean,autoplay:L(0),duration:L(500),touchable:z,lazyRender:Boolean,initialSwipe:L(0),indicatorColor:String,showIndicators:z,stopPropagation:z},Oe=Symbol(pe);var ot=le({name:pe,props:at,emits:["change","dragStart","dragEnd"],setup(e,{emit:g,slots:b}){const t=Y(),h=Y(),a=ce({rect:null,width:0,height:0,offset:0,active:0,swiping:!1});let s=!1;const u=Ce(),{children:f,linkChildren:v}=Re(Oe),n=P(()=>f.length),c=P(()=>a[e.vertical?"height":"width"]),d=P(()=>e.vertical?u.deltaY.value:u.deltaX.value),_=P(()=>a.rect?(e.vertical?a.rect.height:a.rect.width)-c.value*n.value:0),R=P(()=>c.value?Math.ceil(Math.abs(_.value)/c.value):n.value),Z=P(()=>n.value*c.value),I=P(()=>(a.active+n.value)%n.value),B=P(()=>{const o=e.vertical?"vertical":"horizontal";return u.direction.value===o}),D=P(()=>{const o={transitionDuration:`${a.swiping?0:e.duration}ms`,transform:`translate${e.vertical?"Y":"X"}(${+a.offset.toFixed(2)}px)`};if(c.value){const w=e.vertical?"height":"width",y=e.vertical?"width":"height";o[w]=`${Z.value}px`,o[y]=e[y]?`${e[y]}px`:""}return o}),m=o=>{const{active:w}=a;return o?e.loop?E(w+o,-1,n.value):E(w+o,0,R.value):w},p=(o,w=0)=>{let y=o*c.value;e.loop||(y=Math.min(y,-_.value));let O=w-y;return e.loop||(O=E(O,_.value,0)),O},x=({pace:o=0,offset:w=0,emitChange:y})=>{if(n.value<=1)return;const{active:O}=a,k=m(o),V=p(k,w);if(e.loop){if(f[0]&&V!==_.value){const ue=V<_.value;f[0].setOffset(ue?Z.value:0)}if(f[n.value-1]&&V!==0){const ue=V>0;f[n.value-1].setOffset(ue?-Z.value:0)}}a.active=k,a.offset=V,y&&k!==O&&g("change",I.value)},M=()=>{a.swiping=!0,a.active<=-1?x({pace:n.value}):a.active>=n.value&&x({pace:-n.value})},q=()=>{M(),u.reset(),J(()=>{a.swiping=!1,x({pace:-1,emitChange:!0})})},N=()=>{M(),u.reset(),J(()=>{a.swiping=!1,x({pace:1,emitChange:!0})})};let G;const W=()=>clearTimeout(G),A=()=>{W(),+e.autoplay>0&&n.value>1&&(G=setTimeout(()=>{N(),A()},+e.autoplay))},H=(o=+e.initialSwipe)=>{if(!t.value)return;const w=()=>{var y,O;if(!ge(t)){const k={width:t.value.offsetWidth,height:t.value.offsetHeight};a.rect=k,a.width=+((y=e.width)!=null?y:k.width),a.height=+((O=e.height)!=null?O:k.height)}n.value&&(o=Math.min(n.value-1,o),o===-1&&(o=n.value-1)),a.active=o,a.swiping=!0,a.offset=p(o),f.forEach(k=>{k.setOffset(0)}),A()};ge(t)?me().then(w):w()},F=()=>H(a.active);let U;const K=o=>{!e.touchable||o.touches.length>1||(u.start(o),s=!1,U=Date.now(),W(),M())},i=o=>{e.touchable&&a.swiping&&(u.move(o),B.value&&(!e.loop&&(a.active===0&&d.value>0||a.active===n.value-1&&d.value<0)||(oe(o,e.stopPropagation),x({offset:d.value}),s||(g("dragStart",{index:I.value}),s=!0))))},l=()=>{if(!e.touchable||!a.swiping)return;const o=Date.now()-U,w=d.value/o;if((Math.abs(w)>.25||Math.abs(d.value)>c.value/2)&&B.value){const O=e.vertical?u.offsetY.value:u.offsetX.value;let k=0;e.loop?k=O>0?d.value>0?-1:1:0:k=-Math[d.value>0?"ceil":"floor"](d.value/c.value),x({pace:k,emitChange:!0})}else d.value&&x({pace:0});s=!1,a.swiping=!1,g("dragEnd",{index:I.value}),A()},r=(o,w={})=>{M(),u.reset(),J(()=>{let y;e.loop&&o===n.value?y=a.active===0?0:o:y=o%n.value,w.immediate?J(()=>{a.swiping=!1}):a.swiping=!1,x({pace:y-a.active,emitChange:!0})})},C=(o,w)=>{const y=w===I.value,O=y?{backgroundColor:e.indicatorColor}:void 0;return S("i",{style:O,class:ae("indicator",{active:y})},null)},T=()=>{if(b.indicator)return b.indicator({active:I.value,total:n.value});if(e.showIndicators&&n.value>1)return S("div",{class:ae("indicators",{vertical:e.vertical})},[Array(n.value).fill("").map(C)])};return se({prev:q,next:N,state:a,resize:F,swipeTo:r}),v({size:c,props:e,count:n,activeIndicator:I}),$(()=>e.initialSwipe,o=>H(+o)),$(n,()=>H(a.active)),$(()=>e.autoplay,A),$([Se,Pe,()=>e.width,()=>e.height],F),$(ze(),o=>{o==="visible"?A():W()}),re(H),je(()=>H(a.active)),$e(()=>H(a.active)),Fe(W),Ue(W),Ie("touchmove",i,{target:h}),()=>{var o;return S("div",{ref:t,class:ae()},[S("div",{ref:h,style:D.value,class:ae("track",{vertical:e.vertical}),onTouchstartPassive:K,onTouchend:l,onTouchcancel:l},[(o=b.default)==null?void 0:o.call(b)]),T()])}}});const it=fe(ot),[nt,st]=ne("swipe-item");var lt=le({name:nt,setup(e,{slots:g}){let b;const t=ce({offset:0,inited:!1,mounted:!1}),{parent:h,index:a}=Ye(Oe);if(!h)return;const s=P(()=>{const v={},{vertical:n}=h.props;return h.size.value&&(v[n?"height":"width"]=`${h.size.value}px`),t.offset&&(v.transform=`translate${n?"Y":"X"}(${t.offset}px)`),v}),u=P(()=>{const{loop:v,lazyRender:n}=h.props;if(!n||b)return!0;if(!t.mounted)return!1;const c=h.activeIndicator.value,d=h.count.value-1,_=c===0&&v?d:c-1,R=c===d&&v?0:c+1;return b=a.value===c||a.value===_||a.value===R,b}),f=v=>{t.offset=v};return re(()=>{me(()=>{t.mounted=!0})}),se({setOffset:f}),()=>{var v;return S("div",{class:st(),style:s.value},[u.value?(v=g.default)==null?void 0:v.call(g):null])}}});const ct=fe(lt),be=e=>Math.sqrt((e[0].clientX-e[1].clientX)**2+(e[0].clientY-e[1].clientY)**2),rt=e=>({x:(e[0].clientX+e[1].clientX)/2,y:(e[0].clientY+e[1].clientY)/2}),de=ne("image-preview")[1],xe=2.6,ut={src:String,show:Boolean,active:Number,minZoom:Q(ie),maxZoom:Q(ie),rootWidth:Q(Number),rootHeight:Q(Number),disableZoom:Boolean,doubleScale:Boolean,closeOnClickImage:Boolean,closeOnClickOverlay:Boolean,vertical:Boolean};var vt=le({props:ut,emits:["scale","close","longPress"],setup(e,{emit:g,slots:b}){const t=ce({scale:1,moveX:0,moveY:0,moving:!1,zooming:!1,initializing:!1,imageRatio:0}),h=Ce(),a=Y(),s=Y(),u=Y(!1),f=Y(!1);let v=0;const n=P(()=>{const{scale:i,moveX:l,moveY:r,moving:C,zooming:T,initializing:o}=t,w={transitionDuration:T||C||o?"0s":".3s"};return(i!==1||f.value)&&(w.transform=`matrix(${i}, 0, 0, ${i}, ${l}, ${r})`),w}),c=P(()=>{if(t.imageRatio){const{rootWidth:i,rootHeight:l}=e,r=u.value?l/t.imageRatio:i;return Math.max(0,(t.scale*r-i)/2)}return 0}),d=P(()=>{if(t.imageRatio){const{rootWidth:i,rootHeight:l}=e,r=u.value?l:i*t.imageRatio;return Math.max(0,(t.scale*r-l)/2)}return 0}),_=(i,l)=>{var r;if(i=E(i,+e.minZoom,+e.maxZoom+1),i!==t.scale){const C=i/t.scale;if(t.scale=i,l){const T=Te((r=a.value)==null?void 0:r.$el),o={x:T.width*.5,y:T.height*.5},w=t.moveX-(l.x-T.left-o.x)*(C-1),y=t.moveY-(l.y-T.top-o.y)*(C-1);t.moveX=E(w,-c.value,c.value),t.moveY=E(y,-d.value,d.value)}else t.moveX=0,t.moveY=f.value?v:0;g("scale",{scale:i,index:e.active})}},R=()=>{_(1)},Z=()=>{const i=t.scale>1?1:2;_(i,i===2||f.value?{x:h.startX.value,y:h.startY.value}:void 0)};let I,B,D,m,p,x,M,q,N=!1;const G=i=>{const{touches:l}=i;if(I=l.length,I===2&&e.disableZoom)return;const{offsetX:r}=h;h.start(i),B=t.moveX,D=t.moveY,q=Date.now(),N=!1,t.moving=I===1&&(t.scale!==1||f.value),t.zooming=I===2&&!r.value,t.zooming&&(m=t.scale,p=be(l))},W=i=>{const{touches:l}=i;if(h.move(i),t.moving){const{deltaX:r,deltaY:C}=h,T=r.value+B,o=C.value+D;if((e.vertical?h.isVertical()&&Math.abs(o)>d.value:h.isHorizontal()&&Math.abs(T)>c.value)&&!N){t.moving=!1;return}N=!0,oe(i,!0),t.moveX=E(T,-c.value,c.value),t.moveY=E(o,-d.value,d.value)}if(t.zooming&&(oe(i,!0),l.length===2)){const r=be(l),C=m*r/p;x=rt(l),_(C,x)}},A=i=>{var l;const r=(l=s.value)==null?void 0:l.$el;if(!r)return;const C=r.firstElementChild,T=i.target===r,o=C?.contains(i.target);!e.closeOnClickImage&&o||!e.closeOnClickOverlay&&T||g("close")},H=i=>{if(I>1)return;const l=Date.now()-q,r=250;h.isTap.value&&(l<r?e.doubleScale?M?(clearTimeout(M),M=null,Z()):M=setTimeout(()=>{A(i),M=null},r):A(i):l>Ee&&g("longPress"))},F=i=>{let l=!1;if((t.moving||t.zooming)&&(l=!0,t.moving&&B===t.moveX&&D===t.moveY&&(l=!1),!i.touches.length)){t.zooming&&(t.moveX=E(t.moveX,-c.value,c.value),t.moveY=E(t.moveY,-d.value,d.value),t.zooming=!1),t.moving=!1,B=0,D=0,m=1,t.scale<1&&R();const r=+e.maxZoom;t.scale>r&&_(r,x)}oe(i,l),H(i),h.reset()},U=()=>{const{rootWidth:i,rootHeight:l}=e,r=l/i,{imageRatio:C}=t;u.value=t.imageRatio>r&&C<xe,f.value=t.imageRatio>r&&C>=xe,f.value&&(v=(C*i-l)/2,t.moveY=v,t.initializing=!0,Me(()=>{t.initializing=!1})),R()},K=i=>{const{naturalWidth:l,naturalHeight:r}=i.target;t.imageRatio=r/l,U()};return $(()=>e.active,R),$(()=>e.show,i=>{i||R()}),$(()=>[e.rootWidth,e.rootHeight],U),Ie("touchmove",W,{target:P(()=>{var i;return(i=s.value)==null?void 0:i.$el})}),se({resetScale:R}),()=>{const i={loading:()=>S(Xe,{type:"spinner"},null)};return S(ct,{ref:s,class:de("swipe-item"),onTouchstartPassive:G,onTouchend:F,onTouchcancel:F},{default:()=>[b.image?S("div",{class:de("image-wrap")},[b.image({src:e.src,onLoad:K,style:n.value})]):S(tt,{ref:a,src:e.src,fit:"contain",class:de("image",{vertical:u.value}),style:n.value,onLoad:K},i)]})}}});const[dt,j]=ne("image-preview"),ft=["show","teleport","transition","overlayStyle","closeOnPopstate"],mt={show:Boolean,loop:z,images:Be(),minZoom:L(1/3),maxZoom:L(3),overlay:z,vertical:Boolean,closeable:Boolean,showIndex:z,className:we,closeIcon:he("clear"),transition:String,beforeClose:Function,doubleScale:z,overlayClass:we,overlayStyle:Object,swipeDuration:L(300),startPosition:L(0),showIndicators:Boolean,closeOnPopstate:z,closeOnClickImage:z,closeOnClickOverlay:z,closeIconPosition:he("top-right"),teleport:[String,Object]};var gt=le({name:dt,props:mt,emits:["scale","close","closed","change","longPress","update:show"],setup(e,{emit:g,slots:b}){const t=Y(),h=Y(),a=ce({active:0,rootWidth:0,rootHeight:0,disableZoom:!1}),s=()=>{if(t.value){const m=Te(t.value.$el);a.rootWidth=m.width,a.rootHeight=m.height,t.value.resize()}},u=m=>g("scale",m),f=m=>g("update:show",m),v=()=>{Ze(e.beforeClose,{args:[a.active],done:()=>f(!1)})},n=m=>{m!==a.active&&(a.active=m,g("change",m))},c=()=>{if(e.showIndex)return S("div",{class:j("index")},[b.index?b.index({index:a.active}):`${a.active+1} / ${e.images.length}`])},d=()=>{if(b.cover)return S("div",{class:j("cover")},[b.cover()])},_=()=>{a.disableZoom=!0},R=()=>{a.disableZoom=!1},Z=()=>S(it,{ref:t,lazyRender:!0,loop:e.loop,class:j("swipe"),vertical:e.vertical,duration:e.swipeDuration,initialSwipe:e.startPosition,showIndicators:e.showIndicators,indicatorColor:"white",onChange:n,onDragEnd:R,onDragStart:_},{default:()=>[e.images.map((m,p)=>S(vt,{ref:x=>{p===a.active&&(h.value=x)},src:m,show:e.show,active:a.active,maxZoom:e.maxZoom,minZoom:e.minZoom,rootWidth:a.rootWidth,rootHeight:a.rootHeight,disableZoom:a.disableZoom,doubleScale:e.doubleScale,closeOnClickImage:e.closeOnClickImage,closeOnClickOverlay:e.closeOnClickOverlay,vertical:e.vertical,onScale:u,onClose:v,onLongPress:()=>g("longPress",{index:p})},{image:b.image}))]}),I=()=>{if(e.closeable)return S(He,{role:"button",name:e.closeIcon,class:[j("close-icon",e.closeIconPosition),Ae],onClick:v},null)},B=()=>g("closed"),D=(m,p)=>{var x;return(x=t.value)==null?void 0:x.swipeTo(m,p)};return se({resetScale:()=>{var m;(m=h.value)==null||m.resetScale()},swipeTo:D}),re(s),$([Se,Pe],s),$(()=>e.startPosition,m=>n(+m)),$(()=>e.show,m=>{const{images:p,startPosition:x}=e;m?(n(+x),me(()=>{s(),D(+x,{immediate:!0})})):g("close",{index:a.active,url:p[a.active]})}),()=>S(ke,Ve({class:[j(),e.className],overlayClass:[j("overlay"),e.overlayClass],onClosed:B,"onUpdate:show":f},De(e,ft)),{default:()=>[I(),Z(),c(),d()]})}});const ht=fe(gt),wt=e=>We("/yuthon/yuthon/notice",{id:e}),_t={class:"container"},yt={class:"scroll-area"},bt={class:"notice-header"},xt={class:"title"},Ct={class:"sub-info"},St={class:"author"},Pt=["innerHTML"],It={key:0,class:"attachment"},Tt={class:"video-wrapper"},kt=["src"],pt={__name:"Notice",setup(e){const g=Y({}),b=Y(!1),t=Y(""),h=(s,u)=>{if(s.includes("pdf"))return".pdf";if(s.includes("msword"))return".doc";if(s.includes("wordprocessingml"))return".docx";if(s.includes("excel"))return".xls";if(s.includes("spreadsheetml"))return".xlsx";if(s.includes("mp4"))return".mp4";if(s.includes("png"))return".png";if(s.includes("jpeg")||s.includes("jpg"))return".jpg";const f=/\.[0-9a-z]+$/i.exec(u);return f?f[0]:""},a=s=>{if(!s||!s.datas){_e("文件数据缺失");return}const u=atob(s.datas),f=new Array(u.length);for(let _=0;_<u.length;_++)f[_]=u.charCodeAt(_);const v=new Uint8Array(f),n=h(s.mimetype,s.name),c=new Blob([v],{type:s.mimetype}),d=URL.createObjectURL(c);if(s.mimetype.startsWith("application/")){const _=document.createElement("a");_.href=d,_.download=s.name||`file${n}`,_.click(),URL.revokeObjectURL(d)}else s.mimetype.startsWith("video/")?(t.value=d,b.value=!0):s.mimetype.startsWith("image/")?ht([d]):_e("不支持的文件类型")};return re(async()=>{const s=Ge();console.log(s.query);const u=parseInt(s.query.id);let v=(await wt(u)).data;v.notice_text=v.notice_text.replace(/<img/gi,'<img class="img-class"'),g.value=v}),(s,u)=>{const f=Ne,v=Le,n=ke;return te(),ve("div",_t,[X("div",yt,[X("div",bt,[X("div",xt,ee(g.value.title),1),X("div",Ct,[X("span",null,ee(g.value.create_date1),1),X("span",St,ee(g.value.user_name),1),X("span",null,"阅读量: "+ee(g.value.read_number),1)])]),X("div",{class:"notice-body",innerHTML:g.value.notice_text},null,8,Pt),g.value.documents?.length?(te(),ve("div",It,[S(v,null,{default:ye(()=>[(te(!0),ve(Je,null,Qe(g.value.documents,c=>(te(),et(f,{key:c.id,title:c.name,label:c.file_size_display,"is-link":"",onClick:d=>a(c)},null,8,["title","label","onClick"]))),128))]),_:1})])):Ke("",!0)]),S(n,{show:b.value,"onUpdate:show":u[0]||(u[0]=c=>b.value=c),position:"center",round:""},{default:ye(()=>[X("div",Tt,[X("video",{ref:"popupVideo",src:t.value,autoplay:"",controls:"",style:{width:"300px",height:"200px"}},null,8,kt)])]),_:1},8,["show"])])}}},Yt=qe(pt,[["__scopeId","data-v-54ef9a6c"]]);export{Yt as default};
diff --git a/yuthon_base/static/webh5/assets/Salary-_DcRmXnI.js b/yuthon_base/static/webh5/assets/Salary-_DcRmXnI.js
new file mode 100644
index 000000000..01ff16c40
--- /dev/null
+++ b/yuthon_base/static/webh5/assets/Salary-_DcRmXnI.js
@@ -0,0 +1 @@
+import{v as B,t as A,c as p,H as E,I as V,j as w,n as b,F as y,B as q,E as H,C as O,D as j}from"./requests-DdoUQiv8.js";import{d as x,g as a,T as G,F as I,s as K,_ as M,r as R,o as J,u as Q,h as S,i as f,t as k,k as P,l as C,p as U,q as W}from"./index-CimcMLIq.js";import{I as X}from"./index-BJ3ARmPk.js";const[Y,T]=p("tag"),Z={size:String,mark:Boolean,show:A,type:B("default"),color:String,plain:Boolean,round:Boolean,textColor:String,closeable:Boolean};var ee=x({name:Y,props:Z,emits:["close"],setup(t,{slots:e,emit:u}){const l=o=>{o.stopPropagation(),u("close",o)},r=()=>t.plain?{color:t.textColor||t.color,borderColor:t.color}:{color:t.textColor,background:t.color},d=()=>{var o;const{type:m,mark:i,plain:c,round:v,size:s,closeable:_}=t,g={mark:i,plain:c,round:v};s&&(g[s]=s);const h=_&&a(V,{name:"cross",class:[T("close"),E],onClick:l},null);return a("span",{style:r(),class:T([g,m])},[(o=e.default)==null?void 0:o.call(e),h])};return()=>a(G,{name:t.closeable?"van-fade":void 0},{default:()=>[t.show?d():null]})}});const te=w(ee),[ae,n]=p("card"),ne={tag:String,num:b,desc:String,thumb:String,title:String,price:b,centered:Boolean,lazyLoad:Boolean,currency:B("¥"),thumbLink:String,originPrice:b};var re=x({name:ae,props:ne,emits:["clickThumb"],setup(t,{slots:e,emit:u}){const l=()=>{if(e.title)return e.title();if(t.title)return a("div",{class:[n("title"),"van-multi-ellipsis--l2"]},[t.title])},r=()=>{if(e.tag||t.tag)return a("div",{class:n("tag")},[e.tag?e.tag():a(te,{mark:!0,type:"primary"},{default:()=>[t.tag]})])},d=()=>e.thumb?e.thumb():a(X,{src:t.thumb,fit:"cover",width:"100%",height:"100%",lazyLoad:t.lazyLoad},null),o=()=>{if(e.thumb||t.thumb)return a("a",{href:t.thumbLink,class:n("thumb"),onClick:c=>u("clickThumb",c)},[d(),r()])},m=()=>{if(e.desc)return e.desc();if(t.desc)return a("div",{class:[n("desc"),"van-ellipsis"]},[t.desc])},i=()=>{const c=t.price.toString().split(".");return a("div",null,[a("span",{class:n("price-currency")},[t.currency]),a("span",{class:n("price-integer")},[c[0]]),c.length>1&&a(I,null,[K("."),a("span",{class:n("price-decimal")},[c[1]])])])};return()=>{var c,v,s;const _=e.num||y(t.num),g=e.price||y(t.price),h=e["origin-price"]||y(t.originPrice),D=_||g||h||e.bottom,F=g&&a("div",{class:n("price")},[e.price?e.price():i()]),L=h&&a("div",{class:n("origin-price")},[e["origin-price"]?e["origin-price"]():`${t.currency} ${t.originPrice}`]),N=_&&a("div",{class:n("num")},[e.num?e.num():`x${t.num}`]),$=e.footer&&a("div",{class:n("footer")},[e.footer()]),z=D&&a("div",{class:n("bottom")},[(c=e["price-top"])==null?void 0:c.call(e),F,L,N,(v=e.bottom)==null?void 0:v.call(e)]);return a("div",{class:n()},[a("div",{class:n("header")},[o(),a("div",{class:n("content",{centered:t.centered})},[a("div",null,[l(),m(),(s=e.tags)==null?void 0:s.call(e)]),z])]),$])}}});const ce=w(re),oe=t=>q("/yuthon/yuthon/salary",{id:t}),ie={class:"container"},le={class:"header"},se={class:"salary-amount"},ue={class:"detail-section"},de={__name:"Salary",setup(t){const e=R({}),u=Q();return J(async()=>{const l=parseInt(u.query.id);try{const r=await oe(l);console.log(r),e.value=r.data}catch(r){H("获取工资条失败"),console.error(r)}}),(l,r)=>{const d=ce,o=j,m=O;return C(),S("div",ie,[f("div",le,k(e.value.date_from)+" - "+k(e.value.date_to)+" 工资条 ",1),a(d,{class:"salary-card",title:"实发工资",bordered:""},{desc:P(()=>[f("div",se,k(e.value.amount_total),1)]),_:1}),f("div",ue,[r[0]||(r[0]=f("div",{class:"section-title"},"明细",-1)),a(m,null,{default:P(()=>[(C(!0),S(I,null,U(e.value.lines_ids,i=>(C(),W(o,{key:i.name,title:i.name,value:i.total},null,8,["title","value"]))),128))]),_:1})])])}}},_e=M(de,[["__scopeId","data-v-4564b9eb"]]);export{_e as default};
diff --git a/yuthon_base/static/webh5/assets/index-BJ3ARmPk.js b/yuthon_base/static/webh5/assets/index-BJ3ARmPk.js
new file mode 100644
index 000000000..401176c82
--- /dev/null
+++ b/yuthon_base/static/webh5/assets/index-BJ3ARmPk.js
@@ -0,0 +1 @@
+import{v as P,t as S,n as d,c as B,G as u,F as $,J as j,I as D,j as _}from"./requests-DdoUQiv8.js";import{d as C,r as f,v as F,c as N,w as R,f as U,o as G,n as z,g as n,x as J,y as M,m as b}from"./index-CimcMLIq.js";const[O,i]=B("image"),T={src:String,alt:String,fit:String,position:String,round:Boolean,block:Boolean,width:d,height:d,radius:d,lazyLoad:Boolean,iconSize:d,showError:S,errorIcon:P("photo-fail"),iconPrefix:String,showLoading:S,loadingIcon:P("photo"),crossorigin:String,referrerpolicy:String,decoding:String};var V=C({name:O,props:T,emits:["load","error"],setup(r,{emit:g,slots:c}){const t=f(!1),a=f(!0),o=f(),{$Lazyload:l}=F().proxy,x=N(()=>{const e={width:u(r.width),height:u(r.height)};return $(r.radius)&&(e.overflow="hidden",e.borderRadius=u(r.radius)),e});R(()=>r.src,()=>{t.value=!1,a.value=!0});const v=e=>{a.value&&(a.value=!1,g("load",e))},m=()=>{const e=new Event("load");Object.defineProperty(e,"target",{value:o.value,enumerable:!0}),v(e)},h=e=>{t.value=!0,a.value=!1,g("error",e)},y=(e,s,I)=>I?I():n(D,{name:e,size:r.iconSize,class:s,classPrefix:r.iconPrefix},null),E=()=>{if(a.value&&r.showLoading)return n("div",{class:i("loading")},[y(r.loadingIcon,i("loading-icon"),c.loading)]);if(t.value&&r.showError)return n("div",{class:i("error")},[y(r.errorIcon,i("error-icon"),c.error)])},k=()=>{if(t.value||!r.src)return;const e={alt:r.alt,class:i("img"),decoding:r.decoding,style:{objectFit:r.fit,objectPosition:r.position},crossorigin:r.crossorigin,referrerpolicy:r.referrerpolicy};return r.lazyLoad?J(n("img",b({ref:o},e),null),[[M("lazy"),r.src]]):n("img",b({ref:o,src:r.src,onLoad:v,onError:h},e),null)},w=({el:e})=>{const s=()=>{e===o.value&&a.value&&m()};o.value?s():z(s)},L=({el:e})=>{e===o.value&&!t.value&&h()};return l&&j&&(l.$on("loaded",w),l.$on("error",L),U(()=>{l.$off("loaded",w),l.$off("error",L)})),G(()=>{z(()=>{var e;(e=o.value)!=null&&e.complete&&!r.lazyLoad&&m()})}),()=>{var e;return n("div",{class:i({round:r.round,block:r.block}),style:x.value},[k(),E(),(e=c.default)==null?void 0:e.call(c)])}}});const H=_(V);export{H as I};
diff --git a/yuthon_base/static/webh5/assets/index-CimcMLIq.js b/yuthon_base/static/webh5/assets/index-CimcMLIq.js
new file mode 100644
index 000000000..bd8472bf2
--- /dev/null
+++ b/yuthon_base/static/webh5/assets/index-CimcMLIq.js
@@ -0,0 +1,26 @@
+const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["assets/Notice-DeLRV3hn.js","assets/requests-DdoUQiv8.js","assets/requests-r41Ag5Ie.css","assets/index-BJ3ARmPk.js","assets/Notice-CkW2yr7O.css","assets/index-C_c56t6o.css","assets/Salary-_DcRmXnI.js","assets/Salary-DqCIV6VL.css","assets/Journey-i8wtFFe-.js","assets/Journey-DGgEqI0C.css","assets/ClockInStatistics-iXdu-bYU.js","assets/ClockInStatistics-C3bUuhSM.css"])))=>i.map(i=>d[i]);
+(function(){const t=document.createElement("link").relList;if(t&&t.supports&&t.supports("modulepreload"))return;for(const r of document.querySelectorAll('link[rel="modulepreload"]'))s(r);new MutationObserver(r=>{for(const o of r)if(o.type==="childList")for(const i of o.addedNodes)i.tagName==="LINK"&&i.rel==="modulepreload"&&s(i)}).observe(document,{childList:!0,subtree:!0});function n(r){const o={};return r.integrity&&(o.integrity=r.integrity),r.referrerPolicy&&(o.referrerPolicy=r.referrerPolicy),r.crossOrigin==="use-credentials"?o.credentials="include":r.crossOrigin==="anonymous"?o.credentials="omit":o.credentials="same-origin",o}function s(r){if(r.ep)return;r.ep=!0;const o=n(r);fetch(r.href,o)}})();/**
+* @vue/shared v3.5.18
+* (c) 2018-present Yuxi (Evan) You and Vue contributors
+* @license MIT
+**//*! #__NO_SIDE_EFFECTS__ */function Es(e){const t=Object.create(null);for(const n of e.split(","))t[n]=1;return n=>n in t}const se={},At=[],We=()=>{},Ii=()=>!1,Pn=e=>e.charCodeAt(0)===111&&e.charCodeAt(1)===110&&(e.charCodeAt(2)>122||e.charCodeAt(2)<97),Ss=e=>e.startsWith("onUpdate:"),ae=Object.assign,xs=(e,t)=>{const n=e.indexOf(t);n>-1&&e.splice(n,1)},Li=Object.prototype.hasOwnProperty,X=(e,t)=>Li.call(e,t),j=Array.isArray,Tt=e=>On(e)==="[object Map]",Jr=e=>On(e)==="[object Set]",k=e=>typeof e=="function",ce=e=>typeof e=="string",dt=e=>typeof e=="symbol",ie=e=>e!==null&&typeof e=="object",Qr=e=>(ie(e)||k(e))&&k(e.then)&&k(e.catch),Yr=Object.prototype.toString,On=e=>Yr.call(e),Ni=e=>On(e).slice(8,-1),Xr=e=>On(e)==="[object Object]",ws=e=>ce(e)&&e!=="NaN"&&e[0]!=="-"&&""+parseInt(e,10)===e,kt=Es(",key,ref,ref_for,ref_key,onVnodeBeforeMount,onVnodeMounted,onVnodeBeforeUpdate,onVnodeUpdated,onVnodeBeforeUnmount,onVnodeUnmounted"),Mn=e=>{const t=Object.create(null);return n=>t[n]||(t[n]=e(n))},Fi=/-(\w)/g,Ie=Mn(e=>e.replace(Fi,(t,n)=>n?n.toUpperCase():"")),Di=/\B([A-Z])/g,Et=Mn(e=>e.replace(Di,"-$1").toLowerCase()),In=Mn(e=>e.charAt(0).toUpperCase()+e.slice(1)),Un=Mn(e=>e?`on${In(e)}`:""),ut=(e,t)=>!Object.is(e,t),Kn=(e,...t)=>{for(let n=0;n<e.length;n++)e[n](...t)},os=(e,t,n,s=!1)=>{Object.defineProperty(e,t,{configurable:!0,enumerable:!1,writable:s,value:n})},$i=e=>{const t=parseFloat(e);return isNaN(t)?e:t},Hi=e=>{const t=ce(e)?Number(e):NaN;return isNaN(t)?e:t};let Gs;const Ln=()=>Gs||(Gs=typeof globalThis<"u"?globalThis:typeof self<"u"?self:typeof window<"u"?window:typeof global<"u"?global:{});function Cs(e){if(j(e)){const t={};for(let n=0;n<e.length;n++){const s=e[n],r=ce(s)?ki(s):Cs(s);if(r)for(const o in r)t[o]=r[o]}return t}else if(ce(e)||ie(e))return e}const ji=/;(?![^(]*\))/g,Bi=/:([^]+)/,Vi=/\/\*[^]*?\*\//g;function ki(e){const t={};return e.replace(Vi,"").split(ji).forEach(n=>{if(n){const s=n.split(Bi);s.length>1&&(t[s[0].trim()]=s[1].trim())}}),t}function Rs(e){let t="";if(ce(e))t=e;else if(j(e))for(let n=0;n<e.length;n++){const s=Rs(e[n]);s&&(t+=s+" ")}else if(ie(e))for(const n in e)e[n]&&(t+=n+" ");return t.trim()}const Ui="itemscope,allowfullscreen,formnovalidate,ismap,nomodule,novalidate,readonly",Ki=Es(Ui);function Zr(e){return!!e||e===""}const eo=e=>!!(e&&e.__v_isRef===!0),Wi=e=>ce(e)?e:e==null?"":j(e)||ie(e)&&(e.toString===Yr||!k(e.toString))?eo(e)?Wi(e.value):JSON.stringify(e,to,2):String(e),to=(e,t)=>eo(t)?to(e,t.value):Tt(t)?{[`Map(${t.size})`]:[...t.entries()].reduce((n,[s,r],o)=>(n[Wn(s,o)+" =>"]=r,n),{})}:Jr(t)?{[`Set(${t.size})`]:[...t.values()].map(n=>Wn(n))}:dt(t)?Wn(t):ie(t)&&!j(t)&&!Xr(t)?String(t):t,Wn=(e,t="")=>{var n;return dt(e)?`Symbol(${(n=e.description)!=null?n:t})`:e};/**
+* @vue/reactivity v3.5.18
+* (c) 2018-present Yuxi (Evan) You and Vue contributors
+* @license MIT
+**/let xe;class no{constructor(t=!1){this.detached=t,this._active=!0,this._on=0,this.effects=[],this.cleanups=[],this._isPaused=!1,this.parent=xe,!t&&xe&&(this.index=(xe.scopes||(xe.scopes=[])).push(this)-1)}get active(){return this._active}pause(){if(this._active){this._isPaused=!0;let t,n;if(this.scopes)for(t=0,n=this.scopes.length;t<n;t++)this.scopes[t].pause();for(t=0,n=this.effects.length;t<n;t++)this.effects[t].pause()}}resume(){if(this._active&&this._isPaused){this._isPaused=!1;let t,n;if(this.scopes)for(t=0,n=this.scopes.length;t<n;t++)this.scopes[t].resume();for(t=0,n=this.effects.length;t<n;t++)this.effects[t].resume()}}run(t){if(this._active){const n=xe;try{return xe=this,t()}finally{xe=n}}}on(){++this._on===1&&(this.prevScope=xe,xe=this)}off(){this._on>0&&--this._on===0&&(xe=this.prevScope,this.prevScope=void 0)}stop(t){if(this._active){this._active=!1;let n,s;for(n=0,s=this.effects.length;n<s;n++)this.effects[n].stop();for(this.effects.length=0,n=0,s=this.cleanups.length;n<s;n++)this.cleanups[n]();if(this.cleanups.length=0,this.scopes){for(n=0,s=this.scopes.length;n<s;n++)this.scopes[n].stop(!0);this.scopes.length=0}if(!this.detached&&this.parent&&!t){const r=this.parent.scopes.pop();r&&r!==this&&(this.parent.scopes[this.index]=r,r.index=this.index)}this.parent=void 0}}}function qi(e){return new no(e)}function Gi(){return xe}let oe;const qn=new WeakSet;class so{constructor(t){this.fn=t,this.deps=void 0,this.depsTail=void 0,this.flags=5,this.next=void 0,this.cleanup=void 0,this.scheduler=void 0,xe&&xe.active&&xe.effects.push(this)}pause(){this.flags|=64}resume(){this.flags&64&&(this.flags&=-65,qn.has(this)&&(qn.delete(this),this.trigger()))}notify(){this.flags&2&&!(this.flags&32)||this.flags&8||oo(this)}run(){if(!(this.flags&1))return this.fn();this.flags|=2,zs(this),io(this);const t=oe,n=Ne;oe=this,Ne=!0;try{return this.fn()}finally{lo(this),oe=t,Ne=n,this.flags&=-3}}stop(){if(this.flags&1){for(let t=this.deps;t;t=t.nextDep)Ps(t);this.deps=this.depsTail=void 0,zs(this),this.onStop&&this.onStop(),this.flags&=-2}}trigger(){this.flags&64?qn.add(this):this.scheduler?this.scheduler():this.runIfDirty()}runIfDirty(){is(this)&&this.run()}get dirty(){return is(this)}}let ro=0,Ut,Kt;function oo(e,t=!1){if(e.flags|=8,t){e.next=Kt,Kt=e;return}e.next=Ut,Ut=e}function As(){ro++}function Ts(){if(--ro>0)return;if(Kt){let t=Kt;for(Kt=void 0;t;){const n=t.next;t.next=void 0,t.flags&=-9,t=n}}let e;for(;Ut;){let t=Ut;for(Ut=void 0;t;){const n=t.next;if(t.next=void 0,t.flags&=-9,t.flags&1)try{t.trigger()}catch(s){e||(e=s)}t=n}}if(e)throw e}function io(e){for(let t=e.deps;t;t=t.nextDep)t.version=-1,t.prevActiveLink=t.dep.activeLink,t.dep.activeLink=t}function lo(e){let t,n=e.depsTail,s=n;for(;s;){const r=s.prevDep;s.version===-1?(s===n&&(n=r),Ps(s),zi(s)):t=s,s.dep.activeLink=s.prevActiveLink,s.prevActiveLink=void 0,s=r}e.deps=t,e.depsTail=n}function is(e){for(let t=e.deps;t;t=t.nextDep)if(t.dep.version!==t.version||t.dep.computed&&(co(t.dep.computed)||t.dep.version!==t.version))return!0;return!!e._dirty}function co(e){if(e.flags&4&&!(e.flags&16)||(e.flags&=-17,e.globalVersion===Xt)||(e.globalVersion=Xt,!e.isSSR&&e.flags&128&&(!e.deps&&!e._dirty||!is(e))))return;e.flags|=2;const t=e.dep,n=oe,s=Ne;oe=e,Ne=!0;try{io(e);const r=e.fn(e._value);(t.version===0||ut(r,e._value))&&(e.flags|=128,e._value=r,t.version++)}catch(r){throw t.version++,r}finally{oe=n,Ne=s,lo(e),e.flags&=-3}}function Ps(e,t=!1){const{dep:n,prevSub:s,nextSub:r}=e;if(s&&(s.nextSub=r,e.prevSub=void 0),r&&(r.prevSub=s,e.nextSub=void 0),n.subs===e&&(n.subs=s,!s&&n.computed)){n.computed.flags&=-5;for(let o=n.computed.deps;o;o=o.nextDep)Ps(o,!0)}!t&&!--n.sc&&n.map&&n.map.delete(n.key)}function zi(e){const{prevDep:t,nextDep:n}=e;t&&(t.nextDep=n,e.prevDep=void 0),n&&(n.prevDep=t,e.nextDep=void 0)}let Ne=!0;const fo=[];function et(){fo.push(Ne),Ne=!1}function tt(){const e=fo.pop();Ne=e===void 0?!0:e}function zs(e){const{cleanup:t}=e;if(e.cleanup=void 0,t){const n=oe;oe=void 0;try{t()}finally{oe=n}}}let Xt=0;class Ji{constructor(t,n){this.sub=t,this.dep=n,this.version=n.version,this.nextDep=this.prevDep=this.nextSub=this.prevSub=this.prevActiveLink=void 0}}class Os{constructor(t){this.computed=t,this.version=0,this.activeLink=void 0,this.subs=void 0,this.map=void 0,this.key=void 0,this.sc=0,this.__v_skip=!0}track(t){if(!oe||!Ne||oe===this.computed)return;let n=this.activeLink;if(n===void 0||n.sub!==oe)n=this.activeLink=new Ji(oe,this),oe.deps?(n.prevDep=oe.depsTail,oe.depsTail.nextDep=n,oe.depsTail=n):oe.deps=oe.depsTail=n,uo(n);else if(n.version===-1&&(n.version=this.version,n.nextDep)){const s=n.nextDep;s.prevDep=n.prevDep,n.prevDep&&(n.prevDep.nextDep=s),n.prevDep=oe.depsTail,n.nextDep=void 0,oe.depsTail.nextDep=n,oe.depsTail=n,oe.deps===n&&(oe.deps=s)}return n}trigger(t){this.version++,Xt++,this.notify(t)}notify(t){As();try{for(let n=this.subs;n;n=n.prevSub)n.sub.notify()&&n.sub.dep.notify()}finally{Ts()}}}function uo(e){if(e.dep.sc++,e.sub.flags&4){const t=e.dep.computed;if(t&&!e.dep.subs){t.flags|=20;for(let s=t.deps;s;s=s.nextDep)uo(s)}const n=e.dep.subs;n!==e&&(e.prevSub=n,n&&(n.nextSub=e)),e.dep.subs=e}}const ls=new WeakMap,bt=Symbol(""),cs=Symbol(""),Zt=Symbol("");function de(e,t,n){if(Ne&&oe){let s=ls.get(e);s||ls.set(e,s=new Map);let r=s.get(n);r||(s.set(n,r=new Os),r.map=s,r.key=n),r.track()}}function Xe(e,t,n,s,r,o){const i=ls.get(e);if(!i){Xt++;return}const l=c=>{c&&c.trigger()};if(As(),t==="clear")i.forEach(l);else{const c=j(e),h=c&&ws(n);if(c&&n==="length"){const f=Number(s);i.forEach((a,p)=>{(p==="length"||p===Zt||!dt(p)&&p>=f)&&l(a)})}else switch((n!==void 0||i.has(void 0))&&l(i.get(n)),h&&l(i.get(Zt)),t){case"add":c?h&&l(i.get("length")):(l(i.get(bt)),Tt(e)&&l(i.get(cs)));break;case"delete":c||(l(i.get(bt)),Tt(e)&&l(i.get(cs)));break;case"set":Tt(e)&&l(i.get(bt));break}}Ts()}function wt(e){const t=z(e);return t===e?t:(de(t,"iterate",Zt),Me(e)?t:t.map(he))}function Nn(e){return de(e=z(e),"iterate",Zt),e}const Qi={__proto__:null,[Symbol.iterator](){return Gn(this,Symbol.iterator,he)},concat(...e){return wt(this).concat(...e.map(t=>j(t)?wt(t):t))},entries(){return Gn(this,"entries",e=>(e[1]=he(e[1]),e))},every(e,t){return ze(this,"every",e,t,void 0,arguments)},filter(e,t){return ze(this,"filter",e,t,n=>n.map(he),arguments)},find(e,t){return ze(this,"find",e,t,he,arguments)},findIndex(e,t){return ze(this,"findIndex",e,t,void 0,arguments)},findLast(e,t){return ze(this,"findLast",e,t,he,arguments)},findLastIndex(e,t){return ze(this,"findLastIndex",e,t,void 0,arguments)},forEach(e,t){return ze(this,"forEach",e,t,void 0,arguments)},includes(...e){return zn(this,"includes",e)},indexOf(...e){return zn(this,"indexOf",e)},join(e){return wt(this).join(e)},lastIndexOf(...e){return zn(this,"lastIndexOf",e)},map(e,t){return ze(this,"map",e,t,void 0,arguments)},pop(){return Dt(this,"pop")},push(...e){return Dt(this,"push",e)},reduce(e,...t){return Js(this,"reduce",e,t)},reduceRight(e,...t){return Js(this,"reduceRight",e,t)},shift(){return Dt(this,"shift")},some(e,t){return ze(this,"some",e,t,void 0,arguments)},splice(...e){return Dt(this,"splice",e)},toReversed(){return wt(this).toReversed()},toSorted(e){return wt(this).toSorted(e)},toSpliced(...e){return wt(this).toSpliced(...e)},unshift(...e){return Dt(this,"unshift",e)},values(){return Gn(this,"values",he)}};function Gn(e,t,n){const s=Nn(e),r=s[t]();return s!==e&&!Me(e)&&(r._next=r.next,r.next=()=>{const o=r._next();return o.value&&(o.value=n(o.value)),o}),r}const Yi=Array.prototype;function ze(e,t,n,s,r,o){const i=Nn(e),l=i!==e&&!Me(e),c=i[t];if(c!==Yi[t]){const a=c.apply(e,o);return l?he(a):a}let h=n;i!==e&&(l?h=function(a,p){return n.call(this,he(a),p,e)}:n.length>2&&(h=function(a,p){return n.call(this,a,p,e)}));const f=c.call(i,h,s);return l&&r?r(f):f}function Js(e,t,n,s){const r=Nn(e);let o=n;return r!==e&&(Me(e)?n.length>3&&(o=function(i,l,c){return n.call(this,i,l,c,e)}):o=function(i,l,c){return n.call(this,i,he(l),c,e)}),r[t](o,...s)}function zn(e,t,n){const s=z(e);de(s,"iterate",Zt);const r=s[t](...n);return(r===-1||r===!1)&&Ls(n[0])?(n[0]=z(n[0]),s[t](...n)):r}function Dt(e,t,n=[]){et(),As();const s=z(e)[t].apply(e,n);return Ts(),tt(),s}const Xi=Es("__proto__,__v_isRef,__isVue"),ao=new Set(Object.getOwnPropertyNames(Symbol).filter(e=>e!=="arguments"&&e!=="caller").map(e=>Symbol[e]).filter(dt));function Zi(e){dt(e)||(e=String(e));const t=z(this);return de(t,"has",e),t.hasOwnProperty(e)}class ho{constructor(t=!1,n=!1){this._isReadonly=t,this._isShallow=n}get(t,n,s){if(n==="__v_skip")return t.__v_skip;const r=this._isReadonly,o=this._isShallow;if(n==="__v_isReactive")return!r;if(n==="__v_isReadonly")return r;if(n==="__v_isShallow")return o;if(n==="__v_raw")return s===(r?o?fl:_o:o?mo:go).get(t)||Object.getPrototypeOf(t)===Object.getPrototypeOf(s)?t:void 0;const i=j(t);if(!r){let c;if(i&&(c=Qi[n]))return c;if(n==="hasOwnProperty")return Zi}const l=Reflect.get(t,n,ge(t)?t:s);return(dt(n)?ao.has(n):Xi(n))||(r||de(t,"get",n),o)?l:ge(l)?i&&ws(n)?l:l.value:ie(l)?r?vo(l):Fn(l):l}}class po extends ho{constructor(t=!1){super(!1,t)}set(t,n,s,r){let o=t[n];if(!this._isShallow){const c=at(o);if(!Me(s)&&!at(s)&&(o=z(o),s=z(s)),!j(t)&&ge(o)&&!ge(s))return c?!1:(o.value=s,!0)}const i=j(t)&&ws(n)?Number(n)<t.length:X(t,n),l=Reflect.set(t,n,s,ge(t)?t:r);return t===z(r)&&(i?ut(s,o)&&Xe(t,"set",n,s):Xe(t,"add",n,s)),l}deleteProperty(t,n){const s=X(t,n);t[n];const r=Reflect.deleteProperty(t,n);return r&&s&&Xe(t,"delete",n,void 0),r}has(t,n){const s=Reflect.has(t,n);return(!dt(n)||!ao.has(n))&&de(t,"has",n),s}ownKeys(t){return de(t,"iterate",j(t)?"length":bt),Reflect.ownKeys(t)}}class el extends ho{constructor(t=!1){super(!0,t)}set(t,n){return!0}deleteProperty(t,n){return!0}}const tl=new po,nl=new el,sl=new po(!0);const fs=e=>e,an=e=>Reflect.getPrototypeOf(e);function rl(e,t,n){return function(...s){const r=this.__v_raw,o=z(r),i=Tt(o),l=e==="entries"||e===Symbol.iterator&&i,c=e==="keys"&&i,h=r[e](...s),f=n?fs:t?En:he;return!t&&de(o,"iterate",c?cs:bt),{next(){const{value:a,done:p}=h.next();return p?{value:a,done:p}:{value:l?[f(a[0]),f(a[1])]:f(a),done:p}},[Symbol.iterator](){return this}}}}function hn(e){return function(...t){return e==="delete"?!1:e==="clear"?void 0:this}}function ol(e,t){const n={get(r){const o=this.__v_raw,i=z(o),l=z(r);e||(ut(r,l)&&de(i,"get",r),de(i,"get",l));const{has:c}=an(i),h=t?fs:e?En:he;if(c.call(i,r))return h(o.get(r));if(c.call(i,l))return h(o.get(l));o!==i&&o.get(r)},get size(){const r=this.__v_raw;return!e&&de(z(r),"iterate",bt),Reflect.get(r,"size",r)},has(r){const o=this.__v_raw,i=z(o),l=z(r);return e||(ut(r,l)&&de(i,"has",r),de(i,"has",l)),r===l?o.has(r):o.has(r)||o.has(l)},forEach(r,o){const i=this,l=i.__v_raw,c=z(l),h=t?fs:e?En:he;return!e&&de(c,"iterate",bt),l.forEach((f,a)=>r.call(o,h(f),h(a),i))}};return ae(n,e?{add:hn("add"),set:hn("set"),delete:hn("delete"),clear:hn("clear")}:{add(r){!t&&!Me(r)&&!at(r)&&(r=z(r));const o=z(this);return an(o).has.call(o,r)||(o.add(r),Xe(o,"add",r,r)),this},set(r,o){!t&&!Me(o)&&!at(o)&&(o=z(o));const i=z(this),{has:l,get:c}=an(i);let h=l.call(i,r);h||(r=z(r),h=l.call(i,r));const f=c.call(i,r);return i.set(r,o),h?ut(o,f)&&Xe(i,"set",r,o):Xe(i,"add",r,o),this},delete(r){const o=z(this),{has:i,get:l}=an(o);let c=i.call(o,r);c||(r=z(r),c=i.call(o,r)),l&&l.call(o,r);const h=o.delete(r);return c&&Xe(o,"delete",r,void 0),h},clear(){const r=z(this),o=r.size!==0,i=r.clear();return o&&Xe(r,"clear",void 0,void 0),i}}),["keys","values","entries",Symbol.iterator].forEach(r=>{n[r]=rl(r,e,t)}),n}function Ms(e,t){const n=ol(e,t);return(s,r,o)=>r==="__v_isReactive"?!e:r==="__v_isReadonly"?e:r==="__v_raw"?s:Reflect.get(X(n,r)&&r in s?n:s,r,o)}const il={get:Ms(!1,!1)},ll={get:Ms(!1,!0)},cl={get:Ms(!0,!1)};const go=new WeakMap,mo=new WeakMap,_o=new WeakMap,fl=new WeakMap;function ul(e){switch(e){case"Object":case"Array":return 1;case"Map":case"Set":case"WeakMap":case"WeakSet":return 2;default:return 0}}function al(e){return e.__v_skip||!Object.isExtensible(e)?0:ul(Ni(e))}function Fn(e){return at(e)?e:Is(e,!1,tl,il,go)}function yo(e){return Is(e,!1,sl,ll,mo)}function vo(e){return Is(e,!0,nl,cl,_o)}function Is(e,t,n,s,r){if(!ie(e)||e.__v_raw&&!(t&&e.__v_isReactive))return e;const o=al(e);if(o===0)return e;const i=r.get(e);if(i)return i;const l=new Proxy(e,o===2?s:n);return r.set(e,l),l}function Pt(e){return at(e)?Pt(e.__v_raw):!!(e&&e.__v_isReactive)}function at(e){return!!(e&&e.__v_isReadonly)}function Me(e){return!!(e&&e.__v_isShallow)}function Ls(e){return e?!!e.__v_raw:!1}function z(e){const t=e&&e.__v_raw;return t?z(t):e}function bo(e){return!X(e,"__v_skip")&&Object.isExtensible(e)&&os(e,"__v_skip",!0),e}const he=e=>ie(e)?Fn(e):e,En=e=>ie(e)?vo(e):e;function ge(e){return e?e.__v_isRef===!0:!1}function Eo(e){return So(e,!1)}function hl(e){return So(e,!0)}function So(e,t){return ge(e)?e:new dl(e,t)}class dl{constructor(t,n){this.dep=new Os,this.__v_isRef=!0,this.__v_isShallow=!1,this._rawValue=n?t:z(t),this._value=n?t:he(t),this.__v_isShallow=n}get value(){return this.dep.track(),this._value}set value(t){const n=this._rawValue,s=this.__v_isShallow||Me(t)||at(t);t=s?t:z(t),ut(t,n)&&(this._rawValue=t,this._value=s?t:he(t),this.dep.trigger())}}function Ot(e){return ge(e)?e.value:e}const pl={get:(e,t,n)=>t==="__v_raw"?e:Ot(Reflect.get(e,t,n)),set:(e,t,n,s)=>{const r=e[t];return ge(r)&&!ge(n)?(r.value=n,!0):Reflect.set(e,t,n,s)}};function xo(e){return Pt(e)?e:new Proxy(e,pl)}class gl{constructor(t,n,s){this.fn=t,this.setter=n,this._value=void 0,this.dep=new Os(this),this.__v_isRef=!0,this.deps=void 0,this.depsTail=void 0,this.flags=16,this.globalVersion=Xt-1,this.next=void 0,this.effect=this,this.__v_isReadonly=!n,this.isSSR=s}notify(){if(this.flags|=16,!(this.flags&8)&&oe!==this)return oo(this,!0),!0}get value(){const t=this.dep.track();return co(this),t&&(t.version=this.dep.version),this._value}set value(t){this.setter&&this.setter(t)}}function ml(e,t,n=!1){let s,r;return k(e)?s=e:(s=e.get,r=e.set),new gl(s,r,n)}const dn={},Sn=new WeakMap;let yt;function _l(e,t=!1,n=yt){if(n){let s=Sn.get(n);s||Sn.set(n,s=[]),s.push(e)}}function yl(e,t,n=se){const{immediate:s,deep:r,once:o,scheduler:i,augmentJob:l,call:c}=n,h=O=>r?O:Me(O)||r===!1||r===0?Ze(O,1):Ze(O);let f,a,p,m,S=!1,x=!1;if(ge(e)?(a=()=>e.value,S=Me(e)):Pt(e)?(a=()=>h(e),S=!0):j(e)?(x=!0,S=e.some(O=>Pt(O)||Me(O)),a=()=>e.map(O=>{if(ge(O))return O.value;if(Pt(O))return h(O);if(k(O))return c?c(O,2):O()})):k(e)?t?a=c?()=>c(e,2):e:a=()=>{if(p){et();try{p()}finally{tt()}}const O=yt;yt=f;try{return c?c(e,3,[m]):e(m)}finally{yt=O}}:a=We,t&&r){const O=a,U=r===!0?1/0:r;a=()=>Ze(O(),U)}const B=Gi(),L=()=>{f.stop(),B&&B.active&&xs(B.effects,f)};if(o&&t){const O=t;t=(...U)=>{O(...U),L()}}let M=x?new Array(e.length).fill(dn):dn;const N=O=>{if(!(!(f.flags&1)||!f.dirty&&!O))if(t){const U=f.run();if(r||S||(x?U.some((W,q)=>ut(W,M[q])):ut(U,M))){p&&p();const W=yt;yt=f;try{const q=[U,M===dn?void 0:x&&M[0]===dn?[]:M,m];M=U,c?c(t,3,q):t(...q)}finally{yt=W}}}else f.run()};return l&&l(N),f=new so(a),f.scheduler=i?()=>i(N,!1):N,m=O=>_l(O,!1,f),p=f.onStop=()=>{const O=Sn.get(f);if(O){if(c)c(O,4);else for(const U of O)U();Sn.delete(f)}},t?s?N(!0):M=f.run():i?i(N.bind(null,!0),!0):f.run(),L.pause=f.pause.bind(f),L.resume=f.resume.bind(f),L.stop=L,L}function Ze(e,t=1/0,n){if(t<=0||!ie(e)||e.__v_skip||(n=n||new Set,n.has(e)))return e;if(n.add(e),t--,ge(e))Ze(e.value,t,n);else if(j(e))for(let s=0;s<e.length;s++)Ze(e[s],t,n);else if(Jr(e)||Tt(e))e.forEach(s=>{Ze(s,t,n)});else if(Xr(e)){for(const s in e)Ze(e[s],t,n);for(const s of Object.getOwnPropertySymbols(e))Object.prototype.propertyIsEnumerable.call(e,s)&&Ze(e[s],t,n)}return e}/**
+* @vue/runtime-core v3.5.18
+* (c) 2018-present Yuxi (Evan) You and Vue contributors
+* @license MIT
+**/function cn(e,t,n,s){try{return s?e(...s):e()}catch(r){Dn(r,t,n)}}function Fe(e,t,n,s){if(k(e)){const r=cn(e,t,n,s);return r&&Qr(r)&&r.catch(o=>{Dn(o,t,n)}),r}if(j(e)){const r=[];for(let o=0;o<e.length;o++)r.push(Fe(e[o],t,n,s));return r}}function Dn(e,t,n,s=!0){const r=t?t.vnode:null,{errorHandler:o,throwUnhandledErrorInProduction:i}=t&&t.appContext.config||se;if(t){let l=t.parent;const c=t.proxy,h=`https://vuejs.org/error-reference/#runtime-${n}`;for(;l;){const f=l.ec;if(f){for(let a=0;a<f.length;a++)if(f[a](e,c,h)===!1)return}l=l.parent}if(o){et(),cn(o,null,10,[e,c,h]),tt();return}}vl(e,n,r,s,i)}function vl(e,t,n,s=!0,r=!1){if(r)throw e;console.error(e)}const ye=[];let ke=-1;const Mt=[];let it=null,Ct=0;const wo=Promise.resolve();let xn=null;function Co(e){const t=xn||wo;return e?t.then(this?e.bind(this):e):t}function bl(e){let t=ke+1,n=ye.length;for(;t<n;){const s=t+n>>>1,r=ye[s],o=en(r);o<e||o===e&&r.flags&2?t=s+1:n=s}return t}function Ns(e){if(!(e.flags&1)){const t=en(e),n=ye[ye.length-1];!n||!(e.flags&2)&&t>=en(n)?ye.push(e):ye.splice(bl(t),0,e),e.flags|=1,Ro()}}function Ro(){xn||(xn=wo.then(To))}function El(e){j(e)?Mt.push(...e):it&&e.id===-1?it.splice(Ct+1,0,e):e.flags&1||(Mt.push(e),e.flags|=1),Ro()}function Qs(e,t,n=ke+1){for(;n<ye.length;n++){const s=ye[n];if(s&&s.flags&2){if(e&&s.id!==e.uid)continue;ye.splice(n,1),n--,s.flags&4&&(s.flags&=-2),s(),s.flags&4||(s.flags&=-2)}}}function Ao(e){if(Mt.length){const t=[...new Set(Mt)].sort((n,s)=>en(n)-en(s));if(Mt.length=0,it){it.push(...t);return}for(it=t,Ct=0;Ct<it.length;Ct++){const n=it[Ct];n.flags&4&&(n.flags&=-2),n.flags&8||n(),n.flags&=-2}it=null,Ct=0}}const en=e=>e.id==null?e.flags&2?-1:1/0:e.id;function To(e){try{for(ke=0;ke<ye.length;ke++){const t=ye[ke];t&&!(t.flags&8)&&(t.flags&4&&(t.flags&=-2),cn(t,t.i,t.i?15:14),t.flags&4||(t.flags&=-2))}}finally{for(;ke<ye.length;ke++){const t=ye[ke];t&&(t.flags&=-2)}ke=-1,ye.length=0,Ao(),xn=null,(ye.length||Mt.length)&&To()}}let Re=null,Po=null;function wn(e){const t=Re;return Re=e,Po=e&&e.type.__scopeId||null,t}function Sl(e,t=Re,n){if(!t||e._n)return e;const s=(...r)=>{s._d&&ur(-1);const o=wn(t);let i;try{i=e(...r)}finally{wn(o),s._d&&ur(1)}return i};return s._n=!0,s._c=!0,s._d=!0,s}function yu(e,t){if(Re===null)return e;const n=Vn(Re),s=e.dirs||(e.dirs=[]);for(let r=0;r<t.length;r++){let[o,i,l,c=se]=t[r];o&&(k(o)&&(o={mounted:o,updated:o}),o.deep&&Ze(i),s.push({dir:o,instance:n,value:i,oldValue:void 0,arg:l,modifiers:c}))}return e}function pt(e,t,n,s){const r=e.dirs,o=t&&t.dirs;for(let i=0;i<r.length;i++){const l=r[i];o&&(l.oldValue=o[i].value);let c=l.dir[s];c&&(et(),Fe(c,n,8,[e.el,l,e,t]),tt())}}const Oo=Symbol("_vte"),Mo=e=>e.__isTeleport,Wt=e=>e&&(e.disabled||e.disabled===""),Ys=e=>e&&(e.defer||e.defer===""),Xs=e=>typeof SVGElement<"u"&&e instanceof SVGElement,Zs=e=>typeof MathMLElement=="function"&&e instanceof MathMLElement,us=(e,t)=>{const n=e&&e.to;return ce(n)?t?t(n):null:n},Io={name:"Teleport",__isTeleport:!0,process(e,t,n,s,r,o,i,l,c,h){const{mc:f,pc:a,pbc:p,o:{insert:m,querySelector:S,createText:x,createComment:B}}=h,L=Wt(t.props);let{shapeFlag:M,children:N,dynamicChildren:O}=t;if(e==null){const U=t.el=x(""),W=t.anchor=x("");m(U,n,s),m(W,n,s);const q=($,K)=>{M&16&&(r&&r.isCE&&(r.ce._teleportTarget=$),f(N,$,K,r,o,i,l,c))},le=()=>{const $=t.target=us(t.props,S),K=Lo($,t,x,m);$&&(i!=="svg"&&Xs($)?i="svg":i!=="mathml"&&Zs($)&&(i="mathml"),L||(q($,K),mn(t,!1)))};L&&(q(n,W),mn(t,!0)),Ys(t.props)?(t.el.__isMounted=!1,_e(()=>{le(),delete t.el.__isMounted},o)):le()}else{if(Ys(t.props)&&e.el.__isMounted===!1){_e(()=>{Io.process(e,t,n,s,r,o,i,l,c,h)},o);return}t.el=e.el,t.targetStart=e.targetStart;const U=t.anchor=e.anchor,W=t.target=e.target,q=t.targetAnchor=e.targetAnchor,le=Wt(e.props),$=le?n:W,K=le?U:q;if(i==="svg"||Xs(W)?i="svg":(i==="mathml"||Zs(W))&&(i="mathml"),O?(p(e.dynamicChildren,O,$,r,o,i,l),$s(e,t,!0)):c||a(e,t,$,K,r,o,i,l,!1),L)le?t.props&&e.props&&t.props.to!==e.props.to&&(t.props.to=e.props.to):pn(t,n,U,h,1);else if((t.props&&t.props.to)!==(e.props&&e.props.to)){const Z=t.target=us(t.props,S);Z&&pn(t,Z,null,h,0)}else le&&pn(t,W,q,h,1);mn(t,L)}},remove(e,t,n,{um:s,o:{remove:r}},o){const{shapeFlag:i,children:l,anchor:c,targetStart:h,targetAnchor:f,target:a,props:p}=e;if(a&&(r(h),r(f)),o&&r(c),i&16){const m=o||!Wt(p);for(let S=0;S<l.length;S++){const x=l[S];s(x,t,n,m,!!x.dynamicChildren)}}},move:pn,hydrate:xl};function pn(e,t,n,{o:{insert:s},m:r},o=2){o===0&&s(e.targetAnchor,t,n);const{el:i,anchor:l,shapeFlag:c,children:h,props:f}=e,a=o===2;if(a&&s(i,t,n),(!a||Wt(f))&&c&16)for(let p=0;p<h.length;p++)r(h[p],t,n,2);a&&s(l,t,n)}function xl(e,t,n,s,r,o,{o:{nextSibling:i,parentNode:l,querySelector:c,insert:h,createText:f}},a){const p=t.target=us(t.props,c);if(p){const m=Wt(t.props),S=p._lpa||p.firstChild;if(t.shapeFlag&16)if(m)t.anchor=a(i(e),t,l(e),n,s,r,o),t.targetStart=S,t.targetAnchor=S&&i(S);else{t.anchor=i(e);let x=S;for(;x;){if(x&&x.nodeType===8){if(x.data==="teleport start anchor")t.targetStart=x;else if(x.data==="teleport anchor"){t.targetAnchor=x,p._lpa=t.targetAnchor&&i(t.targetAnchor);break}}x=i(x)}t.targetAnchor||Lo(p,t,f,h),a(S&&i(S),t,p,n,s,r,o)}mn(t,m)}return t.anchor&&i(t.anchor)}const vu=Io;function mn(e,t){const n=e.ctx;if(n&&n.ut){let s,r;for(t?(s=e.el,r=e.anchor):(s=e.targetStart,r=e.targetAnchor);s&&s!==r;)s.nodeType===1&&s.setAttribute("data-v-owner",n.uid),s=s.nextSibling;n.ut()}}function Lo(e,t,n,s){const r=t.targetStart=n(""),o=t.targetAnchor=n("");return r[Oo]=o,e&&(s(r,e),s(o,e)),o}const lt=Symbol("_leaveCb"),gn=Symbol("_enterCb");function wl(){const e={isMounted:!1,isLeaving:!1,isUnmounting:!1,leavingVNodes:new Map};return ko(()=>{e.isMounted=!0}),Uo(()=>{e.isUnmounting=!0}),e}const Oe=[Function,Array],No={mode:String,appear:Boolean,persisted:Boolean,onBeforeEnter:Oe,onEnter:Oe,onAfterEnter:Oe,onEnterCancelled:Oe,onBeforeLeave:Oe,onLeave:Oe,onAfterLeave:Oe,onLeaveCancelled:Oe,onBeforeAppear:Oe,onAppear:Oe,onAfterAppear:Oe,onAppearCancelled:Oe},Fo=e=>{const t=e.subTree;return t.component?Fo(t.component):t},Cl={name:"BaseTransition",props:No,setup(e,{slots:t}){const n=pi(),s=wl();return()=>{const r=t.default&&Ho(t.default(),!0);if(!r||!r.length)return;const o=Do(r),i=z(e),{mode:l}=i;if(s.isLeaving)return Jn(o);const c=er(o);if(!c)return Jn(o);let h=as(c,i,s,n,a=>h=a);c.type!==ve&&tn(c,h);let f=n.subTree&&er(n.subTree);if(f&&f.type!==ve&&!vt(c,f)&&Fo(n).type!==ve){let a=as(f,i,s,n);if(tn(f,a),l==="out-in"&&c.type!==ve)return s.isLeaving=!0,a.afterLeave=()=>{s.isLeaving=!1,n.job.flags&8||n.update(),delete a.afterLeave,f=void 0},Jn(o);l==="in-out"&&c.type!==ve?a.delayLeave=(p,m,S)=>{const x=$o(s,f);x[String(f.key)]=f,p[lt]=()=>{m(),p[lt]=void 0,delete h.delayedLeave,f=void 0},h.delayedLeave=()=>{S(),delete h.delayedLeave,f=void 0}}:f=void 0}else f&&(f=void 0);return o}}};function Do(e){let t=e[0];if(e.length>1){for(const n of e)if(n.type!==ve){t=n;break}}return t}const Rl=Cl;function $o(e,t){const{leavingVNodes:n}=e;let s=n.get(t.type);return s||(s=Object.create(null),n.set(t.type,s)),s}function as(e,t,n,s,r){const{appear:o,mode:i,persisted:l=!1,onBeforeEnter:c,onEnter:h,onAfterEnter:f,onEnterCancelled:a,onBeforeLeave:p,onLeave:m,onAfterLeave:S,onLeaveCancelled:x,onBeforeAppear:B,onAppear:L,onAfterAppear:M,onAppearCancelled:N}=t,O=String(e.key),U=$o(n,e),W=($,K)=>{$&&Fe($,s,9,K)},q=($,K)=>{const Z=K[1];W($,K),j($)?$.every(I=>I.length<=1)&&Z():$.length<=1&&Z()},le={mode:i,persisted:l,beforeEnter($){let K=c;if(!n.isMounted)if(o)K=B||c;else return;$[lt]&&$[lt](!0);const Z=U[O];Z&&vt(e,Z)&&Z.el[lt]&&Z.el[lt](),W(K,[$])},enter($){let K=h,Z=f,I=a;if(!n.isMounted)if(o)K=L||h,Z=M||f,I=N||a;else return;let J=!1;const ue=$[gn]=we=>{J||(J=!0,we?W(I,[$]):W(Z,[$]),le.delayedLeave&&le.delayedLeave(),$[gn]=void 0)};K?q(K,[$,ue]):ue()},leave($,K){const Z=String(e.key);if($[gn]&&$[gn](!0),n.isUnmounting)return K();W(p,[$]);let I=!1;const J=$[lt]=ue=>{I||(I=!0,K(),ue?W(x,[$]):W(S,[$]),$[lt]=void 0,U[Z]===e&&delete U[Z])};U[Z]=e,m?q(m,[$,J]):J()},clone($){const K=as($,t,n,s,r);return r&&r(K),K}};return le}function Jn(e){if($n(e))return e=ht(e),e.children=null,e}function er(e){if(!$n(e))return Mo(e.type)&&e.children?Do(e.children):e;if(e.component)return e.component.subTree;const{shapeFlag:t,children:n}=e;if(n){if(t&16)return n[0];if(t&32&&k(n.default))return n.default()}}function tn(e,t){e.shapeFlag&6&&e.component?(e.transition=t,tn(e.component.subTree,t)):e.shapeFlag&128?(e.ssContent.transition=t.clone(e.ssContent),e.ssFallback.transition=t.clone(e.ssFallback)):e.transition=t}function Ho(e,t=!1,n){let s=[],r=0;for(let o=0;o<e.length;o++){let i=e[o];const l=n==null?i.key:String(n)+String(i.key!=null?i.key:o);i.type===Ue?(i.patchFlag&128&&r++,s=s.concat(Ho(i.children,t,l))):(t||i.type!==ve)&&s.push(l!=null?ht(i,{key:l}):i)}if(r>1)for(let o=0;o<s.length;o++)s[o].patchFlag=-2;return s}/*! #__NO_SIDE_EFFECTS__ */function jo(e,t){return k(e)?ae({name:e.name},t,{setup:e}):e}function Bo(e){e.ids=[e.ids[0]+e.ids[2]+++"-",0,0]}function qt(e,t,n,s,r=!1){if(j(e)){e.forEach((S,x)=>qt(S,t&&(j(t)?t[x]:t),n,s,r));return}if(Gt(s)&&!r){s.shapeFlag&512&&s.type.__asyncResolved&&s.component.subTree.component&&qt(e,t,n,s.component.subTree);return}const o=s.shapeFlag&4?Vn(s.component):s.el,i=r?null:o,{i:l,r:c}=e,h=t&&t.r,f=l.refs===se?l.refs={}:l.refs,a=l.setupState,p=z(a),m=a===se?()=>!1:S=>X(p,S);if(h!=null&&h!==c&&(ce(h)?(f[h]=null,m(h)&&(a[h]=null)):ge(h)&&(h.value=null)),k(c))cn(c,l,12,[i,f]);else{const S=ce(c),x=ge(c);if(S||x){const B=()=>{if(e.f){const L=S?m(c)?a[c]:f[c]:c.value;r?j(L)&&xs(L,o):j(L)?L.includes(o)||L.push(o):S?(f[c]=[o],m(c)&&(a[c]=f[c])):(c.value=[o],e.k&&(f[e.k]=c.value))}else S?(f[c]=i,m(c)&&(a[c]=i)):x&&(c.value=i,e.k&&(f[e.k]=i))};i?(B.id=-1,_e(B,n)):B()}}}Ln().requestIdleCallback;Ln().cancelIdleCallback;const Gt=e=>!!e.type.__asyncLoader,$n=e=>e.type.__isKeepAlive;function Al(e,t){Vo(e,"a",t)}function Tl(e,t){Vo(e,"da",t)}function Vo(e,t,n=pe){const s=e.__wdc||(e.__wdc=()=>{let r=n;for(;r;){if(r.isDeactivated)return;r=r.parent}return e()});if(Hn(t,s,n),n){let r=n.parent;for(;r&&r.parent;)$n(r.parent.vnode)&&Pl(s,t,n,r),r=r.parent}}function Pl(e,t,n,s){const r=Hn(t,e,s,!0);Ko(()=>{xs(s[t],r)},n)}function Hn(e,t,n=pe,s=!1){if(n){const r=n[e]||(n[e]=[]),o=t.__weh||(t.__weh=(...i)=>{et();const l=fn(n),c=Fe(t,n,e,i);return l(),tt(),c});return s?r.unshift(o):r.push(o),o}}const nt=e=>(t,n=pe)=>{(!sn||e==="sp")&&Hn(e,(...s)=>t(...s),n)},Ol=nt("bm"),ko=nt("m"),Ml=nt("bu"),Il=nt("u"),Uo=nt("bum"),Ko=nt("um"),Ll=nt("sp"),Nl=nt("rtg"),Fl=nt("rtc");function Dl(e,t=pe){Hn("ec",e,t)}const Wo="components",$l="directives";function Hl(e,t){return qo(Wo,e,!0,t)||e}const jl=Symbol.for("v-ndc");function bu(e){return qo($l,e)}function qo(e,t,n=!0,s=!1){const r=Re||pe;if(r){const o=r.type;if(e===Wo){const l=Rc(o,!1);if(l&&(l===t||l===Ie(t)||l===In(Ie(t))))return o}const i=tr(r[e]||o[e],t)||tr(r.appContext[e],t);return!i&&s?o:i}}function tr(e,t){return e&&(e[t]||e[Ie(t)]||e[In(Ie(t))])}function Eu(e,t,n,s){let r;const o=n,i=j(e);if(i||ce(e)){const l=i&&Pt(e);let c=!1,h=!1;l&&(c=!Me(e),h=at(e),e=Nn(e)),r=new Array(e.length);for(let f=0,a=e.length;f<a;f++)r[f]=t(c?h?En(he(e[f])):he(e[f]):e[f],f,void 0,o)}else if(typeof e=="number"){r=new Array(e);for(let l=0;l<e;l++)r[l]=t(l+1,l,void 0,o)}else if(ie(e))if(e[Symbol.iterator])r=Array.from(e,(l,c)=>t(l,c,void 0,o));else{const l=Object.keys(e);r=new Array(l.length);for(let c=0,h=l.length;c<h;c++){const f=l[c];r[c]=t(e[f],f,c,o)}}else r=[];return r}const hs=e=>e?gi(e)?Vn(e):hs(e.parent):null,zt=ae(Object.create(null),{$:e=>e,$el:e=>e.vnode.el,$data:e=>e.data,$props:e=>e.props,$attrs:e=>e.attrs,$slots:e=>e.slots,$refs:e=>e.refs,$parent:e=>hs(e.parent),$root:e=>hs(e.root),$host:e=>e.ce,$emit:e=>e.emit,$options:e=>zo(e),$forceUpdate:e=>e.f||(e.f=()=>{Ns(e.update)}),$nextTick:e=>e.n||(e.n=Co.bind(e.proxy)),$watch:e=>ic.bind(e)}),Qn=(e,t)=>e!==se&&!e.__isScriptSetup&&X(e,t),Bl={get({_:e},t){if(t==="__v_skip")return!0;const{ctx:n,setupState:s,data:r,props:o,accessCache:i,type:l,appContext:c}=e;let h;if(t[0]!=="$"){const m=i[t];if(m!==void 0)switch(m){case 1:return s[t];case 2:return r[t];case 4:return n[t];case 3:return o[t]}else{if(Qn(s,t))return i[t]=1,s[t];if(r!==se&&X(r,t))return i[t]=2,r[t];if((h=e.propsOptions[0])&&X(h,t))return i[t]=3,o[t];if(n!==se&&X(n,t))return i[t]=4,n[t];ds&&(i[t]=0)}}const f=zt[t];let a,p;if(f)return t==="$attrs"&&de(e.attrs,"get",""),f(e);if((a=l.__cssModules)&&(a=a[t]))return a;if(n!==se&&X(n,t))return i[t]=4,n[t];if(p=c.config.globalProperties,X(p,t))return p[t]},set({_:e},t,n){const{data:s,setupState:r,ctx:o}=e;return Qn(r,t)?(r[t]=n,!0):s!==se&&X(s,t)?(s[t]=n,!0):X(e.props,t)||t[0]==="$"&&t.slice(1)in e?!1:(o[t]=n,!0)},has({_:{data:e,setupState:t,accessCache:n,ctx:s,appContext:r,propsOptions:o}},i){let l;return!!n[i]||e!==se&&X(e,i)||Qn(t,i)||(l=o[0])&&X(l,i)||X(s,i)||X(zt,i)||X(r.config.globalProperties,i)},defineProperty(e,t,n){return n.get!=null?e._.accessCache[t]=0:X(n,"value")&&this.set(e,t,n.value,null),Reflect.defineProperty(e,t,n)}};function nr(e){return j(e)?e.reduce((t,n)=>(t[n]=null,t),{}):e}let ds=!0;function Vl(e){const t=zo(e),n=e.proxy,s=e.ctx;ds=!1,t.beforeCreate&&sr(t.beforeCreate,e,"bc");const{data:r,computed:o,methods:i,watch:l,provide:c,inject:h,created:f,beforeMount:a,mounted:p,beforeUpdate:m,updated:S,activated:x,deactivated:B,beforeDestroy:L,beforeUnmount:M,destroyed:N,unmounted:O,render:U,renderTracked:W,renderTriggered:q,errorCaptured:le,serverPrefetch:$,expose:K,inheritAttrs:Z,components:I,directives:J,filters:ue}=t;if(h&&kl(h,s,null),i)for(const te in i){const Q=i[te];k(Q)&&(s[te]=Q.bind(n))}if(r){const te=r.call(n,n);ie(te)&&(e.data=Fn(te))}if(ds=!0,o)for(const te in o){const Q=o[te],Ge=k(Q)?Q.bind(n,n):k(Q.get)?Q.get.bind(n,n):We,st=!k(Q)&&k(Q.set)?Q.set.bind(n):We,$e=Le({get:Ge,set:st});Object.defineProperty(s,te,{enumerable:!0,configurable:!0,get:()=>$e.value,set:be=>$e.value=be})}if(l)for(const te in l)Go(l[te],s,n,te);if(c){const te=k(c)?c.call(n):c;Reflect.ownKeys(te).forEach(Q=>{_n(Q,te[Q])})}f&&sr(f,e,"c");function fe(te,Q){j(Q)?Q.forEach(Ge=>te(Ge.bind(n))):Q&&te(Q.bind(n))}if(fe(Ol,a),fe(ko,p),fe(Ml,m),fe(Il,S),fe(Al,x),fe(Tl,B),fe(Dl,le),fe(Fl,W),fe(Nl,q),fe(Uo,M),fe(Ko,O),fe(Ll,$),j(K))if(K.length){const te=e.exposed||(e.exposed={});K.forEach(Q=>{Object.defineProperty(te,Q,{get:()=>n[Q],set:Ge=>n[Q]=Ge,enumerable:!0})})}else e.exposed||(e.exposed={});U&&e.render===We&&(e.render=U),Z!=null&&(e.inheritAttrs=Z),I&&(e.components=I),J&&(e.directives=J),$&&Bo(e)}function kl(e,t,n=We){j(e)&&(e=ps(e));for(const s in e){const r=e[s];let o;ie(r)?"default"in r?o=qe(r.from||s,r.default,!0):o=qe(r.from||s):o=qe(r),ge(o)?Object.defineProperty(t,s,{enumerable:!0,configurable:!0,get:()=>o.value,set:i=>o.value=i}):t[s]=o}}function sr(e,t,n){Fe(j(e)?e.map(s=>s.bind(t.proxy)):e.bind(t.proxy),t,n)}function Go(e,t,n,s){let r=s.includes(".")?ii(n,s):()=>n[s];if(ce(e)){const o=t[e];k(o)&&yn(r,o)}else if(k(e))yn(r,e.bind(n));else if(ie(e))if(j(e))e.forEach(o=>Go(o,t,n,s));else{const o=k(e.handler)?e.handler.bind(n):t[e.handler];k(o)&&yn(r,o,e)}}function zo(e){const t=e.type,{mixins:n,extends:s}=t,{mixins:r,optionsCache:o,config:{optionMergeStrategies:i}}=e.appContext,l=o.get(t);let c;return l?c=l:!r.length&&!n&&!s?c=t:(c={},r.length&&r.forEach(h=>Cn(c,h,i,!0)),Cn(c,t,i)),ie(t)&&o.set(t,c),c}function Cn(e,t,n,s=!1){const{mixins:r,extends:o}=t;o&&Cn(e,o,n,!0),r&&r.forEach(i=>Cn(e,i,n,!0));for(const i in t)if(!(s&&i==="expose")){const l=Ul[i]||n&&n[i];e[i]=l?l(e[i],t[i]):t[i]}return e}const Ul={data:rr,props:or,emits:or,methods:Vt,computed:Vt,beforeCreate:me,created:me,beforeMount:me,mounted:me,beforeUpdate:me,updated:me,beforeDestroy:me,beforeUnmount:me,destroyed:me,unmounted:me,activated:me,deactivated:me,errorCaptured:me,serverPrefetch:me,components:Vt,directives:Vt,watch:Wl,provide:rr,inject:Kl};function rr(e,t){return t?e?function(){return ae(k(e)?e.call(this,this):e,k(t)?t.call(this,this):t)}:t:e}function Kl(e,t){return Vt(ps(e),ps(t))}function ps(e){if(j(e)){const t={};for(let n=0;n<e.length;n++)t[e[n]]=e[n];return t}return e}function me(e,t){return e?[...new Set([].concat(e,t))]:t}function Vt(e,t){return e?ae(Object.create(null),e,t):t}function or(e,t){return e?j(e)&&j(t)?[...new Set([...e,...t])]:ae(Object.create(null),nr(e),nr(t??{})):t}function Wl(e,t){if(!e)return t;if(!t)return e;const n=ae(Object.create(null),e);for(const s in t)n[s]=me(e[s],t[s]);return n}function Jo(){return{app:null,config:{isNativeTag:Ii,performance:!1,globalProperties:{},optionMergeStrategies:{},errorHandler:void 0,warnHandler:void 0,compilerOptions:{}},mixins:[],components:{},directives:{},provides:Object.create(null),optionsCache:new WeakMap,propsCache:new WeakMap,emitsCache:new WeakMap}}let ql=0;function Gl(e,t){return function(s,r=null){k(s)||(s=ae({},s)),r!=null&&!ie(r)&&(r=null);const o=Jo(),i=new WeakSet,l=[];let c=!1;const h=o.app={_uid:ql++,_component:s,_props:r,_container:null,_context:o,_instance:null,version:Tc,get config(){return o.config},set config(f){},use(f,...a){return i.has(f)||(f&&k(f.install)?(i.add(f),f.install(h,...a)):k(f)&&(i.add(f),f(h,...a))),h},mixin(f){return o.mixins.includes(f)||o.mixins.push(f),h},component(f,a){return a?(o.components[f]=a,h):o.components[f]},directive(f,a){return a?(o.directives[f]=a,h):o.directives[f]},mount(f,a,p){if(!c){const m=h._ceVNode||Te(s,r);return m.appContext=o,p===!0?p="svg":p===!1&&(p=void 0),e(m,f,p),c=!0,h._container=f,f.__vue_app__=h,Vn(m.component)}},onUnmount(f){l.push(f)},unmount(){c&&(Fe(l,h._instance,16),e(null,h._container),delete h._container.__vue_app__)},provide(f,a){return o.provides[f]=a,h},runWithContext(f){const a=It;It=h;try{return f()}finally{It=a}}};return h}}let It=null;function _n(e,t){if(pe){let n=pe.provides;const s=pe.parent&&pe.parent.provides;s===n&&(n=pe.provides=Object.create(s)),n[e]=t}}function qe(e,t,n=!1){const s=pi();if(s||It){let r=It?It._context.provides:s?s.parent==null||s.ce?s.vnode.appContext&&s.vnode.appContext.provides:s.parent.provides:void 0;if(r&&e in r)return r[e];if(arguments.length>1)return n&&k(t)?t.call(s&&s.proxy):t}}const Qo={},Yo=()=>Object.create(Qo),Xo=e=>Object.getPrototypeOf(e)===Qo;function zl(e,t,n,s=!1){const r={},o=Yo();e.propsDefaults=Object.create(null),Zo(e,t,r,o);for(const i in e.propsOptions[0])i in r||(r[i]=void 0);n?e.props=s?r:yo(r):e.type.props?e.props=r:e.props=o,e.attrs=o}function Jl(e,t,n,s){const{props:r,attrs:o,vnode:{patchFlag:i}}=e,l=z(r),[c]=e.propsOptions;let h=!1;if((s||i>0)&&!(i&16)){if(i&8){const f=e.vnode.dynamicProps;for(let a=0;a<f.length;a++){let p=f[a];if(jn(e.emitsOptions,p))continue;const m=t[p];if(c)if(X(o,p))m!==o[p]&&(o[p]=m,h=!0);else{const S=Ie(p);r[S]=gs(c,l,S,m,e,!1)}else m!==o[p]&&(o[p]=m,h=!0)}}}else{Zo(e,t,r,o)&&(h=!0);let f;for(const a in l)(!t||!X(t,a)&&((f=Et(a))===a||!X(t,f)))&&(c?n&&(n[a]!==void 0||n[f]!==void 0)&&(r[a]=gs(c,l,a,void 0,e,!0)):delete r[a]);if(o!==l)for(const a in o)(!t||!X(t,a))&&(delete o[a],h=!0)}h&&Xe(e.attrs,"set","")}function Zo(e,t,n,s){const[r,o]=e.propsOptions;let i=!1,l;if(t)for(let c in t){if(kt(c))continue;const h=t[c];let f;r&&X(r,f=Ie(c))?!o||!o.includes(f)?n[f]=h:(l||(l={}))[f]=h:jn(e.emitsOptions,c)||(!(c in s)||h!==s[c])&&(s[c]=h,i=!0)}if(o){const c=z(n),h=l||se;for(let f=0;f<o.length;f++){const a=o[f];n[a]=gs(r,c,a,h[a],e,!X(h,a))}}return i}function gs(e,t,n,s,r,o){const i=e[n];if(i!=null){const l=X(i,"default");if(l&&s===void 0){const c=i.default;if(i.type!==Function&&!i.skipFactory&&k(c)){const{propsDefaults:h}=r;if(n in h)s=h[n];else{const f=fn(r);s=h[n]=c.call(null,t),f()}}else s=c;r.ce&&r.ce._setProp(n,s)}i[0]&&(o&&!l?s=!1:i[1]&&(s===""||s===Et(n))&&(s=!0))}return s}const Ql=new WeakMap;function ei(e,t,n=!1){const s=n?Ql:t.propsCache,r=s.get(e);if(r)return r;const o=e.props,i={},l=[];let c=!1;if(!k(e)){const f=a=>{c=!0;const[p,m]=ei(a,t,!0);ae(i,p),m&&l.push(...m)};!n&&t.mixins.length&&t.mixins.forEach(f),e.extends&&f(e.extends),e.mixins&&e.mixins.forEach(f)}if(!o&&!c)return ie(e)&&s.set(e,At),At;if(j(o))for(let f=0;f<o.length;f++){const a=Ie(o[f]);ir(a)&&(i[a]=se)}else if(o)for(const f in o){const a=Ie(f);if(ir(a)){const p=o[f],m=i[a]=j(p)||k(p)?{type:p}:ae({},p),S=m.type;let x=!1,B=!0;if(j(S))for(let L=0;L<S.length;++L){const M=S[L],N=k(M)&&M.name;if(N==="Boolean"){x=!0;break}else N==="String"&&(B=!1)}else x=k(S)&&S.name==="Boolean";m[0]=x,m[1]=B,(x||X(m,"default"))&&l.push(a)}}const h=[i,l];return ie(e)&&s.set(e,h),h}function ir(e){return e[0]!=="$"&&!kt(e)}const Fs=e=>e==="_"||e==="__"||e==="_ctx"||e==="$stable",Ds=e=>j(e)?e.map(Ke):[Ke(e)],Yl=(e,t,n)=>{if(t._n)return t;const s=Sl((...r)=>Ds(t(...r)),n);return s._c=!1,s},ti=(e,t,n)=>{const s=e._ctx;for(const r in e){if(Fs(r))continue;const o=e[r];if(k(o))t[r]=Yl(r,o,s);else if(o!=null){const i=Ds(o);t[r]=()=>i}}},ni=(e,t)=>{const n=Ds(t);e.slots.default=()=>n},si=(e,t,n)=>{for(const s in t)(n||!Fs(s))&&(e[s]=t[s])},Xl=(e,t,n)=>{const s=e.slots=Yo();if(e.vnode.shapeFlag&32){const r=t.__;r&&os(s,"__",r,!0);const o=t._;o?(si(s,t,n),n&&os(s,"_",o,!0)):ti(t,s)}else t&&ni(e,t)},Zl=(e,t,n)=>{const{vnode:s,slots:r}=e;let o=!0,i=se;if(s.shapeFlag&32){const l=t._;l?n&&l===1?o=!1:si(r,t,n):(o=!t.$stable,ti(t,r)),i=t}else t&&(ni(e,t),i={default:1});if(o)for(const l in r)!Fs(l)&&i[l]==null&&delete r[l]},_e=dc;function ec(e){return tc(e)}function tc(e,t){const n=Ln();n.__VUE__=!0;const{insert:s,remove:r,patchProp:o,createElement:i,createText:l,createComment:c,setText:h,setElementText:f,parentNode:a,nextSibling:p,setScopeId:m=We,insertStaticContent:S}=e,x=(u,d,g,_=null,b=null,v=null,R=void 0,C=null,w=!!d.dynamicChildren)=>{if(u===d)return;u&&!vt(u,d)&&(_=y(u),be(u,b,v,!0),u=null),d.patchFlag===-2&&(w=!1,d.dynamicChildren=null);const{type:E,ref:H,shapeFlag:T}=d;switch(E){case Bn:B(u,d,g,_);break;case ve:L(u,d,g,_);break;case Xn:u==null&&M(d,g,_,R);break;case Ue:I(u,d,g,_,b,v,R,C,w);break;default:T&1?U(u,d,g,_,b,v,R,C,w):T&6?J(u,d,g,_,b,v,R,C,w):(T&64||T&128)&&E.process(u,d,g,_,b,v,R,C,w,F)}H!=null&&b?qt(H,u&&u.ref,v,d||u,!d):H==null&&u&&u.ref!=null&&qt(u.ref,null,v,u,!0)},B=(u,d,g,_)=>{if(u==null)s(d.el=l(d.children),g,_);else{const b=d.el=u.el;d.children!==u.children&&h(b,d.children)}},L=(u,d,g,_)=>{u==null?s(d.el=c(d.children||""),g,_):d.el=u.el},M=(u,d,g,_)=>{[u.el,u.anchor]=S(u.children,d,g,_,u.el,u.anchor)},N=({el:u,anchor:d},g,_)=>{let b;for(;u&&u!==d;)b=p(u),s(u,g,_),u=b;s(d,g,_)},O=({el:u,anchor:d})=>{let g;for(;u&&u!==d;)g=p(u),r(u),u=g;r(d)},U=(u,d,g,_,b,v,R,C,w)=>{d.type==="svg"?R="svg":d.type==="math"&&(R="mathml"),u==null?W(d,g,_,b,v,R,C,w):$(u,d,b,v,R,C,w)},W=(u,d,g,_,b,v,R,C)=>{let w,E;const{props:H,shapeFlag:T,transition:D,dirs:V}=u;if(w=u.el=i(u.type,v,H&&H.is,H),T&8?f(w,u.children):T&16&&le(u.children,w,null,_,b,Yn(u,v),R,C),V&&pt(u,null,_,"created"),q(w,u,u.scopeId,R,_),H){for(const re in H)re!=="value"&&!kt(re)&&o(w,re,null,H[re],v,_);"value"in H&&o(w,"value",null,H.value,v),(E=H.onVnodeBeforeMount)&&Ve(E,_,u)}V&&pt(u,null,_,"beforeMount");const G=nc(b,D);G&&D.beforeEnter(w),s(w,d,g),((E=H&&H.onVnodeMounted)||G||V)&&_e(()=>{E&&Ve(E,_,u),G&&D.enter(w),V&&pt(u,null,_,"mounted")},b)},q=(u,d,g,_,b)=>{if(g&&m(u,g),_)for(let v=0;v<_.length;v++)m(u,_[v]);if(b){let v=b.subTree;if(d===v||ci(v.type)&&(v.ssContent===d||v.ssFallback===d)){const R=b.vnode;q(u,R,R.scopeId,R.slotScopeIds,b.parent)}}},le=(u,d,g,_,b,v,R,C,w=0)=>{for(let E=w;E<u.length;E++){const H=u[E]=C?ct(u[E]):Ke(u[E]);x(null,H,d,g,_,b,v,R,C)}},$=(u,d,g,_,b,v,R)=>{const C=d.el=u.el;let{patchFlag:w,dynamicChildren:E,dirs:H}=d;w|=u.patchFlag&16;const T=u.props||se,D=d.props||se;let V;if(g&&gt(g,!1),(V=D.onVnodeBeforeUpdate)&&Ve(V,g,d,u),H&&pt(d,u,g,"beforeUpdate"),g&&gt(g,!0),(T.innerHTML&&D.innerHTML==null||T.textContent&&D.textContent==null)&&f(C,""),E?K(u.dynamicChildren,E,C,g,_,Yn(d,b),v):R||Q(u,d,C,null,g,_,Yn(d,b),v,!1),w>0){if(w&16)Z(C,T,D,g,b);else if(w&2&&T.class!==D.class&&o(C,"class",null,D.class,b),w&4&&o(C,"style",T.style,D.style,b),w&8){const G=d.dynamicProps;for(let re=0;re<G.length;re++){const ee=G[re],Ee=T[ee],Se=D[ee];(Se!==Ee||ee==="value")&&o(C,ee,Ee,Se,b,g)}}w&1&&u.children!==d.children&&f(C,d.children)}else!R&&E==null&&Z(C,T,D,g,b);((V=D.onVnodeUpdated)||H)&&_e(()=>{V&&Ve(V,g,d,u),H&&pt(d,u,g,"updated")},_)},K=(u,d,g,_,b,v,R)=>{for(let C=0;C<d.length;C++){const w=u[C],E=d[C],H=w.el&&(w.type===Ue||!vt(w,E)||w.shapeFlag&198)?a(w.el):g;x(w,E,H,null,_,b,v,R,!0)}},Z=(u,d,g,_,b)=>{if(d!==g){if(d!==se)for(const v in d)!kt(v)&&!(v in g)&&o(u,v,d[v],null,b,_);for(const v in g){if(kt(v))continue;const R=g[v],C=d[v];R!==C&&v!=="value"&&o(u,v,C,R,b,_)}"value"in g&&o(u,"value",d.value,g.value,b)}},I=(u,d,g,_,b,v,R,C,w)=>{const E=d.el=u?u.el:l(""),H=d.anchor=u?u.anchor:l("");let{patchFlag:T,dynamicChildren:D,slotScopeIds:V}=d;V&&(C=C?C.concat(V):V),u==null?(s(E,g,_),s(H,g,_),le(d.children||[],g,H,b,v,R,C,w)):T>0&&T&64&&D&&u.dynamicChildren?(K(u.dynamicChildren,D,g,b,v,R,C),(d.key!=null||b&&d===b.subTree)&&$s(u,d,!0)):Q(u,d,g,H,b,v,R,C,w)},J=(u,d,g,_,b,v,R,C,w)=>{d.slotScopeIds=C,u==null?d.shapeFlag&512?b.ctx.activate(d,g,_,R,w):ue(d,g,_,b,v,R,w):we(u,d,w)},ue=(u,d,g,_,b,v,R)=>{const C=u.component=Ec(u,_,b);if($n(u)&&(C.ctx.renderer=F),Sc(C,!1,R),C.asyncDep){if(b&&b.registerDep(C,fe,R),!u.el){const w=C.subTree=Te(ve);L(null,w,d,g),u.placeholder=w.el}}else fe(C,u,d,g,b,v,R)},we=(u,d,g)=>{const _=d.component=u.component;if(ac(u,d,g))if(_.asyncDep&&!_.asyncResolved){te(_,d,g);return}else _.next=d,_.update();else d.el=u.el,_.vnode=d},fe=(u,d,g,_,b,v,R)=>{const C=()=>{if(u.isMounted){let{next:T,bu:D,u:V,parent:G,vnode:re}=u;{const je=ri(u);if(je){T&&(T.el=re.el,te(u,T,R)),je.asyncDep.then(()=>{u.isUnmounted||C()});return}}let ee=T,Ee;gt(u,!1),T?(T.el=re.el,te(u,T,R)):T=re,D&&Kn(D),(Ee=T.props&&T.props.onVnodeBeforeUpdate)&&Ve(Ee,G,T,re),gt(u,!0);const Se=cr(u),He=u.subTree;u.subTree=Se,x(He,Se,a(He.el),y(He),u,b,v),T.el=Se.el,ee===null&&hc(u,Se.el),V&&_e(V,b),(Ee=T.props&&T.props.onVnodeUpdated)&&_e(()=>Ve(Ee,G,T,re),b)}else{let T;const{el:D,props:V}=d,{bm:G,m:re,parent:ee,root:Ee,type:Se}=u,He=Gt(d);gt(u,!1),G&&Kn(G),!He&&(T=V&&V.onVnodeBeforeMount)&&Ve(T,ee,d),gt(u,!0);{Ee.ce&&Ee.ce._def.shadowRoot!==!1&&Ee.ce._injectChildStyle(Se);const je=u.subTree=cr(u);x(null,je,g,_,u,b,v),d.el=je.el}if(re&&_e(re,b),!He&&(T=V&&V.onVnodeMounted)){const je=d;_e(()=>Ve(T,ee,je),b)}(d.shapeFlag&256||ee&&Gt(ee.vnode)&&ee.vnode.shapeFlag&256)&&u.a&&_e(u.a,b),u.isMounted=!0,d=g=_=null}};u.scope.on();const w=u.effect=new so(C);u.scope.off();const E=u.update=w.run.bind(w),H=u.job=w.runIfDirty.bind(w);H.i=u,H.id=u.uid,w.scheduler=()=>Ns(H),gt(u,!0),E()},te=(u,d,g)=>{d.component=u;const _=u.vnode.props;u.vnode=d,u.next=null,Jl(u,d.props,_,g),Zl(u,d.children,g),et(),Qs(u),tt()},Q=(u,d,g,_,b,v,R,C,w=!1)=>{const E=u&&u.children,H=u?u.shapeFlag:0,T=d.children,{patchFlag:D,shapeFlag:V}=d;if(D>0){if(D&128){st(E,T,g,_,b,v,R,C,w);return}else if(D&256){Ge(E,T,g,_,b,v,R,C,w);return}}V&8?(H&16&&Pe(E,b,v),T!==E&&f(g,T)):H&16?V&16?st(E,T,g,_,b,v,R,C,w):Pe(E,b,v,!0):(H&8&&f(g,""),V&16&&le(T,g,_,b,v,R,C,w))},Ge=(u,d,g,_,b,v,R,C,w)=>{u=u||At,d=d||At;const E=u.length,H=d.length,T=Math.min(E,H);let D;for(D=0;D<T;D++){const V=d[D]=w?ct(d[D]):Ke(d[D]);x(u[D],V,g,null,b,v,R,C,w)}E>H?Pe(u,b,v,!0,!1,T):le(d,g,_,b,v,R,C,w,T)},st=(u,d,g,_,b,v,R,C,w)=>{let E=0;const H=d.length;let T=u.length-1,D=H-1;for(;E<=T&&E<=D;){const V=u[E],G=d[E]=w?ct(d[E]):Ke(d[E]);if(vt(V,G))x(V,G,g,null,b,v,R,C,w);else break;E++}for(;E<=T&&E<=D;){const V=u[T],G=d[D]=w?ct(d[D]):Ke(d[D]);if(vt(V,G))x(V,G,g,null,b,v,R,C,w);else break;T--,D--}if(E>T){if(E<=D){const V=D+1,G=V<H?d[V].el:_;for(;E<=D;)x(null,d[E]=w?ct(d[E]):Ke(d[E]),g,G,b,v,R,C,w),E++}}else if(E>D)for(;E<=T;)be(u[E],b,v,!0),E++;else{const V=E,G=E,re=new Map;for(E=G;E<=D;E++){const Ce=d[E]=w?ct(d[E]):Ke(d[E]);Ce.key!=null&&re.set(Ce.key,E)}let ee,Ee=0;const Se=D-G+1;let He=!1,je=0;const Ft=new Array(Se);for(E=0;E<Se;E++)Ft[E]=0;for(E=V;E<=T;E++){const Ce=u[E];if(Ee>=Se){be(Ce,b,v,!0);continue}let Be;if(Ce.key!=null)Be=re.get(Ce.key);else for(ee=G;ee<=D;ee++)if(Ft[ee-G]===0&&vt(Ce,d[ee])){Be=ee;break}Be===void 0?be(Ce,b,v,!0):(Ft[Be-G]=E+1,Be>=je?je=Be:He=!0,x(Ce,d[Be],g,null,b,v,R,C,w),Ee++)}const Ks=He?sc(Ft):At;for(ee=Ks.length-1,E=Se-1;E>=0;E--){const Ce=G+E,Be=d[Ce],Ws=d[Ce+1],qs=Ce+1<H?Ws.el||Ws.placeholder:_;Ft[E]===0?x(null,Be,g,qs,b,v,R,C,w):He&&(ee<0||E!==Ks[ee]?$e(Be,g,qs,2):ee--)}}},$e=(u,d,g,_,b=null)=>{const{el:v,type:R,transition:C,children:w,shapeFlag:E}=u;if(E&6){$e(u.component.subTree,d,g,_);return}if(E&128){u.suspense.move(d,g,_);return}if(E&64){R.move(u,d,g,F);return}if(R===Ue){s(v,d,g);for(let T=0;T<w.length;T++)$e(w[T],d,g,_);s(u.anchor,d,g);return}if(R===Xn){N(u,d,g);return}if(_!==2&&E&1&&C)if(_===0)C.beforeEnter(v),s(v,d,g),_e(()=>C.enter(v),b);else{const{leave:T,delayLeave:D,afterLeave:V}=C,G=()=>{u.ctx.isUnmounted?r(v):s(v,d,g)},re=()=>{T(v,()=>{G(),V&&V()})};D?D(v,G,re):re()}else s(v,d,g)},be=(u,d,g,_=!1,b=!1)=>{const{type:v,props:R,ref:C,children:w,dynamicChildren:E,shapeFlag:H,patchFlag:T,dirs:D,cacheIndex:V}=u;if(T===-2&&(b=!1),C!=null&&(et(),qt(C,null,g,u,!0),tt()),V!=null&&(d.renderCache[V]=void 0),H&256){d.ctx.deactivate(u);return}const G=H&1&&D,re=!Gt(u);let ee;if(re&&(ee=R&&R.onVnodeBeforeUnmount)&&Ve(ee,d,u),H&6)un(u.component,g,_);else{if(H&128){u.suspense.unmount(g,_);return}G&&pt(u,null,d,"beforeUnmount"),H&64?u.type.remove(u,d,g,F,_):E&&!E.hasOnce&&(v!==Ue||T>0&&T&64)?Pe(E,d,g,!1,!0):(v===Ue&&T&384||!b&&H&16)&&Pe(w,d,g),_&&St(u)}(re&&(ee=R&&R.onVnodeUnmounted)||G)&&_e(()=>{ee&&Ve(ee,d,u),G&&pt(u,null,d,"unmounted")},g)},St=u=>{const{type:d,el:g,anchor:_,transition:b}=u;if(d===Ue){xt(g,_);return}if(d===Xn){O(u);return}const v=()=>{r(g),b&&!b.persisted&&b.afterLeave&&b.afterLeave()};if(u.shapeFlag&1&&b&&!b.persisted){const{leave:R,delayLeave:C}=b,w=()=>R(g,v);C?C(u.el,v,w):w()}else v()},xt=(u,d)=>{let g;for(;u!==d;)g=p(u),r(u),u=g;r(d)},un=(u,d,g)=>{const{bum:_,scope:b,job:v,subTree:R,um:C,m:w,a:E,parent:H,slots:{__:T}}=u;lr(w),lr(E),_&&Kn(_),H&&j(T)&&T.forEach(D=>{H.renderCache[D]=void 0}),b.stop(),v&&(v.flags|=8,be(R,u,d,g)),C&&_e(C,d),_e(()=>{u.isUnmounted=!0},d),d&&d.pendingBranch&&!d.isUnmounted&&u.asyncDep&&!u.asyncResolved&&u.suspenseId===d.pendingId&&(d.deps--,d.deps===0&&d.resolve())},Pe=(u,d,g,_=!1,b=!1,v=0)=>{for(let R=v;R<u.length;R++)be(u[R],d,g,_,b)},y=u=>{if(u.shapeFlag&6)return y(u.component.subTree);if(u.shapeFlag&128)return u.suspense.next();const d=p(u.anchor||u.el),g=d&&d[Oo];return g?p(g):d};let P=!1;const A=(u,d,g)=>{u==null?d._vnode&&be(d._vnode,null,null,!0):x(d._vnode||null,u,d,null,null,null,g),d._vnode=u,P||(P=!0,Qs(),Ao(),P=!1)},F={p:x,um:be,m:$e,r:St,mt:ue,mc:le,pc:Q,pbc:K,n:y,o:e};return{render:A,hydrate:void 0,createApp:Gl(A)}}function Yn({type:e,props:t},n){return n==="svg"&&e==="foreignObject"||n==="mathml"&&e==="annotation-xml"&&t&&t.encoding&&t.encoding.includes("html")?void 0:n}function gt({effect:e,job:t},n){n?(e.flags|=32,t.flags|=4):(e.flags&=-33,t.flags&=-5)}function nc(e,t){return(!e||e&&!e.pendingBranch)&&t&&!t.persisted}function $s(e,t,n=!1){const s=e.children,r=t.children;if(j(s)&&j(r))for(let o=0;o<s.length;o++){const i=s[o];let l=r[o];l.shapeFlag&1&&!l.dynamicChildren&&((l.patchFlag<=0||l.patchFlag===32)&&(l=r[o]=ct(r[o]),l.el=i.el),!n&&l.patchFlag!==-2&&$s(i,l)),l.type===Bn&&(l.el=i.el),l.type===ve&&!l.el&&(l.el=i.el)}}function sc(e){const t=e.slice(),n=[0];let s,r,o,i,l;const c=e.length;for(s=0;s<c;s++){const h=e[s];if(h!==0){if(r=n[n.length-1],e[r]<h){t[s]=r,n.push(s);continue}for(o=0,i=n.length-1;o<i;)l=o+i>>1,e[n[l]]<h?o=l+1:i=l;h<e[n[o]]&&(o>0&&(t[s]=n[o-1]),n[o]=s)}}for(o=n.length,i=n[o-1];o-- >0;)n[o]=i,i=t[i];return n}function ri(e){const t=e.subTree.component;if(t)return t.asyncDep&&!t.asyncResolved?t:ri(t)}function lr(e){if(e)for(let t=0;t<e.length;t++)e[t].flags|=8}const rc=Symbol.for("v-scx"),oc=()=>qe(rc);function yn(e,t,n){return oi(e,t,n)}function oi(e,t,n=se){const{immediate:s,deep:r,flush:o,once:i}=n,l=ae({},n),c=t&&s||!t&&o!=="post";let h;if(sn){if(o==="sync"){const m=oc();h=m.__watcherHandles||(m.__watcherHandles=[])}else if(!c){const m=()=>{};return m.stop=We,m.resume=We,m.pause=We,m}}const f=pe;l.call=(m,S,x)=>Fe(m,f,S,x);let a=!1;o==="post"?l.scheduler=m=>{_e(m,f&&f.suspense)}:o!=="sync"&&(a=!0,l.scheduler=(m,S)=>{S?m():Ns(m)}),l.augmentJob=m=>{t&&(m.flags|=4),a&&(m.flags|=2,f&&(m.id=f.uid,m.i=f))};const p=yl(e,t,l);return sn&&(h?h.push(p):c&&p()),p}function ic(e,t,n){const s=this.proxy,r=ce(e)?e.includes(".")?ii(s,e):()=>s[e]:e.bind(s,s);let o;k(t)?o=t:(o=t.handler,n=t);const i=fn(this),l=oi(r,o.bind(s),n);return i(),l}function ii(e,t){const n=t.split(".");return()=>{let s=e;for(let r=0;r<n.length&&s;r++)s=s[n[r]];return s}}const lc=(e,t)=>t==="modelValue"||t==="model-value"?e.modelModifiers:e[`${t}Modifiers`]||e[`${Ie(t)}Modifiers`]||e[`${Et(t)}Modifiers`];function cc(e,t,...n){if(e.isUnmounted)return;const s=e.vnode.props||se;let r=n;const o=t.startsWith("update:"),i=o&&lc(s,t.slice(7));i&&(i.trim&&(r=n.map(f=>ce(f)?f.trim():f)),i.number&&(r=n.map($i)));let l,c=s[l=Un(t)]||s[l=Un(Ie(t))];!c&&o&&(c=s[l=Un(Et(t))]),c&&Fe(c,e,6,r);const h=s[l+"Once"];if(h){if(!e.emitted)e.emitted={};else if(e.emitted[l])return;e.emitted[l]=!0,Fe(h,e,6,r)}}function li(e,t,n=!1){const s=t.emitsCache,r=s.get(e);if(r!==void 0)return r;const o=e.emits;let i={},l=!1;if(!k(e)){const c=h=>{const f=li(h,t,!0);f&&(l=!0,ae(i,f))};!n&&t.mixins.length&&t.mixins.forEach(c),e.extends&&c(e.extends),e.mixins&&e.mixins.forEach(c)}return!o&&!l?(ie(e)&&s.set(e,null),null):(j(o)?o.forEach(c=>i[c]=null):ae(i,o),ie(e)&&s.set(e,i),i)}function jn(e,t){return!e||!Pn(t)?!1:(t=t.slice(2).replace(/Once$/,""),X(e,t[0].toLowerCase()+t.slice(1))||X(e,Et(t))||X(e,t))}function cr(e){const{type:t,vnode:n,proxy:s,withProxy:r,propsOptions:[o],slots:i,attrs:l,emit:c,render:h,renderCache:f,props:a,data:p,setupState:m,ctx:S,inheritAttrs:x}=e,B=wn(e);let L,M;try{if(n.shapeFlag&4){const O=r||s,U=O;L=Ke(h.call(U,O,f,a,m,p,S)),M=l}else{const O=t;L=Ke(O.length>1?O(a,{attrs:l,slots:i,emit:c}):O(a,null)),M=t.props?l:fc(l)}}catch(O){Jt.length=0,Dn(O,e,1),L=Te(ve)}let N=L;if(M&&x!==!1){const O=Object.keys(M),{shapeFlag:U}=N;O.length&&U&7&&(o&&O.some(Ss)&&(M=uc(M,o)),N=ht(N,M,!1,!0))}return n.dirs&&(N=ht(N,null,!1,!0),N.dirs=N.dirs?N.dirs.concat(n.dirs):n.dirs),n.transition&&tn(N,n.transition),L=N,wn(B),L}const fc=e=>{let t;for(const n in e)(n==="class"||n==="style"||Pn(n))&&((t||(t={}))[n]=e[n]);return t},uc=(e,t)=>{const n={};for(const s in e)(!Ss(s)||!(s.slice(9)in t))&&(n[s]=e[s]);return n};function ac(e,t,n){const{props:s,children:r,component:o}=e,{props:i,children:l,patchFlag:c}=t,h=o.emitsOptions;if(t.dirs||t.transition)return!0;if(n&&c>=0){if(c&1024)return!0;if(c&16)return s?fr(s,i,h):!!i;if(c&8){const f=t.dynamicProps;for(let a=0;a<f.length;a++){const p=f[a];if(i[p]!==s[p]&&!jn(h,p))return!0}}}else return(r||l)&&(!l||!l.$stable)?!0:s===i?!1:s?i?fr(s,i,h):!0:!!i;return!1}function fr(e,t,n){const s=Object.keys(t);if(s.length!==Object.keys(e).length)return!0;for(let r=0;r<s.length;r++){const o=s[r];if(t[o]!==e[o]&&!jn(n,o))return!0}return!1}function hc({vnode:e,parent:t},n){for(;t;){const s=t.subTree;if(s.suspense&&s.suspense.activeBranch===e&&(s.el=e.el),s===e)(e=t.vnode).el=n,t=t.parent;else break}}const ci=e=>e.__isSuspense;function dc(e,t){t&&t.pendingBranch?j(e)?t.effects.push(...e):t.effects.push(e):El(e)}const Ue=Symbol.for("v-fgt"),Bn=Symbol.for("v-txt"),ve=Symbol.for("v-cmt"),Xn=Symbol.for("v-stc"),Jt=[];let Ae=null;function fi(e=!1){Jt.push(Ae=e?null:[])}function pc(){Jt.pop(),Ae=Jt[Jt.length-1]||null}let nn=1;function ur(e,t=!1){nn+=e,e<0&&Ae&&t&&(Ae.hasOnce=!0)}function ui(e){return e.dynamicChildren=nn>0?Ae||At:null,pc(),nn>0&&Ae&&Ae.push(e),e}function Su(e,t,n,s,r,o){return ui(di(e,t,n,s,r,o,!0))}function ai(e,t,n,s,r){return ui(Te(e,t,n,s,r,!0))}function Rn(e){return e?e.__v_isVNode===!0:!1}function vt(e,t){return e.type===t.type&&e.key===t.key}const hi=({key:e})=>e??null,vn=({ref:e,ref_key:t,ref_for:n})=>(typeof e=="number"&&(e=""+e),e!=null?ce(e)||ge(e)||k(e)?{i:Re,r:e,k:t,f:!!n}:e:null);function di(e,t=null,n=null,s=0,r=null,o=e===Ue?0:1,i=!1,l=!1){const c={__v_isVNode:!0,__v_skip:!0,type:e,props:t,key:t&&hi(t),ref:t&&vn(t),scopeId:Po,slotScopeIds:null,children:n,component:null,suspense:null,ssContent:null,ssFallback:null,dirs:null,transition:null,el:null,anchor:null,target:null,targetStart:null,targetAnchor:null,staticCount:0,shapeFlag:o,patchFlag:s,dynamicProps:r,dynamicChildren:null,appContext:null,ctx:Re};return l?(Hs(c,n),o&128&&e.normalize(c)):n&&(c.shapeFlag|=ce(n)?8:16),nn>0&&!i&&Ae&&(c.patchFlag>0||o&6)&&c.patchFlag!==32&&Ae.push(c),c}const Te=gc;function gc(e,t=null,n=null,s=0,r=null,o=!1){if((!e||e===jl)&&(e=ve),Rn(e)){const l=ht(e,t,!0);return n&&Hs(l,n),nn>0&&!o&&Ae&&(l.shapeFlag&6?Ae[Ae.indexOf(e)]=l:Ae.push(l)),l.patchFlag=-2,l}if(Ac(e)&&(e=e.__vccOpts),t){t=mc(t);let{class:l,style:c}=t;l&&!ce(l)&&(t.class=Rs(l)),ie(c)&&(Ls(c)&&!j(c)&&(c=ae({},c)),t.style=Cs(c))}const i=ce(e)?1:ci(e)?128:Mo(e)?64:ie(e)?4:k(e)?2:0;return di(e,t,n,s,r,i,o,!0)}function mc(e){return e?Ls(e)||Xo(e)?ae({},e):e:null}function ht(e,t,n=!1,s=!1){const{props:r,ref:o,patchFlag:i,children:l,transition:c}=e,h=t?yc(r||{},t):r,f={__v_isVNode:!0,__v_skip:!0,type:e.type,props:h,key:h&&hi(h),ref:t&&t.ref?n&&o?j(o)?o.concat(vn(t)):[o,vn(t)]:vn(t):o,scopeId:e.scopeId,slotScopeIds:e.slotScopeIds,children:l,target:e.target,targetStart:e.targetStart,targetAnchor:e.targetAnchor,staticCount:e.staticCount,shapeFlag:e.shapeFlag,patchFlag:t&&e.type!==Ue?i===-1?16:i|16:i,dynamicProps:e.dynamicProps,dynamicChildren:e.dynamicChildren,appContext:e.appContext,dirs:e.dirs,transition:c,component:e.component,suspense:e.suspense,ssContent:e.ssContent&&ht(e.ssContent),ssFallback:e.ssFallback&&ht(e.ssFallback),placeholder:e.placeholder,el:e.el,anchor:e.anchor,ctx:e.ctx,ce:e.ce};return c&&s&&tn(f,c.clone(f)),f}function _c(e=" ",t=0){return Te(Bn,null,e,t)}function xu(e="",t=!1){return t?(fi(),ai(ve,null,e)):Te(ve,null,e)}function Ke(e){return e==null||typeof e=="boolean"?Te(ve):j(e)?Te(Ue,null,e.slice()):Rn(e)?ct(e):Te(Bn,null,String(e))}function ct(e){return e.el===null&&e.patchFlag!==-1||e.memo?e:ht(e)}function Hs(e,t){let n=0;const{shapeFlag:s}=e;if(t==null)t=null;else if(j(t))n=16;else if(typeof t=="object")if(s&65){const r=t.default;r&&(r._c&&(r._d=!1),Hs(e,r()),r._c&&(r._d=!0));return}else{n=32;const r=t._;!r&&!Xo(t)?t._ctx=Re:r===3&&Re&&(Re.slots._===1?t._=1:(t._=2,e.patchFlag|=1024))}else k(t)?(t={default:t,_ctx:Re},n=32):(t=String(t),s&64?(n=16,t=[_c(t)]):n=8);e.children=t,e.shapeFlag|=n}function yc(...e){const t={};for(let n=0;n<e.length;n++){const s=e[n];for(const r in s)if(r==="class")t.class!==s.class&&(t.class=Rs([t.class,s.class]));else if(r==="style")t.style=Cs([t.style,s.style]);else if(Pn(r)){const o=t[r],i=s[r];i&&o!==i&&!(j(o)&&o.includes(i))&&(t[r]=o?[].concat(o,i):i)}else r!==""&&(t[r]=s[r])}return t}function Ve(e,t,n,s=null){Fe(e,t,7,[n,s])}const vc=Jo();let bc=0;function Ec(e,t,n){const s=e.type,r=(t?t.appContext:e.appContext)||vc,o={uid:bc++,vnode:e,type:s,parent:t,appContext:r,root:null,next:null,subTree:null,effect:null,update:null,job:null,scope:new no(!0),render:null,proxy:null,exposed:null,exposeProxy:null,withProxy:null,provides:t?t.provides:Object.create(r.provides),ids:t?t.ids:["",0,0],accessCache:null,renderCache:[],components:null,directives:null,propsOptions:ei(s,r),emitsOptions:li(s,r),emit:null,emitted:null,propsDefaults:se,inheritAttrs:s.inheritAttrs,ctx:se,data:se,props:se,attrs:se,slots:se,refs:se,setupState:se,setupContext:null,suspense:n,suspenseId:n?n.pendingId:0,asyncDep:null,asyncResolved:!1,isMounted:!1,isUnmounted:!1,isDeactivated:!1,bc:null,c:null,bm:null,m:null,bu:null,u:null,um:null,bum:null,da:null,a:null,rtg:null,rtc:null,ec:null,sp:null};return o.ctx={_:o},o.root=t?t.root:o,o.emit=cc.bind(null,o),e.ce&&e.ce(o),o}let pe=null;const pi=()=>pe||Re;let An,ms;{const e=Ln(),t=(n,s)=>{let r;return(r=e[n])||(r=e[n]=[]),r.push(s),o=>{r.length>1?r.forEach(i=>i(o)):r[0](o)}};An=t("__VUE_INSTANCE_SETTERS__",n=>pe=n),ms=t("__VUE_SSR_SETTERS__",n=>sn=n)}const fn=e=>{const t=pe;return An(e),e.scope.on(),()=>{e.scope.off(),An(t)}},ar=()=>{pe&&pe.scope.off(),An(null)};function gi(e){return e.vnode.shapeFlag&4}let sn=!1;function Sc(e,t=!1,n=!1){t&&ms(t);const{props:s,children:r}=e.vnode,o=gi(e);zl(e,s,o,t),Xl(e,r,n||t);const i=o?xc(e,t):void 0;return t&&ms(!1),i}function xc(e,t){const n=e.type;e.accessCache=Object.create(null),e.proxy=new Proxy(e.ctx,Bl);const{setup:s}=n;if(s){et();const r=e.setupContext=s.length>1?Cc(e):null,o=fn(e),i=cn(s,e,0,[e.props,r]),l=Qr(i);if(tt(),o(),(l||e.sp)&&!Gt(e)&&Bo(e),l){if(i.then(ar,ar),t)return i.then(c=>{hr(e,c)}).catch(c=>{Dn(c,e,0)});e.asyncDep=i}else hr(e,i)}else mi(e)}function hr(e,t,n){k(t)?e.type.__ssrInlineRender?e.ssrRender=t:e.render=t:ie(t)&&(e.setupState=xo(t)),mi(e)}function mi(e,t,n){const s=e.type;e.render||(e.render=s.render||We);{const r=fn(e);et();try{Vl(e)}finally{tt(),r()}}}const wc={get(e,t){return de(e,"get",""),e[t]}};function Cc(e){const t=n=>{e.exposed=n||{}};return{attrs:new Proxy(e.attrs,wc),slots:e.slots,emit:e.emit,expose:t}}function Vn(e){return e.exposed?e.exposeProxy||(e.exposeProxy=new Proxy(xo(bo(e.exposed)),{get(t,n){if(n in t)return t[n];if(n in zt)return zt[n](e)},has(t,n){return n in t||n in zt}})):e.proxy}function Rc(e,t=!0){return k(e)?e.displayName||e.name:e.name||t&&e.__name}function Ac(e){return k(e)&&"__vccOpts"in e}const Le=(e,t)=>ml(e,t,sn);function js(e,t,n){const s=arguments.length;return s===2?ie(t)&&!j(t)?Rn(t)?Te(e,null,[t]):Te(e,t):Te(e,null,t):(s>3?n=Array.prototype.slice.call(arguments,2):s===3&&Rn(n)&&(n=[n]),Te(e,t,n))}const Tc="3.5.18";/**
+* @vue/runtime-dom v3.5.18
+* (c) 2018-present Yuxi (Evan) You and Vue contributors
+* @license MIT
+**/let _s;const dr=typeof window<"u"&&window.trustedTypes;if(dr)try{_s=dr.createPolicy("vue",{createHTML:e=>e})}catch{}const _i=_s?e=>_s.createHTML(e):e=>e,Pc="http://www.w3.org/2000/svg",Oc="http://www.w3.org/1998/Math/MathML",Ye=typeof document<"u"?document:null,pr=Ye&&Ye.createElement("template"),Mc={insert:(e,t,n)=>{t.insertBefore(e,n||null)},remove:e=>{const t=e.parentNode;t&&t.removeChild(e)},createElement:(e,t,n,s)=>{const r=t==="svg"?Ye.createElementNS(Pc,e):t==="mathml"?Ye.createElementNS(Oc,e):n?Ye.createElement(e,{is:n}):Ye.createElement(e);return e==="select"&&s&&s.multiple!=null&&r.setAttribute("multiple",s.multiple),r},createText:e=>Ye.createTextNode(e),createComment:e=>Ye.createComment(e),setText:(e,t)=>{e.nodeValue=t},setElementText:(e,t)=>{e.textContent=t},parentNode:e=>e.parentNode,nextSibling:e=>e.nextSibling,querySelector:e=>Ye.querySelector(e),setScopeId(e,t){e.setAttribute(t,"")},insertStaticContent(e,t,n,s,r,o){const i=n?n.previousSibling:t.lastChild;if(r&&(r===o||r.nextSibling))for(;t.insertBefore(r.cloneNode(!0),n),!(r===o||!(r=r.nextSibling)););else{pr.innerHTML=_i(s==="svg"?`<svg>${e}</svg>`:s==="mathml"?`<math>${e}</math>`:e);const l=pr.content;if(s==="svg"||s==="mathml"){const c=l.firstChild;for(;c.firstChild;)l.appendChild(c.firstChild);l.removeChild(c)}t.insertBefore(l,n)}return[i?i.nextSibling:t.firstChild,n?n.previousSibling:t.lastChild]}},rt="transition",$t="animation",rn=Symbol("_vtc"),yi={name:String,type:String,css:{type:Boolean,default:!0},duration:[String,Number,Object],enterFromClass:String,enterActiveClass:String,enterToClass:String,appearFromClass:String,appearActiveClass:String,appearToClass:String,leaveFromClass:String,leaveActiveClass:String,leaveToClass:String},Ic=ae({},No,yi),Lc=e=>(e.displayName="Transition",e.props=Ic,e),wu=Lc((e,{slots:t})=>js(Rl,Nc(e),t)),mt=(e,t=[])=>{j(e)?e.forEach(n=>n(...t)):e&&e(...t)},gr=e=>e?j(e)?e.some(t=>t.length>1):e.length>1:!1;function Nc(e){const t={};for(const I in e)I in yi||(t[I]=e[I]);if(e.css===!1)return t;const{name:n="v",type:s,duration:r,enterFromClass:o=`${n}-enter-from`,enterActiveClass:i=`${n}-enter-active`,enterToClass:l=`${n}-enter-to`,appearFromClass:c=o,appearActiveClass:h=i,appearToClass:f=l,leaveFromClass:a=`${n}-leave-from`,leaveActiveClass:p=`${n}-leave-active`,leaveToClass:m=`${n}-leave-to`}=e,S=Fc(r),x=S&&S[0],B=S&&S[1],{onBeforeEnter:L,onEnter:M,onEnterCancelled:N,onLeave:O,onLeaveCancelled:U,onBeforeAppear:W=L,onAppear:q=M,onAppearCancelled:le=N}=t,$=(I,J,ue,we)=>{I._enterCancelled=we,_t(I,J?f:l),_t(I,J?h:i),ue&&ue()},K=(I,J)=>{I._isLeaving=!1,_t(I,a),_t(I,m),_t(I,p),J&&J()},Z=I=>(J,ue)=>{const we=I?q:M,fe=()=>$(J,I,ue);mt(we,[J,fe]),mr(()=>{_t(J,I?c:o),Je(J,I?f:l),gr(we)||_r(J,s,x,fe)})};return ae(t,{onBeforeEnter(I){mt(L,[I]),Je(I,o),Je(I,i)},onBeforeAppear(I){mt(W,[I]),Je(I,c),Je(I,h)},onEnter:Z(!1),onAppear:Z(!0),onLeave(I,J){I._isLeaving=!0;const ue=()=>K(I,J);Je(I,a),I._enterCancelled?(Je(I,p),br()):(br(),Je(I,p)),mr(()=>{I._isLeaving&&(_t(I,a),Je(I,m),gr(O)||_r(I,s,B,ue))}),mt(O,[I,ue])},onEnterCancelled(I){$(I,!1,void 0,!0),mt(N,[I])},onAppearCancelled(I){$(I,!0,void 0,!0),mt(le,[I])},onLeaveCancelled(I){K(I),mt(U,[I])}})}function Fc(e){if(e==null)return null;if(ie(e))return[Zn(e.enter),Zn(e.leave)];{const t=Zn(e);return[t,t]}}function Zn(e){return Hi(e)}function Je(e,t){t.split(/\s+/).forEach(n=>n&&e.classList.add(n)),(e[rn]||(e[rn]=new Set)).add(t)}function _t(e,t){t.split(/\s+/).forEach(s=>s&&e.classList.remove(s));const n=e[rn];n&&(n.delete(t),n.size||(e[rn]=void 0))}function mr(e){requestAnimationFrame(()=>{requestAnimationFrame(e)})}let Dc=0;function _r(e,t,n,s){const r=e._endId=++Dc,o=()=>{r===e._endId&&s()};if(n!=null)return setTimeout(o,n);const{type:i,timeout:l,propCount:c}=$c(e,t);if(!i)return s();const h=i+"end";let f=0;const a=()=>{e.removeEventListener(h,p),o()},p=m=>{m.target===e&&++f>=c&&a()};setTimeout(()=>{f<c&&a()},l+1),e.addEventListener(h,p)}function $c(e,t){const n=window.getComputedStyle(e),s=S=>(n[S]||"").split(", "),r=s(`${rt}Delay`),o=s(`${rt}Duration`),i=yr(r,o),l=s(`${$t}Delay`),c=s(`${$t}Duration`),h=yr(l,c);let f=null,a=0,p=0;t===rt?i>0&&(f=rt,a=i,p=o.length):t===$t?h>0&&(f=$t,a=h,p=c.length):(a=Math.max(i,h),f=a>0?i>h?rt:$t:null,p=f?f===rt?o.length:c.length:0);const m=f===rt&&/\b(transform|all)(,|$)/.test(s(`${rt}Property`).toString());return{type:f,timeout:a,propCount:p,hasTransform:m}}function yr(e,t){for(;e.length<t.length;)e=e.concat(e);return Math.max(...t.map((n,s)=>vr(n)+vr(e[s])))}function vr(e){return e==="auto"?0:Number(e.slice(0,-1).replace(",","."))*1e3}function br(){return document.body.offsetHeight}function Hc(e,t,n){const s=e[rn];s&&(t=(t?[t,...s]:[...s]).join(" ")),t==null?e.removeAttribute("class"):n?e.setAttribute("class",t):e.className=t}const Tn=Symbol("_vod"),vi=Symbol("_vsh"),Cu={beforeMount(e,{value:t},{transition:n}){e[Tn]=e.style.display==="none"?"":e.style.display,n&&t?n.beforeEnter(e):Ht(e,t)},mounted(e,{value:t},{transition:n}){n&&t&&n.enter(e)},updated(e,{value:t,oldValue:n},{transition:s}){!t!=!n&&(s?t?(s.beforeEnter(e),Ht(e,!0),s.enter(e)):s.leave(e,()=>{Ht(e,!1)}):Ht(e,t))},beforeUnmount(e,{value:t}){Ht(e,t)}};function Ht(e,t){e.style.display=t?e[Tn]:"none",e[vi]=!t}const jc=Symbol(""),Bc=/(^|;)\s*display\s*:/;function Vc(e,t,n){const s=e.style,r=ce(n);let o=!1;if(n&&!r){if(t)if(ce(t))for(const i of t.split(";")){const l=i.slice(0,i.indexOf(":")).trim();n[l]==null&&bn(s,l,"")}else for(const i in t)n[i]==null&&bn(s,i,"");for(const i in n)i==="display"&&(o=!0),bn(s,i,n[i])}else if(r){if(t!==n){const i=s[jc];i&&(n+=";"+i),s.cssText=n,o=Bc.test(n)}}else t&&e.removeAttribute("style");Tn in e&&(e[Tn]=o?s.display:"",e[vi]&&(s.display="none"))}const Er=/\s*!important$/;function bn(e,t,n){if(j(n))n.forEach(s=>bn(e,t,s));else if(n==null&&(n=""),t.startsWith("--"))e.setProperty(t,n);else{const s=kc(e,t);Er.test(n)?e.setProperty(Et(s),n.replace(Er,""),"important"):e[s]=n}}const Sr=["Webkit","Moz","ms"],es={};function kc(e,t){const n=es[t];if(n)return n;let s=Ie(t);if(s!=="filter"&&s in e)return es[t]=s;s=In(s);for(let r=0;r<Sr.length;r++){const o=Sr[r]+s;if(o in e)return es[t]=o}return t}const xr="http://www.w3.org/1999/xlink";function wr(e,t,n,s,r,o=Ki(t)){s&&t.startsWith("xlink:")?n==null?e.removeAttributeNS(xr,t.slice(6,t.length)):e.setAttributeNS(xr,t,n):n==null||o&&!Zr(n)?e.removeAttribute(t):e.setAttribute(t,o?"":dt(n)?String(n):n)}function Cr(e,t,n,s,r){if(t==="innerHTML"||t==="textContent"){n!=null&&(e[t]=t==="innerHTML"?_i(n):n);return}const o=e.tagName;if(t==="value"&&o!=="PROGRESS"&&!o.includes("-")){const l=o==="OPTION"?e.getAttribute("value")||"":e.value,c=n==null?e.type==="checkbox"?"on":"":String(n);(l!==c||!("_value"in e))&&(e.value=c),n==null&&e.removeAttribute(t),e._value=n;return}let i=!1;if(n===""||n==null){const l=typeof e[t];l==="boolean"?n=Zr(n):n==null&&l==="string"?(n="",i=!0):l==="number"&&(n=0,i=!0)}try{e[t]=n}catch{}i&&e.removeAttribute(r||t)}function Uc(e,t,n,s){e.addEventListener(t,n,s)}function Kc(e,t,n,s){e.removeEventListener(t,n,s)}const Rr=Symbol("_vei");function Wc(e,t,n,s,r=null){const o=e[Rr]||(e[Rr]={}),i=o[t];if(s&&i)i.value=s;else{const[l,c]=qc(t);if(s){const h=o[t]=Jc(s,r);Uc(e,l,h,c)}else i&&(Kc(e,l,i,c),o[t]=void 0)}}const Ar=/(?:Once|Passive|Capture)$/;function qc(e){let t;if(Ar.test(e)){t={};let s;for(;s=e.match(Ar);)e=e.slice(0,e.length-s[0].length),t[s[0].toLowerCase()]=!0}return[e[2]===":"?e.slice(3):Et(e.slice(2)),t]}let ts=0;const Gc=Promise.resolve(),zc=()=>ts||(Gc.then(()=>ts=0),ts=Date.now());function Jc(e,t){const n=s=>{if(!s._vts)s._vts=Date.now();else if(s._vts<=n.attached)return;Fe(Qc(s,n.value),t,5,[s])};return n.value=e,n.attached=zc(),n}function Qc(e,t){if(j(t)){const n=e.stopImmediatePropagation;return e.stopImmediatePropagation=()=>{n.call(e),e._stopped=!0},t.map(s=>r=>!r._stopped&&s&&s(r))}else return t}const Tr=e=>e.charCodeAt(0)===111&&e.charCodeAt(1)===110&&e.charCodeAt(2)>96&&e.charCodeAt(2)<123,Yc=(e,t,n,s,r,o)=>{const i=r==="svg";t==="class"?Hc(e,s,i):t==="style"?Vc(e,n,s):Pn(t)?Ss(t)||Wc(e,t,n,s,o):(t[0]==="."?(t=t.slice(1),!0):t[0]==="^"?(t=t.slice(1),!1):Xc(e,t,s,i))?(Cr(e,t,s),!e.tagName.includes("-")&&(t==="value"||t==="checked"||t==="selected")&&wr(e,t,s,i,o,t!=="value")):e._isVueCE&&(/[A-Z]/.test(t)||!ce(s))?Cr(e,Ie(t),s,o,t):(t==="true-value"?e._trueValue=s:t==="false-value"&&(e._falseValue=s),wr(e,t,s,i))};function Xc(e,t,n,s){if(s)return!!(t==="innerHTML"||t==="textContent"||t in e&&Tr(t)&&k(n));if(t==="spellcheck"||t==="draggable"||t==="translate"||t==="autocorrect"||t==="form"||t==="list"&&e.tagName==="INPUT"||t==="type"&&e.tagName==="TEXTAREA")return!1;if(t==="width"||t==="height"){const r=e.tagName;if(r==="IMG"||r==="VIDEO"||r==="CANVAS"||r==="SOURCE")return!1}return Tr(t)&&ce(n)?!1:t in e}const Zc=ae({patchProp:Yc},Mc);let Pr;function ef(){return Pr||(Pr=ec(Zc))}const tf=(...e)=>{const t=ef().createApp(...e),{mount:n}=t;return t.mount=s=>{const r=sf(s);if(!r)return;const o=t._component;!k(o)&&!o.render&&!o.template&&(o.template=r.innerHTML),r.nodeType===1&&(r.textContent="");const i=n(r,!1,nf(r));return r instanceof Element&&(r.removeAttribute("v-cloak"),r.setAttribute("data-v-app","")),i},t};function nf(e){if(e instanceof SVGElement)return"svg";if(typeof MathMLElement=="function"&&e instanceof MathMLElement)return"mathml"}function sf(e){return ce(e)?document.querySelector(e):e}/*!
+ * pinia v3.0.3
+ * (c) 2025 Eduardo San Martin Morote
+ * @license MIT
+ */const rf=Symbol();var Or;(function(e){e.direct="direct",e.patchObject="patch object",e.patchFunction="patch function"})(Or||(Or={}));function of(){const e=qi(!0),t=e.run(()=>Eo({}));let n=[],s=[];const r=bo({install(o){r._a=o,o.provide(rf,r),o.config.globalProperties.$pinia=r,s.forEach(i=>n.push(i)),s=[]},use(o){return this._a?n.push(o):s.push(o),this},_p:n,_a:null,_e:e,_s:new Map,state:t});return r}const lf=(e,t)=>{const n=e.__vccOpts||e;for(const[s,r]of t)n[s]=r;return n},cf={};function ff(e,t){const n=Hl("router-view");return fi(),ai(n)}const uf=lf(cf,[["render",ff]]),af="modulepreload",hf=function(e){return"/yuthon_base/static/webh5/"+e},Mr={},jt=function(t,n,s){let r=Promise.resolve();if(n&&n.length>0){let c=function(h){return Promise.all(h.map(f=>Promise.resolve(f).then(a=>({status:"fulfilled",value:a}),a=>({status:"rejected",reason:a}))))};document.getElementsByTagName("link");const i=document.querySelector("meta[property=csp-nonce]"),l=i?.nonce||i?.getAttribute("nonce");r=c(n.map(h=>{if(h=hf(h),h in Mr)return;Mr[h]=!0;const f=h.endsWith(".css"),a=f?'[rel="stylesheet"]':"";if(document.querySelector(`link[href="${h}"]${a}`))return;const p=document.createElement("link");if(p.rel=f?"stylesheet":af,f||(p.as="script"),p.crossOrigin="",p.href=h,l&&p.setAttribute("nonce",l),document.head.appendChild(p),f)return new Promise((m,S)=>{p.addEventListener("load",m),p.addEventListener("error",()=>S(new Error(`Unable to preload CSS for ${h}`)))})}))}function o(i){const l=new Event("vite:preloadError",{cancelable:!0});if(l.payload=i,window.dispatchEvent(l),!l.defaultPrevented)throw i}return r.then(i=>{for(const l of i||[])l.status==="rejected"&&o(l.reason);return t().catch(o)})};/*!
+  * vue-router v4.5.1
+  * (c) 2025 Eduardo San Martin Morote
+  * @license MIT
+  */const Rt=typeof document<"u";function bi(e){return typeof e=="object"||"displayName"in e||"props"in e||"__vccOpts"in e}function df(e){return e.__esModule||e[Symbol.toStringTag]==="Module"||e.default&&bi(e.default)}const Y=Object.assign;function ns(e,t){const n={};for(const s in t){const r=t[s];n[s]=De(r)?r.map(e):e(r)}return n}const Qt=()=>{},De=Array.isArray,Ei=/#/g,pf=/&/g,gf=/\//g,mf=/=/g,_f=/\?/g,Si=/\+/g,yf=/%5B/g,vf=/%5D/g,xi=/%5E/g,bf=/%60/g,wi=/%7B/g,Ef=/%7C/g,Ci=/%7D/g,Sf=/%20/g;function Bs(e){return encodeURI(""+e).replace(Ef,"|").replace(yf,"[").replace(vf,"]")}function xf(e){return Bs(e).replace(wi,"{").replace(Ci,"}").replace(xi,"^")}function ys(e){return Bs(e).replace(Si,"%2B").replace(Sf,"+").replace(Ei,"%23").replace(pf,"%26").replace(bf,"`").replace(wi,"{").replace(Ci,"}").replace(xi,"^")}function wf(e){return ys(e).replace(mf,"%3D")}function Cf(e){return Bs(e).replace(Ei,"%23").replace(_f,"%3F")}function Rf(e){return e==null?"":Cf(e).replace(gf,"%2F")}function on(e){try{return decodeURIComponent(""+e)}catch{}return""+e}const Af=/\/$/,Tf=e=>e.replace(Af,"");function ss(e,t,n="/"){let s,r={},o="",i="";const l=t.indexOf("#");let c=t.indexOf("?");return l<c&&l>=0&&(c=-1),c>-1&&(s=t.slice(0,c),o=t.slice(c+1,l>-1?l:t.length),r=e(o)),l>-1&&(s=s||t.slice(0,l),i=t.slice(l,t.length)),s=If(s??t,n),{fullPath:s+(o&&"?")+o+i,path:s,query:r,hash:on(i)}}function Pf(e,t){const n=t.query?e(t.query):"";return t.path+(n&&"?")+n+(t.hash||"")}function Ir(e,t){return!t||!e.toLowerCase().startsWith(t.toLowerCase())?e:e.slice(t.length)||"/"}function Of(e,t,n){const s=t.matched.length-1,r=n.matched.length-1;return s>-1&&s===r&&Lt(t.matched[s],n.matched[r])&&Ri(t.params,n.params)&&e(t.query)===e(n.query)&&t.hash===n.hash}function Lt(e,t){return(e.aliasOf||e)===(t.aliasOf||t)}function Ri(e,t){if(Object.keys(e).length!==Object.keys(t).length)return!1;for(const n in e)if(!Mf(e[n],t[n]))return!1;return!0}function Mf(e,t){return De(e)?Lr(e,t):De(t)?Lr(t,e):e===t}function Lr(e,t){return De(t)?e.length===t.length&&e.every((n,s)=>n===t[s]):e.length===1&&e[0]===t}function If(e,t){if(e.startsWith("/"))return e;if(!e)return t;const n=t.split("/"),s=e.split("/"),r=s[s.length-1];(r===".."||r===".")&&s.push("");let o=n.length-1,i,l;for(i=0;i<s.length;i++)if(l=s[i],l!==".")if(l==="..")o>1&&o--;else break;return n.slice(0,o).join("/")+"/"+s.slice(i).join("/")}const ot={path:"/",name:void 0,params:{},query:{},hash:"",fullPath:"/",matched:[],meta:{},redirectedFrom:void 0};var ln;(function(e){e.pop="pop",e.push="push"})(ln||(ln={}));var Yt;(function(e){e.back="back",e.forward="forward",e.unknown=""})(Yt||(Yt={}));function Lf(e){if(!e)if(Rt){const t=document.querySelector("base");e=t&&t.getAttribute("href")||"/",e=e.replace(/^\w+:\/\/[^\/]+/,"")}else e="/";return e[0]!=="/"&&e[0]!=="#"&&(e="/"+e),Tf(e)}const Nf=/^[^#]+#/;function Ff(e,t){return e.replace(Nf,"#")+t}function Df(e,t){const n=document.documentElement.getBoundingClientRect(),s=e.getBoundingClientRect();return{behavior:t.behavior,left:s.left-n.left-(t.left||0),top:s.top-n.top-(t.top||0)}}const kn=()=>({left:window.scrollX,top:window.scrollY});function $f(e){let t;if("el"in e){const n=e.el,s=typeof n=="string"&&n.startsWith("#"),r=typeof n=="string"?s?document.getElementById(n.slice(1)):document.querySelector(n):n;if(!r)return;t=Df(r,e)}else t=e;"scrollBehavior"in document.documentElement.style?window.scrollTo(t):window.scrollTo(t.left!=null?t.left:window.scrollX,t.top!=null?t.top:window.scrollY)}function Nr(e,t){return(history.state?history.state.position-t:-1)+e}const vs=new Map;function Hf(e,t){vs.set(e,t)}function jf(e){const t=vs.get(e);return vs.delete(e),t}let Bf=()=>location.protocol+"//"+location.host;function Ai(e,t){const{pathname:n,search:s,hash:r}=t,o=e.indexOf("#");if(o>-1){let l=r.includes(e.slice(o))?e.slice(o).length:1,c=r.slice(l);return c[0]!=="/"&&(c="/"+c),Ir(c,"")}return Ir(n,e)+s+r}function Vf(e,t,n,s){let r=[],o=[],i=null;const l=({state:p})=>{const m=Ai(e,location),S=n.value,x=t.value;let B=0;if(p){if(n.value=m,t.value=p,i&&i===S){i=null;return}B=x?p.position-x.position:0}else s(m);r.forEach(L=>{L(n.value,S,{delta:B,type:ln.pop,direction:B?B>0?Yt.forward:Yt.back:Yt.unknown})})};function c(){i=n.value}function h(p){r.push(p);const m=()=>{const S=r.indexOf(p);S>-1&&r.splice(S,1)};return o.push(m),m}function f(){const{history:p}=window;p.state&&p.replaceState(Y({},p.state,{scroll:kn()}),"")}function a(){for(const p of o)p();o=[],window.removeEventListener("popstate",l),window.removeEventListener("beforeunload",f)}return window.addEventListener("popstate",l),window.addEventListener("beforeunload",f,{passive:!0}),{pauseListeners:c,listen:h,destroy:a}}function Fr(e,t,n,s=!1,r=!1){return{back:e,current:t,forward:n,replaced:s,position:window.history.length,scroll:r?kn():null}}function kf(e){const{history:t,location:n}=window,s={value:Ai(e,n)},r={value:t.state};r.value||o(s.value,{back:null,current:s.value,forward:null,position:t.length-1,replaced:!0,scroll:null},!0);function o(c,h,f){const a=e.indexOf("#"),p=a>-1?(n.host&&document.querySelector("base")?e:e.slice(a))+c:Bf()+e+c;try{t[f?"replaceState":"pushState"](h,"",p),r.value=h}catch(m){console.error(m),n[f?"replace":"assign"](p)}}function i(c,h){const f=Y({},t.state,Fr(r.value.back,c,r.value.forward,!0),h,{position:r.value.position});o(c,f,!0),s.value=c}function l(c,h){const f=Y({},r.value,t.state,{forward:c,scroll:kn()});o(f.current,f,!0);const a=Y({},Fr(s.value,c,null),{position:f.position+1},h);o(c,a,!1),s.value=c}return{location:s,state:r,push:l,replace:i}}function Uf(e){e=Lf(e);const t=kf(e),n=Vf(e,t.state,t.location,t.replace);function s(o,i=!0){i||n.pauseListeners(),history.go(o)}const r=Y({location:"",base:e,go:s,createHref:Ff.bind(null,e)},t,n);return Object.defineProperty(r,"location",{enumerable:!0,get:()=>t.location.value}),Object.defineProperty(r,"state",{enumerable:!0,get:()=>t.state.value}),r}function Kf(e){return e=location.host?e||location.pathname+location.search:"",e.includes("#")||(e+="#"),Uf(e)}function Wf(e){return typeof e=="string"||e&&typeof e=="object"}function Ti(e){return typeof e=="string"||typeof e=="symbol"}const Pi=Symbol("");var Dr;(function(e){e[e.aborted=4]="aborted",e[e.cancelled=8]="cancelled",e[e.duplicated=16]="duplicated"})(Dr||(Dr={}));function Nt(e,t){return Y(new Error,{type:e,[Pi]:!0},t)}function Qe(e,t){return e instanceof Error&&Pi in e&&(t==null||!!(e.type&t))}const $r="[^/]+?",qf={sensitive:!1,strict:!1,start:!0,end:!0},Gf=/[.+*?^${}()[\]/\\]/g;function zf(e,t){const n=Y({},qf,t),s=[];let r=n.start?"^":"";const o=[];for(const h of e){const f=h.length?[]:[90];n.strict&&!h.length&&(r+="/");for(let a=0;a<h.length;a++){const p=h[a];let m=40+(n.sensitive?.25:0);if(p.type===0)a||(r+="/"),r+=p.value.replace(Gf,"\\$&"),m+=40;else if(p.type===1){const{value:S,repeatable:x,optional:B,regexp:L}=p;o.push({name:S,repeatable:x,optional:B});const M=L||$r;if(M!==$r){m+=10;try{new RegExp(`(${M})`)}catch(O){throw new Error(`Invalid custom RegExp for param "${S}" (${M}): `+O.message)}}let N=x?`((?:${M})(?:/(?:${M}))*)`:`(${M})`;a||(N=B&&h.length<2?`(?:/${N})`:"/"+N),B&&(N+="?"),r+=N,m+=20,B&&(m+=-8),x&&(m+=-20),M===".*"&&(m+=-50)}f.push(m)}s.push(f)}if(n.strict&&n.end){const h=s.length-1;s[h][s[h].length-1]+=.7000000000000001}n.strict||(r+="/?"),n.end?r+="$":n.strict&&!r.endsWith("/")&&(r+="(?:/|$)");const i=new RegExp(r,n.sensitive?"":"i");function l(h){const f=h.match(i),a={};if(!f)return null;for(let p=1;p<f.length;p++){const m=f[p]||"",S=o[p-1];a[S.name]=m&&S.repeatable?m.split("/"):m}return a}function c(h){let f="",a=!1;for(const p of e){(!a||!f.endsWith("/"))&&(f+="/"),a=!1;for(const m of p)if(m.type===0)f+=m.value;else if(m.type===1){const{value:S,repeatable:x,optional:B}=m,L=S in h?h[S]:"";if(De(L)&&!x)throw new Error(`Provided param "${S}" is an array but it is not repeatable (* or + modifiers)`);const M=De(L)?L.join("/"):L;if(!M)if(B)p.length<2&&(f.endsWith("/")?f=f.slice(0,-1):a=!0);else throw new Error(`Missing required param "${S}"`);f+=M}}return f||"/"}return{re:i,score:s,keys:o,parse:l,stringify:c}}function Jf(e,t){let n=0;for(;n<e.length&&n<t.length;){const s=t[n]-e[n];if(s)return s;n++}return e.length<t.length?e.length===1&&e[0]===80?-1:1:e.length>t.length?t.length===1&&t[0]===80?1:-1:0}function Oi(e,t){let n=0;const s=e.score,r=t.score;for(;n<s.length&&n<r.length;){const o=Jf(s[n],r[n]);if(o)return o;n++}if(Math.abs(r.length-s.length)===1){if(Hr(s))return 1;if(Hr(r))return-1}return r.length-s.length}function Hr(e){const t=e[e.length-1];return e.length>0&&t[t.length-1]<0}const Qf={type:0,value:""},Yf=/[a-zA-Z0-9_]/;function Xf(e){if(!e)return[[]];if(e==="/")return[[Qf]];if(!e.startsWith("/"))throw new Error(`Invalid path "${e}"`);function t(m){throw new Error(`ERR (${n})/"${h}": ${m}`)}let n=0,s=n;const r=[];let o;function i(){o&&r.push(o),o=[]}let l=0,c,h="",f="";function a(){h&&(n===0?o.push({type:0,value:h}):n===1||n===2||n===3?(o.length>1&&(c==="*"||c==="+")&&t(`A repeatable param (${h}) must be alone in its segment. eg: '/:ids+.`),o.push({type:1,value:h,regexp:f,repeatable:c==="*"||c==="+",optional:c==="*"||c==="?"})):t("Invalid state to consume buffer"),h="")}function p(){h+=c}for(;l<e.length;){if(c=e[l++],c==="\\"&&n!==2){s=n,n=4;continue}switch(n){case 0:c==="/"?(h&&a(),i()):c===":"?(a(),n=1):p();break;case 4:p(),n=s;break;case 1:c==="("?n=2:Yf.test(c)?p():(a(),n=0,c!=="*"&&c!=="?"&&c!=="+"&&l--);break;case 2:c===")"?f[f.length-1]=="\\"?f=f.slice(0,-1)+c:n=3:f+=c;break;case 3:a(),n=0,c!=="*"&&c!=="?"&&c!=="+"&&l--,f="";break;default:t("Unknown state");break}}return n===2&&t(`Unfinished custom RegExp for param "${h}"`),a(),i(),r}function Zf(e,t,n){const s=zf(Xf(e.path),n),r=Y(s,{record:e,parent:t,children:[],alias:[]});return t&&!r.record.aliasOf==!t.record.aliasOf&&t.children.push(r),r}function eu(e,t){const n=[],s=new Map;t=kr({strict:!1,end:!0,sensitive:!1},t);function r(a){return s.get(a)}function o(a,p,m){const S=!m,x=Br(a);x.aliasOf=m&&m.record;const B=kr(t,a),L=[x];if("alias"in a){const O=typeof a.alias=="string"?[a.alias]:a.alias;for(const U of O)L.push(Br(Y({},x,{components:m?m.record.components:x.components,path:U,aliasOf:m?m.record:x})))}let M,N;for(const O of L){const{path:U}=O;if(p&&U[0]!=="/"){const W=p.record.path,q=W[W.length-1]==="/"?"":"/";O.path=p.record.path+(U&&q+U)}if(M=Zf(O,p,B),m?m.alias.push(M):(N=N||M,N!==M&&N.alias.push(M),S&&a.name&&!Vr(M)&&i(a.name)),Mi(M)&&c(M),x.children){const W=x.children;for(let q=0;q<W.length;q++)o(W[q],M,m&&m.children[q])}m=m||M}return N?()=>{i(N)}:Qt}function i(a){if(Ti(a)){const p=s.get(a);p&&(s.delete(a),n.splice(n.indexOf(p),1),p.children.forEach(i),p.alias.forEach(i))}else{const p=n.indexOf(a);p>-1&&(n.splice(p,1),a.record.name&&s.delete(a.record.name),a.children.forEach(i),a.alias.forEach(i))}}function l(){return n}function c(a){const p=su(a,n);n.splice(p,0,a),a.record.name&&!Vr(a)&&s.set(a.record.name,a)}function h(a,p){let m,S={},x,B;if("name"in a&&a.name){if(m=s.get(a.name),!m)throw Nt(1,{location:a});B=m.record.name,S=Y(jr(p.params,m.keys.filter(N=>!N.optional).concat(m.parent?m.parent.keys.filter(N=>N.optional):[]).map(N=>N.name)),a.params&&jr(a.params,m.keys.map(N=>N.name))),x=m.stringify(S)}else if(a.path!=null)x=a.path,m=n.find(N=>N.re.test(x)),m&&(S=m.parse(x),B=m.record.name);else{if(m=p.name?s.get(p.name):n.find(N=>N.re.test(p.path)),!m)throw Nt(1,{location:a,currentLocation:p});B=m.record.name,S=Y({},p.params,a.params),x=m.stringify(S)}const L=[];let M=m;for(;M;)L.unshift(M.record),M=M.parent;return{name:B,path:x,params:S,matched:L,meta:nu(L)}}e.forEach(a=>o(a));function f(){n.length=0,s.clear()}return{addRoute:o,resolve:h,removeRoute:i,clearRoutes:f,getRoutes:l,getRecordMatcher:r}}function jr(e,t){const n={};for(const s of t)s in e&&(n[s]=e[s]);return n}function Br(e){const t={path:e.path,redirect:e.redirect,name:e.name,meta:e.meta||{},aliasOf:e.aliasOf,beforeEnter:e.beforeEnter,props:tu(e),children:e.children||[],instances:{},leaveGuards:new Set,updateGuards:new Set,enterCallbacks:{},components:"components"in e?e.components||null:e.component&&{default:e.component}};return Object.defineProperty(t,"mods",{value:{}}),t}function tu(e){const t={},n=e.props||!1;if("component"in e)t.default=n;else for(const s in e.components)t[s]=typeof n=="object"?n[s]:n;return t}function Vr(e){for(;e;){if(e.record.aliasOf)return!0;e=e.parent}return!1}function nu(e){return e.reduce((t,n)=>Y(t,n.meta),{})}function kr(e,t){const n={};for(const s in e)n[s]=s in t?t[s]:e[s];return n}function su(e,t){let n=0,s=t.length;for(;n!==s;){const o=n+s>>1;Oi(e,t[o])<0?s=o:n=o+1}const r=ru(e);return r&&(s=t.lastIndexOf(r,s-1)),s}function ru(e){let t=e;for(;t=t.parent;)if(Mi(t)&&Oi(e,t)===0)return t}function Mi({record:e}){return!!(e.name||e.components&&Object.keys(e.components).length||e.redirect)}function ou(e){const t={};if(e===""||e==="?")return t;const s=(e[0]==="?"?e.slice(1):e).split("&");for(let r=0;r<s.length;++r){const o=s[r].replace(Si," "),i=o.indexOf("="),l=on(i<0?o:o.slice(0,i)),c=i<0?null:on(o.slice(i+1));if(l in t){let h=t[l];De(h)||(h=t[l]=[h]),h.push(c)}else t[l]=c}return t}function Ur(e){let t="";for(let n in e){const s=e[n];if(n=wf(n),s==null){s!==void 0&&(t+=(t.length?"&":"")+n);continue}(De(s)?s.map(o=>o&&ys(o)):[s&&ys(s)]).forEach(o=>{o!==void 0&&(t+=(t.length?"&":"")+n,o!=null&&(t+="="+o))})}return t}function iu(e){const t={};for(const n in e){const s=e[n];s!==void 0&&(t[n]=De(s)?s.map(r=>r==null?null:""+r):s==null?s:""+s)}return t}const lu=Symbol(""),Kr=Symbol(""),Vs=Symbol(""),ks=Symbol(""),bs=Symbol("");function Bt(){let e=[];function t(s){return e.push(s),()=>{const r=e.indexOf(s);r>-1&&e.splice(r,1)}}function n(){e=[]}return{add:t,list:()=>e.slice(),reset:n}}function ft(e,t,n,s,r,o=i=>i()){const i=s&&(s.enterCallbacks[r]=s.enterCallbacks[r]||[]);return()=>new Promise((l,c)=>{const h=p=>{p===!1?c(Nt(4,{from:n,to:t})):p instanceof Error?c(p):Wf(p)?c(Nt(2,{from:t,to:p})):(i&&s.enterCallbacks[r]===i&&typeof p=="function"&&i.push(p),l())},f=o(()=>e.call(s&&s.instances[r],t,n,h));let a=Promise.resolve(f);e.length<3&&(a=a.then(h)),a.catch(p=>c(p))})}function rs(e,t,n,s,r=o=>o()){const o=[];for(const i of e)for(const l in i.components){let c=i.components[l];if(!(t!=="beforeRouteEnter"&&!i.instances[l]))if(bi(c)){const f=(c.__vccOpts||c)[t];f&&o.push(ft(f,n,s,i,l,r))}else{let h=c();o.push(()=>h.then(f=>{if(!f)throw new Error(`Couldn't resolve component "${l}" at "${i.path}"`);const a=df(f)?f.default:f;i.mods[l]=f,i.components[l]=a;const m=(a.__vccOpts||a)[t];return m&&ft(m,n,s,i,l,r)()}))}}return o}function Wr(e){const t=qe(Vs),n=qe(ks),s=Le(()=>{const c=Ot(e.to);return t.resolve(c)}),r=Le(()=>{const{matched:c}=s.value,{length:h}=c,f=c[h-1],a=n.matched;if(!f||!a.length)return-1;const p=a.findIndex(Lt.bind(null,f));if(p>-1)return p;const m=qr(c[h-2]);return h>1&&qr(f)===m&&a[a.length-1].path!==m?a.findIndex(Lt.bind(null,c[h-2])):p}),o=Le(()=>r.value>-1&&hu(n.params,s.value.params)),i=Le(()=>r.value>-1&&r.value===n.matched.length-1&&Ri(n.params,s.value.params));function l(c={}){if(au(c)){const h=t[Ot(e.replace)?"replace":"push"](Ot(e.to)).catch(Qt);return e.viewTransition&&typeof document<"u"&&"startViewTransition"in document&&document.startViewTransition(()=>h),h}return Promise.resolve()}return{route:s,href:Le(()=>s.value.href),isActive:o,isExactActive:i,navigate:l}}function cu(e){return e.length===1?e[0]:e}const fu=jo({name:"RouterLink",compatConfig:{MODE:3},props:{to:{type:[String,Object],required:!0},replace:Boolean,activeClass:String,exactActiveClass:String,custom:Boolean,ariaCurrentValue:{type:String,default:"page"},viewTransition:Boolean},useLink:Wr,setup(e,{slots:t}){const n=Fn(Wr(e)),{options:s}=qe(Vs),r=Le(()=>({[Gr(e.activeClass,s.linkActiveClass,"router-link-active")]:n.isActive,[Gr(e.exactActiveClass,s.linkExactActiveClass,"router-link-exact-active")]:n.isExactActive}));return()=>{const o=t.default&&cu(t.default(n));return e.custom?o:js("a",{"aria-current":n.isExactActive?e.ariaCurrentValue:null,href:n.href,onClick:n.navigate,class:r.value},o)}}}),uu=fu;function au(e){if(!(e.metaKey||e.altKey||e.ctrlKey||e.shiftKey)&&!e.defaultPrevented&&!(e.button!==void 0&&e.button!==0)){if(e.currentTarget&&e.currentTarget.getAttribute){const t=e.currentTarget.getAttribute("target");if(/\b_blank\b/i.test(t))return}return e.preventDefault&&e.preventDefault(),!0}}function hu(e,t){for(const n in t){const s=t[n],r=e[n];if(typeof s=="string"){if(s!==r)return!1}else if(!De(r)||r.length!==s.length||s.some((o,i)=>o!==r[i]))return!1}return!0}function qr(e){return e?e.aliasOf?e.aliasOf.path:e.path:""}const Gr=(e,t,n)=>e??t??n,du=jo({name:"RouterView",inheritAttrs:!1,props:{name:{type:String,default:"default"},route:Object},compatConfig:{MODE:3},setup(e,{attrs:t,slots:n}){const s=qe(bs),r=Le(()=>e.route||s.value),o=qe(Kr,0),i=Le(()=>{let h=Ot(o);const{matched:f}=r.value;let a;for(;(a=f[h])&&!a.components;)h++;return h}),l=Le(()=>r.value.matched[i.value]);_n(Kr,Le(()=>i.value+1)),_n(lu,l),_n(bs,r);const c=Eo();return yn(()=>[c.value,l.value,e.name],([h,f,a],[p,m,S])=>{f&&(f.instances[a]=h,m&&m!==f&&h&&h===p&&(f.leaveGuards.size||(f.leaveGuards=m.leaveGuards),f.updateGuards.size||(f.updateGuards=m.updateGuards))),h&&f&&(!m||!Lt(f,m)||!p)&&(f.enterCallbacks[a]||[]).forEach(x=>x(h))},{flush:"post"}),()=>{const h=r.value,f=e.name,a=l.value,p=a&&a.components[f];if(!p)return zr(n.default,{Component:p,route:h});const m=a.props[f],S=m?m===!0?h.params:typeof m=="function"?m(h):m:null,B=js(p,Y({},S,t,{onVnodeUnmounted:L=>{L.component.isUnmounted&&(a.instances[f]=null)},ref:c}));return zr(n.default,{Component:B,route:h})||B}}});function zr(e,t){if(!e)return null;const n=e(t);return n.length===1?n[0]:n}const pu=du;function gu(e){const t=eu(e.routes,e),n=e.parseQuery||ou,s=e.stringifyQuery||Ur,r=e.history,o=Bt(),i=Bt(),l=Bt(),c=hl(ot);let h=ot;Rt&&e.scrollBehavior&&"scrollRestoration"in history&&(history.scrollRestoration="manual");const f=ns.bind(null,y=>""+y),a=ns.bind(null,Rf),p=ns.bind(null,on);function m(y,P){let A,F;return Ti(y)?(A=t.getRecordMatcher(y),F=P):F=y,t.addRoute(F,A)}function S(y){const P=t.getRecordMatcher(y);P&&t.removeRoute(P)}function x(){return t.getRoutes().map(y=>y.record)}function B(y){return!!t.getRecordMatcher(y)}function L(y,P){if(P=Y({},P||c.value),typeof y=="string"){const g=ss(n,y,P.path),_=t.resolve({path:g.path},P),b=r.createHref(g.fullPath);return Y(g,_,{params:p(_.params),hash:on(g.hash),redirectedFrom:void 0,href:b})}let A;if(y.path!=null)A=Y({},y,{path:ss(n,y.path,P.path).path});else{const g=Y({},y.params);for(const _ in g)g[_]==null&&delete g[_];A=Y({},y,{params:a(g)}),P.params=a(P.params)}const F=t.resolve(A,P),ne=y.hash||"";F.params=f(p(F.params));const u=Pf(s,Y({},y,{hash:xf(ne),path:F.path})),d=r.createHref(u);return Y({fullPath:u,hash:ne,query:s===Ur?iu(y.query):y.query||{}},F,{redirectedFrom:void 0,href:d})}function M(y){return typeof y=="string"?ss(n,y,c.value.path):Y({},y)}function N(y,P){if(h!==y)return Nt(8,{from:P,to:y})}function O(y){return q(y)}function U(y){return O(Y(M(y),{replace:!0}))}function W(y){const P=y.matched[y.matched.length-1];if(P&&P.redirect){const{redirect:A}=P;let F=typeof A=="function"?A(y):A;return typeof F=="string"&&(F=F.includes("?")||F.includes("#")?F=M(F):{path:F},F.params={}),Y({query:y.query,hash:y.hash,params:F.path!=null?{}:y.params},F)}}function q(y,P){const A=h=L(y),F=c.value,ne=y.state,u=y.force,d=y.replace===!0,g=W(A);if(g)return q(Y(M(g),{state:typeof g=="object"?Y({},ne,g.state):ne,force:u,replace:d}),P||A);const _=A;_.redirectedFrom=P;let b;return!u&&Of(s,F,A)&&(b=Nt(16,{to:_,from:F}),$e(F,F,!0,!1)),(b?Promise.resolve(b):K(_,F)).catch(v=>Qe(v)?Qe(v,2)?v:st(v):Q(v,_,F)).then(v=>{if(v){if(Qe(v,2))return q(Y({replace:d},M(v.to),{state:typeof v.to=="object"?Y({},ne,v.to.state):ne,force:u}),P||_)}else v=I(_,F,!0,d,ne);return Z(_,F,v),v})}function le(y,P){const A=N(y,P);return A?Promise.reject(A):Promise.resolve()}function $(y){const P=xt.values().next().value;return P&&typeof P.runWithContext=="function"?P.runWithContext(y):y()}function K(y,P){let A;const[F,ne,u]=mu(y,P);A=rs(F.reverse(),"beforeRouteLeave",y,P);for(const g of F)g.leaveGuards.forEach(_=>{A.push(ft(_,y,P))});const d=le.bind(null,y,P);return A.push(d),Pe(A).then(()=>{A=[];for(const g of o.list())A.push(ft(g,y,P));return A.push(d),Pe(A)}).then(()=>{A=rs(ne,"beforeRouteUpdate",y,P);for(const g of ne)g.updateGuards.forEach(_=>{A.push(ft(_,y,P))});return A.push(d),Pe(A)}).then(()=>{A=[];for(const g of u)if(g.beforeEnter)if(De(g.beforeEnter))for(const _ of g.beforeEnter)A.push(ft(_,y,P));else A.push(ft(g.beforeEnter,y,P));return A.push(d),Pe(A)}).then(()=>(y.matched.forEach(g=>g.enterCallbacks={}),A=rs(u,"beforeRouteEnter",y,P,$),A.push(d),Pe(A))).then(()=>{A=[];for(const g of i.list())A.push(ft(g,y,P));return A.push(d),Pe(A)}).catch(g=>Qe(g,8)?g:Promise.reject(g))}function Z(y,P,A){l.list().forEach(F=>$(()=>F(y,P,A)))}function I(y,P,A,F,ne){const u=N(y,P);if(u)return u;const d=P===ot,g=Rt?history.state:{};A&&(F||d?r.replace(y.fullPath,Y({scroll:d&&g&&g.scroll},ne)):r.push(y.fullPath,ne)),c.value=y,$e(y,P,A,d),st()}let J;function ue(){J||(J=r.listen((y,P,A)=>{if(!un.listening)return;const F=L(y),ne=W(F);if(ne){q(Y(ne,{replace:!0,force:!0}),F).catch(Qt);return}h=F;const u=c.value;Rt&&Hf(Nr(u.fullPath,A.delta),kn()),K(F,u).catch(d=>Qe(d,12)?d:Qe(d,2)?(q(Y(M(d.to),{force:!0}),F).then(g=>{Qe(g,20)&&!A.delta&&A.type===ln.pop&&r.go(-1,!1)}).catch(Qt),Promise.reject()):(A.delta&&r.go(-A.delta,!1),Q(d,F,u))).then(d=>{d=d||I(F,u,!1),d&&(A.delta&&!Qe(d,8)?r.go(-A.delta,!1):A.type===ln.pop&&Qe(d,20)&&r.go(-1,!1)),Z(F,u,d)}).catch(Qt)}))}let we=Bt(),fe=Bt(),te;function Q(y,P,A){st(y);const F=fe.list();return F.length?F.forEach(ne=>ne(y,P,A)):console.error(y),Promise.reject(y)}function Ge(){return te&&c.value!==ot?Promise.resolve():new Promise((y,P)=>{we.add([y,P])})}function st(y){return te||(te=!y,ue(),we.list().forEach(([P,A])=>y?A(y):P()),we.reset()),y}function $e(y,P,A,F){const{scrollBehavior:ne}=e;if(!Rt||!ne)return Promise.resolve();const u=!A&&jf(Nr(y.fullPath,0))||(F||!A)&&history.state&&history.state.scroll||null;return Co().then(()=>ne(y,P,u)).then(d=>d&&$f(d)).catch(d=>Q(d,y,P))}const be=y=>r.go(y);let St;const xt=new Set,un={currentRoute:c,listening:!0,addRoute:m,removeRoute:S,clearRoutes:t.clearRoutes,hasRoute:B,getRoutes:x,resolve:L,options:e,push:O,replace:U,go:be,back:()=>be(-1),forward:()=>be(1),beforeEach:o.add,beforeResolve:i.add,afterEach:l.add,onError:fe.add,isReady:Ge,install(y){const P=this;y.component("RouterLink",uu),y.component("RouterView",pu),y.config.globalProperties.$router=P,Object.defineProperty(y.config.globalProperties,"$route",{enumerable:!0,get:()=>Ot(c)}),Rt&&!St&&c.value===ot&&(St=!0,O(r.location).catch(ne=>{}));const A={};for(const ne in ot)Object.defineProperty(A,ne,{get:()=>c.value[ne],enumerable:!0});y.provide(Vs,P),y.provide(ks,yo(A)),y.provide(bs,c);const F=y.unmount;xt.add(y),y.unmount=function(){xt.delete(y),xt.size<1&&(h=ot,J&&J(),J=null,c.value=ot,St=!1,te=!1),F()}}};function Pe(y){return y.reduce((P,A)=>P.then(()=>$(A)),Promise.resolve())}return un}function mu(e,t){const n=[],s=[],r=[],o=Math.max(t.matched.length,e.matched.length);for(let i=0;i<o;i++){const l=t.matched[i];l&&(e.matched.find(h=>Lt(h,l))?s.push(l):n.push(l));const c=e.matched[i];c&&(t.matched.find(h=>Lt(h,c))||r.push(c))}return[n,s,r]}function Ru(e){return qe(ks)}const _u=gu({history:Kf(),routes:[{path:"/",name:"home",component:()=>jt(()=>import("./HomeView-B12pd-6u.js"),[])},{path:"/notice",name:"notice",component:()=>jt(()=>import("./Notice-DeLRV3hn.js"),__vite__mapDeps([0,1,2,3,4,5]))},{path:"/salary",name:"salary",component:()=>jt(()=>import("./Salary-_DcRmXnI.js"),__vite__mapDeps([6,1,2,3,7]))},{path:"/journey",name:"journey",component:()=>jt(()=>import("./Journey-i8wtFFe-.js"),__vite__mapDeps([8,1,2,9]))},{path:"/clock_in_staticstis",name:"journey",component:()=>jt(()=>import("./ClockInStatistics-iXdu-bYU.js"),__vite__mapDeps([10,1,2,11,5]))}]}),Us=tf(uf);Us.use(of());Us.use(_u);Us.mount("#app");export{Ot as A,Ko as B,ge as C,_n as D,Rn as E,Ue as F,qe as G,vu as H,Cu as I,tf as J,wu as T,lf as _,Fn as a,Al as b,Le as c,jo as d,Tl as e,Uo as f,Te as g,Su as h,di as i,xu as j,Sl as k,fi as l,yc as m,Co as n,ko as o,Eu as p,ai as q,Eo as r,_c as s,Wi as t,Ru as u,pi as v,yn as w,yu as x,bu as y,Ml as z};
diff --git a/yuthon_base/static/webh5/assets/requests-DdoUQiv8.js b/yuthon_base/static/webh5/assets/requests-DdoUQiv8.js
new file mode 100644
index 000000000..6e91547cc
--- /dev/null
+++ b/yuthon_base/static/webh5/assets/requests-DdoUQiv8.js
@@ -0,0 +1,6 @@
+import{B as He,e as Ve,C as gn,w as q,a as we,o as Je,n as Tt,b as At,A as Ee,D as xt,r as C,E as wn,v as Q,G as We,c as ae,d as M,g,m as K,f as En,T as Pt,H as Bt,x as kt,I as Nt,F as _t,J as Sn}from"./index-CimcMLIq.js";function On(){}const $=Object.assign,Dt=typeof window<"u",Re=e=>e!==null&&typeof e=="object",D=e=>e!=null,Fe=e=>typeof e=="function",vn=e=>Re(e)&&Fe(e.then)&&Fe(e.catch),xs=e=>Object.prototype.toString.call(e)==="[object Date]"&&!Number.isNaN(e.getTime()),Ft=e=>typeof e=="number"||/^\d+(\.\d+)?$/.test(e),Rn=()=>Dt?/ios|iphone|ipad|ipod/.test(navigator.userAgent.toLowerCase()):!1;function et(e,t){const n=t.split(".");let r=e;return n.forEach(o=>{var s;r=Re(r)&&(s=r[o])!=null?s:""}),r}function Cn(e,t,n){return t.reduce((r,o)=>(r[o]=e[o],r),{})}const J=null,A=[Number,String],U={type:Boolean,default:!0},Ps=e=>({type:e,required:!0}),Bs=()=>({type:Array,default:()=>[]}),Tn=e=>({type:Number,default:e}),ks=e=>({type:A,default:e}),F=e=>({type:String,default:e});var ce=typeof window<"u";function tt(e){return ce?requestAnimationFrame(e):-1}function Ns(e){tt(()=>tt(e))}var An=e=>e===window,nt=(e,t)=>({top:0,left:0,right:e,bottom:t,width:e,height:t}),_s=e=>{const t=Ee(e);if(An(t)){const n=t.innerWidth,r=t.innerHeight;return nt(n,r)}return t?.getBoundingClientRect?t.getBoundingClientRect():nt(0,0)};function Ds(e=!1){const t=C(e);return[t,(r=!t.value)=>{t.value=r}]}function Fs(e){const t=We(e,null);if(t){const n=Q(),{link:r,unlink:o,internalChildren:s}=t;r(n),He(()=>o(n));const i=ae(()=>s.indexOf(n));return{parent:t,index:i}}return{parent:null,index:C(-1)}}function xn(e){const t=[],n=r=>{Array.isArray(r)&&r.forEach(o=>{var s;wn(o)&&(t.push(o),(s=o.component)!=null&&s.subTree&&(t.push(o.component.subTree),n(o.component.subTree.children)),o.children&&n(o.children))})};return n(e),t}var rt=(e,t)=>{const n=e.indexOf(t);return n===-1?e.findIndex(r=>t.key!==void 0&&t.key!==null&&r.type===t.type&&r.key===t.key):n};function Pn(e,t,n){const r=xn(e.subTree.children);n.sort((s,i)=>rt(r,s.vnode)-rt(r,i.vnode));const o=n.map(s=>s.proxy);t.sort((s,i)=>{const a=o.indexOf(s),u=o.indexOf(i);return a-u})}function Ls(e){const t=we([]),n=we([]),r=Q();return{children:t,linkChildren:s=>{xt(e,Object.assign({link:u=>{u.proxy&&(n.push(u),t.push(u.proxy),Pn(r,t,n))},unlink:u=>{const l=n.indexOf(u);t.splice(l,1),n.splice(l,1)},children:t,internalChildren:n},s))}}}function Lt(e){let t;Je(()=>{e(),Tt(()=>{t=!0})}),At(()=>{t&&e()})}function It(e,t,n={}){if(!ce)return;const{target:r=window,passive:o=!1,capture:s=!1}=n;let i=!1,a;const u=d=>{if(i)return;const m=Ee(d);m&&!a&&(m.addEventListener(e,t,{capture:s,passive:o}),a=!0)},l=d=>{if(i)return;const m=Ee(d);m&&a&&(m.removeEventListener(e,t,s),a=!1)};He(()=>l(r)),Ve(()=>l(r)),Lt(()=>u(r));let f;return gn(r)&&(f=q(r,(d,m)=>{l(m),u(d)})),()=>{f?.(),l(r),i=!0}}var he,ke;function Bn(){if(!he&&(he=C(0),ke=C(0),ce)){const e=()=>{he.value=window.innerWidth,ke.value=window.innerHeight};e(),window.addEventListener("resize",e,{passive:!0}),window.addEventListener("orientationchange",e,{passive:!0})}return{width:he,height:ke}}var kn=/scroll|auto|overlay/i,Nn=ce?window:void 0;function _n(e){return e.tagName!=="HTML"&&e.tagName!=="BODY"&&e.nodeType===1}function Dn(e,t=Nn){let n=e;for(;n&&n!==t&&_n(n);){const{overflowY:r}=window.getComputedStyle(n);if(kn.test(r))return n;n=n.parentNode}return t}var pe;function Is(){if(!pe&&(pe=C("visible"),ce)){const e=()=>{pe.value=document.hidden?"hidden":"visible"};e(),window.addEventListener("visibilitychange",e)}return pe}function Us(e){const t="scrollTop"in e?e.scrollTop:e.pageYOffset;return Math.max(t,0)}function $s(e,t){"scrollTop"in e?e.scrollTop=t:e.scrollTo(e.scrollX,t)}Rn();const Fn=e=>e.stopPropagation();function Ut(e,t){(typeof e.cancelable!="boolean"||e.cancelable)&&e.preventDefault(),t&&Fn(e)}function js(e){const t=Ee(e);if(!t)return!1;const n=window.getComputedStyle(t),r=n.display==="none",o=t.offsetParent===null&&n.position!=="fixed";return r||o}const{width:zs,height:qs}=Bn();function _(e){if(D(e))return Ft(e)?`${e}px`:String(e)}function Ln(e){if(D(e)){if(Array.isArray(e))return{width:_(e[0]),height:_(e[1])};const t=_(e);return{width:t,height:t}}}function In(e){const t={};return e!==void 0&&(t.zIndex=+e),t}const Un=/-(\w)/g,$t=e=>e.replace(Un,(t,n)=>n.toUpperCase()),Ms=(e,t,n)=>Math.min(Math.max(e,t),n),{hasOwnProperty:$n}=Object.prototype;function jn(e,t,n){const r=t[n];D(r)&&(!$n.call(e,n)||!Re(r)?e[n]=r:e[n]=jt(Object(e[n]),r))}function jt(e,t){return Object.keys(t).forEach(n=>{jn(e,t,n)}),e}var zn={name:"姓名",tel:"电话",save:"保存",clear:"清空",cancel:"取消",confirm:"确认",delete:"删除",loading:"加载中...",noCoupon:"暂无优惠券",nameEmpty:"请填写姓名",addContact:"添加联系人",telInvalid:"请填写正确的电话",vanCalendar:{end:"结束",start:"开始",title:"日期选择",weekdays:["日","一","二","三","四","五","六"],monthTitle:(e,t)=>`${e}年${t}月`,rangePrompt:e=>`最多选择 ${e} 天`},vanCascader:{select:"请选择"},vanPagination:{prev:"上一页",next:"下一页"},vanPullRefresh:{pulling:"下拉即可刷新...",loosing:"释放即可刷新..."},vanSubmitBar:{label:"合计:"},vanCoupon:{unlimited:"无门槛",discount:e=>`${e}折`,condition:e=>`满${e}元可用`},vanCouponCell:{title:"优惠券",count:e=>`${e}张可用`},vanCouponList:{exchange:"兑换",close:"不使用",enable:"可用",disabled:"不可用",placeholder:"输入优惠码"},vanAddressEdit:{area:"地区",areaEmpty:"请选择地区",addressEmpty:"请填写详细地址",addressDetail:"详细地址",defaultAddress:"设为默认收货地址"},vanAddressList:{add:"新增地址"}};const ot=C("zh-CN"),st=we({"zh-CN":zn}),qn={messages(){return st[ot.value]},use(e,t){ot.value=e,this.add({[e]:t})},add(e={}){jt(st,e)}};var Mn=qn;function Hn(e){const t=$t(e)+".";return(n,...r)=>{const o=Mn.messages(),s=et(o,t+n)||et(o,n);return Fe(s)?s(...r):s}}function Le(e,t){return t?typeof t=="string"?` ${e}--${t}`:Array.isArray(t)?t.reduce((n,r)=>n+Le(e,r),""):Object.keys(t).reduce((n,r)=>n+(t[r]?Le(e,r):""),""):""}function Vn(e){return(t,n)=>(t&&typeof t!="string"&&(n=t,t=""),t=t?`${e}__${t}`:e,`${t}${Le(t,n)}`)}function j(e){const t=`van-${e}`;return[t,Vn(t),Hn(t)]}const Ke="van-hairline",Hs=`${Ke}--top`,Vs=`${Ke}--surround`,Jn=`${Ke}--top-bottom`,Wn="van-haptics-feedback",Js=500,it=5;function Kn(e,{args:t=[],done:n,canceled:r,error:o}){if(e){const s=e.apply(null,t);vn(s)?s.then(i=>{i?n():r&&r()}).catch(o||On):s?n():r&&r()}else n()}function Y(e){return e.install=t=>{const{name:n}=e;n&&(t.component(n,e),t.component($t(`-${n}`),e))},e}const zt=Symbol();function Ws(e){const t=We(zt,null);t&&q(t,n=>{n&&e()})}function qt(e){const t=Q();t&&$(t.proxy,e)}const Xn={to:[String,Object],url:String,replace:Boolean};function Yn({to:e,url:t,replace:n,$router:r}){e&&r?r[n?"replace":"push"](e):t&&(n?location.replace(t):location.href=t)}function Gn(){const e=Q().proxy;return()=>Yn(e)}const[Zn,at]=j("badge"),Qn={dot:Boolean,max:A,tag:F("div"),color:String,offset:Array,content:A,showZero:U,position:F("top-right")};var er=M({name:Zn,props:Qn,setup(e,{slots:t}){const n=()=>{if(t.content)return!0;const{content:a,showZero:u}=e;return D(a)&&a!==""&&(u||a!==0&&a!=="0")},r=()=>{const{dot:a,max:u,content:l}=e;if(!a&&n())return t.content?t.content():D(u)&&Ft(l)&&+l>+u?`${u}+`:l},o=a=>a.startsWith("-")?a.replace("-",""):`-${a}`,s=ae(()=>{const a={background:e.color};if(e.offset){const[u,l]=e.offset,{position:f}=e,[d,m]=f.split("-");t.default?(typeof l=="number"?a[d]=_(d==="top"?l:-l):a[d]=d==="top"?_(l):o(l),typeof u=="number"?a[m]=_(m==="left"?u:-u):a[m]=m==="left"?_(u):o(u)):(a.marginTop=_(l),a.marginLeft=_(u))}return a}),i=()=>{if(n()||e.dot)return g("div",{class:at([e.position,{dot:e.dot,fixed:!!t.default}]),style:s.value},[r()])};return()=>{if(t.default){const{tag:a}=e;return g(a,{class:at("wrapper")},{default:()=>[t.default(),i()]})}return i()}}});const tr=Y(er);let nr=2e3;const rr=()=>++nr,[or,Ks]=j("config-provider"),sr=Symbol(or),[ir,ct]=j("icon"),ar=e=>e?.includes("/"),cr={dot:Boolean,tag:F("i"),name:String,size:A,badge:A,color:String,badgeProps:Object,classPrefix:String};var lr=M({name:ir,props:cr,setup(e,{slots:t}){const n=We(sr,null),r=ae(()=>e.classPrefix||n?.iconPrefix||ct());return()=>{const{tag:o,dot:s,name:i,size:a,badge:u,color:l}=e,f=ar(i);return g(tr,K({dot:s,tag:o,class:[r.value,f?"":`${r.value}-${i}`],style:{color:l,fontSize:_(a)},content:u},e.badgeProps),{default:()=>{var d;return[(d=t.default)==null?void 0:d.call(t),f&&g("img",{class:ct("image"),src:i},null)]}})}}});const Se=Y(lr),[ur,se]=j("loading"),fr=Array(12).fill(null).map((e,t)=>g("i",{class:se("line",String(t+1))},null)),dr=g("svg",{class:se("circular"),viewBox:"25 25 50 50"},[g("circle",{cx:"50",cy:"50",r:"20",fill:"none"},null)]),hr={size:A,type:F("circular"),color:String,vertical:Boolean,textSize:A,textColor:String};var pr=M({name:ur,props:hr,setup(e,{slots:t}){const n=ae(()=>$({color:e.color},Ln(e.size))),r=()=>{const s=e.type==="spinner"?fr:dr;return g("span",{class:se("spinner",e.type),style:n.value},[t.icon?t.icon():s])},o=()=>{var s;if(t.default)return g("span",{class:se("text"),style:{fontSize:_(e.textSize),color:(s=e.textColor)!=null?s:e.color}},[t.default()])};return()=>{const{type:s,vertical:i}=e;return g("div",{class:se([s,{vertical:i}]),"aria-live":"polite","aria-busy":!0},[r(),o()])}}});const mr=Y(pr),yr={show:Boolean,zIndex:A,overlay:U,duration:A,teleport:[String,Object],lockScroll:U,lazyRender:U,beforeClose:Function,overlayProps:Object,overlayStyle:Object,overlayClass:J,transitionAppear:Boolean,closeOnClickOverlay:U};function br(e,t){return e>t?"horizontal":t>e?"vertical":""}function gr(){const e=C(0),t=C(0),n=C(0),r=C(0),o=C(0),s=C(0),i=C(""),a=C(!0),u=()=>i.value==="vertical",l=()=>i.value==="horizontal",f=()=>{n.value=0,r.value=0,o.value=0,s.value=0,i.value="",a.value=!0};return{move:w=>{const h=w.touches[0];n.value=(h.clientX<0?0:h.clientX)-e.value,r.value=h.clientY-t.value,o.value=Math.abs(n.value),s.value=Math.abs(r.value);const y=10;(!i.value||o.value<y&&s.value<y)&&(i.value=br(o.value,s.value)),a.value&&(o.value>it||s.value>it)&&(a.value=!1)},start:w=>{f(),e.value=w.touches[0].clientX,t.value=w.touches[0].clientY},reset:f,startX:e,startY:t,deltaX:n,deltaY:r,offsetX:o,offsetY:s,direction:i,isVertical:u,isHorizontal:l,isTap:a}}let ne=0;const lt="van-overflow-hidden";function wr(e,t){const n=gr(),r="01",o="10",s=f=>{n.move(f);const d=n.deltaY.value>0?o:r,m=Dn(f.target,e.value),{scrollHeight:w,offsetHeight:h,scrollTop:y}=m;let p="11";y===0?p=h>=w?"00":"01":y+h>=w&&(p="10"),p!=="11"&&n.isVertical()&&!(parseInt(p,2)&parseInt(d,2))&&Ut(f,!0)},i=()=>{document.addEventListener("touchstart",n.start),document.addEventListener("touchmove",s,{passive:!1}),ne||document.body.classList.add(lt),ne++},a=()=>{ne&&(document.removeEventListener("touchstart",n.start),document.removeEventListener("touchmove",s),ne--,ne||document.body.classList.remove(lt))},u=()=>t()&&i(),l=()=>t()&&a();Lt(u),Ve(l),En(l),q(t,f=>{f?i():a()})}function Mt(e){const t=C(!1);return q(e,n=>{n&&(t.value=n)},{immediate:!0}),n=>()=>t.value?n():null}const Ie=()=>{var e;const{scopeId:t}=((e=Q())==null?void 0:e.vnode)||{};return t?{[t]:""}:null},[Er,Sr]=j("overlay"),Or={show:Boolean,zIndex:A,duration:A,className:J,lockScroll:U,lazyRender:U,customStyle:Object,teleport:[String,Object]};var vr=M({name:Er,inheritAttrs:!1,props:Or,setup(e,{attrs:t,slots:n}){const r=C(),o=Mt(()=>e.show||!e.lazyRender),s=a=>{e.lockScroll&&Ut(a,!0)},i=o(()=>{var a;const u=$(In(e.zIndex),e.customStyle);return D(e.duration)&&(u.animationDuration=`${e.duration}s`),kt(g("div",K({ref:r,style:u,class:[Sr(),e.className]},t),[(a=n.default)==null?void 0:a.call(n)]),[[Nt,e.show]])});return It("touchmove",s,{target:r}),()=>{const a=g(Pt,{name:"van-fade",appear:!0},{default:i});return e.teleport?g(Bt,{to:e.teleport},{default:()=>[a]}):a}}});const Rr=Y(vr),Cr=$({},yr,{round:Boolean,position:F("center"),closeIcon:F("cross"),closeable:Boolean,transition:String,iconPrefix:String,closeOnPopstate:Boolean,closeIconPosition:F("top-right"),destroyOnClose:Boolean,safeAreaInsetTop:Boolean,safeAreaInsetBottom:Boolean}),[Tr,ut]=j("popup");var Ar=M({name:Tr,inheritAttrs:!1,props:Cr,emits:["open","close","opened","closed","keydown","update:show","clickOverlay","clickCloseIcon"],setup(e,{emit:t,attrs:n,slots:r}){let o,s;const i=C(),a=C(),u=Mt(()=>e.show||!e.lazyRender),l=ae(()=>{const E={zIndex:i.value};if(D(e.duration)){const x=e.position==="center"?"animationDuration":"transitionDuration";E[x]=`${e.duration}s`}return E}),f=()=>{o||(o=!0,i.value=e.zIndex!==void 0?+e.zIndex:rr(),t("open"))},d=()=>{o&&Kn(e.beforeClose,{done(){o=!1,t("close"),t("update:show",!1)}})},m=E=>{t("clickOverlay",E),e.closeOnClickOverlay&&d()},w=()=>{if(e.overlay){const E=$({show:e.show,class:e.overlayClass,zIndex:i.value,duration:e.duration,customStyle:e.overlayStyle,role:e.closeOnClickOverlay?"button":void 0,tabindex:e.closeOnClickOverlay?0:void 0},e.overlayProps);return g(Rr,K(E,Ie(),{onClick:m}),{default:r["overlay-content"]})}},h=E=>{t("clickCloseIcon",E),d()},y=()=>{if(e.closeable)return g(Se,{role:"button",tabindex:0,name:e.closeIcon,class:[ut("close-icon",e.closeIconPosition),Wn],classPrefix:e.iconPrefix,onClick:h},null)};let p;const S=()=>{p&&clearTimeout(p),p=setTimeout(()=>{t("opened")})},O=()=>t("closed"),R=E=>t("keydown",E),N=u(()=>{var E;const{destroyOnClose:x,round:z,position:H,safeAreaInsetTop:yn,safeAreaInsetBottom:bn,show:Qe}=e;if(!(!Qe&&x))return kt(g("div",K({ref:a,style:l.value,role:"dialog",tabindex:0,class:[ut({round:z,[H]:H}),{"van-safe-area-top":yn,"van-safe-area-bottom":bn}],onKeydown:R},n,Ie()),[(E=r.default)==null?void 0:E.call(r),y()]),[[Nt,Qe]])}),T=()=>{const{position:E,transition:x,transitionAppear:z}=e,H=E==="center"?"van-fade":`van-popup-slide-${E}`;return g(Pt,{name:x||H,appear:z,onAfterEnter:S,onAfterLeave:O},{default:N})};return q(()=>e.show,E=>{E&&!o&&(f(),n.tabindex===0&&Tt(()=>{var x;(x=a.value)==null||x.focus()})),!E&&o&&(o=!1,t("close"))}),qt({popupRef:a}),wr(a,()=>e.show&&e.lockScroll),It("popstate",()=>{e.closeOnPopstate&&(d(),s=!1)}),Je(()=>{e.show&&f()}),At(()=>{s&&(t("update:show",!0),s=!1)}),Ve(()=>{e.show&&e.teleport&&(d(),s=!0)}),xt(zt,()=>e.show),()=>e.teleport?g(Bt,{to:e.teleport},{default:()=>[w(),T()]}):g(_t,null,[w(),T()])}});const xr=Y(Ar),[Pr,G]=j("cell"),Br={tag:F("div"),icon:String,size:String,title:A,value:A,label:A,center:Boolean,isLink:Boolean,border:U,iconPrefix:String,valueClass:J,labelClass:J,titleClass:J,titleStyle:null,arrowDirection:String,required:{type:[Boolean,String],default:null},clickable:{type:Boolean,default:null}},kr=$({},Br,Xn);var Nr=M({name:Pr,props:kr,setup(e,{slots:t}){const n=Gn(),r=()=>{if(t.label||D(e.label))return g("div",{class:[G("label"),e.labelClass]},[t.label?t.label():e.label])},o=()=>{var u;if(t.title||D(e.title)){const l=(u=t.title)==null?void 0:u.call(t);return Array.isArray(l)&&l.length===0?void 0:g("div",{class:[G("title"),e.titleClass],style:e.titleStyle},[l||g("span",null,[e.title]),r()])}},s=()=>{const u=t.value||t.default;if(u||D(e.value))return g("div",{class:[G("value"),e.valueClass]},[u?u():g("span",null,[e.value])])},i=()=>{if(t.icon)return t.icon();if(e.icon)return g(Se,{name:e.icon,class:G("left-icon"),classPrefix:e.iconPrefix},null)},a=()=>{if(t["right-icon"])return t["right-icon"]();if(e.isLink){const u=e.arrowDirection&&e.arrowDirection!=="right"?`arrow-${e.arrowDirection}`:"arrow";return g(Se,{name:u,class:G("right-icon")},null)}};return()=>{var u;const{tag:l,size:f,center:d,border:m,isLink:w,required:h}=e,y=(u=e.clickable)!=null?u:w,p={center:d,required:!!h,clickable:y,borderless:!m};return f&&(p[f]=!!f),g(l,{class:G(p),role:y?"button":void 0,tabindex:y?0:void 0,onClick:n},{default:()=>{var S;return[i(),o(),s(),a(),(S=t.extra)==null?void 0:S.call(t)]}})}}});const Xs=Y(Nr);let re=0;function _r(e){e?(re||document.body.classList.add("van-toast--unclickable"),re++):re&&(re--,re||document.body.classList.remove("van-toast--unclickable"))}const[Dr,Z]=j("toast"),Fr=["show","overlay","teleport","transition","overlayClass","overlayStyle","closeOnClickOverlay","zIndex"],Lr={icon:String,show:Boolean,type:F("text"),overlay:Boolean,message:A,iconSize:A,duration:Tn(2e3),position:F("middle"),teleport:[String,Object],wordBreak:String,className:J,iconPrefix:String,transition:F("van-fade"),loadingType:String,forbidClick:Boolean,overlayClass:J,overlayStyle:Object,closeOnClick:Boolean,closeOnClickOverlay:Boolean,zIndex:A};var Ir=M({name:Dr,props:Lr,emits:["update:show"],setup(e,{emit:t,slots:n}){let r,o=!1;const s=()=>{const d=e.show&&e.forbidClick;o!==d&&(o=d,_r(o))},i=d=>t("update:show",d),a=()=>{e.closeOnClick&&i(!1)},u=()=>clearTimeout(r),l=()=>{const{icon:d,type:m,iconSize:w,iconPrefix:h,loadingType:y}=e;if(d||m==="success"||m==="fail")return g(Se,{name:d||m,size:w,class:Z("icon"),classPrefix:h},null);if(m==="loading")return g(mr,{class:Z("loading"),size:w,type:y},null)},f=()=>{const{type:d,message:m}=e;if(n.message)return g("div",{class:Z("text")},[n.message()]);if(D(m)&&m!=="")return d==="html"?g("div",{key:0,class:Z("text"),innerHTML:String(m)},null):g("div",{class:Z("text")},[m])};return q(()=>[e.show,e.forbidClick],s),q(()=>[e.show,e.type,e.message,e.duration],()=>{u(),e.show&&e.duration>0&&(r=setTimeout(()=>{i(!1)},e.duration))}),Je(s),He(s),()=>g(xr,K({class:[Z([e.position,e.wordBreak==="normal"?"break-normal":e.wordBreak,{[e.type]:!e.icon}]),e.className],lockScroll:!1,onClick:a,onClosed:u,"onUpdate:show":i},Cn(e,Fr)),{default:()=>[l(),f()]})}});function Ur(){const e=we({show:!1}),t=o=>{e.show=o},n=o=>{$(e,o,{transitionAppear:!0}),t(!0)},r=()=>t(!1);return qt({open:n,close:r,toggle:t}),{open:n,close:r,state:e,toggle:t}}function $r(e){const t=Sn(e),n=document.createElement("div");return document.body.appendChild(n),{instance:t.mount(n),unmount(){t.unmount(),document.body.removeChild(n)}}}const jr={icon:"",type:"text",message:"",className:"",overlay:!1,onClose:void 0,onOpened:void 0,duration:2e3,teleport:"body",iconSize:void 0,iconPrefix:void 0,position:"middle",transition:"van-fade",forbidClick:!1,loadingType:void 0,overlayClass:"",overlayStyle:void 0,closeOnClick:!1,closeOnClickOverlay:!1};let me=[],zr=!1,ft=$({},jr);const qr=new Map;function Mr(e){return Re(e)?e:{message:e}}function Hr(){const{instance:e}=$r({setup(){const t=C(""),{open:n,state:r,close:o,toggle:s}=Ur(),i=()=>{},a=()=>g(Ir,K(r,{onClosed:i,"onUpdate:show":s}),null);return q(t,u=>{r.message=u}),Q().render=a,{open:n,close:o,message:t}}});return e}function Vr(){if(!me.length||zr){const e=Hr();me.push(e)}return me[me.length-1]}function Jr(e={}){if(!Dt)return{};const t=Vr(),n=Mr(e);return t.open($({},ft,qr.get(n.type||ft.type),n)),t}const[Wr,dt]=j("cell-group"),Kr={title:String,inset:Boolean,border:U};var Xr=M({name:Wr,inheritAttrs:!1,props:Kr,setup(e,{slots:t,attrs:n}){const r=()=>{var s;return g("div",K({class:[dt({inset:e.inset}),{[Jn]:e.border&&!e.inset}]},n,Ie()),[(s=t.default)==null?void 0:s.call(t)])},o=()=>g("div",{class:dt("title",{inset:e.inset})},[t.title?t.title():e.title]);return()=>e.title||t.title?g(_t,null,[o(),r()]):r()}});const Ys=Y(Xr);function Ht(e,t){return function(){return e.apply(t,arguments)}}const{toString:Yr}=Object.prototype,{getPrototypeOf:Xe}=Object,{iterator:Ce,toStringTag:Vt}=Symbol,Te=(e=>t=>{const n=Yr.call(t);return e[n]||(e[n]=n.slice(8,-1).toLowerCase())})(Object.create(null)),L=e=>(e=e.toLowerCase(),t=>Te(t)===e),Ae=e=>t=>typeof t===e,{isArray:ee}=Array,ie=Ae("undefined");function le(e){return e!==null&&!ie(e)&&e.constructor!==null&&!ie(e.constructor)&&B(e.constructor.isBuffer)&&e.constructor.isBuffer(e)}const Jt=L("ArrayBuffer");function Gr(e){let t;return typeof ArrayBuffer<"u"&&ArrayBuffer.isView?t=ArrayBuffer.isView(e):t=e&&e.buffer&&Jt(e.buffer),t}const Zr=Ae("string"),B=Ae("function"),Wt=Ae("number"),ue=e=>e!==null&&typeof e=="object",Qr=e=>e===!0||e===!1,ye=e=>{if(Te(e)!=="object")return!1;const t=Xe(e);return(t===null||t===Object.prototype||Object.getPrototypeOf(t)===null)&&!(Vt in e)&&!(Ce in e)},eo=e=>{if(!ue(e)||le(e))return!1;try{return Object.keys(e).length===0&&Object.getPrototypeOf(e)===Object.prototype}catch{return!1}},to=L("Date"),no=L("File"),ro=L("Blob"),oo=L("FileList"),so=e=>ue(e)&&B(e.pipe),io=e=>{let t;return e&&(typeof FormData=="function"&&e instanceof FormData||B(e.append)&&((t=Te(e))==="formdata"||t==="object"&&B(e.toString)&&e.toString()==="[object FormData]"))},ao=L("URLSearchParams"),[co,lo,uo,fo]=["ReadableStream","Request","Response","Headers"].map(L),ho=e=>e.trim?e.trim():e.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,"");function fe(e,t,{allOwnKeys:n=!1}={}){if(e===null||typeof e>"u")return;let r,o;if(typeof e!="object"&&(e=[e]),ee(e))for(r=0,o=e.length;r<o;r++)t.call(null,e[r],r,e);else{if(le(e))return;const s=n?Object.getOwnPropertyNames(e):Object.keys(e),i=s.length;let a;for(r=0;r<i;r++)a=s[r],t.call(null,e[a],a,e)}}function Kt(e,t){if(le(e))return null;t=t.toLowerCase();const n=Object.keys(e);let r=n.length,o;for(;r-- >0;)if(o=n[r],t===o.toLowerCase())return o;return null}const V=typeof globalThis<"u"?globalThis:typeof self<"u"?self:typeof window<"u"?window:global,Xt=e=>!ie(e)&&e!==V;function Ue(){const{caseless:e}=Xt(this)&&this||{},t={},n=(r,o)=>{const s=e&&Kt(t,o)||o;ye(t[s])&&ye(r)?t[s]=Ue(t[s],r):ye(r)?t[s]=Ue({},r):ee(r)?t[s]=r.slice():t[s]=r};for(let r=0,o=arguments.length;r<o;r++)arguments[r]&&fe(arguments[r],n);return t}const po=(e,t,n,{allOwnKeys:r}={})=>(fe(t,(o,s)=>{n&&B(o)?e[s]=Ht(o,n):e[s]=o},{allOwnKeys:r}),e),mo=e=>(e.charCodeAt(0)===65279&&(e=e.slice(1)),e),yo=(e,t,n,r)=>{e.prototype=Object.create(t.prototype,r),e.prototype.constructor=e,Object.defineProperty(e,"super",{value:t.prototype}),n&&Object.assign(e.prototype,n)},bo=(e,t,n,r)=>{let o,s,i;const a={};if(t=t||{},e==null)return t;do{for(o=Object.getOwnPropertyNames(e),s=o.length;s-- >0;)i=o[s],(!r||r(i,e,t))&&!a[i]&&(t[i]=e[i],a[i]=!0);e=n!==!1&&Xe(e)}while(e&&(!n||n(e,t))&&e!==Object.prototype);return t},go=(e,t,n)=>{e=String(e),(n===void 0||n>e.length)&&(n=e.length),n-=t.length;const r=e.indexOf(t,n);return r!==-1&&r===n},wo=e=>{if(!e)return null;if(ee(e))return e;let t=e.length;if(!Wt(t))return null;const n=new Array(t);for(;t-- >0;)n[t]=e[t];return n},Eo=(e=>t=>e&&t instanceof e)(typeof Uint8Array<"u"&&Xe(Uint8Array)),So=(e,t)=>{const r=(e&&e[Ce]).call(e);let o;for(;(o=r.next())&&!o.done;){const s=o.value;t.call(e,s[0],s[1])}},Oo=(e,t)=>{let n;const r=[];for(;(n=e.exec(t))!==null;)r.push(n);return r},vo=L("HTMLFormElement"),Ro=e=>e.toLowerCase().replace(/[-_\s]([a-z\d])(\w*)/g,function(n,r,o){return r.toUpperCase()+o}),ht=(({hasOwnProperty:e})=>(t,n)=>e.call(t,n))(Object.prototype),Co=L("RegExp"),Yt=(e,t)=>{const n=Object.getOwnPropertyDescriptors(e),r={};fe(n,(o,s)=>{let i;(i=t(o,s,e))!==!1&&(r[s]=i||o)}),Object.defineProperties(e,r)},To=e=>{Yt(e,(t,n)=>{if(B(e)&&["arguments","caller","callee"].indexOf(n)!==-1)return!1;const r=e[n];if(B(r)){if(t.enumerable=!1,"writable"in t){t.writable=!1;return}t.set||(t.set=()=>{throw Error("Can not rewrite read-only method '"+n+"'")})}})},Ao=(e,t)=>{const n={},r=o=>{o.forEach(s=>{n[s]=!0})};return ee(e)?r(e):r(String(e).split(t)),n},xo=()=>{},Po=(e,t)=>e!=null&&Number.isFinite(e=+e)?e:t;function Bo(e){return!!(e&&B(e.append)&&e[Vt]==="FormData"&&e[Ce])}const ko=e=>{const t=new Array(10),n=(r,o)=>{if(ue(r)){if(t.indexOf(r)>=0)return;if(le(r))return r;if(!("toJSON"in r)){t[o]=r;const s=ee(r)?[]:{};return fe(r,(i,a)=>{const u=n(i,o+1);!ie(u)&&(s[a]=u)}),t[o]=void 0,s}}return r};return n(e,0)},No=L("AsyncFunction"),_o=e=>e&&(ue(e)||B(e))&&B(e.then)&&B(e.catch),Gt=((e,t)=>e?setImmediate:t?((n,r)=>(V.addEventListener("message",({source:o,data:s})=>{o===V&&s===n&&r.length&&r.shift()()},!1),o=>{r.push(o),V.postMessage(n,"*")}))(`axios@${Math.random()}`,[]):n=>setTimeout(n))(typeof setImmediate=="function",B(V.postMessage)),Do=typeof queueMicrotask<"u"?queueMicrotask.bind(V):typeof process<"u"&&process.nextTick||Gt,Fo=e=>e!=null&&B(e[Ce]),c={isArray:ee,isArrayBuffer:Jt,isBuffer:le,isFormData:io,isArrayBufferView:Gr,isString:Zr,isNumber:Wt,isBoolean:Qr,isObject:ue,isPlainObject:ye,isEmptyObject:eo,isReadableStream:co,isRequest:lo,isResponse:uo,isHeaders:fo,isUndefined:ie,isDate:to,isFile:no,isBlob:ro,isRegExp:Co,isFunction:B,isStream:so,isURLSearchParams:ao,isTypedArray:Eo,isFileList:oo,forEach:fe,merge:Ue,extend:po,trim:ho,stripBOM:mo,inherits:yo,toFlatObject:bo,kindOf:Te,kindOfTest:L,endsWith:go,toArray:wo,forEachEntry:So,matchAll:Oo,isHTMLForm:vo,hasOwnProperty:ht,hasOwnProp:ht,reduceDescriptors:Yt,freezeMethods:To,toObjectSet:Ao,toCamelCase:Ro,noop:xo,toFiniteNumber:Po,findKey:Kt,global:V,isContextDefined:Xt,isSpecCompliantForm:Bo,toJSONObject:ko,isAsyncFn:No,isThenable:_o,setImmediate:Gt,asap:Do,isIterable:Fo};function b(e,t,n,r,o){Error.call(this),Error.captureStackTrace?Error.captureStackTrace(this,this.constructor):this.stack=new Error().stack,this.message=e,this.name="AxiosError",t&&(this.code=t),n&&(this.config=n),r&&(this.request=r),o&&(this.response=o,this.status=o.status?o.status:null)}c.inherits(b,Error,{toJSON:function(){return{message:this.message,name:this.name,description:this.description,number:this.number,fileName:this.fileName,lineNumber:this.lineNumber,columnNumber:this.columnNumber,stack:this.stack,config:c.toJSONObject(this.config),code:this.code,status:this.status}}});const Zt=b.prototype,Qt={};["ERR_BAD_OPTION_VALUE","ERR_BAD_OPTION","ECONNABORTED","ETIMEDOUT","ERR_NETWORK","ERR_FR_TOO_MANY_REDIRECTS","ERR_DEPRECATED","ERR_BAD_RESPONSE","ERR_BAD_REQUEST","ERR_CANCELED","ERR_NOT_SUPPORT","ERR_INVALID_URL"].forEach(e=>{Qt[e]={value:e}});Object.defineProperties(b,Qt);Object.defineProperty(Zt,"isAxiosError",{value:!0});b.from=(e,t,n,r,o,s)=>{const i=Object.create(Zt);return c.toFlatObject(e,i,function(u){return u!==Error.prototype},a=>a!=="isAxiosError"),b.call(i,e.message,t,n,r,o),i.cause=e,i.name=e.name,s&&Object.assign(i,s),i};const Lo=null;function $e(e){return c.isPlainObject(e)||c.isArray(e)}function en(e){return c.endsWith(e,"[]")?e.slice(0,-2):e}function pt(e,t,n){return e?e.concat(t).map(function(o,s){return o=en(o),!n&&s?"["+o+"]":o}).join(n?".":""):t}function Io(e){return c.isArray(e)&&!e.some($e)}const Uo=c.toFlatObject(c,{},null,function(t){return/^is[A-Z]/.test(t)});function xe(e,t,n){if(!c.isObject(e))throw new TypeError("target must be an object");t=t||new FormData,n=c.toFlatObject(n,{metaTokens:!0,dots:!1,indexes:!1},!1,function(y,p){return!c.isUndefined(p[y])});const r=n.metaTokens,o=n.visitor||f,s=n.dots,i=n.indexes,u=(n.Blob||typeof Blob<"u"&&Blob)&&c.isSpecCompliantForm(t);if(!c.isFunction(o))throw new TypeError("visitor must be a function");function l(h){if(h===null)return"";if(c.isDate(h))return h.toISOString();if(c.isBoolean(h))return h.toString();if(!u&&c.isBlob(h))throw new b("Blob is not supported. Use a Buffer instead.");return c.isArrayBuffer(h)||c.isTypedArray(h)?u&&typeof Blob=="function"?new Blob([h]):Buffer.from(h):h}function f(h,y,p){let S=h;if(h&&!p&&typeof h=="object"){if(c.endsWith(y,"{}"))y=r?y:y.slice(0,-2),h=JSON.stringify(h);else if(c.isArray(h)&&Io(h)||(c.isFileList(h)||c.endsWith(y,"[]"))&&(S=c.toArray(h)))return y=en(y),S.forEach(function(R,N){!(c.isUndefined(R)||R===null)&&t.append(i===!0?pt([y],N,s):i===null?y:y+"[]",l(R))}),!1}return $e(h)?!0:(t.append(pt(p,y,s),l(h)),!1)}const d=[],m=Object.assign(Uo,{defaultVisitor:f,convertValue:l,isVisitable:$e});function w(h,y){if(!c.isUndefined(h)){if(d.indexOf(h)!==-1)throw Error("Circular reference detected in "+y.join("."));d.push(h),c.forEach(h,function(S,O){(!(c.isUndefined(S)||S===null)&&o.call(t,S,c.isString(O)?O.trim():O,y,m))===!0&&w(S,y?y.concat(O):[O])}),d.pop()}}if(!c.isObject(e))throw new TypeError("data must be an object");return w(e),t}function mt(e){const t={"!":"%21","'":"%27","(":"%28",")":"%29","~":"%7E","%20":"+","%00":"\0"};return encodeURIComponent(e).replace(/[!'()~]|%20|%00/g,function(r){return t[r]})}function Ye(e,t){this._pairs=[],e&&xe(e,this,t)}const tn=Ye.prototype;tn.append=function(t,n){this._pairs.push([t,n])};tn.toString=function(t){const n=t?function(r){return t.call(this,r,mt)}:mt;return this._pairs.map(function(o){return n(o[0])+"="+n(o[1])},"").join("&")};function $o(e){return encodeURIComponent(e).replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(/%20/g,"+").replace(/%5B/gi,"[").replace(/%5D/gi,"]")}function nn(e,t,n){if(!t)return e;const r=n&&n.encode||$o;c.isFunction(n)&&(n={serialize:n});const o=n&&n.serialize;let s;if(o?s=o(t,n):s=c.isURLSearchParams(t)?t.toString():new Ye(t,n).toString(r),s){const i=e.indexOf("#");i!==-1&&(e=e.slice(0,i)),e+=(e.indexOf("?")===-1?"?":"&")+s}return e}class yt{constructor(){this.handlers=[]}use(t,n,r){return this.handlers.push({fulfilled:t,rejected:n,synchronous:r?r.synchronous:!1,runWhen:r?r.runWhen:null}),this.handlers.length-1}eject(t){this.handlers[t]&&(this.handlers[t]=null)}clear(){this.handlers&&(this.handlers=[])}forEach(t){c.forEach(this.handlers,function(r){r!==null&&t(r)})}}const rn={silentJSONParsing:!0,forcedJSONParsing:!0,clarifyTimeoutError:!1},jo=typeof URLSearchParams<"u"?URLSearchParams:Ye,zo=typeof FormData<"u"?FormData:null,qo=typeof Blob<"u"?Blob:null,Mo={isBrowser:!0,classes:{URLSearchParams:jo,FormData:zo,Blob:qo},protocols:["http","https","file","blob","url","data"]},Ge=typeof window<"u"&&typeof document<"u",je=typeof navigator=="object"&&navigator||void 0,Ho=Ge&&(!je||["ReactNative","NativeScript","NS"].indexOf(je.product)<0),Vo=typeof WorkerGlobalScope<"u"&&self instanceof WorkerGlobalScope&&typeof self.importScripts=="function",Jo=Ge&&window.location.href||"http://localhost",Wo=Object.freeze(Object.defineProperty({__proto__:null,hasBrowserEnv:Ge,hasStandardBrowserEnv:Ho,hasStandardBrowserWebWorkerEnv:Vo,navigator:je,origin:Jo},Symbol.toStringTag,{value:"Module"})),P={...Wo,...Mo};function Ko(e,t){return xe(e,new P.classes.URLSearchParams,{visitor:function(n,r,o,s){return P.isNode&&c.isBuffer(n)?(this.append(r,n.toString("base64")),!1):s.defaultVisitor.apply(this,arguments)},...t})}function Xo(e){return c.matchAll(/\w+|\[(\w*)]/g,e).map(t=>t[0]==="[]"?"":t[1]||t[0])}function Yo(e){const t={},n=Object.keys(e);let r;const o=n.length;let s;for(r=0;r<o;r++)s=n[r],t[s]=e[s];return t}function on(e){function t(n,r,o,s){let i=n[s++];if(i==="__proto__")return!0;const a=Number.isFinite(+i),u=s>=n.length;return i=!i&&c.isArray(o)?o.length:i,u?(c.hasOwnProp(o,i)?o[i]=[o[i],r]:o[i]=r,!a):((!o[i]||!c.isObject(o[i]))&&(o[i]=[]),t(n,r,o[i],s)&&c.isArray(o[i])&&(o[i]=Yo(o[i])),!a)}if(c.isFormData(e)&&c.isFunction(e.entries)){const n={};return c.forEachEntry(e,(r,o)=>{t(Xo(r),o,n,0)}),n}return null}function Go(e,t,n){if(c.isString(e))try{return(t||JSON.parse)(e),c.trim(e)}catch(r){if(r.name!=="SyntaxError")throw r}return(n||JSON.stringify)(e)}const de={transitional:rn,adapter:["xhr","http","fetch"],transformRequest:[function(t,n){const r=n.getContentType()||"",o=r.indexOf("application/json")>-1,s=c.isObject(t);if(s&&c.isHTMLForm(t)&&(t=new FormData(t)),c.isFormData(t))return o?JSON.stringify(on(t)):t;if(c.isArrayBuffer(t)||c.isBuffer(t)||c.isStream(t)||c.isFile(t)||c.isBlob(t)||c.isReadableStream(t))return t;if(c.isArrayBufferView(t))return t.buffer;if(c.isURLSearchParams(t))return n.setContentType("application/x-www-form-urlencoded;charset=utf-8",!1),t.toString();let a;if(s){if(r.indexOf("application/x-www-form-urlencoded")>-1)return Ko(t,this.formSerializer).toString();if((a=c.isFileList(t))||r.indexOf("multipart/form-data")>-1){const u=this.env&&this.env.FormData;return xe(a?{"files[]":t}:t,u&&new u,this.formSerializer)}}return s||o?(n.setContentType("application/json",!1),Go(t)):t}],transformResponse:[function(t){const n=this.transitional||de.transitional,r=n&&n.forcedJSONParsing,o=this.responseType==="json";if(c.isResponse(t)||c.isReadableStream(t))return t;if(t&&c.isString(t)&&(r&&!this.responseType||o)){const i=!(n&&n.silentJSONParsing)&&o;try{return JSON.parse(t)}catch(a){if(i)throw a.name==="SyntaxError"?b.from(a,b.ERR_BAD_RESPONSE,this,null,this.response):a}}return t}],timeout:0,xsrfCookieName:"XSRF-TOKEN",xsrfHeaderName:"X-XSRF-TOKEN",maxContentLength:-1,maxBodyLength:-1,env:{FormData:P.classes.FormData,Blob:P.classes.Blob},validateStatus:function(t){return t>=200&&t<300},headers:{common:{Accept:"application/json, text/plain, */*","Content-Type":void 0}}};c.forEach(["delete","get","head","post","put","patch"],e=>{de.headers[e]={}});const Zo=c.toObjectSet(["age","authorization","content-length","content-type","etag","expires","from","host","if-modified-since","if-unmodified-since","last-modified","location","max-forwards","proxy-authorization","referer","retry-after","user-agent"]),Qo=e=>{const t={};let n,r,o;return e&&e.split(`
+`).forEach(function(i){o=i.indexOf(":"),n=i.substring(0,o).trim().toLowerCase(),r=i.substring(o+1).trim(),!(!n||t[n]&&Zo[n])&&(n==="set-cookie"?t[n]?t[n].push(r):t[n]=[r]:t[n]=t[n]?t[n]+", "+r:r)}),t},bt=Symbol("internals");function oe(e){return e&&String(e).trim().toLowerCase()}function be(e){return e===!1||e==null?e:c.isArray(e)?e.map(be):String(e)}function es(e){const t=Object.create(null),n=/([^\s,;=]+)\s*(?:=\s*([^,;]+))?/g;let r;for(;r=n.exec(e);)t[r[1]]=r[2];return t}const ts=e=>/^[-_a-zA-Z0-9^`|~,!#$%&'*+.]+$/.test(e.trim());function Ne(e,t,n,r,o){if(c.isFunction(r))return r.call(this,t,n);if(o&&(t=n),!!c.isString(t)){if(c.isString(r))return t.indexOf(r)!==-1;if(c.isRegExp(r))return r.test(t)}}function ns(e){return e.trim().toLowerCase().replace(/([a-z\d])(\w*)/g,(t,n,r)=>n.toUpperCase()+r)}function rs(e,t){const n=c.toCamelCase(" "+t);["get","set","has"].forEach(r=>{Object.defineProperty(e,r+n,{value:function(o,s,i){return this[r].call(this,t,o,s,i)},configurable:!0})})}let k=class{constructor(t){t&&this.set(t)}set(t,n,r){const o=this;function s(a,u,l){const f=oe(u);if(!f)throw new Error("header name must be a non-empty string");const d=c.findKey(o,f);(!d||o[d]===void 0||l===!0||l===void 0&&o[d]!==!1)&&(o[d||u]=be(a))}const i=(a,u)=>c.forEach(a,(l,f)=>s(l,f,u));if(c.isPlainObject(t)||t instanceof this.constructor)i(t,n);else if(c.isString(t)&&(t=t.trim())&&!ts(t))i(Qo(t),n);else if(c.isObject(t)&&c.isIterable(t)){let a={},u,l;for(const f of t){if(!c.isArray(f))throw TypeError("Object iterator must return a key-value pair");a[l=f[0]]=(u=a[l])?c.isArray(u)?[...u,f[1]]:[u,f[1]]:f[1]}i(a,n)}else t!=null&&s(n,t,r);return this}get(t,n){if(t=oe(t),t){const r=c.findKey(this,t);if(r){const o=this[r];if(!n)return o;if(n===!0)return es(o);if(c.isFunction(n))return n.call(this,o,r);if(c.isRegExp(n))return n.exec(o);throw new TypeError("parser must be boolean|regexp|function")}}}has(t,n){if(t=oe(t),t){const r=c.findKey(this,t);return!!(r&&this[r]!==void 0&&(!n||Ne(this,this[r],r,n)))}return!1}delete(t,n){const r=this;let o=!1;function s(i){if(i=oe(i),i){const a=c.findKey(r,i);a&&(!n||Ne(r,r[a],a,n))&&(delete r[a],o=!0)}}return c.isArray(t)?t.forEach(s):s(t),o}clear(t){const n=Object.keys(this);let r=n.length,o=!1;for(;r--;){const s=n[r];(!t||Ne(this,this[s],s,t,!0))&&(delete this[s],o=!0)}return o}normalize(t){const n=this,r={};return c.forEach(this,(o,s)=>{const i=c.findKey(r,s);if(i){n[i]=be(o),delete n[s];return}const a=t?ns(s):String(s).trim();a!==s&&delete n[s],n[a]=be(o),r[a]=!0}),this}concat(...t){return this.constructor.concat(this,...t)}toJSON(t){const n=Object.create(null);return c.forEach(this,(r,o)=>{r!=null&&r!==!1&&(n[o]=t&&c.isArray(r)?r.join(", "):r)}),n}[Symbol.iterator](){return Object.entries(this.toJSON())[Symbol.iterator]()}toString(){return Object.entries(this.toJSON()).map(([t,n])=>t+": "+n).join(`
+`)}getSetCookie(){return this.get("set-cookie")||[]}get[Symbol.toStringTag](){return"AxiosHeaders"}static from(t){return t instanceof this?t:new this(t)}static concat(t,...n){const r=new this(t);return n.forEach(o=>r.set(o)),r}static accessor(t){const r=(this[bt]=this[bt]={accessors:{}}).accessors,o=this.prototype;function s(i){const a=oe(i);r[a]||(rs(o,i),r[a]=!0)}return c.isArray(t)?t.forEach(s):s(t),this}};k.accessor(["Content-Type","Content-Length","Accept","Accept-Encoding","User-Agent","Authorization"]);c.reduceDescriptors(k.prototype,({value:e},t)=>{let n=t[0].toUpperCase()+t.slice(1);return{get:()=>e,set(r){this[n]=r}}});c.freezeMethods(k);function _e(e,t){const n=this||de,r=t||n,o=k.from(r.headers);let s=r.data;return c.forEach(e,function(a){s=a.call(n,s,o.normalize(),t?t.status:void 0)}),o.normalize(),s}function sn(e){return!!(e&&e.__CANCEL__)}function te(e,t,n){b.call(this,e??"canceled",b.ERR_CANCELED,t,n),this.name="CanceledError"}c.inherits(te,b,{__CANCEL__:!0});function an(e,t,n){const r=n.config.validateStatus;!n.status||!r||r(n.status)?e(n):t(new b("Request failed with status code "+n.status,[b.ERR_BAD_REQUEST,b.ERR_BAD_RESPONSE][Math.floor(n.status/100)-4],n.config,n.request,n))}function os(e){const t=/^([-+\w]{1,25})(:?\/\/|:)/.exec(e);return t&&t[1]||""}function ss(e,t){e=e||10;const n=new Array(e),r=new Array(e);let o=0,s=0,i;return t=t!==void 0?t:1e3,function(u){const l=Date.now(),f=r[s];i||(i=l),n[o]=u,r[o]=l;let d=s,m=0;for(;d!==o;)m+=n[d++],d=d%e;if(o=(o+1)%e,o===s&&(s=(s+1)%e),l-i<t)return;const w=f&&l-f;return w?Math.round(m*1e3/w):void 0}}function is(e,t){let n=0,r=1e3/t,o,s;const i=(l,f=Date.now())=>{n=f,o=null,s&&(clearTimeout(s),s=null),e(...l)};return[(...l)=>{const f=Date.now(),d=f-n;d>=r?i(l,f):(o=l,s||(s=setTimeout(()=>{s=null,i(o)},r-d)))},()=>o&&i(o)]}const Oe=(e,t,n=3)=>{let r=0;const o=ss(50,250);return is(s=>{const i=s.loaded,a=s.lengthComputable?s.total:void 0,u=i-r,l=o(u),f=i<=a;r=i;const d={loaded:i,total:a,progress:a?i/a:void 0,bytes:u,rate:l||void 0,estimated:l&&a&&f?(a-i)/l:void 0,event:s,lengthComputable:a!=null,[t?"download":"upload"]:!0};e(d)},n)},gt=(e,t)=>{const n=e!=null;return[r=>t[0]({lengthComputable:n,total:e,loaded:r}),t[1]]},wt=e=>(...t)=>c.asap(()=>e(...t)),as=P.hasStandardBrowserEnv?((e,t)=>n=>(n=new URL(n,P.origin),e.protocol===n.protocol&&e.host===n.host&&(t||e.port===n.port)))(new URL(P.origin),P.navigator&&/(msie|trident)/i.test(P.navigator.userAgent)):()=>!0,cs=P.hasStandardBrowserEnv?{write(e,t,n,r,o,s){const i=[e+"="+encodeURIComponent(t)];c.isNumber(n)&&i.push("expires="+new Date(n).toGMTString()),c.isString(r)&&i.push("path="+r),c.isString(o)&&i.push("domain="+o),s===!0&&i.push("secure"),document.cookie=i.join("; ")},read(e){const t=document.cookie.match(new RegExp("(^|;\\s*)("+e+")=([^;]*)"));return t?decodeURIComponent(t[3]):null},remove(e){this.write(e,"",Date.now()-864e5)}}:{write(){},read(){return null},remove(){}};function ls(e){return/^([a-z][a-z\d+\-.]*:)?\/\//i.test(e)}function us(e,t){return t?e.replace(/\/?\/$/,"")+"/"+t.replace(/^\/+/,""):e}function cn(e,t,n){let r=!ls(t);return e&&(r||n==!1)?us(e,t):t}const Et=e=>e instanceof k?{...e}:e;function X(e,t){t=t||{};const n={};function r(l,f,d,m){return c.isPlainObject(l)&&c.isPlainObject(f)?c.merge.call({caseless:m},l,f):c.isPlainObject(f)?c.merge({},f):c.isArray(f)?f.slice():f}function o(l,f,d,m){if(c.isUndefined(f)){if(!c.isUndefined(l))return r(void 0,l,d,m)}else return r(l,f,d,m)}function s(l,f){if(!c.isUndefined(f))return r(void 0,f)}function i(l,f){if(c.isUndefined(f)){if(!c.isUndefined(l))return r(void 0,l)}else return r(void 0,f)}function a(l,f,d){if(d in t)return r(l,f);if(d in e)return r(void 0,l)}const u={url:s,method:s,data:s,baseURL:i,transformRequest:i,transformResponse:i,paramsSerializer:i,timeout:i,timeoutMessage:i,withCredentials:i,withXSRFToken:i,adapter:i,responseType:i,xsrfCookieName:i,xsrfHeaderName:i,onUploadProgress:i,onDownloadProgress:i,decompress:i,maxContentLength:i,maxBodyLength:i,beforeRedirect:i,transport:i,httpAgent:i,httpsAgent:i,cancelToken:i,socketPath:i,responseEncoding:i,validateStatus:a,headers:(l,f,d)=>o(Et(l),Et(f),d,!0)};return c.forEach(Object.keys({...e,...t}),function(f){const d=u[f]||o,m=d(e[f],t[f],f);c.isUndefined(m)&&d!==a||(n[f]=m)}),n}const ln=e=>{const t=X({},e);let{data:n,withXSRFToken:r,xsrfHeaderName:o,xsrfCookieName:s,headers:i,auth:a}=t;t.headers=i=k.from(i),t.url=nn(cn(t.baseURL,t.url,t.allowAbsoluteUrls),e.params,e.paramsSerializer),a&&i.set("Authorization","Basic "+btoa((a.username||"")+":"+(a.password?unescape(encodeURIComponent(a.password)):"")));let u;if(c.isFormData(n)){if(P.hasStandardBrowserEnv||P.hasStandardBrowserWebWorkerEnv)i.setContentType(void 0);else if((u=i.getContentType())!==!1){const[l,...f]=u?u.split(";").map(d=>d.trim()).filter(Boolean):[];i.setContentType([l||"multipart/form-data",...f].join("; "))}}if(P.hasStandardBrowserEnv&&(r&&c.isFunction(r)&&(r=r(t)),r||r!==!1&&as(t.url))){const l=o&&s&&cs.read(s);l&&i.set(o,l)}return t},fs=typeof XMLHttpRequest<"u",ds=fs&&function(e){return new Promise(function(n,r){const o=ln(e);let s=o.data;const i=k.from(o.headers).normalize();let{responseType:a,onUploadProgress:u,onDownloadProgress:l}=o,f,d,m,w,h;function y(){w&&w(),h&&h(),o.cancelToken&&o.cancelToken.unsubscribe(f),o.signal&&o.signal.removeEventListener("abort",f)}let p=new XMLHttpRequest;p.open(o.method.toUpperCase(),o.url,!0),p.timeout=o.timeout;function S(){if(!p)return;const R=k.from("getAllResponseHeaders"in p&&p.getAllResponseHeaders()),T={data:!a||a==="text"||a==="json"?p.responseText:p.response,status:p.status,statusText:p.statusText,headers:R,config:e,request:p};an(function(x){n(x),y()},function(x){r(x),y()},T),p=null}"onloadend"in p?p.onloadend=S:p.onreadystatechange=function(){!p||p.readyState!==4||p.status===0&&!(p.responseURL&&p.responseURL.indexOf("file:")===0)||setTimeout(S)},p.onabort=function(){p&&(r(new b("Request aborted",b.ECONNABORTED,e,p)),p=null)},p.onerror=function(){r(new b("Network Error",b.ERR_NETWORK,e,p)),p=null},p.ontimeout=function(){let N=o.timeout?"timeout of "+o.timeout+"ms exceeded":"timeout exceeded";const T=o.transitional||rn;o.timeoutErrorMessage&&(N=o.timeoutErrorMessage),r(new b(N,T.clarifyTimeoutError?b.ETIMEDOUT:b.ECONNABORTED,e,p)),p=null},s===void 0&&i.setContentType(null),"setRequestHeader"in p&&c.forEach(i.toJSON(),function(N,T){p.setRequestHeader(T,N)}),c.isUndefined(o.withCredentials)||(p.withCredentials=!!o.withCredentials),a&&a!=="json"&&(p.responseType=o.responseType),l&&([m,h]=Oe(l,!0),p.addEventListener("progress",m)),u&&p.upload&&([d,w]=Oe(u),p.upload.addEventListener("progress",d),p.upload.addEventListener("loadend",w)),(o.cancelToken||o.signal)&&(f=R=>{p&&(r(!R||R.type?new te(null,e,p):R),p.abort(),p=null)},o.cancelToken&&o.cancelToken.subscribe(f),o.signal&&(o.signal.aborted?f():o.signal.addEventListener("abort",f)));const O=os(o.url);if(O&&P.protocols.indexOf(O)===-1){r(new b("Unsupported protocol "+O+":",b.ERR_BAD_REQUEST,e));return}p.send(s||null)})},hs=(e,t)=>{const{length:n}=e=e?e.filter(Boolean):[];if(t||n){let r=new AbortController,o;const s=function(l){if(!o){o=!0,a();const f=l instanceof Error?l:this.reason;r.abort(f instanceof b?f:new te(f instanceof Error?f.message:f))}};let i=t&&setTimeout(()=>{i=null,s(new b(`timeout ${t} of ms exceeded`,b.ETIMEDOUT))},t);const a=()=>{e&&(i&&clearTimeout(i),i=null,e.forEach(l=>{l.unsubscribe?l.unsubscribe(s):l.removeEventListener("abort",s)}),e=null)};e.forEach(l=>l.addEventListener("abort",s));const{signal:u}=r;return u.unsubscribe=()=>c.asap(a),u}},ps=function*(e,t){let n=e.byteLength;if(n<t){yield e;return}let r=0,o;for(;r<n;)o=r+t,yield e.slice(r,o),r=o},ms=async function*(e,t){for await(const n of ys(e))yield*ps(n,t)},ys=async function*(e){if(e[Symbol.asyncIterator]){yield*e;return}const t=e.getReader();try{for(;;){const{done:n,value:r}=await t.read();if(n)break;yield r}}finally{await t.cancel()}},St=(e,t,n,r)=>{const o=ms(e,t);let s=0,i,a=u=>{i||(i=!0,r&&r(u))};return new ReadableStream({async pull(u){try{const{done:l,value:f}=await o.next();if(l){a(),u.close();return}let d=f.byteLength;if(n){let m=s+=d;n(m)}u.enqueue(new Uint8Array(f))}catch(l){throw a(l),l}},cancel(u){return a(u),o.return()}},{highWaterMark:2})},Pe=typeof fetch=="function"&&typeof Request=="function"&&typeof Response=="function",un=Pe&&typeof ReadableStream=="function",bs=Pe&&(typeof TextEncoder=="function"?(e=>t=>e.encode(t))(new TextEncoder):async e=>new Uint8Array(await new Response(e).arrayBuffer())),fn=(e,...t)=>{try{return!!e(...t)}catch{return!1}},gs=un&&fn(()=>{let e=!1;const t=new Request(P.origin,{body:new ReadableStream,method:"POST",get duplex(){return e=!0,"half"}}).headers.has("Content-Type");return e&&!t}),Ot=64*1024,ze=un&&fn(()=>c.isReadableStream(new Response("").body)),ve={stream:ze&&(e=>e.body)};Pe&&(e=>{["text","arrayBuffer","blob","formData","stream"].forEach(t=>{!ve[t]&&(ve[t]=c.isFunction(e[t])?n=>n[t]():(n,r)=>{throw new b(`Response type '${t}' is not supported`,b.ERR_NOT_SUPPORT,r)})})})(new Response);const ws=async e=>{if(e==null)return 0;if(c.isBlob(e))return e.size;if(c.isSpecCompliantForm(e))return(await new Request(P.origin,{method:"POST",body:e}).arrayBuffer()).byteLength;if(c.isArrayBufferView(e)||c.isArrayBuffer(e))return e.byteLength;if(c.isURLSearchParams(e)&&(e=e+""),c.isString(e))return(await bs(e)).byteLength},Es=async(e,t)=>{const n=c.toFiniteNumber(e.getContentLength());return n??ws(t)},Ss=Pe&&(async e=>{let{url:t,method:n,data:r,signal:o,cancelToken:s,timeout:i,onDownloadProgress:a,onUploadProgress:u,responseType:l,headers:f,withCredentials:d="same-origin",fetchOptions:m}=ln(e);l=l?(l+"").toLowerCase():"text";let w=hs([o,s&&s.toAbortSignal()],i),h;const y=w&&w.unsubscribe&&(()=>{w.unsubscribe()});let p;try{if(u&&gs&&n!=="get"&&n!=="head"&&(p=await Es(f,r))!==0){let T=new Request(t,{method:"POST",body:r,duplex:"half"}),E;if(c.isFormData(r)&&(E=T.headers.get("content-type"))&&f.setContentType(E),T.body){const[x,z]=gt(p,Oe(wt(u)));r=St(T.body,Ot,x,z)}}c.isString(d)||(d=d?"include":"omit");const S="credentials"in Request.prototype;h=new Request(t,{...m,signal:w,method:n.toUpperCase(),headers:f.normalize().toJSON(),body:r,duplex:"half",credentials:S?d:void 0});let O=await fetch(h,m);const R=ze&&(l==="stream"||l==="response");if(ze&&(a||R&&y)){const T={};["status","statusText","headers"].forEach(H=>{T[H]=O[H]});const E=c.toFiniteNumber(O.headers.get("content-length")),[x,z]=a&&gt(E,Oe(wt(a),!0))||[];O=new Response(St(O.body,Ot,x,()=>{z&&z(),y&&y()}),T)}l=l||"text";let N=await ve[c.findKey(ve,l)||"text"](O,e);return!R&&y&&y(),await new Promise((T,E)=>{an(T,E,{data:N,headers:k.from(O.headers),status:O.status,statusText:O.statusText,config:e,request:h})})}catch(S){throw y&&y(),S&&S.name==="TypeError"&&/Load failed|fetch/i.test(S.message)?Object.assign(new b("Network Error",b.ERR_NETWORK,e,h),{cause:S.cause||S}):b.from(S,S&&S.code,e,h)}}),qe={http:Lo,xhr:ds,fetch:Ss};c.forEach(qe,(e,t)=>{if(e){try{Object.defineProperty(e,"name",{value:t})}catch{}Object.defineProperty(e,"adapterName",{value:t})}});const vt=e=>`- ${e}`,Os=e=>c.isFunction(e)||e===null||e===!1,dn={getAdapter:e=>{e=c.isArray(e)?e:[e];const{length:t}=e;let n,r;const o={};for(let s=0;s<t;s++){n=e[s];let i;if(r=n,!Os(n)&&(r=qe[(i=String(n)).toLowerCase()],r===void 0))throw new b(`Unknown adapter '${i}'`);if(r)break;o[i||"#"+s]=r}if(!r){const s=Object.entries(o).map(([a,u])=>`adapter ${a} `+(u===!1?"is not supported by the environment":"is not available in the build"));let i=t?s.length>1?`since :
+`+s.map(vt).join(`
+`):" "+vt(s[0]):"as no adapter specified";throw new b("There is no suitable adapter to dispatch the request "+i,"ERR_NOT_SUPPORT")}return r},adapters:qe};function De(e){if(e.cancelToken&&e.cancelToken.throwIfRequested(),e.signal&&e.signal.aborted)throw new te(null,e)}function Rt(e){return De(e),e.headers=k.from(e.headers),e.data=_e.call(e,e.transformRequest),["post","put","patch"].indexOf(e.method)!==-1&&e.headers.setContentType("application/x-www-form-urlencoded",!1),dn.getAdapter(e.adapter||de.adapter)(e).then(function(r){return De(e),r.data=_e.call(e,e.transformResponse,r),r.headers=k.from(r.headers),r},function(r){return sn(r)||(De(e),r&&r.response&&(r.response.data=_e.call(e,e.transformResponse,r.response),r.response.headers=k.from(r.response.headers))),Promise.reject(r)})}const hn="1.11.0",Be={};["object","boolean","number","function","string","symbol"].forEach((e,t)=>{Be[e]=function(r){return typeof r===e||"a"+(t<1?"n ":" ")+e}});const Ct={};Be.transitional=function(t,n,r){function o(s,i){return"[Axios v"+hn+"] Transitional option '"+s+"'"+i+(r?". "+r:"")}return(s,i,a)=>{if(t===!1)throw new b(o(i," has been removed"+(n?" in "+n:"")),b.ERR_DEPRECATED);return n&&!Ct[i]&&(Ct[i]=!0,console.warn(o(i," has been deprecated since v"+n+" and will be removed in the near future"))),t?t(s,i,a):!0}};Be.spelling=function(t){return(n,r)=>(console.warn(`${r} is likely a misspelling of ${t}`),!0)};function vs(e,t,n){if(typeof e!="object")throw new b("options must be an object",b.ERR_BAD_OPTION_VALUE);const r=Object.keys(e);let o=r.length;for(;o-- >0;){const s=r[o],i=t[s];if(i){const a=e[s],u=a===void 0||i(a,s,e);if(u!==!0)throw new b("option "+s+" must be "+u,b.ERR_BAD_OPTION_VALUE);continue}if(n!==!0)throw new b("Unknown option "+s,b.ERR_BAD_OPTION)}}const ge={assertOptions:vs,validators:Be},I=ge.validators;let W=class{constructor(t){this.defaults=t||{},this.interceptors={request:new yt,response:new yt}}async request(t,n){try{return await this._request(t,n)}catch(r){if(r instanceof Error){let o={};Error.captureStackTrace?Error.captureStackTrace(o):o=new Error;const s=o.stack?o.stack.replace(/^.+\n/,""):"";try{r.stack?s&&!String(r.stack).endsWith(s.replace(/^.+\n.+\n/,""))&&(r.stack+=`
+`+s):r.stack=s}catch{}}throw r}}_request(t,n){typeof t=="string"?(n=n||{},n.url=t):n=t||{},n=X(this.defaults,n);const{transitional:r,paramsSerializer:o,headers:s}=n;r!==void 0&&ge.assertOptions(r,{silentJSONParsing:I.transitional(I.boolean),forcedJSONParsing:I.transitional(I.boolean),clarifyTimeoutError:I.transitional(I.boolean)},!1),o!=null&&(c.isFunction(o)?n.paramsSerializer={serialize:o}:ge.assertOptions(o,{encode:I.function,serialize:I.function},!0)),n.allowAbsoluteUrls!==void 0||(this.defaults.allowAbsoluteUrls!==void 0?n.allowAbsoluteUrls=this.defaults.allowAbsoluteUrls:n.allowAbsoluteUrls=!0),ge.assertOptions(n,{baseUrl:I.spelling("baseURL"),withXsrfToken:I.spelling("withXSRFToken")},!0),n.method=(n.method||this.defaults.method||"get").toLowerCase();let i=s&&c.merge(s.common,s[n.method]);s&&c.forEach(["delete","get","head","post","put","patch","common"],h=>{delete s[h]}),n.headers=k.concat(i,s);const a=[];let u=!0;this.interceptors.request.forEach(function(y){typeof y.runWhen=="function"&&y.runWhen(n)===!1||(u=u&&y.synchronous,a.unshift(y.fulfilled,y.rejected))});const l=[];this.interceptors.response.forEach(function(y){l.push(y.fulfilled,y.rejected)});let f,d=0,m;if(!u){const h=[Rt.bind(this),void 0];for(h.unshift(...a),h.push(...l),m=h.length,f=Promise.resolve(n);d<m;)f=f.then(h[d++],h[d++]);return f}m=a.length;let w=n;for(d=0;d<m;){const h=a[d++],y=a[d++];try{w=h(w)}catch(p){y.call(this,p);break}}try{f=Rt.call(this,w)}catch(h){return Promise.reject(h)}for(d=0,m=l.length;d<m;)f=f.then(l[d++],l[d++]);return f}getUri(t){t=X(this.defaults,t);const n=cn(t.baseURL,t.url,t.allowAbsoluteUrls);return nn(n,t.params,t.paramsSerializer)}};c.forEach(["delete","get","head","options"],function(t){W.prototype[t]=function(n,r){return this.request(X(r||{},{method:t,url:n,data:(r||{}).data}))}});c.forEach(["post","put","patch"],function(t){function n(r){return function(s,i,a){return this.request(X(a||{},{method:t,headers:r?{"Content-Type":"multipart/form-data"}:{},url:s,data:i}))}}W.prototype[t]=n(),W.prototype[t+"Form"]=n(!0)});let Rs=class pn{constructor(t){if(typeof t!="function")throw new TypeError("executor must be a function.");let n;this.promise=new Promise(function(s){n=s});const r=this;this.promise.then(o=>{if(!r._listeners)return;let s=r._listeners.length;for(;s-- >0;)r._listeners[s](o);r._listeners=null}),this.promise.then=o=>{let s;const i=new Promise(a=>{r.subscribe(a),s=a}).then(o);return i.cancel=function(){r.unsubscribe(s)},i},t(function(s,i,a){r.reason||(r.reason=new te(s,i,a),n(r.reason))})}throwIfRequested(){if(this.reason)throw this.reason}subscribe(t){if(this.reason){t(this.reason);return}this._listeners?this._listeners.push(t):this._listeners=[t]}unsubscribe(t){if(!this._listeners)return;const n=this._listeners.indexOf(t);n!==-1&&this._listeners.splice(n,1)}toAbortSignal(){const t=new AbortController,n=r=>{t.abort(r)};return this.subscribe(n),t.signal.unsubscribe=()=>this.unsubscribe(n),t.signal}static source(){let t;return{token:new pn(function(o){t=o}),cancel:t}}};function Cs(e){return function(n){return e.apply(null,n)}}function Ts(e){return c.isObject(e)&&e.isAxiosError===!0}const Me={Continue:100,SwitchingProtocols:101,Processing:102,EarlyHints:103,Ok:200,Created:201,Accepted:202,NonAuthoritativeInformation:203,NoContent:204,ResetContent:205,PartialContent:206,MultiStatus:207,AlreadyReported:208,ImUsed:226,MultipleChoices:300,MovedPermanently:301,Found:302,SeeOther:303,NotModified:304,UseProxy:305,Unused:306,TemporaryRedirect:307,PermanentRedirect:308,BadRequest:400,Unauthorized:401,PaymentRequired:402,Forbidden:403,NotFound:404,MethodNotAllowed:405,NotAcceptable:406,ProxyAuthenticationRequired:407,RequestTimeout:408,Conflict:409,Gone:410,LengthRequired:411,PreconditionFailed:412,PayloadTooLarge:413,UriTooLong:414,UnsupportedMediaType:415,RangeNotSatisfiable:416,ExpectationFailed:417,ImATeapot:418,MisdirectedRequest:421,UnprocessableEntity:422,Locked:423,FailedDependency:424,TooEarly:425,UpgradeRequired:426,PreconditionRequired:428,TooManyRequests:429,RequestHeaderFieldsTooLarge:431,UnavailableForLegalReasons:451,InternalServerError:500,NotImplemented:501,BadGateway:502,ServiceUnavailable:503,GatewayTimeout:504,HttpVersionNotSupported:505,VariantAlsoNegotiates:506,InsufficientStorage:507,LoopDetected:508,NotExtended:510,NetworkAuthenticationRequired:511};Object.entries(Me).forEach(([e,t])=>{Me[t]=e});function mn(e){const t=new W(e),n=Ht(W.prototype.request,t);return c.extend(n,W.prototype,t,{allOwnKeys:!0}),c.extend(n,t,null,{allOwnKeys:!0}),n.create=function(o){return mn(X(e,o))},n}const v=mn(de);v.Axios=W;v.CanceledError=te;v.CancelToken=Rs;v.isCancel=sn;v.VERSION=hn;v.toFormData=xe;v.AxiosError=b;v.Cancel=v.CanceledError;v.all=function(t){return Promise.all(t)};v.spread=Cs;v.isAxiosError=Ts;v.mergeConfig=X;v.AxiosHeaders=k;v.formToJSON=e=>on(c.isHTMLForm(e)?new FormData(e):e);v.getAdapter=dn.getAdapter;v.HttpStatusCode=Me;v.default=v;const{Axios:Qs,AxiosError:ei,CanceledError:ti,isCancel:ni,CancelToken:ri,VERSION:oi,all:si,Cancel:ii,isAxiosError:ai,spread:ci,toFormData:li,AxiosHeaders:ui,HttpStatusCode:fi,formToJSON:di,getAdapter:hi,mergeConfig:pi}=v,Ze=v.create({timeout:1e4});Ze.interceptors.request.use(e=>{const t=localStorage.getItem("token");return t&&(e.headers.Authorization=`Bearer ${t}`),e},e=>Promise.reject(e));Ze.interceptors.response.use(e=>e.data,e=>(Jr(e.message||"网络错误"),Promise.reject(e)));const mi=(e,t)=>{const n=new URLSearchParams;for(const r in t)n.append(r,t[r]);return Ze.post(e,n,{headers:{"Content-Type":"application/x-www-form-urlencoded"}})};export{Kn as A,mi as B,Ys as C,Xs as D,Jr as E,D as F,_ as G,Wn as H,Se as I,Dt as J,$ as K,mr as L,Gn as M,Vs as N,Xn as O,xr as P,Tn as Q,Ds as R,$s as S,xs as T,Lt as U,Us as V,Ln as W,Hs as X,Ke as Y,tr as Z,Ls as a,qt as b,j as c,qs as d,Is as e,It as f,Ns as g,Ms as h,js as i,Y as j,Fs as k,Ps as l,ks as m,A as n,Ws as o,Ut as p,_s as q,tt as r,Js as s,U as t,gr as u,F as v,zs as w,J as x,Bs as y,Cn as z};
diff --git a/yuthon_base/static/webh5/index.html b/yuthon_base/static/webh5/index.html
index fdbf8da03..9c17d2466 100644
--- a/yuthon_base/static/webh5/index.html
+++ b/yuthon_base/static/webh5/index.html
@@ -2,10 +2,10 @@
 <html lang="">
   <head>
     <meta charset="UTF-8">
-    <link rel="icon" href="/favicon.ico">
+    <link rel="icon" href="/yuthon_base/static/webh5/favicon.ico">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Vite App</title>
-    <script type="module" crossorigin src="/assets/index-BVX99fD-.js"></script>
+    <script type="module" crossorigin src="/yuthon_base/static/webh5/assets/index-CimcMLIq.js"></script>
   </head>
   <body>
     <div id="app"></div>
diff --git a/yuthon_hr_attendance/models/hr_attendance.py b/yuthon_hr_attendance/models/hr_attendance.py
index 37cd1f629..f8e426953 100644
--- a/yuthon_hr_attendance/models/hr_attendance.py
+++ b/yuthon_hr_attendance/models/hr_attendance.py
@@ -219,7 +219,7 @@ class HrAttendance(models.Model):
                 if record.absenteeism_card:
                     absenteeism_card += 1
             if has_abnormal:
-                url = f"http://oa.thtzjt.com/#/clock_in_staticstis?user_id={employee.user_id.id}"
+                url = f"https://oa.thtzjt.com/webh5#/clock_in_staticstis?user_id={employee.user_id.id}"
                 self.sudo().env["wecom.apps"].sync_send_message_textcard(category='att', user_id=employee.wecom_userid, title="打卡异常提醒",
                                                                          description="本月迟到: {}\n本月缺卡: {}\n本月早退: {}\n本月异常：{}\n 本月旷工: {}\n"
                                                                          .format(is_late_card, is_no_card, is_early_card, is_abnormal, absenteeism_card),

From dcd649c443a2a948bf0b29e697d202b351fcd7fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Wed, 10 Sep 2025 15:06:51 +0800
Subject: [PATCH 03/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/soong_workflow_record.xml           |  2 +-
 yuthon_hr_attendance/models/go_approval.py    | 39 ++++++++++++++++---
 .../models/yuthon_vacation_reports.py         |  6 +--
 .../views/hr_attendance_views.xml             | 14 +++++--
 .../models/yuthon_message_login.py            |  5 +++
 5 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/soong_workflow/views/soong_workflow_record.xml b/soong_workflow/views/soong_workflow_record.xml
index c93a02a7a..35bce5a08 100644
--- a/soong_workflow/views/soong_workflow_record.xml
+++ b/soong_workflow/views/soong_workflow_record.xml
@@ -177,7 +177,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">soong.workflow.record</field>
             <field name="view_mode">tree,kanban,search</field>
-            <field name="domain">[('reclaim_state', '=', False), '|', ('approvals_group_id.name', '=', '人力资源'), ('approvals_group_id.name', '=', '考勤')]</field>
+            <field name="domain">[('reclaim_state', '=', False), '|', ('approvals_group_id.name', '=', '人力资源'), ('approvals_group_id.name', '=', '考勤'), ('approve_state', '!=', 'start')]</field>
             <field name="search_view_id" ref="soong_workflow_record_search"/>
         </record>
         <record id="soong_workflow_other_record_action" model="ir.actions.act_window">
diff --git a/yuthon_hr_attendance/models/go_approval.py b/yuthon_hr_attendance/models/go_approval.py
index 996a99ac5..ced35bd09 100644
--- a/yuthon_hr_attendance/models/go_approval.py
+++ b/yuthon_hr_attendance/models/go_approval.py
@@ -82,15 +82,42 @@ class GoApprovals(models.Model):
                 'approval_date': fields.Datetime.now(),
             })
 
-    @api.depends('users_id', 'days', 'hours')
+    @api.depends('users_id', 'days', 'hours', 'statr_date', 'end_date', 'date_start', 'date_end', 'is_day', 'is_half',
+                 'is_hour')
     def _compute_name(self):
         for rec in self:
-            if  rec.is_hour == True:
-                rec.name = f"{rec.users_id.name}外出{rec.hours}小时"
-            elif rec.is_day == True:
-                rec.name = f"{rec.users_id.name}外出{rec.days}天"
+            base_name = f"{rec.users_id.name}外出"
+            date_info = ""
+            if rec.is_hour:
+                # 按小时
+                if rec.date_start and rec.date_end:
+                    start_date = fields.Date.from_string(rec.date_start)
+                    end_date = fields.Date.from_string(rec.date_end)
+                    start_str = start_date.strftime('%Y-%m-%d')
+                    end_str = end_date.strftime('%Y-%m-%d')
+                    if start_date == end_date:
+                        date_info = f"{start_str}共:{rec.hours}小时"
+                    else:
+                        date_info = f"{start_str}至{end_str}共:{rec.hours}小时"
+
+            elif rec.is_day or rec.is_half:
+                # 按天或半天
+                if rec.statr_date and rec.end_date:
+                    start_str = rec.statr_date.strftime('%Y-%m-%d')
+                    end_str = rec.end_date.strftime('%Y-%m-%d')
+                    if rec.statr_date == rec.end_date:
+                        date_part = start_str
+                    else:
+                        date_part = f"{start_str}至{end_str}"
+                    if rec.is_day:
+                        date_info = f"{date_part}共:{rec.days}天"
+                    else:
+                        date_info = f"{date_part}共:{rec.days}天"
+
+            if date_info:
+                rec.name = f"{base_name}{date_info}"
             else:
-                rec.name = f"{rec.users_id.name}外出"
+                rec.name = base_name
 
     @api.onchange('statr_date', 'end_date')
     def _onchange_days(self):
diff --git a/yuthon_hr_attendance/models/yuthon_vacation_reports.py b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
index 84b1a1348..96a14b5e8 100644
--- a/yuthon_hr_attendance/models/yuthon_vacation_reports.py
+++ b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
@@ -22,7 +22,7 @@ class YuthonVacationReports(models.Model):
     meal_fee_ids = fields.One2many('vacation.meal.line', 'vacation_id', string='误餐明细')
     medical_fee_ids = fields.One2many('vacation.medical.line', 'vacation_id', string='体检费明细')
     other_fee_ids = fields.One2many('vacation.other.line', 'vacation_id', string='其他明细')
-    vacation_date = fields.Date(string='日期', default=lambda self: fields.Date.today())
+    vacation_date = fields.Date(string='日期', default=lambda self: fields.Date.today().replace(day=1))
     display_date = fields.Char(string='日期', compute='_compute_display_date')
     done_leave = fields.Float(string='年假', compute='_compute_leave', store=True, digits=(16, 3), group_operator=None)
     done_working_overtime = fields.Float(string='加班时', compute='_compute_working_overtime', digits=(16, 3),
@@ -172,8 +172,8 @@ class YuthonVacationReports(models.Model):
             rec._compute_attendance_fields1()
 
     def update_data(self):
-        august_start = fields.Date.from_string('2025-08-01')
-        august_end = fields.Date.from_string('2025-08-31')
+        august_start = fields.Date.from_string('2025-09-01')
+        august_end = fields.Date.from_string('2025-9-31')
         august_records = self.env["yuthon.vacation.reports"].search([
             ('vacation_date', '>=', august_start),
             ('vacation_date', '<=', august_end)
diff --git a/yuthon_hr_attendance/views/hr_attendance_views.xml b/yuthon_hr_attendance/views/hr_attendance_views.xml
index 1f29ada92..ae8b1f223 100644
--- a/yuthon_hr_attendance/views/hr_attendance_views.xml
+++ b/yuthon_hr_attendance/views/hr_attendance_views.xml
@@ -13,6 +13,12 @@
 <!--                    <button name="button_all" string="班次更新" type="object" class="btn btn-primary"/>-->
                         <button name="compute_attendance_ids" string="重新计算" type="object" class="btn btn-primary"/>
                         <button name="state_fix" string="状态修正" type="object" class="btn btn-primary" groups="yuthon_hr_attendance.group_he_attendance_sign_manager"/>
+                        <button name="unlink"
+                            string="删除"
+                            type="object"
+                            icon="fa-trash"
+                            groups="yuthon_hr_attendance.group_he_attendance_sign_manager"
+                            confirm="确定要删除选中的记录吗？"/>
                 </header>
                 <field name="employee_id" class="list_current_data" options="{'no_create': True}"/>
                 <field name="current_data" optional="show" class="list_current_data"/>
@@ -39,8 +45,8 @@
                 <field name="is_workflow" optional="hidden"/>
                 <field name="workflow_id" optional="hidden"/>
                 <button name="button_controls_wizard" type="object" string="操作" class="oe_highlight" invisible="not (is_abnormal or is_early_card or is_late_card or absenteeism_card or is_no_card)"/>
-                <button name="button_correct_wizard" type="object" string="修正" class="btn btn-primary" invisible="not (is_abnormal or is_early_card or is_late_card or absenteeism_card or is_no_card)" groups="base.group_system"/>
-                <button name="revoke" type="object" string="撤销" class="btn btn-primary" invisible="not (is_check_out_red or is_check_in_red)" groups="base.group_system"/>
+                <button name="button_correct_wizard" type="object" string="修正" class="btn btn-primary" invisible="not (is_abnormal or is_early_card or is_late_card or absenteeism_card or is_no_card)" groups="yuthon_hr_attendance.group_he_attendance_sign_manager"/>
+                <button name="revoke" type="object" string="撤销" class="btn btn-primary" invisible="not (is_check_out_red or is_check_in_red)" groups="yuthon_hr_attendance.group_he_attendance_sign_manager"/>
                 <button name="button_workflow" type="object" string="流程" class="oe_highlight" invisible="not is_workflow"/>
                 <button name="button_source" type="object" string="详情" class="oe_highlight" groups="yuthon_hr_attendance.group_he_attendance_sign_manager"/>
             </tree>
@@ -80,8 +86,8 @@
                 <field name="is_check_in_red" column_invisible="1"/>
                 <field name="is_check_out_red" column_invisible="1"/>
                 <button name="button_controls_wizard" type="object" string="操作" class="oe_highlight" invisible="not (is_abnormal or is_early_card or is_late_card or absenteeism_card or is_no_card)"/>
-                <button name="button_correct_wizard" type="object" string="修正" class="btn btn-primary" invisible="not (is_abnormal or is_early_card or is_late_card or absenteeism_card or is_no_card)" groups="base.group_system"/>
-                <button name="revoke" type="object" string="撤销" class="btn btn-primary" invisible="not (is_check_out_red or is_check_in_red)" groups="base.group_system"/>
+                <button name="button_correct_wizard" type="object" string="修正" class="btn btn-primary" invisible="not (is_abnormal or is_early_card or is_late_card or absenteeism_card or is_no_card)" groups="yuthon_hr_attendance.group_he_attendance_sign_manager"/>
+                <button name="revoke" type="object" string="撤销" class="btn btn-primary" invisible="not (is_check_out_red or is_check_in_red)" groups="yuthon_hr_attendance.group_he_attendance_sign_manager"/>
                 <button name="button_source" type="object" string="详情" class="oe_highlight" groups="yuthon_hr_attendance.group_he_attendance_sign_manager"/>
             </tree>
         </field>
diff --git a/yuthon_hr_employee_approval/models/yuthon_message_login.py b/yuthon_hr_employee_approval/models/yuthon_message_login.py
index 4589a011c..cdd0a59ed 100644
--- a/yuthon_hr_employee_approval/models/yuthon_message_login.py
+++ b/yuthon_hr_employee_approval/models/yuthon_message_login.py
@@ -130,6 +130,11 @@ class YuthonMessageLogin(models.Model):
     degree_id_ids = fields.One2many('education.details.line2', 'degree_id', string="学位证")
     certificate_ids = fields.One2many('certificates.detail.line', 'certificate_id', string="专业证书")
 
+    @api.onchange('staff_name')
+    def _onchange_staff_name(self):
+        if self.staff_name:
+            self.name = '人员信息登记表'+ '-' + self.staff_name
+
     @api.onchange('is_issues')
     def _onchange_is_issues(self):
         if self.is_issues:

From 2946f396eadac3287a937842a63d51bb5b682465 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Wed, 10 Sep 2025 15:32:14 +0800
Subject: [PATCH 04/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_hr_attendance/models/yuthon_vacation_reports.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yuthon_hr_attendance/models/yuthon_vacation_reports.py b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
index 96a14b5e8..0849df2a3 100644
--- a/yuthon_hr_attendance/models/yuthon_vacation_reports.py
+++ b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
@@ -173,7 +173,7 @@ class YuthonVacationReports(models.Model):
 
     def update_data(self):
         august_start = fields.Date.from_string('2025-09-01')
-        august_end = fields.Date.from_string('2025-9-31')
+        august_end = fields.Date.from_string('2025-9-30')
         august_records = self.env["yuthon.vacation.reports"].search([
             ('vacation_date', '>=', august_start),
             ('vacation_date', '<=', august_end)

From 272fe4b753fbbad06843cd747111c0df92469926 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Wed, 10 Sep 2025 15:52:47 +0800
Subject: [PATCH 05/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_hr_attendance/models/hr_attendance.py           | 7 +++++++
 yuthon_hr_attendance/models/yuthon_vacation_reports.py | 9 +++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/yuthon_hr_attendance/models/hr_attendance.py b/yuthon_hr_attendance/models/hr_attendance.py
index f8e426953..1d50f3c85 100644
--- a/yuthon_hr_attendance/models/hr_attendance.py
+++ b/yuthon_hr_attendance/models/hr_attendance.py
@@ -1044,6 +1044,13 @@ class HrAttendance(models.Model):
             self._update_vacation_report(record)
             return result
 
+    def unlink(self):
+        for record in self:
+            self._update_vacation_report(record)
+        result = super(HrAttendance, self).unlink()
+        return result
+
+
     def _update_vacation_report(self, record):
         """更新相关的假期报表日志"""
         if record.current_data and record.employee_id:
diff --git a/yuthon_hr_attendance/models/yuthon_vacation_reports.py b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
index 0849df2a3..431654db1 100644
--- a/yuthon_hr_attendance/models/yuthon_vacation_reports.py
+++ b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
@@ -131,7 +131,7 @@ class YuthonVacationReports(models.Model):
                 days_in_month = calendar.monthrange(year, month)[1]
                 month_start = date(year, month, 1)
                 month_end = date(year, month, days_in_month)
-                leave_days = rec._create_leave_record(month_start, month_end)
+                leave_days = rec._create_leave_record(rec.employee_id, month_start, month_end)
                 for day in range(1, days_in_month + 1):
                     current_date = date(year, month, day)
                     attendances = self.env["hr.attendance"].sudo().search([
@@ -228,7 +228,12 @@ class YuthonVacationReports(models.Model):
             for field in int_fields:
                 setattr(rec, field, getattr(rec, field) or 0)
 
-    def _create_leave_record(self, start_date, end_date):
+    def _create_leave_record(self, employee_id, start_date, end_date):
+        entry_date = employee_id.entry_date
+        # 调整日期范围：如果开始日期早于入职日期，则从入职日期开始计算
+        actual_start_date = max(start_date, entry_date) if entry_date else start_date
+        if actual_start_date > end_date:
+            return 0
         calendar_leaves = self.env['resource.calendar.leaves'].search([("calendar_id", "=", "行政考勤工作日")])
         holidays_list = []
         shift_days_list = []

From d55f431c234f3354427f688b3b2786b63c7cd901 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Wed, 10 Sep 2025 16:03:33 +0800
Subject: [PATCH 06/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_hr_attendance/models/yuthon_vacation_reports.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yuthon_hr_attendance/models/yuthon_vacation_reports.py b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
index 431654db1..bc94c1021 100644
--- a/yuthon_hr_attendance/models/yuthon_vacation_reports.py
+++ b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
@@ -248,7 +248,7 @@ class YuthonVacationReports(models.Model):
         holidays_list = [self.remove_leading_zero(date) for date in holidays_list]
         shift_days_list = [self.remove_leading_zero(date) for date in shift_days_list]
         days = 0  # 初始化工作日计数
-        current_date = start_date
+        current_date = actual_start_date
 
         while current_date <= end_date:
             current_date_str = current_date.strftime('%m月%d日')

From 1275def013761ce880e917d0e8b4cec6c97414a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Wed, 10 Sep 2025 17:03:24 +0800
Subject: [PATCH 07/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_hr_attendance/models/go_approval.py    | 46 +++++++++++++++----
 yuthon_hr_attendance/models/wifi_message.py   |  1 +
 .../models/yuthon_vacation_reports.py         | 19 +++++++-
 .../views/wifi_message_view.xml               |  1 +
 .../views/yuthon_vacation_reports_views.xml   |  6 ++-
 5 files changed, 62 insertions(+), 11 deletions(-)

diff --git a/yuthon_hr_attendance/models/go_approval.py b/yuthon_hr_attendance/models/go_approval.py
index ced35bd09..82afb328d 100644
--- a/yuthon_hr_attendance/models/go_approval.py
+++ b/yuthon_hr_attendance/models/go_approval.py
@@ -82,11 +82,14 @@ class GoApprovals(models.Model):
                 'approval_date': fields.Datetime.now(),
             })
 
-    @api.depends('users_id', 'days', 'hours', 'statr_date', 'end_date', 'date_start', 'date_end', 'is_day', 'is_half',
+    @api.depends('employee_ids', 'days', 'hours', 'statr_date', 'end_date', 'date_start', 'date_end', 'is_day', 'is_half',
                  'is_hour')
     def _compute_name(self):
         for rec in self:
-            base_name = f"{rec.users_id.name}外出"
+            employee_list = [employee.name for employee in rec.employee_ids]
+            # 将员工列表转换为逗号分隔的字符串
+            employees_str = ", ".join(employee_list)
+            base_name = f"{employees_str}外出"
             date_info = ""
             if rec.is_hour:
                 # 按小时
@@ -165,23 +168,50 @@ class GoApprovals(models.Model):
     def end_approval(self):
         if self.meal:
             # 创建日志
-            go_approval_list = []
+            first_day = self.statr_date.replace(day=1)
             reports_id = self.env['yuthon.vacation.reports'].search([
                 ('employee_id', '=', self.users_id.employee_id.id),
+                ('vacation_date', '=', first_day)
             ])
             workflow_record_id = self.env['soong.workflow.record'].search([
                 ('code', '=', self.code)
             ])
-            go_approval_list.append((0, 0, {
+            meal_fee_value = (0, 0, {
                 'vacation_id': reports_id.id,
                 'update_type': 'add',
                 'workflow_record_id': workflow_record_id.id,
                 'update_date': fields.Datetime.now(),
-                'update_lines': 1 ,
+                'update_lines': 1,
                 'text': '审批'
-            }))
-            reports_id.write({'meal_fee_ids': [(0, 0, go_approval_list)]})
-
+            })
+            reports_id.write({'meal_fee_ids': [meal_fee_value]})
+
+        for employee in self.employee_ids:
+            if self.is_day or self.is_half:
+                start = self.statr_date
+                end = self.end_date
+                date_field = 'current_data'
+            elif self.is_hour:
+                start = self.date_start.date() if self.date_start else None
+                end = self.date_end.date() if self.date_end else None
+                date_field = 'current_data'
+            else:
+                return True
+            if not (start and end):
+                return True
+            attendance_records = self.env['hr.attendance'].search([
+                ('employee_id', '=', employee.id),
+                (date_field, '>=', start),
+                (date_field, '<=', end)
+            ])
+            if attendance_records:
+                attendance_records.write({
+                    'is_no_card': False,
+                    'is_early_card': False,
+                    'is_late_card': False,
+                    'is_abnormal': False,
+                    'absenteeism_card': False
+                })
 
 
 
diff --git a/yuthon_hr_attendance/models/wifi_message.py b/yuthon_hr_attendance/models/wifi_message.py
index e72ac0093..5ca442a16 100644
--- a/yuthon_hr_attendance/models/wifi_message.py
+++ b/yuthon_hr_attendance/models/wifi_message.py
@@ -13,6 +13,7 @@ class WifiMessage(models.Model):
     mac = fields.Char(string='MAC地址')
     name = fields.Char(string='详细地址')
     bssid = fields.Char(string='BSSID')
+    create_time = fields.Date(string='创建日期', default=lambda self: fields.Date.today())
     company_id = fields.Many2one("res.company", string="公司", default=lambda self: self.env.company)
 
 
diff --git a/yuthon_hr_attendance/models/yuthon_vacation_reports.py b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
index bc94c1021..d197c8ed2 100644
--- a/yuthon_hr_attendance/models/yuthon_vacation_reports.py
+++ b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
@@ -73,6 +73,21 @@ class YuthonVacationReports(models.Model):
         tracking=3,
         default='unconfirmed')
 
+    @api.constrains('employee_id', 'vacation_date')
+    def _check_duplicate_monthly_record(self):
+        """检查是否存在同一员工当月的重复记录"""
+        for record in self:
+            duplicate_records = self.search([
+                ('employee_id', '=', record.employee_id.id),
+                ('vacation_date', '=', record.vacation_date),
+                ('id', '!=', record.id)
+            ])
+            if duplicate_records:
+                raise ValidationError(
+                    f"员工 {record.employee_id.name} 在 {record.vacation_date.strftime('%Y年%m月')} "
+                    f"已存在假期额度记录，不能重复创建！"
+                )
+
     def confirm_state(self):
         for rec in self:
             rec.vacation_state = 'confirmed'
@@ -743,9 +758,9 @@ class VacationMealLine(models.Model):
             delta = int(record.update_lines) * sign
 
             if record.update_type == 'add':
-                employee.write({'meal_count': employee.meal_count + delta})
+                employee.write({'meal_number': employee.meal_number + delta})
             elif record.update_type == 'reduce':
-                employee.write({'meal_count': employee.meal_count - delta})
+                employee.write({'meal_number': employee.meal_number - delta})
 
     def unlink(self):
         self._sync_to_employee(reverse=True)
diff --git a/yuthon_hr_attendance/views/wifi_message_view.xml b/yuthon_hr_attendance/views/wifi_message_view.xml
index 92e052e29..857f5eacc 100644
--- a/yuthon_hr_attendance/views/wifi_message_view.xml
+++ b/yuthon_hr_attendance/views/wifi_message_view.xml
@@ -10,6 +10,7 @@
                 <field name="name"/>
                 <field name="bssid" />
                 <field name="company_id"/>
+                <field name="create_time"/>
             </tree>
         </field>
     </record>
diff --git a/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml b/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml
index fc419f35a..5ea7d7fdd 100644
--- a/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml
+++ b/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml
@@ -99,7 +99,11 @@
         <field name="arch" type="xml">
             <form string="假期额度日志">
                 <sheet>
-                     <field name="employee_id" invisible="1"/>
+                    <div>
+
+                    </div>
+                    <field name="employee_id"/>
+                    <field name="vacation_date"/>
                     <div class="col-12 text-center">
                         <h1>
                             <field name="display_date"/>

From d4ed673f820434594cd41f78435855f4d7b47147 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Wed, 10 Sep 2025 17:18:47 +0800
Subject: [PATCH 08/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../models/yuthon_vacation_reports.py                 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/yuthon_hr_attendance/models/yuthon_vacation_reports.py b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
index d197c8ed2..8e66ced5a 100644
--- a/yuthon_hr_attendance/models/yuthon_vacation_reports.py
+++ b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
@@ -147,7 +147,16 @@ class YuthonVacationReports(models.Model):
                 month_start = date(year, month, 1)
                 month_end = date(year, month, days_in_month)
                 leave_days = rec._create_leave_record(rec.employee_id, month_start, month_end)
-                for day in range(1, days_in_month + 1):
+                entry_date = rec.employee_id.entry_date
+                actual_start_date = max(month_start, entry_date) if entry_date else month_start
+                if not entry_date:
+                    start_day = 1
+                else:
+                    days_in_month = (date(year, month + 1, 1) - timedelta(days=1)).day
+                    start_day = min(actual_start_date.day, days_in_month)
+                days_in_month = (date(year, month + 1, 1) - timedelta(days=1)).day
+                actual_days_range = range(start_day, days_in_month + 1)
+                for day in actual_days_range:
                     current_date = date(year, month, day)
                     attendances = self.env["hr.attendance"].sudo().search([
                         ('employee_id', '=', rec.employee_id.id),

From 309c78bbef3e675d95181993ac168c513864f435 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Wed, 10 Sep 2025 17:21:44 +0800
Subject: [PATCH 09/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_hr_attendance/models/yuthon_vacation_reports.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/yuthon_hr_attendance/models/yuthon_vacation_reports.py b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
index 8e66ced5a..9cde87af2 100644
--- a/yuthon_hr_attendance/models/yuthon_vacation_reports.py
+++ b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
@@ -148,12 +148,11 @@ class YuthonVacationReports(models.Model):
                 month_end = date(year, month, days_in_month)
                 leave_days = rec._create_leave_record(rec.employee_id, month_start, month_end)
                 entry_date = rec.employee_id.entry_date
-                actual_start_date = max(month_start, entry_date) if entry_date else month_start
-                if not entry_date:
+                if month_start > entry_date:
                     start_day = 1
                 else:
                     days_in_month = (date(year, month + 1, 1) - timedelta(days=1)).day
-                    start_day = min(actual_start_date.day, days_in_month)
+                    start_day = min(entry_date.day, days_in_month)
                 days_in_month = (date(year, month + 1, 1) - timedelta(days=1)).day
                 actual_days_range = range(start_day, days_in_month + 1)
                 for day in actual_days_range:

From 4a2b950ff9a5876b95e6170f165c93d82f459948 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Wed, 10 Sep 2025 17:37:34 +0800
Subject: [PATCH 10/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_hr_attendance/models/go_approval.py   | 18 ++++++++++++++++++
 yuthon_hr_attendance/models/hr_attendance.py |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/yuthon_hr_attendance/models/go_approval.py b/yuthon_hr_attendance/models/go_approval.py
index 82afb328d..36a6d7596 100644
--- a/yuthon_hr_attendance/models/go_approval.py
+++ b/yuthon_hr_attendance/models/go_approval.py
@@ -206,12 +206,30 @@ class GoApprovals(models.Model):
             ])
             if attendance_records:
                 attendance_records.write({
+                    'is_clock_card': True,
                     'is_no_card': False,
                     'is_early_card': False,
                     'is_late_card': False,
                     'is_abnormal': False,
                     'absenteeism_card': False
                 })
+            else:
+                current_date = start
+                while current_date <= end:
+                    self.env['hr.attendance'].create({
+                        'employee_id': employee.id,
+                        date_field: current_date,
+                        'is_clock_card': True,
+                        'check_in': False,
+                        'check_out': False,
+                        'is_no_card': False,
+                        'is_early_card': False,
+                        'is_late_card': False,
+                        'is_abnormal': False,
+                        'absenteeism_card': False
+                    })
+                    # 日期递增
+                    current_date += timedelta(days=1)
 
 
 
diff --git a/yuthon_hr_attendance/models/hr_attendance.py b/yuthon_hr_attendance/models/hr_attendance.py
index 1d50f3c85..05863070c 100644
--- a/yuthon_hr_attendance/models/hr_attendance.py
+++ b/yuthon_hr_attendance/models/hr_attendance.py
@@ -264,7 +264,7 @@ class HrAttendance(models.Model):
            # 工作日打卡情况判断
             if is_workday:
                 if employee_record:
-                    is_no_card = not employee_record.check_in or not employee_record.check_out
+                    is_no_card = (not employee_record.check_in or not employee_record.check_out) and not employee_record.is_clock_card
                 else:
                     is_no_card = True
             else:

From 3348302ea4413ecfd17fdda38771673683289ef5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Wed, 10 Sep 2025 17:41:16 +0800
Subject: [PATCH 11/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_hr_attendance/models/hr_attendance_detail_wechat.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py b/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py
index ce7547aa2..0e581d754 100644
--- a/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py
+++ b/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py
@@ -110,7 +110,7 @@ class HrAttendanceDetail(models.Model):
             for resource_id in role.resource_ids:
                 employee_list.append(resource_id.employee_id.id)
         if not record.employee_id.id in employee_list:
-            days = self.env['yuthon.vacation.reports']._create_leave_record(slot_start_dt, slot_end_dt)
+            days = self.env['yuthon.vacation.reports']._create_leave_record(record.employee_id,slot_start_dt, slot_end_dt)
         else:
             monthly_slots = self.env['planning.slot'].search([
             ('employee_id', '=', record.employee_id.id),

From 5b68c4f38ef3a5306621acf470b67e56e7f83546 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Wed, 10 Sep 2025 17:45:58 +0800
Subject: [PATCH 12/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_hr_attendance/models/yuthon_vacation_reports.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/yuthon_hr_attendance/models/yuthon_vacation_reports.py b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
index 9cde87af2..ee2d835fe 100644
--- a/yuthon_hr_attendance/models/yuthon_vacation_reports.py
+++ b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
@@ -254,6 +254,7 @@ class YuthonVacationReports(models.Model):
     def _create_leave_record(self, employee_id, start_date, end_date):
         entry_date = employee_id.entry_date
         # 调整日期范围：如果开始日期早于入职日期，则从入职日期开始计算
+        start_date  = start_date.date()
         actual_start_date = max(start_date, entry_date) if entry_date else start_date
         if actual_start_date > end_date:
             return 0

From d9308bf85896aa7ce9f79452fba05cb35ac2b002 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Wed, 10 Sep 2025 17:48:00 +0800
Subject: [PATCH 13/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_hr_attendance/models/hr_attendance_detail_wechat.py | 3 ++-
 yuthon_hr_attendance/models/yuthon_vacation_reports.py     | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py b/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py
index 0e581d754..e8c50ff6d 100644
--- a/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py
+++ b/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py
@@ -110,7 +110,8 @@ class HrAttendanceDetail(models.Model):
             for resource_id in role.resource_ids:
                 employee_list.append(resource_id.employee_id.id)
         if not record.employee_id.id in employee_list:
-            days = self.env['yuthon.vacation.reports']._create_leave_record(record.employee_id,slot_start_dt, slot_end_dt)
+            start_dt = slot_start_dt.date()
+            days = self.env['yuthon.vacation.reports']._create_leave_record(record.employee_id, start_dt, slot_end_dt)
         else:
             monthly_slots = self.env['planning.slot'].search([
             ('employee_id', '=', record.employee_id.id),
diff --git a/yuthon_hr_attendance/models/yuthon_vacation_reports.py b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
index ee2d835fe..9cde87af2 100644
--- a/yuthon_hr_attendance/models/yuthon_vacation_reports.py
+++ b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
@@ -254,7 +254,6 @@ class YuthonVacationReports(models.Model):
     def _create_leave_record(self, employee_id, start_date, end_date):
         entry_date = employee_id.entry_date
         # 调整日期范围：如果开始日期早于入职日期，则从入职日期开始计算
-        start_date  = start_date.date()
         actual_start_date = max(start_date, entry_date) if entry_date else start_date
         if actual_start_date > end_date:
             return 0

From 0492ebd0f79c30ef7440b406a439b30dfb053923 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Wed, 10 Sep 2025 17:54:34 +0800
Subject: [PATCH 14/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_hr_attendance/models/yuthon_vacation_reports.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/yuthon_hr_attendance/models/yuthon_vacation_reports.py b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
index 9cde87af2..da63a16f7 100644
--- a/yuthon_hr_attendance/models/yuthon_vacation_reports.py
+++ b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
@@ -255,8 +255,6 @@ class YuthonVacationReports(models.Model):
         entry_date = employee_id.entry_date
         # 调整日期范围：如果开始日期早于入职日期，则从入职日期开始计算
         actual_start_date = max(start_date, entry_date) if entry_date else start_date
-        if actual_start_date > end_date:
-            return 0
         calendar_leaves = self.env['resource.calendar.leaves'].search([("calendar_id", "=", "行政考勤工作日")])
         holidays_list = []
         shift_days_list = []

From 7cc85b90b4ab7ba0c8934165c799f8c39458f6a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Wed, 10 Sep 2025 17:58:05 +0800
Subject: [PATCH 15/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_hr_attendance/models/hr_attendance_detail_wechat.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py b/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py
index e8c50ff6d..4516b4ca0 100644
--- a/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py
+++ b/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py
@@ -111,7 +111,8 @@ class HrAttendanceDetail(models.Model):
                 employee_list.append(resource_id.employee_id.id)
         if not record.employee_id.id in employee_list:
             start_dt = slot_start_dt.date()
-            days = self.env['yuthon.vacation.reports']._create_leave_record(record.employee_id, start_dt, slot_end_dt)
+            end_dt = slot_end_dt.date()
+            days = self.env['yuthon.vacation.reports']._create_leave_record(record.employee_id, start_dt, end_dt)
         else:
             monthly_slots = self.env['planning.slot'].search([
             ('employee_id', '=', record.employee_id.id),

From f44eff024f6f28aa1b8a5b3ceab1ddf5e7f6362e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Wed, 10 Sep 2025 18:41:57 +0800
Subject: [PATCH 16/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_property_approval/wizard/property_rental_wizard.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yuthon_property_approval/wizard/property_rental_wizard.py b/yuthon_property_approval/wizard/property_rental_wizard.py
index 18bcc4a84..07a7f928d 100644
--- a/yuthon_property_approval/wizard/property_rental_wizard.py
+++ b/yuthon_property_approval/wizard/property_rental_wizard.py
@@ -178,8 +178,8 @@ class PropertyRentalWizard(models.Model):
             start_year_month = start_date_adj.strftime('%Y-%m')
             end_year_month = rent_id.end_data.strftime('%Y-%m')
             start_day = start_date_adj.day
-            # 通过period_month 来判断是否有免租期，则使用 period_rent，否则使用 monthly_amount
-            rent_amount = rent_id.period_rent if period_month else rent_id.monthly_amount
+            # 通过period_month 来判断是否有免租期，则使用 ，否则月租金使用 期间租金
+            rent_amount = rent_id.monthly_amount if period_month else rent_id.period_rent
             if is_year:
                 if rent_id.month_number >12:
                     multiplier = rent_id.month_number - 12

From 30821e3980089098c2dfee2287bcbff46132901f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Wed, 10 Sep 2025 18:50:58 +0800
Subject: [PATCH 17/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../models/property_lease_contract.py             | 15 ++++++++++++++-
 .../wizard/choose_property_wizard.py              |  8 --------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/yuthon_property_approval/models/property_lease_contract.py b/yuthon_property_approval/models/property_lease_contract.py
index c69054d9b..332c8c956 100644
--- a/yuthon_property_approval/models/property_lease_contract.py
+++ b/yuthon_property_approval/models/property_lease_contract.py
@@ -216,11 +216,24 @@ class PropertyLeaseContract(models.Model):
     responsibility_book_name = fields.Char(string="安全生产责任书(住宅)名称", compute='_compute_attachment_names',
                                            store=True)
     self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])])
-    title_information = fields.Text(string="产权证信息")
+    title_information = fields.Text(string="产权证信息", compute='_compute_title_information')
     contract_count = fields.Integer(string="联系人数量", compute='_compute_contract_count')
     reconciliation_count = fields.Integer(string="对账数量", compute='_compute_reconciliation_count')
     process_count = fields.Integer(string="流程数量", compute='_compute_process_count')
 
+    @api.depends('lease_ids.address_id.title_deed')
+    def _compute_title_information(self):
+        for record in self:
+            seen_titles = set()
+            unique_titles = []
+            for lease in record.lease_ids:
+                if lease.address_id and lease.address_id.title_deed:
+                    title = lease.address_id.title_deed.strip()
+                    if title and title not in seen_titles:
+                        seen_titles.add(title)
+                        unique_titles.append(title)
+            record.title_information = ', '.join(unique_titles)
+
     def contract_signature(self):
         return {
             'type': 'ir.actions.act_window',
diff --git a/yuthon_property_approval/wizard/choose_property_wizard.py b/yuthon_property_approval/wizard/choose_property_wizard.py
index 2bd4822c4..bd01efa76 100644
--- a/yuthon_property_approval/wizard/choose_property_wizard.py
+++ b/yuthon_property_approval/wizard/choose_property_wizard.py
@@ -66,12 +66,6 @@ class ChoosePropertyWizard(models.Model):
                 name_val = lease.address_id.name
                 existing_names.append(name_val if name_val is not None else "无")
 
-        information_names = []
-        for lease in self.lease_contract_id.lease_ids:
-            if lease.address_id and lease.address_id.title_deed != '无产权':
-                deed_val = lease.address_id.title_deed
-                information_names.append(str(deed_val) if deed_val is not None else "无")
-
         title_name = []
         for lease in self.lease_contract_id.lease_ids:
             if lease.address_id:
@@ -80,7 +74,6 @@ class ChoosePropertyWizard(models.Model):
 
         # 过滤空字符串，避免拼接时出现空内容
         all_names = [name for name in list(set(existing_names + lease_name)) if name]
-        title_information = [info for info in list(set(information_names + title_deed))]
         title_address_combined = [addr for addr in list(set(title_address + title_name)) if addr]
 
         existing_lease_ids = [(4, lease.id) for lease in self.lease_contract_id.lease_ids]
@@ -94,7 +87,6 @@ class ChoosePropertyWizard(models.Model):
             if self.lease_contract_id.lease_ids else False,
             'use_address': ','.join(all_names),
             'address_for_delivery': ','.join(all_names),
-            'title_information': ','.join(title_information),
             'total_area': sum([lease.property_area for lease in rec.lease_ids])
         })
 

From 238a0b6ce79065b3f2e3e140ec22e0ab2072c4dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Wed, 10 Sep 2025 19:16:43 +0800
Subject: [PATCH 18/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_hr_attendance/models/yuthon_vacation_reports.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yuthon_hr_attendance/models/yuthon_vacation_reports.py b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
index da63a16f7..43c368d5c 100644
--- a/yuthon_hr_attendance/models/yuthon_vacation_reports.py
+++ b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
@@ -28,7 +28,7 @@ class YuthonVacationReports(models.Model):
     done_working_overtime = fields.Float(string='加班时', compute='_compute_working_overtime', digits=(16, 3),
                                          store=True, group_operator=None)
     leave = fields.Float(string='剩余年假', compute='_compute_leave', store=True, digits=(16, 3), group_operator=None)
-    working_overtime = fields.Float(string='剩余加班时', compute='_compute_working_overtime', store=True,
+    working_overtime = fields.Float(string='剩余补休', compute='_compute_working_overtime', store=True,
                                     digits=(16, 3), group_operator=None)
     meal_fee = fields.Integer(string="误餐次数", compute='_compute_meal_fee', store=True, group_operator=None)
     medical_fee = fields.Float(string="体检费", compute='_compute_medical_fee', store=True, group_operator=None)
@@ -36,7 +36,7 @@ class YuthonVacationReports(models.Model):
     leave_of_absence = fields.Float(string="事假", digits=(16, 3), compute='_compute_other_leave', store=True,
                                     group_operator=None)
     statutory_leave = fields.Integer(string="加班时(法定)", compute='_compute_other_leave', store=True, group_operator=None)
-    cop_leave = fields.Float(string='补休', digits=(16, 3), compute='_compute_other_leave', store=True,
+    cop_leave = fields.Float(string='补休', digits=(16, 3), store=True, compute='_compute_working_overtime',
                              group_operator=None)
     duty_off_leave = fields.Integer(string='值班调休', compute='_compute_other_leave', store=True, group_operator=None)
     marriage_leave = fields.Integer(string='婚假', compute='_compute_other_leave', store=True, group_operator=None)
@@ -514,8 +514,8 @@ class YuthonVacationReports(models.Model):
                     line_total = (line.workday or 0) + (line.legal_day or 0) + (line.public_holidays or 0)
                     if line.update_type == 'add':
                         total_add += line_total
-                    elif line.update_type == 'reduce':
                         total_reduce += line_total
+                    elif line.update_type == 'reduce':
                         total_add -= line_total
                         done_working_overtime += line_total
             record.working_overtime = max(total_add / 8, 0)

From 4d7b4a6acfa9ba6d22820bab69773e5330979f51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Wed, 10 Sep 2025 19:30:11 +0800
Subject: [PATCH 19/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../models/yuthon_vacation_reports.py            | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/yuthon_hr_attendance/models/yuthon_vacation_reports.py b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
index 43c368d5c..47819ac68 100644
--- a/yuthon_hr_attendance/models/yuthon_vacation_reports.py
+++ b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
@@ -503,24 +503,22 @@ class YuthonVacationReports(models.Model):
         'overtime_ids.public_holidays',
         'overtime_ids.update_type',
         'overtime_ids.is_void'
+        'overtime_ids.workflow_record_id'
     )
     def _compute_working_overtime(self):
         for record in self:
             total_add = 0.0
-            total_reduce = 0.0
-            done_working_overtime = 0.0
+            total_add1 = 0.0
             for line in record.overtime_ids:
                 if not line.is_void:
                     line_total = (line.workday or 0) + (line.legal_day or 0) + (line.public_holidays or 0)
-                    if line.update_type == 'add':
+                    if line.update_type == 'add' and line.workflow_record_id:
+                        total_add += line_total
+                    else:
                         total_add += line_total
-                        total_reduce += line_total
-                    elif line.update_type == 'reduce':
-                        total_add -= line_total
-                        done_working_overtime += line_total
             record.working_overtime = max(total_add / 8, 0)
-            record.done_working_overtime = done_working_overtime / 8
-            record.cop_leave = total_reduce / 8
+            record.done_working_overtime = total_add1 / 8
+            record.cop_leave = total_add1 / 8
 
     @api.depends('meal_fee_ids.update_lines', 'meal_fee_ids.update_type', 'meal_fee_ids.is_void')
     def _compute_meal_fee(self):

From 7cd7ba2a7477f320a90303f4e68eb10ba543af18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Wed, 10 Sep 2025 19:37:21 +0800
Subject: [PATCH 20/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../models/yuthon_vacation_reports.py         | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/yuthon_hr_attendance/models/yuthon_vacation_reports.py b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
index 47819ac68..d338d0aa0 100644
--- a/yuthon_hr_attendance/models/yuthon_vacation_reports.py
+++ b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
@@ -502,22 +502,26 @@ class YuthonVacationReports(models.Model):
         'overtime_ids.legal_day',
         'overtime_ids.public_holidays',
         'overtime_ids.update_type',
-        'overtime_ids.is_void'
+        'overtime_ids.is_void',
         'overtime_ids.workflow_record_id'
     )
     def _compute_working_overtime(self):
         for record in self:
-            total_add = 0.0
             total_add1 = 0.0
+            total_add = 0.0
+
             for line in record.overtime_ids:
-                if not line.is_void:
-                    line_total = (line.workday or 0) + (line.legal_day or 0) + (line.public_holidays or 0)
-                    if line.update_type == 'add' and line.workflow_record_id:
-                        total_add += line_total
-                    else:
-                        total_add += line_total
-            record.working_overtime = max(total_add / 8, 0)
-            record.done_working_overtime = total_add1 / 8
+                if line.is_void:
+                    continue
+
+                line_total = (line.workday or 0) + (line.legal_day or 0) + (line.public_holidays or 0)
+                total_add += line_total
+
+                if line.workflow_record_id and line.update_type == 'add':
+                    total_add1 += line_total
+
+            record.working_overtime = max(total_add / 8, 0)  # 所有有效明细行总额
+            record.done_working_overtime = total_add1 / 8  # 符合条件的明细行总额
             record.cop_leave = total_add1 / 8
 
     @api.depends('meal_fee_ids.update_lines', 'meal_fee_ids.update_type', 'meal_fee_ids.is_void')

From 2ea8996f5e693702ddb53544fc8e1359f7561936 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Wed, 10 Sep 2025 19:41:20 +0800
Subject: [PATCH 21/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../models/yuthon_vacation_reports.py              | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/yuthon_hr_attendance/models/yuthon_vacation_reports.py b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
index d338d0aa0..6c212e1cd 100644
--- a/yuthon_hr_attendance/models/yuthon_vacation_reports.py
+++ b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
@@ -508,6 +508,7 @@ class YuthonVacationReports(models.Model):
     def _compute_working_overtime(self):
         for record in self:
             total_add1 = 0.0
+            total_add2 = 0.0
             total_add = 0.0
 
             for line in record.overtime_ids:
@@ -515,14 +516,19 @@ class YuthonVacationReports(models.Model):
                     continue
 
                 line_total = (line.workday or 0) + (line.legal_day or 0) + (line.public_holidays or 0)
-                total_add += line_total
+                if line.update_type == 'add':
+                    total_add += line_total
+                elif line.update_type == 'reduce':
+                    total_add -= line_total
 
                 if line.workflow_record_id and line.update_type == 'add':
                     total_add1 += line_total
+                if line.workflow_record_id and line.update_type == 'reduce':
+                    total_add2 += line_total
 
-            record.working_overtime = max(total_add / 8, 0)  # 所有有效明细行总额
-            record.done_working_overtime = total_add1 / 8  # 符合条件的明细行总额
-            record.cop_leave = total_add1 / 8
+            record.working_overtime = max(total_add / 8, 0)
+            record.done_working_overtime = total_add1 / 8
+            record.cop_leave = total_add2 / 8
 
     @api.depends('meal_fee_ids.update_lines', 'meal_fee_ids.update_type', 'meal_fee_ids.is_void')
     def _compute_meal_fee(self):

From edd83e3d6bc855820aa1dd667e4e13f1b19fbadf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <pengyuthon@user.noreply.gitee.com>
Date: Thu, 11 Sep 2025 09:32:32 +0800
Subject: [PATCH 22/43] 1

---
 yuthon_hr_attendance/models/hr_attendance_detail_wechat.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py b/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py
index 218aff00d..392012d5f 100644
--- a/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py
+++ b/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py
@@ -621,11 +621,14 @@ class HrAttendanceDetail(models.Model):
         """
         # 从用户列表里获取企业微信的用户
         user_list = self._get_wx_attendance_user_list()
-        now_time = datetime.now() + timedelta(hours=8)
-        start_time = now_time - timedelta(days=30)
+        now_time = datetime(2023, 8, 14)  # 替换为你需要的年份
+        start_time = datetime(2023, 9, 1)  # 替换为你需要的年份
+        # now_time = datetime.now() + timedelta(hours=8)
+        # start_time = now_time - timedelta(days=30)
 
         # 企业微信获取打卡数据，要求用户分组100，分批获取打卡记录
         # for userid_limit in self.utils_list_page(user_list, 1):
+
         for userid_limit in user_list:
             # 获取企业微信的打卡信息
             try:

From 0885eba7aa5bc88dc9a0e551929d690f658977df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <pengyuthon@user.noreply.gitee.com>
Date: Thu, 11 Sep 2025 10:14:20 +0800
Subject: [PATCH 23/43] 1

---
 .../models/hr_attendance_detail_wechat.py            | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py b/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py
index 392012d5f..c7fe12b56 100644
--- a/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py
+++ b/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py
@@ -460,7 +460,8 @@ class HrAttendanceDetail(models.Model):
         获取企业微信的关联用户
         :return: 用户列表
         """
-        user_obj = self.sudo().env['res.users'].search([('employee_id.id', '!=', False)])
+        # user_obj = self.sudo().env['res.users'].search([('employee_id.id', '!=', False)])
+        user_obj = self.sudo().env['res.users'].search([('name', '=', '邹培培')])
         total_users = len(user_obj)
         remaining_users = total_users
         user_list = []
@@ -509,6 +510,7 @@ class HrAttendanceDetail(models.Model):
         result = response.json()
         if result.get('errcode') != 0:
             # 301021至少有一个不存在通讯录
+            # 301024获取打卡间隔受限
             _logger.error('获取外出打卡数据失败\n异常:{0}\n数量:{1}\n用户列表:{2}'.format(str(result.get('errmsg')), len(userid_limit), str(userid_limit)))
             return []
         checkin_data = result.get('checkindata', [])
@@ -621,10 +623,10 @@ class HrAttendanceDetail(models.Model):
         """
         # 从用户列表里获取企业微信的用户
         user_list = self._get_wx_attendance_user_list()
-        now_time = datetime(2023, 8, 14)  # 替换为你需要的年份
-        start_time = datetime(2023, 9, 1)  # 替换为你需要的年份
-        # now_time = datetime.now() + timedelta(hours=8)
-        # start_time = now_time - timedelta(days=30)
+        # now_time = datetime(2025, 8, 14)  # 替换为你需要的年份
+        # start_time = datetime(2025, 9, 1)  # 替换为你需要的年份
+        now_time = datetime.now() + timedelta(hours=8)
+        start_time = now_time - timedelta(days=30)
 
         # 企业微信获取打卡数据，要求用户分组100，分批获取打卡记录
         # for userid_limit in self.utils_list_page(user_list, 1):

From 6bbd0c0b860ec5052bab9c350ecee30a55df858e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <pengyuthon@user.noreply.gitee.com>
Date: Thu, 11 Sep 2025 10:16:27 +0800
Subject: [PATCH 24/43] 1

---
 yuthon_hr_attendance/models/hr_attendance_detail_wechat.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py b/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py
index c7fe12b56..4e82b7aaa 100644
--- a/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py
+++ b/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py
@@ -460,8 +460,8 @@ class HrAttendanceDetail(models.Model):
         获取企业微信的关联用户
         :return: 用户列表
         """
-        # user_obj = self.sudo().env['res.users'].search([('employee_id.id', '!=', False)])
-        user_obj = self.sudo().env['res.users'].search([('name', '=', '邹培培')])
+        user_obj = self.sudo().env['res.users'].search([('employee_id.id', '!=', False)])
+        # user_obj = self.sudo().env['res.users'].search([('name', '=', '邹培培')])
         total_users = len(user_obj)
         remaining_users = total_users
         user_list = []

From c322451d1811235060bd80296fdda5cef353bf7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <pengyuthon@user.noreply.gitee.com>
Date: Thu, 11 Sep 2025 10:20:24 +0800
Subject: [PATCH 25/43] 1

---
 .../models/hr_attendance_detail_wechat.py                | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py b/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py
index 4e82b7aaa..0e3358c93 100644
--- a/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py
+++ b/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py
@@ -461,7 +461,6 @@ class HrAttendanceDetail(models.Model):
         :return: 用户列表
         """
         user_obj = self.sudo().env['res.users'].search([('employee_id.id', '!=', False)])
-        # user_obj = self.sudo().env['res.users'].search([('name', '=', '邹培培')])
         total_users = len(user_obj)
         remaining_users = total_users
         user_list = []
@@ -623,10 +622,10 @@ class HrAttendanceDetail(models.Model):
         """
         # 从用户列表里获取企业微信的用户
         user_list = self._get_wx_attendance_user_list()
-        # now_time = datetime(2025, 8, 14)  # 替换为你需要的年份
-        # start_time = datetime(2025, 9, 1)  # 替换为你需要的年份
-        now_time = datetime.now() + timedelta(hours=8)
-        start_time = now_time - timedelta(days=30)
+        now_time = datetime(2025, 9, 1)  # 替换为你需要的年份
+        start_time = datetime(2025, 8, 15)  # 替换为你需要的年份
+        # now_time = datetime.now() + timedelta(hours=8)
+        # start_time = now_time - timedelta(days=30)
 
         # 企业微信获取打卡数据，要求用户分组100，分批获取打卡记录
         # for userid_limit in self.utils_list_page(user_list, 1):

From dbae8ec67d540879173138fc304ccbe5ecfe623c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <pengyuthon@user.noreply.gitee.com>
Date: Thu, 11 Sep 2025 10:20:46 +0800
Subject: [PATCH 26/43] 1

---
 yuthon_hr_attendance/models/hr_attendance_detail_wechat.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py b/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py
index 0e3358c93..c816479cf 100644
--- a/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py
+++ b/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py
@@ -625,7 +625,7 @@ class HrAttendanceDetail(models.Model):
         now_time = datetime(2025, 9, 1)  # 替换为你需要的年份
         start_time = datetime(2025, 8, 15)  # 替换为你需要的年份
         # now_time = datetime.now() + timedelta(hours=8)
-        # start_time = now_time - timedelta(days=30)
+        # start_time = now_time - timedelta(days=3)
 
         # 企业微信获取打卡数据，要求用户分组100，分批获取打卡记录
         # for userid_limit in self.utils_list_page(user_list, 1):

From 91ae70c56df8683b3d1c7d8a42a239d77881044a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Thu, 11 Sep 2025 10:47:22 +0800
Subject: [PATCH 27/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../models/soong_workflow_record.py           | 81 ++++++++++++++++++-
 .../views/soong_workflow_record.xml           |  2 +-
 .../wizard/soong_workflow_comment_wizard.py   | 35 ++++++--
 3 files changed, 108 insertions(+), 10 deletions(-)

diff --git a/soong_workflow/models/soong_workflow_record.py b/soong_workflow/models/soong_workflow_record.py
index b63d3f60e..180cde344 100644
--- a/soong_workflow/models/soong_workflow_record.py
+++ b/soong_workflow/models/soong_workflow_record.py
@@ -4,6 +4,7 @@ from odoo import models, fields, api, _
 from odoo.exceptions import ValidationError, UserError
 import logging
 from datetime import datetime, date, time, timedelta
+import re
 _logger = logging.getLogger(__name__)
 
 
@@ -52,7 +53,85 @@ class SoongWorkflowRecord(models.Model):
     member_of_department = fields.Boolean("是否是本部门数据",  compute='_compute_part_of_department', search='_search_part_of_department')
 
     def admin_end(self):
-        pass
+        workflow_ids = self.env["soong.workflow.record"].browse(
+            self._context.get('active_ids', self._context.get('active_id', []))
+        )
+        current_datetime = fields.Datetime.now()
+        for workflow in workflow_ids:
+            record_id = self.env[workflow.res_model].search([('id', '=', workflow.res_id)])
+            if not record_id:
+                continue
+            log_records = None
+            if record_id.log_ids2:
+                log_records = record_id.log_ids2
+            elif record_id.log_ids:
+                log_records = record_id.log_ids
+            last_log = log_records[-1:]
+            if last_log:
+                last_log.write({
+                    'approval_state': '3',
+                    'lase_click_date': current_datetime,
+                })
+                end_node = self.env["soong.workflow.node"].search(
+                    [('workflow_id', '=', workflow.workflow_id.id), ('is_end', '=', True)],
+                    limit=1
+                )
+                end_btn = self.env["soong.workflow.node.button"].search(
+                    [('node_id', '=', end_node.id),
+                     ('name', '=', '结束')],
+                    limit=1
+                )
+                if end_btn:
+                    self.execute_button_code(end_btn.id, workflow.res_model, workflow.res_id)
+            workflow.approve_state = 'end'
+
+    def execute_button_code(self, button_id, res_model, res_id):
+
+        """
+        执行按钮code字段中的代码，动态解析并验证方法是否存在
+        :param button_id: soong.workflow.node.button的记录ID
+        :param res_model: 模型名称
+        """
+        button = self.env["soong.workflow.node.button"].browse(button_id)
+        if not button or not button.code:
+            return
+        workflow = button.node_id.workflow_id if button.node_id else None
+        obj = self.env[res_model].browse(res_id)
+        if not obj:
+            raise UserError(f"找不到{res_model}模型中ID为{res_id}的记录")
+        # 从code中提取obj调用的方法名（匹配obj.xxx()格式）
+        method_match = re.search(r'obj\.(\w+)\(\)', button.code)
+        if not method_match:
+            raise UserError("该按钮没有配置结束的方法，请先配置！")
+
+        # 准备代码执行的上下文环境
+        local_context = {
+            'time': time,
+            'date': date,
+            'datetime': datetime,
+            'timedelta': timedelta,
+            'env': self.env,
+            'model': self.env[res_model],
+            'obj': obj,
+            'user': self.env.user,
+            'workflow': workflow,
+            'syslog': self._log_debug,
+            'warning': self._get_warning_exception,
+            'action': None
+        }
+        exec(button.code, globals(), local_context)
+        # 如果有返回的action，处理它
+        if local_context.get('action'):
+            return local_context['action']
+
+    def _log_debug(self, message):
+        """用于syslog的实现"""
+        self.env.logger.debug(message)
+
+    def _get_warning_exception(self, message):
+        """用于warning的实现"""
+        return Warning(message)
+
 
     def update_self_users_ids(self):
         record_ids = self.env["soong.workflow.record"].browse(
diff --git a/soong_workflow/views/soong_workflow_record.xml b/soong_workflow/views/soong_workflow_record.xml
index 35bce5a08..5b1e3feab 100644
--- a/soong_workflow/views/soong_workflow_record.xml
+++ b/soong_workflow/views/soong_workflow_record.xml
@@ -70,7 +70,7 @@
                       decoration-danger="approve_state == 'end'" delete="false"
                       create="false" default_order="write_date2 desc, id desc" expand="1">
                     <header>
-                       <button name="admin_end" type="object" string="管理员强制结束" class="oe_highlight"/>
+                       <button name="admin_end" type="object" string="管理员强制结束" class="oe_highlight" groups="soong_workflow.group_soong_workflow_manager"/>
                        <button name="delete_record" type="object" string="删除" class="oe_highlight" groups="soong_workflow.group_soong_workflow_manager"/>
                     </header>
                     <field name="code"/>
diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py
index 2b5afd493..e501d0b1c 100644
--- a/soong_workflow/wizard/soong_workflow_comment_wizard.py
+++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py
@@ -24,7 +24,7 @@ class SoongWorkflowCommentWizard(models.TransientModel):
     node_link_len = fields.Char(string="转交2")
     is_supervising = fields.Boolean(string="是否督办")
     comment_note_id = fields.Many2one('soong.note', string="常用意见", default='妥否，呈领导审批')
-    comment_note = fields.Char(string="意见")
+    comment_note = fields.Char(string="意见", default='同意')
     comment = fields.Char(compute='_compute_comment', store=True)
     state_list = fields.Char(string="状态列表")
     record_id = fields.Integer()
@@ -492,13 +492,32 @@ class SoongWorkflowCommentWizard(models.TransientModel):
                 related_record.self_users_ids = [(6, 0, user_ids)] if user_ids else [(5,)]
             return self.node_btn_id.with_context(cx).run()
         if self.node_btn_name == '结束':
-            record_id.log_ids[-1].comment = self.comment
-            record_id.log_ids[-1].approval_state = "3"
-            record_id.log_ids[-1].lase_click_date = fields.Datetime.now()
-            record_id.work_end = True
-            self.env['soong.workflow.record'].search([('code', '=', record_id.code)]).write({'approve_state': 'end',
-                                                                                             "employee_ids": False,
-                                                                                             "node_id": False,})
+            # 获取当前登录用户
+            current_user = self.env.user
+            # 获取当前时间
+            current_datetime = fields.Datetime.now()
+            log_records = None
+            if record_id.log_ids2:
+                log_records = record_id.log_ids2
+            elif record_id.log_ids:
+                log_records = record_id.log_ids
+            if log_records:
+                # 查找当前用户的日志记录
+                user_log = log_records.filtered(lambda log: log.done_by == current_user)
+                if user_log:
+                    user_log.write({
+                        'comment': self.comment,
+                        'approval_state': "3",
+                        'lase_click_date': current_datetime
+                    })
+                record_id.work_end = True
+                self.env['soong.workflow.record'].search([
+                    ('code', '=', record_id.code)
+                ]).write({
+                    'approve_state': 'end',
+                    'employee_ids': False,
+                    'node_id': False,
+                })
 
             # 给申请人发消息
             biz_record = self.env[self.res_model].browse(self.res_id)

From 733c78f0f1cc0c3b23039d9856fb9257d7acd427 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Thu, 11 Sep 2025 11:09:00 +0800
Subject: [PATCH 28/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../models/soong_workflow_record.py           | 36 +++++++++++++------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/soong_workflow/models/soong_workflow_record.py b/soong_workflow/models/soong_workflow_record.py
index 180cde344..00b4fbd5f 100644
--- a/soong_workflow/models/soong_workflow_record.py
+++ b/soong_workflow/models/soong_workflow_record.py
@@ -66,23 +66,37 @@ class SoongWorkflowRecord(models.Model):
                 log_records = record_id.log_ids2
             elif record_id.log_ids:
                 log_records = record_id.log_ids
+            log_model = None
+            if record_id.log_ids2:
+                log_model = "soong.workflow.log2"
+            elif record_id.log_ids:
+                log_model = "soong.workflow.log"
             last_log = log_records[-1:]
             if last_log:
                 last_log.write({
                     'approval_state': '3',
                     'lase_click_date': current_datetime,
                 })
-                end_node = self.env["soong.workflow.node"].search(
-                    [('workflow_id', '=', workflow.workflow_id.id), ('is_end', '=', True)],
-                    limit=1
-                )
-                end_btn = self.env["soong.workflow.node.button"].search(
-                    [('node_id', '=', end_node.id),
-                     ('name', '=', '结束')],
-                    limit=1
-                )
-                if end_btn:
-                    self.execute_button_code(end_btn.id, workflow.res_model, workflow.res_id)
+            else:
+                self.env[log_model].create({
+                    'workflow_id': workflow.workflow_id.id,
+                    'model': workflow.res_model,
+                    'res_id': workflow.res_id,
+                    'approval_state': '3',
+                    'lase_click_date': current_datetime,
+                    'sequence': 99,
+                })
+            end_node = self.env["soong.workflow.node"].search(
+                [('workflow_id', '=', workflow.workflow_id.id), ('is_end', '=', True)],
+                limit=1
+            )
+            end_btn = self.env["soong.workflow.node.button"].search(
+                [('node_id', '=', end_node.id),
+                 ('name', '=', '结束')],
+                limit=1
+            )
+            if end_btn:
+                self.execute_button_code(end_btn.id, workflow.res_model, workflow.res_id)
             workflow.approve_state = 'end'
 
     def execute_button_code(self, button_id, res_model, res_id):

From 60fe3c4a8c195e02721b4fcb9e08f0f005f98994 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Thu, 11 Sep 2025 11:17:55 +0800
Subject: [PATCH 29/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 soong_workflow/models/soong_workflow_record.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/soong_workflow/models/soong_workflow_record.py b/soong_workflow/models/soong_workflow_record.py
index 00b4fbd5f..2d9fac52e 100644
--- a/soong_workflow/models/soong_workflow_record.py
+++ b/soong_workflow/models/soong_workflow_record.py
@@ -66,14 +66,13 @@ class SoongWorkflowRecord(models.Model):
                 log_records = record_id.log_ids2
             elif record_id.log_ids:
                 log_records = record_id.log_ids
-            log_model = None
+            log_model = "soong.workflow.log2" # log2是正常用户 log是管理员
             if record_id.log_ids2:
                 log_model = "soong.workflow.log2"
             elif record_id.log_ids:
                 log_model = "soong.workflow.log"
-            last_log = log_records[-1:]
-            if last_log:
-                last_log.write({
+            if log_records:
+               log_records[-1].write({
                     'approval_state': '3',
                     'lase_click_date': current_datetime,
                 })

From 40c8d85f08689649eaca74a244e38d94bf0d9ac5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Thu, 11 Sep 2025 11:23:29 +0800
Subject: [PATCH 30/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 soong_workflow/models/soong_workflow_record.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/soong_workflow/models/soong_workflow_record.py b/soong_workflow/models/soong_workflow_record.py
index 2d9fac52e..cb48b06a2 100644
--- a/soong_workflow/models/soong_workflow_record.py
+++ b/soong_workflow/models/soong_workflow_record.py
@@ -66,7 +66,7 @@ class SoongWorkflowRecord(models.Model):
                 log_records = record_id.log_ids2
             elif record_id.log_ids:
                 log_records = record_id.log_ids
-            log_model = "soong.workflow.log2" # log2是正常用户 log是管理员
+            log_model = "soong.workflow.log"
             if record_id.log_ids2:
                 log_model = "soong.workflow.log2"
             elif record_id.log_ids:

From 965361a3363d64d78a362248c791e885a4169b17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Thu, 11 Sep 2025 11:25:38 +0800
Subject: [PATCH 31/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 soong_workflow/models/soong_workflow_record.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/soong_workflow/models/soong_workflow_record.py b/soong_workflow/models/soong_workflow_record.py
index cb48b06a2..74c446269 100644
--- a/soong_workflow/models/soong_workflow_record.py
+++ b/soong_workflow/models/soong_workflow_record.py
@@ -78,6 +78,7 @@ class SoongWorkflowRecord(models.Model):
                 })
             else:
                 self.env[log_model].create({
+                    'name': None,
                     'workflow_id': workflow.workflow_id.id,
                     'model': workflow.res_model,
                     'res_id': workflow.res_id,

From f17b701d40aa0874e29a8e473ea956a69a5e66c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Thu, 11 Sep 2025 11:31:18 +0800
Subject: [PATCH 32/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wizard/soong_workflow_comment_wizard.py   | 43 ++++++++++++++-----
 1 file changed, 32 insertions(+), 11 deletions(-)

diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py
index e501d0b1c..91694b0b9 100644
--- a/soong_workflow/wizard/soong_workflow_comment_wizard.py
+++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py
@@ -492,17 +492,16 @@ class SoongWorkflowCommentWizard(models.TransientModel):
                 related_record.self_users_ids = [(6, 0, user_ids)] if user_ids else [(5,)]
             return self.node_btn_id.with_context(cx).run()
         if self.node_btn_name == '结束':
-            # 获取当前登录用户
             current_user = self.env.user
-            # 获取当前时间
             current_datetime = fields.Datetime.now()
-            log_records = None
+            log_records = record_id.log_ids
             if record_id.log_ids2:
                 log_records = record_id.log_ids2
             elif record_id.log_ids:
                 log_records = record_id.log_ids
+
             if log_records:
-                # 查找当前用户的日志记录
+                # 查找当前用户的日志记录并更新
                 user_log = log_records.filtered(lambda log: log.done_by == current_user)
                 if user_log:
                     user_log.write({
@@ -511,13 +510,35 @@ class SoongWorkflowCommentWizard(models.TransientModel):
                         'lase_click_date': current_datetime
                     })
                 record_id.work_end = True
-                self.env['soong.workflow.record'].search([
-                    ('code', '=', record_id.code)
-                ]).write({
-                    'approve_state': 'end',
-                    'employee_ids': False,
-                    'node_id': False,
-                })
+                last_log = log_records[-1] if log_records else None
+                if last_log:
+                    same_name_logs = log_records.filtered(
+                        lambda log: log.name == last_log.name
+                                    and log.node_btn_name == '4'
+                                    and log.id != last_log.id
+                    )
+
+                    # 判断是否需要更新工作流状态
+                    if same_name_logs:
+                        all_approved = all(log.approval_state == '3' for log in same_name_logs)
+                        all_approved = all_approved and (last_log.approval_state == '3')
+                        if all_approved:
+                            # 所有符合条件的记录都已批准，更新工作流状态
+                            self.env['soong.workflow.record'].search([
+                                ('code', '=', record_id.code)
+                            ]).write({
+                                'approve_state': 'end',
+                                'employee_ids': False,
+                                'node_id': False,
+                            })
+                    else:
+                        self.env['soong.workflow.record'].search([
+                            ('code', '=', record_id.code)
+                        ]).write({
+                            'approve_state': 'end',
+                            'employee_ids': False,
+                            'node_id': False,
+                        })
 
             # 给申请人发消息
             biz_record = self.env[self.res_model].browse(self.res_id)

From 4cdc0f8438f66d0e9617bdf569685091cf229291 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Thu, 11 Sep 2025 11:45:04 +0800
Subject: [PATCH 33/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../models/soong_workflow_record.py           | 61 +++++++++++--------
 1 file changed, 36 insertions(+), 25 deletions(-)

diff --git a/soong_workflow/models/soong_workflow_record.py b/soong_workflow/models/soong_workflow_record.py
index 74c446269..bf74c7802 100644
--- a/soong_workflow/models/soong_workflow_record.py
+++ b/soong_workflow/models/soong_workflow_record.py
@@ -59,33 +59,13 @@ class SoongWorkflowRecord(models.Model):
         current_datetime = fields.Datetime.now()
         for workflow in workflow_ids:
             record_id = self.env[workflow.res_model].search([('id', '=', workflow.res_id)])
+            if hasattr(record_id, 'user_id') and record_id.user_id:
+                user_id = record_id.user_id
+            elif hasattr(record_id, 'users_id') and record_id.users_id:
+                user_id = record_id.users_id.employee_id
             if not record_id:
                 continue
-            log_records = None
-            if record_id.log_ids2:
-                log_records = record_id.log_ids2
-            elif record_id.log_ids:
-                log_records = record_id.log_ids
-            log_model = "soong.workflow.log"
-            if record_id.log_ids2:
-                log_model = "soong.workflow.log2"
-            elif record_id.log_ids:
-                log_model = "soong.workflow.log"
-            if log_records:
-               log_records[-1].write({
-                    'approval_state': '3',
-                    'lase_click_date': current_datetime,
-                })
-            else:
-                self.env[log_model].create({
-                    'name': None,
-                    'workflow_id': workflow.workflow_id.id,
-                    'model': workflow.res_model,
-                    'res_id': workflow.res_id,
-                    'approval_state': '3',
-                    'lase_click_date': current_datetime,
-                    'sequence': 99,
-                })
+            # 触发模型对应的结束方法
             end_node = self.env["soong.workflow.node"].search(
                 [('workflow_id', '=', workflow.workflow_id.id), ('is_end', '=', True)],
                 limit=1
@@ -97,6 +77,37 @@ class SoongWorkflowRecord(models.Model):
             )
             if end_btn:
                 self.execute_button_code(end_btn.id, workflow.res_model, workflow.res_id)
+            # 修改日志
+            log_records = None
+            if record_id.log_ids2:
+                log_records = record_id.log_ids2
+            elif record_id.log_ids:
+                log_records = record_id.log_ids
+
+            log_model = "soong.workflow.log"
+            if record_id.log_ids2:
+                log_model = "soong.workflow.log2"
+            elif record_id.log_ids:
+                log_model = "soong.workflow.log"
+
+            if log_records:
+               log_records[-1].write({
+                    'approval_state': '3',
+                    'lase_click_date': current_datetime,
+                })
+            else:
+                self.env[log_model].create({
+                    'done_by': user_id.id,
+                    'node_id': end_node.id if end_node else False,
+                    'node_btn_id': end_btn.id if end_btn else False,
+                    'workflow_id': workflow.workflow_id.id,
+                    'model': workflow.res_model,
+                    'res_id': workflow.res_id,
+                    'approval_state': '3',
+                    'lase_click_date': current_datetime,
+                    'sequence': 99,
+                })
+
             workflow.approve_state = 'end'
 
     def execute_button_code(self, button_id, res_model, res_id):

From 518095b44f1eb15751e0895fac6f8f1c5bdb181b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Thu, 11 Sep 2025 11:56:35 +0800
Subject: [PATCH 34/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 soong_workflow/models/soong_workflow_record.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/soong_workflow/models/soong_workflow_record.py b/soong_workflow/models/soong_workflow_record.py
index bf74c7802..b3c29b161 100644
--- a/soong_workflow/models/soong_workflow_record.py
+++ b/soong_workflow/models/soong_workflow_record.py
@@ -62,7 +62,7 @@ class SoongWorkflowRecord(models.Model):
             if hasattr(record_id, 'user_id') and record_id.user_id:
                 user_id = record_id.user_id
             elif hasattr(record_id, 'users_id') and record_id.users_id:
-                user_id = record_id.users_id.employee_id
+                user_id = record_id.users_id
             if not record_id:
                 continue
             # 触发模型对应的结束方法
@@ -77,6 +77,11 @@ class SoongWorkflowRecord(models.Model):
             )
             if end_btn:
                 self.execute_button_code(end_btn.id, workflow.res_model, workflow.res_id)
+            node_id = self.env["soong.workflow.node"].search(
+                [('workflow_id', '=', workflow.workflow_id.id),
+                 ('name', '=', record_id.state)],
+                limit=1
+                )
             # 修改日志
             log_records = None
             if record_id.log_ids2:
@@ -98,8 +103,7 @@ class SoongWorkflowRecord(models.Model):
             else:
                 self.env[log_model].create({
                     'done_by': user_id.id,
-                    'node_id': end_node.id if end_node else False,
-                    'node_btn_id': end_btn.id if end_btn else False,
+                    'node_id': node_id.id if node_id else False,
                     'workflow_id': workflow.workflow_id.id,
                     'model': workflow.res_model,
                     'res_id': workflow.res_id,

From 1bc4a86808b912812b0a89ec58a8dc60a36dc880 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Thu, 11 Sep 2025 17:04:53 +0800
Subject: [PATCH 35/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../soong_workflow_record_delete_wizard.py    | 27 +++----
 .../wizard/leave_allocation_wizard.py         | 47 ++++++------
 .../models/overtime_approval.py               | 12 ++++
 yuthon_property_approval/__manifest__.py      |  1 +
 .../data/sale_renting_code_data.xml           |  8 ++-
 yuthon_property_approval/models/__init__.py   |  3 +-
 .../models/payment_process.py                 | 32 +++++++++
 .../models/property_accounting_approval.py    | 30 ++++----
 .../models/property_construction_approval.py  | 30 ++++----
 .../models/property_delegated_agent.py        | 26 ++++---
 .../models/property_design_approval.py        | 26 +++----
 .../models/property_lease_contract.py         |  5 ++
 .../models/property_project_approval.py       |  3 +-
 .../models/property_sporadic_works.py         | 30 ++++----
 .../models/property_supervising_approval.py   | 40 ++++++-----
 .../security/ir.model.access.csv              |  1 +
 .../views/payment_process_viwes.xml           | 58 +++++++++++++++
 .../property_accounting_approval_views.xml    | 71 ++++++++++---------
 .../property_construction_approval_views.xml  | 62 +++++++++-------
 .../views/property_delegated_agent_views.xml  | 47 +++++++++---
 .../views/property_design_approval_views.xml  | 56 +++++++++------
 .../views/property_project_approval_views.xml | 15 +++-
 .../views/property_sporadic_works_views.xml   | 48 ++++++++-----
 .../property_supervising_approval_views.xml   | 56 +++++++++------
 .../wizard/build_pop_wizard.py                | 12 ++++
 .../wizard/build_pop_wizard_viwes.xml         |  0
 26 files changed, 497 insertions(+), 249 deletions(-)
 create mode 100644 yuthon_property_approval/models/payment_process.py
 create mode 100644 yuthon_property_approval/views/payment_process_viwes.xml
 create mode 100644 yuthon_property_approval/wizard/build_pop_wizard.py
 create mode 100644 yuthon_property_approval/wizard/build_pop_wizard_viwes.xml

diff --git a/soong_workflow/wizard/soong_workflow_record_delete_wizard.py b/soong_workflow/wizard/soong_workflow_record_delete_wizard.py
index 5a689cf6c..71f3e048e 100644
--- a/soong_workflow/wizard/soong_workflow_record_delete_wizard.py
+++ b/soong_workflow/wizard/soong_workflow_record_delete_wizard.py
@@ -28,19 +28,20 @@ class SoongWorkflowRecordDeleteWizard(models.TransientModel):
                         })
                     target_model = self.env[record.res_model]
                     target_record = target_model.sudo().browse(record.res_id)
-                    if target_model._name in ["hr.leave.batch"]:
-                        if target_record.leave_ids:
-                            for leave in target_record.leave_ids:
-                                leave.sudo().with_context(from_cancel_wizard=True).write({
-                                    "state": "confirm",
-                                    "active": False
-                                })
-                        if target_record.hour_leave_ids:
-                            for hour_leave in target_record.hour_leave_ids:
-                                hour_leave.sudo().with_context(from_cancel_wizard=True).write({
-                                    "state": "confirm",
-                                    "active": False
-                                })
+                    if target_record:
+                        if target_model._name in ["hr.leave.batch"]:
+                            if target_record.leave_ids:
+                                for leave in target_record.leave_ids:
+                                    leave.sudo().with_context(from_cancel_wizard=True).write({
+                                        "state": "confirm",
+                                        "active": False
+                                    })
+                            if target_record.hour_leave_ids:
+                                for hour_leave in target_record.hour_leave_ids:
+                                    hour_leave.sudo().with_context(from_cancel_wizard=True).write({
+                                        "state": "confirm",
+                                        "active": False
+                                    })
                     target_record.write({'active': False})
                 else:
                     self.env["soong.workflow.record"].sudo().search(
diff --git a/yuthon_holiday/wizard/leave_allocation_wizard.py b/yuthon_holiday/wizard/leave_allocation_wizard.py
index 6a832e77c..6246597ea 100644
--- a/yuthon_holiday/wizard/leave_allocation_wizard.py
+++ b/yuthon_holiday/wizard/leave_allocation_wizard.py
@@ -24,7 +24,7 @@ class LeaveAllocationWizard(models.Model):
             raise ValidationError('请上传文件。')
         book = xlrd.open_workbook(file_contents=base64.decodebytes(self.excel_file))
         sh = book.sheet_by_index(0)
-        for rx in range(1, sh.nrows):
+        for rx in range(1, 2):
             row = sh.row(rx)
             self.salary_import(row)
 
@@ -35,29 +35,28 @@ class LeaveAllocationWizard(models.Model):
         holiday_status_id = self.env['hr.leave.type'].search([('name', '=', '年假'), ('company_id', '=', '天河物管')], limit=1)
         holiday_status_id1 = self.env['hr.leave.type'].search([('name', '=', '补休')], limit=1)
         accrual_plan_id = self.env['hr.leave.accrual.plan'].search([('name', '=', '年假（天河物管）')], limit=1)
-        if row[1].value:
-            number_of_days_display = int(row[1].value)/8
-        else:
-            number_of_days_display = 0
-        self.env['hr.leave.allocation'].create({
-            'employee_id': employee_id.id,
-            'name': '年假公司分配',
-            'number_of_days': number_of_days_display,
-            'employee_ids': [(6, 0, [employee_id.id])],
-            'holiday_status_id': holiday_status_id.id,
-            'accrual_plan_id': accrual_plan_id.id,
-            'allocation_type': 'accrual',
-            "number_of_days_display":number_of_days_display,
-            'notes':'年假公司分配'
-        })
-        self.env['hr.leave.allocation'].create({
-            'employee_id': employee_id.id,
-            'name': '补休',
-            'employee_ids': [(6, 0, [employee_id.id])],
-            'holiday_status_id' : holiday_status_id1.id,
-            'number_of_hours_display':row[2].value,
-        })
-
+        if row[1].value and int(row[1].value) != 0:
+            number_of_days_display = int(row[1].value) / 8
+            self.env['hr.leave.allocation'].create({
+                'employee_id': employee_id.id,
+                'name': '年假公司分配',
+                'number_of_days': number_of_days_display,
+                'employee_ids': [(6, 0, [employee_id.id])],
+                'holiday_status_id': holiday_status_id.id,
+                'accrual_plan_id': accrual_plan_id.id,
+                'allocation_type': 'accrual',
+                "number_of_days_display": number_of_days_display,
+                'notes': '年假公司分配'
+            })
+
+        if row[2].value and int(row[2].value) != 0:
+            self.env['hr.leave.allocation'].create({
+                'holiday_status_id': holiday_status_id1.id,
+                'employee_id': employee_id.id,
+                'name': '补休',
+                'employee_ids': [(6, 0, [employee_id.id])],
+                'number_of_hours_display': int(row[2].value)
+            })
 
 
 
diff --git a/yuthon_hr_attendance/models/overtime_approval.py b/yuthon_hr_attendance/models/overtime_approval.py
index 9bb0cd5f2..a10af2ea1 100644
--- a/yuthon_hr_attendance/models/overtime_approval.py
+++ b/yuthon_hr_attendance/models/overtime_approval.py
@@ -180,6 +180,7 @@ class OvertimeApprovals(models.Model):
             if self.meal == 'yes':
                 meal_number += 1
                 employee_id.write({'meal_number': meal_number})
+
             holiday_status_id = self.env['hr.leave.type'].search([('name', '=', '补休')])
             allocation = self.env['hr.leave.allocation'].create({
                 'employee_id': employee_id.id,
@@ -224,6 +225,17 @@ class OvertimeApprovals(models.Model):
                 'update_date': fields.Datetime.now(),
                 'text': '审批'
             }
+            if self.meal == 'yes':
+                meal_fee_value = (0, 0, {
+                    'vacation_id': reports_id.id,
+                    'update_type': 'add',
+                    'workflow_record_id': workflow_record_id.id,
+                    'update_date': fields.Datetime.now(),
+                    'update_lines': 1,
+                    'text': '审批'
+                })
+                reports_id.write({'meal_fee_ids': [meal_fee_value]})
+
             reports_id.write({'overtime_ids': [(0, 0, overtime_data)]})
 
     @api.depends('users_id', 'duration')
diff --git a/yuthon_property_approval/__manifest__.py b/yuthon_property_approval/__manifest__.py
index 8b06ccd78..1abe3f16a 100644
--- a/yuthon_property_approval/__manifest__.py
+++ b/yuthon_property_approval/__manifest__.py
@@ -55,6 +55,7 @@
         'views/property_accounting_approval_views.xml',
         'views/property_record_views.xml',
         'views/property_equity_views.xml',
+        'views/payment_process_viwes.xml',
         'views/property_handover_views.xml',
         'views/property_merge_approval_views.xml',
         'views/property_current_approval_views.xml',
diff --git a/yuthon_property_approval/data/sale_renting_code_data.xml b/yuthon_property_approval/data/sale_renting_code_data.xml
index 8f9f9986f..045a97ee1 100644
--- a/yuthon_property_approval/data/sale_renting_code_data.xml
+++ b/yuthon_property_approval/data/sale_renting_code_data.xml
@@ -7,7 +7,13 @@
         <field name="padding">3</field>
         <field name="company_id" eval="False"/>
     </record>
-
+    <record id="payment_process_code_sequence" model="ir.sequence">
+        <field name="name">支付流程编号</field>
+        <field name="code">payment_process_code</field>
+        <field name="prefix">ZF%(y)s%(month)s%(day)s</field>
+        <field name="padding">3</field>
+        <field name="company_id" eval="False"/>
+    </record>
     <record id="property_business_confirm_code_sequence" model="ir.sequence">
         <field name="name">经营报表确认单编号</field>
         <field name="code">property_business_confirm_code</field>
diff --git a/yuthon_property_approval/models/__init__.py b/yuthon_property_approval/models/__init__.py
index 023fc7602..ddcd195fb 100644
--- a/yuthon_property_approval/models/__init__.py
+++ b/yuthon_property_approval/models/__init__.py
@@ -55,4 +55,5 @@ from . import property_accounts_approval
 from . import inherit_property_tenant_information
 from . import property_meeting_approval
 from . import property_lessee_analysis
-from . import yuthon_property_ledger
\ No newline at end of file
+from . import yuthon_property_ledger
+from . import payment_process
\ No newline at end of file
diff --git a/yuthon_property_approval/models/payment_process.py b/yuthon_property_approval/models/payment_process.py
new file mode 100644
index 000000000..bd51a0144
--- /dev/null
+++ b/yuthon_property_approval/models/payment_process.py
@@ -0,0 +1,32 @@
+from odoo import models, fields, api
+
+
+class PaymentProcess(models.Model):
+    _name = 'payment.process'
+    _description = '支付流程'
+    _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin']
+
+
+    code = fields.Char(string="编号", readonly=True,default=lambda self: self.env['ir.sequence'].next_by_code('payment_process_code'))
+    users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
+    department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门")
+    company_id = fields.Many2one(related='users_id.employee_id.company_id', string="公司")
+    supervising_id = fields.Many2one('property.supervising.approval', string='合同编号')
+    reason = fields.Text(related='supervising_id.reason', string='事项')
+    payment_instructions = fields.Text(string='支付说明')
+    payment_nodes = fields.Selection([('first', '一期'), ('second', '二期'), ('third', '三期'), ('fourth', '四期')],
+                                    string="支付节点")
+    amount = fields.Float(string="金额")
+    documents_id = fields.Many2one('ir.attachment', string="附件")
+
+    urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度',
+                                     default='normal')
+    active = fields.Boolean('Active', default=True, tracking=True)
+    work_end = fields.Boolean(string="结束")
+
+    def _get_default_name_title(self):
+        return self._description if self._description else self._name
+
+    name_title = fields.Char(default=_get_default_name_title)
+    self_users_ids = fields.Many2many('res.users', string="当前经办人",
+                                      default=lambda self: [(6, 0, [self.env.user.id])])
\ No newline at end of file
diff --git a/yuthon_property_approval/models/property_accounting_approval.py b/yuthon_property_approval/models/property_accounting_approval.py
index c2d11a94d..541f884c4 100644
--- a/yuthon_property_approval/models/property_accounting_approval.py
+++ b/yuthon_property_approval/models/property_accounting_approval.py
@@ -7,28 +7,26 @@ from odoo.exceptions import UserError, ValidationError
 
 class PropertyAccountingApproval(models.Model):
     _name = 'property.accounting.approval'
-    _description = '建设工程委托核算合同审批'
+    _description = '建设工程委托监理合同审批 '
     _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin']
 
-    name = fields.Char(string='标题')
+    name = fields.Char(string='合同编号')
     code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('property_accounting_approval_code'))
     users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
     department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门")
-    company_id = fields.Many2one('yuthon.property.company', string="甲方")
+    company_id = fields.Many2one(related='users_id.employee_id.company_id', string="公司")
+    company_a_id = fields.Many2one('yuthon.property.company', string="甲方")
+    budget_list_id = fields.Many2one('ir.attachment', string="预算清单")
     project_content = fields.Char(string="工程内容")
+    image = fields.Binary(string="维修前图片")
     company_b_id = fields.Many2one('property.construction.unit', string="乙方")
-    property_id = fields.Many2one('yuthon.property', string='物业')
-    reason = fields.Text(string="正文")
-    three_point_offer = fields.Text(string="三方报价")
-    documents_ids = fields.Many2many('ir.attachment', string="附件")
-    contract_id = fields.Many2one('ir.attachment', string="合同")
+    property_address = fields.Char(string='物业地址')
+    contract_amount = fields.Float(string="合同金额")
     start_date = fields.Date(string="开始日期")
     end_date = fields.Date(string="结束日期")
-    amount = fields.Float(string="总金额")
-    is_tex = fields.Boolean(string="是否含税")
-    lack = fields.Float(string="差额")
-    percentage = fields.Float(string="差额百分比")
+    contract_id = fields.Many2one('ir.attachment', string="合同")
     accounting_way_ids = fields.One2many('accounting.way.line', 'accounting_id', string="关联支付方式明细行")
+    lease_ids = fields.One2many('property.lease.contract.line', 'accounting_id', string="物业信息明细")
     urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度',
                                      default='normal')
     active = fields.Boolean('Active', default=True, tracking=True)
@@ -44,8 +42,10 @@ class PropertyAccountingApproval(models.Model):
 class AccountingWayLine(models.Model):
     _name = 'accounting.way.line'
 
-    pay_way = fields.Selection([('cumulative', '累计项'), ('stage', '单项'), ('other', '其他')], string="付款方式",)
-    interval = fields.Char(string="区间")
-    service_charge = fields.Float(string="服务费")
+    payment_nodes = fields.Selection([('first', '一期'), ('second', '二期'), ('third', '三期'), ('fourth', '四期')],
+                                     string="支付节点")
+    payout_ratio = fields.Float(string="支付比例")
+    amount = fields.Float(string="金额")
     remake = fields.Char(string="备注")
+    payment_instructions = fields.Text(string="支付说明")
     accounting_id = fields.Many2one('property.accounting.approval', string="关联核算方式")
diff --git a/yuthon_property_approval/models/property_construction_approval.py b/yuthon_property_approval/models/property_construction_approval.py
index 23b9cd224..534a8ebec 100644
--- a/yuthon_property_approval/models/property_construction_approval.py
+++ b/yuthon_property_approval/models/property_construction_approval.py
@@ -7,7 +7,7 @@ from odoo.exceptions import UserError, ValidationError
 
 class PropertyConstructionApproval(models.Model):
     _name = 'property.construction.approval'
-    _description = '建设工程施工合同审批'
+    _description = '建设工程造价咨询合同审批'
     _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin']
 
     name = fields.Char(string='标题')
@@ -15,19 +15,21 @@ class PropertyConstructionApproval(models.Model):
                        default=lambda self: self.env['ir.sequence'].next_by_code('property_construction_approval_code'))
     users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
     department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门")
-    company_id = fields.Many2one('yuthon.property.company', string="甲方")
+    company_id = fields.Many2one(related='users_id.employee_id.company_id', string="公司")
+    company_a_id = fields.Many2one('yuthon.property.company', string="甲方")
     project_content = fields.Char(string="工程内容")
     company_b_id = fields.Many2one('property.construction.unit', string="乙方")
-    property_id = fields.Many2one('yuthon.property', string='物业')
+    property_address = fields.Char(string='物业地址')
     reason = fields.Text(string="正文")
     image = fields.Binary(string="开工前图片")
-    contract_id = fields.Many2one('ir.attachment', string="合同")
-    start_date = fields.Date(string="开始日期")
-    end_date = fields.Date(string="结束日期")
-    review_price = fields.Float(string="审核价")
+    budget_list_id = fields.Many2one('ir.attachment', string="预算清单")
+    start_date = fields.Date(string="代理开始日期")
+    end_date = fields.Date(string="代理结束日期")
     business_type = fields.Char(string="业务类型")
     contract_amount = fields.Float(string="合同金额")
-    payment_methods = fields.Char(string="付款方式")
+    contract_id = fields.Many2one('ir.attachment', string="合同")
+    payment_methods = fields.Selection([('onetime', '一次性'), ('installment', '分期')], string="付款方式")
+    lease_ids = fields.One2many('property.lease.contract.line', 'construction_id', string="物业信息明细")
     construction_way_ids = fields.One2many('construction.way.line', 'construction_id', string="关联支付方式")
     urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度',
                                      default='normal')
@@ -43,12 +45,14 @@ class PropertyConstructionApproval(models.Model):
 
 class ConstructionWayLine(models.Model):
     _name = 'construction.way.line'
-    _description = '施工支付方式'
+    _description = '价咨询合同审批支付方式'
 
-    name = fields.Char(string="支付节点")
-    pay_ratio = fields.Float(string="支付比例%")
+    payment_nodes = fields.Selection([('first', '一期'), ('second', '二期'), ('third', '三期'), ('fourth', '四期')],
+                                     string="支付节点")
+    payout_ratio = fields.Float(string="支付比例")
+    coping_date = fields.Date(string="应付日期")
     amount = fields.Float(string="金额")
-    paid_time = fields.Text(string="付费时间")
     remake = fields.Char(string="备注")
-    construction_id = fields.Many2one('property.construction.approval', string="关联施工合同")
+    payment_instructions = fields.Text(string="支付说明")
+    construction_id = fields.Many2one('property.construction.approval', string="关联价咨询合同审批")
 
diff --git a/yuthon_property_approval/models/property_delegated_agent.py b/yuthon_property_approval/models/property_delegated_agent.py
index acfef131c..60664a7ff 100644
--- a/yuthon_property_approval/models/property_delegated_agent.py
+++ b/yuthon_property_approval/models/property_delegated_agent.py
@@ -6,19 +6,27 @@ from odoo import models, fields, api, exceptions, _
 
 class PropertyDelegatedAgent(models.Model):
     _name = 'property.delegated.agent'
-    _description = '零星工程'
+    _description = '零星工程年度委托合同审批'
     _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin']
 
-    name = fields.Char(string="名称")
-    users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
+    name = fields.Char(string="合同编号")
     department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门")
     code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('property_delegated_agent_code'))
-    annual = fields.Char(string="年度")
-    contract_date = fields.Date(string="合同有效期")
-    signing_date = fields.Date(string="签订日期")
-    payment_date = fields.Date(string="付款日期")
-    consult_fee = fields.Float(string="咨询费")
-    quotations_list_id = fields.Many2one('ir.attachment', string="报价清单")
+    users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
+    company_id = fields.Many2one(related='users_id.employee_id.company_id', string="公司")
+    company_a_id = fields.Many2one('yuthon.property.company', string="甲方")
+    company_b_id = fields.Many2one('property.construction.unit', string="乙方")
+    matters = fields.Text(string="事项")
+    text = fields.Text(string="正文")
+    license_id = fields.Many2one('ir.attachment', string='营业执照')
+    aptitude_id = fields.Many2one('ir.attachment', string='资质')
+    contract_id = fields.Many2one('ir.attachment', string='合同')
+    legal_person_id_card = fields.Many2one('ir.attachment', string='法人身份证')
+    bid_winning = fields.Many2one('ir.attachment', string='中标确认书')
+    service_start_date = fields.Date(string="服务开始时间")
+    service_end_date = fields.Date(string="服务结束时间")
+    settlement_method = fields.Selection([('cash', '预算审核'), ('bank', '结算审核')], string='结算方式', default='cash')
+    floating = fields.Float(string="下浮%")
     urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度',
                                      default='normal')
     active = fields.Boolean('Active', default=True, tracking=True)
diff --git a/yuthon_property_approval/models/property_design_approval.py b/yuthon_property_approval/models/property_design_approval.py
index 9a91c43a2..b5564463b 100644
--- a/yuthon_property_approval/models/property_design_approval.py
+++ b/yuthon_property_approval/models/property_design_approval.py
@@ -4,27 +4,28 @@ from odoo.exceptions import UserError, ValidationError
 
 class PropertyDesignApproval(models.Model):
     _name = 'property.design.approval'
-    _description = '工程设计合同审批'
+    _description = '建设工程设计合同审批'
     _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin']
 
-    name = fields.Char(string='标题')
+    name = fields.Char(string='合同编号')
     code = fields.Char(string="编号",
                        default=lambda self: self.env['ir.sequence'].next_by_code('property_design_approval_code'))
     users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
     department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门")
-    company_id = fields.Many2one('yuthon.property.company', string="甲方")
-    project_content = fields.Char(string="工程内容")
+    company_id = fields.Many2one(related='users_id.employee_id.company_id', string="公司")
+    company_a_id = fields.Many2one('yuthon.property.company', string="甲方")
     company_b_id = fields.Many2one('property.construction.unit', string="乙方")
-    property_id = fields.Many2one('yuthon.property', string='物业')
+    budget_list_id = fields.Many2one('ir.attachment', string="预算清单")
+    property_address = fields.Char(string='物业地址')
     reason = fields.Text(string="正文")
-    three_point_offer = fields.Text(string="三方报价")
+    image = fields.Binary(string="开工前图片")
     contract_id = fields.Many2one('ir.attachment', string="合同")
     start_date = fields.Date(string="开始日期")
     end_date = fields.Date(string="结束日期")
-    review_price = fields.Float(string="审核价")
-    business_type = fields.Char(string="业务类型")
     contract_amount = fields.Float(string="合同金额")
-    payment_methods = fields.Char(string="付款方式")
+    payment_methods = fields.Selection([('onetime', '一次性'), ('installment', '分期')], string="付款方式")
+    lease_ids = fields.One2many('property.lease.contract.line', 'design_id', string="关联租赁信息")
+    business_type = fields.Char(string="业务类型")
     design_way_ids = fields.One2many('design.way.line', 'design_id', string="关联支付方式")
     urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度',
                                      default='normal')
@@ -42,9 +43,10 @@ class DesignWayLine(models.Model):
     _name = 'design.way.line'
     _description = '施工支付方式'
 
-    name = fields.Char(string="支付节点")
-    pay_ratio = fields.Float(string="支付比例%")
+    payment_nodes = fields.Selection([('first', '一期'), ('second', '二期'), ('third', '三期'), ('fourth', '四期')],
+                                     string="支付节点")
+    payout_ratio = fields.Float(string="支付比例")
     amount = fields.Float(string="金额")
-    paid_time = fields.Text(string="付费时间")
     remake = fields.Char(string="备注")
+    payment_instructions = fields.Text(string="支付说明")
     design_id = fields.Many2one('property.design.approval', string="关联施工合同")
\ No newline at end of file
diff --git a/yuthon_property_approval/models/property_lease_contract.py b/yuthon_property_approval/models/property_lease_contract.py
index 332c8c956..232e66a61 100644
--- a/yuthon_property_approval/models/property_lease_contract.py
+++ b/yuthon_property_approval/models/property_lease_contract.py
@@ -1658,6 +1658,11 @@ class PropertyLeaseContractLine(models.Model):
     _description = '物业列表明细行'
 
     lease_id = fields.Many2one('property.lease.contract', string="关联凭租合同审批")
+    construction_id = fields.Many2one('property.construction.approval', string="关联建设工程造价咨询合同审批")
+    project_id = fields.Many2one('property.project.approval', string="关联工程立项")
+    design_id = fields.Many2one('property.design.approval', string="关联建设工程设计合同审批")
+    accounting_id = fields.Many2one('property.accounting.approval', string="关联建设工程委托监理合同审批")
+    supervising_id = fields.Many2one('property.supervising.approval', string="关联建设工程施工合同审批")
     address_id = fields.Many2one('yuthon.property', string="物业地址")
     admin_line_id = fields.Many2one(related='address_id.admin_id', string="管理员")
     property_area = fields.Float(related='address_id.management_area', string="面积")
diff --git a/yuthon_property_approval/models/property_project_approval.py b/yuthon_property_approval/models/property_project_approval.py
index aad47ad65..75fa15cfe 100644
--- a/yuthon_property_approval/models/property_project_approval.py
+++ b/yuthon_property_approval/models/property_project_approval.py
@@ -12,12 +12,13 @@ class PropertyProjectApproval(models.Model):
                        default=lambda self: self.env['ir.sequence'].next_by_code('property_project_approval_code'))
     users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
     department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门")
-    property_id = fields.Many2one('yuthon.property', string='物业')
+    property_address = fields.Char(string='物业地址')
     background_note = fields.Html(string="背景说明")
     documents_id = fields.Many2one('ir.attachment', string="建议书/可研报告")
     amount = fields.Float(string="预算金额")
     start_date = fields.Date(string="开始日期")
     end_date = fields.Date(string="结束日期")
+    lease_ids = fields.One2many('property.lease.contract.line', 'project_id', string="物业信息")
     urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度',
                                      default='normal')
     active = fields.Boolean('Active', default=True, tracking=True)
diff --git a/yuthon_property_approval/models/property_sporadic_works.py b/yuthon_property_approval/models/property_sporadic_works.py
index 2db33be94..387d9c05d 100644
--- a/yuthon_property_approval/models/property_sporadic_works.py
+++ b/yuthon_property_approval/models/property_sporadic_works.py
@@ -4,19 +4,25 @@ from odoo.exceptions import UserError
 
 class PropertySporadicWorks(models.Model):
     _name = 'property.sporadic.works'
-    _description = '委托招标代理'
+    _description = '项目委托招标代理合同'
     _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin']
 
-    name = fields.Char(string="工程名称", required=True)
-    code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('property_sporadic_works_code'))
+    name = fields.Char(string="合同编号", required=True)
+    code = fields.Char(string="流水号", default=lambda self: self.env['ir.sequence'].next_by_code('property_sporadic_works_code'))
     users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
+    company_a_id = fields.Many2one('yuthon.property.company', string="甲方")
+    company_b_id = fields.Many2one('property.construction.unit', string="乙方")
     department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门")
-    signing_date = fields.Date(string="签订日期")
-    acceptance_date = fields.Date(string="验收日期")
-    total = fields.Float(string="总金额")
-    coping = fields.Float(string="应付")
-    paid = fields.Float(string="已付")
-    not_paid = fields.Float(string="未付")
+    company_id = fields.Many2one(related='users_id.employee_id.company_id', string="公司")
+    text = fields.Text(string="正文")
+    three_quotation_id = fields.Many2one('ir.attachment', string="三方报价")
+    service_contract = fields.Many2one('ir.attachment', string="服务合同")
+    service_start_date = fields.Date(string="服务开始时间")
+    service_end_date = fields.Date(string="服务结束时间")
+    standard_amount = fields.Float(string="标准金额")
+    service_fee = fields.Float(string="服务费")
+    settlement_party = fields.Selection([('self' , '我方'), ('other', '中标方')], string="结算方")
+    payment_methods = fields.Selection([('onetime', '一次性'), ('installment', '分期')], string="付款方式")
     payment_methods_line_ids = fields.One2many('payment.methods.line', 'payment_methods_id', string="付款方式明细行")
     urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度',
                                      default='normal')
@@ -34,10 +40,10 @@ class PaymentMethodsLine(models.Model):
     _name = 'payment.methods.line'
     _description = '付款方式明细行'
 
-    name = fields.Char(string="合同阶段")
+    payment_nodes = fields.Selection([('first', '一期' ), ('second', '二期'), ('third', '三期'), ('fourth', '四期')], string="支付节点")
+    payout_ratio = fields.Float(string="支付比例")
     coping_date = fields.Date(string="应付日期")
     amount = fields.Float(string="金额")
     remake = fields.Char(string="备注")
-    quotations_list_id = fields.Many2one('ir.attachment', string="报价清单")
-    accounting_list_id = fields.Many2one('ir.attachment', string="核算清单")
+    payment_instructions = fields.Text(string="支付说明")
     payment_methods_id = fields.Many2one('property.sporadic.works', string="关联付款方式")
\ No newline at end of file
diff --git a/yuthon_property_approval/models/property_supervising_approval.py b/yuthon_property_approval/models/property_supervising_approval.py
index aa98a467b..4befcb07a 100644
--- a/yuthon_property_approval/models/property_supervising_approval.py
+++ b/yuthon_property_approval/models/property_supervising_approval.py
@@ -4,30 +4,35 @@ from odoo.exceptions import UserError, ValidationError
 
 class PropertySupervisingApproval(models.Model):
     _name = 'property.supervising.approval'
-    _description = '工程设计合同审批'
+    _description = '建设工程施工合同审批 '
     _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin']
 
     name = fields.Char(string='标题')
     code = fields.Char(string="编号",
                        default=lambda self: self.env['ir.sequence'].next_by_code('property_supervising_code'))
-    users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
-    department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门")
-    company_id = fields.Many2one('yuthon.property.company', string="甲方")
-    project_content = fields.Char(string="工程内容")
-    company_b_id = fields.Many2one('property.construction.unit', string="乙方")
-    property_id = fields.Many2one('yuthon.property', string='物业')
-    reason = fields.Text(string="正文")
-    documents_ids = fields.Many2many('ir.attachment', string="附件")
-    contract_id = fields.Many2one('ir.attachment', string="合同")
-    start_date = fields.Date(string="开始日期")
-    end_date = fields.Date(string="结束日期")
-    review_price = fields.Float(string="审核价")
-    business_type = fields.Char(string="业务类型")
-    contract_amount = fields.Float(string="合同金额")
-    payment_methods = fields.Char(string="付款方式")
+
     supervising_way_ids = fields.One2many('supervising.way.line', 'supervising_id', string="关联支付方式")
     urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度',
                                      default='normal')
+    users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
+    department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门")
+    company_id = fields.Many2one(related='users_id.employee_id.company_id', string="公司")
+    company_a_id = fields.Many2one('yuthon.property.company', string="甲方")
+    company_b_id = fields.Many2one('property.construction.unit', string="乙方")
+    budget_list_id = fields.Many2one('ir.attachment', string="预算清单")
+    property_address = fields.Char(string='物业地址')
+    reason = fields.Text(string="正文")
+    image = fields.Binary(string="开工前图片")
+    contract_id = fields.Many2one('ir.attachment', string="合同")
+    start_date = fields.Date(string="开始日期")
+    project_content = fields.Char(string="工程内容")
+    end_date = fields.Date(string="结束日期")
+    review_price = fields.Float(string="审核价")
+    floating = fields.Float(string="浮动")
+    contract_amount = fields.Float(string="合同金额")
+    payment_methods = fields.Selection([('onetime', '一次性'), ('installment', '分期')], string="付款方式")
+    lease_ids = fields.One2many('property.lease.contract.line', 'supervising_id', string="物业信息明细")
+    business_type = fields.Char(string="业务类型")
     active = fields.Boolean('Active', default=True, tracking=True)
     work_end = fields.Boolean(string="结束")
 
@@ -41,7 +46,8 @@ class SupervisingWayLine(models.Model):
     _name = 'supervising.way.line'
     _description = '施工支付方式'
 
-    name = fields.Char(string="支付节点")
+    payment_nodes = fields.Selection([('first', '一期'), ('second', '二期'), ('third', '三期'), ('fourth', '四期')],
+                                     string="支付节点")
     pay_ratio = fields.Float(string="支付比例%")
     amount = fields.Float(string="金额")
     remake = fields.Char(string="备注")
diff --git a/yuthon_property_approval/security/ir.model.access.csv b/yuthon_property_approval/security/ir.model.access.csv
index b4841954d..0c8f650b7 100644
--- a/yuthon_property_approval/security/ir.model.access.csv
+++ b/yuthon_property_approval/security/ir.model.access.csv
@@ -102,5 +102,6 @@ access_binding_information_wizard,binding_information_wizard,model_binding_infor
 access_yuthon_property_ledger, yuthon_property_ledger,model_yuthon_property_ledger,base.group_user,1,1,1,1
 access_property_lessee_analysis,property_lessee_analysis,model_property_lessee_analysis,base.group_user,1,1,1,1
 access_contract_signature_wizard,contract_signature_wizard,model_contract_signature_wizard,base.group_user,1,1,1,1
+access_payment_process,payment_process,model_payment_process,base.group_user,1,1,1,1
 
 
diff --git a/yuthon_property_approval/views/payment_process_viwes.xml b/yuthon_property_approval/views/payment_process_viwes.xml
new file mode 100644
index 000000000..611f14a9d
--- /dev/null
+++ b/yuthon_property_approval/views/payment_process_viwes.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="view_payment_process_tree" model="ir.ui.view">
+        <field name="name">payment.process.tree</field>
+        <field name="model">payment.process</field>
+        <field name="arch" type="xml">
+            <tree string="支付流程">
+                <field name="supervising_id"/>
+                <field name="reason"/>
+                <field name="payment_instructions"/>
+            </tree>
+        </field>
+    </record>
+    <record id="view_payment_process_form" model="ir.ui.view">
+        <field name="name">payment.process.form</field>
+        <field name="model">payment.process</field>
+        <field name="arch" type="xml">
+            <form string="支付流程">
+                <sheet>
+                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
+                        invisible="urgency_level != 'normal'"/>
+                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
+                            invisible="urgency_level != 'urgent'"/>
+                    <widget name="web_ribbon" title="特级" bg_color="text-bg-danger"
+                            invisible="urgency_level != 'emergency'"/>
+                     <group col="3">
+                        <group>
+                            <field name="code" string="流水号" readonly="1"/>
+                        </group>
+                        <group>
+                            <field name="urgency_level" readonly="1"/>
+                        </group>
+                        <group/>
+                    </group>
+                    <div class="col-12 text-center">
+                        <h1>
+                            <field name="name_title" readonly="1"/>
+                        </h1>
+                    </div>
+                    <group>
+                        <field name="name" required="1" string="合同编号:"/>
+                    </group>
+                    <group string="审批事项">
+                        <field name="users_id"/>
+                        <field name="supervising_id"/>
+                        <field name="reason"/>
+                        <field name="payment_instructions"/>
+                        <field name="payment_nodes"/>
+                        <field name="amount"/>
+                        <field name="documents_id" widget="many2many_tags"/>
+                        <field name="department_id" invisible="1"/>
+                        <field name="company_id" invisible="1"/>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/yuthon_property_approval/views/property_accounting_approval_views.xml b/yuthon_property_approval/views/property_accounting_approval_views.xml
index 0b5306c11..9f4cd026c 100644
--- a/yuthon_property_approval/views/property_accounting_approval_views.xml
+++ b/yuthon_property_approval/views/property_accounting_approval_views.xml
@@ -4,7 +4,7 @@
         <field name="name">property.accounting.approval.tree</field>
         <field name="model">property.accounting.approval</field>
         <field name="arch" type="xml">
-            <tree string="建设工程委托核算合同审批">
+            <tree string="建设工程委托监理合同审批">
                 <field name="name"/>
                 <field name="company_id" required="1"/>
                 <field name="company_b_id"/>
@@ -17,7 +17,7 @@
         <field name="name">property.accounting.approval.form</field>
         <field name="model">property.accounting.approval</field>
         <field name="arch" type="xml">
-            <form string="建设工程委托核算合同审批" create="0">
+            <form string="建设工程委托监理合同审批" create="0">
                 <sheet>
                     <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
                         invisible="urgency_level != 'normal'"/>
@@ -42,49 +42,56 @@
                     <group>
                         <field name="name" required="1" string="合同编号:"/>
                     </group>
-                    <group col="2">
+                      <group col="2">
                         <group>
-                            <field name="company_id" required="1"/>
-                            <field name="project_content"/>
-                            <field name="users_id" invisible="1"/>
-                            <field name="department_id" invisible="1"/>
+                            <field name="company_a_id"/>
                         </group>
                         <group>
-                            <field name="company_b_id" options="{'no_create': True}"/>
-                            <field name="property_id" options="{'no_create': True}"/>
+                            <field name="company_b_id"/>
                         </group>
                     </group>
                     <group>
-                        <field name="work_end" invisible="1"/>
+                        <field name="users_id"/>
+                        <field name="property_address"/>
                         <field name="reason"/>
-                        <field name="three_point_offer"/>
-                        <field name="documents_ids" widget="preview_many2many"/>
+                        <field name="image"/>
+                         <field name="budget_list_id" widget="preview_many2one"/>
                         <field name="contract_id" widget="preview_many2one"/>
-                    </group>
-                    <group col="2">
-                        <group>
-                            <field name="start_date"/>
-                            <field name="amount"/>
-                        </group>
-                        <group>
-                            <field name="end_date"/>
-                            <field name="is_tex"/>
-                        </group>
-                    </group>
-                    <label for="lack"/>
+                        <label for="start_date"/>
                         <div class="d-inline-flex w-100">
-                            <field name="lack" class="me-2" style="max-width: 11rem !important;" string=" "/>不足
-                            <field name="percentage" class="me-2" style="max-width: 11rem !important;"/>元收百分比
+                            <field name="start_date" class="me-2" style="max-width: 7rem;"
+                                   string="代理期限"/>至
+                            <field name="end_date" class="me-2" style="max-width: 7rem;"
+                                   force_save="1"/>
                         </div>
+                        <field name="contract_amount"/>
+                        <field name="business_type"/>
+                        <field name="payment_methods"/>
+                        <field name="work_end" invisible="1"/>
+                        <field name="company_id" invisible="1"/>
+                        <field name="project_content"/>
+                        <field name="department_id" invisible="1"/>
+                    </group>
                     <notebook>
+                        <page string="物业信息">
+                            <field name="lease_ids">
+                                 <tree editable="bottom" create="false">
+                                    <field name="accounting_id" column_invisible="1"/>
+                                    <field name="address_id"/>
+                                    <field name="admin_line_id"/>
+                                    <field name="property_area"/>
+                                    <field name="evaluate_unit_price"/>
+                                </tree>
+                            </field>
+                        </page>
                         <page string="支付方式">
                             <field name="accounting_way_ids">
                                 <tree editable="bottom">
-                                        <field name="accounting_id" column_invisible="1"/>
-                                        <field name="pay_way"/>
-                                        <field name="interval"/>
-                                        <field name="service_charge"/>
-                                        <field name="remake"/>
+                                    <field name="accounting_id" column_invisible="1"/>
+                                    <field name="payment_nodes"/>
+                                    <field name="coping_date"/>
+                                    <field name="amount"/>
+                                    <field name="remake"/>
                                 </tree>
                             </field>
                         </page>
@@ -94,7 +101,7 @@
         </field>
     </record>
     <record id="view_property_accounting_approval_action" model="ir.actions.act_window">
-        <field name="name">核算审批</field>
+        <field name="name">建设工程委托监理合同审批</field>
         <field name="res_model">property.accounting.approval</field>
         <field name="view_mode">tree,form</field>
     </record>
diff --git a/yuthon_property_approval/views/property_construction_approval_views.xml b/yuthon_property_approval/views/property_construction_approval_views.xml
index 023cbbf80..bd1f2f637 100644
--- a/yuthon_property_approval/views/property_construction_approval_views.xml
+++ b/yuthon_property_approval/views/property_construction_approval_views.xml
@@ -27,7 +27,7 @@
                             invisible="urgency_level != 'emergency'"/>
                      <group col="3">
                         <group>
-                            <field name="code" string="流水号" readonly="1"/>
+                            <field name="code" string="合同编号" readonly="1"/>
                         </group>
                         <group>
                             <field name="urgency_level" readonly="1"/>
@@ -40,49 +40,57 @@
                         </h1>
                     </div>
                     <group>
-                        <field name="name" required="1" string="合同编号:"/>
+                        <field name="name" readonly="1"/>
                     </group>
                     <group col="2">
                         <group>
-                            <field name="work_end" invisible="1"/>
-                            <field name="company_id" required="1"/>
-                            <field name="project_content"/>
-                            <field name="users_id" invisible="1"/>
-                            <field name="department_id" invisible="1"/>
+                            <field name="company_a_id"/>
                         </group>
                         <group>
-                            <field name="company_b_id" options="{'no_create': True}"/>
-                            <field name="property_id" options="{'no_create': True}"/>
+                            <field name="company_b_id"/>
                         </group>
                     </group>
                     <group>
+                        <field name="user_id"/>
+                        <field name="property_address"/>
+                        <field name="department_id" invisible="1"/>
+                        <field name="company_id" invisible="1"/>
                         <field name="reason"/>
                         <field name="image"/>
+                         <field name="budget_list_id" widget="preview_many2one"/>
                         <field name="contract_id" widget="preview_many2one"/>
-                    </group>
-                    <group col="2">
-                        <group>
-                            <field name="contract_amount"/>
-                            <field name="start_date"/>
-                            <field name="review_price"/>
-                        </group>
-                        <group>
-                            <field name="payment_methods"/>
-                            <field name="end_date"/>
-                            <field name="business_type"/>
-                        </group>
+                        <label for="start_date"/>
+                            <div class="d-inline-flex w-100">
+                                <field name="start_date" class="me-2" style="max-width: 7rem;"
+                                       string="代理期限"/>至
+                                <field name="end_date" class="me-2" style="max-width: 7rem;"
+                                       force_save="1"/>
+                            </div>
+                        <field name="contract_amount"/>
+                        <field name="business_type"/>
+                        <field name="payment_methods"/>
                     </group>
                     <notebook>
+                        <page string="物业信息">
+                            <field name="lease_ids">
+                                 <tree editable="bottom" create="false">
+                                    <field name="construction_id" column_invisible="1"/>
+                                    <field name="address_id"/>
+                                    <field name="admin_line_id"/>
+                                    <field name="property_area"/>
+                                    <field name="evaluate_unit_price"/>
+                                </tree>
+                            </field>
+                        </page>
                         <page string="支付方式">
                             <field name="construction_way_ids">
-                            <tree editable="bottom">
-                                    <field name="construction_id" column_invisible="1"/>
-                                    <field name="name"/>
-                                    <field name="pay_ratio"/>
+                              <tree editable="bottom">
+                                  <field name="construction_id" column_invisible="1"/>
+                                    <field name="payment_nodes"/>
+                                    <field name="coping_date"/>
                                     <field name="amount"/>
-                                    <field name="paid_time"/>
                                     <field name="remake"/>
-                            </tree>
+                                </tree>
                             </field>
                         </page>
                     </notebook>
diff --git a/yuthon_property_approval/views/property_delegated_agent_views.xml b/yuthon_property_approval/views/property_delegated_agent_views.xml
index 196630557..bfd543829 100644
--- a/yuthon_property_approval/views/property_delegated_agent_views.xml
+++ b/yuthon_property_approval/views/property_delegated_agent_views.xml
@@ -6,10 +6,8 @@
         <field name="arch" type="xml">
             <tree string="零星工程">
                 <field name="name"/>
-                <field name="annual"/>
-                <field name="contract_date"/>
-                <field name="payment_date"/>
-                <field name="consult_fee"/>
+                <field name="service_start_date"/>
+                <field name="service_end_date"/>
             </tree>
         </field>
     </record>
@@ -45,14 +43,43 @@
                             <field name="name" required="1"/>
                         </h1>
                     </div>
+                     <group col="2">
+                        <group>
+                            <field name="company_a_id"/>
+                        </group>
+                        <group>
+                            <field name="company_b_id"/>
+                        </group>
+                    </group>
                     <group>
+                        <field name="user_id"/>
+                        <field name="department_id" invisible="1"/>
+                        <field name="company_id" invisible="1"/>
                         <field name="work_end" invisible="1"/>
-                        <field name="annual"/>
-                        <field name="contract_date"/>
-                        <field name="signing_date"/>
-                        <field name="payment_date"/>
-                        <field name="consult_fee"/>
-                        <field name="quotations_list_id" widget="preview_many2one"/>
+                        <field name="matters"/>
+                        <field name="text"/>
+                    </group>
+                    <group col="2">
+                        <group>
+                            <field name="license_id" widget="preview_many2one"/>
+                            <field name="aptitude_id" widget="preview_many2one"/>
+                            <field name="contract_id" widget="preview_many2one"/>
+                        </group>
+                        <group>
+                            <field name="legal_person_id_card" widget="preview_many2one"/>
+                            <field name="bid_winning" widget="preview_many2one"/>
+                        </group>
+                    </group>
+                    <group>
+                      <label for="service_start_date"/>
+                        <div class="d-inline-flex w-100">
+                            <field name="service_start_date" class="me-2" style="max-width: 7rem;"
+                                   string="服务期限"/>至
+                            <field name="service_end_date" class="me-2" style="max-width: 7rem;"
+                                   force_save="1"/>
+                        </div>
+                        <field name="settlement_method"/>
+                        <field name="floating"/>
                     </group>
                 </sheet>
             </form>
diff --git a/yuthon_property_approval/views/property_design_approval_views.xml b/yuthon_property_approval/views/property_design_approval_views.xml
index 2b63a92c5..bb15371a6 100644
--- a/yuthon_property_approval/views/property_design_approval_views.xml
+++ b/yuthon_property_approval/views/property_design_approval_views.xml
@@ -44,43 +44,53 @@
                     </group>
                     <group col="2">
                         <group>
-                            <field name="work_end" invisible="1"/>
-                            <field name="company_id" required="1"/>
-                            <field name="project_content"/>
-                            <field name="users_id" invisible="1"/>
-                            <field name="department_id" invisible="1"/>
+                            <field name="company_a_id"/>
                         </group>
                         <group>
-                            <field name="company_b_id" options="{'no_create': True}"/>
-                            <field name="property_id" options="{'no_create': True}"/>
+                            <field name="company_b_id"/>
                         </group>
                     </group>
                     <group>
+                        <field name="users_id"/>
+                        <field name="property_address"/>
                         <field name="reason"/>
-                        <field name="three_point_offer"/>
+                        <field name="image"/>
+                         <field name="budget_list_id" widget="preview_many2one"/>
                         <field name="contract_id" widget="preview_many2one"/>
-                    </group>
-                    <group col="2">
-                        <group>
-                            <field name="contract_amount"/>
-                            <field name="start_date"/>
-                            <field name="review_price"/>
-                        </group>
-                        <group>
-                            <field name="payment_methods"/>
-                            <field name="end_date"/>
-                            <field name="business_type"/>
-                        </group>
+                        <label for="start_date"/>
+                        <div class="d-inline-flex w-100">
+                            <field name="start_date" class="me-2" style="max-width: 7rem;"
+                                   string="合同期限"/>至
+                            <field name="end_date" class="me-2" style="max-width: 7rem;"
+                                   force_save="1"/>
+                        </div>
+                        <field name="contract_amount"/>
+                        <field name="business_type"/>
+                        <field name="payment_methods"/>
+                        <field name="work_end" invisible="1"/>
+                        <field name="company_id" invisible="1"/>
+                        <field name="project_content"/>
+                        <field name="department_id" invisible="1"/>
                     </group>
                     <notebook>
+                        <page string="物业信息">
+                            <field name="lease_ids">
+                                 <tree editable="bottom" create="false">
+                                    <field name="design_id" column_invisible="1"/>
+                                    <field name="address_id"/>
+                                    <field name="admin_line_id"/>
+                                    <field name="property_area"/>
+                                    <field name="evaluate_unit_price"/>
+                                </tree>
+                            </field>
+                        </page>
                         <page string="支付方式">
                             <field name="design_way_ids">
                                 <tree editable="bottom">
                                     <field name="design_id" column_invisible="1"/>
-                                    <field name="name"/>
-                                    <field name="pay_ratio"/>
+                                    <field name="payment_nodes"/>
+                                    <field name="coping_date"/>
                                     <field name="amount"/>
-                                    <field name="paid_time"/>
                                     <field name="remake"/>
                                 </tree>
                             </field>
diff --git a/yuthon_property_approval/views/property_project_approval_views.xml b/yuthon_property_approval/views/property_project_approval_views.xml
index 526ac337e..d5c5dce4d 100644
--- a/yuthon_property_approval/views/property_project_approval_views.xml
+++ b/yuthon_property_approval/views/property_project_approval_views.xml
@@ -42,15 +42,28 @@
                     <group>
                         <field name="work_end" invisible="1"/>
                         <field name="name" required="1" string="项目名称:"/>
+                        <field name="property_address"/>
                         <field name="users_id" invisible="1"/>
                         <field name="department_id" invisible="1"/>
-                        <field name="property_id" options="{'no_create': True}"/>
                         <field name="background_note"/>
                         <field name="amount"/>
                         <field name="documents_id" widget="preview_many2one"/>
                         <field name="start_date"/>
                         <field name="end_date"/>
                     </group>
+                    <notebook>
+                        <page string="物业信息">
+                            <field name="lease_ids">
+                                 <tree editable="bottom" create="false">
+                                    <field name="project_id" column_invisible="1"/>
+                                    <field name="address_id"/>
+                                    <field name="admin_line_id"/>
+                                    <field name="property_area"/>
+                                    <field name="evaluate_unit_price"/>
+                                </tree>
+                            </field>
+                        </page>
+                    </notebook>
                 </sheet>
             </form>
         </field>
diff --git a/yuthon_property_approval/views/property_sporadic_works_views.xml b/yuthon_property_approval/views/property_sporadic_works_views.xml
index fbead6a71..8565b08bf 100644
--- a/yuthon_property_approval/views/property_sporadic_works_views.xml
+++ b/yuthon_property_approval/views/property_sporadic_works_views.xml
@@ -4,11 +4,8 @@
         <field name="name">property.sporadic.works.tree</field>
         <field name="model">property.sporadic.works</field>
         <field name="arch" type="xml">
-            <tree string="委托招标代理">
+            <tree string="项目委托招标代理合同">
                     <field name="name"/>
-                    <field name="signing_date"/>
-                    <field name="acceptance_date"/>
-                    <field name="total"/>
             </tree>
         </field>
     </record>
@@ -16,7 +13,7 @@
         <field name="name">property.sporadic.works.form</field>
         <field name="model">property.sporadic.works</field>
         <field name="arch" type="xml">
-            <form string="委托招标代理" create="0">
+            <form string="项目委托招标代理合同" create="0">
                 <sheet>
                     <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
                         invisible="urgency_level != 'normal'"/>
@@ -44,27 +41,46 @@
                             <field name="name" required="1"/>
                         </h1>
                     </div>
+                    <group col="2">
+                        <group>
+                            <field name="company_a_id"/>
+                        </group>
+                        <group>
+                            <field name="company_b_id"/>
+                        </group>
+                    </group>
                     <group>
-                        <field name="signing_date"/>
-                        <field name="acceptance_date"/>
-                        <field name="total"/>
-                        <field name="work_end" invisible="1"/>
-                        <field name="coping"/>
-                        <field name="paid"/>
-                        <field name="not_paid"/>
-                        <field name="users_id" invisible="1"/>
                         <field name="department_id" invisible="1"/>
+                        <field name="company_id" invisible="1"/>
+                        <field name="text"/>
+                        <field name="three_quotation_id" widget="preview_many2one"/>
+                        <field name="service_contract" widget="preview_many2one"/>
+                        <label for="service_start_date"/>
+                            <div class="d-inline-flex w-100">
+                                <field name="service_start_date" class="me-2" style="max-width: 7rem;"
+                                       string="服务期限"/>至
+                                <field name="service_end_date" class="me-2" style="max-width: 7rem;"
+                                       force_save="1"/>
+                            </div>
+                    </group>
+                    <group col="2">
+                        <group>
+                            <field name="standard_amount"/>
+                            <field name="service_fee"/>
+                        </group>
+                        <group>
+                            <field name="settlement_party"/>
+                            <field name="payment_methods"/>
+                        </group>
                     </group>
                     <notebook>
                         <page string="付款方式">
                             <field name="payment_methods_line_ids">
                                 <tree editable="bottom">
-                                    <field name="name"/>
+                                    <field name="payment_nodes"/>
                                     <field name="coping_date"/>
                                     <field name="amount"/>
                                     <field name="remake"/>
-                                    <field name="quotations_list_id" widget="preview_many2one"/>
-                                    <field name="accounting_list_id" widget="preview_many2one"/>
                                 </tree>
                             </field>
                         </page>
diff --git a/yuthon_property_approval/views/property_supervising_approval_views.xml b/yuthon_property_approval/views/property_supervising_approval_views.xml
index 1ac6c3b62..da6ecc58f 100644
--- a/yuthon_property_approval/views/property_supervising_approval_views.xml
+++ b/yuthon_property_approval/views/property_supervising_approval_views.xml
@@ -42,43 +42,55 @@
                     <group>
                         <field name="name" required="1" string="合同编号:"/>
                     </group>
-                    <group col="2">
+                   <group col="2">
                         <group>
-                            <field name="work_end" invisible="1"/>
-                            <field name="company_id" required="1"/>
-                            <field name="project_content"/>
-                            <field name="users_id" invisible="1"/>
-                            <field name="department_id" invisible="1"/>
+                            <field name="company_a_id"/>
                         </group>
                         <group>
                             <field name="company_b_id"/>
-                            <field name="property_id"/>
                         </group>
                     </group>
                     <group>
+                        <field name="users_id"/>
+                        <field name="property_address"/>
                         <field name="reason"/>
-                        <field name="documents_ids" widget="preview_many2many"/>
+                        <field name="image"/>
+                        <field name="budget_list_id" widget="preview_many2one"/>
                         <field name="contract_id" widget="preview_many2one"/>
-                    </group>
-                    <group col="2">
-                        <group>
-                            <field name="contract_amount"/>
-                            <field name="start_date"/>
-                            <field name="review_price"/>
-                        </group>
-                        <group>
-                            <field name="payment_methods"/>
-                            <field name="end_date"/>
-                            <field name="business_type"/>
-                        </group>
+                        <label for="start_date"/>
+                        <div class="d-inline-flex w-100">
+                            <field name="start_date" class="me-2" style="max-width: 7rem;"
+                                   string="代理期限"/>至
+                            <field name="end_date" class="me-2" style="max-width: 7rem;"
+                                   force_save="1"/>
+                        </div>
+                        <field name="review_price"/>
+                        <field name="floating"/>
+                        <field name="contract_amount"/>
+                        <field name="business_type"/>
+                        <field name="payment_methods"/>
+                        <field name="work_end" invisible="1"/>
+                        <field name="company_id" invisible="1"/>
+                        <field name="project_content"/>
+                        <field name="department_id" invisible="1"/>
                     </group>
                     <notebook>
+                        <page string="物业信息">
+                            <field name="lease_ids">
+                                 <tree editable="bottom" create="false">
+                                    <field name="supervising_id" column_invisible="1"/>
+                                    <field name="address_id"/>
+                                    <field name="admin_line_id"/>
+                                    <field name="property_area"/>
+                                    <field name="evaluate_unit_price"/>
+                                </tree>
+                            </field>
+                        </page>
                         <page string="支付方式">
                             <field name="supervising_way_ids">
                                 <tree editable="bottom">
                                     <field name="supervising_id" column_invisible="1"/>
-                                    <field name="name"/>
-                                    <field name="pay_ratio"/>
+                                    <field name="payment_nodes"/>
                                     <field name="amount"/>
                                     <field name="remake"/>
                                 </tree>
diff --git a/yuthon_property_approval/wizard/build_pop_wizard.py b/yuthon_property_approval/wizard/build_pop_wizard.py
new file mode 100644
index 000000000..9dbfedc43
--- /dev/null
+++ b/yuthon_property_approval/wizard/build_pop_wizard.py
@@ -0,0 +1,12 @@
+from odoo import models, fields, api, _, SUPERUSER_ID
+from odoo.exceptions import UserError, ValidationError
+
+
+class BuildPopWizard(models.TransientModel):
+    _name = 'build.pop.wizard'
+    _description = '添加物业弹窗'
+
+
+
+    def confirm(self):
+        pass
diff --git a/yuthon_property_approval/wizard/build_pop_wizard_viwes.xml b/yuthon_property_approval/wizard/build_pop_wizard_viwes.xml
new file mode 100644
index 000000000..e69de29bb

From 5e4b4a3a2abbcbbe0d20f635521cb2f570bb2d0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Thu, 11 Sep 2025 17:31:53 +0800
Subject: [PATCH 36/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../soong_workflow_record_delete_wizard.py    | 63 ++++++++++---------
 .../models/property_design_approval.py        |  1 +
 .../views/property_project_approval_views.xml |  2 +-
 3 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/soong_workflow/wizard/soong_workflow_record_delete_wizard.py b/soong_workflow/wizard/soong_workflow_record_delete_wizard.py
index 71f3e048e..78a32d5d0 100644
--- a/soong_workflow/wizard/soong_workflow_record_delete_wizard.py
+++ b/soong_workflow/wizard/soong_workflow_record_delete_wizard.py
@@ -17,34 +17,41 @@ class SoongWorkflowRecordDeleteWizard(models.TransientModel):
     def add_comment(self):
         for record in self.record_ids:
             if self.name == "确认删除":
-                if record.reclaim_state is False:
-                    self.env["soong.workflow.record"].sudo().search([("id", "=", record.id)]).write({
-                        "reclaim_state": True
-                    })
+                # 首先检查工作流记录是否存在
+                workflow_record = self.env["soong.workflow.record"].sudo().search([("id", "=", record.id)], limit=1)
+                if not workflow_record:
+                    continue
+
+                if not record.reclaim_state:
+                    workflow_record.write({"reclaim_state": True})
+
+                    # 处理工作流日志
                     log_ids = self.env["soong.workflow.log"].sudo().search([("code", "=", record.code)])
                     for log_id in log_ids:
-                        log_id.sudo().write({
-                            "active": False
-                        })
-                    target_model = self.env[record.res_model]
-                    target_record = target_model.sudo().browse(record.res_id)
-                    if target_record:
-                        if target_model._name in ["hr.leave.batch"]:
-                            if target_record.leave_ids:
-                                for leave in target_record.leave_ids:
-                                    leave.sudo().with_context(from_cancel_wizard=True).write({
-                                        "state": "confirm",
-                                        "active": False
-                                    })
-                            if target_record.hour_leave_ids:
-                                for hour_leave in target_record.hour_leave_ids:
-                                    hour_leave.sudo().with_context(from_cancel_wizard=True).write({
-                                        "state": "confirm",
-                                        "active": False
-                                    })
-                    target_record.write({'active': False})
+                        log_id.sudo().write({"active": False})
+
+                    if record.res_model and record.res_id:
+                        target_model = self.env[record.res_model]
+                        target_record = target_model.sudo().browse(record.res_id).exists()
+                        if target_record:
+                            if target_model._name in ["hr.leave.batch"]:
+                                if target_record.leave_ids:
+                                    for leave in target_record.leave_ids:
+                                        leave.sudo().with_context(from_cancel_wizard=True).write({
+                                            "state": "confirm",
+                                            "active": False
+                                        })
+                                if target_record.hour_leave_ids:
+                                    for hour_leave in target_record.hour_leave_ids:
+                                        hour_leave.sudo().with_context(from_cancel_wizard=True).write({
+                                            "state": "confirm",
+                                            "active": False
+                                        })
+                            # 确保在写入前记录仍然存在
+                            if target_record.exists():
+                                target_record.write({'active': False})
                 else:
-                    self.env["soong.workflow.record"].sudo().search(
-                        [("id", "=", record.id), ('reclaim_state', "=", True)]).write({
-                        "active": False
-                    })
\ No newline at end of file
+                    workflow_record = self.env["soong.workflow.record"].sudo().search(
+                        [("id", "=", record.id), ('reclaim_state', "=", True)], limit=1)
+                    if workflow_record:
+                        workflow_record.write({"active": False})
\ No newline at end of file
diff --git a/yuthon_property_approval/models/property_design_approval.py b/yuthon_property_approval/models/property_design_approval.py
index b5564463b..9383567c6 100644
--- a/yuthon_property_approval/models/property_design_approval.py
+++ b/yuthon_property_approval/models/property_design_approval.py
@@ -13,6 +13,7 @@ class PropertyDesignApproval(models.Model):
     users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
     department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门")
     company_id = fields.Many2one(related='users_id.employee_id.company_id', string="公司")
+    project_content = fields.Char(string="工程内容")
     company_a_id = fields.Many2one('yuthon.property.company', string="甲方")
     company_b_id = fields.Many2one('property.construction.unit', string="乙方")
     budget_list_id = fields.Many2one('ir.attachment', string="预算清单")
diff --git a/yuthon_property_approval/views/property_project_approval_views.xml b/yuthon_property_approval/views/property_project_approval_views.xml
index d5c5dce4d..7f2bc19b5 100644
--- a/yuthon_property_approval/views/property_project_approval_views.xml
+++ b/yuthon_property_approval/views/property_project_approval_views.xml
@@ -6,7 +6,7 @@
         <field name="arch" type="xml">
             <tree string="项目立项审批">
                 <field name="name"/>
-                <field name="property_id"/>
+                <field name="property_address"/>
                 <field name="amount"/>
                 <field name="start_date"/>
                 <field name="end_date"/>

From 221266e285d0a332bd9d3ca6cff61501f7dd8c4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Thu, 11 Sep 2025 18:27:37 +0800
Subject: [PATCH 37/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/yuthon_vacation_reports_views.xml   |  2 +-
 yuthon_property_approval/__manifest__.py      |  1 +
 .../models/property_accounting_approval.py    | 15 +++++++
 .../models/property_construction_approval.py  | 17 ++++++--
 .../models/property_delegated_agent.py        |  6 +--
 .../models/property_design_approval.py        | 12 ++++++
 .../models/property_project_approval.py       | 14 ++++++-
 .../models/property_supervising_approval.py   | 12 ++++++
 .../security/ir.model.access.csv              |  2 +-
 .../views/payment_process_viwes.xml           |  3 --
 .../property_accounting_approval_views.xml    |  4 +-
 .../property_construction_approval_views.xml  |  3 ++
 .../views/property_design_approval_views.xml  |  6 ++-
 .../views/property_project_approval_views.xml |  2 +
 .../views/property_sporadic_works_views.xml   |  1 +
 .../property_supervising_approval_views.xml   |  5 ++-
 yuthon_property_approval/wizard/__init__.py   |  3 +-
 .../wizard/build_pop_wizard.py                | 40 ++++++++++++++++++-
 .../wizard/build_pop_wizard_viwes.xml         | 25 ++++++++++++
 19 files changed, 154 insertions(+), 19 deletions(-)

diff --git a/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml b/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml
index 5ea7d7fdd..b63709a54 100644
--- a/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml
+++ b/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml
@@ -198,7 +198,7 @@
                                 </tree>
                             </field>
                         </page>
-                        <page string="其他">
+                        <page string="请假情况">
                             <field name="other_fee_ids" context="{'default_employee_id': employee_id}">
                                 <tree editable="bottom" delete="false" decoration-muted="is_void">
                                     <field name="employee_id" column_invisible="1"/>
diff --git a/yuthon_property_approval/__manifest__.py b/yuthon_property_approval/__manifest__.py
index 1abe3f16a..14ed35942 100644
--- a/yuthon_property_approval/__manifest__.py
+++ b/yuthon_property_approval/__manifest__.py
@@ -81,6 +81,7 @@
         'wizard/binding_information_wizard_views.xml',
         'wizard/property_rental_wizard_views.xml',
         'wizard/contract_signature_wizard_viwes.xml',
+        'wizard/build_pop_wizard_viwes.xml',
         'wizard/property_meeting_wizard_views.xml',
         'views/property_menu_all.xml',
     ],
diff --git a/yuthon_property_approval/models/property_accounting_approval.py b/yuthon_property_approval/models/property_accounting_approval.py
index 541f884c4..12315e2fa 100644
--- a/yuthon_property_approval/models/property_accounting_approval.py
+++ b/yuthon_property_approval/models/property_accounting_approval.py
@@ -16,6 +16,7 @@ class PropertyAccountingApproval(models.Model):
     department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门")
     company_id = fields.Many2one(related='users_id.employee_id.company_id', string="公司")
     company_a_id = fields.Many2one('yuthon.property.company', string="甲方")
+    reason = fields.Text(string="正文")
     budget_list_id = fields.Many2one('ir.attachment', string="预算清单")
     project_content = fields.Char(string="工程内容")
     image = fields.Binary(string="维修前图片")
@@ -24,6 +25,8 @@ class PropertyAccountingApproval(models.Model):
     contract_amount = fields.Float(string="合同金额")
     start_date = fields.Date(string="开始日期")
     end_date = fields.Date(string="结束日期")
+    business_type = fields.Char(string="业务类型")
+    payment_methods = fields.Selection([('onetime', '一次性'), ('installment', '分期')], string="付款方式")
     contract_id = fields.Many2one('ir.attachment', string="合同")
     accounting_way_ids = fields.One2many('accounting.way.line', 'accounting_id', string="关联支付方式明细行")
     lease_ids = fields.One2many('property.lease.contract.line', 'accounting_id', string="物业信息明细")
@@ -38,6 +41,18 @@ class PropertyAccountingApproval(models.Model):
     name_title = fields.Char(default=_get_default_name_title)
     self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])])
 
+    def build_pop(self):
+        return {
+            'name': '添加物业',
+            'type': 'ir.actions.act_window',
+            'res_model': 'build.pop.wizard',
+            'view_mode': 'form',
+            'target': 'new',
+            'context': {
+                'default_accounting_id': self.id,
+            }
+        }
+
 
 class AccountingWayLine(models.Model):
     _name = 'accounting.way.line'
diff --git a/yuthon_property_approval/models/property_construction_approval.py b/yuthon_property_approval/models/property_construction_approval.py
index 534a8ebec..1b4a867d7 100644
--- a/yuthon_property_approval/models/property_construction_approval.py
+++ b/yuthon_property_approval/models/property_construction_approval.py
@@ -13,9 +13,9 @@ class PropertyConstructionApproval(models.Model):
     name = fields.Char(string='标题')
     code = fields.Char(string="编号",
                        default=lambda self: self.env['ir.sequence'].next_by_code('property_construction_approval_code'))
-    users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
-    department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门")
-    company_id = fields.Many2one(related='users_id.employee_id.company_id', string="公司")
+    user_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
+    department_id = fields.Many2one(related='user_id.employee_id.department_id', string="部门")
+    company_id = fields.Many2one(related='user_id.employee_id.company_id', string="公司")
     company_a_id = fields.Many2one('yuthon.property.company', string="甲方")
     project_content = fields.Char(string="工程内容")
     company_b_id = fields.Many2one('property.construction.unit', string="乙方")
@@ -42,6 +42,17 @@ class PropertyConstructionApproval(models.Model):
     name_title = fields.Char(default=_get_default_name_title)
     self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])])
 
+    def build_pop(self):
+        return {
+            'name': '添加物业',
+            'type': 'ir.actions.act_window',
+            'res_model': 'build.pop.wizard',
+            'view_mode': 'form',
+            'target': 'new',
+            'context': {
+                'default_construction_id': self.id,
+            }
+        }
 
 class ConstructionWayLine(models.Model):
     _name = 'construction.way.line'
diff --git a/yuthon_property_approval/models/property_delegated_agent.py b/yuthon_property_approval/models/property_delegated_agent.py
index 60664a7ff..72c33742b 100644
--- a/yuthon_property_approval/models/property_delegated_agent.py
+++ b/yuthon_property_approval/models/property_delegated_agent.py
@@ -10,10 +10,10 @@ class PropertyDelegatedAgent(models.Model):
     _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin']
 
     name = fields.Char(string="合同编号")
-    department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门")
+    department_id = fields.Many2one(related='user_id.employee_id.department_id', string="部门")
     code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('property_delegated_agent_code'))
-    users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
-    company_id = fields.Many2one(related='users_id.employee_id.company_id', string="公司")
+    user_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
+    company_id = fields.Many2one(related='user_id.employee_id.company_id', string="公司")
     company_a_id = fields.Many2one('yuthon.property.company', string="甲方")
     company_b_id = fields.Many2one('property.construction.unit', string="乙方")
     matters = fields.Text(string="事项")
diff --git a/yuthon_property_approval/models/property_design_approval.py b/yuthon_property_approval/models/property_design_approval.py
index 9383567c6..fabe0aed7 100644
--- a/yuthon_property_approval/models/property_design_approval.py
+++ b/yuthon_property_approval/models/property_design_approval.py
@@ -39,6 +39,18 @@ class PropertyDesignApproval(models.Model):
     name_title = fields.Char(default=_get_default_name_title)
     self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])])
 
+    def build_pop(self):
+        return {
+            'name': '添加物业',
+            'type': 'ir.actions.act_window',
+            'res_model': 'build.pop.wizard',
+            'view_mode': 'form',
+            'target': 'new',
+            'context': {
+                'default_design_id': self.id,
+            }
+        }
+
 
 class DesignWayLine(models.Model):
     _name = 'design.way.line'
diff --git a/yuthon_property_approval/models/property_project_approval.py b/yuthon_property_approval/models/property_project_approval.py
index 75fa15cfe..155857cac 100644
--- a/yuthon_property_approval/models/property_project_approval.py
+++ b/yuthon_property_approval/models/property_project_approval.py
@@ -28,4 +28,16 @@ class PropertyProjectApproval(models.Model):
         return self._description if self._description else self._name
 
     name_title = fields.Char(default=_get_default_name_title)
-    self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])])
\ No newline at end of file
+    self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])])
+
+    def build_pop(self):
+        return {
+            'name': '添加物业',
+            'type': 'ir.actions.act_window',
+            'res_model': 'build.pop.wizard',
+            'view_mode': 'form',
+            'target': 'new',
+            'context': {
+                'default_project_id': self.id,
+            }
+        }
diff --git a/yuthon_property_approval/models/property_supervising_approval.py b/yuthon_property_approval/models/property_supervising_approval.py
index 4befcb07a..474e4888a 100644
--- a/yuthon_property_approval/models/property_supervising_approval.py
+++ b/yuthon_property_approval/models/property_supervising_approval.py
@@ -42,6 +42,18 @@ class PropertySupervisingApproval(models.Model):
     name_title = fields.Char(default=_get_default_name_title)
     self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])])
 
+    def build_pop(self):
+        return {
+            'name': '添加物业',
+            'type': 'ir.actions.act_window',
+            'res_model': 'build.pop.wizard',
+            'view_mode': 'form',
+            'target': 'new',
+            'context': {
+                'default_supervising_id': self.id,
+            }
+        }
+
 class SupervisingWayLine(models.Model):
     _name = 'supervising.way.line'
     _description = '施工支付方式'
diff --git a/yuthon_property_approval/security/ir.model.access.csv b/yuthon_property_approval/security/ir.model.access.csv
index 0c8f650b7..938386606 100644
--- a/yuthon_property_approval/security/ir.model.access.csv
+++ b/yuthon_property_approval/security/ir.model.access.csv
@@ -103,5 +103,5 @@ access_yuthon_property_ledger, yuthon_property_ledger,model_yuthon_property_ledg
 access_property_lessee_analysis,property_lessee_analysis,model_property_lessee_analysis,base.group_user,1,1,1,1
 access_contract_signature_wizard,contract_signature_wizard,model_contract_signature_wizard,base.group_user,1,1,1,1
 access_payment_process,payment_process,model_payment_process,base.group_user,1,1,1,1
-
+access_build_pop_wizard, build_pop_wizard,model_build_pop_wizard,base.group_user,1,1,1,1
 
diff --git a/yuthon_property_approval/views/payment_process_viwes.xml b/yuthon_property_approval/views/payment_process_viwes.xml
index 611f14a9d..71c76bf96 100644
--- a/yuthon_property_approval/views/payment_process_viwes.xml
+++ b/yuthon_property_approval/views/payment_process_viwes.xml
@@ -37,9 +37,6 @@
                             <field name="name_title" readonly="1"/>
                         </h1>
                     </div>
-                    <group>
-                        <field name="name" required="1" string="合同编号:"/>
-                    </group>
                     <group string="审批事项">
                         <field name="users_id"/>
                         <field name="supervising_id"/>
diff --git a/yuthon_property_approval/views/property_accounting_approval_views.xml b/yuthon_property_approval/views/property_accounting_approval_views.xml
index 9f4cd026c..f62105b84 100644
--- a/yuthon_property_approval/views/property_accounting_approval_views.xml
+++ b/yuthon_property_approval/views/property_accounting_approval_views.xml
@@ -52,6 +52,7 @@
                     </group>
                     <group>
                         <field name="users_id"/>
+                         <field name="work_end" invisible="1"/>
                         <field name="property_address"/>
                         <field name="reason"/>
                         <field name="image"/>
@@ -74,6 +75,8 @@
                     </group>
                     <notebook>
                         <page string="物业信息">
+                             <button name="build_pop" string="添加物业" type="object"
+                                    class="btn-primary"/>
                             <field name="lease_ids">
                                  <tree editable="bottom" create="false">
                                     <field name="accounting_id" column_invisible="1"/>
@@ -89,7 +92,6 @@
                                 <tree editable="bottom">
                                     <field name="accounting_id" column_invisible="1"/>
                                     <field name="payment_nodes"/>
-                                    <field name="coping_date"/>
                                     <field name="amount"/>
                                     <field name="remake"/>
                                 </tree>
diff --git a/yuthon_property_approval/views/property_construction_approval_views.xml b/yuthon_property_approval/views/property_construction_approval_views.xml
index bd1f2f637..5daa7d6e5 100644
--- a/yuthon_property_approval/views/property_construction_approval_views.xml
+++ b/yuthon_property_approval/views/property_construction_approval_views.xml
@@ -52,6 +52,7 @@
                     </group>
                     <group>
                         <field name="user_id"/>
+                        <field name="work_end" invisible="1"/>
                         <field name="property_address"/>
                         <field name="department_id" invisible="1"/>
                         <field name="company_id" invisible="1"/>
@@ -72,6 +73,8 @@
                     </group>
                     <notebook>
                         <page string="物业信息">
+                             <button name="build_pop" string="添加物业" type="object"
+                                    class="btn-primary"/>
                             <field name="lease_ids">
                                  <tree editable="bottom" create="false">
                                     <field name="construction_id" column_invisible="1"/>
diff --git a/yuthon_property_approval/views/property_design_approval_views.xml b/yuthon_property_approval/views/property_design_approval_views.xml
index bb15371a6..270036f66 100644
--- a/yuthon_property_approval/views/property_design_approval_views.xml
+++ b/yuthon_property_approval/views/property_design_approval_views.xml
@@ -51,6 +51,7 @@
                         </group>
                     </group>
                     <group>
+                         <field name="work_end" invisible="1"/>
                         <field name="users_id"/>
                         <field name="property_address"/>
                         <field name="reason"/>
@@ -74,6 +75,8 @@
                     </group>
                     <notebook>
                         <page string="物业信息">
+                             <button name="build_pop" string="添加物业" type="object"
+                                    class="btn-primary"/>
                             <field name="lease_ids">
                                  <tree editable="bottom" create="false">
                                     <field name="design_id" column_invisible="1"/>
@@ -89,7 +92,6 @@
                                 <tree editable="bottom">
                                     <field name="design_id" column_invisible="1"/>
                                     <field name="payment_nodes"/>
-                                    <field name="coping_date"/>
                                     <field name="amount"/>
                                     <field name="remake"/>
                                 </tree>
@@ -102,7 +104,7 @@
     </record>
     <record id="view_property_design_approval_action" model="ir.actions.act_window">
         <field name="name">建设工程设计合同审批</field>
-        <field name="res_model">property.construction.approval</field>
+        <field name="res_model">property.design.approval</field>
         <field name="view_mode">tree,form</field>
     </record>
 </odoo>
diff --git a/yuthon_property_approval/views/property_project_approval_views.xml b/yuthon_property_approval/views/property_project_approval_views.xml
index 7f2bc19b5..235ef2902 100644
--- a/yuthon_property_approval/views/property_project_approval_views.xml
+++ b/yuthon_property_approval/views/property_project_approval_views.xml
@@ -53,6 +53,8 @@
                     </group>
                     <notebook>
                         <page string="物业信息">
+                             <button name="build_pop" string="添加物业" type="object"
+                                    class="btn-primary"/>
                             <field name="lease_ids">
                                  <tree editable="bottom" create="false">
                                     <field name="project_id" column_invisible="1"/>
diff --git a/yuthon_property_approval/views/property_sporadic_works_views.xml b/yuthon_property_approval/views/property_sporadic_works_views.xml
index 8565b08bf..0fb09c6f1 100644
--- a/yuthon_property_approval/views/property_sporadic_works_views.xml
+++ b/yuthon_property_approval/views/property_sporadic_works_views.xml
@@ -50,6 +50,7 @@
                         </group>
                     </group>
                     <group>
+                         <field name="work_end" invisible="1"/>
                         <field name="department_id" invisible="1"/>
                         <field name="company_id" invisible="1"/>
                         <field name="text"/>
diff --git a/yuthon_property_approval/views/property_supervising_approval_views.xml b/yuthon_property_approval/views/property_supervising_approval_views.xml
index da6ecc58f..2db914a56 100644
--- a/yuthon_property_approval/views/property_supervising_approval_views.xml
+++ b/yuthon_property_approval/views/property_supervising_approval_views.xml
@@ -51,6 +51,7 @@
                         </group>
                     </group>
                     <group>
+                         <field name="work_end" invisible="1"/>
                         <field name="users_id"/>
                         <field name="property_address"/>
                         <field name="reason"/>
@@ -76,6 +77,8 @@
                     </group>
                     <notebook>
                         <page string="物业信息">
+                             <button name="build_pop" string="添加物业" type="object"
+                                    class="btn-primary"/>
                             <field name="lease_ids">
                                  <tree editable="bottom" create="false">
                                     <field name="supervising_id" column_invisible="1"/>
@@ -103,7 +106,7 @@
     </record>
     <record id="view_property_supervising_approval_action" model="ir.actions.act_window">
         <field name="name">建设工程委托监理合同审批</field>
-        <field name="res_model">property.construction.approval</field>
+        <field name="res_model">property.supervising.approval</field>
         <field name="view_mode">tree,form</field>
     </record>
 </odoo>
diff --git a/yuthon_property_approval/wizard/__init__.py b/yuthon_property_approval/wizard/__init__.py
index eaf7600b2..85811fbd0 100644
--- a/yuthon_property_approval/wizard/__init__.py
+++ b/yuthon_property_approval/wizard/__init__.py
@@ -9,4 +9,5 @@ from . import property_management_wizard
 from . import click_reconciliation_wizard
 from . import accounts_wizard
 from . import binding_information_wizard
-from . import contract_signature_wizard
\ No newline at end of file
+from . import contract_signature_wizard
+from . import build_pop_wizard
\ No newline at end of file
diff --git a/yuthon_property_approval/wizard/build_pop_wizard.py b/yuthon_property_approval/wizard/build_pop_wizard.py
index 9dbfedc43..075b69ea7 100644
--- a/yuthon_property_approval/wizard/build_pop_wizard.py
+++ b/yuthon_property_approval/wizard/build_pop_wizard.py
@@ -6,7 +6,43 @@ class BuildPopWizard(models.TransientModel):
     _name = 'build.pop.wizard'
     _description = '添加物业弹窗'
 
-
+    property_ids = fields.Many2many('yuthon.property', string='物业')
+    construction_id = fields.Many2one('property.construction.approval', string="关联建设工程造价咨询合同审批")
+    project_id = fields.Many2one('property.project.approval', string="关联工程立项")
+    design_id = fields.Many2one('property.design.approval', string="关联建设工程设计合同审批")
+    accounting_id = fields.Many2one('property.accounting.approval', string="关联建设工程委托监理合同审批")
+    supervising_id = fields.Many2one('property.supervising.approval', string="关联建设工程施工合同审批")
 
     def confirm(self):
-        pass
+        # 收集所有选中物业的地址
+        property_addresses = [
+            prop.name
+            for prop in self.property_ids
+            if prop.name
+        ]
+        concatenated_address = ', '.join(property_addresses)
+        related_fields = [
+            ('construction_id', 'construction_id'),
+            ('project_id', 'project_id'),
+            ('design_id', 'design_id'),
+            ('accounting_id', 'accounting_id'),
+            ('supervising_id', 'supervising_id')
+        ]
+
+        for field, line_field in related_fields:
+            record = getattr(self, field)
+            if record:
+                if hasattr(record, 'property_address'):
+                    record.write({'property_address': concatenated_address})
+
+                existing_lines = self.env['property.lease.contract.line'].search([
+                    (line_field, '=', record.id)
+                ])
+                if existing_lines:
+                    existing_lines.unlink()
+
+                for prop in self.property_ids:
+                    self.env['property.lease.contract.line'].create({
+                        line_field: record.id,
+                        'address_id': prop.id,
+                    })
\ No newline at end of file
diff --git a/yuthon_property_approval/wizard/build_pop_wizard_viwes.xml b/yuthon_property_approval/wizard/build_pop_wizard_viwes.xml
index e69de29bb..91071b1c1 100644
--- a/yuthon_property_approval/wizard/build_pop_wizard_viwes.xml
+++ b/yuthon_property_approval/wizard/build_pop_wizard_viwes.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="build_pop_wizard_form" model="ir.ui.view">
+        <field name="name">build.pop.wizard.form</field>
+        <field name="model">build.pop.wizard</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <group>
+                        <field name="property_ids" widget="many2many_tags"/>
+                        <field name="construction_id" invisible="1"/>
+                        <field name="project_id" invisible="1"/>
+                        <field name="design_id" invisible="1"/>
+                        <field name="accounting_id" invisible="1"/>
+                        <field name="supervising_id" invisible="1"/>
+                    </group>
+                </sheet>
+                 <footer>
+                    <button name="confirm" string="确认" type="object" class="oe_highlight"/>
+                    <button string="返回" class="btn-secondary" special="cancel"/>
+                </footer>
+            </form>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file

From 2fc4e51c818f2f9fcd178047bf58d47c3c7f2dcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Thu, 11 Sep 2025 18:38:34 +0800
Subject: [PATCH 38/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_property_approval/views/payment_process_viwes.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/yuthon_property_approval/views/payment_process_viwes.xml b/yuthon_property_approval/views/payment_process_viwes.xml
index 71c76bf96..fcfa12921 100644
--- a/yuthon_property_approval/views/payment_process_viwes.xml
+++ b/yuthon_property_approval/views/payment_process_viwes.xml
@@ -38,6 +38,7 @@
                         </h1>
                     </div>
                     <group string="审批事项">
+                        <field name="work_end" invisible="1"/>
                         <field name="users_id"/>
                         <field name="supervising_id"/>
                         <field name="reason"/>

From d24d9dee7a124a56e2e292b0898ce068fcf5ab0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Thu, 11 Sep 2025 18:45:23 +0800
Subject: [PATCH 39/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_holiday/wizard/leave_allocation_wizard.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yuthon_holiday/wizard/leave_allocation_wizard.py b/yuthon_holiday/wizard/leave_allocation_wizard.py
index 6246597ea..c3c9e12ab 100644
--- a/yuthon_holiday/wizard/leave_allocation_wizard.py
+++ b/yuthon_holiday/wizard/leave_allocation_wizard.py
@@ -24,7 +24,7 @@ class LeaveAllocationWizard(models.Model):
             raise ValidationError('请上传文件。')
         book = xlrd.open_workbook(file_contents=base64.decodebytes(self.excel_file))
         sh = book.sheet_by_index(0)
-        for rx in range(1, 2):
+        for rx in range(1, sh.nrows):
             row = sh.row(rx)
             self.salary_import(row)
 

From d5fcd4a63af6c4870ff7e4c3e8919dd7cd601c70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Thu, 11 Sep 2025 19:05:08 +0800
Subject: [PATCH 40/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_property_approval/views/payment_process_viwes.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yuthon_property_approval/views/payment_process_viwes.xml b/yuthon_property_approval/views/payment_process_viwes.xml
index fcfa12921..56cf535e4 100644
--- a/yuthon_property_approval/views/payment_process_viwes.xml
+++ b/yuthon_property_approval/views/payment_process_viwes.xml
@@ -45,7 +45,7 @@
                         <field name="payment_instructions"/>
                         <field name="payment_nodes"/>
                         <field name="amount"/>
-                        <field name="documents_id" widget="many2many_tags"/>
+                        <field name="documents_id"  widget="preview_many2one"/>
                         <field name="department_id" invisible="1"/>
                         <field name="company_id" invisible="1"/>
                     </group>

From c6ceaab778c7119476c13f82807e3c735b3fd5be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Thu, 11 Sep 2025 19:19:30 +0800
Subject: [PATCH 41/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 soong_workflow/wizard/soong_workflow_comment_wizard.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py
index 91694b0b9..615361480 100644
--- a/soong_workflow/wizard/soong_workflow_comment_wizard.py
+++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py
@@ -509,7 +509,6 @@ class SoongWorkflowCommentWizard(models.TransientModel):
                         'approval_state': "3",
                         'lase_click_date': current_datetime
                     })
-                record_id.work_end = True
                 last_log = log_records[-1] if log_records else None
                 if last_log:
                     same_name_logs = log_records.filtered(
@@ -531,6 +530,7 @@ class SoongWorkflowCommentWizard(models.TransientModel):
                                 'employee_ids': False,
                                 'node_id': False,
                             })
+                            record_id.work_end = True
                     else:
                         self.env['soong.workflow.record'].search([
                             ('code', '=', record_id.code)
@@ -539,6 +539,7 @@ class SoongWorkflowCommentWizard(models.TransientModel):
                             'employee_ids': False,
                             'node_id': False,
                         })
+                        record_id.work_end = True
 
             # 给申请人发消息
             biz_record = self.env[self.res_model].browse(self.res_id)

From a3b95b8b4e0462747e7854f442ae4952c72aa9d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Thu, 11 Sep 2025 19:27:05 +0800
Subject: [PATCH 42/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wizard/soong_workflow_record_delete_wizard.py  | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/soong_workflow/wizard/soong_workflow_record_delete_wizard.py b/soong_workflow/wizard/soong_workflow_record_delete_wizard.py
index 78a32d5d0..62d6bae34 100644
--- a/soong_workflow/wizard/soong_workflow_record_delete_wizard.py
+++ b/soong_workflow/wizard/soong_workflow_record_delete_wizard.py
@@ -21,6 +21,20 @@ class SoongWorkflowRecordDeleteWizard(models.TransientModel):
                 workflow_record = self.env["soong.workflow.record"].sudo().search([("id", "=", record.id)], limit=1)
                 if not workflow_record:
                     continue
+                # 删除假期额度里面的对应的流程记录
+                related_detail_models = [
+                    'vacation.leave.line',
+                    'vacation.over.line',
+                    'vacation.meal.line',
+                    'vacation.medical.line'
+                ]
+                for model_name in related_detail_models:
+                    detail_model = self.env[model_name].sudo()
+                    related_detail_records = detail_model.search([
+                        ('workflow_record_id', '=', workflow_record.id)
+                    ])
+                    if related_detail_records:
+                        related_detail_records.unlink()
 
                 if not record.reclaim_state:
                     workflow_record.write({"reclaim_state": True})

From 10de196e7e2884233803387208cf1280f2f7734b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Thu, 11 Sep 2025 19:45:19 +0800
Subject: [PATCH 43/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_property/models/yuthon_property.py       | 1 +
 yuthon_property/views/yuthon_property_views.xml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/yuthon_property/models/yuthon_property.py b/yuthon_property/models/yuthon_property.py
index 6bbd93ea7..8d2257e7a 100644
--- a/yuthon_property/models/yuthon_property.py
+++ b/yuthon_property/models/yuthon_property.py
@@ -51,6 +51,7 @@ class YuthonProperty(models.Model):
     image_1920 = fields.Image(string="图片")
     description = fields.Html(string="描述")
     is_message_fee = fields.Boolean(string="管理费")
+    financial_address = fields.Char(string="财务地址")
     message_standard_id = fields.Many2one('property.message.fee', string="管理费标准")
     rental_unit_price = fields.Float(string="评估单价")
     title_number = fields.Char(string="产权编号")
diff --git a/yuthon_property/views/yuthon_property_views.xml b/yuthon_property/views/yuthon_property_views.xml
index b7f2be549..eed2e4a51 100644
--- a/yuthon_property/views/yuthon_property_views.xml
+++ b/yuthon_property/views/yuthon_property_views.xml
@@ -71,6 +71,7 @@
                             <field name="units"/>
                             <field name="property_orientation"/>
                             <field name="street"/>
+                            <field name="financial_address"/>
                             <field name="effective_date"/>
                         </group>
                         <group>