From f7a889e3d6369be28913e14da3f05ce91a2ea5fe Mon Sep 17 00:00:00 2001 From: liushuai Date: Wed, 30 Oct 2019 12:56:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/Inventory/CreatePickingList.js | 4 +- src/api/Inventory/PurchaseInRecord.js | 35 +- src/api/Inventory/PurchaseOutRecord.js | 18 +- src/assets/img/img28.png | Bin 0 -> 74103 bytes src/utils/request.js | 4 +- .../index.vue | 4 +- .../Inventory/CreatePickingList/index.vue | 227 ++++----- src/views/Inventory/MaterialOut/index.vue | 450 +++++------------- .../Inventory/PurchaseInRecord/index.vue | 204 +++----- .../Inventory/PurchaseOutRecord/index.vue | 138 +++--- .../ManufacturingCenter/ParseQuery/index.vue | 32 +- 11 files changed, 397 insertions(+), 719 deletions(-) create mode 100644 src/assets/img/img28.png diff --git a/src/api/Inventory/CreatePickingList.js b/src/api/Inventory/CreatePickingList.js index 642bd02b..e4176c32 100644 --- a/src/api/Inventory/CreatePickingList.js +++ b/src/api/Inventory/CreatePickingList.js @@ -42,8 +42,8 @@ export function searchTable(...params) { data: { type: '1', name: '车间装配管理_领料单_三表_查询数据', - param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&名称_check=${params[4]}&名称=${params[5]}&型号_check=${params[6]}&型号=${params[7]}&规格_check=${params[8]}&规格=${params[9]}&零件类型=${params[12]}`, - Pagination: params[10] + '&' + params[11] + param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&名称_check=${params[4]}&名称=${params[5]}&型号_check=${params[6]}&型号=${params[7]}&规格_check=${params[8]}&规格=${params[9]}&领料情况_check=${params[10]}&领料情况=${params[11]}&零件类型=${params[14]}`, + Pagination: params[12] + '&' + params[13] } }) } diff --git a/src/api/Inventory/PurchaseInRecord.js b/src/api/Inventory/PurchaseInRecord.js index e86dedea..7ac36d53 100644 --- a/src/api/Inventory/PurchaseInRecord.js +++ b/src/api/Inventory/PurchaseInRecord.js @@ -1,25 +1,13 @@ import request from '@/utils/request' -// 初始化项目 -export function initProject() { +// 初始化机床项目 +export function initMachineProject() { return request({ url: '', method: 'post', data: { type: '1', - name: 'PDM_项目名称_查询数据_按时间排序' - } - }) -} -// 机床查询 -export function searchMachine(num) { - return request({ - url: '', - method: 'post', - data: { - type: '1', - name: 'PDM_机床名称_查询数据', - param: '项目流水号_check=1&项目流水号=' + num + name: 'PDM_项目名称_查询数据' } }) } @@ -36,27 +24,14 @@ export function searchGroup(num) { }) } // 查询采购件入库记录 -export function searchRecord1(check1, project, check2, machine, check3, group, check4, name, check5, spec, check6, model, pageCurrent, pageSize) { +export function searchRecord1(check1, project, check2, machine, check3, group, check4, name, check5, spec, check6, model, check7, time1, time2, pageCurrent, pageSize) { return request({ url: '', method: 'post', data: { type: '1', name: `库存管理_入库记录_采购件_查询数据`, - param: `项目流水号_check=${check1}&项目流水号=${project}&机床流水号_check=${check2}&机床流水号=${machine}&组件流水号_check=${check3}&组件流水号=${group}&名称_check=${check4}&名称=${name}&规格_check=${check5}&规格=${spec}&图号或型号_check=${check6}&图号或型号=${model}`, - Pagination: pageCurrent + '&' + pageSize - } - }) -} -// 查询离线件入库记录 -export function searchRecord2(check4, name, check5, spec, check6, model, pageCurrent, pageSize) { - return request({ - url: '', - method: 'post', - data: { - type: '1', - name: `库存管理_入库记录_离线件_查询数据`, - param: `名称_check=${check4}&名称=${name}&规格_check=${check5}&规格=${spec}&图号或型号_check=${check6}&图号或型号=${model}`, + param: `项目流水号_check=${check1}&项目流水号=${project}&机床流水号_check=${check2}&机床流水号=${machine}&组件流水号_check=${check3}&组件流水号=${group}&名称_check=${check4}&名称=${name}&规格_check=${check5}&规格=${spec}&图号或型号_check=${check6}&图号或型号=${model}&入库时间_check=${check7}&入库开始时间=${time1}&入库结束时间=${time2}`, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/Inventory/PurchaseOutRecord.js b/src/api/Inventory/PurchaseOutRecord.js index 27505231..b71a1eff 100644 --- a/src/api/Inventory/PurchaseOutRecord.js +++ b/src/api/Inventory/PurchaseOutRecord.js @@ -1,25 +1,13 @@ import request from '@/utils/request' -// 初始化项目 -export function initProject() { +// 初始化机床项目 +export function initMachineProject() { return request({ url: '', method: 'post', data: { type: '1', - name: 'PDM_项目名称_查询数据_按时间排序' - } - }) -} -// 机床查询 -export function searchMachine(num) { - return request({ - url: '', - method: 'post', - data: { - type: '1', - name: 'PDM_机床名称_查询数据', - param: '项目流水号_check=1&项目流水号=' + num + name: 'PDM_项目名称_查询数据' } }) } diff --git a/src/assets/img/img28.png b/src/assets/img/img28.png new file mode 100644 index 0000000000000000000000000000000000000000..60a122b3e2b875f17cf2d9697bf1b9fb9fbb139b GIT binary patch literal 74103 zcmeEv1wd5W*6^XbOL`~~knZkMkq$vXVrXWFp+OWC1O+4o6p#`LMNnG6piya%5)l!Q z5KubiKQpM;+wtE0{`=nJ;GDDf+O_sNd+k_pM7}~!Pz91Ae{0`7%YfE^Cb-C!e9V!Q1yVnTnxr<;bM#< z-<1_c)c~-7zlRti=rA=H?ul>)u)!y)>G(z-}em@<69kPF~8MKZuF%-E%1rz zANq-Wg?vkFrmd=Kt!JRCp?yLfMR|Z&>x455j!6yx?l6Rxfu;(??36hK?Z%ZLFw>X%zdY6k(5(Qy{91Yt$dA*0H%4LS;e`OvMA1Oh9_noe zhA)C)H$Q|23cdt}scl_RVNBHfqV@t21jC0=VaNUOQFNaDuo5b4?+&vE^Pq6{uy?md zg&V=}WnUjC7{)pQhQocGp?+Yv4-9j<`M5iS;SDfM?GCl^245X93XXua^L_acKj}E`&}3T^#}0;09Ck0fS0qQ69RI?jt3$vEiDDng8I2Z5eR-g8#`AU zFMEh8+}**@y`~!^h766c41b~Xp@A^ZF8ZS-=goliv zpr4@U$J3(Lqpg7Nzb$Wl?gJCcoegDx7GZu_u zdOJHpP+(O9BZ!@kmoF*|@&xLJ0}uja05w1l&a@oB5r7{M0VDxgKnYL>jsd!W5pW8y z0_*@Mz#Z@c{D5HKJP;0C0j>c_KpKz<t8 zguRDDg2RNvha-cdjbn!6h~tM7j+2aY8>bwn38x=t3TF)$7nc^78&?un3-=VR3vLkZ zRoryk65PkQ-MEvut9W>L^mu%D@_4#$-6v`#njqRFrX=PiRwX`7>_Z$woKO6ic!>BD z2?@zz5+xFI5(G&MNdd_-lGh{~q*SB=q}rtRq@koYNGnKtNEgWn$hgRq$*jl%$&$$) zkad#HlM|31CRZi5AwNrggS?u2kbISbib9w|m%^RmDn%hh8^sJI9_3+5bxM26iPuCHBn7b<5F`|Yg4;WU!lHB{gQf#hLT2%#)QV7<_1k2%^O-Q z+QYQkv~IMqv}Lpdv|Dt{bjoy4x=6ZvbUk$IhZqkj9fBT;I#hC~|IijagkGKAl|GKX zl75TpTUnIgQ1CGo{^eSmeGzeim{AwmZc?6I z-bOx4{*3}e;f%s9g*S?9iZ+Vbif@%TlZD=(@Dsd%ZBtE{WasD`LM zR>M-$REtu3sZObGte&R+T7zA~QKLv>NmE=iNb|84j@EIlIITf#W^Fs|0_~+^lE*@h zH6ABEZg@QH_}de_C%jJ7=wRv`(@D@7J;`+vcCu0z(ACyW&>hp`*7MY>)yLJ>)4!qr z-ayzO*r3Ib%Fx=d&~VL2#VFQj#Q2D@kMUCzGLzFL1t#mJYNqj~Z_EVELd-f&F`RNf zRb`H6Zeo7heAPnTBFSRvwD{@p(*u^=mj0G)Rt#2dR&~~7);87;&fuIeJyUpQ$41vC z+h)~P+xDjIlAWsEb-OuxCHqACS*ScT9y;wH?-1`W<0$W#;5h4~=#=a<@2u*a=Dh5p z<&x>L?yBpW?}~IYbt`elcR%A^4Wop)!W!W$aDRBW2cJi{#~V)>&m_+!uj5{~y)nEk zy{iz^;AZN%&k>(XJ`=tQzBha~{7n2F_*3}9{GSK#21Eu-2WkZ71z`u-1w9RB3qBt_ z5uzNDbr$2S?b)ZH9HAFOr_O1fyK|oKyzBWFVM1Z?VV^IUUZ}aqeDU1H$xE7-io!|5 zy}}10WFs;!V_$Z@{4!EBGBt89%08<7iqMthD?3;1uC_-DN2f$1V;o{$#!AFyT*JKv zyEYJ~7m_-CezKxo9pTJ={*@r8TT@oGp}TB-EzM5DoZn~BKvT5at>~eZ_fK%liZd(sl0;Q z47ab`-pz;Qzqw;@r?Eh?prDYcFt!M@$fszw_;hjCUA4Pa_xSH+mC%-4xewg;x&NW` zOzA+`@v^56q#oRR$o24MIaPU71x7_c#ZskH<(sNgRo&Ics-M=#)|A%@)aE~8dvv3Y zrY^Rgu>N8_vLUcx^|8m}`6rG~CZAeA9eHN8_e?x$gQN#hxdU+I=1UC;Phx zj0au~o*sPj%Kp{NklWDmu7vGb-Po8F-E|?LSc{Hmr+x5ZX!_=I|-1dC<0>#43#UqOkKPr8EzGSvE zwd}QwT)Fy*{!{*EvCmIe^;Tc6xvy=nM{Uq=+}V`cY}qp1n%?%?!P`mM<=L&-JH9uH zbVnkQ3ji_tq-3qC17IK*0aA1fus;Xx3^0%*z(s%j`v(+| z!vHZBx=ji|5%|1)M6kSq$nA_<5Q9c9YaPF$ww|L}^%h-ZO(*h z`|KWV86{kdWdl7Mh6?BlnT-!o^e1omub;d%!AZa_-rJ@XiGAW^ytMZ5I}wy8E@NGI zd($I)x-{w0qsLC3oEx0E7c-t3U_YlIz!Pi5^-WRG;8K5j8sOBpt-!;RrX9;dAl9M0 zqJ2C!d)l1}dy~{C-XQ)2aU^qZZXRd6HV?9E)#%CN=O@F($?J70x4Gk_;Yo!BM>i6rR5I^m@jZ}&bvH8+3>*h@l&f&+3#gy)!rOu5o zXurY3;^9GduNqx%FW}7oko%_}Ef;o7+uOjR@K01Rx1y{K^?VG;vYcI8)0Y*hr6M3Xu}XtD9pzlm4FJPpYG^$ z3mLksp|d|Khl(=-RR)#3UnkV-q>Ve&NZkx2HrQ`$zkr?>9PVHUMfiB=+PZ-92>{25 z%}Me~eJBi77$EfcmJY_y1y$S-urD|e+xj@WA)I08O2BjibZ%9hQ^)uFFN>-IlOMeO z&_~Me`l#!HIyHh434jijQ`G|j`-(Q8>SpWpEn?v4t@ACS>IGB%Ap%4E5IJG%=KU?@ zq$9%jTSVR6P3>C*q}&fxtJt|Ze(Cx?T>$V%4GKfh!YaVP9s;q4``9YM-=Hu=Uz%R9 zpTShzex6Uo%ihQshS1Re4@|>PCy;@tNBT@Mxcc6mzp)SbK8gOdD$tQLe+r2$nCt~ z9;QxE@a2MI5Qzowv2_zq6;6>fkM8-15R^fdv* z?Hd@y9aszdH~?qBCpi0leWE$%FglGCeMjFE&w+9rRH+qoln?;GRU5qaq1Ys7D2i`c z(BnccxeHG4h~?78+Zq$nc#)-1(KDT z_6;I}hJ*6FZxC@b1jP?uN}=mSN#;OV-dC*masT0tHG@k2A^v^nUr9sL0#!BGw=a|e zpWnrV&@ph=fX<1+8ihA%{86AG_-M!%&c;*%s{wysYC=h*zX(szc^ObqEYvvN?>Q=p zmW$#lfB{xO8n6c(02@FY5Ci|j0Vyyp1U{ufsfrXRsg(po!E}4@DFH(4K?n*e4c;Zd zQYiZW{Q3@tYUP_G`diNLGJJ!5=?*Fm^KnDXpeUl?+QNNc_TE34C+rX?876u`Krz?1 z5ex!opmqK>ORF2AYS%@>z&c25d=PL=C=BXlgFuOl0l+B0o}8j~6gp8#jcJjpL7Uk=jAs+>Ag;wYImGkV^1)>?U8qKh92M>!=C}X1%^6 zF2#QRDw^LCz#_m&I1EK=0tDOxT>8DC-_MYQZs1hsascEW;0?tbx4<7e7<>Z&ijP6K5pW1R@f_${4sUVNL09C*c6cD0> z8K@S>Zh=7ngV@~$=B#a?Vel2M3{yji-QIw|pNs#nKq#QBVfejN2GH=*hW(N%r$ex#jH*S$OA}NbgUSSy%=60yR{YCizppi+#fuu=Ka%f(_;`IUcn37RHN3v! zgAxsXZSjOE>^riNDz=y^apJcU7-kwEfkbT%Cmp0ZD5Bu z+sm_?it7mJc&I|1oV5bIpoW1bjqCzl?WFD56%`8lx1FaCfpb&8ZQGPoiVPS}bgn+P^xP*l8Q3z+};9fO|O#f@ZGLs5(SM_`w|f z-T^R#jXyuko8xN@YM^zmmor+Q1wqva>S}xt^6Vg{`(1GN_*U&N(&}qQd%JJ>JV2o+ zx^a6uL8u$l9STEugLD-}bst@+$5+ekZ$*Ao^|xg7%lKLdB(09lFBkaw-rU{4HQ|j= z_XWH0TW{GLCEye^fO>;AsCH0wUl2_WRAU}8s$NhVP;+GjYOTJ$s9!NQ|1LiiRCGb* z*-_T#{6f_9#q+VKC*|~f#rYbn7F98xTFKrp5Gp7Bg`)>43*}$wUZL!cd!$N z+Cqh-r6fe{zt*;|MzC@FzE%`Q_F#>6qP9|!LQ*#T5)KYh{8Hj#;{4L0_NX@_CJB{v zuz`w7*`pZdhnBzAq73%U8yqX%Ul>xw#_>zY%~|2EBP}P0;zh6u$bM+QTEX9Lf1hev z&M15WzF=Vp_56kp1kDsOHg+iGwLH5WYLr7k`s{<9f8kC2A-a4i?+2<}e{=ZnH{%U= zK=|2sL6sfBH~S0RrHY#NB!6({U>E#V{NXT^V&jJ%c-VM>wgL#Km$y8-gBRQ#vd;~+ z?j8^X{7VGQ8oyelw~g-))%_AdY(=E(Bgo0zWnlp^~d`1 zy`RokGX10<=z+gKY6X8fpwVgHEm&W<16&1B!Eej2!q;W;;CVoS0}32a;D7=L6gZ&3 z{}2U!IKV?;;19-meFawqK2a4jgR{9BmIAZ4Vr64;*a|9BmIA zZ4Vr6|Ei$Xi`QQq%5;v56@|+0&l4EA|%<2^XO`51#c-@<=&+ z^5K=1(b7H!TIxDFIlK7!`3D4E3XixP8I_ond_5&KEjRCW{+)uthvgNORn;|(P0cN> zZS8&i1B0)IhTl!SpPrfh@OgD@ePeSA>^{mF7#j-*8yg!J7snk$nF4eM#u3H^*r}BD z@kDH>J@Hk}bHvdYWZBY+5|na2=~nexqMHa41AT%I*{LmOmmL>b9ZTO6|?R&k8*H&;+WaiMuasMy^ z;xwiDbWZWT5s2GQ(?wX8# zj^u!_XfOYlX=$l!Cg%v3n4B9E2E?s`a$XpW)($`N)X?s!XDG++3eIG;9I0&C+UCRAs~ps<3oQ<<6f5aDjs&2TNFeiW=siCvB+#xB`jQ$6NLnEQ z$KH3lCA*7{XY12LN3YVRn^aq#m9^fH-`=&Cuex25o1FQnTX1u$a%@fcq3lhbPMmg zQ?kRHQtvaJd{-ccPh!j&NUnKOb1_0vDqHQ((}*O zVqQ1*+=Kh{x^p%upC++9d^iU&si8BSPMv?_$sr#lE#j@?n3aYvGJ^wdBY_c8>$;i| z%nnbQ&K`}IvZ}70Z)xzvjKs`)^=ay`70 zyGfmUXCEoRgQF!Y=AJMTEk6`;c(!$eyLTsKdk-J(6TyfoAo$5=a@}^#DYOyYMChm0 z!EM=bG*(DphV23p$dUiJhi~oUY<)LkuPqCFixx=We8f=6rc&l!`!qO|EHiIpa-6Fk zlTsq9I7xgEl?iUhDFYofe^$aWJ{_h98{q{Q>Pbii@p9ol7iNbo8vzpQnrZ!?+A z$HHO>SNiH(9W6NOhuN=FSVR>y+j76q6k%ZGygYYuSw<$om-vt~q+OvaXz=CDj+YfX z<pqSJl?1I@9RLpK@!vWekljCC zht2$Wkbrk}!?uM<=%bg{3$mdYQ#&o>cm6myVH;fW&1hY@^cHxb>twEwwWqT$Dg~8@6AFp0w@vgA;v70#}W7aC@@Ge3Cu~Y5FXV!k1kf^KVnT zGvkUB@{_jLV|U>y`0VU#Ed$08DIZ?d^TGMY8Upd|`3Y>kc(d;CE;)iPs&L!_&Y_d= z*q2{mw6ouR#}^4S>+0h0#BSt@wTT01xIH5hv!S)A-Zc+CaZMgFWR;e@`J((Asa^~~#65xq@Rn&x~~=O+WrnDe0_R^+87 zlb(Tt%gQbSc6^~CNl{w%24_>+o8hS+d=1omdoPry#R zX02R_-1cpLcF_fTT?3QsBF--PQ!Xw6v>I-3cue6x45w0dm?o}Pm&o5N^&Uc&2IuS0yosXmW4?;E`1+^%$abh?03xS83gK+|9lkB;%; zh~4YE<;5MIu1@Pfn^&&}*3lZ?aMj}E%VD=LagM0Fc0=nD{jRt{Gel_`=V&M~7$W_qEZyD{|D8e?V(?9BM$y{s{cA&FHR3r)h8WyhY#$@`1vSw~`%3B=e9vtM_u ztc-th&b7jDPbe)cQMt(E=J`g!J0+PWWEV;b+85joo0N$~J>aP*rI%^7GtrtTYO}R1 zE{qYg)iRD7GNRPNY)n|RElr)S2n)cW?~&l>DhtzGkk_o_E!8>7bFH{t;jtELtB-#s zPs9Axt(-lAzVYog#rmVWOAS+}8<0R=2su8sDX82CHAMH=tnB<@t%ee&KK%+pd?<@EoG;$Mt#-B0S#*5fNQb zOS9KlFu7%?f~YCWe4(}J(@h%Ckm)+b-{MvN{F*XHiFb(?&l%pUF&G?NW~`Y?F&o3_ z7i&HG7UYW>DqdP$7k}s_m~n3tEAH;C<_Y2L>?>?FE_?+d0ixK~LWyJUI%s3y5WHPm z;~kbHNf~z<72uzajyLYA4Ged5O1C96;8%WRkjQZ!OCD=Iy*89q;qVaL8_wHCM9=8$ zRlv~6c*0DsiExAM3AQ~0@n>e=mv8R2EV@P6SMDK!>om%#FMJ(vvr8P-jpg}i`S3Dz z*V!)KotvQyDu^RI6x?4`#6JiP9x0-4d*9hh#9sE1pu6Q-8 zW#|%WLdAs3uBAD5*`=)Gg|GH}*qVr!=B&P&B1y>G1Zfv9y!;yfVkt!aN&k6wpOWLW zW0p5AH!a8z%D2?dt<)w2!vaTlNsq(t^*p!rtr(rNiBF4g*ByQ+daTdk9)3|?LE)v8 z4t;UClN5TG<6|QYJ>oUR^;$koKjFCp zRX~5&^aDnd3q;Yc#x4y?@vKR3d-odH#WS=&$}o22Xwsj&eYGI3@J>{FS>*G8veu!M zne+VaNgTR>n6s#?F5KIL+y9EzF;0CaQMvO)Z#5#gj?u1IZq&RFuMX-cTdBHPT&8p< zdC;VydF(JI;%tQA4WTRKfkol3+O$dSnsEZ{e znZ)u2cdH=VVpq1sw`DZBn*;f42PaD`;TPwfKUu#f@J_#>8`1LKPhP_%IK~d|;*)pI zUR4VvWw>hc3aqpbdN_Lx^i?tfET`@`=XK3`-CDiXwCjweevdx)yfD0$b?>Q6!>eBCR6IwOO;er7yU9!Jg{G%mPQ31sS<5m1 zTva@`W52y;^&+qJU1@DW%`?7!v9g}s1ii`oLpp7`HP`ud)D5W$?&cTeU3~VgpZ1#Z zr0e#os8vB1*~JaV{@UY;<&_SPN5@JBZd780zczccHb1xfX@|qh*F-hc^sUJD10P>; zUxWC1!uj$L7z<&0`%FPra<-|RXpJVJrYa?i;)m^!K<`Fagh2jWu%@2R>sNDfxVo}w zjSEg?-MtQy>h{tkP4U+ytN0|vLmXV{X|U*m8^;B$FWN>S9a-? zZ0^^l<@mXeO+6Cc-1?MW&}J{PGAW5jl6HT&bZ_#7fxtwVaduh-p^J=kaHy#pba-2AAiL)+wQw{9 zrx-zCNr<2*<~jPbTqZTLfIaGwq{-y6|J{honc{J+20j&U@;euV*HRw2=&Ng&7gZ#& z(3;(0x8@Qv+9bSg(AaL@>&IJhSYm`pNZA#(B6>IR{M)B@Fl^%?iF&dstu4}bMPuS# zR6i;kJyBRVc*H=}M7*ddxrm8UUtP+es$jMkrNDw% zD_fB0r?RS&`B^}D|1m80BaTuFJ!2(9g~OJ2tteLR zBomOA81!Pq8JQ8|j6Ndv^0u+z^wTK0B5Q?2LjaOu#(Vju=VL78Hx@%-o~%x@9OTpq zv;D7j^7HSol5DkE(Hr0CEf~IQC1H5-N(C{o1BvY|t@dyvFboL^SvLF_Nc^b!>@vwQ zNxjCa=Wc617XMs;*&uv#bs)C-O7ZD!mv{zIcdsK%1nxp<7<1}}GtRB*j%2z|tjCPL zT#$dJyF;;yDaTqjMMWY@dg%c>lw62tK71I(;O7yP=$ha@7; z_{5Phh>&YYQRrXu&>&-}v8i@nyU{$NFnG3RqB?rgGtS6|_h}WR>rE87*O5RXuR2EM z%*MetqIIdG)i-Ia!h@|GDJ<#=XcPFOiZ1t>+VN$?vQjtGzvZWXEv+9V3Ov5Ct$5)E z*Td@Lwa1C1rlK$8TsFTm$=h*?uwMuN4uo8|%V09jwyrWrcC2~L%pS**K@Tg3P(;|s zq^JE@`5{VzPThFKz_U#HN5Vb`@&2~DWh(d4I;gKfp<6WR5XB+kZC994<)L9ha#ejp z19sll>{D_HRw{|!5(`WNy*Y&;e32B!N+!wW&QR8wGVP6_Hcn=aV_i5e+HNo?8S?a>EuZm9C3B zA4)5I!E=l>&O9jOzOpy})J)KW3~Tg zGL_7sF=7|7Bf=cLO=g$d3GNV&p1AwEvHGYVd;tjv3|nhfsl;%anx0)_cRY64T;E*s zyaD78g`h2t617?Avx~l)Y=bh!Bh4e(+JpsgrqI#Ri_q8O$^}WVP)@SW()|1F7GoiW zVGp;$&Z^Ej(kSv?Q|OVw3Yknb9g2P@jAhz${*&S+6Q@NZ{plRwQr}RCkFrGzP9+{5&`QUBwOl=!%D_dh;Jf zNp-VF(@ISmtEn;Q>*FLDo1Vj)9C4HjY*4xlpY&5%l)HP@Te@$Aj{ADMk-U{keGZP6 zV{xH(p?PFGK>upxg=<1v^_tLwb)pQ3ZKJXWV=%iYVRd~zeWf>etpQ{L7b=-@IwZZz zU%a>~$dUGdnufb?XA49SdVDfsXEPeqKxD{-x-<;Rj*@N3j)I7*_A2&e7=Vh2VAhXV zC81?`%ME+M%}+oj9}~;^UiIrYq1~^i_qG* z=_C(j7CyoYVZyy}D{wxww_5XT#J6wFFlnliI^tX&l`0%%@nclI{>i@iWIq)lstCBd|B{WP$8#YiUdA&;N2J8>e{wL0vfWQ zhD|1}VX$_rbIS=HIxXt+aqX0XVrXafD{v@HT^Mf|h!|nr5*`kH$u{`^I~$^KXjgqe zKEzr-e#nB(eWCc$X;xQx7&o1+jxm>Thy$w>PFOq!6dTJX=v9#1t7_JSO^2xx36hG} zJ*EuDTNsKcn$xPz1wWqb@=Mu$IvoQmKQ7=f27}vZ^c5T}Zf8jB&p!|G;J&0=qGDQV zt#qIgI?#yy&nN^NkbOT|j{YkxpVaan?pd7)w0QS=Xm;-jb=6pOUClIXT6m;9Hq!U~ zhkIiI#c~(q`O-O<4QaSU=r^{V=`3FJFi)&o&CGJ-UM|yUU9Q2?RH0`+WO>TWLzxzG z0aO|nXZ+JO$WfUc*4O&286+aCKTbrReox0ST;-l$D_j6=Jzh~}VJaF|bc0On>YZ|r z7n-_aDyrE^(Nxrw0aRl_S?jhR)9(&h=;GC_nb=;Jt*FFdFq!lci!C_C*vl`k=GafY zROOT(ropwT^39NN=jF zB??~bYcw6Ob@kq;i?lfR#L)eei2q_^uPC)aq;J4P|4~`>)`Qmh#uaS^a7y5`EL|dV^^I*?C{1Wt zV6GfYr?03Phv`;3NjT8al~2BwE!iGPOAcn{mmrj);c`*d5TR)bzJd`hHDbY`zF60P z({|Z^=ddW_rAB?j$x^8(LOCl@R!zz$+R8Dv^39LQ@R}K3j5!jgPwhbs$ZwY*CV$t0 zC8d&fWaLHz$*D>|7#2Z|#GVqUKOuhtJ8Db{C$U^ha<s|2sRKqZY?)7hp39z8_&-&-CGG zKJyAqL$!`Bi~dO9syj(#*xcO(%fVX)3&$1^WX6_;QJHLp7IKs)n~g5ZG!g6P*Q_g% zb(CD%wkY$3Te}M+&yiNX3K-rSd|E#>R_h0Kud6#u1ywE=)wy2O+Hd1LJDqV;ckMh6 z*0A{n%yc;!klY@Drnf7sRejbt?yZS4Dqp!(XB^_AOcvMa@PS>e)v+wTghcMW7_A-+ zg~5@hEeuD%^~wAXSuA()>~&bTC~hvvgN7g3CALUl6%S?X@?Qb1VvTNKO|qEZvMBcG zE$7CmT~c~;6f z^y<-odG@iF`V7>AgOXwQugkwM(@l{8>tLJij*dU;9-jPpaE{I@ z`9E`BP|8wl7$f8uNN-z3LD{Ex4g2(s0BT@K4f^-4X1 z_I$3+OLcXZnr#XS3#SV%P{mx&^3`xSeO81%rI=jY($d&ao!nSd=V-2L+$(UqD)cXI zSI?g;0#zP!@ACH!KOzI&IWiuD>w4GV?;bh-e{LTC#V-F-P;dB&+5Q1b|Av)V}|FF~aPYf>)SoOD9HN<*52noEqD1g}^ z2w!*}#603KRv|F?vzp^E`kYI-5V6}*=lj_&EY|h({`r$QW(d~H#uxXiPswJ! z3%)Zr@%H*VjoD-#>OJGca04kwm=sEm#R$rNe|en!9djXqVAYZF-y)mq1X>V9R-I> z&7gup;>TDvrkPLhdzIvKmA%%{pU3C&?tVtIRmiWg)$flOn!7J_>byfbuP5Y{NrjZA zJf2wF<11e$oy*RYf3WgG&R}Y-Vw_Qt<+HI*fQ!tr1f$ii_eV^4%~Ncy^?!(VmLIG+ zv2*^ZU!OeDSkHS|zB{hV6sxRI?WC;c&oQ4G-xUeBJ>WC1NnlMXoM(7dkRK0eqftxr zE_PFWC~{7}Zm{O4b$f%GAB@9xk+}JNk&8mgiv;~r4|*qVw>*uYMZ=Al$;ZdpScp%T z7RPB_6zS7-wxyU!$_Ho7;a{CgzV9@G4t7)*(f8i<@Nm#}(bA2Oz448+qMkmab7S;r z?qZjdLIcv9;lXlLb2qg)1BJV0G|W2VuC;?&9Fvkye2@J&>$pp2B{gPWjWjbwcrQc| zYf#y)n#>NT&OTVR(3DF&EHfIjFv=%Ww#iN%r&k=y(cB@_WtT7(lry*NiZ^QEmsh9KuIE3C2Vw4M}ooMBR#cm)vzp6&P<_fRF+PbUkVAx>RuWh zx#GFF#cO`u@;LFTl*~oVp63^>!8uSx@}!Y_V9bMIZimUDWhsW>;Hr(~Qw{;5QqOM- z)SUL6Xqhf#ekW?r*4kvuqH?Q)J2?xQ&~~`a9bE3xe{DR^P=9FH*sDJl`quR^5?GR+ zCj&7gIs1pY_p46s*$-+&EIRN;H`Qlva^WsNcMz)e&8d*sd)p>4GJMGHWI~U--12M0 ztcCvZm=NIm&YQD)%J=2CQ2CB<6S1oiuUfn& zd-k1EA%iuQR$1+9wD7wUR@UW9VvLUW=a#PN)ZF)PkFCndZlybOkt&orUX3Ho<;)@^ z?llExwlD{%Ipg}>Gv6J09uZ-?GRleBBSkCA-Np*M5!}`a+^nbKwCL{?h|rsxy9_zs ziq|XPS3`I|bU9uua*YBUL-^q7HyAZKOu^BiSP6~}S8I^=9_}wz2$N2%rmGGZ-`B{k zlNkBPw0hRcf@n4;e^i#0LaT8XFS(vA==6Cn`N0}%x4Y9(=woUCS3{<$g%s+{+=nPS1c!!wYe2gcFAv6nm6LQ>?Uz;M(70g84lW&eeUgGnHsyM`6mDF zFi`=vpmr`-$eDhoC>&vJF5~#?V?jla{?KNu%dgh6uH;l)m}O*L;3t?ZWt7whr%Fe& zMV-00>+IZdd4(5v!pC0W=bX!;;3E^I3YOv3(NQ~?w@rP!9&GWT35H}nVj}B zm9!jOVK3|)oGBT0PFh7TZ}Re3(V7w+6_In(zX13{K7oBGc$k>@kosXCHFaN~*%q&p z^O2cZwwSc!nB+8J5_xfPIW_~SNp<|o=WxJ}z_EaH`So9${(tsulG*D#l}o8LSD8)h z=rrRq-QUxBoPic!a*!$>p5*nIP0S&C`ut&kl0M(?2Tt3gZkjdgx>jHVzq%Cs;s;P> zsApI=mc7R}()NypE@{9}tKzS(Ie(9!5WA+Lt`b9*sTFL4+NjG863!&u5Mc-`)Fxhv9bTO@hv7CmuU zPtCP{&)W)|d5M|BWE?mH`n{m8l6Z)zE^Uz* z$hHn_JrHF<+X6BE3#0J+o!38h&;D;g?4N9ThM8V~Qm!{Q?C1o11eNPZ0A$i{+Vx(6 z@sSOkf=f;Ab(L3go}KYPh;2OA;ASQ4?e5a+(O?hDz`uTunyld6jd*QNP&_d^_os&1 z|GeVkZ&369`=zA6xLo|-*m2$!0#k&G~=9aHWd}w2>*h`k`S*C4CnO)D4=0 zGs3@OC-ZkG5&lHKFw?P+0E+-9%B8Yy)7`^=(f|F___K=s{fviNA(irtLF=Pcl;IJT z6(0D7y3RA;QSd*Qs{g^ue&|2hIOu?#e@BvVz|MbaZ-(CaVl&RwtVvqHUzfdNeEP_y zNcJ==EuOnRrROFebp>HMH<@b9O7}PPl?5=-30}G4S)Eg_p_tlKO68* zwn93X0S;z>f0wav7i-PB#^+JyIBr8Xm#T{VrS#NG<3SB)``;Ek06+AxF5t~|9{k|5 z>)Q|S$U|07R9(H;+i$AQDfEn?P+2ZM8PvJVWo{iE4>epdtU14Rt%@w>iSkZi_^YGt zy8_zaRtB6O3SVw+ccteyNOm^wUaF|9*j@;ERy94pmg_#QKIq>rpRcYo;_>d2NdM~I z_>;>8D($hx{EjzcnY2&RYVt_dteZ6SZ=1@N)@(buGk4UMS$veOTuMwCy}i)ULhZ9z zc!&CRwkI8z9tE{KpIq_fyJBU}tu(D>Fav^+7i zk&nlDZuSNvQ(=6-o207_X>gy#tEPWgkN=CZuK%N1^`C6f_3xh^>4(aWKlJOgTq{>+ zcDEWE@sHjt^Sik5L8ds#1P`M=@0o+$Xs_K&ymoHx?Rz7AdIQ>&qRQ0o{V?%wBR~d` z+!o1X)+8IZ6s5X?8+EpGNKc1;OGF2|zi{T+OzQ`HIdYVHS!8EhW_qploptbg4O3fl zfo}EPuQmlgt|>lTTk9B;_4DjE?Ar9u#7d3|R{IoE4wauvi{^&LWCbrXhNfQu#oc&A zvV(5E5`9nLA*t7IzjTjoQAs5}c{2H}%w?j7A}yQ-z;Xxm<)u#IC>CjoNgq=KJkZ&- z6CAj|y;H~HPH3_5?BBfF6hg~Q6`5VsHYJiOQ*}hRYSbN@#Mts$tEsVwIx%@;G-p}s z6Mba|2qq{jL{K1s2Rxw1UFbUKan}cW+*yPCc#r#CeoH#{!gfo+im1if%zf~?oUZRz zeE2t_uFzaA%((5RI23azHTDfFh!%AAgBHG>U;P@;dnXw1#c*^k+q-ZwYL6lqpmiobTLhc zDsfjWDCP&fXdDbDGr>=mE`oM%-36tgTMejf+}{XR#`9T|R9UNUX?1_Z+A(&0ASfEE ze_?m5bbAh`vPgJS?P@VmLIlzEe40LZh-mMLQ0;z3%_FDiz#0AC#&YEAYL=m~Yil20 zd~i=M^^lF>z1x}iEckYKMoC4P$J^OEM_fDtj)*#Q_I-@Kot2--Ek)Tx?Ad+mR2DQ3 zRMdZP-qYCe$jcAQPykEcbFUhCFo36F!g4M&g+zRtFn2QR_7o;B9(DR^DWzm z`^yM&dhRwu_H&VOVVr`NCmv~K720B87l7PgqW`;V2Fj-P)|~I!Ms9HlJ$W`X zc6Ga!EV83VH}-kY8{r#_ID`IyH}6Rl7`U7&%6feDa$dTLlR*|oDo3gnC%8yC{UPPo z&x9K&z~3Q`>EZz`Im@mt=z=mMP})*A2>mME=yM3ey%Tfy*2R8h;?K**Vp{zahW*-1 zNkZzv3`v|$wvKvkP2|^(T?s1j;r>$x8w8=>`i_4U>yAz+0}|NakSGCX+5Zsds(-Q> z=D&S?{Wb`xSQC%{&6!Q%hAj!pChIlJpuwE`B8*Qn((G6)BoDisrdx8uAu18p)L%0` zT$szO-<)R9qZN}eH^x{j!AMmpEHzJx$E+UlbYiAp`PCyUnGD`zOd%wkDhw{ijyWkA zsp(OzthApFD;L0Xabr2QIXl6lFTh!L?DS`m$cZQfC9e*{ zu_7^1!{@Z>q}gV?H1^TOAzB~kb+Iw=QIi(@%aW=VG;#gebGqibd!o{P+0WNrPi9|+ zop{TugG-ofal*G^EcMa=_L&ABsnUWtRYr|Cc5n^!|G!l-{vGNL1mT&``5akLh)a(0 zCjIC$gi=@kMW@*R=n3q{ABX$@$u>XR-u`_P*w32!&jb8D+Kqozw|Bs+za#ScR|eWY z+3f6qSAXMt{txBVKkgPY^yR!YEB+7ik3q@RW=Ka?G(a2sTBuzdbJlFexhSY6ad*34 ziTz3TM6#Y?W|o%pqhwtu5d*2hpEgKC3+XV=s+$Sd9%QpH}PpgXLt*WN>}^3O!Q5pZ(528kg@`k*_3FKttHz081Sk&}gWW&nJ)m{3VV)#!SXPmszCy#6`2FxGb);$R zy$j)12wlxnC-iX)uMo0aGT`pH)s&kJ8<)O}df6@o`Ki7im+ac;-SqZ=~ z_K(`B{qes1GpE9T-H*mH6l0Sf{67i}^AtZTeJt5SpC{IrSmQE3t;&GM3^h{lf6ZJ- zLP@1U-;q+)XU$kGUKbv+RJFbwduN;X#9dO!T)zx%u2V5OspkECDLZ#f&kQu_$i?Am z6>{dJ+u1T_C1OS|)^*$N8E@OwdNR^^I7o_H=znf@ON+j8u0vTC$}2kVmD%XWf_Vym z$#yE*K1z)(IXmb$d92!9MNnqe{l{cxwVt*?xAR3$N%W47SzjFaxP}CtE#J6u$Ioi! zd9QP>TG96NMbV&%H<_p3YIAhQM5u@~2VV_01!ZR3NuZRNn~~A1DyDZ9E8fNLn4+Y{ z$0+<{Uj`G6;t(WY#lg3A-bMP-V;uYjkmcj7=^@2U?`o}a8r~LV*3bOE_O3gs$uxW8 z2sYXvMF9a3rGwI?%Q*BVy-DvSAV@+N5fy1cLXjdMEkNj92t`E*5L)OY6ltP#kRsLJ zmp!|CX3x%VRvdTM8TmKoe0jg}-upcF-sj%8)aN!cb_bdUPh^onX7lUY2Aa8bRkE8%(Y)FwZKvb>;f7Ux%6ZE*9PYEJX9ehwSkWi!{VA* z#|9C@)Pzo3Dt&j{O1OE)UXRDiP84J}_iA3he&f_fTf4XY2|^Lz#Xx8|c8n)mxcn0D z;sRNANS&}tS>P>j$M`&`Q8CPnl<3&_2+rTtX`6F)kflsV=!SW^K?do08xlzX6^{5W zzur_8Y2@uqfh_G8wu7ejr_MnIoY%?buv-a9#t}hE>ZKi1l}#2W1l25Is-Ex5)5ImeKf0xI*-shPtQ<67koxSkqOl$;(5}*L)X4=)M@h8x3dWP< zUpB+YYDu_KD>|^G2UwXIn?L$7bg{Nq{m;}2!1}ALSK9Sx($rOHkq?epD~STG<^qzX z$BjU3aALRl@btLBLDi~E5k~Y3Q3U-?1!1pvdDjy z55Ftz;$I0SzfH{h%}~8Z%AY8B&1)aBpgXd2fu1z5n z6a=S$?i0Wrf-eIX{kB*7C9U{_GIp#YHk~;7567j3Mz0$3G*-?!7FE&JNXgPUoN7&~ zeVR3_pHd4aIbuCJZ!~7_Qzg=i&rjOo?h!K8nN4u*F+Ui?-R;N3?5x8#{qY^Pr27C}vdiu;e_wjG zy;dtKJy0}0wRNgkKgagx{N^sR>C8|*9r>g5&C%^f3angyQrh+S09*}!+2?c6XIl03 zlZ`-6^@QU`pttuWZMh%71cdMf^3enR(LZUy=db;HFRA~o#Fk&U)xOEN{7=Y0zVP+C zlPrp37W!oWI2R`!TBAfg$mu4k$Hz~EEn zmXsLSv;Z95X7C^*#r;jO5O8`nQ?#{|eri%sX1sgNG$4|%=Wlf(zLvmKMMa8yOu5P!5Tx*wAeB9dIql;E0ggwBAY)R>w#^%v?fgD1Y z{I1WG?e2CRUct0iSHFYr3wmFWWericvf7x0z?>Fx%PR`rzE~3T%Pgv-c{2hw3UvcH zh1ft|$G79+n#^k41$BxV4DHMsW0URDR<*e~E(!o{O!`ma#{Ttm`p>jjLHVZ*=%=|j zjj8OhTQ??(w_4l8I#OP9EN?kfBS;`hhK{p8wo6iLD_+VoWM#rDl(PIkEB5{e%k7aP z77ZGH?qo8K+u~H|AQ!r>3VS{6`XN)5=BIll%tAssf-5ju28HvV2rBV}`@qOkE@1|Mq8FzR-(9*a0Mkn`SJpqq^mV`GM3}V7;EeExkoKT83BCi zJUGccU}pD^gR=wP7?D`vzH}ihbS^2i$|D&)R@L^iC{N2kFETdKu1`CF`>L0S?O=gPU2@V( z(<+XLhwNE<8tFZL_$-#>SfUcic(^r?*cZ7jgT0lxTM5U34)N+d5&dp7WYoJ?W08Pasp`m2V5}z7Y zeYcS+i3M<4(*Mb6xi>z~8g?J_ZrO;vOq@7;a$|-mY}jCXq3~f&pKh?;X8gRf0G|Zi zd45I4Fn8>TuE3-oKX6usOvK6(kPV;R2D0Ju8~AKEewr4da9@YM6Uphg$=V(g@PUCg z9GZqGh|;5g=zWwO;e7=Yt*dN zX$8#_jGRh{)<@>e{GSM-0Q)re?}h`tB@7jQz}{1I!4gw z7OLJpdy)uc16d78iBtn!&3ChPb0eorzV+DX^T6c4?6AKyg!~4f?f1s2pZ7g}?<)0Q zHtLYsAJg9@87ktS_~;>Mbw{45IJI4ku=@t6nxx#>aeifXqAPx;AO>M9`uL*K@cH9F zjeOuhOyfQAfF!s~EZx=|!r1s)<^j(0lq@_Q{^(eOJvkza*;G?5XV!snwNrc~sfBGB zP}D0I{wJ^hFPPhP32TzHwNf5C9&y`t95O}opiaW2C7CM%@dPTuwRTB+PumEXT2lFU zBG4s*Nn$A8m!3c8{AzH`kohi;nxl}$IZK|ZQndii4+dUc-WfiIS6^bN%q_!+@YFdq z>OdUA{pefQwHvz$b5HZMF(^~mJLo&qKwtI+!)k6eGbg$*Rl%m+eDNtRLuO}^Zhr(o zQo2_DB24xhwB2vi%l%F^{H4zIfXjYYBEPRbq2yn@)c-oV_-|ygfA0f+o0-6`9;q!I z2+lrpqkLDQvqRJT4MFc`ZkU7Z!b8*i^3vjWrH$z#Lh`$NF2N+(NUf6DI>9dfpj{9O zp2e|y+rn8!;p9Fhy-Bz2_*!^B`MAEHijaFb)hc;I6M7y0=k!3L|M&8S1Kix71I+);H-A?$7L3Ez@qjxobLSQd z8`=hqXX09|H|vi3^|YIkDd(>s>F6A|-!8u5754UG%eQUQut7LTNho~^ z!A-o$i|@JxfvE?bMYx~1y%Y1jCF5gc18fpq#H03<`PgRvHjWm(|HucqzltuZUo%+K z`$S-wjL+k3GcPXfpm|>b)kj;5=^oSvKONv*5VC%W8wpskY>KS^hA7@?`KK{10(sJs z`OAAWe$<}`250bDki-8xe4mGV>Azz~GiPpiuqdQePJ37@D}lK&nDr&u8+~H@G3G=@ zpm<-<78%RMJ3x&QypX^0i9n>3kA=8m|N16~^hiOA)yxOWYGO81qo_7LMOdrVs@Khm z#$*Hnp611M)$$D!i@JXvot+Oy5Ra+;);*w%g#ezHV$afA5*~x9IrGj*2$8b95SwvND@?Gr7(EL{6!4Y~XytmQMQU@N48Pt2bgImL z7N_Zwj+*nEHjZr8)7%YMnCFoMfsA#8>1iLlGjJV@JpqBR z56R|7v&`NGS`S!fjmO2}a_`7)T3d4ms;r@9F>$d80^8}dJoP1ZbLREi)!uQ#cg_L; z^G+Fy(<3TbcK5mMd?VqU4yAT;@Fi6pu#T(_SZiR)P4ry24_ZSh!EnmUm z4K(dyUQ@q(BuWRNa^mz$4JxgM^K`JE^)zW^80SV*KFe$T^}~^Wi%-7B58u}~z^^_2 z{4j?8qf?@P6*D(IuyX7V+-qNbbjKk&9;C7D5B$qDqnR|{TSU~`3$6QwfhinJ?DJCq`GZHmL4%9-eetkZv zEb*JHc5mmkCe8IHmb%xKanB8DcEkpHs3e0zpWSVdQi`V{R0*SC_MWw#kR{dn@x&zs z$${#Uh|j979yhA2^iDUMGHY0>>zr$kd6JVB!KNHKf*b%Xw1vxw*-vE#F%ywlz-dj6 z$I_-7=qSa?-*Ca{)jyK;48BfTzgq~A7#H2 zC~Ck6WvA&3&&+{0I_CkI!r?)ZMkga1hYa;vIO=-E1m%E?w+Ad+mI|gwGI1Fg+RStq z#r-kDxWiR^{;4hemK8m}bad|Wb+o<`FMS=clLARf+?}9BG4_X39TzgX%yO*DP>!IX zIAb$8;!Ukkx_BzSGW*kP)tmA`2h!;sV%;Hw{@-jE|8H5m^Gho{G?7CS`HCijk=o)~ zC1&nT46+988p|D}*3evZf7YJuWG*%rmHUw%=AwAr-q!=}v4(4)%q6CO2*4G#TrFLUp) z<%ui7MXk(~Yb->0uZcC&6alGv6I|k)pH+Pr!^?ixg|VX7Is=n5iN0?txwrBj@Ox2G zPzzrW;0B#13_f*bqM!8zu!;_!|9RwCDZ9M~FB)s?ACxiIbG;f#NksN>%xef?=O{dF zUNBcvzq}WqDIKOEjuO(LVTC&+ct6r)3txW^P|L33{!auK-RMzPkp3O?f?wHlwc=Nb zPt%*7Ky!LXzC?tWWR=Eq{^#3Xs~?~Kyav{OctlZxT06C0*Q_;F#vho^Bpkc8)YftR z5;AkHP1dGuco39hTmo4h(>D|g6B2yhl;1Kim0SOi7M@(9ILXMu45bSGDcprwYHsA( zi1hhU^{}df$p%gM(6FeI%3B=vYE7n%RBl5()9v1QZbBZ78@cM7=c4UJ`JaXTM4Nep zx)~6ekU!oMcz$b(Av0`*{`RefQ~9ZbR~GJIvl60?RObp@MZI&{w4w{MG7?jo`srdu zYC#P9*iFYBt9Sft01dvM{AMW(-qZ-Xx%d(VUNY-;p*!mU8D-7#pIXMHL$n77qbSH) z8^&+NyFLy{6CqjGR3;RBp<^OS(CEBq;5XKN?4b0osFxoE;qa?dHZn z`lxY4V(h(&+cLr|J6UDf%Rmvwms}p2WzVOrX@v<_DgHP`opYA+p+=TTAyCJujT#*p zD;94Nekv|tZ?#dY+thAT^bsL}GJ88)!l&h&;0q?3Mpv{B(Ry#w1yI;a< zf8u`f+z3aV)F!!;%Qo*w=aOo9K*Z5<5$AWPaTb)-CaKh&*j(}lC@XWU>B#&duA#U5 zisEz(zfd)2f;@!~>)k>?%>b8>ciX)?9|k{FXtCbk+fdN&%V>IMfh5Z^*um|p-%@GQ z?IS@gibfSVZ=dBsITO5lV`IIj84T$jWz&n_EzCK_qB$stxJypyW6$e2UYcMe2B_ZtTtVv zrjmDP5QpX{TdvisskEkHvs>Kjztx$vzsl%8Ts_c(4Go7reBb$+9+7p14JOjCBR)b%YZRhetlHazYD zQ&cCgIrGGz^06?O0a;dT!byfan#Gl4mexgQ*p~5iUi?|(-}FJAhj4y?xlV_C=OBCs zL%T)XZ;Y!Eff#`oeAW5`DFcVLBx@hFXhPucapIvY0fkwCJc$`CX4%3cz9dTq$KoO# z2KnU~T4T)tACz$h#h9^lPRLZnWw?&gVPIkfd4~K^Mv6EVSBK=Otbo32vb1h15Vx{0eq*M$t|L{FsW<+^IA^F65Gnx zk%*&D2G5QTznZAnc$IiE3K0#OxAHL|jF404lFLzpDP{(90wqSEN8ifL$*?1F>&X2< z{p7B~;i}}aF#{6d{Dbw_Eu44+ShpAC-OBAwX;VpahIUsimG1gE3XWK7-J&(@=-kM8 zi2uzC3p{z8b&N}5*wo4^_u$1y7Y9o$;+f@z)4df^>29(YkI5m=nh09e#p;|70E8?& zPbwfqA1nKjmPOU+zRqC_&PEkika}hl#Z{vGWuoDzlwti%Sapf*P3t3}^je~!Trtt| zr%Kh2mg=W~7o$9HLiT6rl8c>jSb7{^;tR;WW%=f&El7e@ueiu3`3X;-mq~5fDWufh zf$qM^iENZ+?{x!c2x~}!;UoC%3$OivR@*K5yR&=m`^1Uqi#B*ngcVE98aGsCd?L7( z6lz4`qfVKeQ_upM{kYD>+rJ^yI*@l3FtoVZsiw= zR6t4#ZllD3DHRv)bf7Q`qjlJioUMi`r00x?c^)IsQ#}mO&b}%B%f{*_?-ks1yd-Gb zNG&D^>i}N*@f1ek{*@QIkLIfQ^%-9^Sj=8A4q(u7c3?ouL$ebk1bLJ$$6)CVS;3de zwh;>TKX8qz1B3>I>M@QQksO1y=s9~jTrm8`;Nq@2UhI^Gg}Q)--4;2O z+R(C@jdI2$?v@JrVe>O6ppm&}lJ(VmUD2p`kHyR?%(4jOI^*$ru(^8C1LuQ?x~xh@ z%n*(93lpHWi0@g*vC4j}tL4{bb@iBj#8ZF`p{lR!C^L*1kLX~Z^UmktjNr~yEg&pI zWTm)|K#7PfuZU&OcnMFENfA7j^GOyWU_vndq#!PelIsWHb5XlqO(_CtIvAoo{76Vfv7M;q)cBWy46A%pm-H$xq ze&R7B(svAljauYw@(VBX{zTxkIK01t3onAK%J=Qv-z%-$m_9ZU0z1q3wwZs@mG2yw z;l{oAq@0L! z4#fv~2?Ywx_3#AN$BFi50J_~5J*m3VOK8#*61{pt;zj)pFQz#_q%-RRIGOryS%`ZG i?T65QAf^7dvSIwcWqsDS@{$hk - + diff --git a/src/views/Inventory/CreatePickingList/index.vue b/src/views/Inventory/CreatePickingList/index.vue index 6b152024..f8eab07a 100644 --- a/src/views/Inventory/CreatePickingList/index.vue +++ b/src/views/Inventory/CreatePickingList/index.vue @@ -1,6 +1,6 @@ - + @@ -81,7 +81,7 @@
- + - + - + - + - + - + @@ -128,7 +128,7 @@ {{ scope.row.备件总数量 }} - + @@ -137,7 +137,7 @@
- + - + - + - + - + - + @@ -189,7 +189,7 @@ {{ scope.row.备件总数量 }} - + @@ -198,7 +198,7 @@
- - - + + + - + - + - + @@ -251,32 +251,28 @@ - -
- - 查询 - 创建领料单 - - 选入物料 - - 删除领料单 - 选中领料单：{{ pickingListNumberShow }} - 领料人：{{ peopleName }} - 移除领料明细 -
-
- - +
+ + + + 查询 + 创建领料单 + + 选入物料 + + 删除领料单 + 移除领料明细 + + +
+
+ + - - - -
+
-
-
- + +
+
+ + - + - + - + - + @@ -327,17 +325,17 @@ {{ scope.row.组号 }} - + - + - + @@ -376,13 +374,13 @@ - 查看详情 + 领料详情 -
- + +
@@ -417,6 +415,7 @@ export default { return { 审批情况: '', peopleName: '', + ListMX: '', PartType: '基本件', machineNumberValue: '', machineNumber: [], @@ -438,13 +437,13 @@ export default { tableData1: [], tableData2: [], pageCurrent0: 1, - pageSize0: 20, + pageSize0: 300, total0: 0, pageCurrent1: 1, - pageSize1: 20, + pageSize1: 300, total1: 0, pageCurrent2: 1, - pageSize2: 20, + pageSize2: 300, total2: 0, pickListTable1: [], pageCurrent3: 1, @@ -481,7 +480,6 @@ export default { }, mounted() { this.fetchData() - this.searchTable() this.searchList() }, methods: { @@ -550,67 +548,86 @@ export default { }) }, tableRowClassName({ row }) { - return '.warning-row' - // if (row.是否审批 === 1) { - // return '.warning-row' - // } else { - // return '' - // } + if (parseInt(row.是否审批) === 1) { + return 'shenpi-row' + } else { + return '' + } }, selectable(row, index) { // 控制某行是否可选 - console.log(row) return row.领料单编号 === null // 未采购&&确认物料修改 }, + selectable1(row) { + return row.领用数量 !== 0 + }, // 查三表 searchTable() { - this.multipleSelection = [] - this.multipleSelection1 = [] - if (this.PartType === '标准件') { - this.searchTable0() - } else if (this.PartType === '外购件') { - this.searchTable1() - } else if (this.PartType === '基本件') { - this.searchTable2() - } else if (this.PartType === '离线采购件') { - this.searchTable4() + if (this.machineNumberValue !== '' && this.machineNumberValue !== null) { + this.multipleSelection = [] + this.multipleSelection1 = [] + if (this.PartType === '标准件') { + this.searchTable0() + } else if (this.PartType === '外购件') { + this.searchTable1() + } else if (this.PartType === '基本件') { + this.searchTable2() + } else if (this.PartType === '离线采购件') { + this.searchTable4() + } + } else { + this.$message.warning('请选择机床后再查询') } }, // 标准件 searchTable0() { - let check1, check2, check3, check4, check5 + let check1, check2, check3, check4, check5, check6 this.machineNumberValue ? check1 = 1 : check1 = 0 this.groupNumberValue ? check2 = 1 : check2 = 0 this.Name ? check3 = 1 : check3 = 0 this.materialModel ? check4 = 1 : check4 = 0 this.materialSpec ? check5 = 1 : check5 = 0 - searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, check4, this.materialModel, check5, this.materialSpec, this.pageCurrent0, this.pageSize0, 1).then(response => { - console.log(response.data.rows) + if (this.PickingValue !== 0 && this.PickingValue !== 1) { + check6 = 0 + } else { + check6 = 1 + } + searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, check4, this.materialModel, check5, this.materialSpec, check6, this.PickingValue, this.pageCurrent0, this.pageSize0, 1).then(response => { this.tableData0 = response.data.rows this.total0 = response.data.total }) }, // 外购件 searchTable1() { - let check1, check2, check3, check4, check5 + let check1, check2, check3, check4, check5, check6 this.machineNumberValue ? check1 = 1 : check1 = 0 this.groupNumberValue ? check2 = 1 : check2 = 0 this.Name ? check3 = 1 : check3 = 0 this.materialModel ? check4 = 1 : check4 = 0 this.materialSpec ? check5 = 1 : check5 = 0 - searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, check4, this.materialModel, check5, this.materialSpec, this.pageCurrent1, this.pageSize1, 2).then(response => { + if (this.PickingValue !== 0 && this.PickingValue !== 1) { + check6 = 0 + } else { + check6 = 1 + } + searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, check4, this.materialModel, check5, this.materialSpec, check6, this.PickingValue, this.pageCurrent1, this.pageSize1, 2).then(response => { this.tableData1 = response.data.rows this.total1 = response.data.total }) }, // 基本件 searchTable2() { - let check1, check2, check3, check4, check5 + let check1, check2, check3, check4, check5, check6 this.machineNumberValue ? check1 = 1 : check1 = 0 this.groupNumberValue ? check2 = 1 : check2 = 0 this.Name ? check3 = 1 : check3 = 0 this.materialModel ? check4 = 1 : check4 = 0 this.materialSpec ? check5 = 1 : check5 = 0 - searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, check4, this.materialModel, check5, this.materialSpec, this.pageCurrent2, this.pageSize2, 3).then(response => { + if (this.PickingValue !== 0 && this.PickingValue !== 1) { + check6 = 0 + } else { + check6 = 1 + } + searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, check4, this.materialModel, check5, this.materialSpec, check6, this.PickingValue, this.pageCurrent2, this.pageSize2, 3).then(response => { this.tableData2 = response.data.rows this.total2 = response.data.total }) @@ -779,7 +796,6 @@ export default { // 多选 handleSelectionChange1(val) { this.multipleSelection1 = val - console.log(val, 111) }, // 选入 selectInto() { @@ -846,7 +862,6 @@ export default { }, // 查看领料单明细 clickList(row) { - console.log(row) row ? this.审批情况 = row.是否审批 : this.审批情况 row ? this.pickingListNum = row.领料单流水号 : this.pickingListNum row ? this.pickingListNumberShow = row.领料单编号 : this.pickingListNumberShow @@ -855,15 +870,17 @@ export default { this.pickListTable2 = res.data }) }, + searchMX(row) { + this.ListMX = row.领料单明细流水号 + }, // 删除领料单明细 - dropListDetail(row) { - console.log(row) + dropListDetail() { this.$confirm('此操作将永久删除该行, 是否继续?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => { - dropListDetail(row.领料单明细流水号).then(response => { + dropListDetail(this.ListMX).then(response => { if (Number(response.data[0].result) === 1) { this.$message.success('删除成功') this.searchTable() @@ -897,10 +914,8 @@ export default { margin: 0 } - diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue index 88bd1880..d7dcdff1 100644 --- a/src/views/Inventory/MaterialOut/index.vue +++ b/src/views/Inventory/MaterialOut/index.vue @@ -1,196 +1,114 @@