lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: lpf:be6da143393b68a86e4db385d7365331e2820672
Branches Tags
lpf:master
lpf:panhf_20240125
..
compare: lpf:00a325ba3a81b4023e24ed1bc00cb068464329dc
Branches Tags
lpf:master
lpf:panhf_20240125

No commits in common. "be6da143393b68a86e4db385d7365331e2820672" and "00a325ba3a81b4023e24ed1bc00cb068464329dc" have entirely different histories.
be6da14339 ... 00a325ba3a

12 changed files with 165 additions and 5731 deletions
Show Stats Expand all files Collapse all files

2
CreateModel2017.bat
View File

@ -27,7 +27,7 @@ REM --------------
@echo.
@call "%VS150%"
SqlMetal /views /server:DESKTOP-1QITK9E\MSSQLSERVER2 /user:sa /password:123 /database:SGGLDB_WH /code:%Model_ROOT%\Model.cs /namespace:Model
SqlMetal /views /server:. /user:sa /password:1111 /database:SGGLDB_WH /code:%Model_ROOT%\Model.cs /namespace:Model
@ECHO 完成
pause

10
DataBase/版本日志/SGGLDB_WH_2024-04-02-phf.sql
View File

@ -1,10 +0,0 @@
update sys_menu set menuname='项目质量周报' where menuname='施工质量周报'
update sys_menu set menuname='项目质量月报' where menuname='施工质量月报'
update sys_menu set menuname='项目质量月报（新）' where menuname='施工质量月报（新）'
update Comprehensive_MajorPlanApproval set ExpertReviewMan='' where ExpertReviewMan is null;
--超危大工程方案管理增加是否通过专家评审
alter table Comprehensive_MajorPlanApproval
add IsReview bit NULL;

4
SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs
View File

@ -119,8 +119,6 @@ namespace BLL
newMajorPlanApproval.CompileDate = majorPlanApproval.CompileDate;
newMajorPlanApproval.UnitWorkId = majorPlanApproval.UnitWorkId;
newMajorPlanApproval.ExpertReviewMan = majorPlanApproval.ExpertReviewMan;
newMajorPlanApproval.IsReview = majorPlanApproval.IsReview;
db.Comprehensive_MajorPlanApproval.InsertOnSubmit(newMajorPlanApproval);
db.SubmitChanges();
}
@ -148,8 +146,6 @@ namespace BLL
newMajorPlanApproval.AttachUrl = majorPlanApproval.AttachUrl;
newMajorPlanApproval.UnitWorkId = majorPlanApproval.UnitWorkId;
newMajorPlanApproval.ExpertReviewMan = majorPlanApproval.ExpertReviewMan;
newMajorPlanApproval.IsReview = majorPlanApproval.IsReview;
db.SubmitChanges();
}
}

5
SGGL/BLL/Common/Const.cs
View File

@ -3900,11 +3900,6 @@ namespace BLL
/// </summary>
public static string WorkPost_HSSEDirector = "8A7C2CDF-AFB5-4826-9951-343253342DAC";
/// <summary>
/// 综合ID
/// </summary>
public const string ComprehensiveId = "3686d62d-26b8-4ff9-8160-f3688d58bfc0";
#region WBS_BreakdownProject表中SourceBreakdownId
public const string SourceBreakdownId = "2cbaabf0-c58a-4a12-b36e-4f8e588fa18e";

4
SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx
View File

@ -71,9 +71,9 @@
<f:RenderField ColumnID="ApprovalMan" DataField="ApprovalMan" FieldType="String" HeaderText="批准人" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<%-- <f:RenderField ColumnID="ImplementationDeviation" DataField="ImplementationDeviation" FieldType="String" HeaderText="施工总结" TextAlign="Center"
<f:RenderField ColumnID="ImplementationDeviation" DataField="ImplementationDeviation" FieldType="String" HeaderText="施工总结" TextAlign="Center"
HeaderTextAlign="Center" Width="220px">
</f:RenderField>--%>
</f:RenderField>
<f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left" >
<ItemTemplate>
<asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink"

8
SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx
View File

@ -48,13 +48,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<%--<f:TextArea ID="txtImplementationDeviation" runat="server" Label="施工总结" MaxLength="500" LabelWidth="130px" LabelAlign="right"></f:TextArea>--%>
<f:RadioButtonList runat="server" ID="rblIsReview" Label="是否通过专家评审" ShowRedStar="true" LabelAlign="Right" LabelWidth="130px">
<f:RadioItem Text="是" Value="true" Selected="true" />
<f:RadioItem Text="否" Value="false" />
</f:RadioButtonList>
<f:Label Hidden="true" runat="server"></f:Label>
<f:TextArea ID="txtImplementationDeviation" runat="server" Label="施工总结" MaxLength="500" LabelWidth="130px" LabelAlign="right"></f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>

16
SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.cs
View File

@ -64,10 +64,8 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
this.txtAuditMan.Text = majorPlanApproval.AuditMan;
this.txtApprovalMan.Text = majorPlanApproval.ApprovalMan;
//this.txtImplementationDeviation.Text = majorPlanApproval.ImplementationDeviation;
this.txtImplementationDeviation.Text = majorPlanApproval.ImplementationDeviation;
this.txtExpertReviewMan.Text = majorPlanApproval.ExpertReviewMan;
this.rblIsReview.SelectedValue = majorPlanApproval.IsReview.HasValue && majorPlanApproval.IsReview == true ? "true" : "false";
}
else
{
@ -110,7 +108,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
majorPlanApproval.AuditMan = this.txtAuditMan.Text.Trim();
majorPlanApproval.ApprovalMan = this.txtApprovalMan.Text.Trim();
//majorPlanApproval.ImplementationDeviation = this.txtImplementationDeviation.Text.Trim();
majorPlanApproval.ImplementationDeviation = this.txtImplementationDeviation.Text.Trim();
string ids = string.Empty;
var lists = this.drpUnitWorkIds.SelectedValueArray;
foreach (var item in lists)
@ -122,16 +120,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive
ids = ids.Substring(0, ids.LastIndexOf(","));
}
majorPlanApproval.UnitWorkId = ids;
if (this.rblIsReview.SelectedValue == "true")
{
majorPlanApproval.IsReview = true;
}
else
{
majorPlanApproval.IsReview = false;
}
if (string.IsNullOrEmpty(this.MajorPlanApprovalId))
{
if (!string.IsNullOrEmpty(this.hdAttachUrl.Text))

4
SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.designer.cs generated
View File

@ -132,13 +132,13 @@ namespace FineUIPro.Web.CQMS.Comprehensive
protected global::FineUIPro.TextBox txtExpertReviewMan;
/// <summary>
/// rblIsReview 控件。
/// txtImplementationDeviation 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rblIsReview;
protected global::FineUIPro.TextArea txtImplementationDeviation;
/// <summary>
/// Panel2 控件。

1697
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit2.aspx
View File

File diff suppressed because it is too large Load Diff

3029
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit2.aspx.cs
View File

File diff suppressed because it is too large Load Diff

1039
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit2.aspx.designer.cs generated
View File

File diff suppressed because it is too large Load Diff

74
SGGL/Model/Model.cs
View File

@ -96363,8 +96363,6 @@ namespace Model
private string _ExpertReviewMan;
private System.Nullable<bool> _IsReview;
private EntityRef<Base_CNProfessional> _Base_CNProfessional;
private EntityRef<Base_Project> _Base_Project;
@ -96409,8 +96407,6 @@ namespace Model
partial void OnUnitWorkIdChanged();
partial void OnExpertReviewManChanging(string value);
partial void OnExpertReviewManChanged();
partial void OnIsReviewChanging(System.Nullable<bool> value);
partial void OnIsReviewChanged();
#endregion
public Comprehensive_MajorPlanApproval()
@ -96754,26 +96750,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsReview", DbType="Bit")]
public System.Nullable<bool> IsReview
{
get
{
return this._IsReview;
}
set
{
if ((this._IsReview != value))
{
this.OnIsReviewChanging(value);
this.SendPropertyChanging();
this._IsReview = value;
this.SendPropertyChanged("IsReview");
this.OnIsReviewChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Comprehensive_MajorPlanApproval_Base_CNProfessional", Storage="_Base_CNProfessional", ThisKey="CNProfessionalId", OtherKey="CNProfessionalId", IsForeignKey=true)]
public Base_CNProfessional Base_CNProfessional
{
@ -99658,10 +99634,10 @@ namespace Model
private string _ProjectId;
private string _CNProfessionalId;
private string _DraCode;
private string _CNProfessionalId;
private System.Nullable<System.DateTime> _ReviewDate;
private string _UnitWorkId;
@ -99684,10 +99660,10 @@ namespace Model
partial void OnIdChanged();
partial void OnProjectIdChanging(string value);
partial void OnProjectIdChanged();
partial void OnCNProfessionalIdChanging(string value);
partial void OnCNProfessionalIdChanged();
partial void OnDraCodeChanging(string value);
partial void OnDraCodeChanged();
partial void OnCNProfessionalIdChanging(string value);
partial void OnCNProfessionalIdChanged();
partial void OnReviewDateChanging(System.Nullable<System.DateTime> value);
partial void OnReviewDateChanged();
partial void OnUnitWorkIdChanging(string value);
@ -99729,7 +99705,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
public string ProjectId
{
get
@ -99749,6 +99725,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DraCode", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
public string DraCode
{
get
{
return this._DraCode;
}
set
{
if ((this._DraCode != value))
{
this.OnDraCodeChanging(value);
this.SendPropertyChanging();
this._DraCode = value;
this.SendPropertyChanged("DraCode");
this.OnDraCodeChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CNProfessionalId", DbType="NVarChar(50)")]
public string CNProfessionalId
{
@ -99769,26 +99765,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DraCode", DbType="NVarChar(50)")]
public string DraCode
{
get
{
return this._DraCode;
}
set
{
if ((this._DraCode != value))
{
this.OnDraCodeChanging(value);
this.SendPropertyChanging();
this._DraCode = value;
this.SendPropertyChanged("DraCode");
this.OnDraCodeChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReviewDate", DbType="DateTime")]
public System.Nullable<System.DateTime> ReviewDate
{