From 57e6dccba7f5ff1b28d66d89588677b7edc513f5 Mon Sep 17 00:00:00 2001
From: wendy <408182087@qq.com>
Date: Thu, 23 May 2024 16:37:33 +0800
Subject: [PATCH] =?UTF-8?q?20240523=20=E8=B4=A8=E9=87=8F=E6=9C=88=E6=8A=A5?=
=?UTF-8?q?=E5=91=A8=E6=8A=A5=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
SGGL/BLL/BaseInfo/CNProfessionalService.cs | 2 +-
.../CQMS/Check/EditJointCheck.aspx | 8 +-
.../CQMS/Check/EditJointCheckTwo.aspx | 10 +-
SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx | 6 +-
.../CQMS/Check/JointCheckFile.aspx | 4 +-
.../CQMS/Check/JointCheckView.aspx | 10 +-
.../CQMS/ManageReportNew/MonthReport.aspx.cs | 84 +-
.../CQMS/ManageReportNew/WeekReport.aspx.cs | 84 +-
.../File/Word/CQMS/项目质量周报.doc | Bin 66867 -> 67659 bytes
SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user | 2 +-
SGGL/FineUIPro.Web/common/main_new1.aspx.cs | 4 +-
SGGL/Model/Model.cs | 1915 ++++++++++-------
12 files changed, 1187 insertions(+), 942 deletions(-)
diff --git a/SGGL/BLL/BaseInfo/CNProfessionalService.cs b/SGGL/BLL/BaseInfo/CNProfessionalService.cs
index 35bdff36..a5361053 100644
--- a/SGGL/BLL/BaseInfo/CNProfessionalService.cs
+++ b/SGGL/BLL/BaseInfo/CNProfessionalService.cs
@@ -18,7 +18,7 @@ namespace BLL
///
public static List GetList()
{
- var q = (from x in Funs.DB.Base_CNProfessional orderby x.SortIndex select x).ToList();
+ var q = (from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalHSEId orderby x.SortIndex select x).ToList();
return q;
}
///
diff --git a/SGGL/FineUIPro.Web/CQMS/Check/EditJointCheck.aspx b/SGGL/FineUIPro.Web/CQMS/Check/EditJointCheck.aspx
index 9aad070a..f8c30ef0 100644
--- a/SGGL/FineUIPro.Web/CQMS/Check/EditJointCheck.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Check/EditJointCheck.aspx
@@ -4,7 +4,7 @@
-质量共检
+质量专项检查