From 6ac768b911b4ddc93466a19b89969257c86d8f87 Mon Sep 17 00:00:00 2001
From: fly-l <1420031550@qq.com>
Date: Thu, 19 Oct 2023 10:12:45 +0800
Subject: [PATCH] 2023-10-19

---
 .vs/SGGL_SeDin/v17/.wsuo                      | Bin 264192 -> 265216 bytes
 .../0-3合同管理（Menu_HTGL）.sql              |  63 ++-
 .../1-6合同管理（Menu_PHTGL）.sql             |  39 +-
 SGGL/BLL/Common/Const.cs                      |  17 +-
 .../BillOfQuantities/PhtglQuantityService.cs  | 133 ++++-
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj       |  24 +
 .../HJGL/WeldingManage/WeldReportEdit.aspx.cs |   4 +-
 .../BillOfQuantities/TemQuantityList.aspx     | 253 +++++-----
 .../BillOfQuantities/TemQuantityList.aspx.cs  |  24 +-
 .../TemQuantityList.aspx.designer.cs          |   9 +
 .../BillOfQuantities/TemQuantitySelect.aspx   |  60 ++-
 .../TemQuantitySelect.aspx.designer.cs        |   9 -
 .../ContractTrackComparison.aspx              | 293 +++++++++++
 .../ContractTrackComparison.aspx.cs           | 476 ++++++++++++++++++
 .../ContractTrackComparison.aspx.designer.cs  | 467 +++++++++++++++++
 .../ContractCompile/ContractTrackList.aspx    |   6 +-
 .../ContractTrackList.aspx.designer.cs        |  63 ---
 .../ContractTrackProgressDetection.aspx       |  16 +
 .../ContractTrackProgressDetection.aspx.cs    |  17 +
 ...actTrackProgressDetection.aspx.designer.cs |  26 +
 .../PHTGL/ContractCompile/ContractWBS.aspx    | 213 ++++++++
 .../PHTGL/ContractCompile/ContractWBS.aspx.cs | 270 ++++++++++
 .../ContractWBS.aspx.designer.cs              | 278 ++++++++++
 SGGL/FineUIPro.Web/common/Menu_DigData.xml    |  65 ++-
 SGGL/FineUIPro.Web/common/Menu_HTGL.xml       |  13 +-
 SGGL/FineUIPro.Web/common/Menu_JDGL.xml       |   6 +-
 SGGL/FineUIPro.Web/common/Menu_PHTGL.xml      |   5 +-
 SGGL/FineUIPro.Web/common/Menu_ZHGL.xml       |  42 --
 28 files changed, 2562 insertions(+), 329 deletions(-)
 create mode 100644 SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx
 create mode 100644 SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.designer.cs
 create mode 100644 SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetection.aspx
 create mode 100644 SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetection.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetection.aspx.designer.cs
 create mode 100644 SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx
 create mode 100644 SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx.designer.cs

diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo
index 1261326e19e8a0a1a723af7550cb66d640766925..b7abaf608b485145db2dbe1e6478c8798dc30905 100644
GIT binary patch
delta 2277
zcmcJRZERCj7{`0gy?wE3x2}7kY_PF0SP`mS>9#TqD{RP%xG6=l!~h!|d;vxaEh`(a
z0s=;t2z_F%XtE&DeejcT6ZXvvF!6(n_*oL8d_X}(P1Zy(IR8)S)e=H9zMSOO^Y+~5
zJokT|b8ge8UFo-6r(bX$HJMD+U=El|m(}?fVrh|)yPfmi58WFxeIXWOVv-KZVKGKo
z+3j$kUjt@PsI;U(oT8*MB4U(P=5KN5CwQ_FZ8InVmi%}b>SE9YeuK>{)a;P$xfJEc
zAM_sl-ba<=Okd+hFASc{Kj1^X1T+Fye$03<fc{bt1kIoYw1N<518lb(wIb<``zhC2
zG}nRk;5k4`%F>&5qp=4JfW06F;$R=x4-y~=4uC<B0tdkm7zT&HVQ>VDfHYubKcv>j
zDq9B|j_qM(t&K0SvMOLz*}y2}=(DOupKDgN0<h9n-~_C;p?ZO$iyy0~2M-lG{SOq~
z@_#7G349D3r#^d`Hb)gbddxm5GIj^`+g$|%#aHR7Y@+Gnv}mMcNyH}eZ^&BHbjjxq
z)|j)EU;Dw}V{A*$Iap7I6OzukQ{~10rxCaFX><rtlvA%;b#UtN1g8#7m8BeL&lm@T
zmy^$!=s@`qagws--3|q2Y{4a$4JRmBF=BoN!wTIkedpgt5X@9{IvU`Q^U7F;5>;uj
zm$FqOVt|s>UC!JLXPIFk_UPH_F5wi9$d#Bo`uAM&{ZZ)B%*Sj6-CaE_)>5)_M697K
zeiu@5&2ckFXQKPFo~5f5*gnr3I_>EfyC~~HaD48K^v|iZo|3b>oPvWbJWDyX*bx_M
ziY969w&zK1JwoBy$#JtPwEc?e(Lz$~qMqU^*Qsmk4s^UXIClN4G9A2fYulS&tFcUd
zhf^4rkD-R1s2^1_p2S0eMQjhpq$k@y6S?qNqTsZJuLmjVUfX*5xY|#N=5EeSu}{w~
zFA|v!ti%5KHZ<0uM91hqjJuS57)3?a&*pnxcX_8oj}Qn1C_n{fU;$QO15W@uC;^5G
zqjndJRTQ*uqOA+>jJOb6Dg57{_bs>uz61R9_o#mWcfgO}C-5`)6`bi?;6P<8GDC5D
znVF+5{Uhp3=&$m2S;Y2ee(87HyH%ULK-5RGP5))}s}4QAAuTR$5>gjk?Sj%9H_+ke
zBHFT{C=&^v?@{#&o4bYn#^$)l)P^a%71U0i?^X41?*|Iq?hn)LXr&(Bal@wFsF5|c
zTn2OA+2SEe53G>=KAId@p@gD>>SP(MjMo+UBAeQp+Wc+9I|F)nuMoP}->y(NR;g`n
zkh|LP{`^7>&4C?DTm1doeg39st1sw}27RF&(U33L8u0hEZ0}pz6544pK|gHlStWJ!
z<%U!kyLd5vLfBS4&1(df(Wmi6Mf}y}D+Yxwr`mb{>BUc)OCtEBZ8xnp^;~12a8xc;
zXk!6cW4U7Lz?U;q=cRoYJ!ZZ;9olt8T|l?zRi011Hm(XutBzMqR7r7DXuWqtr#AGF
zY&kV#5feied9s9#?F>!?J#xxAUMc0JdMVTiF;C8jlU_OQRld?HEowlk_sUM~bw!P6
z+pOxl+LTqT;Xe_kRhqD>ArgZ#^!A`zb4zuh_NAiMWBGE;p{T(>ds7zl)>>5m?_|XQ
AVE_OC

delta 3329
zcmeI!eRPvo9l-JD-lQc5(vm=6ffkmQQo6pZ=_qMCpafbRuwjd38#*Q}D-5;{Xlc5%
z%q4TY%z@hGrv%0}u}+*Xb8F+QqOuB8r{VzJ)H$cybe`$a;~UvzFU;@l5>JQQj(VJb
zdC&Re{+|2XJonz`-sgF4be}8Q>*{TEO|&e_i%IY(%Sz-04yu@L%WB@fV#&srpHL;7
zh)TEKrtXrYZg9Rvnn0P!#qBOo+azR*sCG%(W-NE5PMDKZh%=CnamYkD&T`I2o&{6y
zRr5ni=jqrf?m&*bGS^Y#PSu=AUWf})$EId>DlR227**~kuHgzZ?Bf{KK#O-|P{F{z
zJE$?UGR>gumShK}M|^~4@MB>5YsO=8Gp2O^b138Rwdtwc#O5BD+|)Da?MCED)qRr@
z>2rtVbjF=_Rc$xdl_g_yrE!91p!GHtd&?8q$Fh`}^K|db6w2xBs49}s_$G&$B-6py
zi^rdIn!4lPQ1}*g-3Og!ZcI-`dUJ3>*mKFKf@P^#N;9H#)9dI+7aX4$b~-t*A>Fo~
ztfb3xv$|7~o(88`K6=zybwEOsA{lp>Kgk*Qf&aYa%2;uyx<Nv|h;;gL#Z^-6$Q#|z
zr4lOH9rM=9!zJ@1>g`lpB<YQ)%@SJBAob;bwJDKY(4-u1xJ8{gd*sh+AC#w>m&?)o
zS_#e=mSA}CKL$wymh^R>CmXuFHdd$H+C5XZwC&BbPqwW(F*bfm+vn=48i{rn6}7e1
zn(CyA`ioaTfB)g<9@_Ezkt3^jomkpcch8M?Ke^v_y7K66*Tfqg_6K5xby*{~&`$mI
ztxR+l?y>a;b;1+)z3SWIIk#((Tj;_EaVxfC2X<l?Zo`LgJ9c9aK8%mxqv%B+Vi0@`
zAIDzAu@C!k2M*v)+=aXG2^>^b#QG#bKR$(f@M#>vXK*h*i_hWn_yX?37jZuxzyJo3
zz?bkKzKkJ!1z*Ksd<|d6H*f?GVOT{h>zf2eaSRXRTlhA<gGcaPd=KBpar^*};sj3O
z6n=;w;W0dpALA$ZDW1U3@FaeYr|=8>5>J=&^9-KFukdR;hu^`>;pp@i%KBPztN%)V
z8cDo>7x6co!Ap1r=6|n}pM~P-F~|R#W!TqJ8gbHU7P8@jY28h3o?{bFCQQFE&!gOn
zDVT~J<YF48<9zs#hkVRH0cN5QvrvQ!P>d3@s7eXSa3Rbs_M-w9VKyo;2LV)}8a22W
zb1@I|QHuo#Vj&ix4)s`!ci|E&!BQ;4rDjoGMz9?3MgtnL0`EZ+R^oD8fh(~J@5TFY
z6;|VFydP`Oj25iLHE6{;tjD$3fQ`5g*P9Er;RbBNW^6$_I<OU;2%!r%B8+bIU>k12
z2XHeYh~i(FTJtXa|J1%?Q)@2#-=A7JTlPX`jF~&7<fRLj$}wFbo#hQ#s+h9$#>(sp
zCT*qQ3Yer*PqQoG4*Zdiiz8P1W}nI?M|#U<u8^^bf7Z&GvX?WjCmLyRnbWMA(Y4fd
z5-N|VYZJ-xaZ0ARXNk`}Ef#Rf$qGNAZ-iglM~do#;wo-^+YfmnRPv}w)Gf@g$s@W{
z&6m*hh?*x!esd&rend@8Bp2^?O7P0d<eB`+{*`KQrP6Xyes5yM)tgoSD*L$~P8rUR
zCW6gT)!%GS46iR%;=X+H;D%=%Iy_AdcjQhnUtyCTzh>Wy;c2hOJiAtRd|;E#iTjo-
zhxG2SOR&9GudyWBUTd>5mE`G(;%P4(>`+P;c1@DK9mNvu^3UfruB`pG@GVyrgoBpl
zIK@IRo5g~fwN(|Zvn$q>t*@-EDyy9BuP&=@t*R(%nLWo}UDL8|&bokq=)NM|r2hH+
zzam_&l_h#>?cmm+Z4BEF(@)veoo99@W($(qnG6jV=%DKFxjpXk(C@~_CJar@RKHP&
z>`KQM-D|6l_Z-oIT|Evp)Z@@Q$H#m3sMUK1bhh}9kB$E+OFM>c^6BkL7HzB?s`TpP
gV-6K+%@7&xkSAaN!6pmC_3!*1X=jl>RAhVl?=O{wdjJ3c

diff --git a/DataBase/菜单初始化脚本/0-3合同管理（Menu_HTGL）.sql b/DataBase/菜单初始化脚本/0-3合同管理（Menu_HTGL）.sql
index 5a6ab701..80aeb926 100644
--- a/DataBase/菜单初始化脚本/0-3合同管理（Menu_HTGL）.sql
+++ b/DataBase/菜单初始化脚本/0-3合同管理（Menu_HTGL）.sql
@@ -1,11 +1,11 @@
---delete from Sys_ButtonToMenu where MenuId in (select MenuId from Sys_Menu where MenuType='Menu_HTGL')
---go
---delete from Sys_Menu where MenuType='Menu_HTGL'
---go
-
---INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
---VALUES('E9D387EB-2797-43E3-AACE-93413839CCF7','合同管理','',10,'0','Menu_HTGL',0,0,1)
---GO
+-- delete from Sys_ButtonToMenu where MenuId in (select MenuId from Sys_Menu where MenuType='Menu_HTGL')
+-- go
+-- delete from Sys_Menu where MenuType='Menu_HTGL'
+-- go
+--
+-- INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+-- VALUES('E9D387EB-2797-43E3-AACE-93413839CCF7','合同管理','',10,'0','Menu_HTGL',0,0,1)
+-- GO
 
 INSERT Sys_Menu ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
 VALUES ( N'E36CBDD0-2E49-415E-BBE7-B8222F40D749',N'合同模板',20,N'0',N'Menu_HTGL',1,0,1)
@@ -158,17 +158,44 @@ GO
    VALUES ( N'DADA9037-FB84-4F87-B582-22D8C9060CA2',N'10586190-0FDD-4DA8-A877-CE4599D6F0DF',N'保存',4)
    GO
 INSERT Sys_Menu ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
-VALUES ( N'1C770E20-7912-484C-9739-499B1B2F8DEB',N'电仪安装工程',N'PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=5',60,N'8213BE20-2680-4A13-91B8-49028BB89869',N'Menu_HTGL',1,1,1)
+VALUES ( N'1C770E20-7912-484C-9739-499B1B2F8DEB',N'电仪安装工程','',60,N'8213BE20-2680-4A13-91B8-49028BB89869',N'Menu_HTGL',1,0,1)
 GO
-   INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
-   VALUES ( N'4A66821E-D8EE-4D1B-953D-7D18323A46DA',N'1C770E20-7912-484C-9739-499B1B2F8DEB',N'增加',1)
-   INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
-   VALUES ( N'6CD2EF60-3F20-4A1F-B920-39A696EE1948',N'1C770E20-7912-484C-9739-499B1B2F8DEB',N'修改',2)
-   INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
-   VALUES ( N'CD5B9E2F-52F1-496B-B34D-5C4F27881645',N'1C770E20-7912-484C-9739-499B1B2F8DEB',N'删除',3)
-   INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
-   VALUES ( N'08F6077E-DEC5-4965-BC39-D81439B867B9',N'1C770E20-7912-484C-9739-499B1B2F8DEB',N'保存',4)
-   GO
+        INSERT Sys_Menu ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
+        VALUES ( N'3593DF22-78C1-4A73-8468-B20CB44D88C9',N'电气工程',N'PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=5.1',10,N'1C770E20-7912-484C-9739-499B1B2F8DEB',N'Menu_HTGL',1,1,1)
+        GO
+           INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+           VALUES ( N'E85E577E-D291-4BE4-A188-1299627CB9BF',N'3593DF22-78C1-4A73-8468-B20CB44D88C9',N'增加',1)
+           INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+           VALUES ( N'96284F37-5F44-45BC-9A76-07C5951B65FA',N'3593DF22-78C1-4A73-8468-B20CB44D88C9',N'修改',2)
+           INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+           VALUES ( N'B449607E-78A1-4D43-B96F-DC005B63D0A9',N'3593DF22-78C1-4A73-8468-B20CB44D88C9',N'删除',3)
+           INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+           VALUES ( N'C0DAC9B2-E39B-4424-B84B-88CDC840366E',N'3593DF22-78C1-4A73-8468-B20CB44D88C9',N'保存',4)
+           GO
+        INSERT Sys_Menu ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
+        VALUES ( N'3ECE6333-6785-424D-996E-B923A650D8C7',N'仪表工程',N'PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=5.2',20,N'1C770E20-7912-484C-9739-499B1B2F8DEB',N'Menu_HTGL',1,1,1)
+        GO
+           INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+           VALUES ( N'0F96E48B-F865-4735-916E-8A981E004898',N'3ECE6333-6785-424D-996E-B923A650D8C7',N'增加',1)
+           INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+           VALUES ( N'D482584F-9CFD-4490-8BC3-9E19053F4E0D',N'3ECE6333-6785-424D-996E-B923A650D8C7',N'修改',2)
+           INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+           VALUES ( N'D59B5E5F-C8B0-4ABB-AE90-0574F5057FA5',N'3ECE6333-6785-424D-996E-B923A650D8C7',N'删除',3)
+           INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+           VALUES ( N'27A4B058-2DAA-49DD-BDA6-27E87DF14EFA',N'3ECE6333-6785-424D-996E-B923A650D8C7',N'保存',4)
+           GO
+        INSERT Sys_Menu ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
+        VALUES ( N'480F8C85-F5F2-4C5C-BE72-2ADABB7250CF',N'电信工程',N'PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=5.3',30,N'1C770E20-7912-484C-9739-499B1B2F8DEB',N'Menu_HTGL',1,1,1)
+        GO
+           INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+           VALUES ( N'FE761E62-A580-470E-AE7D-ACC112F816F1',N'480F8C85-F5F2-4C5C-BE72-2ADABB7250CF',N'增加',1)
+           INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+           VALUES ( N'3CF4C013-1A1E-4FB9-926B-CE50F187EFA5',N'480F8C85-F5F2-4C5C-BE72-2ADABB7250CF',N'修改',2)
+           INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+           VALUES ( N'C13CB62F-8793-460F-A0D0-8FBBA7F588A4',N'480F8C85-F5F2-4C5C-BE72-2ADABB7250CF',N'删除',3)
+           INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+           VALUES ( N'89CF8033-B506-41E2-96D5-9D2406D814D0',N'480F8C85-F5F2-4C5C-BE72-2ADABB7250CF',N'保存',4)
+           GO
 INSERT Sys_Menu ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) 
 VALUES ( N'92101A90-9C22-4B43-B012-9AFF8402F85D',N'水暖安装工程',N'PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=6',70,N'8213BE20-2680-4A13-91B8-49028BB89869',N'Menu_HTGL',1,1,1)
 GO
diff --git a/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql b/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql
index ef9d7f04..e29a1926 100644
--- a/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql
+++ b/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql
@@ -191,7 +191,7 @@ INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOff
 
 		GO
 INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
-			VALUES ( N'D9BAB30E-3255-4EA0-8631-EF15C9203EFD',N'��ִͬ�и���',N'PHTGL/ContractCompile/ContractTrackList.aspx',40,0,N'Menu_PHTGL',0,1,1)
+			VALUES ( N'D9BAB30E-3255-4EA0-8631-EF15C9203EFD',N'��ͬ�۸���Ϣ',N'PHTGL/ContractCompile/ContractTrackList.aspx',40,0,N'Menu_PHTGL',0,1,1)
 			GO
 				INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
 				VALUES ( N'5AD91BF5-4CA6-4A9E-A370-D17B0D99010F',N'D9BAB30E-3255-4EA0-8631-EF15C9203EFD',N'�޸�',2)
@@ -201,4 +201,41 @@ INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],
 				VALUES ( N'DD9A3A8A-8DD9-4B24-B51D-C3EB530B60F2',N'D9BAB30E-3255-4EA0-8631-EF15C9203EFD',N'����',4)
 				INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
 				VALUES ( N'C1708178-C52B-4D32-9849-C69622D96105',N'D9BAB30E-3255-4EA0-8631-EF15C9203EFD',N'����',1)
+			GO
+
+INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
+			VALUES ( N'98269480-3F36-4169-A91D-16144D903C6C',N'WBS������',N'PHTGL/ContractCompile/ContractWBS.aspx',50,0,N'Menu_PHTGL',0,1,1)
+			GO
+				INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+				VALUES ( N'08CD24EB-98F4-407D-822F-8CF9C8D33E82',N'98269480-3F36-4169-A91D-16144D903C6C',N'�޸�',2)
+				INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+				VALUES ( N'97308133-D190-4AD7-917F-A2AF444E8462',N'98269480-3F36-4169-A91D-16144D903C6C',N'ɾ��',3)
+				INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+				VALUES ( N'0B7306D1-A4A8-4C3C-814F-B28B991C5488',N'98269480-3F36-4169-A91D-16144D903C6C',N'����',4)
+				INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+				VALUES ( N'3D4B433D-EA34-4D0C-B744-E12CE232171C',N'98269480-3F36-4169-A91D-16144D903C6C',N'����',1)
+			GO
+INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
+			VALUES ( N'D715B66F-8E99-498F-87DA-E85B4B8EB923',N'���öԱ�ͳ��',N'PHTGL/ContractCompile/ContractTrackComparison.aspx',60,0,N'Menu_PHTGL',0,1,1)
+			GO
+				INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+				VALUES ( N'E2C32BE6-A98D-4A6E-A2C5-6C2A50CF1105',N'D715B66F-8E99-498F-87DA-E85B4B8EB923',N'�޸�',2)
+				INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+				VALUES ( N'C375017D-7521-4339-8CAB-029CD3EBB36B',N'D715B66F-8E99-498F-87DA-E85B4B8EB923',N'ɾ��',3)
+				INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+				VALUES ( N'64464E85-267F-4559-89D4-FB6F1E2B5FA5',N'D715B66F-8E99-498F-87DA-E85B4B8EB923',N'����',4)
+				INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+				VALUES ( N'1859C0E1-437C-419F-ABEE-63EE72E24AFC',N'D715B66F-8E99-498F-87DA-E85B4B8EB923',N'����',1)
+			GO
+INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
+			VALUES ( N'F545E899-B3B5-4B49-A741-DE19356553D5',N'���ȼ��',N'PHTGL/ContractCompile/ContractTrackProgressDetection.aspx',70,0,N'Menu_PHTGL',0,1,1)
+			GO
+				INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+				VALUES ( N'646C7C58-350D-484D-91BD-2FD3754FFD3E',N'F545E899-B3B5-4B49-A741-DE19356553D5',N'�޸�',2)
+				INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+				VALUES ( N'6765754C-917B-4C07-A0F6-CCDED2ABDD07',N'F545E899-B3B5-4B49-A741-DE19356553D5',N'ɾ��',3)
+				INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+				VALUES ( N'1F7FDDC4-2746-4B65-9F65-37C71F11D342',N'F545E899-B3B5-4B49-A741-DE19356553D5',N'����',4)
+				INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+				VALUES ( N'D11BD092-6A18-44A3-8ABD-9CF9B95340E1',N'F545E899-B3B5-4B49-A741-DE19356553D5',N'����',1)
 			GO
\ No newline at end of file
diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs
index 829132a1..b5f1c295 100644
--- a/SGGL/BLL/Common/Const.cs
+++ b/SGGL/BLL/Common/Const.cs
@@ -3206,6 +3206,9 @@ namespace BLL
         public const string TemQuantityListMenuId3= "FAC4F0F7-A7C0-4F66-8BCB-846C082BCA40";
         public const string TemQuantityListMenuId4= "10586190-0FDD-4DA8-A877-CE4599D6F0DF";
         public const string TemQuantityListMenuId5= "1C770E20-7912-484C-9739-499B1B2F8DEB";
+        public const string TemQuantityListMenuId5_1= "3593DF22-78C1-4A73-8468-B20CB44D88C9";
+        public const string TemQuantityListMenuId5_2= "3ECE6333-6785-424D-996E-B923A650D8C7";
+        public const string TemQuantityListMenuId5_3= "480F8C85-F5F2-4C5C-BE72-2ADABB7250CF";
         public const string TemQuantityListMenuId6= "92101A90-9C22-4B43-B012-9AFF8402F85D";
         public const string TemQuantityListMenuId7= "33A03E2C-4E00-4722-AA14-F50419468154";
         public const string TemQuantityListMenuId8= "A5A31FE8-0643-4396-99E3-A4A31A947789";
@@ -3215,9 +3218,21 @@ namespace BLL
         /// </summary>
         public const string PHTGL_BidProjectQuantityMenuId = "687991B6-73AC-42FA-9A72-178AF94D1EB4";
         /// <summary>
-        /// 合同执行跟踪
+        /// 合同价格信息
         /// </summary>
         public const string PHTGL_ContractTrackMenuId = "D9BAB30E-3255-4EA0-8631-EF15C9203EFD";
+        /// <summary>
+        /// WBS工作包
+        /// </summary>
+        public const string PHTGL_ContractWBSMenuId = "98269480-3F36-4169-A91D-16144D903C6C";
+        /// <summary>
+        /// 费用对比统计
+        /// </summary>
+        public const string PHTGL_ContractTrackComparisonMenuId = "D715B66F-8E99-498F-87DA-E85B4B8EB923";
+        /// <summary>
+        /// 进度检测
+        /// </summary>
+        public const string PHTGL_ContractTrackProgressDetectionMenuId = "F545E899-B3B5-4B49-A741-DE19356553D5";
 
         #endregion
 
diff --git a/SGGL/BLL/PHTGL/BillOfQuantities/PhtglQuantityService.cs b/SGGL/BLL/PHTGL/BillOfQuantities/PhtglQuantityService.cs
index 0e6a5cd1..ee9616c6 100644
--- a/SGGL/BLL/PHTGL/BillOfQuantities/PhtglQuantityService.cs
+++ b/SGGL/BLL/PHTGL/BillOfQuantities/PhtglQuantityService.cs
@@ -17,6 +17,10 @@ namespace BLL
             return Funs.DB.PHTGL_Quantity.FirstOrDefault(x => x.Id == Id);
         }
 
+        public static PHTGL_Quantity GetPHTGL_QuantityByNumBer(string serialNumber,string marjor)
+        {
+            return Funs.DB.PHTGL_Quantity.FirstOrDefault(x => x.SerialNumber == serialNumber && x.Major==marjor);
+        }
 
         public static void AddPHTGL_Quantity(PHTGL_Quantity newtable)
         {
@@ -132,10 +136,24 @@ namespace BLL
         public static ResponeData ImportData(string path, string majortype)
         {
             var responeData = new ResponeData();
-            List<PHTGL_QuantityDtoIn> rows;
+            List<PHTGL_QuantityDtoIn> rows= new List<PHTGL_QuantityDtoIn>();
+            List<dynamic> remarkQuery=new List<dynamic>();
+            string Major = "";
             try
             {
-                rows = MiniExcel.Query<PHTGL_QuantityDtoIn>(path).ToList();
+                var sheetNames = MiniExcel.GetSheetNames(path);
+                foreach (var item in sheetNames)
+                {
+                    if (item=="编制说明")
+                    {
+                         remarkQuery = MiniExcel.Query(path, sheetName: item).ToList();
+                    }
+                    else
+                    {
+                        rows = MiniExcel.Query<PHTGL_QuantityDtoIn>(path, sheetName: item).ToList();
+                    }
+                }
+             
             }
             catch (Exception e)
             {
@@ -154,17 +172,46 @@ namespace BLL
                 return responeData;
             }
 
+            Major = GetMajorItems().Where(x => x.Text == majortype).Select(x => x.Value).FirstOrDefault() ??
+                    "";
+            List<Model.Sys_Const> consts=new List<Model.Sys_Const>();
+            int SortIndex = 0;
+            foreach (var item in remarkQuery)
+            {
+                if (string.IsNullOrEmpty(Major)) break;
+                Model.Sys_Const model = new Model.Sys_Const()
+                {
+                    ID = SQLHelper.GetNewID(),
+                    ConstValue = item.A?.ToString(),
+                    SortIndex = SortIndex,
+                    GroupId = "工程量清单-"+ Major
+                };
+                consts.Add(model);
+                SortIndex++;
+            }
+
+            var old = ConstValue.drpConstItemList("工程量清单-" + Major);
+            if (old.Count>0)
+            {
+                Funs.DB.Sys_Const.DeleteAllOnSubmit(old);
+                Funs.DB.SubmitChanges();
+            }
+            ;
+            Funs.DB.Sys_Const.InsertAllOnSubmit(consts);
+            Funs.DB.SubmitChanges();
             foreach (var item in modeList)
             {
-                item.Major = GetMajorItems().Where(x => x.Text == majortype).Select(x => x.Value).FirstOrDefault() ??
-                             "";
-                if (string.IsNullOrEmpty(item.Major)) break;
+                item.Major = Major;
+                if (string.IsNullOrEmpty(Major)) break;
+                if (string .IsNullOrEmpty(item.ProjectName)) continue;
+                if (item.ProjectName== "项目名称") continue;
                 var queryPhtglQuantity = new PHTGL_Quantity
                 {
                     Major = item.Major,
                     SubProject = item.SubProject,
                     SubItemProject = item.SubItemProject,
                     ProjectCode = item.ProjectCode,
+                    ProjectName = item.ProjectName,
                     IsTemplate = true
                 };
                 var resultModel = GetPHTGL_QuantityByModle(queryPhtglQuantity);
@@ -256,17 +303,19 @@ namespace BLL
 
         public static ListItem[] GetMajorItems()
         {
-            var list = new ListItem[10];
+            var list = new ListItem[12];
             list[0] = new ListItem("0", "土建工程");
             list[1] = new ListItem("1", "钢结构预制工程");
             list[2] = new ListItem("2", "工艺管道安装工程");
             list[3] = new ListItem("3", "工艺设备安装工程");
             list[4] = new ListItem("4", "非标设备现场制作安装工程");
-            list[5] = new ListItem("5", "电仪安装工程");
-            list[6] = new ListItem("6", "水暖安装工程");
-            list[7] = new ListItem("7", "防腐绝热工程");
-            list[8] = new ListItem("8", "无损检测工程");
-            list[9] = new ListItem("9", "消防工程");
+            list[5] = new ListItem("5.1", "电气工程");
+            list[6] = new ListItem("5.2", "仪表工程");
+            list[7] = new ListItem("5.3", "电信工程");
+            list[8] = new ListItem("6", "水暖安装工程");
+            list[9] = new ListItem("7", "防腐绝热工程");
+            list[10] = new ListItem("8", "无损检测工程");
+            list[11] = new ListItem("9", "消防工程");
 
             return list;
         }
@@ -305,12 +354,14 @@ namespace BLL
                     (string.IsNullOrEmpty(table.Remarks) || x.Remarks.Contains(table.Remarks)) &&
                     x.IsTemplate == table.IsTemplate &&
                     (string.IsNullOrEmpty(table.ParentId) || x.ParentId.Contains(table.ParentId))
-                   
-                    select new  { x ,IntSerialNumber= Funs.GetNewIntOrZero(x.SerialNumber.Replace(".", ""))
-                        }
+
+                select x;
+                    //select new  { x ,IntSerialNumber= Funs.GetNewIntOrZero(x.SerialNumber.Replace(".", ""))
+                    //    }
 
                 ; 
-            var model = q.ToList().OrderBy(x => x.IntSerialNumber).Select(itemx =>  itemx.x).ToList();
+            //var model = q.ToList().OrderBy(x => x.IntSerialNumber).Select(itemx =>  itemx.x).ToList();
+            var model = q.ToList().OrderBy(x => x.SerialNumber, new CustomComparer()).ToList();
             return model;
         }
 
@@ -350,9 +401,61 @@ namespace BLL
                 };
         }
 
+        public static void CheckSubProjectName(List<PHTGL_Quantity> list)
+        {
+            foreach (var item in list)
+            {
+                var SubProject = "";
+                var SubItemProject = "";
+                var SerialNumberArry = item.SerialNumber?.Split('.');
+                if (SerialNumberArry.Length==2)
+                {
+                    item.SubProject = GetPHTGL_QuantityByNumBer(SerialNumberArry[0], item.Major).ProjectName;
+                    UpdatePHTGL_Quantity(item);
+
+                }
+                else if (SerialNumberArry.Length == 3)
+                {
+                    item.SubProject = GetPHTGL_QuantityByNumBer(SerialNumberArry[0], item.Major).ProjectName;
+                    item.SubItemProject= GetPHTGL_QuantityByNumBer(SerialNumberArry[0]+"."+ SerialNumberArry[1], item.Major).ProjectName;
+                    UpdatePHTGL_Quantity(item);
+                }
+                 
+            }
+        }
+
         #endregion
     }
+    public class CustomComparer : IComparer<string>
+    {
+        public int Compare(string x, string y)
+        {
+            if (string.IsNullOrEmpty(x)||string.IsNullOrEmpty(y))
+            {
+                return 0;
+            }
+            var xParts = x.Split('.');
+            var yParts = y.Split('.');
 
+            for (int i = 0; i < Math.Min(xParts.Length, yParts.Length); i++)
+            {
+                int xNumber, yNumber;
+                if (int.TryParse(xParts[i], out xNumber) && int.TryParse(yParts[i], out yNumber))
+                {
+                    if (xNumber != yNumber)
+                    {
+                        return xNumber.CompareTo(yNumber);
+                    }
+                }
+                else
+                {
+                    return x.CompareTo(y);
+                }
+            }
+
+            return xParts.Length.CompareTo(yParts.Length);
+        }
+    }
     public class PHTGL_QuantityDtoIn
     {
         [ExcelColumnIndex("A")] public string SerialNumber { get; set; }
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index d6fef964..9f17ed3c 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -1267,11 +1267,14 @@
     <Content Include="PHTGL\ContractCompile\ContractReviewEdit.aspx" />
     <Content Include="PHTGL\ContractCompile\ContractReview_Countersign.aspx" />
     <Content Include="PHTGL\ContractCompile\ContractStandingBook.aspx" />
+    <Content Include="PHTGL\ContractCompile\ContractTrackComparison.aspx" />
     <Content Include="PHTGL\ContractCompile\ContractTrackEdit.aspx" />
     <Content Include="PHTGL\ContractCompile\ContractTrackIn.aspx" />
     <Content Include="PHTGL\ContractCompile\ContractTrackList.aspx" />
     <Content Include="PHTGL\ContractCompile\ContractTrackMatchWBS.aspx" />
     <Content Include="PHTGL\ContractCompile\ContractTrackProgressChart.aspx" />
+    <Content Include="PHTGL\ContractCompile\ContractTrackProgressDetection.aspx" />
+    <Content Include="PHTGL\ContractCompile\ContractWBS.aspx" />
     <Content Include="PHTGL\ContractCompile\GeneralTermsConditions.aspx" />
     <Content Include="PHTGL\ContractCompile\SpecialTermsConditions.aspx" />
     <Content Include="PHTGL\Filing\ActionPlanFile.aspx" />
@@ -12435,6 +12438,13 @@
     <Compile Include="PHTGL\ContractCompile\ContractStandingBook.aspx.designer.cs">
       <DependentUpon>ContractStandingBook.aspx</DependentUpon>
     </Compile>
+    <Compile Include="PHTGL\ContractCompile\ContractTrackComparison.aspx.cs">
+      <DependentUpon>ContractTrackComparison.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="PHTGL\ContractCompile\ContractTrackComparison.aspx.designer.cs">
+      <DependentUpon>ContractTrackComparison.aspx</DependentUpon>
+    </Compile>
     <Compile Include="PHTGL\ContractCompile\ContractTrackEdit.aspx.cs">
       <DependentUpon>ContractTrackEdit.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -12470,6 +12480,20 @@
     <Compile Include="PHTGL\ContractCompile\ContractTrackProgressChart.aspx.designer.cs">
       <DependentUpon>ContractTrackProgressChart.aspx</DependentUpon>
     </Compile>
+    <Compile Include="PHTGL\ContractCompile\ContractTrackProgressDetection.aspx.cs">
+      <DependentUpon>ContractTrackProgressDetection.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="PHTGL\ContractCompile\ContractTrackProgressDetection.aspx.designer.cs">
+      <DependentUpon>ContractTrackProgressDetection.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="PHTGL\ContractCompile\ContractWBS.aspx.cs">
+      <DependentUpon>ContractWBS.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="PHTGL\ContractCompile\ContractWBS.aspx.designer.cs">
+      <DependentUpon>ContractWBS.aspx</DependentUpon>
+    </Compile>
     <Compile Include="PHTGL\ContractCompile\GeneralTermsConditions.aspx.cs">
       <DependentUpon>GeneralTermsConditions.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
index 77e15f0d..88c0514c 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
@@ -206,7 +206,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                            && x.WeldingDailyId == null /*&& x.CoverWelderId != null && x.BackingWelderId != null*/) || x.WeldingDailyId == this.WeldingDailyId
 
                                     select x).ToList();
-                weldJointIds= weldJointIds.GroupBy(x => x.WeldJointId, (key, group) => group.First()).ToList();
+                weldJointIds= weldJointIds.GroupBy(x => x.WeldJointId, (key, group) => group.OrderByDescending(x=>x.TaskDate).First()).ToList();
                 task = weldJointIds;
                 //foreach (var weldJointId in weldJointIds)
                 //{
@@ -228,7 +228,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                                     where x.UnitWorkId == this.UnitWorkId && x.TaskDate.Value.Date <= Convert.ToDateTime(txtWeldingDate.Text)
                            && x.WeldingDailyId == null /*&& x.CoverWelderId != null && x.BackingWelderId != null*/
                                     select x).ToList();
-                weldJointIds = weldJointIds.GroupBy(x => x.WeldJointId, (key, group) => group.First()).ToList();
+                weldJointIds = weldJointIds.GroupBy(x => x.WeldJointId, (key, group) => group.OrderByDescending(x => x.TaskDate).First()).ToList();
                 task = weldJointIds;
                 //foreach (var weldJointId in weldJointIds)
                 //{
diff --git a/SGGL/FineUIPro.Web/PHTGL/BillOfQuantities/TemQuantityList.aspx b/SGGL/FineUIPro.Web/PHTGL/BillOfQuantities/TemQuantityList.aspx
index a09ceb99..d318451f 100644
--- a/SGGL/FineUIPro.Web/PHTGL/BillOfQuantities/TemQuantityList.aspx
+++ b/SGGL/FineUIPro.Web/PHTGL/BillOfQuantities/TemQuantityList.aspx
@@ -5,151 +5,152 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title></title>
     <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
     <style type="text/css">
         .f-grid-row .f-grid-cell-inner {
             white-space: normal;
             word-break: break-all;
-        }   
-        .f-grid-row.yellow
-        {
+            height: 50px;
+        }
+
+        .f-grid-row.yellow {
             background-color: YellowGreen;
             background-image: none;
         }
-        
-        .f-grid-row.red
-        {
+
+        .f-grid-row.red {
             background-color: Yellow;
         }
-
     </style>
 </head>
 <body>
     <form id="form1" runat="server">
-    <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-    <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" AutoScroll="true"
-        ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
-        <Items>
-            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
-                runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" 
-                ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="SerialNumber"
-                SortDirection="DESC" OnSort="Grid1_Sort"  EnableColumnLines="true"
-                AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="true"
-                EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
-                <Toolbars>
-                    <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
-                        <Items> 
-                            <f:TextBox runat="server" ID="txtSubProject" Label="分部工程" Width="200px" LabelAlign="Right"/>
-                            <f:TextBox runat="server" ID="txtSubItemProject" Label="分项工程" Width="200px" LabelAlign="Right"/>
-                            <f:TextBox runat="server" ID="txtProjectCode" Label="项目编码" Width="200px" LabelAlign="Right"/>
-                            <f:TextBox runat="server" ID="txtProjectName" Label="项目名称" Width="200px" LabelAlign="Right"/>
-                            <f:Button ID="btnSearch" ToolTip="查询" Icon="SystemSearch" runat="server" OnClick="btnSearch_Click">
-                            </f:Button>                          
-                            <f:ToolbarFill runat="server"></f:ToolbarFill>
-                            <f:Button ID="btnNew" ToolTip="新增" Text="新增" Hidden="true" Icon="Add" runat="server" 
-                                OnClick="btnNew_Click">
-                            </f:Button>
-                            <f:Button ID="btnImport" Text="导入" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click">
-                            </f:Button>
-                            <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" ToolTip="导出" Icon="FolderUp"
-                                EnableAjax="false" DisableControlBeforePostBack="false">
-                            </f:Button>                            
-                        </Items>
-                    </f:Toolbar>
-                </Toolbars>
-                <Columns>
-                    <f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
-                        TextAlign="Center">
-                        <ItemTemplate>
-                            <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                        </ItemTemplate>
-                    </f:TemplateField>    
-                            <f:RenderField Width="150px" ColumnID="SerialNumber" DataField="SerialNumber" SortField="SerialNumber" 
-                                           FieldType="String" HeaderText="序号" TextAlign="Left" HeaderTextAlign="Center" >
-                            </f:RenderField>   
-                          <f:RenderField Width="150px" ColumnID="Major" DataField="Major" SortField="Major" Hidden="True" 
-                             FieldType="String" HeaderText="专业" TextAlign="Left" HeaderTextAlign="Center" >
-                           </f:RenderField>
-                          <f:RenderField Width="150px" ColumnID="SubProject" DataField="SubProject" SortField="SubProject"
-                             FieldType="String" HeaderText="分部工程" TextAlign="Left" HeaderTextAlign="Center" >
-                           </f:RenderField>
-                          <f:RenderField Width="150px" ColumnID="SubItemProject" DataField="SubItemProject" SortField="SubItemProject"
-                             FieldType="String" HeaderText="分项工程" TextAlign="Left" HeaderTextAlign="Center" >
-                           </f:RenderField>
-                          <f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" SortField="ProjectCode"
-                             FieldType="String" HeaderText="项目编码" TextAlign="Left" HeaderTextAlign="Center" >
-                           </f:RenderField>
-                          <f:RenderField Width="150px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName"
-                             FieldType="String" HeaderText="项目名称" TextAlign="Left" HeaderTextAlign="Center" >
-                           </f:RenderField>
-                          <f:BoundField  Width="150px" ColumnID="ProjectDescription" DataField="ProjectDescription" SortField="ProjectDescription" DataToolTipField="WorkContent"
-                             HeaderText="项目特征描述" TextAlign="Left" HeaderTextAlign="Center" >
-                           </f:BoundField>
-                          <f:RenderField Width="150px" ColumnID="UnitOfMeasurement" DataField="UnitOfMeasurement" SortField="UnitOfMeasurement"
-                             FieldType="String" HeaderText="计量单位" TextAlign="Left" HeaderTextAlign="Center" >
-                           </f:RenderField>
-                          <f:RenderField Width="150px" ColumnID="Quantity" DataField="Quantity" SortField="Quantity"
-                             FieldType="String" HeaderText="工程量" TextAlign="Left" HeaderTextAlign="Center" >
-                           </f:RenderField>
-                          <f:RenderField Width="150px" ColumnID="TotalCostFixedComprehensiveUnitPrice" DataField="TotalCostFixedComprehensiveUnitPrice" SortField="TotalCostFixedComprehensiveUnitPrice"
-                             FieldType="String" HeaderText="全费用固定综合单价" TextAlign="Left" HeaderTextAlign="Center" >
-                           </f:RenderField>
-                          <f:RenderField Width="150px" ColumnID="MainMaterialCost" DataField="MainMaterialCost" SortField="MainMaterialCost"
-                             FieldType="String" HeaderText="主材费" TextAlign="Left" HeaderTextAlign="Center" >
-                           </f:RenderField>
-                          <f:RenderField Width="150px" ColumnID="TotalPrice" DataField="TotalPrice" SortField="TotalPrice"
-                             FieldType="String" HeaderText="合价/元" TextAlign="Left" HeaderTextAlign="Center" >
-                           </f:RenderField>
-                          <f:RenderField Width="150px" ColumnID="CalculationRule" DataField="CalculationRule" SortField="CalculationRule"
-                             FieldType="String" HeaderText="计算规则" TextAlign="Left" HeaderTextAlign="Center" >
-                           </f:RenderField>
-                          <f:BoundField  Width="150px" ColumnID="WorkContent" DataField="WorkContent" SortField="WorkContent" DataToolTipField="WorkContent"
-                            HeaderText="工作内容" TextAlign="Left" HeaderTextAlign="Center" >
-                           </f:BoundField>
-                          <f:RenderField Width="150px" ColumnID="Remarks" DataField="Remarks" SortField="Remarks"
-                             FieldType="String" HeaderText="备注" TextAlign="Left" HeaderTextAlign="Center" >
-                           </f:RenderField>
-                     
-                </Columns>
-                <Listeners>
-                    <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                </Listeners>
-                <PageItems>
-                    <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                    </f:ToolbarSeparator>
-                    <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                    </f:ToolbarText>
-                    <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                        OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                        <f:ListItem Text="10" Value="10" />
-                        <f:ListItem Text="15" Value="15" />
-                        <f:ListItem Text="20" Value="20" />
-                        <f:ListItem Text="25" Value="25" />
-                        <f:ListItem Text="所有行" Value="100000" />
-                    </f:DropDownList>
-                </PageItems>
-            </f:Grid>
-        </Items>
-    </f:Panel>
-    <f:Window ID="Window1" runat="server" Hidden="true" ShowHeader="true"
-        IsModal="true" Target="Parent" EnableMaximize="true" EnableResize="true" OnClose="Window1_Close"
-        Title="编辑PHTGL_Quantity" EnableIFrame="true" Height="650px"
-        Width="1200px">
-    </f:Window>
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" AutoScroll="true"
+            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+            <Items>
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
+                    runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true"
+                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="SerialNumber"
+                    SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true"
+                    AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="true"
+                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
+                            <Items>
+                                <f:TextBox runat="server" ID="txtSubProject" Label="分部工程" Width="200px" LabelAlign="Right" />
+                                <f:TextBox runat="server" ID="txtSubItemProject" Label="分项工程" Width="200px" LabelAlign="Right" />
+                                <f:TextBox runat="server" ID="txtProjectCode" Label="项目编码" Width="200px" LabelAlign="Right" />
+                                <f:TextBox runat="server" ID="txtProjectName" Label="项目名称" Width="200px" LabelAlign="Right" />
+                                <f:Button ID="btnSearch" ToolTip="查询" Icon="SystemSearch" runat="server" OnClick="btnSearch_Click">
+                                </f:Button>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnNew" ToolTip="新增" Text="新增" Hidden="true" Icon="Add" runat="server"
+                                    OnClick="btnNew_Click">
+                                </f:Button>
+                                <f:Button ID="btnImport" Text="导入" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click">
+                                </f:Button>
+                                <f:Button ID="btnCheck" Text="修正名称" ToolTip="修正名称" Icon="PackageIn" runat="server" OnClick="btnCheck_OnClick" Hidden="True">
+                                </f:Button>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" ToolTip="导出" Icon="FolderUp"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="80px" ColumnID="SerialNumber" DataField="SerialNumber" SortField="SerialNumber"
+                            FieldType="String" HeaderText="序号" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="Major" DataField="Major" SortField="Major"
+                            FieldType="String" HeaderText="专业" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="SubProject" DataField="SubProject" SortField="SubProject"
+                            FieldType="String" HeaderText="分部工程" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="SubItemProject" DataField="SubItemProject" SortField="SubItemProject"
+                            FieldType="String" HeaderText="子分部工程" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" SortField="ProjectCode"
+                            FieldType="String" HeaderText="项目编码" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="200px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName"
+                            FieldType="String" HeaderText="项目名称" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:BoundField Width="250px" ColumnID="ProjectDescription" DataField="ProjectDescription" SortField="ProjectDescription" DataToolTipField="WorkContent"
+                            HeaderText="项目特征描述" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:BoundField>
+                        <f:RenderField Width="80px" ColumnID="UnitOfMeasurement" DataField="UnitOfMeasurement" SortField="UnitOfMeasurement"
+                            FieldType="String" HeaderText="计量单位" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="80px" ColumnID="Quantity" DataField="Quantity" SortField="Quantity"
+                            FieldType="String" HeaderText="工程量" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="80px" ColumnID="TotalCostFixedComprehensiveUnitPrice" DataField="TotalCostFixedComprehensiveUnitPrice" SortField="TotalCostFixedComprehensiveUnitPrice"
+                            FieldType="String" HeaderText="全费用固定综合单价" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="80px" ColumnID="MainMaterialCost" DataField="MainMaterialCost" SortField="MainMaterialCost"
+                            FieldType="String" HeaderText="主材费" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="80px" ColumnID="TotalPrice" DataField="TotalPrice" SortField="TotalPrice"
+                            FieldType="String" HeaderText="合价/元" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="200px" ColumnID="CalculationRule" DataField="CalculationRule" SortField="CalculationRule"
+                            FieldType="String" HeaderText="计算规则" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:BoundField Width="200px" ColumnID="WorkContent" DataField="WorkContent" SortField="WorkContent" DataToolTipField="WorkContent"
+                            HeaderText="工作内容" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:BoundField>
+                        <f:RenderField Width="80px" ColumnID="Remarks" DataField="Remarks" SortField="Remarks"
+                            FieldType="String" HeaderText="备注" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+
+                    </Columns>
+                    <Listeners>
+                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                    </Listeners>
+                    <PageItems>
+                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                        </f:ToolbarSeparator>
+                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                        </f:ToolbarText>
+                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                            <f:ListItem Text="10" Value="10" />
+                            <f:ListItem Text="15" Value="15" />
+                            <f:ListItem Text="20" Value="20" />
+                            <f:ListItem Text="25" Value="25" />
+                            <f:ListItem Text="所有行" Value="100000" />
+                        </f:DropDownList>
+                    </PageItems>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" runat="server" Hidden="true" ShowHeader="true"
+            IsModal="true" Target="Parent" EnableMaximize="true" EnableResize="true" OnClose="Window1_Close"
+            Title="编辑PHTGL_Quantity" EnableIFrame="true" Height="650px"
+            Width="1200px">
+        </f:Window>
         <f:Window ID="Window2" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
             Width="700px" Height="240px">
         </f:Window>
-    <f:Menu ID="Menu1" runat="server">      
-        <f:MenuButton ID="btnMenuEdit" OnClick="btnEdit_Click" EnablePostBack="true"
-            Hidden="true" runat="server" Text="编辑" Icon="TableEdit" >
-        </f:MenuButton>
-        <f:MenuButton ID="btnMenuDelete" OnClick="btnDelete_Click" EnablePostBack="true"  Icon="Delete"
-            Hidden="true" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除">
-        </f:MenuButton>
-    </f:Menu>
+        <f:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnMenuEdit" OnClick="btnEdit_Click" EnablePostBack="true"
+                Hidden="true" runat="server" Text="编辑" Icon="TableEdit">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuDelete" OnClick="btnDelete_Click" EnablePostBack="true" Icon="Delete"
+                Hidden="true" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除">
+            </f:MenuButton>
+        </f:Menu>
     </form>
     <script type="text/javascript">
         var menuID = '<%= Menu1.ClientID %>';
diff --git a/SGGL/FineUIPro.Web/PHTGL/BillOfQuantities/TemQuantityList.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/BillOfQuantities/TemQuantityList.aspx.cs
index d150dde6..3836e808 100644
--- a/SGGL/FineUIPro.Web/PHTGL/BillOfQuantities/TemQuantityList.aspx.cs
+++ b/SGGL/FineUIPro.Web/PHTGL/BillOfQuantities/TemQuantityList.aspx.cs
@@ -91,8 +91,14 @@ namespace FineUIPro.Web.PHTGL.BillOfQuantities
                 case "4":
                     menuid = Const.TemQuantityListMenuId4;
                     break;
-                case "5":
-                    menuid = Const.TemQuantityListMenuId5;
+                case "5.1":
+                    menuid = Const.TemQuantityListMenuId5_1;
+                    break; 
+                case "5.2":
+                    menuid = Const.TemQuantityListMenuId5_2;
+                    break;
+                case "5.3":
+                    menuid = Const.TemQuantityListMenuId5_3;
                     break;
                 case "6":
                     menuid = Const.TemQuantityListMenuId6;
@@ -115,6 +121,11 @@ namespace FineUIPro.Web.PHTGL.BillOfQuantities
                 if (buttonList.Contains(Const.BtnModify)) btnMenuEdit.Hidden = false;
                 if (buttonList.Contains(Const.BtnDelete)) btnMenuDelete.Hidden = false;
             }
+
+            if (this.CurrUser.PersonId==Const.hfnbdId)
+            {
+                btnCheck.Hidden=false;  
+            }
         }
 
         #endregion
@@ -296,5 +307,14 @@ namespace FineUIPro.Web.PHTGL.BillOfQuantities
         {
            BindGrid();
         }
+
+        protected void btnCheck_OnClick(object sender, EventArgs e)
+        {
+            var table = new PHTGL_Quantity();
+            table.Major = BLL.PHTGL_QuantityService.GetMajorItems().Where(x => x.Text == Type).Select(x => x.Value).FirstOrDefault() ?? "";
+            table.IsTemplate = true;
+            var tb = PHTGL_QuantityService.GetPHTGL_QuantityByModle(table);
+            PHTGL_QuantityService.CheckSubProjectName(tb);
+        }
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/PHTGL/BillOfQuantities/TemQuantityList.aspx.designer.cs b/SGGL/FineUIPro.Web/PHTGL/BillOfQuantities/TemQuantityList.aspx.designer.cs
index c8f54ecf..eba4950b 100644
--- a/SGGL/FineUIPro.Web/PHTGL/BillOfQuantities/TemQuantityList.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/PHTGL/BillOfQuantities/TemQuantityList.aspx.designer.cs
@@ -122,6 +122,15 @@ namespace FineUIPro.Web.PHTGL.BillOfQuantities
         /// </remarks>
         protected global::FineUIPro.Button btnImport;
 
+        /// <summary>
+        /// btnCheck 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnCheck;
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/PHTGL/BillOfQuantities/TemQuantitySelect.aspx b/SGGL/FineUIPro.Web/PHTGL/BillOfQuantities/TemQuantitySelect.aspx
index 6a36cc5c..0e638c8c 100644
--- a/SGGL/FineUIPro.Web/PHTGL/BillOfQuantities/TemQuantitySelect.aspx
+++ b/SGGL/FineUIPro.Web/PHTGL/BillOfQuantities/TemQuantitySelect.aspx
@@ -11,6 +11,7 @@
         .f-grid-row .f-grid-cell-inner {
             white-space: normal;
             word-break: break-all;
+            height: 50px;
         }
 
         .f-grid-row.yellow {
@@ -32,79 +33,75 @@
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true"
                     ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="Id"
-                    SortDirection="DESC" EnableColumnLines="true" EnableBigData="True"  EnableTextSelection="true"
+                    SortDirection="DESC" EnableColumnLines="true" EnableBigData="True" EnableTextSelection="true"
                     AllowPaging="true" IsDatabasePaging="true" EnableCheckBoxSelect="True">
                     <Toolbars>
                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
                             <Items>
                                 <f:TextBox runat="server" ID="txtMajor" Label="专业" Width="200px" LabelAlign="Left" />
-                                <f:TextBox runat="server" ID="txtSubProject" Label="分部工程" Width="200px" LabelAlign="Left"/>
-                                <f:TextBox runat="server" ID="txtSubItemProject" Label="分项工程" Width="200px" LabelAlign="Left"/>
-                                <f:TextBox runat="server" ID="txtProjectCode" Label="项目编码" Width="200px" LabelAlign="Left"/>
-                                <f:TextBox runat="server" ID="txtProjectName" Label="项目名称" Width="200px" LabelAlign="Left"/>
+                                <f:TextBox runat="server" ID="txtSubProject" Label="分部工程" Width="200px" LabelAlign="Left" />
+                                <f:TextBox runat="server" ID="txtSubItemProject" Label="分项工程" Width="200px" LabelAlign="Left" />
+                                <f:TextBox runat="server" ID="txtProjectCode" Label="项目编码" Width="200px" LabelAlign="Left" />
+                                <f:TextBox runat="server" ID="txtProjectName" Label="项目名称" Width="200px" LabelAlign="Left" />
                                 <f:Button ID="btnSearch" ToolTip="查询" Text="查询" Icon="SystemSearch" runat="server" OnClick="btnSearch_Click">
-                                </f:Button>                   
-                               
+                                </f:Button>
+
                             </Items>
                         </f:Toolbar>
                         <f:Toolbar runat="server" Position="Top" runat="server" ToolbarAlign="Right">
                             <Items>
-                                <f:Button ID="btnSave" ToolTip="保存" Text="保存"  Icon="PageSave" runat="server"
-                                          OnClick="btnSave_Click">
+                                <f:Button ID="btnSave" ToolTip="保存" Text="保存" Icon="PageSave" runat="server"
+                                    OnClick="btnSave_Click">
                                 </f:Button>
-                                <f:Button ID="btnClose" ToolTip="关闭" Text="关闭"  runat="server" Icon="SystemClose">
+                                <f:Button ID="btnClose" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose">
                                 </f:Button>
                             </Items>
                         </f:Toolbar>
                     </Toolbars>
                     <Columns>
-                        <f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
-                            TextAlign="Center">
-                            <ItemTemplate>
-                                <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-
-                        <f:RenderField Width="150px" ColumnID="Major" DataField="Major" SortField="Major" 
+                        <f:RenderField Width="80px" ColumnID="SerialNumber" DataField="SerialNumber" SortField="SerialNumber"
+                            FieldType="String" HeaderText="序号" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="Major" DataField="Major" SortField="Major"
                             FieldType="String" HeaderText="专业" TextAlign="Left" HeaderTextAlign="Center">
                         </f:RenderField>
                         <f:RenderField Width="150px" ColumnID="SubProject" DataField="SubProject" SortField="SubProject"
                             FieldType="String" HeaderText="分部工程" TextAlign="Left" HeaderTextAlign="Center">
                         </f:RenderField>
                         <f:RenderField Width="150px" ColumnID="SubItemProject" DataField="SubItemProject" SortField="SubItemProject"
-                            FieldType="String" HeaderText="分项工程" TextAlign="Left" HeaderTextAlign="Center">
+                            FieldType="String" HeaderText="子分部工程" TextAlign="Left" HeaderTextAlign="Center">
                         </f:RenderField>
                         <f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" SortField="ProjectCode"
                             FieldType="String" HeaderText="项目编码" TextAlign="Left" HeaderTextAlign="Center">
                         </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName"
+                        <f:RenderField Width="200px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName"
                             FieldType="String" HeaderText="项目名称" TextAlign="Left" HeaderTextAlign="Center">
                         </f:RenderField>
-                        <f:BoundField Width="150px" ColumnID="ProjectDescription" DataField="ProjectDescription" SortField="ProjectDescription" DataToolTipField="WorkContent"
+                        <f:BoundField Width="250px" ColumnID="ProjectDescription" DataField="ProjectDescription" SortField="ProjectDescription" DataToolTipField="WorkContent"
                             HeaderText="项目特征描述" TextAlign="Left" HeaderTextAlign="Center">
                         </f:BoundField>
-                        <f:RenderField Width="150px" ColumnID="UnitOfMeasurement" DataField="UnitOfMeasurement" SortField="UnitOfMeasurement"
+                        <f:RenderField Width="80px" ColumnID="UnitOfMeasurement" DataField="UnitOfMeasurement" SortField="UnitOfMeasurement"
                             FieldType="String" HeaderText="计量单位" TextAlign="Left" HeaderTextAlign="Center">
                         </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="Quantity" DataField="Quantity" SortField="Quantity"
+                        <f:RenderField Width="80px" ColumnID="Quantity" DataField="Quantity" SortField="Quantity"
                             FieldType="String" HeaderText="工程量" TextAlign="Left" HeaderTextAlign="Center">
                         </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="TotalCostFixedComprehensiveUnitPrice" DataField="TotalCostFixedComprehensiveUnitPrice" SortField="TotalCostFixedComprehensiveUnitPrice"
+                        <f:RenderField Width="80px" ColumnID="TotalCostFixedComprehensiveUnitPrice" DataField="TotalCostFixedComprehensiveUnitPrice" SortField="TotalCostFixedComprehensiveUnitPrice"
                             FieldType="String" HeaderText="全费用固定综合单价" TextAlign="Left" HeaderTextAlign="Center">
                         </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="MainMaterialCost" DataField="MainMaterialCost" SortField="MainMaterialCost"
+                        <f:RenderField Width="80px" ColumnID="MainMaterialCost" DataField="MainMaterialCost" SortField="MainMaterialCost"
                             FieldType="String" HeaderText="主材费" TextAlign="Left" HeaderTextAlign="Center">
                         </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="TotalPrice" DataField="TotalPrice" SortField="TotalPrice"
+                        <f:RenderField Width="80px" ColumnID="TotalPrice" DataField="TotalPrice" SortField="TotalPrice"
                             FieldType="String" HeaderText="合价/元" TextAlign="Left" HeaderTextAlign="Center">
                         </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="CalculationRule" DataField="CalculationRule" SortField="CalculationRule"
+                        <f:RenderField Width="200px" ColumnID="CalculationRule" DataField="CalculationRule" SortField="CalculationRule"
                             FieldType="String" HeaderText="计算规则" TextAlign="Left" HeaderTextAlign="Center">
                         </f:RenderField>
-                        <f:BoundField Width="150px" ColumnID="WorkContent" DataField="WorkContent" SortField="WorkContent" DataToolTipField="WorkContent"
+                        <f:BoundField Width="200px" ColumnID="WorkContent" DataField="WorkContent" SortField="WorkContent" DataToolTipField="WorkContent"
                             HeaderText="工作内容" TextAlign="Left" HeaderTextAlign="Center">
                         </f:BoundField>
-                        <f:RenderField Width="150px" ColumnID="Remarks" DataField="Remarks" SortField="Remarks"
+                        <f:RenderField Width="80px" ColumnID="Remarks" DataField="Remarks" SortField="Remarks"
                             FieldType="String" HeaderText="备注" TextAlign="Left" HeaderTextAlign="Center">
                         </f:RenderField>
 
@@ -113,10 +110,11 @@
             </Items>
         </f:Panel>
         <f:Window ID="Window1" runat="server" Hidden="true" ShowHeader="true"
-            IsModal="true" Target="Parent" EnableMaximize="true" EnableResize="true" 
+            IsModal="true" Target="Parent" EnableMaximize="true" EnableResize="true"
             Title="编辑PHTGL_BidProjectQuantity" EnableIFrame="true" Height="650px"
             Width="1200px">
-        </f:Window><%--
+        </f:Window>
+        <%--
         <f:Menu ID="Menu1" runat="server">
             <f:MenuButton ID="btnMenuEdit" OnClick="btnEdit_Click" EnablePostBack="true"
                 Hidden="true" runat="server" Text="编辑" Icon="TableEdit">
diff --git a/SGGL/FineUIPro.Web/PHTGL/BillOfQuantities/TemQuantitySelect.aspx.designer.cs b/SGGL/FineUIPro.Web/PHTGL/BillOfQuantities/TemQuantitySelect.aspx.designer.cs
index ab56127c..ea8f5bcd 100644
--- a/SGGL/FineUIPro.Web/PHTGL/BillOfQuantities/TemQuantitySelect.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/PHTGL/BillOfQuantities/TemQuantitySelect.aspx.designer.cs
@@ -131,15 +131,6 @@ namespace FineUIPro.Web.PHTGL.BillOfQuantities
         /// </remarks>
         protected global::FineUIPro.Button btnClose;
 
-        /// <summary>
-        /// lblNumber 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Label lblNumber;
-
         /// <summary>
         /// Window1 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx
new file mode 100644
index 00000000..1836809d
--- /dev/null
+++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx
@@ -0,0 +1,293 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ContractTrackComparison.aspx.cs" Inherits="FineUIPro.Web.PHTGL.ContractCompile.ContractTrackComparison" %>
+
+<!DOCTYPE html>
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>合同执行跟踪表</title>
+    <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
+    <style type="text/css">
+        .f-grid-row .f-grid-cell-inner {
+            white-space: normal;
+            word-break: break-all;
+        }
+
+        .f-grid-row.yellow {
+            background-color: YellowGreen;
+            background-image: none;
+        }
+
+        .f-grid-row.red {
+            background-color: Yellow;
+        }
+    </style>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel3" runat="server" />
+        <f:Panel ID="Panel3" Margin="24px" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
+            <Items>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" Layout="Fit"
+                    Title="中间面板" ShowBorder="true" ShowHeader="false" BodyPadding="10px" IconFont="_RoundPlus">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="合同执行跟踪表" EnableCollapse="true"
+                            runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true"
+                            ClicksToEdit="1" DataIDField="Id" AllowSorting="true" SortField="Id"
+                            SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true"
+                            AllowPaging="False" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" OnRowClick="Grid1_OnRowClick" EnableRowClickEvent="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
+                                    <Items>
+                                        <f:DropDownList ID="DropContractCode" runat="server" Label="施工分包合同编号" AutoPostBack="true" AutoSelectFirstItem="True" LabelAlign="Right"
+                                            LabelWidth="140px" OnSelectedIndexChanged="DropMainContractCode_SelectedIndexChanged">
+                                        </f:DropDownList>
+                                        <f:Label ID="txtContractName" runat="server" Label="合同名称" LabelAlign="Right" LabelWidth="140px"></f:Label>
+                                        <f:ToolbarFill runat="server" />
+
+                                        <f:Button ID="btnNew" ToolTip="新增" Text="新增" Hidden="true" Icon="Add" runat="server"
+                                            OnClick="btnNew_Click">
+                                        </f:Button>
+
+                                        <f:Button ID="btnImport" Text="导入" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click">
+                                        </f:Button>
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" ToolTip="导出" Icon="FolderUp"
+                                            EnableAjax="false" DisableControlBeforePostBack="false">
+                                        </f:Button>
+                                        <f:Button ID="btnSave" ToolTip="保存" Icon="PageSave" EnablePostBack="true" Text="保存" runat="server" OnClick="btnSave_OnClick">
+                                        </f:Button>
+
+                                    </Items>
+                                </f:Toolbar>
+                                <f:Toolbar ID="Toolbar4" Position="Top" runat="server" ToolbarAlign="Right">
+                                    <Items>
+                                        <f:TextBox runat="server" ID="txtProjectCode" Label="项目编码" LabelWidth="90" Width="200px" />
+                                        <f:TextBox runat="server" ID="txtProjectName" Label="项目名称" LabelWidth="90" Width="200px" />
+                                        <f:ToolbarFill runat="server" />
+
+                                        <f:Button ID="btnQuery" ToolTip="查询" Text="查询" Icon="SystemSearch" runat="server" EnablePostBack="true"
+                                            OnClick="btnQuery_OnClick">
+                                        </f:Button>
+                                        <f:Button ID="btnGetChart" ToolTip="图表" Icon="ChartPie" Text="统计图表"
+                                            EnablePostBack="true" OnClick="btnGetChart_Click" runat="server">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center" 
+                                    TextAlign="Center">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+
+                                <f:RenderField Width="150px" ColumnID="MainItemCode" DataField="MainItemCode" SortField="MainItemCode"  EnableColumnEdit="False"
+                                    FieldType="String" HeaderText="主项号" TextAlign="Left" HeaderTextAlign="Center">
+                                    <Editor>
+                                        <f:TextBox ID="TextBox2" runat="server" Required="true"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="MainItemName" DataField="MainItemName" SortField="MainItemName" EnableColumnEdit="False"
+                                    FieldType="String" HeaderText="主项名称" TextAlign="Left" HeaderTextAlign="Center">
+                                    <Editor>
+                                        <f:TextBox ID="TextBox3" runat="server" Required="true"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="MajorName" DataField="MajorName" SortField="MajorName" EnableColumnEdit="False"
+                                    FieldType="String" HeaderText="专业工程名称" TextAlign="Left" HeaderTextAlign="Center">
+                                    <Editor>
+                                        <f:TextBox ID="TextBox4" runat="server" Required="true"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="MajorCode" DataField="MajorCode" SortField="MajorCode" EnableColumnEdit="False"
+                                    FieldType="String" HeaderText="专业代码" TextAlign="Left" HeaderTextAlign="Center">
+                                    <Editor>
+                                        <f:TextBox ID="TextBox5" runat="server" Required="true"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="SubProject" DataField="SubProject" SortField="SubProject" EnableColumnEdit="False"
+                                    FieldType="String" HeaderText="分部工程" TextAlign="Left" HeaderTextAlign="Center">
+                                    <Editor>
+                                        <f:TextBox ID="TextBox6" runat="server" Required="true"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="SubItemProject" DataField="SubItemProject" SortField="SubItemProject" EnableColumnEdit="False"
+                                    FieldType="String" HeaderText="分项工程" TextAlign="Left" HeaderTextAlign="Center">
+                                    <Editor>
+                                        <f:TextBox ID="TextBox7" runat="server" Required="true"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+
+                                <f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" SortField="ProjectCode" EnableColumnEdit="False"
+                                    FieldType="String" HeaderText="项目编码" TextAlign="Left" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName" EnableColumnEdit="False"
+                                    FieldType="String" HeaderText="项目名称" TextAlign="Left" HeaderTextAlign="Center">
+                                    <Editor>
+                                        <f:TextBox ID="TextBox8" runat="server" Required="true"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="ProjectDescription" DataField="ProjectDescription" SortField="ProjectDescription" EnableColumnEdit="False"
+                                    FieldType="String" HeaderText="项目特征描述" TextAlign="Left" HeaderTextAlign="Center">
+                                    <Editor>
+                                        <f:TextBox ID="TextBox9" runat="server" Required="true"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="UnitOfMeasurement" DataField="UnitOfMeasurement" SortField="UnitOfMeasurement" EnableColumnEdit="False"
+                                    FieldType="String" HeaderText="计量单位" TextAlign="Left" HeaderTextAlign="Center">
+                                    <Editor>
+                                        <f:TextBox ID="TextBox10" runat="server" Required="true"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="Quantity" DataField="Quantity" SortField="Quantity" EnableColumnEdit="False"
+                                    FieldType="String" HeaderText="工程量" TextAlign="Left" HeaderTextAlign="Center">
+                                    <Editor>
+                                        <f:TextBox ID="TextBox11" runat="server" Required="true"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="TotalCostFixedComprehensiveUnitPrice" DataField="TotalCostFixedComprehensiveUnitPrice" SortField="TotalCostFixedComprehensiveUnitPrice"
+                                    FieldType="String" HeaderText="全费用固定综合单价" TextAlign="Left" HeaderTextAlign="Center" EnableColumnEdit="False">
+                                    <Editor>
+                                        <f:TextBox ID="TextBox12" runat="server" Required="true"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="MainMaterialCost" DataField="MainMaterialCost" SortField="MainMaterialCost" EnableColumnEdit="False"
+                                    FieldType="String" HeaderText="主材费" TextAlign="Left" HeaderTextAlign="Center">
+                                    <Editor>
+                                        <f:TextBox ID="TextBox13" runat="server" Required="true"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="TotalPrice" DataField="TotalPrice" SortField="TotalPrice" EnableColumnEdit="False"
+                                    FieldType="String" HeaderText="合价/元" TextAlign="Left" HeaderTextAlign="Center">
+                                    <Editor>
+                                        <f:TextBox ID="TextBox14" runat="server" Required="true"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="CalculationRule" DataField="CalculationRule" SortField="CalculationRule" EnableColumnEdit="False"
+                                    FieldType="String" HeaderText="计算规则" TextAlign="Left" HeaderTextAlign="Center">
+                                    <Editor>
+                                        <f:TextBox ID="TextBox15" runat="server" Required="true"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="WorkContent" DataField="WorkContent" SortField="WorkContent" EnableColumnEdit="False"
+                                    FieldType="String" HeaderText="工作内容" TextAlign="Left" HeaderTextAlign="Center">
+                                    <Editor>
+                                        <f:TextBox ID="TextBox16" runat="server" Required="true"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="Remarks" DataField="Remarks" SortField="Remarks" EnableColumnEdit="False"
+                                    FieldType="String" HeaderText="备注" TextAlign="Left" HeaderTextAlign="Center">
+                                    <Editor>
+                                        <f:TextBox ID="TextBox17" runat="server" Required="true"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="ConstructionSubcontractor" DataField="ConstructionSubcontractor" SortField="ConstructionSubcontractor"
+                                    FieldType="String" HeaderText="施工分包商" TextAlign="Left" HeaderTextAlign="Center">
+                                    <Editor>
+                                        <f:TextBox ID="TextBox18" runat="server" Required="true"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="ContractWeight" DataField="ContractWeight" SortField="ContractWeight"
+                                    FieldType="String" HeaderText="合同权重 " TextAlign="Left" HeaderTextAlign="Center">
+                                    <Editor>
+                                        <f:TextBox ID="TextBox19" runat="server" Required="true"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="MaterialSupplier" DataField="MaterialSupplier" SortField="MaterialSupplier"
+                                    FieldType="String" HeaderText="主材供应方 " TextAlign="Left" HeaderTextAlign="Center">
+                                    <Editor>
+                                        <f:TextBox ID="TextBox20" runat="server" Required="true"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderCheckField Width="100px" ColumnID="IsWithinGeneralContractScope" DataField="IsWithinGeneralContractScope" HeaderText="是否总包合同范围内" />
+
+                                <f:RenderField Width="150px" ColumnID="EstimatedQuantity" DataField="EstimatedQuantity" SortField="EstimatedQuantity"
+                                    FieldType="String" HeaderText="概算工程量" TextAlign="Left" HeaderTextAlign="Center">
+                                    <Editor>
+                                        <f:TextBox ID="TextBox22" runat="server" Required="true"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="EstimatedAmount" DataField="EstimatedAmount" SortField="EstimatedAmount"
+                                    FieldType="String" HeaderText="概算金额" TextAlign="Left" HeaderTextAlign="Center">
+                                    <Editor>
+                                        <f:NumberBox ID="NumberBox2" runat="server" NoDecimal="false" NoNegative="false" DecimalPrecision="2" Increment="0.01">
+                                        </f:NumberBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="SettledQuantity" DataField="SettledQuantity" SortField="SettledQuantity"
+                                    FieldType="String" HeaderText="预算工程量" TextAlign="Left" HeaderTextAlign="Center">
+                                    <Editor>
+                                        <f:TextBox ID="TextBox24" runat="server" Required="true"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="SettledAmount" DataField="SettledAmount" SortField="SettledAmount"
+                                    FieldType="String" HeaderText="预算金额 " TextAlign="Left" HeaderTextAlign="Center">
+                                    <Editor>
+                                        <f:NumberBox ID="NumberBox3" runat="server" NoDecimal="false" NoNegative="false" DecimalPrecision="2" Increment="0.01">
+                                        </f:NumberBox>
+                                    </Editor>
+                                </f:RenderField>
+
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                                    <f:ListItem Text="10" Value="10" />
+                                    <f:ListItem Text="15" Value="15" />
+                                    <f:ListItem Text="20" Value="20" />
+                                    <f:ListItem Text="25" Value="25" />
+                                    <f:ListItem Text="所有行" Value="100000" />
+                                </f:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+
+                    </Items>
+                </f:Panel>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" runat="server" Hidden="true" ShowHeader="true"
+            IsModal="true" Target="Parent" EnableMaximize="true" EnableResize="true" OnClose="Window1_Close"
+            Title="编辑PHTGL_ContractTrack" EnableIFrame="true" Height="650px"
+            Width="1200px">
+        </f:Window>
+        <f:Window ID="Window2" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
+            Width="1200px" Height="650px">
+        </f:Window>
+        <f:Window ID="Window3" runat="server" Hidden="true" ShowHeader="true"
+            IsModal="true" Target="Parent" EnableMaximize="true" EnableResize="true" OnClose="Window3_OnClose"
+            Title="匹配WBS" EnableIFrame="true" Height="650px"
+            Width="1200px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnMenuEdit" OnClick="btnEdit_Click" EnablePostBack="true"
+                Hidden="true" runat="server" Text="编辑" Icon="TableEdit">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuDelete" OnClick="btnDelete_Click" EnablePostBack="true" Icon="Delete"
+                Hidden="true" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除">
+            </f:MenuButton>
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+        function reloadGrid() {
+            __doPostBack(null, 'reloadGrid');
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.cs
new file mode 100644
index 00000000..a8e8e597
--- /dev/null
+++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.cs
@@ -0,0 +1,476 @@
+using BLL;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.PHTGL.ContractCompile
+{
+    public partial class ContractTrackComparison : PageBase
+    {
+        public string ContractId
+        {
+            get => (string)ViewState["ContractId"];
+            set => ViewState["ContractId"] = value;
+        }
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.GetButtonPower();
+                //主合同编号
+                this.DropContractCode.DataTextField = "ContractNum";
+                this.DropContractCode.DataValueField = "ContractNum";
+                this.DropContractCode.DataSource = BLL.PHTGL_ContractReviewService.GetContractReview_CompleteData(this.CurrUser.LoginProjectId);
+                this.DropContractCode.DataBind();
+                Funs.FineUIPleaseSelect(this.DropContractCode);
+                DropMainContractCode_SelectedIndexChanged(null, null);
+                this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
+                // 绑定表格
+                this.BindGrid();
+
+            }
+        }
+
+        #region 绑定数据
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            Model.PHTGL_ContractTrack table = new Model.PHTGL_ContractTrack();
+            table.ProjectId = this.CurrUser.LoginProjectId;
+            table.ContractId = this.ContractId;
+            table.ProjectCode = this.txtProjectCode.Text.Trim();
+            table.ProjectName = this.txtProjectName.Text.Trim();
+            var tb = BLL.PhtglContractTrackService.GetListData(table, Grid1);
+            Grid1.RecordCount = PhtglContractTrackService.Count;
+            //tb = GetFilteredTable(Grid1.FilteredData, tb);
+            Grid1.DataSource = tb;
+            Grid1.DataBind();
+           
+
+        }
+        private void BindGrid2()
+        {
+            var db = Funs.DB;
+            var q = from x in db.PHTGL_ContractTrackMatchWBS
+                    join y in db.WBS_ControlItemAndCycle on x.ControlItemAndCycleId equals y.ControlItemAndCycleId
+                    where x.ContractTrackId == Grid1.SelectedRowID
+                    select new
+                    {
+                        x.Id,
+                        x.ContractTrackId,
+                        x.ControlItemAndCycleId,
+                        y.ControlItemAndCycleCode,
+                        y.ControlItemContent,
+                        y.Weights,
+                        x.WorkPackageEstimate
+                    };
+            ;
+         
+
+        }
+        private string GetDeleteScript()
+        {
+            return Confirm.GetShowReference("确定删除当前数据吗？", String.Empty, MessageBoxIcon.Question, Grid1.GetDeleteSelectedRowsReference(), String.Empty);
+        }
+
+        #endregion
+
+        #region GV 数据操作
+        /// <summary>
+        /// 过滤表头
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        //protected void Grid1_FilterChange(object sender, EventArgs e)
+        //{
+        //    this.BindGrid();
+        //}
+
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            this.Grid1.PageIndex = e.NewPageIndex;
+            this.BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            this.Grid1.SortDirection = e.SortDirection;
+            this.Grid1.SortField = e.SortField;
+            this.BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue);
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 数据编辑事件
+        /// <summary>
+        /// 新增
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnNew_Click(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(ContractId))
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ContractTrackEdit.aspx?Id={0}", string.Empty, "增加 - ")));
+
+            }
+            else
+            {
+                ShowNotify("请选择施工分包合同！", MessageBoxIcon.Information);
+            }
+        }
+
+        /// <summary>
+        /// 编辑按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnEdit_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            string ID = Grid1.SelectedRowID;
+            var model = BLL.PhtglContractTrackService.GetPHTGL_ContractTrackById(ID);
+            if (model != null) ///已上报时不能删除
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ContractTrackEdit.aspx?Id={0}", ID, "编辑 - ")));
+            }
+        }
+
+        /// <summary>
+        /// Grid行单击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_OnRowClick(object sender, GridRowClickEventArgs e)
+        {
+            BindGrid2();
+        }
+
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            this.btnEdit_Click(null, null);
+        }
+
+        /// <summary>
+        /// 批量删除
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnDelete_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length > 0)
+            {
+                foreach (int rowIndex in Grid1.SelectedRowIndexArray)
+                {
+                    string rowID = Grid1.DataKeys[rowIndex][0].ToString();
+                    var model = BLL.PhtglContractTrackService.GetPHTGL_ContractTrackById(rowID);
+                    if (model != null)
+                    {
+                        BLL.PhtglContractTrackService.DeletePHTGL_ContractTrackById(rowID);
+                    }
+                }
+
+                BindGrid();
+                ShowNotify("删除数据成功!", MessageBoxIcon.Success);
+            }
+        }
+
+        #region  更新上级WBS内容每月实际费用
+        /// <summary>
+        /// 更新上级WBS内容每月实际费用
+        /// </summary>
+        /// <param name="years"></param>
+        /// <param name="months"></param>
+        /// <param name="PlanNum"></param>
+        /// <param name="parentId"></param>
+        private void UpdateWorkPackageParentThisValue(Model.SGGLDB db, string SuperWorkPackageId, DateTime months, decimal thisValue)
+        {
+            Model.WBS_WorkPackage workPackage = db.WBS_WorkPackage.FirstOrDefault(x => x.WorkPackageId == SuperWorkPackageId);
+            if (workPackage != null)
+            {
+                Model.WBS_WorkPackageParentDetail parentDetail = BLL.WorkPackageParentDetailService.GetWorkPackageParentDetailByParentIdAndMonths(SuperWorkPackageId, months);
+                if (parentDetail != null)
+                {
+                    parentDetail.ThisValue += thisValue;
+                }
+                else
+                {
+                    parentDetail = new Model.WBS_WorkPackageParentDetail();
+                    parentDetail.WorkPackageParentDetailId = SQLHelper.GetNewID();
+                    parentDetail.ParentId = SuperWorkPackageId;
+                    parentDetail.Months = months;
+                    parentDetail.ThisValue = thisValue;
+                    db.WBS_WorkPackageParentDetail.InsertOnSubmit(parentDetail);
+                }
+                if (workPackage.SuperWorkPackageId != null)   //还存在上级节点，需要继续循环
+                {
+                    UpdateWorkPackageParentThisValue(db, workPackage.SuperWorkPackageId, months, thisValue);
+                }
+            }
+        }
+        #endregion
+
+        protected void btnSave_OnClick(object sender, EventArgs e)
+        {
+            JArray EditorArr = Grid1.GetMergedData();
+            if (EditorArr.Count > 0)
+            {
+                for (int i = 0; i < EditorArr.Count; i++)
+                {
+                    JObject objects = (JObject)EditorArr[i];
+                    var Id = objects["id"].ToString();
+                    var MainItemCode = objects["values"]["MainItemCode"].ToString();
+                    var MainItemName = objects["values"]["MainItemName"].ToString();
+                    var MajorName = objects["values"]["MajorName"].ToString();
+                    var MajorCode = objects["values"]["MajorCode"].ToString();
+                    //var ProjectCode = objects["values"]["ProjectCode"].ToString();
+                    var ProjectName = objects["values"]["ProjectName"].ToString();
+                    var ProjectDescription = objects["values"]["ProjectDescription"].ToString();
+                    var UnitOfMeasurement = objects["values"]["UnitOfMeasurement"].ToString();
+                    var Quantity = objects["values"]["Quantity"].ToString();
+                    var TotalCostFixedComprehensiveUnitPrice = objects["values"]["TotalCostFixedComprehensiveUnitPrice"].ToString();
+                    var MainMaterialCost = objects["values"]["MainMaterialCost"].ToString();
+                    var TotalPrice = objects["values"]["TotalPrice"].ToString();
+                    var CalculationRule = objects["values"]["CalculationRule"].ToString();
+                    var WorkContent = objects["values"]["WorkContent"].ToString();
+                    var Remarks = objects["values"]["Remarks"].ToString();
+                    var ConstructionSubcontractor = objects["values"]["ConstructionSubcontractor"].ToString();
+                    var ContractWeight = objects["values"]["ContractWeight"].ToString();
+                    var MaterialSupplier = objects["values"]["MaterialSupplier"].ToString();
+                    var IsWithinGeneralContractScope = objects["values"]["IsWithinGeneralContractScope"].ToString();
+                    var EstimatedQuantity = objects["values"]["EstimatedQuantity"].ToString();
+                    var EstimatedAmount = objects["values"]["EstimatedAmount"].ToString();
+                    var SettledQuantity = objects["values"]["SettledQuantity"].ToString();
+                    var SettledAmount = objects["values"]["SettledAmount"].ToString();
+
+                    var model = PhtglContractTrackService.GetPHTGL_ContractTrackById(Id);
+                    model.MainItemCode = MainItemCode;
+                    model.MainItemName = MainItemName;
+                    model.MajorName = MajorName;
+                    model.MajorCode = MajorCode;
+                    // model.ProjectCode = ProjectCode;
+                    model.ProjectName = ProjectName;
+                    model.ProjectDescription = ProjectDescription;
+                    model.UnitOfMeasurement = UnitOfMeasurement;
+                    model.Quantity = Quantity;
+                    model.TotalCostFixedComprehensiveUnitPrice = TotalCostFixedComprehensiveUnitPrice;
+                    model.MainMaterialCost = MainMaterialCost;
+                    model.TotalPrice = TotalPrice;
+                    model.CalculationRule = CalculationRule;
+                    model.WorkContent = WorkContent;
+                    model.Remarks = Remarks;
+                    model.ConstructionSubcontractor = ConstructionSubcontractor;
+                    model.ContractWeight = ContractWeight;
+                    model.MaterialSupplier = MaterialSupplier;
+                    model.IsWithinGeneralContractScope = bool.Parse(IsWithinGeneralContractScope);
+                    model.EstimatedQuantity = EstimatedQuantity;
+                    model.EstimatedAmount = Funs.GetNewDecimal(EstimatedAmount);
+                    model.SettledQuantity = SettledQuantity;
+                    model.SettledAmount = Funs.GetNewDecimal(SettledAmount);
+
+                    PhtglContractTrackService.UpdatePHTGL_ContractTrack(model);
+                }
+            }
+            BindGrid();
+        }
+
+        protected void btnQuery_OnClick(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+
+        protected void btnGetChart_Click(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(ContractId))
+            {
+                var model = ContractService.GetContractByContractNum(DropContractCode.SelectedValue);
+                if (model != null)
+                {
+                    PageContext.RegisterStartupScript(
+                        Window2.GetShowReference(string.Format("ContractTrackProgressChart.aspx?ContractId={0}", model.ContractId, "图表 - ")));
+                }
+            }
+            else
+            {
+                ShowNotify("请选择施工分包合同", MessageBoxIcon.Question);
+            }
+        }
+        #endregion
+
+        #region 关闭弹出窗
+        /// <summary>
+        /// 关闭弹出窗
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 获取权限按钮
+        /// <summary>
+        /// 获取按钮权限
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        private void GetButtonPower()
+        {
+            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.PHTGL_ContractTrackComparisonMenuId);
+            if (buttonList.Count > 0)
+            {
+                if (buttonList.Contains(BLL.Const.BtnAdd))
+                {
+                    this.btnNew.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnModify))
+                {
+                    this.btnMenuEdit.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnDelete))
+                {
+                    this.btnMenuDelete.Hidden = false;
+                }
+            }
+        }
+        #endregion        
+
+        #region 导出按钮
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            Response.ClearContent();
+            string filename = Funs.GetNewFileName();
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("合同执行跟踪表" + filename, System.Text.Encoding.UTF8) + ".xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = System.Text.Encoding.UTF8;
+            this.Grid1.PageSize = 500;
+            this.BindGrid();
+            Response.Write(GetGridTableHtml(Grid1));
+            Response.End();
+        }
+
+        /// <summary>
+        /// 导出方法
+        /// </summary>
+        /// <param name="grid"></param>
+        /// <returns></returns>
+        private string GetGridTableHtml(Grid grid)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
+            sb.Append("<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">");
+            sb.Append("<tr>");
+            foreach (GridColumn column in grid.Columns)
+            {
+                sb.AppendFormat("<td>{0}</td>", column.HeaderText);
+            }
+            sb.Append("</tr>");
+            foreach (GridRow row in grid.Rows)
+            {
+                sb.Append("<tr>");
+                foreach (GridColumn column in grid.Columns)
+                {
+                    string html = row.Values[column.ColumnIndex].ToString();
+                    if (column.ColumnID == "tfNumber")
+                    {
+                        html = (row.FindControl("lblNumber") as System.Web.UI.WebControls.Label).Text;
+                    }
+                    sb.AppendFormat("<td>{0}</td>", html);
+                }
+
+                sb.Append("</tr>");
+            }
+
+            sb.Append("</table>");
+
+            return sb.ToString();
+        }
+        #endregion
+
+        protected void DropMainContractCode_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(DropContractCode.SelectedValue))
+            {
+                var model = ContractService.GetContractByContractNum(DropContractCode.SelectedValue);
+                if (model != null)
+                {
+                    ContractId = model.ContractId;
+                    this.txtContractName.Text = model.ContractName;
+                }
+                else
+                {
+                    ContractId = "";
+                    this.txtContractName.Text = string.Empty;
+
+                }
+            }
+            BindGrid();
+        }
+
+        protected void btnImport_Click(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(ContractId))
+            {
+                var model = ContractService.GetContractByContractNum(DropContractCode.SelectedValue);
+                if (model != null)
+                {
+                    PageContext.RegisterStartupScript(
+                        Window2.GetShowReference(string.Format("ContractTrackIn.aspx?ContractId={0}", model.ContractId, "导入 - ")));
+                }
+            }
+            else
+            {
+                ShowNotify("请选择施工分包合同", MessageBoxIcon.Question);
+            }
+        }
+
+
+        protected void Window3_OnClose(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid2();
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.designer.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.designer.cs
new file mode 100644
index 00000000..076beb91
--- /dev/null
+++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.designer.cs
@@ -0,0 +1,467 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.PHTGL.ContractCompile
+{
+
+
+    public partial class ContractTrackComparison
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel3;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// DropContractCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList DropContractCode;
+
+        /// <summary>
+        /// txtContractName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label txtContractName;
+
+        /// <summary>
+        /// btnNew 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnNew;
+
+        /// <summary>
+        /// btnImport 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnImport;
+
+        /// <summary>
+        /// btnOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+
+        /// <summary>
+        /// btnSave 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+
+        /// <summary>
+        /// Toolbar4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar4;
+
+        /// <summary>
+        /// txtProjectCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProjectCode;
+
+        /// <summary>
+        /// txtProjectName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProjectName;
+
+        /// <summary>
+        /// btnQuery 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnQuery;
+
+        /// <summary>
+        /// btnGetChart 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnGetChart;
+
+        /// <summary>
+        /// lblNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblNumber;
+
+        /// <summary>
+        /// TextBox2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox2;
+
+        /// <summary>
+        /// TextBox3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox3;
+
+        /// <summary>
+        /// TextBox4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox4;
+
+        /// <summary>
+        /// TextBox5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox5;
+
+        /// <summary>
+        /// TextBox6 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox6;
+
+        /// <summary>
+        /// TextBox7 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox7;
+
+        /// <summary>
+        /// TextBox8 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox8;
+
+        /// <summary>
+        /// TextBox9 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox9;
+
+        /// <summary>
+        /// TextBox10 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox10;
+
+        /// <summary>
+        /// TextBox11 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox11;
+
+        /// <summary>
+        /// TextBox12 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox12;
+
+        /// <summary>
+        /// TextBox13 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox13;
+
+        /// <summary>
+        /// TextBox14 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox14;
+
+        /// <summary>
+        /// TextBox15 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox15;
+
+        /// <summary>
+        /// TextBox16 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox16;
+
+        /// <summary>
+        /// TextBox17 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox17;
+
+        /// <summary>
+        /// TextBox18 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox18;
+
+        /// <summary>
+        /// TextBox19 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox19;
+
+        /// <summary>
+        /// TextBox20 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox20;
+
+        /// <summary>
+        /// TextBox22 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox22;
+
+        /// <summary>
+        /// NumberBox2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox NumberBox2;
+
+        /// <summary>
+        /// TextBox24 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox24;
+
+        /// <summary>
+        /// NumberBox3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox NumberBox3;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Window2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window2;
+
+        /// <summary>
+        /// Window3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window3;
+
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnMenuEdit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuEdit;
+
+        /// <summary>
+        /// btnMenuDelete 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuDelete;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx
index 4128a8ff..ede7e4c6 100644
--- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx
+++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx
@@ -189,7 +189,7 @@
                                         <f:TextBox ID="TextBox17" runat="server" Required="true"></f:TextBox>
                                     </Editor>
                                 </f:RenderField>
-                                <f:RenderField Width="150px" ColumnID="ConstructionSubcontractor" DataField="ConstructionSubcontractor" SortField="ConstructionSubcontractor"
+                                <%--<f:RenderField Width="150px" ColumnID="ConstructionSubcontractor" DataField="ConstructionSubcontractor" SortField="ConstructionSubcontractor"
                                     FieldType="String" HeaderText="施工分包商" TextAlign="Left" HeaderTextAlign="Center">
                                     <Editor>
                                         <f:TextBox ID="TextBox18" runat="server" Required="true"></f:TextBox>
@@ -234,7 +234,7 @@
                                         <f:NumberBox ID="NumberBox3" runat="server" NoDecimal="false" NoNegative="false" DecimalPrecision="2" Increment="0.01">
                                         </f:NumberBox>
                                     </Editor>
-                                </f:RenderField>
+                                </f:RenderField>--%>
 
                             </Columns>
                             <Listeners>
@@ -260,7 +260,7 @@
                 </f:Panel>
 
                 <f:Panel runat="server" ID="panelBottomRegion" RegionPosition="Bottom" RegionSplit="true" EnableCollapse="true" RegionPercent="40%"
-                    Title="底部面板" ShowBorder="true" ShowHeader="false" BodyPadding="10px" IconFont="_PullDown" Layout="HBox">
+                    Title="底部面板" ShowBorder="true" ShowHeader="false" BodyPadding="10px" IconFont="_PullDown" Layout="HBox" Hidden="True">
                     <Items>
                         <f:Panel ID="Panel7" BoxFlex="1" runat="server" ShowBorder="true" ShowHeader="false" Layout="Fit">
                             <Items>
diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.designer.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.designer.cs
index ee26ef32..f9e9e9af 100644
--- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.designer.cs
@@ -320,69 +320,6 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
         /// </remarks>
         protected global::FineUIPro.TextBox TextBox17;
 
-        /// <summary>
-        /// TextBox18 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox TextBox18;
-
-        /// <summary>
-        /// TextBox19 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox TextBox19;
-
-        /// <summary>
-        /// TextBox20 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox TextBox20;
-
-        /// <summary>
-        /// TextBox22 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox TextBox22;
-
-        /// <summary>
-        /// NumberBox2 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.NumberBox NumberBox2;
-
-        /// <summary>
-        /// TextBox24 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox TextBox24;
-
-        /// <summary>
-        /// NumberBox3 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.NumberBox NumberBox3;
-
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetection.aspx b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetection.aspx
new file mode 100644
index 00000000..74cc0878
--- /dev/null
+++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetection.aspx
@@ -0,0 +1,16 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ContractTrackProgressDetection.aspx.cs" Inherits="FineUIPro.Web.PHTGL.ContractCompile.ContractTrackProgressDetection" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <div>
+        </div>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetection.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetection.aspx.cs
new file mode 100644
index 00000000..912e8656
--- /dev/null
+++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetection.aspx.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.PHTGL.ContractCompile
+{
+    public partial class ContractTrackProgressDetection : System.Web.UI.Page
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetection.aspx.designer.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetection.aspx.designer.cs
new file mode 100644
index 00000000..2c60b552
--- /dev/null
+++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetection.aspx.designer.cs
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.PHTGL.ContractCompile
+{
+
+
+    public partial class ContractTrackProgressDetection
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx
new file mode 100644
index 00000000..e4974a14
--- /dev/null
+++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx
@@ -0,0 +1,213 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ContractWBS.aspx.cs" Inherits="FineUIPro.Web.PHTGL.ContractCompile.ContractWBS" %>
+
+<!DOCTYPE html>
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>合同执行跟踪表</title>
+    <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
+    <style type="text/css">
+        .f-grid-row .f-grid-cell-inner {
+            white-space: normal;
+            word-break: break-all;
+        }
+
+        .f-grid-row.yellow {
+            background-color: YellowGreen;
+            background-image: none;
+        }
+
+        .f-grid-row.red {
+            background-color: Yellow;
+        }
+    </style>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel3" runat="server" />
+        <f:Panel ID="Panel3" Margin="24px" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
+            <Items>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" Layout="Fit"
+                    Title="中间面板" ShowBorder="true" ShowHeader="false" BodyPadding="10px" IconFont="_RoundPlus">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="合同执行跟踪表" EnableCollapse="true"
+                            runat="server" BoxFlex="1" DataKeyNames="Id,MatchWbsId" AllowCellEditing="true"  
+                            ClicksToEdit="1"  AllowSorting="true" SortField="Id"
+                            SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" 
+                            AllowPaging="False" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"  EnableRowClickEvent="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
+                                    <Items>
+                                        <f:DropDownList ID="DropContractCode" runat="server" Label="施工分包合同编号" AutoPostBack="true" AutoSelectFirstItem="True" LabelAlign="Right"
+                                            LabelWidth="140px" OnSelectedIndexChanged="DropMainContractCode_SelectedIndexChanged">
+                                        </f:DropDownList>
+                                        <f:Label ID="txtContractName" runat="server" Label="合同名称" LabelAlign="Right" LabelWidth="140px"></f:Label>
+                                        <f:ToolbarFill runat="server" />
+
+                                        <f:Button ID="btnNew" ToolTip="匹配WBS" Text="匹配WBS" Hidden="true" Icon="ApplicationEdit" runat="server" 
+                                            OnClick="btnNew_Click">
+                                        </f:Button>
+                                         
+
+                                    </Items>
+                                </f:Toolbar>
+                                <f:Toolbar ID="Toolbar4" Position="Top" runat="server" ToolbarAlign="Right">
+                                    <Items>
+                                        <f:TextBox runat="server" ID="txtProjectCode" Label="项目编码" LabelWidth="90" Width="200px" />
+                                        <f:TextBox runat="server" ID="txtProjectName" Label="项目名称" LabelWidth="90" Width="200px" />
+                                        <f:ToolbarFill runat="server" />
+
+                                        <f:Button ID="btnQuery" ToolTip="查询" Text="查询" Icon="SystemSearch" runat="server" EnablePostBack="true"
+                                            OnClick="btnQuery_OnClick">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <%--<f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
+                                    TextAlign="Center">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>--%>
+
+                                <f:RenderField Width="150px" ColumnID="MainItemCode" DataField="MainItemCode" SortField="MainItemCode"  EnableColumnEdit="False"
+                                    FieldType="String" HeaderText="主项号" TextAlign="Left" HeaderTextAlign="Center">
+                                    <Editor>
+                                        <f:TextBox ID="TextBox2" runat="server" Required="true" Readonly="True"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="MainItemName" DataField="MainItemName" SortField="MainItemName"  EnableColumnEdit="False"
+                                    FieldType="String" HeaderText="主项名称" TextAlign="Left" HeaderTextAlign="Center">
+                                    <Editor>
+                                        <f:TextBox ID="TextBox3" runat="server" Required="true" Readonly="True"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="MajorName" DataField="MajorName" SortField="MajorName" EnableColumnEdit="False"
+                                    FieldType="String" HeaderText="专业工程名称" TextAlign="Left" HeaderTextAlign="Center">
+                                    <Editor>
+                                        <f:TextBox ID="TextBox4" runat="server" Required="true"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="MajorCode" DataField="MajorCode" SortField="MajorCode" EnableColumnEdit="False"
+                                    FieldType="String" HeaderText="专业代码" TextAlign="Left" HeaderTextAlign="Center">
+                                    <Editor>
+                                        <f:TextBox ID="TextBox5" runat="server" Required="true"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="SubProject" DataField="SubProject" SortField="SubProject" EnableColumnEdit="False"
+                                    FieldType="String" HeaderText="分部工程" TextAlign="Left" HeaderTextAlign="Center">
+                                    <Editor>
+                                        <f:TextBox ID="TextBox6" runat="server" Required="true"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="SubItemProject" DataField="SubItemProject" SortField="SubItemProject" EnableColumnEdit="False"
+                                    FieldType="String" HeaderText="分项工程" TextAlign="Left" HeaderTextAlign="Center">
+                                    <Editor>
+                                        <f:TextBox ID="TextBox7" runat="server" Required="true"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:WindowField ColumnID="ProjectCode" HeaderTextAlign="Center" TextAlign="Left"
+                                    Width="150px" WindowID="Window1" HeaderText="项目编码" DataTextField="ProjectCode" 
+                                    DataIFrameUrlFields="Id" DataIFrameUrlFormatString="ContractTrackMatchWBS.aspx?ContractTrackId={0}"
+                                    Title="项目编码" DataToolTipField="ProjectCode" SortField="ProjectCode" 
+                                    Locked="true">
+                                </f:WindowField>
+                                <%--                          <f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" SortField="ProjectCode"
+                             FieldType="String" HeaderText="项目编码" TextAlign="Left" HeaderTextAlign="Center" >
+                           </f:RenderField>--%>
+                                <f:RenderField Width="150px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName" EnableColumnEdit="False"
+                                    FieldType="String" HeaderText="项目名称" TextAlign="Left" HeaderTextAlign="Center">
+                                    <Editor>
+                                        <f:TextBox ID="TextBox8" runat="server" Required="true"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="ProjectDescription" DataField="ProjectDescription" SortField="ProjectDescription" EnableColumnEdit="False"
+                                    FieldType="String" HeaderText="项目特征描述" TextAlign="Left" HeaderTextAlign="Center">
+                                    <Editor>
+                                        <f:TextBox ID="TextBox9" runat="server" Required="true"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+
+                                <f:RenderField Width="150px" ColumnID="ControlItemAndCycleCode" DataField="ControlItemAndCycleCode" SortField="ControlItemAndCycleCode"
+                                    FieldType="String" HeaderText="WBS编号" TextAlign="Left" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="ControlItemContent" DataField="ControlItemContent" SortField="ControlItemContent"
+                                    FieldType="String" HeaderText="工作包名称" TextAlign="Left" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="60px" ColumnID="Weights" DataField="Weights" SortField="Weights"
+                                    FieldType="String" HeaderText="权重" TextAlign="Left" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="WorkPackageEstimate" DataField="WorkPackageEstimate" FieldType="Double"
+                                    HeaderText="概算" HeaderTextAlign="Center">
+                                    <Editor>
+                                        <f:NumberBox ID="NumberBox2" runat="server" NoDecimal="false" NoNegative="false" DecimalPrecision="2" Increment="0.01">
+                                        </f:NumberBox>
+                                    </Editor>
+                                </f:RenderField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" /> 
+                                <f:Listener Event="dataload" Handler="onGridDataLoad" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                                    <f:ListItem Text="10" Value="10" />
+                                    <f:ListItem Text="15" Value="15" />
+                                    <f:ListItem Text="20" Value="20" />
+                                    <f:ListItem Text="25" Value="25" />
+                                    <f:ListItem Text="所有行" Value="100000" />
+                                </f:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+
+                    </Items>
+                </f:Panel>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" runat="server" Hidden="true" ShowHeader="true"
+            IsModal="true" Target="Parent" EnableMaximize="true" EnableResize="true" OnClose="Window1_Close"
+            Title="匹配WBS" EnableIFrame="true" Height="650px" CloseAction="HidePostBack"
+            Width="1200px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnMenuEdit" OnClick="btnNew_Click" EnablePostBack="true"
+                Hidden="true" runat="server" Text="编辑" Icon="TableEdit">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuDelete" OnClick="btnDelete_Click" EnablePostBack="true" Icon="Delete"
+                Hidden="true" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除">
+            </f:MenuButton>
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+        function reloadGrid() {
+            __doPostBack(null, 'reloadGrid');
+        }
+        function onGridDataLoad(event) {
+            this.mergeColumns(['ProjectCode', 'MainItemCode',
+                'MainItemName',
+                'MajorName',
+                'MajorCode',
+                'SubProject',
+                'SubItemProject',
+                'ProjectName',
+                'ProjectDescription'], {
+                dependsFirst: true });
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx.cs
new file mode 100644
index 00000000..bb75b6f2
--- /dev/null
+++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx.cs
@@ -0,0 +1,270 @@
+using BLL;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.PHTGL.ContractCompile
+{
+    public partial class ContractWBS : PageBase
+    {
+        public string ContractId
+        {
+            get => (string)ViewState["ContractId"];
+            set => ViewState["ContractId"] = value;
+        }
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.GetButtonPower();
+                //主合同编号
+                this.DropContractCode.DataTextField = "ContractNum";
+                this.DropContractCode.DataValueField = "ContractNum";
+                this.DropContractCode.DataSource = BLL.PHTGL_ContractReviewService.GetContractReview_CompleteData(this.CurrUser.LoginProjectId);
+                this.DropContractCode.DataBind();
+                Funs.FineUIPleaseSelect(this.DropContractCode);
+                DropMainContractCode_SelectedIndexChanged(null, null);
+                this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
+                // 绑定表格
+                this.BindGrid();
+
+            }
+        }
+
+        #region 绑定数据
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            var db = Funs.DB;
+            var q = 
+                    from x in db.PHTGL_ContractTrack
+                    join y in db.PHTGL_ContractTrackMatchWBS on x.Id equals y.ContractTrackId  into g 
+                    from y in g.DefaultIfEmpty()
+                    join z in db.WBS_ControlItemAndCycle on y.ControlItemAndCycleId equals z.ControlItemAndCycleId into _ControlJoin
+                    from z in _ControlJoin.DefaultIfEmpty()
+
+                    where (string.IsNullOrEmpty(ContractId) || x.ContractId.Contains(ContractId)) &&
+                          (string.IsNullOrEmpty(CurrUser.LoginProjectId) || x.ProjectId.Contains(CurrUser.LoginProjectId)) &&
+                          (string.IsNullOrEmpty(this.txtProjectCode.Text.Trim()) || x.ProjectCode.Contains(this.txtProjectCode.Text.Trim())) &&
+                          (string.IsNullOrEmpty(this.txtProjectName.Text.Trim()) || x.ProjectName.Contains(this.txtProjectName.Text.Trim())) 
+
+                    select new
+                    { 
+                        MatchWbsId= y.Id ,
+                       y.ContractTrackId,
+                       y.ControlItemAndCycleId,
+                       z.ControlItemAndCycleCode,
+                       z.ControlItemContent,
+                       z.Weights,
+                       y.WorkPackageEstimate,
+                       x.Id,
+                       x.ContractNum,
+                       x.MainItemCode,
+                       x.MainItemName,
+                       x.MajorName,
+                       x.MajorCode,
+                       x.SubProject,
+                       x.SubItemProject,
+                       x.ProjectCode,
+                       x.ProjectName,
+                       x.ProjectDescription,
+                       x.UnitOfMeasurement,
+                       x.Quantity,
+                       x.TotalCostFixedComprehensiveUnitPrice,
+                       x.MainMaterialCost,
+                       x.TotalPrice,
+                       x.CalculationRule,
+                       x.WorkContent,
+                       x.Remarks,
+                       x.ConstructionSubcontractor,
+                       x.ContractWeight,
+                       x.MaterialSupplier,
+                       x.IsWithinGeneralContractScope,
+                       x.EstimatedQuantity,
+                       x.EstimatedAmount,
+                       x.SettledQuantity,
+                       x.SettledAmount,
+                       x.ContractId
+                    };
+            ;
+            Grid1.RecordCount = q.Count();
+            Grid1.DataSource = q.ToList();
+            Grid1.DataBind();
+          
+        }
+
+        protected void DropMainContractCode_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(DropContractCode.SelectedValue))
+            {
+                var model = ContractService.GetContractByContractNum(DropContractCode.SelectedValue);
+                if (model != null)
+                {
+                    ContractId = model.ContractId;
+                    this.txtContractName.Text = model.ContractName;
+                }
+                else
+                {
+                    ContractId = "";
+                    this.txtContractName.Text = string.Empty;
+
+                }
+            }
+            BindGrid();
+        }
+
+        #endregion
+
+        #region GV 数据操作
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            this.Grid1.PageIndex = e.NewPageIndex;
+            this.BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            this.Grid1.SortDirection = e.SortDirection;
+            this.Grid1.SortField = e.SortField;
+            this.BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue);
+            this.BindGrid();
+        }
+        protected void btnQuery_OnClick(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 数据编辑事件
+        /// <summary>
+        /// 新增
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnNew_Click(object sender, EventArgs e)
+        {
+
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            object[] ID = Grid1.DataKeys[Grid1.SelectedRowIndex]; 
+            var model = BLL.PhtglContractTrackService.GetPHTGL_ContractTrackById(ID[0].ToString());
+            if (model != null) ///已上报时不能删除
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ContractTrackMatchWBS.aspx?ContractTrackId={0}", ID, "编辑 - ")));
+            }
+        }
+
+        /// <summary>
+        /// 批量删除
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnDelete_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length > 0)
+            {
+                foreach (int rowIndex in Grid1.SelectedRowIndexArray)
+                {
+                    object[] rowID = Grid1.DataKeys[rowIndex];
+                    var model = BLL.PhtglContracttrackmatchwbsService.GetPHTGL_ContractTrackMatchWBSById(rowID[1].ToString());
+                    if (model != null)
+                    {
+                        BLL.PhtglContracttrackmatchwbsService.DeleteModelById(rowID[1].ToString());
+                    }
+                }
+
+                BindGrid();
+                ShowNotify("删除数据成功!", MessageBoxIcon.Success);
+            }
+        }
+      
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            object[] ID = Grid1.DataKeys[Grid1.SelectedRowIndex];
+            var model = BLL.PhtglContractTrackService.GetPHTGL_ContractTrackById(ID[0].ToString());
+            if (model != null) ///已上报时不能删除
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ContractTrackMatchWBS.aspx?ContractTrackId={0}", ID, "编辑 - ")));
+            }
+        }
+        #endregion
+
+        #region 关闭弹出窗
+        /// <summary>
+        /// 关闭弹出窗
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 获取权限按钮
+        /// <summary>
+        /// 获取按钮权限
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        private void GetButtonPower()
+        {
+            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.PHTGL_ContractWBSMenuId);
+            if (buttonList.Count > 0)
+            {
+                if (buttonList.Contains(BLL.Const.BtnAdd))
+                {
+                    this.btnNew.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnModify))
+                {
+                    this.btnMenuEdit.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnDelete))
+                {
+                    this.btnMenuDelete.Hidden = false;
+                }
+            }
+        }
+        #endregion        
+
+       
+
+       
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx.designer.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx.designer.cs
new file mode 100644
index 00000000..8f51d833
--- /dev/null
+++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx.designer.cs
@@ -0,0 +1,278 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.PHTGL.ContractCompile
+{
+
+
+    public partial class ContractWBS
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel3;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// DropContractCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList DropContractCode;
+
+        /// <summary>
+        /// txtContractName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label txtContractName;
+
+        /// <summary>
+        /// btnNew 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnNew;
+
+        /// <summary>
+        /// Toolbar4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar4;
+
+        /// <summary>
+        /// txtProjectCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProjectCode;
+
+        /// <summary>
+        /// txtProjectName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProjectName;
+
+        /// <summary>
+        /// btnQuery 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnQuery;
+
+        /// <summary>
+        /// TextBox2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox2;
+
+        /// <summary>
+        /// TextBox3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox3;
+
+        /// <summary>
+        /// TextBox4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox4;
+
+        /// <summary>
+        /// TextBox5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox5;
+
+        /// <summary>
+        /// TextBox6 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox6;
+
+        /// <summary>
+        /// TextBox7 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox7;
+
+        /// <summary>
+        /// TextBox8 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox8;
+
+        /// <summary>
+        /// TextBox9 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox9;
+
+        /// <summary>
+        /// NumberBox2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox NumberBox2;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnMenuEdit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuEdit;
+
+        /// <summary>
+        /// btnMenuDelete 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuDelete;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/common/Menu_DigData.xml b/SGGL/FineUIPro.Web/common/Menu_DigData.xml
index b3d0385c..bb7a7a34 100644
--- a/SGGL/FineUIPro.Web/common/Menu_DigData.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_DigData.xml
@@ -1,9 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Tree>
-  <TreeNode id="FF0D9166-4509-4411-8039-F035BC251114" Text="数据仓库" NavigateUrl="">
-    <TreeNode id="0E9C6A47-E410-43C4-95D1-1EC1C01E9967" Text="WBS数据仓库" NavigateUrl="DigData/WBSDW.aspx">
-    </TreeNode>
-<TreeNode id="92B50285-30BD-4B62-9E23-A0D6B4BA1577" Text="项目数据仓库" NavigateUrl=""><TreeNode id="AA670914-6EAA-4CFA-8BD6-E0648F8FD21C" Text="安全数据库" NavigateUrl=""><TreeNode id="E1ABD1B1-1563-433A-972B-555076A96D06" Text="安全数据仓库" NavigateUrl="DigData/HSEDataDW.aspx"></TreeNode>
+  <TreeNode id="6A992AB8-A32D-448F-B06F-8DD4C112CC91" Text="法律法规制度标准库" NavigateUrl="">
+    <TreeNode id="CF1F59BB-215A-4E9D-9F19-DE188D322477" Text="标准分类" NavigateUrl="">
+      <TreeNode id="8B550B58-C681-4F34-83F0-F1E99CE04A47" Text="国内标准" NavigateUrl="">
+      </TreeNode>
+<TreeNode id="97D1E401-EA0F-4C90-B7DC-61D568BAE617" Text="国外标准" NavigateUrl=""></TreeNode>
+</TreeNode>
+<TreeNode id="DC3C36E0-4CD4-43E1-9CF8-D98D053E31FB" Text="法律法规" NavigateUrl=""><TreeNode id="2C7F78D3-DA7B-4193-A37F-CC479E4B9583" Text="法律法规" NavigateUrl=""></TreeNode>
+</TreeNode>
+<TreeNode id="97D20BA1-9378-4268-901B-3747EDFB15F4" Text="赛鼎体系" NavigateUrl=""><TreeNode id="406EBAAB-05B2-4249-BAC2-5589F50AE365" Text="企业标准" NavigateUrl=""></TreeNode>
+<TreeNode id="59F3FA81-7D08-4611-A3FF-22BFA656A940" Text="企业制度" NavigateUrl=""></TreeNode>
+</TreeNode>
+<TreeNode id="35092B0F-1B7B-4014-A41D-41354FD87374" Text="遵照执行的集团制度" NavigateUrl=""></TreeNode>
+</TreeNode>
+<TreeNode id="BAEBE57F-2858-49E0-BEFE-4D2FDF2FA4FE" Text="公共资源库" NavigateUrl=""><TreeNode id="664094A9-3DEF-4674-8FE2-ACF30B71B8DB" Text="安全公共资源库" NavigateUrl=""><TreeNode id="FDVXFGDS-5THM-CCDE-DCS2-TGHNO48F7UKM" Text="安全合规" NavigateUrl=""><TreeNode id="F4B02718-0616-4623-ABCE-885698DDBEB1" Text="安全法律法规" NavigateUrl="HSSE/Law/LawRegulationList.aspx"></TreeNode>
+<TreeNode id="499E23C1-057C-4B04-B92A-973B1DACD546" Text="赛鼎制度" NavigateUrl="HSSE/HSSESystem/SafetyInstitution.aspx"></TreeNode>
+<TreeNode id="EFDSFVDE-RTHN-7UMG-4THA-5TGED48F8IOL" Text="安全标准规范" NavigateUrl="HSSE/Law/HSSEStandardList.aspx"></TreeNode>
+<TreeNode id="DF1413F3-4CE5-40B3-A574-E01CE64FEA25" Text="安全规章制度" NavigateUrl="HSSE/Law/RulesRegulations.aspx"></TreeNode>
+<TreeNode id="56960940-81A8-43D1-9565-C306EC7AFD12" Text="集团制度" NavigateUrl="HSSE/Law/ManageRule.aspx"></TreeNode>
+</TreeNode>
+<TreeNode id="2B49BFE2-734F-489E-91B9-D05F02E1976D" Text="安全生产责任制" NavigateUrl=""><TreeNode id="1DB91420-47D3-4219-AAB4-7E613FCBCC90" Text="安全主体责任" NavigateUrl="HSSE/HSSESystem/HSSEMainDuty.aspx"></TreeNode>
+</TreeNode>
+<TreeNode id="E26D223B-4CA2-4A6D-82D0-224CC9C8676D" Text="安全教育" NavigateUrl=""><TreeNode id="9D99A981-7380-4085-84FA-8C3B1AFA6202" Text="培训教材库" NavigateUrl="HSSE/EduTrain/TrainDB.aspx"></TreeNode>
+<TreeNode id="9D4F76A1-CD2E-4E66-B833-49425CD879EB" Text="公司教材库" NavigateUrl="HSSE/EduTrain/CompanyTraining.aspx"></TreeNode>
+<TreeNode id="4D6BD686-DA06-45CC-9DB8-54B342651724" Text="考试试题库" NavigateUrl="HSSE/EduTrain/TestTraining.aspx"></TreeNode>
+<TreeNode id="F58EE8ED-9EB5-47C7-9D7F-D751EFEA44CA" Text="安全试题库" NavigateUrl="HSSE/EduTrain/TrainTestDB.aspx"></TreeNode>
+<TreeNode id="D86917DB-D00A-4E18-9793-C290B5BBA84C" Text="事故案例库" NavigateUrl="HSSE/EduTrain/AccidentCase.aspx"></TreeNode>
+</TreeNode>
+<TreeNode id="D70D9BF5-C72E-414D-941B-CF9B4065F6BA" Text="安全技术" NavigateUrl=""><TreeNode id="8333727B-A2CE-4CE2-A019-21AC9EE61A4C" Text="危险源清单" NavigateUrl="HSSE/Technique/HazardList.aspx"></TreeNode>
+<TreeNode id="C0018E8C-C88B-4E25-BCFC-F0BF3CACC63A" Text="公司危险源清单" NavigateUrl="HSSE/Technique/CompanyHazardList.aspx"></TreeNode>
+<TreeNode id="773B59F9-61F9-4F5E-9D68-A1BF9322AFFA" Text="环境因素危险源" NavigateUrl="HSSE/Technique/Environmental.aspx"></TreeNode>
+<TreeNode id="DC2AA8C2-82A8-4F7A-832D-9889C65AA228" Text="公司环境因素危险源" NavigateUrl="HSSE/Technique/CompanyEnvironmental.aspx"></TreeNode>
+<TreeNode id="2D86AD87-4108-428C-BA3D-F81FB85511FE" Text="安全隐患" NavigateUrl="HSSE/Technique/Rectify.aspx"></TreeNode>
+<TreeNode id="9C26BF2A-091D-4AC3-8678-334DE4E1CED7" Text="项目安全检查项" NavigateUrl="HSSE/Technique/CheckItemSet.aspx"></TreeNode>
+<TreeNode id="D11BFC83-BE64-457D-B8FA-11C37D35CD72" Text="应急预案" NavigateUrl="HSSE/Technique/Emergency.aspx"></TreeNode>
+<TreeNode id="3E2F2FFD-ED2E-4914-8370-D97A68398814" Text="施工方案" NavigateUrl="HSSE/Technique/SpecialScheme.aspx"></TreeNode>
+</TreeNode>
+<TreeNode id="1B688B07-AEF4-43D8-BF31-1907522967ED" Text="标牌管理" NavigateUrl=""><TreeNode id="022CA9C1-70F0-4C07-996C-0736D32B442A" Text="标牌管理" NavigateUrl="HSSE/Resources/SignManage.aspx"></TreeNode>
+</TreeNode>
+</TreeNode>
+<TreeNode id="34705FFF-0BA5-4C4F-BD70-721AA0EF874F" Text="质量公共资源库" NavigateUrl=""></TreeNode>
+<TreeNode id="AB48BB81-A0F1-4E90-9E01-3F203E5ACFDE" Text="施工公共资源库" NavigateUrl=""></TreeNode>
+<TreeNode id="EDDED4C1-B01E-4831-8552-38CB30CE8817" Text="开车公共资源库" NavigateUrl=""></TreeNode>
+</TreeNode>
+<TreeNode id="DCVVBDE3-1B48-4615-FCD0-VDBCDS3ET4D9" Text="施工WBS基础数据库" NavigateUrl="CQMS/WBS/ControlItemInitSet.aspx"></TreeNode>
+<TreeNode id="FF0D9166-4509-4411-8039-F035BC251114" Text="数据仓库" NavigateUrl=""><TreeNode id="AA670914-6EAA-4CFA-8BD6-E0648F8FD21C" Text="安全数据库" NavigateUrl=""><TreeNode id="E1ABD1B1-1563-433A-972B-555076A96D06" Text="安全数据库" NavigateUrl="DigData/HSEDataDW.aspx"></TreeNode>
+<TreeNode id="427AB060-2510-4568-B85B-AD6796EBE569" Text="项目HSE数据汇总" NavigateUrl="DigData/HSEDataCollect.aspx"></TreeNode>
 <TreeNode id="04B182E4-D31E-449F-9803-322F3F380D89" Text="HSE日常检查问题分析" NavigateUrl="DigData/DailyProblemAnalysis.aspx"></TreeNode>
 <TreeNode id="24939ABD-E174-4C3D-8B04-494917B7BE40" Text="HSE隐患整改问题分析" NavigateUrl="DigData/RectifyProblemAnalysis.aspx"></TreeNode>
 <TreeNode id="4B2E7EE5-AC7C-4143-B5BC-60080C763A24" Text="HSE教育培训统计" NavigateUrl="DigData/TrainRecordAnalysis.aspx"></TreeNode>
@@ -12,16 +54,19 @@
 </TreeNode>
 <TreeNode id="E7F7BC38-7357-49C0-9242-68289031F618" Text="进度数据库" NavigateUrl=""><TreeNode id="44D51E89-267D-4D72-AB6D-1F4CA4E7D19D" Text="进度数据库" NavigateUrl="DigData/JDGLDataDW.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="381A4608-2CDE-42AF-BC4D-FF554785B9F8" Text="合同数据库" NavigateUrl=""><TreeNode id="ABC4323E-2F6F-4147-AA7A-8726131D7044" Text="合同数据库" NavigateUrl="DigData/HTGLDataDW.aspx"></TreeNode>
+<TreeNode id="381A4608-2CDE-42AF-BC4D-FF554785B9F8" Text="合同数据库" NavigateUrl=""><TreeNode id="ABC4323E-2F6F-4147-AA7A-8726131D7044" Text="合同数据库" NavigateUrl="DigData/JDGLDataDW.aspx"></TreeNode>
 <TreeNode id="A20E2443-A118-4C67-9084-FFEB685CA539" Text="清单子目使用率及价格走势图" NavigateUrl=""></TreeNode>
 <TreeNode id="6D1F3A3F-EFD1-420A-87E7-8CFAEF971165" Text="日工效统计" NavigateUrl=""></TreeNode>
 </TreeNode>
+<TreeNode id="5BE7F83B-C02D-4481-815F-153279B44C39" Text="劳务数据库" NavigateUrl=""></TreeNode>
 </TreeNode>
+<TreeNode id="B87413D8-4EFB-42F3-A4F6-9D21C0CD3DFE" Text="数据分析室" NavigateUrl=""><TreeNode id="AF5C32FD-F0CB-404E-B56D-C4AE79A8A050" Text="人员功效分析" NavigateUrl=""></TreeNode>
+<TreeNode id="0DB6BB5F-B17A-4A38-AABB-278300EA9E39" Text="员工产值分析" NavigateUrl=""></TreeNode>
 </TreeNode>
-<TreeNode id="B87413D8-4EFB-42F3-A4F6-9D21C0CD3DFE" Text="数据分析室" NavigateUrl=""><TreeNode id="CFEF47C0-8EFA-46FF-8648-5B1922519DCC" Text="WBS数据分析" NavigateUrl="DigData/WBSAnalysis.aspx"></TreeNode>
-<TreeNode id="B146FC96-B199-426B-8504-4BE093C0DCB1" Text="项目数据汇总分析" NavigateUrl=""><TreeNode id="427AB060-2510-4568-B85B-AD6796EBE569" Text="项目HSE数据汇总" NavigateUrl="DigData/HSEDataCollect.aspx"></TreeNode>
-<TreeNode id="DD960B76-1F33-468B-9FEF-76328235C079" Text="项目质量数据汇总" NavigateUrl="DigData/CQMSDataCollect.aspx"></TreeNode>
-<TreeNode id="A705738B-D0A2-41D2-A01A-18774B5AED49" Text="项目施工数据汇总" NavigateUrl=""></TreeNode>
-</TreeNode>
+<TreeNode id="6136C2AE-2AF8-498D-BC19-7D693841239C" Text="文件柜" NavigateUrl=""><TreeNode id="506F42F3-F4CF-46A7-AC90-787117B4F1DC" Text="安全文件柜" NavigateUrl=""></TreeNode>
+<TreeNode id="A90460D0-2658-43F7-9558-A72E91E54ABD" Text="质量文件柜" NavigateUrl=""></TreeNode>
+<TreeNode id="2539A5CE-E209-4A16-A9B7-4C43E4E3CBEC" Text="进度文件柜" NavigateUrl=""></TreeNode>
+<TreeNode id="8FB0A651-485F-4413-BCD6-22BF82438125" Text="焊接文件柜" NavigateUrl=""></TreeNode>
+<TreeNode id="F596EC1A-71A3-4B34-B36C-68628F2F42FE" Text="合同文件柜" NavigateUrl=""></TreeNode>
 </TreeNode>
 </Tree>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/common/Menu_HTGL.xml b/SGGL/FineUIPro.Web/common/Menu_HTGL.xml
index 9b647aea..6a68aebd 100644
--- a/SGGL/FineUIPro.Web/common/Menu_HTGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_HTGL.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Tree>
-  <TreeNode id="E36CBDD0-2E49-415E-BBE7-B8222F40D749" Text="合同模板" NavigateUrl="">
-    <TreeNode id="C141ABE5-E377-45C1-9507-E723C40099B8" Text="基本信息" NavigateUrl="PHTGL/ContractCompile/Contract.aspx">
-    </TreeNode>
+  <TreeNode id="E9D387EB-2797-43E3-AACE-93413839CCF7" Text="合同管理" NavigateUrl="">
+  </TreeNode>
+<TreeNode id="E36CBDD0-2E49-415E-BBE7-B8222F40D749" Text="合同模板" NavigateUrl=""><TreeNode id="C141ABE5-E377-45C1-9507-E723C40099B8" Text="基本信息" NavigateUrl="PHTGL/ContractCompile/Contract.aspx"></TreeNode>
 <TreeNode id="C5560FF5-8181-4BA2-8326-D2B49E45660C" Text="合同协议书" NavigateUrl="PHTGL/ContractCompile/ContractAgreementEdit.aspx"></TreeNode>
 <TreeNode id="98573D16-3310-4292-96A5-A59B9A5E6B6B" Text="通用条款" NavigateUrl="PHTGL/ContractCompile/GeneralTermsConditions.aspx"></TreeNode>
 <TreeNode id="98367C43-9C85-467E-9144-288D80101E41" Text="专用条款" NavigateUrl="PHTGL/ContractCompile/SpecialTermsConditions.aspx"></TreeNode>
 </TreeNode>
+<TreeNode id="E3978B9E-89D7-4B23-B44B-A680FAFA0443" Text="施工长名单管理" NavigateUrl=""><TreeNode id="9C4E7381-4080-4082-8C4D-B041149D48C7" Text="施工长名单入网申请" NavigateUrl="PHTGL/LongListManager/LongListNetApplication.aspx"></TreeNode>
+</TreeNode>
 <TreeNode id="C18B4A2E-7BE7-43E6-A969-8A6292D19987" Text="招标工作台账" NavigateUrl="PHTGL/Filing/BidDocumentsStandingBook.aspx"></TreeNode>
 <TreeNode id="0A5DF9F5-B6B5-41B8-8951-C203C5749495" Text="合同台账" NavigateUrl="PHTGL/Filing/ContractStandingBook.aspx"></TreeNode>
 <TreeNode id="8213BE20-2680-4A13-91B8-49028BB89869" Text="工程量清单" NavigateUrl=""><TreeNode id="326AA80C-6B01-4214-ACF2-B29595BA28D5" Text="土建工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=0"></TreeNode>
@@ -14,7 +16,10 @@
 <TreeNode id="0E04FA16-FFA6-4987-A0A5-A4658F0099F2" Text="工艺管道安装工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=2"></TreeNode>
 <TreeNode id="FAC4F0F7-A7C0-4F66-8BCB-846C082BCA40" Text="工艺设备安装工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=3"></TreeNode>
 <TreeNode id="10586190-0FDD-4DA8-A877-CE4599D6F0DF" Text="非标设备现场制作安装工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=4"></TreeNode>
-<TreeNode id="1C770E20-7912-484C-9739-499B1B2F8DEB" Text="电仪安装工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=5"></TreeNode>
+<TreeNode id="1C770E20-7912-484C-9739-499B1B2F8DEB" Text="电仪安装工程" NavigateUrl=""><TreeNode id="3593DF22-78C1-4A73-8468-B20CB44D88C9" Text="电气工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=5.1"></TreeNode>
+<TreeNode id="3ECE6333-6785-424D-996E-B923A650D8C7" Text="仪表工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=5.2"></TreeNode>
+<TreeNode id="480F8C85-F5F2-4C5C-BE72-2ADABB7250CF" Text="电信工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=5.3"></TreeNode>
+</TreeNode>
 <TreeNode id="92101A90-9C22-4B43-B012-9AFF8402F85D" Text="水暖安装工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=6"></TreeNode>
 <TreeNode id="33A03E2C-4E00-4722-AA14-F50419468154" Text="防腐绝热工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=7"></TreeNode>
 <TreeNode id="A5A31FE8-0643-4396-99E3-A4A31A947789" Text="无损检测工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=8"></TreeNode>
diff --git a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml
index 8d4aa005..fd6a0762 100644
--- a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Tree>
-  <TreeNode id="E23F0879-3E9F-4E7B-9A2D-EFF34798D629" Text="进度计划编制" NavigateUrl="JDGL/Check/PlanSet.aspx">
+  <TreeNode id="BAC3D994-03A8-466C-8975-A31039998BCC" Text="施工进度统计" NavigateUrl="JDGL/Check/ProgressShow.aspx">
   </TreeNode>
+<TreeNode id="1172B112-2A12-4410-AD66-E5BA6B461475" Text="施工进度赢得值曲线" NavigateUrl="JDGL/Check/ProgressStatistics.aspx"></TreeNode>
 <TreeNode id="B479EC55-E12A-4F91-AF3F-864DAAA136FB" Text="进度完成情况录入" NavigateUrl="JDGL/Check/CompleteInput.aspx"></TreeNode>
+<TreeNode id="4288426D-E49B-4E5D-A495-7E6A76F269B5" Text="周计划" NavigateUrl=""></TreeNode>
 <TreeNode id="F0E296C3-6499-43E5-88CD-E00C5180D3BC" Text="赢得值曲线" NavigateUrl="JDGL/Check/EarnedValueCurve.aspx"></TreeNode>
+<TreeNode id="C75F0853-8A2B-4B32-83B7-509278D11957" Text="项目里程碑节点" NavigateUrl=""></TreeNode>
+<TreeNode id="3550F422-E520-4962-9816-B691B0EE2865" Text="形象进度照片" NavigateUrl=""></TreeNode>
 </Tree>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml b/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml
index 997760f7..3ccb32ac 100644
--- a/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml
@@ -35,5 +35,8 @@
 <TreeNode id="48216E20-7103-48AB-A12F-237E28605952" Text="消防电信" NavigateUrl=""></TreeNode>
 <TreeNode id="5EB73242-63F0-402C-A42B-2BCDC0AC2229" Text="临建设施" NavigateUrl=""></TreeNode>
 </TreeNode>
-<TreeNode id="D9BAB30E-3255-4EA0-8631-EF15C9203EFD" Text="合同执行跟踪" NavigateUrl="PHTGL/ContractCompile/ContractTrackList.aspx"></TreeNode>
+<TreeNode id="D9BAB30E-3255-4EA0-8631-EF15C9203EFD" Text="合同价格信息" NavigateUrl="PHTGL/ContractCompile/ContractTrackList.aspx"></TreeNode>
+<TreeNode id="98269480-3F36-4169-A91D-16144D903C6C" Text="WBS工作包" NavigateUrl="PHTGL/ContractCompile/ContractWBS.aspx"></TreeNode>
+<TreeNode id="D715B66F-8E99-498F-87DA-E85B4B8EB923" Text="费用对比统计" NavigateUrl="PHTGL/ContractCompile/ContractTrackComparison.aspx"></TreeNode>
+<TreeNode id="F545E899-B3B5-4B49-A741-DE19356553D5" Text="进度检测" NavigateUrl="PHTGL/ContractCompile/ContractTrackProgressDetection.aspx"></TreeNode>
 </Tree>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
index 342d91b8..9bc36592 100644
--- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
@@ -48,48 +48,6 @@
 <TreeNode id="3BBFCD70-D7A3-435C-9571-DD499D5ED7B8" Text="应急信息" NavigateUrl=""><TreeNode id="D12C2412-E12A-4F78-9AEF-1EE8AC84A561" Text="应急预案管理清单" NavigateUrl="ZHGL/Emergency/EmergencyList.aspx"></TreeNode>
 <TreeNode id="172F25E0-F5E2-42E3-AD67-AC824D4E0FBB" Text="应急演练开展情况" NavigateUrl="ZHGL/Emergency/DrillRecordList.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="6A992AB8-A32D-448F-B06F-8DD4C112CC91" Text="法律法规制度标准库" NavigateUrl=""><TreeNode id="CF1F59BB-215A-4E9D-9F19-DE188D322477" Text="标准分类" NavigateUrl=""><TreeNode id="8B550B58-C681-4F34-83F0-F1E99CE04A47" Text="国内标准" NavigateUrl=""></TreeNode>
-<TreeNode id="97D1E401-EA0F-4C90-B7DC-61D568BAE617" Text="国外标准" NavigateUrl=""></TreeNode>
-</TreeNode>
-<TreeNode id="DC3C36E0-4CD4-43E1-9CF8-D98D053E31FB" Text="法律法规" NavigateUrl=""><TreeNode id="2C7F78D3-DA7B-4193-A37F-CC479E4B9583" Text="法律法规" NavigateUrl=""></TreeNode>
-</TreeNode>
-<TreeNode id="97D20BA1-9378-4268-901B-3747EDFB15F4" Text="赛鼎体系" NavigateUrl=""><TreeNode id="406EBAAB-05B2-4249-BAC2-5589F50AE365" Text="企业标准" NavigateUrl=""></TreeNode>
-<TreeNode id="59F3FA81-7D08-4611-A3FF-22BFA656A940" Text="企业制度" NavigateUrl=""></TreeNode>
-</TreeNode>
-<TreeNode id="35092B0F-1B7B-4014-A41D-41354FD87374" Text="遵照执行的集团制度" NavigateUrl=""></TreeNode>
-</TreeNode>
-<TreeNode id="BAEBE57F-2858-49E0-BEFE-4D2FDF2FA4FE" Text="公共资源库" NavigateUrl=""><TreeNode id="664094A9-3DEF-4674-8FE2-ACF30B71B8DB" Text="安全公共资源库" NavigateUrl=""><TreeNode id="FDVXFGDS-5THM-CCDE-DCS2-TGHNO48F7UKM" Text="安全合规" NavigateUrl=""><TreeNode id="F4B02718-0616-4623-ABCE-885698DDBEB1" Text="安全法律法规" NavigateUrl="HSSE/Law/LawRegulationList.aspx"></TreeNode>
-<TreeNode id="499E23C1-057C-4B04-B92A-973B1DACD546" Text="赛鼎制度" NavigateUrl="HSSE/HSSESystem/SafetyInstitution.aspx"></TreeNode>
-<TreeNode id="EFDSFVDE-RTHN-7UMG-4THA-5TGED48F8IOL" Text="安全标准规范" NavigateUrl="HSSE/Law/HSSEStandardList.aspx"></TreeNode>
-<TreeNode id="DF1413F3-4CE5-40B3-A574-E01CE64FEA25" Text="安全规章制度" NavigateUrl="HSSE/Law/RulesRegulations.aspx"></TreeNode>
-<TreeNode id="56960940-81A8-43D1-9565-C306EC7AFD12" Text="集团制度" NavigateUrl="HSSE/Law/ManageRule.aspx"></TreeNode>
-</TreeNode>
-<TreeNode id="2B49BFE2-734F-489E-91B9-D05F02E1976D" Text="安全生产责任制" NavigateUrl=""><TreeNode id="1DB91420-47D3-4219-AAB4-7E613FCBCC90" Text="安全主体责任" NavigateUrl="HSSE/HSSESystem/HSSEMainDuty.aspx"></TreeNode>
-</TreeNode>
-<TreeNode id="E26D223B-4CA2-4A6D-82D0-224CC9C8676D" Text="安全教育" NavigateUrl=""><TreeNode id="9D99A981-7380-4085-84FA-8C3B1AFA6202" Text="培训教材库" NavigateUrl="HSSE/EduTrain/TrainDB.aspx"></TreeNode>
-<TreeNode id="9D4F76A1-CD2E-4E66-B833-49425CD879EB" Text="公司教材库" NavigateUrl="HSSE/EduTrain/CompanyTraining.aspx"></TreeNode>
-<TreeNode id="4D6BD686-DA06-45CC-9DB8-54B342651724" Text="考试试题库" NavigateUrl="HSSE/EduTrain/TestTraining.aspx"></TreeNode>
-<TreeNode id="F58EE8ED-9EB5-47C7-9D7F-D751EFEA44CA" Text="安全试题库" NavigateUrl="HSSE/EduTrain/TrainTestDB.aspx"></TreeNode>
-<TreeNode id="D86917DB-D00A-4E18-9793-C290B5BBA84C" Text="事故案例库" NavigateUrl="HSSE/EduTrain/AccidentCase.aspx"></TreeNode>
-</TreeNode>
-<TreeNode id="D70D9BF5-C72E-414D-941B-CF9B4065F6BA" Text="安全技术" NavigateUrl=""><TreeNode id="8333727B-A2CE-4CE2-A019-21AC9EE61A4C" Text="危险源清单" NavigateUrl="HSSE/Technique/HazardList.aspx"></TreeNode>
-<TreeNode id="C0018E8C-C88B-4E25-BCFC-F0BF3CACC63A" Text="公司危险源清单" NavigateUrl="HSSE/Technique/CompanyHazardList.aspx"></TreeNode>
-<TreeNode id="773B59F9-61F9-4F5E-9D68-A1BF9322AFFA" Text="环境因素危险源" NavigateUrl="HSSE/Technique/Environmental.aspx"></TreeNode>
-<TreeNode id="DC2AA8C2-82A8-4F7A-832D-9889C65AA228" Text="公司环境因素危险源" NavigateUrl="HSSE/Technique/CompanyEnvironmental.aspx"></TreeNode>
-<TreeNode id="2D86AD87-4108-428C-BA3D-F81FB85511FE" Text="安全隐患" NavigateUrl="HSSE/Technique/Rectify.aspx"></TreeNode>
-<TreeNode id="9C26BF2A-091D-4AC3-8678-334DE4E1CED7" Text="项目安全检查项" NavigateUrl="HSSE/Technique/CheckItemSet.aspx"></TreeNode>
-<TreeNode id="D11BFC83-BE64-457D-B8FA-11C37D35CD72" Text="应急预案" NavigateUrl="HSSE/Technique/Emergency.aspx"></TreeNode>
-<TreeNode id="3E2F2FFD-ED2E-4914-8370-D97A68398814" Text="施工方案" NavigateUrl="HSSE/Technique/SpecialScheme.aspx"></TreeNode>
-</TreeNode>
-<TreeNode id="1B688B07-AEF4-43D8-BF31-1907522967ED" Text="标牌管理" NavigateUrl=""><TreeNode id="022CA9C1-70F0-4C07-996C-0736D32B442A" Text="标牌管理" NavigateUrl="HSSE/Resources/SignManage.aspx"></TreeNode>
-</TreeNode>
-</TreeNode>
-<TreeNode id="34705FFF-0BA5-4C4F-BD70-721AA0EF874F" Text="质量公共资源库" NavigateUrl=""></TreeNode>
-<TreeNode id="AB48BB81-A0F1-4E90-9E01-3F203E5ACFDE" Text="施工公共资源库" NavigateUrl=""></TreeNode>
-<TreeNode id="EDDED4C1-B01E-4831-8552-38CB30CE8817" Text="开车公共资源库" NavigateUrl=""></TreeNode>
-</TreeNode>
-<TreeNode id="DCVVBDE3-1B48-4615-FCD0-VDBCDS3ET4D9" Text="施工WBS基础数据库" NavigateUrl="CQMS/WBS/ControlItemInitSet.aspx"></TreeNode>
-<TreeNode id="6136C2AE-2AF8-498D-BC19-7D693841239C" Text="文件柜" NavigateUrl=""></TreeNode>
 <TreeNode id="1E216BE3-DB22-4649-BD9A-0777B0DC03E6" Text="QHSE上报" NavigateUrl=""><TreeNode id="94F94EC1-54B3-4BEB-A019-0A755A66D8FD" Text="安全数据" NavigateUrl="ZHGL/DataSync/HSSEData_HSSE.aspx"></TreeNode>
 <TreeNode id="4C9920AE-F335-48B1-BDB0-276173305952" Text="质量数据" NavigateUrl="ZHGL/DataSync/CQMSData_CQMS.aspx"></TreeNode>
 <TreeNode id="2110702F-4E12-479A-8EA1-E5A8EEF77276" Text="焊接数据" NavigateUrl="ZHGL/DataSync/HJGLData_HJGL.aspx"></TreeNode>