From d1d6353e0a31cb08355d69eb5f512c8b25bbf910 Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Thu, 9 Jan 2025 16:04:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E4=BA=A4=E7=AE=A1=E7=90=86=EF=BC=8C?=
 =?UTF-8?q?=E5=B0=BE=E9=A1=B9=E7=AE=A1=E7=90=86=E5=AF=BC=E5=87=BA=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E4=B8=8D=E5=B8=A6=E5=9B=BE=E7=89=87=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx      |  8 ++++++--
 SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs   |  8 ++++++--
 .../Transfer/PunchlistFrom.aspx.designer.cs         | 13 +++++++++++--
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
index fc6e24b4..c66ad357 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
@@ -74,11 +74,15 @@
                                     <f:ListItem Value="N" Text="N"></f:ListItem>
                                 </f:DropDownList>
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                <f:Button ID="btnImport" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true">
-                                </f:Button>
+                                <f:RadioButtonList ID="rbOutType" Label="导出" runat="server" LabelWidth="50px">
+                                    <f:RadioItem Text="无图" Value="0" Selected="true" />
+                                    <f:RadioItem Text="有图" Value="1" />
+                                </f:RadioButtonList>
                                 <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
                                     EnableAjax="false" DisableControlBeforePostBack="false">
                                 </f:Button>
+                                <f:Button ID="btnImport" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true">
+                                </f:Button>
                             </Items>
                         </f:Toolbar>
                         <%--<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
index 97e84cf7..d40e559b 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
@@ -457,8 +457,12 @@ namespace FineUIPro.Web.Transfer
 
             NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0);
 
-            var pcList = Funs.DB.AttachFile.Where(p => p.MenuId == BLL.Const.PunchlistFromMenuId && p.AttachUrl != null && p.AttachUrl != "").ToList();
-
+            //var pcList = Funs.DB.AttachFile.Where(p => p.MenuId == BLL.Const.PunchlistFromMenuId && p.AttachUrl != null && p.AttachUrl != "").ToList();
+            var pcList = new List<Model.AttachFile>();
+            if (rbOutType.SelectedValue == "1")
+            {//导出带图片
+                pcList = Funs.DB.AttachFile.Where(p => p.MenuId == BLL.Const.PunchlistFromMenuId && p.AttachUrl != null && p.AttachUrl != "").ToList();
+            }
             int i = 2;
             foreach (DataRow tbRow in tb.Rows)
             {
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
index a4598406..66400c38 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
@@ -195,13 +195,13 @@ namespace FineUIPro.Web.Transfer
         protected global::FineUIPro.DropDownList ddlMatI;
 
         /// <summary>
-        /// btnImport 控件。
+        /// rbOutType 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Button btnImport;
+        protected global::FineUIPro.RadioButtonList rbOutType;
 
         /// <summary>
         /// btnOut 控件。
@@ -212,6 +212,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
 
+        /// <summary>
+        /// btnImport 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnImport;
+
         /// <summary>
         /// lbPhotoesImageUrl 控件。
         /// </summary>