diff --git a/SUBQHSE/FineUIPro.Web/HJGL/CheckManage/CheckManage.aspx b/SUBQHSE/FineUIPro.Web/HJGL/CheckManage/CheckManage.aspx index 904b0db..dec89b5 100644 --- a/SUBQHSE/FineUIPro.Web/HJGL/CheckManage/CheckManage.aspx +++ b/SUBQHSE/FineUIPro.Web/HJGL/CheckManage/CheckManage.aspx @@ -1,5 +1,7 @@ <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CheckManage.aspx.cs" Inherits="FineUIPro.Web.HJGL.CheckManage.CheckManage" %> +<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %> + @@ -13,6 +15,16 @@ + + + + + + + @@ -32,9 +44,9 @@ - - + + @@ -63,10 +75,9 @@ - - - - + + + @@ -97,7 +108,7 @@ - + @@ -115,7 +126,7 @@ @@ -129,7 +140,7 @@ - + @@ -139,7 +150,7 @@ - + @@ -175,19 +186,19 @@ - - - - + + + + - + - - - + + - + @@ -296,19 +307,19 @@ - - - - + + + + - + - - - + + - + @@ -382,7 +393,7 @@ ////RT检测批量填充拍片日期、报告日期 function onGridAfterEdit(event, value, params) { var ckAllFilmDate = F('<%= ckAllFilmDate.ClientID %>'); - var ckAllReportDate = F('<%= ckAllReportDate.ClientID %>'); + var ckAllReportDate = F('<%= ckAllReportDate.ClientID %>'); var me = this, columnId = params.columnId, rowId = params.rowId; if (columnId === 'CHT_TotalFilm' || columnId === 'CHT_PassFilm') { var total = me.getCellValue(rowId, 'CHT_TotalFilm'); diff --git a/SUBQHSE/FineUIPro.Web/HJGL/CheckManage/CheckManage.aspx.cs b/SUBQHSE/FineUIPro.Web/HJGL/CheckManage/CheckManage.aspx.cs index b423d2f..6e5959e 100644 --- a/SUBQHSE/FineUIPro.Web/HJGL/CheckManage/CheckManage.aspx.cs +++ b/SUBQHSE/FineUIPro.Web/HJGL/CheckManage/CheckManage.aspx.cs @@ -1,6 +1,5 @@ using BLL; using System; -using System; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; @@ -9,9 +8,6 @@ using Newtonsoft.Json.Linq; using System.IO; using NPOI.XSSF.UserModel; using NPOI.SS.UserModel; -using System.Runtime.Serialization; -using NPOI.SS.Util; -using NPOI.HSSF.UserModel; namespace FineUIPro.Web.HJGL.CheckManage { @@ -19,6 +15,20 @@ namespace FineUIPro.Web.HJGL.CheckManage { #region 定义变量 /// + /// 项目主键 + /// + public string ProjectId + { + get + { + return (string)ViewState["ProjectId"]; + } + set + { + ViewState["ProjectId"] = value; + } + } + /// /// 检测主键 /// public string CHT_CheckID @@ -94,7 +104,19 @@ namespace FineUIPro.Web.HJGL.CheckManage { if (!IsPostBack) { - BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpCheckUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_5, true); + this.ProjectId = this.CurrUser.LoginProjectId; + if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId) + { + this.ProjectId = Request.Params["projectId"]; + } + this.InitDropDownList(); + + this.ucTree.UnitId = this.CurrUser.UnitId; + this.ucTree.ProjectId = this.ProjectId; + if (!string.IsNullOrEmpty(this.ProjectId)) + { + this.panelLeftRegion.Hidden = true; + } BLL.Base_DefectService.InitDefectDropDownList(drpDefects_Definition, false, null); BLL.Base_DefectService.InitDefectDropDownList(drpDefects_Definition2, false, null); //报表类型 @@ -103,57 +125,75 @@ namespace FineUIPro.Web.HJGL.CheckManage this.drpPrintType.DataSource = BLL.DropListService.NDTCheckSelectPrint(); this.drpPrintType.DataBind(); - //查询检测单位 - //施工单位、装置 - //if (BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId) == null || BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId).UnitTypeId == BLL.Const.ProjectUnitType_1 || BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId).UnitTypeId == BLL.Const.ProjectUnitType_5) - //{ - // BLL.UnitService.InitUnitNameByUnitTypeDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true); - // BLL.Project_InstallationService.InitInstallationDropDownList(this.drpInstallationId, this.CurrUser.LoginProjectId, true); - //} - //else - //{ - // BLL.UnitService.InitSubUnitNameDownList(this.drpUnit, this.CurrUser.LoginProjectId, this.CurrUser.UnitId, true); - // BLL.Project_InstallationService.InitInstallationListDownList(this.drpInstallationId, this.CurrUser.LoginProjectId, this.CurrUser.UnitId, true); - //} - var pUnit = BLL.UnitService.GetUnitByProjectIdUnitTypeList(this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2); - if (pUnit != null) - { - this.drpUnit.DataTextField = "UnitName"; - this.drpUnit.DataValueField = "UnitId"; - this.drpUnit.DataSource = pUnit; - this.drpUnit.DataBind(); - this.drpUnit.SelectedValue = this.CurrUser.UnitId; - if(CommonService.GetProjectUnitType(this.CurrUser.LoginProjectId, this.CurrUser.UnitId) != BLL.Const.ProjectUnitType_1 && this.CurrUser.UserId != Const.hfnbdId) - { - this.drpUnit.Enabled = false; - } - BLL.Project_InstallationService.InitInstallationListDownList(this.drpInstallationId, this.CurrUser.LoginProjectId, this.drpUnit.SelectedValue, true); - this.drpInstallationId.SelectedIndex = 0; - } - BLL.UserService.InitUserDropDownList(this.drpTabler, this.CurrUser.LoginProjectId, true);//制单人 - BLL.UserService.InitUserDropDownList(this.ddlAuditMan, this.CurrUser.LoginProjectId, true);//审核人 - - BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpContractualUnits, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_5, true);//检测单位 - if (drpContractualUnits.Items.Count > 1) - { - drpContractualUnits.SelectedIndex = 1; - BLL.UserService.InitUserProjectIdUnitIdDropDownList(this.ddlCheckMan, this.CurrUser.LoginProjectId, drpContractualUnits.SelectedValue, true);//检测人 - if (ddlCheckMan.Items.Count > 1) - { - ddlCheckMan.SelectedIndex = 1; - } - } this.txtCheckDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); this.txtTableDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); - this.drpTabler.SelectedValue = this.CurrUser.UserId; this.txtCheckType.Text = "C1"; this.txtCheckTime.Text = string.Format("{0:yyyy-MM}", DateTime.Now); this.InitTreeMenu();//加载树 } } + + private void InitDropDownList() + { + BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpCheckUnit, this.ProjectId, BLL.Const.ProjectUnitType_5, true); + //查询检测单位 + //施工单位、装置 + //if (BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId) == null || BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId).UnitTypeId == BLL.Const.ProjectUnitType_1 || BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId).UnitTypeId == BLL.Const.ProjectUnitType_5) + //{ + // BLL.UnitService.InitUnitNameByUnitTypeDropDownList(this.drpUnit, this.ProjectId, BLL.Const.ProjectUnitType_2, true); + // BLL.Project_InstallationService.InitInstallationDropDownList(this.drpInstallationId, this.ProjectId, true); + //} + //else + //{ + // BLL.UnitService.InitSubUnitNameDownList(this.drpUnit, this.ProjectId, this.CurrUser.UnitId, true); + // BLL.Project_InstallationService.InitInstallationListDownList(this.drpInstallationId, this.ProjectId, this.CurrUser.UnitId, true); + //} + var pUnit = BLL.UnitService.GetUnitByProjectIdUnitTypeList(this.ProjectId, BLL.Const.ProjectUnitType_2); + if (pUnit != null) + { + this.drpUnit.DataTextField = "UnitName"; + this.drpUnit.DataValueField = "UnitId"; + this.drpUnit.DataSource = pUnit; + this.drpUnit.DataBind(); + this.drpUnit.SelectedValue = this.CurrUser.UnitId; + if (CommonService.GetProjectUnitType(this.ProjectId, this.CurrUser.UnitId) != BLL.Const.ProjectUnitType_1 && this.CurrUser.UserId != Const.hfnbdId) + { + this.drpUnit.Enabled = false; + } + BLL.Project_InstallationService.InitInstallationListDownList(this.drpInstallationId, this.ProjectId, this.drpUnit.SelectedValue, true); + this.drpInstallationId.SelectedIndex = 0; + } + BLL.UserService.InitUserDropDownList(this.drpTabler, this.ProjectId, true);//制单人 + this.drpTabler.SelectedValue = this.CurrUser.UserId; + BLL.UserService.InitUserDropDownList(this.ddlAuditMan, this.ProjectId, true);//审核人 + + BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpContractualUnits, this.ProjectId, BLL.Const.ProjectUnitType_5, true);//检测单位 + if (drpContractualUnits.Items.Count > 1) + { + drpContractualUnits.SelectedIndex = 1; + BLL.UserService.InitUserProjectIdUnitIdDropDownList(this.ddlCheckMan, this.ProjectId, drpContractualUnits.SelectedValue, true);//检测人 + if (ddlCheckMan.Items.Count > 1) + { + ddlCheckMan.SelectedIndex = 1; + } + } + } + + /// + /// 公司级树加载 + /// + /// + /// + protected void changeTree(object sender, EventArgs e) + { + this.ProjectId = this.ucTree.ProjectId; + this.InitDropDownList(); + + this.InitTreeMenu(); + } #endregion #region 加载树装置-单位-工作区 @@ -162,6 +202,10 @@ namespace FineUIPro.Web.HJGL.CheckManage /// private void InitTreeMenu() { + if (string.IsNullOrEmpty(this.ProjectId)) + { + return; + } if (!string.IsNullOrEmpty(this.txtCheckTime.Text.Trim())) { DateTime? startTime = Funs.GetNewDateTime(this.txtCheckTime.Text.Trim()); @@ -175,19 +219,19 @@ namespace FineUIPro.Web.HJGL.CheckManage this.tvControlItem.Nodes.Add(rootNode); List units = null; - var unit = BLL.ProjectUnitService.GetProjectUnitByUnitIdProjectId(this.CurrUser.LoginProjectId, this.CurrUser.UnitId); + var unit = BLL.ProjectUnitService.GetProjectUnitByUnitIdProjectId(this.ProjectId, this.CurrUser.UnitId); if (unit == null || unit.UnitType == BLL.Const.ProjectUnitType_1 || unit.UnitType == BLL.Const.ProjectUnitType_5 || unit.UnitType == BLL.Const.ProjectUnitType_3) { - if (BLL.WorkAreaService.IsSupervisor(this.CurrUser.UnitId, this.CurrUser.LoginProjectId)) + if (BLL.WorkAreaService.IsSupervisor(this.CurrUser.UnitId, this.ProjectId)) { units = (from x in Funs.DB.Base_Unit join y in Funs.DB.ProjectData_WorkArea on x.UnitId equals y.UnitId - where (x.UnitId == this.CurrUser.UnitId || y.SupervisorUnitId == this.CurrUser.UnitId) && y.ProjectId == this.CurrUser.LoginProjectId + where (x.UnitId == this.CurrUser.UnitId || y.SupervisorUnitId == this.CurrUser.UnitId) && y.ProjectId == this.ProjectId select x).Distinct().ToList(); } else { - units = BLL.UnitService.GetUnitByProjectIdUnitTypeList(this.CurrUser.LoginProjectId, "2"); + units = BLL.UnitService.GetUnitByProjectIdUnitTypeList(this.ProjectId, "2"); } } else @@ -198,19 +242,19 @@ namespace FineUIPro.Web.HJGL.CheckManage if (!this.txtCheckTime.Hidden) { checkLists = (from x in Funs.DB.CH_Check - where x.ProjectId == this.CurrUser.LoginProjectId && x.CHT_CheckDate >= startTime && x.CHT_CheckDate < endTime + where x.ProjectId == this.ProjectId && x.CHT_CheckDate >= startTime && x.CHT_CheckDate < endTime select x).ToList(); } else { checkLists = (from x in Funs.DB.CH_Check - where x.ProjectId == this.CurrUser.LoginProjectId && x.CHT_CheckCode.Contains(this.txtSearchCode.Text.Trim()) + where x.ProjectId == this.ProjectId && x.CHT_CheckCode.Contains(this.txtSearchCode.Text.Trim()) select x).ToList(); } if (this.drpCheckUnit.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpCheckUnit.SelectedValue)) { checkLists = (from x in Funs.DB.CH_Check - where x.ProjectId == this.CurrUser.LoginProjectId && x.ContractualUnits == this.drpCheckUnit.SelectedValue + where x.ProjectId == this.ProjectId && x.ContractualUnits == this.drpCheckUnit.SelectedValue select x).ToList(); } if (units != null) @@ -223,11 +267,11 @@ namespace FineUIPro.Web.HJGL.CheckManage rootUnitNode.Expanded = true; rootUnitNode.ToolTip = "施工单位"; rootNode.Nodes.Add(rootUnitNode); - //if (CommonService.GetProjectUnitType(this.CurrUser.LoginProjectId, this.CurrUser.UnitId) != BLL.Const.ProjectUnitType_1 && this.CurrUser.UserId != Const.hfnbdId|| this.CurrUser.UserId != Const.sysglyId||!UnitService.IsSubUnitByProjectAndUnit(CurrUser.LoginProjectId, this.CurrUser.UserId)) + //if (CommonService.GetProjectUnitType(this.ProjectId, this.CurrUser.UnitId) != BLL.Const.ProjectUnitType_1 && this.CurrUser.UserId != Const.hfnbdId|| this.CurrUser.UserId != Const.sysglyId||!UnitService.IsSubUnitByProjectAndUnit(ProjectId, this.CurrUser.UserId)) //{ // if (!string.IsNullOrEmpty(txtTrust.Text)) // { - // var TrustList = Funs.DB.CH_Trust.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.CH_TrustCode.Contains(txtTrust.Text)).Select(x => x.CH_TrustID).ToList(); + // var TrustList = Funs.DB.CH_Trust.Where(x => x.ProjectId == this.ProjectId && x.CH_TrustCode.Contains(txtTrust.Text)).Select(x => x.CH_TrustID).ToList(); // var checkList = checkLists.Where(x => x.UnitId == item.UnitId && x.UnitId == this.CurrUser.UnitId&& TrustList.Contains(x.CH_TrustID)).ToList(); // this.BindNodes(rootUnitNode, checkList); // } @@ -243,7 +287,7 @@ namespace FineUIPro.Web.HJGL.CheckManage //{ // if (!string.IsNullOrEmpty(txtTrust.Text)) // { - // var TrustList = Funs.DB.CH_Trust.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.CH_TrustCode.Contains(txtTrust.Text)).Select(x => x.CH_TrustID).ToList(); + // var TrustList = Funs.DB.CH_Trust.Where(x => x.ProjectId == this.ProjectId && x.CH_TrustCode.Contains(txtTrust.Text)).Select(x => x.CH_TrustID).ToList(); // var checkList = checkLists.Where(x => x.UnitId == item.UnitId && TrustList.Contains(x.CH_TrustID)).ToList(); // this.BindNodes(rootUnitNode, checkList); // } @@ -418,7 +462,7 @@ namespace FineUIPro.Web.HJGL.CheckManage { this.drpUnit.SelectedValue = check.UnitId; this.drpInstallationId.Items.Clear(); - BLL.Project_InstallationService.InitInstallationListDownList(this.drpInstallationId, this.CurrUser.LoginProjectId, this.drpUnit.SelectedValue, true); + BLL.Project_InstallationService.InitInstallationListDownList(this.drpInstallationId, this.ProjectId, this.drpUnit.SelectedValue, true); this.drpInstallationId.SelectedIndex = 0; } if (!string.IsNullOrEmpty(check.InstallationId)) @@ -792,8 +836,8 @@ namespace FineUIPro.Web.HJGL.CheckManage } } checkItems.Clear(); - //Project_HJGLData_HJGLService.StatisticalData(this.CurrUser.LoginProjectId, Project_HJGLData_HJGLService.HJGLDateType.NumberOfFilms); - //Project_HJGLData_DefectService.StatisticalData(this.CurrUser.LoginProjectId); + //Project_HJGLData_HJGLService.StatisticalData(this.ProjectId, Project_HJGLData_HJGLService.HJGLDateType.NumberOfFilms); + //Project_HJGLData_DefectService.StatisticalData(this.ProjectId); this.CHT_CheckID = null; this.Grid1.DataSource = null; this.Grid1.DataBind(); @@ -939,7 +983,7 @@ namespace FineUIPro.Web.HJGL.CheckManage #region 增加主表 Model.CH_Check check = new Model.CH_Check(); - check.ProjectId = this.CurrUser.LoginProjectId; + check.ProjectId = this.ProjectId; check.CHT_CheckCode = this.txtCheckCode.Text.Trim(); //if (checkItems.Count() > 0) //{ @@ -975,7 +1019,7 @@ namespace FineUIPro.Web.HJGL.CheckManage { if (updateCheck.CHT_CheckCode != this.txtCheckCode.Text.Trim()) { - if (BLL.CheckManageService.IsExistCheckCode(this.CurrUser.LoginProjectId, this.txtCheckCode.Text.Trim())) + if (BLL.CheckManageService.IsExistCheckCode(this.ProjectId, this.txtCheckCode.Text.Trim())) { Alert.ShowInTop("此检测单号已经存在！", MessageBoxIcon.Warning); return; @@ -1000,7 +1044,7 @@ namespace FineUIPro.Web.HJGL.CheckManage } else { - if (BLL.CheckManageService.IsExistCheckCode(this.CurrUser.LoginProjectId, this.txtCheckCode.Text.Trim())) + if (BLL.CheckManageService.IsExistCheckCode(this.ProjectId, this.txtCheckCode.Text.Trim())) { Alert.ShowInTop("此检测单号已经存在！", MessageBoxIcon.Warning); return; @@ -1041,8 +1085,8 @@ namespace FineUIPro.Web.HJGL.CheckManage BLL.CheckItemManageService.UpdateJointCheckFlag(checkitem.JOT_ID, "1"); } #endregion - //Project_HJGLData_HJGLService.StatisticalData(this.CurrUser.LoginProjectId, Project_HJGLData_HJGLService.HJGLDateType.NumberOfFilms); - //Project_HJGLData_DefectService.StatisticalData(this.CurrUser.LoginProjectId); + //Project_HJGLData_HJGLService.StatisticalData(this.ProjectId, Project_HJGLData_HJGLService.HJGLDateType.NumberOfFilms); + //Project_HJGLData_DefectService.StatisticalData(this.ProjectId); ShowNotify("保存成功！", MessageBoxIcon.Success); checkItems.Clear(); InitTreeMenu(); @@ -1067,7 +1111,7 @@ namespace FineUIPro.Web.HJGL.CheckManage { ddlCheckMan.Items.Clear(); ddlCheckMan.DataBind(); - BLL.UserService.InitUserProjectIdUnitIdDropDownList(this.ddlCheckMan, this.CurrUser.LoginProjectId, drpContractualUnits.SelectedValue, true);//检测人 + BLL.UserService.InitUserProjectIdUnitIdDropDownList(this.ddlCheckMan, this.ProjectId, drpContractualUnits.SelectedValue, true);//检测人 if (ddlCheckMan.Items.Count > 1) { ddlCheckMan.SelectedIndex = 1; @@ -1083,17 +1127,17 @@ namespace FineUIPro.Web.HJGL.CheckManage this.drpInstallationId.Items.Clear(); if (!string.IsNullOrEmpty(this.drpUnit.SelectedValue) && this.drpUnit.SelectedValue != BLL.Const._Null) { - //if (BLL.WorkAreaService.IsSupervisor(this.CurrUser.UnitId, this.CurrUser.LoginProjectId)) + //if (BLL.WorkAreaService.IsSupervisor(this.CurrUser.UnitId, this.ProjectId)) //{ - // BLL.Project_InstallationService.InitInstallationBySupervisorUnitIdListDownList(this.drpInstallationId, this.CurrUser.LoginProjectId, this.drpUnit.SelectedValue, this.CurrUser.UnitId, true); + // BLL.Project_InstallationService.InitInstallationBySupervisorUnitIdListDownList(this.drpInstallationId, this.ProjectId, this.drpUnit.SelectedValue, this.CurrUser.UnitId, true); // this.drpInstallationId.SelectedIndex = 0; //} //else //{ - // BLL.Project_InstallationService.InitInstallationListDownList(this.drpInstallationId, this.CurrUser.LoginProjectId, this.drpUnit.SelectedValue, true); + // BLL.Project_InstallationService.InitInstallationListDownList(this.drpInstallationId, this.ProjectId, this.drpUnit.SelectedValue, true); // this.drpInstallationId.SelectedIndex = 0; //} - BLL.Project_InstallationService.InitInstallationListDownList(this.drpInstallationId, this.CurrUser.LoginProjectId, this.drpUnit.SelectedValue, true); + BLL.Project_InstallationService.InitInstallationListDownList(this.drpInstallationId, this.ProjectId, this.drpUnit.SelectedValue, true); this.drpInstallationId.SelectedIndex = 0; } else @@ -1131,7 +1175,7 @@ namespace FineUIPro.Web.HJGL.CheckManage /// private bool GetButtonPower(string button) { - return BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.HJGL_CheckManageMenuId, button); + return BLL.CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, BLL.Const.HJGL_CheckManageMenuId, button); } #endregion @@ -1153,7 +1197,7 @@ namespace FineUIPro.Web.HJGL.CheckManage { var q = BLL.CheckManageService.GetCheckByCHT_CheckID(this.CHT_CheckID); string varValue = string.Empty; - var projectName = BLL.ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId); + var projectName = BLL.ProjectService.GetProjectNameByProjectId(this.ProjectId); var installationName = BLL.Project_InstallationService.GetInstallationByInstallationId(q.InstallationId).InstallationName; var unitName = BLL.UnitService.GetUnitNameByUnitId(q.UnitId); @@ -1207,7 +1251,7 @@ namespace FineUIPro.Web.HJGL.CheckManage ////{ //// varValue = Microsoft.JScript.GlobalObject.escape(varValue.Replace("/", ",")); ////} - ////PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("../../ReportPrint/ExReportPrint.aspx?ispop=1&reportId={0}&replaceParameter={1}&varValue={2}&projectId={3}", BLL.Const.CheckReportId, reportId, varValue, this.CurrUser.LoginProjectId))); + ////PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("../../ReportPrint/ExReportPrint.aspx?ispop=1&reportId={0}&replaceParameter={1}&varValue={2}&projectId={3}", BLL.Const.CheckReportId, reportId, varValue, this.ProjectId))); //string rootPath = Server.MapPath("~/") + Const.ExcelUrl; @@ -1315,7 +1359,7 @@ namespace FineUIPro.Web.HJGL.CheckManage //{ // hssfworkbook.Write(filess); //} - ////PageContext.RegisterStartupScript(Window5.GetShowReference(String.Format("../../ReportPrint/ExReportPrint.aspx?ispop=1&reportId={0}&replaceParameter={1}&varValue={2}&projectId={3}", BLL.Const.HJGL_JointInfoReportId, isoId, varValue, this.CurrUser.LoginProjectId))); + ////PageContext.RegisterStartupScript(Window5.GetShowReference(String.Format("../../ReportPrint/ExReportPrint.aspx?ispop=1&reportId={0}&replaceParameter={1}&varValue={2}&projectId={3}", BLL.Const.HJGL_JointInfoReportId, isoId, varValue, this.ProjectId))); //FileInfo filet = new FileInfo(ReportFileName); //Response.Clear(); @@ -1339,7 +1383,7 @@ namespace FineUIPro.Web.HJGL.CheckManage { var q = BLL.CheckManageService.GetCheckByCHT_CheckID(this.CHT_CheckID); string varValue = string.Empty; - var projectName = BLL.ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId); + var projectName = BLL.ProjectService.GetProjectNameByProjectId(this.ProjectId); var installationName = BLL.Project_InstallationService.GetInstallationByInstallationId(q.InstallationId).InstallationName; var unitName = BLL.UnitService.GetUnitNameByUnitId(q.UnitId); @@ -1349,7 +1393,7 @@ namespace FineUIPro.Web.HJGL.CheckManage //{ // varValue = Microsoft.JScript.GlobalObject.escape(varValue.Replace("/", ",")); //} - //PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("../../ReportPrint/ExReportPrint.aspx?ispop=1&reportId={0}&replaceParameter={1}&varValue={2}&projectId={3}", BLL.Const.CheckReportId, reportId, varValue, this.CurrUser.LoginProjectId))); + //PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("../../ReportPrint/ExReportPrint.aspx?ispop=1&reportId={0}&replaceParameter={1}&varValue={2}&projectId={3}", BLL.Const.CheckReportId, reportId, varValue, this.ProjectId))); string rootPath = Server.MapPath("~/") + Const.ExcelUrl; @@ -1467,7 +1511,7 @@ namespace FineUIPro.Web.HJGL.CheckManage { hssfworkbook.Write(filess); } - //PageContext.RegisterStartupScript(Window5.GetShowReference(String.Format("../../ReportPrint/ExReportPrint.aspx?ispop=1&reportId={0}&replaceParameter={1}&varValue={2}&projectId={3}", BLL.Const.HJGL_JointInfoReportId, isoId, varValue, this.CurrUser.LoginProjectId))); + //PageContext.RegisterStartupScript(Window5.GetShowReference(String.Format("../../ReportPrint/ExReportPrint.aspx?ispop=1&reportId={0}&replaceParameter={1}&varValue={2}&projectId={3}", BLL.Const.HJGL_JointInfoReportId, isoId, varValue, this.ProjectId))); FileInfo filet = new FileInfo(ReportFileName); Response.Clear(); @@ -1490,7 +1534,7 @@ namespace FineUIPro.Web.HJGL.CheckManage var q = BLL.CheckManageService.GetCheckByCHT_CheckID(this.CHT_CheckID); string varValue = string.Empty; - var projectName = BLL.ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId); + var projectName = BLL.ProjectService.GetProjectNameByProjectId(this.ProjectId); var installationName = BLL.Project_InstallationService.GetInstallationByInstallationId(q.InstallationId).InstallationName; var unitName = BLL.UnitService.GetUnitNameByUnitId(q.UnitId); Dictionary keyValuePairs = new Dictionary(); @@ -1542,10 +1586,10 @@ namespace FineUIPro.Web.HJGL.CheckManage { var q = BLL.CheckManageService.GetCheckByCHT_CheckID(this.CHT_CheckID); string varValue = string.Empty; - var projectName = BLL.ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId); + var projectName = BLL.ProjectService.GetProjectNameByProjectId(this.ProjectId); var installation = BLL.Project_InstallationService.GetInstallationByInstallationId(q.InstallationId); var unitName = BLL.UnitService.GetUnitNameByUnitId(q.UnitId); - var workarea = WorkAreaService.GetWorkAreaByProjectIdAndInstalltionIdAndUnitId(this.CurrUser.LoginProjectId, q.InstallationId, q.UnitId); + var workarea = WorkAreaService.GetWorkAreaByProjectIdAndInstalltionIdAndUnitId(this.ProjectId, q.InstallationId, q.UnitId); Dictionary keyValuePairs = new Dictionary(); keyValuePairs.Add("projectName", projectName); keyValuePairs.Add("install", installation!=null?installation.InstallationName:""); diff --git a/SUBQHSE/FineUIPro.Web/HJGL/CheckManage/CheckManage.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HJGL/CheckManage/CheckManage.aspx.designer.cs index cf9eb3f..a4ea256 100644 --- a/SUBQHSE/FineUIPro.Web/HJGL/CheckManage/CheckManage.aspx.designer.cs +++ b/SUBQHSE/FineUIPro.Web/HJGL/CheckManage/CheckManage.aspx.designer.cs @@ -50,6 +50,33 @@ namespace FineUIPro.Web.HJGL.CheckManage /// protected global::FineUIPro.Panel panelLeftRegion; + /// + /// ContentPanel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel1; + + /// + /// ucTree 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree; + + /// + /// panelLeftRegion2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelLeftRegion2; + /// /// Toolbar1 控件。 /// diff --git a/SUBQHSE/FineUIPro.Web/HJGL/CheckManage/CheckManageAudit.aspx b/SUBQHSE/FineUIPro.Web/HJGL/CheckManage/CheckManageAudit.aspx index 20ca7ed..a467862 100644 --- a/SUBQHSE/FineUIPro.Web/HJGL/CheckManage/CheckManageAudit.aspx +++ b/SUBQHSE/FineUIPro.Web/HJGL/CheckManage/CheckManageAudit.aspx @@ -1,5 +1,7 @@ <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CheckManageAudit.aspx.cs" Inherits="FineUIPro.Web.HJGL.CheckManage.CheckManageAudit" %> +<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %> + @@ -13,6 +15,16 @@ + + + + + + + @@ -51,7 +63,7 @@ - + @@ -141,7 +153,7 @@ FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px"> + FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px"> @@ -193,8 +205,8 @@ - + diff --git a/SUBQHSE/FineUIPro.Web/HJGL/CheckManage/CheckManageAudit.aspx.cs b/SUBQHSE/FineUIPro.Web/HJGL/CheckManage/CheckManageAudit.aspx.cs index 6f0c6f9..ad25334 100644 --- a/SUBQHSE/FineUIPro.Web/HJGL/CheckManage/CheckManageAudit.aspx.cs +++ b/SUBQHSE/FineUIPro.Web/HJGL/CheckManage/CheckManageAudit.aspx.cs @@ -1,23 +1,32 @@ using BLL; using System; -using System; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; using System.Linq; -using Newtonsoft.Json.Linq; using System.IO; using NPOI.XSSF.UserModel; using NPOI.SS.UserModel; -using System.Runtime.Serialization; -using NPOI.SS.Util; -using NPOI.HSSF.UserModel; namespace FineUIPro.Web.HJGL.CheckManage { public partial class CheckManageAudit : PageBase { #region 定义变量 /// + /// 项目主键 + /// + public string ProjectId + { + get + { + return (string)ViewState["ProjectId"]; + } + set + { + ViewState["ProjectId"] = value; + } + } + /// /// 检测主键 /// public string CHT_CheckID @@ -78,9 +87,21 @@ namespace FineUIPro.Web.HJGL.CheckManage { if (!IsPostBack) { + this.ProjectId = this.CurrUser.LoginProjectId; + if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId) + { + this.ProjectId = Request.Params["projectId"]; + } + this.InitDropDownList(); + this.ucTree.UnitId = this.CurrUser.UnitId; + this.ucTree.ProjectId = this.ProjectId; + if (!string.IsNullOrEmpty(this.ProjectId)) + { + this.panelLeftRegion.Hidden = true; + ////权限按钮方法 + //this.GetButtonPower(); + } this.txtCheckTime.Text = string.Format("{0:yyyy-MM}", DateTime.Now); - BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpCheckUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_5, true);//查询检测单位 - BLL.UserService.InitUserDropDownList(this.ddlAuditMan, this.CurrUser.LoginProjectId, true);//审核人 this.InitTreeMenu();//加载树 @@ -92,6 +113,30 @@ namespace FineUIPro.Web.HJGL.CheckManage //Funs.FineUIPleaseSelect(this.drpPrintType); } } + private void InitDropDownList() + { + BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpCheckUnit, this.ProjectId, BLL.Const.ProjectUnitType_5, true);//查询检测单位 + BLL.UserService.InitUserDropDownList(this.ddlAuditMan, this.ProjectId, true);//审核人 + } + + /// + /// 公司级树加载 + /// + /// + /// + protected void changeTree(object sender, EventArgs e) + { + this.ProjectId = this.ucTree.ProjectId; + this.InitDropDownList(); + + //if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId)) + //{ + // btnNew.Hidden = true; + //} + //this.GetButtonPower(); + this.InitTreeMenu(); + } + #endregion #region 加载树装置-单位-工作区 @@ -100,6 +145,7 @@ namespace FineUIPro.Web.HJGL.CheckManage /// private void InitTreeMenu() { + this.InitDropDownList(); if (!string.IsNullOrEmpty(this.txtCheckTime.Text.Trim())) { DateTime? startTime = Funs.GetNewDateTime(this.txtCheckTime.Text.Trim()); @@ -113,19 +159,19 @@ namespace FineUIPro.Web.HJGL.CheckManage this.tvControlItem.Nodes.Add(rootNode); List units = null; - var unit = BLL.ProjectUnitService.GetProjectUnitByUnitIdProjectId(this.CurrUser.LoginProjectId, this.CurrUser.UnitId); + var unit = BLL.ProjectUnitService.GetProjectUnitByUnitIdProjectId(this.ProjectId, this.CurrUser.UnitId); if (unit == null || unit.UnitType == BLL.Const.ProjectUnitType_1 || unit.UnitType == BLL.Const.ProjectUnitType_5 || unit.UnitType == BLL.Const.ProjectUnitType_3) { - if (BLL.WorkAreaService.IsSupervisor(this.CurrUser.UnitId, this.CurrUser.LoginProjectId)) + if (BLL.WorkAreaService.IsSupervisor(this.CurrUser.UnitId, this.ProjectId)) { units = (from x in Funs.DB.Base_Unit join y in Funs.DB.ProjectData_WorkArea on x.UnitId equals y.UnitId - where (x.UnitId == this.CurrUser.UnitId || y.SupervisorUnitId == this.CurrUser.UnitId) && y.ProjectId == this.CurrUser.LoginProjectId + where (x.UnitId == this.CurrUser.UnitId || y.SupervisorUnitId == this.CurrUser.UnitId) && y.ProjectId == this.ProjectId select x).Distinct().ToList(); } else { - units = BLL.UnitService.GetUnitByProjectIdUnitTypeList(this.CurrUser.LoginProjectId, "2"); + units = BLL.UnitService.GetUnitByProjectIdUnitTypeList(this.ProjectId, "2"); } } else @@ -136,19 +182,19 @@ namespace FineUIPro.Web.HJGL.CheckManage if (!this.txtCheckTime.Hidden) { checkLists = (from x in Funs.DB.CH_Check - where x.ProjectId == this.CurrUser.LoginProjectId && x.CHT_CheckDate >= startTime && x.CHT_CheckDate < endTime + where x.ProjectId == this.ProjectId && x.CHT_CheckDate >= startTime && x.CHT_CheckDate < endTime select x).ToList(); } else { checkLists = (from x in Funs.DB.CH_Check - where x.ProjectId == this.CurrUser.LoginProjectId && x.CHT_CheckCode.Contains(this.txtSearchCode.Text.Trim()) + where x.ProjectId == this.ProjectId && x.CHT_CheckCode.Contains(this.txtSearchCode.Text.Trim()) select x).ToList(); } if (this.drpCheckUnit.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpCheckUnit.SelectedValue)) { checkLists = (from x in Funs.DB.CH_Check - where x.ProjectId == this.CurrUser.LoginProjectId && x.ContractualUnits == this.drpCheckUnit.SelectedValue + where x.ProjectId == this.ProjectId && x.ContractualUnits == this.drpCheckUnit.SelectedValue select x).ToList(); } if (units != null) @@ -577,7 +623,7 @@ namespace FineUIPro.Web.HJGL.CheckManage /// private bool GetButtonPower(string button) { - return BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.HJGL_CheckManageAuditMenuId, button); + return BLL.CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, BLL.Const.HJGL_CheckManageAuditMenuId, button); } #endregion @@ -599,7 +645,7 @@ namespace FineUIPro.Web.HJGL.CheckManage { var q = BLL.CheckManageService.GetCheckByCHT_CheckID(this.CHT_CheckID); string varValue = string.Empty; - var projectName = BLL.ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId); + var projectName = BLL.ProjectService.GetProjectNameByProjectId(this.ProjectId); var installationName = BLL.Project_InstallationService.GetInstallationByInstallationId(q.InstallationId).InstallationName; var unitName = BLL.UnitService.GetUnitNameByUnitId(q.UnitId); @@ -653,7 +699,7 @@ namespace FineUIPro.Web.HJGL.CheckManage ////{ //// varValue = Microsoft.JScript.GlobalObject.escape(varValue.Replace("/", ",")); ////} - ////PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("../../ReportPrint/ExReportPrint.aspx?ispop=1&reportId={0}&replaceParameter={1}&varValue={2}&projectId={3}", BLL.Const.CheckReportId, reportId, varValue, this.CurrUser.LoginProjectId))); + ////PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("../../ReportPrint/ExReportPrint.aspx?ispop=1&reportId={0}&replaceParameter={1}&varValue={2}&projectId={3}", BLL.Const.CheckReportId, reportId, varValue, this.ProjectId))); //string rootPath = Server.MapPath("~/") + Const.ExcelUrl; @@ -761,7 +807,7 @@ namespace FineUIPro.Web.HJGL.CheckManage //{ // hssfworkbook.Write(filess); //} - ////PageContext.RegisterStartupScript(Window5.GetShowReference(String.Format("../../ReportPrint/ExReportPrint.aspx?ispop=1&reportId={0}&replaceParameter={1}&varValue={2}&projectId={3}", BLL.Const.HJGL_JointInfoReportId, isoId, varValue, this.CurrUser.LoginProjectId))); + ////PageContext.RegisterStartupScript(Window5.GetShowReference(String.Format("../../ReportPrint/ExReportPrint.aspx?ispop=1&reportId={0}&replaceParameter={1}&varValue={2}&projectId={3}", BLL.Const.HJGL_JointInfoReportId, isoId, varValue, this.ProjectId))); //FileInfo filet = new FileInfo(ReportFileName); //Response.Clear(); @@ -785,7 +831,7 @@ namespace FineUIPro.Web.HJGL.CheckManage { var q = BLL.CheckManageService.GetCheckByCHT_CheckID(this.CHT_CheckID); string varValue = string.Empty; - var projectName = BLL.ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId); + var projectName = BLL.ProjectService.GetProjectNameByProjectId(this.ProjectId); var installationName = BLL.Project_InstallationService.GetInstallationByInstallationId(q.InstallationId).InstallationName; var unitName = BLL.UnitService.GetUnitNameByUnitId(q.UnitId); @@ -795,7 +841,7 @@ namespace FineUIPro.Web.HJGL.CheckManage //{ // varValue = Microsoft.JScript.GlobalObject.escape(varValue.Replace("/", ",")); //} - //PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("../../ReportPrint/ExReportPrint.aspx?ispop=1&reportId={0}&replaceParameter={1}&varValue={2}&projectId={3}", BLL.Const.CheckReportId, reportId, varValue, this.CurrUser.LoginProjectId))); + //PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("../../ReportPrint/ExReportPrint.aspx?ispop=1&reportId={0}&replaceParameter={1}&varValue={2}&projectId={3}", BLL.Const.CheckReportId, reportId, varValue, this.ProjectId))); string rootPath = Server.MapPath("~/") + Const.ExcelUrl; @@ -913,7 +959,7 @@ namespace FineUIPro.Web.HJGL.CheckManage { hssfworkbook.Write(filess); } - //PageContext.RegisterStartupScript(Window5.GetShowReference(String.Format("../../ReportPrint/ExReportPrint.aspx?ispop=1&reportId={0}&replaceParameter={1}&varValue={2}&projectId={3}", BLL.Const.HJGL_JointInfoReportId, isoId, varValue, this.CurrUser.LoginProjectId))); + //PageContext.RegisterStartupScript(Window5.GetShowReference(String.Format("../../ReportPrint/ExReportPrint.aspx?ispop=1&reportId={0}&replaceParameter={1}&varValue={2}&projectId={3}", BLL.Const.HJGL_JointInfoReportId, isoId, varValue, this.ProjectId))); FileInfo filet = new FileInfo(ReportFileName); Response.Clear(); @@ -936,7 +982,7 @@ namespace FineUIPro.Web.HJGL.CheckManage var q = BLL.CheckManageService.GetCheckByCHT_CheckID(this.CHT_CheckID); string varValue = string.Empty; - var projectName = BLL.ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId); + var projectName = BLL.ProjectService.GetProjectNameByProjectId(this.ProjectId); var installationName = BLL.Project_InstallationService.GetInstallationByInstallationId(q.InstallationId).InstallationName; var unitName = BLL.UnitService.GetUnitNameByUnitId(q.UnitId); Dictionary keyValuePairs = new Dictionary(); @@ -988,10 +1034,10 @@ namespace FineUIPro.Web.HJGL.CheckManage { var q = BLL.CheckManageService.GetCheckByCHT_CheckID(this.CHT_CheckID); string varValue = string.Empty; - var projectName = BLL.ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId); + var projectName = BLL.ProjectService.GetProjectNameByProjectId(this.ProjectId); var installation = BLL.Project_InstallationService.GetInstallationByInstallationId(q.InstallationId); var unitName = BLL.UnitService.GetUnitNameByUnitId(q.UnitId); - var workarea = WorkAreaService.GetWorkAreaByProjectIdAndInstalltionIdAndUnitId(this.CurrUser.LoginProjectId, q.InstallationId, q.UnitId); + var workarea = WorkAreaService.GetWorkAreaByProjectIdAndInstalltionIdAndUnitId(this.ProjectId, q.InstallationId, q.UnitId); Dictionary keyValuePairs = new Dictionary(); keyValuePairs.Add("projectName", projectName); keyValuePairs.Add("install", installation != null ? installation.InstallationName : ""); diff --git a/SUBQHSE/FineUIPro.Web/HJGL/CheckManage/CheckManageAudit.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HJGL/CheckManage/CheckManageAudit.aspx.designer.cs index bab6301..8f93c6f 100644 --- a/SUBQHSE/FineUIPro.Web/HJGL/CheckManage/CheckManageAudit.aspx.designer.cs +++ b/SUBQHSE/FineUIPro.Web/HJGL/CheckManage/CheckManageAudit.aspx.designer.cs @@ -50,6 +50,33 @@ namespace FineUIPro.Web.HJGL.CheckManage /// protected global::FineUIPro.Panel panelLeftRegion; + /// + /// ContentPanel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel1; + + /// + /// ucTree 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree; + + /// + /// panelLeftRegion2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelLeftRegion2; + /// /// Toolbar1 控件。 /// diff --git a/SUBQHSE/FineUIPro.Web/HJGL/CheckManage/CheckManageImport.aspx b/SUBQHSE/FineUIPro.Web/HJGL/CheckManage/CheckManageImport.aspx index f3b57f9..6b9cef5 100644 --- a/SUBQHSE/FineUIPro.Web/HJGL/CheckManage/CheckManageImport.aspx +++ b/SUBQHSE/FineUIPro.Web/HJGL/CheckManage/CheckManageImport.aspx @@ -1,5 +1,7 @@ <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CheckManageImport.aspx.cs" Inherits="FineUIPro.Web.HJGL.CheckManage.CheckManageImport" %> +<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %> + @@ -17,186 +19,176 @@ } - - + } +
+ - - - - - - - - - - - - - - - - <%-- - --%> - - <%----%> - <%----%> - - - - - - - <%-- - - - - - - - - - - - - - - - --%> + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + <%-- + --%> + + <%----%> + <%----%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
- + FieldType="String" HeaderTextAlign="Center" TextAlign="Left"> - + - + - + + FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Locked="true"> - + @@ -92,7 +103,7 @@ SortField="DefectCode" FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px"> - @@ -100,57 +111,56 @@ SortField="ISO_IsoNo" FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="130px"> - - + + + - - + SortField="MaterialCode" FieldType="String" HeaderTextAlign="Center" TextAlign="Left"> + SortField="DetectionRateCode" FieldType="String" HeaderTextAlign="Center" TextAlign="Left"> + SortField="WorkAmout1" FieldType="String" HeaderTextAlign="Center" TextAlign="Left"> + FieldType="String" HeaderTextAlign="Center" TextAlign="Left"> + FieldType="String" HeaderTextAlign="Center" TextAlign="Left"> + FieldType="Date" Renderer="Date" HeaderTextAlign="Center" TextAlign="Left"> + FieldType="String" HeaderTextAlign="Center" TextAlign="Left"> + FieldType="String" HeaderTextAlign="Center" TextAlign="Left"> + FieldType="String" HeaderTextAlign="Center" TextAlign="Left"> - - + + + FieldType="String" HeaderTextAlign="Center" TextAlign="Left"> - + + FieldType="String" HeaderTextAlign="Center" TextAlign="Left"> @@ -162,13 +172,13 @@ FieldType="Date" Renderer="Date" HeaderTextAlign="Center" TextAlign="Left" Width="150px"> + FieldType="String" HeaderTextAlign="Center" TextAlign="Left"> + FieldType="String" HeaderTextAlign="Center" TextAlign="Left"> - + @@ -198,14 +208,14 @@ Width="1100px" Height="740px"> - + @@ -73,13 +84,12 @@ + LabelAlign="Left"> + LabelAlign="Left"> - + @@ -174,7 +184,7 @@ EnablePostBack="true" Icon="Pencil" ConfirmTarget="Top" runat="server" Text="热处理报告"> - <%-- + <%--