lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改关键事项与沟通协调

This commit is contained in:
潘鸿锋 2024-10-15 10:06:34 +08:00
parent d35d9efdcb
commit 6614252a9c
10 changed files with 242 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
DataBase/版本日志/SGGLDB_WH_V2024-10-14-phf.sql Normal file
View File

@ -0,0 +1,46 @@
insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
values('168A94C7-E37D-4B9C-8684-51DF4F8C5134','关键事项（内部）','',10,'0','Menu_PGJSX',0,0,1)
go
update sys_menu set IsUsed='0' where menuid='5F3B18D6-9FBA-4EF5-A7E4-DC9F6A4EA680';
update sys_menu set IsUsed='0' where menuid='CAA875A7-089B-4B79-87CE-742FDFD9DE43';
--0 我创建的，1待我处理，2我已处理、3我参与的
--关键事项改成 我创建的
update sys_menu set SuperMenu='3517DBE2-9728-4BA0-9EA5-AE2147DB883B',MenuName='我创建的',url='PZHGL/GJSX/GJSXList.aspx?classify=0'
where menuid='0BEA2126-7A48-40EB-8E21-99148E91A22B';
insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
values('4A9E60ED-24FF-4410-B3B7-2A5079615A78','待我处理','PZHGL/GJSX/GJSXList.aspx?classify=1',20,'168A94C7-E37D-4B9C-8684-51DF4F8C5134','Menu_PGJSX',0,1,1)
go
insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
values('BEF7850D-1BA5-45F9-BD40-E52F6D813E7C','我已处理','PZHGL/GJSX/GJSXList.aspx?classify=2',30,'168A94C7-E37D-4B9C-8684-51DF4F8C5134','Menu_PGJSX',0,1,1)
go
insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
values('3C129205-F6A9-480D-B36C-E35DED5D7CEC','我参与的','PZHGL/GJSX/GJSXList.aspx?classify=3',40,'168A94C7-E37D-4B9C-8684-51DF4F8C5134','Menu_PGJSX',0,1,1)
go
--协调沟通
insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
values('42791ACB-7C72-481F-B1ED-158C7141522C','协调沟通（外部）','',20,'0','Menu_PGJSX',0,0,1)
go
update sys_menu set SuperMenu='42791ACB-7C72-481F-B1ED-158C7141522C',MenuName='我创建的',url='DocManage/DocManage.aspx?classify=0',MenuType='Menu_PGJSX'
where menuid='609F0D64-ABB8-4F5C-9646-FC1DFC8BAB85';
insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
values('2FEF98BD-DBBD-4ADA-B600-18D3C113B22A','待我处理','DocManage/DocManage.aspx?classify=1',20,'42791ACB-7C72-481F-B1ED-158C7141522C','Menu_PGJSX',0,1,1)
go
insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
values('5BDEEA43-FFD7-4AEB-B760-24E70009EA0C','我已处理','DocManage/DocManage.aspx?classify=2',30,'42791ACB-7C72-481F-B1ED-158C7141522C','Menu_PGJSX',0,1,1)
go
insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
values('58B45CA6-AFFB-4624-80C6-F70C1A54FBE2','我参与的','DocManage/DocManage.aspx?classify=3',40,'42791ACB-7C72-481F-B1ED-158C7141522C','Menu_PGJSX',0,1,1)
go

43
SGGL/FineUIPro.Web/DocManage/DocManage.aspx.cs
View File

@ -60,10 +60,26 @@ namespace FineUIPro.Web.DocManage
}
}
/// <summary>
/// 类型
/// </summary>
public string classify
{
get
{
return (string)ViewState["classify"];
}
set
{
ViewState["classify"] = value;
}
}
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
classify = Request.Params["classify"];
UnitService.GetUnit(drpSendUnit, CurrUser.LoginProjectId, true);
UnitService.GetUnit(drpReceivUnit, CurrUser.LoginProjectId, true);
UserService.InitUserDropDownList(drpCompileMan, CurrUser.LoginProjectId, true);
@ -74,6 +90,10 @@ namespace FineUIPro.Web.DocManage
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
btnNew.OnClientClick = Window1.GetShowReference("DocManageEdit.aspx") + "return false;";
GetButtonPower();
if (classify != "0")
{
btnNew.Hidden = true;
}
BindData();
}
@ -141,6 +161,29 @@ namespace FineUIPro.Web.DocManage
strSql += " AND doc.AcceptMan like @AcceptMan";
listStr.Add(new SqlParameter("@AcceptMan", "%" + drpAcceptMan.SelectedValue + "%"));
}
var uid = CurrUser.UserId;
//我创建的
if (classify == "0")
{
strSql += " AND doc.CompileMan ='" + uid + "' ";
}
//待我处理
else if (classify == "1")
{
strSql += " AND (doc.State ='1' and doc.AcceptMan like'%" + uid + "%' )";
}
//我已处理
else if (classify == "2")
{
strSql += " AND (doc.State ='2' and doc.AcceptMan like'%" + uid + "%' )";
}
//我参与的
else if (classify == "3")
{
strSql += " AND doc.CopyMan like'%" + uid + "%' ";
}
SqlParameter[] parameter = listStr.ToArray();

2
SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx
View File

@ -162,7 +162,7 @@
<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="2" />
</f:RadioButtonList>
<f:DatePicker ID="txtFinishTime" runat="server" Label="要求完成时间" LabelWidth="120px" LabelAlign="Right"
EnableEdit="true">

5
SGGL/FineUIPro.Web/DocManage/DocManageView.aspx
View File

@ -94,6 +94,11 @@
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox runat="server" ID="txtCopyMan" Label="抄送人员" Readonly="True" Enabled="False"/>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:HtmlEditor runat="server" Label=" " ID="txtDocContent" ShowLabel="false"

18
SGGL/FineUIPro.Web/DocManage/DocManageView.aspx.cs
View File

@ -45,6 +45,16 @@ namespace FineUIPro.Web.DocManage
}
}
private string GetUserNames(string Ids)
{
string[] arr = Ids.Split(',');
var data = Funs.DB.Sys_User.Where(t => arr.Contains(t.UserId)).Select(t => t.UserName).ToList();
if (data.Count > 0)
return string.Join(",", data);
return null;
}
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
@ -82,6 +92,14 @@ namespace FineUIPro.Web.DocManage
{
State = Const.Doc_State_0;
}
if (!string.IsNullOrEmpty(doc.CopyMan))
{
txtCopyMan.Text = GetUserNames(doc.CopyMan);
}
BindGrid();
if (!string.IsNullOrEmpty(Type) && Type == "notice")
{

9
SGGL/FineUIPro.Web/DocManage/DocManageView.aspx.designer.cs generated
View File

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

75
SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx.cs
View File

@ -12,6 +12,21 @@ namespace FineUIPro.Web.PZHGL.GJSX
{
public partial class GJSXList : PageBase
{
/// <summary>
/// 类型
/// </summary>
public string classify
{
get
{
return (string)ViewState["classify"];
}
set
{
ViewState["classify"] = value;
}
}
/// <summary>
/// 加载页面
/// </summary>
@ -21,9 +36,14 @@ namespace FineUIPro.Web.PZHGL.GJSX
{
if (!IsPostBack)
{
classify = Request.Params["classify"];
Funs.DropDownPageSize(this.ddlPageSize);
////权限按钮方法
this.GetButtonPower();
if (classify != "0")
{
btnNew.Hidden = true;
}
this.btnNew.OnClientClick = Window1.GetShowReference("GJSXListEdit.aspx?EditType=add") + "return false;";
if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
{
@ -42,7 +62,33 @@ namespace FineUIPro.Web.PZHGL.GJSX
private void BindGrid()
{
string strSql = "";
string strSql = @"select
a.GJSXID
,a.ProjectId
,a.detail
,a.Userid
,b.username
,a.createDate
,User_ReceiveID = STUFF((SELECT ',' + p2.UserName FROM dbo.Sys_User as p2 where PATINDEX('%,' + RTRIM(p2.UserId) + ',%', ',' + a.User_ReceiveID + ',') > 0 FOR XML PATH('')), 1, 1,'')
, CNProfessionalId = STUFF((SELECT ',' + Base_CNProfessional.ProfessionalName FROM dbo.Base_CNProfessional where PATINDEX('%,' + RTRIM(Base_CNProfessional.CNProfessionalId) + ',%', ',' + a.CNProfessional_ID + ',') > 0 FOR XML PATH('')), 1, 1,'')
,Base_Project.ProjectName
,Base_Unit.unitname
,a.CloseDate
,case a.state when 2 then '正在进行' when 3 then '待关闭' when 0 then '已关闭' when 1 then '开放' end as state
,QuestionTypeName = STUFF((SELECT ',' + Base_QuestionType.QuestionTypeName FROM dbo.Base_QuestionType where PATINDEX('%,' + RTRIM(Base_QuestionType.QuestionTypeID) + ',%', ',' + a.QuestionTypeID + ',') > 0 FOR XML PATH('')), 1, 1,'')
,a.IsManypeople
,a.CompleteDate
,a.AttachUrl
,user_Acceptance = STUFF((SELECT ',' + p2.UserName FROM dbo.Sys_User as p2 where PATINDEX('%,' + RTRIM(p2.UserId) + ',%', ',' + a.user_Acceptance + ',') > 0 FOR XML PATH('')), 1, 1,'')
from GJSX as a left join Sys_User as b on a.UserId = b.UserId
left join[dbo].[Base_Project] on a.ProjectId = Base_Project.ProjectId
left join[dbo].[Base_Unit] on a.UnitId = Base_Unit.UnitId
left join[dbo].[Base_QuestionType] on a.QuestionTypeID = Base_QuestionType.QuestionTypeID
where a.ProjectId = @ProjectId";
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(Request.Params["projectId"])) ///是否文件柜查看页面传项目值
@ -53,11 +99,32 @@ namespace FineUIPro.Web.PZHGL.GJSX
{
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
}
listStr.Add(new SqlParameter("@sql_where", strSql));
var uid = CurrUser.UserId;
//listStr.Add(new SqlParameter("@sql_where", strSql));
//我创建的
if (classify=="0")
{
strSql += " AND a.Userid='" + uid + "' ";
}
//待我处理
else if (classify == "1")
{
strSql += " AND (a.state ='2' and a.User_Acceptance like'%"+ uid + "%' ) or (a.state ='3' and (a.Userid like'%" + uid + "%' or a.User_ReceiveID like'%" + uid + "%' ))";
}
//我已处理
else if (classify == "2")
{
strSql += " AND (a.state ='0' and (a.Userid like'%" + uid + "%' or a.User_ReceiveID like'%" + uid + "%' ))";
}
//我参与的
else if (classify == "3")
{
strSql += " AND a.CsUsers like'%" + uid + "%' ";
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunProc("Sp_GJSX_getlist", parameter);
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;

38
SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs
View File

@ -202,7 +202,7 @@ namespace FineUIPro.Web.PZHGL.GJSX
}
if (EditType == "Edit") //添加事项进展
if (EditType == "Edit" || EditType=="See") //添加事项进展
{
//this.Progress_detail.Visible = true;
//this.nextProgress.Visible = true;
@ -385,14 +385,46 @@ namespace FineUIPro.Web.PZHGL.GJSX
else //浏览者
{
Progress_detail.Hidden = false;
this.Grid2.AllowCellEditing = false;// 禁止编辑
//Progress_detail.Enabled = false;
//this.nextProgress.Visible = false;
btnSave.Visible = false;
btnsubmit.Visible = false;
Button1.Hidden = true;
Grid2Binging();
Grid2.AllColumns[0].Hidden = true;
Grid2.AllColumns[5].Hidden = true;
Grid2.AllColumns[6].Hidden = false;
}
if (!string.IsNullOrEmpty(gjsx.User_Acceptance) && gjsx.User_Acceptance.Contains(this.CurrUser.UserId)
&& state=="2") //如果当前登录人为责任人
{
if (state == "2")
{
Toolbar131.Hidden = false;
Progress_detail.Hidden = false;
btnSave.Visible = false;
btnsubmit.Hidden = false;
Button1.Hidden = true;
}
else
{
Progress_detail.Hidden = true;
btnSave.Visible = false;
btnsubmit.Hidden = true;
Button1.Hidden = true;
}
if (state == "0" || state == "3")
{
Progress_detail.Hidden = false;
Grid2Binging();
Grid2.AllColumns[0].Hidden = true;
Grid2.AllColumns[5].Hidden = true;
Grid2.AllColumns[6].Hidden = false;
}
}
if (BLL.GJSXService.GetGJSXById(this.txtGJSXID.Text).IsManypeople == "1")
{

16
SGGL/FineUIPro.Web/common/Menu_PGJSX.xml
View File

@ -1,7 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<Tree>
<TreeNode id="0BEA2126-7A48-40EB-8E21-99148E91A22B" Text="关键事项" NavigateUrl="PZHGL/GJSX/GJSXList.aspx">
</TreeNode>
<TreeNode id="5F3B18D6-9FBA-4EF5-A7E4-DC9F6A4EA680" Text="关键事项查询" NavigateUrl="PZHGL/GJSX/GJSXFind.aspx"></TreeNode>
<TreeNode id="CAA875A7-089B-4B79-87CE-742FDFD9DE43" Text="关键事项统计" NavigateUrl="PZHGL/GJSX/GJSXInfoCount.aspx"></TreeNode>
<TreeNode id="168A94C7-E37D-4B9C-8684-51DF4F8C5134" Text="关键事项（内部）" NavigateUrl="">
<TreeNode id="0BEA2126-7A48-40EB-8E21-99148E91A22B" Text="我创建的" NavigateUrl="PZHGL/GJSX/GJSXList.aspx?classify=0">
</TreeNode>
<TreeNode id="4A9E60ED-24FF-4410-B3B7-2A5079615A78" Text="待我处理" NavigateUrl="PZHGL/GJSX/GJSXList.aspx?classify=1"></TreeNode>
<TreeNode id="BEF7850D-1BA5-45F9-BD40-E52F6D813E7C" Text="我已处理" NavigateUrl="PZHGL/GJSX/GJSXList.aspx?classify=2"></TreeNode>
<TreeNode id="3C129205-F6A9-480D-B36C-E35DED5D7CEC" Text="我参与的" NavigateUrl="PZHGL/GJSX/GJSXList.aspx?classify=3"></TreeNode>
</TreeNode>
<TreeNode id="42791ACB-7C72-481F-B1ED-158C7141522C" Text="协调沟通（外部）" NavigateUrl=""><TreeNode id="609F0D64-ABB8-4F5C-9646-FC1DFC8BAB85" Text="我创建的" NavigateUrl="DocManage/DocManage.aspx?classify=0"></TreeNode>
<TreeNode id="2FEF98BD-DBBD-4ADA-B600-18D3C113B22A" Text="待我处理" NavigateUrl="DocManage/DocManage.aspx?classify=1"></TreeNode>
<TreeNode id="5BDEEA43-FFD7-4AEB-B760-24E70009EA0C" Text="我已处理" NavigateUrl="DocManage/DocManage.aspx?classify=2"></TreeNode>
<TreeNode id="58B45CA6-AFFB-4624-80C6-F70C1A54FBE2" Text="我参与的" NavigateUrl="DocManage/DocManage.aspx?classify=3"></TreeNode>
</TreeNode>
</Tree>

4
SGGL/FineUIPro.Web/indexProject.aspx
View File

@ -280,11 +280,11 @@
</div>
<div class="nav-btn n-btns-r">
<div class="n-btn-r c-n-btn-r" onclick="TransferClick();" style="cursor:pointer">移交管理</div>
<div class="n-btn-r c-n-btn-r" onclick="PGJSXClick();" style="cursor:pointer">关键事项</div>
<div class="n-btn-r c-n-btn-r" onclick="PGJSXClick();" style="cursor:pointer;width: 2.225rem;height: .305rem;line-height: .35rem;">关键事项与协调沟通</div>
<div class="n-btn-r c-n-btn-r" onclick="DigitalSiteClick();" style="cursor:pointer">视频监控</div>
<div class="n-btn-r c-n-btn-r" onclick="PDigDataClick();" style="cursor:pointer">现场考勤</div>
<div class="n-btn-r c-n-btn-r" onclick="OpinionClick();" style="cursor:pointer">意见收集</div>
<div class="n-btn-r c-n-btn-r" onclick="DocClick();" style="cursor:pointer">协调与沟通</div>
<div class="n-btn-r c-n-btn-r" onclick="DocClick();" style="cursor:pointer; display:none">协调与沟通</div>
</div>
</div>
</div>