From acf4ef12eceaca21cf7a2f3072b19acb406638d2 Mon Sep 17 00:00:00 2001
From: xiaji <rembme@163.com>
Date: Wed, 3 Dec 2025 17:17:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A2=84=E7=AE=97=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fzjgact/db.sqlite3                            | Bin 438272 -> 471040 bytes
 .../huodong/__pycache__/admin.cpython-311.pyc | Bin 12160 -> 17149 bytes
 .../__pycache__/models.cpython-311.pyc        | Bin 12246 -> 22295 bytes
 .../huodong/__pycache__/urls.cpython-311.pyc  | Bin 1969 -> 2117 bytes
 .../huodong/__pycache__/views.cpython-311.pyc | Bin 20408 -> 28189 bytes
 fzjgact/huodong/admin.py                      | 481 ++++++++++-------
 ...et_equipmentbudget_infrastructurebudget.py |  64 +++
 ...template_templateequipmentitem_and_more.py |  60 +++
 ...0032_remove_budget_activity_budget_name.py |  23 +
 ...udget_infrastructurebudget.cpython-311.pyc | Bin 0 -> 4195 bytes
 ...lateequipmentitem_and_more.cpython-311.pyc | Bin 0 -> 3643 bytes
 ...udget_activity_budget_name.cpython-311.pyc | Bin 0 -> 1050 bytes
 fzjgact/huodong/models.py                     | 509 +++++++++++-------
 fzjgact/huodong/templates/branch_detail.html  | 119 ++++
 fzjgact/huodong/urls.py                       |  43 +-
 fzjgact/huodong/views.py                      | 157 +++++-
 16 files changed, 1058 insertions(+), 398 deletions(-)
 create mode 100644 fzjgact/huodong/migrations/0030_budget_equipmentbudget_infrastructurebudget.py
 create mode 100644 fzjgact/huodong/migrations/0031_budgettemplate_templateequipmentitem_and_more.py
 create mode 100644 fzjgact/huodong/migrations/0032_remove_budget_activity_budget_name.py
 create mode 100644 fzjgact/huodong/migrations/__pycache__/0030_budget_equipmentbudget_infrastructurebudget.cpython-311.pyc
 create mode 100644 fzjgact/huodong/migrations/__pycache__/0031_budgettemplate_templateequipmentitem_and_more.cpython-311.pyc
 create mode 100644 fzjgact/huodong/migrations/__pycache__/0032_remove_budget_activity_budget_name.cpython-311.pyc

diff --git a/fzjgact/db.sqlite3 b/fzjgact/db.sqlite3
index aef337ef7bc94f36be1e46d45191acc6a1f12fc5..0df05bce2e550cd088f4653d27cce4907b578ab1 100644
GIT binary patch
delta 7460
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
U0s2;dd?IExjYJ|#R{+a@0M4#hQ~&?~

delta 3070
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

diff --git a/fzjgact/huodong/__pycache__/admin.cpython-311.pyc b/fzjgact/huodong/__pycache__/admin.cpython-311.pyc
index 4558fb1a18e8427ca5ca1c5a3fdebb6a5e5d1dca..6fd6ab4395617b19302e999b54c52e99700bf619 100644
GIT binary patch
literal 17149
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
BkTw7S

delta 3144
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
K*OBnwOaB3x7Oar~

diff --git a/fzjgact/huodong/__pycache__/models.cpython-311.pyc b/fzjgact/huodong/__pycache__/models.cpython-311.pyc
index 5d5f33f7234c6ae5b133988852b3a14e356b8711..3b2962fca4503e77fb1505cf83ca74f1ac27f0d3 100644
GIT binary patch
literal 22295
zcmeHv4|G&jnrBr~RjDNPKOrQ5Py&LPR`3rEqBamhf(S+-0X1NkMP31cN-Dmp!UnOs
z6v1d?6T71@Ews_5H5npAht_C7IJ48c?r!hyEBEc1t(kMiGfh>Jb7r^024{QSKfS;2
z-l}?kswmO!>2v0seX08L-o4+u_r3e>{oUX9-S5@gc6*rt+nfJuaeHK$!SEY8$ZY2H
z&eS7C2E#FfU=WN!Lx-`|Xr%q3U{ObLYq8N#WLRquik~wGrhsv`DRc5$#RkJ^eEHUD
zW?E)wSqf-bm{tk2tOc}6m{uvY$_i*%nN~TpYz4GRnU)<|jsjX`Ov?!^R{^bZrsal~
zr+}7?X;nb0vVfMIX-$JxRRJvr)0z&g>H=C$rd0#283nXlOlu~zW);wKGp!q-HM@Y8
zhiT1$mbZXbg>YlDp?2;Bb&*<Q!qO2E0>Lo$tdaJP!2VEYpe@~f*gs49VCpU-b;p3A
z)hHNRiv(k9agiZl+MVgH=$b;YU>Y>*x*$52PRlY_@)o-GX?*$Cims*8vF7NYV?n1h
za}Me%9W2w8gASu9r(CcJcEK^|d<z5Qbas%mqRVLXT!CW2EqDeibb9DC(6eXjtQ4jV
zR_W?=2<Ql{{9#w4>1%ZPE@1|mduGD2TJ(3e?W#4^7JWfiQkVSM55*Gfq>oqAu~j*)
zr(?QZ<kP>)!!J$5o*nD$7YRBheh<+S^*|=O52t$1rcQj6`q^{Io|nen9;z))ly&&O
z=L-fpcSd$4EYZ&PC!&FbZErx_9tsD1o&JtM)P_@2FT|23`o~T@b9v;#K#@pEq5~r8
zgt$CBGXB;x<InVt{pHBzk3RZ>IzsZ)^Qph=A1F$gw+H>5dzkVB-NgQqc@2$?OB)-b
zbgknDkEH(m?Dz}sMdwmM7cSzm=WW`wcJ1obslM~c^GC;i`rO2uC!lb7<mY33&(xY&
z-H8$*u)`k>Mp(It(p`aImoF0dUSxu9nKed~T}Aidv3EzZC$;SgwYLSrVkIfj<u~%1
zJAO9V^H!?6XYBCnxVda@8~Sl}qdrJ*IduobF~b4F?rfG=hNG<RYk=XCMV%IP8lG!W
zQ<MgPck=ZgpRX-Sl(vU`9sWpE3?xj{$^*uPDI5sy2va%UFX|!hyL(&mowqK3*f;*m
z=Tfi!`8Hv<zjJ43oBAoH&W$8r?BBLy|L&dsw#c?!(U1`8+_{Yp)J0wU5+y!gI3oId
z`yISfElM9(q5SZT5HZ8(f<HUeDLLzV=J(c0&biso@ci?&lC^#cN(Rk1&)n%06`~#I
zLQ$(pD8}8IzAR5y_&^}y|AP99`nsdDbqT*c-<^E@qp>$)moL7NdgknJ&%e+#U`|+l
ztOxphi87xLHx&&Auy6DEo{0K`)M`E-?*J9*4(sa*Mn!*cz#w{2i%3-^OmrC{^|2a!
z!!sdb*}u{0H+9=aXRnZ~Gx>*~_-9aRs&$Ju;lH?m#6pOKtG=$KVeNyP9`)7V_u#tv
zhGvnvMWVERmtSmb4+I5~N>5mWp*DY{J=B@7wS_t(cs#!L&K;pdX$!h3(@T^KfpDAH
z-o><B+x=~Oc8Z~Br{HS~1w&%Oit__IL*l-KZFMLV4EQ^F@iXXB=8&K(6l+O%Nzk2&
z)a{v|-WIOJ!%}W^vdCO*kxZ47HiK<e_folhW?y({iPYFCm2ZugZ<Wip#@38F=XCFt
zopbu{9R9B4+z@wekewT1_l;J}>scyS%<B(Jb(^G$=6FT3T+tlcFzT7xvq1LD?XMiZ
zPx3UxJq@y_A+~;W`of;Q^7Ms6w-2{VTl}MUY?&-JRzG6AVjy{yNnFV1nab{vmaUaG
zJ}m7(PYlJKA=w#1ovwL37TGngzu}TYay=M#Jt(^#jIEor7|m;plLnQv6q#2}8gj)I
zO1qjTgEttpm8NS`0&P>X(QZoD2Dle1%qd{TQAQJkeXvM3k(KNO-+I&7N)u7BY9cZP
ztb$pfNzJ60WN0$d=n2-rQr+Z06Ome{OeoLMp-HG%H3?x#8+7Q(0V9D9p*Gtv?KyLF
zT!IS|6=xERE$Pbe2o)IOm5Gvi-m%4bC<{<u8tU|cAp{};HY(W!M#GI}obHQ@$IpC>
zSz+SXx#S0Lq<$X5Od;NdT+CY2@Q)At<e3+ehx)TqiMX6AP-`a-olm}ZOuU<?(B#3D
zlP@0^@4=B+4#DQ5?CF3Uz<+cFGEzrgxP0NLw>}~U7uSb6I{cl2ccS-9^3+c!VlNQ-
z#Lg#&4qqPm#YF5_^5_RRbK<AH$#;$?pX~=2rDqUvI@LoHhe(&qr<k{Yg1J<r7M-A(
zgC&mj{&M{6Nj~dNJbPyB%)7rme<XSIET-n<8>dA#>CudwI(l^c;*dH|Gv^S}61Ysc
zAhdH%vthv4G+<;{BhErLpEx)M5IF32rk_p*^6#XAXnF+XJ1dUtldRQj6lexOA#67S
z+l%nvi@&sGiY8QLQ)sry$38yQB+f@IdR$^ywHg^q={oWP@GW@(xIzcO9B#`RLt>zP
zXXpCBK8AMajCIZRb!!?DmhFr_iQl4&xP=7G*c_D2UAw?q6J-q@{`MdTVRL}?#l@s^
z8;NTo>$fSF1mSF$XqAGjqxRX|TV(s}<9mmy&dvU$Q?fr6w?8J^AB#0k7Fnt-lZK2S
z_;ndvUIwzG6;-1y@94Azqn=HZrDm7qiUHy(iP(K=lpd~@%2&tBSIgzA0nq^OM%gy2
zzX-{;)p6Tu*|s{?FlxJjl5gl+BQ0Am**3&&8)VxCq-P;oy7wW;voY@3D0?=>)=!#@
z<{E<0v;c_SN+7Bi1fsVRi0U&qh*FDa`cQ`FPc8j}K$HO$(OkBrEe5bKl{En45MZX(
zu?QuDRvjF3cqMe;C6P6ND?6R(>xNbioQg)d0DEB2t}6#7pRP6sY#8ko>EYFxQ`hx^
ztF^8z(!RGnvX7ywNTY@$9HZlm_i+x-pr_Uh7$uZUy*iW}`AFP=-Aqc);P}O7#0Pi^
zV`4vgJ$W)V{_{hZFP;&bRGL3NHPIUrALJ>_VmS2v<&jrYFUC?Q&Q2UVGx6qe@gd}L
z*37N}_zLr5pqQHkS$t#~$@8(~+doVl`$g)+>wqf4%@&q1Hu96y$=A~v#Uj-N790%*
znGP?V863$ILu1c=$O}94e)7!0<l#ffGap_*NQ#90;z|;ELDH3J<qS%$C)HIXybzjx
zo#`)yd9OWNA_GUdxABWT<2}FNT%F%Ql)yMQ8S@Z-eku0M_!CP0_y~UhM2fEstq-F_
zdX_od_FKelo39^Q#Wg5})5r$eYb3#Nl<`_~xGmHbNR+MtIpqji76!GB_{b-aum(V1
zX-~YBPP-0NWerY(=J2o;jeK3GI$Az6O<;#-OXc^)%kPuR?^8iz@uZ<-sb$h(m^N?H
zSz@1m#Q<@YM63b$3rMVz-8c4sUvjUAyI08W6|ws>%(qV%s=U-BIh*6oX4%;c9-3jP
zI!c_z)gg!ESsC}Nlszl+f@%x6YLPjgBxG#?8_u80;gy<3(+#um`X+L&%~1s-z$(j9
zb2+LW%mz(5P~_lBgn?~>dC;QMC>P)fB=CfP(F%u#p0nD8GSG$cgrnh!XnR*jpfj?r
z!@o0-a0N2QzII9ogFD*9KoC7jU<RKEPp4sjm7*qwLLF({#juo1qg}y}9~~{!f+L$h
z8VUJ2Lr?nrf}nv06N)LucZw!<I7p3Zs~vWFk=jPz4J7B=Ylf31;yF!G7ZMcO`r5~1
zFFf!4ve<j8cc3^?)GqL`LBk?Hx>RXzJcBWh;Dj*I3}Rxd`sSZnC^=W*(=QC}kr%Dt
z2a<Kw*MlI1o>l0oRajb<fxq@~0VvsxOWR5}RZqf8g4kQrfFmCj%ZC?<GWMj?42wPF
zgq;wh1<=4#%lR|J6Zc21&AA?<%1Jci8$Je+4;`c>jnbw^<V}xDc7NRNm+k&oV}=b$
zH?NXxb#YsrY^x(Kw1CXj1w(5j&+@oux$Ifa$7~%lD6{e#av{3Xf98X=WR2*5vb}R>
z!Yc5cu;{~G?Jvz7E*AYbZV~A||G1-#+=EFBvX6$n;tuSKJ4xi7x1H&$%nT_~&km_&
z$16`vmz>M+>1#Q)Rle!l{6MlU`=&$6mZ^`8C4yCcp#?@!6iV%MS%eR&UORmbO~?!K
zO~~RNsOk-;Cn${sHG8-RLRFYzcHIBTf?qF^?2pFnkIME(mHyvfF4>mEZA)a^k^<fT
zF0upC0)2lW%~*Otv(-YHtn?WiBIpt|eLus?r?z2IS0<|5^?-l{zH@r`Y!iwGi*?Lf
z@6k8GjY88=F<3mld~4-C{qoGQPy$~)Ib6(elwi_4otZc}-&cF<p(B(Hmg~wRF0Wp-
zu;GZze6~@!SjQj-3wpz8>Je;f#WD@_$iin^z_Ys|vyasUw1mp;sMPA>N?kgQX#yND
ztyOG_^<avv(AgW)g-Xm+(-O9aqT7S*ZOv_BAkbM`3<q;bhhKy*KfvAWAG|y<FgW(i
zS!CG#0=%V>_Hck^WR{)$@M7}i7nAQEMRqxPDMh%Z;kxABeddu(9(_4Ed=M%LM;EKg
z2iGO)3fC5~*;;%Yce#I>CNDE%x6~Gk+mS7{kRV1Z-V4EL{fn=UAH2Y=h+4DGicn5a
z>2jZmNE1TB+_0DKfr?C>h$VY|lsex#HgfRtM?btg@;-_q9>FVQRX<LLWQNolnU|lI
zvNGgB17*}zsAEmhRIPQqXdV3r41HPJ0M+dF7WPhOkJ3~l+f_j@%#2_#nETS`g@36L
z+T2MoeP<w&Ze3qwUsu2<w1>Nb{(a&uQppR4mFmZz!NjMb9=;s{G{aNX`z?5BCFe$b
z`XZk#tp9XjeSBeqys&|%ePa4`3Ez{f8^0+^x;2-<ppphm^3Y)N(7W)7CEw{m4=R9}
z&$6q{;~%=2FmrJ}%&e`}k&=Y1xqeeaLzA!N(TCE``Fs>b45BWvg9I5jiE`ebS&J)n
zOTyaR(Bf;_ykSG4Ea(qMe1g~xGqsaWGtp_q;GKyw3<XAB{gFgjv`a|uUz^rEN#~OY
z;TxV0R8TN|vdC0viEWrHGdSj`d`eQ&cO|<oZuiM{pMvhv%_}bn(xxqv?cuoXVcGVu
z%H6Yl_!en%o3y)A+Ph!!JQepmC3~KNYd-4^8d`Jd`;uo%+_OdYY(a*b8AWsZmJRJV
z7y6_{dSsil=c!49VSSOW2>(2f7hPfUDw8mn+&7UGbyNSY!Jy>6C+@yScHg5)j!5n$
zarYA0y(D%&Ih!^yj+K>|XKtf;MlWcdxsB!-eFmRrsM*@^&2AZ7pZa?wDf0|7aOfGa
zEnpUmd1e+1(^BRh%q*B!Fr-ypCcPV<JWN^~*E{e_h0;9p33uV!GFJo-lfE3gfIx><
z9yH(p+B<bu;uKtf4YzmzWh5*C!oDzb4*`T9M;doc(+tS)lEa|NOT<w$?Ui{So_KK+
zbhSPimQ3KPDuP3<1|iV^*LF>RmDk12U^|0TM^Kcwii8(J^Ju9S+6uc|%6M^#nZx`o
z{O+UGIGuZ1cmnzQnJcNVJLM=&qi+s-V@rj1<wYWw4vDy@+WCOLb6-n{B(r?DyV}aV
z)L4ur^x<y&M`^E>1hc*t)81_)$X3j|*hd|K^@c;(315UzaAeeZ6Zx2L>f14Vmju(u
z>5n`8veOTL#x;B=?i;_3Q{+0mAIoWo>je$*<ut_g8GMM-ZE5;JhF(qmBXX1>{?$}c
zD287HAfO8A(3455=CL(7%+3YKq%}_vi9YDViZwZ#Zpd;HsRV{t^Q_4^1w<|pafBZQ
zD{q2ZR|W!3FzhQ5_ATu~Ak-2NJK8(_!CDKkysl7iUt6eyF}38GlgaLZiP%raM!LsN
z6W1%=AK~#Emxtd;9y*sz$Kv$P_DG;@7dvn4!ZGqNzWiMB;L+r%b2zUw=<kYz5K^(1
zajUVx-tjX-sS|_A7yD>w>+QqPaiw*-#L(_QTO=e#r{UqKRZ}m%lDzQl<&nRDwmB5p
z6%hG~85@2H=U%!SL~ZcfNdsB2!X`PI-HSpQ6mdTcXNuxRq;lNi$!SvPM)DVgu*vS%
z;08|}BQ!%uhkztj9Lr3-b`EaVY$ov}mZ<?anmN!V3{&?({4prtNyJ4A6g4r*2STjy
zy&B?snP$*3zFDX{XJK!erW<5X^yj3y5JJuN)=AEF#P%9KUDyy`xK>`c776sRuKRjm
zt2mcD+S(cDGAH-jhbP{AIsK4W|0}@r=wgW?Pw8!A=B&OWFS>ek=$de}G;DfcT~pnL
zuVQ+HunD`Sg%yU!x!em-5nm*6O|1P1<&x;dH~gO<6s(;rDyg!>n&4R0aW<dSc|fv1
z9k)L%+n)w)tDN7{C|AxODjIH*9^ENb?uu9Lk}G$`9#B{ray;wfp7pY4J#jKlv4)mh
z>Xh7@<L=F}d$XEiU0Ni$H^$u?W%ou-vhHUjD=R^=?j!`(3qs&K34!$)9D(UR+wje9
zS(5dCk)$B7o@8l!&PE-MQShERj>1|{Tkn5H&>*l}OU-nYin^3yb+z&ZJF@rK27}#_
z2k8-zhwD(Zfb@CDn@g|(quqiXNbJA@@?L*1%4}qql4NC05ME5+>ags_W9o!<Kx{bS
z5CUy*fCdqj<fqs(VrOI!6H2K}Q-V2ew|8L)1^zc~n177rt~XMB!zk41?*i2B4G28v
zgZBXR;}@T&95Fx$tmLGA_~WsWlj1w9OqESti3APE5x~)RiUKhTgPh_XS6jdYYGNNw
zMkJxtpINb_QOyA^FMxTJ*2|#RFL6fL3&GLrR@pOOa^8baf92pzxpp}}kgWHx?%7nU
z2Lnd6xS6+}DsLe1E(xLz>{=4GHT+4Wz0z365(5ke5+#^H$r-{e!O|V=h%@W*Q$Qq^
zwj$9m2L)ZARX-I>f_hx|eFy~)MxAVZ-`iI`wB;PasMf@tYh>pdP%p({hd2SrzAA2C
zCEHh#K{tmM@8|U2KD<$~t&H1N%C?m-<{Y!TcgT*}aferScw=i3EkGer-v0Wb$ffy`
zYi-=MR(7q8tsAx9K*r(?{hrYUdq)>6o-`LZZpR>Z+>Sx+xE)~#R-^e|^782gAMkV|
zngLJkM%&k>T-W2h%dxR?e0O<5pg7&4@xwNugbh<IAkdIEsRlEP>P3i?OGg5o%&*2N
zS3bX*JMCAqtd0tpo*8YJc=NfjGsh^{^^N{~i}E~QWp1^Iui;9?6C_TO_!-26llK0C
z1fc~R%&FK2KY73;Qg0FmNziC5z)Q$7_=+K$F`o?NfJ(1vG5!%Hi`UERgzeZ!HL*dP
zcf2}yBV@+vUqM?nR=HmZBXoIR<kUX=OMk4(S<ljRs>}uDv*#3wQJ$`kxP|y3YAe7b
zK1TMh=<@4HcuBCesvLx%P*@?<hKNxDyu2PE;t9MNn14s%1n(guVT*(!fbs3DLtL9C
z3{xQ_KEgNr?;%vMV5*W#Ray+t#0p*0GW$9#V6<WZg=#JsntN%Z^w37>@jX&SFkTUq
zD}rz<!4Gpc!9ZGk!-X!oLCurR!o@B;<L6ZjfowDi3&y}SE9=pL5}_E!RuscF_BsHj
zP?eoV^S^m_SyqFG_GpJY&Hq}RQaDw#Is_YLRa7J*C-VgNke#M3$q_Iy*g$7dS%t(E
z%)4FLYvQj0XzN4Vq^7<~)HhA28l0|!AWyephf%10&e~eR_G++KDa-)Nm?q#YkF?W&
z7VN<rbaynp+weVOYc-h2?1VGB)|*Bu#>M$MFT<<U@gI$i9A>eYlto6|iJ|ecZ(bhx
zVB-1b$IrbZ{xy;jD@253{LGulmtIMy)38E14JSlTjvacNVCrE1#G#kQE}TKYf9l<5
z^OW{4`B^v8Svhs3x?j~)@voqja4YNld~k)?pdTpaJ}qKb+!Q3}XF*OAZ+tlR+8Gx3
z#EubxgqTgSiZlsXdE!g2;2u$mf~Z9DChi~wx><gksaHS5YX;1qoFI5&=cZm6nt1-G
zSWQ}_%AlH;I&^gW%p2ke5;aVU_%R{-)Qb?W7`4Ex4l~#f%>xD>`V8NS43Vt+ksC#H
zy?j$*jt>~y4F`%&8GnR#yRha!wdHJYAw@Zt-T?zQqxh!*3%t^u?Gay>h}RzyRz%Nt
zMi5z+u!f`C8LB1B;b>Pt#48B?y@5mpcVQ#ELIFI?OgEsYgvl@N3@0pmo@D<^eZDrh
z#lv{30E5@y^?GAG0yTl7{gt}DxrmjHoGF@ceg~>oJ?n(CfBxXD@#<yWrX%)IYvoJk
z7fOzl9I^EXlJ%zJJ0SSybF1w$tM^l@H*TFPTjxrd51(T)^9qVJWS_)#9MF?M3#;<A
zt)y^ST?=QQ4;7i&wCAc@xLEuzP)b<R;m?1A1MzPmbj|V`B<)wCLeldbKk0MiO;MO1
zHH@_?-4KrBCds<6&jP_e*WVBpltpvh)C%0bwnHknoqzdC-6fSyC>XVVZv+*gWMw^5
zD6T<ueCsj_rl*YuG!Zw-8({yGweE+rO<%K*+JbHB2%tXIz{}+8haes@mg)v9?2Q%f
zI8yUKyq=ULZ{jEl!IGkxjT><cM+`Tb2CN85=Ct7xBqmDzJ9mnKomeH}9^&HWXh)(7
z>#ibJn8ausy%m(^8Da4f6+^=bZY&ystlThlPp_AcHR^2p=jq2<o-v$+;?zqJF~jGs
z%HDF>b?axYWuLm1UD$Dc_a`&rD_Z0gEs|?l+_hPDZI-q?CcC~Xx!R=dZQbTktG%bP
zcc$#V^E3B%K6QWRSB-yt|0nz7Yg*+st&;mYarai)y;a)QCc6d6-7f8Fk6YVu*1VfB
zuFGYschqV-QvR8>`crFl+&V+H&X6*n+!0KjmUZ0u*wJ=edbvuCrdUbMSfB&s4duSb
zgqghom4B^ty1u2-uSER=wayIII<#DRi{xC4Pv4SLck?~Ty7-$C+8iKc%=TZPt^&;V
z3uONmU-1+PFA188Yio3VFp=E;ctvRQnzdM})GvAxQRCL|1nu2I;tGlXPU1Zh{~03T
zLDRLN-;o*Y>j*@4g@lA{T_;{Z3Z&m^`iyj`i?iM+{)YA#&SgDj343}vXbS{`J|9AU
z{|-vbf4Pcx)xV;XNc<bhcns(Pu*>|7nr2C+S$Ic@Eq~e+SDLhBt<?Oe-0YXSzAxE-
z5V!w8w*LSobJ{lUpNChE91U?tgY0O4iJXa!FCM;Gven0J^|GxVmb805t!}{ecIkGh
zd8_2!7I$xx-P_<ytEoL+CD+srZMrl|+O}J&*%PnXBiHO9s_vXiYbbMJmEWbd;xozH
zFS$RdleP(xGZ1$MWM=?T`zDil-lQRquoY8A9#LjC&zv-5g~LcIpIPy>J$Q<{kM|mC
z?>2n1TLuiL4&wpnxjNXZD(EF(5sGk}1<LDLPhmbb0F-J8Rd3#3&uR*LB^Ti}Kmrv5
z=j$n@nR^kiB%1RAFtK#gZeojULlBTV=LKM0n2vyVng%O%Jln&{!E}-?XBys?suHFT
zR_mC&ioY`^KLboY&EW;`_txobWrw|!t*fD$G5H!W`8kQob(#qvP3MV%@;4*lT2H-t
zflof1)QbdJj4O-(n)c|9IZ0(N_cDImB9gVj-Z)bDvG{9B`*$Sn&7K3geBmW_`uN#%
zs6dn`KTd)!Lj05j9;-q8k0kzCF<_D0_4x=H<Eb_ITAq>B-_vQIlkh_1C;Z!y^CzO2
z;@{JyT#HxE%zGQ0T$(Y`#mjWI7eaF*|DPtJMfmoI(nK+Za>Q{G{}m#arQMwO5#^z3
zW%RuM8x`b*&^#~XaCSrkTg#5p_FjSaU1sIIfHVVgQ>Cj=Dz6kf*^Mftt+3-R|3G47
z=l|g30%XU63g}(soN$ZVDex;_xJB)Zd^||y+{?#&X5uQ+E`LxRzqlu?qCh6Hk$J$y
z??~^f36J<cN$*PtHOcwklt|(#WsvRpy9~vFWoMczndT}kKxxSa>5=cskL;K<81@?1
zP@I*cf#R$naXuu7juNk-c?~elfBIU6t&*cI?x>R;b>KhOCOVmNM4V7w7cZ}q%j@vY
zOg11)`wDl4<ot=bPx@^{5TKe#a36hy2n#2<X8ec}Y{L35dkh-xW5P3`ZHk7fvW}S>
zNkTtTlC$1uVT?dwL;P)SE!WA3FUhl%!TFHFVtDwmwjA<pns(dR)k4q@l;pgrZD)}q
zJYXze<cKpJIg<9^w*)${3K<EgmNQcQZ=_CMRJ~cqj@648QMv@Kri!x2x3tm71991}
zX-te9A3t*{T{`iHKOTlvacY#gnar}pjTmTu5PDVU%4N7!j#3NYmIK)ozL~T9kP{0=
zRvJgATWBwfL>zE*3l4WeB~gZ-2+91+N!G^Fza79P3KBK=hJS_g)L6ro8#1FltbJ2X
z8TH>h;2?uF{hOt_&60ad+`UD1Z{dLmx^b+3d6-7(tu&4cyjo26r5U|h%cTf8g+}im
z)oxLb)7+mM(vMR_53o2et=+;GCY6%x0f*{k0{Y=0t^W1CCOj=O46<I0b&){F7vzfO
zgO5k#z+;|p29($Cpc7_XKRrUT_Jc^4IkOzZe@lCcPn}>OdGy)w*g-52z_ZTn2U_3~
z{{xAQ5Sl@b8~O%r91%0%HKN>a$a}Au@qatIgg8Yfdm%L4203gi%wA^XFP_1G2SpTs
zfofzgq52P^9zOGsucoOs=f?{a7+6E9Z1^@{55K9E2Ip(~Xqe+f{6{+Ne~`E)CNLgH
zq88sUdHvLwP$QXYvhfMCr4<iKTmACZb~O7wV;%7i*J|P)kl-JX2wM0994&syy*=*U
zF1xpD94&L?y2qs8eyQfEc+FFC%~SBT(8{FF@1YL>C(O8wFrz?tINi7A;b$>p26Fyn
zn4$JQ<o^7aK63P**w-N-#3B8AF6?*hbY2LLFby7vszi1GXpIC0DAUl3I96!95rCD-
zc8%Y{hq%%X{KOU-Tk%SW6g5`BA2E%zv;GM2_oQv02Z?WXqkY1ZDHp`oHGJk~26yhg
zWdLL~UBoJs{Y?R6PJucYip)X{1yIC`>;`;ujG#qi1bsViROEF7j7S7Q6>PqkZnT8b
zvQA);-oF2ei1V4GLSi|-Ve(O{v1N{Anxn>+7U}UF^5dNVmG2uH8Mdrt*s_*k%UZ$~
zg`IqD+eU*enR2enw#oC;Crb%j^n$QvDMd-@GdRXmJ2c^kkV^Savn>*~^93DS`ZyYC
z4~F@BLgokP#}j!p+PA6c*OPdR#1kZ*ByoVmPe@QW7K<X`pwCQ7HdiogXAhy4RJ<f+
zLwsqym;XT83X%9IK8A1{1_ge0%V-=m%#yU9QNxXr_A_azGU7M1az*!+BipV}`c)<K
zju}Sqxm?k`<4EudrC(Jt@1AC)-#*AMyZ0VBaE0YvRcqW<M&;*<o-Mt&7NlQQGG~<;
z@j_~@;Man5(oJj3sxV?s$rU|Id+)tM=~tD^TWm(yp1GpC@yLcNlzvsooLy-|9Br=X
zY3zkA(yuC+i^`1%!OImrRlT#WQ2JFRbGDt@Ay@Ecg7m9OrgtG-L$2uA(Tit-^s7o{
zi*YX9T&_62^aL6L=~tD^`;EC5z%GhE4c%4PsfBaJ@x~Kq38d2%r!~9|BgR#(=&L$~
NmO%Q|JejP^|3BC3rIP>v

delta 2539
zcma)7drXs86z77JM<4r2q0mBGp3?Ff%6Q07r$ZM6D+)Rt8?}Q@yYVo$t(z<hEQ+FA
z<Z%{ZQ>ShUk{LvcE&-ipW?7c(5BJAj-IkceufmcgCd-n|f3|z>S4Mesv1xz(zH`q#
z_dI^*+`%#OolP~ORK|v}&-PW<_Woh$S0#nJ$rUptvgU-kFpJiED7-M7c;MQyb0!T_
zqbdd)Jqm{Yq03_5u)nA8!QnHOaH{coBEKSPBPyjZ@GaZyaNB7rY>6@_ajBU}trj)S
zK$T2{Ea;6|PIPcRs!^YW0s{i-(QE|Cn71H0mk^`(g_s&b(qJUEjFiB=*i>^V)3JpA
zDPw<P_YLvtAT5(5F(?^3Dt2EK`-kW%Fw6JIwM@pnr}6NCyn+buy?m2ahf+NQ7h#af
zJ*NgJRhWqpb}M%1(@`PF8GPjqJ_C0Z^8(Y%3rtYv3Kmq(K`2DfLABDjG9Moc5S9!U
z7m8*9<9Gc7Pb4Nnv_=hglt0OMN{V1SQRls>dXC7_Q1>Z_6$&~xvBy9<{C$_EZ@o>c
zB?(qbJbp$z-8KDj_x)RAv?fS%;QY*cU39Y~i9^lq>-VQl_>Xn@PhFlF9Gm%Qh+3Ig
zs`<o}c<kbXD^uc!?~F!JG)!j`3!e%FL=AqSA-MwOs}UBb_C>W`wg#6lzj-h&i-oId
zn=xdbw=-QU+}6dzLv!TDy1UWI(pMsf#Ho3yN81qy>k*I~^jU;T1YQjt9FNN@$i?@^
zs74j)Re7i55{Q)jDwh4v;fwf{q!|8+A4%qhLl9{)p^_7+1d6rUJ3|J!mz~jo=d45E
zHRh3xs)9*{YfDB36WStENIG%D4IoQAFZtiV{Qp+}60_D3(@gEJJKOfSo}@PRUQg`|
zVMT%!eos;)H{*d0gvDiy*RAG(mBLY-E_9c;;D*keH5U+dqPYeA)Q+-th|!;x9BlVq
z(*I3l#VBrsPg0D+ZhYK^phhT%A5&76&k`?ag_Be~c4qqEO@D9i^sRBa6_O2^Dcls_
z%8fLl5u9WeLN(A}=oT>4M<ms<OrnVn9vTeVS5R$n=o!ZPKuyPt=Fr6LV!OLIaidK_
z@B~Z>t|=6n5=)k1>Z^G8YY50$pWM|%9ga4e`@lX&fVJ?JNl#i}$h16k?LBC~<Nd|7
zB0ydbjt<CAn@Q+EvogniN1NM4ag4Ab-Uzwr#iSPO=~}WC-bi0t_CKx6wsa^r;Qj)e
z&E=*x+q-z$g67W3csg{Ba6>QV$eh)q_`z7VWOobm@->-ZSub@l9`-!KPJ~?ukI~K;
zHtm3{%&#S~b$~5K=M}PkCY?M95me$Gsv$*aIRnnC>9Nnm^GBrNN4GF(eULanH(^#;
z>^Uh;P5K9~&kRnm#J-G{(3~_zPfqwxjQ_XzrnCqVg-LKQyH<&0v_#A@@m{t`y_kf8
zxjI0?0drpH1fOE2h6B@6=$z|AOI&bLnUYUczhT?vD(ku$Tm7!u4RuQo8g!J?QR#Nj
zR%e^NC76)7+JbNx;RwRKp%gcJqvJ{+2k5u_D%GKn-)RFm8p6ivaPBJkT)URTZ@G1G
z7uW`tmAN}d16%TT<h{?uzG!=s+qvKAK0x^-<}-P5*1pMG*N925E{Z=WUOw>ol`)Dw
z@*4#0`4p9oCTFX?Wuw#4((H?LHMLWz7kyDp?X9h>5oiwV%TLtvs22>mvuNuqoXfwX
z;AOyft3?GD>I!T4h0l-WvzpIC-npEtJX3u8e3Or&D_Yx|JuQwk^eQt(*w6JP@vg1E
PO;llWQt=RhUnc(oMgk}F

diff --git a/fzjgact/huodong/__pycache__/urls.cpython-311.pyc b/fzjgact/huodong/__pycache__/urls.cpython-311.pyc
index 80f766f95c1ec68ed590b2d9a926193bf302f270..4073f153c84948a0ff295f1ceb6eb996a95198e3 100644
GIT binary patch
delta 254
zcmdnUe^fwyIWI340}zyb($D<N!octt#DM_;DC6^{jq06DlP55;YRadwWr@S&Qxw+l
zEMsP1SPjGwkj@h&k)jyPps6%@7t=~R)uf`tyyOgho6NitD+oJ2GsR9nGq)hWs6;oZ
zG$lQ?M88T5g|AzZnp=>QSduz9iTM|!<m6bECE`#O@em#HFcp(n-*Bk|ZDs`G;xm)K
tv3?M_z-h2S^@@?-h0xp!EO{4M@~*JtO@7FBkYAFQpQ(Wx1dCLG$^m%@NzVWP

delta 112
zcmX>qu#sPVIWI340}$+bvOS}Tg@NHQhyw%sP{!xJjq06DT<P3V;wkdM44Mj)?=h{M
we2n=gqr~I`EK4TWu)gL}1FB^N;^NJd3)wzQu43QAFV4fy)W8jbMJhlU0P0&C%m4rY

diff --git a/fzjgact/huodong/__pycache__/views.cpython-311.pyc b/fzjgact/huodong/__pycache__/views.cpython-311.pyc
index 8c0caade548eba6eff0b31af5b0d7d65aba68a12..80f06efec8f01eab83caafdf5070dbcbdfb6f11e 100644
GIT binary patch
delta 10137
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

delta 4031
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

diff --git a/fzjgact/huodong/admin.py b/fzjgact/huodong/admin.py
index 5118c28..35d55a9 100644
--- a/fzjgact/huodong/admin.py
+++ b/fzjgact/huodong/admin.py
@@ -1,194 +1,287 @@
-from django.contrib import admin
-from django.contrib.admin.actions import delete_selected
-from django.urls import reverse
-from django.utils.html import format_html
-from .models import Branch, EquipmentImage, Drawing, PublicScreen
-from .models import Activity, Branch, Event, Contact, VideoTerminal
-from django_select2.forms import Select2Widget
-from unfold.admin import ModelAdmin
-from django.contrib.admin import AdminSite
-from django.contrib.auth.models import User, Group
-from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
-from django.contrib.auth.admin import GroupAdmin as BaseGroupAdmin
-from django.db.models import Count, Q
-
-from django.utils.html import format_html
-from django.urls import reverse
-from django import forms
-
-
-# 定义Activity的内联admin类
-class ActivityInline(admin.TabularInline):  # 改为更紧凑的表格形式内联（原StackedInline为堆叠形式）
-    model = Activity
-    extra = 1  # 在Branch表单中默认显示1个额外的Activity表单（可根据需求调整数值）
-    fields = ('name', 'scope', 'start_time', 'end_time')  # 限制内联表单显示的字段
-    readonly_fields = ('start_time',)  # 可选：将开始时间设为只读字段（避免误修改）
-    # 可选：添加帮助文本提示
-    help_texts = {
-        'name': '请输入活动名称（必填）',
-        'scope': '选择活动范围（内部/外部）'
-    }
-
-
-admin.site.unregister(User)
-admin.site.unregister(Group)
-
-
-@admin.register(User)
-class UserAdmin(BaseUserAdmin, ModelAdmin):
-    pass
-
-
-@admin.register(Group)
-class GroupAdmin(BaseGroupAdmin, ModelAdmin):
-    pass
-
-
-@admin.register(Branch)
-class BranchAdmin(ModelAdmin):
-    inlines = [ActivityInline]
-    list_display = ('name', 'location', 'category', 'display_mature_status', 'background_color')
-    search_fields = ['name', 'location']
-    fieldsets = (
-        (None, {
-            'fields': ('name', 'location', 'contact_info', 'description', 'category', 'is_mature', 'background_color')
-        }),
-    )
-    
-    def display_mature_status(self, obj):
-        return '💼' if obj.is_mature else '📒'
-    display_mature_status.short_description = '是否成熟'
-
-    def activity_count(self, obj):
-        return obj.activity_set.count()
-
-    activity_count.short_description = '活动数量'
-
-    def get_queryset(self, request):
-        queryset = super().get_queryset(request)
-        queryset = queryset.annotate(
-            inspection_person_count=Count('contact', filter=Q(contact__category='机房/设备间巡检人')))
-        return queryset
-
-    actions = ['set_branches_to_type_b']
-
-    def set_branches_to_type_b(self, request, queryset):
-        queryset.update(category='B型')
-
-    set_branches_to_type_b.short_description = '将选中的分支机构统一改为B型'
-
-
-# 注册Activity模型（如果需要的话，虽然在这个示例中我们主要关注Branch）
-@admin.register(Activity)
-class ActivityAdmin(ModelAdmin):
-    list_display = ('branch', 'scope', 'name', 'start_time', 'end_time')
-    search_fields = ["branch__name"]  # 改为关联Branch模型的name字段
-    add_form_template = 'admin/huodong/add_form.html'
-
-    autocomplete_fields = ['branch']
-
-
-@admin.register(Event)
-class EventAdmin(ModelAdmin):
-    list_display = ('name', 'start_time', 'end_time', 'description')
-    filter_horizontal = ('branches',)
-
-
-class ContactAdminForm(forms.ModelForm):
-    class Meta:
-        model = Contact
-        fields = '__all__'
-        widgets = {
-            # 使用复选框实现多选
-            'category': forms.CheckboxSelectMultiple(choices=Contact.CATEGORY_CHOICES)
-        }
-
-
-class EquipmentImageAdmin(admin.ModelAdmin):
-    def bulk_delete_selected(self, request, queryset):
-        count = queryset.count()
-        queryset.delete()
-        self.message_user(request, f'已成功删除{count}条设备图片记录')
-    bulk_delete_selected.short_description = '批量删除选中的设备图片'
-    actions = ['bulk_delete_selected']
-    list_display = ['id', 'branch', 'uploaded_at', 'delete_link']
-
-    def delete_link(self, obj):
-        url = reverse('admin:huodong_equipmentimage_delete', args=[obj.id])
-        return format_html('<a class="deletelink" href="{}">删除</a>', url)
-    delete_link.short_description = '操作'
-    list_filter = ['branch']
-    search_fields = ['branch__name']
-
-    autocomplete_fields = ['branch']
-
-    def get_form(self, request, obj=None, **kwargs):
-        form = super().get_form(request, obj, **kwargs)
-        # 设置默认分支机构为最后一个设备间图片的分支机构
-        try:
-            latest_image = EquipmentImage.objects.latest('uploaded_at')
-            form.base_fields['branch'].initial = latest_image.branch_id
-        except EquipmentImage.DoesNotExist:
-            pass
-        return form
-
-    def save_model(self, request, obj, form, change):
-        super().save_model(request, obj, form, change)
-        # Count images for the current branch
-        count = EquipmentImage.objects.filter(branch=obj.branch).count()
-        self.message_user(request, f"【{obj.branch.name}】已经有{count}张设备间图片。")
-
-admin.site.register(EquipmentImage, EquipmentImageAdmin)
-
-class DrawingAdmin(admin.ModelAdmin):
-    def bulk_delete_selected(self, request, queryset):
-        count = queryset.count()
-        queryset.delete()
-        self.message_user(request, f'已成功删除{count}条图纸记录')
-    bulk_delete_selected.short_description = '批量删除选中的图纸'
-    actions = ['bulk_delete_selected']
-    list_display = ('id', 'branch', 'uploaded_at', 'delete_link')
-
-    def delete_link(self, obj):
-        url = reverse('admin:huodong_drawing_delete', args=[obj.id])
-        return format_html('<a class="deletelink" href="{}">删除</a>', url)
-    delete_link.short_description = '操作'
-    list_filter = ('branch', 'uploaded_at')
-    search_fields = ('branch__name',)
-    autocomplete_fields = ['branch']
-
-admin.site.register(Drawing, DrawingAdmin)
-
-class PublicScreenAdmin(ModelAdmin):
-    def delete_link(self, obj):
-        if obj.id:
-            delete_url = reverse('admin:huodong_publicscreen_delete', args=[obj.id])
-            return format_html('<a href="{}" class="text-red-600 hover:text-red-900">删除</a>', delete_url)
-        return '-'    
-    delete_link.short_description = '操作'
-    
-    def bulk_delete_selected(self, request, queryset):
-        count = queryset.count()
-        queryset.delete()
-        self.message_user(request, f'已成功删除{count}条公共电子屏记录')
-    bulk_delete_selected.short_description = '批量删除选中的公共电子屏'
-    
-    list_display = ('id', 'branch', 'screen_type', 'last_drill', 'delete_link')
-    list_filter = ['branch', 'screen_type']
-    autocomplete_fields = ['branch']
-    actions = ['bulk_delete_selected']
-
-admin.site.register(PublicScreen, PublicScreenAdmin)
-@admin.register(Contact)
-class ContactAdmin(ModelAdmin):
-    form = ContactAdminForm  # 指定自定义表单
-    list_display = ('branch', 'category', 'name', 'phone', 'email')  # 可选：显示分类字段
-
-    autocomplete_fields = ['branch']
-
-@admin.register(VideoTerminal)
-class VideoTerminalAdmin(ModelAdmin):
-    list_display = ('branch', 'terminal_type', 'description', 'created_at')
-    list_filter = ('terminal_type', 'branch')
-    search_fields = ('branch__name', 'description')
-    autocomplete_fields = ['branch']
+from django.contrib import admin
+from django.contrib.admin.actions import delete_selected
+from django.urls import reverse
+from django.utils.html import format_html
+from .models import Branch, EquipmentImage, Drawing, PublicScreen
+from .models import Activity, Branch, Event, Contact, VideoTerminal, Budget, EquipmentBudget, InfrastructureBudget, BudgetTemplate, TemplateEquipmentItem, TemplateInfrastructureItem
+from django_select2.forms import Select2Widget
+from unfold.admin import ModelAdmin
+from django.contrib.admin import AdminSite
+from django.contrib.auth.models import User, Group
+from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
+from django.contrib.auth.admin import GroupAdmin as BaseGroupAdmin
+from django.db.models import Count, Q
+
+from django.utils.html import format_html
+from django.urls import reverse
+from django import forms
+
+
+# 定义Activity的内联admin类
+class ActivityInline(admin.TabularInline):  # 改为更紧凑的表格形式内联（原StackedInline为堆叠形式）
+    model = Activity
+    extra = 1  # 在Branch表单中默认显示1个额外的Activity表单（可根据需求调整数值）
+    fields = ('name', 'scope', 'start_time', 'end_time')  # 限制内联表单显示的字段
+    readonly_fields = ('start_time',)  # 可选：将开始时间设为只读字段（避免误修改）
+    # 可选：添加帮助文本提示
+    help_texts = {
+        'name': '请输入活动名称（必填）',
+        'scope': '选择活动范围（内部/外部）'
+    }
+
+
+admin.site.unregister(User)
+admin.site.unregister(Group)
+
+
+@admin.register(User)
+class UserAdmin(BaseUserAdmin, ModelAdmin):
+    pass
+
+
+@admin.register(Group)
+class GroupAdmin(BaseGroupAdmin, ModelAdmin):
+    pass
+
+
+@admin.register(Branch)
+class BranchAdmin(ModelAdmin):
+    inlines = [ActivityInline]
+    list_display = ('name', 'location', 'category', 'display_mature_status', 'background_color')
+    search_fields = ['name', 'location']
+    fieldsets = (
+        (None, {
+            'fields': ('name', 'location', 'contact_info', 'description', 'category', 'is_mature', 'background_color')
+        }),
+    )
+    
+    def display_mature_status(self, obj):
+        return '💼' if obj.is_mature else '📒'
+    display_mature_status.short_description = '是否成熟'
+
+    def activity_count(self, obj):
+        return obj.activity_set.count()
+
+    activity_count.short_description = '活动数量'
+
+    def get_queryset(self, request):
+        queryset = super().get_queryset(request)
+        queryset = queryset.annotate(
+            inspection_person_count=Count('contact', filter=Q(contact__category='机房/设备间巡检人')))
+        return queryset
+
+    actions = ['set_branches_to_type_b']
+
+    def set_branches_to_type_b(self, request, queryset):
+        queryset.update(category='B型')
+
+    set_branches_to_type_b.short_description = '将选中的分支机构统一改为B型'
+
+
+# 注册Activity模型（如果需要的话，虽然在这个示例中我们主要关注Branch）
+@admin.register(Activity)
+class ActivityAdmin(ModelAdmin):
+    list_display = ('branch', 'scope', 'name', 'start_time', 'end_time')
+    search_fields = ["branch__name"]  # 改为关联Branch模型的name字段
+    add_form_template = 'admin/huodong/add_form.html'
+
+    autocomplete_fields = ['branch']
+
+
+@admin.register(Event)
+class EventAdmin(ModelAdmin):
+    list_display = ('name', 'start_time', 'end_time', 'description')
+    filter_horizontal = ('branches',)
+
+
+class ContactAdminForm(forms.ModelForm):
+    class Meta:
+        model = Contact
+        fields = '__all__'
+        widgets = {
+            # 使用复选框实现多选
+            'category': forms.CheckboxSelectMultiple(choices=Contact.CATEGORY_CHOICES)
+        }
+
+
+class EquipmentImageAdmin(admin.ModelAdmin):
+    def bulk_delete_selected(self, request, queryset):
+        count = queryset.count()
+        queryset.delete()
+        self.message_user(request, f'已成功删除{count}条设备图片记录')
+    bulk_delete_selected.short_description = '批量删除选中的设备图片'
+    actions = ['bulk_delete_selected']
+    list_display = ['id', 'branch', 'uploaded_at', 'delete_link']
+
+    def delete_link(self, obj):
+        url = reverse('admin:huodong_equipmentimage_delete', args=[obj.id])
+        return format_html('<a class="deletelink" href="{}">删除</a>', url)
+    delete_link.short_description = '操作'
+    list_filter = ['branch']
+    search_fields = ['branch__name']
+
+    autocomplete_fields = ['branch']
+
+    def get_form(self, request, obj=None, **kwargs):
+        form = super().get_form(request, obj, **kwargs)
+        # 设置默认分支机构为最后一个设备间图片的分支机构
+        try:
+            latest_image = EquipmentImage.objects.latest('uploaded_at')
+            form.base_fields['branch'].initial = latest_image.branch_id
+        except EquipmentImage.DoesNotExist:
+            pass
+        return form
+
+    def save_model(self, request, obj, form, change):
+        super().save_model(request, obj, form, change)
+        # Count images for the current branch
+        count = EquipmentImage.objects.filter(branch=obj.branch).count()
+        self.message_user(request, f"【{obj.branch.name}】已经有{count}张设备间图片。")
+
+admin.site.register(EquipmentImage, EquipmentImageAdmin)
+
+class DrawingAdmin(admin.ModelAdmin):
+    def bulk_delete_selected(self, request, queryset):
+        count = queryset.count()
+        queryset.delete()
+        self.message_user(request, f'已成功删除{count}条图纸记录')
+    bulk_delete_selected.short_description = '批量删除选中的图纸'
+    actions = ['bulk_delete_selected']
+    list_display = ('id', 'branch', 'uploaded_at', 'delete_link')
+
+    def delete_link(self, obj):
+        url = reverse('admin:huodong_drawing_delete', args=[obj.id])
+        return format_html('<a class="deletelink" href="{}">删除</a>', url)
+    delete_link.short_description = '操作'
+    list_filter = ('branch', 'uploaded_at')
+    search_fields = ('branch__name',)
+    autocomplete_fields = ['branch']
+
+admin.site.register(Drawing, DrawingAdmin)
+
+class PublicScreenAdmin(ModelAdmin):
+    def delete_link(self, obj):
+        if obj.id:
+            delete_url = reverse('admin:huodong_publicscreen_delete', args=[obj.id])
+            return format_html('<a href="{}" class="text-red-600 hover:text-red-900">删除</a>', delete_url)
+        return '-'    
+    delete_link.short_description = '操作'
+    
+    def bulk_delete_selected(self, request, queryset):
+        count = queryset.count()
+        queryset.delete()
+        self.message_user(request, f'已成功删除{count}条公共电子屏记录')
+    bulk_delete_selected.short_description = '批量删除选中的公共电子屏'
+    
+    list_display = ('id', 'branch', 'screen_type', 'last_drill', 'delete_link')
+    list_filter = ['branch', 'screen_type']
+    autocomplete_fields = ['branch']
+    actions = ['bulk_delete_selected']
+
+admin.site.register(PublicScreen, PublicScreenAdmin)
+@admin.register(Contact)
+class ContactAdmin(ModelAdmin):
+    form = ContactAdminForm  # 指定自定义表单
+    list_display = ('branch', 'category', 'name', 'phone', 'email')  # 可选：显示分类字段
+
+    autocomplete_fields = ['branch']
+
+@admin.register(VideoTerminal)
+class VideoTerminalAdmin(ModelAdmin):
+    list_display = ('branch', 'terminal_type', 'description', 'created_at')
+    list_filter = ('terminal_type', 'branch')
+    search_fields = ('branch__name', 'description')
+    autocomplete_fields = ['branch']
+
+
+# 预算相关Admin配置
+
+# 设备预算内联
+class EquipmentBudgetInline(admin.TabularInline):
+    model = EquipmentBudget
+    extra = 1
+    fields = ('project', 'model', 'unit_price', 'procurement_method', 'quantity', 'subtotal')
+    readonly_fields = ('subtotal',)  # 小计自动计算，设为只读
+
+# 基础设施预算内联
+class InfrastructureBudgetInline(admin.TabularInline):
+    model = InfrastructureBudget
+    extra = 1
+    fields = ('name', 'remarks', 'unit_price', 'unit', 'quantity', 'subtotal', 'description')
+    readonly_fields = ('subtotal',)  # 小计自动计算，设为只读
+
+# 预算Admin
+@admin.register(Budget)
+class BudgetAdmin(ModelAdmin):
+    list_display = ('branch', 'name', 'total_budget', 'created_at')
+    list_filter = ('branch',)
+    search_fields = ('branch__name', 'name')
+    autocomplete_fields = ['branch']
+    readonly_fields = ('total_budget',)  # 总预算自动计算，设为只读
+    inlines = [EquipmentBudgetInline, InfrastructureBudgetInline]
+    
+    def save_model(self, request, obj, form, change):
+        super().save_model(request, obj, form, change)
+        # 保存后重新计算总预算
+        obj.update_total_budget()
+
+# 设备预算Admin（如果需要单独管理）
+@admin.register(EquipmentBudget)
+class EquipmentBudgetAdmin(ModelAdmin):
+    list_display = ('budget', 'project', 'model', 'unit_price', 'procurement_method', 'quantity', 'subtotal')
+    list_filter = ('budget__branch', 'project', 'procurement_method')
+    search_fields = ('budget__branch__name', 'project', 'model')
+    autocomplete_fields = ['budget']
+    readonly_fields = ('subtotal',)
+
+# 基础设施预算Admin（如果需要单独管理）
+@admin.register(InfrastructureBudget)
+class InfrastructureBudgetAdmin(ModelAdmin):
+    list_display = ('budget', 'name', 'unit_price', 'unit', 'quantity', 'subtotal')
+    list_filter = ('budget__branch', 'name')
+    search_fields = ('budget__branch__name', 'name', 'description')
+    autocomplete_fields = ['budget']
+    readonly_fields = ('subtotal',)
+
+
+# 预算模板相关Admin配置
+
+# 模板设备项内联
+class TemplateEquipmentItemInline(admin.TabularInline):
+    model = TemplateEquipmentItem
+    extra = 1
+
+# 模板基础设施项内联
+class TemplateInfrastructureItemInline(admin.TabularInline):
+    model = TemplateInfrastructureItem
+    extra = 1
+
+# 模板设备项Admin（如果需要单独管理）
+@admin.register(TemplateEquipmentItem)
+class TemplateEquipmentItemAdmin(ModelAdmin):
+    list_display = ('template', 'project', 'model', 'unit_price', 'procurement_method')
+    list_filter = ('template', 'project', 'procurement_method')
+    search_fields = ('template__name', 'project', 'model')
+    autocomplete_fields = ['template']
+
+# 模板基础设施项Admin（如果需要单独管理）
+@admin.register(TemplateInfrastructureItem)
+class TemplateInfrastructureItemAdmin(ModelAdmin):
+    list_display = ('template', 'name', 'unit_price', 'unit')
+    list_filter = ('template', 'unit')
+    search_fields = ('template__name', 'name', 'description')
+    autocomplete_fields = ['template']
+
+# 预算模板Admin
+@admin.register(BudgetTemplate)
+class BudgetTemplateAdmin(ModelAdmin):
+    list_display = ('name', 'description', 'is_default', 'created_at')
+    list_filter = ('is_default',)
+    search_fields = ('name', 'description')
+    inlines = [TemplateEquipmentItemInline, TemplateInfrastructureItemInline]
+    
+    def save_model(self, request, obj, form, change):
+        # 如果设置为默认模板，将其他模板的默认状态取消
+        if obj.is_default:
+            BudgetTemplate.objects.exclude(id=obj.id).update(is_default=False)
+        super().save_model(request, obj, form, change)
diff --git a/fzjgact/huodong/migrations/0030_budget_equipmentbudget_infrastructurebudget.py b/fzjgact/huodong/migrations/0030_budget_equipmentbudget_infrastructurebudget.py
new file mode 100644
index 0000000..7ea59f3
--- /dev/null
+++ b/fzjgact/huodong/migrations/0030_budget_equipmentbudget_infrastructurebudget.py
@@ -0,0 +1,64 @@
+# Generated by Django 5.0.6 on 2025-12-03 07:44
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('huodong', '0029_alter_activity_end_time_alter_activity_start_time_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Budget',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
+                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='更新时间')),
+                ('total_budget', models.DecimalField(decimal_places=2, default=0, max_digits=15, verbose_name='总预算')),
+                ('activity', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='huodong.activity', verbose_name='活动')),
+                ('branch', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='huodong.branch', verbose_name='分支机构')),
+            ],
+            options={
+                'verbose_name': '预算主表',
+                'verbose_name_plural': '预算主表',
+            },
+        ),
+        migrations.CreateModel(
+            name='EquipmentBudget',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('project', models.CharField(max_length=255, verbose_name='项目')),
+                ('model', models.CharField(max_length=255, verbose_name='型号')),
+                ('unit_price', models.DecimalField(decimal_places=2, max_digits=10, verbose_name='单价')),
+                ('procurement_method', models.CharField(choices=[('本地询价采购', '本地询价采购'), ('订单采购', '订单采购'), ('按照总部配置要求本地询价采购', '按照总部配置要求本地询价采购'), ('本地询价采购或订单采购', '本地询价采购或订单采购')], max_length=50, verbose_name='采购方式')),
+                ('quantity', models.IntegerField(default=1, verbose_name='数量')),
+                ('subtotal', models.DecimalField(decimal_places=2, default=0, max_digits=12, verbose_name='小计')),
+                ('budget', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='equipment_budgets', to='huodong.budget', verbose_name='预算主表')),
+            ],
+            options={
+                'verbose_name': '设备预算明细',
+                'verbose_name_plural': '设备预算明细',
+            },
+        ),
+        migrations.CreateModel(
+            name='InfrastructureBudget',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255, verbose_name='名称')),
+                ('remarks', models.TextField(blank=True, verbose_name='备注')),
+                ('unit_price', models.DecimalField(decimal_places=2, max_digits=10, verbose_name='单价')),
+                ('unit', models.CharField(max_length=20, verbose_name='单位')),
+                ('description', models.TextField(blank=True, verbose_name='说明')),
+                ('quantity', models.IntegerField(default=1, verbose_name='数量')),
+                ('subtotal', models.DecimalField(decimal_places=2, default=0, max_digits=12, verbose_name='小计')),
+                ('budget', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='infrastructure_budgets', to='huodong.budget', verbose_name='预算主表')),
+            ],
+            options={
+                'verbose_name': '基础设施预算明细',
+                'verbose_name_plural': '基础设施预算明细',
+            },
+        ),
+    ]
diff --git a/fzjgact/huodong/migrations/0031_budgettemplate_templateequipmentitem_and_more.py b/fzjgact/huodong/migrations/0031_budgettemplate_templateequipmentitem_and_more.py
new file mode 100644
index 0000000..1d438b0
--- /dev/null
+++ b/fzjgact/huodong/migrations/0031_budgettemplate_templateequipmentitem_and_more.py
@@ -0,0 +1,60 @@
+# Generated by Django 5.0.6 on 2025-12-03 08:16
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('huodong', '0030_budget_equipmentbudget_infrastructurebudget'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='BudgetTemplate',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255, verbose_name='模板名称')),
+                ('description', models.TextField(blank=True, verbose_name='模板描述')),
+                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
+                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='更新时间')),
+                ('is_default', models.BooleanField(default=False, verbose_name='是否默认模板')),
+            ],
+            options={
+                'verbose_name': '预算模板',
+                'verbose_name_plural': '预算模板',
+            },
+        ),
+        migrations.CreateModel(
+            name='TemplateEquipmentItem',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('project', models.CharField(max_length=255, verbose_name='项目')),
+                ('model', models.CharField(max_length=255, verbose_name='型号')),
+                ('unit_price', models.DecimalField(decimal_places=2, max_digits=10, verbose_name='参考单价')),
+                ('procurement_method', models.CharField(choices=[('本地询价采购', '本地询价采购'), ('订单采购', '订单采购'), ('按照总部配置要求本地询价采购', '按照总部配置要求本地询价采购'), ('本地询价采购或订单采购', '本地询价采购或订单采购')], max_length=50, verbose_name='采购方式')),
+                ('template', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='equipment_items', to='huodong.budgettemplate', verbose_name='模板')),
+            ],
+            options={
+                'verbose_name': '模板设备项',
+                'verbose_name_plural': '模板设备项',
+            },
+        ),
+        migrations.CreateModel(
+            name='TemplateInfrastructureItem',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255, verbose_name='名称')),
+                ('remarks', models.TextField(blank=True, verbose_name='备注')),
+                ('unit_price', models.DecimalField(decimal_places=2, max_digits=10, verbose_name='参考单价')),
+                ('unit', models.CharField(max_length=20, verbose_name='单位')),
+                ('description', models.TextField(blank=True, verbose_name='说明')),
+                ('template', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='infrastructure_items', to='huodong.budgettemplate', verbose_name='模板')),
+            ],
+            options={
+                'verbose_name': '模板基础设施项',
+                'verbose_name_plural': '模板基础设施项',
+            },
+        ),
+    ]
diff --git a/fzjgact/huodong/migrations/0032_remove_budget_activity_budget_name.py b/fzjgact/huodong/migrations/0032_remove_budget_activity_budget_name.py
new file mode 100644
index 0000000..e191601
--- /dev/null
+++ b/fzjgact/huodong/migrations/0032_remove_budget_activity_budget_name.py
@@ -0,0 +1,23 @@
+# Generated by Django 5.0.6 on 2025-12-03 09:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('huodong', '0031_budgettemplate_templateequipmentitem_and_more'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='budget',
+            name='activity',
+        ),
+        migrations.AddField(
+            model_name='budget',
+            name='name',
+            field=models.CharField(default=1, max_length=255, verbose_name='预算名称'),
+            preserve_default=False,
+        ),
+    ]
diff --git a/fzjgact/huodong/migrations/__pycache__/0030_budget_equipmentbudget_infrastructurebudget.cpython-311.pyc b/fzjgact/huodong/migrations/__pycache__/0030_budget_equipmentbudget_infrastructurebudget.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..46ca2887d012a2e2f968388efa308001e093c4cb
GIT binary patch
literal 4195
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
Y>oD1JOewkK)LdI1lZmHm%+eVC3q4@kB>(^b

literal 0
HcmV?d00001

diff --git a/fzjgact/huodong/migrations/__pycache__/0031_budgettemplate_templateequipmentitem_and_more.cpython-311.pyc b/fzjgact/huodong/migrations/__pycache__/0031_budgettemplate_templateequipmentitem_and_more.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..5b8c5a6f7700fc9c49f66bd899092eb385e157a9
GIT binary patch
literal 3643
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

literal 0
HcmV?d00001

diff --git a/fzjgact/huodong/migrations/__pycache__/0032_remove_budget_activity_budget_name.cpython-311.pyc b/fzjgact/huodong/migrations/__pycache__/0032_remove_budget_activity_budget_name.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..04c64efdd13df36f265b9ed2399a86d476ede710
GIT binary patch
literal 1050
zcmZuvO=uHA6rSBpHoKb?Y!rIvpA->uscpSUDTq*|Xb%b=mcX*@Otu^LC*5p<?WstR
zA_zT*MGz4WX{Gh&py1D0@K_;-Fjq}#Z(CX~Uh11kwjy<A_nY_Ty*K;q_hzG~M?)~a
z99^^vB0}Gp6OUxqIG6-u9btq82f2bSxS}o!NJQ5V7HbGgL?}veQ5~$UV^5cG;x@`9
z_gFY5Qq8rkzzl8QD^uC^F>%WCaV1+h8CVbQ0jwi}bO9q>#DXR0l88v67?XleV`)24
z2hv;cb_UOoV-GTtu#+k($2&4kVP#wWmn7D<)Aa<L18-+oqORf$5bvSt&6qLJPc2k@
z?0XiS7#q7ZZp>A%MZ%D{CC3bj5gTN&VwYUvg*NOMriTsJ4+xbz=~OZ2L%V8+OI#18
zf#I1hp$UdT1{mxK42}RQ+<j5oeZAgVd$_ytHYd>(CIz$NgdnDQ*Kmkug$p!OCBd9u
zCj6-BTp~zAH9w3d3pQ~uJyi-wnFLj0bn9nx8dVHlU>H<0fF-Ut1ni7qELKd1@nIe&
zCE{V?&D*3Lu-4M_E#mrBGR+TGu3*fqfayoos|#k(iD-U_bi4f$9Y7HM@&T@2&bMCG
ze|&uY^L?%T_(>iYP0#Z4t=0SOM{n9sKeeCL+V4KM9&F|d%S8*+%6DbY|GhnVXuyOK
za2nk{7_qLg&-jm)mI8JmI54BU46t%MBN?ePLL`Z2<dqwdhScFzt)UDx`-Ypn{ZUd<
zwS5F|$RJXXI>5sHJlxmJj;x(;WJfl~Kb-zLwUgDqW%Wi@Zw`(`YLXQK95RT~>8!jm
z!)7oTlbOvWsM`7UQ9Q?W<pOr-4zM(yI|SBmWwO(pso*TQ?0S^%07Q}?2=EI+ZU<dB
Z`9yNBAV=sVtZ9u?=k{6P@IO)h-9L{1C$Rtk

literal 0
HcmV?d00001

diff --git a/fzjgact/huodong/models.py b/fzjgact/huodong/models.py
index afbec58..cc496ac 100644
--- a/fzjgact/huodong/models.py
+++ b/fzjgact/huodong/models.py
@@ -1,182 +1,327 @@
-from django.db import models
-from django.utils import timezone
-
-
-class Branch(models.Model):
-    CATEGORY_CHOICES = (
-        ('A型', 'A型'),
-        ('B型', 'B型'),
-        ('C型', 'C型'),
-        ('不适用', '不适用'),
-    )
-    name = models.CharField(max_length=255, unique=True, verbose_name='分支机构名称')
-    location = models.CharField(max_length=255, verbose_name='所在省份')
-    contact_info = models.CharField(max_length=255, verbose_name='主要联系人')
-    description = models.TextField(blank=True, verbose_name='备注')
-    background_color = models.CharField(max_length=7, default='#EFF6FF', verbose_name='背景色',
-                                        help_text='使用#RRGGBB格式的颜色代码')
-    category = models.CharField(max_length=10, choices=CATEGORY_CHOICES, default='C型', verbose_name='分类')
-    is_mature = models.BooleanField(default=False, verbose_name='是否成熟')
-    
-
-    def __str__(self):
-        return f'{self.name} 💼' if self.is_mature else self.name
-
-    class Meta:
-        verbose_name = '分支机构'
-        verbose_name_plural = '分支机构（基础信息）'
-
-
-class Contact(models.Model):
-    branch = models.ForeignKey(Branch, on_delete=models.CASCADE, verbose_name='分支机构')
-    CATEGORY_CHOICES = [
-        ('机房/设备间巡检人', '机房/设备间巡检人'),
-        ('信息安全联系人', '信息安全联系人'),
-        ('兼岗', '兼岗'),
-        ('安全员', '安全员')
-        # 可以添加更多类别
-    ]
-    # 修改为支持多选的 CharField
-    category = models.CharField(
-        max_length=255,  # 增大长度（原50可能不足）
-        choices=CATEGORY_CHOICES,
-        verbose_name='联系人分类',
-        help_text='按住 Ctrl/Command 键多选（值将以逗号分隔存储）'
-    )
-    name = models.CharField(max_length=255, verbose_name='姓名')
-    phone = models.CharField(max_length=20, verbose_name='电话')
-    email = models.EmailField(blank=True, verbose_name='邮箱，可不填')
-    description = models.TextField(blank=True, verbose_name='描述，可不填')
-
-    def __str__(self):
-        return self.name
-
-    class Meta:
-        verbose_name = '联系人群'
-        verbose_name_plural = '联系人群'
-
-
-class Activity(models.Model):
-    branch = models.ForeignKey(Branch, on_delete=models.CASCADE, verbose_name='分支机构')
-    name = models.CharField(max_length=255, verbose_name='活动名称')
-    scope = models.CharField(max_length=255, choices=(
-        ('新建', '新建'),
-        ('搬迁', '搬迁'),
-        ('原址装修', '原址装修'),
-        ('撤销', '撤销'),
-		('其他技术问题', '其他技术问题')
-		
-    ), verbose_name='活动类型')
-    start_time = models.DateField(verbose_name='开始日期')
-    end_time = models.DateField(blank=True, null=True, verbose_name='结束日期')  # 可以为空，表示活动尚未结束
-    location = models.CharField(max_length=255, verbose_name='所在地点')
-    description = models.TextField(verbose_name='其它内容')
-
-    def __str__(self):
-        return self.name
-
-    class Meta:
-        verbose_name = '运营活动内容'
-        verbose_name_plural = '运营活动内容（新建搬迁装修和技术）'
-
-
-class EquipmentImage(models.Model):
-    branch = models.ForeignKey(Branch, related_name='equipment_images', on_delete=models.CASCADE)
-    image = models.ImageField(upload_to='equipment_room_images/')
-    uploaded_at = models.DateTimeField(auto_now_add=True)
-
-    def __str__(self):
-        return f"设备间图片 {self.id} - {self.branch.name}"
-        
-    class Meta:
-        verbose_name = '设备间图'
-        verbose_name_plural = '设备间图'
-
-
-# 图纸的类
-class Drawing(models.Model):
-    branch = models.ForeignKey(Branch, related_name='drawings', on_delete=models.CASCADE)
-    image = models.ImageField(upload_to='drawings/')
-    uploaded_at = models.DateTimeField(auto_now_add=True)
-
-    def __str__(self):
-        return f"图纸 {self.id} - {self.branch.name}"
-        
-    class Meta:
-        verbose_name = '图纸'
-        verbose_name_plural = '图纸'
-
-
-# 公共电子屏
-class PublicScreen(models.Model):
-    SCREEN_TYPES = (
-        ('marquee', '跑马灯'),
-        ('advertisement', '广告屏'),
-        ('information', '信息发布屏'),
-    )
-    branch = models.ForeignKey(Branch, on_delete=models.CASCADE, related_name='public_screens')
-    image = models.ImageField(upload_to='public_screen_images/', null=True, blank=True)
-    screen_type = models.CharField(max_length=20, choices=SCREEN_TYPES, verbose_name='功能类型', null=True, blank=True)
-    description = models.TextField(blank=True, null=True, verbose_name='功能描述')
-    last_drill = models.ForeignKey('Event', on_delete=models.SET_NULL, blank=True, null=True, related_name='public_screens', verbose_name='最后演练事件')
-    created_at = models.DateTimeField(default=timezone.now)
-    updated_at = models.DateTimeField(auto_now=True)
-
-    def __str__(self):
-        return f'{self.branch.name} - {self.get_screen_type_display()} {self.id}'
-    
-    class Meta:
-        verbose_name = '公共电子屏'
-        verbose_name_plural = '公共电子屏'
-
-
-class Event(models.Model):
-    branches = models.ManyToManyField(Branch, related_name='events', verbose_name='分支机构')
-    name = models.CharField(max_length=255, verbose_name='事件名称')
-    start_time = models.DateField(verbose_name='开始时间')
-    end_time = models.DateField(blank=True, null=True, verbose_name='结束时间')  # 可以为空，表示活动尚未结束
-    description = models.TextField(verbose_name='事件描述')
-
-    def __str__(self):
-        return self.name
-
-    class Meta:
-        verbose_name = '运营事件'
-        verbose_name_plural = '运营事件（其它）'
-
-
-class VideoTerminal(models.Model):
-    TERMINAL_TYPES = (
-        ('polycom', '宝利通终端'),
-        ('zte', '中兴终端'),
-        ('logitech', '罗技摄像头'),
-        ('laptop_tv', '笔记本加电视'),
-        ('laptop_projector', '笔记本加投影仪'),
-        ('other', '其它'),
-    )
-    branch = models.ForeignKey(Branch, on_delete=models.CASCADE, related_name='video_terminals', verbose_name='分支机构')
-    terminal_type = models.CharField(max_length=20, choices=TERMINAL_TYPES, verbose_name='设备类型')
-    description = models.TextField(blank=True, verbose_name='设备描述')
-    created_at = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
-    updated_at = models.DateTimeField(auto_now=True, verbose_name='更新时间')
-
-    def __str__(self):
-        return f"{self.branch.name} - {self.get_terminal_type_display()}"
-
-    class Meta:
-        verbose_name = '视频设备终端'
-        verbose_name_plural = '视频设备终端'
-
-
-class Evaluation(models.Model):
-    activity = models.ForeignKey(Activity, on_delete=models.CASCADE)
-    branch = models.ForeignKey(Branch, on_delete=models.CASCADE)
-    score = models.DecimalField(max_digits=4, decimal_places=2)
-    comment = models.TextField()
-    file_path = models.CharField(max_length=255, blank=True, null=True)
-    status = models.CharField(max_length=20,
-                              choices=(('pending', '待审核'), ('approved', '已通过'), ('rejected', '已拒绝')),
-                              default='pending')
-
-    def __str__(self):
-        return f"{self.activity.name} - {self.branch.name}"
+from django.db import models
+from django.utils import timezone
+
+
+class Branch(models.Model):
+    CATEGORY_CHOICES = (
+        ('A型', 'A型'),
+        ('B型', 'B型'),
+        ('C型', 'C型'),
+        ('不适用', '不适用'),
+    )
+    name = models.CharField(max_length=255, unique=True, verbose_name='分支机构名称')
+    location = models.CharField(max_length=255, verbose_name='所在省份')
+    contact_info = models.CharField(max_length=255, verbose_name='主要联系人')
+    description = models.TextField(blank=True, verbose_name='备注')
+    background_color = models.CharField(max_length=7, default='#EFF6FF', verbose_name='背景色',
+                                        help_text='使用#RRGGBB格式的颜色代码')
+    category = models.CharField(max_length=10, choices=CATEGORY_CHOICES, default='C型', verbose_name='分类')
+    is_mature = models.BooleanField(default=False, verbose_name='是否成熟')
+    
+
+    def __str__(self):
+        return f'{self.name} 💼' if self.is_mature else self.name
+
+    class Meta:
+        verbose_name = '分支机构'
+        verbose_name_plural = '分支机构（基础信息）'
+
+
+class Contact(models.Model):
+    branch = models.ForeignKey(Branch, on_delete=models.CASCADE, verbose_name='分支机构')
+    CATEGORY_CHOICES = [
+        ('机房/设备间巡检人', '机房/设备间巡检人'),
+        ('信息安全联系人', '信息安全联系人'),
+        ('兼岗', '兼岗'),
+        ('安全员', '安全员')
+        # 可以添加更多类别
+    ]
+    # 修改为支持多选的 CharField
+    category = models.CharField(
+        max_length=255,  # 增大长度（原50可能不足）
+        choices=CATEGORY_CHOICES,
+        verbose_name='联系人分类',
+        help_text='按住 Ctrl/Command 键多选（值将以逗号分隔存储）'
+    )
+    name = models.CharField(max_length=255, verbose_name='姓名')
+    phone = models.CharField(max_length=20, verbose_name='电话')
+    email = models.EmailField(blank=True, verbose_name='邮箱，可不填')
+    description = models.TextField(blank=True, verbose_name='描述，可不填')
+
+    def __str__(self):
+        return self.name
+
+    class Meta:
+        verbose_name = '联系人群'
+        verbose_name_plural = '联系人群'
+
+
+class Activity(models.Model):
+    branch = models.ForeignKey(Branch, on_delete=models.CASCADE, verbose_name='分支机构')
+    name = models.CharField(max_length=255, verbose_name='活动名称')
+    scope = models.CharField(max_length=255, choices=(
+        ('新建', '新建'),
+        ('搬迁', '搬迁'),
+        ('原址装修', '原址装修'),
+        ('撤销', '撤销'),
+		('其他技术问题', '其他技术问题')
+		
+    ), verbose_name='活动类型')
+    start_time = models.DateField(verbose_name='开始日期')
+    end_time = models.DateField(blank=True, null=True, verbose_name='结束日期')  # 可以为空，表示活动尚未结束
+    location = models.CharField(max_length=255, verbose_name='所在地点')
+    description = models.TextField(verbose_name='其它内容')
+
+    def __str__(self):
+        return self.name
+
+    class Meta:
+        verbose_name = '运营活动内容'
+        verbose_name_plural = '运营活动内容（新建搬迁装修和技术）'
+
+
+class EquipmentImage(models.Model):
+    branch = models.ForeignKey(Branch, related_name='equipment_images', on_delete=models.CASCADE)
+    image = models.ImageField(upload_to='equipment_room_images/')
+    uploaded_at = models.DateTimeField(auto_now_add=True)
+
+    def __str__(self):
+        return f"设备间图片 {self.id} - {self.branch.name}"
+        
+    class Meta:
+        verbose_name = '设备间图'
+        verbose_name_plural = '设备间图'
+
+
+# 图纸的类
+class Drawing(models.Model):
+    branch = models.ForeignKey(Branch, related_name='drawings', on_delete=models.CASCADE)
+    image = models.ImageField(upload_to='drawings/')
+    uploaded_at = models.DateTimeField(auto_now_add=True)
+
+    def __str__(self):
+        return f"图纸 {self.id} - {self.branch.name}"
+        
+    class Meta:
+        verbose_name = '图纸'
+        verbose_name_plural = '图纸'
+
+
+# 公共电子屏
+class PublicScreen(models.Model):
+    SCREEN_TYPES = (
+        ('marquee', '跑马灯'),
+        ('advertisement', '广告屏'),
+        ('information', '信息发布屏'),
+    )
+    branch = models.ForeignKey(Branch, on_delete=models.CASCADE, related_name='public_screens')
+    image = models.ImageField(upload_to='public_screen_images/', null=True, blank=True)
+    screen_type = models.CharField(max_length=20, choices=SCREEN_TYPES, verbose_name='功能类型', null=True, blank=True)
+    description = models.TextField(blank=True, null=True, verbose_name='功能描述')
+    last_drill = models.ForeignKey('Event', on_delete=models.SET_NULL, blank=True, null=True, related_name='public_screens', verbose_name='最后演练事件')
+    created_at = models.DateTimeField(default=timezone.now)
+    updated_at = models.DateTimeField(auto_now=True)
+
+    def __str__(self):
+        return f'{self.branch.name} - {self.get_screen_type_display()} {self.id}'
+    
+    class Meta:
+        verbose_name = '公共电子屏'
+        verbose_name_plural = '公共电子屏'
+
+
+class Event(models.Model):
+    branches = models.ManyToManyField(Branch, related_name='events', verbose_name='分支机构')
+    name = models.CharField(max_length=255, verbose_name='事件名称')
+    start_time = models.DateField(verbose_name='开始时间')
+    end_time = models.DateField(blank=True, null=True, verbose_name='结束时间')  # 可以为空，表示活动尚未结束
+    description = models.TextField(verbose_name='事件描述')
+
+    def __str__(self):
+        return self.name
+
+    class Meta:
+        verbose_name = '运营事件'
+        verbose_name_plural = '运营事件（其它）'
+
+
+class VideoTerminal(models.Model):
+    TERMINAL_TYPES = (
+        ('polycom', '宝利通终端'),
+        ('zte', '中兴终端'),
+        ('logitech', '罗技摄像头'),
+        ('laptop_tv', '笔记本加电视'),
+        ('laptop_projector', '笔记本加投影仪'),
+        ('other', '其它'),
+    )
+    branch = models.ForeignKey(Branch, on_delete=models.CASCADE, related_name='video_terminals', verbose_name='分支机构')
+    terminal_type = models.CharField(max_length=20, choices=TERMINAL_TYPES, verbose_name='设备类型')
+    description = models.TextField(blank=True, verbose_name='设备描述')
+    created_at = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    updated_at = models.DateTimeField(auto_now=True, verbose_name='更新时间')
+
+    def __str__(self):
+        return f"{self.branch.name} - {self.get_terminal_type_display()}"
+
+    class Meta:
+        verbose_name = '视频设备终端'
+        verbose_name_plural = '视频设备终端'
+
+
+class Evaluation(models.Model):
+    activity = models.ForeignKey(Activity, on_delete=models.CASCADE)
+    branch = models.ForeignKey(Branch, on_delete=models.CASCADE)
+    score = models.DecimalField(max_digits=4, decimal_places=2)
+    comment = models.TextField()
+    file_path = models.CharField(max_length=255, blank=True, null=True)
+    status = models.CharField(max_length=20,
+                              choices=(('pending', '待审核'), ('approved', '已通过'), ('rejected', '已拒绝')),
+                              default='pending')
+
+    def __str__(self):
+        return f"{self.activity.name} - {self.branch.name}"
+
+
+# 预算相关模型
+class Budget(models.Model):
+    """预算主表"""
+    branch = models.ForeignKey(Branch, on_delete=models.CASCADE, verbose_name='分支机构')
+    name = models.CharField(max_length=255, verbose_name='预算名称')
+    created_at = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    updated_at = models.DateTimeField(auto_now=True, verbose_name='更新时间')
+    total_budget = models.DecimalField(max_digits=15, decimal_places=2, default=0, verbose_name='总预算')
+
+    def __str__(self):
+        return f"{self.branch.name} - {self.name} 预算"
+
+    class Meta:
+        verbose_name = '预算主表'
+        verbose_name_plural = '预算主表'
+
+
+class EquipmentBudget(models.Model):
+    """设备预算明细"""
+    BUDGET_TYPES = (
+        ('本地询价采购', '本地询价采购'),
+        ('订单采购', '订单采购'),
+        ('按照总部配置要求本地询价采购', '按照总部配置要求本地询价采购'),
+        ('本地询价采购或订单采购', '本地询价采购或订单采购')
+    )
+    budget = models.ForeignKey(Budget, related_name='equipment_budgets', on_delete=models.CASCADE, verbose_name='预算主表')
+    project = models.CharField(max_length=255, verbose_name='项目')
+    model = models.CharField(max_length=255, verbose_name='型号')
+    unit_price = models.DecimalField(max_digits=10, decimal_places=2, verbose_name='单价')
+    procurement_method = models.CharField(max_length=50, choices=BUDGET_TYPES, verbose_name='采购方式')
+    quantity = models.IntegerField(default=1, verbose_name='数量')
+    subtotal = models.DecimalField(max_digits=12, decimal_places=2, default=0, verbose_name='小计')
+
+    def save(self, *args, **kwargs):
+        self.subtotal = self.unit_price * self.quantity
+        super().save(*args, **kwargs)
+        # 更新预算主表的总预算
+        self.update_total_budget()
+
+    def delete(self, *args, **kwargs):
+        super().delete(*args, **kwargs)
+        # 更新预算主表的总预算
+        self.update_total_budget()
+
+    def update_total_budget(self):
+        """更新预算主表的总预算"""
+        total = self.budget.equipment_budgets.aggregate(total=models.Sum('subtotal'))['total'] or 0
+        total += self.budget.infrastructure_budgets.aggregate(total=models.Sum('subtotal'))['total'] or 0
+        self.budget.total_budget = total
+        self.budget.save()
+
+    def __str__(self):
+        return f"{self.project} - {self.model}"
+
+    class Meta:
+        verbose_name = '设备预算明细'
+        verbose_name_plural = '设备预算明细'
+
+
+class InfrastructureBudget(models.Model):
+    """基础设施预算明细"""
+    budget = models.ForeignKey(Budget, related_name='infrastructure_budgets', on_delete=models.CASCADE, verbose_name='预算主表')
+    name = models.CharField(max_length=255, verbose_name='名称')
+    remarks = models.TextField(blank=True, verbose_name='备注')
+    unit_price = models.DecimalField(max_digits=10, decimal_places=2, verbose_name='单价')
+    unit = models.CharField(max_length=20, verbose_name='单位')
+    description = models.TextField(blank=True, verbose_name='说明')
+    quantity = models.IntegerField(default=1, verbose_name='数量')
+    subtotal = models.DecimalField(max_digits=12, decimal_places=2, default=0, verbose_name='小计')
+
+    def save(self, *args, **kwargs):
+        self.subtotal = self.unit_price * self.quantity
+        super().save(*args, **kwargs)
+        # 更新预算主表的总预算
+        self.update_total_budget()
+
+    def delete(self, *args, **kwargs):
+        super().delete(*args, **kwargs)
+        # 更新预算主表的总预算
+        self.update_total_budget()
+
+    def update_total_budget(self):
+        """更新预算主表的总预算"""
+        total = self.budget.equipment_budgets.aggregate(total=models.Sum('subtotal'))['total'] or 0
+        total += self.budget.infrastructure_budgets.aggregate(total=models.Sum('subtotal'))['total'] or 0
+        self.budget.total_budget = total
+        self.budget.save()
+
+    def __str__(self):
+        return self.name
+
+    class Meta:
+        verbose_name = '基础设施预算明细'
+        verbose_name_plural = '基础设施预算明细'
+
+
+class BudgetTemplate(models.Model):
+    """预算模板"""
+    name = models.CharField(max_length=255, verbose_name='模板名称')
+    description = models.TextField(blank=True, verbose_name='模板描述')
+    created_at = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
+    updated_at = models.DateTimeField(auto_now=True, verbose_name='更新时间')
+    is_default = models.BooleanField(default=False, verbose_name='是否默认模板')
+    
+    def __str__(self):
+        return self.name
+    
+    class Meta:
+        verbose_name = '预算模板'
+        verbose_name_plural = '预算模板'
+
+
+class TemplateEquipmentItem(models.Model):
+    """模板设备项"""
+    template = models.ForeignKey(BudgetTemplate, related_name='equipment_items', on_delete=models.CASCADE, verbose_name='模板')
+    project = models.CharField(max_length=255, verbose_name='项目')
+    model = models.CharField(max_length=255, verbose_name='型号')
+    unit_price = models.DecimalField(max_digits=10, decimal_places=2, verbose_name='参考单价')
+    procurement_method = models.CharField(max_length=50, choices=EquipmentBudget.BUDGET_TYPES, verbose_name='采购方式')
+    
+    def __str__(self):
+        return f"{self.project} - {self.model}"
+    
+    class Meta:
+        verbose_name = '模板设备项'
+        verbose_name_plural = '模板设备项'
+
+
+class TemplateInfrastructureItem(models.Model):
+    """模板基础设施项"""
+    template = models.ForeignKey(BudgetTemplate, related_name='infrastructure_items', on_delete=models.CASCADE, verbose_name='模板')
+    name = models.CharField(max_length=255, verbose_name='名称')
+    remarks = models.TextField(blank=True, verbose_name='备注')
+    unit_price = models.DecimalField(max_digits=10, decimal_places=2, verbose_name='参考单价')
+    unit = models.CharField(max_length=20, verbose_name='单位')
+    description = models.TextField(blank=True, verbose_name='说明')
+    
+    def __str__(self):
+        return self.name
+    
+    class Meta:
+        verbose_name = '模板基础设施项'
+        verbose_name_plural = '模板基础设施项'
diff --git a/fzjgact/huodong/templates/branch_detail.html b/fzjgact/huodong/templates/branch_detail.html
index 2dc67c9..a0d0007 100644
--- a/fzjgact/huodong/templates/branch_detail.html
+++ b/fzjgact/huodong/templates/branch_detail.html
@@ -11,6 +11,125 @@
     <span class="flex-grow block border-t border-black" aria-hidden="true" role="presentation"></span>
 </h2>
 <!-- Component ends here -->
+
+<!-- 投入预算表 -->
+<div class="bg-white rounded-lg shadow-md p-4 mb-6">
+    <h2 class="text-2xl font-bold mb-4">投入预算表</h2>
+    <p class="text-gray-700 mb-4">分支机构项目的预算表，包括设备和基础设施明细</p>
+    
+    <!-- 预算模板导入功能 -->
+    {% if budget_templates %}  <!-- 只有当有模板时才显示导入功能 -->
+    <div class="mb-6 p-4 bg-blue-50 rounded-lg">
+        <h3 class="text-lg font-semibold mb-2">预算模板导入</h3>
+        <p class="text-sm text-gray-600 mb-3">从模板一键导入预算，快速生成预算表</p>
+        
+        <form method="POST" action="{% url 'import-budget-template' branch.id %}">
+            {% csrf_token %}
+            <div class="grid grid-cols-1 md:grid-cols-3 gap-4">
+                <div>
+                    <label for="template" class="block text-sm font-medium text-gray-700 mb-1">选择模板</label>
+                    <select id="template" name="template" class="w-full p-2 border border-gray-300 rounded-md">
+                        {% for template in budget_templates %}
+                            <option value="{{ template.id }}">{{ template.name }}{% if template.is_default %} (默认){% endif %}</option>
+                        {% endfor %}
+                    </select>
+                </div>
+                <div>
+                    <label for="budget_name" class="block text-sm font-medium text-gray-700 mb-1">预算名称</label>
+                    <input type="text" id="budget_name" name="budget_name" placeholder="请输入预算名称" class="w-full p-2 border border-gray-300 rounded-md">
+                </div>
+                <div class="flex items-end">
+                    <button type="submit" class="bg-blue-500 hover:bg-blue-600 text-white px-4 py-2 rounded-md">
+                        一键导入
+                    </button>
+                </div>
+            </div>
+        </form>
+    </div>
+    {% endif %}
+    
+    {% if budgets %}
+        {% for budget in budgets %}
+        <div class="mb-6">
+            <h3 class="text-lg font-semibold mb-3">{{ budget.activity.name }} - 总预算: ￥{{ budget.total_budget }}</h3>
+            
+            <!-- 设备预算部分 -->
+            <div class="mb-4">
+                <h4 class="text-md font-semibold mb-2">设备预算明细</h4>
+                {% if budget.equipment_budgets.all %}
+                <div class="overflow-x-auto">
+                    <table class="min-w-full divide-y divide-gray-200">
+                        <thead class="bg-gray-50">
+                            <tr>
+                                <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">项目</th>
+                                <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">型号</th>
+                                <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">单价</th>
+                                <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">采购方式</th>
+                                <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">数量</th>
+                                <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">小计</th>
+                            </tr>
+                        </thead>
+                        <tbody class="bg-white divide-y divide-gray-200">
+                            {% for equipment in budget.equipment_budgets.all %}
+                                <tr>
+                                    <td class="px-6 py-4 whitespace-nowrap">{{ equipment.project }}</td>
+                                    <td class="px-6 py-4 whitespace-nowrap">{{ equipment.model }}</td>
+                                    <td class="px-6 py-4 whitespace-nowrap">￥{{ equipment.unit_price }}</td>
+                                    <td class="px-6 py-4 whitespace-nowrap">{{ equipment.get_procurement_method_display }}</td>
+                                    <td class="px-6 py-4 whitespace-nowrap">{{ equipment.quantity }}</td>
+                                    <td class="px-6 py-4 whitespace-nowrap">￥{{ equipment.subtotal }}</td>
+                                </tr>
+                            {% endfor %}
+                        </tbody>
+                    </table>
+                </div>
+                {% else %}
+                <p class="text-gray-500 italic">暂无设备预算明细</p>
+                {% endif %}
+            </div>
+            
+            <!-- 基础设施预算部分 -->
+            <div>
+                <h4 class="text-md font-semibold mb-2">基础设施预算明细</h4>
+                {% if budget.infrastructure_budgets.all %}
+                <div class="overflow-x-auto">
+                    <table class="min-w-full divide-y divide-gray-200">
+                        <thead class="bg-gray-50">
+                            <tr>
+                                <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">名称</th>
+                                <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">备注</th>
+                                <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">单价</th>
+                                <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">单位</th>
+                                <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">数量</th>
+                                <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">小计</th>
+                                <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">说明</th>
+                            </tr>
+                        </thead>
+                        <tbody class="bg-white divide-y divide-gray-200">
+                            {% for infrastructure in budget.infrastructure_budgets.all %}
+                                <tr>
+                                    <td class="px-6 py-4 whitespace-nowrap">{{ infrastructure.name }}</td>
+                                    <td class="px-6 py-4 whitespace-nowrap">{{ infrastructure.remarks }}</td>
+                                    <td class="px-6 py-4 whitespace-nowrap">￥{{ infrastructure.unit_price }}</td>
+                                    <td class="px-6 py-4 whitespace-nowrap">{{ infrastructure.unit }}</td>
+                                    <td class="px-6 py-4 whitespace-nowrap">{{ infrastructure.quantity }}</td>
+                                    <td class="px-6 py-4 whitespace-nowrap">￥{{ infrastructure.subtotal }}</td>
+                                    <td class="px-6 py-4 whitespace-nowrap">{{ infrastructure.description }}</td>
+                                </tr>
+                            {% endfor %}
+                        </tbody>
+                    </table>
+                </div>
+                {% else %}
+                <p class="text-gray-500 italic">暂无基础设施预算明细</p>
+                {% endif %}
+            </div>
+        </div>
+        {% endfor %}
+    {% else %}
+    <p class="text-gray-500 italic">暂无预算信息</p>
+    {% endif %}
+</div>
 <div class="bg-white rounded-lg shadow-md p-4 mb-6">
     <h2 class="text-2xl font-bold mb-4">基本信息</h2>
     <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
diff --git a/fzjgact/huodong/urls.py b/fzjgact/huodong/urls.py
index 37f4164..9cdced3 100644
--- a/fzjgact/huodong/urls.py
+++ b/fzjgact/huodong/urls.py
@@ -1,22 +1,23 @@
-from django.urls import path, include
-from rest_framework.routers import DefaultRouter
-from . import views
-
-router = DefaultRouter()
-router.register(r'branches', views.BranchViewSet, basename='branches')
-router.register(r'activities', views.ActivityViewSet, basename='activities')
-router.register(r'evaluations', views.EvaluationViewSet, basename='evaluations')
-
-urlpatterns = [
-    path('api/', include(router.urls)),
-    path('', views.BranchAll, name='branch-all'),
-    path('branch/<int:branch_id>/', views.branch_detail, name='branch-detail'),
-    path('branch/info/', views.Branchinfo, name='branchinfo'),
-    path('statistics/', views.Statistics, name='statistics'),
-    path('contact/', views.contact_list, name='contact-list'),
-    path('equipment-images/', views.equipment_images, name='equipment-images'),
-    path('public-screens/', views.public_screens, name='public-screens'),
-    path('video-terminals/', views.video_terminal_list, name='video-terminals'),
-    path('export/xls/', views.export_branches_xls, name='export-branches-xls'),
-    path('export/pdf/', views.export_branches_pdf, name='export-branches-pdf'),
+from django.urls import path, include
+from rest_framework.routers import DefaultRouter
+from . import views
+
+router = DefaultRouter()
+router.register(r'branches', views.BranchViewSet, basename='branches')
+router.register(r'activities', views.ActivityViewSet, basename='activities')
+router.register(r'evaluations', views.EvaluationViewSet, basename='evaluations')
+
+urlpatterns = [
+    path('api/', include(router.urls)),
+    path('', views.BranchAll, name='branch-all'),
+    path('branch/<int:branch_id>/', views.branch_detail, name='branch-detail'),
+    path('branch/<int:branch_id>/import-budget/', views.import_budget_template, name='import-budget-template'),
+    path('branch/info/', views.Branchinfo, name='branchinfo'),
+    path('statistics/', views.Statistics, name='statistics'),
+    path('contact/', views.contact_list, name='contact-list'),
+    path('equipment-images/', views.equipment_images, name='equipment-images'),
+    path('public-screens/', views.public_screens, name='public-screens'),
+    path('video-terminals/', views.video_terminal_list, name='video-terminals'),
+    path('export/xls/', views.export_branches_xls, name='export-branches-xls'),
+    path('export/pdf/', views.export_branches_pdf, name='export-branches-pdf'),
 ]
\ No newline at end of file
diff --git a/fzjgact/huodong/views.py b/fzjgact/huodong/views.py
index acd232a..dd7f4d0 100644
--- a/fzjgact/huodong/views.py
+++ b/fzjgact/huodong/views.py
@@ -1,5 +1,5 @@
 from rest_framework import viewsets
-from .models import Branch, Activity, Evaluation, Event, VideoTerminal
+from .models import Branch, Activity, Evaluation, Event, VideoTerminal, Budget, EquipmentBudget, InfrastructureBudget, BudgetTemplate, TemplateEquipmentItem, TemplateInfrastructureItem
 from .serializers import BranchSerializer, ActivitySerializer, EvaluationSerializer
 from django.shortcuts import render, redirect
 from .models import PublicScreen
@@ -55,6 +55,12 @@ def branch_detail(request, branch_id):
     equipment_images = branch.equipment_images.all()
     public_screens = branch.public_screens.all()
     
+    # 获取预算数据
+    budgets = Budget.objects.filter(branch=branch).select_related('activity').prefetch_related('equipment_budgets', 'infrastructure_budgets').order_by('-created_at')
+    
+    # 获取预算模板
+    budget_templates = BudgetTemplate.objects.all()
+    
     # 准备上下文数据
     context = {
         'branch': branch,
@@ -62,10 +68,62 @@ def branch_detail(request, branch_id):
         'events': events,
         'equipment_images': equipment_images,
         'public_screens': public_screens,
+        'budgets': budgets,
+        'activities': activities,
+        'budget_templates': budget_templates,
     }
     return render(request, 'branch_detail.html', context)
 
 
+def import_budget_template(request, branch_id):
+    """从模板导入预算"""
+    if request.method == 'POST':
+        template_id = request.POST.get('template')
+        budget_name = request.POST.get('budget_name', '导入预算')
+        
+        if template_id:
+            try:
+                # 获取模板和分支机构
+                template = BudgetTemplate.objects.get(pk=template_id)
+                branch = Branch.objects.get(pk=branch_id)
+                
+                # 创建预算
+                budget = Budget.objects.create(
+                    branch=branch,
+                    name=budget_name
+                )
+                
+                # 导入设备预算项
+                for equipment_item in template.equipment_items.all():
+                    EquipmentBudget.objects.create(
+                        budget=budget,
+                        project=equipment_item.project,
+                        model=equipment_item.model,
+                        unit_price=equipment_item.unit_price,
+                        procurement_method=equipment_item.procurement_method,
+                        quantity=1  # 默认数量为1
+                    )
+                
+                # 导入基础设施预算项
+                for infrastructure_item in template.infrastructure_items.all():
+                    InfrastructureBudget.objects.create(
+                        budget=budget,
+                        name=infrastructure_item.name,
+                        remarks=infrastructure_item.remarks,
+                        unit_price=infrastructure_item.unit_price,
+                        unit=infrastructure_item.unit,
+                        description=infrastructure_item.description,
+                        quantity=1  # 默认数量为1
+                    )
+                
+                # 更新总预算
+                budget.update_total_budget()
+            except Exception as e:
+                print(f"导入预算模板失败: {e}")
+    
+    return redirect('branch-detail', branch_id=branch_id)
+
+
 # 在页面上显示所有的branch以及active的数量，首页显示
 def BranchAll(request):
     branches = Branch.objects.exclude(activity__isnull=True).order_by('name')
@@ -442,3 +500,100 @@ def video_terminal_list(request):
         'selected_type_name': selected_type_name,
     }
     return render(request, 'video_terminals.html', context)
+
+
+# 预算相关视图
+
+def create_budget(request, branch_id):
+    branch = Branch.objects.get(pk=branch_id)
+    activities = Activity.objects.filter(branch=branch)
+    
+    if request.method == 'POST':
+        activity_id = request.POST.get('activity')
+        if activity_id:
+            activity = Activity.objects.get(pk=activity_id)
+            budget = Budget.objects.create(branch=branch, activity=activity)
+            return redirect('budget_detail', branch_id=branch_id, budget_id=budget.id)
+    
+    context = {
+        'branch': branch,
+        'activities': activities,
+    }
+    return render(request, 'create_budget.html', context)
+
+
+def budget_detail(request, branch_id, budget_id):
+    branch = Branch.objects.get(pk=branch_id)
+    budget = Budget.objects.get(pk=budget_id, branch=branch)
+    
+    context = {
+        'branch': branch,
+        'budget': budget,
+    }
+    return render(request, 'budget_detail.html', context)
+
+
+def add_equipment_budget(request, branch_id, budget_id):
+    branch = Branch.objects.get(pk=branch_id)
+    budget = Budget.objects.get(pk=budget_id, branch=branch)
+    
+    if request.method == 'POST':
+        project = request.POST.get('project')
+        model = request.POST.get('model')
+        unit_price = request.POST.get('unit_price')
+        procurement_method = request.POST.get('procurement_method')
+        quantity = request.POST.get('quantity', 1)
+        
+        if project and model and unit_price and procurement_method:
+            EquipmentBudget.objects.create(
+                budget=budget,
+                project=project,
+                model=model,
+                unit_price=unit_price,
+                procurement_method=procurement_method,
+                quantity=quantity
+            )
+    
+    return redirect('budget_detail', branch_id=branch_id, budget_id=budget_id)
+
+
+def add_infrastructure_budget(request, branch_id, budget_id):
+    branch = Branch.objects.get(pk=branch_id)
+    budget = Budget.objects.get(pk=budget_id, branch=branch)
+    
+    if request.method == 'POST':
+        name = request.POST.get('name')
+        remarks = request.POST.get('remarks')
+        unit_price = request.POST.get('unit_price')
+        unit = request.POST.get('unit')
+        description = request.POST.get('description')
+        quantity = request.POST.get('quantity', 1)
+        
+        if name and unit_price and unit:
+            InfrastructureBudget.objects.create(
+                budget=budget,
+                name=name,
+                remarks=remarks,
+                unit_price=unit_price,
+                unit=unit,
+                description=description,
+                quantity=quantity
+            )
+    
+    return redirect('budget_detail', branch_id=branch_id, budget_id=budget_id)
+
+
+def delete_equipment_budget(request, branch_id, budget_id, equipment_budget_id):
+    branch = Branch.objects.get(pk=branch_id)
+    budget = Budget.objects.get(pk=budget_id, branch=branch)
+    equipment_budget = EquipmentBudget.objects.get(pk=equipment_budget_id, budget=budget)
+    equipment_budget.delete()
+    return redirect('budget_detail', branch_id=branch_id, budget_id=budget_id)
+
+
+def delete_infrastructure_budget(request, branch_id, budget_id, infrastructure_budget_id):
+    branch = Branch.objects.get(pk=branch_id)
+    budget = Budget.objects.get(pk=budget_id, branch=branch)
+    infrastructure_budget = InfrastructureBudget.objects.get(pk=infrastructure_budget_id, budget=budget)
+    infrastructure_budget.delete()
+    return redirect('budget_detail', branch_id=branch_id, budget_id=budget_id)