提交代码
This commit is contained in:
@@ -40,6 +40,7 @@
|
|||||||
<WarningLevel>3</WarningLevel>
|
<WarningLevel>3</WarningLevel>
|
||||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||||
<Prefer32Bit>false</Prefer32Bit>
|
<Prefer32Bit>false</Prefer32Bit>
|
||||||
|
<LangVersion>7.2</LangVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||||
<DebugType>pdbonly</DebugType>
|
<DebugType>pdbonly</DebugType>
|
||||||
@@ -1555,6 +1556,9 @@
|
|||||||
<Content Include="ZHGL\Meeting\CompanySpecialMeeting.aspx" />
|
<Content Include="ZHGL\Meeting\CompanySpecialMeeting.aspx" />
|
||||||
<Content Include="ZHGL\Meeting\CompanySpecialMeetingEdit.aspx" />
|
<Content Include="ZHGL\Meeting\CompanySpecialMeetingEdit.aspx" />
|
||||||
<Content Include="ZHGL\Meeting\CompanySpecialMeetingView.aspx" />
|
<Content Include="ZHGL\Meeting\CompanySpecialMeetingView.aspx" />
|
||||||
|
<Content Include="ZHGL\Plan\ActionPlanList.aspx" />
|
||||||
|
<Content Include="ZHGL\Plan\ActionPlanListEdit.aspx" />
|
||||||
|
<Content Include="ZHGL\Plan\ActionPlanListView.aspx" />
|
||||||
<Content Include="ZHGL\Plan\MainPlan.aspx" />
|
<Content Include="ZHGL\Plan\MainPlan.aspx" />
|
||||||
<Content Include="ZHGL\Plan\MainPlanEdit.aspx" />
|
<Content Include="ZHGL\Plan\MainPlanEdit.aspx" />
|
||||||
<Content Include="ZHGL\Plan\MainPlanView.aspx" />
|
<Content Include="ZHGL\Plan\MainPlanView.aspx" />
|
||||||
@@ -13549,6 +13553,27 @@
|
|||||||
<Compile Include="ZHGL\Meeting\CompanySpecialMeetingView.aspx.designer.cs">
|
<Compile Include="ZHGL\Meeting\CompanySpecialMeetingView.aspx.designer.cs">
|
||||||
<DependentUpon>CompanySpecialMeetingView.aspx</DependentUpon>
|
<DependentUpon>CompanySpecialMeetingView.aspx</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
<Compile Include="ZHGL\Plan\ActionPlanList.aspx.cs">
|
||||||
|
<DependentUpon>ActionPlanList.aspx</DependentUpon>
|
||||||
|
<SubType>ASPXCodeBehind</SubType>
|
||||||
|
</Compile>
|
||||||
|
<Compile Include="ZHGL\Plan\ActionPlanList.aspx.designer.cs">
|
||||||
|
<DependentUpon>ActionPlanList.aspx</DependentUpon>
|
||||||
|
</Compile>
|
||||||
|
<Compile Include="ZHGL\Plan\ActionPlanListEdit.aspx.cs">
|
||||||
|
<DependentUpon>ActionPlanListEdit.aspx</DependentUpon>
|
||||||
|
<SubType>ASPXCodeBehind</SubType>
|
||||||
|
</Compile>
|
||||||
|
<Compile Include="ZHGL\Plan\ActionPlanListEdit.aspx.designer.cs">
|
||||||
|
<DependentUpon>ActionPlanListEdit.aspx</DependentUpon>
|
||||||
|
</Compile>
|
||||||
|
<Compile Include="ZHGL\Plan\ActionPlanListView.aspx.cs">
|
||||||
|
<DependentUpon>ActionPlanListView.aspx</DependentUpon>
|
||||||
|
<SubType>ASPXCodeBehind</SubType>
|
||||||
|
</Compile>
|
||||||
|
<Compile Include="ZHGL\Plan\ActionPlanListView.aspx.designer.cs">
|
||||||
|
<DependentUpon>ActionPlanListView.aspx</DependentUpon>
|
||||||
|
</Compile>
|
||||||
<Compile Include="ZHGL\Plan\MainPlan.aspx.cs">
|
<Compile Include="ZHGL\Plan\MainPlan.aspx.cs">
|
||||||
<DependentUpon>MainPlan.aspx</DependentUpon>
|
<DependentUpon>MainPlan.aspx</DependentUpon>
|
||||||
<SubType>ASPXCodeBehind</SubType>
|
<SubType>ASPXCodeBehind</SubType>
|
||||||
|
|||||||
+43
-25
@@ -59406,11 +59406,11 @@ namespace Model
|
|||||||
|
|
||||||
private string _CostTypeName;
|
private string _CostTypeName;
|
||||||
|
|
||||||
private string _SupCostTypeName;
|
private System.Nullable<int> _SortIndex;
|
||||||
|
|
||||||
private string _SupCostTypeId;
|
private string _SupCostTypeId;
|
||||||
|
|
||||||
private System.Nullable<int> _SortIndex;
|
private string _SupCostTypeName;
|
||||||
|
|
||||||
private System.Nullable<int> _SupSortIndex;
|
private System.Nullable<int> _SupSortIndex;
|
||||||
|
|
||||||
@@ -59432,12 +59432,12 @@ namespace Model
|
|||||||
partial void OnCostDefChanged();
|
partial void OnCostDefChanged();
|
||||||
partial void OnCostTypeNameChanging(string value);
|
partial void OnCostTypeNameChanging(string value);
|
||||||
partial void OnCostTypeNameChanged();
|
partial void OnCostTypeNameChanged();
|
||||||
partial void OnSupCostTypeNameChanging(string value);
|
|
||||||
partial void OnSupCostTypeNameChanged();
|
|
||||||
partial void OnSupCostTypeIdChanging(string value);
|
|
||||||
partial void OnSupCostTypeIdChanged();
|
|
||||||
partial void OnSortIndexChanging(System.Nullable<int> value);
|
partial void OnSortIndexChanging(System.Nullable<int> value);
|
||||||
partial void OnSortIndexChanged();
|
partial void OnSortIndexChanged();
|
||||||
|
partial void OnSupCostTypeIdChanging(string value);
|
||||||
|
partial void OnSupCostTypeIdChanged();
|
||||||
|
partial void OnSupCostTypeNameChanging(string value);
|
||||||
|
partial void OnSupCostTypeNameChanged();
|
||||||
partial void OnSupSortIndexChanging(System.Nullable<int> value);
|
partial void OnSupSortIndexChanging(System.Nullable<int> value);
|
||||||
partial void OnSupSortIndexChanged();
|
partial void OnSupSortIndexChanged();
|
||||||
#endregion
|
#endregion
|
||||||
@@ -59572,22 +59572,22 @@ namespace Model
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupCostTypeName", DbType="NVarChar(50)")]
|
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SortIndex", DbType="Int")]
|
||||||
public string SupCostTypeName
|
public System.Nullable<int> SortIndex
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
return this._SupCostTypeName;
|
return this._SortIndex;
|
||||||
}
|
}
|
||||||
set
|
set
|
||||||
{
|
{
|
||||||
if ((this._SupCostTypeName != value))
|
if ((this._SortIndex != value))
|
||||||
{
|
{
|
||||||
this.OnSupCostTypeNameChanging(value);
|
this.OnSortIndexChanging(value);
|
||||||
this.SendPropertyChanging();
|
this.SendPropertyChanging();
|
||||||
this._SupCostTypeName = value;
|
this._SortIndex = value;
|
||||||
this.SendPropertyChanged("SupCostTypeName");
|
this.SendPropertyChanged("SortIndex");
|
||||||
this.OnSupCostTypeNameChanged();
|
this.OnSortIndexChanged();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -59612,22 +59612,22 @@ namespace Model
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SortIndex", DbType="Int")]
|
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupCostTypeName", DbType="NVarChar(50)")]
|
||||||
public System.Nullable<int> SortIndex
|
public string SupCostTypeName
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
return this._SortIndex;
|
return this._SupCostTypeName;
|
||||||
}
|
}
|
||||||
set
|
set
|
||||||
{
|
{
|
||||||
if ((this._SortIndex != value))
|
if ((this._SupCostTypeName != value))
|
||||||
{
|
{
|
||||||
this.OnSortIndexChanging(value);
|
this.OnSupCostTypeNameChanging(value);
|
||||||
this.SendPropertyChanging();
|
this.SendPropertyChanging();
|
||||||
this._SortIndex = value;
|
this._SupCostTypeName = value;
|
||||||
this.SendPropertyChanged("SortIndex");
|
this.SendPropertyChanged("SupCostTypeName");
|
||||||
this.OnSortIndexChanged();
|
this.OnSupCostTypeNameChanged();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -172702,7 +172702,7 @@ namespace Model
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remarks", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
|
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remarks", DbType="NVarChar(2000)")]
|
||||||
public string Remarks
|
public string Remarks
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
@@ -173322,7 +173322,7 @@ namespace Model
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PriceMethod", DbType="NVarChar(500)")]
|
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PriceMethod", DbType="VarChar(50)")]
|
||||||
public string PriceMethod
|
public string PriceMethod
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
@@ -173462,7 +173462,7 @@ namespace Model
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Clause", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
|
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Clause", DbType="NVarChar(2000)")]
|
||||||
public string Clause
|
public string Clause
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
@@ -262052,6 +262052,8 @@ namespace Model
|
|||||||
|
|
||||||
private string _DNDia;
|
private string _DNDia;
|
||||||
|
|
||||||
|
private System.Nullable<decimal> _Size;
|
||||||
|
|
||||||
private System.Nullable<decimal> _Thickness;
|
private System.Nullable<decimal> _Thickness;
|
||||||
|
|
||||||
private string _Remark;
|
private string _Remark;
|
||||||
@@ -262200,6 +262202,22 @@ namespace Model
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Size", DbType="Decimal(8,3)")]
|
||||||
|
public System.Nullable<decimal> Size
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return this._Size;
|
||||||
|
}
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if ((this._Size != value))
|
||||||
|
{
|
||||||
|
this._Size = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Thickness", DbType="Decimal(8,3)")]
|
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Thickness", DbType="Decimal(8,3)")]
|
||||||
public System.Nullable<decimal> Thickness
|
public System.Nullable<decimal> Thickness
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user