diff --git a/.collaboration b/.collaboration index fee29ce0..bc63c6b5 100644 --- a/.collaboration +++ b/.collaboration @@ -2054,59 +2054,19 @@ }, { "ModuleName": "RdlReport/人员工时报表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-12-31T19:06:40.873869+08:00", - "ModuleType": 18, - "ToRemoveFiles": [ - "Reports\\人员工时报表.json", - "Reports\\人员工时报表.rdlx" - ] + "ModuleType": 18 }, { "ModuleName": "RdlReport/项目工时报表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-12-31T19:06:57.0086632+08:00", - "ModuleType": 18, - "ToRemoveFiles": [ - "Reports\\项目工时报表.json", - "Reports\\项目工时报表.rdlx" - ] + "ModuleType": 18 }, { "ModuleName": "RdlReport/客户部门工时报表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-12-31T19:07:44.4612047+08:00", - "ModuleType": 18, - "ToRemoveFiles": [ - "Reports\\客户部门工时报表.json", - "Reports\\客户部门工时报表.rdlx" - ] + "ModuleType": 18 }, { "ModuleName": "RdlReport/客户工时报表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-12-31T19:07:18.3203386+08:00", - "ModuleType": 18, - "ToRemoveFiles": [ - "Reports\\客户工时报表.json", - "Reports\\客户工时报表.rdlx" - ] + "ModuleType": 18 }, { "ModuleName": "ProcessItem/项目立项流程", diff --git a/Reports/人员工时报表.rdlx b/Reports/人员工时报表.rdlx index eb07e4e9..573e6414 100644 --- a/Reports/人员工时报表.rdlx +++ b/Reports/人员工时报表.rdlx @@ -1,6 +1,6 @@  - 人员工时报表.rdlx111 + 人员工时报表.rdlx1111 @@ -18,7 +18,6 @@ 人员工时报表 Auto
- true 2.274cm @@ -550,7 +549,6 @@
- true 1.011cm diff --git a/Reports/客户工时报表.rdlx b/Reports/客户工时报表.rdlx index 85b7a7a1..e2041f3d 100644 --- a/Reports/客户工时报表.rdlx +++ b/Reports/客户工时报表.rdlx @@ -1,6 +1,6 @@  - 客户工时报表.rdlx1 + 客户工时报表.rdlx11 @@ -18,7 +18,6 @@ 客户工时报表 Auto
- true 1.751cm @@ -480,7 +479,6 @@
- true 1cm diff --git a/Reports/客户部门工时报表.rdlx b/Reports/客户部门工时报表.rdlx index 72061405..61c8ab1f 100644 --- a/Reports/客户部门工时报表.rdlx +++ b/Reports/客户部门工时报表.rdlx @@ -1 +1,1038 @@ -客户部门工时报表.rdlx4.251cm0cm0.122cm44.256cm4.251cm工时表_DataSet客户工时报表Auto
1.751cm8true开发服务月度工时报表0.75cmtrue日期true部门true项目true文本框32版本true任务true文本框3负责人true内容true=IIF(Parameters!显示工时.Value, "工时", "人天")
=Fields.Item("日期").Value=Fields.Item("部门ID").Value=Fields.Item("项目ID").Value=Fields.Item("版本名称").Value=Fields.Item("任务ID").Value=Fields.Item("执行人").Value=Fields.Item("执行内容").Value=Fields.Item("上报工时").ValueAscending=Fields.Item("日期").ValueAscending=Fields.Item("项目ID").ValueAscending=Fields.Item("任务ID").ValueAscending=Fields.Item("执行人").Value0.75cmtrue日期=Fields.Item("日期").Valuetrue部门名称=Fields.Item("部门名称").Valuetrue项目名称=Fields.Item("项目名称").Valuetrue版本名称=Fields.Item("版本名称").Valuetrue任务名称=Fields.Item("任务名称").Valuetrue执行人=Fields.Item("执行人").Valuetrue执行内容=Fields.Item("执行内容").Valuetrue上报人天=IIF(Parameters!显示工时.Value, Fields!上报工时.Value, Fields!上报人天.Value)
1cm7true合计true=IIF(Parameters!显示工时.Value, Sum(Fields!上报工时.Value), Sum(Fields!上报人天.Value))
4.453cm4.5cm6.045cm3.879cm6.002cm4.927cm10.401cm4.049cm
1cm1cm100cm48cm1cm1cm44.378cmInteger客户True客户表_DataSet客户名称IDInteger部门Truetrue客户部门_DataSet部门名称ID客户部门_DataSetIDDateTimetrue开始日期TrueDateTimetrue结束日期TrueBoolean勾选择显示工时，否则显示人天Truetruejsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/626dc4a2-38c3-4b2c-9a6d-0b539b349d64;schemadata={"type":"array","items":{"type":"object","properties":{"所属客户":{"type":"integer"},"部门ID":{"type":"integer"},"部门名称":{"type":"string"},"日期":{"type":"date-time"},"执行人":{"type":"string"},"项目ID":{"type":"integer"},"项目名称":{"type":"string"},"任务ID":{"type":"integer"},"任务名称":{"type":"string"},"版本名称":{"type":"string"},"执行内容":{"type":"string"},"上报工时":{"type":"number"},"上报人天":{"type":"number"}}}}JSONjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/04414b10-23b8-43e4-bad1-ce5281cc2d3a;schemadata={"type":"array","items":{"type":"object","properties":{"ID":{"type":"integer"},"客户名称":{"type":"string"}}}}JSONjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/276a04a7-4c76-4074-85c4-6f8e0902f8ba;schemadata={"type":"array","items":{"type":"object","properties":{"ID":{"type":"integer"},"客户ID":{"type":"integer"},"部门名称":{"type":"string"}}}}JSON所属客户部门ID部门名称日期执行人项目ID项目名称任务ID任务名称版本名称执行内容上报工时上报人天=Fields!所属客户.Value=Parameters!客户.ValueEqual=Fields!部门ID.Value=IIF(IsNothing(Parameters!部门.Value), Fields!部门ID.Value, Parameters!部门.Value)In=Fields!日期.Value=IIF(IsNothing(Parameters!开始日期.Value), Fields!日期.Value, Parameters!开始日期.Value)GreaterThanOrEqual=Fields!日期.Value=IIF(IsNothing(Parameters!结束日期.Value), Fields!日期.Value, Parameters!结束日期.Value)LessThanOrEqual$.[*]工时表ID客户名称$.[*]客户表ID客户ID部门名称=Fields!客户ID.Value=Parameters!客户.ValueEqual$.[*]客户部门DisplayTypeGalleySizeTypeFitToWidthPaperOrientationLandscapeParametersView{"controls":[{"left":25,"top":10,"width":200,"height":75,"control":{"type":"dropdown","binding":"客户","label":{"display":"top","text":"客户","color":"default","font":{"bold":false,"italic":false,"underline":false,"transform":"none"}}}},{"left":235,"top":10,"width":200,"height":75,"control":{"type":"dropdown","binding":"部门","label":{"display":"top","text":"部门","color":"default","font":{"bold":false,"italic":false,"underline":false,"transform":"none"}}}},{"left":1045,"top":40,"width":100,"height":30,"control":{"type":"button","action":"preview","text":"","background":"accent"}},{"left":935,"top":40,"width":100,"height":30,"control":{"type":"button","action":"reset","background":"warning","text":""}},{"left":445,"top":10,"width":340,"height":75,"control":{"type":"date-range","binding":["开始日期","结束日期"],"maxRange":["none"],"viewMode":"default","daysViewHeaderFormat":"","label":{"display":"top","text":"日期范围"}}},{"left":795,"top":10,"width":125,"height":75,"control":{"type":"boolean","binding":["显示工时"],"label":{"display":"top","text":"工时显示方式"},"subType":"toggle","text":"布尔型","textTrue":"工时","textFalse":"人天","layout":"horizontal"}}]}DefaultTheme.rdlx-theme \ No newline at end of file + + + 客户部门工时报表.rdlx1 + + + + 6.001cm + + + 0cm + 0.122cm + 44.256cm + 6.001cm + + 工时表_DataSet + 客户工时报表 + Auto +
+ + + 1.751cm + + + 8 + + + + true + 开发服务月度工时报表 + + + + + + + 0.75cm + + + + + + true + 日期 + + + + + + + + DimGray + + + true + 部门 + + + + + + + + DimGray + + + true + 项目 + + + + + + + + true + 文本框32 + 版本 + + + + + + + + true + 任务 + + + + + + + + true + 文本框3 + 负责人 + + + + + + + + true + 内容 + + + + + + + + true + =IIF(Parameters!显示工时.Value, "工时", "人天") + + + + + + +
+
+ + + =Fields.Item("日期").Value + =Fields!项目ID.Value + =Fields!任务ID.Value + =Fields!执行内容.Value + + + + + Ascending + =Fields.Item("日期").Value + + + Ascending + =Fields.Item("项目ID").Value + + + Ascending + =Fields.Item("任务ID").Value + + + Ascending + =Fields.Item("执行人").Value + + + + + 0.75cm + + + + + + + + + + + + + + + 1pt + + + true + 日期 + =Fields.Item("日期").Value + + + + + + + + + + + + + + + + + 1pt + + + true + 部门名称 + =Fields.Item("部门名称").Value + + + + + + + + + + + + + + + + + 1pt + + + true + 项目名称 + =Fields.Item("项目名称").Value + + + + + + + + + + + + + + + + + 1pt + + + true + 版本名称 + =Fields.Item("版本名称").Value + + + + + + + + + + + + + + + + + 1pt + + + true + 任务名称 + =Fields.Item("任务名称").Value + + + + + + + + + + + + + + + + + 1pt + + + true + 执行人 + =Fields.Item("执行人").Value + + + + + + + + + + + + + + + + + 1pt + + + true + 执行内容 + =Fields.Item("执行内容").Value + + + + + + + + + + + + + + + + + 1pt + + + true + 上报人天 + =IIF(Parameters!显示工时.Value, Sum(Fields!上报工时.Value), Sum(Fields!上报人天.Value)) + + + + + + +
+
+ + + 1cm + + + 7 + + + + + + true + 合计 + + + + + + + + + + true + =IIF(Parameters!显示工时.Value, Sum(Fields!上报工时.Value), Sum(Fields!上报人天.Value)) + + + + + + +
+ + + 4.453cm + + + 4.5cm + + + 6.045cm + + + 3.879cm + + + 6.002cm + + + 4.927cm + + + 10.401cm + + + 4.049cm + + + + +
+ true + + + 1cm + + + 8 + + + + true + 部门名称 + =Fields!部门名称.Value + + + + + + +
+
+ + + 0.75cm + + + + + + true + + + + + + + + + true + + + + + + + + + true + + + + + + + + + true + + + + + + + + + true + + + + + + + + + true + + + + + + + + + true + 合计 + + + + + + + + true + =IIF(Parameters!显示工时.Value, Sum(Fields!上报工时.Value), Sum(Fields!上报人天.Value)) + + + + + + +
+ + + =Fields!部门ID.Value + + + + +
+ + + + Landscape + 100cm + 48cm + 1cm + 1cm + 1cm + 1cm + + 44.378cm + + + + + Integer + 客户 + True + + + 客户表_DataSet + 客户名称 + ID + + + + + Integer + 部门 + True + true + + + 客户部门_DataSet + 部门名称 + ID + + + + + 客户部门_DataSet + ID + + + + + DateTime + true + 开始日期 + True + + + DateTime + true + 结束日期 + True + + + Boolean + 勾选择显示工时，否则显示人天 + True + + + true + + + + + + + + jsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/626dc4a2-38c3-4b2c-9a6d-0b539b349d64;schemadata={"type":"array","items":{"type":"object","properties":{"所属客户":{"type":"integer"},"部门ID":{"type":"integer"},"部门名称":{"type":"string"},"日期":{"type":"date-time"},"执行人":{"type":"string"},"项目ID":{"type":"integer"},"项目名称":{"type":"string"},"任务ID":{"type":"integer"},"任务名称":{"type":"string"},"版本名称":{"type":"string"},"执行内容":{"type":"string"},"上报工时":{"type":"number"},"上报人天":{"type":"number"}}}} + JSON + + + + + jsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/04414b10-23b8-43e4-bad1-ce5281cc2d3a;schemadata={"type":"array","items":{"type":"object","properties":{"ID":{"type":"integer"},"客户名称":{"type":"string"}}}} + JSON + + + + + jsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/276a04a7-4c76-4074-85c4-6f8e0902f8ba;schemadata={"type":"array","items":{"type":"object","properties":{"ID":{"type":"integer"},"客户ID":{"type":"integer"},"部门名称":{"type":"string"}}}} + JSON + + + + + + + + 所属客户 + + + 部门ID + + + 部门名称 + + + 日期 + + + 执行人 + + + 项目ID + + + 项目名称 + + + 任务ID + + + 任务名称 + + + 版本名称 + + + 执行内容 + + + 上报工时 + + + 上报人天 + + + + + =Fields!所属客户.Value + + =Parameters!客户.Value + + Equal + + + =Fields!部门ID.Value + + =IIF(IsNothing(Parameters!部门.Value), Fields!部门ID.Value, Parameters!部门.Value) + + In + + + =Fields!日期.Value + + =IIF(IsNothing(Parameters!开始日期.Value), Fields!日期.Value, Parameters!开始日期.Value) + + GreaterThanOrEqual + + + =Fields!日期.Value + + =IIF(IsNothing(Parameters!结束日期.Value), Fields!日期.Value, Parameters!结束日期.Value) + + LessThanOrEqual + + + + $.[*] + 工时表 + + + + + + ID + + + 客户名称 + + + + $.[*] + 客户表 + + + + + + ID + + + 客户ID + + + 部门名称 + + + + + =Fields!客户ID.Value + + =Parameters!客户.Value + + Equal + + + + $.[*] + 客户部门 + + + + + + DisplayType + Galley + + + SizeType + FitToWidth + + + PaperOrientation + Landscape + + + ParametersView + {"controls":[{"left":25,"top":10,"width":200,"height":75,"control":{"type":"dropdown","binding":"客户","label":{"display":"top","text":"客户","color":"default","font":{"bold":false,"italic":false,"underline":false,"transform":"none"}}}},{"left":235,"top":10,"width":200,"height":75,"control":{"type":"dropdown","binding":"部门","label":{"display":"top","text":"部门","color":"default","font":{"bold":false,"italic":false,"underline":false,"transform":"none"}}}},{"left":1045,"top":40,"width":100,"height":30,"control":{"type":"button","action":"preview","text":"","background":"accent"}},{"left":935,"top":40,"width":100,"height":30,"control":{"type":"button","action":"reset","background":"warning","text":""}},{"left":445,"top":10,"width":340,"height":75,"control":{"type":"date-range","binding":["开始日期","结束日期"],"maxRange":["none"],"viewMode":"default","daysViewHeaderFormat":"","label":{"display":"top","text":"日期范围"},"showDefaultRanges":true}},{"left":795,"top":10,"width":125,"height":75,"control":{"type":"boolean","binding":["显示工时"],"label":{"display":"top","text":"工时显示方式"},"subType":"toggle","text":"布尔型","textTrue":"工时","textFalse":"人天","layout":"horizontal"}}],"preferredLayout":"free-form","canvas":{"width":1160,"height":85}} + + + + DefaultTheme.rdlx-theme + + \ No newline at end of file diff --git a/Reports/项目工时报表.rdlx b/Reports/项目工时报表.rdlx index 3a5e94c1..7b6a8eef 100644 --- a/Reports/项目工时报表.rdlx +++ b/Reports/项目工时报表.rdlx @@ -1,6 +1,6 @@  - 项目工时报表.rdlx1 + 项目工时报表.rdlx11 @@ -18,7 +18,6 @@ 项目工时报表 Auto
- true 2cm @@ -477,7 +476,6 @@
- true 0.75cm