feat: 完善材料管理与焊接业务功能

2026-08-06 15:33:11 +08:00
parent e418b60fdb
commit 1de898812e
49 changed files with 2566 additions and 555 deletions
@@ -67,7 +67,7 @@
                                    OnClick="btnDelete_Click">
                                </f:Button>
                                <f:Button ID="btnPrint" Text="打印" Icon="Printer" runat="server"
-                                    OnClick="btnPrint_Click">
+                                    MenuID="MenuPrint" ShowMenuIcon="true">
                                </f:Button>
                            </Items>
                        </f:Toolbar>
@@ -182,6 +182,10 @@
                  EnableMaximize="true" Target="Top" EnableResize="false" runat="server" 
                  IsModal="true" Width="1010px" Height="660px">
        </f:Window>
+        <f:Menu ID="MenuPrint" runat="server">
+            <f:MenuButton ID="btnPrintAttachment4" EnablePostBack="true" runat="server" Text="附件4：管道焊口检测委托单" Icon="Printer" OnClick="btnPrintAttachment4_Click" />
+            <f:MenuButton ID="btnPrintAttachment6" EnablePostBack="true" runat="server" Text="附件6：无损检测委托单（附页）" Icon="Printer" OnClick="btnPrintAttachment6_Click" />
+        </f:Menu>
    </form>
    <script type="text/javascript">
        function reloadGrid() {
@@ -449,6 +449,21 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand
            }
        }

+        protected void btnPrintAttachment4_Click(object sender, EventArgs e)
+        {
+            ViewState["TrustPrintTemplate"] = "附件4";
+            btnPrint_Click(sender, e);
+        }
+
+        protected void btnPrintAttachment6_Click(object sender, EventArgs e)
+        {
+            ViewState["TrustPrintTemplate"] = "附件6";
+            btnPrint_Click(sender, e);
+        }
+
+        /// <summary>
+        /// 按所选模板打印返修委托单。两个模板均保留返修页面的当前明细数据源。
+        /// </summary>
        protected void btnPrint_Click(object sender, EventArgs e)
        {
            DataTable dt = new DataTable("Table1");
@@ -548,7 +563,9 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand
                // Session["CH_TrustID"] = reportId;
                string initTemplatePath = "";
                string rootPath = Server.MapPath("~/");
-                initTemplatePath = "File\\Fastreport\\管道焊口返修委托单NoPic.frx";
+                initTemplatePath = (ViewState["TrustPrintTemplate"] as string) == "附件6"
+                    ? "File\\Fastreport\\无损检测委托单_附件6.frx"
+                    : "File\\Fastreport\\管道焊口检测委托单_附件4.frx";

                if (File.Exists(rootPath + initTemplatePath))
                {
@@ -290,5 +290,20 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Window Window2;
+
+        /// <summary>
+        /// MenuPrint 控件。
+        /// </summary>
+        protected global::FineUIPro.Menu MenuPrint;
+
+        /// <summary>
+        /// btnPrintAttachment4 控件。
+        /// </summary>
+        protected global::FineUIPro.MenuButton btnPrintAttachment4;
+
+        /// <summary>
+        /// btnPrintAttachment6 控件。
+        /// </summary>
+        protected global::FineUIPro.MenuButton btnPrintAttachment6;
    }
 }