From e53561a66759c193e28717b27a68c091fe598f7c Mon Sep 17 00:00:00 2001
From: 10191 <506754232@qq.com>
Date: Wed, 30 Jul 2025 09:40:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=A4=B4=E5=83=8F=E5=88=B0?=
 =?UTF-8?q?=E7=99=BE=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/WelderManage/WelderManage.aspx     |  2 +-
 .../common/WelderManage/WelderSave.aspx       | 38 +++++++----
 .../common/WelderManage/WelderSave.aspx.cs    |  4 ++
 .../WelderManage/WelderSave.aspx.designer.cs  | 63 +++++++++++++------
 4 files changed, 77 insertions(+), 30 deletions(-)
diff --git a/HJGL_DS/FineUIPro.Web/common/WelderManage/WelderManage.aspx b/HJGL_DS/FineUIPro.Web/common/WelderManage/WelderManage.aspx
index 9ec89c5..59f26f6 100644
--- a/HJGL_DS/FineUIPro.Web/common/WelderManage/WelderManage.aspx
+++ b/HJGL_DS/FineUIPro.Web/common/WelderManage/WelderManage.aspx
@@ -134,7 +134,7 @@
             </f:Grid>
         </Items>
     </f:Panel>    
-    <f:Window ID="WindowWelderSave" Title="焊工信息" Hidden="true" EnableIFrame="true"
+    <f:Window ID="WindowWelderSave" Title="焊工信息" Hidden="true" EnableIFrame="true" 
         EnableMaximize="true" Target="Top" EnableResize="true" runat="server"
         IsModal="true" Width="900px" Height="520px" OnClose="Window1_Close">
     </f:Window>   
diff --git a/HJGL_DS/FineUIPro.Web/common/WelderManage/WelderSave.aspx b/HJGL_DS/FineUIPro.Web/common/WelderManage/WelderSave.aspx
index 719344c..2c56004 100644
--- a/HJGL_DS/FineUIPro.Web/common/WelderManage/WelderSave.aspx
+++ b/HJGL_DS/FineUIPro.Web/common/WelderManage/WelderSave.aspx
@@ -5,11 +5,17 @@
 <head runat="server">
     <title>人员管理</title>
     <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
+     <style id="Style1" runat="server" type="text/css">          
+     .headImage { width:100px !important; }
+     </style>
 </head>
 <body>
     <form id="form1" runat="server">
     <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-    <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+    <f:Panel ID="Panel1" runat="server" ShowHeader="false" ShowBorder="false" ColumnWidth="100%" MarginRight="5px"  Layout="HBox">
+         <Items>
+  
+             <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"  BoxFlex="5"
         BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
         <Rows>
             <f:FormRow>
@@ -85,16 +91,8 @@
                     </f:Image>
                 </Items>
             </f:FormRow>
-             <f:FormRow>
-                 <Items>
-                     <f:FileUpload ID="filePhoto1" runat="server" ButtonText="上传头像到百度" ButtonOnly="true"
-                         AutoPostBack="true" OnFileSelected="filePhoto1_FileSelected">
-                     </f:FileUpload>
-                     <f:Image ID="imgPhoto1" CssClass="userphoto" runat="server" BoxFlex="1" MarginLeft="10px" CssStyle="width:300px;hight:400px" Width="300px" Height="400px">
-                     </f:Image>
-                 </Items>
-            </f:FormRow>
-
+             
+             
         </Rows>
         <Toolbars>
             <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Right">
@@ -114,6 +112,24 @@
             </f:Toolbar>
         </Toolbars>
     </f:Form>
+   
+        
+
+            <f:Panel ID="Panel5" Title="面板1" BoxFlex="1" runat="server" ShowBorder="false" ShowHeader="false"
+                Layout="VBox">
+                <Items>
+                    <f:Image ID="imgPhoto1" CssClass="userphoto" ImageUrl="~/res/images/blank_150.png"
+                        runat="server" BoxFlex="1">
+                    </f:Image>
+                     <f:FileUpload ID="filePhoto1" runat="server" ButtonText="上传头像到百度" ButtonOnly="true"
+                     AutoPostBack="true" OnFileSelected="filePhoto1_FileSelected">
+                 </f:FileUpload>
+
+                </Items>
+            </f:Panel>
+          </Items>
+           </f:Panel>
+
     <f:Window ID="Window1" runat="server" Hidden="true" IsModal="false" Target="Top"
         EnableMaximize="true" EnableResize="true" Title="弹出框" CloseAction="HidePostBack"
         EnableIFrame="true">
diff --git a/HJGL_DS/FineUIPro.Web/common/WelderManage/WelderSave.aspx.cs b/HJGL_DS/FineUIPro.Web/common/WelderManage/WelderSave.aspx.cs
index a2351e0..909d8e0 100644
--- a/HJGL_DS/FineUIPro.Web/common/WelderManage/WelderSave.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/common/WelderManage/WelderSave.aspx.cs
@@ -157,6 +157,10 @@
                 {
                     imgPhoto.ImageUrl = person.SignatureUrl;
                 }
+                if (!string.IsNullOrEmpty(person.PhotoUrl))
+                {
+                    imgPhoto1.ImageUrl = person.PhotoUrl;
+                }
             }
             else
             {
diff --git a/HJGL_DS/FineUIPro.Web/common/WelderManage/WelderSave.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/common/WelderManage/WelderSave.aspx.designer.cs
index 6da9942..ac10f97 100644
--- a/HJGL_DS/FineUIPro.Web/common/WelderManage/WelderSave.aspx.designer.cs
+++ b/HJGL_DS/FineUIPro.Web/common/WelderManage/WelderSave.aspx.designer.cs
@@ -14,6 +14,15 @@ namespace FineUIPro.Web.common.WelderManage
     public partial class WelderSave
     {
 
+        /// <summary>
+        /// Style1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl Style1;
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -32,6 +41,15 @@ namespace FineUIPro.Web.common.WelderManage
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
 
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -185,24 +203,6 @@ namespace FineUIPro.Web.common.WelderManage
         /// </remarks>
         protected global::FineUIPro.Image imgPhoto;
 
-        /// <summary>
-        /// filePhoto1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.FileUpload filePhoto1;
-
-        /// <summary>
-        /// imgPhoto1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Image imgPhoto1;
-
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -239,6 +239,33 @@ namespace FineUIPro.Web.common.WelderManage
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
 
+        /// <summary>
+        /// Panel5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel5;
+
+        /// <summary>
+        /// imgPhoto1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Image imgPhoto1;
+
+        /// <summary>
+        /// filePhoto1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.FileUpload filePhoto1;
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
