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

合同增加合同条款、合同主要内容

This commit is contained in:
高飞 2022-09-13 10:58:05 +08:00
parent e0ba13fd2f
commit 34df8a8b03
10 changed files with 568 additions and 438 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
DataBase/版本日志/SGGLDB_V2022-09-13.sql Normal file
View File

@ -0,0 +1,3 @@
alter table PHTGL_Contract add Clause nvarchar(1000) null
alter table PHTGL_Contract add MainContent nvarchar(max) null
GO

3
DataBase/版本日志/SGGLDB_V2022-09-13修改明细.txt Normal file
View File

@ -0,0 +1,3 @@
--ADD BY gaofei 2022-09-13
1,合同编制和合同台账增加合同条款、合同主要内容
--END

4
SGGL/BLL/PHTGL/ContractCompile/ContractService.cs
View File

@ -123,6 +123,8 @@ namespace BLL
SubcontractingMethod = newtable.SubcontractingMethod,
IsItACentralizedPurchaseSupplier = newtable.IsItACentralizedPurchaseSupplier,
ContactUnitOfPartyA = newtable.ContactUnitOfPartyA,
Clause = newtable.Clause,
MainContent = newtable.MainContent,
};
Funs.DB.PHTGL_Contract.InsertOnSubmit(table);
Funs.DB.SubmitChanges();
@ -185,6 +187,8 @@ namespace BLL
newContract.SubcontractingMethod = contract.SubcontractingMethod;
newContract.IsItACentralizedPurchaseSupplier = contract.IsItACentralizedPurchaseSupplier;
newContract.ContactUnitOfPartyA = contract.ContactUnitOfPartyA;
newContract.Clause = contract.Clause;
newContract.MainContent = contract.MainContent;
Funs.DB.SubmitChanges();
}
}

23
SGGL/FineUIPro.Web/ErrLog.txt
View File

@ -112,3 +112,26 @@ IP地址:::1
出错时间:09/08/2022 19:57:53
错误信息开始=====>
错误类型:ChangeConflictException
错误信息:2 的 1 更新失败。
错误堆栈:
在 System.Data.Linq.ChangeProcessor.SubmitChanges(ConflictMode failureMode)
在 System.Data.Linq.DataContext.SubmitChanges(ConflictMode failureMode)
在 System.Data.Linq.DataContext.SubmitChanges()
在 BLL.ContractService.UpdateContract(PHTGL_Contract contract) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\BLL\PHTGL\ContractCompile\ContractService.cs:行号 177
在 FineUIPro.Web.PHTGL.ContractCompile.ContractFormationEdit.btnSave_Tab1_Click(Object sender, EventArgs e) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\FineUIPro.Web\PHTGL\ContractCompile\ContractFormationEdit.aspx.cs:行号 564
在 FineUIPro.Button.OnClick(EventArgs e)
在 (Button , EventArgs )
在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:09/13/2022 10:46:27
出错文件:http://localhost:8008/PHTGL/ContractCompile/ContractFormationEdit.aspx?ContractId=60594f33-0093-416f-afbf-a7c1bac3170c
IP地址:::1
操作人员:JT
出错时间:09/13/2022 10:46:27

10
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractFormationEdit.aspx
View File

@ -237,6 +237,16 @@
</f:Panel>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtClause" runat="server" Label="合同条款" LabelAlign="Right" LabelWidth="140px" ColumnWidth="100%" ShowRedStar="true" Required="true" AutoGrowHeightMax="50px" AutoGrowHeight="true"></f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtMainContent" runat="server" Label="合同主要内容" LabelAlign="Right" LabelWidth="140px" ColumnWidth="100%" ShowRedStar="true" Required="true" AutoGrowHeightMax="50px" AutoGrowHeight="true"></f:TextArea>
</Items>
</f:FormRow>
</Rows>
<Toolbars>
<f:Toolbar ID="Toolbar5" Position="Bottom" ToolbarAlign="Right" runat="server">

6
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractFormationEdit.aspx.cs
View File

@ -247,7 +247,8 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
{
this.drpContractType.SelectedValue = contract.ContractType;
}
this.txtClause.Text = contract.Clause;
this.txtMainContent.Text = contract.MainContent;
}
}
}
@ -549,7 +550,8 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
newContract.ActionPlanCode = DropActionPlanCode.SelectedValue;
newContract.Remarks = this.tab1_txtRemark.Text.Trim();
newContract.CreatUser = this.CurrUser.PersonId;
newContract.Clause = this.txtClause.Text.Trim();
newContract.MainContent = this.txtMainContent.Text.Trim();
if (!string.IsNullOrEmpty(ContractId))
{
var con = ContractService.GetContractById(ContractId);

858
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractFormationEdit.aspx.designer.cs generated
View File

File diff suppressed because it is too large Load Diff

42
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractStandingBook.aspx
View File

@ -6,6 +6,17 @@
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title></title>
<style type="text/css">
.f-grid-row .f-grid-cell-inner {
white-space: normal;
word-break: break-all;
}
.f-grid-colheader-text {
white-space: normal;
word-break: break-all;
}
</style>
</head>
<body>
<form id="form1" runat="server">
@ -77,24 +88,12 @@
<f:RenderField ColumnID="ContractName" DataField="ContractName" Width="180px" FieldType="String" HeaderText="施工合同名称" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="SubConstruction" DataField="SubConstruction" Width="120px" FieldType="String" HeaderText="施工分包商" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="SubcontractPriceForm" DataField="SubcontractPriceForm" Width="100px" FieldType="String" HeaderText="合同价格形式" TextAlign="Center"
<f:RenderField ColumnID="ContractType" DataField="ContractType" Width="150px" FieldType="String" HeaderText="合同类型" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ContractAmount" DataField="ContractAmount" Width="120px" FieldType="String" HeaderText="合同价格（元）" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="DepartName" DataField="DepartName" Width="120px" FieldType="String" HeaderText="签订日期" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="Bank1" DataField="Bank1" Width="120px" FieldType="String" HeaderText="公司开户行" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="Account1" DataField="Account1" Width="150px" FieldType="String" HeaderText="开户行账号" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="Status" DataField="Status" Width="150px" FieldType="String" HeaderText="合同状态" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
@ -104,6 +103,15 @@
<f:RenderField ColumnID="ContactPersonOfPartyA" DataField="ContactPersonOfPartyA" Width="150px" FieldType="String" HeaderText="甲方联系人" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="SubConstruction" DataField="SubConstruction" Width="120px" FieldType="String" HeaderText="施工分包商" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="Bank1" DataField="Bank1" Width="120px" FieldType="String" HeaderText="公司开户行" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="Account1" DataField="Account1" Width="150px" FieldType="String" HeaderText="开户行账号" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ContactPersonOfPartyB" DataField="ContactPersonOfPartyB" Width="150px" FieldType="String" HeaderText="乙方联系人" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
@ -119,7 +127,7 @@
<f:RenderField ColumnID="PriceMethod" DataField="PriceMethod" Width="150px" FieldType="String" HeaderText="计价方式" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="SignedOnDate" DataField="SignedOnDate" Width="150px" FieldType="String" HeaderText="签订日期" TextAlign="Center"
<f:RenderField ColumnID="SignedOnDate" DataField="SignedOnDate" Width="120px" FieldType="String" HeaderText="签订日期" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ContractStartDate" DataField="ContractStartDate" Width="150px" FieldType="String" HeaderText="合同起始日期" TextAlign="Center"
@ -137,6 +145,12 @@
<f:RenderField ColumnID="IsItACentralizedPurchaseSupplier" DataField="IsItACentralizedPurchaseSupplier" Width="150px" FieldType="String" HeaderText="乙方是否为集采供应商/分包商" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="Clause" DataField="Clause" Width="150px" FieldType="String" HeaderText="合同条款" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="MainContent" DataField="MainContent" Width="150px" FieldType="String" HeaderText="合同主要内容" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
</Columns>
<%-- <Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />

9
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractStandingBook.aspx.cs
View File

@ -73,7 +73,12 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
con.ProjectShortName,
(convert(varchar(20), Sub.SignedYear) + '年' + convert(varchar(20), Sub.SignedMonth) + '月') as DepartName,
(CASE Con.Status WHEN '0' THEN '已签订'
WHEN '1' THEN '已完毕' END) as Status,
WHEN '1' THEN '已完毕' END) as Status,
(CASE Con.ContractType WHEN '1' THEN '施工总承包分包合同'
WHEN '2' THEN '施工专业分包合同'
WHEN '3' THEN '上官红劳务分包合同'
WHEN '4' THEN '试车服务合同'
WHEN '5' THEN '租赁合同' END) AS ContractType,
Con.ContactUnitOfPartyA,
Con.ContactPersonOfPartyA,
Con.ContactPersonOfPartyB,
@ -81,6 +86,8 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
Con.ContactPersonEmailOfPartyB,
Con.ContractAmountExcludingTax,
Con.PriceMethod,
Con.Clause,
Con.MainContent,
CONVERT(varchar(100), SignedOnDate, 111) as SignedOnDate,
CONVERT(varchar(100), ContractStartDate, 111) as ContractStartDate,
CONVERT(varchar(100), ContractEndDate, 111) as ContractEndDate,

48
SGGL/Model/Model.cs
View File

@ -137389,6 +137389,10 @@ namespace Model
private System.Nullable<int> _IsItACentralizedPurchaseSupplier;
private string _Clause;
private string _MainContent;
private EntityRef<Base_Depart> _Base_Depart;
private EntityRef<Base_Project> _Base_Project;
@ -137497,6 +137501,10 @@ namespace Model
partial void OnSubcontractingMethodChanged();
partial void OnIsItACentralizedPurchaseSupplierChanging(System.Nullable<int> value);
partial void OnIsItACentralizedPurchaseSupplierChanged();
partial void OnClauseChanging(string value);
partial void OnClauseChanged();
partial void OnMainContentChanging(string value);
partial void OnMainContentChanged();
#endregion
public PHTGL_Contract()
@ -138480,6 +138488,46 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Clause", DbType="NVarChar(1000)")]
public string Clause
{
get
{
return this._Clause;
}
set
{
if ((this._Clause != value))
{
this.OnClauseChanging(value);
this.SendPropertyChanging();
this._Clause = value;
this.SendPropertyChanged("Clause");
this.OnClauseChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MainContent", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
public string MainContent
{
get
{
return this._MainContent;
}
set
{
if ((this._MainContent != value))
{
this.OnMainContentChanging(value);
this.SendPropertyChanging();
this._MainContent = value;
this.SendPropertyChanged("MainContent");
this.OnMainContentChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HTGL_Contract_Base_Depart", Storage="_Base_Depart", ThisKey="DepartId", OtherKey="DepartId", IsForeignKey=true)]
public Base_Depart Base_Depart
{