From 0fc844f1070b89d113462c748db2fa3df8619622 Mon Sep 17 00:00:00 2001
From: fly-l <1420031550@qq.com>
Date: Thu, 31 Aug 2023 11:02:23 +0800
Subject: [PATCH] 2023-08-31

---
 .vs/SGGL_SeDin/v17/.wsuo                      | Bin 265216 -> 265216 bytes
 DataBase/版本日志/SGGLDB_V2023-08-31.sql      |  29 +
 SGGL/BLL/BLL.csproj                           |   5 +-
 .../PhtglContracttrackService .cs             |  10 +-
 .../PhtglContracttrackmatchwbsService.cs      | 124 +++++
 .../PhtglContracttrackprogressService.cs      |  61 +-
 .../BLL/ZHGL/DataSync/HSSEData_HSSEService.cs |   2 +-
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj       |   8 +
 .../ContractCompile/ContractTrackEdit.aspx    |   8 +-
 .../ContractCompile/ContractTrackEdit.aspx.cs |  14 +-
 .../ContractTrackEdit.aspx.designer.cs        |   9 +
 .../ContractCompile/ContractTrackIn.aspx.cs   |   2 +-
 .../ContractCompile/ContractTrackList.aspx    | 523 ++++++++++++------
 .../ContractCompile/ContractTrackList.aspx.cs | 243 +++++++-
 .../ContractTrackList.aspx.designer.cs        | 445 ++++++++++++++-
 .../ContractTrackMatchWBS.aspx                | 166 ++++++
 .../ContractTrackMatchWBS.aspx.cs             | 514 +++++++++++++++++
 .../ContractTrackMatchWBS.aspx.designer.cs    | 179 ++++++
 SGGL/FineUIPro.Web/common/Menu_DigData.xml    |  60 +-
 SGGL/FineUIPro.Web/common/Menu_JDGL.xml       |   6 +-
 SGGL/FineUIPro.Web/common/Menu_PHTGL.xml      |   1 +
 SGGL/FineUIPro.Web/common/Menu_ZHGL.xml       |  37 --
 SGGL/Model/Model.cs                           |  38 +-
 SGGL/SGGL.sln                                 |  14 +
 24 files changed, 2260 insertions(+), 238 deletions(-)
 create mode 100644 DataBase/版本日志/SGGLDB_V2023-08-31.sql
 create mode 100644 SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackmatchwbsService.cs
 create mode 100644 SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackMatchWBS.aspx
 create mode 100644 SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackMatchWBS.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackMatchWBS.aspx.designer.cs

diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo
index fc93fb60637a6e96f472f9c05ebf860d76ac6e0d..66e9549e47322828887bc8d7befc020152bcc41b 100644
GIT binary patch
delta 2504
zcmds&ZETZO6oB7*-*;U%yYH?mW!6y&8>EG|U)wsyXc!PQgf?s;@?oT(d^uL<I~X!t
zF^Ew~96bqd^^d0L{DU!Bqy4)?V!#-}7Gfel48a8DL&0P-G8yxnuEU~6{lPEa<moy0
z+>f4n&bjv{Qk98R<#3?vm>>u`qy{l&syfcFq^76nqHR^jl}sOhm9Z#HiHkj@*gc#7
zo<!Y>6d^NcYd~3sXb>AxfjmI_%&A}v3`+W;ax~0Ot}4*UMgy0ktr2NLDv{;L5`_9!
z<|XMe>dt)Ih0=|9kY=O>5xF3EQMMtgkalD>`PPBT8pMYrYZA5~$`BGpB1ja8A-j=1
z$X;Y0vLAu7HOBTnR9-?9q#rqm96|<=!^q3X5o8cKioAjhAqgbOU(m!qdL*F5jkOd|
z37HQj?T-SsK##^;1AmH9r-<gGSvO?H#-jWHiey7xrwM<KWG(jnzalwW+9{Q>dfb;O
zzi+6ju%1!M8LNl>iY_fxAcca=Fj?XM>tImIyR}rHe+(;6{O#;21$I?yCCU#d)dPA8
zFG00L(uXoxGYEldqmgQdY*ah*<MOqW($VP>5$w-7##;qAsK2PABZLL}&<;v%H=H-w
zim2E`xc8J_O9e7N4U`7l4;>{sDi5ub4c*#?LW8mhhf!@93#=MCpBorVR~>jPyXy8a
zhTbD0A|XYH1}R2L5ps~eiUNJkGCO-6Z5g&=j3rG9Oq%Lp*yJh`sMx7yX%r=p?Sd)O
z5L*NN3*SmwCs_ohtbSbyj#yYYDh&ONUD{;@rXo7p9dNJq8Tgz#Krvi?G~-I$$umA1
zgNkiF@Y%<b@;coDoS`jP0u<R#lQWa+bS&M*M^~hn{5`t;19Ahog^;7SQT~Yhgxo>y
zB0nR)A*X^?{e6^F5rtpU(3x9XF`Q(Dj-=apa)qu)!lE$XO?-!)iqEyGbFH+Sqd`mE
zGq@@S@HR^}Y<zr0QaV>87zQEpz{`2kat_XMSwlCWz+u|*G`Y?8LjU3+wi~7v&;CPB
zmOPphT`niI5PoSNPd0UyF$xOZgCuhqUk&|DejPRI3eD{>)ilHwLjSVO<Ut9YemWWg
z%q%$c-wFs4ay`@=8XpG!U$dSxpVQG@JpT}pgPBRQj*V_gaJC+fZC;~uZS4wRDunf&
zT>%JgcZ1JA2H$KS&yH8~UNOB<Doii<cHK1DEM2{QN}#Vd9_>>OZw~fEEp3)SZZB7D
zR%nXW!|`YUWG+D>tj{5HEu0UxrZ-9Hm^2#UJj3^06(QYY#<NEME~v#8?iDd2YNv&-
zhQxu6C!Wu}#yf=P(0IYZTNr~yyaq1EZQ$$OUmFu-!H(~zj6`!<NN~bf@782o4>x-a
z;ET(Foq``<$S^*5aUn=gA66bk#2R$D9WiIK+wSs4+;(@&6S22OWw+hocC>n9o=~(U
zg3mO%hL^-U;=r*T)&ZX&lzg^?Z(%)aS9W!`Ib4o5x$TG}7Iw-`TqEL^9d@_u3fsM{
zF1OtiaynW)E$&dLx#j5G1gAGQ!4+~iqpqku><HmMdt6?-*VTekV^MEVj(D7|SorAt
zg^R9chnDi!#Ehiee_Ks`!0WPg8g_$?NQ|qN4Xj$N{Eq2fH)~netmW5A)Zr6s=jo4m
zImlm>s&|XIHapnBk2832+jwUD*_GnRMUjsfxmMlsAva_Vm&BXwgoTe-#Iqw4q6C))
zn$+R1L|=B#6*0v|zQw^`i(H*}Lri27SH(mTy#I+gYyMTdRt%%Joa(z1Vsm!Sbum>1
z6Yp(-OBYOPoJ;0U-;@rr(;;S55Bwr7SJz5XN}aeXR%dTdi+Z|^)U-xw&Ne>~zbyM5
DP(%p5

delta 3059
zcmeI!UrbY190%}w&TXMU3oVpdwLmH5k08+USLKft7(-CN(J?1DMM_0MsjM(`PP)ao
zEc$@`J(TTX4|QSLVq!v<^lfQ|%aUbLG;Z0$VvG-4W|nMOFqv+;eNSy?U0i0eKTkX4
zlXLDl_Z)t`=iGCyZ(i%0*Ut5743Z=nVKwB1bhdNM&&QK)R5cijE{7)hYmB++wp=ih
zf%acxNgFFGV|f<x`)Er?o*AptAYTPZV268X*T-^EjwjJCp6;C;D$Xy(P2~`;tUy`C
z9$u$~baf2~@{qD)Q(}zC#k)m}3J~!ngBU`@Ch~ZEI$Wz`bs|2|CX$FLHFhn^@t8%M
z=!@9Oo-nqcnlGwbIW2MfId3{+IW(2grxJmQ!AO^3rIm~x(M;ZSrz-wmA2g)<9(%ve
zt6qx%L?i-vGiUUT2^E`TWxvu#y_rV+{@C?_gnQ_G*1Xz^3Na_~P`IAawEmJ>MjcP6
zCvUb>B_3A%M&%?fWV(~rsbQjSO+s79TY851Ge`fC7@dBTm+hk|Q#UPT;}Mxmq|I?L
z2TkRiCSR_Wv?kY|wfj3S(#33BXr)ul{Duxye5Rw%)@$g|Na87GCxlKb2B*rDSm9k2
zotq@Fg4-G0ZTM8Z4n?uJ<If^#3>R;st#PY{iB*@9(8vzbRMV_-6jl9nC+BB2Lbr2!
z)S_=;;%zRP+T5oS??il9<uERq|DsRcqkYuTKIkWszok_yE7nX?Ej?=S3W(P_K0Irp
z+by%qL{qKZ59Y8qp;aj+blc<Sm%Qd{kFHa1{uzq&IVg8m8I@T+Cr3eKv1Fc|^^E$h
zZPDMVN*J5G)*cNLubbFv;_=Xms5QrGey{Zw;`wLWQ^f6JVkFYp3T9KV1;pn~jj{&P
zK?|a*4tXYIfsBQmjobjMzzC~h4Xgzd<UlUuff@3_0tH}&LMVb_C}Gm9v<`(*D1-G-
z4i!)dHn2k#R6`BaLLJn@2G|IjpaB}837TOuIA9C3Kr6JtQ_v1iLkF9cq^&4)LKkd<
z?a&Q9&<i`@8R!EiJPZBs9PEVWVHXU*Anb-0U=QqtA=n4Q;DQlw!+sbQl?UJ;jKMe@
zg2ONY9ykJ%@FI9&3Z~&Dn1Q2k3|@xg@CuxOS@1!yhW~L*`Af{vnU8Na|Ihq?KJ#K(
z{JS$Bx?jk7u!8G2-dpi5ixW<Pat^*nzGp!P_ctzS*x%TM3%Z_gOA4)6ad0H;qTQP4
zm&B8Aqw453Dz+`8pi>bXRQNkPRC%}(KMe;_3C(nN(Na!Ru#5T4tr}K@HuJ-FD^61<
zd*n<~*P>Z$s3KudvhTPOI@?<*WAsH=Df90&i1VA+a50s-4dfVTqm!P-a3odXV1cAG
zg^qMZmE;@HQ|7RN-gg`6qk-l{7w6#?BmXd&A_pvV^Js1|lQ7$o6tLTQxqeb=lQv0%
z(%sV^?-5@wBGK~X2J#(jPP^GJz9I&s-Kg6#Q_mRX^Q^#Em3%!p#>N6ywzF)CjP;Y@
zcquu?ZM}8)3apWAQZ;hBR2AJc#Mx)9t{$=v)w}KGE?Zqqd5ycewtU0TP)&JloqeQg
zUzKabRqvKWSd2+;$}_JHSZ5sggb78)3z%7)@8Xw7)1WjgO-P6EHz6HH+~`9`-di2;
zUErxybYe{?a#+CvEl!pjaM$wO<eitrr<W8sUCTF;!&4IYu9h2vlXD9S#>s!d5H@gj
ziv^ZH;Fi}dNi1wh;@4ARkA6Z<Jo?DSRbiEp|CCIN)9qyY(Mq<9sevDqs6MXcC)p_r
zU$DsM7Yv*SmeV+fHuGDI9QPH0U$!s{4ZfiYS6q^>%4GY*6ZU)|&#_R%gSo3wDfD#X
zh*=cQ(DHOiVD2;75gxrN&$D+UDg|G-CS%A})*kSDgN9RI%Ey$n_-$3-txIxUc=T&|
NUbk>vR=uN8{|3h_U5Wqz

diff --git a/DataBase/版本日志/SGGLDB_V2023-08-31.sql b/DataBase/版本日志/SGGLDB_V2023-08-31.sql
new file mode 100644
index 00000000..fb755b76
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2023-08-31.sql
@@ -0,0 +1,29 @@
+alter table dbo.PHTGL_ContractTrackMatchWBS
+    alter column ContractTrackId varchar(50) null
+go
+alter table dbo.PHTGL_ContractTrackMatchWBS
+    alter column WorkPackageEstimate decimal(18, 3) null
+go
+
+alter table dbo.PHTGL_ContractTrackProgress
+    add Date nvarchar(50)
+go
+alter table dbo.PHTGL_ContractTrack
+    alter column EstimatedAmount decimal(18, 2) null
+go
+
+alter table dbo.PHTGL_ContractTrack
+    alter column SettledAmount decimal(18, 2) null
+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)
+			GO
+				INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+				VALUES ( N'5AD91BF5-4CA6-4A9E-A370-D17B0D99010F',N'D9BAB30E-3255-4EA0-8631-EF15C9203EFD',N'�޸�',2)
+				INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+				VALUES ( N'5D1F64DE-32CE-4236-A6AE-3E276105D387',N'D9BAB30E-3255-4EA0-8631-EF15C9203EFD',N'ɾ��',3)
+				INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+				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
diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj
index f939458b..a1a5254d 100644
--- a/SGGL/BLL/BLL.csproj
+++ b/SGGL/BLL/BLL.csproj
@@ -105,8 +105,8 @@
     <Reference Include="QRCoder, Version=1.4.3.0, Culture=neutral, PublicKeyToken=c4ed5b9ae8358a28, processorArchitecture=MSIL">
       <HintPath>..\packages\QRCoder.1.4.3\lib\net40\QRCoder.dll</HintPath>
     </Reference>
-    <Reference Include="Quartz, Version=3.7.0.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Quartz.3.7.0\lib\netstandard2.0\Quartz.dll</HintPath>
+    <Reference Include="Quartz, Version=3.5.0.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Quartz.3.5.0\lib\netstandard2.0\Quartz.dll</HintPath>
     </Reference>
     <Reference Include="RestSharp, Version=106.15.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
       <HintPath>..\packages\RestSharp.106.15.0\lib\net452\RestSharp.dll</HintPath>
@@ -583,6 +583,7 @@
     <Compile Include="PHTGL\BiddingManagement\SetSubReview_Sch2Service.cs" />
     <Compile Include="Common\WordHelp.cs" />
     <Compile Include="PHTGL\BillOfQuantities\PhtglBidprojectquantityService .cs" />
+    <Compile Include="PHTGL\ContractCompile\PhtglContracttrackmatchwbsService.cs" />
     <Compile Include="PHTGL\ContractCompile\PhtglContracttrackprogressService.cs" />
     <Compile Include="PHTGL\ContractCompile\PhtglContracttrackService .cs" />
     <Compile Include="PHTGL\BillOfQuantities\PhtglMainprojectquantityService .cs" />
diff --git a/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs b/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs
index 6b9414eb..775ceb26 100644
--- a/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs	
+++ b/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs	
@@ -7,10 +7,11 @@ using FineUIPro;
 using MiniExcelLibs;
 using MiniExcelLibs.Attributes;
 using Model;
+using WIA;
 
 namespace BLL
 {
-    public static class PHTGL_ContractTrackService
+    public static class PhtglContractTrackService
     {
         #region 获取列表
 
@@ -157,6 +158,8 @@ namespace BLL
             };
             Funs.DB.PHTGL_ContractTrack.InsertOnSubmit(table);
             Funs.DB.SubmitChanges();
+            PhtglContracttrackprogressService.CreateTemplateByContractTrackId(newtable.Id);
+
         }
 
 
@@ -206,6 +209,8 @@ namespace BLL
                 Funs.DB.PHTGL_ContractTrack.DeleteOnSubmit(table);
                 Funs.DB.SubmitChanges();
             }
+            PhtglContracttrackprogressService.DeleteModleByContractTrackId(id);
+            PhtglContracttrackmatchwbsService.DeleteModelByContractTrackId(id);
         }
 
         public static ResponeData ImportData(string path, string contractid, string projectid)
@@ -243,7 +248,9 @@ namespace BLL
                     ContractId = contractid,
                     ProjectId = projectid,
                 };
+                if (string.IsNullOrEmpty(item.ProjectCode)) continue;
                 var resultModel = GetPHTGL_ContractTrackByModle(phtglContractTrack);
+                item.ContractNum=ContractService.GetContractById(contractid)?.ContractNum;
                 if (resultModel.Any())
                 {
                     item.Id = resultModel[0].Id;
@@ -254,6 +261,7 @@ namespace BLL
                     item.Id = SQLHelper.GetNewID();
                     AddPHTGL_ContractTrack(item);
                 }
+                PhtglContracttrackprogressService.CreateTemplateByContractTrackId(item.Id);
             }
 
             return responeData;
diff --git a/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackmatchwbsService.cs b/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackmatchwbsService.cs
new file mode 100644
index 00000000..7cc62f20
--- /dev/null
+++ b/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackmatchwbsService.cs
@@ -0,0 +1,124 @@
+using FineUIPro;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+
+namespace BLL
+{
+
+    public static class PhtglContracttrackmatchwbsService
+    {
+
+
+
+        #region 获取列表
+        /// <summary>
+        /// 记录数
+        /// </summary>
+        public static int Count
+        {
+            get;
+            set;
+        }
+        public static List<Model.PHTGL_ContractTrackMatchWBS> GetPHTGL_ContractTrackMatchWBSByModle(Model.PHTGL_ContractTrackMatchWBS table)
+        {
+            var q = from x in Funs.DB.PHTGL_ContractTrackMatchWBS
+                    where
+                              (string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) &&
+                              (string.IsNullOrEmpty(table.ContractTrackId) || x.ContractTrackId.Contains(table.ContractTrackId)) &&
+                              (string.IsNullOrEmpty(table.ControlItemAndCycleId) || x.ControlItemAndCycleId.Contains(table.ControlItemAndCycleId)) 
+                    select x
+                  ;
+
+            return q.ToList();
+        }
+
+        /// <summary>
+        /// 获取分页列表
+        /// </summary>
+        /// <param name="table"></param>
+        /// <param name="grid1"></param>
+        /// <returns></returns>
+        public static IEnumerable GetListData(Model.PHTGL_ContractTrackMatchWBS table, Grid grid1)
+        {
+            var q = GetPHTGL_ContractTrackMatchWBSByModle(table);
+            Count = q.Count();
+            if (Count == 0)
+            {
+                return null;
+            }
+            q = q.Skip(grid1.PageSize * grid1.PageIndex).Take(grid1.PageSize).ToList();
+            // q = SortConditionHelper.SortingAndPaging(q, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
+            return from x in q
+                   select new
+                   {
+                       x.Id,
+                       x.ContractTrackId,
+                       x.ControlItemAndCycleId,
+                       x.WorkPackageEstimate,
+
+                   };
+        }
+        #endregion
+
+        public static Model.PHTGL_ContractTrackMatchWBS GetPHTGL_ContractTrackMatchWBSById(string Id)
+        {
+            return Funs.DB.PHTGL_ContractTrackMatchWBS.FirstOrDefault(x => x.Id == Id);
+        }
+
+
+        public static void AddPHTGL_ContractTrackMatchWBS(Model.PHTGL_ContractTrackMatchWBS newtable)
+        {
+
+            Model.PHTGL_ContractTrackMatchWBS table = new Model.PHTGL_ContractTrackMatchWBS
+            {
+                Id = newtable.Id,
+                ContractTrackId = newtable.ContractTrackId,
+                ControlItemAndCycleId = newtable.ControlItemAndCycleId,
+                WorkPackageEstimate = newtable.WorkPackageEstimate,
+            };
+            Funs.DB.PHTGL_ContractTrackMatchWBS.InsertOnSubmit(table);
+            Funs.DB.SubmitChanges();
+        }
+
+
+        public static void UpdatePHTGL_ContractTrackMatchWBS(Model.PHTGL_ContractTrackMatchWBS newtable)
+        {
+
+            Model.PHTGL_ContractTrackMatchWBS table = Funs.DB.PHTGL_ContractTrackMatchWBS.FirstOrDefault(x => x.Id == newtable.Id);
+            if (table != null)
+            {
+                table.Id = newtable.Id;
+                table.ContractTrackId = newtable.ContractTrackId;
+                table.ControlItemAndCycleId = newtable.ControlItemAndCycleId;
+                table.WorkPackageEstimate = newtable.WorkPackageEstimate;
+                Funs.DB.SubmitChanges();
+            }
+
+        }
+        public static void DeleteModelById(string Id)
+        {
+
+            Model.PHTGL_ContractTrackMatchWBS table = Funs.DB.PHTGL_ContractTrackMatchWBS.FirstOrDefault(x => x.Id == Id);
+            if (table != null)
+            {
+                Funs.DB.PHTGL_ContractTrackMatchWBS.DeleteOnSubmit(table);
+                Funs.DB.SubmitChanges();
+            }
+
+        }
+        public static void DeleteModelByContractTrackId(string ContractTrackId)
+        {
+            var table = Funs.DB.PHTGL_ContractTrackMatchWBS.Where(x =>
+                x.ContractTrackId == ContractTrackId);
+            if (table != null)
+            {
+                Funs.DB.PHTGL_ContractTrackMatchWBS.DeleteAllOnSubmit(table);
+                Funs.DB.SubmitChanges();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackprogressService.cs b/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackprogressService.cs
index 4c23749e..61e730bf 100644
--- a/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackprogressService.cs
+++ b/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackprogressService.cs
@@ -1,4 +1,5 @@
-using System.Collections;
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using FineUIPro;
@@ -33,7 +34,10 @@ namespace BLL
                         (string.IsNullOrEmpty(table.ACWP_OutputValue) ||
                          x.ACWP_OutputValue.Contains(table.ACWP_OutputValue)) &&
                         (string.IsNullOrEmpty(table.ACWP_Percentage) ||
-                         x.ACWP_Percentage.Contains(table.ACWP_Percentage))
+                         x.ACWP_Percentage.Contains(table.ACWP_Percentage)) &&
+                        (string.IsNullOrEmpty(table.Date) ||
+                         x.Date.Contains(table.Date))
+                        orderby x.Date
                     select x
                 ;
 
@@ -63,7 +67,8 @@ namespace BLL
                     x.BCWS_Percentage,
                     x.ACWP_Quantity,
                     x.ACWP_OutputValue,
-                    x.ACWP_Percentage
+                    x.ACWP_Percentage,
+                    x.Date
                 };
         }
 
@@ -75,7 +80,52 @@ namespace BLL
                 x.ContractTrackProgressId == ContractTrackProgressId);
         }
 
+        public static void CreateTemplateByContractTrackId(string ContractTrackId)
+        {
+            var model = PhtglContractTrackService.GetPHTGL_ContractTrackById(ContractTrackId);
+            if (model == null) return;
+            var contractNum=model.ContractNum;
+            var contractmode = ContractService.GetContractByContractNum(contractNum);
+            if (contractmode.ContractStartDate != null && contractmode.ContractEndDate != null)
+            {
+                var startDate = (DateTime)contractmode.ContractStartDate;
+                var endDate = (DateTime)contractmode.ContractEndDate;
+                List<DateTime> months = GetMonthsBetween(startDate, endDate);
 
+                foreach (DateTime month in months)
+                {
+                    var querymodel = new Model.PHTGL_ContractTrackProgress
+                    {
+                        ContractTrackId = ContractTrackId,
+                        Date= month.ToString("yyyy-MM")
+                    };
+                    if (!GetPHTGL_ContractTrackProgressByModle(querymodel).Any())
+                    {
+                        var newmodel = new Model.PHTGL_ContractTrackProgress();
+                        newmodel.ContractTrackProgressId = SQLHelper.GetNewID(typeof(Model.PHTGL_ContractTrackProgress));
+                        newmodel.ContractTrackId = ContractTrackId;
+                        newmodel.Date = month.ToString("yyyy-MM");
+                        AddPHTGL_ContractTrackProgress(newmodel);
+                    }
+                    //Console.WriteLine(month.ToString("yyyy-MM"));
+                }
+            }
+        }
+        public static List<DateTime> GetMonthsBetween(DateTime startDate, DateTime endDate)
+        {
+            List<DateTime> months = new List<DateTime>();
+
+            DateTime currentMonth = new DateTime(startDate.Year, startDate.Month, 1);
+            DateTime lastMonth = new DateTime(endDate.Year, endDate.Month, 1);
+
+            while (currentMonth <= lastMonth)
+            {
+                months.Add(currentMonth);
+                currentMonth = currentMonth.AddMonths(1);
+            }
+
+            return months;
+        }
         public static void AddPHTGL_ContractTrackProgress(PHTGL_ContractTrackProgress newtable)
         {
             var table = new PHTGL_ContractTrackProgress
@@ -87,7 +137,9 @@ namespace BLL
                 BCWS_Percentage = newtable.BCWS_Percentage,
                 ACWP_Quantity = newtable.ACWP_Quantity,
                 ACWP_OutputValue = newtable.ACWP_OutputValue,
-                ACWP_Percentage = newtable.ACWP_Percentage
+                ACWP_Percentage = newtable.ACWP_Percentage,
+                Date = newtable.Date
+
             };
             Funs.DB.PHTGL_ContractTrackProgress.InsertOnSubmit(table);
             Funs.DB.SubmitChanges();
@@ -108,6 +160,7 @@ namespace BLL
                 table.ACWP_Quantity = newtable.ACWP_Quantity;
                 table.ACWP_OutputValue = newtable.ACWP_OutputValue;
                 table.ACWP_Percentage = newtable.ACWP_Percentage;
+                table.Date =newtable.Date;
                 Funs.DB.SubmitChanges();
             }
         }
diff --git a/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs b/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs
index dd232097..e5cfebf5 100644
--- a/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs
+++ b/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs
@@ -599,7 +599,7 @@ namespace BLL
         }
 
         /// <summary>
-        ///     获取企业总部总监人数
+        /// 获取企业总部总监人数
         /// </summary>
         /// <returns></returns>
         public static int GetHeadOfficeInspectorGeneralNum()
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index ca69c0f9..d00d86fc 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -1258,6 +1258,7 @@
     <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\GeneralTermsConditions.aspx" />
     <Content Include="PHTGL\ContractCompile\SpecialTermsConditions.aspx" />
     <Content Include="PHTGL\Filing\ActionPlanFile.aspx" />
@@ -12367,6 +12368,13 @@
     <Compile Include="PHTGL\ContractCompile\ContractTrackList.aspx.designer.cs">
       <DependentUpon>ContractTrackList.aspx</DependentUpon>
     </Compile>
+    <Compile Include="PHTGL\ContractCompile\ContractTrackMatchWBS.aspx.cs">
+      <DependentUpon>ContractTrackMatchWBS.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="PHTGL\ContractCompile\ContractTrackMatchWBS.aspx.designer.cs">
+      <DependentUpon>ContractTrackMatchWBS.aspx</DependentUpon>
+    </Compile>
     <Compile Include="PHTGL\ContractCompile\GeneralTermsConditions.aspx.cs">
       <DependentUpon>GeneralTermsConditions.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx
index 5c365b79..dd057102 100644
--- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx
+++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx
@@ -197,7 +197,7 @@
                     <Items>
                         <f:Grid ID="Grid1" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" Title="" EnableCollapse="false"
                             runat="server" DataKeyNames="ContractTrackProgressId" AllowCellEditing="true" ClicksToEdit="1" ForceFit="true"
-                            EnableColumnLines="true" DataIDField="ContractTrackProgressId">
+                            EnableColumnLines="true" DataIDField="ContractTrackProgressId" Hidden="True">
                             <Toolbars>
                                 <f:Toolbar ID="Toolbar2" runat="server" Position="Top" ToolbarAlign="Left">
                                     <Items>
@@ -211,6 +211,12 @@
                             </Toolbars>
                             <Columns>
                                 <f:RowNumberField HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center" Width="60px"></f:RowNumberField>
+                                <f:RenderField ColumnID="Date" DataField="Date" FieldType="String"
+                                    HeaderText="日期" HeaderTextAlign="Center">
+                                    <Editor>
+                                        <f:TextBox ID="TextBox1" runat="server" Required="true"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
                                 <f:GroupField HeaderText="BCWS" TextAlign="Center">
                                     <Columns>
                                         <f:RenderField ColumnID="BCWS_Quantity" DataField="BCWS_Quantity" FieldType="String"
diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx.cs
index 8efee3dc..b93222a4 100644
--- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx.cs
@@ -41,7 +41,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
                 Id = Request.Params["Id"];
                 if (!string.IsNullOrEmpty(Id))
                 {
-                    var model = PHTGL_ContractTrackService.GetPHTGL_ContractTrackById(Id);
+                    var model = PhtglContractTrackService.GetPHTGL_ContractTrackById(Id);
                     if (model != null)
                     {
                          
@@ -101,6 +101,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
             defaultObj.Add("ACWP_Quantity", "");
             defaultObj.Add("ACWP_OutputValue", "");
             defaultObj.Add("ACWP_Percentage", "");
+            defaultObj.Add("Date", "");
 
             // 在第一行新增一条数据
             btnNew.OnClientClick = Grid1.GetAddNewRecordReference(defaultObj, true);
@@ -129,6 +130,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
                     model.ACWP_Quantity = objects["values"]["ACWP_Quantity"].ToString();
                     model.ACWP_OutputValue = objects["values"]["ACWP_OutputValue"].ToString();
                     model.ACWP_Percentage = objects["values"]["ACWP_Percentage"].ToString();
+                    model.Date = objects["values"]["Date"].ToString();
                     BLL.PhtglContracttrackprogressService.AddPHTGL_ContractTrackProgress(model);
                 }
             }
@@ -177,20 +179,20 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
             table.EstimatedAmount =  Funs.GetNewDecimalOrZero(txtEstimatedAmount.Text);
             table.SettledQuantity = txtSettledQuantity.Text;
             table.SettledAmount = Funs.GetNewDecimalOrZero(txtSettledAmount.Text);
-            table.ContractId = txtContractId.Text;
-            table.ProjectId = txtProjectId.Text;
+            table.ContractNum = DropContractCode.SelectedValue;
+            table.ProjectId = this.CurrUser.LoginProjectId;
             if (string.IsNullOrEmpty(Id))
             {
                 table.Id = SQLHelper.GetNewID(typeof(PHTGL_ContractTrack));
-                PHTGL_ContractTrackService.AddPHTGL_ContractTrack(table);
+                PhtglContractTrackService.AddPHTGL_ContractTrack(table);
             }
             else
             {
                 table.Id = Id;
-                PHTGL_ContractTrackService.UpdatePHTGL_ContractTrack(table);
+                PhtglContractTrackService.UpdatePHTGL_ContractTrack(table);
             }
 
-            SaveGrid1();
+            //SaveGrid1();
             PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
         }
 
diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx.designer.cs
index 129c8c4a..5adcd3b0 100644
--- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx.designer.cs
@@ -338,6 +338,15 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
         /// </remarks>
         protected global::FineUIPro.Button btnDelete;
 
+        /// <summary>
+        /// TextBox1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox1;
+
         /// <summary>
         /// txtBCWS_Quantity 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackIn.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackIn.aspx.cs
index 43f91278..34b8f586 100644
--- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackIn.aspx.cs
@@ -80,7 +80,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
             var fileName = rootPath + initPath + hdFileName.Text;
 
             ResponeData responeData = new ResponeData();
-            responeData = PHTGL_ContractTrackService.ImportData(fileName,  ContractId, this.CurrUser.LoginProjectId);
+            responeData = PhtglContractTrackService.ImportData(fileName,  ContractId, this.CurrUser.LoginProjectId);
 
 
             if (responeData.code == 1)
diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx
index 3ed16b01..3bc45eff 100644
--- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx
+++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx
@@ -5,179 +5,394 @@
 
 <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
-        {
+        }
+
+        .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" Title="合同执行跟踪表" EnableCollapse="true"
-                runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" 
-                ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="Id"
-                SortDirection="DESC" OnSort="Grid1_Sort"  EnableColumnLines="true"
-                AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
-                <Toolbars>
-                    <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
-                        <Items>
-                            <f:DropDownList ID="DropContractCode" runat="server" Label="施工分包合同编号" AutoPostBack="true" AutoSelectFirstItem="false" LabelAlign="Right" LabelWidth="140px" OnSelectedIndexChanged="DropMainContractCode_SelectedIndexChanged"></f:DropDownList>
-                            <f:Label ID="txtContractName" runat="server" Label="合同名称" LabelAlign="Right"  LabelWidth="140px"></f:Label>
+        <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>                            
-                        </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:ToolbarFill runat="server" />
+                                        <f:Button ID="btnNew" ToolTip="新增" Text="新增" Hidden="true" Icon="Add" runat="server"
+                                            OnClick="btnNew_Click">
+                                        </f:Button>
 
-                          <f:RenderField Width="150px" ColumnID="MainItemCode" DataField="MainItemCode" SortField="MainItemCode"
-                             FieldType="String" HeaderText="主项号" TextAlign="Left" HeaderTextAlign="Center" >
-                           </f:RenderField>
-                          <f:RenderField Width="150px" ColumnID="MainItemName" DataField="MainItemName" SortField="MainItemName"
-                             FieldType="String" HeaderText="主项名称" TextAlign="Left" HeaderTextAlign="Center" >
-                           </f:RenderField>
-                          <f:RenderField Width="150px" ColumnID="MajorName" DataField="MajorName" SortField="MajorName"
-                             FieldType="String" HeaderText="专业工程名称" TextAlign="Left" HeaderTextAlign="Center" >
-                           </f:RenderField>
-                          <f:RenderField Width="150px" ColumnID="MajorCode" DataField="MajorCode" SortField="MajorCode"
-                             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"
+                                        <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>
+                            </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"
+                                    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"
+                                    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"
+                                    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"
+                                    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"
+                                    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"
+                                    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"
-                             FieldType="String" HeaderText="项目名称" TextAlign="Left" HeaderTextAlign="Center" >
-                           </f:RenderField>
-                          <f:RenderField Width="150px" ColumnID="ProjectDescription" DataField="ProjectDescription" SortField="ProjectDescription"
-                             FieldType="String" HeaderText="项目特征描述" TextAlign="Left" HeaderTextAlign="Center" >
-                           </f:RenderField>
-                          <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:RenderField Width="150px" ColumnID="WorkContent" DataField="WorkContent" SortField="WorkContent"
-                             FieldType="String" HeaderText="工作内容" TextAlign="Left" HeaderTextAlign="Center" >
-                           </f:RenderField>
-                          <f:RenderField Width="150px" ColumnID="Remarks" DataField="Remarks" SortField="Remarks"
-                             FieldType="String" HeaderText="备注" TextAlign="Left" HeaderTextAlign="Center" >
-                           </f:RenderField>
-                          <f:RenderField Width="150px" ColumnID="ConstructionSubcontractor" DataField="ConstructionSubcontractor" SortField="ConstructionSubcontractor"
-                             FieldType="String" HeaderText="施工分包商" TextAlign="Left" HeaderTextAlign="Center" >
-                           </f:RenderField>
-                          <f:RenderField Width="150px" ColumnID="ContractWeight" DataField="ContractWeight" SortField="ContractWeight"
-                             FieldType="String" HeaderText="合同权重 " TextAlign="Left" HeaderTextAlign="Center" >
-                           </f:RenderField>
-                          <f:RenderField Width="150px" ColumnID="MaterialSupplier" DataField="MaterialSupplier" SortField="MaterialSupplier"
-                             FieldType="String" HeaderText="主材供应方 " TextAlign="Left" HeaderTextAlign="Center" >
-                           </f:RenderField>
-                          <f:RenderField Width="150px" ColumnID="IsWithinGeneralContractScope" DataField="IsWithinGeneralContractScope" SortField="IsWithinGeneralContractScope"
-                             FieldType="String" HeaderText="是否总包合同范围内" TextAlign="Left" HeaderTextAlign="Center" >
-                           </f:RenderField>
-                          <f:RenderField Width="150px" ColumnID="EstimatedQuantity" DataField="EstimatedQuantity" SortField="EstimatedQuantity"
-                             FieldType="String" HeaderText="概算工程量" TextAlign="Left" HeaderTextAlign="Center" >
-                           </f:RenderField>
-                          <f:RenderField Width="150px" ColumnID="EstimatedAmount" DataField="EstimatedAmount" SortField="EstimatedAmount"
-                             FieldType="String" HeaderText="概算金额" TextAlign="Left" HeaderTextAlign="Center" >
-                           </f:RenderField>
-                          <f:RenderField Width="150px" ColumnID="SettledQuantity" DataField="SettledQuantity" SortField="SettledQuantity"
-                             FieldType="String" HeaderText="结算工程量" TextAlign="Left" HeaderTextAlign="Center" >
-                           </f:RenderField>
-                          <f:RenderField Width="150px" ColumnID="SettledAmount" DataField="SettledAmount" SortField="SettledAmount"
-                             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_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="700px" Height="240px">
+                           </f:RenderField>--%>
+                                <f:RenderField Width="150px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName"
+                                    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"
+                                    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"
+                                    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"
+                                    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">
+                                    <Editor>
+                                        <f:TextBox ID="TextBox12" runat="server" Required="true"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="MainMaterialCost" DataField="MainMaterialCost" SortField="MainMaterialCost"
+                                    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"
+                                    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"
+                                    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"
+                                    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"
+                                    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>
+
+                <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">
+                    <Items>
+                        <f:Panel ID="Panel7" BoxFlex="1" runat="server" ShowBorder="true" ShowHeader="false" Layout="Fit">
+                            <Items>
+                                <f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="WBS匹配表" 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"
+                                    IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange">
+                                    <Toolbars>
+                                        <f:Toolbar ID="Toolbar1" runat="server" Position="Top" ToolbarAlign="Left">
+                                            <Items>
+                                                <f:ToolbarFill ID="ToolbarFill2" runat="server"></f:ToolbarFill>
+                                                <f:Button ID="btnMatchWBS_New" ToolTip="增加" Icon="Add" EnablePostBack="false" runat="server">
+                                                </f:Button>
+                                                <f:Button ID="btnMatchWBS_Delete" ToolTip="删除" Icon="Delete" EnablePostBack="true" ConfirmText="是否删除？" runat="server" OnClick="btnMatchWBS_Delete_OnClick">
+                                                </f:Button>
+                                                <f:Button ID="btnMatchWBS_Save" ToolTip="保存" Icon="PageSave" EnablePostBack="true"  runat="server" OnClick="btnMatchWBS_Save_OnClick">
+                                                </f:Button>
+                                            </Items>
+                                        </f:Toolbar>
+                                    </Toolbars>
+                                    <Columns>
+                                        <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="NumberBox1" runat="server" NoDecimal="false" NoNegative="false" DecimalPrecision="2" Increment="0.01">
+                                                </f:NumberBox>
+                                            </Editor>
+                                        </f:RenderField>
+                                    </Columns>
+                                </f:Grid>
+
+                            </Items>
+                        </f:Panel>
+                        <f:Panel ID="Panel8" BoxFlex="2" runat="server" ShowBorder="true" ShowHeader="false" Layout="Fit">
+                            <Items>
+                                <f:Grid ID="Grid3" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" Title="" EnableCollapse="false"
+                                    runat="server" DataKeyNames="ContractTrackProgressId" AllowCellEditing="true" ClicksToEdit="1" ForceFit="true"
+                                    EnableColumnLines="true" DataIDField="ContractTrackProgressId">
+                                    <Toolbars>
+                                        <f:Toolbar ID="Toolbar3" runat="server" Position="Top" ToolbarAlign="Left">
+                                            <Items>
+                                                <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
+                                                <f:Button ID="btnProgress_New" ToolTip="增加" Icon="Add" EnablePostBack="false" runat="server" Hidden="True">
+                                                </f:Button>
+                                                <f:Button ID="btnProgress_Delete" ToolTip="删除" Icon="Delete" EnablePostBack="false" runat="server" Hidden="True">
+                                                </f:Button>
+
+                                                <f:Button ID="btnProgress_Save" ToolTip="保存" Icon="PageSave" EnablePostBack="true" runat="server" OnClick="btnProgress_Save_OnClick">
+                                                </f:Button>
+                                            </Items>
+                                        </f:Toolbar>
+                                    </Toolbars>
+                                    <Columns>
+                                        <f:RowNumberField HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center" Width="60px"></f:RowNumberField>
+                                        <f:RenderField ColumnID="Date" DataField="Date" FieldType="String"
+                                            HeaderText="日期" HeaderTextAlign="Center">
+                                            <Editor>
+                                                <f:TextBox ID="TextBox1" runat="server" Required="true"></f:TextBox>
+                                            </Editor>
+                                        </f:RenderField>
+                                        <f:GroupField HeaderText="BCWS" TextAlign="Center">
+                                            <Columns>
+                                                <f:RenderField ColumnID="BCWS_Quantity" DataField="BCWS_Quantity" FieldType="String"
+                                                    HeaderText="工程量" HeaderTextAlign="Center">
+                                                    <Editor>
+                                                        <f:TextBox ID="txtBCWS_Quantity" runat="server" Required="true"></f:TextBox>
+                                                    </Editor>
+                                                </f:RenderField>
+                                                <f:RenderField ColumnID="BCWS_OutputValue" DataField="BCWS_OutputValue" FieldType="String"
+                                                    HeaderText="产值" HeaderTextAlign="Center">
+                                                    <Editor>
+                                                        <f:TextBox ID="txtBCWS_OutputValue" runat="server" Required="true"></f:TextBox>
+                                                    </Editor>
+                                                </f:RenderField>
+                                                <f:RenderField ColumnID="BCWS_Percentage" DataField="BCWS_Percentage" FieldType="String"
+                                                    HeaderText="百分比" HeaderTextAlign="Center">
+                                                    <Editor>
+                                                        <f:TextBox ID="txtBCWS_Percentage" runat="server" Required="true">
+                                                        </f:TextBox>
+                                                    </Editor>
+                                                </f:RenderField>
+                                            </Columns>
+                                        </f:GroupField>
+                                        <f:GroupField HeaderText="ACWP" TextAlign="Center">
+                                            <Columns>
+                                                <f:RenderField ColumnID="ACWP_Quantity" DataField="ACWP_Quantity" FieldType="String"
+                                                    HeaderText="工程量" HeaderTextAlign="Center">
+                                                    <Editor>
+                                                        <f:TextBox ID="txtACWP_Quantity" runat="server" Required="true"></f:TextBox>
+                                                    </Editor>
+                                                </f:RenderField>
+                                                <f:RenderField ColumnID="ACWP_OutputValue" DataField="ACWP_OutputValue" FieldType="String"
+                                                    HeaderText="产值" HeaderTextAlign="Center">
+                                                    <Editor>
+                                                        <f:TextBox ID="txtACWP_OutputValue" runat="server" Required="true"></f:TextBox>
+                                                    </Editor>
+                                                </f:RenderField>
+                                                <f:RenderField ColumnID="ACWP_Percentage" DataField="ACWP_Percentage" FieldType="String"
+                                                    HeaderText="百分比" HeaderTextAlign="Center">
+                                                    <Editor>
+                                                        <f:TextBox ID="txtACWP_Percentage" runat="server" Required="true">
+                                                        </f:TextBox>
+                                                    </Editor>
+                                                </f:RenderField>
+                                            </Columns>
+                                        </f:GroupField>
+
+                                    </Columns>
+                                </f:Grid>
+                            </Items>
+                        </f:Panel>
+                    </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: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: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: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 %>';
diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.cs
index d74fe07c..d4d639e7 100644
--- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.cs
+++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.cs
@@ -1,4 +1,6 @@
 using BLL;
+using Microsoft.Vbe.Interop;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -27,6 +29,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
                 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();
@@ -40,14 +43,62 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
         /// </summary>
         private void BindGrid()
         {
-            Model.PHTGL_ContractTrack table = new Model.PHTGL_ContractTrack();
-            table.ProjectId=this.CurrUser.LoginProjectId;
-            table.ContractId= this.ContractId;
-            var tb = BLL.PHTGL_ContractTrackService.GetListData(table, Grid1);
-            Grid1.RecordCount = PHTGL_ContractTrackService.Count;
-            //tb = GetFilteredTable(Grid1.FilteredData, tb);
-            Grid1.DataSource = tb;
-            Grid1.DataBind();
+            if (!string.IsNullOrEmpty(ContractId))
+            {
+                Model.PHTGL_ContractTrack table = new Model.PHTGL_ContractTrack();
+                table.ProjectId = this.CurrUser.LoginProjectId;
+                table.ContractId = this.ContractId;
+                var tb = BLL.PhtglContractTrackService.GetListData(table, Grid1);
+                Grid1.RecordCount = PhtglContractTrackService.Count;
+                //tb = GetFilteredTable(Grid1.FilteredData, tb);
+                Grid1.DataSource = tb;
+                Grid1.DataBind();
+            }
+            else
+            {
+                Grid1.DataSource = null;
+                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
+                };
+            ;
+            Grid2.RecordCount =q.Count();
+            Grid2.DataSource = q;
+            Grid2.DataBind();
+            string deleteScript = GetDeleteScript();
+
+            // 在第一行新增一条数据
+            btnMatchWBS_New.OnClientClick = Window1.GetShowReference(String.Format("ContractTrackMatchWBS.aspx?ContractTrackId={0}", Grid1.SelectedRowID, "增加 - "));
+            
+        }
+        private string GetDeleteScript()
+        {
+            return Confirm.GetShowReference("确定删除当前数据吗？", String.Empty, MessageBoxIcon.Question, Grid1.GetDeleteSelectedRowsReference(), String.Empty);
+        }
+        private void BindGrid3()
+        {
+            Model.PHTGL_ContractTrackProgress table = new Model.PHTGL_ContractTrackProgress();
+            table.ContractTrackId = Grid1.SelectedRowID;
+            var tb = BLL.PhtglContracttrackprogressService.GetPHTGL_ContractTrackProgressByModle(table);
+            Grid3.RecordCount = PhtglContracttrackprogressService.Count;
+            Grid3.DataSource = tb;
+            Grid3.DataBind();
         }
         #endregion
 
@@ -105,7 +156,15 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
         /// <param name="e"></param>
         protected void btnNew_Click(object sender, EventArgs e)
         {
-            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ContractTrackEdit.aspx?Id={0}", string.Empty, "增加 - ")));
+            if (!string.IsNullOrEmpty(ContractId))
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ContractTrackEdit.aspx?Id={0}", string.Empty, "增加 - ")));
+
+            }
+            else
+            {
+                ShowNotify("请选择施工分包合同！",MessageBoxIcon.Information);
+            }
         }
 
         /// <summary>
@@ -121,13 +180,24 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
                 return;
             }
             string ID = Grid1.SelectedRowID;
-            var model = BLL.PHTGL_ContractTrackService.GetPHTGL_ContractTrackById(ID);
+            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();
+           BindGrid3();
+        }
+
         /// <summary>
         /// Grid行双击事件
         /// </summary>
@@ -150,10 +220,10 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
                 foreach (int rowIndex in Grid1.SelectedRowIndexArray)
                 {
                     string rowID = Grid1.DataKeys[rowIndex][0].ToString();
-                    var model = BLL.PHTGL_ContractTrackService.GetPHTGL_ContractTrackById(rowID);
+                    var model = BLL.PhtglContractTrackService.GetPHTGL_ContractTrackById(rowID);
                     if (model != null)
                     {
-                        BLL.PHTGL_ContractTrackService.DeletePHTGL_ContractTrackById(rowID);
+                        BLL.PhtglContractTrackService.DeletePHTGL_ContractTrackById(rowID);
                     }
                 }
 
@@ -161,6 +231,146 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
                 ShowNotify("删除数据成功!", MessageBoxIcon.Success);
             }
         }
+
+        protected void btnMatchWBS_Save_OnClick(object sender, EventArgs e)
+        {
+            SaveGrid2();
+        }
+
+        protected void btnMatchWBS_Delete_OnClick(object sender, EventArgs e)
+        {
+            if (Grid2.SelectedRowIndexArray.Length > 0)
+            {
+
+                foreach (int rowIndex in Grid2.SelectedRowIndexArray)
+                {
+                    string rowID = Grid2.DataKeys[rowIndex][0].ToString();
+                    var p = BLL.PhtglContracttrackmatchwbsService.GetPHTGL_ContractTrackMatchWBSById(rowID);
+                    if (p != null)
+                    {
+                        PhtglContracttrackmatchwbsService.DeleteModelById(rowID);
+                    }
+                }
+                BindGrid2();
+                ShowNotify("删除数据成功!", MessageBoxIcon.Success);
+            }
+        }
+
+        protected void btnProgress_Save_OnClick(object sender, EventArgs e)
+        {
+            SaveGrid3();
+        }
+
+        private void SaveGrid2()
+        {
+            JArray EditorArr = Grid2.GetMergedData();
+            if (EditorArr.Count > 0)
+            {
+                for (int i = 0; i < EditorArr.Count; i++)
+                {
+                    JObject objects = (JObject)EditorArr[i];
+                    var Id = objects["id"].ToString();
+                    var WorkPackageEstimate = Funs.GetNewDecimal(objects["values"]["WorkPackageEstimate"].ToString());
+
+                    var model = PhtglContracttrackmatchwbsService.GetPHTGL_ContractTrackMatchWBSById(Id);
+                    model.WorkPackageEstimate = WorkPackageEstimate;
+                    PhtglContracttrackmatchwbsService.UpdatePHTGL_ContractTrackMatchWBS(model);
+                }
+            }
+            ShowNotify("保存成功", MessageBoxIcon.Success);
+        }
+
+        private void SaveGrid3()
+        {
+
+            PhtglContracttrackprogressService.DeleteModleByContractTrackId(Grid1.SelectedRowID);
+            JArray EditorArr = Grid3.GetMergedData();
+            if (EditorArr.Count > 0)
+            {
+                Model.PHTGL_ContractTrackProgress model = null;
+                for (int i = 0; i < EditorArr.Count; i++)
+                {
+                    JObject objects = (JObject)EditorArr[i];
+                    model = new Model.PHTGL_ContractTrackProgress();
+                    model.ContractTrackProgressId = SQLHelper.GetNewID(typeof(Model.PHTGL_ContractTrackProgress));
+                    model.ContractTrackId = Grid1.SelectedRowID;
+                    model.BCWS_Quantity = objects["values"]["BCWS_Quantity"].ToString();
+                    model.BCWS_OutputValue = objects["values"]["BCWS_OutputValue"].ToString();
+                    model.BCWS_Percentage = objects["values"]["BCWS_Percentage"].ToString();
+                    model.ACWP_Quantity = objects["values"]["ACWP_Quantity"].ToString();
+                    model.ACWP_OutputValue = objects["values"]["ACWP_OutputValue"].ToString();
+                    model.ACWP_Percentage = objects["values"]["ACWP_Percentage"].ToString();
+                    model.Date = objects["values"]["Date"].ToString();
+                    BLL.PhtglContracttrackprogressService.AddPHTGL_ContractTrackProgress(model);
+                }
+            }
+            ShowNotify("保存成功", MessageBoxIcon.Success);
+
+        }
+
+        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();
+        }
         #endregion
 
         #region 关闭弹出窗
@@ -280,7 +490,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
 
         protected void btnImport_Click(object sender, EventArgs e)
         {
-            if (!string.IsNullOrEmpty(DropContractCode.SelectedValue))
+            if (!string.IsNullOrEmpty(ContractId))
             {
                 var model = ContractService.GetContractByContractNum(DropContractCode.SelectedValue);
                 if (model != null)
@@ -293,7 +503,12 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
             {
                 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/ContractTrackList.aspx.designer.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.designer.cs
index b2b523c5..d2a20143 100644
--- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.designer.cs
@@ -33,13 +33,22 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
         protected global::FineUIPro.PageManager PageManager1;
 
         /// <summary>
-        /// Panel1 控件。
+        /// Panel3 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Panel Panel1;
+        protected global::FineUIPro.Panel Panel3;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
 
         /// <summary>
         /// Grid1 控件。
@@ -104,6 +113,15 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
 
+        /// <summary>
+        /// btnSave 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+
         /// <summary>
         /// lblNumber 控件。
         /// </summary>
@@ -113,6 +131,213 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
         /// </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>
@@ -140,6 +365,213 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
 
+        /// <summary>
+        /// panelBottomRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelBottomRegion;
+
+        /// <summary>
+        /// Panel7 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel7;
+
+        /// <summary>
+        /// Grid2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid2;
+
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// ToolbarFill2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill2;
+
+        /// <summary>
+        /// btnMatchWBS_New 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnMatchWBS_New;
+
+        /// <summary>
+        /// btnMatchWBS_Delete 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnMatchWBS_Delete;
+
+        /// <summary>
+        /// btnMatchWBS_Save 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnMatchWBS_Save;
+
+        /// <summary>
+        /// NumberBox1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox NumberBox1;
+
+        /// <summary>
+        /// Panel8 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel8;
+
+        /// <summary>
+        /// Grid3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid3;
+
+        /// <summary>
+        /// Toolbar3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar3;
+
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+        /// <summary>
+        /// btnProgress_New 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnProgress_New;
+
+        /// <summary>
+        /// btnProgress_Delete 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnProgress_Delete;
+
+        /// <summary>
+        /// btnProgress_Save 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnProgress_Save;
+
+        /// <summary>
+        /// TextBox1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox1;
+
+        /// <summary>
+        /// txtBCWS_Quantity 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtBCWS_Quantity;
+
+        /// <summary>
+        /// txtBCWS_OutputValue 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtBCWS_OutputValue;
+
+        /// <summary>
+        /// txtBCWS_Percentage 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtBCWS_Percentage;
+
+        /// <summary>
+        /// txtACWP_Quantity 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtACWP_Quantity;
+
+        /// <summary>
+        /// txtACWP_OutputValue 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtACWP_OutputValue;
+
+        /// <summary>
+        /// txtACWP_Percentage 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtACWP_Percentage;
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -158,6 +590,15 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
         /// </remarks>
         protected global::FineUIPro.Window Window2;
 
+        /// <summary>
+        /// Window3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window3;
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackMatchWBS.aspx b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackMatchWBS.aspx
new file mode 100644
index 00000000..579c0fc2
--- /dev/null
+++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackMatchWBS.aspx
@@ -0,0 +1,166 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ContractTrackMatchWBS.aspx.cs" Inherits="FineUIPro.Web.PHTGL.ContractCompile.ContractTrackMatchWBS" %>
+
+<!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>项目施工WBS展示</title>
+    <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
+    <style>
+        .f-grid-row .f-grid-cell-inner {
+            white-space: normal;
+            word-break: break-all;
+        }
+
+        .f-grid-colheader-text {
+            white-space: normal;
+            word-break: break-all;
+        }
+
+        .f-grid-row.color3,
+        .f-grid-row.color3 .f-icon,
+        .f-grid-row.color3 a {
+            background-color: green;
+            color: #fff;
+        }
+    </style>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" CssClass="blockpanel" Margin="5px" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
+            <Items>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true" EnableCollapse="true" Layout="Fit"
+                    RegionPercent="20%" Title="项目WBS基础数据库" TitleToolTip="项目WBS基础数据库" ShowBorder="true" ShowHeader="true"
+                    BodyPadding="10px">
+                    <Items>
+                        <f:Tree ID="trWBS" EnableCollapse="true" ShowHeader="true"
+                            OnNodeCommand="trWBS_NodeCommand" OnNodeExpand="trWBS_NodeExpand" AutoLeafIdentification="true"
+                            runat="server">
+                            <Listeners>
+                                <f:Listener Event="beforenodecontextmenu" Handler="onTreeNodeContextMenu" />
+                            </Listeners>
+                        </f:Tree>
+                        <f:HiddenField runat="server" ID="hdSelectId">
+                        </f:HiddenField>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" Layout="Fit"
+                    Title="中间面板" ShowBorder="true" ShowHeader="false" BodyPadding="10px">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
+                            <Items>
+                                <f:ToolbarFill runat="server" />
+                                <f:Button ID="btnAccept" ToolTip="确认" Text="确认" Icon="Accept" runat="server"
+                                    OnClick="btnAccept_Click">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Items>
+                        <f:Grid ID="Grid1" Width="870px" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
+                            runat="server" BoxFlex="1" DataKeyNames="ControlItemAndCycleId,InitControlItemCode" AllowSorting="true" EnableColumnLines="true"
+                            SortField="ControlItemAndCycleCode" SortDirection="ASC" AllowCellEditing="False" ClicksToEdit="1" ForceFit="true"
+                            ShowSelectedCell="true" DataIDField="ControlItemAndCycleId" AllowPaging="true" IsDatabasePaging="true" EnableCheckBoxSelect="True"
+                            PageSize="100" OnPageIndexChange="Grid1_PageIndexChange" AllowFilters="true" OnFilterChange="Grid1_FilterChange" OnRowDataBound="Grid1_OnRowDataBound">
+                            <Columns>
+                                <f:RenderField Width="70px" ColumnID="ControlItemContent" DataField="ControlItemContent" FieldType="String"
+                                    HeaderText="工作包" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="70px" ColumnID="ControlPoint" DataField="ControlPoint" FieldType="String"
+                                    HeaderText="控制点等级" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="控制点内容描述" ColumnID="ControlItemDef" DataField="ControlItemDef" SortField="ControlItemDef"
+                                    HeaderTextAlign="Center" TextAlign="Center" Width="300px" FieldType="String">
+                                </f:RenderField>
+                                <f:TemplateField ColumnID="HGForms" Width="170px" HeaderText="对应的化工资料表格" HeaderTextAlign="Center" TextAlign="Left">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label3" runat="server" Text='<%# ConvertText(Eval("HGForms")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:TemplateField ColumnID="SHForms" Width="170px" HeaderText="对应的石化资料表格" HeaderTextAlign="Center" TextAlign="Left">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label2" runat="server" Text='<%# ConvertText(Eval("SHForms")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:TemplateField ColumnID="Standard" Width="150px" HeaderText="质量验收规范" HeaderTextAlign="Center" TextAlign="Center">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label1" runat="server" Text='<%# ConvertText(Eval("Standard")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField HeaderText="条款号" ColumnID="ClauseNo" DataField="ClauseNo" SortField="ClauseNo" Hidden="true"
+                                    HeaderTextAlign="Center" TextAlign="Center" Width="60px" FieldType="String">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="检查次数" ColumnID="CheckNum" DataField="CheckNum"
+                                    SortField="CheckNum" HeaderTextAlign="Center" TextAlign="Center" Width="50px"
+                                    FieldType="String">
+                                </f:RenderField>
+                                <f:RenderField Width="20px" ColumnID="ControlItemAndCycleId" DataField="ControlItemAndCycleId" FieldType="String"
+                                    HeaderText="工作包Id" HeaderTextAlign="Center" TextAlign="Center" Hidden="true">
+                                </f:RenderField>
+                            </Columns>
+                            <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="100" Value="100" />
+                                    <f:ListItem Text="500" Value="500" />
+                                </f:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
+            </Items>
+        </f:Panel>
+        <f:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnMenuMore" OnClick="btnMenuMore_Click" EnablePostBack="true" runat="server" Icon="ZoomIn"
+                Text="展开全部">
+            </f:MenuButton>
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var treeID = '<%= trWBS.ClientID %>';
+        var menuID = '<%= Menu1.ClientID %>';
+        // 保存当前菜单对应的树节点ID
+        var currentNodeId;
+
+        // 返回false，来阻止浏览器右键菜单
+        function onTreeNodeContextMenu(event, nodeId) {
+            currentNodeId = nodeId;
+            F(menuID).show();
+            return false;
+        }
+
+        // 设置所有菜单项的禁用状态
+        function setMenuItemsDisabled(disabled) {
+            var menu = F(menuID);
+            $.each(menu.items, function (index, item) {
+                item.setDisabled(disabled);
+            });
+        }
+
+        // 显示菜单后，检查是否禁用菜单项
+        function onMenuShow() {
+            if (currentNodeId) {
+                var tree = F(treeID);
+                var nodeData = tree.getNodeData(currentNodeId);
+                if (nodeData.leaf) {
+                    setMenuItemsDisabled(true);
+                } else {
+                    setMenuItemsDisabled(false);
+                }
+            }
+        }
+
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID2).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackMatchWBS.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackMatchWBS.aspx.cs
new file mode 100644
index 00000000..916b6ef4
--- /dev/null
+++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackMatchWBS.aspx.cs
@@ -0,0 +1,514 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.PHTGL.ContractCompile
+{
+    public partial class ContractTrackMatchWBS : PageBase
+    {
+        public string ContractTrackId
+        {
+            get { return (string)ViewState["ContractTrackId"]; }
+            set { ViewState["ContractTrackId"] = value; }
+        }
+
+        #region  页面加载
+        /// <summary>
+        /// 页面加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                ContractTrackId = Request.Params["ContractTrackId"];
+
+                InitTreeMenu();
+            }
+        }
+        #endregion
+
+        #region  加载树
+        /// <summary>
+        /// 加载树
+        /// </summary>
+        private void InitTreeMenu()
+        {
+            this.trWBS.Nodes.Clear();
+            this.trWBS.ShowBorder = false;
+            this.trWBS.ShowHeader = false;
+            this.trWBS.EnableIcons = true;
+            this.trWBS.AutoScroll = true;
+            this.trWBS.EnableSingleClickExpand = true;
+
+            TreeNode rootNode1 = new TreeNode();
+            rootNode1.Text = "建筑工程";
+            rootNode1.NodeID = "1";
+            rootNode1.CommandName = "ProjectType";
+            rootNode1.EnableExpandEvent = true;
+            rootNode1.EnableClickEvent = true;
+            this.trWBS.Nodes.Add(rootNode1);
+            TreeNode emptyNode = new TreeNode();
+            emptyNode.Text = "";
+            emptyNode.NodeID = "";
+            rootNode1.Nodes.Add(emptyNode);
+            //this.GetNodes(rootNode1.Nodes, rootNode1.NodeID);
+
+            TreeNode rootNode2 = new TreeNode();
+            rootNode2.Text = "安装工程";
+            rootNode2.NodeID = "2";
+            rootNode2.CommandName = "ProjectType";
+            rootNode2.EnableExpandEvent = true;
+            rootNode2.EnableClickEvent = true;
+            this.trWBS.Nodes.Add(rootNode2);
+            rootNode2.Nodes.Add(emptyNode);
+            //this.GetNodes(rootNode2.Nodes, rootNode2.NodeID);
+        }
+
+        #region  遍历节点方法
+        /// <summary>
+        /// 遍历节点方法
+        /// </summary>
+        /// <param name="nodes">节点集合</param>
+        /// <param name="parentId">父节点</param>
+        private void GetNodes(TreeNodeCollection nodes, string parentId)
+        {
+            List<Model.WBS_WorkPackageProject> workPackages = new List<Model.WBS_WorkPackageProject>();
+            if (parentId.Length == 1) //工程类型节点
+            {
+                workPackages = (from x in Funs.DB.WBS_WorkPackageProject
+                                where x.SuperWorkPack == null && x.ProjectId == this.CurrUser.LoginProjectId && x.ProjectType == parentId
+                                orderby x.PackageCode ascending
+                                select x).ToList();
+            }
+            else
+            {
+                workPackages = (from x in Funs.DB.WBS_WorkPackageProject
+                                where x.SuperWorkPack == parentId && x.ProjectId == this.CurrUser.LoginProjectId
+                                orderby x.PackageCode ascending
+                                select x).ToList();
+            }
+            foreach (var q in workPackages)
+            {
+                TreeNode newNode = new TreeNode();
+                newNode.Text = q.PackageContent;
+                newNode.NodeID = q.WorkPackageCode;
+                newNode.CommandName = "WorkPackage";
+                newNode.EnableClickEvent = true;
+                nodes.Add(newNode);
+            }
+
+            for (int i = 0; i < nodes.Count; i++)
+            {
+                GetNodes(nodes[i].Nodes, nodes[i].NodeID);
+            }
+        }
+        #endregion
+        #endregion
+
+        #region  展开树
+        /// <summary>
+        /// 展开树
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void trWBS_NodeExpand(object sender, TreeNodeEventArgs e)
+        {
+            e.Node.Nodes.Clear();
+            if (e.Node.CommandName == "ProjectType")   //展开工程类型
+            {
+                var trUnitWork = from x in Funs.DB.WBS_UnitWork
+                                 where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperUnitWork == null && x.ProjectType == e.Node.NodeID
+                                 select x;
+                trUnitWork = trUnitWork.OrderBy(x => x.UnitWorkCode);
+                if (trUnitWork.Count() > 0)
+                {
+                    foreach (var trUnitWorkItem in trUnitWork)
+                    {
+                        TreeNode newNode = new TreeNode();
+                        newNode.Text = trUnitWorkItem.UnitWorkCode + "-" + trUnitWorkItem.UnitWorkName;
+                        newNode.NodeID = trUnitWorkItem.UnitWorkId;
+                        newNode.CommandName = "UnitWork";
+                        newNode.EnableExpandEvent = true;
+                        newNode.EnableClickEvent = true;
+                        e.Node.Nodes.Add(newNode);
+                        if (BLL.WorkPackageService.GetWorkPackages1ByUnitWorkId(trUnitWorkItem.UnitWorkId.ToString()) != null)
+                        {
+                            TreeNode temp = new TreeNode();
+                            temp.Text = "temp";
+                            temp.NodeID = "temp";
+                            newNode.Nodes.Add(temp);
+                        }
+                    }
+                }
+            }
+            else if (e.Node.CommandName == "UnitWork")   //展开单位工程节点
+            {
+                var workPackages = from x in Funs.DB.WBS_WorkPackage where x.UnitWorkId == e.NodeID && x.SuperWorkPack == null && x.IsApprove == true orderby x.WorkPackageCode select x;
+                foreach (var workPackage in workPackages)
+                {
+                    TreeNode newNode = new TreeNode();
+                    newNode.Text = workPackage.PackageContent;
+                    newNode.NodeID = workPackage.WorkPackageId;
+                    newNode.CommandName = "WorkPackage";
+                    newNode.EnableExpandEvent = true;
+                    newNode.EnableClickEvent = true;
+                    e.Node.Nodes.Add(newNode);
+                    var childWorkPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == workPackage.WorkPackageId && x.IsApprove == true select x;
+                    if (childWorkPackages.Count() > 0)
+                    {
+                        TreeNode emptyNode = new TreeNode();
+                        emptyNode.Text = "";
+                        emptyNode.NodeID = "";
+                        newNode.Nodes.Add(emptyNode);
+                    }
+                }
+            }
+            else if (e.Node.CommandName == "WorkPackage")   //展开工作包节点
+            {
+                var workPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == e.Node.NodeID && x.IsApprove == true orderby x.WorkPackageCode select x;
+                if (workPackages.Count() > 0)   //存在子单位工程
+                {
+                    foreach (var workPackage in workPackages)
+                    {
+                        TreeNode newNode = new TreeNode();
+                        newNode.Text = workPackage.PackageContent;
+                        newNode.NodeID = workPackage.WorkPackageId;
+                        newNode.CommandName = "WorkPackage";
+                        newNode.EnableExpandEvent = true;
+                        newNode.EnableClickEvent = true;
+                        e.Node.Nodes.Add(newNode);
+                        var childWorkPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == workPackage.WorkPackageId && x.IsApprove == true select x;
+                        if (childWorkPackages.Count() > 0)
+                        {
+                            TreeNode emptyNode = new TreeNode();
+                            emptyNode.Text = "";
+                            emptyNode.NodeID = "";
+                            newNode.Nodes.Add(emptyNode);
+                        }
+                    }
+                }
+            }
+        }
+        #endregion
+
+        /// <summary>
+        /// 发起设计交底(树节点)
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuAddTechnicalDisclose_Click(object sender, EventArgs e)
+        {
+            if (this.trWBS.SelectedNode != null)
+            {
+                if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.CQMSTechnicalDiscloseMenuId, BLL.Const.BtnAdd))
+                {
+                    if (this.trWBS.SelectedNode.CommandName == "WorkPackage")
+                    {
+                        var childWorkPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == this.trWBS.SelectedNodeID && x.IsApprove == true select x;
+                        if (childWorkPackages.Count() == 0)  //末级节点
+                        {
+                            var oldTechnicalDisclose = BLL.CQMS_TechnicalDiscloseService.GetTechnicalDiscloseByDataId(this.trWBS.SelectedNodeID);
+                            if (oldTechnicalDisclose == null)
+                            {
+                                var unitWork = (from x in Funs.DB.WBS_UnitWork
+                                                join y in Funs.DB.WBS_WorkPackage on x.UnitWorkId equals y.UnitWorkId
+                                                where y.WorkPackageId == this.trWBS.SelectedNodeID
+                                                select x).FirstOrDefault();
+                                Model.Technical_TechnicalDisclose technicalDisclose = new Model.Technical_TechnicalDisclose();
+                                technicalDisclose.TechnicalDiscloseId = SQLHelper.GetNewID();
+                                technicalDisclose.ProjectId = this.CurrUser.LoginProjectId;
+                                if (unitWork != null)
+                                {
+                                    technicalDisclose.UnitId = unitWork.UnitId;
+                                    technicalDisclose.UnitWorkId = unitWork.UnitWorkId;
+                                }
+                                technicalDisclose.DataId = this.trWBS.SelectedNodeID;
+                                technicalDisclose.DiscloseName = this.trWBS.SelectedNode.Text;
+                                technicalDisclose.State = "0";  //未交底
+                                technicalDisclose.CompileMan = this.CurrUser.PersonId;
+                                technicalDisclose.CompileDate = DateTime.Now;
+                                BLL.CQMS_TechnicalDiscloseService.AddTechnicalDisclose(technicalDisclose);
+                                ShowNotify("发起成功！", MessageBoxIcon.Success);
+                            }
+                            else
+                            {
+                                ShowNotify("该节点已发起设计交底！", MessageBoxIcon.Warning);
+                            }
+                        }
+                        else
+                        {
+                            ShowNotify("请选择末级节点发起设计交底！", MessageBoxIcon.Warning);
+                        }
+                    }
+                    else
+                    {
+                        ShowNotify("请选择末级节点发起设计交底！", MessageBoxIcon.Warning);
+                    }
+                }
+                else
+                {
+                    ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
+                }
+            }
+            else
+            {
+                ShowNotify("请选择树节点！", MessageBoxIcon.Warning);
+            }
+        }
+
+        /// <summary>
+        /// 展开全部
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuMore_Click(object sender, EventArgs e)
+        {
+            if (this.trWBS.SelectedNode != null)
+            {
+                if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.ControlItemAndCycleMenuId, BLL.Const.BtnAdd))
+                {
+                    if (this.trWBS.SelectedNode.CommandName != "ProjectType")   //非工程类型节点可以增加
+                    {
+                        Model.WBS_UnitWork unitWork = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(this.trWBS.SelectedNodeID);
+                        if (unitWork != null)   //单位工程节点
+                        {
+                            this.trWBS.SelectedNode.Expanded = true;
+                            this.trWBS.SelectedNode.Nodes.Clear();
+                            var workPackages = from x in Funs.DB.WBS_WorkPackage where x.UnitWorkId == this.trWBS.SelectedNodeID && x.SuperWorkPack == null && x.IsApprove == true orderby x.WorkPackageCode select x;
+                            foreach (var workPackage in workPackages)
+                            {
+                                TreeNode newNode = new TreeNode();
+                                newNode.Text = workPackage.PackageContent;
+                                newNode.NodeID = workPackage.WorkPackageId;
+                                newNode.CommandName = "WorkPackage";
+                                newNode.EnableExpandEvent = true;
+                                newNode.EnableClickEvent = true;
+                                this.trWBS.SelectedNode.Nodes.Add(newNode);
+                                var childWorkPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == workPackage.WorkPackageId && x.IsApprove == true select x;
+                                if (childWorkPackages.Count() > 0)
+                                {
+                                    newNode.Expanded = true;
+                                    ExpandWorkPackage(newNode.Nodes, newNode.NodeID);
+                                }
+                            }
+                        }
+                        else
+                        {
+                            this.trWBS.SelectedNode.Expanded = true;
+                            this.trWBS.SelectedNode.Nodes.Clear();
+                            ExpandWorkPackage(this.trWBS.SelectedNode.Nodes, this.trWBS.SelectedNodeID);
+                        }
+                    }
+                    else
+                    {
+                        ShowNotify("请选择单位工程节点展开！", MessageBoxIcon.Warning);
+                    }
+                }
+                else
+                {
+                    ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
+                }
+            }
+            else
+            {
+                ShowNotify("请选择树节点！", MessageBoxIcon.Warning);
+            }
+        }
+
+        /// <summary>
+        /// 展开子级分部分项节点
+        /// </summary>
+        /// <param name="nodes"></param>
+        /// <param name="parentId"></param>
+        private void ExpandWorkPackage(TreeNodeCollection nodes, string parentId)
+        {
+            var workPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == parentId && x.IsApprove == true orderby x.WorkPackageCode select x;
+            if (workPackages.Count() > 0)   //存在子单位工程
+            {
+                foreach (var workPackage in workPackages)
+                {
+                    TreeNode newNode = new TreeNode();
+                    newNode.Text = workPackage.PackageContent;
+                    newNode.NodeID = workPackage.WorkPackageId;
+                    newNode.CommandName = "WorkPackage";
+                    newNode.EnableExpandEvent = true;
+                    newNode.EnableClickEvent = true;
+                    nodes.Add(newNode);
+                    var childWorkPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == workPackage.WorkPackageId && x.IsApprove == true select x;
+                    if (childWorkPackages.Count() > 0)
+                    {
+                        newNode.Expanded = true;
+                        ExpandWorkPackage(newNode.Nodes, newNode.NodeID);
+                    }
+                }
+            }
+        }
+
+        #region  Tree点击事件
+        /// <summary>
+        /// Tree点击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void trWBS_NodeCommand(object sender, TreeCommandEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region  绑定数据
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_FilterChange(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            Grid1.PageIndex = e.NewPageIndex;
+            BindGrid();
+        }
+
+        /// <summary>
+        /// Grid1排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            Grid1.SortDirection = e.SortDirection;
+            Grid1.SortField = e.SortField;
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页下拉选择事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 加载Grid
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"SELECT ControlItemAndCycleId,ControlItemAndCycleCode,InitControlItemCode,ControlItemContent,ControlPoint,ControlItemDef,HGForms,SHForms,Standard,ClauseNo,CheckNum"
+                     + @" FROM WBS_ControlItemAndCycle ";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            strSql += " where WorkPackageId = @WorkPackageId and IsApprove=1 ";
+            listStr.Add(new SqlParameter("@WorkPackageId", this.trWBS.SelectedNodeID));
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+            Grid1.RecordCount = tb.Rows.Count;
+            tb = GetFilteredTable(Grid1.FilteredData, tb);
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+
+            Model.WBS_WorkPackage workPackage = BLL.WorkPackageService.GetWorkPackageByWorkPackageId(this.trWBS.SelectedNodeID);
+            if (workPackage != null)
+            {
+                if (workPackage.ProjectType == "1")  //建筑工程
+                {
+                    this.Grid1.Columns[4].HeaderText = "对应的建筑资料表格";
+                    this.Grid1.Columns[5].Hidden = true;
+                }
+                else    //安装工程
+                {
+                    this.Grid1.Columns[4].HeaderText = "对应的化工资料表格";
+                    this.Grid1.Columns[5].Hidden = false;
+                }
+            }
+        }
+        #endregion
+
+        //<summary>
+        //获取文本
+        //</summary>
+        //<param name="state"></param>
+        //<returns></returns>
+        public static string ConvertText(object Str)
+        {
+            string s = string.Empty;
+            if (Str != null)
+            {
+                string[] strs = Str.ToString().Split(',');
+                foreach (var item in strs)
+                {
+                    s += item + "<br/>";
+                }
+                if (!string.IsNullOrEmpty(s))
+                {
+                    s = s.Substring(0, s.Length - 5);
+                }
+            }
+            return s;
+        }
+
+        protected void btnAccept_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIDArray.Length>0)
+            {
+                var Ids=Grid1.SelectedRowIDArray;
+                foreach (var item in Ids)
+                {
+                    var querymodel = new Model.PHTGL_ContractTrackMatchWBS
+                    {
+                        ContractTrackId = ContractTrackId,
+                        ControlItemAndCycleId = item,
+                    };
+                    var queryResult =
+                        PhtglContracttrackmatchwbsService.GetPHTGL_ContractTrackMatchWBSByModle(querymodel);
+                    if (!queryResult.Any())
+                    {
+                        var newtable = new Model.PHTGL_ContractTrackMatchWBS
+                        {
+                            Id = SQLHelper.GetNewID(typeof(Model.PHTGL_ContractTrackMatchWBS)),
+                            ContractTrackId = ContractTrackId,
+                            ControlItemAndCycleId = item,
+
+                        };
+                        BLL.PhtglContracttrackmatchwbsService.AddPHTGL_ContractTrackMatchWBS(newtable);
+                    }
+                }
+                ShowNotify("添加成功", MessageBoxIcon.Success);
+                BindGrid();
+            }
+            else
+            {
+                ShowNotify("请选择需要添加的数据",MessageBoxIcon.Information);
+            }
+        }
+
+        protected void Grid1_OnRowDataBound(object sender, GridRowEventArgs e)
+        {
+            var querymodel = new Model.PHTGL_ContractTrackMatchWBS
+            {
+                ContractTrackId = ContractTrackId,
+                ControlItemAndCycleId = e.RowID,
+            };
+            var queryResult =
+                PhtglContracttrackmatchwbsService.GetPHTGL_ContractTrackMatchWBSByModle(querymodel);
+            if (queryResult.Any())
+            {
+                e.RowCssClass = "color3";
+            } 
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackMatchWBS.aspx.designer.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackMatchWBS.aspx.designer.cs
new file mode 100644
index 00000000..592e15f3
--- /dev/null
+++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackMatchWBS.aspx.designer.cs
@@ -0,0 +1,179 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.PHTGL.ContractCompile
+{
+
+
+    public partial class ContractTrackMatchWBS
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// trWBS 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tree trWBS;
+
+        /// <summary>
+        /// hdSelectId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdSelectId;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// btnAccept 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnAccept;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label3;
+
+        /// <summary>
+        /// Label2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label2;
+
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label1;
+
+        /// <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>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnMenuMore 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuMore;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/common/Menu_DigData.xml b/SGGL/FineUIPro.Web/common/Menu_DigData.xml
index f0ecac2c..025b6757 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="04B182E4-D31E-449F-9803-322F3F380D89" Text="HSE日常检查问题分析" NavigateUrl="DigData/DailyProblemAnalysis.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="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>
 </TreeNode>
@@ -12,9 +54,13 @@
 <TreeNode id="381A4608-2CDE-42AF-BC4D-FF554785B9F8" Text="合同数据库" NavigateUrl=""></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=""></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>
+<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_JDGL.xml b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml
index b241c0a1..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 c8a6ab93..997760f7 100644
--- a/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml
@@ -35,4 +35,5 @@
 <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>
 </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 03eb9188..9bc36592 100644
--- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
@@ -48,43 +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>
-<TreeNode id="DC3C36E0-4CD4-43E1-9CF8-D98D053E31FB" Text="法律法规" NavigateUrl=""></TreeNode>
-<TreeNode id="97D20BA1-9378-4268-901B-3747EDFB15F4" Text="赛鼎体系" NavigateUrl=""></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>
-<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 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>
 <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>
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index a9f002d3..6783a46b 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -11539,7 +11539,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(2000)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(200)")]
 		public string ApproveIdea
 		{
 			get
@@ -149756,7 +149756,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(3000)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(500)")]
 		public string AttentPerson
 		{
 			get
@@ -181094,7 +181094,7 @@ namespace Model
 		
 		private string _Id;
 		
-		private System.Nullable<int> _ContractTrackId;
+		private string _ContractTrackId;
 		
 		private string _ControlItemAndCycleId;
 		
@@ -181106,7 +181106,7 @@ namespace Model
     partial void OnCreated();
     partial void OnIdChanging(string value);
     partial void OnIdChanged();
-    partial void OnContractTrackIdChanging(System.Nullable<int> value);
+    partial void OnContractTrackIdChanging(string value);
     partial void OnContractTrackIdChanged();
     partial void OnControlItemAndCycleIdChanging(string value);
     partial void OnControlItemAndCycleIdChanged();
@@ -181139,8 +181139,8 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractTrackId", DbType="Int")]
-		public System.Nullable<int> ContractTrackId
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractTrackId", DbType="VarChar(50)")]
+		public string ContractTrackId
 		{
 			get
 			{
@@ -181179,7 +181179,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,0)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,2)")]
 		public System.Nullable<decimal> WorkPackageEstimate
 		{
 			get
@@ -181242,6 +181242,8 @@ namespace Model
 		
 		private string _ACWP_Percentage;
 		
+		private string _Date;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -181262,6 +181264,8 @@ namespace Model
     partial void OnACWP_OutputValueChanged();
     partial void OnACWP_PercentageChanging(string value);
     partial void OnACWP_PercentageChanged();
+    partial void OnDateChanging(string value);
+    partial void OnDateChanged();
     #endregion
 		
 		public PHTGL_ContractTrackProgress()
@@ -181429,6 +181433,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Date", DbType="NVarChar(50)")]
+		public string Date
+		{
+			get
+			{
+				return this._Date;
+			}
+			set
+			{
+				if ((this._Date != value))
+				{
+					this.OnDateChanging(value);
+					this.SendPropertyChanging();
+					this._Date = value;
+					this.SendPropertyChanged("Date");
+					this.OnDateChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
diff --git a/SGGL/SGGL.sln b/SGGL/SGGL.sln
index c04800eb..2dcebcae 100644
--- a/SGGL/SGGL.sln
+++ b/SGGL/SGGL.sln
@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebAPI", "WebAPI\WebAPI.csp
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FineUIPro.Mobile", "FineUIPro.Mobile\FineUIPro.Mobile.csproj", "{6FD4603B-1B6D-48AE-A1BD-7385495F81FD}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BLLTests", "BLLTests\BLLTests.csproj", "{18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -77,6 +79,18 @@ Global
 		{6FD4603B-1B6D-48AE-A1BD-7385495F81FD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6FD4603B-1B6D-48AE-A1BD-7385495F81FD}.Release|x86.ActiveCfg = Release|Any CPU
 		{6FD4603B-1B6D-48AE-A1BD-7385495F81FD}.Release|x86.Build.0 = Release|Any CPU
+		{18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}.Debug|x86.Build.0 = Debug|Any CPU
+		{18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}.Release|x86.ActiveCfg = Release|Any CPU
+		{18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE