shecs/Basf_EProject
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20250619 修改报表

Browse Source
This commit is contained in:
毕文静
2025-06-19 11:45:21 +08:00
parent 1390e63fe2
commit a4b1a94dd9
17 changed files with 322 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EProject/FineUIPro.Web/common/Main.aspx
+5 -5
View File
@@ -333,7 +333,7 @@
<f:Panel ID="Panel9" Width="350px"
runat="server" BodyPadding="1px" ShowBorder="false" ShowHeader="false">
<Items>
<f:NumberBox ID="txtOrginalBudget" runat="server" Label="Orginal Budget(RMB)" LabelWidth="190px" EnableCommas="true" Readonly="true"></f:NumberBox>
<f:NumberBox ID="txtOrginalBudget" runat="server" Label="Original Budget(RMB)" LabelWidth="190px" EnableCommas="true" Readonly="true"></f:NumberBox>
<f:NumberBox ID="txtChangedBudget" runat="server" Label="Changed Budget(RMB)" LabelWidth="190px" EnableCommas="true" Readonly="true"></f:NumberBox>
<f:NumberBox ID="txtActualCost" runat="server" Label="Actual Cost(RMB)" LabelWidth="190px" EnableCommas="true" Readonly="true"></f:NumberBox>
<f:NumberBox ID="txtCommitted_PRPO" runat="server" Label="Committed_PR/PO(RMB)" LabelWidth="190px" EnableCommas="true" Readonly="true"></f:NumberBox>
@@ -431,7 +431,7 @@
<Items>
<f:FormRow>
<Items>
<f:TextArea ID="txtEnginering" runat="server" Label="Enginering" Height="60px"></f:TextArea>
<f:TextArea ID="txtEnginering" runat="server" Label="Engineering" Height="60px"></f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
@@ -446,7 +446,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtQuilaityHSE" runat="server" Label="Quilaity&HSE" Height="60px"></f:TextArea>
<f:TextArea ID="txtQuilaityHSE" runat="server" Label="Quality&HSE" Height="60px"></f:TextArea>
</Items>
</f:FormRow>
</Items>
@@ -658,10 +658,10 @@
SortField="DisciplinesWBSCode" FieldType="String" HeaderText="Identifier" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="180px" ColumnID="DisciplinesWBSName" DataField="DisciplinesWBSName"
FieldType="String" HeaderText="Descipline" HeaderTextAlign="Center" TextAlign="Left">
FieldType="String" HeaderText="Discipline" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="QuantityDesctiption" DataField="QuantityDesctiption"
FieldType="String" HeaderText="Quantity Desctiption" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
FieldType="String" HeaderText="Quantity Description" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="InputQuantity" DataField="InputQuantity"
FieldType="String" HeaderText="Input Quantity" HeaderTextAlign="Center" TextAlign="Left">
EProject/FineUIPro.Web/common/PageBase.cs
+1 -1
View File
@@ -1527,7 +1527,7 @@ namespace FineUIPro.Web
{
var Sendes1 = (from u in Sys_UserService.GetUserList()
join r in Funs.DB.Sys_Role on u.RoleId equals r.RoleId
where r.RoleName == "CTE_Manager" || r.RoleName == "Accounting"
where r.RoleName == "CTE_Manager" //|| r.RoleName == "Accounting"
select new { EmuaerEmailAddress = u.Email, senduserid = u.UserId }
).Distinct().ToList();
var Senders = Sendes1.Union(Sendes2);