From a3c6b691332869665f7e911b5a0c43e36e933037 Mon Sep 17 00:00:00 2001
From: gaofei <181547018@qq.com>
Date: Wed, 8 Mar 2023 10:17:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A8=E9=87=8F=E5=B7=A1?=
 =?UTF-8?q?=E6=A3=80=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/BLL/CQMS/Check/CheckControlService.cs    | 20 +++++++++----------
 .../CQMS/Check/ChecklistEdit.aspx             |  2 +-
 .../CQMS/PersonManage/WelderManage.aspx.cs    |  6 +++++-
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/SGGL/BLL/CQMS/Check/CheckControlService.cs b/SGGL/BLL/CQMS/Check/CheckControlService.cs
index fd2cbdbd..371282a8 100644
--- a/SGGL/BLL/CQMS/Check/CheckControlService.cs
+++ b/SGGL/BLL/CQMS/Check/CheckControlService.cs
@@ -142,9 +142,9 @@ namespace BLL
         {
             if (state == Const.CheckControl_Compile || state == Const.CheckControl_ReCompile)  //无是否同意
             {
-                ListItem[] lis = new ListItem[2];
-                lis[0] = new ListItem("总包负责人审核", Const.CheckControl_Audit1);
-                lis[1] = new ListItem("分包专业工程师回复", Const.CheckControl_Audit2);
+                ListItem[] lis = new ListItem[1];
+                //lis[0] = new ListItem("总包负责人审核", Const.CheckControl_Audit1);
+                lis[0] = new ListItem("分包专业工程师回复", Const.CheckControl_Audit2);
                 return lis;
             }
             else if (state == Const.CheckControl_Audit1)//有是否同意
@@ -156,9 +156,9 @@ namespace BLL
             }
             else if (state == Const.CheckControl_Audit2 || state == Const.CheckControl_ReCompile2)//无是否同意
             {
-                ListItem[] lis = new ListItem[2];
-                lis[0] = new ListItem("分包负责人审批", Const.CheckControl_Audit3);
-                lis[1] = new ListItem("总包专业工程师确认", Const.CheckControl_Audit4);
+                ListItem[] lis = new ListItem[1];
+                //lis[0] = new ListItem("分包负责人审批", Const.CheckControl_Audit3);
+                lis[0] = new ListItem("总包专业工程师确认", Const.CheckControl_Audit4);
                 return lis;
             }
             else if (state == Const.CheckControl_Audit3)//有是否同意
@@ -170,10 +170,10 @@ namespace BLL
             }
             else if (state == Const.CheckControl_Audit4)//有是否同意
             {
-                ListItem[] lis = new ListItem[3];
-                lis[0] = new ListItem("总包负责人确认", Const.CheckControl_Audit5);//是 加载
-                lis[1] = new ListItem("审批完成", Const.CheckControl_Complete);//是 加载
-                lis[2] = new ListItem("分包专业工程师重新回复", Const.CheckControl_ReCompile2);//否加载
+                ListItem[] lis = new ListItem[2];
+                //lis[0] = new ListItem("总包负责人确认", Const.CheckControl_Audit5);//是 加载
+                lis[0] = new ListItem("审批完成", Const.CheckControl_Complete);//是 加载
+                lis[1] = new ListItem("分包专业工程师重新回复", Const.CheckControl_ReCompile2);//否加载
                 return lis;
             }
             else if (state == Const.CheckControl_Audit5)//有是否同意
diff --git a/SGGL/FineUIPro.Web/CQMS/Check/ChecklistEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Check/ChecklistEdit.aspx
index d5a88afc..4a09ea70 100644
--- a/SGGL/FineUIPro.Web/CQMS/Check/ChecklistEdit.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Check/ChecklistEdit.aspx
@@ -45,7 +45,7 @@
                                     <f:FormRow>
                                         <Items>
                                             <f:TextBox ID="txtProjectName" runat="server" Readonly="true" Label="项目名称" LabelAlign="Right"
-                                                MaxLength="50">
+                                                >
                                             </f:TextBox>
                                             <f:TextBox ID="txtDocCode" runat="server" Required="true" ShowRedStar="true" Label="编号" LabelAlign="Right"
                                                 MaxLength="50">
diff --git a/SGGL/FineUIPro.Web/CQMS/PersonManage/WelderManage.aspx.cs b/SGGL/FineUIPro.Web/CQMS/PersonManage/WelderManage.aspx.cs
index 08543df8..59e51c48 100644
--- a/SGGL/FineUIPro.Web/CQMS/PersonManage/WelderManage.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/PersonManage/WelderManage.aspx.cs
@@ -192,6 +192,10 @@ namespace FineUIPro.Web.CQMS.PersonManage
                 rootNode.EnableClickEvent = true;
                 this.tvControlItem.Nodes.Add(rootNode);
                 var getWelders = (from x in Funs.DB.SitePerson_Person where x.ProjectId == this.CurrUser.LoginProjectId && x.WorkPostId == Const.WorkPost_Welder && x.States == Const.ProjectPersonStates_1 && x.UnitId == item.UnitId && x.WelderCode.Contains(txtQueryWelderCode.Text.Trim()) select x).ToList();
+                if (!string.IsNullOrEmpty(txtQueryWelderCode.Text.Trim()))
+                {
+                    getWelders = getWelders.Where(x => x.WelderCode.Contains(txtQueryWelderCode.Text.Trim())).ToList();
+                }
                 foreach (var sitem in getWelders)
                 {
                     TreeNode tn = new TreeNode();
@@ -202,7 +206,7 @@ namespace FineUIPro.Web.CQMS.PersonManage
                     }
                     else
                     {
-                        tn.Text = sitem.PersonName+"【" + sitem.WelderCode + "】";
+                        tn.Text = sitem.PersonName + "【" + sitem.WelderCode + "】";
                     }
                     tn.EnableClickEvent = true;
                     rootNode.Nodes.Add(tn);