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 @@ - + + + + + <%-- 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(); + 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; /// - /// btnImport 控件。 + /// rbOutType 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Button btnImport; + protected global::FineUIPro.RadioButtonList rbOutType; /// /// btnOut 控件。 @@ -212,6 +212,15 @@ namespace FineUIPro.Web.Transfer /// protected global::FineUIPro.Button btnOut; + /// + /// btnImport 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnImport; + /// /// lbPhotoesImageUrl 控件。 ///