From cdec2aba2184a33db143684530e401aff180a343 Mon Sep 17 00:00:00 2001
From: jxj_yjl <1490736767@qq.com>
Date: Thu, 27 Apr 2023 15:22:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=90=E6=96=99=E7=AE=A1=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2/=E4=B8=AD=E5=BB=BA=E4=BA=94=E5=B1=80=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/js/config.js                           |   4 +-
 src/assets/images/menu/xmgk_cggl.png          | Bin 4905 -> 4799 bytes
 src/assets/images/menu/xmgk_htgl.png          | Bin 4466 -> 4466 bytes
 src/assets/images/menu/xmgk_sbgl.png          | Bin 4798 -> 4736 bytes
 src/assets/images/menu/xmgk_zcgl.png          | Bin 4860 -> 4753 bytes
 src/assets/images/menu/xmgk_zclgl.png         | Bin 5472 -> 5418 bytes
 src/assets/js/api/materialManagement.js       |   2 +-
 src/assets/js/http.js                         |   5 +-
 .../companyAdmin/basicSetup/checkItem.vue     | 136 ++--
 .../projectFront/configManage/roleManage.vue  |   8 +-
 .../inspectionWarehousing.vue                 | 246 ++++---
 .../inOutboundManagement/materialOutbound.vue | 683 +++++++++++-------
 .../quality/businessModule/checkPoint.vue     |  19 +-
 .../projectFront/quality/qualitypersonnel.vue |  66 +-
 .../recordsModule/inspectionRecord.vue        |  41 +-
 .../entryRegistration.vue                     | 649 +++++++++++------
 .../exitRegistration.vue                      | 683 +++++++++++-------
 17 files changed, 1575 insertions(+), 967 deletions(-)

diff --git a/public/js/config.js b/public/js/config.js
index a1d887b1..e82ee993 100644
--- a/public/js/config.js
+++ b/public/js/config.js
@@ -1,4 +1,4 @@
-// var COMPANY = ''; //通用
+var COMPANY = ''; //通用
 // var COMPANY='zhongjian'; //中建，和沃尔对接的插件版用这个企业
 // var COMPANY='hezhan'; //合展-宿迁
 // var COMPANY='nanchang'; //南昌地铁、衢州
@@ -11,7 +11,7 @@
 // COMPANY = 'yunlian'//云联万物
 // COMPANY = 'neimenggu'//内蒙古项目
 // COMPANY = 'zjsj'//中建四局
-COMPANY = 'zjwj'//中建五局
+// COMPANY = 'zjwj'//中建五局
 
 
 
diff --git a/src/assets/images/menu/xmgk_cggl.png b/src/assets/images/menu/xmgk_cggl.png
index aa5fe1774c48c473dd84aa77207923eb681aa7f2..9f6b986f045822c5db5f601b75b89d9d696f9155 100644
GIT binary patch
delta 4757
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

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

diff --git a/src/assets/images/menu/xmgk_htgl.png b/src/assets/images/menu/xmgk_htgl.png
index d8c7d579e99a88f2a745257aa48c7c22746d2a6c..f7165111fc1f2ff18c4bbc7561d2b28b91183b42 100644
GIT binary patch
delta 4414
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
Ef;W1%1poj5

delta 4414
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
Ef`&h?XaE2J

diff --git a/src/assets/images/menu/xmgk_sbgl.png b/src/assets/images/menu/xmgk_sbgl.png
index 24dc687528f47ba35071e5798d4f446066657522..fda5cb041c0950914332e7cafd8d6402bafc458c 100644
GIT binary patch
delta 4693
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
X18aJjj{#6;00000NkvXXu0mjfCtVYI

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

diff --git a/src/assets/images/menu/xmgk_zcgl.png b/src/assets/images/menu/xmgk_zcgl.png
index 817fb111eef18966dce338bcbc2e009964442e0d..30e80a408f2f114a0bed730c558cba2b22b84ef3 100644
GIT binary patch
delta 4710
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

delta 4818
zcmV;@5-shKCHy6jR)3L6L_t(|0j*n0kRQc)|8>vI|DoO0uGn3z1WP19$jD%0ff5^B
z76Nj}oAMzSSE_PJu1=LNT#_J_PaIRZ1SdJ95+8_DIi#GTzz7Qh*fEk&EF=titzfl!
zto9}C|2Z@L<?HV0nV$LoR}bu7&3}4&`tiNLufHA%e8I9xw11@@;{{201_ECrqMd*k
z=eyuS014t>e#id=i2t|>*JcXYo9@r=Me%HELJ?M_5Oe%|f`=SwxA9*S6JiBlpoqKa
ztdUq<?e45MYk$Q<|C|9F*N~HeZAgD_5gJ@n<1Dggzg`+IG8&m5LqPE_P&m|ViaFdx
zxh<lWL(IWdOn-zmyc9@$*HGWVP8q`rd_)B+pNG0LW#jE=JHE1JF>yA?QlglJlu~~;
z(v;t`$p4y%Y9#f2wTqo~&|5s?PTanDh?#2kTr|^0BH#li^zw!(PLzFkGiHkm-0*y(
zfw|iuEH`@LkZi~JS`B!M^<^iS1q2bfE@o|WSDH`c#(%m?*a67uROl#W6A-z&ck#1Q
z{z7h!{1Ubw?Np${8b%GTgLx?7ZiVRD8XgSmcvBmiT#p<(ZpRkNe+K*AYV5FgL)yxE
zEiQx-zgw>x&Z=S43T%Mn!c9z$26U7=>~LZPYY=iB^3@XXjSdZ&+O}C5(a@zuWmX?i
zky)j|wSU}THcknCdu$9#!^Bt)L-NQG1fx>@twu5vFOj{{B4tGmA_q7ZF*tE7l&TO%
z3!qZ|Sl8dyRaU1mj;6nI^E&lFj;JNOqMao1H%EYAm<U&8MEpBJK6eujN0Lta0z(;9
z^PU(&)!YPA*>`$9g^=jQ3a6I{=h-7Jb_l%$sDFpRbW>o@l)cJsrm#iAd-m6IUHeMx
z`REwV9XNp0=WK{F^~Bk;2!n0vuN7G&Nr>F-m&J)W;2~s@$T%e|2lP8tLK8T>nBwh=
zj9glx5ITL}vp(UoHNwy5fv?{u@a1WlBWStqNMA^VWlv615s>=s?5zCWAq}3#hk_K$
z?tf#)5N>+_Gb1(n+%YXv&XR-3w5`CnJk^Hf=ktW0&8w;yRGdap|Hl0SPt8gPA97-P
zQI>u-krgRj(K5Tb-s^t#%7y0Defvc0mhg2{^!o@KAzmm<xby$Q=!YR4S&VHT@=SiA
zU%9U4b>P^7!h4@7sMNTQ;?k0lqG)$@ZhwEDIe%u!xh+v3Ovu}eYg0-Xo+uJL$3!D+
zzHoEW=&CFsnklcCo<_vI_vb+8e$hvwFebSVgeW7dvcAgJ*SduF=cs}t6^P}}wvD{@
z*FII~CT`tqt$fXbn2N~xR_3ev)|gtUAMqHOD*;>Ds4dWtQa<KSsGNm`&%t5=%YS9>
zIqxg-w)dDb?U-_eNL7)e5&=^0U5EAd=p~hN51E933RhhOCsyJZ)yHJIrG`0#2M=1V
zN@t4i*#iz^QRm5LOB4FhTrS3iNUD<fW{6b8`r>jXvZ>{2s;Cgrp;!6+#bwIp&F@s)
ztM;FpW+RElJvR`%^pb50wIctND1R7haUH!n5N!tB1SrUs&EO1CZX8Mm9|P{C&tkXI
z&fdAmLzJ!Nuu@oXi>MagdVtLS7hs9Z!h4+2hIun;qBeRD!Xs8{m2ofAryzp>VK?L;
z%1xgK0aP-ErM3#dRQk2|D>to3W&n6QlZ||Fc{W$NY(Hy3xtToV3PRf^c7N6Nl|@9;
z3s!1F{lmUfw8s!cZG@^CRb<f6ur{CT8N}WO%rxsjK&fKj#)#dzP^n(bqMU23z$yB1
zEs6R;U5=PI$8a<ZA)+pVgt?kCs33o772dMt!YWE&m*ZZ_Fs(^p^vrc}6dx!Rkt~5A
ztk~MR2bY6{2B{%yk=!gId4E099L*5D%!qE%vK+_kdjdO|qB8tk{^NwgCs(PwR(0)4
z+aG^L8j<V9x9-1D(S2t|nP6dARI_kqa6s17S8+&jBx|FV@&?hG<oVhiksy?)8Vaxa
z@nx#aSeEi(V!6^HJholn7jrbw@Ai6X%l#8_IAMkkvM|*U>9ATjVSkc`4nb_!wPuq=
zIHKG=042BKOnceyQSKM@m6qNYF5!1}h*Ddc`%5a_3m;pq@7o~;V1W-G{AU~7BqA1F
z)~#SM<0$(X`sFVndLt0^AZB3*O75dXKqYeB+dd)irJ1VT66Wv3=L%~btEXB6HuJ7z
z|E>T>K1s`#S`6WkD1Ss#i|sSJCB~bB%qynww|tpez>2Ej<~G~Uh;BRuYBFFdDa`+{
zlBR`z?w%I-*2A(8KhN4OuLCF6GuxQ$A@)Bku-uY3!SU`!qFQbL#zRaXUc*^%QSF%T
zlFD4QCCXq1X{j}cYSCRbXzQ0M7h4B>PAO&gKDznv#|p<UmVbSyTX3yi1Q5y-tv`93
zxziB%>95iOq)LvT%d?M29N=rftvFfD3?`wVKt%}oiMfZSc?dPOfAp6cfez~2I4mG?
z0BhY6u*mMYSK_IM#1NANMnvJlVkS<?1CYxzUlMryeiq|j5k6kvST?rpdX7fKnQ+#}
zy}u<eGcGXb>VG_o?*}SF1uzyG$?!Ua4g+%?l_O0ZD^ZD)9&HS=s(2o6*k|E6X?JHU
zZr(K+@NF7k<@+KYyGh`MC-~aSewn$iT~8yj?ZRU<`SR#s@>5@B*X{H=Q`yM;PE8rn
zEp)WbTuxA=6^9i{0mq#8c>DD3C&)MDz8>lOy;}sn^M7=JiA@CoG?#h5i|tzq8PI{)
zDc+2483Fe06eZ{XpC6=nV5`L59iq^g5<r6ih*R0ba5Tc=V&O+cbp5Kp$P8nuy?RhV
zv>=%i-CUx)x*q~Q&6e^H9(S1mi{Rl?3Uk*8k8q0Q&%PNLozy<|?_W>yU_u+Q=N`4=
zj?XC^JAY4nrFiqCz+W7Ym>8+}?TTK*gT+|gPNAdPk1|JRNHr|XN>zzg>?^6_H~maO
znr)Py-6Qe)U$wxlw19tnE5#2ECpdpanfK?fT2a;Vwak{e(?h=5cHGz3n<rK7Z<lT=
zGtbJppCQaLgYYsL1y^CLZc`(96<R&zi~OUlu7B+E$k58Q+vlllbY=(2h*g3IO@ya*
z3p|@~<Pw|lSKf?q?uv8#HfU&Zw&Cb`W#)c>UDS>#i=_6IJEyI}A3LWQIkNlGj0j7-
z3;Mxfi>ynFTG)hFrySO5kuNi8uH=ugaM6X^3iyVm$nAI=V~qd<G|oZ6^N$5Nr(XF<
zf`6qO9&xhGwAS;J7ga`i!uD}Her6m-G<DliMpXABCn?!xTqFC+PZ-&jcf4UP;YD&q
zp17fzy=?~Cvq&7W!9&ORoD3m12-WOCk-#!s;staNp+)QupO9utrqh=Hz<Ss2`Y99P
zNdj<=V`jr?UT1#Ea!n(l*En|-ID5HBt$&nML?e5H@ans1Nn8s9nq@$YO^u;Lz-ikR
z^2HZHmyOD5dFI?$#!Yhi>4}7@=%rp*1M=Wj&cWU<O}{rzC<Am_;^ZLUZ=6UCp&X)@
zu3O|kIHLyFsa$6-EBw#tv;<quQ7b7TNvtF;E?yNzM_+!~H`+SZ74WlwIl`a~7k_@@
zL79hs@0?PDoEUPQ;b7q-7U6ccXnXrqieC&xR1CDe{vnU;y9_U~%wr*ep^oy5)t#|A
zs<DkYdQf!@YNY$D7vfq@bPdhF^7YU*YXQ$LWP0cT8`9T*e&e_*y*qh<?kHKN=V&nw
z?|h^TY$^*09jqKpw+w%@)n&c3I)BPtbimN-b%f!l!ZmoAK4;2}Irntb)wN!ZZ?b*<
z_fwU*8Y&}I68ED1`E?8A?L>7@WeTaV5=W(Mq|iQvZ?elcv86r8%nZBT%zx%NXK_J7
zJ&5X7O$_>2U2K$N2{XS~xTG&!Znq2fie3-75h{);n9p;d*hq6a4LYbfs(*EKhTk+A
zO$vgD3B#voB=US|ew3FvZ&kgMrBJJ9ePm&H%A4~$d#1vD4SSb!)z*z=&kQFF%&;P?
zggyzRTCJ(JGHzNuO;A6lW5bW3WR3euIvRy&GyHj!>VC};haZgc<MlP$<RYB%wkNyi
zk$NQ{_BPq2HvhR)sMtktzklD`CkGM)n(j$VM`eVxA3)8|&trCW)&}*-SvE-bAeC*7
zb`@?gwm;*%_Vd+AG`I4S?bliz%keFoz}n9N!^sQE___fA@4665pAclQOmcetD?25g
zeLTRHF;wDmBf{^CAXt+sND^wPsi|3`a0by2d!QXnq)~u4l+@$!?tgF~>G|rq-+3;`
zC(L(7yi%LF+2qvsx4$Xz?WZL!v2R?y0Tae8-yn1E^n~HMK1*r$Y>aEC5+!ISH`|#v
z)deHMhO;g)%Ll`gV*>Y1W$&Gc4iJziO~ikv5`6|R9*;(nUH3uh(}>VW$fHmvPOPSC
zYNF5S6b>k8f!BVAXMfvoy{Mh^>yHE&%q3-h%xk`PQkd)ZoV*LmlcQ3t*g4EjM$x;F
zazP^LQj*43RyygG`zCB;1bd>b<o1a;?SbhYwgm<4l*DU{)T%Q`xyz|u*r3frVDKIC
z+?0d2+6O5576_I5`JRCd(MqD|HFlV7Ha)Ev^{%MJ$$@MNcYkb1%N?Y=`Q?0lzm<q&
zol;t6WdDiuXMfp(%A;ZqK>lGyv7G}|0rG(LpjSSUC=<aUVs=f0{P@ye-@&85++(ls
z&&<{9e7_m1emmr2)%(6Yt#`VrgeadSCQIw+LDgD<4U!13#u4Hre)B3Lv*ywvE*$iu
zCu>ZLHs?##0Dss0gWCd0*AM<3$fKToEk#ALE$=Vb?&H;ju%O{qX>zlcs@CWvdh;kg
z*vJop4;)|-Z*a)pK&uvps{sWoyf;~6a$Mk})PLi{)ipmH1O~a_mqPqplqD+MLM8e_
z&ar`h)j1u(G)%z1Y8csitny+0s;q@;oX~1rZzF#D5Py^>OZi~)eNl53n?^Zn!A&!L
znR2dAY~y*gX_@3c&+v#ROVHhoJ*nnl9P~qyT&_=^psrYFZadDW^GCR4iT(GI4Co58
zY9U2*bu{Mv`8vA$_T_1?;`1B(We2GvbLexnp%p~Em71tWam-#v3TcyK;&le%IM<&h
zZL58tHh;p4Fh~rlG*KnV<&AMC0~x>B5sK3c%?EtH&d)7vgo04&U~sWk3sz_i>p>m;
zAO9F>6&9aL`W7rKpw2t4O*d|0vR1=Zju^L+45nB^##s+WSm5idFQa^lvx@<_pX*zh
z;A6aK9d}TMop=vBVdE3W9?yA`xq6NHz$z!saDTUTMzpIVz<}f`d(I_3Vd0GkuBA;Z
zt4nA-`6RTLRvUg$l_9P^{S^J(yZNYZ0@_&X<M1@mu9!`-kctf!hlfJ+Nu~cMr2I$<
z5h%S|Fy9+Wc4d|)IwX`?j#p+$L8Y<`DPyMl>1X>jg?s1NsrbD#K`r;yhc@gzpsi?!
zEq`m91DdrYO_zD;#YFU$YARj{#Ati(5F`f>H81sNEC-MtJBB!l&|)f4A~`%1DrStk
zyanroQ7}e{8kK=;=$)F$E)p|9N)xFngJqEi7v>S>^AO=lk!h1=fXMBVv^iX1D*Qf>
z90$mRJM|gu4nwytHJ5{6nIpO7e!sUGB!BfaY_7NCd5(x?29b0e99o=l+O-Q2+wW#S
z?v4ejF~%^AbL6pENioXPjfy}pDNti<0-+>Bl^FJD4(T1Rts3MF=agl7UdgzR?7iix
z%z@LcGUZfrU!;<eOxIaW*17$LM7YK&>Klz3);ZejJT+^$ooeGV><igjBC78{`hOAR
z=-#v8gA==Iy)`sdfK4*MC{H=UfyGFW3O-0co&8uC27v)lsZ_|)`A`-k>pd6`w(kQ@
z^l2RIJJ;sFlblu(VUX~+KBL@15c0(aD8;&D@$GO>Fu4o84|!kmr&(aI(U;iaMu>U?
z(t`(ynlB-(pFwiZ!|1eE&|-1s<A0L0kqFU<f?5>tQ939PiS`E?89h>G{&nt#?>dK*
z7-bFkTs>gB&u!V!o|XaKW)L=GW2REXVjWWiy$eZWS+8}7L)07Tdao`<ds8*^&z?p6
z!yiKFt>&$eyd_7g#eGJ{;w)zmAh>i2j2t4~wFFH3C=9giu-_ooIqTnb1AjZlq6(c(
z-NKvuHb3`7$E;iDXANSn$78sr+w0WK@1!~u)|zQQ;qWv>Jl8_fsUvRABh>+pD86LB
zZMkDaD+t3Oy*LfI_fd$(JmfX)ZFM$0J7spq>LN?xY-NxVPHil4GHx5UTw%*GIc1Y`
zeZDXA-976(R-dy2+u01YT1!xTSfn&^Fagn>A@>_C?xTHov6M^w{hg^F)b)e9F1_~r
suCMQZzo@&*jn`MBaqIsSaHr+}0c28=$a6Cyl>h($07*qoM6N<$g0TT=6aWAK

diff --git a/src/assets/images/menu/xmgk_zclgl.png b/src/assets/images/menu/xmgk_zclgl.png
index e3a948c7645ed6f593e1ef25b34607d760740db9..c03de79729594b7b98e1cc415c5c6110990098b5 100644
GIT binary patch
delta 5380
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

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

diff --git a/src/assets/js/api/materialManagement.js b/src/assets/js/api/materialManagement.js
index 90c017d6..e904979a 100644
--- a/src/assets/js/api/materialManagement.js
+++ b/src/assets/js/api/materialManagement.js
@@ -68,7 +68,7 @@ export const gettGMaterialSupplierEvaluationRecordPageApi = data => get('/xmgl/g
 //出入库管理
 export const addGtMaterialInOutWarehouseApi = data => post('/xmgl/gt/gtMaterialInOutWarehouse/addWithMaterial', data);
 export const deletGtMaterialInOutWarehouseApi = data => post('/xmgl/gt/gtMaterialInOutWarehouse/delete', data);
-export const editGtMaterialInOutWarehouseApi = data => post('/xmgl/gt/gtMaterialInOutWarehouse/edit', data);
+export const editGtMaterialInOutWarehouseApi = data => post('xmgl/gt/gtMaterialInOutWarehouse/editWithMaterial', data);
 export const gettGMaterialInOutWarehousePageApi = data => get('/xmgl/gt/gtMaterialInOutWarehouse/page', data);//查询表单数据
 export const gettGMaterialInOutWarehouseListApi = data => get('/xmgl/gt/gtMaterialPointCheckIntoWarehouseDetail/list', data);//根据id查物料
 
diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 01f52648..537341c8 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -80,12 +80,13 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://192.168.34.221:12346' //郭圣雄本地
   // axios.defaults.baseURL = 'http://192.168.34.221:12350' //金林湾本地
   // axios.defaults.baseURL = 'http://192.168.34.122:8070' //彭洁本地
-  // axios.defaults.baseURL = 'http://192.168.34.221:8070' //演示平台郭圣雄本地
-  axios.defaults.baseURL = 'http://192.168.34.221:30000' //中建五局郭圣雄本地
+  axios.defaults.baseURL = 'http://192.168.34.221:8070' //演示平台郭圣雄本地
+  // axios.defaults.baseURL = 'http://192.168.34.221:30000' //中建五局郭圣雄本地
   // axios.defaults.baseURL = 'http://101.43.164.214:11111' //百色线上
   // axios.defaults.baseURL = 'http://101.43.164.214:12345/'//内蒙古线上
   // axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新
   // axios.defaults.baseURL = 'http://42.194.144.62:8088/'//中建四局线上（新）地址
+  // axios.defaults.baseURL = 'http://101.43.164.214:12350'//中建五局线上
 
 } else if (process.env.NODE_ENV == 'debug') {
   axios.defaults.baseURL = 'https://www.ceshi.com'
diff --git a/src/views/companyAdmin/basicSetup/checkItem.vue b/src/views/companyAdmin/basicSetup/checkItem.vue
index 829a806b..837fa64d 100644
--- a/src/views/companyAdmin/basicSetup/checkItem.vue
+++ b/src/views/companyAdmin/basicSetup/checkItem.vue
@@ -55,7 +55,7 @@
                       @mouseleave="name.visible = false"
                       >{{
                         name.dangerName.length > 9
-                          ? name.dangerName.substring(0, 8) + "..."
+                          ? name.dangerName.substring(0, 8) + '...'
                           : name.dangerName
                       }}</span
                     >
@@ -93,9 +93,9 @@
                   <el-button
                     type="text"
                     size="medium"
-                    style="color: red;font-size: 14px;"
+                    style="color: red; font-size: 14px"
                     icon="el-icon-delete"
-                    @click="del1(name.id,1)"
+                    @click="del1(name.id, 1)"
                   ></el-button>
                 </div>
               </li>
@@ -132,7 +132,7 @@
                     >
                       {{
                         item.dangerName.length > 10
-                          ? item.dangerName.substring(0, 9) + "..."
+                          ? item.dangerName.substring(0, 9) + '...'
                           : item.dangerName
                       }}
                     </div>
@@ -166,9 +166,9 @@
                     <el-button
                       type="text"
                       size="medium"
-                      style="color: red;font-size: 14px;"
+                      style="color: red; font-size: 14px"
                       icon="el-icon-delete"
-                      @click="del1(item.id,2)"
+                      @click="del1(item.id, 2)"
                     ></el-button>
                   </div>
                 </li>
@@ -187,10 +187,7 @@
             </ul>
             <li
               class="title"
-              style="
-                text-align: center;
-                line-height: 140px;
-              "
+              style="text-align: center; line-height: 140px"
               v-show="dataList.length == 0"
             >
               暂无数据
@@ -259,13 +256,13 @@
                   <span style="font-size: 14px">编辑</span>
                 </el-button>
                 <el-button
-                  @click="del1(scope.row.id,3)"
+                  @click="del1(scope.row.id, 3)"
                   type="text"
                   size="small"
-                  style="color: red;"
+                  style="color: red"
                   icon="el-icon-delete"
                 >
-                  <span style="font-size:14px">删除</span>
+                  <span style="font-size: 14px">删除</span>
                 </el-button>
               </template>
             </el-table-column>
@@ -281,9 +278,13 @@
       width="30%"
     >
       <p>你确定要删除该项吗</p>
-      <div slot="footer" style="margin-top:0px;" class="dialog-footer">
-        <el-button size="medium" @click="dialogVisible1 = false">取 消</el-button>
-        <el-button size="medium" type="primary" @click="delSave1">确 定</el-button>
+      <div slot="footer" style="margin-top: 0px" class="dialog-footer">
+        <el-button size="medium" @click="dialogVisible1 = false"
+          >取 消</el-button
+        >
+        <el-button size="medium" type="primary" @click="delSave1"
+          >确 定</el-button
+        >
       </div>
     </el-dialog>
     <el-dialog
@@ -302,10 +303,16 @@
           size="medium"
         >
           <el-form-item label="检查库名称" prop="dangerName">
-            <el-input v-model="dialogdata.dangerName"></el-input>
+            <el-input
+              placeholder="请输入检查库名称"
+              v-model="dialogdata.dangerName"
+            ></el-input>
           </el-form-item>
           <el-form-item label="描述">
-            <el-input v-model="dialogdata.remark"></el-input>
+            <el-input
+              placeholder="请输入"
+              v-model="dialogdata.remark"
+            ></el-input>
           </el-form-item>
           <div class="dialog-footer">
             <el-button
@@ -342,10 +349,16 @@
           size="medium"
         >
           <el-form-item label="大项名称" prop="dangerName">
-            <el-input v-model="dialogdata.dangerName"></el-input>
+            <el-input
+              placeholder="请输入大项"
+              v-model="dialogdata.dangerName"
+            ></el-input>
           </el-form-item>
           <el-form-item label="描述">
-            <el-input v-model="dialogdata.remark"></el-input>
+            <el-input
+              placeholder="请输入"
+              v-model="dialogdata.remark"
+            ></el-input>
           </el-form-item>
         </el-form>
         <div class="dialog-footer">
@@ -395,14 +408,23 @@
             </el-select>
           </el-form-item>
           <el-form-item label="问题描述" prop="content">
-            <el-input v-model="dialogdata.content"></el-input>
+            <el-input
+              placeholder="请输入"
+              v-model="dialogdata.content"
+            ></el-input>
           </el-form-item>
 
           <el-form-item label="整改要求">
-            <el-input v-model="dialogdata.remark"></el-input>
+            <el-input
+              placeholder="请输入"
+              v-model="dialogdata.remark"
+            ></el-input>
           </el-form-item>
           <el-form-item label="整改时限(天)" prop="changeLimit">
-            <el-input v-model="dialogdata.changeLimit"></el-input>
+            <el-input
+              placeholder="请输入"
+              v-model="dialogdata.changeLimit"
+            ></el-input>
           </el-form-item>
         </el-form>
         <div class="dialog-footer">
@@ -630,42 +652,42 @@ export default {
       this.dialogdata = data;
     },
     delSave1() {
-      if(this.type == 3){
+      if (this.type == 3) {
         delDangerItemRecordApi({ id: this.editId }).then((res) => {
-        if (res.code == 200) {
-          this.$message({
-            message: '删除成功',
-            type: 'success',
-          });
-          this.loadList();
-          this.loadRigthtList()
-        } else {
-          this.$message({
-            message: '删除失败',
-            type: "error",
-          });
-        }
-        this.dialogVisible1 = false;
-          });
-      }else{
+          if (res.code == 200) {
+            this.$message({
+              message: '删除成功',
+              type: 'success',
+            });
+            this.loadList();
+            this.loadRigthtList()
+          } else {
+            this.$message({
+              message: '删除失败',
+              type: "error",
+            });
+          }
+          this.dialogVisible1 = false;
+        });
+      } else {
         delDangerTypeRecordApi({ id: this.editId }).then((res) => {
-        if (res.code == 200) {
-          this.$message({
-            message: '删除成功',
-            type: 'success',
-          });
-          this.loadList();
-          this.loadRigthtList()
-        } else {
-          this.$message({
-            message: '删除失败',
-            type: "error",
-          });
-        }
-        this.dialogVisible1 = false;
-          });
+          if (res.code == 200) {
+            this.$message({
+              message: '删除成功',
+              type: 'success',
+            });
+            this.loadList();
+            this.loadRigthtList()
+          } else {
+            this.$message({
+              message: '删除失败',
+              type: "error",
+            });
+          }
+          this.dialogVisible1 = false;
+        });
       }
-      
+
       // this.dialogVisible1 = false;
       // this.$message({
       //   message: "删除成功",
@@ -692,7 +714,7 @@ export default {
       // });
     },
     del1(id, type) {
-      console.log('当前点击的id',id,'类型',type)
+      console.log('当前点击的id', id, '类型', type)
       this.type = type;
       this.title = "删除";
       this.editId = id;
diff --git a/src/views/projectFront/configManage/roleManage.vue b/src/views/projectFront/configManage/roleManage.vue
index 986bfbaa..d9bb6324 100644
--- a/src/views/projectFront/configManage/roleManage.vue
+++ b/src/views/projectFront/configManage/roleManage.vue
@@ -39,18 +39,18 @@
       <vue-scroll style="height: 70%">
         <el-table class="tables" :data="List">
           <!--align="center"-->
-          <el-table-column prop="roleName" :label="$t('message.roleManage.juese')"></el-table-column>
+          <el-table-column prop="roleName" :label="$t('message.roleManage.juese')" align="center"></el-table-column>
           <!-- 是否能进入设备中台 -->
-          <el-table-column prop="roleName" :label="$t('message.projectInfo.isJoinDev')">
+          <el-table-column prop="roleName" :label="$t('message.projectInfo.isJoinDev')" align="center">
             <template slot-scope="scope">
               <!-- '是':'否' -->
               {{scope.row.seeEquipment==0?$t('message.projectInfo.is'):$t('message.projectInfo.isNot')}}
             </template>
           </el-table-column>
-          <el-table-column prop="roleDesc" :label="$t('message.roleManage.miaoshu')"></el-table-column>
+          <el-table-column prop="roleDesc" :label="$t('message.roleManage.miaoshu')" align="center"></el-table-column >
           <el-table-column :label="$t('message.alarmValueSet.operation')" align="center">
             <template slot-scope="scope">
-              <div class="tableBtns">
+              <div class="tableBtns" style="margin-left: 120px !important">
                 <div @click="edit(scope.row)" class="operationText">
                   <img src="@/assets/images/icon-edit.png" width="15px" height="15px" />
                   <span>{{ $t("message.alarmValueSet.edit") }}</span>
diff --git a/src/views/projectFront/inOutboundManagement/inspectionWarehousing.vue b/src/views/projectFront/inOutboundManagement/inspectionWarehousing.vue
index a9e3e4cf..99e5242c 100644
--- a/src/views/projectFront/inOutboundManagement/inspectionWarehousing.vue
+++ b/src/views/projectFront/inOutboundManagement/inspectionWarehousing.vue
@@ -11,9 +11,9 @@
         <el-form-item label="单号">
           <el-input v-model="searchForm.number" placeholder="请输入"></el-input>
         </el-form-item>
-        <el-form-item label="货号">
+        <!-- <el-form-item label="货号">
           <el-input v-model="searchForm.stuffNumber" placeholder="请输入"></el-input>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="仓库">
           <el-input
             v-model="searchForm.warehouse"
@@ -38,18 +38,19 @@
             placeholder="请输入"
           ></el-input>
         </el-form-item>
-        <el-form-item label="助查码">
+        <!-- <el-form-item label="助查码">
           <el-input v-model="searchForm.lookupCode" placeholder="请输入"></el-input>
-        </el-form-item>
+        </el-form-item> -->
 
         <el-form-item label="日期">
           <el-date-picker
-            v-model="searchForm.warehouseName"
+            v-model="timeValue"
             type="daterange"
             range-separator="至"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
             value-format="yyyy-MM-dd"
+            @change="getTime"
           >
           </el-date-picker>
         </el-form-item>
@@ -68,7 +69,7 @@
       </el-form>
     </div>
     <div class="table_wrap whiteBlock">
-      <el-table class="tables" :data="List"  @row-click="showDetailFn">
+      <el-table class="tables" :data="List" @row-click="showDetailFn">
         <el-table-column
           prop="serialNumber"
           label="编号"
@@ -125,6 +126,7 @@
           label="制单人"
         ></el-table-column>
         <el-table-column
+        width="110"
           prop="createTime"
           align="center"
           label="制单时间"
@@ -132,7 +134,7 @@
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <div class="tableBtns" style="margin-left: -14px !important">
-              <div @click="edit(scope.row)" class="operationText">
+              <div @click.stop="edit(scope.row)" class="operationText" style="margin-right: 10px !important;margin-left: 20px !important;">
                 <img
                   src="@/assets/images/icon-edit.png"
                   width="15px"
@@ -140,7 +142,7 @@
                 />
                 <span>编辑</span>
               </div>
-              <div @click="deleteDev(scope.row)" class="operationText">
+              <div @click.stop="deleteDev(scope.row)" class="operationText">
                 <img
                   src="@/assets/images/icon-delete.png"
                   width="15px"
@@ -183,7 +185,7 @@
         >
           <el-form-item label="日期" prop="createTime">
             <el-date-picker
-              v-model="addForm.createTime"
+              v-model="addForm.date"
               type="date"
               placeholder="选择日期"
               value-format="yyyy-MM-dd"
@@ -271,7 +273,7 @@
           </el-button>
           <el-table
             class="tables"
-            :data="orderMaterialList"
+            :data="materialData"
             height="360"
             style="min-height: auto"
           >
@@ -365,11 +367,11 @@
             size="medium"
             >取消
           </el-button>
-         
+
           <el-button
             type="primary"
             icon="el-icon-circle-check"
-            @click="saveContractInfoFn(2)"
+            @click="saveContractInfoFn"
             size="medium"
           >
             保存
@@ -377,11 +379,11 @@
         </div>
       </div>
     </el-dialog>
-    <!--详情信息弹框-->
+    <!--详情弹框-->
     <el-dialog
       :modal-append-to-body="false"
       title="详情"
-      :visible.sync="deliteShow"
+      :visible.sync="isShow"
       width="1167px"
     >
       <div class="dialog_content">
@@ -395,7 +397,8 @@
         >
           <el-form-item label="日期" prop="createTime">
             <el-date-picker
-              v-model="detailData.createTime"
+              v-model="detailData.date"
+              disabled
               type="date"
               placeholder="选择日期"
               value-format="yyyy-MM-dd"
@@ -404,12 +407,14 @@
           </el-form-item>
           <el-form-item label="仓库" prop="warehouse">
             <el-input
+              disabled
               v-model="detailData.warehouse"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
           <el-form-item label="类型" prop="category">
             <el-input
+              disabled
               v-model="detailData.category"
               placeholder="请输入"
             ></el-input>
@@ -417,6 +422,7 @@
 
           <el-form-item label="方向" prop="direction" style="margin-left: 15px">
             <el-input
+              disabled
               v-model="detailData.direction"
               placeholder="请输入"
             ></el-input>
@@ -427,17 +433,23 @@
             style="margin-left: 10px"
           >
             <el-input
+              disabled
               v-model="detailData.serialNumber"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
 
           <el-form-item label="单号" prop="number">
-            <el-input v-model="detailData.number" placeholder="请输入"></el-input>
+            <el-input
+              disabled
+              v-model="detailData.number"
+              placeholder="请输入"
+            ></el-input>
           </el-form-item>
 
           <el-form-item label="批号" prop="lotNumber">
             <el-input
+              disabled
               v-model="detailData.lotNumber"
               placeholder="请输入"
             ></el-input>
@@ -445,25 +457,36 @@
 
           <el-form-item label="部门" prop="department">
             <el-input
+              disabled
               v-model="detailData.department"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
           <el-form-item label="经手人" prop="handler">
-            <el-input v-model="detailData.handler" placeholder="请输入"></el-input>
+            <el-input
+              disabled
+              v-model="detailData.handler"
+              placeholder="请输入"
+            ></el-input>
           </el-form-item>
           <el-form-item label="制单人" prop="singleHanded">
             <el-input
+              disabled
               v-model="detailData.singleHanded"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
           <el-form-item label="供货单位" prop="vendor">
-            <el-input v-model="detailData.vendor" placeholder="请输入"></el-input>
+            <el-input
+              disabled
+              v-model="detailData.vendor"
+              placeholder="请输入"
+            ></el-input>
           </el-form-item>
 
           <el-form-item label="备注" prop="remarks">
             <el-input
+              disabled
               style="width: 790px"
               type="textarea"
               :rows="1"
@@ -475,13 +498,14 @@
         <div class="importMaterialBox">
           <el-table
             class="tables"
-            :data="deliteMaterialList"
+            :data="materialData"
             height="360"
             style="min-height: auto"
           >
             <el-table-column prop="name" label="品名" align="center">
               <template slot-scope="scope">
                 <el-input
+                  disabled
                   style="width: 122px"
                   size="mini"
                   v-model="scope.row.name"
@@ -491,6 +515,7 @@
             <el-table-column prop="specification" label="规格" align="center">
               <template slot-scope="scope">
                 <el-input
+                  disabled
                   style="width: 122px"
                   size="mini"
                   v-model="scope.row.specification"
@@ -500,6 +525,7 @@
             <el-table-column prop="unit" label="单位" align="center">
               <template slot-scope="scope">
                 <el-input
+                  disabled
                   style="width: 122px"
                   size="mini"
                   v-model="scope.row.unit"
@@ -509,6 +535,7 @@
             <el-table-column prop="quantity" label="数量" align="center">
               <template slot-scope="scope">
                 <el-input
+                  disabled
                   style="width: 122px"
                   size="mini"
                   v-model="scope.row.quantity"
@@ -518,6 +545,7 @@
             <el-table-column prop="unitPrice" label="单价" align="center">
               <template slot-scope="scope">
                 <el-input
+                  disabled
                   style="width: 122px"
                   size="mini"
                   v-model="scope.row.unitPrice"
@@ -527,6 +555,7 @@
             <el-table-column prop="amount" label="金额" align="center">
               <template slot-scope="scope">
                 <el-input
+                  disabled
                   style="width: 122px"
                   size="mini"
                   v-model="scope.row.amount"
@@ -536,58 +565,28 @@
             <el-table-column prop="remark" label="备注" align="center">
               <template slot-scope="scope">
                 <el-input
+                  disabled
                   style="width: 122px"
                   size="mini"
                   v-model="scope.row.remark"
                 ></el-input>
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center">
-              <template slot-scope="scope">
-                <div class="tableBtns" style="margin-left: 35px !important">
-                  <div
-                    @click="deleteTable(scope.row, scope.index)"
-                    class="operationText"
-                  >
-                    <img
-                      src="@/assets/images/icon-delete.png"
-                      width="15px"
-                      height="15px"
-                    />
-                    <span>删除</span>
-                  </div>
-                </div>
-              </template>
-            </el-table-column>
           </el-table>
         </div>
         <div class="dialog-footer" style="text-align: center">
           <el-button
-            class="cancleBtn"
-            @click="dialogShow = false"
-            icon="el-icon-circle-close"
-            size="medium"
-            >取消
-          </el-button>
-          <!-- <el-button
             type="primary"
             icon="el-icon-circle-check"
-            @click="saveContractInfoFn(1)"
             size="medium"
+            @click="isShow = false"
           >
-          暂存
-          </el-button> -->
-          <el-button
-            type="primary"
-            icon="el-icon-circle-check"
-            @click="saveContractInfoFn(2)"
-            size="medium"
-          >
-            保存
+            确认
           </el-button>
         </div>
       </div>
     </el-dialog>
+   
   </div>
 </template>
 <script>
@@ -604,22 +603,24 @@ export default {
   },
   data() {
     return {
-      deliteShow:false,
-      detailData:{},
+      timeValue: '',
+      isShow: false,
+      deliteShow: false,
+      detailData: {},
       searchForm: {
         number: "",
-        stuffNumber:"",//货号
+        // stuffNumber:"",//货号
         warehouse: "",
         department: "",
         category: "",
         handler: "",
-        lookupCode: "",//助查码
+        // lookupCode: "",//助查码
         vendor: "",
-        startTime:'',//开始时间
-        endTime:'',//结束时间
+        startTime: '',//开始时间
+        endTime: '',//结束时间
       },//查询
       addForm: {
-        createTime: "",
+        date: "",
         warehouse: "",
         category: "",
         direction: "",
@@ -631,8 +632,11 @@ export default {
         singleHanded: "",
         vendor: "",
         remark: "",
+        materialList: [],
+        gtMaterialInOutWarehouseId: '',
+        type: "",
       },//表单
-      orderMaterialList: [
+      materialData: [
         {
           name: "",
           specification: "",
@@ -643,7 +647,7 @@ export default {
           remark: "",
         }
       ],
-      deliteMaterialList:[],//详情
+      deliteMaterialList: [],//详情
       addFormules: {},
       title: "",
       dialogShow: false,
@@ -653,49 +657,21 @@ export default {
         total: 0 //总条数
       },
       List: [],
+      gtMaterialInOutWarehouseId: '',//编辑查询
 
     }
   },
   methods: {
-      //显示检查详细弹框
-      showDetailFn(row) {
-      this.detailData = row
-      this.deliteShow = true
-      // this.gtMaterialContractId = this.detailData.id
-    },
-    //表格动态添加
-    importMaterial() {
-      let statusType = true;
-      this.orderMaterialList.forEach((item) => {
-        if (item.name == "" || item.specifications == "" || item.unit == "" || item.quantity == "" || item.unitPrice == "" || item.amount == "" || item.remark == "") {
-          this.$message({
-            message: "请完善信息后在添加",
-            type: "warning",
-          });
-          statusType = false;
-        }
-
-      })
-      if (statusType) {
-        this.orderMaterialList.push({
-          name: "",
-          specification: "",
-          unit: "",
-          quantity: "",
-          unitPrice: "",
-          amount: "",
-          remark: "",
-        });
+    //选择时间时
+    getTime(val) {
+      if (val) {
+        this.searchForm.startTime = val[0]
+        this.searchForm.endTime = val[1]
+      } else {
+        this.searchForm.startTime = ''
+        this.searchForm.endTime = ''
       }
     },
-    //删除表格动态操作
-    deleteTable(item, index) {
-      this.orderMaterialList.splice(index, 1)
-      this.$message({
-        message: "删除成功",
-        type: "success",
-      });
-    },
     //查询仓库数据
     getList() {
       gettGMaterialInOutWarehousePageApi({
@@ -703,13 +679,14 @@ export default {
         pageSize: this.pagInfo.pageSize,
         projectSn: this.$store.state.projectSn,
         number: this.searchForm.number,
-        stuffNumber: this.searchForm.stuffNumber,
         warehouse: this.searchForm.warehouse,
         department: this.searchForm.department,
         category: this.searchForm.category,
         handler: this.searchForm.handler,
-        lookupCode: this.searchForm.lookupCode,
         vendor: this.searchForm.vendor,
+        endTime:this.searchForm.endTime,
+        startTime:this.searchForm.startTime,
+        type: 10,
       }).then((result) => {
         if (result.success) {
           this.List = result.result.records
@@ -717,23 +694,72 @@ export default {
         }
       })
     },
+    //查询物料信息
+    getMaterialData() {
+      gettGMaterialInOutWarehouseListApi({
+        projectSn: this.$store.state.projectSn,
+        gtMaterialInOutWarehouseId: this.gtMaterialInOutWarehouseId
+      }).then((result) => {
+        this.materialData = result.result
+      })
+    },
+    //显示检查详细弹框
+    showDetailFn(row) {
+      this.detailData = row
+      this.isShow = true
+      this.gtMaterialInOutWarehouseId = this.detailData.id
+      this.getMaterialData()
+    },
+    //表格动态添加
+    importMaterial() {
+      // let statusType = true;
+      // this.materialList.forEach((item) => {
+      //   if (item.name == "" || item.specifications == "" || item.unit == "" || item.quantity == "") {
+      //     this.$message({
+      //       message: "请完善信息后在添加",
+      //       type: "warning",
+      //     });
+      //     statusType = false;
+      //   }
 
+      // })
+      // if (statusType) {
+      this.materialData.push({
+        name: "",
+        specification: "",
+        unit: "",
+        quantity: "",
+        unitPrice: "",
+        amount: "",
+        remark: "",
+      });
+      // }
+    },
+    //删除表格动态操作
+    deleteTable(index) {
+      this.materialData.splice(index, 1)
+    },
     add() {
       this.title = '新增入库'
       this.dialogShow = true
-      this.orderMaterialList = []
-      this.close()
+      this.materialData = []
+      this.addForm = {}
     },
 
     edit(obj) {
+      console.log('obj=======', obj);
       this.title = '编辑入库'
       this.dialogShow = true
-      this.addEditForm = JSON.parse(JSON.stringify(obj))
+      this.addForm = JSON.parse(JSON.stringify(obj))
+      this.gtMaterialInOutWarehouseId = obj.id
+      this.getMaterialData()
     },
-    submit() {
-      let params = JSON.parse(JSON.stringify(this.addEditForm))
+    saveContractInfoFn() {
+      let params = JSON.parse(JSON.stringify(this.addForm))
+      params.materialList = this.materialData
       params.projectSn = this.$store.state.projectSn
-      this.$refs.addEditForm.validate((valid) => {
+      params.type = 10
+      this.$refs.addForm.validate((valid) => {
         if (valid) {
           if (this.title == '新增入库') {
             addGtMaterialInOutWarehouseApi(params).then((result) => {
@@ -787,12 +813,6 @@ export default {
         });
     },
 
-    close() {
-      this.addEditForm = {}
-      this.$nextTick(() => {
-        this.$refs.addEditForm.clearValidate()
-      })
-    },
     SizeChange(val) {
       this.pagInfo.pageSize = val
       this.getList()
diff --git a/src/views/projectFront/inOutboundManagement/materialOutbound.vue b/src/views/projectFront/inOutboundManagement/materialOutbound.vue
index 2b244df5..38737e03 100644
--- a/src/views/projectFront/inOutboundManagement/materialOutbound.vue
+++ b/src/views/projectFront/inOutboundManagement/materialOutbound.vue
@@ -9,88 +9,53 @@
         size="medium"
       >
         <el-form-item label="单号">
-          <el-input
-            v-model="searchForm.warehouseName"
-            placeholder="请输入"
-          ></el-input>
+          <el-input v-model="searchForm.number" placeholder="请输入"></el-input>
         </el-form-item>
-        <el-form-item label="客户">
-          <el-input
-            v-model="searchForm.warehouseName"
-            placeholder="请输入"
-          ></el-input>
-        </el-form-item>
-
+        <!-- <el-form-item label="货号">
+          <el-input v-model="searchForm.stuffNumber" placeholder="请输入"></el-input>
+        </el-form-item> -->
         <el-form-item label="仓库">
           <el-input
-            v-model="searchForm.warehouseName"
+            v-model="searchForm.warehouse"
             placeholder="请输入"
           ></el-input>
         </el-form-item>
         <el-form-item label="部门">
           <el-input
-            v-model="searchForm.warehouseName"
+            v-model="searchForm.department"
+            placeholder="请输入"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="类型">
+          <el-input
+            v-model="searchForm.category"
             placeholder="请输入"
           ></el-input>
         </el-form-item>
-
         <el-form-item label="经手人">
           <el-input
-            v-model="searchForm.warehouseName"
+            v-model="searchForm.handler"
             placeholder="请输入"
           ></el-input>
         </el-form-item>
+        <!-- <el-form-item label="助查码">
+          <el-input v-model="searchForm.lookupCode" placeholder="请输入"></el-input>
+        </el-form-item> -->
+
         <el-form-item label="日期">
           <el-date-picker
-            v-model="searchForm.warehouseName"
+            v-model="timeValue"
             type="daterange"
             range-separator="至"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
+            value-format="yyyy-MM-dd"
+            @change="getTime"
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="批号">
-          <el-input
-            v-model="searchForm.warehouseName"
-            placeholder="请输入"
-          ></el-input>
-        </el-form-item>
-
-        <el-form-item label="类型">
-          <el-select v-model="searchForm.warehouseName" placeholder="请选择">
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="货号">
-          <el-input
-            v-model="searchForm.warehouseName"
-            placeholder="请输入"
-          ></el-input>
-        </el-form-item>
-      
-        <el-form-item label="品名">
-          <el-select v-model="searchForm.warehouseName" placeholder="请选择">
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="助查码">
-          <el-input
-            v-model="searchForm.warehouseName"
-            placeholder="请输入"
-          ></el-input>
+        <el-form-item label="客户">
+          <el-input v-model="searchForm.customer" placeholder="请输入"></el-input>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" plain @click="getList">{{
@@ -104,71 +69,72 @@
       </el-form>
     </div>
     <div class="table_wrap whiteBlock">
-      <el-table class="tables" :data="List">
+      <el-table class="tables" :data="List" @row-click="showDetailFn">
         <el-table-column
-          prop="warehouseName"
+          prop="serialNumber"
           label="编号"
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="warehousePos"
+          prop="number"
           align="center"
           label="单号"
         ></el-table-column>
         <el-table-column
-          prop="header"
+          prop="date"
           align="center"
           label="日期"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="warehouse"
           align="center"
           label="仓库"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="direction"
           align="center"
           label="方向"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="category"
           align="center"
           label="类别"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="department"
           align="center"
           label="部门"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="customer"
           align="center"
-          label="供应商"
+          label="客户"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="handler"
           align="center"
           label="经手人"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="lotNumber"
           align="center"
           label="批号"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="singleHanded"
           align="center"
           label="制单人"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          width="110"
+          prop="createTime"
           align="center"
           label="制单时间"
         ></el-table-column>
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <div class="tableBtns" style="margin-left: -14px !important">
-              <div @click="edit(scope.row)" class="operationText">
+              <div @click.stop="edit(scope.row)" class="operationText" style="margin-right: 10px !important;margin-left: 20px !important;">
                 <img
                   src="@/assets/images/icon-edit.png"
                   width="15px"
@@ -176,7 +142,7 @@
                 />
                 <span>编辑</span>
               </div>
-              <div @click="deleteDev(scope.row)" class="operationText">
+              <div @click.stop="deleteDev(scope.row)" class="operationText">
                 <img
                   src="@/assets/images/icon-delete.png"
                   width="15px"
@@ -207,107 +173,98 @@
       :visible.sync="dialogShow"
       width="1167px"
     >
-      <p>出库单信息</p>
+      <p>入库单信息</p>
       <div class="dialog_content">
         <el-form
           style="margin: 0 28px"
           size="medium"
-          :model="contractForm"
-          ref="contractForm"
-          :rules="contractFormRules"
+          :model="addForm"
+          ref="addForm"
+          :rules="addFormules"
           :inline="true"
         >
-          <el-form-item label="日期" prop="arrivalTime">
+          <el-form-item label="日期" prop="createTime">
             <el-date-picker
-              v-model="value1"
+              v-model="addForm.date"
               type="date"
               placeholder="选择日期"
-              value-format="yyyy-MM-dd HH:mm"
+              value-format="yyyy-MM-dd"
             >
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="仓库" prop="enterpriseId">
+          <el-form-item label="仓库" prop="warehouse">
             <el-input
-              v-model="searchForm.warehouseName"
+              v-model="addForm.warehouse"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="类型" prop="enterpriseId">
+          <el-form-item label="类型" prop="category">
             <el-input
-              v-model="searchForm.warehouseName"
-              placeholder="请输入"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="客户" prop="enterpriseId">
-            <el-input
-              v-model="searchForm.warehouseName"
+              v-model="addForm.category"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
 
+          <el-form-item label="方向" prop="direction" style="margin-left: 15px">
+            <el-input
+              v-model="addForm.direction"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
           <el-form-item
-            label="方向"
-            prop="enterpriseId"
-            style="margin-left: 15px"
+            label="编号"
+            prop="serialNumber"
+            style="margin-left: 10px"
           >
             <el-input
-              v-model="searchForm.warehouseName"
-              placeholder="请输入"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="编号" prop="orderNumber">
-            <el-input
-              v-model="contractForm.orderNumber"
+              v-model="addForm.serialNumber"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
 
-          <el-form-item label="单号" prop="orderNumber">
+          <el-form-item label="单号" prop="number">
+            <el-input v-model="addForm.number" placeholder="请输入"></el-input>
+          </el-form-item>
+
+          <el-form-item label="批号" prop="lotNumber">
             <el-input
-              v-model="contractForm.orderNumber"
+              v-model="addForm.lotNumber"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
 
-          <el-form-item label="批号" prop="orderNumber">
+          <el-form-item label="部门" prop="department">
             <el-input
-              v-model="contractForm.orderNumber"
+              v-model="addForm.department"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-
-          <el-form-item label="部门" prop="enterpriseId">
+          <el-form-item label="经手人" prop="handler">
+            <el-input v-model="addForm.handler" placeholder="请输入"></el-input>
+          </el-form-item>
+          <el-form-item label="制单人" prop="singleHanded">
             <el-input
-              v-model="searchForm.warehouseName"
+              v-model="addForm.singleHanded"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="经手人" prop="enterpriseId">
-            <el-input
-              v-model="searchForm.warehouseName"
-              placeholder="请输入"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="制单人" prop="enterpriseId">
-            <el-input
-              v-model="searchForm.warehouseName"
-              placeholder="请输入"
-            ></el-input>
+          <el-form-item label="客户" prop="customer">
+            <el-input v-model="addForm.customer" placeholder="请输入"></el-input>
           </el-form-item>
 
           <el-form-item label="备注" prop="remarks">
             <el-input
-              style="width: 790px"
+              style="width: 820px"
               type="textarea"
               :rows="1"
-              v-model="contractForm.remarks"
+              v-model="addForm.remark"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
         </el-form>
         <div class="importMaterialBox">
           <el-button
-            style="margin-bottom: 15px; margin-left: 990px"
+            style="margin-bottom: 15px; margin-left: 1005px"
             type="primary"
             size="medium"
             @click="importMaterial"
@@ -316,7 +273,7 @@
           </el-button>
           <el-table
             class="tables"
-            :data="orderMaterialList"
+            :data="materialData"
             height="360"
             style="min-height: auto"
           >
@@ -329,12 +286,12 @@
                 ></el-input>
               </template>
             </el-table-column>
-            <el-table-column prop="specifications" label="规格" align="center">
+            <el-table-column prop="specification" label="规格" align="center">
               <template slot-scope="scope">
                 <el-input
                   style="width: 122px"
                   size="mini"
-                  v-model="scope.row.specifications"
+                  v-model="scope.row.specification"
                 ></el-input>
               </template>
             </el-table-column>
@@ -347,12 +304,12 @@
                 ></el-input>
               </template>
             </el-table-column>
-            <el-table-column prop="materialNum" label="数量" align="center">
+            <el-table-column prop="quantity" label="数量" align="center">
               <template slot-scope="scope">
                 <el-input
                   style="width: 122px"
                   size="mini"
-                  v-model="scope.row.materialNum"
+                  v-model="scope.row.quantity"
                 ></el-input>
               </template>
             </el-table-column>
@@ -365,12 +322,12 @@
                 ></el-input>
               </template>
             </el-table-column>
-            <el-table-column prop="computeUnit" label="金额" align="center">
+            <el-table-column prop="amount" label="金额" align="center">
               <template slot-scope="scope">
                 <el-input
                   style="width: 122px"
                   size="mini"
-                  v-model="scope.row.computeUnit"
+                  v-model="scope.row.amount"
                 ></el-input>
               </template>
             </el-table-column>
@@ -410,18 +367,11 @@
             size="medium"
             >取消
           </el-button>
-          <!-- <el-button
-            type="primary"
-            icon="el-icon-circle-check"
-            @click="saveContractInfoFn(1)"
-            size="medium"
-          >
-          暂存
-          </el-button> -->
+
           <el-button
             type="primary"
             icon="el-icon-circle-check"
-            @click="saveContractInfoFn(2)"
+            @click="saveContractInfoFn"
             size="medium"
           >
             保存
@@ -429,33 +379,276 @@
         </div>
       </div>
     </el-dialog>
+    <!--详情弹框-->
+    <el-dialog
+      :modal-append-to-body="false"
+      title="详情"
+      :visible.sync="isShow"
+      width="1167px"
+    >
+      <div class="dialog_content">
+        <el-form
+          style="margin: 0 28px"
+          size="medium"
+          :model="addForm"
+          ref="addForm"
+          :rules="addFormules"
+          :inline="true"
+        >
+          <el-form-item label="日期" prop="createTime">
+            <el-date-picker
+              v-model="detailData.date"
+              disabled
+              type="date"
+              placeholder="选择日期"
+              value-format="yyyy-MM-dd"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="仓库" prop="warehouse">
+            <el-input
+              disabled
+              v-model="detailData.warehouse"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="类型" prop="category">
+            <el-input
+              disabled
+              v-model="detailData.category"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item label="方向" prop="direction" style="margin-left: 15px">
+            <el-input
+              disabled
+              v-model="detailData.direction"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            label="编号"
+            prop="serialNumber"
+            style="margin-left: 10px"
+          >
+            <el-input
+              disabled
+              v-model="detailData.serialNumber"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item label="单号" prop="number">
+            <el-input
+              disabled
+              v-model="detailData.number"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item label="批号" prop="lotNumber">
+            <el-input
+              disabled
+              v-model="detailData.lotNumber"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item label="部门" prop="department">
+            <el-input
+              disabled
+              v-model="detailData.department"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="经手人" prop="handler">
+            <el-input
+              disabled
+              v-model="detailData.handler"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="制单人" prop="singleHanded">
+            <el-input
+              disabled
+              v-model="detailData.singleHanded"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="客户" prop="customer">
+            <el-input
+              disabled
+              v-model="detailData.customer"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item label="备注" prop="remarks">
+            <el-input
+              disabled
+              style="width: 790px"
+              type="textarea"
+              :rows="1"
+              v-model="detailData.remark"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+        </el-form>
+        <div class="importMaterialBox">
+          <el-table
+            class="tables"
+            :data="materialData"
+            height="360"
+            style="min-height: auto"
+          >
+            <el-table-column prop="name" label="品名" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  disabled
+                  style="width: 122px"
+                  size="mini"
+                  v-model="scope.row.name"
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="specification" label="规格" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  disabled
+                  style="width: 122px"
+                  size="mini"
+                  v-model="scope.row.specification"
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="unit" label="单位" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  disabled
+                  style="width: 122px"
+                  size="mini"
+                  v-model="scope.row.unit"
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="quantity" label="数量" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  disabled
+                  style="width: 122px"
+                  size="mini"
+                  v-model="scope.row.quantity"
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="unitPrice" label="单价" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  disabled
+                  style="width: 122px"
+                  size="mini"
+                  v-model="scope.row.unitPrice"
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="amount" label="金额" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  disabled
+                  style="width: 122px"
+                  size="mini"
+                  v-model="scope.row.amount"
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="remark" label="备注" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  disabled
+                  style="width: 122px"
+                  size="mini"
+                  v-model="scope.row.remark"
+                ></el-input>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <div class="dialog-footer" style="text-align: center">
+          <el-button
+            type="primary"
+            icon="el-icon-circle-check"
+            size="medium"
+            @click="isShow = false"
+          >
+            确认
+          </el-button>
+        </div>
+      </div>
+    </el-dialog>
+   
   </div>
 </template>
 <script>
 import {
-  addStuffWarehouseApi,
-  deleteStuffWarehouseApi,
-  editStuffWarehouseApi,
-  getStuffWarehousePageApi
-} from '@/assets/js/api/warehouseManagement.js'
+  addGtMaterialInOutWarehouseApi,
+  deletGtMaterialInOutWarehouseApi,
+  editGtMaterialInOutWarehouseApi,
+  gettGMaterialInOutWarehousePageApi,//查询表单数据
+  gettGMaterialInOutWarehouseListApi,//根据id查询物料
+} from '@/assets/js/api/materialManagement.js'
 export default {
   mounted() {
     this.getList()
   },
   data() {
     return {
-      orderMaterialList: [
+      timeValue: '',
+      isShow: false,
+      deliteShow: false,
+      detailData: {},
+      searchForm: {
+        number: "",
+        // stuffNumber:"",//货号
+        warehouse: "",
+        department: "",
+        category: "",
+        handler: "",
+        // lookupCode: "",//助查码
+        customer: "",
+        startTime: '',//开始时间
+        endTime: '',//结束时间
+      },//查询
+      addForm: {
+        date: "",
+        warehouse: "",
+        category: "",
+        direction: "",
+        serialNumber: "",
+        number: "",
+        lotNumber: "",
+        department: "",
+        handler: "",
+        singleHanded: "",
+        customer: "",
+        remark: "",
+        materialList: [],
+        gtMaterialInOutWarehouseId: '',
+        type: "",
+      },//表单
+      materialData: [
         {
           name: "",
-          specifications: "",
+          specification: "",
           unit: "",
-          materialNum: "",
+          quantity: "",
           unitPrice: "",
-          computeUnit: "",
+          amount: "",
           remark: "",
         }
       ],
-      contractForm: {},
+      deliteMaterialList: [],//详情
+      addFormules: {},
       title: "",
       dialogShow: false,
       pagInfo: {
@@ -464,113 +657,36 @@ export default {
         total: 0 //总条数
       },
       List: [],
-      addEditForm: {
-        warehouseName: '',//仓库名称
-        warehousePos: '',//warehousePos
-        header: '',//负责人
-        headerPhone: '',//负责人电话
-        remark: '',//备注
-      },
-      addEditRules: {
-        warehouseName: [
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'blur'
-          },
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'change'
-          }
-        ],
-        warehousePos: [
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'blur'
-          },
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'change'
-          }
-        ],
-        header: [
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'blur'
-          },
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'change'
-          }
-        ],
-        headerPhone: [
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'blur'
-          },
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'change'
-          }
-        ],
+      gtMaterialInOutWarehouseId: '',//编辑查询
 
-      },
-      searchForm: {
-        warehouseName: '',
-        warehouseNumber: '',
-        warehousePos: '',
-      },
     }
   },
   methods: {
-    //表格动态添加
-    importMaterial() {
-      let statusType = true;
-      this.orderMaterialList.forEach((item) => {
-        if (item.name == "" || item.specifications == "" || item.unit == "" || item.materialNum == "" || item.unitPrice == "" || item.computeUnit == "" || item.remark == "") {
-          this.$message({
-            message: "请完善信息后在添加",
-            type: "warning",
-          });
-          statusType = false;
-        }
-
-      })
-      if (statusType) {
-        this.orderMaterialList.push({
-          name: "",
-          specifications: "",
-          unit: "",
-          materialNum: "",
-          unitPrice: "",
-          computeUnit: "",
-          remark: "",
-        });
+    //选择时间时
+    getTime(val) {
+      if (val) {
+        this.searchForm.startTime = val[0]
+        this.searchForm.endTime = val[1]
+      } else {
+        this.searchForm.startTime = ''
+        this.searchForm.endTime = ''
       }
     },
-    //删除表格动态操作
-    deleteTable(item, index) {
-      this.orderMaterialList.splice(index, 1)
-      this.$message({
-        message: "删除成功",
-        type: "success",
-      });
-    },
     //查询仓库数据
     getList() {
-      getStuffWarehousePageApi({
+      gettGMaterialInOutWarehousePageApi({
         pageNo: this.pagInfo.pageNo,
         pageSize: this.pagInfo.pageSize,
         projectSn: this.$store.state.projectSn,
-        warehouseName: this.searchForm.warehouseName,
-        warehousePos: this.searchForm.warehousePos,
+        number: this.searchForm.number,
+        warehouse: this.searchForm.warehouse,
+        department: this.searchForm.department,
+        category: this.searchForm.category,
+        handler: this.searchForm.handler,
+        customer: this.searchForm.customer,
+        endTime:this.searchForm.endTime,
+        startTime:this.searchForm.startTime,
+        type: 20,
       }).then((result) => {
         if (result.success) {
           this.List = result.result.records
@@ -578,34 +694,83 @@ export default {
         }
       })
     },
+    //查询物料信息
+    getMaterialData() {
+      gettGMaterialInOutWarehouseListApi({
+        projectSn: this.$store.state.projectSn,
+        gtMaterialInOutWarehouseId: this.gtMaterialInOutWarehouseId
+      }).then((result) => {
+        this.materialData = result.result
+      })
+    },
+    //显示检查详细弹框
+    showDetailFn(row) {
+      this.detailData = row
+      this.isShow = true
+      this.gtMaterialInOutWarehouseId = this.detailData.id
+      this.getMaterialData()
+    },
+    //表格动态添加
+    importMaterial() {
+      // let statusType = true;
+      // this.materialList.forEach((item) => {
+      //   if (item.name == "" || item.specifications == "" || item.unit == "" || item.quantity == "") {
+      //     this.$message({
+      //       message: "请完善信息后在添加",
+      //       type: "warning",
+      //     });
+      //     statusType = false;
+      //   }
 
+      // })
+      // if (statusType) {
+      this.materialData.push({
+        name: "",
+        specification: "",
+        unit: "",
+        quantity: "",
+        unitPrice: "",
+        amount: "",
+        remark: "",
+      });
+      // }
+    },
+    //删除表格动态操作
+    deleteTable(index) {
+      this.materialData.splice(index, 1)
+    },
     add() {
-      this.title = '新增'
+      this.title = '新增入库'
       this.dialogShow = true
-      this.orderMaterialList = []
-      this.close()
+      this.materialData = []
+      this.addForm = {}
     },
 
     edit(obj) {
-      this.title = '编辑'
+      console.log('obj=======', obj);
+      this.title = '编辑入库'
       this.dialogShow = true
-      this.addEditForm = JSON.parse(JSON.stringify(obj))
+      this.addForm = JSON.parse(JSON.stringify(obj))
+      this.gtMaterialInOutWarehouseId = obj.id
+      this.getMaterialData()
     },
-    submit() {
-      let params = JSON.parse(JSON.stringify(this.addEditForm))
+    saveContractInfoFn() {
+      let params = JSON.parse(JSON.stringify(this.addForm))
+      params.materialList = this.materialData
       params.projectSn = this.$store.state.projectSn
-      this.$refs.addEditForm.validate((valid) => {
+      params.type = 20
+      this.$refs.addForm.validate((valid) => {
         if (valid) {
-          if (this.title == '新增仓库') {
-            addStuffWarehouseApi(params).then((result) => {
+          if (this.title == '新增入库') {
+            addGtMaterialInOutWarehouseApi(params).then((result) => {
               if (result.success) {
                 this.$message.success(result.message)
                 this.getList()
               }
             })
-          } else if (this.title === '编辑仓库') {
+          } else if (this.title === '编辑入库') {
             console.log('编辑信息', this.addEditForm)
-            editStuffWarehouseApi(params).then((result) => {
+            editGtMaterialInOutWarehouseApi(params).then((result) => {
               if (result.success) {
                 this.$message.success(result.message)
                 this.getList()
@@ -625,7 +790,7 @@ export default {
         type: "warning",
       })
         .then(() => {
-          deleteStuffWarehouseApi({ id: obj.id }).then((res) => {
+          deletGtMaterialInOutWarehouseApi({ id: obj.id }).then((res) => {
             if (res.success) {
               this.getList()
               this.$message({
@@ -648,12 +813,6 @@ export default {
         });
     },
 
-    close() {
-      this.addEditForm = {}
-      this.$nextTick(() => {
-        this.$refs.addEditForm.clearValidate()
-      })
-    },
     SizeChange(val) {
       this.pagInfo.pageSize = val
       this.getList()
diff --git a/src/views/projectFront/quality/businessModule/checkPoint.vue b/src/views/projectFront/quality/businessModule/checkPoint.vue
index 8a8a8267..3ab23ab8 100644
--- a/src/views/projectFront/quality/businessModule/checkPoint.vue
+++ b/src/views/projectFront/quality/businessModule/checkPoint.vue
@@ -2,9 +2,7 @@
   <!-- 检查部位 -->
   <vue-scroll style="height: 100%">
     <div class="checkPoint">
-      <el-button type="primary" size="medium" @click="newRootNode">{{
-        $t('message.quality.NewRootNode')
-      }}</el-button>
+      <el-button type="primary" size="medium" @click="newRootNode">新增区域</el-button>
       <el-table
         :data="tableData"
         style="width: 100%; margin: 20px 0"
@@ -16,24 +14,32 @@
         <el-table-column
           prop="regionName"
           :label="$t('message.quality.regionName')"
+
         >
         </el-table-column>
         <el-table-column
+        align="center"
+
           prop="regionCode"
           :label="$t('message.quality.coding')"
         >
         </el-table-column>
         <el-table-column
+        align="center"
+
           prop="dutyName"
           :label="$t('message.quality.rectificationPeople')"
         >
         </el-table-column>
         <el-table-column
+        align="center"
+
           prop="intendanceNames"
           :label="$t('message.quality.notifier')"
         >
         </el-table-column>
-        <el-table-column prop="remark" :label="$t('message.quality.explain')">
+        <el-table-column prop="remark" :label="$t('message.quality.explain')"    align="center"
+>
         </el-table-column>
         <el-table-column
           prop="remark"
@@ -81,6 +87,7 @@
             ]"
           >
             <el-input
+            placeholder="请输入区域名称"
               v-model="form.regionName"
               :disabled="dialogType == 2"
             ></el-input>
@@ -236,7 +243,7 @@ export default {
         remark: ''
       }
       this.editDialog = true
-      this.title = this.$t('message.quality.NewRootNode')
+      this.title ='新增区域'
       this.dialogType = 1
       this.getNotifierOrPeopleList()
     },
@@ -270,7 +277,7 @@ export default {
       this.form.intendanceIds = value.intendanceIds.split(',')
       this.form.remark = value.remark
       this.form.id = value.id
-      this.title = this.$t('message.quality.EditorialResponsibilityArea')
+      this.title = '编辑区域'
       this.dialogType = 2
       this.getNotifierOrPeopleList()
       this.editDialog = true
diff --git a/src/views/projectFront/quality/qualitypersonnel.vue b/src/views/projectFront/quality/qualitypersonnel.vue
index 39a00920..47e7b51f 100644
--- a/src/views/projectFront/quality/qualitypersonnel.vue
+++ b/src/views/projectFront/quality/qualitypersonnel.vue
@@ -77,6 +77,7 @@
               label="手机号"
               align="center"
             ></el-table-column>
+           
             <el-table-column label="操作" align="center">
               <template slot-scope="scope">
                 <el-button
@@ -121,7 +122,11 @@
           size="medium"
         >
           <el-form-item label="部门名称" prop="departmentName">
-            <el-input  style="width: 350px" v-model="dialogdata.departmentName"></el-input>
+            <el-input
+            placeholder="请输入部门"
+              style="width: 350px"
+              v-model="dialogdata.departmentName"
+            ></el-input>
           </el-form-item>
           <div class="dialog-footer">
             <el-button
@@ -159,16 +164,40 @@
         >
           <el-form-item label="账号" prop="account">
             <el-input
+            placeholder="请输入账号"
               v-model="dialogTable.account"
               style="width: 350px"
             ></el-input>
           </el-form-item>
-          <el-form-item label="密码" prop="password">
+          <el-form-item
+            :label="$t('message.personnelAccess.LabPwd')"
+            prop="password"
+            v-if="!dialogTable.showPassword && dialogTable.showPassword != ''"
+          >
             <el-input
+            style="width: 350px"
+              type="password"
+              show-password
               v-model="dialogTable.password"
+              :placeholder="$t('message.personnelAccess.pwd')"
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item label="密码" prop="password" v-else>
+            <el-input
+              type="password"
+              show-password
+              v-model="dialogTable.showPassword"
               style="width: 350px"
             ></el-input>
           </el-form-item>
+          <el-form-item label="姓名" prop="realName">
+            <el-input
+            placeholder="请输入姓名"
+              style="width: 350px"
+              v-model="dialogTable.realName"
+            ></el-input>
+          </el-form-item>
           <el-form-item label="角色" prop="roleId">
             <el-select
               style="width: 350px"
@@ -185,14 +214,9 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="姓名" prop="realName">
-            <el-input
-              style="width: 350px"
-              v-model="dialogTable.realName"
-            ></el-input>
-          </el-form-item>
           <el-form-item label="手机号" prop="userTel">
             <el-input
+            placeholder="请输入手机号"
               style="width: 350px"
               v-model="dialogTable.userTel"
             ></el-input>
@@ -239,7 +263,15 @@ export default {
       dialogdata: {
         departmentName: "",//部门名称
       },
-      rules: {},
+      rules: {
+        departmentName:[
+        {
+          required: true,
+          message: '请输入部门',
+          trigger: "blur"
+        }
+      ]
+      },
       threeData: [],
       dialogVisible: false,
       depart: [],
@@ -252,13 +284,16 @@ export default {
         realName: '',
         userTel: '',
         departmentId: '',
+        showPassword: '',
       },
       rules2: {
-        account: [{
+        account: [
+          {
           required: true,
           message: '请输入账号',
           trigger: "blur"
-        }],
+        }
+      ],
         password: [{
           required: true,
           message: '请输入密码',
@@ -280,10 +315,13 @@ export default {
       currentTwo: -1,
       current: 0,
       checkedId: 1,
+      showPassword: '',
     };
   },
   mounted() {
     this.getList()
+    this.getRoleList()
+
 
   },
   methods: {
@@ -324,6 +362,9 @@ export default {
       }).then((res) => {
         console.log('res===', res);
         this.threeData = res.result
+        this.threeData.forEach(item => {
+          this.showPassword = item.showPassword
+        })
       })
 
     },
@@ -337,7 +378,6 @@ export default {
       if (type == 2) {
         this.dialogVisible3 = true
         this.title = '新增人员'
-        this.getRoleList()
         this.dialogTable = {}
       }
 
@@ -347,12 +387,14 @@ export default {
       this.dialogVisible = true
       this.title = '编辑部门'
       this.dialogdata = JSON.parse(JSON.stringify(val))
+
     },
     //编辑
     edit2(val) {
       this.dialogVisible3 = true
       this.title = '编辑人员'
       this.dialogTable = JSON.parse(JSON.stringify(val))
+
     },
     //部门保存/编辑
     addSave() {
diff --git a/src/views/projectFront/quality/recordsModule/inspectionRecord.vue b/src/views/projectFront/quality/recordsModule/inspectionRecord.vue
index 4e6d3b07..d2a8aa06 100644
--- a/src/views/projectFront/quality/recordsModule/inspectionRecord.vue
+++ b/src/views/projectFront/quality/recordsModule/inspectionRecord.vue
@@ -221,6 +221,8 @@
         </el-table-column>
         <!--        检查结果-->
         <el-table-column
+        align="center"
+
           prop="changeLimitTime"
           :label="
             $t('message.quality.inspectionResult') +
@@ -253,6 +255,8 @@
           </template>
         </el-table-column>
         <el-table-column
+        align="center"
+
           prop="inspectManName"
           :label="
             $t('message.quality.rummager') +
@@ -268,26 +272,35 @@
           </template>
         </el-table-column>
         <el-table-column
+        align="center"
           prop="dangerItemContent"
           :label="$t('message.quality.problemInformation')"
         >
         </el-table-column>
         <el-table-column
+        align="center"
+
           prop="changeName"
           :label="$t('message.quality.rectificationPeople')"
         >
         </el-table-column>
         <el-table-column
+        align="center"
+
           prop="reviewName"
           :label="$t('message.quality.reviewOfThePeople')"
         >
         </el-table-column>
         <el-table-column
+        align="center"
+
           prop="verifyManName"
           :label="$t('message.quality.checkOne')"
         >
         </el-table-column>
         <el-table-column
+        align="center"
+
           prop="notifyPersonName"
           :label="$t('message.quality.notifier')"
         >
@@ -298,7 +311,8 @@
           :label="$t('message.quality.routineCheck')"
         >
         </el-table-column> -->
-        <el-table-column prop="remark" :label="$t('message.quality.explain')">
+        <el-table-column         align="center"
+ prop="remark" :label="$t('message.quality.explain')">
         </el-table-column>
       </el-table>
       <el-pagination
@@ -655,9 +669,9 @@
                 >
                   <el-option
                     v-for="item in crewList"
-                    :key="item.userId"
+                    :key="item.userId+''"
                     :label="item.workerName"
-                    :value="item.userId"
+                    :value="item.userId+''"
                   >
                     <!-- <span style="float: left">{{ item.workerName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px"
@@ -1579,7 +1593,6 @@ export default {
       }
       getSubdivisionProjectApi(data).then((res) => {
         if (res.code == 200) {
-          console.log('获取到的列表- 以父子节点形式呈现', res)
           this.listData = res.result
           if (this.listData.length >= 1) {
             this.addForm1.subsectionId = this.listData[0].id
@@ -1596,7 +1609,7 @@ export default {
       if (this.COMPANY == 'zjwj') {
         window.location.href =
           this.$http.defaults.baseURL +
-          '/xmgl/qualityRectifyRecord/recordRectify/excel/export?projectSn=' +
+          'xmgl/qualityRectifyRecord/recordRectify/excel/export?projectSn=' +
           this.$store.state.projectSn +
           '&recordStatus=' +
           this.formInline.recordStatus +
@@ -1704,9 +1717,10 @@ export default {
             text = pathLabels[i]
           }
         }
-        // if (data.dutyId) {
-        //   this.addForm1.changeId = Number(data.dutyId)
-        // }
+        if (data.dutyId) {
+          this.addForm1.changeId = data.dutyId
+          console.log(' this.addForm1.changeId================', this.addForm1.changeId);
+        }
         this.addForm1.regionName = text
         // console.log(data.intendanceIds.split(','))
         // console.log(text)
@@ -1715,13 +1729,14 @@ export default {
             if (this.addForm1.notifyPerson > 0) {
               this.addForm1.notifyPerson = []
             }
-            // this.addForm1.notifyPerson.push(
-            //   Number(data.intendanceIds.split(',')[j])
-            // )
+             this.addForm1.notifyPerson.push(
+               Number(data.intendanceIds.split(',')[j])
+            )
           }
         }
-        console.log(data.intendanceIds)
-        // this.addForm1.notifyPerson = data.intendanceIds.split(',')
+        this.addForm1.notifyPerson = data.intendanceIds.split(',')
+        console.log(' this.addForm1.notifyPerson================', this.addForm1.notifyPerson);
+
       } else if (this.recordType == 2) {
         let pathLabels =
           this.$refs['addFormRegion2'].getCheckedNodes()[0].pathLabels
diff --git a/src/views/projectFront/turnoverMaterialManagement/entryRegistration.vue b/src/views/projectFront/turnoverMaterialManagement/entryRegistration.vue
index f390f694..75e5e6b5 100644
--- a/src/views/projectFront/turnoverMaterialManagement/entryRegistration.vue
+++ b/src/views/projectFront/turnoverMaterialManagement/entryRegistration.vue
@@ -9,63 +9,53 @@
         size="medium"
       >
         <el-form-item label="单号">
-          <el-input
-            v-model="searchForm.warehouseName"
-            placeholder="请输入"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="货号">
-          <el-input
-            v-model="searchForm.warehouseName"
-            placeholder="请输入"
-          ></el-input>
+          <el-input v-model="searchForm.number" placeholder="请输入"></el-input>
         </el-form-item>
+        <!-- <el-form-item label="货号">
+          <el-input v-model="searchForm.stuffNumber" placeholder="请输入"></el-input>
+        </el-form-item> -->
         <el-form-item label="仓库">
           <el-input
-            v-model="searchForm.warehouseName"
+            v-model="searchForm.warehouse"
             placeholder="请输入"
           ></el-input>
         </el-form-item>
         <el-form-item label="部门">
           <el-input
-            v-model="searchForm.warehouseName"
+            v-model="searchForm.department"
             placeholder="请输入"
           ></el-input>
         </el-form-item>
         <el-form-item label="类型">
           <el-input
-            v-model="searchForm.warehouseName"
+            v-model="searchForm.category"
             placeholder="请输入"
           ></el-input>
         </el-form-item>
         <el-form-item label="经手人">
           <el-input
-            v-model="searchForm.warehouseName"
-            placeholder="请输入"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="助查码">
-          <el-input
-            v-model="searchForm.warehouseName"
+            v-model="searchForm.handler"
             placeholder="请输入"
           ></el-input>
         </el-form-item>
+        <!-- <el-form-item label="助查码">
+          <el-input v-model="searchForm.lookupCode" placeholder="请输入"></el-input>
+        </el-form-item> -->
 
         <el-form-item label="日期">
           <el-date-picker
-            v-model="searchForm.warehouseName"
+            v-model="timeValue"
             type="daterange"
             range-separator="至"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
+            value-format="yyyy-MM-dd"
+            @change="getTime"
           >
           </el-date-picker>
         </el-form-item>
         <el-form-item label="供货单位">
-          <el-input
-            v-model="searchForm.warehouseName"
-            placeholder="请输入"
-          ></el-input>
+          <el-input v-model="searchForm.vendor" placeholder="请输入"></el-input>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" plain @click="getList">{{
@@ -79,71 +69,72 @@
       </el-form>
     </div>
     <div class="table_wrap whiteBlock">
-      <el-table class="tables" :data="List">
+      <el-table class="tables" :data="List" @row-click="showDetailFn">
         <el-table-column
-          prop="warehouseName"
+          prop="serialNumber"
           label="编号"
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="warehousePos"
+          prop="number"
           align="center"
           label="单号"
         ></el-table-column>
         <el-table-column
-          prop="header"
+          prop="date"
           align="center"
           label="日期"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="warehouse"
           align="center"
           label="仓库"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="direction"
           align="center"
           label="方向"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="category"
           align="center"
           label="类别"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="department"
           align="center"
           label="部门"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="vendor"
           align="center"
           label="供应商"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="handler"
           align="center"
           label="经手人"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="lotNumber"
           align="center"
           label="批号"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="singleHanded"
           align="center"
           label="制单人"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+        width="110"
+          prop="createTime"
           align="center"
           label="制单时间"
         ></el-table-column>
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <div class="tableBtns" style="margin-left: -14px !important">
-              <div @click="edit(scope.row)" class="operationText">
+              <div @click.stop="edit(scope.row)" class="operationText" style="margin-right: 10px !important;margin-left: 20px !important;">
                 <img
                   src="@/assets/images/icon-edit.png"
                   width="15px"
@@ -151,7 +142,7 @@
                 />
                 <span>编辑</span>
               </div>
-              <div @click="deleteDev(scope.row)" class="operationText">
+              <div @click.stop="deleteDev(scope.row)" class="operationText">
                 <img
                   src="@/assets/images/icon-delete.png"
                   width="15px"
@@ -187,88 +178,78 @@
         <el-form
           style="margin: 0 28px"
           size="medium"
-          :model="contractForm"
-          ref="contractForm"
-          :rules="contractFormRules"
+          :model="addForm"
+          ref="addForm"
+          :rules="addFormules"
           :inline="true"
         >
-          <el-form-item label="日期" prop="arrivalTime">
+          <el-form-item label="日期" prop="createTime">
             <el-date-picker
-              v-model="value1"
+              v-model="addForm.date"
               type="date"
               placeholder="选择日期"
-              value-format="yyyy-MM-dd HH:mm"
+              value-format="yyyy-MM-dd"
             >
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="仓库" prop="enterpriseId">
+          <el-form-item label="仓库" prop="warehouse">
             <el-input
-            v-model="searchForm.warehouseName"
-            placeholder="请输入"
-          ></el-input>
+              v-model="addForm.warehouse"
+              placeholder="请输入"
+            ></el-input>
           </el-form-item>
-          <el-form-item label="类型" prop="enterpriseId">
+          <el-form-item label="类型" prop="category">
             <el-input
-            v-model="searchForm.warehouseName"
-            placeholder="请输入"
-          ></el-input>
+              v-model="addForm.category"
+              placeholder="请输入"
+            ></el-input>
           </el-form-item>
-         
 
+          <el-form-item label="方向" prop="direction" style="margin-left: 15px">
+            <el-input
+              v-model="addForm.direction"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
           <el-form-item
-            label="方向"
-            prop="enterpriseId"
-            style="margin-left: 15px"
+            label="编号"
+            prop="serialNumber"
+            style="margin-left: 10px"
           >
-          <el-input
-            v-model="searchForm.warehouseName"
-            placeholder="请输入"
-          ></el-input>
-          </el-form-item>
-          <el-form-item label="编号" prop="orderNumber"  style="margin-left: 10px">
             <el-input
-              v-model="contractForm.orderNumber"
+              v-model="addForm.serialNumber"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
 
-          <el-form-item label="单号" prop="orderNumber">
+          <el-form-item label="单号" prop="number">
+            <el-input v-model="addForm.number" placeholder="请输入"></el-input>
+          </el-form-item>
+
+          <el-form-item label="批号" prop="lotNumber">
             <el-input
-              v-model="contractForm.orderNumber"
+              v-model="addForm.lotNumber"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
 
-          <el-form-item label="批号" prop="orderNumber">
+          <el-form-item label="部门" prop="department">
             <el-input
-              v-model="contractForm.orderNumber"
+              v-model="addForm.department"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-
-          <el-form-item label="部门" prop="enterpriseId">
-            <el-input
-            v-model="searchForm.warehouseName"
-            placeholder="请输入"
-          ></el-input>
+          <el-form-item label="经手人" prop="handler">
+            <el-input v-model="addForm.handler" placeholder="请输入"></el-input>
           </el-form-item>
-          <el-form-item label="经手人" prop="enterpriseId">
+          <el-form-item label="制单人" prop="singleHanded">
             <el-input
-            v-model="searchForm.warehouseName"
-            placeholder="请输入"
-          ></el-input>
+              v-model="addForm.singleHanded"
+              placeholder="请输入"
+            ></el-input>
           </el-form-item>
-          <el-form-item label="制单人" prop="enterpriseId">
-            <el-input
-            v-model="searchForm.warehouseName"
-            placeholder="请输入"
-          ></el-input>
-          </el-form-item>
-          <el-form-item label="供货单位" prop="enterpriseId">
-            <el-input
-            v-model="searchForm.warehouseName"
-            placeholder="请输入"
-          ></el-input>
+          <el-form-item label="供货单位" prop="vendor">
+            <el-input v-model="addForm.vendor" placeholder="请输入"></el-input>
           </el-form-item>
 
           <el-form-item label="备注" prop="remarks">
@@ -276,7 +257,7 @@
               style="width: 790px"
               type="textarea"
               :rows="1"
-              v-model="contractForm.remarks"
+              v-model="addForm.remark"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
@@ -292,7 +273,7 @@
           </el-button>
           <el-table
             class="tables"
-            :data="orderMaterialList"
+            :data="materialData"
             height="360"
             style="min-height: auto"
           >
@@ -305,12 +286,12 @@
                 ></el-input>
               </template>
             </el-table-column>
-            <el-table-column prop="specifications" label="规格" align="center">
+            <el-table-column prop="specification" label="规格" align="center">
               <template slot-scope="scope">
                 <el-input
                   style="width: 122px"
                   size="mini"
-                  v-model="scope.row.specifications"
+                  v-model="scope.row.specification"
                 ></el-input>
               </template>
             </el-table-column>
@@ -323,12 +304,12 @@
                 ></el-input>
               </template>
             </el-table-column>
-            <el-table-column prop="materialNum" label="数量" align="center">
+            <el-table-column prop="quantity" label="数量" align="center">
               <template slot-scope="scope">
                 <el-input
                   style="width: 122px"
                   size="mini"
-                  v-model="scope.row.materialNum"
+                  v-model="scope.row.quantity"
                 ></el-input>
               </template>
             </el-table-column>
@@ -341,12 +322,12 @@
                 ></el-input>
               </template>
             </el-table-column>
-            <el-table-column prop="computeUnit" label="金额" align="center">
+            <el-table-column prop="amount" label="金额" align="center">
               <template slot-scope="scope">
                 <el-input
                   style="width: 122px"
                   size="mini"
-                  v-model="scope.row.computeUnit"
+                  v-model="scope.row.amount"
                 ></el-input>
               </template>
             </el-table-column>
@@ -378,7 +359,7 @@
             </el-table-column>
           </el-table>
         </div>
-        <div class="dialog-footer" style="text-align: center;">
+        <div class="dialog-footer" style="text-align: center">
           <el-button
             class="cancleBtn"
             @click="dialogShow = false"
@@ -386,18 +367,11 @@
             size="medium"
             >取消
           </el-button>
-          <!-- <el-button
-            type="primary"
-            icon="el-icon-circle-check"
-            @click="saveContractInfoFn(1)"
-            size="medium"
-          >
-          暂存
-          </el-button> -->
+
           <el-button
             type="primary"
             icon="el-icon-circle-check"
-            @click="saveContractInfoFn(2)"
+            @click="saveContractInfoFn"
             size="medium"
           >
             保存
@@ -405,33 +379,276 @@
         </div>
       </div>
     </el-dialog>
+    <!--详情弹框-->
+    <el-dialog
+      :modal-append-to-body="false"
+      title="详情"
+      :visible.sync="isShow"
+      width="1167px"
+    >
+      <div class="dialog_content">
+        <el-form
+          style="margin: 0 28px"
+          size="medium"
+          :model="addForm"
+          ref="addForm"
+          :rules="addFormules"
+          :inline="true"
+        >
+          <el-form-item label="日期" prop="createTime">
+            <el-date-picker
+              v-model="detailData.date"
+              disabled
+              type="date"
+              placeholder="选择日期"
+              value-format="yyyy-MM-dd"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="仓库" prop="warehouse">
+            <el-input
+              disabled
+              v-model="detailData.warehouse"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="类型" prop="category">
+            <el-input
+              disabled
+              v-model="detailData.category"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item label="方向" prop="direction" style="margin-left: 15px">
+            <el-input
+              disabled
+              v-model="detailData.direction"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            label="编号"
+            prop="serialNumber"
+            style="margin-left: 10px"
+          >
+            <el-input
+              disabled
+              v-model="detailData.serialNumber"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item label="单号" prop="number">
+            <el-input
+              disabled
+              v-model="detailData.number"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item label="批号" prop="lotNumber">
+            <el-input
+              disabled
+              v-model="detailData.lotNumber"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item label="部门" prop="department">
+            <el-input
+              disabled
+              v-model="detailData.department"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="经手人" prop="handler">
+            <el-input
+              disabled
+              v-model="detailData.handler"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="制单人" prop="singleHanded">
+            <el-input
+              disabled
+              v-model="detailData.singleHanded"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="供货单位" prop="vendor">
+            <el-input
+              disabled
+              v-model="detailData.vendor"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item label="备注" prop="remarks">
+            <el-input
+              disabled
+              style="width: 790px"
+              type="textarea"
+              :rows="1"
+              v-model="detailData.remark"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+        </el-form>
+        <div class="importMaterialBox">
+          <el-table
+            class="tables"
+            :data="materialData"
+            height="360"
+            style="min-height: auto"
+          >
+            <el-table-column prop="name" label="品名" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  disabled
+                  style="width: 122px"
+                  size="mini"
+                  v-model="scope.row.name"
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="specification" label="规格" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  disabled
+                  style="width: 122px"
+                  size="mini"
+                  v-model="scope.row.specification"
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="unit" label="单位" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  disabled
+                  style="width: 122px"
+                  size="mini"
+                  v-model="scope.row.unit"
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="quantity" label="数量" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  disabled
+                  style="width: 122px"
+                  size="mini"
+                  v-model="scope.row.quantity"
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="unitPrice" label="单价" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  disabled
+                  style="width: 122px"
+                  size="mini"
+                  v-model="scope.row.unitPrice"
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="amount" label="金额" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  disabled
+                  style="width: 122px"
+                  size="mini"
+                  v-model="scope.row.amount"
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="remark" label="备注" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  disabled
+                  style="width: 122px"
+                  size="mini"
+                  v-model="scope.row.remark"
+                ></el-input>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <div class="dialog-footer" style="text-align: center">
+          <el-button
+            type="primary"
+            icon="el-icon-circle-check"
+            size="medium"
+            @click="isShow = false"
+          >
+            确认
+          </el-button>
+        </div>
+      </div>
+    </el-dialog>
+   
   </div>
 </template>
 <script>
 import {
-  addStuffWarehouseApi,
-  deleteStuffWarehouseApi,
-  editStuffWarehouseApi,
-  getStuffWarehousePageApi
-} from '@/assets/js/api/warehouseManagement.js'
+  addGtMaterialInOutWarehouseApi,
+  deletGtMaterialInOutWarehouseApi,
+  editGtMaterialInOutWarehouseApi,
+  gettGMaterialInOutWarehousePageApi,//查询表单数据
+  gettGMaterialInOutWarehouseListApi,//根据id查询物料
+} from '@/assets/js/api/materialManagement.js'
 export default {
   mounted() {
     this.getList()
   },
   data() {
     return {
-      orderMaterialList: [
+      timeValue: '',
+      isShow: false,
+      deliteShow: false,
+      detailData: {},
+      searchForm: {
+        number: "",
+        // stuffNumber:"",//货号
+        warehouse: "",
+        department: "",
+        category: "",
+        handler: "",
+        // lookupCode: "",//助查码
+        vendor: "",
+        startTime: '',//开始时间
+        endTime: '',//结束时间
+      },//查询
+      addForm: {
+        date: "",
+        warehouse: "",
+        category: "",
+        direction: "",
+        serialNumber: "",
+        number: "",
+        lotNumber: "",
+        department: "",
+        handler: "",
+        singleHanded: "",
+        vendor: "",
+        remark: "",
+        materialList: [],
+        gtMaterialInOutWarehouseId: '',
+        type: "",
+      },//表单
+      materialData: [
         {
           name: "",
-          specifications: "",
+          specification: "",
           unit: "",
-          materialNum: "",
+          quantity: "",
           unitPrice: "",
-          computeUnit: "",
+          amount: "",
           remark: "",
         }
       ],
-      contractForm: {},
+      deliteMaterialList: [],//详情
+      addFormules: {},
       title: "",
       dialogShow: false,
       pagInfo: {
@@ -440,113 +657,36 @@ export default {
         total: 0 //总条数
       },
       List: [],
-      addEditForm: {
-        warehouseName: '',//仓库名称
-        warehousePos: '',//warehousePos
-        header: '',//负责人
-        headerPhone: '',//负责人电话
-        remark: '',//备注
-      },
-      addEditRules: {
-        warehouseName: [
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'blur'
-          },
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'change'
-          }
-        ],
-        warehousePos: [
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'blur'
-          },
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'change'
-          }
-        ],
-        header: [
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'blur'
-          },
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'change'
-          }
-        ],
-        headerPhone: [
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'blur'
-          },
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'change'
-          }
-        ],
+      gtMaterialInOutWarehouseId: '',//编辑查询
 
-      },
-      searchForm: {
-        warehouseName: '',
-        warehouseNumber: '',
-        warehousePos: '',
-      },
     }
   },
   methods: {
-    //表格动态添加
-    importMaterial() {
-      let statusType = true;
-      this.orderMaterialList.forEach((item) => {
-        if (item.name == "" || item.specifications == "" || item.unit == "" || item.materialNum == "" || item.unitPrice == "" || item.computeUnit == "" || item.remark == "") {
-          this.$message({
-            message: "请完善信息后在添加",
-            type: "warning",
-          });
-          statusType = false;
-        }
-
-      })
-      if (statusType) {
-        this.orderMaterialList.push({
-          name: "",
-          specifications: "",
-          unit: "",
-          materialNum: "",
-          unitPrice: "",
-          computeUnit: "",
-          remark: "",
-        });
+    //选择时间时
+    getTime(val) {
+      if (val) {
+        this.searchForm.startTime = val[0]
+        this.searchForm.endTime = val[1]
+      } else {
+        this.searchForm.startTime = ''
+        this.searchForm.endTime = ''
       }
     },
-    //删除表格动态操作
-    deleteTable(item, index) {
-      this.orderMaterialList.splice(index, 1)
-      this.$message({
-        message: "删除成功",
-        type: "success",
-      });
-    },
     //查询仓库数据
     getList() {
-      getStuffWarehousePageApi({
+      gettGMaterialInOutWarehousePageApi({
         pageNo: this.pagInfo.pageNo,
         pageSize: this.pagInfo.pageSize,
         projectSn: this.$store.state.projectSn,
-        warehouseName: this.searchForm.warehouseName,
-        warehousePos: this.searchForm.warehousePos,
+        number: this.searchForm.number,
+        warehouse: this.searchForm.warehouse,
+        department: this.searchForm.department,
+        category: this.searchForm.category,
+        handler: this.searchForm.handler,
+        vendor: this.searchForm.vendor,
+        endTime:this.searchForm.endTime,
+        startTime:this.searchForm.startTime,
+        type: 30,
       }).then((result) => {
         if (result.success) {
           this.List = result.result.records
@@ -554,34 +694,83 @@ export default {
         }
       })
     },
+    //查询物料信息
+    getMaterialData() {
+      gettGMaterialInOutWarehouseListApi({
+        projectSn: this.$store.state.projectSn,
+        gtMaterialInOutWarehouseId: this.gtMaterialInOutWarehouseId
+      }).then((result) => {
+        this.materialData = result.result
+      })
+    },
+    //显示检查详细弹框
+    showDetailFn(row) {
+      this.detailData = row
+      this.isShow = true
+      this.gtMaterialInOutWarehouseId = this.detailData.id
+      this.getMaterialData()
+    },
+    //表格动态添加
+    importMaterial() {
+      // let statusType = true;
+      // this.materialList.forEach((item) => {
+      //   if (item.name == "" || item.specifications == "" || item.unit == "" || item.quantity == "") {
+      //     this.$message({
+      //       message: "请完善信息后在添加",
+      //       type: "warning",
+      //     });
+      //     statusType = false;
+      //   }
 
+      // })
+      // if (statusType) {
+      this.materialData.push({
+        name: "",
+        specification: "",
+        unit: "",
+        quantity: "",
+        unitPrice: "",
+        amount: "",
+        remark: "",
+      });
+      // }
+    },
+    //删除表格动态操作
+    deleteTable(index) {
+      this.materialData.splice(index, 1)
+    },
     add() {
-      this.title = '新增'
+      this.title = '新增入库'
       this.dialogShow = true
-      this.orderMaterialList=[]
-      this.close()
+      this.materialData = []
+      this.addForm = {}
     },
 
     edit(obj) {
-      this.title = '编辑'
+      console.log('obj=======', obj);
+      this.title = '编辑入库'
       this.dialogShow = true
-      this.addEditForm = JSON.parse(JSON.stringify(obj))
+      this.addForm = JSON.parse(JSON.stringify(obj))
+      this.gtMaterialInOutWarehouseId = obj.id
+      this.getMaterialData()
     },
-    submit() {
-      let params = JSON.parse(JSON.stringify(this.addEditForm))
+    saveContractInfoFn() {
+      let params = JSON.parse(JSON.stringify(this.addForm))
+      params.materialList = this.materialData
       params.projectSn = this.$store.state.projectSn
-      this.$refs.addEditForm.validate((valid) => {
+      params.type = 30
+      this.$refs.addForm.validate((valid) => {
         if (valid) {
-          if (this.title == '新增仓库') {
-            addStuffWarehouseApi(params).then((result) => {
+          if (this.title == '新增入库') {
+            addGtMaterialInOutWarehouseApi(params).then((result) => {
               if (result.success) {
                 this.$message.success(result.message)
                 this.getList()
               }
             })
-          } else if (this.title === '编辑仓库') {
+          } else if (this.title === '编辑入库') {
             console.log('编辑信息', this.addEditForm)
-            editStuffWarehouseApi(params).then((result) => {
+            editGtMaterialInOutWarehouseApi(params).then((result) => {
               if (result.success) {
                 this.$message.success(result.message)
                 this.getList()
@@ -601,7 +790,7 @@ export default {
         type: "warning",
       })
         .then(() => {
-          deleteStuffWarehouseApi({ id: obj.id }).then((res) => {
+          deletGtMaterialInOutWarehouseApi({ id: obj.id }).then((res) => {
             if (res.success) {
               this.getList()
               this.$message({
@@ -624,12 +813,6 @@ export default {
         });
     },
 
-    close() {
-      this.addEditForm = {}
-      this.$nextTick(() => {
-        this.$refs.addEditForm.clearValidate()
-      })
-    },
     SizeChange(val) {
       this.pagInfo.pageSize = val
       this.getList()
diff --git a/src/views/projectFront/turnoverMaterialManagement/exitRegistration.vue b/src/views/projectFront/turnoverMaterialManagement/exitRegistration.vue
index 714a40aa..5146342d 100644
--- a/src/views/projectFront/turnoverMaterialManagement/exitRegistration.vue
+++ b/src/views/projectFront/turnoverMaterialManagement/exitRegistration.vue
@@ -9,88 +9,53 @@
         size="medium"
       >
         <el-form-item label="单号">
-          <el-input
-            v-model="searchForm.warehouseName"
-            placeholder="请输入"
-          ></el-input>
+          <el-input v-model="searchForm.number" placeholder="请输入"></el-input>
         </el-form-item>
-        <el-form-item label="客户">
-          <el-input
-            v-model="searchForm.warehouseName"
-            placeholder="请输入"
-          ></el-input>
-        </el-form-item>
-
+        <!-- <el-form-item label="货号">
+          <el-input v-model="searchForm.stuffNumber" placeholder="请输入"></el-input>
+        </el-form-item> -->
         <el-form-item label="仓库">
           <el-input
-            v-model="searchForm.warehouseName"
+            v-model="searchForm.warehouse"
             placeholder="请输入"
           ></el-input>
         </el-form-item>
         <el-form-item label="部门">
           <el-input
-            v-model="searchForm.warehouseName"
+            v-model="searchForm.department"
+            placeholder="请输入"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="类型">
+          <el-input
+            v-model="searchForm.category"
             placeholder="请输入"
           ></el-input>
         </el-form-item>
-
         <el-form-item label="经手人">
           <el-input
-            v-model="searchForm.warehouseName"
+            v-model="searchForm.handler"
             placeholder="请输入"
           ></el-input>
         </el-form-item>
+        <!-- <el-form-item label="助查码">
+          <el-input v-model="searchForm.lookupCode" placeholder="请输入"></el-input>
+        </el-form-item> -->
+
         <el-form-item label="日期">
           <el-date-picker
-            v-model="searchForm.warehouseName"
+            v-model="timeValue"
             type="daterange"
             range-separator="至"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
+            value-format="yyyy-MM-dd"
+            @change="getTime"
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="批号">
-          <el-input
-            v-model="searchForm.warehouseName"
-            placeholder="请输入"
-          ></el-input>
-        </el-form-item>
-
-        <el-form-item label="类型">
-          <el-select v-model="searchForm.warehouseName" placeholder="请选择">
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="货号">
-          <el-input
-            v-model="searchForm.warehouseName"
-            placeholder="请输入"
-          ></el-input>
-        </el-form-item>
-      
-        <el-form-item label="品名">
-          <el-select v-model="searchForm.warehouseName" placeholder="请选择">
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="助查码">
-          <el-input
-            v-model="searchForm.warehouseName"
-            placeholder="请输入"
-          ></el-input>
+        <el-form-item label="客户">
+          <el-input v-model="searchForm.customer" placeholder="请输入"></el-input>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" plain @click="getList">{{
@@ -104,71 +69,72 @@
       </el-form>
     </div>
     <div class="table_wrap whiteBlock">
-      <el-table class="tables" :data="List">
+      <el-table class="tables" :data="List" @row-click="showDetailFn">
         <el-table-column
-          prop="warehouseName"
+          prop="serialNumber"
           label="编号"
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="warehousePos"
+          prop="number"
           align="center"
           label="单号"
         ></el-table-column>
         <el-table-column
-          prop="header"
+          prop="date"
           align="center"
           label="日期"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="warehouse"
           align="center"
           label="仓库"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="direction"
           align="center"
           label="方向"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="category"
           align="center"
           label="类别"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="department"
           align="center"
           label="部门"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="customer"
           align="center"
-          label="供应商"
+          label="客户"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="handler"
           align="center"
           label="经手人"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="lotNumber"
           align="center"
           label="批号"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="singleHanded"
           align="center"
           label="制单人"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          width="110"
+          prop="createTime"
           align="center"
           label="制单时间"
         ></el-table-column>
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <div class="tableBtns" style="margin-left: -14px !important">
-              <div @click="edit(scope.row)" class="operationText">
+              <div @click.stop="edit(scope.row)" class="operationText" style="margin-right: 10px !important;margin-left: 20px !important;">
                 <img
                   src="@/assets/images/icon-edit.png"
                   width="15px"
@@ -176,7 +142,7 @@
                 />
                 <span>编辑</span>
               </div>
-              <div @click="deleteDev(scope.row)" class="operationText">
+              <div @click.stop="deleteDev(scope.row)" class="operationText">
                 <img
                   src="@/assets/images/icon-delete.png"
                   width="15px"
@@ -207,107 +173,98 @@
       :visible.sync="dialogShow"
       width="1167px"
     >
-      <p>出库单信息</p>
+      <p>入库单信息</p>
       <div class="dialog_content">
         <el-form
           style="margin: 0 28px"
           size="medium"
-          :model="contractForm"
-          ref="contractForm"
-          :rules="contractFormRules"
+          :model="addForm"
+          ref="addForm"
+          :rules="addFormules"
           :inline="true"
         >
-          <el-form-item label="日期" prop="arrivalTime">
+          <el-form-item label="日期" prop="createTime">
             <el-date-picker
-              v-model="value1"
+              v-model="addForm.date"
               type="date"
               placeholder="选择日期"
-              value-format="yyyy-MM-dd HH:mm"
+              value-format="yyyy-MM-dd"
             >
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="仓库" prop="enterpriseId">
+          <el-form-item label="仓库" prop="warehouse">
             <el-input
-              v-model="searchForm.warehouseName"
+              v-model="addForm.warehouse"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="类型" prop="enterpriseId">
+          <el-form-item label="类型" prop="category">
             <el-input
-              v-model="searchForm.warehouseName"
-              placeholder="请输入"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="客户" prop="enterpriseId">
-            <el-input
-              v-model="searchForm.warehouseName"
+              v-model="addForm.category"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
 
+          <el-form-item label="方向" prop="direction" style="margin-left: 15px">
+            <el-input
+              v-model="addForm.direction"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
           <el-form-item
-            label="方向"
-            prop="enterpriseId"
-            style="margin-left: 15px"
+            label="编号"
+            prop="serialNumber"
+            style="margin-left: 10px"
           >
             <el-input
-              v-model="searchForm.warehouseName"
-              placeholder="请输入"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="编号" prop="orderNumber">
-            <el-input
-              v-model="contractForm.orderNumber"
+              v-model="addForm.serialNumber"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
 
-          <el-form-item label="单号" prop="orderNumber">
+          <el-form-item label="单号" prop="number">
+            <el-input v-model="addForm.number" placeholder="请输入"></el-input>
+          </el-form-item>
+
+          <el-form-item label="批号" prop="lotNumber">
             <el-input
-              v-model="contractForm.orderNumber"
+              v-model="addForm.lotNumber"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
 
-          <el-form-item label="批号" prop="orderNumber">
+          <el-form-item label="部门" prop="department">
             <el-input
-              v-model="contractForm.orderNumber"
+              v-model="addForm.department"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-
-          <el-form-item label="部门" prop="enterpriseId">
+          <el-form-item label="经手人" prop="handler">
+            <el-input v-model="addForm.handler" placeholder="请输入"></el-input>
+          </el-form-item>
+          <el-form-item label="制单人" prop="singleHanded">
             <el-input
-              v-model="searchForm.warehouseName"
+              v-model="addForm.singleHanded"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="经手人" prop="enterpriseId">
-            <el-input
-              v-model="searchForm.warehouseName"
-              placeholder="请输入"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="制单人" prop="enterpriseId">
-            <el-input
-              v-model="searchForm.warehouseName"
-              placeholder="请输入"
-            ></el-input>
+          <el-form-item label="客户" prop="customer">
+            <el-input v-model="addForm.customer" placeholder="请输入"></el-input>
           </el-form-item>
 
           <el-form-item label="备注" prop="remarks">
             <el-input
-              style="width: 790px"
+              style="width: 820px"
               type="textarea"
               :rows="1"
-              v-model="contractForm.remarks"
+              v-model="addForm.remark"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
         </el-form>
         <div class="importMaterialBox">
           <el-button
-            style="margin-bottom: 15px; margin-left: 990px"
+            style="margin-bottom: 15px; margin-left: 1005px"
             type="primary"
             size="medium"
             @click="importMaterial"
@@ -316,7 +273,7 @@
           </el-button>
           <el-table
             class="tables"
-            :data="orderMaterialList"
+            :data="materialData"
             height="360"
             style="min-height: auto"
           >
@@ -329,12 +286,12 @@
                 ></el-input>
               </template>
             </el-table-column>
-            <el-table-column prop="specifications" label="规格" align="center">
+            <el-table-column prop="specification" label="规格" align="center">
               <template slot-scope="scope">
                 <el-input
                   style="width: 122px"
                   size="mini"
-                  v-model="scope.row.specifications"
+                  v-model="scope.row.specification"
                 ></el-input>
               </template>
             </el-table-column>
@@ -347,12 +304,12 @@
                 ></el-input>
               </template>
             </el-table-column>
-            <el-table-column prop="materialNum" label="数量" align="center">
+            <el-table-column prop="quantity" label="数量" align="center">
               <template slot-scope="scope">
                 <el-input
                   style="width: 122px"
                   size="mini"
-                  v-model="scope.row.materialNum"
+                  v-model="scope.row.quantity"
                 ></el-input>
               </template>
             </el-table-column>
@@ -365,12 +322,12 @@
                 ></el-input>
               </template>
             </el-table-column>
-            <el-table-column prop="computeUnit" label="金额" align="center">
+            <el-table-column prop="amount" label="金额" align="center">
               <template slot-scope="scope">
                 <el-input
                   style="width: 122px"
                   size="mini"
-                  v-model="scope.row.computeUnit"
+                  v-model="scope.row.amount"
                 ></el-input>
               </template>
             </el-table-column>
@@ -410,18 +367,11 @@
             size="medium"
             >取消
           </el-button>
-          <!-- <el-button
-            type="primary"
-            icon="el-icon-circle-check"
-            @click="saveContractInfoFn(1)"
-            size="medium"
-          >
-          暂存
-          </el-button> -->
+
           <el-button
             type="primary"
             icon="el-icon-circle-check"
-            @click="saveContractInfoFn(2)"
+            @click="saveContractInfoFn"
             size="medium"
           >
             保存
@@ -429,33 +379,276 @@
         </div>
       </div>
     </el-dialog>
+    <!--详情弹框-->
+    <el-dialog
+      :modal-append-to-body="false"
+      title="详情"
+      :visible.sync="isShow"
+      width="1167px"
+    >
+      <div class="dialog_content">
+        <el-form
+          style="margin: 0 28px"
+          size="medium"
+          :model="addForm"
+          ref="addForm"
+          :rules="addFormules"
+          :inline="true"
+        >
+          <el-form-item label="日期" prop="createTime">
+            <el-date-picker
+              v-model="detailData.date"
+              disabled
+              type="date"
+              placeholder="选择日期"
+              value-format="yyyy-MM-dd"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="仓库" prop="warehouse">
+            <el-input
+              disabled
+              v-model="detailData.warehouse"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="类型" prop="category">
+            <el-input
+              disabled
+              v-model="detailData.category"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item label="方向" prop="direction" style="margin-left: 15px">
+            <el-input
+              disabled
+              v-model="detailData.direction"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            label="编号"
+            prop="serialNumber"
+            style="margin-left: 10px"
+          >
+            <el-input
+              disabled
+              v-model="detailData.serialNumber"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item label="单号" prop="number">
+            <el-input
+              disabled
+              v-model="detailData.number"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item label="批号" prop="lotNumber">
+            <el-input
+              disabled
+              v-model="detailData.lotNumber"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item label="部门" prop="department">
+            <el-input
+              disabled
+              v-model="detailData.department"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="经手人" prop="handler">
+            <el-input
+              disabled
+              v-model="detailData.handler"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="制单人" prop="singleHanded">
+            <el-input
+              disabled
+              v-model="detailData.singleHanded"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="客户" prop="customer">
+            <el-input
+              disabled
+              v-model="detailData.customer"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item label="备注" prop="remarks">
+            <el-input
+              disabled
+              style="width: 790px"
+              type="textarea"
+              :rows="1"
+              v-model="detailData.remark"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+        </el-form>
+        <div class="importMaterialBox">
+          <el-table
+            class="tables"
+            :data="materialData"
+            height="360"
+            style="min-height: auto"
+          >
+            <el-table-column prop="name" label="品名" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  disabled
+                  style="width: 122px"
+                  size="mini"
+                  v-model="scope.row.name"
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="specification" label="规格" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  disabled
+                  style="width: 122px"
+                  size="mini"
+                  v-model="scope.row.specification"
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="unit" label="单位" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  disabled
+                  style="width: 122px"
+                  size="mini"
+                  v-model="scope.row.unit"
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="quantity" label="数量" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  disabled
+                  style="width: 122px"
+                  size="mini"
+                  v-model="scope.row.quantity"
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="unitPrice" label="单价" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  disabled
+                  style="width: 122px"
+                  size="mini"
+                  v-model="scope.row.unitPrice"
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="amount" label="金额" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  disabled
+                  style="width: 122px"
+                  size="mini"
+                  v-model="scope.row.amount"
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="remark" label="备注" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  disabled
+                  style="width: 122px"
+                  size="mini"
+                  v-model="scope.row.remark"
+                ></el-input>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <div class="dialog-footer" style="text-align: center">
+          <el-button
+            type="primary"
+            icon="el-icon-circle-check"
+            size="medium"
+            @click="isShow = false"
+          >
+            确认
+          </el-button>
+        </div>
+      </div>
+    </el-dialog>
+   
   </div>
 </template>
 <script>
 import {
-  addStuffWarehouseApi,
-  deleteStuffWarehouseApi,
-  editStuffWarehouseApi,
-  getStuffWarehousePageApi
-} from '@/assets/js/api/warehouseManagement.js'
+  addGtMaterialInOutWarehouseApi,
+  deletGtMaterialInOutWarehouseApi,
+  editGtMaterialInOutWarehouseApi,
+  gettGMaterialInOutWarehousePageApi,//查询表单数据
+  gettGMaterialInOutWarehouseListApi,//根据id查询物料
+} from '@/assets/js/api/materialManagement.js'
 export default {
   mounted() {
     this.getList()
   },
   data() {
     return {
-      orderMaterialList: [
+      timeValue: '',
+      isShow: false,
+      deliteShow: false,
+      detailData: {},
+      searchForm: {
+        number: "",
+        // stuffNumber:"",//货号
+        warehouse: "",
+        department: "",
+        category: "",
+        handler: "",
+        // lookupCode: "",//助查码
+        customer: "",
+        startTime: '',//开始时间
+        endTime: '',//结束时间
+      },//查询
+      addForm: {
+        date: "",
+        warehouse: "",
+        category: "",
+        direction: "",
+        serialNumber: "",
+        number: "",
+        lotNumber: "",
+        department: "",
+        handler: "",
+        singleHanded: "",
+        customer: "",
+        remark: "",
+        materialList: [],
+        gtMaterialInOutWarehouseId: '',
+        type: "",
+      },//表单
+      materialData: [
         {
           name: "",
-          specifications: "",
+          specification: "",
           unit: "",
-          materialNum: "",
+          quantity: "",
           unitPrice: "",
-          computeUnit: "",
+          amount: "",
           remark: "",
         }
       ],
-      contractForm: {},
+      deliteMaterialList: [],//详情
+      addFormules: {},
       title: "",
       dialogShow: false,
       pagInfo: {
@@ -464,113 +657,36 @@ export default {
         total: 0 //总条数
       },
       List: [],
-      addEditForm: {
-        warehouseName: '',//仓库名称
-        warehousePos: '',//warehousePos
-        header: '',//负责人
-        headerPhone: '',//负责人电话
-        remark: '',//备注
-      },
-      addEditRules: {
-        warehouseName: [
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'blur'
-          },
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'change'
-          }
-        ],
-        warehousePos: [
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'blur'
-          },
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'change'
-          }
-        ],
-        header: [
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'blur'
-          },
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'change'
-          }
-        ],
-        headerPhone: [
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'blur'
-          },
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'change'
-          }
-        ],
+      gtMaterialInOutWarehouseId: '',//编辑查询
 
-      },
-      searchForm: {
-        warehouseName: '',
-        warehouseNumber: '',
-        warehousePos: '',
-      },
     }
   },
   methods: {
-    //表格动态添加
-    importMaterial() {
-      let statusType = true;
-      this.orderMaterialList.forEach((item) => {
-        if (item.name == "" || item.specifications == "" || item.unit == "" || item.materialNum == "" || item.unitPrice == "" || item.computeUnit == "" || item.remark == "") {
-          this.$message({
-            message: "请完善信息后在添加",
-            type: "warning",
-          });
-          statusType = false;
-        }
-
-      })
-      if (statusType) {
-        this.orderMaterialList.push({
-          name: "",
-          specifications: "",
-          unit: "",
-          materialNum: "",
-          unitPrice: "",
-          computeUnit: "",
-          remark: "",
-        });
+    //选择时间时
+    getTime(val) {
+      if (val) {
+        this.searchForm.startTime = val[0]
+        this.searchForm.endTime = val[1]
+      } else {
+        this.searchForm.startTime = ''
+        this.searchForm.endTime = ''
       }
     },
-    //删除表格动态操作
-    deleteTable(item, index) {
-      this.orderMaterialList.splice(index, 1)
-      this.$message({
-        message: "删除成功",
-        type: "success",
-      });
-    },
     //查询仓库数据
     getList() {
-      getStuffWarehousePageApi({
+      gettGMaterialInOutWarehousePageApi({
         pageNo: this.pagInfo.pageNo,
         pageSize: this.pagInfo.pageSize,
         projectSn: this.$store.state.projectSn,
-        warehouseName: this.searchForm.warehouseName,
-        warehousePos: this.searchForm.warehousePos,
+        number: this.searchForm.number,
+        warehouse: this.searchForm.warehouse,
+        department: this.searchForm.department,
+        category: this.searchForm.category,
+        handler: this.searchForm.handler,
+        customer: this.searchForm.customer,
+        endTime:this.searchForm.endTime,
+        startTime:this.searchForm.startTime,
+        type: 40,
       }).then((result) => {
         if (result.success) {
           this.List = result.result.records
@@ -578,34 +694,83 @@ export default {
         }
       })
     },
+    //查询物料信息
+    getMaterialData() {
+      gettGMaterialInOutWarehouseListApi({
+        projectSn: this.$store.state.projectSn,
+        gtMaterialInOutWarehouseId: this.gtMaterialInOutWarehouseId
+      }).then((result) => {
+        this.materialData = result.result
+      })
+    },
+    //显示检查详细弹框
+    showDetailFn(row) {
+      this.detailData = row
+      this.isShow = true
+      this.gtMaterialInOutWarehouseId = this.detailData.id
+      this.getMaterialData()
+    },
+    //表格动态添加
+    importMaterial() {
+      // let statusType = true;
+      // this.materialList.forEach((item) => {
+      //   if (item.name == "" || item.specifications == "" || item.unit == "" || item.quantity == "") {
+      //     this.$message({
+      //       message: "请完善信息后在添加",
+      //       type: "warning",
+      //     });
+      //     statusType = false;
+      //   }
 
+      // })
+      // if (statusType) {
+      this.materialData.push({
+        name: "",
+        specification: "",
+        unit: "",
+        quantity: "",
+        unitPrice: "",
+        amount: "",
+        remark: "",
+      });
+      // }
+    },
+    //删除表格动态操作
+    deleteTable(index) {
+      this.materialData.splice(index, 1)
+    },
     add() {
-      this.title = '新增'
+      this.title = '新增入库'
       this.dialogShow = true
-      this.orderMaterialList = []
-      this.close()
+      this.materialData = []
+      this.addForm = {}
     },
 
     edit(obj) {
-      this.title = '编辑'
+      console.log('obj=======', obj);
+      this.title = '编辑入库'
       this.dialogShow = true
-      this.addEditForm = JSON.parse(JSON.stringify(obj))
+      this.addForm = JSON.parse(JSON.stringify(obj))
+      this.gtMaterialInOutWarehouseId = obj.id
+      this.getMaterialData()
     },
-    submit() {
-      let params = JSON.parse(JSON.stringify(this.addEditForm))
+    saveContractInfoFn() {
+      let params = JSON.parse(JSON.stringify(this.addForm))
+      params.materialList = this.materialData
       params.projectSn = this.$store.state.projectSn
-      this.$refs.addEditForm.validate((valid) => {
+      params.type = 40
+      this.$refs.addForm.validate((valid) => {
         if (valid) {
-          if (this.title == '新增仓库') {
-            addStuffWarehouseApi(params).then((result) => {
+          if (this.title == '新增入库') {
+            addGtMaterialInOutWarehouseApi(params).then((result) => {
               if (result.success) {
                 this.$message.success(result.message)
                 this.getList()
               }
             })
-          } else if (this.title === '编辑仓库') {
+          } else if (this.title === '编辑入库') {
             console.log('编辑信息', this.addEditForm)
-            editStuffWarehouseApi(params).then((result) => {
+            editGtMaterialInOutWarehouseApi(params).then((result) => {
               if (result.success) {
                 this.$message.success(result.message)
                 this.getList()
@@ -625,7 +790,7 @@ export default {
         type: "warning",
       })
         .then(() => {
-          deleteStuffWarehouseApi({ id: obj.id }).then((res) => {
+          deletGtMaterialInOutWarehouseApi({ id: obj.id }).then((res) => {
             if (res.success) {
               this.getList()
               this.$message({
@@ -648,12 +813,6 @@ export default {
         });
     },
 
-    close() {
-      this.addEditForm = {}
-      this.$nextTick(() => {
-        this.$refs.addEditForm.clearValidate()
-      })
-    },
     SizeChange(val) {
       this.pagInfo.pageSize = val
       this.getList()