diff --git a/DataBase/版本日志/SUBQHSE_V2026-05-23-xiaj.sql b/DataBase/版本日志/SUBQHSE_V2026-05-23-xiaj.sql
new file mode 100644
index 00000000..8d26a928
--- /dev/null
+++ b/DataBase/版本日志/SUBQHSE_V2026-05-23-xiaj.sql
@@ -0,0 +1,54 @@
+
+
+--去除多个QHSE项目绑定同一个集团主数据项目的异常数据，只保留一条QHSE项目绑定
+
+WITH CTE AS (
+ SELECT
+ RN = ROW_NUMBER() OVER(PARTITION BY MasterSysId ORDER BY ISNULL(ProjectState,'1'),StartDate asc )
+ ,*
+ FROM Base_Project
+ WHERE MasterSysId <>'' AND MasterSysId IS NOT NULL
+)
+
+/***
+
+SELECT ProjectId as 项目id,MasterSysId as sss,ProjectState,StartDate ,RN as 序号,*
+FROM CTE
+--WHERE RN > 1
+ORDER BY MasterSysId,RN
+
+***/
+
+UPDATE Base_Project
+SET MasterSysId=NULL
+WHERE ProjectId IN (select ProjectId FROM CTE WHERE RN > 1 );
+
+
+GO
+
+
+
+
+
+--集团在建项目使用详情补充字段：审批人信息
+IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Project_MasterDataUsage' AND COLUMN_NAME = 'HandleMan')
+BEGIN
+ ALTER TABLE Project_MasterDataUsage ADD HandleMan nvarchar(50);
+ ALTER TABLE Project_MasterDataUsage ADD HandleManName nvarchar(50);
+ ALTER TABLE Project_MasterDataUsage ADD HandleState char(1);
+ ALTER TABLE Project_MasterDataUsage ADD HandleDate datetime;
+ EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'审批人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Project_MasterDataUsage', @level2type=N'COLUMN',@level2name=N'HandleMan'
+ EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'审批人姓名' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Project_MasterDataUsage', @level2type=N'COLUMN',@level2name=N'HandleManName'
+ EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'审批状态（0：通过，1：不通过）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Project_MasterDataUsage', @level2type=N'COLUMN',@level2name=N'HandleState'
+ EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'审批时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Project_MasterDataUsage', @level2type=N'COLUMN',@level2name=N'HandleDate'
+END
+GO
+
+
+--集团在建项目使用详情补充字段：原因类型
+IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Project_MasterDataUsage' AND COLUMN_NAME = 'ReasonType')
+BEGIN
+ ALTER TABLE Project_MasterDataUsage ADD ReasonType nvarchar(50);
+ EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'原因类型' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Project_MasterDataUsage', @level2type=N'COLUMN',@level2name=N'ReasonType'
+END
+GO
diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs
index 62564386..3a0e6f96 100644
--- a/SGGL/BLL/Common/Const.cs
+++ b/SGGL/BLL/Common/Const.cs
@@ -43,6 +43,11 @@ namespace BLL
///
public const string zhanghuijuanId = "8cd25563-429e-4ac7-a13f-610e35eea62d";
+ ///
+ /// 施工部——詹佩佩
+ ///
+ public const string zhanpeipeiId = "23dafa35-cde1-44c6-844a-c9fbc8d50546";
+
///
/// 公共临时账户ID
///
diff --git a/SGGL/BLL/ProjectData/ProjectMasterDataUsageService.cs b/SGGL/BLL/ProjectData/ProjectMasterDataUsageService.cs
index 47861b8f..9df5f614 100644
--- a/SGGL/BLL/ProjectData/ProjectMasterDataUsageService.cs
+++ b/SGGL/BLL/ProjectData/ProjectMasterDataUsageService.cs
@@ -18,6 +18,16 @@ namespace BLL
return Funs.DB.Project_MasterDataUsage.FirstOrDefault(e => e.Id == useId);
}
+ ///
+ /// 根据主数据项目Id获取使用详情
+ ///
+ ///
+ ///
+ public static Model.Project_MasterDataUsage GetProjectMasterDataUsageByProId(string proId)
+ {
+ return Funs.DB.Project_MasterDataUsage.FirstOrDefault(e => e.Pro_id == proId);
+ }
+
///
/// 添加使用详情
///
@@ -36,11 +46,14 @@ namespace BLL
Projectid = model.Projectid,
Projectcode = model.Projectcode,
Projectname = model.Projectname,
+ ReasonType = model.ReasonType,
Reason = model.Reason,
Situation = model.Situation,
Remark = model.Remark,
Create_user = model.Create_user,
Create_date = model.Create_date,
+ HandleMan = model.HandleMan,
+ HandleManName = model.HandleManName,
};
db.Project_MasterDataUsage.InsertOnSubmit(newModel);
db.SubmitChanges();
@@ -66,9 +79,14 @@ namespace BLL
//newModel.Create_user = model.Create_user;
//newModel.Create_date = model.Create_date;
newModel.Is_use = model.Is_use;
+ newModel.ReasonType = model.ReasonType;
newModel.Reason = model.Reason;
newModel.Situation = model.Situation;
newModel.Remark = model.Remark;
+ newModel.HandleMan = model.HandleMan;
+ newModel.HandleManName = model.HandleManName;
+ newModel.HandleState = model.HandleState;
+ newModel.HandleDate = model.HandleDate;
db.SubmitChanges();
}
}
diff --git a/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx b/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx
index 9d9e1b76..043d0d9b 100644
--- a/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx
+++ b/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx
@@ -11,6 +11,17 @@
white-space: normal;
word-break: break-all;
}
+ /* 增强合计行样式 - 使用多种选择器确保生效 */
+ .f-grid-row-summary .f-grid-cell,
+ .f-grid-summary-row .f-grid-cell-inner {
+ font-weight: bold !important;
+ color: red !important;
+ }
+
+ .Pause {
+ /*background-color: darkgray;*/
+ background-color: red;
+ }
@@ -19,109 +30,221 @@
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <%--
+ --%>
+
+
+
+
+ <%--
+
+
+ --%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
/// 绑定数据
///
private void BindGrid()
{
+ var list = new List();
var db = Funs.DB;
var masterProDatas = ProjectService.GetMasterProjectDataInfos();
- var query = from x in masterProDatas
- join pro in db.Base_Project on x.Pro_id equals pro.MasterSysId into proGroup
- from pro in proGroup.DefaultIfEmpty()
- join use in db.Project_MasterDataUsage on x.Pro_id equals use.Pro_id into useGroup
- from use in useGroup.DefaultIfEmpty()
- select new
- {
- //Pid = x.Pro_id + (pro != null ? $"-{pro.ProjectId}" : ""),
- Pid = $"{x.Pro_id}|{(pro != null ? $"{pro.ProjectId}" : "")}|{(use != null ? use.Id : "")}",
- x.Pro_id,
- x.Pro_name,
- x.Pro_code,
- x.Start_date,
- x.Pro_status,
- ProjectId = pro != null ? pro.ProjectId : null,
- ProjectName = pro != null ? pro.ProjectName : "",
- ProjectCode = pro != null ? pro.ProjectCode : "",
- StartDate = pro != null ? pro.StartDate : null,
- ProjectState = pro != null ? pro.ProjectState : "",
- relate = pro != null && pro.MasterSysId != null ? "已关联" : "未关联",
- UseId = use != null ? use.Id : null,
- Use = use == null ? "" : (use != null && use.Is_use == true) ? "已使用" : "未使用",
- Reason = use != null ? use.Reason : "",
- Situation = use != null ? use.Situation : "",
- Remark = use != null ? use.Remark : "",
- };
+ var query = (from x in masterProDatas
+ join pro in db.Base_Project on x.Pro_id equals pro.MasterSysId into proGroup
+ from pro in proGroup.DefaultIfEmpty()
+ join use in db.Project_MasterDataUsage on x.Pro_id equals use.Pro_id into useGroup
+ from use in useGroup.DefaultIfEmpty()
+ select new MasterProjectDataInfo
+ {
+ //Pid = x.Pro_id + (pro != null ? $"-{pro.ProjectId}" : ""),
+ Pid = $"{x.Pro_id}|{(pro != null ? $"{pro.ProjectId}" : "")}|{(use != null ? use.Id : "")}",
+ Pro_id = x.Pro_id,
+ Pro_name = x.Pro_name,
+ Pro_code = x.Pro_code,
+ Start_date = x.Start_date,
+ Con_mode_desc = x.Con_mode_desc,
+ Pro_nature = x.Pro_nature,
+ Pro_status = x.Pro_status,
+ Org_name = x.Org_name,
+ Amount = ConvertAmount(x.Ori_amt_sum_vat_fc, x.Amt_add_sum_vat_fc_local),
+ ProjectId = pro != null ? pro.ProjectId : null,
+ ProjectName = pro != null ? pro.ProjectName : "",
+ ProjectCode = pro != null ? pro.ProjectCode : "",
+ StartDate = pro != null ? pro.StartDate : null,
+ ProjectState = pro != null ? pro.ProjectState : "",
+ Relate = pro != null && pro.MasterSysId != null ? 1 : 2,
+ RelateName = pro != null && pro.MasterSysId != null ? "已关联" : "未关联",
+ UseId = use != null ? use.Id : null,
+ //Use = use == null ? "" : (use != null && use.Is_use == true) ? "已使用" : "未使用",
+ ReasonType = use != null ? use.ReasonType : "",
+ Reason = use != null ? use.Reason : "",
+ //Situation = use != null ? use.Situation : "",
+ //Remark = use != null ? use.Remark : "",
+ }).ToList();
+
+ string startDate = this.txtStartTime.Text.Trim();
+ string endDate = this.txtEndTime.Text.Trim();
+ if (!string.IsNullOrWhiteSpace(startDate))
+ {
+ query = query.Where(x => Funs.GetNewDateTime(x.Start_date) >= Funs.GetNewDateTime(startDate)).ToList();
+ }
+ if (!string.IsNullOrWhiteSpace(endDate))
+ {
+ query = query.Where(x => Funs.GetNewDateTime(x.Start_date) <= Funs.GetNewDateTime(endDate)).ToList();
+ }
+ query = query.OrderByDescending(x => x.StartDate).ToList();
+ list.AddRange(query);
+
+
+ //// 获取施工中的项目
+ var getProjects = ProjectService.GetProjectWorkList();
+ getProjects = getProjects.Where(x => x.MasterSysId == null).OrderByDescending(x => x.StartDate).ToList();
+ foreach (var pro in getProjects)
+ {
+ list.Add(new MasterProjectDataInfo
+ {
+ Pid = $"|{pro.ProjectId}|",
+ Pro_id = "",
+ Pro_name = "",
+ Pro_code = "",
+ Start_date = "",
+ Con_mode_desc = "",
+ Pro_nature = "",
+ Pro_status = "",
+ Org_name = "",
+ Amount = "",
+ ProjectId = pro != null ? pro.ProjectId : null,
+ ProjectName = pro != null ? pro.ProjectName : "",
+ ProjectCode = pro != null ? pro.ProjectCode : "",
+ StartDate = pro != null ? pro.StartDate : null,
+ ProjectState = pro != null ? pro.ProjectState : "",
+ Relate = 3,
+ RelateName = "未对应",
+ UseId = null,
+ //Use = use == null ? "" : (use != null && use.Is_use == true) ? "已使用" : "未使用",
+ ReasonType = "",
+ Reason = "",
+ //Situation = use != null ? use.Situation : "",
+ //Remark = use != null ? use.Remark : "",
+ });
+ }
string proName = this.txtProName.Text.Trim();
string proCode = this.txtProCode.Text.Trim();
string projectName = this.txtProjectName.Text.Trim();
string projectCode = this.txtProjectCode.Text.Trim();
- string relate = this.rblIsRelate.SelectedValue;
+ int relate = int.Parse(this.rblIsRelate.SelectedValue);
if (!string.IsNullOrEmpty(proName))
{
- query = query.Where(x => x.Pro_name.Contains(proName));
+ list = list.Where(x => x.Pro_name.Contains(proName)).ToList();
}
if (!string.IsNullOrEmpty(proCode))
{
- query = query.Where(x => x.Pro_code.Contains(proCode));
+ list = list.Where(x => x.Pro_code.Contains(proCode)).ToList();
}
if (!string.IsNullOrEmpty(projectName))
{
- query = query.Where(x => x.ProjectName.Contains(projectName));
+ list = list.Where(x => x.ProjectName.Contains(projectName)).ToList();
}
if (!string.IsNullOrEmpty(projectCode))
{
- query = query.Where(x => x.ProjectCode.Contains(projectCode));
+ list = list.Where(x => x.ProjectCode.Contains(projectCode)).ToList();
}
- if (!string.IsNullOrWhiteSpace(relate))
+ if (relate > 0)
{
- query = query.Where(x => x.relate == relate);
+ list = list.Where(x => x.Relate == relate).ToList();
}
- DataTable tb = Funs.LINQToDataTable(query);
+
+ DataTable tb = Funs.LINQToDataTable(list);
Grid1.RecordCount = tb.Rows.Count;
- Grid1.DataSource = this.GetPagedDataTable(Grid1, tb);
+ var table = this.GetPagedDataTable(Grid1, tb);
+ Grid1.DataSource = table;
Grid1.DataBind();
+
+ //int masterNum = query.Count();
+ int masterNum = 0;
+ int relateNum = 0;
+ int allQhseNum = 0;
+ try
+ {
+ for (int i = 0; i < Grid1.Rows.Count; i++)
+ {
+ var mpCode = table.Rows[i]["Pro_code"].ToString().Trim();
+ var pCode = table.Rows[i]["ProjectCode"].ToString().Trim();
+ var relateStr = table.Rows[i]["RelateName"].ToString().Trim();
+ var reason = table.Rows[i]["Reason"].ToString().Trim();
+ if (Grid1.Rows[i].DataKeys[0] != null && relateStr == "未关联" && !string.IsNullOrWhiteSpace(reason))
+ {
+ Grid1.Rows[i].RowCssClass = "Pause";
+ }
+ if (relateStr == "已关联")
+ {
+ relateNum++;
+ }
+ if (!string.IsNullOrWhiteSpace(mpCode))
+ {
+ masterNum++;
+ }
+ if (!string.IsNullOrWhiteSpace(pCode))
+ {
+ allQhseNum++;
+ }
+ }
+ }
+ catch (Exception ex) { }
+
+
+ JObject summary = new JObject();
+ summary.Add("tfNumber", "合计");
+ //summary.Add("Pro_name", masterNum);
+ //summary.Add("ProjectName", allQhseNum);
+ //summary.Add("RelateName", $"已关联：{relateNum}");
+
+ summary.Add("Pro_name", $"主数据（已关联/总数）：{relateNum}/{masterNum}");
+ summary.Add("ProjectName", $"QHSE（已关联/总数）：{relateNum}/{allQhseNum}");
+
+ Grid1.SummaryData = summary;
+ }
+
+ ///
+ /// 合同额（亿）
+ ///
+ /// 合同含税金额原始存档（元）
+ /// 增补合同本币含税金额（元）
+ ///
+ protected string ConvertAmount(decimal? Ori_amt, decimal? Amt_add)
+ {
+ string result = string.Empty;
+ Ori_amt = Ori_amt == null ? 0 : Ori_amt;
+ Amt_add = Amt_add == null ? 0 : Amt_add;
+ decimal? all = Amt_add + Ori_amt;
+ if (all != null)
+ {
+ double amount = all == null ? 0 : (Math.Round((double)(all / 100000000m), 2));
+ result = amount.ToString();
+ }
+ return result;
}
///
@@ -139,11 +282,11 @@ namespace FineUIPro.Web.ProjectData
string num = obj[0].ToString();
string pro_name = obj[2].ToString();
string pro_code = obj[3].ToString();
- string startdate = obj[4].ToString();
- string prostatus = obj[5].ToString();
- string projectName = obj[7].ToString();
- string projectCode = obj[8].ToString();
- string startDate = obj[9].ToString();
+ string startdate = obj[7].ToString();
+ string prostatus = obj[9].ToString();
+ string projectName = obj[11].ToString();
+ string projectCode = obj[12].ToString();
+ string startDate = obj[13].ToString();
string lblState = (Grid1.SelectedRow.FindControl("lblState") as AspNet.Label).Text;
if (!string.IsNullOrWhiteSpace(pro_id))
@@ -151,6 +294,7 @@ namespace FineUIPro.Web.ProjectData
var masterUsage = Funs.DB.Project_MasterDataUsage.Where(x => x.Pro_id == pro_id).FirstOrDefault();
if (masterUsage != null)
{
+ useId = masterUsage.Id;
}
else
{
@@ -170,6 +314,7 @@ namespace FineUIPro.Web.ProjectData
ProjectMasterDataUsageService.AddProjectMasterDataUsage(model);
}
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MasterProjectDataUsage.aspx?UseId={0}", useId)));
+ //PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MasterProjectDataUsage.aspx?UseId={0}&ProId={1}", useId, pro_id)));
}
}
@@ -209,8 +354,9 @@ namespace FineUIPro.Web.ProjectData
}
#endregion
-
#region 导出按钮
+
+ ///
/// 导出按钮
///
///
@@ -219,7 +365,7 @@ namespace FineUIPro.Web.ProjectData
{
Response.ClearContent();
string filename = Funs.GetNewFileName();
- Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("集团主数据在建项目使用情况" + filename, System.Text.Encoding.UTF8) + ".xls");
+ Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("企业主数据与QHSE系统项目建立一览表" + filename, System.Text.Encoding.UTF8) + ".xls");
Response.ContentType = "application/excel";
Response.ContentEncoding = System.Text.Encoding.UTF8;
this.Grid1.PageSize = this.Grid1.RecordCount;
@@ -230,6 +376,178 @@ namespace FineUIPro.Web.ProjectData
}
#endregion
+ #endregion
+ #region 企业QHSE在建项目使用情况
+
+
+ ///
+ /// 绑定数据
+ ///
+ private void BindGrid2()
+ {
+ var db = Funs.DB;
+ //// 获取施工中的项目
+ var getProjects = ProjectService.GetProjectWorkList();
+
+ string projectName = this.txtProjectName2.Text.Trim();
+ string projectCode = this.txtProjectCode2.Text.Trim();
+ int relate = int.Parse(this.rblIsRelate.SelectedValue);
+
+ var list = new List();
+ if (!string.IsNullOrEmpty(projectName))
+ {
+ getProjects = getProjects.Where(x => x.ProjectName.Contains(projectName)).ToList();
+ }
+ if (!string.IsNullOrEmpty(projectCode))
+ {
+ getProjects = getProjects.Where(x => x.ProjectCode.Contains(projectCode)).ToList();
+ }
+
+ string startDate = this.txtStartTime2.Text.Trim();
+ string endDate = this.txtEndTime2.Text.Trim();
+ if (!string.IsNullOrWhiteSpace(startDate))
+ {
+ getProjects = getProjects.Where(x => x.StartDate >= Funs.GetNewDateTime(startDate)).ToList();
+ }
+ if (!string.IsNullOrWhiteSpace(endDate))
+ {
+ getProjects = getProjects.Where(x => x.StartDate <= Funs.GetNewDateTime(endDate)).ToList();
+ }
+
+ var dateNow = DateTime.Now.Date;//现在
+ var dateMonthAgo = dateNow.AddMonths(-1);//一个月前
+
+ var datas = (from x in db.Project_HSSEData_HSSE
+ where x.ReportDate == dateNow || x.ReportDate == dateMonthAgo
+ select new QHSEProjectHSSEData
+ {
+ ProjectId = x.ProjectId,
+ ReportDate = x.ReportDate,
+ DataMetricsSum = (x.JoinConstructionPersonNum ?? 0) + (x.GeneralClosedNum ?? 0) + (x.GeneralNotClosedNum ?? 0) + (x.SafeWorkingHour ?? 0)
+ }).ToList();
+
+ foreach (var pro in getProjects)
+ {
+ string result = "正常";
+ var nowData = datas.Where(x => x.ProjectId == pro.ProjectId && x.ReportDate == dateNow).FirstOrDefault();
+ var monthAgoData = datas.Where(x => x.ProjectId == pro.ProjectId && x.ReportDate == dateMonthAgo).FirstOrDefault();
+ if (nowData != null && monthAgoData != null)
+ {//两个时间点都有指标数据
+ if (nowData.DataMetricsSum == monthAgoData.DataMetricsSum)
+ {
+ result = "异常";
+ }
+ }
+ //else if (nowData != null)
+ //{//现在有指标数据，一个月前没有
+ // result = "正常";
+ //}
+ //else if (monthAgoData != null)
+ //{//现在没有指标数据，一个月前有
+ // result = "正常";
+ //}
+
+ list.Add(new QHSEProjectDataInfo
+ {
+ ProjectId = pro.ProjectId,
+ ProjectName = pro.ProjectName,
+ ShortName = pro.ShortName,
+ ProjectCode = pro.ProjectCode,
+ StartDate = pro.StartDate,
+ EndDate = pro.EndDate,
+ ProjectState = pro.ProjectState,
+ Usage = result
+ });
+ }
+
+ DataTable tb = Funs.LINQToDataTable(list);
+ Grid2.RecordCount = tb.Rows.Count;
+ var table = this.GetPagedDataTable(Grid2, tb);
+ Grid2.DataSource = table;
+ Grid2.DataBind();
+
+ int exNum = 0;
+ int allQhseNum = 0;
+ //int allQhseNum = list.Count();
+ try
+ {
+ for (int i = 0; i < Grid2.Rows.Count; i++)
+ {
+ allQhseNum++;
+ var usage = table.Rows[i]["Usage"].ToString().Trim();
+ if (usage == "异常")
+ {
+ Grid2.Rows[i].RowCssClass = "Pause";
+ exNum++;
+ }
+ }
+ }
+ catch (Exception ex) { }
+
+
+ JObject summary = new JObject();
+ summary.Add("tfNumber", "合计");
+ summary.Add("ProjectCode", allQhseNum);
+ summary.Add("Usage", $"异常：{exNum}");
+
+ Grid2.SummaryData = summary;
+ }
+
+ protected void TextBox_TextChanged2(object sender, EventArgs e)
+ {
+ this.BindGrid2();
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ protected void Grid2_PageIndexChange(object sender, GridPageEventArgs e)
+ {
+ this.BindGrid2();
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ protected void ddlPageSize2_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ Grid2.PageSize = Convert.ToInt32(ddlPageSize2.SelectedValue);
+ this.BindGrid2();
+ }
+
+ protected void Grid2_Sort(object sender, FineUIPro.GridSortEventArgs e)
+ {
+ this.BindGrid2();
+ }
+
+ #region 导出按钮
+
+ ///
+ /// 导出按钮
+ ///
+ ///
+ ///
+ protected void btnOut_Click2(object sender, EventArgs e)
+ {
+ Response.ClearContent();
+ string filename = Funs.GetNewFileName();
+ Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("企业QHSE项目使用情况一览表" + filename, System.Text.Encoding.UTF8) + ".xls");
+ Response.ContentType = "application/excel";
+ Response.ContentEncoding = System.Text.Encoding.UTF8;
+ this.Grid2.PageSize = this.Grid2.RecordCount;
+ this.BindGrid2();
+ Response.Write(GetGridMultiHeaderTableHtml(Grid2));
+ //Response.Write(GetGridTableHtml(Grid2));
+ Response.End();
+ }
+ #endregion
+
+
+ #endregion
}
}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx.designer.cs b/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx.designer.cs
index 791c266d..acdb82dc 100644
--- a/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx.designer.cs
@@ -41,6 +41,15 @@ namespace FineUIPro.Web.ProjectData
///
protected global::FineUIPro.Panel Panel1;
+ ///
+ /// TabStrip1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TabStrip TabStrip1;
+
///
/// Grid1 控件。
///
@@ -77,6 +86,51 @@ namespace FineUIPro.Web.ProjectData
///
protected global::FineUIPro.TextBox txtProName;
+ ///
+ /// txtStartTime 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DatePicker txtStartTime;
+
+ ///
+ /// Label5 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label Label5;
+
+ ///
+ /// txtEndTime 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DatePicker txtEndTime;
+
+ ///
+ /// rblIsRelate 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.RadioButtonList rblIsRelate;
+
+ ///
+ /// Toolbar1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Toolbar Toolbar1;
+
///
/// txtProjectCode 控件。
///
@@ -95,15 +149,6 @@ namespace FineUIPro.Web.ProjectData
///
protected global::FineUIPro.TextBox txtProjectName;
- ///
- /// rblIsRelate 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.RadioButtonList rblIsRelate;
-
///
/// btnOut 控件。
///
@@ -158,6 +203,123 @@ namespace FineUIPro.Web.ProjectData
///
protected global::FineUIPro.DropDownList ddlPageSize;
+ ///
+ /// Grid2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Grid Grid2;
+
+ ///
+ /// Toolbar3 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Toolbar Toolbar3;
+
+ ///
+ /// txtProjectCode2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtProjectCode2;
+
+ ///
+ /// txtProjectName2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtProjectName2;
+
+ ///
+ /// txtStartTime2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DatePicker txtStartTime2;
+
+ ///
+ /// Label1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label Label1;
+
+ ///
+ /// txtEndTime2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DatePicker txtEndTime2;
+
+ ///
+ /// btnOut2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnOut2;
+
+ ///
+ /// lblPageIndex 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.WebControls.Label lblPageIndex;
+
+ ///
+ /// lblStatus 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.WebControls.Label lblStatus;
+
+ ///
+ /// ToolbarSeparator2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.ToolbarSeparator ToolbarSeparator2;
+
+ ///
+ /// ToolbarText2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.ToolbarText ToolbarText2;
+
+ ///
+ /// ddlPageSize2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownList ddlPageSize2;
+
///
/// Window1 控件。
///
diff --git a/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataUsage.aspx b/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataUsage.aspx
index fe83d7be..e1ce5274 100644
--- a/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataUsage.aspx
+++ b/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataUsage.aspx
@@ -59,27 +59,40 @@
-
+
-
+ <%--
-
+
+ --%>
+
+
+
+
+
+
+
+
+
+
-
+
+ <%--
+ --%>
-
+ <%--
@@ -90,6 +103,62 @@
+ --%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -98,7 +167,7 @@
-
+
diff --git a/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataUsage.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataUsage.aspx.cs
index 7b642e42..19fe61dc 100644
--- a/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataUsage.aspx.cs
+++ b/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataUsage.aspx.cs
@@ -1,6 +1,10 @@
using BLL;
using Model;
using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
namespace FineUIPro.Web.ProjectData
{
@@ -21,6 +25,20 @@ namespace FineUIPro.Web.ProjectData
ViewState["UseId"] = value;
}
}
+ /////
+ ///// 主数据项目Id
+ /////
+ //public string ProId
+ //{
+ // get
+ // {
+ // return (string)ViewState["ProId"];
+ // }
+ // set
+ // {
+ // ViewState["ProId"] = value;
+ // }
+ //}
#endregion
@@ -28,33 +46,209 @@ namespace FineUIPro.Web.ProjectData
{
if (!IsPostBack)
{
+ //this.ProId = Request.Params["ProId"];
this.UseId = Request.Params["UseId"];
-
+ BindGrid();
if (!string.IsNullOrEmpty(UseId))
{
var usage = ProjectMasterDataUsageService.GetProjectMasterDataUsageById(UseId);
+ //var usage = ProjectMasterDataUsageService.GetProjectMasterDataUsageByProId(ProId);
this.txtPro_code.Text = usage.Pro_code;
this.txtPro_name.Text = usage.Pro_name;
this.txtProjectcode.Text = usage.Projectcode;
this.txtProjectname.Text = usage.Projectname;
this.rblIsRelate.SelectedValue = usage.Is_relate ? "1" : "0";
- this.rblIsUse.SelectedValue = usage.Is_use ? "1" : "0";
- //this.txtPro_code.Text = usage.Pro_code;
- this.txtSituation.Text = usage.Situation;
+ //this.rblIsUse.SelectedValue = usage.Is_use ? "1" : "0";
+
+ this.rblReasonType.SelectedValue = usage.ReasonType;
this.txtReason.Text = usage.Reason;
- this.txtRemark.Text = usage.Remark;
+ //this.txtSituation.Text = usage.Situation;
+ //this.txtReason.Text = usage.Reason;
+ //this.txtRemark.Text = usage.Remark;
+
+ //this.rblIsUse.Readonly = true;
+ //if (this.rblIsRelate.SelectedValue == "0")
+ //{
+ // this.txtReason.Required = true;
+ // this.txtReason.ShowRedStar = true;
+ //}
+ //if (this.rblIsUse.SelectedValue == "1")
+ //{
+ // this.Next.Hidden = true;
+ //}
+ if (usage.Is_relate)
+ {
+ this.Next.Hidden = true;
+ this.Toolbar1.Hidden = true;
+ this.txtReason.Required = false;
+ this.txtReason.ShowRedStar = false;
+ }
+ else
+ {
+ this.Next.Hidden = false;
+ this.txtReason.Required = true;
+ this.txtReason.ShowRedStar = true;
+ }
+
+
+ string handleMan = this.drpHandleMan.Value;
+ if (!string.IsNullOrWhiteSpace(usage.HandleMan))
+ {
+ //this.cbNext.SelectedValue = "1";
+ this.drpHandleMan.Value = usage.HandleMan;
+ this.drpHandleMan.Text = usage.HandleManName;
+
+ bool isAuditer = usage.HandleMan == this.CurrUser.UserId || this.CurrUser.UserId == Const.hfnbdId || this.CurrUser.UserId == Const.sysglyId;
+ if (usage.HandleState == null)
+ {
+ if (isAuditer)
+ {
+ this.Audit.Hidden = false;
+ this.rblHandleState.SelectedValue = "1";
+ }
+ else
+ {
+ this.Next.Hidden = true;
+ this.Toolbar1.Hidden = true;
+ }
+ }
+ if (usage.HandleState != null)
+ {
+ this.Toolbar1.Hidden = true;
+ this.Next.Hidden = true;
+ }
+ }
}
}
}
+ #region 人员下拉框绑定数据
+ ///
+ /// 绑定数据
+ ///
+ private void BindGrid()
+ {
+ string unitId = CommonService.GetThisUnitId();
+ string strSql = @"SELECT UserId,UserName,UserCode,role.RoleName"
+ + @" FROM Sys_User AS users LEFT JOIN Sys_Role AS role ON users.RoleId= role.RoleId"
+ + @" WHERE users.IsPost=1 AND role.IsAuditFlow=1 AND users.IsOffice =1 AND UnitId ='" + unitId + "'";
+ List listStr = new List();
+ if (!string.IsNullOrEmpty(this.txtUserName.Text.Trim()))
+ {
+ strSql += " AND (UserName LIKE @Name OR UserCode LIKE @Name OR role.RoleName LIKE @Name)";
+ listStr.Add(new SqlParameter("@Name", "%" + this.txtUserName.Text.Trim() + "%"));
+ }
+
+ SqlParameter[] parameter = listStr.ToArray();
+ DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+ Grid1.RecordCount = tb.Rows.Count;
+ var table = this.GetPagedDataTable(Grid1, tb);
+ Grid1.DataSource = table;
+ Grid1.DataBind();
+ }
+
+ #region 查询
+ ///
+ /// 下拉框查询
+ ///
+ ///
+ ///
+ protected void TextBox_TextChanged(object sender, EventArgs e)
+ {
+ this.drpHandleMan.Values = null;
+ this.BindGrid();
+ }
+ #endregion
+
+ #endregion
+
+ ///
+ /// 是否使用触发事件
+ ///
+ ///
+ ///
+ protected void rblIsUse_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ //string isUse = this.rblIsUse.SelectedValue;
+ //if (isUse == "0")
+ //{
+ // this.txtReason.Required = true;
+ // this.txtReason.ShowRedStar = true;
+ // this.Next.Hidden = false;
+ //}
+ //else
+ //{
+ // this.Next.Hidden = true;
+ // this.txtReason.Required = false;
+ // this.txtReason.ShowRedStar = false;
+ //}
+ }
+
+ ///
+ /// 下一步触发事件
+ ///
+ ///
+ ///
+ protected void cbNext_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (this.cbNext.SelectedValue == "1")
+ {
+ //this.Audit.Hidden = false;
+ this.HandleMan.Hidden = false;
+ this.drpHandleMan.Required = true;
+ this.drpHandleMan.ShowRedStar = true;
+ }
+ else
+ {
+ //this.Audit.Hidden = true;
+ this.HandleMan.Hidden = true;
+ this.drpHandleMan.Required = false;
+ this.drpHandleMan.ShowRedStar = false;
+ }
+ }
+
+
protected void btnSave_Click(object sender, EventArgs e)
{
+ //var model = ProjectMasterDataUsageService.GetProjectMasterDataUsageByProId(ProId);
Project_MasterDataUsage usage = new Project_MasterDataUsage();
+ //usage.Id = model.Id;
usage.Id = this.UseId;
- usage.Is_use = this.rblIsUse.SelectedValue == "1";
- usage.Situation = this.txtSituation.Text.Trim();
+ //usage.Is_use = this.rblIsUse.SelectedValue == "1";
+ usage.ReasonType = this.rblReasonType.SelectedValue;
usage.Reason = this.txtReason.Text.Trim();
- usage.Remark = this.txtRemark.Text.Trim();
+ //usage.Situation = this.txtSituation.Text.Trim();
+ //usage.Reason = this.txtReason.Text.Trim();
+ //usage.Remark = this.txtRemark.Text.Trim();
+
+
+ //usage.HandleMan = this.drpHandleMan.Value;
+ //usage.HandleManName = this.drpHandleMan.Text;
+
+ string handleMan = this.drpHandleMan.Value;
+ string handleManName = this.drpHandleMan.Text;
+ if (!string.IsNullOrWhiteSpace(handleMan))
+ {//
+ bool isAuditer = handleMan == this.CurrUser.UserId || this.CurrUser.UserId == Const.hfnbdId || this.CurrUser.UserId == Const.sysglyId;
+
+ usage.HandleMan = handleMan;
+ usage.HandleManName = handleManName;
+ if (isAuditer)
+ {
+ usage.HandleState = this.rblHandleState.SelectedValue;
+ //usage.HandleMan = this.CurrUser.UserId;
+ //usage.HandleManName = this.CurrUser.UserName;
+ usage.HandleDate = DateTime.Now;
+ }
+ }
+ else
+ {
+ usage.HandleState = this.rblHandleState.SelectedValue;
+ usage.HandleDate = DateTime.Now;
+ }
+ //if (this.cbNext.SelectedValue == "0")
+ //{
+ //}
ProjectMasterDataUsageService.UpdateProjectMasterDataUsage(usage);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
diff --git a/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataUsage.aspx.designer.cs b/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataUsage.aspx.designer.cs
index 27d54211..2017d642 100644
--- a/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataUsage.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataUsage.aspx.designer.cs
@@ -87,13 +87,13 @@ namespace FineUIPro.Web.ProjectData
protected global::FineUIPro.RadioButtonList rblIsRelate;
///
- /// rblIsUse 控件。
+ /// rblReasonType 控件。
///
///
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
- protected global::FineUIPro.RadioButtonList rblIsUse;
+ protected global::FineUIPro.RadioButtonList rblReasonType;
///
/// txtReason 控件。
@@ -105,22 +105,103 @@ namespace FineUIPro.Web.ProjectData
protected global::FineUIPro.TextArea txtReason;
///
- /// txtSituation 控件。
+ /// Next 控件。
///
///
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
- protected global::FineUIPro.TextArea txtSituation;
+ protected global::FineUIPro.FormRow Next;
///
- /// txtRemark 控件。
+ /// cbNext 控件。
///
///
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
- protected global::FineUIPro.TextArea txtRemark;
+ protected global::FineUIPro.RadioButtonList cbNext;
+
+ ///
+ /// lb 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label lb;
+
+ ///
+ /// HandleMan 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.FormRow HandleMan;
+
+ ///
+ /// drpHandleMan 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownBox drpHandleMan;
+
+ ///
+ /// Grid1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Grid Grid1;
+
+ ///
+ /// Toolbar2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Toolbar Toolbar2;
+
+ ///
+ /// txtUserName 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtUserName;
+
+ ///
+ /// Audit 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.FormRow Audit;
+
+ ///
+ /// rblHandleState 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.RadioButtonList rblHandleState;
+
+ ///
+ /// Label1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label Label1;
///
/// Toolbar1 控件。
diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs
index 23f3273c..33751330 100644
--- a/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs
+++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs
@@ -332,7 +332,7 @@ namespace FineUIPro.Web.ProjectData
}
string curruserId = this.CurrUser.UserId;
- if (curruserId == Const.sysglyId || curruserId == Const.hfnbdId || curruserId == Const.fuweiId || curruserId == Const.shenyinhangId || curruserId == Const.zhanghuijuanId)
+ if (curruserId == Const.sysglyId || curruserId == Const.hfnbdId || curruserId == Const.zhanpeipeiId || curruserId == Const.fuweiId || curruserId == Const.shenyinhangId || curruserId == Const.zhanghuijuanId)
{//只有管理员、JT、付伟、申银行、张慧敏的账号可以新增和维护项目数据
btnUpdata.Hidden = false;
this.btnNew.Hidden = false;
diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs
index fd7b46a5..f1d13b13 100644
--- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs
+++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs
@@ -37,7 +37,7 @@ namespace FineUIPro.Web.ProjectData
if (!IsPostBack)
{
string curruserId = this.CurrUser.UserId;
- if (curruserId == Const.sysglyId || curruserId == Const.hfnbdId || curruserId == Const.fuweiId || curruserId == Const.shenyinhangId || curruserId == Const.zhanghuijuanId)
+ if (curruserId == Const.sysglyId || curruserId == Const.hfnbdId || curruserId == Const.zhanpeipeiId || curruserId == Const.fuweiId || curruserId == Const.shenyinhangId || curruserId == Const.zhanghuijuanId)
{//只有管理员、JT、付伟、申银行、张慧娟的账号可以新增和维护项目数据
this.btnSave.Hidden = false;
}
@@ -2013,7 +2013,10 @@ namespace FineUIPro.Web.ProjectData
{
this.txtShortName.Text = shortname;
}
- this.txtProjectAddress.Text = address;
+ if (!string.IsNullOrWhiteSpace(address))
+ {
+ this.txtProjectAddress.Text = address;
+ }
if (!string.IsNullOrWhiteSpace(startdate))
{
this.txtStartDate.Text = startdate;
diff --git a/SGGL/FineUIPro.Web/common/PageBase.cs b/SGGL/FineUIPro.Web/common/PageBase.cs
index 71143eb2..8f5217ef 100644
--- a/SGGL/FineUIPro.Web/common/PageBase.cs
+++ b/SGGL/FineUIPro.Web/common/PageBase.cs
@@ -1243,6 +1243,7 @@ namespace FineUIPro.Web
return sb.ToString();
}
+
///
/// 多表头导出方法
///
@@ -1305,7 +1306,10 @@ namespace FineUIPro.Web
{
html = (row.FindControl("lblState") as AspNet.Label).Text;
}
-
+ else if (column.ColumnID == "tfStatus")
+ {
+ html = (row.FindControl("lblStatus") as AspNet.Label).Text;
+ }
sb.AppendFormat("| {0} | ", html);
}
}
@@ -1318,6 +1322,8 @@ namespace FineUIPro.Web
return sb.ToString();
}
+
+
#endregion
#region 根据身份证号码获取年龄
diff --git a/SGGL/Model/APIItem/CNCEC/Ads_pms_pro_info_build.cs b/SGGL/Model/APIItem/CNCEC/Ads_pms_pro_info_build.cs
index e7855a4e..e0a91f1e 100644
--- a/SGGL/Model/APIItem/CNCEC/Ads_pms_pro_info_build.cs
+++ b/SGGL/Model/APIItem/CNCEC/Ads_pms_pro_info_build.cs
@@ -76,6 +76,134 @@ namespace Model
/// 二级组织名称
///
public string Org_name2 { get; set; }
+ ///
+ /// 合同含税金额原始存档
+ ///
+ public decimal? Ori_amt_sum_vat_fc { get; set; }
+ ///
+ /// 增补合同本币含税金额
+ ///
+ public decimal? Amt_add_sum_vat_fc_local { get; set; }
+ ///
+ /// 承包方式code
+ ///
+ public string Con_mode_code { get; set; }
+ ///
+ /// 承包方式描述
+ ///
+ public string Con_mode_desc { get; set; }
+ }
+
+ ///
+ /// 在建项目详情
+ ///
+ [Serializable]
+ public class MasterProjectDataInfo
+ {
+ #region 主数据信息
+
+ ///
+ /// 主键
+ ///
+ public string Pid { get; set; }
+ ///
+ /// 主数据项目Id
+ ///
+ public string Pro_id { get; set; }
+ ///
+ /// 项目编码
+ ///
+ public string Pro_code { get; set; }
+ ///
+ /// 项目名称
+ ///
+ public string Pro_name { get; set; }
+ ///
+ /// 组织名称
+ ///
+ public string Org_name { get; set; }
+ ///
+ /// 项目性质
+ ///
+ public string Pro_nature { get; set; }
+ ///
+ /// 项目状态
+ ///
+ public string Pro_status { get; set; }
+ ///
+ /// 开工日期
+ ///
+ public string Start_date { get; set; }
+ ///
+ /// 合同额（亿）
+ ///
+ public string Amount { get; set; }
+ ///
+ /// 承包方式描述
+ ///
+ public string Con_mode_desc { get; set; }
+
+ #endregion
+
+ #region QHSE项目信息
+
+ public string ProjectId { get; set; }
+ public string ProjectName { get; set; }
+ public string ProjectCode { get; set; }
+ public DateTime? StartDate { get; set; }
+ public string ProjectState { get; set; }
+
+ #endregion
+
+ #region 不关联情况信息
+
+ public int Relate { get; set; }
+ public string RelateName { get; set; }
+ public string UseId { get; set; }
+ public string ReasonType { get; set; }
+ public string Reason { get; set; }
+ #endregion
+ }
+
+
+ ///
+ /// 在建项目详情
+ ///
+ [Serializable]
+ public class QHSEProjectDataInfo
+ {
+ #region QHSE项目信息
+
+ public string ProjectId { get; set; }
+ public string ProjectName { get; set; }
+ public string ShortName { get; set; }
+ public string ProjectCode { get; set; }
+ public DateTime? StartDate { get; set; }
+ public DateTime? EndDate { get; set; }
+ public string ProjectState { get; set; }
+
+ #endregion
+
+ ///
+ /// 使用情况
+ ///
+ public string Usage { get; set; }
+ }
+
+
+
+ ///
+ /// 在建项目指标详情
+ ///
+ [Serializable]
+ public class QHSEProjectHSSEData
+ {
+ public string ProjectId { get; set; }
+ public DateTime? ReportDate { get; set; }
+ ///
+ /// 指标之和
+ ///
+ public int DataMetricsSum { get; set; }
}
}
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index 4681410a..7ad8004d 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -320596,6 +320596,16 @@ namespace Model
private System.DateTime _Create_date;
+ private string _HandleMan;
+
+ private string _HandleManName;
+
+ private string _HandleState;
+
+ private System.Nullable _HandleDate;
+
+ private string _ReasonType;
+
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -320628,6 +320638,16 @@ namespace Model
partial void OnCreate_userChanged();
partial void OnCreate_dateChanging(System.DateTime value);
partial void OnCreate_dateChanged();
+ partial void OnHandleManChanging(string value);
+ partial void OnHandleManChanged();
+ partial void OnHandleManNameChanging(string value);
+ partial void OnHandleManNameChanged();
+ partial void OnHandleStateChanging(string value);
+ partial void OnHandleStateChanged();
+ partial void OnHandleDateChanging(System.Nullable value);
+ partial void OnHandleDateChanged();
+ partial void OnReasonTypeChanging(string value);
+ partial void OnReasonTypeChanged();
#endregion
public Project_MasterDataUsage()
@@ -320915,6 +320935,106 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleMan", DbType="NVarChar(50)")]
+ public string HandleMan
+ {
+ get
+ {
+ return this._HandleMan;
+ }
+ set
+ {
+ if ((this._HandleMan != value))
+ {
+ this.OnHandleManChanging(value);
+ this.SendPropertyChanging();
+ this._HandleMan = value;
+ this.SendPropertyChanged("HandleMan");
+ this.OnHandleManChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleManName", DbType="NVarChar(50)")]
+ public string HandleManName
+ {
+ get
+ {
+ return this._HandleManName;
+ }
+ set
+ {
+ if ((this._HandleManName != value))
+ {
+ this.OnHandleManNameChanging(value);
+ this.SendPropertyChanging();
+ this._HandleManName = value;
+ this.SendPropertyChanged("HandleManName");
+ this.OnHandleManNameChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleState", DbType="Char(1)")]
+ public string HandleState
+ {
+ get
+ {
+ return this._HandleState;
+ }
+ set
+ {
+ if ((this._HandleState != value))
+ {
+ this.OnHandleStateChanging(value);
+ this.SendPropertyChanging();
+ this._HandleState = value;
+ this.SendPropertyChanged("HandleState");
+ this.OnHandleStateChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleDate", DbType="DateTime")]
+ public System.Nullable HandleDate
+ {
+ get
+ {
+ return this._HandleDate;
+ }
+ set
+ {
+ if ((this._HandleDate != value))
+ {
+ this.OnHandleDateChanging(value);
+ this.SendPropertyChanging();
+ this._HandleDate = value;
+ this.SendPropertyChanged("HandleDate");
+ this.OnHandleDateChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReasonType", DbType="NVarChar(50)")]
+ public string ReasonType
+ {
+ get
+ {
+ return this._ReasonType;
+ }
+ set
+ {
+ if ((this._ReasonType != value))
+ {
+ this.OnReasonTypeChanging(value);
+ this.SendPropertyChanging();
+ this._ReasonType = value;
+ this.SendPropertyChanged("ReasonType");
+ this.OnReasonTypeChanged();
+ }
+ }
+ }
+
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;