diff --git a/EProject/BLL/BaseInfo/QuantityDesctiptionService.cs b/EProject/BLL/BaseInfo/QuantityDesctiptionService.cs
index ed9967b..8bc48ec 100644
--- a/EProject/BLL/BaseInfo/QuantityDesctiptionService.cs
+++ b/EProject/BLL/BaseInfo/QuantityDesctiptionService.cs
@@ -83,11 +83,11 @@ namespace BLL
         }
 
         #region Identifier下拉值加载
-        public static void InitIdentifierDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease)
+        public static void InitIdentifierDropDownList(FineUIPro.DropDownList dropName,string type, bool isShowPlease)
         {
             dropName.DataValueField = "DisciplinesWBSCode";
             dropName.DataTextField = "DisciplinesWBSCode";
-            dropName.DataSource = GetDisciplinesWBSCodeList();
+            dropName.DataSource = GetDisciplinesWBSCodeList(type);
             dropName.DataBind();
             if (isShowPlease)
             {
@@ -95,21 +95,22 @@ namespace BLL
             }
         }
 
-        public static List<string> GetDisciplinesWBSCodeList()
+        public static List<string> GetDisciplinesWBSCodeList(string type)
         {
             return (from x in Funs.DB.Base_QuantityDesctiption
                     join y in Funs.DB.Base_DisciplinesWBS on x.DisciplinesWBSId equals y.DisciplinesWBSId
+                    where x.DepartId == type
                     orderby y.DisciplinesWBSCode
                     select y.DisciplinesWBSCode).Distinct().ToList();
         }
         #endregion
 
         #region Descipline下拉值加载
-        public static void InitDesciplineDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease, string disciplinesWBSCode)
+        public static void InitDesciplineDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease,string type, string disciplinesWBSCode)
         {
             dropName.DataValueField = "DisciplinesWBSName";
             dropName.DataTextField = "DisciplinesWBSName";
-            dropName.DataSource = GetDesciplineList(disciplinesWBSCode);
+            dropName.DataSource = GetDesciplineList(type,disciplinesWBSCode);
             dropName.DataBind();
             if (isShowPlease)
             {
@@ -117,22 +118,22 @@ namespace BLL
             }
         }
 
-        public static List<string> GetDesciplineList(string disciplinesWBSCode)
+        public static List<string> GetDesciplineList(string type,string disciplinesWBSCode)
         {
             return (from x in Funs.DB.Base_QuantityDesctiption
                     join y in Funs.DB.Base_DisciplinesWBS on x.DisciplinesWBSId equals y.DisciplinesWBSId
-                    where y.DisciplinesWBSCode == disciplinesWBSCode
+                    where y.DisciplinesWBSCode == disciplinesWBSCode && x.DepartId == type
                     orderby y.DisciplinesWBSName
                     select y.DisciplinesWBSName).Distinct().ToList();
         }
         #endregion
 
         #region Quantity Desctiption 下拉值加载
-        public static void InitQuantityDesctiptionDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease, string disciplinesWBSCode, string disciplinesWBSName)
+        public static void InitQuantityDesctiptionDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease,string type, string disciplinesWBSCode, string disciplinesWBSName)
         {
             dropName.DataValueField = "QuantityDesctiption";
             dropName.DataTextField = "QuantityDesctiption";
-            dropName.DataSource = GetQuantityDesctiptionList(disciplinesWBSCode, disciplinesWBSName);
+            dropName.DataSource = GetQuantityDesctiptionList(type,disciplinesWBSCode, disciplinesWBSName);
             dropName.DataBind();
             if (isShowPlease)
             {
@@ -140,22 +141,22 @@ namespace BLL
             }
         }
 
-        public static List<string> GetQuantityDesctiptionList(string disciplinesWBSCode, string disciplinesWBSName)
+        public static List<string> GetQuantityDesctiptionList(string type, string disciplinesWBSCode, string disciplinesWBSName)
         {
             return (from x in Funs.DB.Base_QuantityDesctiption
                     join y in Funs.DB.Base_DisciplinesWBS on x.DisciplinesWBSId equals y.DisciplinesWBSId
-                    where y.DisciplinesWBSCode == disciplinesWBSCode && y.DisciplinesWBSName == disciplinesWBSName
+                    where x.DepartId == type && y.DisciplinesWBSCode == disciplinesWBSCode && y.DisciplinesWBSName == disciplinesWBSName
                     orderby x.QuantityDesctiption
                     select x.QuantityDesctiption).Distinct().ToList();
         }
         #endregion
 
         #region PlanMHRsUnit 下拉值加载
-        public static void InitPlanMHRsUnitDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease, string disciplinesWBSCode, string disciplinesWBSName, string quantityDesctiption)
+        public static void InitPlanMHRsUnitDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease,string type, string disciplinesWBSCode, string disciplinesWBSName, string quantityDesctiption)
         {
             dropName.DataValueField = "PlanMHRsUnit";
             dropName.DataTextField = "PlanMHRsUnit";
-            dropName.DataSource = GetPlanMHRsUnitList(disciplinesWBSCode, disciplinesWBSName, quantityDesctiption);
+            dropName.DataSource = GetPlanMHRsUnitList(type,disciplinesWBSCode, disciplinesWBSName, quantityDesctiption);
             dropName.DataBind();
             if (isShowPlease)
             {
@@ -163,11 +164,11 @@ namespace BLL
             }
         }
 
-        public static List<string> GetPlanMHRsUnitList(string disciplinesWBSCode, string disciplinesWBSName, string quantityDesctiption)
+        public static List<string> GetPlanMHRsUnitList(string type, string disciplinesWBSCode, string disciplinesWBSName, string quantityDesctiption)
         {
             return (from x in Funs.DB.Base_QuantityDesctiption
                     join y in Funs.DB.Base_DisciplinesWBS on x.DisciplinesWBSId equals y.DisciplinesWBSId
-                    where y.DisciplinesWBSCode == disciplinesWBSCode && y.DisciplinesWBSName == disciplinesWBSName
+                    where x.DepartId == type && y.DisciplinesWBSCode == disciplinesWBSCode && y.DisciplinesWBSName == disciplinesWBSName
                     && x.QuantityDesctiption == quantityDesctiption
                     orderby x.PlanMHRsUnit
                     select x.PlanMHRsUnit.ToString()).Distinct().ToList();
diff --git a/EProject/BLL/EditorManage/EProjectService.cs b/EProject/BLL/EditorManage/EProjectService.cs
index 20a4c96..cfbb276 100644
--- a/EProject/BLL/EditorManage/EProjectService.cs
+++ b/EProject/BLL/EditorManage/EProjectService.cs
@@ -122,6 +122,7 @@ namespace BLL
             newEProject.StudyWo = eProject.StudyWo;
             newEProject.CreateDate = eProject.CreateDate;
             newEProject.CreatePerson = eProject.CreatePerson;
+            newEProject.ProjectControl_RFSU_CloseDate = eProject.ProjectControl_RFSU_CloseDate;
 
             db.Editor_EProject.InsertOnSubmit(newEProject);
             db.SubmitChanges();
@@ -211,6 +212,7 @@ namespace BLL
                 newEProject.StudyWo = eProject.StudyWo;
                 newEProject.CreateDate = eProject.CreateDate;
                 newEProject.CreatePerson = eProject.CreatePerson;
+                newEProject.ProjectControl_RFSU_CloseDate = eProject.ProjectControl_RFSU_CloseDate;
                 //if (eProject.ProjectControl_JobStatus != "Hold")
                 //{
                 //    newEProject.Job_Hold =null;
diff --git a/EProject/BLL/EditorManage/KeyQuantityService.cs b/EProject/BLL/EditorManage/KeyQuantityService.cs
index 5cc2fc1..790787f 100644
--- a/EProject/BLL/EditorManage/KeyQuantityService.cs
+++ b/EProject/BLL/EditorManage/KeyQuantityService.cs
@@ -46,6 +46,7 @@ namespace BLL
             newKeyQuantity.Descipline = keyQuantity.Descipline;
             newKeyQuantity.QuantityDesctiption = keyQuantity.QuantityDesctiption;
             newKeyQuantity.PlanMHRsUnit = keyQuantity.PlanMHRsUnit;
+            newKeyQuantity.Type = keyQuantity.Type;
             Funs.DB.Editor_KeyQuantity.InsertOnSubmit(newKeyQuantity);
             Funs.DB.SubmitChanges();
         }
@@ -66,6 +67,7 @@ namespace BLL
                 newKeyQuantity.Descipline = keyQuantity.Descipline;
                 newKeyQuantity.QuantityDesctiption = keyQuantity.QuantityDesctiption;
                 newKeyQuantity.PlanMHRsUnit = keyQuantity.PlanMHRsUnit;
+                newKeyQuantity.Type = keyQuantity.Type;
                 Funs.DB.SubmitChanges();
             }
         }
diff --git a/EProject/FineUIPro.Web/BaseInfo/QuantityDesctiption.aspx b/EProject/FineUIPro.Web/BaseInfo/QuantityDesctiption.aspx
index 003ef56..217049d 100644
--- a/EProject/FineUIPro.Web/BaseInfo/QuantityDesctiption.aspx
+++ b/EProject/FineUIPro.Web/BaseInfo/QuantityDesctiption.aspx
@@ -19,7 +19,7 @@
                     <Toolbars>
                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
                             <Items>
-                                <f:DropDownList ID="drpDepartmentIdS" runat="server" Label="Department" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="Text_TextChanged"></f:DropDownList>
+                                <f:DropDownList ID="drpTypes" runat="server" Label="Type" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="Text_TextChanged"></f:DropDownList>
                                 <f:DropDownList ID="drpDescipline" runat="server" Label="Descipline" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="Text_TextChanged"></f:DropDownList>
                             </Items>
                         </f:Toolbar>
@@ -27,7 +27,7 @@
                     <Columns>
                         <f:RowNumberField EnablePagingNumber="true" Width="40px" HeaderTextAlign="Center"
                             TextAlign="Center" />
-                        <f:RenderField Width="110px" ColumnID="DepartName" DataField="DepartName"
+                        <f:RenderField Width="110px" ColumnID="DepartId" DataField="DepartId"
                             FieldType="String" HeaderText="Type" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                         <f:RenderField Width="80px" ColumnID="DisciplinesWBSCode" DataField="DisciplinesWBSCode"
@@ -66,7 +66,7 @@
                     <Items>
                         <f:HiddenField ID="hfFormID" runat="server">
                         </f:HiddenField>
-                        <f:DropDownList ID="drpDepartId" runat="server" Label="Type" LabelAlign="Right" LabelWidth="120px" EnableEdit="true" Required="true" ShowRedStar="true"></f:DropDownList>
+                        <f:DropDownList ID="drpType" runat="server" Label="Type" LabelAlign="Right" LabelWidth="120px" EnableEdit="true" Required="true" ShowRedStar="true"></f:DropDownList>
                         <f:DropDownList ID="drpDisciplinesWBSId" runat="server" Label="Descipline" LabelAlign="Right" LabelWidth="120px" EnableEdit="true" Required="true" ShowRedStar="true" AutoPostBack="true" OnSelectedIndexChanged="drpDisciplinesWBSId_SelectedIndexChanged"></f:DropDownList>
                         <f:TextBox ID="txtDisciplinesWBSCode" Label="Identifier" ShowRedStar="true" Required="true"
                             runat="server" LabelAlign="right" LabelWidth="120px">
diff --git a/EProject/FineUIPro.Web/BaseInfo/QuantityDesctiption.aspx.cs b/EProject/FineUIPro.Web/BaseInfo/QuantityDesctiption.aspx.cs
index c15931c..37c3bc4 100644
--- a/EProject/FineUIPro.Web/BaseInfo/QuantityDesctiption.aspx.cs
+++ b/EProject/FineUIPro.Web/BaseInfo/QuantityDesctiption.aspx.cs
@@ -28,24 +28,26 @@ namespace FineUIPro.Web.BaseInfo
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
 
                 //部门（查询）
-                this.drpDepartmentIdS.DataTextField = "DepartName";
-                this.drpDepartmentIdS.DataValueField = "DepartId";
-                this.drpDepartmentIdS.DataSource = BLL.DepartService.GetDepartList();
-                this.drpDepartmentIdS.DataBind();
-                Funs.FineUIPleaseSelect(this.drpDepartmentIdS);
+                //this.drpDepartmentIdS.DataTextField = "DepartName";
+                //this.drpDepartmentIdS.DataValueField = "DepartId";
+                //this.drpDepartmentIdS.DataSource = BLL.DepartService.GetDepartList();
+                //this.drpDepartmentIdS.DataBind();
+                //Funs.FineUIPleaseSelect(this.drpDepartmentIdS);
+                BLL.ConstValue.InitSysConstDropDownList(this.drpTypes, "KeyQuantityType", true);
 
                 //部门
-                this.drpDepartId.DataTextField = "DepartName";
-                this.drpDepartId.DataValueField = "DepartId";
-                this.drpDepartId.DataSource = BLL.DepartService.GetDepartList();
-                this.drpDepartId.DataBind();
-                Funs.FineUIPleaseSelect(this.drpDepartId);
+                //this.drpDepartId.DataTextField = "DepartName";
+                //this.drpDepartId.DataValueField = "DepartId";
+                //this.drpDepartId.DataSource = BLL.DepartService.GetDepartList();
+                //this.drpDepartId.DataBind();
+                //Funs.FineUIPleaseSelect(this.drpDepartId);
+                BLL.ConstValue.InitSysConstDropDownList(this.drpType, "KeyQuantityType", false);
 
                 //专业(查询)
                 this.drpDescipline.DataTextField = "DisciplinesWBSName";
                 this.drpDescipline.DataValueField = "DisciplinesWBSId";
                 this.drpDescipline.DataSource = from x in Funs.DB.Base_DisciplinesWBS select x;
-                this.drpDepartId.DataBind();
+                this.drpDescipline.DataBind();
                 Funs.FineUIPleaseSelect(this.drpDescipline);
 
                 //专业
@@ -70,17 +72,15 @@ namespace FineUIPro.Web.BaseInfo
                                      qua.DisciplinesWBSId, 
                                      qua.QuantityDesctiption, 
                                      qua.PlanMHRsUnit,
-                                     d.DepartName,
                                      wbs.DisciplinesWBSCode,
                                      wbs.DisciplinesWBSName
                             FROM Base_QuantityDesctiption as qua
-                            left join Base_Depart as d on d.DepartId = qua.DepartId
                             left join Base_DisciplinesWBS as wbs on wbs.DisciplinesWBSId = qua.DisciplinesWBSId where 1=1";
             List<SqlParameter> listStr = new List<SqlParameter>();
-            if (this.drpDepartmentIdS.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpDepartmentIdS.SelectedValue))
+            if (this.drpTypes.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpTypes.SelectedValue))
             {
                 strSql += " AND qua.DepartId=@DepartId ";
-                listStr.Add(new SqlParameter("@DepartId", this.drpDepartmentIdS.SelectedValue));
+                listStr.Add(new SqlParameter("@DepartId", this.drpTypes.SelectedValue));
             }
             if (this.drpDescipline.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpDescipline.SelectedValue))
             {
@@ -140,7 +140,7 @@ namespace FineUIPro.Web.BaseInfo
         private void EmptyText()
         {
             this.hfFormID.Text = string.Empty;
-            this.drpDepartId.SelectedValue = Const._Null;
+            this.drpType.SelectedValue = Const._Null;
             this.drpDisciplinesWBSId.SelectedValue = Const._Null;
             this.txtDisciplinesWBSCode.Text = string.Empty;
             this.txtQuantityDesctiption.Text = string.Empty;
@@ -235,7 +235,7 @@ namespace FineUIPro.Web.BaseInfo
             {
                 if (!string.IsNullOrEmpty(cons.DepartId))
                 {
-                    this.drpDepartId.SelectedValue = cons.DepartId;
+                    this.drpType.SelectedValue = cons.DepartId;
                 }
                 if (!string.IsNullOrEmpty(cons.DisciplinesWBSId))
                 {
@@ -273,7 +273,7 @@ namespace FineUIPro.Web.BaseInfo
                 ShowNotify("Please select Descipline！", MessageBoxIcon.Warning);
                 return;
             }
-            if (!BLL.QuantityDesctiptionService.IsExitQuantityDesctiption(this.drpDepartId.SelectedValue, this.drpDisciplinesWBSId.SelectedValue, this.txtQuantityDesctiption.Text.Trim(), strRowID))
+            if (!BLL.QuantityDesctiptionService.IsExitQuantityDesctiption(this.drpType.SelectedValue, this.drpDisciplinesWBSId.SelectedValue, this.txtQuantityDesctiption.Text.Trim(), strRowID))
             {
                 Model.Base_QuantityDesctiption cons = new Model.Base_QuantityDesctiption
                 {
@@ -281,9 +281,9 @@ namespace FineUIPro.Web.BaseInfo
                     PlanMHRsUnit = Funs.GetNewDecimal(this.txtPlanMHRsUnit.Text)
                 };
 
-                if (this.drpDepartId.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpDepartId.SelectedValue))
+                if (this.drpType.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpType.SelectedValue))
                 {
-                    cons.DepartId = this.drpDepartId.SelectedValue;
+                    cons.DepartId = this.drpType.SelectedValue;
                 }
                 if (this.drpDisciplinesWBSId.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpDisciplinesWBSId.SelectedValue))
                 {
diff --git a/EProject/FineUIPro.Web/BaseInfo/QuantityDesctiption.aspx.designer.cs b/EProject/FineUIPro.Web/BaseInfo/QuantityDesctiption.aspx.designer.cs
index 79301a9..f857d40 100644
--- a/EProject/FineUIPro.Web/BaseInfo/QuantityDesctiption.aspx.designer.cs
+++ b/EProject/FineUIPro.Web/BaseInfo/QuantityDesctiption.aspx.designer.cs
@@ -60,13 +60,13 @@ namespace FineUIPro.Web.BaseInfo
         protected global::FineUIPro.Toolbar Toolbar2;
 
         /// <summary>
-        /// drpDepartmentIdS 控件。
+        /// drpTypes 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DropDownList drpDepartmentIdS;
+        protected global::FineUIPro.DropDownList drpTypes;
 
         /// <summary>
         /// drpDescipline 控件。
@@ -123,13 +123,13 @@ namespace FineUIPro.Web.BaseInfo
         protected global::FineUIPro.HiddenField hfFormID;
 
         /// <summary>
-        /// drpDepartId 控件。
+        /// drpType 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DropDownList drpDepartId;
+        protected global::FineUIPro.DropDownList drpType;
 
         /// <summary>
         /// drpDisciplinesWBSId 控件。
diff --git a/EProject/FineUIPro.Web/EditorManage/KeyQuantityEditor.aspx b/EProject/FineUIPro.Web/EditorManage/KeyQuantityEditor.aspx
index 16e141a..c6832c2 100644
--- a/EProject/FineUIPro.Web/EditorManage/KeyQuantityEditor.aspx
+++ b/EProject/FineUIPro.Web/EditorManage/KeyQuantityEditor.aspx
@@ -135,16 +135,16 @@
             </Items>
             <Items>
                 <f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="Key Quantity" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="KeyQuantityId" AllowCellEditing="true" EnableColumnLines="true" DataIDField="KeyQuantityId" AllowSorting="true" SortField="Identifier,Descipline"
+                    runat="server" BoxFlex="1" DataKeyNames="KeyQuantityId" AllowCellEditing="true" EnableColumnLines="true" DataIDField="KeyQuantityId" AllowSorting="true" SortField="Type,Identifier,Descipline"
                     SortDirection="ASC" OnSort="Grid2_Sort"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid2_PageIndexChange" EnableTextSelection="true">
                     <Columns>
                         <f:RenderField Width="140px" ColumnID="ProjectControl_JobNo" DataField="ProjectControl_JobNo" SortField="ProjectControl_JobNo"
                             FieldType="String" HeaderText="Job No" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
-                        <%--<f:RenderField Width="100px" ColumnID="DepartName" DataField="DepartName" SortField="DepartName"
+                        <f:RenderField Width="100px" ColumnID="Type" DataField="Type" SortField="Type"
                             FieldType="String" HeaderText="Type" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>--%>
+                        </f:RenderField>
                         <f:RenderField Width="80px" ColumnID="Identifier" DataField="Identifier"
                             SortField="Identifier" FieldType="String" HeaderText="Identifier" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
diff --git a/EProject/FineUIPro.Web/EditorManage/KeyQuantityEditorEdit.aspx b/EProject/FineUIPro.Web/EditorManage/KeyQuantityEditorEdit.aspx
index 16d833f..11deb96 100644
--- a/EProject/FineUIPro.Web/EditorManage/KeyQuantityEditorEdit.aspx
+++ b/EProject/FineUIPro.Web/EditorManage/KeyQuantityEditorEdit.aspx
@@ -56,27 +56,33 @@
                                         </f:Grid>
                                     </PopPanel>
                                 </f:DropDownBox>--%>
+                                <f:DropDownList ID="drpType" runat="server" Label="Type" LabelWidth="200px" AutoPostBack="true" OnSelectedIndexChanged="drpType_SelectedIndexChanged" EnableEdit="true"></f:DropDownList>
                                 <f:DropDownList ID="drpIdentifier" runat="server" Label="Identifier" LabelWidth="200px" AutoPostBack="true" OnSelectedIndexChanged="drpIdentifier_SelectedIndexChanged" EnableEdit="true"></f:DropDownList>
-                                <f:DropDownList ID="drpDescipline" runat="server" Label="Descipline" LabelWidth="200px"  AutoPostBack="true" OnSelectedIndexChanged="drpDescipline_SelectedIndexChanged" EnableEdit="true"></f:DropDownList>
                             </Items>
                         </f:FormRow>
                         <f:FormRow>
                             <Items>
-                                <f:DropDownList ID="drpQuantityDesctiption" runat="server" Label="Quantity Desctiption" LabelWidth="200px" AutoPostBack="true"  OnSelectedIndexChanged="drpQuantityDesctiption_SelectedIndexChanged" EnableEdit="true"></f:DropDownList>
+                                <f:DropDownList ID="drpDescipline" runat="server" Label="Descipline" LabelWidth="200px" AutoPostBack="true" OnSelectedIndexChanged="drpDescipline_SelectedIndexChanged" EnableEdit="true"></f:DropDownList>
+                                <f:DropDownList ID="drpQuantityDesctiption" runat="server" Label="Quantity Desctiption" LabelWidth="200px" AutoPostBack="true" OnSelectedIndexChanged="drpQuantityDesctiption_SelectedIndexChanged" EnableEdit="true"></f:DropDownList>
+                            </Items>
+                        </f:FormRow>
+                        <f:FormRow>
+                            <Items>
                                 <f:DropDownList ID="drpPlanMHRsUnit" runat="server" Label="Plan MHRs/Unit" LabelWidth="200px" EnableEdit="true"></f:DropDownList>
-                            </Items>
-                        </f:FormRow>
-                        <f:FormRow>
-                            <Items>
                                 <f:NumberBox ID="txtInputQuantity" runat="server" Label="Input Quantity" LabelWidth="200px" NoNegative="true" AutoPostBack="true" OnTextChanged="txtInputQuantity_TextChanged"></f:NumberBox>
                                 <%--<f:NumberBox ID="txtPlanMHRsUnit" runat="server" Label="Plan MHRs/Unit" LabelWidth="200px" Readonly="true"></f:NumberBox>--%>
-                                <f:NumberBox ID="txtPlanMHRs" runat="server" Label="Plan MHRs" LabelWidth="200px" Readonly="true"></f:NumberBox>
                             </Items>
                         </f:FormRow>
                         <f:FormRow>
                             <Items>
+                                <f:NumberBox ID="txtPlanMHRs" runat="server" Label="Plan MHRs" LabelWidth="200px" Readonly="true"></f:NumberBox>
                                 <f:NumberBox ID="txtPlanMHRsSummary" runat="server" Label="Plan MHRs Summary" LabelWidth="200px" Readonly="true"></f:NumberBox>
+                            </Items>
+                        </f:FormRow>
+                        <f:FormRow>
+                            <Items>
                                 <f:NumberBox ID="txtActualMHRs" runat="server" Label="Actual MHRs" LabelWidth="200px" Readonly="true"></f:NumberBox>
+                                <f:Label ID="Label1" runat="server"></f:Label>
                             </Items>
                         </f:FormRow>
                     </Rows>
diff --git a/EProject/FineUIPro.Web/EditorManage/KeyQuantityEditorEdit.aspx.cs b/EProject/FineUIPro.Web/EditorManage/KeyQuantityEditorEdit.aspx.cs
index ea17984..7de4fc7 100644
--- a/EProject/FineUIPro.Web/EditorManage/KeyQuantityEditorEdit.aspx.cs
+++ b/EProject/FineUIPro.Web/EditorManage/KeyQuantityEditorEdit.aspx.cs
@@ -64,7 +64,15 @@ namespace FineUIPro.Web.EditorManage
                     GetButtonPower();
                 }
 
-                BLL.QuantityDesctiptionService.InitIdentifierDropDownList(this.drpIdentifier, true);
+                BLL.ConstValue.InitSysConstDropDownList(this.drpType, "KeyQuantityType", false);
+                if (!string.IsNullOrEmpty(this.drpType.SelectedValue) && this.drpType.SelectedValue != BLL.Const._Null)
+                {
+                    BLL.QuantityDesctiptionService.InitIdentifierDropDownList(this.drpIdentifier, this.drpType.SelectedValue, true);
+                }
+                else
+                {
+                    Funs.FineUIPleaseSelect(this.drpIdentifier);
+                }
                 Funs.FineUIPleaseSelect(this.drpDescipline);
                 Funs.FineUIPleaseSelect(this.drpQuantityDesctiption);
                 Funs.FineUIPleaseSelect(this.drpPlanMHRsUnit);
@@ -100,34 +108,39 @@ namespace FineUIPro.Web.EditorManage
                         //    txtQuantityDesctiption.Text = key.QuantityDesctiption;
                         //    txtPlanMHRsUnit.Text = key.PlanMHRsUnit.HasValue ? key.PlanMHRsUnit.ToString() : "";
                         //}
-                        if (!string.IsNullOrEmpty(keyQuantity.Identifier))
+                        if (!string.IsNullOrEmpty(keyQuantity.Type))
                         {
-                            this.drpIdentifier.Items.Clear();
-                            BLL.QuantityDesctiptionService.InitIdentifierDropDownList(this.drpIdentifier, true);
-                            this.drpIdentifier.SelectedValue = keyQuantity.Identifier;
+                            this.drpType.SelectedValue = keyQuantity.Type;
 
-                            if (!string.IsNullOrEmpty(keyQuantity.Descipline))
+                            if (!string.IsNullOrEmpty(keyQuantity.Identifier))
                             {
-                                this.drpDescipline.Items.Clear();
-                                BLL.QuantityDesctiptionService.InitDesciplineDropDownList(this.drpDescipline, true, keyQuantity.Identifier);
-                                this.drpDescipline.SelectedValue = keyQuantity.Descipline;
+                                this.drpIdentifier.Items.Clear();
+                                BLL.QuantityDesctiptionService.InitIdentifierDropDownList(this.drpIdentifier, keyQuantity.Type, true);
+                                this.drpIdentifier.SelectedValue = keyQuantity.Identifier;
 
-                                if (!string.IsNullOrEmpty(keyQuantity.QuantityDesctiption))
+                                if (!string.IsNullOrEmpty(keyQuantity.Descipline))
                                 {
-                                    this.drpQuantityDesctiption.Items.Clear();
-                                    BLL.QuantityDesctiptionService.InitQuantityDesctiptionDropDownList(this.drpQuantityDesctiption, true, keyQuantity.Identifier, keyQuantity.Descipline);
-                                    this.drpQuantityDesctiption.SelectedValue = keyQuantity.QuantityDesctiption;
+                                    this.drpDescipline.Items.Clear();
+                                    BLL.QuantityDesctiptionService.InitDesciplineDropDownList(this.drpDescipline, true, keyQuantity.Type, keyQuantity.Identifier);
+                                    this.drpDescipline.SelectedValue = keyQuantity.Descipline;
 
-                                    if (keyQuantity.PlanMHRsUnit.HasValue)
+                                    if (!string.IsNullOrEmpty(keyQuantity.QuantityDesctiption))
                                     {
-                                        this.drpPlanMHRsUnit.Items.Clear();
-                                        BLL.QuantityDesctiptionService.InitPlanMHRsUnitDropDownList(this.drpPlanMHRsUnit, true, keyQuantity.Identifier, keyQuantity.Descipline, keyQuantity.QuantityDesctiption);
-                                        this.drpPlanMHRsUnit.SelectedValue = keyQuantity.PlanMHRsUnit.ToString();
+                                        this.drpQuantityDesctiption.Items.Clear();
+                                        BLL.QuantityDesctiptionService.InitQuantityDesctiptionDropDownList(this.drpQuantityDesctiption, true, keyQuantity.Type, keyQuantity.Identifier, keyQuantity.Descipline);
+                                        this.drpQuantityDesctiption.SelectedValue = keyQuantity.QuantityDesctiption;
+
+                                        if (keyQuantity.PlanMHRsUnit.HasValue)
+                                        {
+                                            this.drpPlanMHRsUnit.Items.Clear();
+                                            BLL.QuantityDesctiptionService.InitPlanMHRsUnitDropDownList(this.drpPlanMHRsUnit, true, keyQuantity.Type, keyQuantity.Identifier, keyQuantity.Descipline, keyQuantity.QuantityDesctiption);
+                                            this.drpPlanMHRsUnit.SelectedValue = keyQuantity.PlanMHRsUnit.ToString();
+                                        }
                                     }
                                 }
                             }
                         }
-                        this.txtPlanMHRsSummary.Text = BLL.KeyQuantityService.GetSumPlanMHRsByKeyId(keyQuantity.EProjectId,keyQuantity.Identifier, keyQuantity.Descipline).ToString();
+                        this.txtPlanMHRsSummary.Text = BLL.KeyQuantityService.GetSumPlanMHRsByKeyId(keyQuantity.EProjectId, keyQuantity.Identifier, keyQuantity.Descipline).ToString();
                         this.txtInputQuantity.Text = keyQuantity.InputQuantity.HasValue ? keyQuantity.InputQuantity.ToString() : "";
                         this.txtPlanMHRs.Text = keyQuantity.PlanMHRs.HasValue ? keyQuantity.PlanMHRs.ToString() : "";
                         double? actualHoursSum = (from x in Funs.DB.ManHours_Actual
@@ -224,6 +237,11 @@ namespace FineUIPro.Web.EditorManage
         #region 保存
         protected void btnSave_Click(object sender, EventArgs e)
         {
+            if (this.drpType.SelectedValue == BLL.Const._Null || string.IsNullOrEmpty(this.drpType.SelectedValue))
+            {
+                ShowAlert("Please select Type!", MessageBoxIcon.Warning);
+                return;
+            }
             if (this.drpIdentifier.SelectedValue == BLL.Const._Null || string.IsNullOrEmpty(this.drpIdentifier.SelectedValue))
             {
                 ShowAlert("Please select Identifier!", MessageBoxIcon.Warning);
@@ -240,7 +258,7 @@ namespace FineUIPro.Web.EditorManage
                 return;
             }
             Model.Editor_KeyQuantity newKeyQuantity = new Model.Editor_KeyQuantity();
-            //newKeyQuantity.KeyId = this.drpKeyId.Value;
+            newKeyQuantity.Type = this.drpType.SelectedValue;
             newKeyQuantity.InputQuantity = Funs.GetNewDecimal(this.txtInputQuantity.Text);
             newKeyQuantity.PlanMHRs = Funs.GetNewDecimal(this.txtPlanMHRs.Text);
             newKeyQuantity.Identifier = this.drpIdentifier.SelectedText;
@@ -335,6 +353,28 @@ namespace FineUIPro.Web.EditorManage
             }
         }
 
+        /// <summary>
+        /// Type 下拉选择
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void drpType_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.drpIdentifier.Items.Clear();
+            this.drpDescipline.Items.Clear();
+            this.drpQuantityDesctiption.Items.Clear();
+            this.drpPlanMHRsUnit.Items.Clear();
+            if (this.drpType.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpType.SelectedValue))
+            {
+                BLL.QuantityDesctiptionService.InitIdentifierDropDownList(this.drpIdentifier, this.drpType.SelectedValue, true);
+            }
+            else
+            {
+                Funs.FineUIPleaseSelect(this.drpIdentifier);
+            }
+            this.drpIdentifier.SelectedIndex = 0;
+        }
+
         /// <summary>
         /// Identifier 下拉选择
         /// </summary>
@@ -342,10 +382,12 @@ namespace FineUIPro.Web.EditorManage
         /// <param name="e"></param>
         protected void drpIdentifier_SelectedIndexChanged(object sender, EventArgs e)
         {
-            drpDescipline.Items.Clear();
-            if (this.drpIdentifier.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpIdentifier.SelectedValue))
+            this.drpDescipline.Items.Clear();
+            this.drpQuantityDesctiption.Items.Clear();
+            this.drpPlanMHRsUnit.Items.Clear();
+            if (this.drpIdentifier.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpIdentifier.SelectedValue) && this.drpType.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpType.SelectedValue))
             {
-                BLL.QuantityDesctiptionService.InitDesciplineDropDownList(this.drpDescipline, true, this.drpIdentifier.SelectedValue);
+                BLL.QuantityDesctiptionService.InitDesciplineDropDownList(this.drpDescipline, true, this.drpType.SelectedValue, this.drpIdentifier.SelectedValue);
             }
             else
             {
@@ -362,10 +404,11 @@ namespace FineUIPro.Web.EditorManage
         protected void drpDescipline_SelectedIndexChanged(object sender, EventArgs e)
         {
             this.txtActualMHRs.Text = string.Empty;
-            drpQuantityDesctiption.Items.Clear();
-            if (this.drpDescipline.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpDescipline.SelectedValue))
+            this.drpQuantityDesctiption.Items.Clear();
+            this.drpPlanMHRsUnit.Items.Clear();
+            if (this.drpType.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpType.SelectedValue) && this.drpIdentifier.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpIdentifier.SelectedValue) && this.drpDescipline.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpDescipline.SelectedValue))
             {
-                BLL.QuantityDesctiptionService.InitQuantityDesctiptionDropDownList(this.drpQuantityDesctiption, true, this.drpIdentifier.SelectedValue, this.drpDescipline.SelectedValue);
+                BLL.QuantityDesctiptionService.InitQuantityDesctiptionDropDownList(this.drpQuantityDesctiption, true, this.drpType.SelectedValue, this.drpIdentifier.SelectedValue, this.drpDescipline.SelectedValue);
 
                 double? actualHoursSum = (from x in Funs.DB.ManHours_Actual
                                           where x.EProjectId == this.ProjectId
@@ -388,9 +431,9 @@ namespace FineUIPro.Web.EditorManage
         protected void drpQuantityDesctiption_SelectedIndexChanged(object sender, EventArgs e)
         {
             this.drpPlanMHRsUnit.Items.Clear();
-            if (this.drpQuantityDesctiption.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpQuantityDesctiption.SelectedValue))
+            if (this.drpType.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpType.SelectedValue) && this.drpIdentifier.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpIdentifier.SelectedValue) && this.drpDescipline.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpDescipline.SelectedValue) && this.drpQuantityDesctiption.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpQuantityDesctiption.SelectedValue))
             {
-                BLL.QuantityDesctiptionService.InitPlanMHRsUnitDropDownList(this.drpPlanMHRsUnit, true, this.drpIdentifier.SelectedValue, this.drpDescipline.SelectedValue, this.drpQuantityDesctiption.SelectedValue);
+                BLL.QuantityDesctiptionService.InitPlanMHRsUnitDropDownList(this.drpPlanMHRsUnit, true, this.drpType.SelectedValue, this.drpIdentifier.SelectedValue, this.drpDescipline.SelectedValue, this.drpQuantityDesctiption.SelectedValue);
             }
             else
             {
@@ -415,6 +458,7 @@ namespace FineUIPro.Web.EditorManage
                 }
             }
         }
-        #endregion        
+        #endregion
+
     }
 }
\ No newline at end of file
diff --git a/EProject/FineUIPro.Web/EditorManage/KeyQuantityEditorEdit.aspx.designer.cs b/EProject/FineUIPro.Web/EditorManage/KeyQuantityEditorEdit.aspx.designer.cs
index 3afbc4d..aaa1caa 100644
--- a/EProject/FineUIPro.Web/EditorManage/KeyQuantityEditorEdit.aspx.designer.cs
+++ b/EProject/FineUIPro.Web/EditorManage/KeyQuantityEditorEdit.aspx.designer.cs
@@ -50,6 +50,15 @@ namespace FineUIPro.Web.EditorManage
         /// </remarks>
         protected global::FineUIPro.Form Form2;
 
+        /// <summary>
+        /// drpType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpType;
+
         /// <summary>
         /// drpIdentifier 控件。
         /// </summary>
@@ -122,6 +131,15 @@ namespace FineUIPro.Web.EditorManage
         /// </remarks>
         protected global::FineUIPro.NumberBox txtActualMHRs;
 
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label1;
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
diff --git a/EProject/FineUIPro.Web/EditorManage/KeyQuantityEditorList.aspx b/EProject/FineUIPro.Web/EditorManage/KeyQuantityEditorList.aspx
index 29363d2..77ec08e 100644
--- a/EProject/FineUIPro.Web/EditorManage/KeyQuantityEditorList.aspx
+++ b/EProject/FineUIPro.Web/EditorManage/KeyQuantityEditorList.aspx
@@ -15,7 +15,7 @@
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="Key Quantity" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="KeyQuantityId" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="KeyQuantityId" AllowSorting="true" SortField="Identifier,Descipline"
+                    ClicksToEdit="2" DataIDField="KeyQuantityId" AllowSorting="true" SortField="Type,Identifier,Descipline"
                     SortDirection="ASC" OnSort="Grid1_Sort"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="true">
@@ -36,9 +36,9 @@
                         <f:RenderField Width="120px" ColumnID="ProjectControl_JobNo" DataField="ProjectControl_JobNo" SortField="ProjectControl_JobNo"
                             FieldType="String" HeaderText="Job No" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
-                        <%--<f:RenderField Width="100px" ColumnID="DepartName" DataField="DepartName" SortField="DepartName"
+                        <f:RenderField Width="100px" ColumnID="Type" DataField="Type" SortField="Type"
                             FieldType="String" HeaderText="Type" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>--%>
+                        </f:RenderField>
                         <f:RenderField Width="80px" ColumnID="Identifier" DataField="Identifier"
                             SortField="Identifier" FieldType="String" HeaderText="Identifier" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
diff --git a/EProject/FineUIPro.Web/EditorManage/ProjectControlEditorEdit.aspx b/EProject/FineUIPro.Web/EditorManage/ProjectControlEditorEdit.aspx
index c0a5d27..6790b09 100644
--- a/EProject/FineUIPro.Web/EditorManage/ProjectControlEditorEdit.aspx
+++ b/EProject/FineUIPro.Web/EditorManage/ProjectControlEditorEdit.aspx
@@ -33,7 +33,7 @@
                                             <f:ListItem Value="Temp" Text="Temp" />
                                             <f:ListItem Value="Perm" Text="Perm" />
                                         </f:DropDownList>
-                                        
+
                                         <f:DropDownList ID="drpEMManager" runat="server" Label="Engineering Manager" LabelWidth="160px" EnableGroup="true" EnableEdit="true"></f:DropDownList>
                                         <f:TextBox ID="txtNetworkNo" runat="server" Label="Network No." LabelWidth="130px"></f:TextBox>
                                     </Items>
@@ -50,8 +50,8 @@
                                     <Items>
                                         <f:TextBox ID="txtJobTitle" runat="server" Label="Job Title" LabelWidth="110px" ShowRedStar="true" Required="true"></f:TextBox>
                                         <f:TextBox ID="txtCostEffectvitity" runat="server" Label="Cost Effectvitity" LabelWidth="120px"></f:TextBox>
-                                        <f:DropDownList ID="drpLeadBy" runat="server" Label="Lead By" LabelWidth="160px" EnableEdit="true" EnableGroup="true" ShowRedStar="true"
-                                            ></f:DropDownList>
+                                        <f:DropDownList ID="drpLeadBy" runat="server" Label="Lead By" LabelWidth="160px" EnableEdit="true" EnableGroup="true" ShowRedStar="true">
+                                        </f:DropDownList>
                                         <f:TextBox ID="txtCAPEXPlanNo" runat="server" Label="CAPEX Plan No." LabelWidth="130px"></f:TextBox>
                                     </Items>
                                 </f:FormRow>
@@ -59,21 +59,21 @@
                                     <Items>
                                         <f:DropDownList ID="drpBuCode" runat="server" Label="Bu.Code" LabelWidth="110px" ShowRedStar="true" Required="true" EnableEdit="true"></f:DropDownList>
                                         <f:NumberBox ID="txtPVIPrediction" runat="server" Label="PVI Prediction" LabelWidth="120px" EnableCommas="true"></f:NumberBox>
-                                        <f:DropDownList ID="drpOpre" runat="server" Label="Operation Rep" LabelWidth="160px" EnableGroup="true" EnableEdit="true"></f:DropDownList>                                        
-                                        <f:TextBox ID="txtStudyWo" runat="server" Label="Study WO" LabelWidth="130px" ></f:TextBox>
+                                        <f:DropDownList ID="drpOpre" runat="server" Label="Operation Rep" LabelWidth="160px" EnableGroup="true" EnableEdit="true"></f:DropDownList>
+                                        <f:TextBox ID="txtStudyWo" runat="server" Label="Study WO" LabelWidth="130px"></f:TextBox>
                                     </Items>
                                 </f:FormRow>
                                 <f:FormRow ColumnWidths="25% 24% 27% 24%">
                                     <Items>
-                                        <f:DropDownList ID="drpCTEInvolved" runat="server" Label="CTE Involved" LabelWidth="110px"  Enabled="false">
-                                            <f:ListItem Value="N" Text="N" Selected="true"/>
+                                        <f:DropDownList ID="drpCTEInvolved" runat="server" Label="CTE Involved" LabelWidth="110px" Enabled="false">
+                                            <f:ListItem Value="N" Text="N" Selected="true" />
                                             <f:ListItem Value="Y" Text="Y" />
                                         </f:DropDownList>
                                         <f:DatePicker ID="txtRevisedMCDate" runat="server" Label="Revised MC Date" LabelWidth="120px" EnableEdit="true" AutoPostBack="true" OnTextChanged="txtRevisedMCDate_OnTextChanged"></f:DatePicker>
                                         <f:DropDownList ID="drpPM_General_Priority" runat="server" Label="Priority" LabelWidth="140px" EnableEdit="true">
                                         </f:DropDownList>
                                         <f:TextBox ID="txtFilesLink" runat="server" Label="Files Link" LabelWidth="130px"></f:TextBox>
-                                       
+
                                     </Items>
                                 </f:FormRow>
                                 <f:FormRow ColumnWidths="49% 51%">
@@ -212,7 +212,23 @@
                 </f:GroupPanel>
                 <f:Panel runat="server" Layout="HBox" ShowHeader="false" ShowBorder="false">
                     <Items>
-                        <f:GroupPanel ID="GroupPanel8" Title="Business Closure" runat="server" EnableCollapse="true" Width="300px">
+                        <f:GroupPanel ID="GroupPanel12" Title="Technical Closure(RFSU)" runat="server" EnableCollapse="true" Width="260px">
+                            <Items>
+                                <f:Form ID="Form14" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+                                    runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+                                    <Rows>
+                                        <f:FormRow>
+                                            <Items>
+                                                <f:DatePicker ID="txtRFSUCloseDate" runat="server" Label="Close Date" LabelWidth="120px"></f:DatePicker>
+
+                                            </Items>
+                                        </f:FormRow>
+                                    </Rows>
+                                </f:Form>
+                            </Items>
+                        </f:GroupPanel>
+                        <f:Label runat="server" Width="10px"></f:Label>
+                        <f:GroupPanel ID="GroupPanel8" Title="Business Closure" runat="server" EnableCollapse="true" Width="260px">
                             <Items>
                                 <f:Form ID="Form9" ShowBorder="false" ShowHeader="false" AutoScroll="true"
                                     runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
@@ -228,14 +244,14 @@
                             </Items>
                         </f:GroupPanel>
                         <f:Label runat="server" Width="10px"></f:Label>
-                        <f:GroupPanel ID="GroupPanel10" Title="Project Cancel" runat="server" EnableCollapse="true" Width="300px">
+                        <f:GroupPanel ID="GroupPanel10" Title="Project Cancel" runat="server" EnableCollapse="true" Width="260px">
                             <Items>
                                 <f:Form ID="Form10" ShowBorder="false" ShowHeader="false" AutoScroll="true"
                                     runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
                                     <Rows>
                                         <f:FormRow>
                                             <Items>
-                                                <f:DatePicker ID="txtCancelDate" runat="server" Label="Cancel Date" LabelWidth="120px" ></f:DatePicker>
+                                                <f:DatePicker ID="txtCancelDate" runat="server" Label="Cancel Date" LabelWidth="120px"></f:DatePicker>
                                             </Items>
                                         </f:FormRow>
                                     </Rows>
@@ -243,7 +259,7 @@
                             </Items>
                         </f:GroupPanel>
                         <f:Label runat="server" Width="10px"></f:Label>
-                        <f:GroupPanel ID="GroupPanel11" Title="Project Hold" runat="server" EnableCollapse="true" Width="300px">
+                        <f:GroupPanel ID="GroupPanel11" Title="Project Hold" runat="server" EnableCollapse="true" Width="260px">
                             <Items>
                                 <f:Form ID="Form13" ShowBorder="false" ShowHeader="false" AutoScroll="true"
                                     runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
@@ -258,7 +274,7 @@
                             </Items>
                         </f:GroupPanel>
                         <f:Label runat="server" Width="10px"></f:Label>
-                        <f:GroupPanel ID="GroupPanel9" runat="server" EnableCollapse="true" Width="300px">
+                        <f:GroupPanel ID="GroupPanel9" runat="server" EnableCollapse="true" Width="260px">
                             <Items>
                                 <f:Form ID="Form11" ShowBorder="false" ShowHeader="false" AutoScroll="true"
                                     runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
diff --git a/EProject/FineUIPro.Web/EditorManage/ProjectControlEditorEdit.aspx.cs b/EProject/FineUIPro.Web/EditorManage/ProjectControlEditorEdit.aspx.cs
index ed352ca..8cab470 100644
--- a/EProject/FineUIPro.Web/EditorManage/ProjectControlEditorEdit.aspx.cs
+++ b/EProject/FineUIPro.Web/EditorManage/ProjectControlEditorEdit.aspx.cs
@@ -184,6 +184,7 @@ namespace FineUIPro.Web.EditorManage
                         txtPM_SC_PendingQty.Text = Convert.ToString(eproject.PM_SC_PendingQty);
                         txtPM_SC_PendingCost.Text = Convert.ToString(eproject.PM_SC_PendingCost);
 
+                        this.txtRFSUCloseDate.Text = eproject.ProjectControl_RFSU_CloseDate == null ? "" : string.Format("{0:yyyy-MM-dd}", eproject.ProjectControl_RFSU_CloseDate);
                         this.txtBC_CloseDate.Text = eproject.ProjectControl_BC_CloseDate == null ? "" : string.Format("{0:yyyy-MM-dd}", eproject.ProjectControl_BC_CloseDate);
                         this.txtCancelDate.Text = eproject.ProjectControl_PC_CancelDate == null ? "" : string.Format("{0:yyyy-MM-dd}", eproject.ProjectControl_PC_CancelDate);
                         this.txtHold.Text = eproject.Job_Hold == null ? "" : string.Format("{0:yyyy-MM-dd}", eproject.Job_Hold);
@@ -566,6 +567,8 @@ namespace FineUIPro.Web.EditorManage
             eProject.PM_SC_PendingQty = Funs.GetNewInt(txtPM_SC_PendingQty.Text.Trim());
             eProject.PM_SC_PendingCost = Funs.GetNewDecimal(txtPM_SC_PendingCost.Text.Trim());
 
+            eProject.ProjectControl_RFSU_CloseDate = Funs.GetNewDateTime(this.txtRFSUCloseDate.Text.Trim());
+
             if (!string.IsNullOrEmpty(this.txtBC_CloseDate.Text.Trim()))
             {
                 eProject.ProjectControl_BC_CloseDate = Funs.GetNewDateTime(this.txtBC_CloseDate.Text.Trim());
diff --git a/EProject/FineUIPro.Web/EditorManage/ProjectControlEditorEdit.aspx.designer.cs b/EProject/FineUIPro.Web/EditorManage/ProjectControlEditorEdit.aspx.designer.cs
index bb42cc2..d53f4f4 100644
--- a/EProject/FineUIPro.Web/EditorManage/ProjectControlEditorEdit.aspx.designer.cs
+++ b/EProject/FineUIPro.Web/EditorManage/ProjectControlEditorEdit.aspx.designer.cs
@@ -671,6 +671,33 @@ namespace FineUIPro.Web.EditorManage
         /// </remarks>
         protected global::FineUIPro.NumberBox txtPM_SC_PendingCost;
 
+        /// <summary>
+        /// GroupPanel12 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.GroupPanel GroupPanel12;
+
+        /// <summary>
+        /// Form14 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form14;
+
+        /// <summary>
+        /// txtRFSUCloseDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtRFSUCloseDate;
+
         /// <summary>
         /// GroupPanel8 控件。
         /// </summary>
diff --git a/EProject/Model/Model.cs b/EProject/Model/Model.cs
index 86731bc..7d391a7 100644
--- a/EProject/Model/Model.cs
+++ b/EProject/Model/Model.cs
@@ -1847,8 +1847,6 @@ namespace Model
 		
 		private string _DepartLeader;
 		
-		private EntitySet<Base_QuantityDesctiption> _Base_QuantityDesctiption;
-		
 		private EntitySet<Sys_User> _Sys_User;
 		
     #region 可扩展性方法定义
@@ -1871,7 +1869,6 @@ namespace Model
 		
 		public Base_Depart()
 		{
-			this._Base_QuantityDesctiption = new EntitySet<Base_QuantityDesctiption>(new Action<Base_QuantityDesctiption>(this.attach_Base_QuantityDesctiption), new Action<Base_QuantityDesctiption>(this.detach_Base_QuantityDesctiption));
 			this._Sys_User = new EntitySet<Sys_User>(new Action<Sys_User>(this.attach_Sys_User), new Action<Sys_User>(this.detach_Sys_User));
 			OnCreated();
 		}
@@ -1996,19 +1993,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Base_QuantityDesctiption_Base_Depart", Storage="_Base_QuantityDesctiption", ThisKey="DepartId", OtherKey="DepartId", DeleteRule="NO ACTION")]
-		public EntitySet<Base_QuantityDesctiption> Base_QuantityDesctiption
-		{
-			get
-			{
-				return this._Base_QuantityDesctiption;
-			}
-			set
-			{
-				this._Base_QuantityDesctiption.Assign(value);
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Sys_User_Base_Depart", Storage="_Sys_User", ThisKey="DepartId", OtherKey="DepartId", DeleteRule="NO ACTION")]
 		public EntitySet<Sys_User> Sys_User
 		{
@@ -2042,18 +2026,6 @@ namespace Model
 			}
 		}
 		
-		private void attach_Base_QuantityDesctiption(Base_QuantityDesctiption entity)
-		{
-			this.SendPropertyChanging();
-			entity.Base_Depart = this;
-		}
-		
-		private void detach_Base_QuantityDesctiption(Base_QuantityDesctiption entity)
-		{
-			this.SendPropertyChanging();
-			entity.Base_Depart = null;
-		}
-		
 		private void attach_Sys_User(Sys_User entity)
 		{
 			this.SendPropertyChanging();
@@ -2667,8 +2639,6 @@ namespace Model
 		
 		private System.Nullable<decimal> _PlanMHRsUnit;
 		
-		private EntityRef<Base_Depart> _Base_Depart;
-		
 		private EntityRef<Base_DisciplinesWBS> _Base_DisciplinesWBS;
 		
 		private EntitySet<Editor_KeyQuantity> _Editor_KeyQuantity;
@@ -2691,7 +2661,6 @@ namespace Model
 		
 		public Base_QuantityDesctiption()
 		{
-			this._Base_Depart = default(EntityRef<Base_Depart>);
 			this._Base_DisciplinesWBS = default(EntityRef<Base_DisciplinesWBS>);
 			this._Editor_KeyQuantity = new EntitySet<Editor_KeyQuantity>(new Action<Editor_KeyQuantity>(this.attach_Editor_KeyQuantity), new Action<Editor_KeyQuantity>(this.detach_Editor_KeyQuantity));
 			OnCreated();
@@ -2728,10 +2697,6 @@ namespace Model
 			{
 				if ((this._DepartId != value))
 				{
-					if (this._Base_Depart.HasLoadedOrAssignedValue)
-					{
-						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
-					}
 					this.OnDepartIdChanging(value);
 					this.SendPropertyChanging();
 					this._DepartId = value;
@@ -2805,40 +2770,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Base_QuantityDesctiption_Base_Depart", Storage="_Base_Depart", ThisKey="DepartId", OtherKey="DepartId", IsForeignKey=true)]
-		public Base_Depart Base_Depart
-		{
-			get
-			{
-				return this._Base_Depart.Entity;
-			}
-			set
-			{
-				Base_Depart previousValue = this._Base_Depart.Entity;
-				if (((previousValue != value) 
-							|| (this._Base_Depart.HasLoadedOrAssignedValue == false)))
-				{
-					this.SendPropertyChanging();
-					if ((previousValue != null))
-					{
-						this._Base_Depart.Entity = null;
-						previousValue.Base_QuantityDesctiption.Remove(this);
-					}
-					this._Base_Depart.Entity = value;
-					if ((value != null))
-					{
-						value.Base_QuantityDesctiption.Add(this);
-						this._DepartId = value.DepartId;
-					}
-					else
-					{
-						this._DepartId = default(string);
-					}
-					this.SendPropertyChanged("Base_Depart");
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Base_QuantityDesctiption_Base_DisciplinesWBS", Storage="_Base_DisciplinesWBS", ThisKey="DisciplinesWBSId", OtherKey="DisciplinesWBSId", IsForeignKey=true)]
 		public Base_DisciplinesWBS Base_DisciplinesWBS
 		{
@@ -6024,6 +5955,8 @@ namespace Model
 		
 		private string _ProjectControl_ProjectType;
 		
+		private System.Nullable<System.DateTime> _ProjectControl_RFSU_CloseDate;
+		
 		private EntitySet<Design_Input> _Design_Input;
 		
 		private EntitySet<Editor_AreaConcern> _Editor_AreaConcern;
@@ -6460,6 +6393,8 @@ namespace Model
     partial void OnPM_Pre_ApprovalChanged();
     partial void OnProjectControl_ProjectTypeChanging(string value);
     partial void OnProjectControl_ProjectTypeChanged();
+    partial void OnProjectControl_RFSU_CloseDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnProjectControl_RFSU_CloseDateChanged();
     #endregion
 		
 		public Editor_EProject()
@@ -10540,6 +10475,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectControl_RFSU_CloseDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> ProjectControl_RFSU_CloseDate
+		{
+			get
+			{
+				return this._ProjectControl_RFSU_CloseDate;
+			}
+			set
+			{
+				if ((this._ProjectControl_RFSU_CloseDate != value))
+				{
+					this.OnProjectControl_RFSU_CloseDateChanging(value);
+					this.SendPropertyChanging();
+					this._ProjectControl_RFSU_CloseDate = value;
+					this.SendPropertyChanged("ProjectControl_RFSU_CloseDate");
+					this.OnProjectControl_RFSU_CloseDateChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Design_Input_Editor_EProject", Storage="_Design_Input", ThisKey="EProjectId", OtherKey="EProjectId", DeleteRule="NO ACTION")]
 		public EntitySet<Design_Input> Design_Input
 		{
@@ -11592,6 +11547,8 @@ namespace Model
 		
 		private System.Nullable<decimal> _PlanMHRsUnit;
 		
+		private string _Type;
+		
 		private EntityRef<Base_QuantityDesctiption> _Base_QuantityDesctiption;
 		
 		private EntityRef<Editor_EProject> _Editor_EProject;
@@ -11618,6 +11575,8 @@ namespace Model
     partial void OnQuantityDesctiptionChanged();
     partial void OnPlanMHRsUnitChanging(System.Nullable<decimal> value);
     partial void OnPlanMHRsUnitChanged();
+    partial void OnTypeChanging(string value);
+    partial void OnTypeChanged();
     #endregion
 		
 		public Editor_KeyQuantity()
@@ -11815,6 +11774,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Type", DbType="NVarChar(50)")]
+		public string Type
+		{
+			get
+			{
+				return this._Type;
+			}
+			set
+			{
+				if ((this._Type != value))
+				{
+					this.OnTypeChanging(value);
+					this.SendPropertyChanging();
+					this._Type = value;
+					this.SendPropertyChanged("Type");
+					this.OnTypeChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Editor_KeyQuantity_Base_QuantityDesctiption", Storage="_Base_QuantityDesctiption", ThisKey="KeyId", OtherKey="KeyId", IsForeignKey=true)]
 		public Base_QuantityDesctiption Base_QuantityDesctiption
 		{