From 4de383ea58b68eff77c57a7e8e342ae56b7b6a69 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Tue, 10 Feb 2026 13:35:41 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E7=A6=85=E9=81=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 1 - .env.dev | 3 +- index.html | 30 ++--- public/favicon.ico | Bin 4286 -> 152126 bytes src/api/admin/dept.ts | 7 +- src/api/integrated/adRecord.ts | 40 ++++++ src/views/act/act-cancel/index.vue | 55 +++----- src/views/act/cancel-item/index.vue | 30 ++--- src/views/ad/record/index.vue | 117 ++++++++++++++++++ src/views/admin/system/user/index.vue | 13 ++ src/views/login/index.vue | 27 ++-- src/views/wallet/wallet-active/index.vue | 89 ++++--------- .../wallet-recharge-invoice/print-dialog.vue | 87 ++++--------- 13 files changed, 279 insertions(+), 220 deletions(-) create mode 100755 src/api/integrated/adRecord.ts create mode 100755 src/views/ad/record/index.vue diff --git a/.env b/.env index 6f13cd86..e27eea0a 100644 --- a/.env +++ b/.env @@ -1,5 +1,4 @@ # 网站主标题 -#VITE_GLOBAL_TITLE= '浦江县机关事务智慧后勤一体化平台' VITE_GLOBAL_TITLE= '智慧后勤一体化平台' # footer diff --git a/.env.dev b/.env.dev index 8c08ab94..35f5f738 100644 --- a/.env.dev +++ b/.env.dev @@ -8,7 +8,8 @@ VITE_OPEN = true ENV = 'dev' # ADMIN 服务地址 -VITE_ADMIN_PROXY_PATH = https://www.zianxin.com +# VITE_ADMIN_PROXY_PATH = https://www.zianxin.com +VITE_ADMIN_PROXY_PATH = https://rj4jv5rwqs.by.takin.cc # 图片访问基础地址 VITE_IMAGE_BASE_PATH = https://www.zianxin.com/api diff --git a/index.html b/index.html index 4421d6d8..89d20b10 100644 --- a/index.html +++ b/index.html @@ -1,35 +1,29 @@
- - + + - - + + - - + + - - - + + + - + - + -{yUNXZ;<~s2mXsKy7{Yo3>;4G`=xZ?e;Uh?%5qpSe1r|t zXG%W6R16qMd)Ak~Rd#{cXwrYN4Uqrt)Ol{yMIn8YxQ4xywz1tOBfY)&W5U9Z!QC@L z>3!jTFK6njR{p=x%Ku$Ey4L@;2M`xqSQ z-{Rw|F!c@Eb+idRX^#m1MckF}S$q!TbB-ZT)it4{>>>jD9EML2b$y`Nf5LsyMSM@2 zCMYn5YxES@Qu5!QIfq=RpIk)$lZ(!t>8uAH-IFkE ;pu%3)hLUUD8$G zJAGyj4uqY={(UE~hklnm>?e2ctX8sXXBBqtC})lY8Gqew^C>*wKidlNGxWa`@pm%C z;*Dvvcdd5&U+PbCPkqL b(o@Tb| zR&l4D;o)t;E3~WDZOEms=Lor l26Zqa(OJ|GetUI`h8~{>*LB zp8w>&!T%9m^M4!b)vo`$=KtI8k^hZd+dl^X#m-eWm%)FIjXZrt|93O~vrg{Q&OG06 z4L@%yrT#t)Pu79dhti+KT5NnN`?v{72&Ye`k@;*4k=! }%Xmu0Us4|t z5w+wi^&$1YEBUX+05T3B|6OP=O`T?K$A8I *8nRV?-`+wThOqD~T zJuhi{@xH~yXYtvm 1bn&DR{}B)2zuo?irSE{}5pyMS zz6W)dTP)swH-~lJ75`hXj`qJZ^}ieW@2dJ7_B*tHoarAh`z2vRH{-wHMVcymrKYA4 zYnea5%R7cTh (#)$<1r#q>>u(&_)kn+I2KZ3 zBL9iy8&j>YI_Up9ckW|ZDE0pUEAKD%vGAX5kw?XU??f#8G)ws{44<8pqrUz+KK?X^ zI#T)wjs>L8Apbqce~(uFuU+$i|58qAqcJfj5g2%w_M4R=b_~bBJofBGo4#i(b4*y! zrTs(9tk!cFGcKKW51)@VkBAG$zb@4OZsh;;saeR)I@eDB+wu9G^V&BN6;+L4!(-K0 z*qhJjEn^$e?HuQObNucj<9hM=(&kZikNCYf_VMDlC?te-&j%KqJaN(PgnvMNbqjg6 zqvXFIpUsuN7*|i0iM)5C{o_hLx|*!ye{z@O-)%eW`rn22zZ-ck;==Qt$^Txgvw7ry z HrIo!=wj2dTUOwcjZo@&N5+FCNFDmiFZtSO>z zQ25_!Gb!H+`OmuO-6u)qp*8fsDkJX~7k3K5A%|)A&|lY)|MY(j8%F-qw(II;v7X21 zv6 L0_+Eb|0a&p zq(5|{%^A#`Qeg+Hak=Sco1J6St8wg_|F$;%i~S?~pGy6oWI1lvk>sP~aLvo3U;P#O z0_h9!CU?Eq2E0^1z_#EceuM `~+exXAyqrH0PTNI7TG*$s=X|x7tm@ z|2} v z(%_-d*s>*$KFI6FV{|&U=RfO>Hou9wU+I7H- biVfmj>pz-D5Gu5`9S3tBp$SZl>UDP_%9k;{06sJFFSXXP(M)rnmPB!XAwWA zt2g@qj?G-C8^%qFWh_oT{pk;4K^!Z=;D1CE?H~F`?D}8$&vr!VlK;Gb@IvB8LYL=Y z(0~NyndMv&`(JO`F*4>;B07-ste%|rF>_8icwj2}4^Kz%0J|Sl<|x|npJf;QzmfcJ zX|?~2vL+^;MnC4(cXAVZOnh46yQfHB;2cl;B#Hd5Hh$iAlyb(!pTp3R8MF)JnK%b% z2z?!H^o`A$o{fTs@t;=``|ZNT8{Frj7(pRc_|WDt)8`=K-Nt>6VPqUnaZ~jW$9dp1 z=D|DDg 93vI~rSBB`NBA!`kno@LBclJ`aM1q_=N+%Pgr)QY z4ep!BJmQSYVBPz$4-)Ye-v|AmKC}m99@R{{*lr)^a2|l-Cv$c5e;T?|_)q`m#&rdq z_-`Tq`}dFI_)Ny* Q@u__2!Hm6y`se|1!>%qv!|Wzr-yGhJ6RKzYXA6w=4d8%Q!wm+3@b{e>Z+vqVi*? zSUJawI=r{*f8l@hL-{{qxZVCS=6~Dk|5(~ThX2Rlzs&K)Vdk6+jyswcv-}s| hvdKiUF5YW_#s zz~k~i|FQTl?ZAnBfz06!A8x~rF8D8VI8g^rqwgTL8S2Ka_&=NcFQ#9rtCzw5i;O?p z`maLzmlKII$Gm^Qe~B@fJT(ci2{nwfb@ceOzsq02f9dDMw?F;O3{*0fP@ciD&d;8` zuI7JTsUM$d{ e!Do+9#rGshv (Gdrus%xq?*AHEsQ_6rX*Vhv`#NF=>1X#=Vq+ z;X_j}a6k&}8;OJASka$zLn=n2bq+wr080O}?`3Y}7TUMczKxgC{{!Oa59D)EZ@alu zXUX`GHjIqXhYU-`R_?nZ=Qy4xamf3_PB5;B_95?K^2$)6+JV>_^smgFmCJov9>RZK zPv+lbj&=fbIr;>Oe}uY*ZP^$Dhz(@;vE1p)a%Df`Oka+~NPN6F6DR8Iu|>wSI39)n z%Ky`<|E13r8%TUWu6#CE+Giu!wk7_-G5$@)zuT4lPyNrh5%C*|NFV1SK7EfwOeFp` z#te7Fq^|A?eGnz&zJ=oliHo7lMiKoWeZN0r;x=zC>sIq$f|>CgZAbZxA{=aDEb}hr z(;Ua~sEPg`d%OcV%rT|2r-d 7S!GCL_ z-T&iwuH0YBquK$ldyVySmiw>N9BXDy=0+41HZrz=dktk@ phU-app!1%CS760IPAL0K1^52#GcOx%M!V!w{Q*n;lFVKSbx%ZsJl^Q;F z(Yn_d*Zi-atEsmoX2fovh>fD!0XgPQ{?D6}i^{S~j<;)jFV9xbe)Ibuj?n)~{}0DA z%9d;8zmKE;r?nlJ#GVizvKRMI8l8ZxKbNR=8w#toE8E`~{P$P>AM&^p{}VBSwp}fA zTMPfCJn~ZUKjgnVeM~Z6Dd#C^<-ZH-aS(lCUw?h1o&QfxKU#W`>-CPnP2$Mt%a!;O zB~ot2hXn-3 daQ9Zk^3eVj2ecKt7NA_li)K1BHcI`zM$3;r9( z$o$s1hO5XwQm5jArB9O2Bz{LkV%Oy}Sr7B}d->F(2LJ6b8_IV=+pQlt{^QnsHCJX_ zTaH%C8SZt#`5M->8|zy5Z{j%C?klIi#hZGPadrFXZ 20W $2nR+TIJ+Hrq)|oJj7|r)#D?r+lCs&-haOMA#pQDEm&@ znCMeAhh^p1KOS$)OyOD}`#9L(uWyHSsu$X~nvlg}n?fibJX|KqaWpbP$c z(B2fCt@;erZ%{9&xd7Vn0i4^LnTqVZvuZt#+)MUp-L o6%y78nhopA6Ym*wqRij zHhfWnh(jlddjrb2pW<=O0iUS5j?(gG+9GxIMbdXd{(I8~@@DLwmk-+jIU^h%FgTX` zik7SV=8ks|{tq4`^OZKm5qIit;fcvhY#Kf%^_Fj75+=TuhM%_A;9yKWcI~TUc}g&F zsNBo$pO^S3PqqP1wgFFX+FTs(f5 !j-e2yKvgf+~`?n^(T#PN6&S2M@; zK7Og>d Cais!hmzq#bwBJBbMD7mvmClU-%I6rJFRpuzt@+Dazc ztL|)*>Y4a#ivL{aFp}fnnq!wc@&6a{z?1xUB_?icH%bJH)_NCvGKBGX?|+!fy|zzr z&C6NFj54-+c0T-jQy (-Y6$QjSPQ|7N z1=}DJ7@SPuk$t@M^X5SM;$`k#>X%~Fg)932SFghu%KfqSMcCuJjW!Tv@Sp9(#P%Y3 z$Ugrl_Wz^#FFH-?XZ7kMw2h D{wEt;4 z%UmhB?=3N6ivQHboJSb>QVdE;>ec+3Blbz;{}A%u)Q b%K8yvCc^L9g;zT8;)s;SoK_e28 zka(h#A6oIhw2}1~tzx<)Zc$=ERNIz*j{F}*`@bvxiyrhM|0Qn1t^@4%mGfmjR5;*8 z--Gy|2M$Z&+M-OZ`=B3!Ym(I3402!M^HdBO$1P$nxOm1eRy>A2gNim=%Mq8S`Th*| z?^zLALZ2P`Vq)t =R9_3pe^D{6Y>fHa4-{ zcuM#`exmqDg#YqeyM66Odt1dnykVgYBKp7M%f1dZ`cN%%{Zj|~(LdtHu^+|Lm*XqO z{kr*Z4H;uWC0@opX3XZXm5V;)qQw93dHe!mF?XIt&FzWL(D5bwAKH%p 4MW@*}P?xxK z-#qFCGk udB=1u-fy}Gl` zr0vML(yqOUwe(RPF%ev3ysqY}89yv~z#f0a@vka#6h2y*%rSXA`>FPI;8-6| -J)CQ0 z{OWf<6)}eKI&BL(yM+G|{}9M{Mh~_tv0GIfiPRa(=+67TG_q^{? fx z^?SAfPxe#28AmvfJ}-ZzBU^bvOr$*+ZK93))FEO!xv;MZ?z5k^bP>nvj6dvV{J+S! zr44I@|Mam7|M{#+*yjDocVCJR {(piygo=@!)>smH14Z`Ao0J(Qc_B zf9-4XjkYHDw(*&!O|fvV)MyI%Pk*|%M;s+q^#}dQlkGnjsu*d-Wu7Bk7JtN+FY_^E zAoT#A|aa#C4>f!wN;kd-kfA#_7go=x2 zT;!s~dHCsvQVa@-Wxa4-Qek4R0~Mzt{e;+#GR_b@Sk_)nVOX&;9W}= Axc3;ly}EXWFFB7MMBzV L2{kQpQ zzb4s-n-C~nDPt*-(=5x9&odFs_2q88xL(^OhHacj53X@H@5eju#iO9GUd312^*`6n z1cy;q#ZVI1R+)o<{jlKg?jA$_({7^ubD#GzUdsO2Q9;``T>ZwxHA+fM(HP8l>s`Al zP|v&)k=*Nb@>uryEQ1{rUf*4W_Ygj~GDd)03JN@gja (>Eq2VZvw&HZdZY1YrUbf-wxj9(9 zs)*&NMqciD6{jd%=;|eUsD}Q@AAcyunpFkdgS`MNmla_7;#}HYdGv{$#yyrn@F_cb zk#$~!jhx?kZ%!5_jk9qd$wcn8CvgtxJhzZ*e`;v+Tx1N{?M}}l_rG-MDt`It2v#l2 z#HyvaSh*w*p^I{{^wTU#2KMegijyZVE4# v;}Yw+4t3M!Jgnrit)zZixw43LP|UF&k9^i|8FzH?!nJn( z81aMW=by#;bzFPH-z*nAC`*@ckK><@qKbQPN;zb$M^<`0e%V^VXDGnz>8Y5&_Aq8- zJSL2{a39VL&Nmh_=SD4`sY&_PJL&_+XM9@krA#vZ5g*!l`s&V|ZDDMaU1a~}Q{rQ+ zy}~)zX6lM2?(2LRRrEcIREktwX4`I5BKxMFt#7vXalEeZUwr0ub FIDIKOg Oh4W1r)ey)1=$$2c~wrk sGgVJg*OydY4_RxZ@E|Ty*2|28u44UXrkz1T> +PNu_&Eb3RzEZ|oK8h<$f?FVAAg!^&iQ|3^nT-?6Ub_tFL=w_F3)3rL=-%$y5K zO4)8289!}sRL* fe6F7U;dd~~CP#T0e?R<;KmJCp zAs8ECTvOG9d@f@LjycQ8 k zt|Z)-y~EQo>hSr}Le3ZG;C0HvMTOYITuH~M;~&*u8Q0OrKZk&D`qZh*Sj&0NfB=pu z>8Et3FVUTINpAGt`*J_u^ C>WLSJp8) zao)hMZ!C3CD(zDlD?FZ_fBsPX-#xMDpNMer|H%A4^O?|RY|nK@zdYBln*8E1=G8dt zk7P_Zf2&_l4gukREypS|W{Tg3K3x-i@m!niCTqXw!*lV9 xtP9_^?iV5}3;}lKDpqR6lH-r;q=81O)p+<{l0V45u%b z^N!3* +!hebNbLE^v{~@tzzW^Ci>(`S 5b7d^Q6A5t0T z9=a$CGpE=vd0di`X|E+=>0-{6GOk6|yX)7JL%{F@iEmlvOLj7+dMM`%=gr8#)Je&h zH8q8Ek2%a=bi7^c+mkDSzS08(>^{&s&TA%HYH>KCT8YhC3-JxfIuOxS9bfX9qjdaU z|J@k@124z90I`E4F7yoNqVlrqVPmXx7UMHcab8U3w)N}jARu!C#=ovgAmcaLN2Y;$ zD##qN)T4eq8Uf+I%>6c9;l548%!t2}&*i1?cF-%2zMB5_sURSAMY(nR4i3gwVB>cg zh_h9zx_m0-d4_H(JTEJ&NBF^F#3fZRN8i=9KJ*!SjOV+kt^9B19#(Td=AJA;KVsnu zn~Gn4zJdAUrx*Tzv-JpqhV91WIngLA?s{$TA74rT;%OlubtrPVsReI-XvGWuKVxBN zvdYKxw954C-1m2U$^EbW266xQS@9?=V(#_Uf6vY{Jl`cX_}_S${9nKv ;K28DaqZvf%&DpgTpapx)tSRUFTkZoNMXd zJRJlK`{yFpIL)2Ue2IQL$^VQF_Kz{Dvmc*MNxR=&WsYPW^YnQHhS~XFenI;`yI(au zvPA9p|2}iw`0m1IOVibQMv2psIel4oC-Y+xGp%xRw)%{WbJdZ4kLTrOJhx!7W@7>O z1mCatU%|D=#&^#P7SH-~8ucam|1I+0*?SlFk3WP>U*vKhic; zilCNd{!biw~lMKFW@5cXGv_G#J?D8u-n>* zx{FLTx3(MO?`IG=;~DO=UtGODpSkh&bAKo+Dz*N97Hd;6@h0Qql9Frj^|#CsvLXW? zaxUPlISH7;eV0Zu*HZ{{ YsetS-Jzj z59NP_wtu=q{rs6S$eL7HzuLfkiEEfExtM&-$vVwFr%&PV!5Zw|QHGzsFUD6J@)5cu z6AM2`#oKd|F?m89Mh-iO{(TOpd{Tjad(b=h0CU_%v2DcQwMhwhllv9C%X~SXGFR2A z6?xnjpb$TBKk5Sqs#U(4 Ut)??~`GQo&$Y*iCk^*dFzNrHTj^QwKIa#fzke*SGBZUp9Wd5Q$#@EYUppth` za$U&ST>LOfClfW*cR2PXsz3Q_;8f#Z+CT2Jf0X}I^Z%~_x|?0q=>Hv$!ol0Lp{_LF zU|z4Qst+llPEU$Ij =~2M zU+dq!xBh+iL%`tC!;YdaCHK%(t}{48e^TKQ+E-kcvv*f1zS@+_Jcw!d@O>-yF^$8- z@f>##4QKw@aIUEhN1u=g1P4SgFLgL`z=ktFZy5hRz~4k+(u7#dnPp|)lZmb0mtf!C za{8@mkeOM>J%TRa#K~s0m(xY=ecIG?i*4h!${i=U(j@1j-M`z~hqU$=jy9I#dq>n2 z|LOlUk^hs~hm|w0q<(1x9tVN0+K94V*pK{5|IwA^o6G}w2}c=InGjozpMPZk!JNhm z-mx+l=s}Da6o$SWll!{whL`Iec)RXne&+*x&-Lf7` BZ%rD4XYjH6( z>_f`%9rLcQT$X`3Gvo2f*h3gPARGa{Y!_??W{SV}evUoZZkVIFpV(K7+Z;B8 ^*DKKLLROP8f%%h&nX!#*U*R?9YW7N_biqltE%*iuq9qb+FuYbO6y2spNjj_-wo zG9H(C2Ju;4W$s O4|YPBW+bagNc;v1JqUH-DOn`RoT? zn|K(bhJ|5J-+ky4un$2Tmj|*x=^ebE_EseK0^|2DMPoe2C{tde4{MGUAAFR8B^;xF z^-U4>9;ieD*H^!@fVsu|4k-JltW4|wzlsm~x(^WO*d8ACx7hX4e_UtZ(a88d=`$qP zbV-rjca>z3Jk~Xc*k8pQ=cQ`Di%`aXeEeZ5_diNtuJuFQt00nNkNw %CoW3=2|o?e$jBk=eLDE7AbM(tyfyPS)=e(jFh2SD lGRFoH;T72W;}NV~ zmw|2D3%IX=>^-dc|M+O@Up@;6wDliGyRgr)DPO z77ABcKt`2xtT} z0vZ90fJQ(gpb^jrXaqC@8Uc-fMnEH=5zq)|1T+E~0gZr0KqH_L& zSuG0Pq!tMw0%x_zZ=)*43*zpiirxZofovWit{YX+ZaRV9^~IdihQg?Io7J%^eM|Oz zzg3ek4mecXe&eMR>DMJxa<6`ryCz}HQkg(AKi{YG$9&&j>pX8xC-ZO*>0>fCkH@{C zu(iFAXAte&T;2nl{O$7P@=#m#-I|e+RmUi h(>?Hj7g_6L;MUueXY_yjIB-o4jyC5<45`N?onIH-J zqB*(Sp2Cm&PK8lx8Q+WqaN~w^YW3mjbinOeCJRa1QoQSjy>(~CVy|(-qrYBq$T%G+ zFDGzwt)qo{`+7%+sx!y`tlZ%{Czsc?pun#-{L;~{VyZKy+KU5fbvXJ)V7EJ~Vm!_^ z6^%)%J3Y|!|GF1mIzrh^#b)5-5Paxetq9{IHv(9E^x-lc=6co_M)`MXyGO+Tal#;; zr)D=rRHm7N_fH}!)6KSBNYc9&u_H(24maR)i>1LCh-11TY^Gl#3ohJWmpwsH@rz!2 zOqp`!Tz~C2D#N$J-<#_SBL%8E)g}p-PY&9{;$ti3(@KTV3wgjTm4#%kQiMqi;alhV zaPGwke)Dp9{jnWnY`{YZd^_4uFbcVs$!sA{Qos0*&1cUP{>!FU*x_K#*vA& zr!3KDk`afZwdZ##v0sXq%YQ2HYqZMsdX9X)@2CiOWP1WiQ?1bx?!7I(&Y{K9AX+X9 z`4l~@iP=O?=>gsooVf$%yp38bSa*J>O-xm$v6p5KoxY(mMLs0VhF?Q{K#sI|Urd^Y zn$?;A&k;FA;CU*}c@J^E8(5a=8eD$J2K{^{^k4EWB$>b9s^8WMc__i355d6^`0)2Y z9}xd%sCyUKd2Rmboa*U&PG4lLBD@2f(c_-4R)(LcdU$;_a#OcN@3>MfB*epVku=Z) z`zq0A|Izt@oX$RcHGgbKx#9ZL8TGlikM;9$=m8SeU)C2!I)8m?Ej4$w>6REA{Ynnd zv1?Le7j@he Rgk?l)bNpUZR>`>FBkB_nDtKcN_5ASIC79 zbYMD_-@h_+`5Qe)S7%c3-ODDc72%$+`4G~+OeRS6&?L@?u0H<3jYqf58ai4=^GlN_ z;EdBz$La91dv2chBk=B<*{CoHuS|O*EJKS#HJOyvs4!b|K4LxUsd0ABHugU6SS$-F z!@DC3oc!h>4XlB#ll2grg6%C>>sr!QH;VP-cX6S9DC@f17=8E~^tMEseBVD&&)ukN z-M2|MaBrfHlD#hM{tn+bM()M&?*e*|4VDw)mQoYm#iY;C@8=^9-fqS5eu9caww{{A zi8)Q0_mb 9%jU;$b##nNv&F%rPh*A-AO{M q5H=f;P|L(LOsEyAW_5DSlbX3c3pLkA_!OZL92aKFL8%vmDgOl_F#U-D diff --git a/src/api/admin/dept.ts b/src/api/admin/dept.ts index e170e8ab..36535024 100644 --- a/src/api/admin/dept.ts +++ b/src/api/admin/dept.ts @@ -1,8 +1,13 @@ import request from "/@/utils/request" +/** + * TODO 有/admin/dept/tree方法 + * v1会查询所有的部门(没有权限的部门会上锁) + * v2只会查询当前用户有权限的部门 + */ export const deptTree = (params?: Object) => { return request({ - url: "/admin/dept/tree", + url: "/admin/dept/tree/v2", method: "get", params, }) diff --git a/src/api/integrated/adRecord.ts b/src/api/integrated/adRecord.ts new file mode 100755 index 00000000..1f7fd304 --- /dev/null +++ b/src/api/integrated/adRecord.ts @@ -0,0 +1,40 @@ +import request from "/@/utils/request" + +export function fetchList(query?: Object) { + return request({ + url: "/integrated/ad-record/page", + method: "get", + params: query, + }) +} + +export function addObj(obj?: Object) { + return request({ + url: "/integrated/ad-record", + method: "post", + data: obj, + }) +} + +export function getObj(id?: string) { + return request({ + url: "/integrated/ad-record/" + id, + method: "get", + }) +} + +export function delObjs(ids?: Object) { + return request({ + url: "/integrated/ad-record", + method: "delete", + data: ids, + }) +} + +export function putObj(obj?: Object) { + return request({ + url: "/integrated/ad-record", + method: "put", + data: obj, + }) +} diff --git a/src/views/act/act-cancel/index.vue b/src/views/act/act-cancel/index.vue index 2d296bd0..e4073e5b 100644 --- a/src/views/act/act-cancel/index.vue +++ b/src/views/act/act-cancel/index.vue @@ -24,38 +24,22 @@ - -+ 新 增 -+ 删除 -+ + - @@ -68,14 +52,8 @@ - + @@ -95,14 +73,17 @@ - + 编辑 -删除 +删除 + diff --git a/src/views/act/cancel-item/index.vue b/src/views/act/cancel-item/index.vue index 678ca588..cc76a180 100644 --- a/src/views/act/cancel-item/index.vue +++ b/src/views/act/cancel-item/index.vue @@ -22,15 +22,9 @@ - + - @@ -47,21 +41,15 @@ - 编辑 -删除 +编辑 +删除 + diff --git a/src/views/ad/record/index.vue b/src/views/ad/record/index.vue new file mode 100755 index 00000000..e4c04ad1 --- /dev/null +++ b/src/views/ad/record/index.vue @@ -0,0 +1,117 @@ + + ++ + + \ No newline at end of file diff --git a/src/views/admin/system/user/index.vue b/src/views/admin/system/user/index.vue index 9d3b6e0a..6e117895 100644 --- a/src/views/admin/system/user/index.vue +++ b/src/views/admin/system/user/index.vue @@ -74,6 +74,19 @@ inactive-value="9"> ++++ ++ ++ ++ + ++ + ++ + ++ {{ $t("common.queryBtn") }} + ++ {{ $t("common.resetBtn") }} + ++ ++ +++ + ++ + + ++ ++ ++ ++ + + + ++ + + + + + + + + ++ ++ + 注销时间:{{ row.closeAccountApplyTime }} ++未注销+diff --git a/src/views/login/index.vue b/src/views/login/index.vue index b000d9e1..1e00e78b 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -3,26 +3,22 @@ - +-+
+ alt="Login illustration" />
-{{ getThemeConfig.globalTitle }}
+{{ + getThemeConfig.globalTitle }}
@@ -32,9 +28,12 @@ - - - + + + diff --git a/src/views/wallet/wallet-active/index.vue b/src/views/wallet/wallet-active/index.vue index a4ffa7b2..91e2aded 100644 --- a/src/views/wallet/wallet-active/index.vue +++ b/src/views/wallet/wallet-active/index.vue @@ -7,7 +7,8 @@ - + @@ -29,38 +30,22 @@ - -+ 开 卡 -+ 删除 -+ + - @@ -74,47 +59,21 @@ - 重新激活 -绑定用户 -取消绑定 -编辑 -删除 +重新激活 +绑定用户 +取消绑定 +编辑 +删除 + diff --git a/src/views/wallet/wallet-recharge-invoice/print-dialog.vue b/src/views/wallet/wallet-recharge-invoice/print-dialog.vue index c920facb..a65358eb 100644 --- a/src/views/wallet/wallet-recharge-invoice/print-dialog.vue +++ b/src/views/wallet/wallet-recharge-invoice/print-dialog.vue @@ -1,12 +1,14 @@ - -浦江县行政事业单位食堂统一收款收据++智慧后勤一体化平台一收款收据- {{ formatDate(new Date(receiptData.time), "YYYY年 mm月 dd日") || " 年 月 日".replace(/ /g, " ") }} + {{ formatDate(new Date(receiptData.time), "YYYY年 mm月 dd日") || " 年 月 日".replace(/ /g, " ") + }}No. @@ -19,13 +21,9 @@交款单位(或个人) - + @@ -62,14 +60,10 @@ @@ -99,48 +90,20 @@收款单位
(盖章)- + oncontextmenu="return false" src="/@/assets/receiptStamp.png" />
开票人
(签名)@@ -79,11 +73,8 @@ 备注: - +关闭 -+ 作废 -申请审批 -保存 -打印 -重新生成发票 +申请审批 +保存 +打印 +重新生成发票