2023-09-27

This commit is contained in:
2023-09-27 09:10:09 +08:00
parent 74327b5a3e
commit 92fd5a113d
26 changed files with 4569 additions and 882 deletions
+3 -3
View File
@@ -78,7 +78,7 @@
</f:Toolbar>
<f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="drpDocType" runat="server" Label="部门" Width="350px" LabelAlign="Right" EnableEdit="true">
<f:DropDownList ID="drpDocType" runat="server" Label="沟通类型" Width="350px" LabelAlign="Right" EnableEdit="true">
</f:DropDownList>
<%--<f:DropDownList ID="drpCNProfessional" runat="server" Label="专业" Width="350px" LabelAlign="Right" EnableEdit="true">
</f:DropDownList>--%>
@@ -121,7 +121,7 @@
</ItemTemplate>
</f:TemplateField>
<f:RenderField ColumnID="DocTypeName" Width="100px" DataField="DocTypeName"
SortField="DocTypeName" FieldType="String" HeaderText="文档类别" TextAlign="Center"
SortField="DocTypeName" FieldType="String" HeaderText="沟通类型" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:TemplateField ColumnID="ProjectSubjectId" Width="80px" HeaderText="装置" HeaderTextAlign="Center" TextAlign="Center"
@@ -177,7 +177,7 @@
</f:Grid>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="文档" Hidden="true" EnableIFrame="true" EnableMaximize="true"
<f:Window ID="Window1" Title="沟通协调" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" OnClose="Window1_Close" runat="server" IsModal="true"
Width="1300px" Height="660px">
</f:Window>
+22 -19
View File
@@ -36,7 +36,7 @@
<Rows>
<f:FormRow>
<Items>
<f:ContentPanel ID="ContentPanel2" Title="文档" ShowBorder="true"
<f:ContentPanel ID="ContentPanel2" Title="沟通协调" ShowBorder="true"
BodyPadding="10px" ShowHeader="true" AutoScroll="true"
runat="server">
<f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true"
@@ -66,7 +66,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpDocType" ShowRedStar="true" Required="true" runat="server" Label="部门" LabelWidth="120px" LabelAlign="Right" EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="ChangeDocCode">
<f:DropDownList ID="drpDocType" ShowRedStar="true" Required="true" runat="server" Label="沟通类型" LabelWidth="120px" LabelAlign="Right" EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="ChangeDocCode">
</f:DropDownList>
<f:DropDownList ID="drpProSubject" runat="server" Label="装置" LabelAlign="Right" EnableEdit="true" LabelWidth="120px" AutoPostBack="true" OnSelectedIndexChanged="ChangeDocCode">
</f:DropDownList>
@@ -122,12 +122,18 @@
<f:TabStrip ID="TabStrip1" IsFluid="true" Height="350px" ShowBorder="true" TabPosition="Top"
EnableTabCloseMenu="false" ActiveTabIndex="0" runat="server">
<Tabs>
<f:Tab Title="正文" BodyPadding="10px"
<f:Tab Title="正文" BodyPadding="10px"
runat="server">
<Items>
<f:HtmlEditor runat="server" Label=" " ID="txtDocContent" ShowLabel="false"
Editor="UMEditor" BasePath="~/res/umeditor/" ToolbarSet="Full" Height="500px" LabelAlign="Right" Text="">
</f:HtmlEditor>
<f:SimpleForm ID="SimpleForm2" ShowBorder="false"
ShowHeader="false" Title="SimpleForm1" LabelWidth="120px" runat="server">
<Items>
<f:HtmlEditor runat="server" Label=" " ID="txtDocContent" ShowLabel="false"
Editor="UMEditor" BasePath="~/res/umeditor/" ToolbarSet="Full" Height="500px" LabelAlign="Right" Text="">
</f:HtmlEditor>
</Items>
</f:SimpleForm>
</Items>
</f:Tab>
</Tabs>
@@ -149,14 +155,14 @@
<Items>
<f:ContentPanel ID="ContentPanel1" Title="文档审批流程设置" runat="server" ShowHeader="true" EnableCollapse="true"
BodyPadding="0px">
<f:Form ID="Form3" ShowBorder="false" ShowHeader="false" AutoScroll="true"
<f:Form ID="Form3" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow>
<Items>
<f:RadioButtonList runat="server" ID="drpHandleType" Label="办理步骤" LabelWidth="120px" ShowRedStar="true" AutoPostBack="true" OnSelectedIndexChanged="drpHandleType_SelectedIndexChanged" AutoColumnWidth="true">
<f:RadioItem Text="下一步" Value="1" Selected="true" />
<f:RadioItem Text="审批完成" Value="2" />
<f:RadioItem Text="请回复和处理" Value="1" Selected="true" />
<f:RadioItem Text="请知悉了解" Value="2" />
</f:RadioButtonList>
<f:DatePicker ID="txtFinishTime" runat="server" Label="要求完成时间" LabelWidth="120px" LabelAlign="Right"
EnableEdit="true">
@@ -171,11 +177,16 @@
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow runat="server">
<Items>
<f:TextBox runat="server" ID="txtCopyMan" Label="抄送人员" Readonly="True" Enabled="False"/>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Tree ID="trCopyMan" EnableCollapse="true" ShowHeader="false" Title="抄送人员" EnableCheckBox="true"
AutoLeafIdentification="true" runat="server" EnableIcons="true" AutoScroll="true"
AutoLeafIdentification="true" runat="server" EnableIcons="true" AutoScroll="true" IsFluid="True"
EnableSingleClickExpand="true" OnNodeCheck="trCopyMan_NodeCheck">
</f:Tree>
</Items>
@@ -202,14 +213,6 @@
<f:Label runat="server" CssStyle="display:none"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</f:ContentPanel>
@@ -179,6 +179,8 @@ namespace FineUIPro.Web.DocManage
{
this.trCopyMan.UncheckAllNodes(e.Node.Nodes);
}
txtCopyMan.Text = GetCopyManName();
}
/// <summary>
@@ -601,6 +603,36 @@ namespace FineUIPro.Web.DocManage
BLL.DocManageService.UpdateDoc(doc);
}
}
protected string GetCopyManName()
{
TreeNode[] nodes = this.trCopyMan.GetCheckedNodes();
string copyMan = string.Empty;
string copyManName = string.Empty;
if (nodes.Length > 0)
{
foreach (TreeNode tn in nodes)
{
if (tn.CommandName == "User")
{
Model.Doc_DocManageApprove approve = new Model.Doc_DocManageApprove();
approve.DocId = DocId;
approve.ApproveMan = tn.NodeID;
approve.Type = "s";
DocManageApproveService.AddDocManageApprove(approve);
copyMan += tn.NodeID + ",";
}
}
}
if (!string.IsNullOrEmpty(copyMan))
{
copyMan = copyMan.Substring(0, copyMan.Length - 1);
}
copyManName = UserService.getUserNamesUserIds(copyMan);
return copyManName;
}
protected void btnSubmit_Click(object sender, EventArgs e)
{
if (CommonService.GetAllButtonPowerList(CurrUser.LoginProjectId, CurrUser.UserId, Const.DocManageMenuId, Const.BtnSave))
@@ -158,6 +158,15 @@ namespace FineUIPro.Web.DocManage
/// </remarks>
protected global::FineUIPro.TabStrip TabStrip1;
/// <summary>
/// SimpleForm2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.SimpleForm SimpleForm2;
/// <summary>
/// txtDocContent 控件。
/// </summary>
@@ -248,6 +257,15 @@ namespace FineUIPro.Web.DocManage
/// </remarks>
protected global::FineUIPro.DropDownList drpHandleMan;
/// <summary>
/// txtCopyMan 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCopyMan;
/// <summary>
/// trCopyMan 控件。
/// </summary>