diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo
index 98c9e3cf..25628b52 100644
Binary files a/.vs/SGGL_SeDin/v17/.wsuo and b/.vs/SGGL_SeDin/v17/.wsuo differ
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx
index 292d9b50..2455ccd5 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx
@@ -58,7 +58,7 @@
                                 </f:Button>
                                 <f:Button ID="btnNew" Text="新增" Icon="Add" runat="server" OnClick="btnNew_Click">
                                 </f:Button>
-                                <f:Button ID="btnBatchAdd" Text="批量增加" Icon="TableAdd"
+                                <f:Button ID="btnBatchAdd" Text="批量增加" Icon="TableAdd" Hidden="true"
                                     runat="server" OnClick="btnBatchAdd_Click">
                                 </f:Button>
                                 <f:Button ID="btnAutoInput" Text="自动录入" Icon="Add" runat="server" OnClick="btnAutoInput_Click">
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs
index ee570cef..520a730f 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs
@@ -217,10 +217,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         {
             Model.HJGL_Pipeline pipeline = BLL.PipelineService.GetPipelineByPipelineId(this.tvControlItem.SelectedNodeID);
             this.hdUnitWorkId.Text = string.Empty;
-            if (pipeline != null)
-            {
-                this.hdUnitWorkId.Text = this.tvControlItem.SelectedNode.ParentNode.NodeID;
-            }
+        
             if (e.CommandName == "加载")
             {
                 string CommandName = e.Node.ParentNode.CommandName;
@@ -229,7 +226,22 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 treeNode.Nodes.Remove(e.Node);
                 BindNodes(e.Node.ParentNode);
             }
-            this.BindGrid();
+            else
+            {
+                if (pipeline != null)
+                {
+                    this.hdUnitWorkId.Text = this.tvControlItem.SelectedNode.ParentNode.NodeID;
+                    this.BindGrid();
+                }
+                else
+                {
+                    this.hdUnitWorkId.Text = this.tvControlItem.SelectedNodeID;
+                    ckIsAudit.Checked = true;
+                    NoAuditBindGrid();
+                }
+
+            }
+         
         }
         protected void tvControlItem_TreeNodeExpanded(object sender, TreeNodeEventArgs e)
         {
@@ -287,6 +299,49 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             Grid1.DataSource = table;
             Grid1.DataBind();
         }
+
+        private void NoAuditBindGrid()
+        {
+            string strSql = @"SELECT WeldJointId,WeldJointCode,PipelineId,PipelineCode,JointAttribute,TwoJointType,
+                                     ComponentsCode1,ComponentsCode2,IsWelding,IsHotProessStr,Material1Code,Material2Code,
+                                     WeldTypeCode,Specification,HeartNo1,HeartNo2,Size,Dia,Thickness,GrooveTypeCode,
+                                     WeldingMethodCode,WeldingWireCode,WeldingRodCode,WeldingDate,WeldingDailyCode,
+                                     BackingWelderCode,CoverWelderCode,MediumCode ,PreTemperature,JointArea,WPQCode,Remark,
+                                     (CASE WHEN AuditDate IS NOT NULL THEN '已审核' ELSE '未审核' END) AS IsAudit,
+									 subMan.PersonName AS SubmitMan,auditMan.PersonName AS AuditMan,AuditDate
+							  FROM View_HJGL_WeldJoint 
+							  LEFT JOIN dbo.Person_Persons auditMan ON auditMan.PersonId=View_HJGL_WeldJoint.AuditMan
+							  LEFT JOIN dbo.Person_Persons subMan ON subMan.PersonId=View_HJGL_WeldJoint.SubmitMan
+                              WHERE IsTwoJoint = 1";
+            List<SqlParameter> listStr = new List<SqlParameter> { };
+
+            strSql += " AND UnitWorkId =@UnitWorkId";
+            listStr.Add(new SqlParameter("@UnitWorkId", this.tvControlItem.SelectedNodeID));
+
+            if (!string.IsNullOrEmpty(this.txtWeldJointCode.Text.Trim()))
+            {
+                strSql += " AND WeldJointCode LIKE @WeldJointCode";
+                listStr.Add(new SqlParameter("@WeldJointCode", "%" + this.txtWeldJointCode.Text.Trim() + "%"));
+            }
+            if (DropTwoJointType.SelectedValue != BLL.Const._Null)
+            {
+                strSql += " AND TwoJointType = @TwoJointType";
+                listStr.Add(new SqlParameter("@TwoJointType", DropTwoJointType.SelectedValue));
+            }
+            if (ckIsAudit.Checked == true)
+            {
+                strSql += " and  AuditDate is null";
+            }
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+            // 2.获取当前分页数据
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+
         #endregion
 
         #region 分页排序
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx
index ff527bb8..3f0e943d 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx
@@ -50,9 +50,15 @@
                             <Rows>
                                 <f:FormRow>
                                     <Items>
-                                        <f:TextBox ID="txtWeldJointCode" Label="焊口号" Readonly="true"
-                                            runat="server" FocusOnPageLoad="true" LabelWidth="100px" LabelAlign="Right">
+                                        <f:TextBox ID="txtWeldJointCode" Label="焊口号"    Readonly="false"
+                                            runat="server"  LabelWidth="100px" LabelAlign="Right">
                                         </f:TextBox>
+                                         <f:Label runat="server"></f:Label>
+                                    </Items>
+                                </f:FormRow>
+                                <f:FormRow>
+                                    <Items>
+                                        
                                         <f:DropDownList ID="drpMaterial1" Label="材质1"
                                             runat="server" ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="100px" LabelAlign="Right">
                                         </f:DropDownList>
@@ -63,6 +69,8 @@
                                             LabelWidth="100px" DecimalPrecision="4" NoNegative="true" ShowRedStar="true" Required="true"
                                             EnableBlurEvent="true" OnBlur="txtText_TextChanged" LabelAlign="Right">
                                         </f:NumberBox>
+                                        <f:TextBox ID="txtDNDia" Label="公称直径" runat="server"  LabelWidth="100px"  LabelAlign="Right">
+                                        </f:TextBox>
                                     </Items>
                                 </f:FormRow>
                                 <f:FormRow>
@@ -103,8 +111,7 @@
                                 </f:FormRow>
                                 <f:FormRow>
                                     <Items>
-                                        <f:TextBox ID="txtDNDia" Label="公称直径" runat="server"  LabelWidth="100px"  LabelAlign="Right">
-                                        </f:TextBox>
+                                        
                                         <f:Label runat="server"></f:Label>
                                         <f:Label runat="server"></f:Label>
                                         <f:Label runat="server"></f:Label>
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.cs
index 8aececd9..9e45ef75 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.cs
@@ -220,9 +220,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage
 
                 if (!string.IsNullOrEmpty(isTwoJoint))
                 {
-                    string perfix = txtPipelineCode.Text + "/Z-";
+                    //string perfix = txtPipelineCode.Text + "/Z-";
+                    string perfix = txtPipelineCode.Text + "/";
+                    this.txtWeldJointCode.Text = perfix;
+     
+                   // txtWeldJointCode.Text = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCode4ByProjectId", "dbo.HJGL_WeldJoint", "WeldJointCode", this.CurrUser.LoginProjectId, perfix);
 
-                    txtWeldJointCode.Text = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCode4ByProjectId", "dbo.HJGL_WeldJoint", "WeldJointCode", this.CurrUser.LoginProjectId, perfix);
+                   // txtWeldJointCode.Text = txtWeldJointCode.Text.Replace(perfix, "");
                 }
 
             }
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.designer.cs
index 6814317a..bd6aff10 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.designer.cs
@@ -167,6 +167,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// </remarks>
         protected global::FineUIPro.NumberBox txtDia;
 
+        /// <summary>
+        /// txtDNDia 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtDNDia;
+
         /// <summary>
         /// txtSize 控件。
         /// </summary>
@@ -239,15 +248,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// </remarks>
         protected global::FineUIPro.DropDownList DropTwoJointType;
 
-        /// <summary>
-        /// txtDNDia 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtDNDia;
-
         /// <summary>
         /// GroupPanel2 控件。
         /// </summary>