From 818ec31a2648636f4429de2d27b66fd2a4024097 Mon Sep 17 00:00:00 2001
From: zhangdi <15053473693@163.com>
Date: Tue, 31 Dec 2024 11:37:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/favicon.png                            | Bin 11327 -> 6207 bytes
 src/api/common.js                             |  11 ++
 src/assets/json/status.json                   |  10 +-
 src/components/order/workOrderDialog.vue      |  35 +++--
 src/router/axios.js                           |   2 +-
 src/store/getters.js                          |   1 -
 src/store/modules/common.js                   |   2 -
 src/store/modules/user.js                     |  33 ++---
 .../businessManagement/inspection/repair.vue  |  31 +---
 .../businessManagement/inspection/task.vue    | 139 +++++++++++-------
 src/views/businessManagement/ordinary.vue     | 126 ++++++++++------
 src/views/device/deviceSystem.vue             |   5 +
 src/views/goodsManagement/goodsList.vue       |  36 ++---
 src/views/goodsManagement/warehouseList.vue   |   8 +-
 .../labManagement/inspectionManagement.vue    |   9 ++
 src/views/largeScreen/supervisory.vue         |   1 +
 src/views/operation/hand.vue                  |  55 +++----
 17 files changed, 290 insertions(+), 214 deletions(-)

diff --git a/public/favicon.png b/public/favicon.png
index ecd70ca12883e395ca480f789a8ee26a81bd623b..cdc4a2f7f111d1d4974c4aaca9f187e8a70bce2e 100644
GIT binary patch
literal 6207
zcmV-F7{KR=P)<h;3K|Lk000e1NJLTq003kF003kN1^@s6aN?Cz00009a7bBm001r{
z001r{0eGc9b^rhhO=&|zP*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)cUY767Czti
zWe-+D*zmEJY=HnGBdiF>5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1<Rh~l6qxMx9%
zh+2zPTsZC@+^4mDdhhM+``7!t=bY#K&Uw!dfDsZVk>;Xm069{HJUZAPk55R%$-RIA
z6-eL&AQ0xu!e<4=008g<d3b(wus{3(uWtYX0C3eVBofEr|AV?vCRYF;kpSQ#66Xs6
zkWv81E>y@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e
zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5
z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7}
z<RYAxn<EoQ=L1a63;+Nc`O(4tI6si*=H%h#X6J10^u?n7Yw&L(J|Xen{=AF=1OO0D
z&+pn_<>l4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf
zVxhe-<BLB3GvROGi+=X}Kpy_vdhh^onn0PYz@vlxaba$Du2PQY%LGC(ZujRS{>O!X
z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4
ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR
z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#<bWIsp%|7y8C1YJ*aWq(0~(+a
zn&A+%!7(@u=im}tf$MM=24EPT!Wg`U2?RmN2oqr;I*1Wsj@Tm32p5@-1R`NbG?IX%
zAnAw{Q6k02a-;&OLTZs+NF(wsauhj@TtNDe+sGg?iu{VaM=_LvvQY!n0(C&Ss2>`N
z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd
zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS=
zB9o|3v?Y2H`NVi)I<b&gMyw|8As!)~C0-{E6JL`^Bo4`v<W349C6F>n3rTB8+ej^>
zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv
zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&G<BLK&6^fO%cL!%)zF%0XKD9nFX?o;
z3EhJpMVHW*(rf4k>F4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^
zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN
zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS
zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^#<Ae=IoX^_&LPeX&U-BbEk7->
z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ib<gTP(_`y-
z=?V49^$zLX(MR=d^rQ6`>hIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyE<W%V@fh
z#Au_@NuwvYChmu4<285}K4z?M9Ad0A-euftJYiyKGTWrYq{ZaEDb18?nr6Duw9|CV
z%*ZU<tk|r{?2b9roNJz8zS+Fn{EdaBMV!S-i#ChLmfDtl%LSHAmiMffRz6mFR`pib
ztVz~f>n!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>><a9f>;~;Q
z_F?uV_HFjh9n2gO9o9Q^JA86<b<B2baJ=iJ;WWdk#HqvSS7#e%p>v({H5aB!kjoO6
zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a
zam?eLr<<q3^N{B+UUpttUi-ZsPqUmRp4KpJ$lJtQ;JwRxU^+fMW%|zP13tz+0-t)H
zhrXu1BHul}BYxI?nSKZSp8Grc%l(h|zu|fE7V%C6U;)7a<pI5c8iBI|YXctynFOT=
zH3f|Yy9O@|J{3X?2@P2va+7bs7xEkVV>8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT
zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^H<bj`5GFjJZ48
zYPNEAXRK;$Qfy=Fo4A0us<?r8hxkSDmlAXnBnj<_<iyy-J&EIU0_SX+Go0j_RF-sO
zuI1dKxfkZ?&dZ*6JXtkakbF3Wm=c$=KjniULQpRlPvxg>O&t^Rgqwv=MZThqqEWH8
zxJo>d=ABlR_Bh=;eM9<ahEGOy#xn^|QY(3p8Irjp^G#Mn*50ho*>Tw|Ih34~oTE|=
zX_mAr*D$vzw@+p(E0Yc6dFE}(8<U61_v9n_bMxC3Y=unGqqI`4P!1MMFQ_YcTNqn-
zxJbQ7TGTV&X8!8=BMX8Se7%scP`I$O*tmFE@!%rAMY|Rwi&GbOE-_tFx@351@X~$D
zXv?ye{ZQgqQdRP5dED}jQiIZ^r9&%%S2UHWl*!9(uJl^DV-;bQWL58Km(^QVe<~N1
zU#xJfsIK_1M!4qUS59BmeD!&4+S=Yqx61A7Nb98QZmjoNzpqNYYC+Y|hVTuo8}W_h
z8((co-gKdQYW0rIw9U%R12tha?OV*YtlRRTHly}>oqt`+R{gE3x4zjX+Sb3_cYE^=
zgB=w+-tUy`ytONMS8KgRef4hA?t<Nq8e$u|zvh13xJP$S#h#CQrF#eVMeplsbZ>0j
zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3?
zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j<Jb;mW2SDv7qC_VA{<bspqr(~y|
zolZYJ)S29Q_e}hmYh6)Yy=Ozuo<A3K?o78|_sR3#=Z{_Rym0g)_hQ>6w@a-(u02P7
zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W
z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU
zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R
za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)}
z^ZO;zpECde03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`>R<o>I+y?e7jKeZ#YO-C
z4Qxq7K~#9!?45aVRn;BGKY@S>C`#0@i3sA3C@8Js0thY?7sOhMt*uHzE7syxMNnMY
zqJlWJtyUeUq9{uhly+JLr4~jQu?0kHD;7a9DAWYOA_?2;ALn<6cyqRU^K$Pa-0w_g
z;N9)K`#rz?cg`!y<#J>w95l&ZK}JZ1jF60w3>hIAAsI448b6AoUeLLGPMYIA2<Q%U
z1iAtT1EoL_Pz8JjRLI{N;9qGDcFp4#H9R3Hpe4{37!LFRjslu_T(=%r1uO<;18)QW
zYjhHlAPxYo0Lp-qV_aV<f2RXC0V{y#fM<YpnGK1COMo|kM`Dtp!->Fsz#`xdQFj?3
z4jckJAu8sC271Qfz&*f1U}#2&87BcR10xc8-Z8)o;MYLwjF7M69N>>Y&xD`b6u1tU
zCDNG@0-Oi@L0s9i&>xsy2&5Dj02$LHzKDV?5@W0cK9c_ziG4T%I95EYrV&Y*DR!l5
zZzSX*;HijY%mwC%dRqtV(412Q><4@k7zPXiI(Xi{FYpj>6|ie>QdwmYCF2d?0+FcS
z0v{X50LTGf0rP=!;4I)_pvLoASIXaBV?#y)j{+?`&fN~&3G@>WEDk;dekz3i+w+=V
zMv$sKnvjv=X8P#%Dp5K23NiJ?Ux5L@0*`asNp#<+2`K}9gI^x%bKo*@M{VdTGyfVP
z?{uKK<@^fZa#ViHg%RQ)G)kjBQgpwMWNZY!D>K?OdoKm97O(1nS|o1)D#hsk9{7jm
z`t{;TEfhjc*k2~m?Tt-B$|9(#Kr&u693KL_E|S(0C<#eiOP~`lN>tM%@wmeHR1Cf=
z`#S_^)0hY;M<ob-)Kp+I<{KpWHsA$R`rQXD#170bq(<hWvcInM%1ModkU%nuJtgCE
z;59>BF&UU3|Bi|afvKW`!nhyU?6|&PV<4nlT-)Xz=T?ej=*Vaa{0jI<J;yT`xZB_o
zPjy^7a8D;>L<E~rDF*yC!`LS0fsERd<W$Y)vmHTWw<Kedd=pX@Q8F$E<{6Gp1g_8H
z*jmc?!fJ1^ME<txj@uInIakz+kImSKs*%q(9KRX3(et@qhzt9^$GL-m14Ex}0ajbC
z*#|gmPa~wicr5!xkc_#8<2Q(O_+SO9mU0&G4d6+~`5g?g#|p=F?e`=?2BOl|C7!c+
zxFycGQS62f-j)Dysr-MFNY;Cf>y9vZc{UuB6e0DE)Xza>ZA&~QW0-@C2P2SiF{&04
zCVZ_!=N}qlV(v1;C_l4Y^Cs|El7yUts<QczQ6=7#iHw^hs`e#gsD=zsO?0j@@G8w`
z&0~E39;mvB2_;DqGC(5WHlAb*vv^aZfd@RFyIj<i&Ilij%9q*7usMl6!sz07ZZ3vh
z`6?-ub-eiQt@1!d6v<eD%5#~>cmX)magW8Q7Spi0I?-{RuCdPb{dXp1)ISCO;z`DE
z3mG@Wkc?FZ)i6^$Ef;11+cZYLz2n8M)qH-q<5?9+5mJRJanALSj8`mVO!j>K3b7eF
zG7gcK?2~U=g=!-W<4lK|3mPh-s<}^+bbG6T?*o4`xVBd~BqNHN8fwt{hl*2imgl|3
z0~<8o|9jYzmTRe7`fY)`v-0Dl<B$y!;4KPC#&<B+zeh)qjCWA=i2rDg9W4^t-*c?@
z0nchaKSR7l8|G`=-X4zFWRt-QZ1BKvgS@oGsAA7>gDPu^N_9UJK{75iNXE&crh0hX
z=W_`b#~2)%yF3i@90QTX4(V8xMqn6_@@-V-;hTnYCW@-^CF2rHeyKbD$-ZfpVDrbo
z*^cX%p<0l_@2s!my7z!D)68X67|3WMQsGO+I~LbAz|#`d`)omRrPw;%44>ff{T~Ci
zhCb_xYNoJZLEIPFkQKuwA{nD2MBqb!4?NC&NK}yvt%1kIa0lou&Ol3#$)PJ=4W@3!
zIPCDel2$IuhP&}kp}#AV5k>C?Nk~`zYhP3cN)FX=@)YiZ(@q(GwT9qp9oH_@1fQuB
zavgAMMAug5P4yRD{FZ~1Ne<Vw7?qmeg<pwa2JoWh^J_ffj~C)b=?z851@fYrc}j+f
zjK0A0GE2WD2DUzuvXAHZSE4GF;g?#9YDu+WJ@BXc>iK-4EB<Xi?>Ho5hWPsJ#PvMY
zp}uaW{vGR8s0?nU=GYii&zDO&Dhh>=rb0$%k8}SiuI)-g&^L{**DX3q?9t0|&j+#B
zCtTQu>abj-Id-nN$u@ii{4O7!P`+@34BUma65;EDzHX@1RJtNkM^u*CMas>dE^%#a
z1%4<hQuo}4ao0?yi_{kcA;$n?J<j_tD(R>zvmPZcyu0Q4!+@87Q}QS&+u6NdC5&bg
ziyZB^$0q#qbBPc#*5R8Ysg<h@D&a`czsGw#tAm_tTfaWZGfvqqlA+6UH5U~$$m2c_
zlBaDv@<B*HQ9(YW={%6mL|>QQ3Dx0VUrD(QbARu6nLsWq6_rLI5K=6*!=+zmqB_>Y
zD3PEo&L#mqk}?sv#X^Ru!{tu=mLcqv;CEA@5Yj{94ja}OT+(Ke*63T0=XVm9_!Niw
zx+P@jZ%1XHb+`k4AFvL0p|1(0M#xBy;POuNCD40NDfarJqe#ke4pMHdrHUpP&KoD=
z^1*aeorOXnq}0RBU4njD+IbdL5?4~DIs&(eGTsL)l5wx+^Oi`|zN3%`>Fam_IWcxy
zLZ2Tf>cXcx{(j&`_$~Sj3Rku<&7*F@Fsfv%63O1s0BNV#gfu~=p^F@;k(rv$%kZoA
zO%}uZ7%F}4v%5ks2`r;59~c)wGS;GsaTPQW;u6vtcRl+l&CG6tUw!1skV>10s+Fwt
zxVAScQ`;raWUP@%xQqrwTta$c?`7JGzP3IRcgNo%)FPd*SGEAP5XdJjatbiT;c!GD
z;}cO+x-R)6fYZ_@#5I7os9X6vz$1X%Byr7F&9On^X8No%+=1%B%2|TcD3WoZK{DEj
zihKn)KTSe<c|@<_4#AUfuV|en9*iy<@Em@P-P=$p^vBT`ipByz_xzq8qq5S=4P?A1
z?_z&RzYI)+kbSYQD9WMVDZ$m@@g@2;p-vLb`|SD_BnqcmBqItLLr}H;FxpD&(>r7z
zr;AIUC?O@-yWVRIGs@MF_L9M9-;KMEHXvgJsw+i@F%ii42(|uXsX;PcGN|n~A}Irs
zB;-)+U3;6U+eW#M!|TbR?{@4iv($we2N}1ccKGo%;6n|Qs#I)7Z^wk4A$BJbLRzC=
zgkM|K!}g<#<C-tgZ=H0phpO5s-kXh#Uqq0M!RYr$X^+aA_3^k*o4A>XIE1uuMA_>!
zE^B-2-5!-1sVYY83THz#Dn&lUVl#Zns6e$My=~A6F3AYH=-0#{Bu>{!XUB0}MD21_
zH>0}dYojIh-FlF?Bwsee=1tA=m>dCKMKzpPB}K@G;`Nv?E5<!*G*Nw#V|=^NmtCW(
zsUYZEZt$j}k}-^WY@!*5kQdQ6k-1c(O-fpcJ6#<j#HCU@X#%z}5pBk$25%~GZGFj@
zhg#TLnMPn36&p2%KCGS&)C726IL1DK-RlEeqjr+;^`?TL&*a+9#@$pM;I({^5m!Ru
zph9MUD~qex8TI=g0k%lgZd>MjENVf`C*s9*@f^=ui<$}yc%qV#w1j+yeZ530^sP2N
zJCT;4()m%yxX9qzww0i-kLSIf%O@F060!^TmKXgrcIIV+N~w>enu5MVB1*;-)cTXk
ze7>k8cO`w@ar}Hu5LknM!-0>@xDb6Oeb7IAhUdMWkzjOZzF$(3ge-J?fl_f9!<d7)
zL&O(BI%HWMY{t{5Y;sLQyrd)vS&4gR=~0GM$vEOSqb(72_;*X3(I;)mNQ01#m^YsZ
zaDsf{Fm|B2Jg!Ie2m4?vsvCbW`Xvvg5y^O3(lpf#`I3^}YJ7?#9tooCo|aTeA5@>!
zYU*zAvQ-TC6Q~^;Mi~e!MRmHL7C|z~X@It$wBnEe%S1|S4a}`k>Fcx6Z~F29Dw8@E
zwToO=R2SrSA!!-*tzSze=sPWfWQ-s``_C5~A)p%724Y`jb)*>cAD|ZZ=&(&3g@qBG
z-B!qsLPl9qWTc_8K=r~-_c*T?s#|_Yo}SxVqH5p0QJxhtwk7#;()vM{@%ZhQ(^+)=
zH2iB3I=6P5<eN^2AQ@LBO-7o8tVXr_<UGeXOjOfsc~Ko4V{d}W1mB9vb=`~KhHHUj
zlqadC(zYQ1o<|js?(jUnIVwAQ32HUga`~%Z_fH_T6RGNjYB}0J;+Uoi;XBfLDQW*o
z+jtqnn26W4k~GH|c^pe%Gj^o;Lel;n!yM5%LK+H>pw=2zr#y~=`K8Zs62xsz__;L_
z(~L@6G7625oXpaJnD>LvH{O-B$|MR1h4yRFOHlioT#LJY5*J^fT2{}-om<=M2|@Ju
zqY_P*Q+G$VxY&YPcQOFAa<-}fzkBLlmJORxNy2APJ4IY3QFb>;f%srOY6;q(QRUXv
z6gY}0d{ozpIS_KXvHORJ+t&&(o65}p0M$SCK6%<<At@B)ayc?&HY7tvNJdD8jF60w
d40*=?2LLZd0!W)3=ivYV002ovPDHLkV1ip!#$f;e

literal 11327
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

diff --git a/src/api/common.js b/src/api/common.js
index ff9dd57..9452470 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -22,3 +22,14 @@ export const exportBlob1 = (url, params) => {
     responseType: 'blob'
   })
 }
+
+// 下载压缩包
+export const zipDownload = (url, params) => {
+  return request({
+    url: url,
+    data: params,
+    method: 'post',
+    responseType: "blob",
+    // headers: { "Content-Type": "multipart/form-data" }
+  })
+}
diff --git a/src/assets/json/status.json b/src/assets/json/status.json
index 5d508ba..116a63c 100644
--- a/src/assets/json/status.json
+++ b/src/assets/json/status.json
@@ -520,7 +520,7 @@
             "type": ""
           },
           {
-            "name": "",
+            "name": "待接单",
             "status": 205,
             "color": "#f56c6c",
             "type": ""
@@ -532,16 +532,16 @@
             "type": ""
           },
           {
-            "name": "已驳回",
+            "name": "待提报",
             "status": 100,
             "color": "#f56c6c",
             "type": "danger"
           },
           {
-            "name": "已驳回",
+            "name": "待接单",
             "status": 101,
-            "color": "#f56c6c",
-            "type": "danger"
+            "color": "#67c23a",
+            "type": "success"
           },
           {
             "name": "已驳回",
diff --git a/src/components/order/workOrderDialog.vue b/src/components/order/workOrderDialog.vue
index a60b1a1..d72fa91 100644
--- a/src/components/order/workOrderDialog.vue
+++ b/src/components/order/workOrderDialog.vue
@@ -15,33 +15,33 @@
           </el-form-item>
           <el-form-item label="故障现象描述" prop="faultDescribe">
             <el-input placeholder="请输入故障现象描述" type="textarea" v-model="addForm.faultDescribe" style="width:98%;"
-              :disabled="dataType != '2'"></el-input>
+              :disabled="dataTypes != '2'"></el-input>
           </el-form-item>
           <el-form-item label="故障位置" prop="faultLocation">
             <el-input placeholder="请输入故障位置" v-model="addForm.faultLocation" style="width:98%;"
-              :disabled="dataType != '2'"></el-input>
+              :disabled="dataTypes != '2'"></el-input>
           </el-form-item>
           <el-form-item label="设备名称" prop="deviceName">
             <el-input style="width:98%;" placeholder="请输入设备名称" v-model="addForm.deviceName"
-              :disabled="dataType != '2'"></el-input>
+              :disabled="dataTypes != '2'"></el-input>
           </el-form-item>
           <el-form-item label="故障专业类型" prop="faultType">
             <el-input style="width:98%;" placeholder="请输入故障专业类型" v-model="addForm.faultType"
-              :disabled="dataType != '2'"></el-input>
+              :disabled="dataTypes != '2'"></el-input>
           </el-form-item>
         </div>
         <div>
           <div class="title">派单信息</div>
           <el-form-item label="维修类别" prop="repairType">
             <el-select placeholder="请选择维修类别" style="width:98%;" v-model="addForm.repairType"
-              :disabled="dataType != '2'">
+              :disabled="dataTypes != '2'">
               <el-option v-for="item in repairTypeList" :key="item.dictKey" :label="item.dictValue"
                 :value="item.dictKey"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="维修人员" prop="repairPerson">
             <el-select placeholder="请选择维修人员" style="width:98%;" v-model="addForm.repairPerson"
-              :disabled="dataType != '2'">
+              :disabled="dataTypes != '2'">
               <el-option v-for="item in repairPersonList" :key="item.id" :label="item.name"
                 :value="item.id"></el-option>
             </el-select>
@@ -50,12 +50,12 @@
           <el-form-item label="计划完成时间" prop="planCompleteTime">
             <el-date-picker style="width:98%;" v-model="addForm.planCompleteTime" format="yyyy-MM-dd"
               value-format="yyyy-MM-dd HH:mm:ss" type="date" placeholder="请选择计划完成时间" :picker-options="dispatchOptions"
-              :disabled="dataType != '2'">
+              :disabled="dataTypes != '2'">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="客服意见" prop="customerOpinion">
             <el-input placeholder="请输入客服意见" type="textarea" v-model="addForm.customerOpinion" style="width:98%;"
-              :disabled="dataType != '2'"></el-input>
+              :disabled="dataTypes != '2'"></el-input>
           </el-form-item>
         </div>
 
@@ -68,7 +68,7 @@
   </el-dialog>
 </template>
 <script>
-import { mapState, mapActions } from 'vuex';
+import { mapState, mapActions,mapGetters } from 'vuex';
 import { getChildList } from '@/api/system/dictbiz'
 import {
   getList, getDetail, editData, getDeptList, getRepairPeople, repairReject, submitReject, clone, serviceman, servicemanReceive, servicemanReject, servicemanSubmit, supervisorConfirm, supervisorReject,
@@ -92,6 +92,7 @@ export default {
   },
 
   computed: {
+    ...mapGetters(["userInfo", "permission"]),
     ...mapState({
       dataType: state => state.user.dataType,
     }),
@@ -113,11 +114,14 @@ export default {
         disabledDate(v) {
           return v.getTime() < new Date().getTime() - 86400000;//  - 86400000是否包括当天
         }
-      }
+      },
+       dataTypes:''
     }
   },
 
   mounted() {
+    this.dataTypes=this.userInfo.dataType
+    console.log(999,this.dataTypes)
     this.getDetail()
     // 维修类型
     this.getChildList('1869925082102702082', 'repairTypeList')
@@ -132,7 +136,7 @@ export default {
         this.addForm.maintenanceTeam = (res.data.data.status == 101 || res.data.data.status == 203) ? '' : res.data.data.maintenanceTeam
         this.addForm.dispatchTime = (res.data.data.status == 101 || res.data.data.status == 203) ? '' : res.data.data.dispatchTime
         this.addForm.planCompleteTime = (res.data.data.status == 101 || res.data.data.status == 203) ? '' : res.data.data.planCompleteTime
-        this.addForm.repairPerson = this.dataType == '2' ? '' : res.data.data.repairPerson
+        this.addForm.repairPerson = this.dataTypes == '2' ? '' : res.data.data.repairPerson
         this.addForm = {
           ...this.addForm,
           isNeedMaterials: 2,
@@ -148,7 +152,7 @@ export default {
         if (valid) {
           let query = {}
           // 客服接单
-          if (this.dataType == '2') {
+          if (this.dataTypes == '2') {
             query = {
               id: this.addForm.id,
               reportUnit: this.addForm.reportUnit,
@@ -160,7 +164,7 @@ export default {
             }
             let manQuery = {
               id: this.addForm.id,
-              repairPerson: this.dataType == '2' ? this.addForm.repairPerson : null,
+              repairPerson: this.dataTypes == '2' ? this.addForm.repairPerson : null,
               planCompleteTime: this.addForm.planCompleteTime,
               dispatchTime: moment().format('YYYY-MM-DD HH:mm:ss'),
               customerOpinion: this.addForm.customerOpinion,
@@ -183,7 +187,7 @@ export default {
     },
     // 关闭弹框
     handleClose() {
-
+      this.$emit('closeWorkOrder')
     },
     // 获取维修人员列表
     getRepairPeople() {
@@ -196,6 +200,9 @@ export default {
       getChildList(1, 100, id).then(res => {
         if (type == 'repairTypeList') {
           this.repairTypeList = res.data.data
+          this.repairTypeList.forEach(item=>{
+        item.dictKey=Number(item.dictKey)
+      })
         }
       })
     },
diff --git a/src/router/axios.js b/src/router/axios.js
index f947762..6ecb60a 100644
--- a/src/router/axios.js
+++ b/src/router/axios.js
@@ -23,7 +23,7 @@ import crypto from '@/util/crypto';
 let isErrorShown = false;
 
 //默认超时时间
-axios.defaults.timeout = 10000;
+axios.defaults.timeout = 600000;
 //返回其他状态码
 axios.defaults.validateStatus = function (status) {
   return status >= 200 && status <= 500;
diff --git a/src/store/getters.js b/src/store/getters.js
index d735be3..bf3331f 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -26,6 +26,5 @@ const getters = {
   logsFlag: (state, getters) => getters.logsLen === 0,
   flowRoutes: state => state.dict.flowRoutes,
   messageTotal: state => state.dict.messageTotal,
-  dataType: state => state.user.dataType,
 }
 export default getters
diff --git a/src/store/modules/common.js b/src/store/modules/common.js
index 6de71d7..479b695 100644
--- a/src/store/modules/common.js
+++ b/src/store/modules/common.js
@@ -32,8 +32,6 @@ const common = {
   },
   mutations: {
     SET_MESSAGETOTAL: (state, active) => {
-      console.log('state',state)
-      console.log('active',active)
       state.messageTotal = active;
     },
     SET_LANGUAGE: (state, language) => {
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index a206c39..2fdebc1 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -54,7 +54,7 @@ const user = {
     menuAll: getStore({name: 'menuAll'}) || [],
     token: getStore({name: 'token'}) || '',
     refreshToken: getStore({name: 'refreshToken'}) || '',
-    dataType:null,//数据标识权限
+    dataType:'',//数据标识权限
   },
   actions: {
     //根据用户名登录
@@ -264,18 +264,7 @@ const user = {
           if(userInfo.content.detail.status != 1){
             data = res.data.data.filter(item => item.path == '/workbench')
           }else{
-            if (userInfo.content.role_id == "1123598816738675201" || userInfo.content.role_id == "1846419477876510721") {
-              commit('updateDatatype', 1) //客户
-            }
-            if (userInfo.content.role_id == "1839536982874193922") {
-              commit('updateDatatype', 2)  //客服
-            }
-            if (userInfo.content.role_id == "1839537055389515777") {
-              commit('updateDatatype', 3) //维修负责人
-            }
-            if (userInfo.content.role_id == "1839552581620793346") {
-              commit('updateDatatype', 4)  //维修人员
-            }
+
             data = res.data.data
           }
           let menu = deepClone(data);
@@ -343,6 +332,19 @@ const user = {
         if (validatenull(userInfo.avatar)) {
           userInfo.avatar = "/img/bg/img-logo.png";
         }
+
+        if (userInfo.role_id == "1123598816738675201" || userInfo.role_id == "1846419477876510721") {
+          userInfo.dataType=1//客户
+        }
+        if (userInfo.role_id == "1839536982874193922") {
+          userInfo.dataType=2  //客服
+        }
+        if (userInfo.role_id == "1839537055389515777") {
+          userInfo.dataType=3 //维修负责人
+        }
+        if (userInfo.role_id == "1839552581620793346") {
+          userInfo.dataType=4 //维修人员
+        }
         state.userInfo = userInfo;
       }
       setStore({name: 'userInfo', content: state.userInfo})
@@ -374,10 +376,7 @@ const user = {
       });
       setStore({name: 'permission', content: state.permission})
     },
-    updateDatatype(state, data) {
-      console.log(888888,data)
-      state.dataType = data
-    }
+
   }
 
 }
diff --git a/src/views/businessManagement/inspection/repair.vue b/src/views/businessManagement/inspection/repair.vue
index 516e3dc..be5e4be 100644
--- a/src/views/businessManagement/inspection/repair.vue
+++ b/src/views/businessManagement/inspection/repair.vue
@@ -25,7 +25,7 @@
           @click="handleEvaluate(row)">评价</el-button>
         <el-button v-show="permission.confirmpayment && row.repairStatus == 6"
           @click="paymentFinish(row)">确认付款</el-button>
-        <el-button @click="handleExport(row)">导出</el-button>
+        <!-- <el-button @click="handleExport(row)">导出</el-button> -->
       </template>
     </avue-crud>
     <el-dialog title="巡检异常维修" :visible.sync="dialogerror" :append-to-body="true" width="70%">
@@ -1143,33 +1143,8 @@ export default {
       })
     },
     onLoad(page, params = {}) {
-      // this.data = [
-      //     {
-      //         taskNo:'WX-20240820-01',
-      //         unitName:'济南安池实验室',
-      //         inspectionName:'实验室设备巡检',
-      //         projectAddr:'济南市钢城区',
-      //         inspectionFloor:'三层、四层',
-      //         status:0,
-      //         tableData:[
-      //           {floorName:'三层',floorId:'001',roomName:'种子常规检测',roomId:'003',majorName:'水系统',inspectionContent:'1、水量水压满足用水需求',status:'1',price:100,isRepair:1},
-      //           {floorName:'四层',floorId:'002',roomName:'种子常规检测',roomId:'004',majorName:'水系统',inspectionContent:'1、水量水压满足用水需求',status:'1',price:100,isRepair:1}
-      //         ]
-      //     },
-      //     {
-      //         taskNo:'WX-20240820-01',
-      //         unitName:'济南安池实验室',
-      //         inspectionName:'实验室设备巡检',
-      //         projectAddr:'济南市钢城区',
-      //         inspectionFloor:'三层、四层',
-      //         status:1,
-      //         tableData:[
-      //           {floorName:'三层',floorId:'001',roomName:'种子常规检测',roomId:'003',majorName:'水系统',inspectionContent:'1、水量水压满足用水需求',status:'1',price:100,isRepair:1},
-      //           {floorName:'四层',floorId:'002',roomName:'种子常规检测',roomId:'004',majorName:'水系统',inspectionContent:'1、水量水压满足用水需求',status:'1',price:100,isRepair:1}
-      //         ]
-      //     }
-      // ]
-      getRepairPage({ current: this.page.currentPage, size: this.page.pageSize }).then(res => {
+      console.log('query',this.errorForm.deptName,params)
+      getRepairPage({ current: this.page.currentPage, size: this.page.pageSize,deptName:params.deptName }).then(res => {
         this.data = res.data.data.records
         this.page.total = res.data.data.total
       })
diff --git a/src/views/businessManagement/inspection/task.vue b/src/views/businessManagement/inspection/task.vue
index 4fc3410..b72aafe 100644
--- a/src/views/businessManagement/inspection/task.vue
+++ b/src/views/businessManagement/inspection/task.vue
@@ -6,7 +6,7 @@
       @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
       <template slot-scope="scope" slot="menuLeft">
         <el-button type="primary" size="small" @click="createTask">生成巡检任务</el-button>
-        <el-button type="primary" size="small" @click="allExportReport">批量导出报告</el-button>
+         <el-button type="primary" size="small" @click="allExportReport">批量导出报告</el-button>
       </template>
       <template slot-scope="{ row }" slot="taskStatus">
         <!-- role_id  运维主管 1839537055389515777  维修人员 1839552581620793346 实验室管理员 1846419477876510721-->
@@ -388,9 +388,9 @@
     <el-dialog title="图片查看" :visible.sync="dialogImage" :append-to-body="true" width="70%" @close="closeImg">
       <img :src="imgUrl" alt="">
     </el-dialog>
-    <div id="pdfDom" style="padding: 20px;" v-if="routingFormShow">
+    <!-- <div id="pdfDom" style="padding:20px" v-if="routingFormShow">
       <routing-inspection v-if="routingFormShow" :detailForm="routingForm" detailType="task"></routing-inspection>
-    </div>
+    </div> -->
   </basic-container>
 </template>
 
@@ -408,8 +408,9 @@ import {
 import { mapGetters } from "vuex";
 import { getDeviceList } from '@/api/device/device'
 import routingInspection from '@/views/components/routingInspection.vue'
-import { exportBlob, exportBlob1 } from "@/api/common";
+import {  exportBlob1,zipDownload } from "@/api/common";
 import { downloadXls } from "@/util/util";
+
 export default {
   components: {
     routingInspection
@@ -594,8 +595,8 @@ export default {
 
   },
   methods: {
-     // 批量导出报告
-     allExportReport() {
+    // 批量导出报告
+    allExportReport() {
       if (this.selectedList.length == 0) {
         this.$message.warning('请至少选择一条数据')
       } else {
@@ -604,6 +605,27 @@ export default {
           this.$message.warning('请选择状态为已完成的数据')
         } else {
           console.log('批量导出报告', this.selectedList)
+          zipDownload('/api/lab-ops/maintenance/batch-maintenance-output-service', this.selectedList)
+            .then((response) => {
+              const blob = new Blob([response.data])
+              const fileName = '巡检报告.zip'
+              if ('download' in document.createElement('a')) { // 非IE下载
+                const elink = document.createElement('a')
+                elink.download = fileName
+                elink.style.display = 'none'
+                elink.href = URL.createObjectURL(blob)
+                document.body.appendChild(elink)
+                elink.click()
+                URL.revokeObjectURL(elink.href)// 释放URL 对象
+                document.body.removeChild(elink)
+              } else { // IE10+下载
+                navigator.msSaveBlob(blob, fileName)
+              }
+            })
+            .catch((err) => {
+              console.log(err);
+            });
+
         }
       }
     },
@@ -623,59 +645,64 @@ export default {
       // exportBlob1(`/api/lab-ops/maintenance/task-detail-configuration`, { id: this.inspectionForm.id }).then(res => {
       //
       // })
-
+      let query = JSON.parse(JSON.stringify(row))
+        exportBlob1(`/api/lab-ops/maintenance/maintenance-plan-report`, query).then(res => {
+          downloadXls(res.data, "巡检计划.xlsx");
+        })
       getDetail({ id: row.id }).then(res => {
 
-        const header = ["deviceName", "address", "checkContent", "craft", "period", "remark"]
-        //展示的名称
-        const headerDisplay = { deviceName: "专业", address: '点位', checkContent: "巡检内容", craft: '巡检工艺', period: '巡检频次', remark: '备注' };
 
-        let data = []
-        let data2 = []
-        let oldData = this.checkDeepData(res.data.data.details)
-        oldData.forEach(item => {
-          data2.push([item.floorName, item.deptName, item.deviceName,1, item.checkContent, item.craft, this.periodArr.filter(v => v.dictKey == item.period)[0].dictValue, item.remark])
+        // const header = ["deviceName", "address", "checkContent", "craft", "period", "remark"]
+        // //展示的名称
+        // const headerDisplay = { deviceName: "专业", address: '点位', checkContent: "巡检内容", craft: '巡检工艺', period: '巡检频次', remark: '备注' };
 
-          data.push({
-            deviceName: item.deviceName,
-            address: item.floorName + '/' + item.deptName,
-            checkContent: item.checkContent,
-            craft: item.craft,
-            period: this.periodArr.filter(v => v.dictKey == item.period)[0].dictValue,
-            remark: item.remark
-          })
-        })
+        // let data = []
+        // let data2 = []
+        // let oldData = this.checkDeepData(res.data.data.details)
+        // oldData.forEach(item => {
+        //   data2.push([item.floorName, item.deptName, item.deviceName,1, item.checkContent, item.craft, this.periodArr.filter(v => v.dictKey == item.period)[0].dictValue, item.remark])
 
-        let newData = [headerDisplay, ...data]
+        //   data.push({
+        //     deviceName: item.deviceName,
+        //     address: item.floorName + '/' + item.deptName,
+        //     checkContent: item.checkContent,
+        //     craft: item.craft,
+        //     period: this.periodArr.filter(v => v.dictKey == item.period)[0].dictValue,
+        //     remark: item.remark
+        //   })
+        // })
 
-        // 创建工作簿
-        const ws = XLSX.utils.json_to_sheet(newData, { header: header, skipHeader: true });
+        // let newData = [headerDisplay, ...data]
 
+        // // 创建工作簿
+        // const ws = XLSX.utils.json_to_sheet(newData, { header: header, skipHeader: true });
 
-        // 创建工作簿并添加工作表
-        const wb = XLSX.utils.book_new();
-        XLSX.utils.book_append_sheet(wb, ws, "点检任务");
 
-        // 创建数据并写入sheet2
-        const sheet2Data = [
-          ["楼层", "房间", "设备名称", "数量", "维保内容及频次", "巡检工艺", "巡检频次", "备注"],
-        ];
-        data2.forEach(i => {
-          sheet2Data.push(i)
-        })
-        const sheet2 = XLSX.utils.aoa_to_sheet(sheet2Data);
-        XLSX.utils.book_append_sheet(wb, sheet2, res.data.data.deptName + '维保计划');
+        // // 创建工作簿并添加工作表
+        // const wb = XLSX.utils.book_new();
+        // XLSX.utils.book_append_sheet(wb, ws, "点检任务");
 
-        // 生成Excel文件
-        const wbout = XLSX.write(wb, { bookType: "xlsx", type: "binary" });
-        // 字符串转ArrayBuffer
-        function s2ab(s) {
-          const buf = new ArrayBuffer(s.length);
-          const view = new Uint8Array(buf);
-          for (let i = 0; i !== s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF;
-          return buf;
-        }
-        downloadXls(new Blob([s2ab(wbout)]), res.data.data.deptName + "维保计划.xlsx");
+        // // 创建数据并写入sheet2
+        // const sheet2Data = [
+        //   ["楼层", "房间", "设备名称", "数量", "维保内容及频次", "巡检工艺", "巡检频次", "备注"],
+        // ];
+        // data2.forEach(i => {
+        //   sheet2Data.push(i)
+        // })
+        // const sheet2 = XLSX.utils.aoa_to_sheet(sheet2Data);
+        // XLSX.utils.book_append_sheet(wb, sheet2, res.data.data.deptName + '维保计划');
+
+        // // 生成Excel文件
+        // const wbout = XLSX.write(wb, { bookType: "xlsx", type: "binary" });
+        // // 字符串转ArrayBuffer
+        // function s2ab(s) {
+        //   const buf = new ArrayBuffer(s.length);
+        //   const view = new Uint8Array(buf);
+        //   for (let i = 0; i !== s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF;
+        //   return buf;
+        // }
+        // downloadXls(new Blob([s2ab(wbout)]), res.data.data.deptName + "维保计划.xlsx");
+        // maintenance-plan-report
       })
     },
     // 点击图片
@@ -1033,7 +1060,7 @@ export default {
         console.log('tableData------->', this.inspectionForm.tableData)
       })
     },
-    // 导出
+    // 导出 报告
     handleExport(row) {
 
       getDetail({ id: row.id }).then(res => {
@@ -1042,10 +1069,14 @@ export default {
         this.routingForm.tableData.map(item => {
           item.price = item.price != -1 ? item.price : ''
         })
-        this.routingFormShow = true
-        setTimeout(() => {
-          this.getPdf()
-        }, 100)
+        // this.routingFormShow = true
+        let query = JSON.parse(JSON.stringify(row))
+        exportBlob1(`/api/lab-ops/maintenance/maintenance-output-service`, query).then(res => {
+          downloadXls(res.data, "巡检报告.xlsx");
+        })
+        // setTimeout(() => {
+        //   this.getPdf()
+        // }, 100)
       })
     },
     handleInspection(row) {
diff --git a/src/views/businessManagement/ordinary.vue b/src/views/businessManagement/ordinary.vue
index 746b207..e94618d 100644
--- a/src/views/businessManagement/ordinary.vue
+++ b/src/views/businessManagement/ordinary.vue
@@ -22,18 +22,18 @@
             getStatus('maintain', role_id, row.status).name }}</el-tag>
       </template>
       <template slot-scope="scope" slot="menuLeft">
-        <el-button type="primary" size="small" @click="handleAccept" v-show="role_id != '1839600115013713921'">{{
+        <!-- <el-button type="primary" size="small" @click="handleAccept" v-show="role_id != '1839600115013713921'">{{
           role_id
-            == '1839552581620793346' ? '接单确认' : '接单' }}</el-button>
+            == '1839552581620793346' ? '接单确认' : '接单' }}</el-button> -->
 
         <el-button type="primary" size="small" @click="handleApproval"
           v-show="role_id == '1839600115013713921'">审批</el-button>
-          <el-button type="primary" size="small" @click="allExportReport">批量导出报告</el-button>
+        <el-button type="primary" size="small" @click="allExportReport">批量导出报告</el-button>
       </template>
       <template slot-scope="{ row }" slot="menu">
         <el-button v-show="permission.ordinaryView" @click="handleView(row)">查看</el-button>
 
-        <el-button v-show="permission.ordinaryOrder && (row.status == 101 || row.status == 400)"
+        <el-button v-show="permission.ordinaryOrder && (row.status == 101 || row.status == 400 || row.status == 205)"
           @click="takeOrders(row)">接单</el-button>
         <el-button v-show="permission.ordinaryClose && row.status == 101" @click="handleClone(row)">关闭</el-button>
         <el-button v-show="permission.ordinaryConfirm && row.status == 201" @click="reciveOrder(row)">确认</el-button>
@@ -47,9 +47,10 @@
           @click="handleRepairFinish(row)">维修完成</el-button>
         <el-button v-show="permission.ordinarySubmit && (row.status == 401 || row.status == 300 || row.status == 105)"
           @click="handleRepair(row)">提交</el-button>
-        <el-button v-show="permission.ordinaryPay&&row.status == 104" @click="handlePayment(row)">确认付款</el-button>
-        <el-button @click="handleExport(row)" v-show="row.status == 202||row.status == 203||row.status == 204">报告</el-button>
-        <el-button @click="viewLog(row)" >日志</el-button>
+        <el-button v-show="permission.ordinaryPay && row.status == 104" @click="handlePayment(row)">确认付款</el-button>
+        <el-button @click="handleExport(row)"
+          v-show="row.status == 202 || row.status == 203 || row.status == 204">报告</el-button>
+        <el-button @click="viewLog(row)">日志</el-button>
 
       </template>
     </avue-crud>
@@ -209,7 +210,7 @@
             </el-date-picker>
           </el-form-item>
         </div>
-        <div v-show="repairForm.closeReason == ''">
+        <div v-show="repairForm.status != 100 && repairForm.status != 101">
           <div style="color: #101010;font-size: 20px;font-weight: 550;margin-bottom: 20px;">处理情况</div>
           <el-form-item label="接单时间" prop="dispatchTime">
             <el-date-picker v-model="repairForm.dispatchTime" type="datetime" disabled style="width:98%;"
@@ -228,7 +229,7 @@
           </el-form-item>
         </div>
         <div
-          v-show="(repairForm.status == 105||repairForm.status == 401 || repairForm.status == 402 || repairForm.status == 403 || repairForm.status == 301 || repairForm.status == 300 || repairForm.status == 102 || repairForm.status == 103 || repairForm.status == 104)">
+          v-show="(repairForm.status == 105 || repairForm.status == 401 || repairForm.status == 402 || repairForm.status == 403 || repairForm.status == 301 || repairForm.status == 300 || repairForm.status == 102 || repairForm.status == 103 || repairForm.status == 104)">
           <div style="color: #101010;font-size: 20px;font-weight: 550;margin-bottom: 20px;">维修详情</div>
           <el-form-item label="维修人" prop="repairPersonName">
             <el-input placeholder="请输入维修人"
@@ -592,9 +593,9 @@
       </span>
     </el-dialog>
     <!-- 报告导出页面 -->
-    <div id="pdfDom" style="padding: 20px;">
+    <!-- <div id="pdfDom" style="padding:10px;">
       <requirement :detailForm="requireForm"></requirement>
-    </div>
+    </div> -->
     <!-- 流程弹框 -->
     <logDialog :orderId="logOrderId" :infoDialog="infoDialog" @closeLog="closeLog"></logDialog>
     <!-- 工单处理弹框 -->
@@ -622,6 +623,8 @@ import {
 import { getGoodsList } from '@/api/goodsManagement/goods'
 import logDialog from '../../components/order/logDialog.vue'
 import workOrderDialog from '../../components/order/workOrderDialog.vue'
+import { exportBlob, exportBlob1 } from "@/api/common";
+import { downloadXls } from "@/util/util";
 export default {
   components: {
     requestSub,
@@ -736,15 +739,15 @@ export default {
             labelWidth: 120,
             prop: "faultType",
             overHidden: true,
-            type: "select",
-            searchLabelWidth: 100,
-            search: true,
-            viewDisplay: false,
-            dicUrl: '/api/blade-system/dict-biz/child-list?current=1&size=100&parentId=1846802246527463425',
-            props: {
-              label: "dictValue",
-              value: "dictValue",
-            },
+            // type: "select",
+            // searchLabelWidth: 100,
+            // search: true,
+            // viewDisplay: false,
+            // dicUrl: '/api/blade-system/dict-biz/child-list?current=1&size=100&parentId=1846802246527463425',
+            // props: {
+            //   label: "dictValue",
+            //   value: "dictValue",
+            // },
           },
           {
             label: "故障专业描述",
@@ -826,13 +829,13 @@ export default {
       infoDialog: false,//流程查看弹框
       workOrderShow: false,//工单处理弹框
       workOrderId: '',//id
+      dataTypes:''
+
     }
   },
+
   computed: {
     ...mapGetters(["userInfo", "permission"]),
-    ...mapState({
-      dataType: state => state.user.dataType,
-    }),
     getStatus() {
       return (type, id, status) => {
         for (let i in statusData[type]) {
@@ -858,14 +861,18 @@ export default {
     // 维修类型
     getChildList(1, 100, '1869925082102702082').then(res => {
       this.repairTypeList = res.data.data
+      this.repairTypeList.forEach(item=>{
+        item.dictKey=Number(item.dictKey)
+      })
     })
     this.getGoodsList()
     this.getProductLists()
   },
   mounted() {
     this.role_id = this.userInfo.role_id
+    this.dataTypes=this.userInfo.dataType
     // 获取维修人员列表
-    getRepairPeople({ isRepair: this.role_id == '1839537055389515777' ? true : false }).then(res => {
+    getRepairPeople().then(res => {
       this.repairPersonList = res.data.data
     })
     this.option.column.find(item => item.prop == 'finishTime').hide = false
@@ -884,11 +891,15 @@ export default {
       this.option.column.find(item => item.prop == 'finishTime').hide = true
       this.option.column.find(item => item.prop == 'approveTime').hide = false
     }
-    this.onLoad()
+
+    this.$nextTick(() => {
+      this.onLoad()
+    })
+
   },
   methods: {
-     // 批量导出报告
-     allExportReport() {
+    // 批量导出报告
+    allExportReport() {
       if (this.selectList.length == 0) {
         this.$message.warning('请至少选择一条数据')
       } else {
@@ -896,7 +907,27 @@ export default {
         if (tmp.length != this.selectList.length) {
           this.$message.warning('请选择状态为已完成的数据')
         } else {
-          console.log('批量导出报告', this.selectList)
+          zipDownload('/api/lab-ops/work-order/batch-report-service', this.selectList)
+            .then((response) => {
+              const blob = new Blob([response.data])
+              const fileName = '运维服务单.zip'
+              if ('download' in document.createElement('a')) { // 非IE下载
+                const elink = document.createElement('a')
+                elink.download = fileName
+                elink.style.display = 'none'
+                elink.href = URL.createObjectURL(blob)
+                document.body.appendChild(elink)
+                elink.click()
+                URL.revokeObjectURL(elink.href)// 释放URL 对象
+                document.body.removeChild(elink)
+              } else { // IE10+下载
+                navigator.msSaveBlob(blob, fileName)
+              }
+            })
+            .catch((err) => {
+              console.log(err);
+            });
+
         }
       }
     },
@@ -1079,7 +1110,7 @@ export default {
         this.repairForm.errorVideo = res.data.data.videoAttaches.length > 0 ? res.data.data.videoAttaches[0].link : ''
         this.repairForm.errorImg = res.data.data.picAttaches.map(item => { return { name: item.originalName, url: item.link } })
         this.repairForm.deviceId = this.repairForm.deviceId == -1 ? '' : this.repairForm.deviceId
-        this.repairForm.isNeedMaterial = (this.repairForm.status == 201 || this.repairForm.status == 401 || this.repairForm.status == 402|| this.repairForm.status == 105) && this.repairForm.isNeedMaterial == -1 ? '' : this.repairForm.isNeedMaterial
+        this.repairForm.isNeedMaterial = (this.repairForm.status == 201 || this.repairForm.status == 401 || this.repairForm.status == 402 || this.repairForm.status == 105) && this.repairForm.isNeedMaterial == -1 ? '' : this.repairForm.isNeedMaterial
         this.getDeviceList(res.data.data.createDept)
 
         if (this.repairForm.isNeedMaterial != '') {
@@ -1140,13 +1171,18 @@ export default {
       })
     },
     handleExport(row) {
-      getDetail({ id: row.id }).then(res => {
-        this.requireForm = res.data.data
-        // this.getPdf()
-        setTimeout(() => {
-          this.getPdf()
-        }, 100)
+      let query = JSON.parse(JSON.stringify(row))
+      exportBlob1(`/api/lab-ops/work-order/report-service`, query).then(res => {
+        downloadXls(res.data, "运维服务单.xlsx");
       })
+
+      // getDetail({ id: row.id }).then(res => {
+      //   this.requireForm = res.data.data
+      //   // this.getPdf()
+      //   setTimeout(() => {
+      //     this.getPdf()
+      //   }, 100)
+      // })
     },
     // 维修人员提交维修结果
     handleRepairFinish(row) {
@@ -1410,7 +1446,7 @@ export default {
         this.$message.warning('请选择一条数据')
       } else if (this.selectList.length > 1) {
         this.$message.warning('只能选择一条数据')
-      } else if (this.selectList[0].status != 2) {
+      } else if (this.selectList[0].status != 100) {
         this.$message.warning('只能选择状态为待确认的数据')
       } else {
         this.dialogTitle = '工单'
@@ -1457,7 +1493,7 @@ export default {
     handleRepairConfirm() {
       this.$refs.repairForm.validate(valid => {
         if (valid) {
-          if (this.repairForm.status == 105 ||this.repairForm.status == 401 || this.repairForm.status == 300) {
+          if (this.repairForm.status == 105 || this.repairForm.status == 401 || this.repairForm.status == 300) {
             if (this.repairForm.isNeedMaterial == '1') {
               if (this.tableData.length == 0) {
                 this.$message.error('请至少填写一条维修材料信息')
@@ -1486,10 +1522,10 @@ export default {
                   materials: data
                 }
                 // 紧急维修
-                if(this.repairForm.repairType==1){
-                  query.discountPrice=data.reduce((sum, item) => sum + item.materialPrice, 0)
-                  query.totalPrice=data.reduce((sum, item) => sum + item.materialPrice, 0)
-                  query.discount=0
+                if (this.repairForm.repairType == 1) {
+                  query.discountPrice = data.reduce((sum, item) => sum + item.materialPrice, 0)
+                  query.totalPrice = data.reduce((sum, item) => sum + item.materialPrice, 0)
+                  query.discount = 0
 
                 }
                 editData(query).then(res => {
@@ -1498,7 +1534,7 @@ export default {
                       id: this.repairForm.id,
                       deviceId: this.repairForm.deviceId,
                       deviceName: this.repairForm.deviceName,
-                      repairType:this.repairForm.repairType
+                      repairType: this.repairForm.repairType
                     }).then(res => {
                       this.$message.success("提交成功")
                       this.repairVisible = false
@@ -1652,7 +1688,7 @@ export default {
         if (valid) {
           let query = {}
           // 客服提交
-          if (this.dataType == '2') {
+          if (this.dataTypes == '2') {
             query = {
               id: this.addForm.id,
               reportUnit: this.addForm.reportUnit,
@@ -1670,7 +1706,6 @@ export default {
               remark: this.addForm.remark,
               repairType: this.addForm.repairType
             }
-            console.log(1111111111, manQuery)
             // editData(query).then(res => {
             //   if (res.data.code == 200) {
             //     serviceman(manQuery).then(result => {
@@ -1779,6 +1814,7 @@ export default {
       this.selectList = selection
     },
     onLoad(page, params = {}) {
+      console.log(6666,this.dataTypes)
       let query = {
         current: this.page.currentPage,				          //页数
         size: this.page.pageSize,				            //条数
@@ -1786,7 +1822,7 @@ export default {
         endTime: this.searchForm.timeRange && this.searchForm.timeRange.length != 0 ? this.searchForm.timeRange[1].toString() + ' 23:59:59' : '',		             //结束时间
         faultType: this.searchForm.faultType ? this.searchForm.faultType : '',				      //故障类型
         reportUnitName: this.searchForm.reportUnitName ? this.searchForm.reportUnitName : '',
-        // dataType: this.role_id == '1839536982874193922' || this.role_id == '1839600115013713921' ? 2 : this.role_id == '1839537055389515777' ? 3 : this.role_id == '1839552581620793346' ? 4 : ''
+        dataType: this.dataTypes
       }
       getList(query).then(res => {
         let data_ = res.data.data.records
diff --git a/src/views/device/deviceSystem.vue b/src/views/device/deviceSystem.vue
index f42caa6..92c3aca 100644
--- a/src/views/device/deviceSystem.vue
+++ b/src/views/device/deviceSystem.vue
@@ -559,10 +559,15 @@ export default {
     })
     // 维修类型
     getChildList(1, 100, '1869925082102702082').then(res => {
+      console.log(111111,res.data.data)
       this.repairTypeList = res.data.data
+      this.repairTypeList.forEach(item=>{
+        item.dictKey=Number(item.dictKey)
+      })
     })
     // 维修人员列表
     getRepairPeople({ isRepair: this.role_id == '1839537055389515777' ? true : false }).then(res => {
+
       this.repairPersonList = res.data.data
     })
     this.onLoad()
diff --git a/src/views/goodsManagement/goodsList.vue b/src/views/goodsManagement/goodsList.vue
index 0e6405a..c245411 100644
--- a/src/views/goodsManagement/goodsList.vue
+++ b/src/views/goodsManagement/goodsList.vue
@@ -20,12 +20,12 @@
                         <el-tag :type="row.num < row.warnNum ? 'danger' : ''">{{ row.num }}</el-tag>
                     </template>
 					<template slot-scope="scope" slot="menuLeft">
-						<el-button type="primary" size="small" @click="handleAdd" v-show="permission.goodsAdd">入 库</el-button>
+						<!-- <el-button type="primary" size="small" @click="handleAdd" v-show="permission.goodsAdd">入 库</el-button> -->
 						<!-- <el-button type="primary" size="small" @click="handleReceive" v-show="permission.goodsReceive">申 领</el-button> -->
 						<el-button type="primary" size="small" @click="handleReceive" v-show="permission.goodsReceive">申 领</el-button>
 						<el-button size="small" @click="handleImport" type="success">导 入</el-button>
                         <el-button type="warning" size="small" @click="handleExport">导 出</el-button>
-						<el-button type="primary" size="small" @click="handleAddGoods" v-show="permission.goodsBuy">采 购</el-button>
+						<el-button type="primary" size="small" @click="handleAddGoods" v-show="permission.goodsBuy">采购入库</el-button>
 					</template>
 					<template slot-scope="{ row }" slot="menu">
 						<el-button @click="handleVide(row)" v-show="permission.goodsView">查看</el-button>
@@ -167,7 +167,7 @@
                         </el-form-item>
                         <el-form-item label="物品大类" prop="bigClassId">
                             <SelectTree
-                                :disabled="viewType == 'view' || isSelected"  
+                                :disabled="viewType == 'view' || isSelected"
                                 :defaultProps="defaultProps"
                                 style="width: 97%;"
                                 ref="childTree"
@@ -226,7 +226,7 @@
 					<el-button type="primary" v-show="viewType != 'view'" 	@click="handleSaveGoods">提 交</el-button>
 				</span>
             </el-dialog>
-            <el-dialog 
+            <el-dialog
                 title="预警设置"
                 :visible.sync="dialogWarning"
                 :append-to-body="true"
@@ -541,8 +541,8 @@ export default {
             })
             this.getGoodsLists()
         })
-        
-        
+
+
     },
     methods:{
         changeWare(val){
@@ -560,7 +560,7 @@ export default {
                 if(this.warehouseCurrent == 1){
                     this.warehouseList = res.data.data.records
                 }else{
-                    this.warehouseList =  this.warehouseList.concat(res.data.data.records) 
+                    this.warehouseList =  this.warehouseList.concat(res.data.data.records)
                 }
                 this.warehouseTotal = res.data.data.total
             })
@@ -600,7 +600,7 @@ export default {
                 if(this.goodsCurrent == 1){
                     this.goodsList =  res.data.data.records
                 }else{
-                    this.goodsList =  this.goodsList.concat(res.data.data.records) 
+                    this.goodsList =  this.goodsList.concat(res.data.data.records)
                 }
                 this.goodsTotal = res.data.data.total
             })
@@ -670,9 +670,9 @@ export default {
                         brand:item.brand,					//品牌
                         model:  item.xh,	                //型号
                         parameter:item.rule,                       //参数
-                        count:0,                            //申领数量					
+                        count:0,                            //申领数量
                         goodsNumber:item.num,		//库存数量
-                        returnTime:''       
+                        returnTime:''
                     })
                 })
                 this.receiveForm.applyUser = this.userInfo.user_name
@@ -702,9 +702,9 @@ export default {
                 this.addForm = {
                     bigClassId:{node: undefined, data: {}},
                     num:0
-                } 
+                }
             }
-            
+
         },
         // 物品采购
         handlePurchase(){
@@ -820,7 +820,7 @@ export default {
                                 })
                             }
                         }
-                    }   
+                    }
                 }
             })
         },
@@ -866,7 +866,7 @@ export default {
                 brand:row.brand,					//品牌
                 model:  row.xh,	                //型号
                 parameter:row.rule,                       //参数
-                count:0,                            //申领数量					
+                count:0,                            //申领数量
                 goodsNumber:row.num,		//库存数量
                 returnTime:''                       //返还时间
             })
@@ -964,7 +964,7 @@ export default {
                     }
                 })
             }
-            
+
         },
         // 申领数量发生变化
         changeCount(row,currentValue){
@@ -1014,7 +1014,7 @@ export default {
                     }
                 }
             })
-            
+
         },
         // 点击申领单取消按钮
         cancelrRceive(){
@@ -1028,7 +1028,7 @@ export default {
                 name:this.searchForm.name ? this.searchForm.name : null,
                 bigClassId:this.searchForm.bigClassId ? this.searchForm.bigClassId : null,
                 current:this.page.currentPage,				          //页数
-                size:this.page.pageSize,			
+                size:this.page.pageSize,
             }
             getGoodsList(query).then(res =>{
                 this.data = res.data.data.records
@@ -1069,4 +1069,4 @@ export default {
             justify-content: center;
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/goodsManagement/warehouseList.vue b/src/views/goodsManagement/warehouseList.vue
index 625f7fa..453c64d 100644
--- a/src/views/goodsManagement/warehouseList.vue
+++ b/src/views/goodsManagement/warehouseList.vue
@@ -1,7 +1,7 @@
 <template>
   <basic-container style="max-height: 800px; overflow: hidden">
     <avue-crud :option="option" :table-loading="loading" :data="data" :search.sync="searchForm" :page.sync="page"
-      ref="crud" v-model="form" :permission="permissionList" 
+      ref="crud" v-model="form" :permission="permissionList"
       @search-change="searchChange" @search-reset="searchReset" @current-change="currentChange"
       @size-change="sizeChange" @refresh-change="refreshChange" @selection-change="selectionChange" @on-load="onLoad">
       <template slot-scope="{row}" slot="produceTime">
@@ -169,10 +169,12 @@ export default {
     },
     // 查询数据
     onLoad(){
+      console.log('searchForm',this.searchForm)
       this.loading = true
       let query = {
         current:this.page.currentPage,
-        size:this.page.pageSize
+        size:this.page.pageSize,
+        ...this.searchForm
       }
       getList(query).then(res =>{
         this.data = res.data.data.records
@@ -286,4 +288,4 @@ export default {
 
 <style>
 
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/labManagement/inspectionManagement.vue b/src/views/labManagement/inspectionManagement.vue
index 7aa01eb..e78fceb 100644
--- a/src/views/labManagement/inspectionManagement.vue
+++ b/src/views/labManagement/inspectionManagement.vue
@@ -34,6 +34,7 @@
 						<el-button @click="deletePlan(row)" v-show="permission.contentDelete">删除</el-button>
 						<el-button @click="handleDownload(row)"
 							v-show="permission.contentDelete">下载</el-button>
+              <el-button type="primary" @click="handleExportDevice(row)">导出</el-button>
 						<!-- <el-button @click="handleImport(row)">导入</el-button> -->
 					</template>
 				</avue-crud>
@@ -56,6 +57,8 @@ import { mapGetters } from "vuex";
 import JSZip from 'jszip';
 import { saveAs } from 'file-saver';
 import { getLimsTree, planCreate, getContentList, getPlanDetail, dealPlan, deletePlan, editPlan } from '@/api/labManagement/inspectionManagement'
+import {  exportBlob1 } from "@/api/common";
+import { downloadXls } from "@/util/util";
 export default {
 	components: {
 		addDialog
@@ -259,6 +262,12 @@ export default {
 		// }
 	},
 	methods: {
+    handleExportDevice(row) {
+      let query = JSON.parse(JSON.stringify(row))
+        exportBlob1(`/api/lab-ops/maintenance/maintenance-plan-report`, query).then(res => {
+          downloadXls(res.data, "巡检计划.xlsx");
+        })
+    },
 		objectSpanMethod({ row, column, rowIndex, columnIndex }) {
 			// console.log('row--------------->',row)
 			// console.log('column--------------->',column)
diff --git a/src/views/largeScreen/supervisory.vue b/src/views/largeScreen/supervisory.vue
index 0581c7d..f052c51 100644
--- a/src/views/largeScreen/supervisory.vue
+++ b/src/views/largeScreen/supervisory.vue
@@ -1253,6 +1253,7 @@ export default {
         right: 0;
         top: 0;
         opacity: 0;
+        z-index: 22
       }
 
       img {
diff --git a/src/views/operation/hand.vue b/src/views/operation/hand.vue
index 886cf12..75392fd 100644
--- a/src/views/operation/hand.vue
+++ b/src/views/operation/hand.vue
@@ -13,28 +13,7 @@
 
       </template> -->
       <template slot-scope="{ row }" slot="status">
-        <!-- -1-待提报 0-待接单 1,2，3-待维修 4-确认方案 5-维修中 6-待评价 7-待付款 8-已完成/待开发票 9-已开发票 -->
-        <!-- <el-tag size="small" :type="row.status == -1 || row.status == 4 || row.status == 2 || row.status == 3 ? ''
-          : (row.status == 0  || row.status == 9 || row.status == 6 || row.status == 7) ? 'success'
-          : (row.status == 1  || row.status == 5 ) ? 'warning'
-          : row.status == 4 ? 'success'
-          : (row.status == 8 && row.totalPrice < 0) ? 'info'
-          : (row.status == 8 && row.totalPrice > 0) ? 'warning'
-          : ''">
-          {{
-            row.status == -1 ? '待提报'
-            : row.status == 0 ? "待接单"
-            : (row.status == 1 || row.status == 2 || row.status == 3) ? "待维修"
-            : row.status == 4 ? "确认方案"
-            : row.status == 5 ? '维修中'
-            : row.status == 6 ? '待评价'
-            : row.status == 7 ? '待付款'
-            : (row.status == 8 && row.totalPrice < 0) ? '已完成'
-            : (row.status == 8 && row.totalPrice > 0) ? '待开发票'
-            : row.status == 9 ? '已开发票'
-            : ""
-          }}
-        </el-tag> -->
+
         <el-tag :type="getStatus('maintain', role_id, row.status).type">{{ getStatus('maintain', role_id,
           row.status).name
           }}</el-tag>
@@ -467,10 +446,10 @@
     </el-dialog>
     <!-- 流程日志 -->
     <logDialog :orderId="logOrderId" :infoDialog="infoDialog" @closeLog="closeLog"></logDialog>
-
-    <div id="pdfDom" v-if="pdfDomShow" style="padding: 20px;">
+<!--
+    <div id="pdfDom" v-show="pdfDomShow" style="padding:20px">
       <requirement :detailForm="requireForm"></requirement>
-    </div>
+    </div> -->
   </basic-container>
 </template>
 
@@ -488,7 +467,7 @@ import { getChildList } from '@/api/system/dictbiz'
 import statusData from "@/assets/json/status.json"; // 引入状态数据
 import logDialog from '../../components/order/logDialog.vue'
 import { color } from "echarts";
-import { exportBlob, exportBlob1 } from "@/api/common";
+import { exportBlob, exportBlob1, zipDownload } from "@/api/common";
 import { downloadXls } from "@/util/util";
 let action = "https://api.avuejs.com/imgupload";
 
@@ -821,6 +800,30 @@ export default {
           this.$message.warning('请选择状态为已完成的数据')
         } else {
           console.log('批量导出报告', this.selectionList)
+          let query = {
+            workOrderList: this.selectionList
+          }
+          zipDownload('/api/lab-ops/work-order/batch-report-service', this.selectionList)
+            .then((response) => {
+              const blob = new Blob([response.data])
+              const fileName = '运维服务单.zip'
+              if ('download' in document.createElement('a')) { // 非IE下载
+                const elink = document.createElement('a')
+                elink.download = fileName
+                elink.style.display = 'none'
+                elink.href = URL.createObjectURL(blob)
+                document.body.appendChild(elink)
+                elink.click()
+                URL.revokeObjectURL(elink.href)// 释放URL 对象
+                document.body.removeChild(elink)
+              } else { // IE10+下载
+                navigator.msSaveBlob(blob, fileName)
+              }
+            })
+            .catch((err) => {
+              console.log(err);
+            });
+
         }
       }
     },