lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改施工日志

This commit is contained in:
高飞 2023-10-24 11:22:31 +08:00
parent 8e014df363
commit 10f7a64314
7 changed files with 137 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs
View File

@ -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<Model.AttachFile> sours = new List<Model.AttachFile>();
List<string> 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<string> 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];
}
/// <summary>
///
/// </summary>

6
SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx.cs
View File

@ -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<JObject>("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();

4
SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx
View File

@ -40,8 +40,12 @@
<Toolbars>
<f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:Button ID="imgBtnFile" Text="现场照片" ToolTip="查看" Icon="TableCell" runat="server"
OnClick="imgBtnFile_Click">
</f:Button>
<f:HiddenField runat="server" ID="hdWorkPostId"></f:HiddenField>
<f:HiddenField runat="server" ID="hdMachineId"></f:HiddenField>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnSave" Text="发布" ToolTip="发布项目施工日志" Icon="SystemSave" runat="server" OnClick="btnSave_Click" ValidateForms="SimpleForm1">
</f:Button>
</Items>

24
SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx.cs
View File

@ -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()))

9
SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx.designer.cs generated
View File

@ -93,6 +93,15 @@ namespace FineUIPro.Web.PZHGL.InformationProject {
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar3;
/// <summary>
/// imgBtnFile 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button imgBtnFile;
/// <summary>
/// hdWorkPostId 控件。
/// </summary>

1
SGGL/FineUIPro.Web/common/Menu_HTGL.xml
View File

@ -20,4 +20,5 @@
<TreeNode id="A5A31FE8-0643-4396-99E3-A4A31A947789" Text="无损检测工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=8"></TreeNode>
<TreeNode id="481E6B1E-A3D5-4012-B828-FE62EB6BA861" Text="消防工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=9"></TreeNode>
</TreeNode>
<TreeNode id="34037636-4BEC-44A9-8267-7830F021AF02" Text="公司平均工效统计" NavigateUrl="PZHGL/InformationProject/CompanyConstructionLogWorkEfficiencySum.aspx"></TreeNode>
</Tree>

96
SGGL/Model/Model.cs
View File

@ -39527,10 +39527,10 @@ namespace Model
private string _SaveHandleMan;
private string _WorkPackageName;
private string _WorkPackageId;
private string _WorkPackageName;
private EntityRef<Base_Project> _Base_Project;
private EntityRef<Person_Persons> _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> _Base_Unit;
private EntityRef<HSSE_Hazard_HazardRegisterTypes> _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
{