diff --git a/SGGL/BLL/ProjectData/UnitWorkService.cs b/SGGL/BLL/ProjectData/UnitWorkService.cs
index 8e681db9..884d35cc 100644
--- a/SGGL/BLL/ProjectData/UnitWorkService.cs
+++ b/SGGL/BLL/ProjectData/UnitWorkService.cs
@@ -192,6 +192,16 @@ namespace BLL
return (from x in Funs.DB.WBS_UnitWork where x.UnitWorkCode == UnitWorkCode select x).ToList();
}
+ ///
+ /// 根据项目Id获取单位工程信息
+ ///
+ ///
+ ///
+ public static List GetUnitWorkByProjectId(string projectId)
+ {
+ return (from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId select x).ToList();
+ }
+
///
/// 下拉框选择(获取 text value)
///
diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx
index a1feb729..99ef4fc0 100644
--- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx
+++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx
@@ -416,6 +416,9 @@
审批完成
+
+
+ 已审待施工
呼叫
diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan1.designer.cs b/SGGL/FineUIPro.Web/App_GlobalResources/Lan1.designer.cs
index 94b02e68..8126a68e 100644
--- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan1.designer.cs
+++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan1.designer.cs
@@ -105,6 +105,15 @@ namespace Resources {
}
}
+ ///
+ /// 查找类似 已审待施工 的本地化字符串。
+ ///
+ internal static string ApprovalCompletedUnderConstruction {
+ get {
+ return ResourceManager.GetString("ApprovalCompletedUnderConstruction", resourceCulture);
+ }
+ }
+
///
/// 查找类似 材料到货 的本地化字符串。
///
diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagement.aspx b/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagement.aspx
index a862f219..75b65a56 100644
--- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagement.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagement.aspx
@@ -35,6 +35,8 @@
+
+
@@ -91,6 +93,10 @@
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
Width="800px" Height="500px">
+
+