From f9a40c32f8fa030275f4076c6d44d21f2e39ca81 Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Wed, 12 Feb 2025 15:51:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E4=BA=A4=E7=AE=A1=E7=90=86=E8=B0=83?=
 =?UTF-8?q?=E4=BC=98=EF=BC=9A=201=E3=80=81=E5=B0=BE=E9=A1=B9=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E8=A1=A5=E5=85=85=E8=B4=A3=E4=BB=BB=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E4=B8=8B=E6=8B=89=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=9B=202=E3=80=81=E5=B0=BE=E9=A1=B9=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=8C=E8=A1=A5=E5=85=85=E5=AE=8C=E6=88=90=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=9B=203=E3=80=81?=
 =?UTF-8?q?=E7=A7=BB=E4=BA=A4=E5=9B=BE=E8=A1=A8-=E5=B0=BE=E9=A1=B9?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=BB=9F=E8=AE=A1=E8=A1=A8=EF=BC=8C=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=96=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/BLL/BLL.csproj                           |  1 +
 SGGL/BLL/Transfer/PunchlistFromService.cs     | 45 +++++++++
 .../Transfer/Chart/PunchlistFromChartNew.aspx | 36 +++----
 .../Chart/PunchlistFromChartNew.aspx.cs       |  2 +-
 .../FineUIPro.Web/Transfer/PunchlistFrom.aspx | 49 ++++++----
 .../Transfer/PunchlistFrom.aspx.cs            | 20 ++--
 .../Transfer/PunchlistFrom.aspx.designer.cs   | 98 +++++++++++--------
 SGGL/FineUIPro.Web/Web.config                 |  4 +-
 8 files changed, 169 insertions(+), 86 deletions(-)
 create mode 100644 SGGL/BLL/Transfer/PunchlistFromService.cs

diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj
index 399763c9..de45cb1e 100644
--- a/SGGL/BLL/BLL.csproj
+++ b/SGGL/BLL/BLL.csproj
@@ -804,6 +804,7 @@
     <Compile Include="TestRun\TestRunConstructSolutionService.cs" />
     <Compile Include="TestRun\TestRunService.cs" />
     <Compile Include="BoSheng\BOSHENGMonitorService.cs" />
+    <Compile Include="Transfer\PunchlistFromService.cs" />
     <Compile Include="Transfer\PipingService.cs" />
     <Compile Include="Transfer\ProjectSetupService.cs" />
     <Compile Include="Transfer\RotatingEquipmentService.cs" />
diff --git a/SGGL/BLL/Transfer/PunchlistFromService.cs b/SGGL/BLL/Transfer/PunchlistFromService.cs
new file mode 100644
index 00000000..c4b4c34c
--- /dev/null
+++ b/SGGL/BLL/Transfer/PunchlistFromService.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+    public class PunchlistFromService
+    {
+
+
+        /// <summary>
+        ///  责任单位下拉框
+        /// </summary>
+        /// <param name="projectId">项目id</param>
+        /// <param name="dropName">下拉框名字</param>
+        /// <param name="isShowPlease">是否显示请选择</param>
+        public static void InitActionByUnitDropDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease)
+        {
+            var sss = GetActionByUnitDropDownList(projectId);
+            dropName.DataValueField = "string";
+            dropName.DataTextField = "string";
+            dropName.DataSource = GetActionByUnitDropDownList(projectId);
+            dropName.DataBind();
+            if (isShowPlease)
+            {
+                Funs.FineUIPleaseSelect(dropName);
+            }
+        }
+
+        /// <summary>
+        /// 获取责任单位下拉选项
+        /// </summary>
+        /// <param name="projectId">项目id</param>
+        /// <returns></returns>
+        public static List<string> GetActionByUnitDropDownList(string projectId)
+        {
+            var list = (from x in Funs.DB.Transfer_PunchlistFrom
+                        where x.ProjectId == projectId
+                        select x.Action_By).Distinct().OrderBy(x => x).ToList();
+            return list;
+        }
+    }
+}
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx
index 7931068b..13b16f7e 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx
@@ -75,7 +75,7 @@
                             </Items>
                         </f:Tab>
                         
-                        <f:Tab ID="Tab3" Title="按专业统计" BodyPadding="5px" Layout="VBox" IconFont="ListAlt" runat="server">
+                        <f:Tab ID="Tab3" Title="按专业统计" BodyPadding="5px" Layout="Fit" IconFont="ListAlt" runat="server">
                             <Items>
                                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
                                     runat="server" DataKeyNames="Disc" AllowCellEditing="true" EnableColumnLines="true"
@@ -87,7 +87,7 @@
 
                                          <f:GroupField HeaderText="总体情况" TextAlign="Center" >
                                             <Columns>
-                                                <f:RenderField Width="50px" ColumnID="allCount" DataField="allCount" HeaderText="总数" TextAlign="Center" FieldType="Double" />
+                                                <f:RenderField Width="60px" ColumnID="allCount" DataField="allCount" HeaderText="总数" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="70px" ColumnID="allfinshedCount" DataField="allfinshedCount" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="90px" ColumnID="allWUH" DataField="allWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="80px" ColumnID="allBASF" DataField="allBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
@@ -96,7 +96,7 @@
 
                                         <f:GroupField HeaderText="A" TextAlign="Center" >
                                             <Columns>
-                                                <f:RenderField Width="50px" ColumnID="Cat_A_Count" DataField="Cat_A_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
+                                                <f:RenderField Width="60px" ColumnID="Cat_A_Count" DataField="Cat_A_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="70px" ColumnID="Cat_A_Countf" DataField="Cat_A_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="90px" ColumnID="Cat_A_CountWUH" DataField="Cat_A_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="80px" ColumnID="Cat_A_CountBASF" DataField="Cat_A_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
@@ -105,7 +105,7 @@
 
                                         <f:GroupField HeaderText="B" TextAlign="Center">
                                             <Columns>
-                                                <f:RenderField Width="50px" ColumnID="Cat_B_Count" DataField="Cat_B_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
+                                                <f:RenderField Width="60px" ColumnID="Cat_B_Count" DataField="Cat_B_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="70px" ColumnID="Cat_B_Countf" DataField="Cat_B_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="90px" ColumnID="Cat_B_CountWUH" DataField="Cat_B_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="80px" ColumnID="Cat_B_CountBASF" DataField="Cat_B_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
@@ -114,7 +114,7 @@
 
                                         <f:GroupField HeaderText="C" TextAlign="Center" >
                                             <Columns>
-                                                <f:RenderField Width="50px" ColumnID="Cat_C_Count" DataField="Cat_C_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
+                                                <f:RenderField Width="60px" ColumnID="Cat_C_Count" DataField="Cat_C_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="70px" ColumnID="Cat_C_Countf" DataField="Cat_C_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="90px" ColumnID="Cat_C_CountWUH" DataField="Cat_C_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="80px" ColumnID="Cat_C_CountBASF" DataField="Cat_C_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
@@ -123,7 +123,7 @@
 
                                         <f:GroupField HeaderText="D" TextAlign="Center">
                                             <Columns>
-                                                <f:RenderField Width="50px" ColumnID="Cat_D_Count" DataField="Cat_D_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
+                                                <f:RenderField Width="60px" ColumnID="Cat_D_Count" DataField="Cat_D_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="70px" ColumnID="Cat_D_Countf" DataField="Cat_D_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="90px" ColumnID="Cat_D_CountWUH" DataField="Cat_D_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="80px" ColumnID="Cat_D_CountBASF" DataField="Cat_D_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
@@ -144,7 +144,7 @@
                                 </f:Grid>
                             </Items>
                         </f:Tab>
-                        <f:Tab ID="Tab4" Title="按单位统计" BodyPadding="5px" Layout="VBox" IconFont="ListAlt" runat="server">
+                        <f:Tab ID="Tab4" Title="按单位统计" BodyPadding="5px" Layout="Fit" IconFont="ListAlt" runat="server">
                             <Items>
                                 <f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
                                     runat="server" DataKeyNames="Action_By" AllowCellEditing="true" EnableColumnLines="true"
@@ -155,7 +155,7 @@
                                         <f:BoundField DataField="Action_By" ColumnID="Action_By" HeaderText="单位" ExpandUnusedSpace="true" minWidth="80px" TextAlign="Center" />
                                          <f:GroupField HeaderText="总体情况" TextAlign="Center" >
                                             <Columns>
-                                                <f:RenderField Width="50px" ColumnID="allCount" DataField="allCount" HeaderText="总数" TextAlign="Center" FieldType="Double" />
+                                                <f:RenderField Width="60px" ColumnID="allCount" DataField="allCount" HeaderText="总数" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="70px" ColumnID="allfinshedCount" DataField="allfinshedCount" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="90px" ColumnID="allWUH" DataField="allWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="80px" ColumnID="allBASF" DataField="allBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
@@ -166,7 +166,7 @@
 
                                         <f:GroupField HeaderText="A" TextAlign="Center" >
                                             <Columns>
-                                                <f:RenderField Width="50px" ColumnID="Cat_A_Count" DataField="Cat_A_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
+                                                <f:RenderField Width="60px" ColumnID="Cat_A_Count" DataField="Cat_A_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="70px" ColumnID="Cat_A_Countf" DataField="Cat_A_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="90px" ColumnID="Cat_A_CountWUH" DataField="Cat_A_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="80px" ColumnID="Cat_A_CountBASF" DataField="Cat_A_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
@@ -175,7 +175,7 @@
 
                                         <f:GroupField HeaderText="B" TextAlign="Center">
                                             <Columns>
-                                                <f:RenderField Width="50px" ColumnID="Cat_B_Count" DataField="Cat_B_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
+                                                <f:RenderField Width="60px" ColumnID="Cat_B_Count" DataField="Cat_B_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="70px" ColumnID="Cat_B_Countf" DataField="Cat_B_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="90px" ColumnID="Cat_B_CountWUH" DataField="Cat_B_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="80px" ColumnID="Cat_B_CountBASF" DataField="Cat_B_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
@@ -184,7 +184,7 @@
 
                                         <f:GroupField HeaderText="C" TextAlign="Center" >
                                             <Columns>
-                                                <f:RenderField Width="50px" ColumnID="Cat_C_Count" DataField="Cat_C_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
+                                                <f:RenderField Width="60px" ColumnID="Cat_C_Count" DataField="Cat_C_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="70px" ColumnID="Cat_C_Countf" DataField="Cat_C_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="90px" ColumnID="Cat_C_CountWUH" DataField="Cat_C_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="80px" ColumnID="Cat_C_CountBASF" DataField="Cat_C_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
@@ -193,7 +193,7 @@
 
                                         <f:GroupField HeaderText="D" TextAlign="Center">
                                             <Columns>
-                                                <f:RenderField Width="50px" ColumnID="Cat_D_Count" DataField="Cat_D_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
+                                                <f:RenderField Width="60px" ColumnID="Cat_D_Count" DataField="Cat_D_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="70px" ColumnID="Cat_D_Countf" DataField="Cat_D_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="90px" ColumnID="Cat_D_CountWUH" DataField="Cat_D_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="80px" ColumnID="Cat_D_CountBASF" DataField="Cat_D_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
@@ -221,7 +221,7 @@
                                 <f:Grid ID="Grid3" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
                                     runat="server" BoxFlex="1" DataKeyNames="Sub_Sys_No" AllowCellEditing="true" EnableColumnLines="true"
                                     ClicksToEdit="2" DataIDField="Sub_Sys_No" AllowSorting="true" OnSort="Grid3_Sort"
-                                    AllowPaging="true" IsDatabasePaging="true" PageSize="25" OnPageIndexChange="Grid3_PageIndexChange"
+                                    AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid3_PageIndexChange"
                                     EnableRowDoubleClickEvent="true" EnableTextSelection="true"  EnableSummary="true">
                                     <Columns>
 
@@ -241,7 +241,7 @@
 
                                         <f:GroupField HeaderText="A" TextAlign="Center" >
                                             <Columns>
-                                                <f:RenderField Width="50px" ColumnID="Cat_A_Count" DataField="Cat_A_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
+                                                <f:RenderField Width="60px" ColumnID="Cat_A_Count" DataField="Cat_A_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="70px" ColumnID="Cat_A_Countf" DataField="Cat_A_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="90px" ColumnID="Cat_A_CountPercent" DataField="Cat_A_CountPercent" HeaderText="完成率(%)" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="90px" ColumnID="Cat_A_CountWUH" DataField="Cat_A_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
@@ -251,7 +251,7 @@
 
                                         <f:GroupField HeaderText="B" TextAlign="Center">
                                             <Columns>
-                                                <f:RenderField Width="50px" ColumnID="Cat_B_Count" DataField="Cat_B_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
+                                                <f:RenderField Width="60px" ColumnID="Cat_B_Count" DataField="Cat_B_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="70px" ColumnID="Cat_B_Countf" DataField="Cat_B_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="90px" ColumnID="Cat_B_CountPercent" DataField="Cat_B_CountPercent" HeaderText="完成率(%)" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="90px" ColumnID="Cat_B_CountWUH" DataField="Cat_B_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
@@ -261,7 +261,7 @@
 
                                         <f:GroupField HeaderText="C" TextAlign="Center" >
                                             <Columns>
-                                                <f:RenderField Width="50px" ColumnID="Cat_C_Count" DataField="Cat_C_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
+                                                <f:RenderField Width="60px" ColumnID="Cat_C_Count" DataField="Cat_C_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="70px" ColumnID="Cat_C_Countf" DataField="Cat_C_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="90px" ColumnID="Cat_C_CountPercent" DataField="Cat_C_CountPercent" HeaderText="完成率(%)" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="90px" ColumnID="Cat_C_CountWUH" DataField="Cat_C_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
@@ -271,7 +271,7 @@
 
                                         <f:GroupField HeaderText="D" TextAlign="Center">
                                             <Columns>
-                                                <f:RenderField Width="50px" ColumnID="Cat_D_Count" DataField="Cat_D_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
+                                                <f:RenderField Width="60px" ColumnID="Cat_D_Count" DataField="Cat_D_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="70px" ColumnID="Cat_D_Countf" DataField="Cat_D_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="90px" ColumnID="Cat_D_CountPercent" DataField="Cat_D_CountPercent" HeaderText="完成率(%)" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="90px" ColumnID="Cat_D_CountWUH" DataField="Cat_D_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
@@ -286,7 +286,7 @@
                                             <f:ListItem Text="10" Value="10"  />
                                             <f:ListItem Text="15" Value="15" />
                                             <f:ListItem Text="20" Value="20" />
-                                            <f:ListItem Text="25" Value="25" Selected="true"/>
+                                            <f:ListItem Text="25" Value="25"/>
                                             <f:ListItem Text="所有行" Value="100000" />
                                         </f:DropDownList>
                                     </PageItems>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.cs
index 9210d4cc..0fe4eb69 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.cs
@@ -525,7 +525,7 @@ namespace FineUIPro.Web.Transfer.Chart
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql.ToString(), parameter);
             Grid2.RecordCount = tb.Rows.Count;
-            var table = this.GetPagedDataTable(Grid1, tb);
+            var table = this.GetPagedDataTable(Grid2, tb);
             Grid2.DataSource = table;
             Grid2.DataBind();
 
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
index be9f5ebe..58ffe0ba 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
@@ -23,25 +23,15 @@
                             <Items>
                                 <f:TextBox runat="server" ID="txtSystem_No" Label="System No" LabelWidth="100px" LabelAlign="Right" Width="180px"></f:TextBox>
                                 <f:TextBox runat="server" ID="txtSub_Sys_No" Label="Turnover System Code" LabelWidth="180px" LabelAlign="Right"></f:TextBox>
-                                <f:DropDownList ID="ddlCat" runat="server" Label="Cat." AutoPostBack="true" Width="80px" LabelWidth="40px">
-                                    <f:ListItem Value="" Text=""></f:ListItem>
-                                    <f:ListItem Value="A" Text="A"></f:ListItem>
-                                    <f:ListItem Value="B" Text="B"></f:ListItem>
-                                    <f:ListItem Value="C" Text="C"></f:ListItem>
-                                    <f:ListItem Value="D" Text="D"></f:ListItem>
-                                </f:DropDownList>
                                 <f:TextBox runat="server" ID="txtRaised_By" Label="Raised By" LabelWidth="90px" LabelAlign="Right" Width="150px"></f:TextBox>
                                 <f:TextBox runat="server" ID="txtDisc" Label="Disc" LabelWidth="40px" LabelAlign="Right" Width="120px"></f:TextBox>
-                                <f:DropDownList ID="ddlPunchType" runat="server" Label="Punch Type" AutoPostBack="true" Width="170px" LabelWidth="100px">
-                                    <f:ListItem Value="" Text=""></f:ListItem>
-                                    <f:ListItem Value="PWD" Text="PWD"></f:ListItem>
-                                    <%--<f:ListItem Value="FWD" Text="FWD"></f:ListItem>--%>
-                                    <f:ListItem Value="JWD" Text="JWD"></f:ListItem>
-                                </f:DropDownList>
+
+                                
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
 
                                 <f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
                                 </f:Button>
-
+                                
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
 
                                 <f:Button ID="btnNew" Icon="Add" EnablePostBack="false" runat="server" ToolTip="新增" Hidden="true">
@@ -50,11 +40,15 @@
                                 </f:Button>
                             </Items>
                         </f:Toolbar>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                        <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                                <f:TextBox runat="server" ID="txtAction_By" Label="责任单位" LabelWidth="80px" LabelAlign="Right" Width="180px"></f:TextBox>
-                                <f:TextBox runat="server" ID="txtPIC" Label="责任人PIC" LabelWidth="90px" LabelAlign="Right" Width="170px"></f:TextBox>
-                                <f:TextBox runat="server" ID="txtPIC_WUH" Label="责任人-五环/PIC-WUH" LabelWidth="160px" LabelAlign="Right" Width="240px"></f:TextBox>
+                                <f:DropDownList ID="ddlCat" runat="server" Label="Cat." AutoPostBack="true" Width="80px" LabelWidth="40px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
+                                    <f:ListItem Value="A" Text="A"></f:ListItem>
+                                    <f:ListItem Value="B" Text="B"></f:ListItem>
+                                    <f:ListItem Value="C" Text="C"></f:ListItem>
+                                    <f:ListItem Value="D" Text="D"></f:ListItem>
+                                </f:DropDownList>
                                 <f:DropDownList ID="ddlStatus" runat="server" Label="状态/Status" AutoPostBack="true" Width="190px" LabelWidth="100px">
                                     <f:ListItem Value="" Text=""></f:ListItem>
                                     <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
@@ -73,6 +67,12 @@
                                     <f:ListItem Value="Y2" Text="Y2"></f:ListItem>
                                     <f:ListItem Value="N" Text="N"></f:ListItem>
                                 </f:DropDownList>
+                                <f:DropDownList ID="ddlPunchType" runat="server" Label="Punch Type" AutoPostBack="true" Width="170px" LabelWidth="100px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
+                                    <f:ListItem Value="PWD" Text="PWD"></f:ListItem>
+                                    <%--<f:ListItem Value="FWD" Text="FWD"></f:ListItem>--%>
+                                    <f:ListItem Value="JWD" Text="JWD"></f:ListItem>
+                                </f:DropDownList>
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
                                 <f:RadioButtonList ID="rbOutType" Label="导出" runat="server" LabelWidth="50px" Width="180px">
                                     <f:RadioItem Text="无图" Value="0" Selected="true" />
@@ -85,6 +85,19 @@
                                 </f:Button>
                             </Items>
                         </f:Toolbar>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:DropDownList ID="ddlAction_By" runat="server" Label="责任单位" AutoPostBack="true" Width="220px" LabelWidth="80px">
+                                </f:DropDownList>
+                                <%--<f:TextBox runat="server" ID="txtAction_By" Label="责任单位" LabelWidth="80px" LabelAlign="Right" Width="180px"></f:TextBox>--%>
+                                <f:TextBox runat="server" ID="txtPIC" Label="责任人PIC" LabelWidth="90px" LabelAlign="Right" Width="170px"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtPIC_WUH" Label="责任人-五环/PIC-WUH" LabelWidth="160px" LabelAlign="Right" Width="240px"></f:TextBox>
+                                
+                                <f:DatePicker runat="server" Label="Required Date" ID="txtEndRequired_Date" LabelAlign="Right" LabelWidth="110px"
+                                    Width="220px">
+                                </f:DatePicker>
+                            </Items>
+                        </f:Toolbar>
                         <%--<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
                                 <f:DatePicker runat="server" Label="Date Raised" ID="txtStartDate_Raised" LabelAlign="Right" LabelWidth="100px"
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
index 346b576a..644afa97 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
@@ -31,6 +31,7 @@ namespace FineUIPro.Web.Transfer
             if (!IsPostBack)
             {
                 GetButtonPower();
+                BLL.PunchlistFromService.InitActionByUnitDropDownList(this.ddlAction_By, this.CurrUser.LoginProjectId, true);
                 BindGrid();
 
                 this.btnNew.OnClientClick = Window1.GetShowReference("PunchlistFromEdit.aspx") + "return false;";
@@ -77,11 +78,11 @@ namespace FineUIPro.Web.Transfer
             //    strSql += " AND Required_Date >= @StartRequired_Date";
             //    listStr.Add(new SqlParameter("@StartRequired_Date", Funs.GetNewDateTime(txtStartRequired_Date.Text.Trim())));
             //}
-            //if (!string.IsNullOrEmpty(txtEndRequired_Date.Text.Trim()))
-            //{
-            //    strSql += " AND Required_Date <= @EndRequired_Date";
-            //    listStr.Add(new SqlParameter("@EndRequired_Date", Funs.GetNewDateTime(txtEndRequired_Date.Text.Trim())));
-            //}
+            if (!string.IsNullOrEmpty(txtEndRequired_Date.Text.Trim()))
+            {
+                strSql += " AND Required_Date <= @EndRequired_Date";
+                listStr.Add(new SqlParameter("@EndRequired_Date", Funs.GetNewDateTime(txtEndRequired_Date.Text.Trim())));
+            }
             //if (!string.IsNullOrEmpty(txtStartActual_Date.Text.Trim()))
             //{
             //    strSql += " AND Actual_Date >= @StartActual_Date";
@@ -117,10 +118,15 @@ namespace FineUIPro.Web.Transfer
                 strSql += " AND Cat = @Cat";
                 listStr.Add(new SqlParameter("@Cat", ddlCat.SelectedValue.Trim()));
             }
-            if (!string.IsNullOrEmpty(txtAction_By.Text.Trim()))
+            //if (!string.IsNullOrEmpty(txtAction_By.Text.Trim()))
+            //{
+            //    strSql += " AND Action_By = @Action_By";
+            //    listStr.Add(new SqlParameter("@Action_By", txtAction_By.Text.Trim()));
+            //}
+            if (ddlAction_By.SelectedValue != BLL.Const._Null)
             {
                 strSql += " AND Action_By = @Action_By";
-                listStr.Add(new SqlParameter("@Action_By", txtAction_By.Text.Trim()));
+                listStr.Add(new SqlParameter("@Action_By", ddlAction_By.SelectedValue.Trim()));
             }
             if (!string.IsNullOrEmpty(txtPIC.Text.Trim()))
             {
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
index 16021185..1ab82cbc 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
@@ -77,15 +77,6 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.TextBox txtSub_Sys_No;
 
-        /// <summary>
-        /// ddlCat 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownList ddlCat;
-
         /// <summary>
         /// txtRaised_By 控件。
         /// </summary>
@@ -104,15 +95,6 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.TextBox txtDisc;
 
-        /// <summary>
-        /// ddlPunchType 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownList ddlPunchType;
-
         /// <summary>
         /// btnSearch 控件。
         /// </summary>
@@ -141,40 +123,22 @@ namespace FineUIPro.Web.Transfer
         protected global::FineUIPro.Button btnClear;
 
         /// <summary>
-        /// Toolbar2 控件。
+        /// Toolbar1 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Toolbar Toolbar2;
+        protected global::FineUIPro.Toolbar Toolbar1;
 
         /// <summary>
-        /// txtAction_By 控件。
+        /// ddlCat 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtAction_By;
-
-        /// <summary>
-        /// txtPIC 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtPIC;
-
-        /// <summary>
-        /// txtPIC_WUH 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtPIC_WUH;
+        protected global::FineUIPro.DropDownList ddlCat;
 
         /// <summary>
         /// ddlStatus 控件。
@@ -203,6 +167,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlMatI;
 
+        /// <summary>
+        /// ddlPunchType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPunchType;
+
         /// <summary>
         /// rbOutType 控件。
         /// </summary>
@@ -230,6 +203,51 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Button btnImport;
 
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// ddlAction_By 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlAction_By;
+
+        /// <summary>
+        /// txtPIC 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtPIC;
+
+        /// <summary>
+        /// txtPIC_WUH 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtPIC_WUH;
+
+        /// <summary>
+        /// txtEndRequired_Date 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndRequired_Date;
+
         /// <summary>
         /// lbPhotoesImageUrl 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config
index 58dd68d6..6c177656 100644
--- a/SGGL/FineUIPro.Web/Web.config
+++ b/SGGL/FineUIPro.Web/Web.config
@@ -11,7 +11,7 @@
   <FineUIPro DebugMode="true" Theme="Cupertino"/>
   <appSettings>
     <!--连接字符串-->
-    <add key="ConnectionString" value="Server=.\SQL2012;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
+    <add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
     <!--<add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
     <!--系统名称-->
     <add key="SystemName" value="智慧施工管理信息系统V1.0"/>
@@ -77,7 +77,7 @@
       <add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
       <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
     </httpHandlers>
-    <compilation debug="false" targetFramework="4.6.1"/>
+    <compilation debug="true" targetFramework="4.6.1"/>
     <httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
     <authentication mode="Forms">
       <forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>