Merge branch 'master' of https://gitee.com/frane-yang/SGGL_CWCEC

SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.cs

@@ -304,11 +304,36 @@ namespace FineUIPro.Web.CQMS.Solution
             if (CommonService.GetAllButtonPowerList(CurrUser.LoginProjectId, CurrUser.UserId, Const.CQMSConstructSolutionMenuId, Const.BtnDelete))
             {
                 var constructSolution = CQMSConstructSolutionService.GetConstructSolutionByConstructSolutionId(id);
-                CQMSConstructSolutionApproveService.DeleteConstructSolutionApprovesByConstructSolutionId(id);
+                if (constructSolution.State== Const.CQMSConstructSolution_ReCompile|| constructSolution.State == Const.CQMSConstructSolution_Compile)
-                CQMSConstructSolutionService.DeleteConstructSolution(id);
+                {
-                LogService.AddSys_Log(CurrUser, constructSolution.Code, id, Const.CQMSConstructSolutionMenuId, "删除方案审查");
+                    if (constructSolution.CompileMan==this.CurrUser.UserId|| this.CurrUser.UserId == Const.hfnbdId || this.CurrUser.UserId == Const.sysglyId)
-                BindGrid();
+                    {
-                Alert.ShowInTop("删除成功！", MessageBoxIcon.Success);
+                        CQMSConstructSolutionApproveService.DeleteConstructSolutionApprovesByConstructSolutionId(id);
+                        CQMSConstructSolutionService.DeleteConstructSolution(id);
+                        LogService.AddSys_Log(CurrUser, constructSolution.Code, id, Const.CQMSConstructSolutionMenuId, "删除方案审查");
+                        BindGrid();
+                        Alert.ShowInTop("删除成功！", MessageBoxIcon.Success);
+                    }
+                    else
+                    {
+                        Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Success);
+                    }
+                }
+                else
+                {
+                    if (this.CurrUser.UserId==Const.hfnbdId|| this.CurrUser.UserId==Const.sysglyId)
+                    {
+
+                        CQMSConstructSolutionApproveService.DeleteConstructSolutionApprovesByConstructSolutionId(id);
+                        CQMSConstructSolutionService.DeleteConstructSolution(id);
+                        LogService.AddSys_Log(CurrUser, constructSolution.Code, id, Const.CQMSConstructSolutionMenuId, "删除方案审查");
+                        BindGrid();
+                        Alert.ShowInTop("删除成功！", MessageBoxIcon.Success);
+                        return;
+                    }
+                    Alert.ShowInTop("删除失败，方案正在审批中！", MessageBoxIcon.Success);
+                }
+               
 
             }
             else

SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx

@@ -21,7 +21,7 @@
             background-color: #FF7575;
             background-image: none;
         }
-
+         
         .fontred {
             color: #FF7575;
             background-image: none;
@@ -42,7 +42,7 @@
                             <f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true"
                                 BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
                                 <Rows>
-                                     <f:FormRow>
+                                    <f:FormRow>
                                         <Items>
                                             <f:RadioButtonList runat="server" ID="rbType" Label="沟通协调类型" Hidden="True" LabelWidth="120px" AutoPostBack="true" OnSelectedIndexChanged="drpHandleType_SelectedIndexChanged" AutoColumnWidth="true">
                                                 <f:RadioItem Text="信函Letter" Value="1" Selected="true" />
@@ -55,27 +55,8 @@
                                             <f:DropDownList ID="drpSendUnit" ShowRedStar="true" Required="true" runat="server" Label="提出单位" LabelWidth="120px" LabelAlign="Right" EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="ChangeDocCode">
                                             </f:DropDownList>
 
-                                            <f:DropDownList ID="txtReceivUnit" runat="server" Label="接收单位" Required="true" LabelAlign="Right" LabelWidth="120px" EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="txtReceivUnit_TextChanged">
-                                            </f:DropDownList>
                                         </Items>
                                     </f:FormRow>
-                                    <f:FormRow>
-                                        <Items>
-                                            <f:DropDownList ID="drpHandleMan" runat="server" Label="收件人" Required="true" LabelAlign="Right" LabelWidth="120px" EnableEdit="true">
-                                            </f:DropDownList>
-                                        </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"
-                                                EnableSingleClickExpand="true" OnNodeCheck="trCopyMan_NodeCheck">
-                                            </f:Tree>
-                                        </Items>
-                                    </f:FormRow>
-
-                                   
                                     <f:FormRow>
                                         <Items>
                                             <f:TextBox ID="txtDocName" runat="server" Required="true" ShowRedStar="true" Label="主题" LabelAlign="Right"
@@ -83,14 +64,6 @@
                                             </f:TextBox>
                                         </Items>
                                     </f:FormRow>
-                                    <f:FormRow>
-                                        <Items>
-                                            <f:TextBox ID="txtDocCode" runat="server" Required="true" ShowRedStar="true" Label="编号" LabelWidth="120px" LabelAlign="Right" Readonly="true"
-                                                MaxLength="50">
-                                            </f:TextBox>
-
-                                        </Items>
-                                    </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">
@@ -99,6 +72,15 @@
                                             </f:DropDownList>
                                         </Items>
                                     </f:FormRow>
+                                    
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:TextBox ID="txtDocCode" runat="server" Required="true" ShowRedStar="true" Label="编号" LabelWidth="120px" LabelAlign="Right" Readonly="true"
+                                                       MaxLength="50">
+                                            </f:TextBox>
+
+                                        </Items>
+                                    </f:FormRow>
                                     <f:FormRow>
                                         <Items>
                                             <%--<f:DropDownList ID="drpDepart" runat="server" Label="部门" Required="true" ShowRedStar="true" LabelAlign="Right"  EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="ChangeDocCode">
@@ -118,7 +100,7 @@
                                         </Items>
                                     </f:FormRow>
 
-                                    <f:FormRow>
+                                    <f:FormRow Hidden="True">
                                         <Items>
                                             <f:Panel ID="CCfile" ShowHeader="false" ShowBorder="false" Layout="Column" runat="server">
                                                 <Items>
@@ -127,19 +109,29 @@
                                                     </f:Button>
                                                 </Items>
                                             </f:Panel>
-                                            <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:RadioButtonList>
-                                            <f:DatePicker ID="txtFinishTime" ShowRedStar="true" runat="server" Label="要求完成时间" LabelWidth="120px" Required="true" LabelAlign="Right"
-                                                EnableEdit="true">
-                                            </f:DatePicker>
                                         </Items>
                                     </f:FormRow>
                                     <f:FormRow>
                                         <Items>
-                                            <f:TextArea ID="txtDocContent" runat="server" Label="正文" MaxLength="3000" LabelWidth="120px">
+                                           
-                                            </f:TextArea>
+                                        </Items>
+                                    </f:FormRow>
+                                    <f:FormRow runat="server">
+                                        <Items>
+                                            <f:TabStrip ID="TabStrip1" IsFluid="true" Height="350px" ShowBorder="true" TabPosition="Top"
+                                                EnableTabCloseMenu="false" ActiveTabIndex="0" runat="server">
+                                                <Tabs>
+                                                    <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>
+                                                        </Items>
+                                                    </f:Tab>
+                                                </Tabs>
+                                            </f:TabStrip>
                                         </Items>
                                     </f:FormRow>
                                 </Rows>
@@ -153,6 +145,47 @@
                         </f:TextArea>
                     </Items>
                 </f:FormRow>
+                <f:FormRow ID="next22">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" Title="文档审批流程设置" runat="server" ShowHeader="true" EnableCollapse="true"
+                            BodyPadding="0px">
+                            <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:RadioButtonList>
+                                            <f:DatePicker ID="txtFinishTime" runat="server" Label="要求完成时间" LabelWidth="120px"  LabelAlign="Right"
+                                                EnableEdit="true">
+                                            </f:DatePicker>
+                                        </Items>
+                                    </f:FormRow>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:DropDownList ID="txtReceivUnit" runat="server" Label="接收单位" Required="true" LabelAlign="Right" LabelWidth="120px" EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="txtReceivUnit_TextChanged">
+                                            </f:DropDownList>
+                                            <f:DropDownList ID="drpHandleMan" runat="server" Label="收件人" Required="true" LabelAlign="Right" LabelWidth="120px" EnableEdit="true">
+                                            </f:DropDownList>
+                                        </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"
+                                                EnableSingleClickExpand="true" OnNodeCheck="trCopyMan_NodeCheck">
+                                            </f:Tree>
+                                        </Items>
+                                    </f:FormRow>
+                                </Rows>
+                            </f:Form>
+                        </f:ContentPanel>
+                    </Items>
+                </f:FormRow>
+
                 <f:FormRow ID="next">
                     <Items>
                         <f:ContentPanel ID="ContentPanel5" Title="文档审批流程设置" runat="server" ShowHeader="true" EnableCollapse="true"

SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx.cs

@@ -61,9 +61,30 @@ namespace FineUIPro.Web.DocManage
                 DocId = Request.Params["DocId"];
                 BindForm();
                 InitCopyMan();
+                AddAttachTab();
             }
         }
 
+        private void AddAttachTab()
+        {
+            if (string.IsNullOrEmpty(hdDocId.Text))   //新增记录
+            {
+                hdDocId.Text = SQLHelper.GetNewID(typeof(Model.Doc_DocManage));
+            }
+            //string SourcePath = Request.RawUrl;
+            string SourcePath = "/DocManage/DocManageView.aspx?DocId=" + hdDocId.Text;
+            //SourcePath= SourcePath.Replace("DocManageEdit", "DocManageView");
+            string Classify = "文档管理-文档管理";
+            if (CCfile.Hidden!=true)
+            {
+                PageContext.RegisterStartupScript(TabStrip1.GetAddTabReference("dynamic_tab2", String.Format("../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/DocManage&menuId={1}", hdDocId.Text, Const.DocManageMenuId), "附件", IconHelper.GetIconUrl(Icon.Attach), false));
+
+            }
+
+            // PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/DocManage&menuId={1}", hdDocId.Text, Const.DocManageMenuId)));
+
+        }
+
         private void InitCopyMan()
         {
             this.trCopyMan.Nodes.Clear();
@@ -258,7 +279,7 @@ namespace FineUIPro.Web.DocManage
                 {
                     this.txtFinishTime.Text = string.Format("{0:yyyy-MM-dd}", doc.FinishTime);
                 }
-                txtDocContent.Text = doc.DocContent;
+                txtDocContent.Text = HttpUtility.HtmlDecode(doc.DocContent); 
                 if (!string.IsNullOrEmpty(doc.State))
                 {
                     State = doc.State;

SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx.designer.cs

@@ -77,33 +77,6 @@ namespace FineUIPro.Web.DocManage
         /// </remarks>
         protected global::FineUIPro.DropDownList drpSendUnit;
 
-        /// <summary>
-        /// txtReceivUnit 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownList txtReceivUnit;
-
-        /// <summary>
-        /// drpHandleMan 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownList drpHandleMan;
-
-        /// <summary>
-        /// trCopyMan 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Tree trCopyMan;
-
         /// <summary>
         /// txtDocName 控件。
         /// </summary>
@@ -113,15 +86,6 @@ namespace FineUIPro.Web.DocManage
         /// </remarks>
         protected global::FineUIPro.TextBox txtDocName;
 
-        /// <summary>
-        /// txtDocCode 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtDocCode;
-
         /// <summary>
         /// drpDocType 控件。
         /// </summary>
@@ -140,6 +104,15 @@ namespace FineUIPro.Web.DocManage
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProSubject;
 
+        /// <summary>
+        /// txtDocCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtDocCode;
+
         /// <summary>
         /// txtCompileMan 控件。
         /// </summary>
@@ -177,22 +150,13 @@ namespace FineUIPro.Web.DocManage
         protected global::FineUIPro.Button imgfile;
 
         /// <summary>
-        /// drpHandleType 控件。
+        /// TabStrip1 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.RadioButtonList drpHandleType;
+        protected global::FineUIPro.TabStrip TabStrip1;
-
-        /// <summary>
-        /// txtFinishTime 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DatePicker txtFinishTime;
 
         /// <summary>
         /// txtDocContent 控件。
@@ -201,7 +165,7 @@ namespace FineUIPro.Web.DocManage
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextArea txtDocContent;
+        protected global::FineUIPro.HtmlEditor txtDocContent;
 
         /// <summary>
         /// Options 控件。
@@ -221,6 +185,78 @@ namespace FineUIPro.Web.DocManage
         /// </remarks>
         protected global::FineUIPro.TextArea txtOpinions;
 
+        /// <summary>
+        /// next22 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.FormRow next22;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// Form3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form3;
+
+        /// <summary>
+        /// drpHandleType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList drpHandleType;
+
+        /// <summary>
+        /// txtFinishTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtFinishTime;
+
+        /// <summary>
+        /// txtReceivUnit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList txtReceivUnit;
+
+        /// <summary>
+        /// drpHandleMan 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpHandleMan;
+
+        /// <summary>
+        /// trCopyMan 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tree trCopyMan;
+
         /// <summary>
         /// next 控件。
         /// </summary>

SGGL/FineUIPro.Web/DocManage/DocManageView.aspx

@@ -96,8 +96,9 @@
                                     </f:FormRow>
                                     <f:FormRow>
                                         <Items>
-                                            <f:TextArea ID="txtDocContent" runat="server" Label="内容" MaxLength="3000" Readonly="true">
+                                            <f:HtmlEditor runat="server" Label=" " ID="txtDocContent" ShowLabel="false"
-                                            </f:TextArea>
+                                                          Editor="UMEditor" BasePath="~/res/umeditor/" ToolbarSet="Full" Height="500px" LabelAlign="Right" Text="" Readonly="True">
+                                            </f:HtmlEditor>
                                         </Items>
                                     </f:FormRow>
                                     

SGGL/FineUIPro.Web/DocManage/DocManageView.aspx.cs

@@ -73,7 +73,7 @@ namespace FineUIPro.Web.DocManage
                     {
                         this.txtFinishTime.Text = string.Format("{0:yyyy-MM-dd}", doc.FinishTime);
                     }
-                    txtDocContent.Text = doc.DocContent;
+                    txtDocContent.Text = HttpUtility.HtmlDecode(doc.DocContent);
                     if (!string.IsNullOrEmpty(doc.State))
                     {
                         State = doc.State;

SGGL/FineUIPro.Web/DocManage/DocManageView.aspx.designer.cs

@@ -147,7 +147,7 @@ namespace FineUIPro.Web.DocManage
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextArea txtDocContent;
+        protected global::FineUIPro.HtmlEditor txtDocContent;
 
         /// <summary>
         /// plApprove2 控件。