diff --git a/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs b/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs index 2f33bef7..097c9fc0 100644 --- a/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs +++ b/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs @@ -146,6 +146,10 @@ namespace FineUIPro.Web.AttachFile Grid1.DataSource = SourceData(); } } + else if (!string.IsNullOrEmpty(Request.Params["ConstructionLog"])) + { + Grid1.DataSource = GetConstructionLogSourceData(); + } else { Grid1.DataSource = GetSourceData(); @@ -519,6 +523,50 @@ namespace FineUIPro.Web.AttachFile return (JArray)Session[sessionName]; } + private JArray GetConstructionLogSourceData() + { + if (Session[sessionName] == null && !string.IsNullOrEmpty(ToKeyId)) + { + Session[sessionName] = new JArray(); + List sours = new List(); + List lists = Funs.GetStrListByStr(ToKeyId, ','); + sours = (from x in Funs.DB.AttachFile where lists.Contains(x.ToKeyId) select x).ToList(); + string attachSource = string.Empty; + if (sours.Count>0) + { + foreach (var sour in sours) + { + string url = sour.AttachUrl.Replace('\\', '/'); + List list = Funs.GetStrListByStr(url, ','); + if (list.Count() > 0) + { + int i = 0; + foreach (var item in list) + { + string atturl = Funs.RootPath + item.Replace(';', ' ').Trim(); + if (File.Exists(atturl)) + { + i += 1; + break; + } + } + if (i > 0) + { + attachSource += sour.AttachSource; + } + } + } + + } + if (!string.IsNullOrEmpty(attachSource)) + { + attachSource = attachSource.Replace("][", ","); + Session[sessionName] = JArray.Parse(attachSource); + } + } + return (JArray)Session[sessionName]; + } + /// /// /// diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx.cs index ebf59c9c..bf53912b 100644 --- a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx.cs +++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx.cs @@ -593,11 +593,11 @@ namespace FineUIPro.Web.PZHGL.InformationProject } } this.txtRemark.Text = string.Empty; - this.txtHSETodaySummary.Text = string.Empty; + this.txtHSETodaySummary.Text = "安全事故：次；安全检查：次；安全检查累计问题项：项，已整改：项。"; this.txtHSETodaySummaryRemark.Text = string.Empty; this.txtHSETomorrowPlan.Text = string.Empty; this.txtHSETomorrowPlanRemark.Text = string.Empty; - this.txtCQMSTodaySummary.Text = string.Empty; + this.txtCQMSTodaySummary.Text = "质量事故：次；质量检查：次；质量验收：项；质量检查问题累计：项，已整改：项。"; this.txtCQMSTodaySummaryRemark.Text = string.Empty; this.txtCQMSTomorrowPlan.Text = string.Empty; this.txtCQMSTomorrowPlanRemark.Text = string.Empty; @@ -833,7 +833,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject foreach (JObject mergedRow in Grid2.GetMergedData()) //机械数量 { JObject values = mergedRow.Value("values"); - for (int i = 0; i < list.Count; i++) + for (int i = 0; i < list2.Count; i++) { Model.ZHGL_ConstructionLogMachine newItem = new Model.ZHGL_ConstructionLogMachine(); newItem.ConstructionLogMachineId = SQLHelper.GetNewID(); diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx index 8a3671ed..3abe954d 100644 --- a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx +++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx @@ -40,8 +40,12 @@ + + + diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx.cs index 9199652f..17cd80c9 100644 --- a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx.cs +++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx.cs @@ -1235,6 +1235,30 @@ namespace FineUIPro.Web.PZHGL.InformationProject TextNew(); } + protected void imgBtnFile_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(this.txtCompileDate.Text.Trim())) + { + Alert.ShowInTop("请选择日期！", MessageBoxIcon.Warning); + return; + } + DateTime today = DateTime.Now.Date; + if (!string.IsNullOrEmpty(this.txtCompileDate.Text.Trim())) + { + today = Convert.ToDateTime(this.txtCompileDate.Text.Trim()).Date; + } + var personLogs = from x in Funs.DB.ZHGL_ConstructionLog + where x.ProjectId == this.CurrUser.LoginProjectId && x.CompileDate == today + orderby x.CompileDate descending + select x; + string logIds = string.Empty; + foreach (var personLog in personLogs) + { + logIds += personLog.ConstructionLogId + ","; + } + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&ConstructionLog=ConstructionLog&path=FileUpload/ConstructionLog&menuId={2}", -1, logIds, BLL.Const.ConstructionLogMenuId))); + } + protected void btnWorkEfficiency_Click(object sender, EventArgs e) { if (string.IsNullOrEmpty(this.txtCompileDate.Text.Trim())) diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx.designer.cs b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx.designer.cs index 4c5d2bef..6c7e24bb 100644 --- a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx.designer.cs @@ -93,6 +93,15 @@ namespace FineUIPro.Web.PZHGL.InformationProject { /// protected global::FineUIPro.Toolbar Toolbar3; + /// + /// imgBtnFile 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button imgBtnFile; + /// /// hdWorkPostId 控件。 /// diff --git a/SGGL/FineUIPro.Web/common/Menu_HTGL.xml b/SGGL/FineUIPro.Web/common/Menu_HTGL.xml index 9b647aea..c0fc81f0 100644 --- a/SGGL/FineUIPro.Web/common/Menu_HTGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_HTGL.xml @@ -20,4 +20,5 @@ + \ No newline at end of file diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index b4f9e702..3486d11c 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -39527,10 +39527,10 @@ namespace Model private string _SaveHandleMan; - private string _WorkPackageName; - private string _WorkPackageId; + private string _WorkPackageName; + private EntityRef _Base_Project; private EntityRef _Person_Persons; @@ -39587,10 +39587,10 @@ namespace Model partial void OnProposeUnitIdChanged(); partial void OnSaveHandleManChanging(string value); partial void OnSaveHandleManChanged(); - partial void OnWorkPackageNameChanging(string value); - partial void OnWorkPackageNameChanged(); partial void OnWorkPackageIdChanging(string value); partial void OnWorkPackageIdChanged(); + partial void OnWorkPackageNameChanging(string value); + partial void OnWorkPackageNameChanged(); #endregion public Check_CheckControl() @@ -40069,26 +40069,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageName", DbType="NVarChar(2000)")] - public string WorkPackageName - { - get - { - return this._WorkPackageName; - } - set - { - if ((this._WorkPackageName != value)) - { - this.OnWorkPackageNameChanging(value); - this.SendPropertyChanging(); - this._WorkPackageName = value; - this.SendPropertyChanged("WorkPackageName"); - this.OnWorkPackageNameChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")] public string WorkPackageId { @@ -40109,6 +40089,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageName", DbType="NVarChar(2000)")] + public string WorkPackageName + { + get + { + return this._WorkPackageName; + } + set + { + if ((this._WorkPackageName != value)) + { + this.OnWorkPackageNameChanging(value); + this.SendPropertyChanging(); + this._WorkPackageName = value; + this.SendPropertyChanged("WorkPackageName"); + this.OnWorkPackageNameChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckControl_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -100776,10 +100776,10 @@ namespace Model private string _HazardValue; - private string _WorkPackageName; - private string _WorkPackageId; + private string _WorkPackageName; + private EntityRef _Base_Unit; private EntityRef _HSSE_Hazard_HazardRegisterTypes; @@ -100880,10 +100880,10 @@ namespace Model partial void OnRegisterTypes4IdChanged(); partial void OnHazardValueChanging(string value); partial void OnHazardValueChanged(); - partial void OnWorkPackageNameChanging(string value); - partial void OnWorkPackageNameChanged(); partial void OnWorkPackageIdChanging(string value); partial void OnWorkPackageIdChanged(); + partial void OnWorkPackageNameChanging(string value); + partial void OnWorkPackageNameChanged(); #endregion public HSSE_Hazard_HazardRegister() @@ -101821,26 +101821,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageName", DbType="NVarChar(2000)")] - public string WorkPackageName - { - get - { - return this._WorkPackageName; - } - set - { - if ((this._WorkPackageName != value)) - { - this.OnWorkPackageNameChanging(value); - this.SendPropertyChanging(); - this._WorkPackageName = value; - this.SendPropertyChanged("WorkPackageName"); - this.OnWorkPackageNameChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")] public string WorkPackageId { @@ -101861,6 +101841,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageName", DbType="NVarChar(2000)")] + public string WorkPackageName + { + get + { + return this._WorkPackageName; + } + set + { + if ((this._WorkPackageName != value)) + { + this.OnWorkPackageNameChanging(value); + this.SendPropertyChanging(); + this._WorkPackageName = value; + this.SendPropertyChanged("WorkPackageName"); + this.OnWorkPackageNameChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HSSE_Hazard_HazardRegister_Base_Unit", Storage="_Base_Unit", ThisKey="ResponsibleUnit", OtherKey="UnitId", IsForeignKey=true)] public Base_Unit Base_Unit {