Commit 91f49dee by ruyun.zhang

显示设置

parent e5b8203d
......@@ -218,6 +218,7 @@ public enum Title
}
public enum DisplayRule
{
始终隐藏,
始终显示,
下发显示,
}
......
......@@ -330,14 +330,17 @@ public UniteDeptDetailResponse UniteDeptDetail(int allotId, UnitType unitType, s
// 备注
detail.Remark = allot.ShowFormula == 1 ? cfg?.Remark : null;
// 只对科室查看时右侧并且未下发隐藏内容
if (userInfo.IsSecondAdmin
&& detail.Type == (int)UniteDept.Type.右侧收缩
&& cfg?.Display == UniteDept.DisplayRule.下发显示.ToString()
&& allot.States != (int)AllotStates.绩效下发
&& allot.States != (int)AllotStates.归档)
if (cfg?.Display == UniteDept.DisplayRule.始终隐藏.ToString())
{
detail.Display = false;
}
else if (cfg?.Display == UniteDept.DisplayRule.下发显示.ToString())
{
if (userInfo.IsSecondAdmin && detail.Type == (int)UniteDept.Type.右侧收缩 && allot.States != (int)AllotStates.绩效下发 && allot.States != (int)AllotStates.归档)
{
detail.Display = false;
}
}
}
response.DetailItems = response.DetailItems.OrderBy(w => w.Type).ThenBy(w => w.Sort).ToList();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment