From 82d29eb592c41b4c97270232313057153ffa54a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B7=B4=E5=8D=AB?= <14240332@qq.com>
Date: Sat, 7 Jan 2023 11:22:08 +0800
Subject: [PATCH 1/6] =?UTF-8?q?logo=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/assets/images/login-company-logo.png  | Bin 14167 -> 13553 bytes
 .../assets/images/login-company-logo11.png    | Bin 0 -> 14167 bytes
 .../assets/images/login_logo - 副本 (2).png | Bin 0 -> 13553 bytes
 .../src/assets/images/login_logo - 副本.png | Bin 0 -> 15089 bytes
 SC-web/src/assets/images/login_logo.png       | Bin 15089 -> 13553 bytes
 SC-web/src/assets/images/login_logo11.png     | Bin 0 -> 15089 bytes
 .../src/assets/images/新建 DOCX 文档.docx |   0
 SC-web/src/settings.js                        |   2 +-
 8 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 SC-web/src/assets/images/login-company-logo11.png
 create mode 100644 SC-web/src/assets/images/login_logo - 副本 (2).png
 create mode 100644 SC-web/src/assets/images/login_logo - 副本.png
 create mode 100644 SC-web/src/assets/images/login_logo11.png
 create mode 100644 SC-web/src/assets/images/新建 DOCX 文档.docx

diff --git a/SC-web/src/assets/images/login-company-logo.png b/SC-web/src/assets/images/login-company-logo.png
index 613497338070e56d576d37188c9d0a06cb63d453..eb81610183b29897fb0dc52c6d8d4fafd3b7f2c3 100644
GIT binary patch
delta 12977
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
YDyIPd(i#c<M@>Ocl2ezhm9_}`KjWFaAOHXW

literal 14167
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
CDJeVv

diff --git a/SC-web/src/assets/images/login-company-logo11.png b/SC-web/src/assets/images/login-company-logo11.png
new file mode 100644
index 0000000000000000000000000000000000000000..613497338070e56d576d37188c9d0a06cb63d453
GIT binary patch
literal 14167
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
CDJeVv

literal 0
HcmV?d00001

diff --git a/SC-web/src/assets/images/login_logo - 副本 (2).png b/SC-web/src/assets/images/login_logo - 副本 (2).png
new file mode 100644
index 0000000000000000000000000000000000000000..eb81610183b29897fb0dc52c6d8d4fafd3b7f2c3
GIT binary patch
literal 13553
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

literal 0
HcmV?d00001

diff --git a/SC-web/src/assets/images/login_logo - 副本.png b/SC-web/src/assets/images/login_logo - 副本.png
new file mode 100644
index 0000000000000000000000000000000000000000..d36debf3f08750120c4ca396aa9c431a16c8258e
GIT binary patch
literal 15089
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
J>bXVe{{gJw2-*Mu

literal 0
HcmV?d00001

diff --git a/SC-web/src/assets/images/login_logo.png b/SC-web/src/assets/images/login_logo.png
index d36debf3f08750120c4ca396aa9c431a16c8258e..eb81610183b29897fb0dc52c6d8d4fafd3b7f2c3 100644
GIT binary patch
delta 12896
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
Ve`$?`{$r9LD9NeI)=FE1{V#=Or(Xa7

literal 15089
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
J>bXVe{{gJw2-*Mu

diff --git a/SC-web/src/assets/images/login_logo11.png b/SC-web/src/assets/images/login_logo11.png
new file mode 100644
index 0000000000000000000000000000000000000000..d36debf3f08750120c4ca396aa9c431a16c8258e
GIT binary patch
literal 15089
zcmb`uXH-+&);5evm8K}Y3etNgR1u|$AiWnMv=Bn?9fVtYk=~>Wgd)<b5~Vk3p@$wJ
z^cFgAJm)^=`yAsv&lqRCPk!v|>~YO&&NbIuGi$H4=6lW8O2qeR?qgwL5vwS_(89vH
z=ZLw##K*;4DUg)nm@jJgmj>?I5F2+dOIIM4yfx%4kVyq>X$#Z>T3Y+K^Z}(YQf&4*
z2JQyxuOzJ?U_Q&=7(Q>XGe#N<OIps`+0qIGbZ2@Cw6%AVVcu))WM;CrmSNTxRTofq
zRsh=BEBm?vwS8afSowmi0M^WMvP{z6k{ALo(A|>B8|>)hCh0B1{10A9%>D1j{LD=M
zfVhKXnEz>%fx0G>0>l-_B+4hoYb7Wm$|Mfp6BH8`0RVWIgaia7_yr{R1%-J9#Uw=p
zB!z^S{{Apyw7FW_NNT-M{9701mkhI=ySuX_Kfjlk7oV3fAH>y`Ul0HQ@Cyj>3kmUJ
z5WH?aPVSc8yiRT`|6+InbhC1`cXqdjI5GWZw0sNkaF=1mSo+T<fSvzM>*V&gn=lUJ
z_qKHA7vvN8-K2j3)z$xJC>Z>2w41vY@c*;-|4Qtp<KqnE*8;jhJY20X9cRPxTa~k<
zf-BI{9pb73fjIuli<)*2cZi!E#F<G!;kVZSOdR_5PSy}FH_m^^sH;n=IJvo7I#~f#
zUdS+GSorMittEvN1QbLS0g7Ux62gLlFJH*NP<$aFA|d)xLP0_pAoTKIvM(T39$=u8
z`@dwZ|1B#o@E>J=hXdFdqxl8U)!q|mt>_8?GyS94lJ@`EmKXn#?{8V_|7Z)~<$sjr
z#~8!^yL114o&B#zm<alP`|r@j{P=h91D!At?}`a+MIMwU7M8fB$_sfN@7e8zpugyl
zImiRsH5I;o-WOjkl^hNBeV+<M)Fe{7%#-zuE&l{QX?(#}*JeiK@>ID0d8%$8kMQfM
z@TIHtZ&~&6#3mvyqKG%LKN&t%xZ7%XHz|4b`RD_nAXS*?Ym0AYyGcL09{PN#MQs_M
zOuX_yA4#9+cwBD>b|#(1l>1#MdFY~#%8+Gy!jG^+?*1OGbt4RVcYfbInErjm!WR2|
zWvcndGyLD#0qdE?z29H|TY%uNzq8H%pyIy-gb@Fx`@_gT8U8!KUE1Gt{{zGSGT@&M
z$NIy_KUDm8fPZ!w)_-RB?*M;v`rk(W!SDwlc!s9}3v0AaE^t2|5-CR#p0=~^dcnx&
zzn3N|vm3A+UmczX?;1$<ka1E%6iUGuN5a#ZTM+D6={Cah4{9i|u+(uw^4`gjlu#@X
z@uPL<al3kC=x@9w>y<km?2$5}dw5NhNZ-lr;`8fg`35e#ovEK$K^%U@?l%v9#<3a<
z!;&N7@1!&fBsXJNV!~3rXuHz$o+<6rkfnCgN1zTt1(C!U^THHvQ#JQLM)|pw9~b8b
zjeKfq+)*B&VN8QDMrz;6(u&D4fIi--^RhdTHC#N2c%V8XTU2_X*~GiHU~8@d*1tUN
zL`Z!@ZQ4eRw5oXV&hzb7o(m?|r26NzJuqvbpSGDoP#ZkB8V9%UE4ivThNs;OGIq2t
z=EEDH=CJ1uGrosL-A(3z%%&p#qq6nuiDKd;q{P+5dadEUEakDJ>1*C(OF_^@V59MV
z=K48rNh){?ZOtp`S*0b@FTa(>)XqcICc8jLj~&)XNHj3im_eF`E<jRYA1MSiGTh7)
zrB#wH!bh*O7=+sg&*)4BYI8f6J&2_71`woG!anV87cD;5d--T4sz5nw(;{@CXr_YA
zx8_zuf@H*lKo0t;x<||FpEL9N=>chtU>Q}7;d&hwC!_iM{6UYz(iy8+!oxe|$Zx#A
zvwuf1>@J64`LUlc1qZf|Q%rrAr#>`;%d-XSTX@UmZC-eaN<E$$CdH`_7YU|>p^D}G
zMTnf{cmvhPB-%tC>qIETh~UOk5@Fl&z*(Q@?_TP_me<EL?WhB<OWnWr(+2DFqWpBt
z<F=m7W6w3TJ}|x8%$I=nuh2B0CE@5^vThBip}8^f#I9m(=V?=S=DG@iNu>kd)k71I
zMjMZo6w^@fGCd`@tw2H=uci7;r$F5;+uTA_;O&KIKpamoiB{d%;Cub#liG(7jq2}I
ztna@NhNjL3O1!h=wMX(s#!f<X1t&BaH6<jDy+^n^7h|lnPtEAER<8G+#m1jBtC)oN
zNq5aUucEaE%#(Sc#E}(~+340Sd=L!1uqJ6#A6{Q4%+SbL+u=VIKu(OR7zT@z;2t#4
zhBu1i@@h9ZV}D>Gx0$!x(NZ)}lgmABdxsMEwX^7@$Um$6Y~bNkXv`cjB2Na|cO=7j
z%`&<yBMil9s7b8{=fQ)X;62#jo-KL$>DoxnOrt(edZfbA+qgiT#Nc}Iai=H28L6H-
zf;%<g*J@Y<u#wICubtD!kT8#q)A&~_o}v}7*|%{KeWAy7_3qwlT5(^Qh-Cp<du}?u
z-c%MFl4HaJtD>DZ=X4|5PRKdhRQ7o`8L-DYQ7>gWB9bFtT0>!y0k@MD;7L<PBvWpD
zs7vnRXYZMF=b3!Fxnt`7blXowZZpoogZ@JUKRus5nHH5EqngrLtg)FLUaPHId6I0*
z3f7hxxhD*EXCnd|V`5MIaY<@b!}-De-3vK`)F58}LH?901IW8HTQ!Dm^wb9kjXrk^
zf;63`hheUa=#A)!_f0MEQY#|`q=6Fn?A71Uo^??VKgeCMHSEmcw-(NFC|V;{1QR>@
z(Avs|fa|}ysgNc@)pF4;Z+22`hFeC?F&*_WDvv!)DYqt-=fmR1`ow(;+O71CVRq;a
zUo_&jK!IBK@$6|D&0sdNWL;7mqC$F<Jz!#MsPH=aUHx)Eph{#z3K<EOyC}36ju!&<
zh0Ov*eLIXNPxU6SObN{6xdiJ}!rt5`eYNU52GZ4`n1nr1Z@1_7yE-rB8Q^cUHmBhu
zVU`C$-*QOqx9jH(=%rOtpK1_jntwtOJmz>I9H+!PaA}HoZ>t@<EnSobt^y)!hsv&C
z2mWU0P%hcytr#ci$@<(4!nT`^9+W=LZsXQhy{AytcE{ak8|1@dmOb8Cy0--k-TUH<
z#Ko_C@AVMdbPUW_+dpAAq~fuu79Oe5TdZSNNz7lha`fwykKr@c)K+FBxDDqjJv><6
zzws9vq~+SJKbK!1r=^z_v4m8LY^f1A3ej=-n+FwKMdHeW4Lk+gOzbUW(sKt+_7BzL
zI|B;4@+}&|tYz_<Z>MXoW>OvfSW-Z&b}0{Kw}=E<(0&p%*TzFn%3m{z*5g<3v}k)-
zaFZ!-=*qNn=)NOIbPugijc{`Ix|A2AEIJBKj64d_Nhbk)RoKltx+YJ#q0RSl%E*d%
z)0>Au#&KLqxMXL9*k8JSyu{5_a5eT(x4pVsrNxlK)U&DU2CmTeutVt|`;2;4O8jN>
zsn<*9s!Lk)r&Zt2tz_c1!L|AvqP(#1A4sDI^G@2%q92MQSE)yK`X47%iToU`mre_E
zk}sT-pc@lrn!P#gaV(=+^+S5Xbd8huFHW&<-Hm@P7B<ko&joE>^TkqMv^1Gj%!_ps
zfDYZpE69o}B_f5Vx5LYGn}Z|48O2S?CQQXhOcNmA9s>Q;LpY&1j6@)L#Zk~xXmO7I
zd8Cqtss(6(a@_f4$MtgB=DR3{3gQ&Fjfb;e<udZ%hyWC(K8wmI>ULRPPPmX}8Ak|N
zigh1^1ARKJE~jv)7psC6Gj5XPPnH#ES}zS#ilIH*H5)w6525i9yt*HodNrG7P1#_$
zlsWID4~Zc$Ba|nV7oYClK4%WBKG$mU|JgkJ3Qi3V;I-s!ujEMCGns29m{yu~b^2V!
zj7Y>7qponon%<$O3n{Sm4tSkWu@|cr6_-A&n|x$>QyEo5QPsn8AAEvLU6+MDVay4S
z@OV#rY&YhjyR$zjX%-pd*)(gxZ;y;rh(Kv}jEvz)c@5`eSC$=!>};GwPT#M13&lMf
zOSi0K9B~nIGH@ed**@0?9!pm95(U4(pLhI7wl?|evoJi71)8F7QuIsgOW9SVlb1|Q
zPUhJC#4+WwbO#MV0s^o(q#*HQ<drU&tGm^ph{zt{BY#<<?VDuFj6LVxc%#&y3f9<-
zNC$r&!0oB^7Q!67A3P#~0+oK$INOU}26@+PAV<%a6H*B}G4?&JnPeXkxl6?jrG~-u
znzkqG435gMH)T{#vv(hIlMR}{D1c*oLt2D!)}1A4EsdJMD&bDm1nvt2ZCn6TnX=J_
z^`wxrR-DP}!z*!Z8JC9e5Br2WeB^mqAH?0WxVTgWALiwIGwPhaPnWA!<x0&TT%SJQ
zP#h;#(}ti1a=i`$#{>0$d|$)~n5?~uz5l#h1$HOzQqq$TapbTcJR?ZpB8sMX-R0b?
zP{mE)c#_o3qQG)wSRW}G|HP}+a>s7Mj=zztsO-b7$;}EgS4EE_XJ!-=euEp{m#Y*e
z-73|D-J{7VUFqy`aphxTJb+%$d|*;DLB-ZW>ZK{j0g10bllQ=()Rq(d&{R!Sc`x6)
z1-=QHwA)*R(gFAj@!yNgcU?---uOP3i<3r<999*|=ehZt+wKUP>u)UX>t$De@@spw
zQ};0x>+R*>MeDvRB(ke@^SE5fA&~2lF@4h4shFaJrtb3nTIj1sA(!NoDmTgD^_5B7
z@|nIRzRj>q^Z1!;k}y<rSRNciLy$8tGbx;d2@$*u3((+5nkfCn@TUXc`P7qZ$Ioi{
zYah>I2FXhX6>#K?R#uhw{bEGpQqTS>bK!|~j|X%+=B>|(j%e5%+5_c2nf*Zb;0)OI
z;7Qi;O3#Ll+R>7n^C#Dh50!gq-DY-gK1H!BeKdh})y(yp(F;StamUbDZIkbl!sJ7H
zViVjcrAx}Entf(E0>#P(ZaHD%-gDk7zYe0Je<fWM=Tx(`N4e&yIkc%%`q6R7zsm>D
zj9Pe`XXV<K*T}zVAZR8<jT$xmoGr+A-k*zm1$$!4vkZd^PR2!5*W)~r$-ZoP@^m;=
z6lqKxH!VvE@+WCnPLNB7ex=}0ScQi^(@zz)3Uncxn*Z@q%aV7x>LXbZXE^UV6njR$
zgaP1(pDZAu<6l&#no!o)u};UNBv0XIFgIoi{!*~Qj4BH#{U!F&LP6I|6uY6F*WO~_
zL0u<w|2$@HG*Hq%4$^<4a**`;Z2ob_Ml^Y@c8O9^Ou}LZ-!`ciP3pp@bHKEsurxr0
zb~$&!CtaFvkH}PWB2<X@B+P(D3aY}|`x$2RQ7Dp^B%+uVR{PVeZUM;sv)QzY?79%f
z?pJ8ZD}dK~WeFDaC1x48=f}UXd(8@aEzXTe?p0BF(PE`+R=J{I#Xl`jn=OuB4lbt3
zEzEg1w+>20rZ$@ae<%dRP4dEYk2V2KMi<mpS<%(IM-SCsIxc3{<zC9jQ?)_Um_!+?
zH$z>ZW5FU3^}>M|g^yvQmg>Zj_0P_Uz36gdjLuIRPL7?QYYPagJJ93y|GKK`06=jf
zEU3Pt*p<meKS#*NtJEq5ne!PC2vOHI>1xjeZnAP4o!G~j648@bp!)>M=wh2d{r+Z3
zS@cfd)>fTcg;=Y#JBEg*blxI#Otrh~WPTocSW5-_e(oN5Y5XvY@zpGDb5Env(BoeM
z4Z_e+XblC&NbR-C=jg)SvC9Ys5v!38Pn>b4fNH50Hrx_paCoIubV5w7Tk2!RK79hA
z-ff_93|o(<x`ze-Tql_ZKodm=5|U9!6uQP1!%RL*NrJAFe<1POtGH)?3xVcJ=DUFl
z_zF^{qxoPh(mBLf^<I@wd7JMA;lN>hqrYiJ|6@E+Qg8$LXCK!wu|dPV{MhVHy?54j
zYjt_X<Fo{z^Qh?F_>)gh%mY|^mw`vid(i;)`dt)o?gE{AB#4(cr$u+{Z<ag)@KxQB
z?a%^n$w$S8Jm)x>nabbsAMTu6V!@*)0%@%+?~gWq{%{sFcywy2vmx!t@kR*Hy1O|f
ztTU<?a!}x)QN1w9wjnpJ?KQ7csE~%P_joNPLpLTe(X#6>coYFNr6)NLy#2ayA4n7e
zjUtNOuGr)SbV!WtH@p+|^A?D#KjfC@8Yr6bQ9VX`A+-sU%)Xh$mB$mlId}+^yyb-$
zj3)>5DDdjWsV4OCm(pCB{6a-Tns13kXOeBLTr=+LG<Q_WA<rn%_A($8{tRSy<5Q-W
z0y`Ij)MLHNlF%nAnF{vL!?L_IRL=qfhg>J^%fl6Ke%1!{-OP8Z)alb9hCJSNt6(w*
z=fEMMi^YI8E152!y5x&PQFy)DR86X>$%`O6Y>=pKs0gp|FbU{h{2Ze%pG&ZszU^S3
zKY>AMw)|L->9MO$=qrSc442p#k0IWenoOQcYmpL3I<6AW03(C#in(bEV&Y?)Q1^pR
zJtzCa$t96G$F=I%JvvwrvMJB73gGPpgg2n0q<Lj4_ml722!$;-FLl^7gzd7|an~W9
zC>Gi!LK1sS1cEK+57wj#iU|1`LQ3&_d#|ZrM$*`>#~oAGp@?B2pZS!9E-piPckgzR
z`M{qo9pGg^$B-{!Lw?axpO2E=oR-wfH=}}DqN5_!$&Rr|2kB00vUxgosO~EoeRiVC
zXt^bD7FB~8g0aTot?z5GjK#N2nhD2ZauX%j`e?@?qYenl`eHFHznC-*Aa0#Qg3^=)
zHQz9LiD6fN6%(Gfh=8R!DQ{F_afX16A{6;J-~zqdE6gi8?tE$Il3tJ*yM%t~rLlHx
z24oJ-W`Y$R*G&B4E%a#AGmRBS1+O(9-}j}<;Aqung7y{dfiuobb9(~YZ;!PubGDUG
zQAY~wiT*4(M4budHj8`^Ik1nyiMg&<bP>~>5}hS|Yp(7_euOzOKUi|<@DuP{9OZjA
zZaHBr`SLj2kyHx{>3$e5!{S!KN(sLL4Z>23d-u8Rr8N{LmF+dnwKk&y3{#lGq%FbO
zstNtN1g;W~hm?LuVureyW<e0l)ojj2XG88f{S@=2fto>@3bzNYqRft=*v)>OeFDR$
zi58y9LBS)x9w-@PIrbRfJZlxC6M}z>?n!Ajw(bD#mD;x?81t5q090<c+T*uBN7Q>s
z^VQ7g{9rpvS+-A>&Ofy<P{VtuZ$L{#s^ryWq?e*J-e%Q3=dBY-*KP`NX9nB84<xXr
zjccBn+KIO(awdG^p$cyUbw7}DUg-J?&anh91r*IP&jvFKJ-fu{W*q0J$bgnfI~<b_
z9PYudq;Gt>8pFQ8?s&T^uf@EbwgOB|EIr^gPnHyM4SWh+ufWa-uO|jQJ2J~{{m0+Y
z`A|-Sn>mUa&HqDL?@M0K*8ud&gI}$D5pY`(R(Xd2+i>K9;vrkBI1L+;GuuWKtI`%T
zkb<n4&nV>f2#HUy0tMUr;Wbx<yoUUYwLI0A?b#FeJP#L6RmK6)g}`e95HKk}QQz%G
zT}b5cmrl4SX5O_NM@>f>#7{L<yJ0GfE#Y+#|HJM^)J@<EPE}y{HDptuCEYN`744FS
z8y(Ma+YDbpQMg5j7XLC;2&m#ddZTk*Q1Vz})HSZT<-6)YUdLmZ7K*^(d1GXls)CIF
zJaW?RVbmOOx0Ou}?arT9CeeL@n+vyJC}}fSR|LG^lsJM`^lvy?Y*{K87O_9~ojoLR
zGl`*DEhkSo>%R{=I<47&Vsmzmyz7Kel7M{F&TT2_3|+B>#}VLe)_vi<PB{SruO-m~
zv{qg0`Rm6WtsTe$QYkN&hjU`Y6U$k|<m5iFx}+c87O#%nehmMB%Qe=&|9l+Ka_Dnr
z5r$eF;Th;OKtH0kx{Gc&$b~MLuqKV_o#N?ftjpQ!MD(aY6w@LVDeyt54)I#LLine&
z)kpNZ5;UGfovopZuSYilBl@(aQ)r&2%#FseVLIK-KCMBvRTO2}mb`(G!${F$j(Etd
zhCZ$LJaGVZYfaQm*Jb{qMzTf_U>1IK&72{?|HbfL@!41GwupPg(i`GDAv-MUmDn==
zlM}|ig?*fOhp(3wfv2@M;SEB4(wZ+L6sxv6cM1S0gYiHqbKZ)WD~tW~_$ei6?9r(?
zYf`}OgAFq=?;thmA1_~xfMhNOb)_|or4vub?9PP4#}-a%o1{!c_6a&`9Ty9m{vvqC
zFe~r7OlkYNjSDX<4i~x0cii!-<}_+K+MqnR{ju4tb2M^~rt!|<=wmSd9_ak&GA9aw
z!mKpP8ayB978AF4L=ri|I-<g(#e9|6a%$USVrr`G7vD<9K?p|>i%L%ZSj0tIe~Ep3
z>DLj5vgAkIHWa8@`(R?w=j6i}Y_ElKs>l{>xm_b>ur7G@6`!Iqg(-z|+JH-b!%)nC
zz_pJXy0h59_%3^}Xa0OH_9r~Ykf0X%3A+rpYR*&)ld}kXr)Pokv2Yk#0Vvn=f~FCX
zvE<>^^BBxtxwGjkvW?){yjgF{3X6h`*2d*k9~`jdZ(qdXMkv_e<d?`cIu>6sYJalF
z8<uhri&8CDq@bpu7QbjMv?YGK`O&g1_DL@>?g!!JPEsJ{?0zM7M#WO^+X>+mQGeHc
z!OOV!b?PIP)#h{A*Y&YH@E=MO4Q>G>RhP|oE!8<OcG=l)e6Qff@tZldH9@RB#Dx6M
z1LQ3sy(Vr43Wk2;d!NBh?K8zf>*WjY^YC>xInK>|lKqE*HT2n47xS9ei<z><MQMB0
zMh&lXYv}|MAV1{n_kH?`R@jMn_X&w*^2CYrcL1Jc4LD+<#?(cEthy}x>sPHs4%Uqk
ziW}9~n~$cF^8LwX<Kn|h*7j66`QEndS?`Lj8#}*PJc`}!p(Ah>3U>t{bZ~xZ4%L4<
zq5pIjc$tOocqF;TUvV71wZ82Jx<Fop2X*j#$|jd~`!L}I*7&e119)@TIPL|zymnF<
z;h$+O(m4vM+{}Ik=tY~VN!-3X%kB?sD~})uEc`xlXJT$CsH^tsl9-&Vb|;VWL%{S#
zw0bU#8&9tb>BV<)&X&iDq>)}?Mo?~UrNHMVT2m#lo{lrNl@?xZjKBuWF^iWnW{<2(
zBUMTwRhg?}Ly3EGx5oDGf?N`pk18B3d3*1399&RQhe{|4&{B^{2(`Jqma77PDyrOC
zJ^gh}iWnZ_7C*fD03zFG1wEkkX@3VZB40CsqFNFG`iBAR$dKHh@t?mcY3>j=mUn&}
zAOY#lRIDVDd59bri61NWG!B7S#Zoo6*?3f|;gU304Gy7<_5<^v3%V(*)CvR<TzfSI
zkM+U3G@0e<yu>_p+^6Rz1pIqRNHQ~7x|_w!T-1Jh8{Lh!Ok1{&3;$9_oEb@E8e^Z`
zU;D0zeN;B9_oUNHajhegSn0xh=B@D*ahQqg2=?^YKm+wn?Ye0{qLZvh2>VMhM;#ES
z^IOkxB}rL?@0{2woDGR(1C3umAWzyHXfu#_B)0)>){GM7t5zy|r%yyPkjv}2PV$W3
z+KcDk-3g_@YsJ%T><*YWTeYH}AWr9ti*DYuQ?3Y|J2&O3dW!VZ{Dn^OQO*N9eJ!UK
z<4M-MIif?me2!bJjA@2jHy`)*+eLMkk8Xv@AYA-6u90Fp55QX~j)tUVm3DgYKHCxH
zpVc#;dSde9JZ7izc_9k*3koa)9DD_B8}w>{dE*K!@f#$TyA~xp$oiA)5YSp+Ayczu
zN6@-(M&t1??;2s#n@{t-<hfb(Mg4oa1GAAu`OXeqvf5M8dhc}(&YxB-JMuSphi+BS
z`{g-JO@B&CIIN+e>zYXMaMzfb%kGfdV|cVcXg$kMlR-PGMSO@{b_0xcq4z6t@%W46
zFSHb@m)YYKZ)}aPG9vp(K?Eu`{JjrOpVsXpzW)-|sGa6@#n167qWjhGXzz-py02v1
ztU^*h%`QjsD}KsqY<uc{iNooTV-sG32-VE4Og@H!d1Om$cxU3#^!6mfPzsY*^sEl$
z)P~x;YbI5}bXLtslDcU3T3yS5k6uP&3^$mHV$FNk)&0gOa<Ssp?C2tq|NI`kp;E}=
z;-Z>W^HHoFVh`Uwp??DVwu<}R)CnCww;u$ZB6h;`ZF2=Xvi?~1ux+tAJ+e~1FMQU=
zk1C0veoj!N)|<8WDfFFOSjs-K9Pp870rAWE`(zV4H;v+_>=deK3c4B2tm+Sf;Ten-
zdzh3d9rc$Zit~=|)K*5x$>Y4a#totoRm81(=D57em(^;PObICoFZA>y+X0`4%aoxy
zPcL=6&soSvq>imAX@-~G+Vn}kT^wZxaUCVmi}0jb+CU6x+-vdLb(ZY=J5FQSB7!#2
z`)1eg^4dDt8lD8dVG&yu>l66aN>6OL3Aik)T%PPwJiO!`Xf>0sbI^EfC!<Qbui6yb
ze|pZYyUX69{L^w^64FrDLsq!A8jw1&mxC5+Yn#naJHEVl))ND~O>oFo;y@v?F$r!l
zKk-PiPE-zBf$@Pl{ZzwAC)|D1z&TPBw5MgV)rpx-!j@Gd%uci2zQiux+C0YhS393G
zcSBH7n9B3;$<~Td4adlUUf#=c3<BodV?)`04&n9c`2Mw_AZqCIbi)!0@nw(H#e6Y4
zC%o>SZ*SHn;q3sItnG;VP1@CEJ>Rg@hm)HK)M_kL(Q!&Zp8h@<IkdAg-Ezs&(|{{w
z{Q2P~@wtH_NGpm@`5VsWLs`AkJ1hYf$fDKY=f%iMa_Jf!-0`C0&O$#L)Tx~6Y-Dad
zPql~ZSyChE`PGN~mXa_t#;9ak;C0pnJgp5@SM;VM-=SP`gK<hIDw-&~-okIGg((5c
zSJWy_$hbFgIjZ8#YO}Y%7iqJ{QyZ?hoq;wkiQDj^74)<i``muO&Xuj1{+Dg3u1p#h
z_Y}ZWt%l`w+=fMftZzwf<)<II0XOjI)Vb`0#a<PfhSIR~O54H9R!)z_dBW7GuD<;X
zweZ}&qQ=7Z)Y03IP6?_S-<D%qqwa4gt6bLJ?I2O(moO4W>ojYia@&)6eOqm079+WO
zA56>fT7J52TMv*PogA^bZrj6$k2J`73+@N@-Mlos-B8iw9GiRdlG=TwhT_xn6sA>X
zIt5EGvJE=q&0%gK7Y}~wOpIN+{>wzTlkB>G#!AeH-c=wSs2^!E0>!5GKB)zhW)q6H
z$by%B?AOG0h#gDM@Sok2wKMSKrj9G7eO$u)gzN?1YfTnonx7hmRUNrr-kBs;q*6|Y
zp-$3`3kxMXVGG@x<EiT)l`tLjRG<M+LrSpl-py&#I95^DY)o<Dtut}#)gwm+skqql
zz(so>e)G(Pd-i#??-u++z!FXQL@JZL%*04vKlZWZ?-WyaffWu-4|Uz?2tfB54c`yj
ze;E<A!RNj=F#O`lR4L_<te26bChs=M_%V+J8ULk+JAcUQhL9VX^St|7a>;YpW$X8X
zTGy(`%3duShN9YfJR41&Te*`T>z|vplOCT-JX1fVPQ6Ct2L*jQY{Ziyll1R>kZm|n
zdVTNZu4ZJzm$-<tVU=UvQ(0K;ZI9Ec<BPpUI&2>syUQ~dZ<USSw)M|>vX#i<mM>qA
z4hcXW$7e#amC_B1&F>`=Hl`VnQ8;40)BO!*HJ`acDs$a}ySe8WBSrO3dKM7z@whEt
zzibr};l&Kw4pd>6eHba4X&+>0h5~n06BP1=PyAz1<3i_6=hyqx{dI3F)IPoSOJ3qo
zvW!RZH?*bk%05phe2Df?@>U6QQB^o<S#LmO2A?p&>KqlGjKsRt8Ic0Nh<<#^)G>BA
zYC|)NCOl=RKw>85d((;x@JE8?Z)Q%SS&2Gwk!=+*HK~rP9>gQXUa1~}4Knu>=m;Fu
zjo$q5m0mF`Zs{`mC>^=J6CQmMQe#8Jac@9;mHBCe&}IL_F3+?R&!}+hs;z_!1y*Fi
zBJZkzVvi6IKYFIx(D3)lDb0A0E#XLDd-coE*IK}bzqsbU#XzW1Wi0Gp?T&|(R#*<{
z1}`g8BS|(bi{bPkzu0-r#My59tE^6*s0}RF^?15Iy>jV{;=XJyD!n6-bHI>0j1RH}
z@dY2@%LCb=GF=WFY<!Z>ZNapTo1>m=NCc|_i$0f+-VbhhHp?BIxSG@}lju-=At=Ab
zq*8IDVs{Enqbnud%(ZDK!X&PT$B014s+qNyxRbH)$IGV%yqswNpqJdNeC4}oKYEUZ
zh*9l8Npm&IF$r4&@f@CKD{q3AEezwytFrD1WvgdI4lMA&`@lvGQ8yE{SIn((E`Apc
zLZlT7hYRAz9bS<nMjD)G>pj;TqT~;r8W8W!6OR2iUIyGceGT8yJv!f4A{bJmNH8lv
z1&(aPRoNm{(L~x6Hg-kzWJQ(+xq?s}2Fsy|aq=N~PcAQmxgE~vo*qh0iP}p)e!sJ|
zeWCdL#1g~+Dd;`aGVvwy2=%$502Zq@{-i&RK9<*hJ|pU>dllAuhKMtIpxmogJ$bAY
zv;M49)M@0%=JNr)<jS^7oKvR4c;i$#Bc^HT!blY}of+6uphWend(HrAvx>-94P4MW
z#W)RiX%@=XS&u7ed`c#4-?Whx{ffus>+vz!D1T4;W>R?$U^4@wWp(B?4$HV~YdGh?
zYUP$MPvVlFg&8G~PlZBN6UbIfUp{XjWMDGTB#QoSEy|}ad^4=qTp^63>|S_E4wRKs
zGf6&*>JK!b$J%oVZ?FPWo0Y>8H`_Y0l0{M!-lNofzrVuqcZw0d)4=fBFRhleOg;JV
zxO%f08(h4#ZhR;lF6u5-^TxdhY;9+q_}&|-OWp3csvG*M%1t-)c-wL|L(^{n@Zslz
zRRhht>MI<jRB0}GNwaZh4$*hI>*@F==Q^Q-vNu%5{Y`;|OR2TrtD*?(O%?~aWItAS
z+B9Dn(|hk2TB_4bqxDYCB)9#wX5{K$H#|L)wKTlp@=N$xS~1IhEP^Fuaw^Q_M-yxa
z<o}qg6XqY$NQf==K|NIU8i_x{C68;C!n7mvssy2QH|H~15mBrOr+}Byh2St{dKTEe
zO*Nq$vk}tqtzT5Hy*ldT7hl<-+SNVXizMLr?eW#6Re2c3T@QR09!?b@Q5KUUETT$T
zJL46^Zgn%h7Plb_w$`mJ8Z&C=a%L-@M=`R9EolGIP-81tZqRxseeo;B<7sdL{Gb~%
zpyy>|LRh>XbJi_aVN>HqSu9k%=xoLqv|xOKN}MAAxzS_xmJ~XEnIN;l6)Q)1IhNut
zm1xo$7DZ>Wa*rJ)RQZ1b1}52O4N4XZjdFFst)*4Vfi269wDM!W=)jV}RE>#T5mB#$
zJHPM*RTY4hB82+|`apo2?b2}3SNax&5q!rrlTXTM41)}`739A^7IXXt<8H#92>}Uw
zhrWRERI*;A0KHd-SNW8ZEo@JFcXT4_D9K!KB((9}s-nL_dhHKtQhT|`YW1845}z~;
zY?uEE#%yGp_dn8W(FuNmzL43$2OZiUDlZ^yHutTv3|jjDv$-Drlvd7jNoZu)DjgPQ
z)6SI^-g5-mxe)PJNNvd-tQP9&yGqZjl&u%a8EH1%0zYidSA2C@P<|$;7drT8sfhBI
zPFyHUiL;077QjtE;KTbyN<y7b>Bl#+kIX|eau6xYUd52YiQP`Ts_|QfrobgJ6i(RW
z^X_jUC!xlp<po#-vkOga&_Q4qko4w7NUNjA9Wwh@D6I>2VcBz9TCS3?>dMlhQ^2fy
zSYYS+meNeLqO>jG!M>I*9@eqvb%ZRwVAiSz&@agzYjL#w(=(-eSr7@98qswf4@=(F
zt51V(sTz)I+qmUt@6Fo@pn6~|x`|}hDpbbw0jBrjXJ~y)XHuAe1$#q-E6nS<p*)iQ
zf)&cWvsA`otUt~j?Q9K_Bbq8*=c8ZJq=EUK72I3pj@y5-)|T6v$-q?-ojqNSwOFNK
zYuaIBD63ZwBk=45p0jh!RuwlI48z(2Vp<bB15_Bl-jSr5j>>NB1~_^oF*LYFDqiS?
z>I|zU6yE86{PivzOm}D4zg1gGf#q85xO6XwlMfBym8doONM?;_ZBhoLFcp_uB|ecP
zQ#Add6s5<mdlAT5C;D@|LDe9<IFTLJa5F_=<i5FIFl!XN<^$yCOA4>|o7E~X)4x-v
zi}e98+hGRtbp7^uxMMKann<H$u^t74=(~P>sd0rFw2`M=^jE;HBXQwftzCr(l^Z|$
zISNg63qom3K#CT(<tKXRgw`!A>WF+NUs4R4@pP9p?jXB{p@Z1&Qx%RBQmQxQbpFHA
zzc_n2b&JTX6PKe6e<&sGK!2UnkY!etU$9M@O@S(U0q)t!LiCn9<Vq}igjTq*Q{+rP
z+d)<NZ^u3cLI{zMq&{uC)txvP*!J+~cdBrDvl#Qw7P5Bmqc<7!sBfD13txWW`eyDM
z0~?^{%Eeu>=~n0stYx-LuuS^(%3^Nwqj%43?W29o(t}9FDKi3BYlF9*!2`R3#__)O
zS8B(kh_vu};fS8?=ICfD*sS828@He72Qz}&a?8XyR!3XpNpX}}b<;}eO%lUuV8gjY
zhPRx~saY~NP~^L@LGX8vMfl5wtVzkT_x0*|zPF!OG;c#!=W2VLL~4gSzyOYY8)^lm
z6CVdT!l3I!S5lO&FQPT5DYO)0X}d4uphKA|)m5Uj4Q)l+-7qEU#W%ZgHh!(QW02bm
zu}-;k&Yg2re(l=@jgEG)cY7&qo<0jd$`5_WDXGoGY*>4tS~tz9#PfNBLk(0nLP*)j
zA>Ugqg4(qEfk%atPjpYeBgnF2+HFhVV8c9zGwvUl0}kOYsA)313XX9CTu!F?ud8CH
z|MI=4t%9w0Q=vtx_bQ-1hz8w9Zgd61itC`b?p&gG(poDpl{-m$G^t8B%3IPJuR=A>
z(zOBvO&wp9Z_13Fj%{2t%Rv=OnG7oIX#2K80utTeF^=sZ5NjKwR_|J1JcZRqL>``S
zLmA%5wW{+#rmbdGkWAY(Ab<(iE=Q*Mek?W)|N6r1b8kc9u$5}qfQVj+@tc<sZj*)t
zV;)XMx%n|6t~qdusxXV8OFFTm+Q|?sO6>FDp=h>~*EyXVbYw;j25OIYfJXp_HnHyO
zQkCA8B2T~XsWQ(uk~&O<)(%>@(9-pReV1!nRCzI0<~Fa}GEGupYFV<6f`A5|&C4}x
zsO{XOFhwgI<ySIyTRw9l4^7@2jMm&^ji@JdIDW*%0h+dOcnh9EuA3B1az#8X>B_9c
zJMB(Kiof0pd0@OZ8(XlK%y7YxN2sN_R-<H)ytBfGKr4}8|5_2N)tK*XYL-4#k$Htl
zN28Konj^$;8L}=V{PPB0nXD}}nz!wYwsu~e*5$-AKXNc1qMtYn$FpTsh8;d{2j}7_
zL6dbO^Pj8kt6|mTnA>1>AKc83-bmn2w0xE<swG~YKfmlC0aK%1k@NDcJd%FOGf0mA
zhC6p|hBc*=a-@X#s2*I=vLOaFpJ1VhXh>O_UjS2u><5zw^_{cB%N?;%iryCouks>D
z_1$l#1Q(X*Zg6AnC+K*8H=9BVr!Hyx#%J#0TtcIeb;%Ka6Mp*gST|<x=H6$2Ii<%m
z6z;D1?fX>g>H6Khux#;DXg|YgdV<?nho%S>+gu8t$f3`=EL>Yw!I~ymV*qJDh&jOJ
z3BjBcvv^JtV-UHq%X#7rA#Zm(?a3hIAD6I)2#M6r)@<mmzggb{4}9UlOp>&h_vSX-
zrtjwUd?-&m5cuYQRP`f-^9z}^rmlfnmr~+l0bt#H=-?9#M8Yb|5e5H}<B~Ou*C<fO
zD|Y?#IB}<WU#O5Dt#^fkj#4tXG}Eot)in-Yb1)_e{dE+!Sd19=st@?IKI+Nb&c-j%
zWyJF6y_fYu%2+E~h>Cu|F+hpeM`L*FEdZG9#f5C`YtGi!ITf##?u2`gzo`pf6-KT;
zIwZ^c!qeG=T&RFRCWX99GnpDCiszuMnRyjWe`&0DeG9I|q{5>9EqZMn!Z;#y_PaT!
z8k>$F?R{E9wr@beFCT9043YzESX#-fFJ$^m3C5IuE(iFW(h>kr^a%4crk*D$0lTwB
zk68>eQ%RpM;0MVRJ~TVW{;5mB^b@JIAY|g<2h+xPx0gzMPNBhlDe+N}ooo*a6P5@+
z=%w9s;fFE(1N_K<TzU29lcqqlCMrxtNyon<dqf1Q2Qw8TN_He2zig=9Xr`@@6nL8@
ze*E13`&!PY13B}zE)RmfjaDU&T&2fWa?#j%h+M1*4l1yKkxCid@=meXkw1fLckuZd
z7K?XQe!SF~((GPF)>5E9^fe@)1&QT_rJ!YYRK*aNhpR38tkCzwy3jLavr_kI!1%Y3
zujK1N&#!EVQMDx6E`ikyi*-o{J6g6ZZT)wj-VPkT<U`K;>->NX+yIjn5w*kSgzyo_
z2R|ptE+bEtv58jC0rC>}ky;(lLf+Anb-M2UNan43PrQCHoz};IUzi1nysE97)GHk%
zov?5z{vNmx#*Ig2wmXXQ>5M`VPM@aO#ldEDV34u{t!w$+rBo87m&3q0u1ztALFAhk
zLiwlVQc%M#g#>ARrTuB%s(e?y(D^E+^k!c~*RzKv{T;V4Shl1e6;OhiMod!B6m65I
zYMsw|)4BI0P-UZ2@1E6^@XrCzWhw%tB`|Zzs)}~W0%^TzgM<<5aeyY7Y_|{J80?^B
zeeS?hGz4iAfjTU6K`1OxA?8YUiozTfhH?kaTB8B5Oze6kRMl`9DG}zqLpG475T~Vc
z<w$E8ohw7pK^kN;(}*_gGD(x+x}7PUi@)C3$}an6>Bj{}97lE;FXE<+oCAFJz6>iO
zcEe}SVVOi8^L1#ho$#C?6U?H=I&Cvs{qTLzi~_5;`@sV*17ZEp`P$caok-kKE~Ib2
z)lgsqM=YDnmYC#!f<>r}yjAPH&OVBm1nJ+-^X>Zx5Wtw(*V|w`d!KpI?&9FlID|85
zZ^&H9Scz!{mT_^pAl`oI*VHL~Ax<;@x@9+2$?p7K{G|%logf2^z=dg@`z;(}rWfZ;
zqp&HGyzC^nkKhb{!PnE>P9NirrOQ~k%Bv@kp;7Olx#<)8t2O%vXpot$QlVS3j-of!
zj*PLexh+rC=XIWELR2rrRua-!(s8Jf_04zTyVq6QvLi9fPg{dp=_3c+HLNUhqb$%6
zc+Bq=dyoQ-azE*AM}z9LB3wKF6LHew26alOzB)1eaYneJi@ADa9&M^A9Opg_C*3l~
zv%?CqUE}*~**Ud}Gk)Dye#YNYK`k64IEqm_wj(}Q3&vGnOFc*4NR6ff_KwfNWW6Ti
zSZ&>GKcmoFe%kv!-ZG}9J{pH=RI_nj+tD|6XW5NJ#43ozuzEUq$KudS9`>bjrn11s
zltQvKy}Bw#q+9H%SY-^ZBnUF6>dC5X{O#d7oW-^Zn-e)i&-m-QzsjkZBCnA0I>$Ay
zhk~PhxWNI6ox%R>+zH*IMiNDq^t$ZA&m)QKI`SA;`5iv7z6{iw3gWt(RVD4CzGpv%
zB|R5$q~<=N;Ois?kiQ8b+q)F*Hwm{UYZu+PxcKbkkC;HcqFK%>t97tXL7Xbwc&X1F
zCFWmm7a$X!joTg)x96$8`^f?(9wftkI*NLhun2c@ca~T)PQF-9$n<g@lO?^^o=5DT
zH}pvuLOQ?InAgc$l})KnlLeWHo*s)GKM{b=#1#y@_B3lAK^ekh2c?U`56f3C0{dbu
z^J-FWIO5H{q{TDV#iZUT#*v(Iapt+T_$~(xOR1i#K_(BrZM`oMNMCIe%PWsBjIaNg
zhiq$A1x|BlpoPkxZMaD>Rw^B}Ovm^NrxfF>`I=7BPLb7Co4Ia(QOVCN4@=o*KcpV3
zSn9ZxOg{xl2ndzR-J{eMzn`ewJC6@DVjqEx>t2l^0~bEz3gN&dlixmQIFeus5$U>7
zGxjw%+BYj58E9U7w?gULQD6OQFAw5=(msKF-tqIt@|Os(lF3i`>=D>$z=q1_51j%#
z+$<sBP@YZ2)fG)mTH7;ZLC1*u%r<dA=L!9!r+z4Aqj@kSd?4gGHLXi}k{K(ALz_B<
z30V*oGscmINZFl<3LEjoEE%nn(|zVOj_Wd}6TxGjkBjiZ&5D3K1_roj%x4P!g_A-_
z+4m?tb<%11y>&XGrTq2^+MFNo1I?sKHb^$^xf^$@ggL6szDcN0^RnmI(>HV3p&7pL
zg0n((4ZFREERe)QRN~`LFtRqPR50P8AY5`9mW`}e^}rnWJe#Ptp&v~r2o0{J{#{>V
zWJijr6v2G{b1}&uHAsIKwER(R^4|geC=mL8FLU~{K<J;X_(R2i3HYP_=bz2|li`0E
z@JE5r-=6$K#eWC*?~0WEcGMp#{$ThcD*pDve+GQrz9kgEx=mG4mH%ry>33AAynOwl
J>bXVe{{gJw2-*Mu

literal 0
HcmV?d00001

diff --git a/SC-web/src/assets/images/新建 DOCX 文档.docx b/SC-web/src/assets/images/新建 DOCX 文档.docx
new file mode 100644
index 00000000..e69de29b
diff --git a/SC-web/src/settings.js b/SC-web/src/settings.js
index 0f8b9b1f..8786a3fe 100644
--- a/SC-web/src/settings.js
+++ b/SC-web/src/settings.js
@@ -32,7 +32,7 @@ module.exports = {
    * If you want to also use it in dev, you can pass ['production', 'development']
    */
   sysConfig: {
-    sysVersion: 'V3.4.1',
+    sysVersion: 'V1.1.2',
     copyright: 'LINKAGE-BOOT版权所有',
     navigationIcon: '',
     logoIcon: '',

From e9310836a12e9fd109e98d6576cc8ccd9b71cdda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B7=B4=E5=8D=AB?= <14240332@qq.com>
Date: Sat, 7 Jan 2023 11:26:03 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E7=89=88=E6=9C=AC=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SC-web/src/lang/zh.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/SC-web/src/lang/zh.js b/SC-web/src/lang/zh.js
index 0890c1c3..d71ddbcb 100644
--- a/SC-web/src/lang/zh.js
+++ b/SC-web/src/lang/zh.js
@@ -144,7 +144,8 @@ export default {
     logIn: '登录',
     username: '请输入账号',
     password: '请输入密码',
-    rule: '子账户规则：手机号@账户 例：18577778888@101001',
+    // rule: '子账户规则：手机号@账户 例：18577778888@101001',
+    rule: '',
     version: '版本',
     upper: '大写已锁定',
     scanTip: '扫码登录',
@@ -258,4 +259,4 @@ export default {
     cancelAccountTip: '确定要注销该账号?',
     forcedOffline: '强制下线'
   }
-}
\ No newline at end of file
+}

From 2a4e57698e3d27a79a7e60f8c05c28126f76271c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B7=B4=E5=8D=AB?= <14240332@qq.com>
Date: Sat, 7 Jan 2023 12:41:51 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E7=89=88=E6=9C=AC=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SC-web/package-lock.json         | 4 ++--
 SC-web/package.json              | 2 +-
 SC-web/src/settings.js           | 4 ++--
 SC-web/src/views/login/index.vue | 3 ++-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/SC-web/package-lock.json b/SC-web/package-lock.json
index 4fd45f0f..5ce53f24 100644
--- a/SC-web/package-lock.json
+++ b/SC-web/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "linkage-web",
-  "version": "3.4.1",
+  "version": "1.1.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "linkage-web",
-      "version": "3.4.1",
+      "version": "1.1.2",
       "license": "MIT",
       "dependencies": {
         "@fullcalendar/bootstrap": "^4.4.0",
diff --git a/SC-web/package.json b/SC-web/package.json
index 7f2fe47c..4bb6f4c7 100644
--- a/SC-web/package.json
+++ b/SC-web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "linkage-web",
-  "version": "3.4.1",
+  "version": "1.1.2",
   "description": "LINKAGE-快速开发平台",
   "author": "LINKAGE-快速开发平台",
   "license": "MIT",
diff --git a/SC-web/src/settings.js b/SC-web/src/settings.js
index 8786a3fe..9ded260d 100644
--- a/SC-web/src/settings.js
+++ b/SC-web/src/settings.js
@@ -32,12 +32,12 @@ module.exports = {
    * If you want to also use it in dev, you can pass ['production', 'development']
    */
   sysConfig: {
-    sysVersion: 'V1.1.2',
+    sysVersion: 'V1.0.2',
     copyright: 'LINKAGE-BOOT版权所有',
     navigationIcon: '',
     logoIcon: '',
     loginIcon: '',
-    sysName: 'LINKAGE-快速开发平台'
+    sysName: 'LINKAGE-BOOT快速开发平台'
   },
   themeClass: 'blue',
   layoutType: 'classic',
diff --git a/SC-web/src/views/login/index.vue b/SC-web/src/views/login/index.vue
index f44fcaed..58aa2176 100644
--- a/SC-web/src/views/login/index.vue
+++ b/SC-web/src/views/login/index.vue
@@ -1,7 +1,8 @@
 <template>
   <div class="login-container">
     <div class="login-version" v-if="sysConfig && sysConfig.sysVersion">
-      <p class="login-version-text">{{sysConfig.sysVersion}}</p>
+      <p class="login-version-text">V1.0.2</p>
+<!--      <p class="login-version-text">{{sysConfig.sysVersion}}</p>-->
     </div>
     <div class="login-left">
       <a class="login-company-logo" target="_blank" href="">

From 1b798fe998f94c590809db67fe17735753a6a76f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B7=B4=E5=8D=AB?= <14240332@qq.com>
Date: Sat, 7 Jan 2023 13:07:02 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=B8=83=E5=B1=80?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SC-web/src/views/login/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/SC-web/src/views/login/index.vue b/SC-web/src/views/login/index.vue
index 58aa2176..5d18e8cf 100644
--- a/SC-web/src/views/login/index.vue
+++ b/SC-web/src/views/login/index.vue
@@ -10,9 +10,9 @@
       </a>
       <img class="login-banner" src="@/assets/images/login-banner.png" alt="">
       <div class="login-left-txt" v-if="showTxt">
-        <p class="title1">在线自动化，可视化系统开发，零代码实现80%的基础功能</p>
-        <p class="title2">已帮助<span>20000+</span>家企业完成数字化转型升级</p>
-        <a class="link" target="_blank" href="">了解更多</a>
+        <p class="title1">在线自动化，流程可视化， DevOps开发模式实现业务需求核心功能</p>
+        <p class="title2">企业宗旨：<span>致力于</span>传统制造型企业完成数字化转型升级</p>
+<!--        <a class="link" target="_blank" href="">了解更多</a>-->
       </div>
     </div>
     <div class="login-content">

From 7107f7cdecf8aabbc609fd2b49eeda319f837c12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= <vayne0702@163.com>
Date: Sat, 7 Jan 2023 14:16:20 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/MaterialController.java         |  4 ++--
 .../controller/ReservoirareaController.java    |  2 +-
 .../scm/basicInformation/material/Form.vue     | 18 ++++++++++--------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/material/controller/MaterialController.java b/SC-boot/linkage-scm/src/main/java/jnpf/material/controller/MaterialController.java
index 4fe9f8fc..b726a466 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/material/controller/MaterialController.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/material/controller/MaterialController.java
@@ -87,9 +87,9 @@ public class MaterialController {
         //处理id字段转名称，若无需转或者为空可删除
     for(MaterialEntity entity:list){
 						Map<String,Object> outAreaMap = new HashMap<>();
-            entity.setOutArea(generaterSwapUtil.swapRelationFormValue("comInputField102",entity.getOutArea(),"294012196529150981",outAreaMap));
+            entity.setOutArea(generaterSwapUtil.getPopupSelectValue("381404161809350213","id","areaname",entity.getOutArea(),outAreaMap));
 						Map<String,Object> inAreaMap = new HashMap<>();
-            entity.setInArea(generaterSwapUtil.swapRelationFormValue("comInputField102",entity.getInArea(),"294012196529150981",inAreaMap));
+            entity.setInArea(generaterSwapUtil.getPopupSelectValue("381404161809350213","id","areaname",entity.getInArea(),inAreaMap));
     }
 	List<MaterialListVO> listVO=JsonUtil.getJsonToList(list,MaterialListVO.class);
     for(MaterialListVO materialVO:listVO){
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/controller/ReservoirareaController.java b/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/controller/ReservoirareaController.java
index 454263d9..bb9869f3 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/controller/ReservoirareaController.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/controller/ReservoirareaController.java
@@ -87,7 +87,7 @@ public class ReservoirareaController {
         //处理id字段转名称，若无需转或者为空可删除
     for(ReservoirareaEntity entity:list){
 						Map<String,Object> warehouseIdMap = new HashMap<>();
-            entity.setWarehouseId(generaterSwapUtil.swapRelationFormValue("comInputField109",entity.getWarehouseId(),"294090217084722181",warehouseIdMap));
+            entity.setWarehouseId(generaterSwapUtil.getPopupSelectValue("380988259175524165","id","name",entity.getWarehouseId(),warehouseIdMap));
             entity.setOrgnizeId(generaterSwapUtil.comSelectValues(entity.getOrgnizeId()));
             entity.setDepartmentId(generaterSwapUtil.comSelectValues(entity.getDepartmentId()));
     }
diff --git a/SC-web/src/views/scm/basicInformation/material/Form.vue b/SC-web/src/views/scm/basicInformation/material/Form.vue
index 359b3492..e7141d90 100644
--- a/SC-web/src/views/scm/basicInformation/material/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/material/Form.vue
@@ -74,19 +74,21 @@
             <el-col :span="12" >
                 <el-form-item  label="默认出库区"  
  prop="outArea" >
-                    <relationForm    v-model="dataForm.outArea"
- placeholder="请选择"  clearable  field="outArea" modelId ="294012196529150981"  :columnOptions="outAreacolumnOptions" relationField="comInputField102"   >
+                    <popupSelect    v-model="dataForm.outArea"
+ placeholder="请选择"  clearable  field="outArea" interfaceId="381404161809350213"  :columnOptions="outAreacolumnOptions" propsValue="id" relationField="areaname" popupType="dialog"
+    popupTitle="选择数据"  popupWidth="800px">
 
-                </relationForm>
+                </popupSelect>
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
                 <el-form-item  label="默认入库区"  
  prop="inArea" >
-                    <relationForm    v-model="dataForm.inArea"
- placeholder="请选择"  clearable  field="inArea" modelId ="294012196529150981"  :columnOptions="inAreacolumnOptions" relationField="comInputField102"   >
+                    <popupSelect    v-model="dataForm.inArea"
+ placeholder="请选择"  clearable  field="inArea" interfaceId="381404161809350213"  :columnOptions="inAreacolumnOptions" propsValue="id" relationField="areaname" popupType="dialog" 
+   popupTitle="选择数据"  popupWidth="800px">
 
-                </relationForm>
+                </popupSelect>
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
@@ -233,8 +235,8 @@
             },
                         purchaseFlagOptions:[{"fullName":"Y","id":"Y"},{"fullName":"N","id":"N"}],
                         salesFlagOptions:[{"fullName":"Y","id":"Y"},{"fullName":"N","id":"N"}],
-                    outAreacolumnOptions:[ {"label":"购药人","value":"comInputField102"},],
-                    inAreacolumnOptions:[ {"label":"姓名","value":"comInputField102"},],
+                    outAreacolumnOptions:[ {"label":"库区编号","value":"areacode"},{"label":"库区名称","value":"areaname"},{"label":"仓库名称","value":"name"},{"label":"最高库存","value":"maximum"},],
+                    inAreacolumnOptions:[{"label":"库区编号","value":"areacode"},{"label":"库区名称","value":"areaname"},{"label":"仓库名称","value":"name"},{"label":"最高库存","value":"maximum"},],
                         effectiveStatusOptions:[{"fullName":"Y","id":"Y"},{"fullName":"N","id":"N"}],
                         processingTypeOptions:[{"fullName":"Y","id":"Y"},{"fullName":"N","id":"N"}],
                         readTagOptions:[{"fullName":"Y","id":"Y"},{"fullName":"N","id":"N"}],

From 7448c73e0753fddd14e4a830c5ff5a304838b51c Mon Sep 17 00:00:00 2001
From: 17602169347 <h17602169347@163.com>
Date: Sat, 7 Jan 2023 14:34:29 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scm/basicInformation/areasetting/Form.vue |  350 +++---
 .../basicInformation/areasetting/index.vue    |  509 ++++----
 .../basicInformation/contractfile/Form.vue    | 1081 ++++++++---------
 .../basicInformation/contractfile/index.vue   |  636 +++++-----
 .../scm/basicInformation/customer/Form.vue    |  448 ++++---
 .../scm/basicInformation/customer/index.vue   |  582 +++++----
 .../scm/basicInformation/material/Form.vue    |  652 +++++-----
 .../scm/basicInformation/material/index.vue   |  714 ++++++-----
 .../basicInformation/monitormanage/Form.vue   |  443 ++++---
 .../basicInformation/monitormanage/index.vue  |  549 +++++----
 .../scm/basicInformation/poundlist/Form.vue   |  903 +++++++-------
 .../scm/basicInformation/poundlist/index.vue  |  741 ++++++-----
 .../basicInformation/purchaseorder/Form.vue   |  932 +++++++-------
 .../basicInformation/purchaseorder/index.vue  |  638 +++++-----
 .../basicInformation/reservoirarea/Form.vue   |  508 ++++----
 .../basicInformation/reservoirarea/index.vue  |  606 ++++-----
 .../scm/basicInformation/supplier/Form.vue    |  498 ++++----
 .../scm/basicInformation/supplier/index.vue   |  620 +++++-----
 .../scm/basicInformation/tradeupload/Form.vue |  716 ++++++-----
 .../basicInformation/tradeupload/index.vue    |  672 +++++-----
 .../scm/basicInformation/vehicle/Form.vue     |  376 +++---
 .../scm/basicInformation/vehicle/index.vue    |    4 +-
 .../scm/basicInformation/warehouse/Form.vue   |  599 ++++-----
 .../scm/basicInformation/warehouse/index.vue  |  707 ++++++-----
 24 files changed, 7639 insertions(+), 6845 deletions(-)

diff --git a/SC-web/src/views/scm/basicInformation/areasetting/Form.vue b/SC-web/src/views/scm/basicInformation/areasetting/Form.vue
index 7d1b0ad8..91d25e74 100644
--- a/SC-web/src/views/scm/basicInformation/areasetting/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/areasetting/Form.vue
@@ -1,188 +1,182 @@
 <template>
-<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'"
-           :close-on-click-modal="false" append-to-body
-           :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
-           width="800px">
-<el-row :gutter="15" class="">
-<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
-    <template v-if="!loading">
-            <el-col :span="24" >
-                <el-form-item  label="区域名称"  
- prop="mName" >
-                    <el-input    v-model="dataForm.mName"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" append-to-body
+		:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
+		<el-row :gutter="15" class="">
+			<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px"
+				label-position="right">
+				<template v-if="!loading">
+					<el-col :span="24">
+						<el-form-item label="区域名称" prop="mName">
+							<el-input v-model="dataForm.mName" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="创建时间"  
- prop="creatortime" >
-                    <el-date-picker    v-model="dataForm.creatortime"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' type="datetime"  format="yyyy-MM-dd HH:mm:ss"  value-format="timestamp" >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="创建时间" prop="creatortime">
+							<el-date-picker v-model="dataForm.creatortime" placeholder="请选择" clearable
+								:style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
+								value-format="timestamp">
 
-                </el-date-picker>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="创建人名称"  
- prop="creatorusername" >
-                    <el-input    v-model="dataForm.creatorusername"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-date-picker>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="创建人名称" prop="creatorusername">
+							<el-input v-model="dataForm.creatorusername" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="修改时间"  
- prop="lastmodifytime" >
-                    <el-date-picker    v-model="dataForm.lastmodifytime"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' type="datetime"  format="yyyy-MM-dd HH:mm:ss"  value-format="timestamp" >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="修改时间" prop="lastmodifytime">
+							<el-date-picker v-model="dataForm.lastmodifytime" placeholder="请选择" clearable
+								:style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
+								value-format="timestamp">
 
-                </el-date-picker>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="修改人名称"  
- prop="lastmodifyusername" >
-                    <el-input    v-model="dataForm.lastmodifyusername"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-date-picker>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="修改人名称" prop="lastmodifyusername">
+							<el-input v-model="dataForm.lastmodifyusername" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-    </template>
-</el-form>
-    </el-row>
-    <span slot="footer" class="dialog-footer">
-        <el-button @click="visible = false"> 取 消</el-button>
-        <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
-    </span>
-    </el-dialog>
+							</el-input>
+						</el-form-item>
+					</el-col>
+				</template>
+			</el-form>
+		</el-row>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false"> 取 消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
+		</span>
+	</el-dialog>
 </template>
 <script>
-    import request from '@/utils/request'
-    import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-    export default {
-        components: {},
-        props: [],
-        data() {
-            return {
-                visible: false,
-                loading: false,
-                isDetail: false,
-            dataForm: {
-                            mName : '',
-                            creatortime : '',
-                            creatorusername : '',
-                            lastmodifytime : '',
-                            lastmodifyusername : '',
-            },
-            rules:
-            {
-                            mName: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                        ],
-            },
-
-        }
-        },
-        computed: {},
-        watch: {},
-        created() {
-        },
-        mounted() {},
-        methods: {
-            clearData(data){
-                for (let key in data) {
-                    if (data[key] instanceof Array) {
-                        data[key] = [];
-                    } else if (data[key] instanceof Object) {
-                        this.clearData(data[key]);
-                    } else {
-                        data[key] = "";
-                    }
-                }
-            },
-            init(id, isDetail) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.isDetail = isDetail || false;
-                this.$nextTick(() => {
-                    this.$refs['elForm'].resetFields();
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/areasetting/Areasetting/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        });
-                    }else{
-                       this.clearData(this.dataForm)
-                    }
-                });
-                this.$store.commit('generator/UPDATE_RELATION_DATA', {})
-            },
-            // 表单提交
-            dataFormSubmit() {
-                this.$refs['elForm'].validate((valid) => {
-                    if (valid) {
-                            this.request()
-                    }
-                })
-            },
-            request() {
-                var _data =this.dataList()
-                if (!this.dataForm.id) {
-                    request({
-                        url: '/api/areasetting/Areasetting',
-                        method: 'post',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                this.visible = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    })
-                }else{
-                    request({
-                        url: '/api/areasetting/Areasetting/'+this.dataForm.id,
-                        method: 'PUT',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                this.visible = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    })
-                }
-            },
-            dataList(){
-                var _data = JSON.parse(JSON.stringify(this.dataForm));
-                return _data;
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                this.dataForm = _dataAll
-            },
-        },
-    }
+	import request from '@/utils/request'
+	import {
+		getDataInterfaceRes
+	} from '@/api/systemData/dataInterface'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	export default {
+		components: {},
+		props: [],
+		data() {
+			return {
+				visible: false,
+				loading: false,
+				isDetail: false,
+				dataForm: {
+					mName: '',
+					creatortime: '',
+					creatorusername: '',
+					lastmodifytime: '',
+					lastmodifyusername: '',
+				},
+				rules: {
+					mName: [{
+						required: true,
+						message: '请输入',
+						trigger: 'blur'
+					}, ],
+				},
 
+			}
+		},
+		computed: {},
+		watch: {},
+		created() {},
+		mounted() {},
+		methods: {
+			clearData(data) {
+				for (let key in data) {
+					if (data[key] instanceof Array) {
+						data[key] = [];
+					} else if (data[key] instanceof Object) {
+						this.clearData(data[key]);
+					} else {
+						data[key] = "";
+					}
+				}
+			},
+			init(id, isDetail) {
+				this.dataForm.id = id || 0;
+				this.visible = true;
+				this.isDetail = isDetail || false;
+				this.$nextTick(() => {
+					this.$refs['elForm'].resetFields();
+					if (this.dataForm.id) {
+						this.loading = true
+						request({
+							url: '/api/areasetting/Areasetting/' + this.dataForm.id,
+							method: 'get'
+						}).then(res => {
+							this.dataInfo(res.data)
+							this.loading = false
+						});
+					} else {
+						this.clearData(this.dataForm)
+					}
+				});
+				this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+			},
+			// 表单提交
+			dataFormSubmit() {
+				this.$refs['elForm'].validate((valid) => {
+					if (valid) {
+						this.request()
+					}
+				})
+			},
+			request() {
+				var _data = this.dataList()
+				if (!this.dataForm.id) {
+					request({
+						url: '/api/areasetting/Areasetting',
+						method: 'post',
+						data: _data
+					}).then((res) => {
+						this.$message({
+							message: res.msg,
+							type: 'success',
+							duration: 1000,
+							onClose: () => {
+								this.visible = false
+								this.$emit('refresh', true)
+							}
+						})
+					})
+				} else {
+					request({
+						url: '/api/areasetting/Areasetting/' + this.dataForm.id,
+						method: 'PUT',
+						data: _data
+					}).then((res) => {
+						this.$message({
+							message: res.msg,
+							type: 'success',
+							duration: 1000,
+							onClose: () => {
+								this.visible = false
+								this.$emit('refresh', true)
+							}
+						})
+					})
+				}
+			},
+			dataList() {
+				var _data = JSON.parse(JSON.stringify(this.dataForm));
+				return _data;
+			},
+			dataInfo(dataAll) {
+				let _dataAll = dataAll
+				this.dataForm = _dataAll
+			},
+		},
+	}
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/areasetting/index.vue b/SC-web/src/views/scm/basicInformation/areasetting/index.vue
index 9304ae80..cda2db0c 100644
--- a/SC-web/src/views/scm/basicInformation/areasetting/index.vue
+++ b/SC-web/src/views/scm/basicInformation/areasetting/index.vue
@@ -1,250 +1,275 @@
 <template>
-    <div class="JNPF-common-layout">
+	<div class="JNPF-common-layout">
 
-        <div class="JNPF-common-layout-center">
-            <el-row class="JNPF-common-search-box" :gutter="16">
-                <el-form @submit.native.prevent>
-                                            <el-col :span="6">
-                                <el-form-item label="区域名称">
-                                        <el-input v-model="query.mName" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                    <el-col :span="6">
-                        <el-form-item>
-                            <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-                            <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-                        </el-form-item>
-                    </el-col>
-                </el-form>
-            </el-row>
-            <div class="JNPF-common-layout-main JNPF-flex-main">
-                <div class="JNPF-common-head">
-                    <div>
-                                    <el-button type="primary" icon="el-icon-plus"  @click="addOrUpdateHandle()">新增
-                                    </el-button>
-                                    <el-button type="text" icon="el-icon-download" @click="exportData()" >导出
-                                    </el-button>
-                                    <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" >批量删除
-                                    </el-button>
-                    </div>
-                    <div class="JNPF-common-head-right">
-                        <el-tooltip effect="dark" content="刷新" placement="top">
-                            <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                                     @click="reset()"/>
-                        </el-tooltip>
-                        <screenfull isContainer/>
-                    </div>
-                </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  has-c @selection-change="handleSelectionChange">
-                            <el-table-column prop="mName" label="区域名称" width="0" align="left"
-/>
-                            <el-table-column prop="creatortime" label="创建时间" width="0" align="left"
-/>
-                            <el-table-column prop="creatorusername" label="创建人名称" width="0" align="left"
-/>
-                            <el-table-column prop="lastmodifytime" label="修改时间" width="0" align="left"
-/>
-                            <el-table-column prop="lastmodifyusername" label="修改人名称" width="0" align="left"
-/>
-                        <el-table-column label="操作" fixed="right"
-                                         width="100" >
-                            <template slot-scope="scope">
-                                        <el-button type="text"
-                                                   @click="addOrUpdateHandle(scope.row.id)" >编辑
-                                        </el-button>
-                                        <el-button type="text" class="JNPF-table-delBtn"  @click="handleDel(scope.row.id)">删除
-                                        </el-button>
-                            </template>
-                        </el-table-column>
-                </JNPF-table>
-                    <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
-            </div>
-        </div>
-        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
-        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
-        <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
-    </div>
+		<div class="JNPF-common-layout-center">
+			<el-row class="JNPF-common-search-box" :gutter="16">
+				<el-form @submit.native.prevent>
+					<el-col :span="6">
+						<el-form-item label="区域名称">
+							<el-input v-model="query.mName" placeholder="请输入" clearable> </el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+						</el-form-item>
+					</el-col>
+				</el-form>
+			</el-row>
+			<div class="JNPF-common-layout-main JNPF-flex-main">
+				<div class="JNPF-common-head">
+					<div>
+						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+						</el-button>
+						<el-button type="text" icon="el-icon-download" @click="exportData()">导出
+						</el-button>
+						<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+						</el-button>
+					</div>
+					<div class="JNPF-common-head-right">
+						<el-tooltip effect="dark" content="刷新" placement="top">
+							<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+								@click="reset()" />
+						</el-tooltip>
+						<screenfull isContainer />
+					</div>
+				</div>
+				<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
+					@selection-change="handleSelectionChange">
+					<el-table-column prop="mName" label="区域名称" width="0" align="left" />
+					<el-table-column prop="creatortime" label="创建时间" width="0" align="left" />
+					<el-table-column prop="creatorusername" label="创建人名称" width="0" align="left" />
+					<el-table-column prop="lastmodifytime" label="修改时间" width="0" align="left" />
+					<el-table-column prop="lastmodifyusername" label="修改人名称" width="0" align="left" />
+					<el-table-column label="操作" fixed="right" width="100">
+						<template slot-scope="scope">
+							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
+							</el-button>
+							<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+							</el-button>
+						</template>
+					</el-table-column>
+				</JNPF-table>
+				<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+					@pagination="initData" />
+			</div>
+		</div>
+		<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
+		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+		<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
+	</div>
 </template>
 
 <script>
-    import request from '@/utils/request'
-    import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
-    import JNPFForm from './Form'
-    import ExportBox from './ExportBox'
-    import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
-    import Detail from './Detail'
+	import request from '@/utils/request'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	import JNPFForm from './Form'
+	import ExportBox from './ExportBox'
+	import {
+		getDataInterfaceRes
+	} from '@/api/systemData/dataInterface'
+	import Detail from './Detail'
 
-    export default {
-        components: {JNPFForm, ExportBox,Detail},
-        data() {
-            return {
-                detailVisible: false,
-                query: {
-                                mName:undefined,
-                },
-                treeProps: {
-                    children: 'children',
-                    label: 'fullName',
-                    value: 'id'
-                },
-                list: [],
-                listLoading: true,
- multipleSelection: [],                    total: 0,
-                listQuery: {
-                        currentPage: 1,
-                        pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
-                },
-                formVisible: false,
-                exportBoxVisible: false,
-                columnList: [
-                    {prop: 'mName', label: '区域名称'},
-                    {prop: 'creatortime', label: '创建时间'},
-                    {prop: 'creatorusername', label: '创建人名称'},
-                    {prop: 'lastmodifytime', label: '修改时间'},
-                    {prop: 'lastmodifyusername', label: '修改人名称'},
-                ],
-            }
-        },
-        computed: {
-            menuId() {
-                return this.$route.meta.modelId || ''
-            }
-        },
-        created() {
-                this.initData()
-        },
-        methods: {
-            goDetail(id){
-                this.detailVisible = true
-                this.$nextTick(() => {
-                    this.$refs.Detail.init(id)
-                })
-            },
-            sortChange({column, prop, order}) {
-                this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-                this.listQuery.sidx = !order ? '' : prop
-                this.initData()
-            },
-            initData() {
-                this.listLoading = true;
-                let _query = {
-                    ...this.listQuery,
-                    ...this.query,
-                    menuId:this.menuId
-                };
-                request({
-                    url: `/api/areasetting/Areasetting/getList`,
-                    method: 'post',
-                    data: _query
-                }).then(res => {
-                    var _list =[];
-                    for(let i=0;i<res.data.list.length;i++){
-                        let _data = res.data.list[i];
-                        _list.push(_data)
-                    }
-                    this.list = _list
-                        this.total = res.data.pagination.total
+	export default {
+		components: {
+			JNPFForm,
+			ExportBox,
+			Detail
+		},
+		data() {
+			return {
+				detailVisible: false,
+				query: {
+					mName: undefined,
+				},
+				treeProps: {
+					children: 'children',
+					label: 'fullName',
+					value: 'id'
+				},
+				list: [],
+				listLoading: true,
+				multipleSelection: [],
+				total: 0,
+				listQuery: {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				},
+				formVisible: false,
+				exportBoxVisible: false,
+				columnList: [{
+						prop: 'mName',
+						label: '区域名称'
+					},
+					{
+						prop: 'creatortime',
+						label: '创建时间'
+					},
+					{
+						prop: 'creatorusername',
+						label: '创建人名称'
+					},
+					{
+						prop: 'lastmodifytime',
+						label: '修改时间'
+					},
+					{
+						prop: 'lastmodifyusername',
+						label: '修改人名称'
+					},
+				],
+			}
+		},
+		computed: {
+			menuId() {
+				return this.$route.meta.modelId || ''
+			}
+		},
+		created() {
+			this.initData()
+		},
+		methods: {
+			goDetail(id) {
+				this.detailVisible = true
+				this.$nextTick(() => {
+					this.$refs.Detail.init(id)
+				})
+			},
+			sortChange({
+				column,
+				prop,
+				order
+			}) {
+				this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+				this.listQuery.sidx = !order ? '' : prop
+				this.initData()
+			},
+			initData() {
+				this.listLoading = true;
+				let _query = {
+					...this.listQuery,
+					...this.query,
+					menuId: this.menuId
+				};
+				request({
+					url: `/api/areasetting/Areasetting/getList`,
+					method: 'post',
+					data: _query
+				}).then(res => {
+					var _list = [];
+					for (let i = 0; i < res.data.list.length; i++) {
+						let _data = res.data.list[i];
+						_list.push(_data)
+					}
+					this.list = _list
+					this.total = res.data.pagination.total
 
-                    this.listLoading = false
-                })
-            },
-            handleDel(id) {
-                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    request({
-                        url: `/api/areasetting/Areasetting/${id}`,
-                        method: 'DELETE'
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => {
-                });
-            },
-                handleSelectionChange(val) {
-                    const res = val.map(item => item.id)
-                    this.multipleSelection = res
-                },
-                handleBatchRemoveDel() {
-                    if (!this.multipleSelection.length) {
-                        this.$message({
-                            type: 'error',
-                            message: '请选择一条数据',
-                            duration: 1500,
-                        })
-                        return
-                    }
-                    const ids = this.multipleSelection.join()
-                    this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-                        type: 'warning'
-                    }).then(() => {
-                        request({
-                            url: `/api/areasetting/Areasetting/batchRemove/${ids}`,
-                            method: 'DELETE'
-                        }).then(res => {
-                            this.$message({
-                                type: 'success',
-                                message: res.msg,
-                                onClose: () => {
-                                    this.initData()
-                                }
-                            });
-                        })
-                    }).catch(() => {
-                    })
-                },
-            addOrUpdateHandle(id, isDetail) {
-                this.formVisible = true
-                this.$nextTick(() => {
-                    this.$refs.JNPFForm.init(id, isDetail)
-                })
-            },
-            exportData() {
-                this.exportBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.ExportBox.init(this.columnList)
-                })
-            },
-            download(data) {
-                let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
-                request({
-                    url: `/api/areasetting/Areasetting/Actions/Export`,
-                    method: 'GET',
-                    data: query
-                }).then(res => {
-                    if (!res.data.url) return
-                    this.jnpf.downloadFile(res.data.url)
-                    this.$refs.ExportBox.visible = false
-                    this.exportBoxVisible = false
-                })
-            },
-            search() {
-                this.listQuery = {
-                        currentPage: 1,
-                        pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
-                }
-                this.initData()
-            },
-            refresh(isrRefresh) {
-                this.formVisible = false
-                if (isrRefresh) this.reset()
-            },
-            reset() {
-                for (let key in this.query) {
-                    this.query[key] = undefined
-                }
-                this.search()
-            }
-        }
-    }
+					this.listLoading = false
+				})
+			},
+			handleDel(id) {
+				this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/areasetting/Areasetting/${id}`,
+						method: 'DELETE'
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {});
+			},
+			handleSelectionChange(val) {
+				const res = val.map(item => item.id)
+				this.multipleSelection = res
+			},
+			handleBatchRemoveDel() {
+				if (!this.multipleSelection.length) {
+					this.$message({
+						type: 'error',
+						message: '请选择一条数据',
+						duration: 1500,
+					})
+					return
+				}
+				const ids = this.multipleSelection.join()
+				this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/areasetting/Areasetting/batchRemove/${ids}`,
+						method: 'DELETE'
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {})
+			},
+			addOrUpdateHandle(id, isDetail) {
+				this.formVisible = true
+				this.$nextTick(() => {
+					this.$refs.JNPFForm.init(id, isDetail)
+				})
+			},
+			exportData() {
+				this.exportBoxVisible = true
+				this.$nextTick(() => {
+					this.$refs.ExportBox.init(this.columnList)
+				})
+			},
+			download(data) {
+				let query = {
+					...data,
+					...this.listQuery,
+					...this.query,
+					menuId: this.menuId
+				}
+				request({
+					url: `/api/areasetting/Areasetting/Actions/Export`,
+					method: 'GET',
+					data: query
+				}).then(res => {
+					if (!res.data.url) return
+					this.jnpf.downloadFile(res.data.url)
+					this.$refs.ExportBox.visible = false
+					this.exportBoxVisible = false
+				})
+			},
+			search() {
+				this.listQuery = {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				}
+				this.initData()
+			},
+			refresh(isrRefresh) {
+				this.formVisible = false
+				if (isrRefresh) this.reset()
+			},
+			reset() {
+				for (let key in this.query) {
+					this.query[key] = undefined
+				}
+				this.search()
+			}
+		}
+	}
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/contractfile/Form.vue b/SC-web/src/views/scm/basicInformation/contractfile/Form.vue
index a63d38e4..4bb43f23 100644
--- a/SC-web/src/views/scm/basicInformation/contractfile/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/contractfile/Form.vue
@@ -1,199 +1,175 @@
 <template>
-<transition name="el-zoom-in-center">
-<div class="JNPF-preview-main">
-    <div class="JNPF-common-page-header">
-        <el-page-header @back="goBack"
-                        :content="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'"/>
-        <div class="options">
-            <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 保 存</el-button>
-            <el-button @click="goBack"> 取 消</el-button>
-        </div>
-    </div>
-<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
-<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
-    <template v-if="!loading">
-            <el-col :span="8" >
-                <el-form-item  label="合同类型 "
- prop="contractType" >
-                    <el-select    v-model="dataForm.contractType"
- placeholder="请选择"  clearable  :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in contractTypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
+	<transition name="el-zoom-in-center">
+		<div class="JNPF-preview-main">
+			<div class="JNPF-common-page-header">
+				<el-page-header @back="goBack" :content="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" />
+				<div class="options">
+					<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 保 存</el-button>
+					<el-button @click="goBack"> 取 消</el-button>
+				</div>
+			</div>
+			<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
+				<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px"
+					label-position="right">
+					<template v-if="!loading">
+						<el-col :span="8">
+							<el-form-item label="合同类型 " prop="contractType">
+								<el-select v-model="dataForm.contractType" placeholder="请选择" clearable
+									:style='{"width":"100%"}'>
+									<el-option v-for="(item, index) in contractTypeOptions" :key="index"
+										:label="item.fullName" :value="item.id" :disabled="item.disabled"></el-option>
 
-                </el-select>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="合同编码"
- prop="contractCode" >
-                    <el-input    v-model="dataForm.contractCode"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="合同编码" prop="contractCode">
+								<el-input v-model="dataForm.contractCode" placeholder="请输入" clearable
+									:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="合同名称"
- prop="contractName" >
-                    <el-input    v-model="dataForm.contractName"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+								</el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="合同名称" prop="contractName">
+								<el-input v-model="dataForm.contractName" placeholder="请输入" clearable
+									:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="合同状态"
- prop="status" >
-                    <el-input    v-model="dataForm.status"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+								</el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="合同状态" prop="status">
+								<el-input v-model="dataForm.status" placeholder="请输入" clearable
+									:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="开标日期"
- prop="bidOpeningDate" >
-                    <el-date-picker    v-model="dataForm.bidOpeningDate"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp" >
+								</el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="开标日期" prop="bidOpeningDate">
+								<el-date-picker v-model="dataForm.bidOpeningDate" placeholder="请选择" clearable
+									:style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp">
 
-                </el-date-picker>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="开始日期"
- prop="startDate" >
-                    <el-date-picker    v-model="dataForm.startDate"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp" >
+								</el-date-picker>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="开始日期" prop="startDate">
+								<el-date-picker v-model="dataForm.startDate" placeholder="请选择" clearable
+									:style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp">
 
-                </el-date-picker>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="审核日期"
- prop="auditDate" >
-                    <el-date-picker    v-model="dataForm.auditDate"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp" >
+								</el-date-picker>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="审核日期" prop="auditDate">
+								<el-date-picker v-model="dataForm.auditDate" placeholder="请选择" clearable
+									:style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp">
 
-                </el-date-picker>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="供货完成日期"
- prop="completionDate" >
-                    <el-date-picker    v-model="dataForm.completionDate"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp" >
+								</el-date-picker>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="供货完成日期" prop="completionDate">
+								<el-date-picker v-model="dataForm.completionDate" placeholder="请选择" clearable
+									:style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp">
 
-                </el-date-picker>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="关闭日期"
- prop="closingDate" >
-                    <el-date-picker    v-model="dataForm.closingDate"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp" >
+								</el-date-picker>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="关闭日期" prop="closingDate">
+								<el-date-picker v-model="dataForm.closingDate" placeholder="请选择" clearable
+									:style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp">
 
-                </el-date-picker>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="回款周期(日)"
- prop="collectionCycle" >
-                    <el-input    v-model="dataForm.collectionCycle"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+								</el-date-picker>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="回款周期(日)" prop="collectionCycle">
+								<!-- <el-input v-model="dataForm.collectionCycle" placeholder="请输入" clearable
+									:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="签订日期"
- prop="signingDate" >
-                    <el-date-picker    v-model="dataForm.signingDate"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp" >
+								</el-input> -->
+								<el-input-number v-model="dataForm.collectionCycle" :min="0" label="请输入" :style='{"width":"100%"}'></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="签订日期" prop="signingDate">
+								<el-date-picker v-model="dataForm.signingDate" placeholder="请选择" clearable
+									:style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp">
 
-                </el-date-picker>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="截止日期"
- prop="endDate" >
-                    <el-date-picker    v-model="dataForm.endDate"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp" >
+								</el-date-picker>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="截止日期" prop="endDate">
+								<el-date-picker v-model="dataForm.endDate" placeholder="请选择" clearable
+									:style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp">
 
-                </el-date-picker>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="供应商/客户编"
- prop="code" >
-                    <el-input    v-model="dataForm.code"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="供应商/客户名"
- prop="name" >
-                    <el-input    v-model="dataForm.name"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+								</el-date-picker>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="供应商/客户编" prop="code">
+								<el-input v-model="dataForm.code" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="对方合同号"
- prop="contractNo" >
-                    <el-input    v-model="dataForm.contractNo"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+								</el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="供应商/客户名" prop="name">
+								<el-input v-model="dataForm.name" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="币种 "
- prop="currency" >
-                    <el-input    v-model="dataForm.currency"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="数量"
- prop="num" >
-                    <el-input    v-model="dataForm.num"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="金额"
- prop="amount" >
-                    <el-input    v-model="dataForm.amount"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+								</el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="对方合同号" prop="contractNo">
+								<el-input v-model="dataForm.contractNo" placeholder="请输入" clearable
+									:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="库存组织"
- prop="organization" >
-                    <el-input    v-model="dataForm.organization"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+								</el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="币种 " prop="currency">
+								<el-select v-model="dataForm.currency" placeholder="请选择" clearable
+									:style='{"width":"100%"}'>
+									<el-option v-for="(item, index) in currencyOptions" :key="index"
+										:label="item.fullName" :value="item.id" :disabled="item.disabled"></el-option>
+								
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="数量" prop="num">
+								<el-input-number v-model="dataForm.num" :min="0" label="请输入" :style='{"width":"100%"}'></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="金额" prop="amount">
+								<el-input-number v-model="dataForm.amount" :min="0" label="请输入" :style='{"width":"100%"}'></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="库存组织" prop="organization">
+								<el-input v-model="dataForm.organization" placeholder="请输入" clearable
+									:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="16" >
-                <el-form-item  label="备注"
- prop="remark" >
-                    <el-input    v-model="dataForm.remark"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+								</el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :span="16">
+							<el-form-item label="备注" prop="remark">
+								<el-input v-model="dataForm.remark" placeholder="请输入" clearable
+									:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
- <!--           <el-col :span="24" >
+								</el-input>
+							</el-form-item>
+						</el-col>
+						<!--           <el-col :span="24" >
                 <el-form-item  label="合同分类 "
  prop="classification" >
                     <el-input    v-model="dataForm.classification"
@@ -239,383 +215,394 @@
                 </el-form-item>
             </el-col>
              -->
-            <el-col :span="24" >
-                <el-form-item  label="集团审批"
- prop="approval" >
-                    <el-switch    v-model="dataForm.approval"
- :active-value="1"  :inactive-value="0" >
+						<el-col :span="24">
+							<el-form-item label="集团审批" prop="approval">
+								<el-switch v-model="dataForm.approval" :active-value="1" :inactive-value="0">
 
-                </el-switch>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24">
-                <el-tabs  v-model="activemdfrsi"  tab-position="top" class="mb-20">
-                <el-tab-pane  label="物料明细">
-    <el-col :span="24"  >
-    <el-form-item label-width="0">
-            <div class="JNPF-common-title">
-                <h2></h2>
-            </div>
-    <el-table :data="dataForm.contract_item0List" size='mini'   >
-        <el-table-column type="index" width="50" label="序号" align="center" />
-            <el-table-column prop="materialCode" label="物料编码">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.materialCode"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="materialName" label="物料名称">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.materialName"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="specification" label="规格型号">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.specification"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="unit" label="单位 ">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.unit"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="num" label="数量">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.num"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="price" label="单价">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.price"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="amount" label="金额">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.amount"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="rate" label="税率 ">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.rate"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="notPrice" label="不含税单价">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.notPrice"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="notAmount" label="不含税金额">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.notAmount"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="remark" label="备注">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.remark"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-    <el-table-column label="操作" width="50" >
-        <template slot-scope="scope">
-            <el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delcontract_item0List(scope.$index)">删除</el-button>
-        </template>
-    </el-table-column>
-    </el-table>
-    <div class="table-actions" @click="addcontract_item0List()">
-        <el-button type="text" icon="el-icon-plus">添加</el-button>
-    </div>
-    </el-form-item>
-    </el-col>
-            </el-tab-pane >
-                <el-tab-pane  label="附件详情">
-    <el-col :span="24"  >
-    <el-form-item label-width="0">
-            <div class="JNPF-common-title">
-                <h2></h2>
-            </div>
-    <el-table :data="dataForm.contract_item1List" size='mini'   >
-        <el-table-column type="index" width="50" label="序号" align="center" />
-            <el-table-column prop="enclosure" label="附件内容">
-                <template slot-scope="scope">
-                    <JNPF-UploadFz   v-model="scope.row.enclosure"
- :fileSize="5"    sizeUnit="MB"  :limit="9"  buttonText="点击上传" >
-                </JNPF-UploadFz>
-            </template>
-        </el-table-column>
-    <el-table-column label="操作" width="50" >
-        <template slot-scope="scope">
-            <el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delcontract_item1List(scope.$index)">删除</el-button>
-        </template>
-    </el-table-column>
-    </el-table>
-    <div class="table-actions" @click="addcontract_item1List()">
-        <el-button type="text" icon="el-icon-plus">添加</el-button>
-    </div>
-    </el-form-item>
-    </el-col>
-            </el-tab-pane >
-            </el-tabs>
-                </el-col>
-    </template>
-</el-form>
-    </el-row>
-    </div>
-</transition>
+								</el-switch>
+							</el-form-item>
+						</el-col>
+						<el-col :span="24">
+							<el-tabs v-model="activemdfrsi" tab-position="top" class="mb-20">
+								<el-tab-pane label="物料明细">
+									<el-col :span="24">
+										<el-form-item label-width="0">
+											<div class="JNPF-common-title">
+												<h2></h2>
+											</div>
+											<el-table :data="dataForm.contract_item0List" size='mini'>
+												<el-table-column type="index" width="50" label="序号" align="center" />
+												<el-table-column prop="materialCode" label="物料编码" align="center">
+													<template slot-scope="scope">
+														<el-input v-model="scope.row.materialCode" placeholder="请输入"
+															clearable :style='{"width":"100%"}'>
+														</el-input>
+													</template>
+												</el-table-column>
+												<el-table-column prop="materialName" label="物料名称" align="center">
+													<template slot-scope="scope">
+														<el-input v-model="scope.row.materialName" placeholder="请输入"
+															clearable :style='{"width":"100%"}'>
+														</el-input>
+													</template>
+												</el-table-column>
+												<el-table-column prop="specification" label="规格型号" align="center">
+													<template slot-scope="scope">
+														<el-input v-model="scope.row.specification" placeholder="请输入"
+															clearable :style='{"width":"100%"}'>
+														</el-input>
+													</template>
+												</el-table-column>
+												<el-table-column prop="unit" label="单位 " align="center">
+													<template slot-scope="scope">
+														<el-input v-model="scope.row.unit" placeholder="请输入" clearable
+															:style='{"width":"100%"}'>
+														</el-input>
+													</template>
+												</el-table-column>
+												<el-table-column prop="num" label="数量" align="center">
+													<template slot-scope="scope">
+														<el-input-number v-model="scope.row.num" :min="0" label="请输入" :style='{"width":"100%"}'></el-input-number>
+													</template>
+												</el-table-column>
+												<el-table-column prop="price" label="单价" align="center">
+													<template slot-scope="scope">
+														<el-input-number v-model="scope.row.price" :min="0" label="请输入" :style='{"width":"100%"}'></el-input-number>
+													</template>
+												</el-table-column>
+												<el-table-column prop="amount" label="金额" align="center">
+													<template slot-scope="scope">
+														<el-input-number v-model="scope.row.amount" :min="0" label="请输入" :style='{"width":"100%"}'></el-input-number>
+													</template>
+												</el-table-column>
+												<el-table-column prop="rate" label="税率 " align="center">
+													<template slot-scope="scope">
+														<el-input-number v-model="scope.row.rate" :min="0" label="请输入" :style='{"width":"100%"}'></el-input-number>
+													</template>
+												</el-table-column>
+												<el-table-column prop="notPrice" label="不含税单价" align="center">
+													<template slot-scope="scope">
+														<el-input-number v-model="scope.row.notPrice" :min="0" label="请输入" :style='{"width":"100%"}'></el-input-number>
+													</template>
+												</el-table-column>
+												<el-table-column prop="notAmount" label="不含税金额" align="center">
+													<template slot-scope="scope">
+														<el-input-number v-model="scope.row.notAmount" :min="0" label="请输入" :style='{"width":"100%"}'></el-input-number>
+													</template>
+												</el-table-column>
+												<el-table-column prop="remark" label="备注" align="center">
+													<template slot-scope="scope">
+														<el-input v-model="scope.row.remark" placeholder="请输入" clearable
+															:style='{"width":"100%"}'>
+														</el-input>
+													</template>
+												</el-table-column>
+												<el-table-column label="操作" width="50" align="center">
+													<template slot-scope="scope">
+														<el-button size="mini" type="text" class="JNPF-table-delBtn"
+															@click="delcontract_item0List(scope.$index)">删除</el-button>
+													</template>
+												</el-table-column>
+											</el-table>
+											<div class="table-actions" @click="addcontract_item0List()">
+												<el-button type="text" icon="el-icon-plus">添加</el-button>
+											</div>
+										</el-form-item>
+									</el-col>
+								</el-tab-pane>
+								<el-tab-pane label="附件详情">
+									<el-col :span="24">
+										<el-form-item label-width="0">
+											<div class="JNPF-common-title">
+												<h2></h2>
+											</div>
+											<el-table :data="dataForm.contract_item1List" size='mini'>
+												<el-table-column type="index" width="50" label="序号" align="center" />
+												<el-table-column prop="enclosure" label="附件内容">
+													<template slot-scope="scope">
+														<JNPF-UploadFz v-model="scope.row.enclosure" :fileSize="5"
+															sizeUnit="MB" :limit="9" buttonText="点击上传">
+														</JNPF-UploadFz>
+													</template>
+												</el-table-column>
+												<el-table-column label="操作" width="50">
+													<template slot-scope="scope">
+														<el-button size="mini" type="text" class="JNPF-table-delBtn"
+															@click="delcontract_item1List(scope.$index)">删除</el-button>
+													</template>
+												</el-table-column>
+											</el-table>
+											<div class="table-actions" @click="addcontract_item1List()">
+												<el-button type="text" icon="el-icon-plus">添加</el-button>
+											</div>
+										</el-form-item>
+									</el-col>
+								</el-tab-pane>
+							</el-tabs>
+						</el-col>
+					</template>
+				</el-form>
+			</el-row>
+		</div>
+	</transition>
 </template>
 <script>
-    import request from '@/utils/request'
-    import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-    export default {
-        components: {},
-        props: [],
-        data() {
-            return {
-                visible: false,
-                loading: false,
-                isDetail: false,
-            dataForm: {
-                            contractType : "",
-                            contractCode : '',
-                            contractName : '',
-                            status : '',
-                            bidOpeningDate : '',
-                            startDate : '',
-                            auditDate : '',
-                            completionDate : '',
-                            closingDate : '',
-                            collectionCycle : '',
-                            signingDate : '',
-                            endDate : '',
-                            code : '',
-                            name : '',
-                            contractNo : '',
-                            currency : '',
-                            num : '',
-                            amount : '',
-                            organization : '',
-                            remark : '',
-                            classification : '',
-                            declarationDate : '',
-                            deptCode : '',
-                            creatorusername : '',
-                            deptName : '',
-                            approval : 0,
-                        contract_item0List:[],
-                        contract_item1List:[],
-            },
-                            activemdfrsi:'0',
-            rules:
-            {
-                            contractType: [
-                                {
-                                    required: true,
-                                    message: '请选择',
-                                    trigger: 'change'
-                                },
-                        ],
-                            contractCode: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            contractName: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            bidOpeningDate: [
-                                {
-                                    required: true,
-                                    message: '请选择',
-                                    trigger: 'change'
-                                },
-                        ],
-            },
-                        contractTypeOptions:[{"fullName":"采购合同","id":"1"},{"fullName":"销售合同","id":"2"},
-                          {"fullName":"租赁合同","id":"3"},{"fullName":"仓储合同","id":"4"},{"fullName":"运输合同","id":"5"},
-                          {"fullName":"施工合同","id":"6"}],
+	import request from '@/utils/request'
+	import {
+		getDataInterfaceRes
+	} from '@/api/systemData/dataInterface'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	export default {
+		components: {},
+		props: [],
+		data() {
+			return {
+				visible: false,
+				loading: false,
+				isDetail: false,
+				dataForm: {
+					contractType: "",
+					contractCode: '',
+					contractName: '',
+					status: '',
+					bidOpeningDate: '',
+					startDate: '',
+					auditDate: '',
+					completionDate: '',
+					closingDate: '',
+					collectionCycle: '',
+					signingDate: '',
+					endDate: '',
+					code: '',
+					name: '',
+					contractNo: '',
+					currency: '',
+					num: '',
+					amount: '',
+					organization: '',
+					remark: '',
+					classification: '',
+					declarationDate: '',
+					deptCode: '',
+					creatorusername: '',
+					deptName: '',
+					approval: 0,
+					contract_item0List: [],
+					contract_item1List: [],
+				},
+				activemdfrsi: '0',
+				rules: {
+					contractType: [{
+						required: true,
+						message: '请选择',
+						trigger: 'change'
+					}, ],
+					contractCode: [{
+						required: true,
+						message: '请输入',
+						trigger: 'blur'
+					}, ],
+					contractName: [{
+						required: true,
+						message: '请输入',
+						trigger: 'blur'
+					}, ],
+					bidOpeningDate: [{
+						required: true,
+						message: '请选择',
+						trigger: 'change'
+					}, ],
+				},
+				currencyOptions: [{
+					"fullName": "CNY",
+					"id": "CNY"
+				}, {
+					"fullName": "USD",
+					"id": "USD"
+				}, {
+					"fullName": "EUR",
+					"id": "EUR"
+				}],
+				
+				contractTypeOptions: [{
+						"fullName": "采购合同",
+						"id": "1"
+					}, {
+						"fullName": "销售合同",
+						"id": "2"
+					},
+					{
+						"fullName": "租赁合同",
+						"id": "3"
+					}, {
+						"fullName": "仓储合同",
+						"id": "4"
+					}, {
+						"fullName": "运输合同",
+						"id": "5"
+					},
+					{
+						"fullName": "施工合同",
+						"id": "6"
+					}
+				],
 
-        }
-        },
-        computed: {},
-        watch: {},
-        created() {
-        },
-        mounted() {},
-        methods: {
-				contract_item0Exist() {
+			}
+		},
+		computed: {},
+		watch: {},
+		created() {},
+		mounted() {},
+		methods: {
+			contract_item0Exist() {
 				let isOk = true;
-					for(let i=0;i<this.dataForm.contract_item0List.length;i++){
-						const e = this.dataForm.contract_item0List[i];
-					}
+				for (let i = 0; i < this.dataForm.contract_item0List.length; i++) {
+					const e = this.dataForm.contract_item0List[i];
+				}
 				return isOk;
 			},
-				contract_item1Exist() {
+			contract_item1Exist() {
 				let isOk = true;
-					for(let i=0;i<this.dataForm.contract_item1List.length;i++){
-						const e = this.dataForm.contract_item1List[i];
-					}
+				for (let i = 0; i < this.dataForm.contract_item1List.length; i++) {
+					const e = this.dataForm.contract_item1List[i];
+				}
 				return isOk;
 			},
-                goBack() {
-                    this.$emit('refresh')
-                },
-            clearData(data){
-                for (let key in data) {
-                    if (data[key] instanceof Array) {
-                        data[key] = [];
-                    } else if (data[key] instanceof Object) {
-                        this.clearData(data[key]);
-                    } else {
-                        data[key] = "";
-                    }
-                }
-            },
-            init(id, isDetail) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.isDetail = isDetail || false;
-                this.$nextTick(() => {
-                    this.$refs['elForm'].resetFields();
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/example/ContractFile/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        });
-                    }else{
-                       this.clearData(this.dataForm)
-                    }
-                });
-                this.$store.commit('generator/UPDATE_RELATION_DATA', {})
-            },
-            // 表单提交
-            dataFormSubmit() {
-                this.$refs['elForm'].validate((valid) => {
-                    if (valid) {
-                            if (!this.contract_item0Exist()) return
-                            if (!this.contract_item1Exist()) return
-                            this.request()
-                    }
-                })
-            },
-            request() {
-                var _data =this.dataList()
-                if (!this.dataForm.id) {
-                    request({
-                        url: '/api/example/ContractFile',
-                        method: 'post',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                this.visible = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    })
-                }else{
-                    request({
-                        url: '/api/example/ContractFile/'+this.dataForm.id,
-                        method: 'PUT',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                this.visible = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    })
-                }
-            },
-                addcontract_item0List(){
-                    let item = {
-                            materialCode:undefined,
-                            materialName:undefined,
-                            specification:undefined,
-                            unit:undefined,
-                            num:undefined,
-                            price:undefined,
-                            amount:undefined,
-                            rate:undefined,
-                            notPrice:undefined,
-                            notAmount:undefined,
-                            remark:undefined,
-                }
-                    this.dataForm.contract_item0List.push(item)
-                },
-                delcontract_item0List(index) {
-                    this.dataForm.contract_item0List.splice(index, 1);
-                },
-                addcontract_item1List(){
-                    let item = {
-                            enclosure:undefined,
-                }
-                    this.dataForm.contract_item1List.push(item)
-                },
-                delcontract_item1List(index) {
-                    this.dataForm.contract_item1List.splice(index, 1);
-                },
-            dataList(){
-                var _data = JSON.parse(JSON.stringify(this.dataForm));
-                        _data.approval = parseInt(_data.approval)
-                    for(let i=0;i<_data.contract_item0List.length;i++){
-                        var _list = _data.contract_item0List[i];
-                    }
-                    for(let i=0;i<_data.contract_item1List.length;i++){
-                        var _list = _data.contract_item1List[i];
-                                _list.enclosure = JSON.stringify(_list.enclosure)
-                    }
-                return _data;
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                        _dataAll.approval = parseInt( _dataAll.approval)
-                    for(let i=0;i<_dataAll.contract_item0List.length;i++){
-                        var _list = _dataAll.contract_item0List[i];
-                    }
-                    for(let i=0;i<_dataAll.contract_item1List.length;i++){
-                        var _list = _dataAll.contract_item1List[i];
-                                _list.enclosure = JSON.parse(_list.enclosure)
-                    }
-                this.dataForm = _dataAll
-            },
-        },
-    }
-
+			goBack() {
+				this.$emit('refresh')
+			},
+			clearData(data) {
+				for (let key in data) {
+					if (data[key] instanceof Array) {
+						data[key] = [];
+					} else if (data[key] instanceof Object) {
+						this.clearData(data[key]);
+					} else {
+						data[key] = "";
+					}
+				}
+			},
+			init(id, isDetail) {
+				this.dataForm.id = id || 0;
+				this.visible = true;
+				this.isDetail = isDetail || false;
+				this.$nextTick(() => {
+					this.$refs['elForm'].resetFields();
+					if (this.dataForm.id) {
+						this.loading = true
+						request({
+							url: '/api/example/ContractFile/' + this.dataForm.id,
+							method: 'get'
+						}).then(res => {
+							this.dataInfo(res.data)
+							this.loading = false
+						});
+					} else {
+						this.clearData(this.dataForm)
+					}
+				});
+				this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+			},
+			// 表单提交
+			dataFormSubmit() {
+				this.$refs['elForm'].validate((valid) => {
+					if (valid) {
+						if (!this.contract_item0Exist()) return
+						if (!this.contract_item1Exist()) return
+						this.request()
+					}
+				})
+			},
+			request() {
+				var _data = this.dataList()
+				if (!this.dataForm.id) {
+					request({
+						url: '/api/example/ContractFile',
+						method: 'post',
+						data: _data
+					}).then((res) => {
+						this.$message({
+							message: res.msg,
+							type: 'success',
+							duration: 1000,
+							onClose: () => {
+								this.visible = false
+								this.$emit('refresh', true)
+							}
+						})
+					})
+				} else {
+					request({
+						url: '/api/example/ContractFile/' + this.dataForm.id,
+						method: 'PUT',
+						data: _data
+					}).then((res) => {
+						this.$message({
+							message: res.msg,
+							type: 'success',
+							duration: 1000,
+							onClose: () => {
+								this.visible = false
+								this.$emit('refresh', true)
+							}
+						})
+					})
+				}
+			},
+			addcontract_item0List() {
+				let item = {
+					materialCode: undefined,
+					materialName: undefined,
+					specification: undefined,
+					unit: undefined,
+					num: undefined,
+					price: undefined,
+					amount: undefined,
+					rate: undefined,
+					notPrice: undefined,
+					notAmount: undefined,
+					remark: undefined,
+				}
+				this.dataForm.contract_item0List.push(item)
+			},
+			delcontract_item0List(index) {
+				this.dataForm.contract_item0List.splice(index, 1);
+			},
+			addcontract_item1List() {
+				let item = {
+					enclosure: undefined,
+				}
+				this.dataForm.contract_item1List.push(item)
+			},
+			delcontract_item1List(index) {
+				this.dataForm.contract_item1List.splice(index, 1);
+			},
+			dataList() {
+				var _data = JSON.parse(JSON.stringify(this.dataForm));
+				_data.approval = parseInt(_data.approval)
+				for (let i = 0; i < _data.contract_item0List.length; i++) {
+					var _list = _data.contract_item0List[i];
+				}
+				for (let i = 0; i < _data.contract_item1List.length; i++) {
+					var _list = _data.contract_item1List[i];
+					_list.enclosure = JSON.stringify(_list.enclosure)
+				}
+				return _data;
+			},
+			dataInfo(dataAll) {
+				let _dataAll = dataAll
+				_dataAll.approval = parseInt(_dataAll.approval)
+				for (let i = 0; i < _dataAll.contract_item0List.length; i++) {
+					var _list = _dataAll.contract_item0List[i];
+				}
+				for (let i = 0; i < _dataAll.contract_item1List.length; i++) {
+					var _list = _dataAll.contract_item1List[i];
+					_list.enclosure = JSON.parse(_list.enclosure)
+				}
+				this.dataForm = _dataAll
+			},
+		},
+	}
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/contractfile/index.vue b/SC-web/src/views/scm/basicInformation/contractfile/index.vue
index ae927cec..c9e56042 100644
--- a/SC-web/src/views/scm/basicInformation/contractfile/index.vue
+++ b/SC-web/src/views/scm/basicInformation/contractfile/index.vue
@@ -1,294 +1,358 @@
 <template>
-    <div class="JNPF-common-layout">
+	<div class="JNPF-common-layout">
 
-        <div class="JNPF-common-layout-center">
-            <el-row class="JNPF-common-search-box" :gutter="16">
-                <el-form @submit.native.prevent>
-                  <el-col :span="6">
-                    <el-form-item label="合同编码">
-                      <el-input v-model="query.contractCode" placeholder="请输入" clearable>  </el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="6">
-                    <el-form-item label="合同名称">
-                      <el-input v-model="query.contractName" placeholder="请输入" clearable>  </el-input>
-                    </el-form-item>
-                  </el-col>
-                                        <el-col :span="6">
-                        <el-form-item>
-                            <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-                            <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-                        </el-form-item>
-                    </el-col>
-                </el-form>
-            </el-row>
-            <div class="JNPF-common-layout-main JNPF-flex-main">
-                <div class="JNPF-common-head">
-                    <div>
-                                    <el-button type="primary" icon="el-icon-plus"  @click="addOrUpdateHandle()">新增
-                                    </el-button>
-                                    <el-button type="text" icon="el-icon-download" @click="exportData()" >导出
-                                    </el-button>
-                                    <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" >批量删除
-                                    </el-button>
-                    </div>
-                    <div class="JNPF-common-head-right">
-                        <el-tooltip effect="dark" content="刷新" placement="top">
-                            <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                                     @click="reset()"/>
-                        </el-tooltip>
-                        <screenfull isContainer/>
-                    </div>
-                </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  has-c @selection-change="handleSelectionChange">
-                            <el-table-column prop="contractCode" label="合同编码" width="0" align="left"
-/>
-                            <el-table-column prop="contractName" label="合同名称" width="0" align="left"
-/>
-                            <el-table-column prop="contractNo" label="对方合同号" width="0" align="left"
-/>
-                                <el-table-column label="合同类型 " width="0" prop="contractType" algin="left"
->
-                                    <template slot-scope="scope">
-                                        {{ scope.row.contractType | dynamicText(contractTypeOptions) }}
-                                    </template>
-                                </el-table-column>
-                            <el-table-column prop="classification" label="合同分类 " width="0" align="left"
-/>
-                            <el-table-column prop="declarationDate" label="申报日期" width="0" align="left"
-/>
-                            <el-table-column prop="name" label="供应商/客户名" width="0" align="left"
-/>
-                            <el-table-column prop="num" label="数量" width="0" align="left"
-/>
-                            <el-table-column prop="amount" label="金额" width="0" align="left"
-/>
-                            <el-table-column prop="deptName" label="部门名称" width="0" align="left"
-/>
-                            <el-table-column prop="remark" label="备注" width="0" align="left"
-/>
-                            <el-table-column prop="creatorusername" label="录入人" width="0" align="left"
-/>
-                            <el-table-column prop="status" label="合同状态" width="0" align="left"
-/>
-                            <el-table-column prop="approval" label="集团审批" width="0" align="left"
-/>
-                        <el-table-column label="操作" fixed="right"
-width="150" >
-                            <template slot-scope="scope">
-                                        <el-button type="text"
-                                                   @click="addOrUpdateHandle(scope.row.id)" >编辑
-                                        </el-button>
-                                        <el-button type="text" class="JNPF-table-delBtn"  @click="handleDel(scope.row.id)">删除
-                                        </el-button>
-                                        <el-button type="text"
-                                                   @click="goDetail(scope.row.id)">详情
-                                        </el-button>
-                            </template>
-                        </el-table-column>
-                </JNPF-table>
-                    <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
-            </div>
-        </div>
-        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
-        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
-        <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
-    </div>
+		<div class="JNPF-common-layout-center">
+			<el-row class="JNPF-common-search-box" :gutter="16">
+				<el-form @submit.native.prevent>
+					<el-col :span="6">
+						<el-form-item label="合同编码">
+							<el-input v-model="query.contractCode" placeholder="请输入" clearable> </el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="合同名称">
+							<el-input v-model="query.contractName" placeholder="请输入" clearable> </el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+						</el-form-item>
+					</el-col>
+				</el-form>
+			</el-row>
+			<div class="JNPF-common-layout-main JNPF-flex-main">
+				<div class="JNPF-common-head">
+					<div>
+						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+						</el-button>
+						<el-button type="text" icon="el-icon-download" @click="exportData()">导出
+						</el-button>
+						<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+						</el-button>
+					</div>
+					<div class="JNPF-common-head-right">
+						<el-tooltip effect="dark" content="刷新" placement="top">
+							<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+								@click="reset()" />
+						</el-tooltip>
+						<screenfull isContainer />
+					</div>
+				</div>
+				<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
+					@selection-change="handleSelectionChange">
+					<el-table-column prop="contractCode" label="合同编码" width="0" align="left" />
+					<el-table-column prop="contractName" label="合同名称" width="0" align="left" />
+					<el-table-column prop="contractNo" label="对方合同号" width="0" align="left" />
+					<el-table-column label="合同类型 " width="0" prop="contractType" algin="left">
+						<template slot-scope="scope">
+							{{ scope.row.contractType | dynamicText(contractTypeOptions) }}
+						</template>
+					</el-table-column>
+					<el-table-column prop="classification" label="合同分类 " width="0" align="left" />
+					<el-table-column prop="declarationDate" label="申报日期" width="0" align="left" />
+					<el-table-column prop="name" label="供应商/客户名" width="0" align="left" />
+					<el-table-column prop="num" label="数量" width="0" align="left" />
+					<el-table-column prop="amount" label="金额" width="0" align="left" />
+					<el-table-column prop="deptName" label="部门名称" width="0" align="left" />
+					<el-table-column prop="remark" label="备注" width="0" align="left" />
+					<el-table-column prop="creatorusername" label="录入人" width="0" align="left" />
+					<el-table-column prop="status" label="合同状态" width="0" align="left" />
+					<el-table-column prop="approval" label="集团审批" width="0" align="left" />
+					<el-table-column label="操作" fixed="right" width="150">
+						<template slot-scope="scope">
+							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
+							</el-button>
+							<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+							</el-button>
+							<el-button type="text" @click="goDetail(scope.row.id)">详情
+							</el-button>
+						</template>
+					</el-table-column>
+				</JNPF-table>
+				<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+					@pagination="initData" />
+			</div>
+		</div>
+		<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
+		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+		<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
+	</div>
 </template>
 
 <script>
-    import request from '@/utils/request'
-    import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
-    import JNPFForm from './Form'
-    import ExportBox from './ExportBox'
-    import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
-    import Detail from './Detail'
+	import request from '@/utils/request'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	import JNPFForm from './Form'
+	import ExportBox from './ExportBox'
+	import {
+		getDataInterfaceRes
+	} from '@/api/systemData/dataInterface'
+	import Detail from './Detail'
 
-    export default {
-        components: {JNPFForm, ExportBox,Detail},
-        data() {
-            return {
-                detailVisible: false,
-                query: {
-                  contractCode:undefined,
-                  contractName:undefined,
-                },
-                treeProps: {
-                    children: 'children',
-                    label: 'fullName',
-                    value: 'id'
-                },
-                list: [],
-                listLoading: true,
- multipleSelection: [],                    total: 0,
-                listQuery: {
-                        currentPage: 1,
-                        pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
-                },
-                formVisible: false,
-                exportBoxVisible: false,
-                columnList: [
-                    {prop: 'contractCode', label: '合同编码'},
-                    {prop: 'contractName', label: '合同名称'},
-                    {prop: 'contractNo', label: '对方合同号'},
-                    {prop: 'contractType', label: '合同类型 '},
-                    {prop: 'classification', label: '合同分类 '},
-                    {prop: 'declarationDate', label: '申报日期'},
-                    {prop: 'name', label: '供应商/客户名'},
-                    {prop: 'num', label: '数量'},
-                    {prop: 'amount', label: '金额'},
-                    {prop: 'deptName', label: '部门名称'},
-                    {prop: 'remark', label: '备注'},
-                    {prop: 'creatorusername', label: '录入人'},
-                    {prop: 'status', label: '合同状态'},
-                    {prop: 'approval', label: '集团审批'},
-                ],
-                                contractTypeOptions:[{"fullName":"采购合同","id":"1"},{"fullName":"销售合同","id":"2"},
-                                  {"fullName":"租赁合同","id":"3"},{"fullName":"仓储合同","id":"4"},{"fullName":"运输合同","id":"5"},
-                                  {"fullName":"施工合同","id":"6"}],
-                            contractTypeProps:{"label":"fullName","value":"id"},
-            }
-        },
-        computed: {
-            menuId() {
-                return this.$route.meta.modelId || ''
-            }
-        },
-        created() {
-                this.initData()
-        },
-        methods: {
-            goDetail(id){
-                this.detailVisible = true
-                this.$nextTick(() => {
-                    this.$refs.Detail.init(id)
-                })
-            },
-            sortChange({column, prop, order}) {
-                this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-                this.listQuery.sidx = !order ? '' : prop
-                this.initData()
-            },
-            initData() {
-                this.listLoading = true;
-                let _query = {
-                    ...this.listQuery,
-                    ...this.query,
-                    menuId:this.menuId
-                };
-                request({
-                    url: `/api/example/ContractFile/getList`,
-                    method: 'post',
-                    data: _query
-                }).then(res => {
-                    var _list =[];
-                    for(let i=0;i<res.data.list.length;i++){
-                        let _data = res.data.list[i];
-                        _list.push(_data)
-                    }
-                    this.list = _list
-                        this.total = res.data.pagination.total
+	export default {
+		components: {
+			JNPFForm,
+			ExportBox,
+			Detail
+		},
+		data() {
+			return {
+				detailVisible: false,
+				query: {
+					contractCode: undefined,
+					contractName: undefined,
+				},
+				treeProps: {
+					children: 'children',
+					label: 'fullName',
+					value: 'id'
+				},
+				list: [],
+				listLoading: true,
+				multipleSelection: [],
+				total: 0,
+				listQuery: {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				},
+				formVisible: false,
+				exportBoxVisible: false,
+				columnList: [{
+						prop: 'contractCode',
+						label: '合同编码'
+					},
+					{
+						prop: 'contractName',
+						label: '合同名称'
+					},
+					{
+						prop: 'contractNo',
+						label: '对方合同号'
+					},
+					{
+						prop: 'contractType',
+						label: '合同类型 '
+					},
+					{
+						prop: 'classification',
+						label: '合同分类 '
+					},
+					{
+						prop: 'declarationDate',
+						label: '申报日期'
+					},
+					{
+						prop: 'name',
+						label: '供应商/客户名'
+					},
+					{
+						prop: 'num',
+						label: '数量'
+					},
+					{
+						prop: 'amount',
+						label: '金额'
+					},
+					{
+						prop: 'deptName',
+						label: '部门名称'
+					},
+					{
+						prop: 'remark',
+						label: '备注'
+					},
+					{
+						prop: 'creatorusername',
+						label: '录入人'
+					},
+					{
+						prop: 'status',
+						label: '合同状态'
+					},
+					{
+						prop: 'approval',
+						label: '集团审批'
+					},
+				],
+				contractTypeOptions: [{
+						"fullName": "采购合同",
+						"id": "1"
+					}, {
+						"fullName": "销售合同",
+						"id": "2"
+					},
+					{
+						"fullName": "租赁合同",
+						"id": "3"
+					}, {
+						"fullName": "仓储合同",
+						"id": "4"
+					}, {
+						"fullName": "运输合同",
+						"id": "5"
+					},
+					{
+						"fullName": "施工合同",
+						"id": "6"
+					}
+				],
+				contractTypeProps: {
+					"label": "fullName",
+					"value": "id"
+				},
+			}
+		},
+		computed: {
+			menuId() {
+				return this.$route.meta.modelId || ''
+			}
+		},
+		created() {
+			this.initData()
+		},
+		methods: {
+			goDetail(id) {
+				this.detailVisible = true
+				this.$nextTick(() => {
+					this.$refs.Detail.init(id)
+				})
+			},
+			sortChange({
+				column,
+				prop,
+				order
+			}) {
+				this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+				this.listQuery.sidx = !order ? '' : prop
+				this.initData()
+			},
+			initData() {
+				this.listLoading = true;
+				let _query = {
+					...this.listQuery,
+					...this.query,
+					menuId: this.menuId
+				};
+				request({
+					url: `/api/example/ContractFile/getList`,
+					method: 'post',
+					data: _query
+				}).then(res => {
+					var _list = [];
+					for (let i = 0; i < res.data.list.length; i++) {
+						let _data = res.data.list[i];
+						_list.push(_data)
+					}
+					this.list = _list
+					this.total = res.data.pagination.total
 
-                    this.listLoading = false
-                })
-            },
-            handleDel(id) {
-                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    request({
-                        url: `/api/example/ContractFile/${id}`,
-                        method: 'DELETE'
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => {
-                });
-            },
-                handleSelectionChange(val) {
-                    const res = val.map(item => item.id)
-                    this.multipleSelection = res
-                },
-                handleBatchRemoveDel() {
-                    if (!this.multipleSelection.length) {
-                        this.$message({
-                            type: 'error',
-                            message: '请选择一条数据',
-                            duration: 1500,
-                        })
-                        return
-                    }
-                    const ids = this.multipleSelection.join()
-                    this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-                        type: 'warning'
-                    }).then(() => {
-                        request({
-                            url: `/api/example/ContractFile/batchRemove/${ids}`,
-                            method: 'DELETE'
-                        }).then(res => {
-                            this.$message({
-                                type: 'success',
-                                message: res.msg,
-                                onClose: () => {
-                                    this.initData()
-                                }
-                            });
-                        })
-                    }).catch(() => {
-                    })
-                },
-            addOrUpdateHandle(id, isDetail) {
-                this.formVisible = true
-                this.$nextTick(() => {
-                    this.$refs.JNPFForm.init(id, isDetail)
-                })
-            },
-            exportData() {
-                this.exportBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.ExportBox.init(this.columnList)
-                })
-            },
-            download(data) {
-                let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
-                request({
-                    url: `/api/example/ContractFile/Actions/Export`,
-                    method: 'GET',
-                    data: query
-                }).then(res => {
-                    if (!res.data.url) return
-                    this.jnpf.downloadFile(res.data.url)
-                    this.$refs.ExportBox.visible = false
-                    this.exportBoxVisible = false
-                })
-            },
-            search() {
-                this.listQuery = {
-                        currentPage: 1,
-                        pageSize: 20,
-                    sort: "desc",
-                    sidx: "contractCode",
-                }
-                this.initData()
-            },
-            refresh(isrRefresh) {
-                this.formVisible = false
-                if (isrRefresh) this.reset()
-            },
-            reset() {
-                for (let key in this.query) {
-                    this.query[key] = undefined
-                }
-                this.search()
-            }
-        }
-    }
+					this.listLoading = false
+				})
+			},
+			handleDel(id) {
+				this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/example/ContractFile/${id}`,
+						method: 'DELETE'
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {});
+			},
+			handleSelectionChange(val) {
+				const res = val.map(item => item.id)
+				this.multipleSelection = res
+			},
+			handleBatchRemoveDel() {
+				if (!this.multipleSelection.length) {
+					this.$message({
+						type: 'error',
+						message: '请选择一条数据',
+						duration: 1500,
+					})
+					return
+				}
+				const ids = this.multipleSelection.join()
+				this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/example/ContractFile/batchRemove/${ids}`,
+						method: 'DELETE'
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {})
+			},
+			addOrUpdateHandle(id, isDetail) {
+				this.formVisible = true
+				this.$nextTick(() => {
+					this.$refs.JNPFForm.init(id, isDetail)
+				})
+			},
+			exportData() {
+				this.exportBoxVisible = true
+				this.$nextTick(() => {
+					this.$refs.ExportBox.init(this.columnList)
+				})
+			},
+			download(data) {
+				let query = {
+					...data,
+					...this.listQuery,
+					...this.query,
+					menuId: this.menuId
+				}
+				request({
+					url: `/api/example/ContractFile/Actions/Export`,
+					method: 'GET',
+					data: query
+				}).then(res => {
+					if (!res.data.url) return
+					this.jnpf.downloadFile(res.data.url)
+					this.$refs.ExportBox.visible = false
+					this.exportBoxVisible = false
+				})
+			},
+			search() {
+				this.listQuery = {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "contractCode",
+				}
+				this.initData()
+			},
+			refresh(isrRefresh) {
+				this.formVisible = false
+				if (isrRefresh) this.reset()
+			},
+			reset() {
+				for (let key in this.query) {
+					this.query[key] = undefined
+				}
+				this.search()
+			}
+		}
+	}
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/customer/Form.vue b/SC-web/src/views/scm/basicInformation/customer/Form.vue
index 91f3a0d0..38bcfe57 100644
--- a/SC-web/src/views/scm/basicInformation/customer/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/customer/Form.vue
@@ -1,241 +1,235 @@
 <template>
-<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'"
-           :close-on-click-modal="false" append-to-body
-           :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
-           width="600px">
-<el-row :gutter="15" class="">
-<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
-    <template v-if="!loading">
-            <el-col :span="12" >
-                <el-form-item  label="客户编码"  
- prop="supplierCd" >
-                    <el-input    v-model="dataForm.supplierCd"
- placeholder="请输入客户编码"  clearable  :style='{"width":"100%"}'>
+	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" append-to-body
+		:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
+		<el-row :gutter="15" class="">
+			<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px"
+				label-position="right">
+				<template v-if="!loading">
+					<el-col :span="12">
+						<el-form-item label="客户编码" prop="supplierCd">
+							<el-input v-model="dataForm.supplierCd" placeholder="请输入客户编码" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="客户名称"  
- prop="supplierNm" >
-                    <el-input    v-model="dataForm.supplierNm"
- placeholder="请输入客户名称"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="客户名称" prop="supplierNm">
+							<el-input v-model="dataForm.supplierNm" placeholder="请输入客户名称" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="所属公司ID"  
- prop="orgId" >
-                    <el-input    v-model="dataForm.orgId"
- placeholder="请输入所属公司ID"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="所属公司ID" prop="orgId">
+							<el-input v-model="dataForm.orgId" placeholder="请输入所属公司ID" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="公司代码"  
- prop="orgName" >
-                    <el-input    v-model="dataForm.orgName"
- placeholder="请输入公司代码"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="公司代码" prop="orgName">
+							<el-input v-model="dataForm.orgName" placeholder="请输入公司代码" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="客户等级"  
- prop="customerLevel" >
-                    <el-select    v-model="dataForm.customerLevel"
- placeholder="请选择客户等级"  :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in customerLevelOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="客户等级" prop="customerLevel">
+							<el-select v-model="dataForm.customerLevel" placeholder="请选择客户等级" :style='{"width":"100%"}'>
+								<el-option v-for="(item, index) in customerLevelOptions" :key="index"
+									:label="item.fullName" :value="item.id" :disabled="item.disabled"></el-option>
 
-                </el-select>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="联系人"  
- prop="contactName" >
-                    <el-input    v-model="dataForm.contactName"
- placeholder="请输入联系人"  clearable  :style='{"width":"100%"}'>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="联系人" prop="contactName">
+							<el-input v-model="dataForm.contactName" placeholder="请输入联系人" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="地址"  
- prop="address" >
-                    <el-input    v-model="dataForm.address"
- placeholder="请输入地址"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="地址" prop="address">
+							<el-input v-model="dataForm.address" placeholder="请输入地址" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="电话"  
- prop="contactPhone" >
-                    <el-input    v-model="dataForm.contactPhone"
- placeholder="请输入电话"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="电话" prop="contactPhone">
+							<el-input v-model="dataForm.contactPhone" placeholder="请输入电话" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="是否启用"  
- prop="status" >
-                    <el-switch    v-model="dataForm.status"
- :active-value="1"  :inactive-value="0" >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="是否启用" prop="status">
+							<el-switch v-model="dataForm.status" :active-value="1" :inactive-value="0">
 
-                </el-switch>
-                </el-form-item>
-            </el-col>
-    </template>
-</el-form>
-    </el-row>
-    <span slot="footer" class="dialog-footer">
-        <el-button @click="visible = false"> 取 消</el-button>
-        <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
-    </span>
-    </el-dialog>
+							</el-switch>
+						</el-form-item>
+					</el-col>
+				</template>
+			</el-form>
+		</el-row>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false"> 取 消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
+		</span>
+	</el-dialog>
 </template>
 <script>
-    import request from '@/utils/request'
-    import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-    export default {
-        components: {},
-        props: [],
-        data() {
-            return {
-                visible: false,
-                loading: false,
-                isDetail: false,
-            dataForm: {
-                            supplierCd : '',
-                            supplierNm : '',
-                            orgId : '',
-                            orgName : '',
-                            customerLevel : "1",
-                            contactName : '',
-                            address : '',
-                            contactPhone : '',
-                            status : 1,
-            },
-            rules:
-            {
-                            supplierCd: [
-                                {
-                                    required: true,
-                                    message: '请输入客户编码',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            supplierNm: [
-                                {
-                                    required: true,
-                                    message: '请输入客户名称',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            contactPhone: [
-                        ],
-            },
-                        customerLevelOptions:[{"fullName":"一级","id":"1"},{"fullName":"二级","id":"2"},{"fullName":"三级","id":"3"}],
-
-        }
-        },
-        computed: {},
-        watch: {},
-        created() {
-        },
-        mounted() {},
-        methods: {
-            clearData(data){
-                for (let key in data) {
-                    if (data[key] instanceof Array) {
-                        data[key] = [];
-                    } else if (data[key] instanceof Object) {
-                        this.clearData(data[key]);
-                    } else {
-                        data[key] = "";
-                    }
-                }
-            },
-            init(id, isDetail) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.isDetail = isDetail || false;
-                this.$nextTick(() => {
-                    this.$refs['elForm'].resetFields();
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/customer/Customer/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        });
-                    }else{
-                       this.clearData(this.dataForm)
-                    }
-                });
-                this.$store.commit('generator/UPDATE_RELATION_DATA', {})
-            },
-            // 表单提交
-            dataFormSubmit() {
-                this.$refs['elForm'].validate((valid) => {
-                    if (valid) {
-                            this.request()
-                    }
-                })
-            },
-            request() {
-                var _data =this.dataList()
-                if (!this.dataForm.id) {
-                    request({
-                        url: '/api/customer/Customer',
-                        method: 'post',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                this.visible = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    })
-                }else{
-                    request({
-                        url: '/api/customer/Customer/'+this.dataForm.id,
-                        method: 'PUT',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                this.visible = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    })
-                }
-            },
-            dataList(){
-                var _data = JSON.parse(JSON.stringify(this.dataForm));
-                        _data.status = parseInt(_data.status)
-                return _data;
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                        _dataAll.status = parseInt( _dataAll.status)
-                this.dataForm = _dataAll
-            },
-        },
-    }
+	import request from '@/utils/request'
+	import {
+		getDataInterfaceRes
+	} from '@/api/systemData/dataInterface'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	export default {
+		components: {},
+		props: [],
+		data() {
+			return {
+				visible: false,
+				loading: false,
+				isDetail: false,
+				dataForm: {
+					supplierCd: '',
+					supplierNm: '',
+					orgId: '',
+					orgName: '',
+					customerLevel: "1",
+					contactName: '',
+					address: '',
+					contactPhone: '',
+					status: 1,
+				},
+				rules: {
+					supplierCd: [{
+						required: true,
+						message: '请输入客户编码',
+						trigger: 'blur'
+					}, ],
+					supplierNm: [{
+						required: true,
+						message: '请输入客户名称',
+						trigger: 'blur'
+					}, ],
+					contactPhone: [],
+				},
+				customerLevelOptions: [{
+					"fullName": "一级",
+					"id": "1"
+				}, {
+					"fullName": "二级",
+					"id": "2"
+				}, {
+					"fullName": "三级",
+					"id": "3"
+				}],
 
+			}
+		},
+		computed: {},
+		watch: {},
+		created() {},
+		mounted() {},
+		methods: {
+			clearData(data) {
+				for (let key in data) {
+					if (data[key] instanceof Array) {
+						data[key] = [];
+					} else if (data[key] instanceof Object) {
+						this.clearData(data[key]);
+					} else {
+						data[key] = "";
+					}
+				}
+			},
+			init(id, isDetail) {
+				this.dataForm.id = id || 0;
+				this.visible = true;
+				this.isDetail = isDetail || false;
+				this.$nextTick(() => {
+					this.$refs['elForm'].resetFields();
+					if (this.dataForm.id) {
+						this.loading = true
+						request({
+							url: '/api/customer/Customer/' + this.dataForm.id,
+							method: 'get'
+						}).then(res => {
+							this.dataInfo(res.data)
+							this.loading = false
+						});
+					} else {
+						this.clearData(this.dataForm)
+					}
+				});
+				this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+			},
+			// 表单提交
+			dataFormSubmit() {
+				this.$refs['elForm'].validate((valid) => {
+					if (valid) {
+						this.request()
+					}
+				})
+			},
+			request() {
+				var _data = this.dataList()
+				if (!this.dataForm.id) {
+					request({
+						url: '/api/customer/Customer',
+						method: 'post',
+						data: _data
+					}).then((res) => {
+						this.$message({
+							message: res.msg,
+							type: 'success',
+							duration: 1000,
+							onClose: () => {
+								this.visible = false
+								this.$emit('refresh', true)
+							}
+						})
+					})
+				} else {
+					request({
+						url: '/api/customer/Customer/' + this.dataForm.id,
+						method: 'PUT',
+						data: _data
+					}).then((res) => {
+						this.$message({
+							message: res.msg,
+							type: 'success',
+							duration: 1000,
+							onClose: () => {
+								this.visible = false
+								this.$emit('refresh', true)
+							}
+						})
+					})
+				}
+			},
+			dataList() {
+				var _data = JSON.parse(JSON.stringify(this.dataForm));
+				_data.status = parseInt(_data.status)
+				return _data;
+			},
+			dataInfo(dataAll) {
+				let _dataAll = dataAll
+				_dataAll.status = parseInt(_dataAll.status)
+				this.dataForm = _dataAll
+			},
+		},
+	}
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/customer/index.vue b/SC-web/src/views/scm/basicInformation/customer/index.vue
index f98e9ef0..24a306eb 100644
--- a/SC-web/src/views/scm/basicInformation/customer/index.vue
+++ b/SC-web/src/views/scm/basicInformation/customer/index.vue
@@ -1,277 +1,321 @@
 <template>
-    <div class="JNPF-common-layout">
+	<div class="JNPF-common-layout">
 
-        <div class="JNPF-common-layout-center">
-            <el-row class="JNPF-common-search-box" :gutter="16">
-                <el-form @submit.native.prevent>
-                                            <el-col :span="6">
-                                <el-form-item label="客户编码">
-                                        <el-input v-model="query.supplierCd" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                        <el-col :span="6">
-                                <el-form-item label="客户名称">
-                                        <el-input v-model="query.supplierNm" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                    <el-col :span="6">
-                        <el-form-item>
-                            <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-                            <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-                        </el-form-item>
-                    </el-col>
-                </el-form>
-            </el-row>
-            <div class="JNPF-common-layout-main JNPF-flex-main">
-                <div class="JNPF-common-head">
-                    <div>
-                                    <el-button type="primary" icon="el-icon-plus"  @click="addOrUpdateHandle()">新增
-                                    </el-button>
-                                    <el-button type="text" icon="el-icon-download" @click="exportData()" >导出
-                                    </el-button>
-                                    <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" >批量删除
-                                    </el-button>
-                    </div>
-                    <div class="JNPF-common-head-right">
-                        <el-tooltip effect="dark" content="刷新" placement="top">
-                            <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                                     @click="reset()"/>
-                        </el-tooltip>
-                        <screenfull isContainer/>
-                    </div>
-                </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  has-c @selection-change="handleSelectionChange">
-                            <el-table-column prop="supplierCd" label="客户编码" width="0" align="left"
- sortable="custom" />
-                            <el-table-column prop="supplierNm" label="客户名称" width="0" align="left"
- sortable="custom" />
-                            <el-table-column prop="orgId" label="所属公司ID" width="0" align="left"
- sortable="custom" />
-                            <el-table-column prop="orgName" label="公司代码" width="0" align="left"
- sortable="custom" />
-                                <el-table-column label="客户等级" width="0" prop="customerLevel" algin="left"
- sortable="custom" >
-                                    <template slot-scope="scope">
-                                        {{ scope.row.customerLevel | dynamicText(customerLevelOptions) }}
-                                    </template>
-                                </el-table-column>
-                            <el-table-column prop="contactName" label="联系人" width="0" align="left"
- sortable="custom" />
-                            <el-table-column prop="address" label="地址" width="0" align="left"
- sortable="custom" />
-                            <el-table-column prop="contactPhone" label="电话" width="0" align="left"
- sortable="custom" />
-                            <el-table-column prop="status" label="是否启用" width="0" align="left"
-/>
-                        <el-table-column label="操作" fixed="right"
-width="150" >
-                            <template slot-scope="scope">
-                                        <el-button type="text"
-                                                   @click="addOrUpdateHandle(scope.row.id)" >编辑
-                                        </el-button>
-                                        <el-button type="text" class="JNPF-table-delBtn"  @click="handleDel(scope.row.id)">删除
-                                        </el-button>
-                                        <el-button type="text"  
-                                                   @click="goDetail(scope.row.id)">详情
-                                        </el-button>
-                            </template>
-                        </el-table-column>
-                </JNPF-table>
-                    <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
-            </div>
-        </div>
-        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
-        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
-        <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
-    </div>
+		<div class="JNPF-common-layout-center">
+			<el-row class="JNPF-common-search-box" :gutter="16">
+				<el-form @submit.native.prevent>
+					<el-col :span="6">
+						<el-form-item label="客户编码">
+							<el-input v-model="query.supplierCd" placeholder="请输入" clearable> </el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="客户名称">
+							<el-input v-model="query.supplierNm" placeholder="请输入" clearable> </el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+						</el-form-item>
+					</el-col>
+				</el-form>
+			</el-row>
+			<div class="JNPF-common-layout-main JNPF-flex-main">
+				<div class="JNPF-common-head">
+					<div>
+						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+						</el-button>
+						<el-button type="text" icon="el-icon-download" @click="exportData()">导出
+						</el-button>
+						<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+						</el-button>
+					</div>
+					<div class="JNPF-common-head-right">
+						<el-tooltip effect="dark" content="刷新" placement="top">
+							<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+								@click="reset()" />
+						</el-tooltip>
+						<screenfull isContainer />
+					</div>
+				</div>
+				<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
+					@selection-change="handleSelectionChange">
+					<el-table-column prop="supplierCd" label="客户编码" width="0" align="left" sortable="custom" />
+					<el-table-column prop="supplierNm" label="客户名称" width="0" align="left" sortable="custom" />
+					<el-table-column prop="orgId" label="所属公司ID" width="0" align="left" sortable="custom" />
+					<el-table-column prop="orgName" label="公司代码" width="0" align="left" sortable="custom" />
+					<el-table-column label="客户等级" width="0" prop="customerLevel" algin="left" sortable="custom">
+						<template slot-scope="scope">
+							{{ scope.row.customerLevel | dynamicText(customerLevelOptions) }}
+						</template>
+					</el-table-column>
+					<el-table-column prop="contactName" label="联系人" width="0" align="left" sortable="custom" />
+					<el-table-column prop="address" label="地址" width="0" align="left" sortable="custom" />
+					<el-table-column prop="contactPhone" label="电话" width="0" align="left" sortable="custom" />
+					<el-table-column prop="status" label="是否启用" width="0" align="left" />
+					<el-table-column label="操作" fixed="right" width="150">
+						<template slot-scope="scope">
+							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
+							</el-button>
+							<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+							</el-button>
+							<el-button type="text" @click="goDetail(scope.row.id)">详情
+							</el-button>
+						</template>
+					</el-table-column>
+				</JNPF-table>
+				<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+					@pagination="initData" />
+			</div>
+		</div>
+		<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
+		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+		<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
+	</div>
 </template>
 
 <script>
-    import request from '@/utils/request'
-    import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
-    import JNPFForm from './Form'
-    import ExportBox from './ExportBox'
-    import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
-    import Detail from './Detail'
+	import request from '@/utils/request'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	import JNPFForm from './Form'
+	import ExportBox from './ExportBox'
+	import {
+		getDataInterfaceRes
+	} from '@/api/systemData/dataInterface'
+	import Detail from './Detail'
 
-    export default {
-        components: {JNPFForm, ExportBox,Detail},
-        data() {
-            return {
-                detailVisible: false,
-                query: {
-                                supplierCd:undefined,
-                                supplierNm:undefined,
-                },
-                treeProps: {
-                    children: 'children',
-                    label: 'fullName',
-                    value: 'id'
-                },
-                list: [],
-                listLoading: true,
- multipleSelection: [],                    total: 0,
-                listQuery: {
-                        currentPage: 1,
-                        pageSize: 20,
-                    sort: "desc",
-                    sidx: "supplierCd",
-                },
-                formVisible: false,
-                exportBoxVisible: false,
-                columnList: [
-                    {prop: 'supplierCd', label: '客户编码'},
-                    {prop: 'supplierNm', label: '客户名称'},
-                    {prop: 'orgId', label: '所属公司ID'},
-                    {prop: 'orgName', label: '公司代码'},
-                    {prop: 'customerLevel', label: '客户等级'},
-                    {prop: 'contactName', label: '联系人'},
-                    {prop: 'address', label: '地址'},
-                    {prop: 'contactPhone', label: '电话'},
-                    {prop: 'status', label: '是否启用'},
-                ],
-                                customerLevelOptions:[{"fullName":"一级","id":"1"},{"fullName":"二级","id":"2"},{"fullName":"三级","id":"3"}],
-                            customerLevelProps:{"label":"fullName","value":"id"},
-            }
-        },
-        computed: {
-            menuId() {
-                return this.$route.meta.modelId || ''
-            }
-        },
-        created() {
-                this.initData()
-        },
-        methods: {
-            goDetail(id){
-                this.detailVisible = true
-                this.$nextTick(() => {
-                    this.$refs.Detail.init(id)
-                })
-            },
-            sortChange({column, prop, order}) {
-                this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-                this.listQuery.sidx = !order ? '' : prop
-                this.initData()
-            },
-            initData() {
-                this.listLoading = true;
-                let _query = {
-                    ...this.listQuery,
-                    ...this.query,
-                    menuId:this.menuId
-                };
-                request({
-                    url: `/api/customer/Customer/getList`,
-                    method: 'post',
-                    data: _query
-                }).then(res => {
-                    var _list =[];
-                    for(let i=0;i<res.data.list.length;i++){
-                        let _data = res.data.list[i];
-                        _list.push(_data)
-                    }
-                    this.list = _list
-                        this.total = res.data.pagination.total
+	export default {
+		components: {
+			JNPFForm,
+			ExportBox,
+			Detail
+		},
+		data() {
+			return {
+				detailVisible: false,
+				query: {
+					supplierCd: undefined,
+					supplierNm: undefined,
+				},
+				treeProps: {
+					children: 'children',
+					label: 'fullName',
+					value: 'id'
+				},
+				list: [],
+				listLoading: true,
+				multipleSelection: [],
+				total: 0,
+				listQuery: {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "supplierCd",
+				},
+				formVisible: false,
+				exportBoxVisible: false,
+				columnList: [{
+						prop: 'supplierCd',
+						label: '客户编码'
+					},
+					{
+						prop: 'supplierNm',
+						label: '客户名称'
+					},
+					{
+						prop: 'orgId',
+						label: '所属公司ID'
+					},
+					{
+						prop: 'orgName',
+						label: '公司代码'
+					},
+					{
+						prop: 'customerLevel',
+						label: '客户等级'
+					},
+					{
+						prop: 'contactName',
+						label: '联系人'
+					},
+					{
+						prop: 'address',
+						label: '地址'
+					},
+					{
+						prop: 'contactPhone',
+						label: '电话'
+					},
+					{
+						prop: 'status',
+						label: '是否启用'
+					},
+				],
+				customerLevelOptions: [{
+					"fullName": "一级",
+					"id": "1"
+				}, {
+					"fullName": "二级",
+					"id": "2"
+				}, {
+					"fullName": "三级",
+					"id": "3"
+				}],
+				customerLevelProps: {
+					"label": "fullName",
+					"value": "id"
+				},
+			}
+		},
+		computed: {
+			menuId() {
+				return this.$route.meta.modelId || ''
+			}
+		},
+		created() {
+			this.initData()
+		},
+		methods: {
+			goDetail(id) {
+				this.detailVisible = true
+				this.$nextTick(() => {
+					this.$refs.Detail.init(id)
+				})
+			},
+			sortChange({
+				column,
+				prop,
+				order
+			}) {
+				this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+				this.listQuery.sidx = !order ? '' : prop
+				this.initData()
+			},
+			initData() {
+				this.listLoading = true;
+				let _query = {
+					...this.listQuery,
+					...this.query,
+					menuId: this.menuId
+				};
+				request({
+					url: `/api/customer/Customer/getList`,
+					method: 'post',
+					data: _query
+				}).then(res => {
+					var _list = [];
+					for (let i = 0; i < res.data.list.length; i++) {
+						let _data = res.data.list[i];
+						_list.push(_data)
+					}
+					this.list = _list
+					this.total = res.data.pagination.total
 
-                    this.listLoading = false
-                })
-            },
-            handleDel(id) {
-                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    request({
-                        url: `/api/customer/Customer/${id}`,
-                        method: 'DELETE'
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => {
-                });
-            },
-                handleSelectionChange(val) {
-                    const res = val.map(item => item.id)
-                    this.multipleSelection = res
-                },
-                handleBatchRemoveDel() {
-                    if (!this.multipleSelection.length) {
-                        this.$message({
-                            type: 'error',
-                            message: '请选择一条数据',
-                            duration: 1500,
-                        })
-                        return
-                    }
-                    const ids = this.multipleSelection.join()
-                    this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-                        type: 'warning'
-                    }).then(() => {
-                        request({
-                            url: `/api/customer/Customer/batchRemove/${ids}`,
-                            method: 'DELETE'
-                        }).then(res => {
-                            this.$message({
-                                type: 'success',
-                                message: res.msg,
-                                onClose: () => {
-                                    this.initData()
-                                }
-                            });
-                        })
-                    }).catch(() => {
-                    })
-                },
-            addOrUpdateHandle(id, isDetail) {
-                this.formVisible = true
-                this.$nextTick(() => {
-                    this.$refs.JNPFForm.init(id, isDetail)
-                })
-            },
-            exportData() {
-                this.exportBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.ExportBox.init(this.columnList)
-                })
-            },
-            download(data) {
-                let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
-                request({
-                    url: `/api/customer/Customer/Actions/Export`,
-                    method: 'GET',
-                    data: query
-                }).then(res => {
-                    if (!res.data.url) return
-                    this.jnpf.downloadFile(res.data.url)
-                    this.$refs.ExportBox.visible = false
-                    this.exportBoxVisible = false
-                })
-            },
-            search() {
-                this.listQuery = {
-                        currentPage: 1,
-                        pageSize: 20,
-                    sort: "desc",
-                    sidx: "supplierCd",
-                }
-                this.initData()
-            },
-            refresh(isrRefresh) {
-                this.formVisible = false
-                if (isrRefresh) this.reset()
-            },
-            reset() {
-                for (let key in this.query) {
-                    this.query[key] = undefined
-                }
-                this.search()
-            }
-        }
-    }
+					this.listLoading = false
+				})
+			},
+			handleDel(id) {
+				this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/customer/Customer/${id}`,
+						method: 'DELETE'
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {});
+			},
+			handleSelectionChange(val) {
+				const res = val.map(item => item.id)
+				this.multipleSelection = res
+			},
+			handleBatchRemoveDel() {
+				if (!this.multipleSelection.length) {
+					this.$message({
+						type: 'error',
+						message: '请选择一条数据',
+						duration: 1500,
+					})
+					return
+				}
+				const ids = this.multipleSelection.join()
+				this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/customer/Customer/batchRemove/${ids}`,
+						method: 'DELETE'
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {})
+			},
+			addOrUpdateHandle(id, isDetail) {
+				this.formVisible = true
+				this.$nextTick(() => {
+					this.$refs.JNPFForm.init(id, isDetail)
+				})
+			},
+			exportData() {
+				this.exportBoxVisible = true
+				this.$nextTick(() => {
+					this.$refs.ExportBox.init(this.columnList)
+				})
+			},
+			download(data) {
+				let query = {
+					...data,
+					...this.listQuery,
+					...this.query,
+					menuId: this.menuId
+				}
+				request({
+					url: `/api/customer/Customer/Actions/Export`,
+					method: 'GET',
+					data: query
+				}).then(res => {
+					if (!res.data.url) return
+					this.jnpf.downloadFile(res.data.url)
+					this.$refs.ExportBox.visible = false
+					this.exportBoxVisible = false
+				})
+			},
+			search() {
+				this.listQuery = {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "supplierCd",
+				}
+				this.initData()
+			},
+			refresh(isrRefresh) {
+				this.formVisible = false
+				if (isrRefresh) this.reset()
+			},
+			reset() {
+				for (let key in this.query) {
+					this.query[key] = undefined
+				}
+				this.search()
+			}
+		}
+	}
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/material/Form.vue b/SC-web/src/views/scm/basicInformation/material/Form.vue
index e7141d90..28f3abe5 100644
--- a/SC-web/src/views/scm/basicInformation/material/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/material/Form.vue
@@ -1,339 +1,359 @@
 <template>
-<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'"
-           :close-on-click-modal="false" append-to-body
-           :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
-           width="1000px">
-<el-row :gutter="15" class="">
-<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
-    <template v-if="!loading">
-            <el-col :span="12" >
-                <el-form-item  label="物料编码"  
- prop="itemCode" >
-                    <el-input    v-model="dataForm.itemCode"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" append-to-body
+		:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
+		<el-row :gutter="15" class="">
+			<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px"
+				label-position="right">
+				<template v-if="!loading">
+					<el-col :span="12">
+						<el-form-item label="物料编码" prop="itemCode">
+							<el-input v-model="dataForm.itemCode" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="物料名称"  
- prop="description" >
-                    <el-input    v-model="dataForm.description"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="物料名称" prop="description">
+							<el-input v-model="dataForm.description" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="库存组织代码"  
- prop="organizationCode" >
-                    <el-input    v-model="dataForm.organizationCode"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="库存组织代码" prop="organizationCode">
+							<el-input v-model="dataForm.organizationCode" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="主单位代码"  
- prop="primaryUomCode" >
-                    <el-input    v-model="dataForm.primaryUomCode"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="主单位代码" prop="primaryUomCode">
+							<el-input v-model="dataForm.primaryUomCode" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="主单位名称"  
- prop="primaryUnitOmeasure" >
-                    <el-input    v-model="dataForm.primaryUnitOmeasure"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="主单位名称" prop="primaryUnitOmeasure">
+							<el-input v-model="dataForm.primaryUnitOmeasure" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="是否可采购"  
- prop="purchaseFlag" >
-                    <el-select    v-model="dataForm.purchaseFlag"
- placeholder="请选择"  clearable  :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in purchaseFlagOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="是否可采购" prop="purchaseFlag">
+							<el-select v-model="dataForm.purchaseFlag" placeholder="请选择" clearable
+								:style='{"width":"100%"}'>
+								<el-option v-for="(item, index) in purchaseFlagOptions" :key="index"
+									:label="item.fullName" :value="item.id" :disabled="item.disabled"></el-option>
 
-                </el-select>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="是否可销售 "  
- prop="salesFlag" >
-                    <el-select    v-model="dataForm.salesFlag"
- placeholder="请选择"  clearable  :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in salesFlagOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="是否可销售 " prop="salesFlag">
+							<el-select v-model="dataForm.salesFlag" placeholder="请选择" clearable
+								:style='{"width":"100%"}'>
+								<el-option v-for="(item, index) in salesFlagOptions" :key="index" :label="item.fullName"
+									:value="item.id" :disabled="item.disabled"></el-option>
 
-                </el-select>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="默认出库区"  
- prop="outArea" >
-                    <popupSelect    v-model="dataForm.outArea"
- placeholder="请选择"  clearable  field="outArea" interfaceId="381404161809350213"  :columnOptions="outAreacolumnOptions" propsValue="id" relationField="areaname" popupType="dialog"
-    popupTitle="选择数据"  popupWidth="800px">
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="默认出库区" prop="outArea">
+							<relationForm v-model="dataForm.outArea" placeholder="请选择" clearable field="outArea"
+								modelId="294012196529150981" :columnOptions="outAreacolumnOptions"
+								relationField="comInputField102">
 
-                </popupSelect>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="默认入库区"  
- prop="inArea" >
-                    <popupSelect    v-model="dataForm.inArea"
- placeholder="请选择"  clearable  field="inArea" interfaceId="381404161809350213"  :columnOptions="inAreacolumnOptions" propsValue="id" relationField="areaname" popupType="dialog" 
-   popupTitle="选择数据"  popupWidth="800px">
+							</relationForm>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="默认入库区" prop="inArea">
+							<relationForm v-model="dataForm.inArea" placeholder="请选择" clearable field="inArea"
+								modelId="294012196529150981" :columnOptions="inAreacolumnOptions"
+								relationField="comInputField102">
 
-                </popupSelect>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="创建人名称"  
- prop="creatorusername" >
-                    <el-input    v-model="dataForm.creatorusername"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</relationForm>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="创建人名称" prop="creatorusername">
+							<el-input v-model="dataForm.creatorusername" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="创建时间"  
- prop="creatortime" >
-                    <el-date-picker    v-model="dataForm.creatortime"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' type="datetime"  format="yyyy-MM-dd HH:mm:ss"  value-format="timestamp" >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="创建时间" prop="creatortime">
+							<el-date-picker v-model="dataForm.creatortime" placeholder="请选择" clearable
+								:style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
+								value-format="timestamp">
 
-                </el-date-picker>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="修改人名称"  
- prop="lastmodifyusername" >
-                    <el-input    v-model="dataForm.lastmodifyusername"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-date-picker>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="修改人名称" prop="lastmodifyusername">
+							<el-input v-model="dataForm.lastmodifyusername" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="修改时间"  
- prop="lastmodifytime" >
-                    <el-date-picker    v-model="dataForm.lastmodifytime"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' type="datetime"  format="yyyy-MM-dd HH:mm:ss"  value-format="timestamp" >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="修改时间" prop="lastmodifytime">
+							<el-date-picker v-model="dataForm.lastmodifytime" placeholder="请选择" clearable
+								:style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
+								value-format="timestamp">
 
-                </el-date-picker>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="生效状态"  
- prop="effectiveStatus" >
-                    <el-select    v-model="dataForm.effectiveStatus"
- placeholder="请选择"  clearable  :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in effectiveStatusOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
+							</el-date-picker>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="生效状态" prop="effectiveStatus">
+							<el-select v-model="dataForm.effectiveStatus" placeholder="请选择" clearable
+								:style='{"width":"100%"}'>
+								<el-option v-for="(item, index) in effectiveStatusOptions" :key="index"
+									:label="item.fullName" :value="item.id" :disabled="item.disabled"></el-option>
 
-                </el-select>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="处理类型"  
- prop="processingType" >
-                    <el-select    v-model="dataForm.processingType"
- placeholder="请选择"  clearable  :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in processingTypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="处理类型" prop="processingType">
+							<el-select v-model="dataForm.processingType" placeholder="请选择" clearable
+								:style='{"width":"100%"}'>
+								<el-option v-for="(item, index) in processingTypeOptions" :key="index"
+									:label="item.fullName" :value="item.id" :disabled="item.disabled"></el-option>
 
-                </el-select>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="读取标记"  
- prop="readTag" >
-                    <el-select    v-model="dataForm.readTag"
- placeholder="请选择"  clearable  :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in readTagOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="读取标记" prop="readTag">
+							<el-select v-model="dataForm.readTag" placeholder="请选择" clearable :style='{"width":"100%"}'>
+								<el-option v-for="(item, index) in readTagOptions" :key="index" :label="item.fullName"
+									:value="item.id" :disabled="item.disabled"></el-option>
 
-                </el-select>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="读取时间"  
- prop="readDate" >
-                    <el-time-picker    v-model="dataForm.readDate"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' format="HH:mm:ss"  value-format="HH:mm:ss"  :picker-options='{"selectableRange":"00:00:00-23:59:59"}'>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="读取时间" prop="readDate">
+							<el-time-picker v-model="dataForm.readDate" placeholder="请选择" clearable
+								:style='{"width":"100%"}' format="HH:mm:ss" value-format="HH:mm:ss"
+								:picker-options='{"selectableRange":"00:00:00-23:59:59"}'>
 
-                </el-time-picker>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="错误信息"  
- prop="errorMessage" >
-                    <el-input    v-model="dataForm.errorMessage"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-time-picker>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="错误信息" prop="errorMessage">
+							<el-input v-model="dataForm.errorMessage" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-    </template>
-</el-form>
-    </el-row>
-    <span slot="footer" class="dialog-footer">
-        <el-button @click="visible = false"> 取 消</el-button>
-        <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
-    </span>
-    </el-dialog>
+							</el-input>
+						</el-form-item>
+					</el-col>
+				</template>
+			</el-form>
+		</el-row>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false"> 取 消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
+		</span>
+	</el-dialog>
 </template>
 <script>
-    import request from '@/utils/request'
-    import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-    export default {
-        components: {},
-        props: [],
-        data() {
-            return {
-                visible: false,
-                loading: false,
-                isDetail: false,
-            dataForm: {
-                            itemCode : '',
-                            description : '',
-                            organizationCode : '',
-                            primaryUomCode : '',
-                            primaryUnitOmeasure : '',
-                            purchaseFlag : "",
-                            salesFlag : "",
-                            outArea : "",
-                            inArea : "",
-                            creatorusername : '',
-                            creatortime : '',
-                            lastmodifyusername : '',
-                            lastmodifytime : '',
-                            effectiveStatus : "",
-                            processingType : "",
-                            readTag : "",
-                            readDate : '',
-                            errorMessage : '',
-            },
-            rules:
-            {
-                            itemCode: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            description: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                        ],
-            },
-                        purchaseFlagOptions:[{"fullName":"Y","id":"Y"},{"fullName":"N","id":"N"}],
-                        salesFlagOptions:[{"fullName":"Y","id":"Y"},{"fullName":"N","id":"N"}],
-                    outAreacolumnOptions:[ {"label":"库区编号","value":"areacode"},{"label":"库区名称","value":"areaname"},{"label":"仓库名称","value":"name"},{"label":"最高库存","value":"maximum"},],
-                    inAreacolumnOptions:[{"label":"库区编号","value":"areacode"},{"label":"库区名称","value":"areaname"},{"label":"仓库名称","value":"name"},{"label":"最高库存","value":"maximum"},],
-                        effectiveStatusOptions:[{"fullName":"Y","id":"Y"},{"fullName":"N","id":"N"}],
-                        processingTypeOptions:[{"fullName":"Y","id":"Y"},{"fullName":"N","id":"N"}],
-                        readTagOptions:[{"fullName":"Y","id":"Y"},{"fullName":"N","id":"N"}],
-
-        }
-        },
-        computed: {},
-        watch: {},
-        created() {
-        },
-        mounted() {},
-        methods: {
-            clearData(data){
-                for (let key in data) {
-                    if (data[key] instanceof Array) {
-                        data[key] = [];
-                    } else if (data[key] instanceof Object) {
-                        this.clearData(data[key]);
-                    } else {
-                        data[key] = "";
-                    }
-                }
-            },
-            init(id, isDetail) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.isDetail = isDetail || false;
-                this.$nextTick(() => {
-                    this.$refs['elForm'].resetFields();
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/Material/Material/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        });
-                    }else{
-                       this.clearData(this.dataForm)
-                    }
-                });
-                this.$store.commit('generator/UPDATE_RELATION_DATA', {})
-            },
-            // 表单提交
-            dataFormSubmit() {
-                this.$refs['elForm'].validate((valid) => {
-                    if (valid) {
-                            this.request()
-                    }
-                })
-            },
-            request() {
-                var _data =this.dataList()
-                if (!this.dataForm.id) {
-                    request({
-                        url: '/api/Material/Material',
-                        method: 'post',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                this.visible = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    })
-                }else{
-                    request({
-                        url: '/api/Material/Material/'+this.dataForm.id,
-                        method: 'PUT',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                this.visible = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    })
-                }
-            },
-            dataList(){
-                var _data = JSON.parse(JSON.stringify(this.dataForm));
-                return _data;
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                this.dataForm = _dataAll
-            },
-        },
-    }
+	import request from '@/utils/request'
+	import {
+		getDataInterfaceRes
+	} from '@/api/systemData/dataInterface'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	export default {
+		components: {},
+		props: [],
+		data() {
+			return {
+				visible: false,
+				loading: false,
+				isDetail: false,
+				dataForm: {
+					itemCode: '',
+					description: '',
+					organizationCode: '',
+					primaryUomCode: '',
+					primaryUnitOmeasure: '',
+					purchaseFlag: "",
+					salesFlag: "",
+					outArea: "",
+					inArea: "",
+					creatorusername: '',
+					creatortime: '',
+					lastmodifyusername: '',
+					lastmodifytime: '',
+					effectiveStatus: "",
+					processingType: "",
+					readTag: "",
+					readDate: '',
+					errorMessage: '',
+				},
+				rules: {
+					itemCode: [{
+						required: true,
+						message: '请输入',
+						trigger: 'blur'
+					}, ],
+					description: [{
+						required: true,
+						message: '请输入',
+						trigger: 'blur'
+					}, ],
+				},
+				purchaseFlagOptions: [{
+					"fullName": "Y",
+					"id": "Y"
+				}, {
+					"fullName": "N",
+					"id": "N"
+				}],
+				salesFlagOptions: [{
+					"fullName": "Y",
+					"id": "Y"
+				}, {
+					"fullName": "N",
+					"id": "N"
+				}],
+				outAreacolumnOptions: [{
+					"label": "购药人",
+					"value": "comInputField102"
+				}, ],
+				inAreacolumnOptions: [{
+					"label": "姓名",
+					"value": "comInputField102"
+				}, ],
+				effectiveStatusOptions: [{
+					"fullName": "Y",
+					"id": "Y"
+				}, {
+					"fullName": "N",
+					"id": "N"
+				}],
+				processingTypeOptions: [{
+					"fullName": "Y",
+					"id": "Y"
+				}, {
+					"fullName": "N",
+					"id": "N"
+				}],
+				readTagOptions: [{
+					"fullName": "Y",
+					"id": "Y"
+				}, {
+					"fullName": "N",
+					"id": "N"
+				}],
 
+			}
+		},
+		computed: {},
+		watch: {},
+		created() {},
+		mounted() {},
+		methods: {
+			clearData(data) {
+				for (let key in data) {
+					if (data[key] instanceof Array) {
+						data[key] = [];
+					} else if (data[key] instanceof Object) {
+						this.clearData(data[key]);
+					} else {
+						data[key] = "";
+					}
+				}
+			},
+			init(id, isDetail) {
+				this.dataForm.id = id || 0;
+				this.visible = true;
+				this.isDetail = isDetail || false;
+				this.$nextTick(() => {
+					this.$refs['elForm'].resetFields();
+					if (this.dataForm.id) {
+						this.loading = true
+						request({
+							url: '/api/Material/Material/' + this.dataForm.id,
+							method: 'get'
+						}).then(res => {
+							this.dataInfo(res.data)
+							this.loading = false
+						});
+					} else {
+						this.clearData(this.dataForm)
+					}
+				});
+				this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+			},
+			// 表单提交
+			dataFormSubmit() {
+				this.$refs['elForm'].validate((valid) => {
+					if (valid) {
+						this.request()
+					}
+				})
+			},
+			request() {
+				var _data = this.dataList()
+				if (!this.dataForm.id) {
+					request({
+						url: '/api/Material/Material',
+						method: 'post',
+						data: _data
+					}).then((res) => {
+						this.$message({
+							message: res.msg,
+							type: 'success',
+							duration: 1000,
+							onClose: () => {
+								this.visible = false
+								this.$emit('refresh', true)
+							}
+						})
+					})
+				} else {
+					request({
+						url: '/api/Material/Material/' + this.dataForm.id,
+						method: 'PUT',
+						data: _data
+					}).then((res) => {
+						this.$message({
+							message: res.msg,
+							type: 'success',
+							duration: 1000,
+							onClose: () => {
+								this.visible = false
+								this.$emit('refresh', true)
+							}
+						})
+					})
+				}
+			},
+			dataList() {
+				var _data = JSON.parse(JSON.stringify(this.dataForm));
+				return _data;
+			},
+			dataInfo(dataAll) {
+				let _dataAll = dataAll
+				this.dataForm = _dataAll
+			},
+		},
+	}
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/material/index.vue b/SC-web/src/views/scm/basicInformation/material/index.vue
index 103a64b2..1cb69865 100644
--- a/SC-web/src/views/scm/basicInformation/material/index.vue
+++ b/SC-web/src/views/scm/basicInformation/material/index.vue
@@ -1,319 +1,411 @@
 <template>
-    <div class="JNPF-common-layout">
+	<div class="JNPF-common-layout">
 
-        <div class="JNPF-common-layout-center">
-            <el-row class="JNPF-common-search-box" :gutter="16">
-                <el-form @submit.native.prevent>
-                                            <el-col :span="6">
-                                <el-form-item label="物料编码">
-                                        <el-input v-model="query.itemCode" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                        <el-col :span="6">
-                                <el-form-item label="物料名称">
-                                        <el-input v-model="query.description" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                    <el-col :span="6">
-                        <el-form-item>
-                            <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-                            <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-                        </el-form-item>
-                    </el-col>
-                </el-form>
-            </el-row>
-            <div class="JNPF-common-layout-main JNPF-flex-main">
-                <div class="JNPF-common-head">
-                    <div>
-                                    <el-button type="primary" icon="el-icon-plus"  @click="addOrUpdateHandle()">新增
-                                    </el-button>
-                                    <el-button type="text" icon="el-icon-download" @click="exportData()" >导出
-                                    </el-button>
-                                    <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" >批量删除
-                                    </el-button>
-                    </div>
-                    <div class="JNPF-common-head-right">
-                        <el-tooltip effect="dark" content="刷新" placement="top">
-                            <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                                     @click="reset()"/>
-                        </el-tooltip>
-                        <screenfull isContainer/>
-                    </div>
-                </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  has-c @selection-change="handleSelectionChange">
-                            <el-table-column prop="itemCode" label="物料编码" width="0" align="left"
-/>
-                            <el-table-column prop="description" label="物料名称" width="0" align="left"
-/>
-                            <el-table-column prop="outArea" label="默认出库区" width="0" align="left"
-/>
-                            <el-table-column prop="inArea" label="默认入库区" width="0" align="left"
-/>
-                            <el-table-column prop="primaryUnitOmeasure" label="主单位名称" width="0" align="left"
-/>
-                                <el-table-column label="是否可采购" width="0" prop="purchaseFlag" algin="left"
->
-                                    <template slot-scope="scope">
-                                        {{ scope.row.purchaseFlag | dynamicText(purchaseFlagOptions) }}
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="是否可销售 " width="0" prop="salesFlag" algin="left"
->
-                                    <template slot-scope="scope">
-                                        {{ scope.row.salesFlag | dynamicText(salesFlagOptions) }}
-                                    </template>
-                                </el-table-column>
-                            <el-table-column prop="creatorusername" label="创建人名称" width="0" align="left"
-/>
-                            <el-table-column prop="creatortime" label="创建时间" width="0" align="left"
-/>
-                            <el-table-column prop="lastmodifyusername" label="修改人名称" width="0" align="left"
-/>
-                            <el-table-column prop="lastmodifytime" label="修改时间" width="0" align="left"
-/>
-                                <el-table-column label="生效状态" width="0" prop="effectiveStatus" algin="left"
->
-                                    <template slot-scope="scope">
-                                        {{ scope.row.effectiveStatus | dynamicText(effectiveStatusOptions) }}
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="处理类型" width="0" prop="processingType" algin="left"
->
-                                    <template slot-scope="scope">
-                                        {{ scope.row.processingType | dynamicText(processingTypeOptions) }}
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="读取标记" width="0" prop="readTag" algin="left"
->
-                                    <template slot-scope="scope">
-                                        {{ scope.row.readTag | dynamicText(readTagOptions) }}
-                                    </template>
-                                </el-table-column>
-                            <el-table-column prop="readDate" label="读取时间" width="0" align="left"
-/>
-                            <el-table-column prop="errorMessage" label="错误信息" width="0" align="left"
-/>
-                        <el-table-column label="操作" fixed="right"
-                                         width="100" >
-                            <template slot-scope="scope">
-                                        <el-button type="text"
-                                                   @click="addOrUpdateHandle(scope.row.id)" >编辑
-                                        </el-button>
-                                        <el-button type="text" class="JNPF-table-delBtn"  @click="handleDel(scope.row.id)">删除
-                                        </el-button>
-                            </template>
-                        </el-table-column>
-                </JNPF-table>
-                    <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
-            </div>
-        </div>
-        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
-        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
-        <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
-    </div>
+		<div class="JNPF-common-layout-center">
+			<el-row class="JNPF-common-search-box" :gutter="16">
+				<el-form @submit.native.prevent>
+					<el-col :span="6">
+						<el-form-item label="物料编码">
+							<el-input v-model="query.itemCode" placeholder="请输入" clearable> </el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="物料名称">
+							<el-input v-model="query.description" placeholder="请输入" clearable> </el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+						</el-form-item>
+					</el-col>
+				</el-form>
+			</el-row>
+			<div class="JNPF-common-layout-main JNPF-flex-main">
+				<div class="JNPF-common-head">
+					<div>
+						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+						</el-button>
+						<el-button type="text" icon="el-icon-download" @click="exportData()">导出
+						</el-button>
+						<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+						</el-button>
+					</div>
+					<div class="JNPF-common-head-right">
+						<el-tooltip effect="dark" content="刷新" placement="top">
+							<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+								@click="reset()" />
+						</el-tooltip>
+						<screenfull isContainer />
+					</div>
+				</div>
+				<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
+					@selection-change="handleSelectionChange">
+					<el-table-column prop="itemCode" label="物料编码" width="0" align="left" />
+					<el-table-column prop="description" label="物料名称" width="0" align="left" />
+					<el-table-column prop="outArea" label="默认出库区" width="0" align="left" />
+					<el-table-column prop="inArea" label="默认入库区" width="0" align="left" />
+					<el-table-column prop="primaryUnitOmeasure" label="主单位名称" width="0" align="left" />
+					<el-table-column label="是否可采购" width="0" prop="purchaseFlag" algin="left">
+						<template slot-scope="scope">
+							{{ scope.row.purchaseFlag | dynamicText(purchaseFlagOptions) }}
+						</template>
+					</el-table-column>
+					<el-table-column label="是否可销售 " width="0" prop="salesFlag" algin="left">
+						<template slot-scope="scope">
+							{{ scope.row.salesFlag | dynamicText(salesFlagOptions) }}
+						</template>
+					</el-table-column>
+					<el-table-column prop="creatorusername" label="创建人名称" width="0" align="left" />
+					<el-table-column prop="creatortime" label="创建时间" width="0" align="left" />
+					<el-table-column prop="lastmodifyusername" label="修改人名称" width="0" align="left" />
+					<el-table-column prop="lastmodifytime" label="修改时间" width="0" align="left" />
+					<el-table-column label="生效状态" width="0" prop="effectiveStatus" algin="left">
+						<template slot-scope="scope">
+							{{ scope.row.effectiveStatus | dynamicText(effectiveStatusOptions) }}
+						</template>
+					</el-table-column>
+					<el-table-column label="处理类型" width="0" prop="processingType" algin="left">
+						<template slot-scope="scope">
+							{{ scope.row.processingType | dynamicText(processingTypeOptions) }}
+						</template>
+					</el-table-column>
+					<el-table-column label="读取标记" width="0" prop="readTag" algin="left">
+						<template slot-scope="scope">
+							{{ scope.row.readTag | dynamicText(readTagOptions) }}
+						</template>
+					</el-table-column>
+					<el-table-column prop="readDate" label="读取时间" width="0" align="left" />
+					<el-table-column prop="errorMessage" label="错误信息" width="0" align="left" />
+					<el-table-column label="操作" fixed="right" width="100">
+						<template slot-scope="scope">
+							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
+							</el-button>
+							<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+							</el-button>
+						</template>
+					</el-table-column>
+				</JNPF-table>
+				<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+					@pagination="initData" />
+			</div>
+		</div>
+		<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
+		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+		<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
+	</div>
 </template>
 
 <script>
-    import request from '@/utils/request'
-    import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
-    import JNPFForm from './Form'
-    import ExportBox from './ExportBox'
-    import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
-    import Detail from './Detail'
+	import request from '@/utils/request'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	import JNPFForm from './Form'
+	import ExportBox from './ExportBox'
+	import {
+		getDataInterfaceRes
+	} from '@/api/systemData/dataInterface'
+	import Detail from './Detail'
 
-    export default {
-        components: {JNPFForm, ExportBox,Detail},
-        data() {
-            return {
-                detailVisible: false,
-                query: {
-                                itemCode:undefined,
-                                description:undefined,
-                },
-                treeProps: {
-                    children: 'children',
-                    label: 'fullName',
-                    value: 'id'
-                },
-                list: [],
-                listLoading: true,
- multipleSelection: [],                    total: 0,
-                listQuery: {
-                        currentPage: 1,
-                        pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
-                },
-                formVisible: false,
-                exportBoxVisible: false,
-                columnList: [
-                    {prop: 'itemCode', label: '物料编码'},
-                    {prop: 'description', label: '物料名称'},
-                    {prop: 'outArea', label: '默认出库区'},
-                    {prop: 'inArea', label: '默认入库区'},
-                    {prop: 'primaryUnitOmeasure', label: '主单位名称'},
-                    {prop: 'purchaseFlag', label: '是否可采购'},
-                    {prop: 'salesFlag', label: '是否可销售 '},
-                    {prop: 'creatorusername', label: '创建人名称'},
-                    {prop: 'creatortime', label: '创建时间'},
-                    {prop: 'lastmodifyusername', label: '修改人名称'},
-                    {prop: 'lastmodifytime', label: '修改时间'},
-                    {prop: 'effectiveStatus', label: '生效状态'},
-                    {prop: 'processingType', label: '处理类型'},
-                    {prop: 'readTag', label: '读取标记'},
-                    {prop: 'readDate', label: '读取时间'},
-                    {prop: 'errorMessage', label: '错误信息'},
-                ],
-                                purchaseFlagOptions:[{"fullName":"Y","id":"Y"},{"fullName":"N","id":"N"}],
-                            purchaseFlagProps:{"label":"fullName","value":"id"},
-                                salesFlagOptions:[{"fullName":"Y","id":"Y"},{"fullName":"N","id":"N"}],
-                            salesFlagProps:{"label":"fullName","value":"id"},
-                                effectiveStatusOptions:[{"fullName":"Y","id":"Y"},{"fullName":"N","id":"N"}],
-                            effectiveStatusProps:{"label":"fullName","value":"id"},
-                                processingTypeOptions:[{"fullName":"Y","id":"Y"},{"fullName":"N","id":"N"}],
-                            processingTypeProps:{"label":"fullName","value":"id"},
-                                readTagOptions:[{"fullName":"Y","id":"Y"},{"fullName":"N","id":"N"}],
-                            readTagProps:{"label":"fullName","value":"id"},
-            }
-        },
-        computed: {
-            menuId() {
-                return this.$route.meta.modelId || ''
-            }
-        },
-        created() {
-                this.initData()
-        },
-        methods: {
-            goDetail(id){
-                this.detailVisible = true
-                this.$nextTick(() => {
-                    this.$refs.Detail.init(id)
-                })
-            },
-            sortChange({column, prop, order}) {
-                this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-                this.listQuery.sidx = !order ? '' : prop
-                this.initData()
-            },
-            initData() {
-                this.listLoading = true;
-                let _query = {
-                    ...this.listQuery,
-                    ...this.query,
-                    menuId:this.menuId
-                };
-                request({
-                    url: `/api/Material/Material/getList`,
-                    method: 'post',
-                    data: _query
-                }).then(res => {
-                    var _list =[];
-                    for(let i=0;i<res.data.list.length;i++){
-                        let _data = res.data.list[i];
-                        _list.push(_data)
-                    }
-                    this.list = _list
-                        this.total = res.data.pagination.total
+	export default {
+		components: {
+			JNPFForm,
+			ExportBox,
+			Detail
+		},
+		data() {
+			return {
+				detailVisible: false,
+				query: {
+					itemCode: undefined,
+					description: undefined,
+				},
+				treeProps: {
+					children: 'children',
+					label: 'fullName',
+					value: 'id'
+				},
+				list: [],
+				listLoading: true,
+				multipleSelection: [],
+				total: 0,
+				listQuery: {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				},
+				formVisible: false,
+				exportBoxVisible: false,
+				columnList: [{
+						prop: 'itemCode',
+						label: '物料编码'
+					},
+					{
+						prop: 'description',
+						label: '物料名称'
+					},
+					{
+						prop: 'outArea',
+						label: '默认出库区'
+					},
+					{
+						prop: 'inArea',
+						label: '默认入库区'
+					},
+					{
+						prop: 'primaryUnitOmeasure',
+						label: '主单位名称'
+					},
+					{
+						prop: 'purchaseFlag',
+						label: '是否可采购'
+					},
+					{
+						prop: 'salesFlag',
+						label: '是否可销售 '
+					},
+					{
+						prop: 'creatorusername',
+						label: '创建人名称'
+					},
+					{
+						prop: 'creatortime',
+						label: '创建时间'
+					},
+					{
+						prop: 'lastmodifyusername',
+						label: '修改人名称'
+					},
+					{
+						prop: 'lastmodifytime',
+						label: '修改时间'
+					},
+					{
+						prop: 'effectiveStatus',
+						label: '生效状态'
+					},
+					{
+						prop: 'processingType',
+						label: '处理类型'
+					},
+					{
+						prop: 'readTag',
+						label: '读取标记'
+					},
+					{
+						prop: 'readDate',
+						label: '读取时间'
+					},
+					{
+						prop: 'errorMessage',
+						label: '错误信息'
+					},
+				],
+				purchaseFlagOptions: [{
+					"fullName": "Y",
+					"id": "Y"
+				}, {
+					"fullName": "N",
+					"id": "N"
+				}],
+				purchaseFlagProps: {
+					"label": "fullName",
+					"value": "id"
+				},
+				salesFlagOptions: [{
+					"fullName": "Y",
+					"id": "Y"
+				}, {
+					"fullName": "N",
+					"id": "N"
+				}],
+				salesFlagProps: {
+					"label": "fullName",
+					"value": "id"
+				},
+				effectiveStatusOptions: [{
+					"fullName": "Y",
+					"id": "Y"
+				}, {
+					"fullName": "N",
+					"id": "N"
+				}],
+				effectiveStatusProps: {
+					"label": "fullName",
+					"value": "id"
+				},
+				processingTypeOptions: [{
+					"fullName": "Y",
+					"id": "Y"
+				}, {
+					"fullName": "N",
+					"id": "N"
+				}],
+				processingTypeProps: {
+					"label": "fullName",
+					"value": "id"
+				},
+				readTagOptions: [{
+					"fullName": "Y",
+					"id": "Y"
+				}, {
+					"fullName": "N",
+					"id": "N"
+				}],
+				readTagProps: {
+					"label": "fullName",
+					"value": "id"
+				},
+			}
+		},
+		computed: {
+			menuId() {
+				return this.$route.meta.modelId || ''
+			}
+		},
+		created() {
+			this.initData()
+		},
+		methods: {
+			goDetail(id) {
+				this.detailVisible = true
+				this.$nextTick(() => {
+					this.$refs.Detail.init(id)
+				})
+			},
+			sortChange({
+				column,
+				prop,
+				order
+			}) {
+				this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+				this.listQuery.sidx = !order ? '' : prop
+				this.initData()
+			},
+			initData() {
+				this.listLoading = true;
+				let _query = {
+					...this.listQuery,
+					...this.query,
+					menuId: this.menuId
+				};
+				request({
+					url: `/api/Material/Material/getList`,
+					method: 'post',
+					data: _query
+				}).then(res => {
+					var _list = [];
+					for (let i = 0; i < res.data.list.length; i++) {
+						let _data = res.data.list[i];
+						_list.push(_data)
+					}
+					this.list = _list
+					this.total = res.data.pagination.total
 
-                    this.listLoading = false
-                })
-            },
-            handleDel(id) {
-                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    request({
-                        url: `/api/Material/Material/${id}`,
-                        method: 'DELETE'
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => {
-                });
-            },
-                handleSelectionChange(val) {
-                    const res = val.map(item => item.id)
-                    this.multipleSelection = res
-                },
-                handleBatchRemoveDel() {
-                    if (!this.multipleSelection.length) {
-                        this.$message({
-                            type: 'error',
-                            message: '请选择一条数据',
-                            duration: 1500,
-                        })
-                        return
-                    }
-                    const ids = this.multipleSelection.join()
-                    this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-                        type: 'warning'
-                    }).then(() => {
-                        request({
-                            url: `/api/Material/Material/batchRemove/${ids}`,
-                            method: 'DELETE'
-                        }).then(res => {
-                            this.$message({
-                                type: 'success',
-                                message: res.msg,
-                                onClose: () => {
-                                    this.initData()
-                                }
-                            });
-                        })
-                    }).catch(() => {
-                    })
-                },
-            addOrUpdateHandle(id, isDetail) {
-                this.formVisible = true
-                this.$nextTick(() => {
-                    this.$refs.JNPFForm.init(id, isDetail)
-                })
-            },
-            exportData() {
-                this.exportBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.ExportBox.init(this.columnList)
-                })
-            },
-            download(data) {
-                let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
-                request({
-                    url: `/api/Material/Material/Actions/Export`,
-                    method: 'GET',
-                    data: query
-                }).then(res => {
-                    if (!res.data.url) return
-                    this.jnpf.downloadFile(res.data.url)
-                    this.$refs.ExportBox.visible = false
-                    this.exportBoxVisible = false
-                })
-            },
-            search() {
-                this.listQuery = {
-                        currentPage: 1,
-                        pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
-                }
-                this.initData()
-            },
-            refresh(isrRefresh) {
-                this.formVisible = false
-                if (isrRefresh) this.reset()
-            },
-            reset() {
-                for (let key in this.query) {
-                    this.query[key] = undefined
-                }
-                this.search()
-            }
-        }
-    }
+					this.listLoading = false
+				})
+			},
+			handleDel(id) {
+				this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/Material/Material/${id}`,
+						method: 'DELETE'
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {});
+			},
+			handleSelectionChange(val) {
+				const res = val.map(item => item.id)
+				this.multipleSelection = res
+			},
+			handleBatchRemoveDel() {
+				if (!this.multipleSelection.length) {
+					this.$message({
+						type: 'error',
+						message: '请选择一条数据',
+						duration: 1500,
+					})
+					return
+				}
+				const ids = this.multipleSelection.join()
+				this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/Material/Material/batchRemove/${ids}`,
+						method: 'DELETE'
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {})
+			},
+			addOrUpdateHandle(id, isDetail) {
+				this.formVisible = true
+				this.$nextTick(() => {
+					this.$refs.JNPFForm.init(id, isDetail)
+				})
+			},
+			exportData() {
+				this.exportBoxVisible = true
+				this.$nextTick(() => {
+					this.$refs.ExportBox.init(this.columnList)
+				})
+			},
+			download(data) {
+				let query = {
+					...data,
+					...this.listQuery,
+					...this.query,
+					menuId: this.menuId
+				}
+				request({
+					url: `/api/Material/Material/Actions/Export`,
+					method: 'GET',
+					data: query
+				}).then(res => {
+					if (!res.data.url) return
+					this.jnpf.downloadFile(res.data.url)
+					this.$refs.ExportBox.visible = false
+					this.exportBoxVisible = false
+				})
+			},
+			search() {
+				this.listQuery = {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				}
+				this.initData()
+			},
+			refresh(isrRefresh) {
+				this.formVisible = false
+				if (isrRefresh) this.reset()
+			},
+			reset() {
+				for (let key in this.query) {
+					this.query[key] = undefined
+				}
+				this.search()
+			}
+		}
+	}
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/monitormanage/Form.vue b/SC-web/src/views/scm/basicInformation/monitormanage/Form.vue
index eb17910c..df7c1a24 100644
--- a/SC-web/src/views/scm/basicInformation/monitormanage/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/monitormanage/Form.vue
@@ -1,245 +1,228 @@
 <template>
-<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'"
-           :close-on-click-modal="false" append-to-body
-           :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
-           width="800px">
-<el-row :gutter="15" class="">
-<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
-    <template v-if="!loading">
-            <el-col :span="24" >
-                <el-form-item  label="设备名称"  
- prop="mName" >
-                    <el-input    v-model="dataForm.mName"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" append-to-body
+		:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
+		<el-row :gutter="15" class="">
+			<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px"
+				label-position="right">
+				<template v-if="!loading">
+					<el-col :span="24">
+						<el-form-item label="设备名称" prop="mName">
+							<el-input v-model="dataForm.mName" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="设备序列号"  
- prop="serialnumber" >
-                    <el-input    v-model="dataForm.serialnumber"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="设备序列号" prop="serialnumber">
+							<el-input v-model="dataForm.serialnumber" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="ip地址"  
- prop="ip" >
-                    <el-input    v-model="dataForm.ip"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="ip地址" prop="ip">
+							<el-input v-model="dataForm.ip" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="端口号"  
- prop="port" >
-                    <el-input    v-model="dataForm.port"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="端口号" prop="port">
+							<el-input v-model="dataForm.port" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="账号"  
- prop="account" >
-                    <el-input    v-model="dataForm.account"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="账号" prop="account">
+							<el-input v-model="dataForm.account" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="密码"  
- prop="password" >
-                    <el-input    v-model="dataForm.password"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="密码" prop="password">
+							<el-input v-model="dataForm.password" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="创建人名称"  
- prop="creatorusername" >
-                    <el-input    v-model="dataForm.creatorusername"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="创建人名称" prop="creatorusername">
+							<el-input v-model="dataForm.creatorusername" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="创建时间"  
- prop="creatortime" >
-                    <el-date-picker    v-model="dataForm.creatortime"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' type="datetime"  format="yyyy-MM-dd HH:mm:ss"  value-format="timestamp" >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="创建时间" prop="creatortime">
+							<el-date-picker v-model="dataForm.creatortime" placeholder="请选择" clearable
+								:style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
+								value-format="timestamp">
 
-                </el-date-picker>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="修改人名称"  
- prop="lastmodifyusername" >
-                    <el-input    v-model="dataForm.lastmodifyusername"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-date-picker>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="修改人名称" prop="lastmodifyusername">
+							<el-input v-model="dataForm.lastmodifyusername" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="修改时间"  
- prop="lastmodifytime" >
-                    <el-date-picker    v-model="dataForm.lastmodifytime"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' type="datetime"  format="yyyy-MM-dd HH:mm:ss"  value-format="timestamp" >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="修改时间" prop="lastmodifytime">
+							<el-date-picker v-model="dataForm.lastmodifytime" placeholder="请选择" clearable
+								:style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
+								value-format="timestamp">
 
-                </el-date-picker>
-                </el-form-item>
-            </el-col>
-    </template>
-</el-form>
-    </el-row>
-    <span slot="footer" class="dialog-footer">
-        <el-button @click="visible = false"> 取 消</el-button>
-        <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
-    </span>
-    </el-dialog>
+							</el-date-picker>
+						</el-form-item>
+					</el-col>
+				</template>
+			</el-form>
+		</el-row>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false"> 取 消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
+		</span>
+	</el-dialog>
 </template>
 <script>
-    import request from '@/utils/request'
-    import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-    export default {
-        components: {},
-        props: [],
-        data() {
-            return {
-                visible: false,
-                loading: false,
-                isDetail: false,
-            dataForm: {
-                            mName : '',
-                            serialnumber : '',
-                            ip : '',
-                            port : '',
-                            account : '',
-                            password : '',
-                            creatorusername : '',
-                            creatortime : '',
-                            lastmodifyusername : '',
-                            lastmodifytime : '',
-            },
-            rules:
-            {
-                            mName: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            serialnumber: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                        ],
-            },
-
-        }
-        },
-        computed: {},
-        watch: {},
-        created() {
-        },
-        mounted() {},
-        methods: {
-            clearData(data){
-                for (let key in data) {
-                    if (data[key] instanceof Array) {
-                        data[key] = [];
-                    } else if (data[key] instanceof Object) {
-                        this.clearData(data[key]);
-                    } else {
-                        data[key] = "";
-                    }
-                }
-            },
-            init(id, isDetail) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.isDetail = isDetail || false;
-                this.$nextTick(() => {
-                    this.$refs['elForm'].resetFields();
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/monitormanage/Monitormanage/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        });
-                    }else{
-                       this.clearData(this.dataForm)
-                    }
-                });
-                this.$store.commit('generator/UPDATE_RELATION_DATA', {})
-            },
-            // 表单提交
-            dataFormSubmit() {
-                this.$refs['elForm'].validate((valid) => {
-                    if (valid) {
-                            this.request()
-                    }
-                })
-            },
-            request() {
-                var _data =this.dataList()
-                if (!this.dataForm.id) {
-                    request({
-                        url: '/api/monitormanage/Monitormanage',
-                        method: 'post',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                this.visible = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    })
-                }else{
-                    request({
-                        url: '/api/monitormanage/Monitormanage/'+this.dataForm.id,
-                        method: 'PUT',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                this.visible = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    })
-                }
-            },
-            dataList(){
-                var _data = JSON.parse(JSON.stringify(this.dataForm));
-                return _data;
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                this.dataForm = _dataAll
-            },
-        },
-    }
+	import request from '@/utils/request'
+	import {
+		getDataInterfaceRes
+	} from '@/api/systemData/dataInterface'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	export default {
+		components: {},
+		props: [],
+		data() {
+			return {
+				visible: false,
+				loading: false,
+				isDetail: false,
+				dataForm: {
+					mName: '',
+					serialnumber: '',
+					ip: '',
+					port: '',
+					account: '',
+					password: '',
+					creatorusername: '',
+					creatortime: '',
+					lastmodifyusername: '',
+					lastmodifytime: '',
+				},
+				rules: {
+					mName: [{
+						required: true,
+						message: '请输入',
+						trigger: 'blur'
+					}, ],
+					serialnumber: [{
+						required: true,
+						message: '请输入',
+						trigger: 'blur'
+					}, ],
+				},
 
+			}
+		},
+		computed: {},
+		watch: {},
+		created() {},
+		mounted() {},
+		methods: {
+			clearData(data) {
+				for (let key in data) {
+					if (data[key] instanceof Array) {
+						data[key] = [];
+					} else if (data[key] instanceof Object) {
+						this.clearData(data[key]);
+					} else {
+						data[key] = "";
+					}
+				}
+			},
+			init(id, isDetail) {
+				this.dataForm.id = id || 0;
+				this.visible = true;
+				this.isDetail = isDetail || false;
+				this.$nextTick(() => {
+					this.$refs['elForm'].resetFields();
+					if (this.dataForm.id) {
+						this.loading = true
+						request({
+							url: '/api/monitormanage/Monitormanage/' + this.dataForm.id,
+							method: 'get'
+						}).then(res => {
+							this.dataInfo(res.data)
+							this.loading = false
+						});
+					} else {
+						this.clearData(this.dataForm)
+					}
+				});
+				this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+			},
+			// 表单提交
+			dataFormSubmit() {
+				this.$refs['elForm'].validate((valid) => {
+					if (valid) {
+						this.request()
+					}
+				})
+			},
+			request() {
+				var _data = this.dataList()
+				if (!this.dataForm.id) {
+					request({
+						url: '/api/monitormanage/Monitormanage',
+						method: 'post',
+						data: _data
+					}).then((res) => {
+						this.$message({
+							message: res.msg,
+							type: 'success',
+							duration: 1000,
+							onClose: () => {
+								this.visible = false
+								this.$emit('refresh', true)
+							}
+						})
+					})
+				} else {
+					request({
+						url: '/api/monitormanage/Monitormanage/' + this.dataForm.id,
+						method: 'PUT',
+						data: _data
+					}).then((res) => {
+						this.$message({
+							message: res.msg,
+							type: 'success',
+							duration: 1000,
+							onClose: () => {
+								this.visible = false
+								this.$emit('refresh', true)
+							}
+						})
+					})
+				}
+			},
+			dataList() {
+				var _data = JSON.parse(JSON.stringify(this.dataForm));
+				return _data;
+			},
+			dataInfo(dataAll) {
+				let _dataAll = dataAll
+				this.dataForm = _dataAll
+			},
+		},
+	}
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/monitormanage/index.vue b/SC-web/src/views/scm/basicInformation/monitormanage/index.vue
index dd781bce..4701b2b3 100644
--- a/SC-web/src/views/scm/basicInformation/monitormanage/index.vue
+++ b/SC-web/src/views/scm/basicInformation/monitormanage/index.vue
@@ -1,265 +1,300 @@
 <template>
-    <div class="JNPF-common-layout">
+	<div class="JNPF-common-layout">
 
-        <div class="JNPF-common-layout-center">
-            <el-row class="JNPF-common-search-box" :gutter="16">
-                <el-form @submit.native.prevent>
-                                            <el-col :span="6">
-                                <el-form-item label="设备名称">
-                                        <el-input v-model="query.mName" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                    <el-col :span="6">
-                        <el-form-item>
-                            <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-                            <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-                        </el-form-item>
-                    </el-col>
-                </el-form>
-            </el-row>
-            <div class="JNPF-common-layout-main JNPF-flex-main">
-                <div class="JNPF-common-head">
-                    <div>
-                                    <el-button type="primary" icon="el-icon-plus"  @click="addOrUpdateHandle()">新增
-                                    </el-button>
-                                    <el-button type="text" icon="el-icon-download" @click="exportData()" >导出
-                                    </el-button>
-                                    <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" >批量删除
-                                    </el-button>
-                    </div>
-                    <div class="JNPF-common-head-right">
-                        <el-tooltip effect="dark" content="刷新" placement="top">
-                            <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                                     @click="reset()"/>
-                        </el-tooltip>
-                        <screenfull isContainer/>
-                    </div>
-                </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  has-c @selection-change="handleSelectionChange">
-                            <el-table-column prop="mName" label="设备名称" width="0" align="left"
-/>
-                            <el-table-column prop="serialnumber" label="设备序列号" width="0" align="left"
-/>
-                            <el-table-column prop="ip" label="ip地址" width="0" align="left"
-/>
-                            <el-table-column prop="port" label="端口号" width="0" align="left"
-/>
-                            <el-table-column prop="account" label="账号" width="0" align="left"
-/>
-                            <el-table-column prop="password" label="密码" width="0" align="left"
-/>
-                            <el-table-column prop="creatorusername" label="创建人名称" width="0" align="left"
-/>
-                            <el-table-column prop="creatortime" label="创建时间" width="0" align="left"
-/>
-                            <el-table-column prop="lastmodifyusername" label="修改人名称" width="0" align="left"
-/>
-                            <el-table-column prop="lastmodifytime" label="修改时间" width="0" align="left"
-/>
-                        <el-table-column label="操作" fixed="right"
-                                         width="100" >
-                            <template slot-scope="scope">
-                                        <el-button type="text"
-                                                   @click="addOrUpdateHandle(scope.row.id)" >编辑
-                                        </el-button>
-                                        <el-button type="text" class="JNPF-table-delBtn"  @click="handleDel(scope.row.id)">删除
-                                        </el-button>
-                            </template>
-                        </el-table-column>
-                </JNPF-table>
-                    <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
-            </div>
-        </div>
-        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
-        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
-        <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
-    </div>
+		<div class="JNPF-common-layout-center">
+			<el-row class="JNPF-common-search-box" :gutter="16">
+				<el-form @submit.native.prevent>
+					<el-col :span="6">
+						<el-form-item label="设备名称">
+							<el-input v-model="query.mName" placeholder="请输入" clearable> </el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+						</el-form-item>
+					</el-col>
+				</el-form>
+			</el-row>
+			<div class="JNPF-common-layout-main JNPF-flex-main">
+				<div class="JNPF-common-head">
+					<div>
+						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+						</el-button>
+						<el-button type="text" icon="el-icon-download" @click="exportData()">导出
+						</el-button>
+						<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+						</el-button>
+					</div>
+					<div class="JNPF-common-head-right">
+						<el-tooltip effect="dark" content="刷新" placement="top">
+							<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+								@click="reset()" />
+						</el-tooltip>
+						<screenfull isContainer />
+					</div>
+				</div>
+				<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
+					@selection-change="handleSelectionChange">
+					<el-table-column prop="mName" label="设备名称" width="0" align="left" />
+					<el-table-column prop="serialnumber" label="设备序列号" width="0" align="left" />
+					<el-table-column prop="ip" label="ip地址" width="0" align="left" />
+					<el-table-column prop="port" label="端口号" width="0" align="left" />
+					<el-table-column prop="account" label="账号" width="0" align="left" />
+					<el-table-column prop="password" label="密码" width="0" align="left" />
+					<el-table-column prop="creatorusername" label="创建人名称" width="0" align="left" />
+					<el-table-column prop="creatortime" label="创建时间" width="0" align="left" />
+					<el-table-column prop="lastmodifyusername" label="修改人名称" width="0" align="left" />
+					<el-table-column prop="lastmodifytime" label="修改时间" width="0" align="left" />
+					<el-table-column label="操作" fixed="right" width="100">
+						<template slot-scope="scope">
+							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
+							</el-button>
+							<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+							</el-button>
+						</template>
+					</el-table-column>
+				</JNPF-table>
+				<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+					@pagination="initData" />
+			</div>
+		</div>
+		<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
+		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+		<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
+	</div>
 </template>
 
 <script>
-    import request from '@/utils/request'
-    import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
-    import JNPFForm from './Form'
-    import ExportBox from './ExportBox'
-    import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
-    import Detail from './Detail'
+	import request from '@/utils/request'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	import JNPFForm from './Form'
+	import ExportBox from './ExportBox'
+	import {
+		getDataInterfaceRes
+	} from '@/api/systemData/dataInterface'
+	import Detail from './Detail'
 
-    export default {
-        components: {JNPFForm, ExportBox,Detail},
-        data() {
-            return {
-                detailVisible: false,
-                query: {
-                                mName:undefined,
-                },
-                treeProps: {
-                    children: 'children',
-                    label: 'fullName',
-                    value: 'id'
-                },
-                list: [],
-                listLoading: true,
- multipleSelection: [],                    total: 0,
-                listQuery: {
-                        currentPage: 1,
-                        pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
-                },
-                formVisible: false,
-                exportBoxVisible: false,
-                columnList: [
-                    {prop: 'mName', label: '设备名称'},
-                    {prop: 'serialnumber', label: '设备序列号'},
-                    {prop: 'ip', label: 'ip地址'},
-                    {prop: 'port', label: '端口号'},
-                    {prop: 'account', label: '账号'},
-                    {prop: 'password', label: '密码'},
-                    {prop: 'creatorusername', label: '创建人名称'},
-                    {prop: 'creatortime', label: '创建时间'},
-                    {prop: 'lastmodifyusername', label: '修改人名称'},
-                    {prop: 'lastmodifytime', label: '修改时间'},
-                ],
-            }
-        },
-        computed: {
-            menuId() {
-                return this.$route.meta.modelId || ''
-            }
-        },
-        created() {
-                this.initData()
-        },
-        methods: {
-            goDetail(id){
-                this.detailVisible = true
-                this.$nextTick(() => {
-                    this.$refs.Detail.init(id)
-                })
-            },
-            sortChange({column, prop, order}) {
-                this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-                this.listQuery.sidx = !order ? '' : prop
-                this.initData()
-            },
-            initData() {
-                this.listLoading = true;
-                let _query = {
-                    ...this.listQuery,
-                    ...this.query,
-                    menuId:this.menuId
-                };
-                request({
-                    url: `/api/monitormanage/Monitormanage/getList`,
-                    method: 'post',
-                    data: _query
-                }).then(res => {
-                    var _list =[];
-                    for(let i=0;i<res.data.list.length;i++){
-                        let _data = res.data.list[i];
-                        _list.push(_data)
-                    }
-                    this.list = _list
-                        this.total = res.data.pagination.total
+	export default {
+		components: {
+			JNPFForm,
+			ExportBox,
+			Detail
+		},
+		data() {
+			return {
+				detailVisible: false,
+				query: {
+					mName: undefined,
+				},
+				treeProps: {
+					children: 'children',
+					label: 'fullName',
+					value: 'id'
+				},
+				list: [],
+				listLoading: true,
+				multipleSelection: [],
+				total: 0,
+				listQuery: {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				},
+				formVisible: false,
+				exportBoxVisible: false,
+				columnList: [{
+						prop: 'mName',
+						label: '设备名称'
+					},
+					{
+						prop: 'serialnumber',
+						label: '设备序列号'
+					},
+					{
+						prop: 'ip',
+						label: 'ip地址'
+					},
+					{
+						prop: 'port',
+						label: '端口号'
+					},
+					{
+						prop: 'account',
+						label: '账号'
+					},
+					{
+						prop: 'password',
+						label: '密码'
+					},
+					{
+						prop: 'creatorusername',
+						label: '创建人名称'
+					},
+					{
+						prop: 'creatortime',
+						label: '创建时间'
+					},
+					{
+						prop: 'lastmodifyusername',
+						label: '修改人名称'
+					},
+					{
+						prop: 'lastmodifytime',
+						label: '修改时间'
+					},
+				],
+			}
+		},
+		computed: {
+			menuId() {
+				return this.$route.meta.modelId || ''
+			}
+		},
+		created() {
+			this.initData()
+		},
+		methods: {
+			goDetail(id) {
+				this.detailVisible = true
+				this.$nextTick(() => {
+					this.$refs.Detail.init(id)
+				})
+			},
+			sortChange({
+				column,
+				prop,
+				order
+			}) {
+				this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+				this.listQuery.sidx = !order ? '' : prop
+				this.initData()
+			},
+			initData() {
+				this.listLoading = true;
+				let _query = {
+					...this.listQuery,
+					...this.query,
+					menuId: this.menuId
+				};
+				request({
+					url: `/api/monitormanage/Monitormanage/getList`,
+					method: 'post',
+					data: _query
+				}).then(res => {
+					var _list = [];
+					for (let i = 0; i < res.data.list.length; i++) {
+						let _data = res.data.list[i];
+						_list.push(_data)
+					}
+					this.list = _list
+					this.total = res.data.pagination.total
 
-                    this.listLoading = false
-                })
-            },
-            handleDel(id) {
-                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    request({
-                        url: `/api/monitormanage/Monitormanage/${id}`,
-                        method: 'DELETE'
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => {
-                });
-            },
-                handleSelectionChange(val) {
-                    const res = val.map(item => item.id)
-                    this.multipleSelection = res
-                },
-                handleBatchRemoveDel() {
-                    if (!this.multipleSelection.length) {
-                        this.$message({
-                            type: 'error',
-                            message: '请选择一条数据',
-                            duration: 1500,
-                        })
-                        return
-                    }
-                    const ids = this.multipleSelection.join()
-                    this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-                        type: 'warning'
-                    }).then(() => {
-                        request({
-                            url: `/api/monitormanage/Monitormanage/batchRemove/${ids}`,
-                            method: 'DELETE'
-                        }).then(res => {
-                            this.$message({
-                                type: 'success',
-                                message: res.msg,
-                                onClose: () => {
-                                    this.initData()
-                                }
-                            });
-                        })
-                    }).catch(() => {
-                    })
-                },
-            addOrUpdateHandle(id, isDetail) {
-                this.formVisible = true
-                this.$nextTick(() => {
-                    this.$refs.JNPFForm.init(id, isDetail)
-                })
-            },
-            exportData() {
-                this.exportBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.ExportBox.init(this.columnList)
-                })
-            },
-            download(data) {
-                let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
-                request({
-                    url: `/api/monitormanage/Monitormanage/Actions/Export`,
-                    method: 'GET',
-                    data: query
-                }).then(res => {
-                    if (!res.data.url) return
-                    this.jnpf.downloadFile(res.data.url)
-                    this.$refs.ExportBox.visible = false
-                    this.exportBoxVisible = false
-                })
-            },
-            search() {
-                this.listQuery = {
-                        currentPage: 1,
-                        pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
-                }
-                this.initData()
-            },
-            refresh(isrRefresh) {
-                this.formVisible = false
-                if (isrRefresh) this.reset()
-            },
-            reset() {
-                for (let key in this.query) {
-                    this.query[key] = undefined
-                }
-                this.search()
-            }
-        }
-    }
+					this.listLoading = false
+				})
+			},
+			handleDel(id) {
+				this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/monitormanage/Monitormanage/${id}`,
+						method: 'DELETE'
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {});
+			},
+			handleSelectionChange(val) {
+				const res = val.map(item => item.id)
+				this.multipleSelection = res
+			},
+			handleBatchRemoveDel() {
+				if (!this.multipleSelection.length) {
+					this.$message({
+						type: 'error',
+						message: '请选择一条数据',
+						duration: 1500,
+					})
+					return
+				}
+				const ids = this.multipleSelection.join()
+				this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/monitormanage/Monitormanage/batchRemove/${ids}`,
+						method: 'DELETE'
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {})
+			},
+			addOrUpdateHandle(id, isDetail) {
+				this.formVisible = true
+				this.$nextTick(() => {
+					this.$refs.JNPFForm.init(id, isDetail)
+				})
+			},
+			exportData() {
+				this.exportBoxVisible = true
+				this.$nextTick(() => {
+					this.$refs.ExportBox.init(this.columnList)
+				})
+			},
+			download(data) {
+				let query = {
+					...data,
+					...this.listQuery,
+					...this.query,
+					menuId: this.menuId
+				}
+				request({
+					url: `/api/monitormanage/Monitormanage/Actions/Export`,
+					method: 'GET',
+					data: query
+				}).then(res => {
+					if (!res.data.url) return
+					this.jnpf.downloadFile(res.data.url)
+					this.$refs.ExportBox.visible = false
+					this.exportBoxVisible = false
+				})
+			},
+			search() {
+				this.listQuery = {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				}
+				this.initData()
+			},
+			refresh(isrRefresh) {
+				this.formVisible = false
+				if (isrRefresh) this.reset()
+			},
+			reset() {
+				for (let key in this.query) {
+					this.query[key] = undefined
+				}
+				this.search()
+			}
+		}
+	}
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/poundlist/Form.vue b/SC-web/src/views/scm/basicInformation/poundlist/Form.vue
index 86103feb..f5441acf 100644
--- a/SC-web/src/views/scm/basicInformation/poundlist/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/poundlist/Form.vue
@@ -1,491 +1,480 @@
 <template>
-<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'"
-           :close-on-click-modal="false" append-to-body
-           :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
-           width="800px">
-<el-row :gutter="15" class="">
-<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
-    <template v-if="!loading">
-            <el-col :span="12" >
-                <el-form-item  label="物料编码"  
- prop="materialCode" >
-                    <relationForm    v-model="dataForm.materialCode"
- placeholder="请选择"  clearable  field="materialCode" modelId ="294090217084722181"  :columnOptions="materialCodecolumnOptions" relationField="selectField121"   >
+	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" append-to-body
+		:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
+		<el-row :gutter="15" class="">
+			<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px"
+				label-position="right">
+				<template v-if="!loading">
+					<el-col :span="12">
+						<el-form-item label="物料编码" prop="materialCode">
+							<relationForm v-model="dataForm.materialCode" placeholder="请选择" clearable
+								field="materialCode" modelId="294090217084722181"
+								:columnOptions="materialCodecolumnOptions" relationField="selectField121">
 
-                </relationForm>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="物料名称"  
- prop="materialName" >
-                    <el-input    v-model="dataForm.materialName"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</relationForm>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="物料名称" prop="materialName">
+							<el-input v-model="dataForm.materialName" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="销售合同"  
- prop="salesName" >
-                    <relationForm    v-model="dataForm.salesName"
- placeholder="请选择"  clearable  field="salesName" modelId ="294090217084722181"  :columnOptions="salesNamecolumnOptions" relationField="selectField121"   >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="销售合同" prop="salesName">
+							<relationForm v-model="dataForm.salesName" placeholder="请选择" clearable field="salesName"
+								modelId="294090217084722181" :columnOptions="salesNamecolumnOptions"
+								relationField="selectField121">
 
-                </relationForm>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="客户名称"  
- prop="customerName" >
-                    <el-input    v-model="dataForm.customerName"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</relationForm>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="客户名称" prop="customerName">
+							<el-input v-model="dataForm.customerName" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="是否垫资"  
- prop="advance" >
-                    <el-select    v-model="dataForm.advance"
- placeholder="请选择"  clearable  :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in advanceOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="是否垫资" prop="advance">
+							<el-select v-model="dataForm.advance" placeholder="请选择" clearable :style='{"width":"100%"}'>
+								<el-option v-for="(item, index) in advanceOptions" :key="index" :label="item.fullName"
+									:value="item.id" :disabled="item.disabled"></el-option>
 
-                </el-select>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="销售价格"  
- prop="salesPrice" >
-                    <el-input-number    v-model="dataForm.salesPrice"
- placeholder="数字文本"  :step="1" >
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="销售价格" prop="salesPrice">
+							<el-input-number v-model="dataForm.salesPrice" placeholder="数字文本" :step="1">
 
-                </el-input-number>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="运输方式"  
- prop="transportType" >
-                    <el-select    v-model="dataForm.transportType"
- placeholder="请选择"  clearable  :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in transportTypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
+							</el-input-number>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="运输方式" prop="transportType">
+							<el-select v-model="dataForm.transportType" placeholder="请选择" clearable
+								:style='{"width":"100%"}'>
+								<el-option v-for="(item, index) in transportTypeOptions" :key="index"
+									:label="item.fullName" :value="item.id" :disabled="item.disabled"></el-option>
 
-                </el-select>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="运费"  
- prop="departmentId" >
-                    <el-input-number    v-model="dataForm.departmentId"
- placeholder="数字文本"  :step="1" >
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="运费" prop="departmentId">
+							<el-input-number v-model="dataForm.departmentId" placeholder="数字文本" :step="1">
 
-                </el-input-number>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="车号"  
- prop="licenseNo" >
-                    <relationForm    v-model="dataForm.licenseNo"
- placeholder="请选择"  clearable  field="licenseNo" modelId ="294090217084722181"  :columnOptions="licenseNocolumnOptions" relationField="selectField122"   >
+							</el-input-number>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="车号" prop="licenseNo">
+							<relationForm v-model="dataForm.licenseNo" placeholder="请选择" clearable field="licenseNo"
+								modelId="294090217084722181" :columnOptions="licenseNocolumnOptions"
+								relationField="selectField122">
 
-                </relationForm>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="业务员名称"  
- prop="businessName" >
-                    <el-input    v-model="dataForm.businessName"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</relationForm>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="业务员名称" prop="businessName">
+							<el-input v-model="dataForm.businessName" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="磅单图片"  
- prop="poundPictures" >
-                    <JNPF-UploadImg    v-model="dataForm.poundPictures"
- :fileSize="500"    sizeUnit="MB"  :limit="9" >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="磅单图片" prop="poundPictures">
+							<JNPF-UploadImg v-model="dataForm.poundPictures" :fileSize="500" sizeUnit="MB" :limit="9">
 
-                </JNPF-UploadImg>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="皮重"  
- prop="tareWeight" >
-                    <el-input-number    v-model="dataForm.tareWeight"
- placeholder="数字文本"  :step="1" >
+							</JNPF-UploadImg>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="皮重" prop="tareWeight">
+							<el-input-number v-model="dataForm.tareWeight" placeholder="数字文本" :step="1">
 
-                </el-input-number>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="毛重"  
- prop="grossWeight" >
-                    <el-input-number    v-model="dataForm.grossWeight"
- placeholder="数字文本"  :step="1" >
+							</el-input-number>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="毛重" prop="grossWeight">
+							<el-input-number v-model="dataForm.grossWeight" placeholder="数字文本" :step="1">
 
-                </el-input-number>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="扣重"  
- prop="buckleWeight" >
-                    <el-input-number    v-model="dataForm.buckleWeight"
- placeholder="数字文本"  :step="1" >
+							</el-input-number>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="扣重" prop="buckleWeight">
+							<el-input-number v-model="dataForm.buckleWeight" placeholder="数字文本" :step="1">
 
-                </el-input-number>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="净重"  
- prop="netWeight" >
-                    <el-input-number    v-model="dataForm.netWeight"
- placeholder="数字文本"  :step="1" >
+							</el-input-number>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="净重" prop="netWeight">
+							<el-input-number v-model="dataForm.netWeight" placeholder="数字文本" :step="1">
 
-                </el-input-number>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="备注"  
- prop="remark" >
-                    <el-input    v-model="dataForm.remark"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-input-number>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="备注" prop="remark">
+							<el-input v-model="dataForm.remark" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="司机名称"  
- prop="driverName" >
-                    <el-input    v-model="dataForm.driverName"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="司机名称" prop="driverName">
+							<el-input v-model="dataForm.driverName" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="车辆图片"  
- prop="vehiclePictures" >
-                    <JNPF-UploadImg    v-model="dataForm.vehiclePictures"
- :fileSize="500"    sizeUnit="MB"  :limit="9" >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="车辆图片" prop="vehiclePictures">
+							<JNPF-UploadImg v-model="dataForm.vehiclePictures" :fileSize="500" sizeUnit="MB" :limit="9">
 
-                </JNPF-UploadImg>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="制单人"  
- prop="creatorusername" >
-                    <el-input    v-model="dataForm.creatorusername"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</JNPF-UploadImg>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="制单人" prop="creatorusername">
+							<el-input v-model="dataForm.creatorusername" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="供应商名称"  
- prop="supplierName" >
-                    <el-input    v-model="dataForm.supplierName"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="供应商名称" prop="supplierName">
+							<el-input v-model="dataForm.supplierName" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="采购合同"  
- prop="purchaseName" >
-                    <relationForm    v-model="dataForm.purchaseName"
- placeholder="请选择"  clearable  field="purchaseName" modelId ="294090217084722181"  :columnOptions="purchaseNamecolumnOptions" relationField="selectField121"   >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="采购合同" prop="purchaseName">
+							<relationForm v-model="dataForm.purchaseName" placeholder="请选择" clearable
+								field="purchaseName" modelId="294090217084722181"
+								:columnOptions="purchaseNamecolumnOptions" relationField="selectField121">
 
-                </relationForm>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="单位"  
- prop="unit" >
-                    <el-select    v-model="dataForm.unit"
- placeholder="请选择"  clearable  :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in unitOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
+							</relationForm>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="单位" prop="unit">
+							<el-select v-model="dataForm.unit" placeholder="请选择" clearable :style='{"width":"100%"}'>
+								<el-option v-for="(item, index) in unitOptions" :key="index" :label="item.fullName"
+									:value="item.id" :disabled="item.disabled"></el-option>
 
-                </el-select>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="结算重量"  
- prop="settlement" >
-                    <el-input    v-model="dataForm.settlement"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="结算重量" prop="settlement">
+							<el-input v-model="dataForm.settlement" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="采购单价"  
- prop="purchasePrice" >
-                    <el-input    v-model="dataForm.purchasePrice"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="采购单价" prop="purchasePrice">
+							<el-input v-model="dataForm.purchasePrice" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="进项票日期"  
- prop="inputDate" >
-                    <el-date-picker    v-model="dataForm.inputDate"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' type="datetime"  format="yyyy-MM-dd HH:mm:ss"  value-format="timestamp" >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="进项票日期" prop="inputDate">
+							<el-date-picker v-model="dataForm.inputDate" placeholder="请选择" clearable
+								:style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
+								value-format="timestamp">
 
-                </el-date-picker>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="销项票日期"  
- prop="outputDate" >
-                    <el-date-picker    v-model="dataForm.outputDate"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' type="datetime"  format="yyyy-MM-dd HH:mm:ss"  value-format="timestamp" >
+							</el-date-picker>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="销项票日期" prop="outputDate">
+							<el-date-picker v-model="dataForm.outputDate" placeholder="请选择" clearable
+								:style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
+								value-format="timestamp">
 
-                </el-date-picker>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="付款日期"  
- prop="payDate" >
-                    <el-date-picker    v-model="dataForm.payDate"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' type="datetime"  format="yyyy-MM-dd HH:mm:ss"  value-format="timestamp" >
+							</el-date-picker>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="付款日期" prop="payDate">
+							<el-date-picker v-model="dataForm.payDate" placeholder="请选择" clearable
+								:style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
+								value-format="timestamp">
 
-                </el-date-picker>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="回款日期"  
- prop="paymentDate" >
-                    <el-date-picker    v-model="dataForm.paymentDate"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' type="datetime"  format="yyyy-MM-dd HH:mm:ss"  value-format="timestamp" >
+							</el-date-picker>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="回款日期" prop="paymentDate">
+							<el-date-picker v-model="dataForm.paymentDate" placeholder="请选择" clearable
+								:style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
+								value-format="timestamp">
 
-                </el-date-picker>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="磅单日期"  
- prop="poundDate" >
-                    <el-date-picker    v-model="dataForm.poundDate"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' type="datetime"  format="yyyy-MM-dd HH:mm:ss"  value-format="timestamp" >
+							</el-date-picker>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="磅单日期" prop="poundDate">
+							<el-date-picker v-model="dataForm.poundDate" placeholder="请选择" clearable
+								:style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
+								value-format="timestamp">
 
-                </el-date-picker>
-                </el-form-item>
-            </el-col>
-    </template>
-</el-form>
-    </el-row>
-    <span slot="footer" class="dialog-footer">
-        <el-button @click="visible = false"> 取 消</el-button>
-        <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
-    </span>
-    </el-dialog>
+							</el-date-picker>
+						</el-form-item>
+					</el-col>
+				</template>
+			</el-form>
+		</el-row>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false"> 取 消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
+		</span>
+	</el-dialog>
 </template>
 <script>
-    import request from '@/utils/request'
-    import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-    export default {
-        components: {},
-        props: [],
-        data() {
-            return {
-                visible: false,
-                loading: false,
-                isDetail: false,
-            dataForm: {
-                            materialCode : "",
-                            materialName : '',
-                            salesName : "",
-                            customerName : '',
-                            advance : "",
-                            salesPrice : '',
-                            transportType : "",
-                            departmentId : 11.225,
-                            licenseNo : "",
-                            businessName : '',
-                            poundPictures : [],
-                            tareWeight : '',
-                            grossWeight : '',
-                            buckleWeight : '',
-                            netWeight : '',
-                            remark : '',
-                            driverName : '',
-                            vehiclePictures : [],
-                            creatorusername : '',
-                            supplierName : '',
-                            purchaseName : "",
-                            unit : "",
-                            settlement : '',
-                            purchasePrice : '',
-                            inputDate : '',
-                            outputDate : '',
-                            payDate : '',
-                            paymentDate : '',
-                            poundDate : '',
-            },
-            rules:
-            {
-                            materialCode: [
-                                {
-                                    required: true,
-                                    message: '请选择',
-                                    trigger: 'change'
-                                },
-                        ],
-                            salesName: [
-                                {
-                                    required: true,
-                                    message: '请选择',
-                                    trigger: 'change'
-                                },
-                        ],
-                            licenseNo: [
-                                {
-                                    required: true,
-                                    message: '请选择',
-                                    trigger: 'change'
-                                },
-                        ],
-                            poundPictures: [
-                                {
-                                    required: true,
-                                    message: '请至少选择一个',
-                                    trigger: 'click'
-                                },
-                        ],
-                            tareWeight: [
-                                {
-                                    required: true,
-                                    message: '数字文本',
-                                    trigger: ["blur","change"]
-                                },
-                        ],
-                            grossWeight: [
-                                {
-                                    required: true,
-                                    message: '数字文本',
-                                    trigger: ["blur","change"]
-                                },
-                        ],
-                            buckleWeight: [
-                                {
-                                    required: true,
-                                    message: '数字文本',
-                                    trigger: ["blur","change"]
-                                },
-                        ],
-                            netWeight: [
-                                {
-                                    required: true,
-                                    message: '数字文本',
-                                    trigger: ["blur","change"]
-                                },
-                        ],
-            },
-                    materialCodecolumnOptions:[ {"label":"事件等级","value":"selectField121"},],
-                    salesNamecolumnOptions:[ {"label":"事件等级","value":"selectField121"},],
-                        advanceOptions:[{"fullName":"是","id":"1"},{"fullName":"否","id":"0"}],
-                        transportTypeOptions:[{"fullName":"汽运","id":"0"},{"fullName":"船运","id":"1"},{"fullName":"火车","id":"2"}],
-                    licenseNocolumnOptions:[ {"label":"事件级别","value":"selectField122"},],
-                    purchaseNamecolumnOptions:[ {"label":"事件等级","value":"selectField121"},],
-                        unitOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}],
-
-        }
-        },
-        computed: {},
-        watch: {},
-        created() {
-        },
-        mounted() {},
-        methods: {
-            clearData(data){
-                for (let key in data) {
-                    if (data[key] instanceof Array) {
-                        data[key] = [];
-                    } else if (data[key] instanceof Object) {
-                        this.clearData(data[key]);
-                    } else {
-                        data[key] = "";
-                    }
-                }
-            },
-            init(id, isDetail) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.isDetail = isDetail || false;
-                this.$nextTick(() => {
-                    this.$refs['elForm'].resetFields();
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/poundlist/Poundlist/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        });
-                    }else{
-                       this.clearData(this.dataForm)
-                    }
-                });
-                this.$store.commit('generator/UPDATE_RELATION_DATA', {})
-            },
-            // 表单提交
-            dataFormSubmit() {
-                this.$refs['elForm'].validate((valid) => {
-                    if (valid) {
-                            this.request()
-                    }
-                })
-            },
-            request() {
-                var _data =this.dataList()
-                if (!this.dataForm.id) {
-                    request({
-                        url: '/api/poundlist/Poundlist',
-                        method: 'post',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                this.visible = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    })
-                }else{
-                    request({
-                        url: '/api/poundlist/Poundlist/'+this.dataForm.id,
-                        method: 'PUT',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                this.visible = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    })
-                }
-            },
-            dataList(){
-                var _data = JSON.parse(JSON.stringify(this.dataForm));
-                        _data.poundPictures = JSON.stringify(_data.poundPictures)
-                        _data.vehiclePictures = JSON.stringify(_data.vehiclePictures)
-                return _data;
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                        _dataAll.poundPictures = JSON.parse( _dataAll.poundPictures)
-                        _dataAll.vehiclePictures = JSON.parse( _dataAll.vehiclePictures)
-                this.dataForm = _dataAll
-            },
-        },
-    }
+	import request from '@/utils/request'
+	import {
+		getDataInterfaceRes
+	} from '@/api/systemData/dataInterface'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	export default {
+		components: {},
+		props: [],
+		data() {
+			return {
+				visible: false,
+				loading: false,
+				isDetail: false,
+				dataForm: {
+					materialCode: "",
+					materialName: '',
+					salesName: "",
+					customerName: '',
+					advance: "",
+					salesPrice: '',
+					transportType: "",
+					departmentId: 11.225,
+					licenseNo: "",
+					businessName: '',
+					poundPictures: [],
+					tareWeight: '',
+					grossWeight: '',
+					buckleWeight: '',
+					netWeight: '',
+					remark: '',
+					driverName: '',
+					vehiclePictures: [],
+					creatorusername: '',
+					supplierName: '',
+					purchaseName: "",
+					unit: "",
+					settlement: '',
+					purchasePrice: '',
+					inputDate: '',
+					outputDate: '',
+					payDate: '',
+					paymentDate: '',
+					poundDate: '',
+				},
+				rules: {
+					materialCode: [{
+						required: true,
+						message: '请选择',
+						trigger: 'change'
+					}, ],
+					salesName: [{
+						required: true,
+						message: '请选择',
+						trigger: 'change'
+					}, ],
+					licenseNo: [{
+						required: true,
+						message: '请选择',
+						trigger: 'change'
+					}, ],
+					poundPictures: [{
+						required: true,
+						message: '请至少选择一个',
+						trigger: 'click'
+					}, ],
+					tareWeight: [{
+						required: true,
+						message: '数字文本',
+						trigger: ["blur", "change"]
+					}, ],
+					grossWeight: [{
+						required: true,
+						message: '数字文本',
+						trigger: ["blur", "change"]
+					}, ],
+					buckleWeight: [{
+						required: true,
+						message: '数字文本',
+						trigger: ["blur", "change"]
+					}, ],
+					netWeight: [{
+						required: true,
+						message: '数字文本',
+						trigger: ["blur", "change"]
+					}, ],
+				},
+				materialCodecolumnOptions: [{
+					"label": "事件等级",
+					"value": "selectField121"
+				}, ],
+				salesNamecolumnOptions: [{
+					"label": "事件等级",
+					"value": "selectField121"
+				}, ],
+				advanceOptions: [{
+					"fullName": "是",
+					"id": "1"
+				}, {
+					"fullName": "否",
+					"id": "0"
+				}],
+				transportTypeOptions: [{
+					"fullName": "汽运",
+					"id": "0"
+				}, {
+					"fullName": "船运",
+					"id": "1"
+				}, {
+					"fullName": "火车",
+					"id": "2"
+				}],
+				licenseNocolumnOptions: [{
+					"label": "事件级别",
+					"value": "selectField122"
+				}, ],
+				purchaseNamecolumnOptions: [{
+					"label": "事件等级",
+					"value": "selectField121"
+				}, ],
+				unitOptions: [{
+					"fullName": "吨",
+					"id": "0"
+				}, {
+					"fullName": "千克",
+					"id": "1"
+				}],
 
+			}
+		},
+		computed: {},
+		watch: {},
+		created() {},
+		mounted() {},
+		methods: {
+			clearData(data) {
+				for (let key in data) {
+					if (data[key] instanceof Array) {
+						data[key] = [];
+					} else if (data[key] instanceof Object) {
+						this.clearData(data[key]);
+					} else {
+						data[key] = "";
+					}
+				}
+			},
+			init(id, isDetail) {
+				this.dataForm.id = id || 0;
+				this.visible = true;
+				this.isDetail = isDetail || false;
+				this.$nextTick(() => {
+					this.$refs['elForm'].resetFields();
+					if (this.dataForm.id) {
+						this.loading = true
+						request({
+							url: '/api/poundlist/Poundlist/' + this.dataForm.id,
+							method: 'get'
+						}).then(res => {
+							this.dataInfo(res.data)
+							this.loading = false
+						});
+					} else {
+						this.clearData(this.dataForm)
+					}
+				});
+				this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+			},
+			// 表单提交
+			dataFormSubmit() {
+				this.$refs['elForm'].validate((valid) => {
+					if (valid) {
+						this.request()
+					}
+				})
+			},
+			request() {
+				var _data = this.dataList()
+				if (!this.dataForm.id) {
+					request({
+						url: '/api/poundlist/Poundlist',
+						method: 'post',
+						data: _data
+					}).then((res) => {
+						this.$message({
+							message: res.msg,
+							type: 'success',
+							duration: 1000,
+							onClose: () => {
+								this.visible = false
+								this.$emit('refresh', true)
+							}
+						})
+					})
+				} else {
+					request({
+						url: '/api/poundlist/Poundlist/' + this.dataForm.id,
+						method: 'PUT',
+						data: _data
+					}).then((res) => {
+						this.$message({
+							message: res.msg,
+							type: 'success',
+							duration: 1000,
+							onClose: () => {
+								this.visible = false
+								this.$emit('refresh', true)
+							}
+						})
+					})
+				}
+			},
+			dataList() {
+				var _data = JSON.parse(JSON.stringify(this.dataForm));
+				_data.poundPictures = JSON.stringify(_data.poundPictures)
+				_data.vehiclePictures = JSON.stringify(_data.vehiclePictures)
+				return _data;
+			},
+			dataInfo(dataAll) {
+				let _dataAll = dataAll
+				_dataAll.poundPictures = JSON.parse(_dataAll.poundPictures)
+				_dataAll.vehiclePictures = JSON.parse(_dataAll.vehiclePictures)
+				this.dataForm = _dataAll
+			},
+		},
+	}
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/poundlist/index.vue b/SC-web/src/views/scm/basicInformation/poundlist/index.vue
index 4f4e1ec2..ebd19102 100644
--- a/SC-web/src/views/scm/basicInformation/poundlist/index.vue
+++ b/SC-web/src/views/scm/basicInformation/poundlist/index.vue
@@ -1,318 +1,439 @@
 <template>
-    <div class="JNPF-common-layout">
+	<div class="JNPF-common-layout">
 
-        <div class="JNPF-common-layout-center">
-            <el-row class="JNPF-common-search-box" :gutter="16">
-                <el-form @submit.native.prevent>
-                                            <el-col :span="6">
-                                <el-form-item label="物料名称">
-                                        <el-input v-model="query.materialName" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                    <el-col :span="6">
-                        <el-form-item>
-                            <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-                            <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-                        </el-form-item>
-                    </el-col>
-                </el-form>
-            </el-row>
-            <div class="JNPF-common-layout-main JNPF-flex-main">
-                <div class="JNPF-common-head">
-                    <div>
-                                    <el-button type="primary" icon="el-icon-plus"  @click="addOrUpdateHandle()">新增
-                                    </el-button>
-                                    <el-button type="text" icon="el-icon-download" @click="exportData()" >导出
-                                    </el-button>
-                                    <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" >批量删除
-                                    </el-button>
-                    </div>
-                    <div class="JNPF-common-head-right">
-                        <el-tooltip effect="dark" content="刷新" placement="top">
-                            <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                                     @click="reset()"/>
-                        </el-tooltip>
-                        <screenfull isContainer/>
-                    </div>
-                </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  has-c @selection-change="handleSelectionChange">
-                            <el-table-column prop="licenseNo" label="车号" width="0" align="left"
-/>
-                            <el-table-column prop="customerName" label="客户名称" width="0" align="left"
-/>
-                            <el-table-column prop="salesName" label="销售合同" width="0" align="left"
-/>
-                            <el-table-column prop="supplierName" label="供应商名称" width="0" align="left"
-/>
-                            <el-table-column prop="purchaseName" label="采购合同" width="0" align="left"
-/>
-                            <el-table-column prop="materialCode" label="物料编码" width="0" align="left"
-/>
-                            <el-table-column prop="materialName" label="物料名称" width="0" align="left"
-/>
-                                <el-table-column label="是否垫资" width="0" prop="advance" algin="left"
->
-                                    <template slot-scope="scope">
-                                        {{ scope.row.advance | dynamicText(advanceOptions) }}
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="单位" width="0" prop="unit" algin="left"
->
-                                    <template slot-scope="scope">
-                                        {{ scope.row.unit | dynamicText(unitOptions) }}
-                                    </template>
-                                </el-table-column>
-                            <el-table-column prop="grossWeight" label="毛重" width="0" align="left"
-/>
-                            <el-table-column prop="tareWeight" label="皮重" width="0" align="left"
-/>
-                            <el-table-column prop="buckleWeight" label="扣重" width="0" align="left"
-/>
-                            <el-table-column prop="netWeight" label="净重" width="0" align="left"
-/>
-                            <el-table-column prop="settlement" label="结算重量" width="0" align="left"
-/>
-                            <el-table-column prop="purchasePrice" label="采购单价" width="0" align="left"
-/>
-                            <el-table-column prop="salesPrice" label="销售价格" width="0" align="left"
-/>
-                            <el-table-column prop="inputDate" label="进项票日期" width="0" align="left"
-/>
-                            <el-table-column prop="outputDate" label="销项票日期" width="0" align="left"
-/>
-                            <el-table-column prop="payDate" label="付款日期" width="0" align="left"
-/>
-                            <el-table-column prop="paymentDate" label="回款日期" width="0" align="left"
-/>
-                            <el-table-column prop="poundDate" label="磅单日期" width="0" align="left"
-/>
-                            <el-table-column prop="businessName" label="业务员名称" width="0" align="left"
-/>
-                            <el-table-column prop="remark" label="备注" width="0" align="left"
-/>
-                        <el-table-column label="操作" fixed="right"
-                                         width="100" >
-                            <template slot-scope="scope">
-                                        <el-button type="text"
-                                                   @click="addOrUpdateHandle(scope.row.id)" >编辑
-                                        </el-button>
-                                        <el-button type="text" class="JNPF-table-delBtn"  @click="handleDel(scope.row.id)">删除
-                                        </el-button>
-                            </template>
-                        </el-table-column>
-                </JNPF-table>
-                    <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
-            </div>
-        </div>
-        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
-        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
-        <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
-    </div>
+		<div class="JNPF-common-layout-center">
+			<el-row class="JNPF-common-search-box" :gutter="16">
+				<el-form @submit.native.prevent>
+					<el-col :span="6">
+						<el-form-item label="物料名称">
+							<el-input v-model="query.materialName" placeholder="请输入" clearable> </el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+						</el-form-item>
+					</el-col>
+				</el-form>
+			</el-row>
+			<div class="JNPF-common-layout-main JNPF-flex-main">
+				<div class="JNPF-common-head">
+					<div>
+						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+						</el-button>
+						<el-button type="text" icon="el-icon-download" @click="exportData()">导出
+						</el-button>
+						<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+						</el-button>
+					</div>
+					<div class="JNPF-common-head-right">
+						<el-tooltip effect="dark" content="刷新" placement="top">
+							<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+								@click="reset()" />
+						</el-tooltip>
+						<screenfull isContainer />
+					</div>
+				</div>
+				<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
+					@selection-change="handleSelectionChange">
+					<el-table-column prop="licenseNo" label="车号" width="0" align="left" />
+					<el-table-column prop="customerName" label="客户名称" width="0" align="left" />
+					<el-table-column prop="salesName" label="销售合同" width="0" align="left" />
+					<el-table-column prop="supplierName" label="供应商名称" width="0" align="left" />
+					<el-table-column prop="purchaseName" label="采购合同" width="0" align="left" />
+					<el-table-column prop="materialCode" label="物料编码" width="0" align="left" />
+					<el-table-column prop="materialName" label="物料名称" width="0" align="left" />
+					<el-table-column label="是否垫资" width="0" prop="advance" algin="left">
+						<template slot-scope="scope">
+							{{ scope.row.advance | dynamicText(advanceOptions) }}
+						</template>
+					</el-table-column>
+					<el-table-column label="单位" width="0" prop="unit" algin="left">
+						<template slot-scope="scope">
+							{{ scope.row.unit | dynamicText(unitOptions) }}
+						</template>
+					</el-table-column>
+					<el-table-column prop="grossWeight" label="毛重" width="0" align="left" />
+					<el-table-column prop="tareWeight" label="皮重" width="0" align="left" />
+					<el-table-column prop="buckleWeight" label="扣重" width="0" align="left" />
+					<el-table-column prop="netWeight" label="净重" width="0" align="left" />
+					<el-table-column prop="settlement" label="结算重量" width="0" align="left" />
+					<el-table-column prop="purchasePrice" label="采购单价" width="0" align="left" />
+					<el-table-column prop="salesPrice" label="销售价格" width="0" align="left" />
+					<el-table-column prop="inputDate" label="进项票日期" width="0" align="left" />
+					<el-table-column prop="outputDate" label="销项票日期" width="0" align="left" />
+					<el-table-column prop="payDate" label="付款日期" width="0" align="left" />
+					<el-table-column prop="paymentDate" label="回款日期" width="0" align="left" />
+					<el-table-column prop="poundDate" label="磅单日期" width="0" align="left" />
+					<el-table-column prop="businessName" label="业务员" width="0" align="left" />
+					<el-table-column prop="remark" label="备注" width="0" align="left" />
+					<el-table-column prop="poundPictures" label="磅单图片" width="0" align="left">
+						<template slot-scope="scope">
+							<span v-for="(item,index) in JSON.parse(scope.row.poundPictures)" :key="index">
+								<el-popover placement="bottom" trigger="click" width="1000">
+									<img :src="`/dev${item.url}`" width="100%" />
+									<img
+										slot="reference"
+										:src="`/dev${item.url}`"
+										:alt="`/dev${item.url}`"
+										style="max-height: 70px;max-width: 70px; padding: 5px"
+									/>
+								</el-popover>
+							</span>
+						</template>
+					</el-table-column>
+					<el-table-column prop="vehiclePictures" label="车辆图片" width="0" align="left">
+						<template slot-scope="scope">
+							<span v-for="(item,index) in JSON.parse(scope.row.vehiclePictures)" :key="index">
+								<el-popover placement="bottom" trigger="click" width="1000">
+									<img :src="`/dev${item.url}`" width="100%" />
+									<img
+										slot="reference"
+										:src="`/dev${item.url}`"
+										:alt="`/dev${item.url}`"
+										style="max-height: 70px;max-width: 70px; padding: 5px"
+									/>
+								</el-popover>
+							</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="操作" fixed="right" width="100">
+						<template slot-scope="scope">
+							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
+							</el-button>
+							<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+							</el-button>
+						</template>
+					</el-table-column>
+				</JNPF-table>
+				<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+					@pagination="initData" />
+			</div>
+		</div>
+		<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
+		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+		<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
+	</div>
 </template>
 
 <script>
-    import request from '@/utils/request'
-    import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
-    import JNPFForm from './Form'
-    import ExportBox from './ExportBox'
-    import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
-    import Detail from './Detail'
+	import request from '@/utils/request'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	import JNPFForm from './Form'
+	import ExportBox from './ExportBox'
+	import {
+		getDataInterfaceRes
+	} from '@/api/systemData/dataInterface'
+	import Detail from './Detail'
 
-    export default {
-        components: {JNPFForm, ExportBox,Detail},
-        data() {
-            return {
-                detailVisible: false,
-                query: {
-                                materialName:undefined,
-                },
-                treeProps: {
-                    children: 'children',
-                    label: 'fullName',
-                    value: 'id'
-                },
-                list: [],
-                listLoading: true,
- multipleSelection: [],                    total: 0,
-                listQuery: {
-                        currentPage: 1,
-                        pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
-                },
-                formVisible: false,
-                exportBoxVisible: false,
-                columnList: [
-                    {prop: 'licenseNo', label: '车号'},
-                    {prop: 'customerName', label: '客户名称'},
-                    {prop: 'salesName', label: '销售合同'},
-                    {prop: 'supplierName', label: '供应商名称'},
-                    {prop: 'purchaseName', label: '采购合同'},
-                    {prop: 'materialCode', label: '物料编码'},
-                    {prop: 'materialName', label: '物料名称'},
-                    {prop: 'advance', label: '是否垫资'},
-                    {prop: 'unit', label: '单位'},
-                    {prop: 'grossWeight', label: '毛重'},
-                    {prop: 'tareWeight', label: '皮重'},
-                    {prop: 'buckleWeight', label: '扣重'},
-                    {prop: 'netWeight', label: '净重'},
-                    {prop: 'settlement', label: '结算重量'},
-                    {prop: 'purchasePrice', label: '采购单价'},
-                    {prop: 'salesPrice', label: '销售价格'},
-                    {prop: 'inputDate', label: '进项票日期'},
-                    {prop: 'outputDate', label: '销项票日期'},
-                    {prop: 'payDate', label: '付款日期'},
-                    {prop: 'paymentDate', label: '回款日期'},
-                    {prop: 'poundDate', label: '磅单日期'},
-                    {prop: 'businessName', label: '业务员名称'},
-                    {prop: 'remark', label: '备注'},
-                ],
-                                advanceOptions:[{"fullName":"是","id":"1"},{"fullName":"否","id":"0"}],
-                            advanceProps:{"label":"fullName","value":"id"},
-                                transportTypeOptions:[{"fullName":"汽运","id":"0"},{"fullName":"船运","id":"1"},{"fullName":"火车","id":"2"}],
-                            transportTypeProps:{"label":"fullName","value":"id"},
-                                unitOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}],
-                            unitProps:{"label":"fullName","value":"id"},
-            }
-        },
-        computed: {
-            menuId() {
-                return this.$route.meta.modelId || ''
-            }
-        },
-        created() {
-                this.initData()
-        },
-        methods: {
-            goDetail(id){
-                this.detailVisible = true
-                this.$nextTick(() => {
-                    this.$refs.Detail.init(id)
-                })
-            },
-            sortChange({column, prop, order}) {
-                this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-                this.listQuery.sidx = !order ? '' : prop
-                this.initData()
-            },
-            initData() {
-                this.listLoading = true;
-                let _query = {
-                    ...this.listQuery,
-                    ...this.query,
-                    menuId:this.menuId
-                };
-                request({
-                    url: `/api/poundlist/Poundlist/getList`,
-                    method: 'post',
-                    data: _query
-                }).then(res => {
-                    var _list =[];
-                    for(let i=0;i<res.data.list.length;i++){
-                        let _data = res.data.list[i];
-                        _list.push(_data)
-                    }
-                    this.list = _list
-                        this.total = res.data.pagination.total
+	export default {
+		components: {
+			JNPFForm,
+			ExportBox,
+			Detail
+		},
+		data() {
+			return {
+				detailVisible: false,
+				query: {
+					materialName: undefined,
+				},
+				treeProps: {
+					children: 'children',
+					label: 'fullName',
+					value: 'id'
+				},
+				list: [],
+				listLoading: true,
+				multipleSelection: [],
+				total: 0,
+				listQuery: {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				},
+				formVisible: false,
+				exportBoxVisible: false,
+				columnList: [{
+						prop: 'licenseNo',
+						label: '车号'
+					},
+					{
+						prop: 'customerName',
+						label: '客户名称'
+					},
+					{
+						prop: 'salesName',
+						label: '销售合同'
+					},
+					{
+						prop: 'supplierName',
+						label: '供应商名称'
+					},
+					{
+						prop: 'purchaseName',
+						label: '采购合同'
+					},
+					{
+						prop: 'materialCode',
+						label: '物料编码'
+					},
+					{
+						prop: 'materialName',
+						label: '物料名称'
+					},
+					{
+						prop: 'advance',
+						label: '是否垫资'
+					},
+					{
+						prop: 'unit',
+						label: '单位'
+					},
+					{
+						prop: 'grossWeight',
+						label: '毛重'
+					},
+					{
+						prop: 'tareWeight',
+						label: '皮重'
+					},
+					{
+						prop: 'buckleWeight',
+						label: '扣重'
+					},
+					{
+						prop: 'netWeight',
+						label: '净重'
+					},
+					{
+						prop: 'settlement',
+						label: '结算重量'
+					},
+					{
+						prop: 'purchasePrice',
+						label: '采购单价'
+					},
+					{
+						prop: 'salesPrice',
+						label: '销售价格'
+					},
+					{
+						prop: 'inputDate',
+						label: '进项票日期'
+					},
+					{
+						prop: 'outputDate',
+						label: '销项票日期'
+					},
+					{
+						prop: 'payDate',
+						label: '付款日期'
+					},
+					{
+						prop: 'paymentDate',
+						label: '回款日期'
+					},
+					{
+						prop: 'poundDate',
+						label: '磅单日期'
+					},
+					{
+						prop: 'businessName',
+						label: '业务员名称'
+					},
+					{
+						prop: 'remark',
+						label: '备注'
+					},
+				],
+				advanceOptions: [{
+					"fullName": "是",
+					"id": "1"
+				}, {
+					"fullName": "否",
+					"id": "0"
+				}],
+				advanceProps: {
+					"label": "fullName",
+					"value": "id"
+				},
+				transportTypeOptions: [{
+					"fullName": "汽运",
+					"id": "0"
+				}, {
+					"fullName": "船运",
+					"id": "1"
+				}, {
+					"fullName": "火车",
+					"id": "2"
+				}],
+				transportTypeProps: {
+					"label": "fullName",
+					"value": "id"
+				},
+				unitOptions: [{
+					"fullName": "吨",
+					"id": "0"
+				}, {
+					"fullName": "千克",
+					"id": "1"
+				}],
+				unitProps: {
+					"label": "fullName",
+					"value": "id"
+				},
+			}
+		},
+		computed: {
+			menuId() {
+				return this.$route.meta.modelId || ''
+			}
+		},
+		created() {
+			this.initData()
+		},
+		methods: {
+			goDetail(id) {
+				this.detailVisible = true
+				this.$nextTick(() => {
+					this.$refs.Detail.init(id)
+				})
+			},
+			sortChange({
+				column,
+				prop,
+				order
+			}) {
+				this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+				this.listQuery.sidx = !order ? '' : prop
+				this.initData()
+			},
+			initData() {
+				this.listLoading = true;
+				let _query = {
+					...this.listQuery,
+					...this.query,
+					menuId: this.menuId
+				};
+				request({
+					url: `/api/poundlist/Poundlist/getList`,
+					method: 'post',
+					data: _query
+				}).then(res => {
+					var _list = [];
+					for (let i = 0; i < res.data.list.length; i++) {
+						let _data = res.data.list[i];
+						_list.push(_data)
+					}
+					this.list = _list
+					this.total = res.data.pagination.total
 
-                    this.listLoading = false
-                })
-            },
-            handleDel(id) {
-                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    request({
-                        url: `/api/poundlist/Poundlist/${id}`,
-                        method: 'DELETE'
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => {
-                });
-            },
-                handleSelectionChange(val) {
-                    const res = val.map(item => item.id)
-                    this.multipleSelection = res
-                },
-                handleBatchRemoveDel() {
-                    if (!this.multipleSelection.length) {
-                        this.$message({
-                            type: 'error',
-                            message: '请选择一条数据',
-                            duration: 1500,
-                        })
-                        return
-                    }
-                    const ids = this.multipleSelection.join()
-                    this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-                        type: 'warning'
-                    }).then(() => {
-                        request({
-                            url: `/api/poundlist/Poundlist/batchRemove/${ids}`,
-                            method: 'DELETE'
-                        }).then(res => {
-                            this.$message({
-                                type: 'success',
-                                message: res.msg,
-                                onClose: () => {
-                                    this.initData()
-                                }
-                            });
-                        })
-                    }).catch(() => {
-                    })
-                },
-            addOrUpdateHandle(id, isDetail) {
-                this.formVisible = true
-                this.$nextTick(() => {
-                    this.$refs.JNPFForm.init(id, isDetail)
-                })
-            },
-            exportData() {
-                this.exportBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.ExportBox.init(this.columnList)
-                })
-            },
-            download(data) {
-                let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
-                request({
-                    url: `/api/poundlist/Poundlist/Actions/Export`,
-                    method: 'GET',
-                    data: query
-                }).then(res => {
-                    if (!res.data.url) return
-                    this.jnpf.downloadFile(res.data.url)
-                    this.$refs.ExportBox.visible = false
-                    this.exportBoxVisible = false
-                })
-            },
-            search() {
-                this.listQuery = {
-                        currentPage: 1,
-                        pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
-                }
-                this.initData()
-            },
-            refresh(isrRefresh) {
-                this.formVisible = false
-                if (isrRefresh) this.reset()
-            },
-            reset() {
-                for (let key in this.query) {
-                    this.query[key] = undefined
-                }
-                this.search()
-            }
-        }
-    }
+					this.listLoading = false
+				})
+			},
+			handleDel(id) {
+				this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/poundlist/Poundlist/${id}`,
+						method: 'DELETE'
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {});
+			},
+			handleSelectionChange(val) {
+				const res = val.map(item => item.id)
+				this.multipleSelection = res
+			},
+			handleBatchRemoveDel() {
+				if (!this.multipleSelection.length) {
+					this.$message({
+						type: 'error',
+						message: '请选择一条数据',
+						duration: 1500,
+					})
+					return
+				}
+				const ids = this.multipleSelection.join()
+				this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/poundlist/Poundlist/batchRemove/${ids}`,
+						method: 'DELETE'
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {})
+			},
+			addOrUpdateHandle(id, isDetail) {
+				this.formVisible = true
+				this.$nextTick(() => {
+					this.$refs.JNPFForm.init(id, isDetail)
+				})
+			},
+			exportData() {
+				this.exportBoxVisible = true
+				this.$nextTick(() => {
+					this.$refs.ExportBox.init(this.columnList)
+				})
+			},
+			download(data) {
+				let query = {
+					...data,
+					...this.listQuery,
+					...this.query,
+					menuId: this.menuId
+				}
+				request({
+					url: `/api/poundlist/Poundlist/Actions/Export`,
+					method: 'GET',
+					data: query
+				}).then(res => {
+					if (!res.data.url) return
+					this.jnpf.downloadFile(res.data.url)
+					this.$refs.ExportBox.visible = false
+					this.exportBoxVisible = false
+				})
+			},
+			search() {
+				this.listQuery = {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				}
+				this.initData()
+			},
+			refresh(isrRefresh) {
+				this.formVisible = false
+				if (isrRefresh) this.reset()
+			},
+			reset() {
+				for (let key in this.query) {
+					this.query[key] = undefined
+				}
+				this.search()
+			}
+		}
+	}
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/Form.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/Form.vue
index 739f86ef..5d815317 100644
--- a/SC-web/src/views/scm/basicInformation/purchaseorder/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/purchaseorder/Form.vue
@@ -1,467 +1,517 @@
 <template>
-<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'"
-           :close-on-click-modal="false" append-to-body
-           :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
-           width="1000px">
-<el-row :gutter="15" class="">
-<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
-    <template v-if="!loading">
-            <el-col :span="8" >
-                <el-form-item  label="单据编号"  
- prop="documentno" >
-                    <el-input    v-model="dataForm.documentno"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" append-to-body
+		:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
+		<el-row :gutter="15" class="">
+			<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px"
+				label-position="right">
+				<template v-if="!loading">
+					<el-col :span="8">
+						<el-form-item label="单据编号" prop="documentno">
+							<el-input v-model="dataForm.documentno" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="供应商名称"  
- prop="suppliername" >
-                    <el-input    v-model="dataForm.suppliername"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="供应商名称" prop="suppliername">
+							<el-input v-model="dataForm.suppliername" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="合同名称"  
- prop="contractname" >
-                    <el-input    v-model="dataForm.contractname"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="合同名称" prop="contractname">
+							<el-input v-model="dataForm.contractname" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="制单人"  
- prop="creatorusername" >
-                    <el-input    v-model="dataForm.creatorusername"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="制单人" prop="creatorusername">
+							<el-input v-model="dataForm.creatorusername" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="采购部门"  
- prop="departmentId" >
-                    <dep-select    v-model="dataForm.departmentId"
- placeholder="请选择"  clearable >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="采购部门" prop="departmentId">
+							<dep-select v-model="dataForm.departmentId" placeholder="请选择" clearable>
 
-                </dep-select>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="对方合同号"  
- prop="contractno" >
-                    <el-input    v-model="dataForm.contractno"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</dep-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="对方合同号" prop="contractno">
+							<el-input v-model="dataForm.contractno" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="数量"  
- prop="num" >
-                    <el-input-number    v-model="dataForm.num"
- placeholder="数字文本"  :step="1"  controls-position='right' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="数量" prop="num">
+							<el-input-number v-model="dataForm.num" placeholder="数字文本" :step="1"
+								controls-position='right'>
 
-                </el-input-number>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="金额"  
- prop="amount" >
-                    <el-input    v-model="dataForm.amount"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-input-number>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="金额" prop="amount">
+							<el-input v-model="dataForm.amount" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="不含税金额"  
- prop="notamount" >
-                    <el-input    v-model="dataForm.notamount"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="不含税金额" prop="notamount">
+							<el-input v-model="dataForm.notamount" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="币别 "  
- prop="currency" >
-                    <el-select    v-model="dataForm.currency"
- placeholder="请选择"  clearable  :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in currencyOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="币别 " prop="currency">
+							<el-select v-model="dataForm.currency" placeholder="请选择" clearable
+								:style='{"width":"100%"}'>
+								<el-option v-for="(item, index) in currencyOptions" :key="index" :label="item.fullName"
+									:value="item.id" :disabled="item.disabled"></el-option>
 
-                </el-select>
-                </el-form-item>
-            </el-col>
-            <el-col :span="16" >
-                <el-form-item  label="备注"  
- prop="remark" >
-                    <el-input    v-model="dataForm.remark"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="16">
+						<el-form-item label="备注" prop="remark">
+							<el-input v-model="dataForm.remark" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="ERP订单号"  
- prop="erpno" >
-                    <el-input    v-model="dataForm.erpno"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="ERP订单号" prop="erpno">
+							<el-input v-model="dataForm.erpno" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="已付款金额"  
- prop="payprice" >
-                    <el-input    v-model="dataForm.payprice"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="已付款金额" prop="payprice">
+							<el-input v-model="dataForm.payprice" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="发票数量"  
- prop="invoicenum" >
-                    <el-input    v-model="dataForm.invoicenum"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="发票数量" prop="invoicenum">
+							<el-input v-model="dataForm.invoicenum" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="发票金额"  
- prop="invoiceamount" >
-                    <el-input    v-model="dataForm.invoiceamount"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="发票金额" prop="invoiceamount">
+							<el-input v-model="dataForm.invoiceamount" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="垫资金额"  
- prop="advanceamount" >
-                    <el-input    v-model="dataForm.advanceamount"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="垫资金额" prop="advanceamount">
+							<el-input v-model="dataForm.advanceamount" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="单据状态"  
- prop="status" >
-                    <el-select    v-model="dataForm.status"
- placeholder="请选择"  clearable  :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in statusOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="单据状态" prop="status">
+							<el-select v-model="dataForm.status" placeholder="请选择" clearable :style='{"width":"100%"}'>
+								<el-option v-for="(item, index) in statusOptions" :key="index" :label="item.fullName"
+									:value="item.id" :disabled="item.disabled"></el-option>
 
-                </el-select>
-                </el-form-item>
-            </el-col>
-            <el-col :span="10" >
-                <el-form-item  label="制单时间"  
- prop="creatortime" >
-                    <el-date-picker    v-model="dataForm.creatortime"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' type="datetime"  format="yyyy-MM-dd HH:mm:ss"  value-format="timestamp" >
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="10">
+						<el-form-item label="制单时间" prop="creatortime">
+							<el-date-picker v-model="dataForm.creatortime" placeholder="请选择" clearable
+								:style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
+								value-format="timestamp">
 
-                </el-date-picker>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24">
-                <el-tabs  v-model="activebgsnko"  tab-position="top" class="mb-20">
-                <el-tab-pane  label="磅单明细">
-    <el-col :span="24"  >
-    <el-form-item label-width="0">
-            <div class="JNPF-common-title">
-                <h2></h2>
-            </div>
-    <el-table :data="dataForm.purchaseorder_item0List" size='mini'   >
-        <el-table-column type="index" width="50" label="序号" align="center" />
-            <el-table-column prop="licensenum" label="车牌号">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.licensenum"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="materialname" label="物料名称">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.materialname"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="pounttype" label="类型 ">
-                <template slot-scope="scope">
-                    <el-select   v-model="scope.row.pounttype"
- placeholder="请选择"  clearable  :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in pounttypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
-                </el-select>
-            </template>
-        </el-table-column>
-            <el-table-column prop="netweight" label="净重">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.netweight"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="unit" label="单位">
-                <template slot-scope="scope">
-                    <el-select   v-model="scope.row.unit"
- placeholder="请选择"  clearable  :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in unitOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
-                </el-select>
-            </template>
-        </el-table-column>
-            <el-table-column prop="advance" label="是否垫资">
-                <template slot-scope="scope">
-                    <el-select   v-model="scope.row.advance"
- placeholder="请选择"  clearable  :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in advanceOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
-                </el-select>
-            </template>
-        </el-table-column>
-            <el-table-column prop="price" label="单价">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.price"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="settlement" label="结算重量">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.settlement"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="rate" label="税率 ">
-                <template slot-scope="scope">
-                    <el-select   v-model="scope.row.rate"
- placeholder="请选择"  clearable  :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in rateOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
-                </el-select>
-            </template>
-        </el-table-column>
-            <el-table-column prop="amount" label="金额">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.amount"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="notamount" label="不含税金额">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.notamount"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="remark" label="备注">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.remark"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-    <el-table-column label="操作" width="50" >
-        <template slot-scope="scope">
-            <el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delpurchaseorder_item0List(scope.$index)">删除</el-button>
-        </template>
-    </el-table-column>
-    </el-table>
-    <div class="table-actions" @click="addpurchaseorder_item0List()">
-        <el-button type="text" icon="el-icon-plus">添加</el-button>
-    </div>
-    </el-form-item>
-    </el-col>
-            </el-tab-pane >
-            </el-tabs>
-                </el-col>
-    </template>
-</el-form>
-    </el-row>
-    <span slot="footer" class="dialog-footer">
-        <el-button @click="visible = false"> 取 消</el-button>
-        <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
-    </span>
-    </el-dialog>
+							</el-date-picker>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-tabs v-model="activebgsnko" tab-position="top" class="mb-20">
+							<el-tab-pane label="磅单明细">
+								<el-col :span="24">
+									<el-form-item label-width="0">
+										<div class="JNPF-common-title">
+											<h2></h2>
+										</div>
+										<el-table :data="dataForm.purchaseorder_item0List" size='mini'>
+											<el-table-column type="index" width="50" label="序号" align="center" />
+											<el-table-column prop="licensenum" label="车牌号">
+												<template slot-scope="scope">
+													<el-input v-model="scope.row.licensenum" placeholder="请输入" clearable
+														:style='{"width":"100%"}'>
+													</el-input>
+												</template>
+											</el-table-column>
+											<el-table-column prop="materialname" label="物料名称">
+												<template slot-scope="scope">
+													<el-input v-model="scope.row.materialname" placeholder="请输入"
+														clearable :style='{"width":"100%"}'>
+													</el-input>
+												</template>
+											</el-table-column>
+											<el-table-column prop="pounttype" label="类型 ">
+												<template slot-scope="scope">
+													<el-select v-model="scope.row.pounttype" placeholder="请选择" clearable
+														:style='{"width":"100%"}'>
+														<el-option v-for="(item, index) in pounttypeOptions"
+															:key="index" :label="item.fullName" :value="item.id"
+															:disabled="item.disabled"></el-option>
+													</el-select>
+												</template>
+											</el-table-column>
+											<el-table-column prop="netweight" label="净重">
+												<template slot-scope="scope">
+													<el-input v-model="scope.row.netweight" placeholder="请输入" clearable
+														:style='{"width":"100%"}'>
+													</el-input>
+												</template>
+											</el-table-column>
+											<el-table-column prop="unit" label="单位">
+												<template slot-scope="scope">
+													<el-select v-model="scope.row.unit" placeholder="请选择" clearable
+														:style='{"width":"100%"}'>
+														<el-option v-for="(item, index) in unitOptions" :key="index"
+															:label="item.fullName" :value="item.id"
+															:disabled="item.disabled"></el-option>
+													</el-select>
+												</template>
+											</el-table-column>
+											<el-table-column prop="advance" label="是否垫资">
+												<template slot-scope="scope">
+													<el-select v-model="scope.row.advance" placeholder="请选择" clearable
+														:style='{"width":"100%"}'>
+														<el-option v-for="(item, index) in advanceOptions" :key="index"
+															:label="item.fullName" :value="item.id"
+															:disabled="item.disabled"></el-option>
+													</el-select>
+												</template>
+											</el-table-column>
+											<el-table-column prop="price" label="单价">
+												<template slot-scope="scope">
+													<el-input v-model="scope.row.price" placeholder="请输入" clearable
+														:style='{"width":"100%"}'>
+													</el-input>
+												</template>
+											</el-table-column>
+											<el-table-column prop="settlement" label="结算重量">
+												<template slot-scope="scope">
+													<el-input v-model="scope.row.settlement" placeholder="请输入" clearable
+														:style='{"width":"100%"}'>
+													</el-input>
+												</template>
+											</el-table-column>
+											<el-table-column prop="rate" label="税率 ">
+												<template slot-scope="scope">
+													<el-select v-model="scope.row.rate" placeholder="请选择" clearable
+														:style='{"width":"100%"}'>
+														<el-option v-for="(item, index) in rateOptions" :key="index"
+															:label="item.fullName" :value="item.id"
+															:disabled="item.disabled"></el-option>
+													</el-select>
+												</template>
+											</el-table-column>
+											<el-table-column prop="amount" label="金额">
+												<template slot-scope="scope">
+													<el-input v-model="scope.row.amount" placeholder="请输入" clearable
+														:style='{"width":"100%"}'>
+													</el-input>
+												</template>
+											</el-table-column>
+											<el-table-column prop="notamount" label="不含税金额">
+												<template slot-scope="scope">
+													<el-input v-model="scope.row.notamount" placeholder="请输入" clearable
+														:style='{"width":"100%"}'>
+													</el-input>
+												</template>
+											</el-table-column>
+											<el-table-column prop="remark" label="备注">
+												<template slot-scope="scope">
+													<el-input v-model="scope.row.remark" placeholder="请输入" clearable
+														:style='{"width":"100%"}'>
+													</el-input>
+												</template>
+											</el-table-column>
+											<el-table-column label="操作" width="50">
+												<template slot-scope="scope">
+													<el-button size="mini" type="text" class="JNPF-table-delBtn"
+														@click="delpurchaseorder_item0List(scope.$index)">删除</el-button>
+												</template>
+											</el-table-column>
+										</el-table>
+										<div class="table-actions" @click="addpurchaseorder_item0List()">
+											<el-button type="text" icon="el-icon-plus">添加</el-button>
+										</div>
+									</el-form-item>
+								</el-col>
+							</el-tab-pane>
+						</el-tabs>
+					</el-col>
+				</template>
+			</el-form>
+		</el-row>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false"> 取 消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
+		</span>
+	</el-dialog>
 </template>
 <script>
-    import request from '@/utils/request'
-    import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-    export default {
-        components: {},
-        props: [],
-        data() {
-            return {
-                visible: false,
-                loading: false,
-                isDetail: false,
-            dataForm: {
-                            documentno : '',
-                            suppliername : '',
-                            contractname : '',
-                            creatorusername : '',
-                            departmentId : '',
-                            contractno : '',
-                            num : '',
-                            amount : '',
-                            notamount : '',
-                            currency : "",
-                            remark : '',
-                            erpno : '',
-                            payprice : '',
-                            invoicenum : '',
-                            invoiceamount : '',
-                            advanceamount : '',
-                            status : "",
-                            creatortime : '',
-                        purchaseorder_item0List:[],
-            },
-                            activebgsnko:'0',
-            rules:
-            {
-            },
-                        currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
-                        statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"开票中","id":"1"},{"fullName":"付款申请","id":"2"},{"fullName":"待付款","id":"3"},{"fullName":"付款中","id":"4"},{"fullName":"归档","id":"5"}],
+	import request from '@/utils/request'
+	import {
+		getDataInterfaceRes
+	} from '@/api/systemData/dataInterface'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	export default {
+		components: {},
+		props: [],
+		data() {
+			return {
+				visible: false,
+				loading: false,
+				isDetail: false,
+				dataForm: {
+					documentno: '',
+					suppliername: '',
+					contractname: '',
+					creatorusername: '',
+					departmentId: '',
+					contractno: '',
+					num: '',
+					amount: '',
+					notamount: '',
+					currency: "",
+					remark: '',
+					erpno: '',
+					payprice: '',
+					invoicenum: '',
+					invoiceamount: '',
+					advanceamount: '',
+					status: "",
+					creatortime: '',
+					purchaseorder_item0List: [],
+				},
+				activebgsnko: '0',
+				rules: {},
+				currencyOptions: [{
+					"fullName": "人民币",
+					"id": "0"
+				}, {
+					"fullName": "美元",
+					"id": "1"
+				}, {
+					"fullName": "英镑",
+					"id": "2"
+				}],
+				statusOptions: [{
+					"fullName": "已保存",
+					"id": "0"
+				}, {
+					"fullName": "开票中",
+					"id": "1"
+				}, {
+					"fullName": "付款申请",
+					"id": "2"
+				}, {
+					"fullName": "待付款",
+					"id": "3"
+				}, {
+					"fullName": "付款中",
+					"id": "4"
+				}, {
+					"fullName": "归档",
+					"id": "5"
+				}],
 
-                        pounttypeOptions:[{"fullName":"贸易","id":"0"},{"fullName":"其他","id":"1"}],
-                        unitOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}],
-                        advanceOptions:[{"fullName":"是","id":"1"},{"fullName":"否","id":"0"}],
-                        rateOptions:[{"fullName":"13","id":"0"},{"fullName":"9","id":"1"},{"fullName":"6","id":"2"},{"fullName":"5","id":"3"},{"fullName":"3","id":"4"},{"fullName":"0","id":"5"}],
-        }
-        },
-        computed: {},
-        watch: {},
-        created() {
-        },
-        mounted() {},
-        methods: {
-				purchaseorder_item0Exist() {
+				pounttypeOptions: [{
+					"fullName": "贸易",
+					"id": "0"
+				}, {
+					"fullName": "其他",
+					"id": "1"
+				}],
+				unitOptions: [{
+					"fullName": "吨",
+					"id": "0"
+				}, {
+					"fullName": "千克",
+					"id": "1"
+				}],
+				advanceOptions: [{
+					"fullName": "是",
+					"id": "1"
+				}, {
+					"fullName": "否",
+					"id": "0"
+				}],
+				rateOptions: [{
+					"fullName": "13",
+					"id": "0"
+				}, {
+					"fullName": "9",
+					"id": "1"
+				}, {
+					"fullName": "6",
+					"id": "2"
+				}, {
+					"fullName": "5",
+					"id": "3"
+				}, {
+					"fullName": "3",
+					"id": "4"
+				}, {
+					"fullName": "0",
+					"id": "5"
+				}],
+			}
+		},
+		computed: {},
+		watch: {},
+		created() {},
+		mounted() {},
+		methods: {
+			purchaseorder_item0Exist() {
 				let isOk = true;
-					for(let i=0;i<this.dataForm.purchaseorder_item0List.length;i++){
-						const e = this.dataForm.purchaseorder_item0List[i];
-					}
+				for (let i = 0; i < this.dataForm.purchaseorder_item0List.length; i++) {
+					const e = this.dataForm.purchaseorder_item0List[i];
+				}
 				return isOk;
 			},
-            clearData(data){
-                for (let key in data) {
-                    if (data[key] instanceof Array) {
-                        data[key] = [];
-                    } else if (data[key] instanceof Object) {
-                        this.clearData(data[key]);
-                    } else {
-                        data[key] = "";
-                    }
-                }
-            },
-            init(id, isDetail) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.isDetail = isDetail || false;
-                this.$nextTick(() => {
-                    this.$refs['elForm'].resetFields();
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/purchaseorder/Purchaseorder/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        });
-                    }else{
-                       this.clearData(this.dataForm)
-                    }
-                });
-                this.$store.commit('generator/UPDATE_RELATION_DATA', {})
-            },
-            // 表单提交
-            dataFormSubmit() {
-                this.$refs['elForm'].validate((valid) => {
-                    if (valid) {
-                            if (!this.purchaseorder_item0Exist()) return
-                            this.request()
-                    }
-                })
-            },
-            request() {
-                var _data =this.dataList()
-                if (!this.dataForm.id) {
-                    request({
-                        url: '/api/purchaseorder/Purchaseorder',
-                        method: 'post',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                this.visible = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    })
-                }else{
-                    request({
-                        url: '/api/purchaseorder/Purchaseorder/'+this.dataForm.id,
-                        method: 'PUT',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                this.visible = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    })
-                }
-            },
-                addpurchaseorder_item0List(){
-                    let item = {
-                            licensenum:undefined,
-                            materialname:undefined,
-                            pounttype:undefined,
-                            netweight:undefined,
-                            unit:undefined,
-                            advance:undefined,
-                            price:undefined,
-                            settlement:undefined,
-                            rate:undefined,
-                            amount:undefined,
-                            notamount:undefined,
-                            remark:undefined,
-                }
-                    this.dataForm.purchaseorder_item0List.push(item)
-                },
-                delpurchaseorder_item0List(index) {
-                    this.dataForm.purchaseorder_item0List.splice(index, 1);
-                },
-            dataList(){
-                var _data = JSON.parse(JSON.stringify(this.dataForm));
-                    for(let i=0;i<_data.purchaseorder_item0List.length;i++){
-                        var _list = _data.purchaseorder_item0List[i];
-                    }
-                return _data;
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                    for(let i=0;i<_dataAll.purchaseorder_item0List.length;i++){
-                        var _list = _dataAll.purchaseorder_item0List[i];
-                    }
-                this.dataForm = _dataAll
-            },
-        },
-    }
-
+			clearData(data) {
+				for (let key in data) {
+					if (data[key] instanceof Array) {
+						data[key] = [];
+					} else if (data[key] instanceof Object) {
+						this.clearData(data[key]);
+					} else {
+						data[key] = "";
+					}
+				}
+			},
+			init(id, isDetail) {
+				this.dataForm.id = id || 0;
+				this.visible = true;
+				this.isDetail = isDetail || false;
+				this.$nextTick(() => {
+					this.$refs['elForm'].resetFields();
+					if (this.dataForm.id) {
+						this.loading = true
+						request({
+							url: '/api/purchaseorder/Purchaseorder/' + this.dataForm.id,
+							method: 'get'
+						}).then(res => {
+							this.dataInfo(res.data)
+							this.loading = false
+						});
+					} else {
+						this.clearData(this.dataForm)
+					}
+				});
+				this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+			},
+			// 表单提交
+			dataFormSubmit() {
+				this.$refs['elForm'].validate((valid) => {
+					if (valid) {
+						if (!this.purchaseorder_item0Exist()) return
+						this.request()
+					}
+				})
+			},
+			request() {
+				var _data = this.dataList()
+				if (!this.dataForm.id) {
+					request({
+						url: '/api/purchaseorder/Purchaseorder',
+						method: 'post',
+						data: _data
+					}).then((res) => {
+						this.$message({
+							message: res.msg,
+							type: 'success',
+							duration: 1000,
+							onClose: () => {
+								this.visible = false
+								this.$emit('refresh', true)
+							}
+						})
+					})
+				} else {
+					request({
+						url: '/api/purchaseorder/Purchaseorder/' + this.dataForm.id,
+						method: 'PUT',
+						data: _data
+					}).then((res) => {
+						this.$message({
+							message: res.msg,
+							type: 'success',
+							duration: 1000,
+							onClose: () => {
+								this.visible = false
+								this.$emit('refresh', true)
+							}
+						})
+					})
+				}
+			},
+			addpurchaseorder_item0List() {
+				let item = {
+					licensenum: undefined,
+					materialname: undefined,
+					pounttype: undefined,
+					netweight: undefined,
+					unit: undefined,
+					advance: undefined,
+					price: undefined,
+					settlement: undefined,
+					rate: undefined,
+					amount: undefined,
+					notamount: undefined,
+					remark: undefined,
+				}
+				this.dataForm.purchaseorder_item0List.push(item)
+			},
+			delpurchaseorder_item0List(index) {
+				this.dataForm.purchaseorder_item0List.splice(index, 1);
+			},
+			dataList() {
+				var _data = JSON.parse(JSON.stringify(this.dataForm));
+				for (let i = 0; i < _data.purchaseorder_item0List.length; i++) {
+					var _list = _data.purchaseorder_item0List[i];
+				}
+				return _data;
+			},
+			dataInfo(dataAll) {
+				let _dataAll = dataAll
+				for (let i = 0; i < _dataAll.purchaseorder_item0List.length; i++) {
+					var _list = _dataAll.purchaseorder_item0List[i];
+				}
+				this.dataForm = _dataAll
+			},
+		},
+	}
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue
index c93b8014..709d3653 100644
--- a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue
+++ b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue
@@ -1,289 +1,365 @@
 <template>
-    <div class="JNPF-common-layout">
+	<div class="JNPF-common-layout">
 
-        <div class="JNPF-common-layout-center">
-            <el-row class="JNPF-common-search-box" :gutter="16">
-                <el-form @submit.native.prevent>
-                                            <el-col :span="6">
-                                <el-form-item label="单据编号">
-                                        <el-input v-model="query.documentno" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                    <el-col :span="6">
-                        <el-form-item>
-                            <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-                            <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-                        </el-form-item>
-                    </el-col>
-                </el-form>
-            </el-row>
-            <div class="JNPF-common-layout-main JNPF-flex-main">
-                <div class="JNPF-common-head">
-                    <div>
-                                    <el-button type="primary" icon="el-icon-plus"  @click="addOrUpdateHandle()">新增
-                                    </el-button>
-                                    <el-button type="text" icon="el-icon-download" @click="exportData()" >导出
-                                    </el-button>
-                                    <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" >批量删除
-                                    </el-button>
-                    </div>
-                    <div class="JNPF-common-head-right">
-                        <el-tooltip effect="dark" content="刷新" placement="top">
-                            <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                                     @click="reset()"/>
-                        </el-tooltip>
-                        <screenfull isContainer/>
-                    </div>
-                </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  has-c @selection-change="handleSelectionChange">
-                            <el-table-column prop="documentno" label="单据编号" width="0" align="left"
-/>
-                            <el-table-column prop="erpno" label="ERP订单号" width="0" align="left"
-/>
-                            <el-table-column prop="contractname" label="合同名称" width="0" align="left"
-/>
-                            <el-table-column prop="suppliername" label="供应商名称" width="0" align="left"
-/>
-                            <el-table-column prop="amount" label="金额" width="0" align="left"
-/>
-                            <el-table-column prop="num" label="数量" width="0" align="left"
-/>
-                                <el-table-column label="币别 " width="0" prop="currency" algin="left"
->
-                                    <template slot-scope="scope">
-                                        {{ scope.row.currency | dynamicText(currencyOptions) }}
-                                    </template>
-                                </el-table-column>
-                            <el-table-column prop="payprice" label="已付款金额" width="0" align="left"
-/>
-                            <el-table-column prop="invoicenum" label="发票数量" width="0" align="left"
-/>
-                            <el-table-column prop="invoiceamount" label="发票金额" width="0" align="left"
-/>
-                            <el-table-column prop="advanceamount" label="垫资金额" width="0" align="left"
-/>
-                            <el-table-column prop="creatortime" label="制单时间" width="0" align="left"
-/>
-                                <el-table-column label="单据状态" width="0" prop="status" algin="left"
->
-                                    <template slot-scope="scope">
-                                        {{ scope.row.status | dynamicText(statusOptions) }}
-                                    </template>
-                                </el-table-column>
-                            <el-table-column prop="creatorusername" label="制单人" width="0" align="left"
-/>
-                        <el-table-column label="操作" fixed="right"
-                                         width="100" >
-                            <template slot-scope="scope">
-                                        <el-button type="text"
-                                                   @click="addOrUpdateHandle(scope.row.id)" >编辑
-                                        </el-button>
-                                        <el-button type="text" class="JNPF-table-delBtn"  @click="handleDel(scope.row.id)">删除
-                                        </el-button>
-                            </template>
-                        </el-table-column>
-                </JNPF-table>
-                    <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
-            </div>
-        </div>
-        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
-        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
-        <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
-    </div>
+		<div class="JNPF-common-layout-center">
+			<el-row class="JNPF-common-search-box" :gutter="16">
+				<el-form @submit.native.prevent>
+					<el-col :span="6">
+						<el-form-item label="单据编号">
+							<el-input v-model="query.documentno" placeholder="请输入" clearable> </el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+						</el-form-item>
+					</el-col>
+				</el-form>
+			</el-row>
+			<div class="JNPF-common-layout-main JNPF-flex-main">
+				<div class="JNPF-common-head">
+					<div>
+						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+						</el-button>
+						<el-button type="text" icon="el-icon-download" @click="exportData()">导出
+						</el-button>
+						<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+						</el-button>
+					</div>
+					<div class="JNPF-common-head-right">
+						<el-tooltip effect="dark" content="刷新" placement="top">
+							<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+								@click="reset()" />
+						</el-tooltip>
+						<screenfull isContainer />
+					</div>
+				</div>
+				<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
+					@selection-change="handleSelectionChange">
+					<el-table-column prop="documentno" label="单据编号" width="0" align="left" />
+					<el-table-column prop="erpno" label="ERP订单号" width="0" align="left" />
+					<el-table-column prop="contractname" label="合同名称" width="0" align="left" />
+					<el-table-column prop="suppliername" label="供应商名称" width="0" align="left" />
+					<el-table-column prop="amount" label="金额" width="0" align="left" />
+					<el-table-column prop="num" label="数量" width="0" align="left" />
+					<el-table-column label="币别 " width="0" prop="currency" algin="left">
+						<template slot-scope="scope">
+							{{ scope.row.currency | dynamicText(currencyOptions) }}
+						</template>
+					</el-table-column>
+					<el-table-column prop="payprice" label="已付款金额" width="0" align="left" />
+					<el-table-column prop="invoicenum" label="发票数量" width="0" align="left" />
+					<el-table-column prop="invoiceamount" label="发票金额" width="0" align="left" />
+					<el-table-column prop="advanceamount" label="垫资金额" width="0" align="left" />
+					<el-table-column prop="creatortime" label="制单时间" width="0" align="left" />
+					<el-table-column label="单据状态" width="0" prop="status" algin="left">
+						<template slot-scope="scope">
+							{{ scope.row.status | dynamicText(statusOptions) }}
+						</template>
+					</el-table-column>
+					<el-table-column prop="creatorusername" label="制单人" width="0" align="left" />
+					<el-table-column label="操作" fixed="right" width="100">
+						<template slot-scope="scope">
+							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
+							</el-button>
+							<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+							</el-button>
+						</template>
+					</el-table-column>
+				</JNPF-table>
+				<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+					@pagination="initData" />
+			</div>
+		</div>
+		<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
+		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+		<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
+	</div>
 </template>
 
 <script>
-    import request from '@/utils/request'
-    import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
-    import JNPFForm from './Form'
-    import ExportBox from './ExportBox'
-    import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
-    import Detail from './Detail'
+	import request from '@/utils/request'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	import JNPFForm from './Form'
+	import ExportBox from './ExportBox'
+	import {
+		getDataInterfaceRes
+	} from '@/api/systemData/dataInterface'
+	import Detail from './Detail'
 
-    export default {
-        components: {JNPFForm, ExportBox,Detail},
-        data() {
-            return {
-                detailVisible: false,
-                query: {
-                                documentno:undefined,
-                },
-                treeProps: {
-                    children: 'children',
-                    label: 'fullName',
-                    value: 'id'
-                },
-                list: [],
-                listLoading: true,
- multipleSelection: [],                    total: 0,
-                listQuery: {
-                        currentPage: 1,
-                        pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
-                },
-                formVisible: false,
-                exportBoxVisible: false,
-                columnList: [
-                    {prop: 'documentno', label: '单据编号'},
-                    {prop: 'erpno', label: 'ERP订单号'},
-                    {prop: 'contractname', label: '合同名称'},
-                    {prop: 'suppliername', label: '供应商名称'},
-                    {prop: 'amount', label: '金额'},
-                    {prop: 'num', label: '数量'},
-                    {prop: 'currency', label: '币别 '},
-                    {prop: 'payprice', label: '已付款金额'},
-                    {prop: 'invoicenum', label: '发票数量'},
-                    {prop: 'invoiceamount', label: '发票金额'},
-                    {prop: 'advanceamount', label: '垫资金额'},
-                    {prop: 'creatortime', label: '制单时间'},
-                    {prop: 'status', label: '单据状态'},
-                    {prop: 'creatorusername', label: '制单人'},
-                ],
-                                currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
-                            currencyProps:{"label":"fullName","value":"id"},
-                                statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"开票中","id":"1"},{"fullName":"付款申请","id":"2"},{"fullName":"待付款","id":"3"},{"fullName":"付款中","id":"4"},{"fullName":"归档","id":"5"}],
-                            statusProps:{"label":"fullName","value":"id"},
-            }
-        },
-        computed: {
-            menuId() {
-                return this.$route.meta.modelId || ''
-            }
-        },
-        created() {
-                this.initData()
-        },
-        methods: {
-            goDetail(id){
-                this.detailVisible = true
-                this.$nextTick(() => {
-                    this.$refs.Detail.init(id)
-                })
-            },
-            sortChange({column, prop, order}) {
-                this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-                this.listQuery.sidx = !order ? '' : prop
-                this.initData()
-            },
-            initData() {
-                this.listLoading = true;
-                let _query = {
-                    ...this.listQuery,
-                    ...this.query,
-                    menuId:this.menuId
-                };
-                request({
-                    url: `/api/purchaseorder/Purchaseorder/getList`,
-                    method: 'post',
-                    data: _query
-                }).then(res => {
-                    var _list =[];
-                    for(let i=0;i<res.data.list.length;i++){
-                        let _data = res.data.list[i];
-                        _list.push(_data)
-                    }
-                    this.list = _list
-                        this.total = res.data.pagination.total
+	export default {
+		components: {
+			JNPFForm,
+			ExportBox,
+			Detail
+		},
+		data() {
+			return {
+				detailVisible: false,
+				query: {
+					documentno: undefined,
+				},
+				treeProps: {
+					children: 'children',
+					label: 'fullName',
+					value: 'id'
+				},
+				list: [],
+				listLoading: true,
+				multipleSelection: [],
+				total: 0,
+				listQuery: {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				},
+				formVisible: false,
+				exportBoxVisible: false,
+				columnList: [{
+						prop: 'documentno',
+						label: '单据编号'
+					},
+					{
+						prop: 'erpno',
+						label: 'ERP订单号'
+					},
+					{
+						prop: 'contractname',
+						label: '合同名称'
+					},
+					{
+						prop: 'suppliername',
+						label: '供应商名称'
+					},
+					{
+						prop: 'amount',
+						label: '金额'
+					},
+					{
+						prop: 'num',
+						label: '数量'
+					},
+					{
+						prop: 'currency',
+						label: '币别 '
+					},
+					{
+						prop: 'payprice',
+						label: '已付款金额'
+					},
+					{
+						prop: 'invoicenum',
+						label: '发票数量'
+					},
+					{
+						prop: 'invoiceamount',
+						label: '发票金额'
+					},
+					{
+						prop: 'advanceamount',
+						label: '垫资金额'
+					},
+					{
+						prop: 'creatortime',
+						label: '制单时间'
+					},
+					{
+						prop: 'status',
+						label: '单据状态'
+					},
+					{
+						prop: 'creatorusername',
+						label: '制单人'
+					},
+				],
+				currencyOptions: [{
+					"fullName": "人民币",
+					"id": "0"
+				}, {
+					"fullName": "美元",
+					"id": "1"
+				}, {
+					"fullName": "英镑",
+					"id": "2"
+				}],
+				currencyProps: {
+					"label": "fullName",
+					"value": "id"
+				},
+				statusOptions: [{
+					"fullName": "已保存",
+					"id": "0"
+				}, {
+					"fullName": "开票中",
+					"id": "1"
+				}, {
+					"fullName": "付款申请",
+					"id": "2"
+				}, {
+					"fullName": "待付款",
+					"id": "3"
+				}, {
+					"fullName": "付款中",
+					"id": "4"
+				}, {
+					"fullName": "归档",
+					"id": "5"
+				}],
+				statusProps: {
+					"label": "fullName",
+					"value": "id"
+				},
+			}
+		},
+		computed: {
+			menuId() {
+				return this.$route.meta.modelId || ''
+			}
+		},
+		created() {
+			this.initData()
+		},
+		methods: {
+			goDetail(id) {
+				this.detailVisible = true
+				this.$nextTick(() => {
+					this.$refs.Detail.init(id)
+				})
+			},
+			sortChange({
+				column,
+				prop,
+				order
+			}) {
+				this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+				this.listQuery.sidx = !order ? '' : prop
+				this.initData()
+			},
+			initData() {
+				this.listLoading = true;
+				let _query = {
+					...this.listQuery,
+					...this.query,
+					menuId: this.menuId
+				};
+				request({
+					url: `/api/purchaseorder/Purchaseorder/getList`,
+					method: 'post',
+					data: _query
+				}).then(res => {
+					var _list = [];
+					for (let i = 0; i < res.data.list.length; i++) {
+						let _data = res.data.list[i];
+						_list.push(_data)
+					}
+					this.list = _list
+					this.total = res.data.pagination.total
 
-                    this.listLoading = false
-                })
-            },
-            handleDel(id) {
-                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    request({
-                        url: `/api/purchaseorder/Purchaseorder/${id}`,
-                        method: 'DELETE'
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => {
-                });
-            },
-                handleSelectionChange(val) {
-                    const res = val.map(item => item.id)
-                    this.multipleSelection = res
-                },
-                handleBatchRemoveDel() {
-                    if (!this.multipleSelection.length) {
-                        this.$message({
-                            type: 'error',
-                            message: '请选择一条数据',
-                            duration: 1500,
-                        })
-                        return
-                    }
-                    const ids = this.multipleSelection.join()
-                    this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-                        type: 'warning'
-                    }).then(() => {
-                        request({
-                            url: `/api/purchaseorder/Purchaseorder/batchRemove/${ids}`,
-                            method: 'DELETE'
-                        }).then(res => {
-                            this.$message({
-                                type: 'success',
-                                message: res.msg,
-                                onClose: () => {
-                                    this.initData()
-                                }
-                            });
-                        })
-                    }).catch(() => {
-                    })
-                },
-            addOrUpdateHandle(id, isDetail) {
-                this.formVisible = true
-                this.$nextTick(() => {
-                    this.$refs.JNPFForm.init(id, isDetail)
-                })
-            },
-            exportData() {
-                this.exportBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.ExportBox.init(this.columnList)
-                })
-            },
-            download(data) {
-                let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
-                request({
-                    url: `/api/purchaseorder/Purchaseorder/Actions/Export`,
-                    method: 'GET',
-                    data: query
-                }).then(res => {
-                    if (!res.data.url) return
-                    this.jnpf.downloadFile(res.data.url)
-                    this.$refs.ExportBox.visible = false
-                    this.exportBoxVisible = false
-                })
-            },
-            search() {
-                this.listQuery = {
-                        currentPage: 1,
-                        pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
-                }
-                this.initData()
-            },
-            refresh(isrRefresh) {
-                this.formVisible = false
-                if (isrRefresh) this.reset()
-            },
-            reset() {
-                for (let key in this.query) {
-                    this.query[key] = undefined
-                }
-                this.search()
-            }
-        }
-    }
+					this.listLoading = false
+				})
+			},
+			handleDel(id) {
+				this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/purchaseorder/Purchaseorder/${id}`,
+						method: 'DELETE'
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {});
+			},
+			handleSelectionChange(val) {
+				const res = val.map(item => item.id)
+				this.multipleSelection = res
+			},
+			handleBatchRemoveDel() {
+				if (!this.multipleSelection.length) {
+					this.$message({
+						type: 'error',
+						message: '请选择一条数据',
+						duration: 1500,
+					})
+					return
+				}
+				const ids = this.multipleSelection.join()
+				this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/purchaseorder/Purchaseorder/batchRemove/${ids}`,
+						method: 'DELETE'
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {})
+			},
+			addOrUpdateHandle(id, isDetail) {
+				this.formVisible = true
+				this.$nextTick(() => {
+					this.$refs.JNPFForm.init(id, isDetail)
+				})
+			},
+			exportData() {
+				this.exportBoxVisible = true
+				this.$nextTick(() => {
+					this.$refs.ExportBox.init(this.columnList)
+				})
+			},
+			download(data) {
+				let query = {
+					...data,
+					...this.listQuery,
+					...this.query,
+					menuId: this.menuId
+				}
+				request({
+					url: `/api/purchaseorder/Purchaseorder/Actions/Export`,
+					method: 'GET',
+					data: query
+				}).then(res => {
+					if (!res.data.url) return
+					this.jnpf.downloadFile(res.data.url)
+					this.$refs.ExportBox.visible = false
+					this.exportBoxVisible = false
+				})
+			},
+			search() {
+				this.listQuery = {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				}
+				this.initData()
+			},
+			refresh(isrRefresh) {
+				this.formVisible = false
+				if (isrRefresh) this.reset()
+			},
+			reset() {
+				for (let key in this.query) {
+					this.query[key] = undefined
+				}
+				this.search()
+			}
+		}
+	}
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/reservoirarea/Form.vue b/SC-web/src/views/scm/basicInformation/reservoirarea/Form.vue
index 59f6d90e..efef62aa 100644
--- a/SC-web/src/views/scm/basicInformation/reservoirarea/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/reservoirarea/Form.vue
@@ -1,274 +1,270 @@
 <template>
-<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'"
-           :close-on-click-modal="false" append-to-body
-           :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
-           width="600px">
-<el-row :gutter="15" class="">
-<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
-    <template v-if="!loading">
-            <el-col :span="24" >
-                <el-form-item  label="库区编码"
- prop="areacode" >
-                    <el-input    v-model="dataForm.areacode"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" append-to-body
+		:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
+		<el-row :gutter="15" class="">
+			<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px"
+				label-position="right">
+				<template v-if="!loading">
+					<el-col :span="24">
+						<el-form-item label="库区编码" prop="areacode">
+							<el-input v-model="dataForm.areacode" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="库区名称"
- prop="areaname" >
-                    <el-input    v-model="dataForm.areaname"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="库区名称" prop="areaname">
+							<el-input v-model="dataForm.areaname" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="最高库存"
- prop="maximum" >
-                    <el-input-number    v-model="dataForm.maximum"
- placeholder="数字文本"  :step="1" >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="最高库存" prop="maximum">
+							<el-input-number v-model="dataForm.maximum" placeholder="数字文本" :step="1">
 
-                </el-input-number>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="安全库存"
- prop="safety" >
-                    <el-input-number    v-model="dataForm.safety"
- placeholder="数字文本"  :step="1" >
+							</el-input-number>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="安全库存" prop="safety">
+							<el-input-number v-model="dataForm.safety" placeholder="数字文本" :step="1">
 
-                </el-input-number>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="最低库存"
- prop="minimum" >
-                    <el-input-number    v-model="dataForm.minimum"
- placeholder="数字文本"  :step="1" >
+							</el-input-number>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="最低库存" prop="minimum">
+							<el-input-number v-model="dataForm.minimum" placeholder="数字文本" :step="1">
 
-                </el-input-number>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="计量单位"
- prop="unit" >
-                    <el-select    v-model="dataForm.unit"
- placeholder="请选择"  clearable  :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in unitOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
+							</el-input-number>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="计量单位" prop="unit">
+							<el-select v-model="dataForm.unit" placeholder="请选择" clearable :style='{"width":"100%"}'>
+								<el-option v-for="(item, index) in unitOptions" :key="index" :label="item.fullName"
+									:value="item.id" :disabled="item.disabled"></el-option>
 
-                </el-select>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="仓库"
- prop="warehouseId" >
-                    <popupSelect   v-model="dataForm.warehouseId"
- placeholder="请选择"  clearable  field="warehouseId" interfaceId="380988259175524165"  :columnOptions="warehouseIdcolumnOptions" propsValue="id" relationField="name" popupType="dialog"
-	popupTitle="选择数据"  popupWidth="800px">
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="仓库" prop="warehouseId">
+							<popupSelect v-model="dataForm.warehouseId" placeholder="请选择" clearable field="warehouseId"
+								interfaceId="380988259175524165" :columnOptions="warehouseIdcolumnOptions"
+								propsValue="id" relationField="name" popupType="dialog" popupTitle="选择数据"
+								popupWidth="800px">
 
-                </popupSelect >
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="组织"
- prop="orgnizeId" >
-                    <com-select    v-model="dataForm.orgnizeId"
- placeholder="请选择"  clearable >
+							</popupSelect>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="组织" prop="orgnizeId">
+							<com-select v-model="dataForm.orgnizeId" placeholder="请选择" clearable>
 
-                </com-select>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="部门"
- prop="departmentId" >
-                    <dep-select    v-model="dataForm.departmentId"
- placeholder="请选择"  clearable >
+							</com-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="部门" prop="departmentId">
+							<dep-select v-model="dataForm.departmentId" placeholder="请选择" clearable>
 
-                </dep-select>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="创建时间"
- prop="creatortime" >
-                    <el-date-picker    v-model="dataForm.creatortime"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' type="datetime"  format="yyyy-MM-dd HH:mm:ss"  value-format="timestamp" >
+							</dep-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="创建时间" prop="creatortime">
+							<el-date-picker v-model="dataForm.creatortime" placeholder="请选择" clearable
+								:style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
+								value-format="timestamp">
 
-                </el-date-picker>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="创建人名称"
- prop="creatorusername" >
-                    <el-input    v-model="dataForm.creatorusername"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-date-picker>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="创建人名称" prop="creatorusername">
+							<el-input v-model="dataForm.creatorusername" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="修改时间"
- prop="lastmodifytime" >
-                    <el-date-picker    v-model="dataForm.lastmodifytime"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' type="datetime"  format="yyyy-MM-dd HH:mm:ss"  value-format="timestamp" >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="修改时间" prop="lastmodifytime">
+							<el-date-picker v-model="dataForm.lastmodifytime" placeholder="请选择" clearable
+								:style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
+								value-format="timestamp">
 
-                </el-date-picker>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="修改人名称"
- prop="lastmodifyusername" >
-                    <el-input    v-model="dataForm.lastmodifyusername"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-date-picker>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="修改人名称" prop="lastmodifyusername">
+							<el-input v-model="dataForm.lastmodifyusername" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-    </template>
-</el-form>
-    </el-row>
-    <span slot="footer" class="dialog-footer">
-        <el-button @click="visible = false"> 取 消</el-button>
-        <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
-    </span>
-    </el-dialog>
+							</el-input>
+						</el-form-item>
+					</el-col>
+				</template>
+			</el-form>
+		</el-row>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false"> 取 消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
+		</span>
+	</el-dialog>
 </template>
 <script>
-    import request from '@/utils/request'
-    import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-    export default {
-        components: {},
-        props: [],
-        data() {
-            return {
-                visible: false,
-                loading: false,
-                isDetail: false,
-            dataForm: {
-                            areacode : '',
-                            areaname : '',
-                            maximum : 1,
-                            safety : 1,
-                            minimum : 1,
-                            unit : "",
-                            warehouseId : "",
-                            orgnizeId : '',
-                            departmentId : '',
-                            creatortime : '',
-                            creatorusername : '',
-                            lastmodifytime : '',
-                            lastmodifyusername : '',
-            },
-            rules:
-            {
-              areacode: [
-                {
-                  required: true,
-                  message: '请输入',
-                  trigger: 'blur'
-                },
-              ],
-            },
-                        unitOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}],
-                    warehouseIdcolumnOptions:[ {"label":"ID","value":"id"}, {"label":"仓库号","value":"code"}, {"label":"仓库名称","value":"name"},],
-
-        }
-        },
-        computed: {},
-        watch: {},
-        created() {
-        },
-        mounted() {},
-        methods: {
-            clearData(data){
-                for (let key in data) {
-                    if (data[key] instanceof Array) {
-                        data[key] = [];
-                    } else if (data[key] instanceof Object) {
-                        this.clearData(data[key]);
-                    } else {
-                        data[key] = "";
-                    }
-                }
-            },
-            init(id, isDetail) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.isDetail = isDetail || false;
-                this.$nextTick(() => {
-                    this.$refs['elForm'].resetFields();
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/reservoirarea/Reservoirarea/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        });
-                    }else{
-                       this.clearData(this.dataForm)
-                    }
-                });
-                this.$store.commit('generator/UPDATE_RELATION_DATA', {})
-            },
-            // 表单提交
-            dataFormSubmit() {
-                this.$refs['elForm'].validate((valid) => {
-                    if (valid) {
-                            this.request()
-                    }
-                })
-            },
-            request() {
-                var _data =this.dataList()
-                if (!this.dataForm.id) {
-                    request({
-                        url: '/api/reservoirarea/Reservoirarea',
-                        method: 'post',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                this.visible = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    })
-                }else{
-                    request({
-                        url: '/api/reservoirarea/Reservoirarea/'+this.dataForm.id,
-                        method: 'PUT',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                this.visible = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    })
-                }
-            },
-            dataList(){
-                var _data = JSON.parse(JSON.stringify(this.dataForm));
-                        _data.orgnizeId = JSON.stringify(_data.orgnizeId)
-                return _data;
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                        _dataAll.orgnizeId = JSON.parse( _dataAll.orgnizeId)
-                this.dataForm = _dataAll
-            },
-        },
-    }
+	import request from '@/utils/request'
+	import {
+		getDataInterfaceRes
+	} from '@/api/systemData/dataInterface'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	export default {
+		components: {},
+		props: [],
+		data() {
+			return {
+				visible: false,
+				loading: false,
+				isDetail: false,
+				dataForm: {
+					areacode: '',
+					areaname: '',
+					maximum: 1,
+					safety: 1,
+					minimum: 1,
+					unit: "",
+					warehouseId: "",
+					orgnizeId: '',
+					departmentId: '',
+					creatortime: '',
+					creatorusername: '',
+					lastmodifytime: '',
+					lastmodifyusername: '',
+				},
+				rules: {
+					areacode: [{
+						required: true,
+						message: '请输入',
+						trigger: 'blur'
+					}, ],
+				},
+				unitOptions: [{
+					"fullName": "吨",
+					"id": "0"
+				}, {
+					"fullName": "千克",
+					"id": "1"
+				}],
+				warehouseIdcolumnOptions: [{
+					"label": "ID",
+					"value": "id"
+				}, {
+					"label": "仓库号",
+					"value": "code"
+				}, {
+					"label": "仓库名称",
+					"value": "name"
+				}, ],
 
+			}
+		},
+		computed: {},
+		watch: {},
+		created() {},
+		mounted() {},
+		methods: {
+			clearData(data) {
+				for (let key in data) {
+					if (data[key] instanceof Array) {
+						data[key] = [];
+					} else if (data[key] instanceof Object) {
+						this.clearData(data[key]);
+					} else {
+						data[key] = "";
+					}
+				}
+			},
+			init(id, isDetail) {
+				this.dataForm.id = id || 0;
+				this.visible = true;
+				this.isDetail = isDetail || false;
+				this.$nextTick(() => {
+					this.$refs['elForm'].resetFields();
+					if (this.dataForm.id) {
+						this.loading = true
+						request({
+							url: '/api/reservoirarea/Reservoirarea/' + this.dataForm.id,
+							method: 'get'
+						}).then(res => {
+							this.dataInfo(res.data)
+							this.loading = false
+						});
+					} else {
+						this.clearData(this.dataForm)
+					}
+				});
+				this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+			},
+			// 表单提交
+			dataFormSubmit() {
+				this.$refs['elForm'].validate((valid) => {
+					if (valid) {
+						this.request()
+					}
+				})
+			},
+			request() {
+				var _data = this.dataList()
+				if (!this.dataForm.id) {
+					request({
+						url: '/api/reservoirarea/Reservoirarea',
+						method: 'post',
+						data: _data
+					}).then((res) => {
+						this.$message({
+							message: res.msg,
+							type: 'success',
+							duration: 1000,
+							onClose: () => {
+								this.visible = false
+								this.$emit('refresh', true)
+							}
+						})
+					})
+				} else {
+					request({
+						url: '/api/reservoirarea/Reservoirarea/' + this.dataForm.id,
+						method: 'PUT',
+						data: _data
+					}).then((res) => {
+						this.$message({
+							message: res.msg,
+							type: 'success',
+							duration: 1000,
+							onClose: () => {
+								this.visible = false
+								this.$emit('refresh', true)
+							}
+						})
+					})
+				}
+			},
+			dataList() {
+				var _data = JSON.parse(JSON.stringify(this.dataForm));
+				_data.orgnizeId = JSON.stringify(_data.orgnizeId)
+				return _data;
+			},
+			dataInfo(dataAll) {
+				let _dataAll = dataAll
+				_dataAll.orgnizeId = JSON.parse(_dataAll.orgnizeId)
+				this.dataForm = _dataAll
+			},
+		},
+	}
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/reservoirarea/index.vue b/SC-web/src/views/scm/basicInformation/reservoirarea/index.vue
index 4774a11c..a5854afa 100644
--- a/SC-web/src/views/scm/basicInformation/reservoirarea/index.vue
+++ b/SC-web/src/views/scm/basicInformation/reservoirarea/index.vue
@@ -1,286 +1,336 @@
 <template>
-    <div class="JNPF-common-layout">
+	<div class="JNPF-common-layout">
 
-        <div class="JNPF-common-layout-center">
-            <el-row class="JNPF-common-search-box" :gutter="16">
-                <el-form @submit.native.prevent>
-                                            <el-col :span="6">
-                                <el-form-item label="库区编码">
-                                        <el-input v-model="query.areacode" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                        <el-col :span="6">
-                                <el-form-item label="库区名称">
-                                        <el-input v-model="query.areaname" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                    <el-col :span="6">
-                        <el-form-item>
-                            <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-                            <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-                        </el-form-item>
-                    </el-col>
-                </el-form>
-            </el-row>
-            <div class="JNPF-common-layout-main JNPF-flex-main">
-                <div class="JNPF-common-head">
-                    <div>
-                                    <el-button type="primary" icon="el-icon-plus"  @click="addOrUpdateHandle()">新增
-                                    </el-button>
-                                    <el-button type="text" icon="el-icon-download" @click="exportData()" >导出
-                                    </el-button>
-                                    <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" >批量删除
-                                    </el-button>
-                    </div>
-                    <div class="JNPF-common-head-right">
-                        <el-tooltip effect="dark" content="刷新" placement="top">
-                            <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                                     @click="reset()"/>
-                        </el-tooltip>
-                        <screenfull isContainer/>
-                    </div>
-                </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  has-c @selection-change="handleSelectionChange">
-                            <el-table-column prop="areacode" label="库区编码" width="0" align="left"
-/>
-                            <el-table-column prop="areaname" label="库区名称" width="0" align="left"
-/>
-                            <el-table-column prop="maximum" label="最高库存" width="0" align="left"
-/>
-                            <el-table-column prop="safety" label="安全库存" width="0" align="left"
-/>
-                            <el-table-column prop="minimum" label="最低库存" width="0" align="left"
-/>
-                                <el-table-column label="计量单位" width="0" prop="unit" algin="left"
->
-                                    <template slot-scope="scope">
-                                        {{ scope.row.unit | dynamicText(unitOptions) }}
-                                    </template>
-                                </el-table-column>
-                            <el-table-column prop="warehouseId" label="仓库" width="0" align="left"
-/>
-                            <el-table-column prop="orgnizeId" label="组织" width="0" align="left"
-/>
-                            <el-table-column prop="departmentId" label="部门" width="0" align="left"
-/>
-                            <el-table-column prop="creatortime" label="创建时间" width="0" align="left"
-/>
-                            <el-table-column prop="creatorusername" label="创建人名称" width="0" align="left"
-/>
-                            <el-table-column prop="lastmodifytime" label="修改时间" width="0" align="left"
-/>
-                            <el-table-column prop="lastmodifyusername" label="修改人名称" width="0" align="left"
-/>
-                        <el-table-column label="操作" fixed="right"
-                                         width="100" >
-                            <template slot-scope="scope">
-                                        <el-button type="text"
-                                                   @click="addOrUpdateHandle(scope.row.id)" >编辑
-                                        </el-button>
-                                        <el-button type="text" class="JNPF-table-delBtn"  @click="handleDel(scope.row.id)">删除
-                                        </el-button>
-                            </template>
-                        </el-table-column>
-                </JNPF-table>
-                    <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
-            </div>
-        </div>
-        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
-        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
-        <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
-    </div>
+		<div class="JNPF-common-layout-center">
+			<el-row class="JNPF-common-search-box" :gutter="16">
+				<el-form @submit.native.prevent>
+					<el-col :span="6">
+						<el-form-item label="库区编码">
+							<el-input v-model="query.areacode" placeholder="请输入" clearable> </el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="库区名称">
+							<el-input v-model="query.areaname" placeholder="请输入" clearable> </el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+						</el-form-item>
+					</el-col>
+				</el-form>
+			</el-row>
+			<div class="JNPF-common-layout-main JNPF-flex-main">
+				<div class="JNPF-common-head">
+					<div>
+						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+						</el-button>
+						<el-button type="text" icon="el-icon-download" @click="exportData()">导出
+						</el-button>
+						<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+						</el-button>
+					</div>
+					<div class="JNPF-common-head-right">
+						<el-tooltip effect="dark" content="刷新" placement="top">
+							<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+								@click="reset()" />
+						</el-tooltip>
+						<screenfull isContainer />
+					</div>
+				</div>
+				<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
+					@selection-change="handleSelectionChange">
+					<el-table-column prop="areacode" label="库区编码" width="0" align="left" />
+					<el-table-column prop="areaname" label="库区名称" width="0" align="left" />
+					<el-table-column prop="maximum" label="最高库存" width="0" align="left" />
+					<el-table-column prop="safety" label="安全库存" width="0" align="left" />
+					<el-table-column prop="minimum" label="最低库存" width="0" align="left" />
+					<el-table-column label="计量单位" width="0" prop="unit" algin="left">
+						<template slot-scope="scope">
+							{{ scope.row.unit | dynamicText(unitOptions) }}
+						</template>
+					</el-table-column>
+					<el-table-column prop="warehouseId" label="仓库" width="0" align="left" />
+					<el-table-column prop="orgnizeId" label="组织" width="0" align="left" />
+					<el-table-column prop="departmentId" label="部门" width="0" align="left" />
+					<el-table-column prop="creatortime" label="创建时间" width="0" align="left" />
+					<el-table-column prop="creatorusername" label="创建人名称" width="0" align="left" />
+					<el-table-column prop="lastmodifytime" label="修改时间" width="0" align="left" />
+					<el-table-column prop="lastmodifyusername" label="修改人名称" width="0" align="left" />
+					<el-table-column label="操作" fixed="right" width="100">
+						<template slot-scope="scope">
+							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
+							</el-button>
+							<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+							</el-button>
+						</template>
+					</el-table-column>
+				</JNPF-table>
+				<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+					@pagination="initData" />
+			</div>
+		</div>
+		<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
+		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+		<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
+	</div>
 </template>
 
 <script>
-    import request from '@/utils/request'
-    import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
-    import JNPFForm from './Form'
-    import ExportBox from './ExportBox'
-    import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
-    import Detail from './Detail'
+	import request from '@/utils/request'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	import JNPFForm from './Form'
+	import ExportBox from './ExportBox'
+	import {
+		getDataInterfaceRes
+	} from '@/api/systemData/dataInterface'
+	import Detail from './Detail'
 
-    export default {
-        components: {JNPFForm, ExportBox,Detail},
-        data() {
-            return {
-                detailVisible: false,
-                query: {
-                                areacode:undefined,
-                                areaname:undefined,
-                },
-                treeProps: {
-                    children: 'children',
-                    label: 'fullName',
-                    value: 'id'
-                },
-                list: [],
-                listLoading: true,
- multipleSelection: [],                    total: 0,
-                listQuery: {
-                        currentPage: 1,
-                        pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
-                },
-                formVisible: false,
-                exportBoxVisible: false,
-                columnList: [
-                    {prop: 'areacode', label: '库区编码'},
-                    {prop: 'areaname', label: '库区名称'},
-                    {prop: 'maximum', label: '最高库存'},
-                    {prop: 'safety', label: '安全库存'},
-                    {prop: 'minimum', label: '最低库存'},
-                    {prop: 'unit', label: '计量单位'},
-                    {prop: 'warehouseId', label: '仓库'},
-                    {prop: 'orgnizeId', label: '组织'},
-                    {prop: 'departmentId', label: '部门'},
-                    {prop: 'creatortime', label: '创建时间'},
-                    {prop: 'creatorusername', label: '创建人名称'},
-                    {prop: 'lastmodifytime', label: '修改时间'},
-                    {prop: 'lastmodifyusername', label: '修改人名称'},
-                ],
-                                unitOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}],
-                            unitProps:{"label":"fullName","value":"id"},
-            }
-        },
-        computed: {
-            menuId() {
-                return this.$route.meta.modelId || ''
-            }
-        },
-        created() {
-                this.initData()
-        },
-        methods: {
-            goDetail(id){
-                this.detailVisible = true
-                this.$nextTick(() => {
-                    this.$refs.Detail.init(id)
-                })
-            },
-            sortChange({column, prop, order}) {
-                this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-                this.listQuery.sidx = !order ? '' : prop
-                this.initData()
-            },
-            initData() {
-                this.listLoading = true;
-                let _query = {
-                    ...this.listQuery,
-                    ...this.query,
-                    menuId:this.menuId
-                };
-                request({
-                    url: `/api/reservoirarea/Reservoirarea/getList`,
-                    method: 'post',
-                    data: _query
-                }).then(res => {
-                    var _list =[];
-                    for(let i=0;i<res.data.list.length;i++){
-                        let _data = res.data.list[i];
-                        _list.push(_data)
-                    }
-                    this.list = _list
-                        this.total = res.data.pagination.total
+	export default {
+		components: {
+			JNPFForm,
+			ExportBox,
+			Detail
+		},
+		data() {
+			return {
+				detailVisible: false,
+				query: {
+					areacode: undefined,
+					areaname: undefined,
+				},
+				treeProps: {
+					children: 'children',
+					label: 'fullName',
+					value: 'id'
+				},
+				list: [],
+				listLoading: true,
+				multipleSelection: [],
+				total: 0,
+				listQuery: {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				},
+				formVisible: false,
+				exportBoxVisible: false,
+				columnList: [{
+						prop: 'areacode',
+						label: '库区编码'
+					},
+					{
+						prop: 'areaname',
+						label: '库区名称'
+					},
+					{
+						prop: 'maximum',
+						label: '最高库存'
+					},
+					{
+						prop: 'safety',
+						label: '安全库存'
+					},
+					{
+						prop: 'minimum',
+						label: '最低库存'
+					},
+					{
+						prop: 'unit',
+						label: '计量单位'
+					},
+					{
+						prop: 'warehouseId',
+						label: '仓库'
+					},
+					{
+						prop: 'orgnizeId',
+						label: '组织'
+					},
+					{
+						prop: 'departmentId',
+						label: '部门'
+					},
+					{
+						prop: 'creatortime',
+						label: '创建时间'
+					},
+					{
+						prop: 'creatorusername',
+						label: '创建人名称'
+					},
+					{
+						prop: 'lastmodifytime',
+						label: '修改时间'
+					},
+					{
+						prop: 'lastmodifyusername',
+						label: '修改人名称'
+					},
+				],
+				unitOptions: [{
+					"fullName": "吨",
+					"id": "0"
+				}, {
+					"fullName": "千克",
+					"id": "1"
+				}],
+				unitProps: {
+					"label": "fullName",
+					"value": "id"
+				},
+			}
+		},
+		computed: {
+			menuId() {
+				return this.$route.meta.modelId || ''
+			}
+		},
+		created() {
+			this.initData()
+		},
+		methods: {
+			goDetail(id) {
+				this.detailVisible = true
+				this.$nextTick(() => {
+					this.$refs.Detail.init(id)
+				})
+			},
+			sortChange({
+				column,
+				prop,
+				order
+			}) {
+				this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+				this.listQuery.sidx = !order ? '' : prop
+				this.initData()
+			},
+			initData() {
+				this.listLoading = true;
+				let _query = {
+					...this.listQuery,
+					...this.query,
+					menuId: this.menuId
+				};
+				request({
+					url: `/api/reservoirarea/Reservoirarea/getList`,
+					method: 'post',
+					data: _query
+				}).then(res => {
+					var _list = [];
+					for (let i = 0; i < res.data.list.length; i++) {
+						let _data = res.data.list[i];
+						_list.push(_data)
+					}
+					this.list = _list
+					this.total = res.data.pagination.total
 
-                    this.listLoading = false
-                })
-            },
-            handleDel(id) {
-                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    request({
-                        url: `/api/reservoirarea/Reservoirarea/${id}`,
-                        method: 'DELETE'
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => {
-                });
-            },
-                handleSelectionChange(val) {
-                    const res = val.map(item => item.id)
-                    this.multipleSelection = res
-                },
-                handleBatchRemoveDel() {
-                    if (!this.multipleSelection.length) {
-                        this.$message({
-                            type: 'error',
-                            message: '请选择一条数据',
-                            duration: 1500,
-                        })
-                        return
-                    }
-                    const ids = this.multipleSelection.join()
-                    this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-                        type: 'warning'
-                    }).then(() => {
-                        request({
-                            url: `/api/reservoirarea/Reservoirarea/batchRemove/${ids}`,
-                            method: 'DELETE'
-                        }).then(res => {
-                            this.$message({
-                                type: 'success',
-                                message: res.msg,
-                                onClose: () => {
-                                    this.initData()
-                                }
-                            });
-                        })
-                    }).catch(() => {
-                    })
-                },
-            addOrUpdateHandle(id, isDetail) {
-                this.formVisible = true
-                this.$nextTick(() => {
-                    this.$refs.JNPFForm.init(id, isDetail)
-                })
-            },
-            exportData() {
-                this.exportBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.ExportBox.init(this.columnList)
-                })
-            },
-            download(data) {
-                let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
-                request({
-                    url: `/api/reservoirarea/Reservoirarea/Actions/Export`,
-                    method: 'GET',
-                    data: query
-                }).then(res => {
-                    if (!res.data.url) return
-                    this.jnpf.downloadFile(res.data.url)
-                    this.$refs.ExportBox.visible = false
-                    this.exportBoxVisible = false
-                })
-            },
-            search() {
-                this.listQuery = {
-                        currentPage: 1,
-                        pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
-                }
-                this.initData()
-            },
-            refresh(isrRefresh) {
-                this.formVisible = false
-                if (isrRefresh) this.reset()
-            },
-            reset() {
-                for (let key in this.query) {
-                    this.query[key] = undefined
-                }
-                this.search()
-            }
-        }
-    }
+					this.listLoading = false
+				})
+			},
+			handleDel(id) {
+				this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/reservoirarea/Reservoirarea/${id}`,
+						method: 'DELETE'
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {});
+			},
+			handleSelectionChange(val) {
+				const res = val.map(item => item.id)
+				this.multipleSelection = res
+			},
+			handleBatchRemoveDel() {
+				if (!this.multipleSelection.length) {
+					this.$message({
+						type: 'error',
+						message: '请选择一条数据',
+						duration: 1500,
+					})
+					return
+				}
+				const ids = this.multipleSelection.join()
+				this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/reservoirarea/Reservoirarea/batchRemove/${ids}`,
+						method: 'DELETE'
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {})
+			},
+			addOrUpdateHandle(id, isDetail) {
+				this.formVisible = true
+				this.$nextTick(() => {
+					this.$refs.JNPFForm.init(id, isDetail)
+				})
+			},
+			exportData() {
+				this.exportBoxVisible = true
+				this.$nextTick(() => {
+					this.$refs.ExportBox.init(this.columnList)
+				})
+			},
+			download(data) {
+				let query = {
+					...data,
+					...this.listQuery,
+					...this.query,
+					menuId: this.menuId
+				}
+				request({
+					url: `/api/reservoirarea/Reservoirarea/Actions/Export`,
+					method: 'GET',
+					data: query
+				}).then(res => {
+					if (!res.data.url) return
+					this.jnpf.downloadFile(res.data.url)
+					this.$refs.ExportBox.visible = false
+					this.exportBoxVisible = false
+				})
+			},
+			search() {
+				this.listQuery = {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				}
+				this.initData()
+			},
+			refresh(isrRefresh) {
+				this.formVisible = false
+				if (isrRefresh) this.reset()
+			},
+			reset() {
+				for (let key in this.query) {
+					this.query[key] = undefined
+				}
+				this.search()
+			}
+		}
+	}
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/supplier/Form.vue b/SC-web/src/views/scm/basicInformation/supplier/Form.vue
index b0bafb3c..18fac634 100644
--- a/SC-web/src/views/scm/basicInformation/supplier/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/supplier/Form.vue
@@ -1,266 +1,264 @@
 <template>
-<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'"
-           :close-on-click-modal="false" append-to-body
-           :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
-           width="1000px">
-<el-row :gutter="15" class="">
-<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
-    <template v-if="!loading">
-	    <el-col :span="24" >
-		<el-form-item  label-width="0">
-		<JNPF-Text  :style='{"width":"100%"}'
- :textStyle='{"color":"#000000","font-weight":"bold","text-decoration":"none","font-size":18,"line-height":32,"font-style":"normal","text-align":"left"}' value="供应商编辑">
-		</JNPF-Text>
-	</el-form-item>
-	</el-col>
-            <el-col :span="12" >
-                <el-form-item  label="供应商编码"  
- prop="supplierCode" >
-                    <el-input    v-model="dataForm.supplierCode"
- placeholder="请输入供应商编码"  clearable  :style='{"width":"100%"}'>
+	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" append-to-body
+		:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
+		<el-row :gutter="15" class="">
+			<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px"
+				label-position="right">
+				<template v-if="!loading">
+					<el-col :span="24">
+						<el-form-item label-width="0">
+							<JNPF-Text :style='{"width":"100%"}'
+								:textStyle='{"color":"#000000","font-weight":"bold","text-decoration":"none","font-size":18,"line-height":32,"font-style":"normal","text-align":"left"}'
+								value="供应商编辑">
+							</JNPF-Text>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="供应商编码" prop="supplierCode">
+							<el-input v-model="dataForm.supplierCode" placeholder="请输入供应商编码" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="供应商名称"  
- prop="supplierName" >
-                    <el-input    v-model="dataForm.supplierName"
- placeholder="请输入供应商名称"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="供应商名称" prop="supplierName">
+							<el-input v-model="dataForm.supplierName" placeholder="请输入供应商名称" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="地点ID"  
- prop="supplierSiteId" >
-                    <el-input    v-model="dataForm.supplierSiteId"
- placeholder="请输入供应商地点ID"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="地点ID" prop="supplierSiteId">
+							<el-input v-model="dataForm.supplierSiteId" placeholder="请输入供应商地点ID" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="地点名称"  
- prop="supplierSiteCode" >
-                    <el-input    v-model="dataForm.supplierSiteCode"
- placeholder="请输入供应商地点名称"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="地点名称" prop="supplierSiteCode">
+							<el-input v-model="dataForm.supplierSiteCode" placeholder="请输入供应商地点名称" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="所属公司编码"  
- prop="companyId" >
-                    <el-input    v-model="dataForm.companyId"
- placeholder="请输入所属公司编码"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="所属公司编码" prop="companyId">
+							<el-input v-model="dataForm.companyId" placeholder="请输入所属公司编码" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="所属公司名称"  
- prop="companyName" >
-                    <el-input    v-model="dataForm.companyName"
- placeholder="请输入公司名称"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="所属公司名称" prop="companyName">
+							<el-input v-model="dataForm.companyName" placeholder="请输入公司名称" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="联系人"  
- prop="contactName" >
-                    <el-input    v-model="dataForm.contactName"
- placeholder="请输入联系人"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="联系人" prop="contactName">
+							<el-input v-model="dataForm.contactName" placeholder="请输入联系人" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="联系电话"  
- prop="contactPhone" >
-                    <el-input    v-model="dataForm.contactPhone"
- placeholder="请输入联系电话"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="联系电话" prop="contactPhone">
+							<el-input v-model="dataForm.contactPhone" placeholder="请输入联系电话" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="供应商等级"  
- prop="supplierLevel" >
-                    <el-select    v-model="dataForm.supplierLevel"
- placeholder="请选择"  clearable  :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in supplierLevelOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="供应商等级" prop="supplierLevel">
+							<el-select v-model="dataForm.supplierLevel" placeholder="请选择" clearable
+								:style='{"width":"100%"}'>
+								<el-option v-for="(item, index) in supplierLevelOptions" :key="index"
+									:label="item.fullName" :value="item.id" :disabled="item.disabled"></el-option>
 
-                </el-select>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="地址"  
- prop="address" >
-                    <el-input    v-model="dataForm.address"
- placeholder="请输入地址"  clearable  :style='{"width":"100%"}'>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="地址" prop="address">
+							<el-input v-model="dataForm.address" placeholder="请输入地址" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="启用"  
- prop="status" >
-                    <el-switch    v-model="dataForm.status"
- :active-value="1"  :inactive-value="0" >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="启用" prop="status">
+							<el-switch v-model="dataForm.status" :active-value="1" :inactive-value="0">
 
-                </el-switch>
-                </el-form-item>
-            </el-col>
-    </template>
-</el-form>
-    </el-row>
-    <span slot="footer" class="dialog-footer">
-        <el-button @click="visible = false"> 取 消</el-button>
-        <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
-    </span>
-    </el-dialog>
+							</el-switch>
+						</el-form-item>
+					</el-col>
+				</template>
+			</el-form>
+		</el-row>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false"> 取 消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
+		</span>
+	</el-dialog>
 </template>
 <script>
-    import request from '@/utils/request'
-    import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-    export default {
-        components: {},
-        props: [],
-        data() {
-            return {
-                visible: false,
-                loading: false,
-                isDetail: false,
-            dataForm: {
-                            supplierCode : '',
-                            supplierName : '',
-                            supplierSiteId : '',
-                            supplierSiteCode : '',
-                            companyId : '',
-                            companyName : '',
-                            contactName : '',
-                            contactPhone : '',
-                            supplierLevel : "1",
-                            address : '',
-                            status : 1,
-            },
-            rules:
-            {
-                            supplierCode: [
-                                {
-                                    required: true,
-                                    message: '请输入供应商编码',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            supplierName: [
-                                {
-                                    required: true,
-                                    message: '请输入供应商名称',
-                                    trigger: 'blur'
-                                },
-                        ],
-            },
-                        supplierLevelOptions:[{"fullName":"一级","id":"1"},{"fullName":"二级","id":"2"},{"fullName":"三级","id":"3"},{"fullName":"四级","id":"4"}],
-
-        }
-        },
-        computed: {},
-        watch: {},
-        created() {
-        },
-        mounted() {},
-        methods: {
-            clearData(data){
-                for (let key in data) {
-                    if (data[key] instanceof Array) {
-                        data[key] = [];
-                    } else if (data[key] instanceof Object) {
-                        this.clearData(data[key]);
-                    } else {
-                        data[key] = "";
-                    }
-                }
-            },
-            init(id, isDetail) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.isDetail = isDetail || false;
-                this.$nextTick(() => {
-                    this.$refs['elForm'].resetFields();
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/supplier/Supplier/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        });
-                    }else{
-                       this.clearData(this.dataForm)
-                    }
-                });
-                this.$store.commit('generator/UPDATE_RELATION_DATA', {})
-            },
-            // 表单提交
-            dataFormSubmit() {
-                this.$refs['elForm'].validate((valid) => {
-                    if (valid) {
-                            this.request()
-                    }
-                })
-            },
-            request() {
-                var _data =this.dataList()
-                if (!this.dataForm.id) {
-                    request({
-                        url: '/api/supplier/Supplier',
-                        method: 'post',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                this.visible = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    })
-                }else{
-                    request({
-                        url: '/api/supplier/Supplier/'+this.dataForm.id,
-                        method: 'PUT',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                this.visible = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    })
-                }
-            },
-            dataList(){
-                var _data = JSON.parse(JSON.stringify(this.dataForm));
-                        _data.status = parseInt(_data.status)
-                return _data;
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                        _dataAll.status = parseInt( _dataAll.status)
-                this.dataForm = _dataAll
-            },
-        },
-    }
+	import request from '@/utils/request'
+	import {
+		getDataInterfaceRes
+	} from '@/api/systemData/dataInterface'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	export default {
+		components: {},
+		props: [],
+		data() {
+			return {
+				visible: false,
+				loading: false,
+				isDetail: false,
+				dataForm: {
+					supplierCode: '',
+					supplierName: '',
+					supplierSiteId: '',
+					supplierSiteCode: '',
+					companyId: '',
+					companyName: '',
+					contactName: '',
+					contactPhone: '',
+					supplierLevel: "1",
+					address: '',
+					status: 1,
+				},
+				rules: {
+					supplierCode: [{
+						required: true,
+						message: '请输入供应商编码',
+						trigger: 'blur'
+					}, ],
+					supplierName: [{
+						required: true,
+						message: '请输入供应商名称',
+						trigger: 'blur'
+					}, ],
+				},
+				supplierLevelOptions: [{
+					"fullName": "一级",
+					"id": "1"
+				}, {
+					"fullName": "二级",
+					"id": "2"
+				}, {
+					"fullName": "三级",
+					"id": "3"
+				}, {
+					"fullName": "四级",
+					"id": "4"
+				}],
 
+			}
+		},
+		computed: {},
+		watch: {},
+		created() {},
+		mounted() {},
+		methods: {
+			clearData(data) {
+				for (let key in data) {
+					if (data[key] instanceof Array) {
+						data[key] = [];
+					} else if (data[key] instanceof Object) {
+						this.clearData(data[key]);
+					} else {
+						data[key] = "";
+					}
+				}
+			},
+			init(id, isDetail) {
+				this.dataForm.id = id || 0;
+				this.visible = true;
+				this.isDetail = isDetail || false;
+				this.$nextTick(() => {
+					this.$refs['elForm'].resetFields();
+					if (this.dataForm.id) {
+						this.loading = true
+						request({
+							url: '/api/supplier/Supplier/' + this.dataForm.id,
+							method: 'get'
+						}).then(res => {
+							this.dataInfo(res.data)
+							this.loading = false
+						});
+					} else {
+						this.clearData(this.dataForm)
+					}
+				});
+				this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+			},
+			// 表单提交
+			dataFormSubmit() {
+				this.$refs['elForm'].validate((valid) => {
+					if (valid) {
+						this.request()
+					}
+				})
+			},
+			request() {
+				var _data = this.dataList()
+				if (!this.dataForm.id) {
+					request({
+						url: '/api/supplier/Supplier',
+						method: 'post',
+						data: _data
+					}).then((res) => {
+						this.$message({
+							message: res.msg,
+							type: 'success',
+							duration: 1000,
+							onClose: () => {
+								this.visible = false
+								this.$emit('refresh', true)
+							}
+						})
+					})
+				} else {
+					request({
+						url: '/api/supplier/Supplier/' + this.dataForm.id,
+						method: 'PUT',
+						data: _data
+					}).then((res) => {
+						this.$message({
+							message: res.msg,
+							type: 'success',
+							duration: 1000,
+							onClose: () => {
+								this.visible = false
+								this.$emit('refresh', true)
+							}
+						})
+					})
+				}
+			},
+			dataList() {
+				var _data = JSON.parse(JSON.stringify(this.dataForm));
+				_data.status = parseInt(_data.status)
+				return _data;
+			},
+			dataInfo(dataAll) {
+				let _dataAll = dataAll
+				_dataAll.status = parseInt(_dataAll.status)
+				this.dataForm = _dataAll
+			},
+		},
+	}
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/supplier/index.vue b/SC-web/src/views/scm/basicInformation/supplier/index.vue
index c16db104..df3803fa 100644
--- a/SC-web/src/views/scm/basicInformation/supplier/index.vue
+++ b/SC-web/src/views/scm/basicInformation/supplier/index.vue
@@ -1,293 +1,345 @@
 <template>
-    <div class="JNPF-common-layout">
+	<div class="JNPF-common-layout">
 
-        <div class="JNPF-common-layout-center">
-            <el-row class="JNPF-common-search-box" :gutter="16">
-                <el-form @submit.native.prevent>
-                                            <el-col :span="6">
-                                <el-form-item label="供应商编码">
-                                        <el-input v-model="query.supplierCode" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                        <el-col :span="6">
-                                <el-form-item label="供应商名称">
-                                        <el-input v-model="query.supplierName" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                    <el-col :span="6">
-                        <el-form-item>
-                            <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-                            <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-                        </el-form-item>
-                    </el-col>
-                </el-form>
-            </el-row>
-            <div class="JNPF-common-layout-main JNPF-flex-main">
-                <div class="JNPF-common-head">
-                    <div>
-                                    <el-button type="primary" icon="el-icon-plus"  @click="addOrUpdateHandle()">新增
-                                    </el-button>
-                                    <el-button type="text" icon="el-icon-download" @click="exportData()" >导出
-                                    </el-button>
-                                    <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" >批量删除
-                                    </el-button>
-                    </div>
-                    <div class="JNPF-common-head-right">
-                        <el-tooltip effect="dark" content="刷新" placement="top">
-                            <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                                     @click="reset()"/>
-                        </el-tooltip>
-                        <screenfull isContainer/>
-                    </div>
-                </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  has-c @selection-change="handleSelectionChange">
-                            <el-table-column prop="supplierCode" label="供应商编码" width="0" align="left"
- sortable="custom" />
-                            <el-table-column prop="supplierName" label="供应商名称" width="0" align="left"
- sortable="custom" />
-                            <el-table-column prop="supplierSiteId" label="地点ID" width="0" align="left"
- sortable="custom" />
-                            <el-table-column prop="supplierSiteCode" label="地点名称" width="0" align="left"
- sortable="custom" />
-                            <el-table-column prop="companyId" label="所属公司编码" width="0" align="left"
- sortable="custom" />
-                            <el-table-column prop="companyName" label="所属公司名称" width="0" align="left"
- sortable="custom" />
-                            <el-table-column prop="contactName" label="联系人" width="0" align="left"
- sortable="custom" />
-                            <el-table-column prop="contactPhone" label="联系电话" width="0" align="left"
- sortable="custom" />
-                                <el-table-column label="供应商等级" width="0" prop="supplierLevel" algin="left"
- sortable="custom" >
-                                    <template slot-scope="scope">
-                                        {{ scope.row.supplierLevel | dynamicText(supplierLevelOptions) }}
-                                    </template>
-                                </el-table-column>
-                            <el-table-column prop="address" label="地址" width="0" align="left"
- sortable="custom" />
-<!--                            <el-table-column prop="status" label="启用" width="0" align="left"
+		<div class="JNPF-common-layout-center">
+			<el-row class="JNPF-common-search-box" :gutter="16">
+				<el-form @submit.native.prevent>
+					<el-col :span="6">
+						<el-form-item label="供应商编码">
+							<el-input v-model="query.supplierCode" placeholder="请输入" clearable> </el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="供应商名称">
+							<el-input v-model="query.supplierName" placeholder="请输入" clearable> </el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+						</el-form-item>
+					</el-col>
+				</el-form>
+			</el-row>
+			<div class="JNPF-common-layout-main JNPF-flex-main">
+				<div class="JNPF-common-head">
+					<div>
+						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+						</el-button>
+						<el-button type="text" icon="el-icon-download" @click="exportData()">导出
+						</el-button>
+						<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+						</el-button>
+					</div>
+					<div class="JNPF-common-head-right">
+						<el-tooltip effect="dark" content="刷新" placement="top">
+							<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+								@click="reset()" />
+						</el-tooltip>
+						<screenfull isContainer />
+					</div>
+				</div>
+				<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
+					@selection-change="handleSelectionChange">
+					<el-table-column prop="supplierCode" label="供应商编码" width="0" align="left" sortable="custom" />
+					<el-table-column prop="supplierName" label="供应商名称" width="0" align="left" sortable="custom" />
+					<el-table-column prop="supplierSiteId" label="地点ID" width="0" align="left" sortable="custom" />
+					<el-table-column prop="supplierSiteCode" label="地点名称" width="0" align="left" sortable="custom" />
+					<el-table-column prop="companyId" label="所属公司编码" width="0" align="left" sortable="custom" />
+					<el-table-column prop="companyName" label="所属公司名称" width="0" align="left" sortable="custom" />
+					<el-table-column prop="contactName" label="联系人" width="0" align="left" sortable="custom" />
+					<el-table-column prop="contactPhone" label="联系电话" width="0" align="left" sortable="custom" />
+					<el-table-column label="供应商等级" width="0" prop="supplierLevel" algin="left" sortable="custom">
+						<template slot-scope="scope">
+							{{ scope.row.supplierLevel | dynamicText(supplierLevelOptions) }}
+						</template>
+					</el-table-column>
+					<el-table-column prop="address" label="地址" width="0" align="left" sortable="custom" />
+					<!--                            <el-table-column prop="status" label="启用" width="0" align="left"
  sortable="custom" /> -->
- 
- <el-table-column prop="status" label="状态" width="0" align="left">
-             <template slot-scope="scope">
-               <el-tag type="success" disable-transitions v-if="scope.row.status == 1">启用
-               </el-tag>
-               <el-tag type="danger" disable-transitions v-else>禁用</el-tag>
-             </template>
-           </el-table-column>
-		   
-		   
-                        <el-table-column label="操作" fixed="right"
-width="150" >
-                            <template slot-scope="scope">
-                                        <el-button type="text"
-                                                   @click="addOrUpdateHandle(scope.row.id)" >编辑
-                                        </el-button>
-                                        <el-button type="text" class="JNPF-table-delBtn"  @click="handleDel(scope.row.id)">删除
-                                        </el-button>
-                                        <el-button type="text"  
-                                                   @click="goDetail(scope.row.id)">详情
-                                        </el-button>
-                            </template>
-                        </el-table-column>
-                </JNPF-table>
-                    <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
-            </div>
-        </div>
-        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
-        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
-        <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
-    </div>
+
+					<el-table-column prop="status" label="状态" width="0" align="left">
+						<template slot-scope="scope">
+							<el-tag type="success" disable-transitions v-if="scope.row.status == 1">启用
+							</el-tag>
+							<el-tag type="danger" disable-transitions v-else>禁用</el-tag>
+						</template>
+					</el-table-column>
+
+
+					<el-table-column label="操作" fixed="right" width="150">
+						<template slot-scope="scope">
+							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
+							</el-button>
+							<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+							</el-button>
+							<el-button type="text" @click="goDetail(scope.row.id)">详情
+							</el-button>
+						</template>
+					</el-table-column>
+				</JNPF-table>
+				<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+					@pagination="initData" />
+			</div>
+		</div>
+		<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
+		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+		<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
+	</div>
 </template>
 
 <script>
-    import request from '@/utils/request'
-    import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
-    import JNPFForm from './Form'
-    import ExportBox from './ExportBox'
-    import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
-    import Detail from './Detail'
+	import request from '@/utils/request'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	import JNPFForm from './Form'
+	import ExportBox from './ExportBox'
+	import {
+		getDataInterfaceRes
+	} from '@/api/systemData/dataInterface'
+	import Detail from './Detail'
 
-    export default {
-        components: {JNPFForm, ExportBox,Detail},
-        data() {
-            return {
-                detailVisible: false,
-                query: {
-                                supplierCode:undefined,
-                                supplierName:undefined,
-                },
-                treeProps: {
-                    children: 'children',
-                    label: 'fullName',
-                    value: 'id'
-                },
-                list: [],
-                listLoading: true,
- multipleSelection: [],                    total: 0,
-                listQuery: {
-                        currentPage: 1,
-                        pageSize: 20,
-                    sort: "desc",
-                    sidx: "supplierCode",
-                },
-                formVisible: false,
-                exportBoxVisible: false,
-                columnList: [
-                    {prop: 'supplierCode', label: '供应商编码'},
-                    {prop: 'supplierName', label: '供应商名称'},
-                    {prop: 'supplierSiteId', label: '地点ID'},
-                    {prop: 'supplierSiteCode', label: '地点名称'},
-                    {prop: 'companyId', label: '所属公司编码'},
-                    {prop: 'companyName', label: '所属公司名称'},
-                    {prop: 'contactName', label: '联系人'},
-                    {prop: 'contactPhone', label: '联系电话'},
-                    {prop: 'supplierLevel', label: '供应商等级'},
-                    {prop: 'address', label: '地址'},
-                    {prop: 'status', label: '启用'},
-                ],
-                                supplierLevelOptions:[{"fullName":"一级","id":"1"},{"fullName":"二级","id":"2"},{"fullName":"三级","id":"3"},{"fullName":"四级","id":"4"}],
-                            supplierLevelProps:{"label":"fullName","value":"id"},
-            }
-        },
-        computed: {
-            menuId() {
-                return this.$route.meta.modelId || ''
-            }
-        },
-        created() {
-                this.initData()
-        },
-        methods: {
-            goDetail(id){
-                this.detailVisible = true
-                this.$nextTick(() => {
-                    this.$refs.Detail.init(id)
-                })
-            },
-            sortChange({column, prop, order}) {
-                this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-                this.listQuery.sidx = !order ? '' : prop
-                this.initData()
-            },
-            initData() {
-                this.listLoading = true;
-                let _query = {
-                    ...this.listQuery,
-                    ...this.query,
-                    menuId:this.menuId
-                };
-                request({
-                    url: `/api/supplier/Supplier/getList`,
-                    method: 'post',
-                    data: _query
-                }).then(res => {
-                    var _list =[];
-                    for(let i=0;i<res.data.list.length;i++){
-                        let _data = res.data.list[i];
-                        _list.push(_data)
-                    }
-                    this.list = _list
-                        this.total = res.data.pagination.total
+	export default {
+		components: {
+			JNPFForm,
+			ExportBox,
+			Detail
+		},
+		data() {
+			return {
+				detailVisible: false,
+				query: {
+					supplierCode: undefined,
+					supplierName: undefined,
+				},
+				treeProps: {
+					children: 'children',
+					label: 'fullName',
+					value: 'id'
+				},
+				list: [],
+				listLoading: true,
+				multipleSelection: [],
+				total: 0,
+				listQuery: {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "supplierCode",
+				},
+				formVisible: false,
+				exportBoxVisible: false,
+				columnList: [{
+						prop: 'supplierCode',
+						label: '供应商编码'
+					},
+					{
+						prop: 'supplierName',
+						label: '供应商名称'
+					},
+					{
+						prop: 'supplierSiteId',
+						label: '地点ID'
+					},
+					{
+						prop: 'supplierSiteCode',
+						label: '地点名称'
+					},
+					{
+						prop: 'companyId',
+						label: '所属公司编码'
+					},
+					{
+						prop: 'companyName',
+						label: '所属公司名称'
+					},
+					{
+						prop: 'contactName',
+						label: '联系人'
+					},
+					{
+						prop: 'contactPhone',
+						label: '联系电话'
+					},
+					{
+						prop: 'supplierLevel',
+						label: '供应商等级'
+					},
+					{
+						prop: 'address',
+						label: '地址'
+					},
+					{
+						prop: 'status',
+						label: '启用'
+					},
+				],
+				supplierLevelOptions: [{
+					"fullName": "一级",
+					"id": "1"
+				}, {
+					"fullName": "二级",
+					"id": "2"
+				}, {
+					"fullName": "三级",
+					"id": "3"
+				}, {
+					"fullName": "四级",
+					"id": "4"
+				}],
+				supplierLevelProps: {
+					"label": "fullName",
+					"value": "id"
+				},
+			}
+		},
+		computed: {
+			menuId() {
+				return this.$route.meta.modelId || ''
+			}
+		},
+		created() {
+			this.initData()
+		},
+		methods: {
+			goDetail(id) {
+				this.detailVisible = true
+				this.$nextTick(() => {
+					this.$refs.Detail.init(id)
+				})
+			},
+			sortChange({
+				column,
+				prop,
+				order
+			}) {
+				this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+				this.listQuery.sidx = !order ? '' : prop
+				this.initData()
+			},
+			initData() {
+				this.listLoading = true;
+				let _query = {
+					...this.listQuery,
+					...this.query,
+					menuId: this.menuId
+				};
+				request({
+					url: `/api/supplier/Supplier/getList`,
+					method: 'post',
+					data: _query
+				}).then(res => {
+					var _list = [];
+					for (let i = 0; i < res.data.list.length; i++) {
+						let _data = res.data.list[i];
+						_list.push(_data)
+					}
+					this.list = _list
+					this.total = res.data.pagination.total
 
-                    this.listLoading = false
-                })
-            },
-            handleDel(id) {
-                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    request({
-                        url: `/api/supplier/Supplier/${id}`,
-                        method: 'DELETE'
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => {
-                });
-            },
-                handleSelectionChange(val) {
-                    const res = val.map(item => item.id)
-                    this.multipleSelection = res
-                },
-                handleBatchRemoveDel() {
-                    if (!this.multipleSelection.length) {
-                        this.$message({
-                            type: 'error',
-                            message: '请选择一条数据',
-                            duration: 1500,
-                        })
-                        return
-                    }
-                    const ids = this.multipleSelection.join()
-                    this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-                        type: 'warning'
-                    }).then(() => {
-                        request({
-                            url: `/api/supplier/Supplier/batchRemove/${ids}`,
-                            method: 'DELETE'
-                        }).then(res => {
-                            this.$message({
-                                type: 'success',
-                                message: res.msg,
-                                onClose: () => {
-                                    this.initData()
-                                }
-                            });
-                        })
-                    }).catch(() => {
-                    })
-                },
-            addOrUpdateHandle(id, isDetail) {
-                this.formVisible = true
-                this.$nextTick(() => {
-                    this.$refs.JNPFForm.init(id, isDetail)
-                })
-            },
-            exportData() {
-                this.exportBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.ExportBox.init(this.columnList)
-                })
-            },
-            download(data) {
-                let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
-                request({
-                    url: `/api/supplier/Supplier/Actions/Export`,
-                    method: 'GET',
-                    data: query
-                }).then(res => {
-                    if (!res.data.url) return
-                    this.jnpf.downloadFile(res.data.url)
-                    this.$refs.ExportBox.visible = false
-                    this.exportBoxVisible = false
-                })
-            },
-            search() {
-                this.listQuery = {
-                        currentPage: 1,
-                        pageSize: 20,
-                    sort: "desc",
-                    sidx: "supplierCode",
-                }
-                this.initData()
-            },
-            refresh(isrRefresh) {
-                this.formVisible = false
-                if (isrRefresh) this.reset()
-            },
-            reset() {
-                for (let key in this.query) {
-                    this.query[key] = undefined
-                }
-                this.search()
-            }
-        }
-    }
+					this.listLoading = false
+				})
+			},
+			handleDel(id) {
+				this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/supplier/Supplier/${id}`,
+						method: 'DELETE'
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {});
+			},
+			handleSelectionChange(val) {
+				const res = val.map(item => item.id)
+				this.multipleSelection = res
+			},
+			handleBatchRemoveDel() {
+				if (!this.multipleSelection.length) {
+					this.$message({
+						type: 'error',
+						message: '请选择一条数据',
+						duration: 1500,
+					})
+					return
+				}
+				const ids = this.multipleSelection.join()
+				this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/supplier/Supplier/batchRemove/${ids}`,
+						method: 'DELETE'
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {})
+			},
+			addOrUpdateHandle(id, isDetail) {
+				this.formVisible = true
+				this.$nextTick(() => {
+					this.$refs.JNPFForm.init(id, isDetail)
+				})
+			},
+			exportData() {
+				this.exportBoxVisible = true
+				this.$nextTick(() => {
+					this.$refs.ExportBox.init(this.columnList)
+				})
+			},
+			download(data) {
+				let query = {
+					...data,
+					...this.listQuery,
+					...this.query,
+					menuId: this.menuId
+				}
+				request({
+					url: `/api/supplier/Supplier/Actions/Export`,
+					method: 'GET',
+					data: query
+				}).then(res => {
+					if (!res.data.url) return
+					this.jnpf.downloadFile(res.data.url)
+					this.$refs.ExportBox.visible = false
+					this.exportBoxVisible = false
+				})
+			},
+			search() {
+				this.listQuery = {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "supplierCode",
+				}
+				this.initData()
+			},
+			refresh(isrRefresh) {
+				this.formVisible = false
+				if (isrRefresh) this.reset()
+			},
+			reset() {
+				for (let key in this.query) {
+					this.query[key] = undefined
+				}
+				this.search()
+			}
+		}
+	}
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue b/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue
index ca93b29a..be0d6678 100644
--- a/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue
@@ -1,388 +1,374 @@
 <template>
-<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'"
-           :close-on-click-modal="false" append-to-body
-           :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
-           width="800px">
-<el-row :gutter="15" class="">
-<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
-    <template v-if="!loading">
-            <el-col :span="12" >
-                <el-form-item  label="物料编码"
- prop="materialCode" >
-                    <relationForm    v-model="dataForm.materialCode"
- placeholder="请选择"  clearable  field="materialCode" modelId ="294090217084722181"  :columnOptions="materialCodecolumnOptions" relationField="selectField121"   >
+	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" append-to-body
+		:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
+		<el-row :gutter="15" class="">
+			<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px"
+				label-position="right">
+				<template v-if="!loading">
+					<el-col :span="12">
+						<el-form-item label="物料编码" prop="materialCode">
+							<relationForm v-model="dataForm.materialCode" placeholder="请选择" clearable
+								field="materialCode" modelId="294090217084722181"
+								:columnOptions="materialCodecolumnOptions" relationField="selectField121">
 
-                </relationForm>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="物料名称"
- prop="materialName" >
-                    <el-input    v-model="dataForm.materialName"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</relationForm>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="物料名称" prop="materialName">
+							<el-input v-model="dataForm.materialName" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="销售合同"
- prop="salesName" >
-                    <relationForm    v-model="dataForm.salesName"
- placeholder="请选择"  clearable  field="salesName" modelId ="294090217084722181"  :columnOptions="salesNamecolumnOptions" relationField="selectField121"   >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="销售合同" prop="salesName">
+							<relationForm v-model="dataForm.salesName" placeholder="请选择" clearable field="salesName"
+								modelId="294090217084722181" :columnOptions="salesNamecolumnOptions"
+								relationField="selectField121">
 
-                </relationForm>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="客户名称"
- prop="customerName" >
-                    <el-input    v-model="dataForm.customerName"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</relationForm>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="客户名称" prop="customerName">
+							<el-input v-model="dataForm.customerName" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="是否垫资"
- prop="advance" >
-                    <el-select    v-model="dataForm.advance"
- placeholder="请选择"  clearable  :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in advanceOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="是否垫资" prop="advance">
+							<el-select v-model="dataForm.advance" placeholder="请选择" clearable :style='{"width":"100%"}'>
+								<el-option v-for="(item, index) in advanceOptions" :key="index" :label="item.fullName"
+									:value="item.id" :disabled="item.disabled"></el-option>
 
-                </el-select>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="销售价格"
- prop="salesPrice" >
-                    <el-input    v-model="dataForm.salesPrice"
- placeholder="数字文本"  clearable  :style='{"width":"100%"}' >
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="销售价格" prop="salesPrice">
+							<el-input-number v-model="dataForm.salesPrice" placeholder="数字文本" :step="1">
+							
+							</el-input-number>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="运输方式" prop="transportType">
+							<el-select v-model="dataForm.transportType" placeholder="请选择" clearable
+								:style='{"width":"100%"}'>
+								<el-option v-for="(item, index) in transportTypeOptions" :key="index"
+									:label="item.fullName" :value="item.id" :disabled="item.disabled"></el-option>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="运输方式"
- prop="transportType" >
-                    <el-select    v-model="dataForm.transportType"
- placeholder="请选择"  clearable  :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in transportTypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="运费" prop="departmentId">
+							<el-input-number v-model="dataForm.departmentId" placeholder="数字文本" :step="1">
 
-                </el-select>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="运费"
- prop="departmentId" >
-                    <el-input-number    v-model="dataForm.departmentId"
- placeholder="数字文本"  :step="1" >
+							</el-input-number>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="车号" prop="licenseNo">
+							<relationForm v-model="dataForm.licenseNo" placeholder="请选择" clearable field="licenseNo"
+								modelId="294090217084722181" :columnOptions="licenseNocolumnOptions"
+								relationField="selectField122">
 
-                </el-input-number>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="车号"
- prop="licenseNo" >
-                    <relationForm    v-model="dataForm.licenseNo"
- placeholder="请选择"  clearable  field="licenseNo" modelId ="294090217084722181"  :columnOptions="licenseNocolumnOptions" relationField="selectField122"   >
+							</relationForm>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="业务员名称" prop="businessName">
+							<el-input v-model="dataForm.businessName" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </relationForm>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="业务员名称"
- prop="businessName" >
-                    <el-input    v-model="dataForm.businessName"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="磅单图片" prop="poundPictures">
+							<JNPF-UploadImg v-model="dataForm.poundPictures" :fileSize="500" sizeUnit="MB" :limit="9">
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="磅单图片"
- prop="poundPictures" >
-                    <JNPF-UploadImg    v-model="dataForm.poundPictures"
- :fileSize="500"    sizeUnit="MB"  :limit="9" >
+							</JNPF-UploadImg>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="皮重" prop="tareWeight">
+							<el-input-number v-model="dataForm.tareWeight" placeholder="数字文本" :step="1">
 
-                </JNPF-UploadImg>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="皮重"
- prop="tareWeight" >
-                    <el-input-number    v-model="dataForm.tareWeight"
- placeholder="数字文本"  :step="1" >
+							</el-input-number>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="毛重" prop="grossWeight">
+							<el-input-number v-model="dataForm.grossWeight" placeholder="数字文本" :step="1">
 
-                </el-input-number>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="毛重"
- prop="grossWeight" >
-                    <el-input-number    v-model="dataForm.grossWeight"
- placeholder="数字文本"  :step="1" >
+							</el-input-number>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="扣重" prop="buckleWeight">
+							<el-input-number v-model="dataForm.buckleWeight" placeholder="数字文本" :step="1">
 
-                </el-input-number>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="扣重"
- prop="buckleWeight" >
-                    <el-input-number    v-model="dataForm.buckleWeight"
- placeholder="数字文本"  :step="1" >
+							</el-input-number>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="净重" prop="netWeight">
+							<el-input-number v-model="dataForm.netWeight" placeholder="数字文本" :step="1">
 
-                </el-input-number>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="净重"
- prop="netWeight" >
-                    <el-input-number    v-model="dataForm.netWeight"
- placeholder="数字文本"  :step="1" >
+							</el-input-number>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="备注" prop="remark">
+							<el-input v-model="dataForm.remark" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-                </el-input-number>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="备注"
- prop="remark" >
-                    <el-input    v-model="dataForm.remark"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="司机名称" prop="driverName">
+							<el-input v-model="dataForm.driverName" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="司机名称"
- prop="driverName" >
-                    <el-input    v-model="dataForm.driverName"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="车辆图片" prop="vehiclePictures">
+							<JNPF-UploadImg v-model="dataForm.vehiclePictures" :fileSize="500" sizeUnit="MB" :limit="9">
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="车辆图片"
- prop="vehiclePictures" >
-                    <JNPF-UploadImg    v-model="dataForm.vehiclePictures"
- :fileSize="500"    sizeUnit="MB"  :limit="9" >
+							</JNPF-UploadImg>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="制单人" prop="creatorusername">
+							<el-input v-model="dataForm.creatorusername" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </JNPF-UploadImg>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="制单人"
- prop="creatorusername" >
-                    <el-input    v-model="dataForm.creatorusername"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-
-                </el-input>
-                </el-form-item>
-            </el-col>
-    </template>
-</el-form>
-    </el-row>
-    <span slot="footer" class="dialog-footer">
-        <el-button @click="visible = false"> 取 消</el-button>
-        <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
-    </span>
-    </el-dialog>
+							</el-input>
+						</el-form-item>
+					</el-col>
+				</template>
+			</el-form>
+		</el-row>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false"> 取 消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
+		</span>
+	</el-dialog>
 </template>
 <script>
-    import request from '@/utils/request'
-    import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-    export default {
-        components: {},
-        props: [],
-        data() {
-            return {
-                visible: false,
-                loading: false,
-                isDetail: false,
-            dataForm: {
-                            materialCode : "",
-                            materialName : '',
-                            salesName : "",
-                            customerName : '',
-                            advance : "",
-                            salesPrice : '',
-                            transportType : "",
-                            departmentId : 11.225,
-                            licenseNo : "",
-                            businessName : '',
-                            poundPictures : [],
-                            tareWeight : '',
-                            grossWeight : '',
-                            buckleWeight : '',
-                            netWeight : '',
-                            remark : '',
-                            driverName : '',
-                            vehiclePictures : [],
-                            creatorusername : '',
-            },
-            rules:
-            {
-                            materialCode: [
-                                {
-                                    required: true,
-                                    message: '请选择',
-                                    trigger: 'change'
-                                },
-                        ],
-                            salesName: [
-                                {
-                                    required: true,
-                                    message: '请选择',
-                                    trigger: 'change'
-                                },
-                        ],
-                            licenseNo: [
-                                {
-                                    required: true,
-                                    message: '请选择',
-                                    trigger: 'change'
-                                },
-                        ],
-                            // poundPictures: [
-                            //     {
-                            //         required: true,
-                            //         message: '请至少选择一个',
-                            //         trigger: 'click'
-                            //     },
-                        // ],
-                            tareWeight: [
-                                {
-                                    required: true,
-                                    message: '数字文本',
-                                    trigger: ["blur","change"]
-                                },
-                        ],
-                            grossWeight: [
-                                {
-                                    required: true,
-                                    message: '数字文本',
-                                    trigger: ["blur","change"]
-                                },
-                        ],
-                            buckleWeight: [
-                                {
-                                    required: true,
-                                    message: '数字文本',
-                                    trigger: ["blur","change"]
-                                },
-                        ],
-                            netWeight: [
-                                {
-                                    required: true,
-                                    message: '数字文本',
-                                    trigger: ["blur","change"]
-                                },
-                        ],
-            },
-                    materialCodecolumnOptions:[ {"label":"事件等级","value":"selectField121"},],
-                    salesNamecolumnOptions:[ {"label":"事件等级","value":"selectField121"},],
-                        advanceOptions:[{"fullName":"是","id":"1"},{"fullName":"否","id":"0"}],
-                        transportTypeOptions:[{"fullName":"汽运","id":"0"},{"fullName":"船运","id":"1"},{"fullName":"火车","id":"2"}],
-                    licenseNocolumnOptions:[ {"label":"事件级别","value":"selectField122"},],
-
-        }
-        },
-        computed: {},
-        watch: {},
-        created() {
-        },
-        mounted() {},
-        methods: {
-            clearData(data){
-                for (let key in data) {
-                    if (data[key] instanceof Array) {
-                        data[key] = [];
-                    } else if (data[key] instanceof Object) {
-                        this.clearData(data[key]);
-                    } else {
-                        data[key] = "";
-                    }
-                }
-            },
-            init(id, isDetail) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.isDetail = isDetail || false;
-                this.$nextTick(() => {
-                    this.$refs['elForm'].resetFields();
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/tradeupload/Tradeupload/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        });
-                    }else{
-                       this.clearData(this.dataForm)
-                    }
-                });
-                this.$store.commit('generator/UPDATE_RELATION_DATA', {})
-            },
-            // 表单提交
-            dataFormSubmit() {
-                this.$refs['elForm'].validate((valid) => {
-                    if (valid) {
-                            this.request()
-                    }
-                })
-            },
-            request() {
-                var _data =this.dataList()
-                if (!this.dataForm.id) {
-                    request({
-                        url: '/api/tradeupload/Tradeupload',
-                        method: 'post',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                this.visible = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    })
-                }else{
-                    request({
-                        url: '/api/tradeupload/Tradeupload/'+this.dataForm.id,
-                        method: 'PUT',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                this.visible = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    })
-                }
-            },
-            dataList(){
-                var _data = JSON.parse(JSON.stringify(this.dataForm));
-                        _data.poundPictures = JSON.stringify(_data.poundPictures)
-                        _data.vehiclePictures = JSON.stringify(_data.vehiclePictures)
-                return _data;
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                        _dataAll.poundPictures = JSON.parse( _dataAll.poundPictures)
-                        _dataAll.vehiclePictures = JSON.parse( _dataAll.vehiclePictures)
-                this.dataForm = _dataAll
-            },
-        },
-    }
+	import request from '@/utils/request'
+	import {
+		getDataInterfaceRes
+	} from '@/api/systemData/dataInterface'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	export default {
+		components: {},
+		props: [],
+		data() {
+			return {
+				visible: false,
+				loading: false,
+				isDetail: false,
+				dataForm: {
+					materialCode: "",
+					materialName: '',
+					salesName: "",
+					customerName: '',
+					advance: "",
+					salesPrice: '',
+					transportType: "",
+					departmentId: 11.225,
+					licenseNo: "",
+					businessName: '',
+					poundPictures: [],
+					tareWeight: '',
+					grossWeight: '',
+					buckleWeight: '',
+					netWeight: '',
+					remark: '',
+					driverName: '',
+					vehiclePictures: [],
+					creatorusername: '',
+				},
+				rules: {
+					materialCode: [{
+						required: true,
+						message: '请选择',
+						trigger: 'change'
+					}, ],
+					salesName: [{
+						required: true,
+						message: '请选择',
+						trigger: 'change'
+					}, ],
+					licenseNo: [{
+						required: true,
+						message: '请选择',
+						trigger: 'change'
+					}, ],
+					// poundPictures: [
+					//     {
+					//         required: true,
+					//         message: '请至少选择一个',
+					//         trigger: 'click'
+					//     },
+					// ],
+					tareWeight: [{
+						required: true,
+						message: '数字文本',
+						trigger: ["blur", "change"]
+					}, ],
+					grossWeight: [{
+						required: true,
+						message: '数字文本',
+						trigger: ["blur", "change"]
+					}, ],
+					buckleWeight: [{
+						required: true,
+						message: '数字文本',
+						trigger: ["blur", "change"]
+					}, ],
+					netWeight: [{
+						required: true,
+						message: '数字文本',
+						trigger: ["blur", "change"]
+					}, ],
+				},
+				materialCodecolumnOptions: [{
+					"label": "事件等级",
+					"value": "selectField121"
+				}, ],
+				salesNamecolumnOptions: [{
+					"label": "事件等级",
+					"value": "selectField121"
+				}, ],
+				advanceOptions: [{
+					"fullName": "是",
+					"id": "1"
+				}, {
+					"fullName": "否",
+					"id": "0"
+				}],
+				transportTypeOptions: [{
+					"fullName": "汽运",
+					"id": "0"
+				}, {
+					"fullName": "船运",
+					"id": "1"
+				}, {
+					"fullName": "火车",
+					"id": "2"
+				}],
+				licenseNocolumnOptions: [{
+					"label": "事件级别",
+					"value": "selectField122"
+				}, ],
 
+			}
+		},
+		computed: {},
+		watch: {},
+		created() {},
+		mounted() {},
+		methods: {
+			clearData(data) {
+				for (let key in data) {
+					if (data[key] instanceof Array) {
+						data[key] = [];
+					} else if (data[key] instanceof Object) {
+						this.clearData(data[key]);
+					} else {
+						data[key] = "";
+					}
+				}
+			},
+			init(id, isDetail) {
+				this.dataForm.id = id || 0;
+				this.visible = true;
+				this.isDetail = isDetail || false;
+				this.$nextTick(() => {
+					this.$refs['elForm'].resetFields();
+					if (this.dataForm.id) {
+						this.loading = true
+						request({
+							url: '/api/tradeupload/Tradeupload/' + this.dataForm.id,
+							method: 'get'
+						}).then(res => {
+							this.dataInfo(res.data)
+							this.loading = false
+						});
+					} else {
+						this.clearData(this.dataForm)
+					}
+				});
+				this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+			},
+			// 表单提交
+			dataFormSubmit() {
+				this.$refs['elForm'].validate((valid) => {
+					if (valid) {
+						this.request()
+					}
+				})
+			},
+			request() {
+				var _data = this.dataList()
+				if (!this.dataForm.id) {
+					request({
+						url: '/api/tradeupload/Tradeupload',
+						method: 'post',
+						data: _data
+					}).then((res) => {
+						this.$message({
+							message: res.msg,
+							type: 'success',
+							duration: 1000,
+							onClose: () => {
+								this.visible = false
+								this.$emit('refresh', true)
+							}
+						})
+					})
+				} else {
+					request({
+						url: '/api/tradeupload/Tradeupload/' + this.dataForm.id,
+						method: 'PUT',
+						data: _data
+					}).then((res) => {
+						this.$message({
+							message: res.msg,
+							type: 'success',
+							duration: 1000,
+							onClose: () => {
+								this.visible = false
+								this.$emit('refresh', true)
+							}
+						})
+					})
+				}
+			},
+			dataList() {
+				var _data = JSON.parse(JSON.stringify(this.dataForm));
+				_data.poundPictures = JSON.stringify(_data.poundPictures)
+				_data.vehiclePictures = JSON.stringify(_data.vehiclePictures)
+				return _data;
+			},
+			dataInfo(dataAll) {
+				let _dataAll = dataAll
+				_dataAll.poundPictures = JSON.parse(_dataAll.poundPictures)
+				_dataAll.vehiclePictures = JSON.parse(_dataAll.vehiclePictures)
+				this.dataForm = _dataAll
+			},
+		},
+	}
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/index.vue b/SC-web/src/views/scm/basicInformation/tradeupload/index.vue
index 70705be5..14f51cfb 100644
--- a/SC-web/src/views/scm/basicInformation/tradeupload/index.vue
+++ b/SC-web/src/views/scm/basicInformation/tradeupload/index.vue
@@ -1,295 +1,393 @@
 <template>
-    <div class="JNPF-common-layout">
+	<div class="JNPF-common-layout">
 
-        <div class="JNPF-common-layout-center">
-            <el-row class="JNPF-common-search-box" :gutter="16">
-                <el-form @submit.native.prevent>
-                                            <el-col :span="6">
-                                <el-form-item label="物料名称">
-                                        <el-input v-model="query.materialName" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                    <el-col :span="6">
-                        <el-form-item>
-                            <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-                            <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-                        </el-form-item>
-                    </el-col>
-                </el-form>
-            </el-row>
-            <div class="JNPF-common-layout-main JNPF-flex-main">
-                <div class="JNPF-common-head">
-                    <div>
-                                    <el-button type="primary" icon="el-icon-plus"  @click="addOrUpdateHandle()">新增
-                                    </el-button>
-                                    <el-button type="text" icon="el-icon-download" @click="exportData()" >导出
-                                    </el-button>
-                                    <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" >批量删除
-                                    </el-button>
-                    </div>
-                    <div class="JNPF-common-head-right">
-                        <el-tooltip effect="dark" content="刷新" placement="top">
-                            <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                                     @click="reset()"/>
-                        </el-tooltip>
-                        <screenfull isContainer/>
-                    </div>
-                </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  has-c @selection-change="handleSelectionChange">
-                            <el-table-column prop="licenseNo" label="车号" width="0" align="left"
-/>
-                            <el-table-column prop="materialName" label="物料名称" width="0" align="left"
-/>
-                            <el-table-column prop="grossWeight" label="毛重" width="0" align="left"
-/>
-                            <el-table-column prop="tareWeight" label="皮重" width="0" align="left"
-/>
-                            <el-table-column prop="buckleWeight" label="扣重" width="0" align="left"
-/>
-                            <el-table-column prop="netWeight" label="净重" width="0" align="left"
-/>
-                            <el-table-column prop="driverName" label="司机名称" width="0" align="left"
-/>
-                            <el-table-column prop="customerName" label="客户名称" width="0" align="left"
-/>
-                            <el-table-column prop="salesName" label="销售合同" width="0" align="left"
-/>
-                                <el-table-column label="是否垫资" width="0" prop="advance" algin="left"
->
-                                    <template slot-scope="scope">
-                                        {{ scope.row.advance | dynamicText(advanceOptions) }}
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="运输方式" width="0" prop="transportType" algin="left"
->
-                                    <template slot-scope="scope">
-                                        {{ scope.row.transportType | dynamicText(transportTypeOptions) }}
-                                    </template>
-                                </el-table-column>
-                            <el-table-column prop="departmentId" label="运费" width="0" align="left"
-/>
-                            <el-table-column prop="salesPrice" label="销售价格" width="0" align="left"
-/>
-                            <el-table-column prop="creatorusername" label="制单人" width="0" align="left"
-/>
-                            <el-table-column prop="businessName" label="业务员名称" width="0" align="left"
-/>
-                            <el-table-column prop="remark" label="备注" width="0" align="left"
-/>
-                        <el-table-column label="操作" fixed="right"
-                                         width="100" >
-                            <template slot-scope="scope">
-                                        <el-button type="text"
-                                                   @click="addOrUpdateHandle(scope.row.id)" >编辑
-                                        </el-button>
-                                        <el-button type="text" class="JNPF-table-delBtn"  @click="handleDel(scope.row.id)">删除
-                                        </el-button>
-                            </template>
-                        </el-table-column>
-                </JNPF-table>
-                    <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
-            </div>
-        </div>
-        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
-        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
-        <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
-    </div>
+		<div class="JNPF-common-layout-center">
+			<el-row class="JNPF-common-search-box" :gutter="16">
+				<el-form @submit.native.prevent>
+					<el-col :span="6">
+						<el-form-item label="物料名称">
+							<el-input v-model="query.materialName" placeholder="请输入" clearable> </el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+						</el-form-item>
+					</el-col>
+				</el-form>
+			</el-row>
+			<div class="JNPF-common-layout-main JNPF-flex-main">
+				<div class="JNPF-common-head">
+					<div>
+						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+						</el-button>
+						<el-button type="text" icon="el-icon-download" @click="exportData()">导出
+						</el-button>
+						<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+						</el-button>
+					</div>
+					<div class="JNPF-common-head-right">
+						<el-tooltip effect="dark" content="刷新" placement="top">
+							<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+								@click="reset()" />
+						</el-tooltip>
+						<screenfull isContainer />
+					</div>
+				</div>
+				<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
+					@selection-change="handleSelectionChange">
+					<el-table-column prop="licenseNo" label="车号" width="0" align="left" />
+					<el-table-column prop="materialName" label="物料名称" width="0" align="left" />
+					<el-table-column prop="grossWeight" label="毛重" width="0" align="left" />
+					<el-table-column prop="tareWeight" label="皮重" width="0" align="left" />
+					<el-table-column prop="buckleWeight" label="扣重" width="0" align="left" />
+					<el-table-column prop="netWeight" label="净重" width="0" align="left" />
+					<el-table-column prop="driverName" label="司机名称" width="0" align="left" />
+					<el-table-column prop="customerName" label="客户名称" width="0" align="left" />
+					<el-table-column prop="salesName" label="销售合同" width="0" align="left" />
+					<el-table-column label="是否垫资" width="0" prop="advance" algin="left">
+						<template slot-scope="scope">
+							{{ scope.row.advance | dynamicText(advanceOptions) }}
+						</template>
+					</el-table-column>
+					<el-table-column label="运输方式" width="0" prop="transportType" algin="left">
+						<template slot-scope="scope">
+							{{ scope.row.transportType | dynamicText(transportTypeOptions) }}
+						</template>
+					</el-table-column>
+					<el-table-column prop="departmentId" label="运费" width="0" align="left" />
+					<el-table-column prop="salesPrice" label="销售价格" width="0" align="left" />
+					<el-table-column prop="creatorusername" label="制单人" width="0" align="left" />
+					<el-table-column prop="businessName" label="业务员" width="0" align="left" />
+					<el-table-column prop="remark" label="备注" width="0" align="left" />
+					<el-table-column prop="poundPictures" label="磅单图片" width="0" align="left">
+						<template slot-scope="scope">
+							<span v-for="(item,index) in JSON.parse(scope.row.poundPictures)" :key="index">
+								<el-popover placement="bottom" trigger="click" width="1000">
+									<img :src="`/dev${item.url}`" width="100%" />
+									<img
+										slot="reference"
+										:src="`/dev${item.url}`"
+										:alt="`/dev${item.url}`"
+										style="max-height: 70px;max-width: 70px; padding: 5px"
+									/>
+								</el-popover>
+							</span>
+						</template>
+					</el-table-column>
+					<el-table-column prop="vehiclePictures" label="车辆图片" width="0" align="left">
+						<template slot-scope="scope">
+							<span v-for="(item,index) in JSON.parse(scope.row.vehiclePictures)" :key="index">
+								<el-popover placement="bottom" trigger="click" width="1000">
+									<img :src="`/dev${item.url}`" width="100%" />
+									<img
+										slot="reference"
+										:src="`/dev${item.url}`"
+										:alt="`/dev${item.url}`"
+										style="max-height: 70px;max-width: 70px; padding: 5px"
+									/>
+								</el-popover>
+							</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="操作" fixed="right" width="100">
+						<template slot-scope="scope">
+							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
+							</el-button>
+							<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+							</el-button>
+						</template>
+					</el-table-column>
+				</JNPF-table>
+				<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+					@pagination="initData" />
+			</div>
+		</div>
+		<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
+		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+		<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
+	</div>
 </template>
 
 <script>
-    import request from '@/utils/request'
-    import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
-    import JNPFForm from './Form'
-    import ExportBox from './ExportBox'
-    import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
-    import Detail from './Detail'
+	import request from '@/utils/request'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	import JNPFForm from './Form'
+	import ExportBox from './ExportBox'
+	import {
+		getDataInterfaceRes
+	} from '@/api/systemData/dataInterface'
+	import Detail from './Detail'
 
-    export default {
-        components: {JNPFForm, ExportBox,Detail},
-        data() {
-            return {
-                detailVisible: false,
-                query: {
-                                materialName:undefined,
-                },
-                treeProps: {
-                    children: 'children',
-                    label: 'fullName',
-                    value: 'id'
-                },
-                list: [],
-                listLoading: true,
- multipleSelection: [],                    total: 0,
-                listQuery: {
-                        currentPage: 1,
-                        pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
-                },
-                formVisible: false,
-                exportBoxVisible: false,
-                columnList: [
-                    {prop: 'licenseNo', label: '车号'},
-                    {prop: 'materialName', label: '物料名称'},
-                    {prop: 'grossWeight', label: '毛重'},
-                    {prop: 'tareWeight', label: '皮重'},
-                    {prop: 'buckleWeight', label: '扣重'},
-                    {prop: 'netWeight', label: '净重'},
-                    {prop: 'driverName', label: '司机名称'},
-                    {prop: 'customerName', label: '客户名称'},
-                    {prop: 'salesName', label: '销售合同'},
-                    {prop: 'advance', label: '是否垫资'},
-                    {prop: 'transportType', label: '运输方式'},
-                    {prop: 'departmentId', label: '运费'},
-                    {prop: 'salesPrice', label: '销售价格'},
-                    {prop: 'creatorusername', label: '制单人'},
-                    {prop: 'businessName', label: '业务员名称'},
-                    {prop: 'remark', label: '备注'},
-                ],
-                                advanceOptions:[{"fullName":"是","id":"1"},{"fullName":"否","id":"0"}],
-                            advanceProps:{"label":"fullName","value":"id"},
-                                transportTypeOptions:[{"fullName":"汽运","id":"0"},{"fullName":"船运","id":"1"},{"fullName":"火车","id":"2"}],
-                            transportTypeProps:{"label":"fullName","value":"id"},
-            }
-        },
-        computed: {
-            menuId() {
-                return this.$route.meta.modelId || ''
-            }
-        },
-        created() {
-                this.initData()
-        },
-        methods: {
-            goDetail(id){
-                this.detailVisible = true
-                this.$nextTick(() => {
-                    this.$refs.Detail.init(id)
-                })
-            },
-            sortChange({column, prop, order}) {
-                this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-                this.listQuery.sidx = !order ? '' : prop
-                this.initData()
-            },
-            initData() {
-                this.listLoading = true;
-                let _query = {
-                    ...this.listQuery,
-                    ...this.query,
-                    menuId:this.menuId
-                };
-                request({
-                    url: `/api/tradeupload/Tradeupload/getList`,
-                    method: 'post',
-                    data: _query
-                }).then(res => {
-                    var _list =[];
-                    for(let i=0;i<res.data.list.length;i++){
-                        let _data = res.data.list[i];
-                        _list.push(_data)
-                    }
-                    this.list = _list
-                        this.total = res.data.pagination.total
+	export default {
+		components: {
+			JNPFForm,
+			ExportBox,
+			Detail
+		},
+		data() {
+			return {
+				detailVisible: false,
+				query: {
+					materialName: undefined,
+				},
+				treeProps: {
+					children: 'children',
+					label: 'fullName',
+					value: 'id'
+				},
+				list: [],
+				listLoading: true,
+				multipleSelection: [],
+				total: 0,
+				listQuery: {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				},
+				formVisible: false,
+				exportBoxVisible: false,
+				columnList: [{
+						prop: 'licenseNo',
+						label: '车号'
+					},
+					{
+						prop: 'materialName',
+						label: '物料名称'
+					},
+					{
+						prop: 'grossWeight',
+						label: '毛重'
+					},
+					{
+						prop: 'tareWeight',
+						label: '皮重'
+					},
+					{
+						prop: 'buckleWeight',
+						label: '扣重'
+					},
+					{
+						prop: 'netWeight',
+						label: '净重'
+					},
+					{
+						prop: 'driverName',
+						label: '司机名称'
+					},
+					{
+						prop: 'customerName',
+						label: '客户名称'
+					},
+					{
+						prop: 'salesName',
+						label: '销售合同'
+					},
+					{
+						prop: 'advance',
+						label: '是否垫资'
+					},
+					{
+						prop: 'transportType',
+						label: '运输方式'
+					},
+					{
+						prop: 'departmentId',
+						label: '运费'
+					},
+					{
+						prop: 'salesPrice',
+						label: '销售价格'
+					},
+					{
+						prop: 'creatorusername',
+						label: '制单人'
+					},
+					{
+						prop: 'businessName',
+						label: '业务员名称'
+					},
+					{
+						prop: 'remark',
+						label: '备注'
+					},
+				],
+				advanceOptions: [{
+					"fullName": "是",
+					"id": "1"
+				}, {
+					"fullName": "否",
+					"id": "0"
+				}],
+				advanceProps: {
+					"label": "fullName",
+					"value": "id"
+				},
+				transportTypeOptions: [{
+					"fullName": "汽运",
+					"id": "0"
+				}, {
+					"fullName": "船运",
+					"id": "1"
+				}, {
+					"fullName": "火车",
+					"id": "2"
+				}],
+				transportTypeProps: {
+					"label": "fullName",
+					"value": "id"
+				},
+			}
+		},
+		computed: {
+			menuId() {
+				return this.$route.meta.modelId || ''
+			}
+		},
+		created() {
+			this.initData()
+		},
+		methods: {
+			goDetail(id) {
+				this.detailVisible = true
+				this.$nextTick(() => {
+					this.$refs.Detail.init(id)
+				})
+			},
+			sortChange({
+				column,
+				prop,
+				order
+			}) {
+				this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+				this.listQuery.sidx = !order ? '' : prop
+				this.initData()
+			},
+			initData() {
+				this.listLoading = true;
+				let _query = {
+					...this.listQuery,
+					...this.query,
+					menuId: this.menuId
+				};
+				request({
+					url: `/api/tradeupload/Tradeupload/getList`,
+					method: 'post',
+					data: _query
+				}).then(res => {
+					var _list = [];
+					for (let i = 0; i < res.data.list.length; i++) {
+						let _data = res.data.list[i];
+						_list.push(_data)
+					}
+					this.list = _list
+					this.total = res.data.pagination.total
 
-                    this.listLoading = false
-                })
-            },
-            handleDel(id) {
-                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    request({
-                        url: `/api/tradeupload/Tradeupload/${id}`,
-                        method: 'DELETE'
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => {
-                });
-            },
-                handleSelectionChange(val) {
-                    const res = val.map(item => item.id)
-                    this.multipleSelection = res
-                },
-                handleBatchRemoveDel() {
-                    if (!this.multipleSelection.length) {
-                        this.$message({
-                            type: 'error',
-                            message: '请选择一条数据',
-                            duration: 1500,
-                        })
-                        return
-                    }
-                    const ids = this.multipleSelection.join()
-                    this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-                        type: 'warning'
-                    }).then(() => {
-                        request({
-                            url: `/api/tradeupload/Tradeupload/batchRemove/${ids}`,
-                            method: 'DELETE'
-                        }).then(res => {
-                            this.$message({
-                                type: 'success',
-                                message: res.msg,
-                                onClose: () => {
-                                    this.initData()
-                                }
-                            });
-                        })
-                    }).catch(() => {
-                    })
-                },
-            addOrUpdateHandle(id, isDetail) {
-                this.formVisible = true
-                this.$nextTick(() => {
-                    this.$refs.JNPFForm.init(id, isDetail)
-                })
-            },
-            exportData() {
-                this.exportBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.ExportBox.init(this.columnList)
-                })
-            },
-            download(data) {
-                let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
-                request({
-                    url: `/api/tradeupload/Tradeupload/Actions/Export`,
-                    method: 'GET',
-                    data: query
-                }).then(res => {
-                    if (!res.data.url) return
-                    this.jnpf.downloadFile(res.data.url)
-                    this.$refs.ExportBox.visible = false
-                    this.exportBoxVisible = false
-                })
-            },
-            search() {
-                this.listQuery = {
-                        currentPage: 1,
-                        pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
-                }
-                this.initData()
-            },
-            refresh(isrRefresh) {
-                this.formVisible = false
-                if (isrRefresh) this.reset()
-            },
-            reset() {
-                for (let key in this.query) {
-                    this.query[key] = undefined
-                }
-                this.search()
-            }
-        }
-    }
+					this.listLoading = false
+				})
+			},
+			handleDel(id) {
+				this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/tradeupload/Tradeupload/${id}`,
+						method: 'DELETE'
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {});
+			},
+			handleSelectionChange(val) {
+				const res = val.map(item => item.id)
+				this.multipleSelection = res
+			},
+			handleBatchRemoveDel() {
+				if (!this.multipleSelection.length) {
+					this.$message({
+						type: 'error',
+						message: '请选择一条数据',
+						duration: 1500,
+					})
+					return
+				}
+				const ids = this.multipleSelection.join()
+				this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/tradeupload/Tradeupload/batchRemove/${ids}`,
+						method: 'DELETE'
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {})
+			},
+			addOrUpdateHandle(id, isDetail) {
+				this.formVisible = true
+				this.$nextTick(() => {
+					this.$refs.JNPFForm.init(id, isDetail)
+				})
+			},
+			exportData() {
+				this.exportBoxVisible = true
+				this.$nextTick(() => {
+					this.$refs.ExportBox.init(this.columnList)
+				})
+			},
+			download(data) {
+				let query = {
+					...data,
+					...this.listQuery,
+					...this.query,
+					menuId: this.menuId
+				}
+				request({
+					url: `/api/tradeupload/Tradeupload/Actions/Export`,
+					method: 'GET',
+					data: query
+				}).then(res => {
+					if (!res.data.url) return
+					this.jnpf.downloadFile(res.data.url)
+					this.$refs.ExportBox.visible = false
+					this.exportBoxVisible = false
+				})
+			},
+			search() {
+				this.listQuery = {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				}
+				this.initData()
+			},
+			refresh(isrRefresh) {
+				this.formVisible = false
+				if (isrRefresh) this.reset()
+			},
+			reset() {
+				for (let key in this.query) {
+					this.query[key] = undefined
+				}
+				this.search()
+			}
+		}
+	}
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/vehicle/Form.vue b/SC-web/src/views/scm/basicInformation/vehicle/Form.vue
index b8c34eec..bf3b3fcc 100644
--- a/SC-web/src/views/scm/basicInformation/vehicle/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/vehicle/Form.vue
@@ -1,55 +1,50 @@
 <template>
-<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'"
-           :close-on-click-modal="false" append-to-body
-           :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
-           width="600px">
-<el-row :gutter="15" class="">
-<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
-    <template v-if="!loading">
-	    <el-col :span="24" >
-		<el-form-item  label-width="0">
-		<JNPF-Text  :style='{"width":"100%"}'
- :textStyle='{"color":"#000000","font-weight":"normal","text-decoration":"none","font-size":18,"line-height":32,"font-style":"normal","text-align":"left"}' value="车辆信息">
-		</JNPF-Text>
-	</el-form-item>
-	</el-col>
-            <el-col :span="24" >
-                <el-form-item  label="车牌号"  
- prop="ticketno" >
-                    <el-input    v-model="dataForm.ticketno"
- placeholder="请输入车牌号"  clearable  :style='{"width":"100%"}'>
+	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" append-to-body
+		:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
+		<el-row :gutter="15" class="">
+			<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px"
+				label-position="right">
+				<template v-if="!loading">
+					<!-- <el-col :span="24">
+						<el-form-item label-width="0">
+							<JNPF-Text :style='{"width":"100%"}'
+								:textStyle='{"color":"#000000","font-weight":"normal","text-decoration":"none","font-size":18,"line-height":32,"font-style":"normal","text-align":"left"}'
+								value="车辆信息">
+							</JNPF-Text>
+						</el-form-item>
+					</el-col> -->
+					<el-col :span="24">
+						<el-form-item label="车牌号" prop="ticketno">
+							<el-input v-model="dataForm.ticketno" placeholder="请输入车牌号" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="司机名称"  
- prop="drivername" >
-                    <el-input    v-model="dataForm.drivername"
- placeholder="请输入司机名称"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="司机名称" prop="drivername">
+							<el-input v-model="dataForm.drivername" placeholder="请输入司机名称" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="手机号"  
- prop="contact" >
-                    <el-input    v-model="dataForm.contact"
- placeholder="请输入手机号"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="手机号" prop="contact">
+							<el-input v-model="dataForm.contact" placeholder="请输入手机号" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="车辆照片"  
- prop="vehiclephotos" >
-                    <JNPF-UploadImg    v-model="dataForm.vehiclephotos"
- :fileSize="5"    sizeUnit="MB"  :limit="9" >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="车辆照片" prop="vehiclephotos">
+							<JNPF-UploadImg v-model="dataForm.vehiclephotos" :fileSize="5" sizeUnit="MB" :limit="9">
 
-                </JNPF-UploadImg>
-                </el-form-item>
-            </el-col>
-            <!-- <el-col :span="12" >
+							</JNPF-UploadImg>
+						</el-form-item>
+					</el-col>
+					<!-- <el-col :span="12" >
                 <el-form-item  label="录入人"  
  prop="creatorusername" >
                     <el-input    v-model="dataForm.creatorusername"
@@ -67,148 +62,153 @@
                 </el-input>
                 </el-form-item>
             </el-col> -->
-    </template>
-</el-form>
-    </el-row>
-    <span slot="footer" class="dialog-footer">
-        <el-button @click="visible = false"> 取 消</el-button>
-        <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
-    </span>
-    </el-dialog>
+				</template>
+			</el-form>
+		</el-row>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false"> 取 消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
+		</span>
+	</el-dialog>
 </template>
 <script>
-    import request from '@/utils/request'
-    import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-    export default {
-        components: {},
-        props: [],
-        data() {
-            return {
-                visible: false,
-                loading: false,
-                isDetail: false,
-            dataForm: {
-                            ticketno : '',
-                            drivername : '',
-                            contact : '',
-                            vehiclephotos : [{"name":"006-1 (3).jpg","url":"/api/file/Image/annex/20230105_380637081082287813.jpg","fileId":"20230105_380637081082287813.jpg"},{"name":"微信图片_20220617141029.jpg","url":"/api/file/Image/annex/20230105_380637561959241413.jpg","fileId":"20230105_380637561959241413.jpg"}],
-                            creatorusername : '',
-                            creatortime : "",
-            },
-            rules:
-            {
-                            ticketno: [
-                                {
-                                    required: true,
-                                    message: '请输入车牌号',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            drivername: [
-                                {
-                                    required: true,
-                                    message: '请输入司机名称',
-                                    trigger: 'blur'
-                                },
-                        ],
-            },
-
-        }
-        },
-        computed: {},
-        watch: {},
-        created() {
-        },
-        mounted() {},
-        methods: {
-            clearData(data){
-                for (let key in data) {
-                    if (data[key] instanceof Array) {
-                        data[key] = [];
-                    } else if (data[key] instanceof Object) {
-                        this.clearData(data[key]);
-                    } else {
-                        data[key] = "";
-                    }
-                }
-            },
-            init(id, isDetail) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.isDetail = isDetail || false;
-                this.$nextTick(() => {
-                    this.$refs['elForm'].resetFields();
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/example/Vehicle/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        });
-                    }else{
-                       this.clearData(this.dataForm)
-                    }
-                });
-                this.$store.commit('generator/UPDATE_RELATION_DATA', {})
-            },
-            // 表单提交
-            dataFormSubmit() {
-                this.$refs['elForm'].validate((valid) => {
-                    if (valid) {
-                            this.request()
-                    }
-                })
-            },
-            request() {
-                var _data =this.dataList()
-                if (!this.dataForm.id) {
-                    request({
-                        url: '/api/example/Vehicle',
-                        method: 'post',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                this.visible = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    })
-                }else{
-                    request({
-                        url: '/api/example/Vehicle/'+this.dataForm.id,
-                        method: 'PUT',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                this.visible = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    })
-                }
-            },
-            dataList(){
-                var _data = JSON.parse(JSON.stringify(this.dataForm));
-                        _data.vehiclephotos = JSON.stringify(_data.vehiclephotos)
-                return _data;
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                        _dataAll.vehiclephotos = JSON.parse( _dataAll.vehiclephotos)
-                this.dataForm = _dataAll
-            },
-        },
-    }
+	import request from '@/utils/request'
+	import {
+		getDataInterfaceRes
+	} from '@/api/systemData/dataInterface'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	export default {
+		components: {},
+		props: [],
+		data() {
+			return {
+				visible: false,
+				loading: false,
+				isDetail: false,
+				dataForm: {
+					ticketno: '',
+					drivername: '',
+					contact: '',
+					vehiclephotos: [{
+						"name": "006-1 (3).jpg",
+						"url": "/api/file/Image/annex/20230105_380637081082287813.jpg",
+						"fileId": "20230105_380637081082287813.jpg"
+					}, {
+						"name": "微信图片_20220617141029.jpg",
+						"url": "/api/file/Image/annex/20230105_380637561959241413.jpg",
+						"fileId": "20230105_380637561959241413.jpg"
+					}],
+					creatorusername: '',
+					creatortime: "",
+				},
+				rules: {
+					ticketno: [{
+						required: true,
+						message: '请输入车牌号',
+						trigger: 'blur'
+					}, ],
+					drivername: [{
+						required: true,
+						message: '请输入司机名称',
+						trigger: 'blur'
+					}, ],
+				},
 
+			}
+		},
+		computed: {},
+		watch: {},
+		created() {},
+		mounted() {},
+		methods: {
+			clearData(data) {
+				for (let key in data) {
+					if (data[key] instanceof Array) {
+						data[key] = [];
+					} else if (data[key] instanceof Object) {
+						this.clearData(data[key]);
+					} else {
+						data[key] = "";
+					}
+				}
+			},
+			init(id, isDetail) {
+				this.dataForm.id = id || 0;
+				this.visible = true;
+				this.isDetail = isDetail || false;
+				this.$nextTick(() => {
+					this.$refs['elForm'].resetFields();
+					if (this.dataForm.id) {
+						this.loading = true
+						request({
+							url: '/api/example/Vehicle/' + this.dataForm.id,
+							method: 'get'
+						}).then(res => {
+							this.dataInfo(res.data)
+							this.loading = false
+						});
+					} else {
+						this.clearData(this.dataForm)
+					}
+				});
+				this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+			},
+			// 表单提交
+			dataFormSubmit() {
+				this.$refs['elForm'].validate((valid) => {
+					if (valid) {
+						this.request()
+					}
+				})
+			},
+			request() {
+				var _data = this.dataList()
+				if (!this.dataForm.id) {
+					request({
+						url: '/api/example/Vehicle',
+						method: 'post',
+						data: _data
+					}).then((res) => {
+						this.$message({
+							message: res.msg,
+							type: 'success',
+							duration: 1000,
+							onClose: () => {
+								this.visible = false
+								this.$emit('refresh', true)
+							}
+						})
+					})
+				} else {
+					request({
+						url: '/api/example/Vehicle/' + this.dataForm.id,
+						method: 'PUT',
+						data: _data
+					}).then((res) => {
+						this.$message({
+							message: res.msg,
+							type: 'success',
+							duration: 1000,
+							onClose: () => {
+								this.visible = false
+								this.$emit('refresh', true)
+							}
+						})
+					})
+				}
+			},
+			dataList() {
+				var _data = JSON.parse(JSON.stringify(this.dataForm));
+				_data.vehiclephotos = JSON.stringify(_data.vehiclephotos)
+				return _data;
+			},
+			dataInfo(dataAll) {
+				let _dataAll = dataAll
+				_dataAll.vehiclephotos = JSON.parse(_dataAll.vehiclephotos)
+				this.dataForm = _dataAll
+			},
+		},
+	}
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/vehicle/index.vue b/SC-web/src/views/scm/basicInformation/vehicle/index.vue
index d95150f3..c20c0c85 100644
--- a/SC-web/src/views/scm/basicInformation/vehicle/index.vue
+++ b/SC-web/src/views/scm/basicInformation/vehicle/index.vue
@@ -47,10 +47,9 @@
 					<el-table-column prop="drivername" label="司机名称" width="0" align="left" />
 					<el-table-column prop="contact" label="手机号" width="0" align="left" />
 					<el-table-column prop="vehiclephotos" label="车辆照片" width="0" align="left">
-						
 						<template slot-scope="scope">
 							<span v-for="(item,index) in JSON.parse(scope.row.vehiclephotos)" :key="index">
-								<el-popover placement="left" trigger="click" width="300">
+								<el-popover placement="bottom" trigger="click" width="1000">
 									<img :src="`/dev${item.url}`" width="100%" />
 									<img
 										slot="reference"
@@ -61,7 +60,6 @@
 								</el-popover>
 							</span>
 						</template>
-						
 					</el-table-column>
 					<el-table-column prop="creatorusername" label="录入人" width="0" align="left" />
 					<el-table-column prop="creatortime" label="创建时间" width="0" align="left" />
diff --git a/SC-web/src/views/scm/basicInformation/warehouse/Form.vue b/SC-web/src/views/scm/basicInformation/warehouse/Form.vue
index ace4b21e..f3a56b9f 100644
--- a/SC-web/src/views/scm/basicInformation/warehouse/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/warehouse/Form.vue
@@ -1,299 +1,336 @@
 <template>
-<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'"
-           :close-on-click-modal="false" append-to-body
-           :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
-           width="800px">
-<el-row :gutter="15" class="">
-<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
-    <template v-if="!loading">
-            <el-col :span="24" >
-                <el-form-item  label="仓库编码"
- prop="code" >
-                    <el-input    v-model="dataForm.code"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" append-to-body
+		:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
+		<el-row :gutter="15" class="">
+			<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="150px"
+				label-position="right">
+				<template v-if="!loading">
+					<el-col :span="24">
+						<el-form-item label="仓库编码" prop="code">
+							<el-input v-model="dataForm.code" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="公司代码"
- prop="companyCode" >
-                    <el-input    v-model="dataForm.companyCode"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="公司代码" prop="companyCode">
+							<el-input v-model="dataForm.companyCode" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="公司名称"
- prop="companyName" >
-                    <el-input    v-model="dataForm.companyName"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="公司名称" prop="companyName">
+							<el-input v-model="dataForm.companyName" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="仓库位置"
- prop="location" >
-                    <el-input    v-model="dataForm.location"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="仓库位置" prop="location">
+							<el-input v-model="dataForm.location" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="仓库类型"
- prop="type" >
-                    <el-select    v-model="dataForm.type"
- placeholder="请选择"  clearable  :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="仓库类型" prop="type">
+							<el-select v-model="dataForm.type" placeholder="请选择" clearable :style='{"width":"100%"}'>
+								<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.fullName"
+									:value="item.id" :disabled="item.disabled"></el-option>
 
-                </el-select>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="ERP库存组织"
- prop="organization" >
-                    <el-select    v-model="dataForm.organization"
- placeholder="请选择"  clearable  :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in organizationOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="ERP库存组织" prop="organization">
+							<el-select v-model="dataForm.organization" placeholder="请选择" clearable
+								:style='{"width":"100%"}'>
+								<el-option v-for="(item, index) in organizationOptions" :key="index"
+									:label="item.fullName" :value="item.id" :disabled="item.disabled"></el-option>
 
-                </el-select>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="ERP子库"
- prop="sublibrary" >
-                    <el-select    v-model="dataForm.sublibrary"
- placeholder="请选择"  clearable  :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in sublibraryOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="ERP子库" prop="sublibrary">
+							<el-select v-model="dataForm.sublibrary" placeholder="请选择" clearable
+								:style='{"width":"100%"}'>
+								<el-option v-for="(item, index) in sublibraryOptions" :key="index"
+									:label="item.fullName" :value="item.id" :disabled="item.disabled"></el-option>
 
-                </el-select>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="激活状态 "
- prop="activestate" >
-                    <el-radio-group    v-model="dataForm.activestate"
- size="small" >
-                            <el-radio v-for="(item, index) in activestateOptions" :key="index" :label="item.id" :disabled="item.disabled" >
-                                {{item.fullName}}
-                            </el-radio>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="激活状态 " prop="activestate">
+							<!-- <el-radio-group v-model="dataForm.activestate" size="small">
+								<el-radio v-for="(item, index) in activestateOptions" :key="index" :label="item.id"
+									:disabled="item.disabled">
+									{{item.fullName}}
+								</el-radio>
 
-                </el-radio-group>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="备注"
- prop="remark" >
-                    <el-input    v-model="dataForm.remark"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-radio-group> -->
+							<el-switch v-model="dataForm.activestate" :active-value="1" :inactive-value="0">
+							
+							</el-switch>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="备注" prop="remark">
+							<el-input v-model="dataForm.remark" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="创建人名称"
- prop="creatorusername" >
-                    <el-input    v-model="dataForm.creatorusername"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="创建人名称" prop="creatorusername">
+							<el-input v-model="dataForm.creatorusername" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="创建时间"
- prop="creatortime" >
-                    <el-date-picker    v-model="dataForm.creatortime"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' type="datetime"  format="yyyy-MM-dd HH:mm:ss"  value-format="timestamp" >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="创建时间" prop="creatortime">
+							<el-date-picker v-model="dataForm.creatortime" placeholder="请选择" clearable
+								:style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
+								value-format="timestamp">
 
-                </el-date-picker>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="修改人名称"
- prop="lastmodifyusername" >
-                    <el-input    v-model="dataForm.lastmodifyusername"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-date-picker>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="修改人名称" prop="lastmodifyusername">
+							<el-input v-model="dataForm.lastmodifyusername" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="修改时间"
- prop="lastmodifytime" >
-                    <el-date-picker    v-model="dataForm.lastmodifytime"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' type="datetime"  format="yyyy-MM-dd HH:mm:ss"  value-format="timestamp" >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="修改时间" prop="lastmodifytime">
+							<el-date-picker v-model="dataForm.lastmodifytime" placeholder="请选择" clearable
+								:style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
+								value-format="timestamp">
 
-                </el-date-picker>
-                </el-form-item>
-            </el-col>
-    </template>
-</el-form>
-    </el-row>
-    <span slot="footer" class="dialog-footer">
-        <el-button @click="visible = false"> 取 消</el-button>
-        <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
-    </span>
-    </el-dialog>
+							</el-date-picker>
+						</el-form-item>
+					</el-col>
+				</template>
+			</el-form>
+		</el-row>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false"> 取 消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
+		</span>
+	</el-dialog>
 </template>
 <script>
-    import request from '@/utils/request'
-    import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-    export default {
-        components: {},
-        props: [],
-        data() {
-            return {
-                visible: false,
-                loading: false,
-                isDetail: false,
-            dataForm: {
-                            code : '',
-                            companyCode : '',
-                            companyName : '',
-                            location : '',
-                            type : "",
-                            organization : "",
-                            sublibrary : "",
-                            activestate : "2",
-                            remark : '',
-                            creatorusername : '',
-                            creatortime : '',
-                            lastmodifyusername : '',
-                            lastmodifytime : '',
-            },
-            rules:
-            {
-              code: [
-                {
-                  required: true,
-                  message: '请输入',
-                  trigger: 'blur'
-                },
-              ],
-              type: [
-                {
-                  required: true,
-                  message: '请输入',
-                  trigger: 'blur'
-                },
-              ],
-              organization: [
-                {
-                  required: true,
-                  message: '请输入',
-                  trigger: 'blur'
-                },
-              ],
-              sublibrary: [
-                {
-                  required: true,
-                  message: '请输入',
-                  trigger: 'blur'
-                },
-              ],
-            },
-                        typeOptions:[{"fullName":"原料库","id":"0"},{"fullName":"中间库","id":"1"},{"fullName":"成品库","id":"2"},{"fullName":"副产品库","id":"3"},{"fullName":"废次品库","id":"4"},{"fullName":"备件辅材库","id":"5"},{"fullName":"贸易虚拟库","id":"6"},{"fullName":"仓储库","id":"7"},{"fullName":"能源库","id":"8"},{"fullName":"其他库","id":"9"},{"fullName":"帐外库","id":"10"}],
-                        organizationOptions:[{"fullName":"济钢集团","id":"0"},{"fullName":"日照","id":"1"}],
-                        sublibraryOptions:[{"fullName":"城市矿产钢材库","id":"0"},{"fullName":"黄河爆破待发库","id":"1"},{"fullName":"黄河爆破完工库","id":"2"}],
-                        activestateOptions:[{"fullName":"激活","id":"1"},{"fullName":"未激活","id":"0"}],
-
-        }
-        },
-        computed: {},
-        watch: {},
-        created() {
-        },
-        mounted() {},
-        methods: {
-            clearData(data){
-                for (let key in data) {
-                    if (data[key] instanceof Array) {
-                        data[key] = [];
-                    } else if (data[key] instanceof Object) {
-                        this.clearData(data[key]);
-                    } else {
-                        data[key] = "";
-                    }
-                }
-            },
-            init(id, isDetail) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.isDetail = isDetail || false;
-                this.$nextTick(() => {
-                    this.$refs['elForm'].resetFields();
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/warehouse/Warehouse/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        });
-                    }else{
-                       this.clearData(this.dataForm)
-                    }
-                });
-                this.$store.commit('generator/UPDATE_RELATION_DATA', {})
-            },
-            // 表单提交
-            dataFormSubmit() {
-                this.$refs['elForm'].validate((valid) => {
-                    if (valid) {
-                            this.request()
-                    }
-                })
-            },
-            request() {
-                var _data =this.dataList()
-                if (!this.dataForm.id) {
-                    request({
-                        url: '/api/warehouse/Warehouse',
-                        method: 'post',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                this.visible = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    })
-                }else{
-                    request({
-                        url: '/api/warehouse/Warehouse/'+this.dataForm.id,
-                        method: 'PUT',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                this.visible = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    })
-                }
-            },
-            dataList(){
-                var _data = JSON.parse(JSON.stringify(this.dataForm));
-                return _data;
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                this.dataForm = _dataAll
-            },
-        },
-    }
+	import request from '@/utils/request'
+	import {
+		getDataInterfaceRes
+	} from '@/api/systemData/dataInterface'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	export default {
+		components: {},
+		props: [],
+		data() {
+			return {
+				visible: false,
+				loading: false,
+				isDetail: false,
+				dataForm: {
+					code: '',
+					companyCode: '',
+					companyName: '',
+					location: '',
+					type: "",
+					organization: "",
+					sublibrary: "",
+					activestate: "1",
+					remark: '',
+					creatorusername: '',
+					creatortime: '',
+					lastmodifyusername: '',
+					lastmodifytime: '',
+				},
+				rules: {
+					code: [{
+						required: true,
+						message: '请输入',
+						trigger: 'blur'
+					}, ],
+					type: [{
+						required: true,
+						message: '请输入',
+						trigger: 'blur'
+					}, ],
+					organization: [{
+						required: true,
+						message: '请输入',
+						trigger: 'blur'
+					}, ],
+					sublibrary: [{
+						required: true,
+						message: '请输入',
+						trigger: 'blur'
+					}, ],
+				},
+				typeOptions: [{
+					"fullName": "原料库",
+					"id": "0"
+				}, {
+					"fullName": "中间库",
+					"id": "1"
+				}, {
+					"fullName": "成品库",
+					"id": "2"
+				}, {
+					"fullName": "副产品库",
+					"id": "3"
+				}, {
+					"fullName": "废次品库",
+					"id": "4"
+				}, {
+					"fullName": "备件辅材库",
+					"id": "5"
+				}, {
+					"fullName": "贸易虚拟库",
+					"id": "6"
+				}, {
+					"fullName": "仓储库",
+					"id": "7"
+				}, {
+					"fullName": "能源库",
+					"id": "8"
+				}, {
+					"fullName": "其他库",
+					"id": "9"
+				}, {
+					"fullName": "帐外库",
+					"id": "10"
+				}],
+				organizationOptions: [{
+					"fullName": "济钢集团",
+					"id": "0"
+				}, {
+					"fullName": "日照",
+					"id": "1"
+				}],
+				sublibraryOptions: [{
+					"fullName": "城市矿产钢材库",
+					"id": "0"
+				}, {
+					"fullName": "黄河爆破待发库",
+					"id": "1"
+				}, {
+					"fullName": "黄河爆破完工库",
+					"id": "2"
+				}],
+				/* activestateOptions: [{
+					"fullName": "激活",
+					"id": "1"
+				}, {
+					"fullName": "未激活",
+					"id": "0"
+				}], */
 
+			}
+		},
+		computed: {},
+		watch: {},
+		created() {},
+		mounted() {},
+		methods: {
+			clearData(data) {
+				for (let key in data) {
+					if (data[key] instanceof Array) {
+						data[key] = [];
+					} else if (data[key] instanceof Object) {
+						this.clearData(data[key]);
+					} else {
+						data[key] = "";
+					}
+				}
+			},
+			init(id, isDetail) {
+				this.dataForm.id = id || 0;
+				this.visible = true;
+				this.isDetail = isDetail || false;
+				this.$nextTick(() => {
+					this.$refs['elForm'].resetFields();
+					if (this.dataForm.id) {
+						this.loading = true
+						request({
+							url: '/api/warehouse/Warehouse/' + this.dataForm.id,
+							method: 'get'
+						}).then(res => {
+							this.dataInfo(res.data)
+							this.loading = false
+						});
+					} else {
+						this.clearData(this.dataForm)
+					}
+				});
+				this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+			},
+			// 表单提交
+			dataFormSubmit() {
+				this.$refs['elForm'].validate((valid) => {
+					if (valid) {
+						this.request()
+					}
+				})
+			},
+			request() {
+				var _data = this.dataList()
+				if (!this.dataForm.id) {
+					request({
+						url: '/api/warehouse/Warehouse',
+						method: 'post',
+						data: _data
+					}).then((res) => {
+						this.$message({
+							message: res.msg,
+							type: 'success',
+							duration: 1000,
+							onClose: () => {
+								this.visible = false
+								this.$emit('refresh', true)
+							}
+						})
+					})
+				} else {
+					request({
+						url: '/api/warehouse/Warehouse/' + this.dataForm.id,
+						method: 'PUT',
+						data: _data
+					}).then((res) => {
+						this.$message({
+							message: res.msg,
+							type: 'success',
+							duration: 1000,
+							onClose: () => {
+								this.visible = false
+								this.$emit('refresh', true)
+							}
+						})
+					})
+				}
+			},
+			dataList() {
+				var _data = JSON.parse(JSON.stringify(this.dataForm));
+				return _data;
+			},
+			dataInfo(dataAll) {
+				let _dataAll = dataAll
+				this.dataForm = _dataAll
+			},
+		},
+	}
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/warehouse/index.vue b/SC-web/src/views/scm/basicInformation/warehouse/index.vue
index dce860d2..8e36e6d3 100644
--- a/SC-web/src/views/scm/basicInformation/warehouse/index.vue
+++ b/SC-web/src/views/scm/basicInformation/warehouse/index.vue
@@ -1,309 +1,414 @@
 <template>
-    <div class="JNPF-common-layout">
+	<div class="JNPF-common-layout">
 
-        <div class="JNPF-common-layout-center">
-            <el-row class="JNPF-common-search-box" :gutter="16">
-                <el-form @submit.native.prevent>
-                                            <el-col :span="6">
-                                <el-form-item label="激活状态 ">
-                                        <el-select v-model="query.activestate" placeholder="请选择"
-                                                   clearable>
-                                            <el-option v-for="(item, index) in activestateOptions" :key="index"
-                                                       :label="item.fullName" :value="item.id"
-                                                       :disabled="item.disabled"></el-option>
-                                        </el-select>
-                                </el-form-item>
-                            </el-col>
-                        <el-col :span="6">
-                                <el-form-item label="仓库编码">
-                                        <el-input v-model="query.code" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                    <el-col :span="6">
-                        <el-form-item>
-                            <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-                            <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-                        </el-form-item>
-                    </el-col>
-                </el-form>
-            </el-row>
-            <div class="JNPF-common-layout-main JNPF-flex-main">
-                <div class="JNPF-common-head">
-                    <div>
-                                    <el-button type="primary" icon="el-icon-plus"  @click="addOrUpdateHandle()">新增
-                                    </el-button>
-                                    <el-button type="text" icon="el-icon-download" @click="exportData()" >导出
-                                    </el-button>
-                                    <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" >批量删除
-                                    </el-button>
-                    </div>
-                    <div class="JNPF-common-head-right">
-                        <el-tooltip effect="dark" content="刷新" placement="top">
-                            <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                                     @click="reset()"/>
-                        </el-tooltip>
-                        <screenfull isContainer/>
-                    </div>
-                </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  has-c @selection-change="handleSelectionChange">
-                            <el-table-column prop="code" label="仓库编码" width="0" align="left"
-/>
-                                <el-table-column label="激活状态 " width="0" prop="activestate" algin="left"
->
-                                    <template slot-scope="scope">
-                                        {{ scope.row.activestate | dynamicText(activestateOptions) }}
-                                    </template>
-                                </el-table-column>
-                            <el-table-column prop="companyCode" label="公司代码" width="0" align="left"
-/>
-                            <el-table-column prop="companyName" label="公司名称" width="0" align="left"
-/>
-                                <el-table-column label="仓库类型" width="0" prop="type" algin="left"
->
-                                    <template slot-scope="scope">
-                                        {{ scope.row.type | dynamicText(typeOptions) }}
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="ERP库存组织" width="0" prop="organization" algin="left"
->
-                                    <template slot-scope="scope">
-                                        {{ scope.row.organization | dynamicText(organizationOptions) }}
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="ERP子库" width="0" prop="sublibrary" algin="left"
->
-                                    <template slot-scope="scope">
-                                        {{ scope.row.sublibrary | dynamicText(sublibraryOptions) }}
-                                    </template>
-                                </el-table-column>
-                            <el-table-column prop="location" label="仓库位置" width="0" align="left"
-/>
-                            <el-table-column prop="creatorusername" label="创建人名称" width="0" align="left"
-/>
-                            <el-table-column prop="creatortime" label="创建时间" width="0" align="left"
-/>
-                            <el-table-column prop="lastmodifyusername" label="修改人名称" width="0" align="left"
-/>
-                            <el-table-column prop="lastmodifytime" label="修改时间" width="0" align="left"
-/>
-                            <el-table-column prop="remark" label="备注" width="0" align="left"
-/>
-                        <el-table-column label="操作" fixed="right"
-                                         width="100" >
-                            <template slot-scope="scope">
-                                        <el-button type="text"
-                                                   @click="addOrUpdateHandle(scope.row.id)" >编辑
-                                        </el-button>
-                                        <el-button type="text" class="JNPF-table-delBtn"  @click="handleDel(scope.row.id)">删除
-                                        </el-button>
-                            </template>
-                        </el-table-column>
-                </JNPF-table>
-                    <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
-            </div>
-        </div>
-        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
-        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
-        <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
-    </div>
+		<div class="JNPF-common-layout-center">
+			<el-row class="JNPF-common-search-box" :gutter="16">
+				<el-form @submit.native.prevent>
+					<el-col :span="6">
+						<el-form-item label="激活状态 ">
+							<el-select v-model="query.activestate" placeholder="请选择" clearable>
+								<el-option v-for="(item, index) in activestateOptions" :key="index"
+									:label="item.fullName" :value="item.id" :disabled="item.disabled"></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="仓库编码">
+							<el-input v-model="query.code" placeholder="请输入" clearable> </el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+						</el-form-item>
+					</el-col>
+				</el-form>
+			</el-row>
+			<div class="JNPF-common-layout-main JNPF-flex-main">
+				<div class="JNPF-common-head">
+					<div>
+						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+						</el-button>
+						<el-button type="text" icon="el-icon-download" @click="exportData()">导出
+						</el-button>
+						<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+						</el-button>
+					</div>
+					<div class="JNPF-common-head-right">
+						<el-tooltip effect="dark" content="刷新" placement="top">
+							<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+								@click="reset()" />
+						</el-tooltip>
+						<screenfull isContainer />
+					</div>
+				</div>
+				<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
+					@selection-change="handleSelectionChange">
+					<el-table-column prop="code" label="仓库编码" width="0" align="left" />
+					<el-table-column label="激活状态 " width="0" prop="activestate" algin="left">
+						<template slot-scope="scope">
+							{{ scope.row.activestate | dynamicText(activestateOptions) }}
+						</template>
+					</el-table-column>
+					<el-table-column prop="companyCode" label="公司代码" width="0" align="left" />
+					<el-table-column prop="companyName" label="公司名称" width="0" align="left" />
+					<el-table-column label="仓库类型" width="0" prop="type" algin="left">
+						<template slot-scope="scope">
+							{{ scope.row.type | dynamicText(typeOptions) }}
+						</template>
+					</el-table-column>
+					<el-table-column label="ERP库存组织" width="0" prop="organization" algin="left">
+						<template slot-scope="scope">
+							{{ scope.row.organization | dynamicText(organizationOptions) }}
+						</template>
+					</el-table-column>
+					<el-table-column label="ERP子库" width="0" prop="sublibrary" algin="left">
+						<template slot-scope="scope">
+							{{ scope.row.sublibrary | dynamicText(sublibraryOptions) }}
+						</template>
+					</el-table-column>
+					<el-table-column prop="location" label="仓库位置" width="0" align="left" />
+					<el-table-column prop="creatorusername" label="创建人名称" width="0" align="left" />
+					<el-table-column prop="creatortime" label="创建时间" width="0" align="left" />
+					<el-table-column prop="lastmodifyusername" label="修改人名称" width="0" align="left" />
+					<el-table-column prop="lastmodifytime" label="修改时间" width="0" align="left" />
+					<el-table-column prop="remark" label="备注" width="0" align="left" />
+					<el-table-column label="操作" fixed="right" width="100">
+						<template slot-scope="scope">
+							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
+							</el-button>
+							<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+							</el-button>
+						</template>
+					</el-table-column>
+				</JNPF-table>
+				<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+					@pagination="initData" />
+			</div>
+		</div>
+		<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
+		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+		<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
+	</div>
 </template>
 
 <script>
-    import request from '@/utils/request'
-    import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
-    import JNPFForm from './Form'
-    import ExportBox from './ExportBox'
-    import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
-    import Detail from './Detail'
+	import request from '@/utils/request'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	import JNPFForm from './Form'
+	import ExportBox from './ExportBox'
+	import {
+		getDataInterfaceRes
+	} from '@/api/systemData/dataInterface'
+	import Detail from './Detail'
 
-    export default {
-        components: {JNPFForm, ExportBox,Detail},
-        data() {
-            return {
-                detailVisible: false,
-                query: {
-                                activestate:undefined,
-                                code:undefined,
-                },
-                treeProps: {
-                    children: 'children',
-                    label: 'fullName',
-                    value: 'id'
-                },
-                list: [],
-                listLoading: true,
- multipleSelection: [],                    total: 0,
-                listQuery: {
-                        currentPage: 1,
-                        pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
-                },
-                formVisible: false,
-                exportBoxVisible: false,
-                columnList: [
-                    {prop: 'code', label: '仓库编码'},
-                    {prop: 'activestate', label: '激活状态 '},
-                    {prop: 'companyCode', label: '公司代码'},
-                    {prop: 'companyName', label: '公司名称'},
-                    {prop: 'type', label: '仓库类型'},
-                    {prop: 'organization', label: 'ERP库存组织'},
-                    {prop: 'sublibrary', label: 'ERP子库'},
-                    {prop: 'location', label: '仓库位置'},
-                    {prop: 'creatorusername', label: '创建人名称'},
-                    {prop: 'creatortime', label: '创建时间'},
-                    {prop: 'lastmodifyusername', label: '修改人名称'},
-                    {prop: 'lastmodifytime', label: '修改时间'},
-                    {prop: 'remark', label: '备注'},
-                ],
-                                typeOptions:[{"fullName":"原料库","id":"0"},{"fullName":"中间库","id":"1"},{"fullName":"成品库","id":"2"},{"fullName":"副产品库","id":"3"},{"fullName":"废次品库","id":"4"},{"fullName":"备件辅材库","id":"5"},{"fullName":"贸易虚拟库","id":"6"},{"fullName":"仓储库","id":"7"},{"fullName":"能源库","id":"8"},{"fullName":"其他库","id":"9"},{"fullName":"帐外库","id":"10"}],
-                            typeProps:{"label":"fullName","value":"id"},
-                                organizationOptions:[{"fullName":"济钢集团","id":"0"},{"fullName":"日照","id":"1"}],
-                            organizationProps:{"label":"fullName","value":"id"},
-                                sublibraryOptions:[{"fullName":"城市矿产钢材库","id":"0"},{"fullName":"黄河爆破待发库","id":"1"},{"fullName":"黄河爆破完工库","id":"2"}],
-                            sublibraryProps:{"label":"fullName","value":"id"},
-                                activestateOptions:[{"fullName":"激活","id":"1"},{"fullName":"未激活","id":"0"}],
-                            activestateProps:{"label":"fullName","value":"id"},
-            }
-        },
-        computed: {
-            menuId() {
-                return this.$route.meta.modelId || ''
-            }
-        },
-        created() {
-                this.initData()
-        },
-        methods: {
-            goDetail(id){
-                this.detailVisible = true
-                this.$nextTick(() => {
-                    this.$refs.Detail.init(id)
-                })
-            },
-            sortChange({column, prop, order}) {
-                this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-                this.listQuery.sidx = !order ? '' : prop
-                this.initData()
-            },
-            initData() {
-                this.listLoading = true;
-                let _query = {
-                    ...this.listQuery,
-                    ...this.query,
-                    menuId:this.menuId
-                };
-                request({
-                    url: `/api/warehouse/Warehouse/getList`,
-                    method: 'post',
-                    data: _query
-                }).then(res => {
-                    var _list =[];
-                    for(let i=0;i<res.data.list.length;i++){
-                        let _data = res.data.list[i];
-                        _list.push(_data)
-                    }
-                    this.list = _list
-                        this.total = res.data.pagination.total
+	export default {
+		components: {
+			JNPFForm,
+			ExportBox,
+			Detail
+		},
+		data() {
+			return {
+				detailVisible: false,
+				query: {
+					activestate: undefined,
+					code: undefined,
+				},
+				treeProps: {
+					children: 'children',
+					label: 'fullName',
+					value: 'id'
+				},
+				list: [],
+				listLoading: true,
+				multipleSelection: [],
+				total: 0,
+				listQuery: {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				},
+				formVisible: false,
+				exportBoxVisible: false,
+				columnList: [{
+						prop: 'code',
+						label: '仓库编码'
+					},
+					{
+						prop: 'activestate',
+						label: '激活状态 '
+					},
+					{
+						prop: 'companyCode',
+						label: '公司代码'
+					},
+					{
+						prop: 'companyName',
+						label: '公司名称'
+					},
+					{
+						prop: 'type',
+						label: '仓库类型'
+					},
+					{
+						prop: 'organization',
+						label: 'ERP库存组织'
+					},
+					{
+						prop: 'sublibrary',
+						label: 'ERP子库'
+					},
+					{
+						prop: 'location',
+						label: '仓库位置'
+					},
+					{
+						prop: 'creatorusername',
+						label: '创建人名称'
+					},
+					{
+						prop: 'creatortime',
+						label: '创建时间'
+					},
+					{
+						prop: 'lastmodifyusername',
+						label: '修改人名称'
+					},
+					{
+						prop: 'lastmodifytime',
+						label: '修改时间'
+					},
+					{
+						prop: 'remark',
+						label: '备注'
+					},
+				],
+				typeOptions: [{
+					"fullName": "原料库",
+					"id": "0"
+				}, {
+					"fullName": "中间库",
+					"id": "1"
+				}, {
+					"fullName": "成品库",
+					"id": "2"
+				}, {
+					"fullName": "副产品库",
+					"id": "3"
+				}, {
+					"fullName": "废次品库",
+					"id": "4"
+				}, {
+					"fullName": "备件辅材库",
+					"id": "5"
+				}, {
+					"fullName": "贸易虚拟库",
+					"id": "6"
+				}, {
+					"fullName": "仓储库",
+					"id": "7"
+				}, {
+					"fullName": "能源库",
+					"id": "8"
+				}, {
+					"fullName": "其他库",
+					"id": "9"
+				}, {
+					"fullName": "帐外库",
+					"id": "10"
+				}],
+				typeProps: {
+					"label": "fullName",
+					"value": "id"
+				},
+				organizationOptions: [{
+					"fullName": "济钢集团",
+					"id": "0"
+				}, {
+					"fullName": "日照",
+					"id": "1"
+				}],
+				organizationProps: {
+					"label": "fullName",
+					"value": "id"
+				},
+				sublibraryOptions: [{
+					"fullName": "城市矿产钢材库",
+					"id": "0"
+				}, {
+					"fullName": "黄河爆破待发库",
+					"id": "1"
+				}, {
+					"fullName": "黄河爆破完工库",
+					"id": "2"
+				}],
+				sublibraryProps: {
+					"label": "fullName",
+					"value": "id"
+				},
+				activestateOptions: [{
+					"fullName": "激活",
+					"id": "1"
+				}, {
+					"fullName": "未激活",
+					"id": "0"
+				}],
+				activestateProps: {
+					"label": "fullName",
+					"value": "id"
+				},
+			}
+		},
+		computed: {
+			menuId() {
+				return this.$route.meta.modelId || ''
+			}
+		},
+		created() {
+			this.initData()
+		},
+		methods: {
+			goDetail(id) {
+				this.detailVisible = true
+				this.$nextTick(() => {
+					this.$refs.Detail.init(id)
+				})
+			},
+			sortChange({
+				column,
+				prop,
+				order
+			}) {
+				this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+				this.listQuery.sidx = !order ? '' : prop
+				this.initData()
+			},
+			initData() {
+				this.listLoading = true;
+				let _query = {
+					...this.listQuery,
+					...this.query,
+					menuId: this.menuId
+				};
+				request({
+					url: `/api/warehouse/Warehouse/getList`,
+					method: 'post',
+					data: _query
+				}).then(res => {
+					var _list = [];
+					for (let i = 0; i < res.data.list.length; i++) {
+						let _data = res.data.list[i];
+						_list.push(_data)
+					}
+					this.list = _list
+					this.total = res.data.pagination.total
 
-                    this.listLoading = false
-                })
-            },
-            handleDel(id) {
-                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    request({
-                        url: `/api/warehouse/Warehouse/${id}`,
-                        method: 'DELETE'
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => {
-                });
-            },
-                handleSelectionChange(val) {
-                    const res = val.map(item => item.id)
-                    this.multipleSelection = res
-                },
-                handleBatchRemoveDel() {
-                    if (!this.multipleSelection.length) {
-                        this.$message({
-                            type: 'error',
-                            message: '请选择一条数据',
-                            duration: 1500,
-                        })
-                        return
-                    }
-                    const ids = this.multipleSelection.join()
-                    this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-                        type: 'warning'
-                    }).then(() => {
-                        request({
-                            url: `/api/warehouse/Warehouse/batchRemove/${ids}`,
-                            method: 'DELETE'
-                        }).then(res => {
-                            this.$message({
-                                type: 'success',
-                                message: res.msg,
-                                onClose: () => {
-                                    this.initData()
-                                }
-                            });
-                        })
-                    }).catch(() => {
-                    })
-                },
-            addOrUpdateHandle(id, isDetail) {
-                this.formVisible = true
-                this.$nextTick(() => {
-                    this.$refs.JNPFForm.init(id, isDetail)
-                })
-            },
-            exportData() {
-                this.exportBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.ExportBox.init(this.columnList)
-                })
-            },
-            download(data) {
-                let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
-                request({
-                    url: `/api/warehouse/Warehouse/Actions/Export`,
-                    method: 'GET',
-                    data: query
-                }).then(res => {
-                    if (!res.data.url) return
-                    this.jnpf.downloadFile(res.data.url)
-                    this.$refs.ExportBox.visible = false
-                    this.exportBoxVisible = false
-                })
-            },
-            search() {
-                this.listQuery = {
-                        currentPage: 1,
-                        pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
-                }
-                this.initData()
-            },
-            refresh(isrRefresh) {
-                this.formVisible = false
-                if (isrRefresh) this.reset()
-            },
-            reset() {
-                for (let key in this.query) {
-                    this.query[key] = undefined
-                }
-                this.search()
-            }
-        }
-    }
+					this.listLoading = false
+				})
+			},
+			handleDel(id) {
+				this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/warehouse/Warehouse/${id}`,
+						method: 'DELETE'
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {});
+			},
+			handleSelectionChange(val) {
+				const res = val.map(item => item.id)
+				this.multipleSelection = res
+			},
+			handleBatchRemoveDel() {
+				if (!this.multipleSelection.length) {
+					this.$message({
+						type: 'error',
+						message: '请选择一条数据',
+						duration: 1500,
+					})
+					return
+				}
+				const ids = this.multipleSelection.join()
+				this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/warehouse/Warehouse/batchRemove/${ids}`,
+						method: 'DELETE'
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {})
+			},
+			addOrUpdateHandle(id, isDetail) {
+				this.formVisible = true
+				this.$nextTick(() => {
+					this.$refs.JNPFForm.init(id, isDetail)
+				})
+			},
+			exportData() {
+				this.exportBoxVisible = true
+				this.$nextTick(() => {
+					this.$refs.ExportBox.init(this.columnList)
+				})
+			},
+			download(data) {
+				let query = {
+					...data,
+					...this.listQuery,
+					...this.query,
+					menuId: this.menuId
+				}
+				request({
+					url: `/api/warehouse/Warehouse/Actions/Export`,
+					method: 'GET',
+					data: query
+				}).then(res => {
+					if (!res.data.url) return
+					this.jnpf.downloadFile(res.data.url)
+					this.$refs.ExportBox.visible = false
+					this.exportBoxVisible = false
+				})
+			},
+			search() {
+				this.listQuery = {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				}
+				this.initData()
+			},
+			refresh(isrRefresh) {
+				this.formVisible = false
+				if (isrRefresh) this.reset()
+			},
+			reset() {
+				for (let key in this.query) {
+					this.query[key] = undefined
+				}
+				this.search()
+			}
+		}
+	}
 </script>