diff --git a/.collaboration b/.collaboration index 1e9dfe0d..993befb9 100644 --- a/.collaboration +++ b/.collaboration @@ -578,17 +578,7 @@ }, { "ModuleName": "PCPage/任务首页", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-25T19:22:35.2780507+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务首页.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目周报列表", @@ -2480,45 +2470,15 @@ }, { "ModuleName": "RdlReport/人员工时报表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-25T19:14:42.9844636+08:00", - "ModuleType": 18, - "ToRemoveFiles": [ - "Reports\\人员工时报表.json", - "Reports\\人员工时报表.rdlx" - ] + "ModuleType": 18 }, { "ModuleName": "RdlReport/客户工时报表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-25T19:13:10.9380151+08:00", - "ModuleType": 18, - "ToRemoveFiles": [ - "Reports\\客户工时报表.json", - "Reports\\客户工时报表.rdlx" - ] + "ModuleType": 18 }, { "ModuleName": "RdlReport/项目工时报表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-25T19:14:33.2059432+08:00", - "ModuleType": 18, - "ToRemoveFiles": [ - "Reports\\项目工时报表.json", - "Reports\\项目工时报表.rdlx" - ] + "ModuleType": 18 }, { "ModuleName": "ServerCommand/复活流程", diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json index b5443f15..19674ff6 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json @@ -345,12 +345,12 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "dd0fc613-8b79-410d-9e75-2b4f0f49de49" + "ID": "9aff82cc-246d-4727-8767-ce42ea335035" } ] } ], - "ID": "79dff528-a082-4347-ac84-66533bc3a3a6" + "ID": "3f428509-40fd-4d60-879f-2510cef2cd07" } ] } @@ -392,13 +392,28 @@ } } }, + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "ID", + "GUID": "f60a9a79-8579-41ee-9b85-4d115c22c781" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务首页!任务ID" + } + } + }, { "$type": "Forguncy.Model.RunJavaScriptCommand, ServerDesignerCommon", "JavaScript": "Forguncy.Page.reloadBindingData();\r\n", "ID": "e2e848e0e72d48229c97757429d446a2" } ], - "ID": "a8a64d9f-f532-4ab4-bf25-4f8dde22db23" + "ID": "c0da5ed0-5577-4f8f-b774-da616e215762" } ] }, @@ -609,7 +624,7 @@ "MethodName": "Refresh" } ], - "ID": "dfb01b6a-c098-4fc3-8828-abaacb35e146" + "ID": "aef56052-92a2-48fa-b4fe-e72ad2b714df" }, { "CommandList": [ @@ -624,12 +639,12 @@ "BtnText": "知道了" } ], - "ID": "86382a1a-eca4-4630-bfd1-e3f1e560e8e6" + "ID": "a9b7b2ec-0563-497f-b9a7-d47fadd5967e" } ] } ], - "ID": "f51d5ab4-4d37-432f-8f44-b6a9b9176ea1" + "ID": "53a1892e-cd13-4340-a60f-ad01f8398fbc" }, { "Condition": { @@ -786,7 +801,7 @@ "MethodName": "ExecuteCommand" } ], - "ID": "05916bfd-202e-4935-aa0a-8251e5b63549" + "ID": "d84c889d-ba1e-481a-83a5-afd9e1e0b67c" }, { "CommandList": [ @@ -799,18 +814,18 @@ } } ], - "ID": "c667c33d-3b24-438a-982b-42e29974940c" + "ID": "8c7da769-a5ea-4461-a680-501f88fe33db" } ] } ], - "ID": "4959d3e6-ad5a-4790-898d-8def43e62275" + "ID": "8cd73450-6764-43f5-a77e-1ec1d70dde7b" } ] } ], "Comments": "如果已经结束,可以复活", - "ID": "5e71fc76-3cf7-4edc-9539-60577d20156b" + "ID": "2717500d-31cf-4b31-b12f-4126e8687fa8" }, { "CommandList": [ @@ -820,7 +835,7 @@ "Message": "当前任务正在执行中,无法启动流程" } ], - "ID": "b6718df7-a845-4154-9b48-54d3487f66e3" + "ID": "398a4ae6-c57a-4f71-8f0a-9ac7ae1aff1c" } ] } @@ -958,7 +973,7 @@ "ReloadData": true } ], - "ID": "e276d9e0-a670-4704-be8d-9e74e78f44fd" + "ID": "d4215675-a015-4502-a43a-2dd4a9f2dcba" }, { "CommandList": [ @@ -973,12 +988,12 @@ "BtnText": "知道了" } ], - "ID": "939e04f7-cc0a-46e0-93fa-24101a14cf83" + "ID": "8ae0c33b-7cc0-4c93-aa63-6d032e4236cb" } ] } ], - "ID": "d3aa4088-3dc3-475a-8ad5-d10c1f71d9f4" + "ID": "ac9e85eb-5739-4726-9384-4ba316d41e6f" }, { "CommandList": [ @@ -993,12 +1008,12 @@ "BtnText": "知道了" } ], - "ID": "a7053b69-0704-4bf8-a2a7-ebfb2afa3776" + "ID": "09326428-b777-4be9-9e56-64e3bad3eb83" } ] } ], - "ID": "d3df30bb-ec9d-46d2-98b6-8c913cac3e4b" + "ID": "86379bc8-0697-4991-b063-0a5b402d47d2" } ] } @@ -1127,7 +1142,7 @@ } } ], - "ID": "d522537a-1f49-45e1-b82d-c256aa9d0b1d" + "ID": "3b8c1096-9523-4c6f-a27b-aa2492b71609" } ] }, @@ -1168,7 +1183,7 @@ } } ], - "ID": "c298937b-d992-45d7-94e2-28736f1c0dab" + "ID": "8f798eaf-a8a2-4b8e-ad5f-6228b702c744" } ] } @@ -1283,7 +1298,7 @@ "Disabled": true } ], - "ID": "6ff10cdf-d0c1-4f3c-a71c-233bc1324245" + "ID": "7834b3f5-7e96-418e-bacd-89e61781c961" } ] } @@ -1461,7 +1476,7 @@ ] } ], - "ID": "4701bbb3-2049-4a7c-bb03-96703f9b7841" + "ID": "2349c017-4e9d-4cdd-a2e6-6f8d620a5ca9" }, { "CommandList": [ @@ -1478,7 +1493,7 @@ ] } ], - "ID": "1dcef547-f973-4116-90e6-6e4f2aab8c38" + "ID": "be6fdce9-f55c-4d71-894c-0beeaa18d60c" } ] }, @@ -2204,7 +2219,7 @@ } } ], - "ID": "e75f43f6-9fe8-4568-9bc7-0e1648256729" + "ID": "a761cb68-cd9b-404b-8f23-2f5ff90e34de" } ] }, @@ -2314,4 +2329,4 @@ "Formula": "任务首页!$Y$8" } ] -}//qmt5F/SczMDGg/3xqp1+M+jGN7oJ8szXVJ34s2z2cv2HOE1VKZxM4knv5lLCUSEaKeUJhgno9OWB/iH8bCNRwi24gbtXKWV6Ujt8PhRDxU1g5rfDrvSjWOo1hKwkrigzJffPWGJyYujOzckH6PO9xjF5c5eN8ntuhICBdz8VdjSE9PQMAuuESQoxhoIjl54beUQKfHqoLySP/aCjPupy6wJ08D+JUjzGab9MIMtmYj3mqyVVt5zGZV8nAaWdLgoThvFi22kH3OJadTJl5aVAR5O/j/XbVs8vbutTe4gz+a3v/1/aQFv9iJP86y/5rrvUjdQjGAHJLzNkJ7XSHk5P1sUdN2c5tcOA3UlJpttHzCgJlXUfzPMqHqco2+xFxm+lps2y+DMn9R93VsegpE6/kg6UhLw1OWIY81tk50zcz3dOu4YD0E5+KgDhAJefvReT3Wjzj4lN3WXYPODQfsMKLLYD4/CXF/Pz9boS00qORzkkc3kBVw/xhjBZDVOXKEYTUqPjL9fwe0wBm1istRIv8yhwND4Cjhvs7BZGneRN7SMkBfNlc8PgimfD3ykE05HQTyiq7Q7QYpQkT6CR5aMDEYIxWY1rmNLxnVkYSY2zaKlC5ro4QgxOv1jjFD8+ToOWpoIENPjYFua59MuBxy+xxpROE8R825ObKIGHMMfLv2mHyosXK5TqNf4yjUW643SZqzWYktsPJLoP9b3bmelFX9XBr+uhkFP030HRDoqHDx0SrSMYTWxdMGSyWNMOztYQRWUjHA4qr73pX0EIC9Y5x9GSzUZljABZu6oy3vNTgAWkbvWvczv1QKPOkIm71lnGluuhaR8B5zjv1R1fWyLgsHkPUUEZu5UZMCUA+BB2ENCeo5NuCnL/IrErvSxXmN3iCLPbeQl9FZ5UOfMGY52VuA==|920 \ No newline at end of file +}//UL/NdWkSKxGgNxkQ+ebAqefndFdDU0zXfwG1jXWeiGdYRAGbEC7WRFzMarsAY+uVJwY2M5oI1nRXBhkVkXn2VQByofkT/FTSZ8KanHnlZ4dbPbAgx0KhCoxTZh5vP2n1abYCX2doKJSjXmw/fKMrrevroxdiyre5fvRN5g9442FnkY/DS4pI1mzv3IAKGKUXZdZ/d3wyS83I//89rPaKHafb4SJxOi1/ktSWlQiAqvS0a0x4FvSqLQLKMk0xrA0Id0ojfAR43Mp71F73r+NqXnMX6ZTcoghHIPTigydeM/8Rvc1smVmXJflqUBnXcbV1No3+oaoJFmFje5+qYM9J9AzcrBZ8NYuYYjTCHEiYSj9xXiyW+RGs4SQw/Z7sKyRpdFdwvDeHRnbDamENKsMOB0FnEhsHJ/O9WvxDaWACOvINRIdzm166W1UVTjv4bRivJ/HQcQh+2aossxAnqjk8oFM+btQi5qJFCS4puQx8nzpFDrz4nEEmTB+SkUqg4SzauTP7U9Tg48GQF9e4YwDffpooyj6cKNq7J0HHwL7Umjq0TKBZ8d0/xyJ0dVEh6VxrDk5NDLAannZlFDUObDHyo2H454a8ttYVaVqNxXJdxz7BfhblWqZyUGlXl+nsT6phU4QYM9sqQG8elw9KYbGsGHvlNJ5luPo4NGAsmON3VP3G8I+jPOBKZ5o1eAW3QZQI5mG7GXg8ZdO4RSX8h4A2P+sSiYqS5t1ArRpi+0tT+8vcyaQfsJdRUaJMwnVOJ9wQ8birrwh+Tf07kKDqugTZenR3HvQIagnG7QhuTu5OjJ7oJ0J2rnWhFJU0qwbcQyt2OgLSEdY835/HI4zdZPZANbgO4861NihyAhxAegZ41CkXpAI/img3Qhb90YLhxnKRxD6bkZZEHwvYG9n9ZTAL+w==|920 \ No newline at end of file diff --git a/Reports/人员工时报表.rdlx b/Reports/人员工时报表.rdlx index 154798bc..d0200a70 100644 --- a/Reports/人员工时报表.rdlx +++ b/Reports/人员工时报表.rdlx @@ -1,4 +1,4 @@ -人员工时报表.rdlx6cm0cm0cm40cm6cm工时表_DataSet人员工时报表Auto
true2.25cm6true=" " & Format(Parameters!开始日期.Value, "yyyy-MM-dd") & "~" & Format(Parameters!结束日期.Value, "yyyy-MM-dd") & "人员工时统计表"1cmtrue文本框1项目true文本框12版本2true文本框2任务true文本框17上报工时true文本框21核定工时
=Fields.Item("项目ID").Value=Fields.Item("版本ID").Value=Fields.Item("任务ID").ValueAscending=Fields.Item("执行人").ValueAscending=Fields.Item("项目ID").ValueAscending=Fields.Item("版本ID").ValueAscending=Fields.Item("任务名称").Value0.75cmTrueRestrictedtrue项目=Fields.Item("项目").ValueTrueRestrictedtrue版本=Fields.Item("版本名称").ValueTrueRestricted2true任务=Fields.Item("任务名称").Valuetrue上报工时=Fields.Item("上报工时").Valuetrue核定工时=Fields.Item("核定工时").Value
1cm4true合计true文本框45=Sum(Fields.Item("上报工时").Value)true文本框46=Sum(Fields.Item("核定工时").Value)
8.372cm7.063cm7.816cm8.931cm3.907cm3.911cm
true1cmtrue=(Fields.Item("执行人").Value & " ")3true小计true=Sum(Fields.Item("上报工时").Value)true=Sum(Fields.Item("核定工时").Value)
=Fields.Item("执行人").Value
1cmtruetrue0cm0cm40cm1cmtrue +人员工时报表.rdlx6cm0cm0cm40cm6cm工时表_DataSet人员工时报表Auto
true2.25cm6true=" " & Format(Parameters!开始日期.Value, "yyyy-MM-dd") & "~" & Format(Parameters!结束日期.Value, "yyyy-MM-dd") & "人员工时统计表"1cmtrue文本框1项目true文本框12版本2true文本框2任务true文本框17上报工时true文本框21核定工时
=Fields.Item("项目ID").Value=Fields.Item("版本ID").Value=Fields.Item("任务ID").ValueAscending=Fields.Item("执行人").ValueAscending=Fields.Item("项目ID").ValueAscending=Fields.Item("版本ID").ValueAscending=Fields.Item("任务名称").Value0.75cmTrueRestrictedtrue项目=Fields.Item("项目").ValueTrueRestrictedtrue版本=Fields.Item("版本名称").ValueTrueRestricted2true任务=Fields.Item("任务名称").Valuetrue上报工时=Fields.Item("上报工时").Valuetrue核定工时=Fields.Item("核定工时").Value
1cm4true合计true文本框45=Sum(Fields.Item("上报工时").Value)true文本框46=Sum(Fields.Item("核定工时").Value)
8.372cm7.063cm7.816cm8.931cm3.907cm3.911cm
true1cmtrue=Fields.Item("执行人").Value & " "3true小计true=Sum(Fields.Item("上报工时").Value)true=Sum(Fields.Item("核定工时").Value)
=Fields.Item("执行人").Value
1cmtruetrue0cm0cm40cm1cmtrue b89954dd-a360-4909-926a-34ae179f314f 空白样式 -="第 " & Globals!PageNumber & " 页 共 " & Globals!TotalPages & " 页"1cm1cm29.7cm42cm1cm1cm40cmDateTimetrueTrueDateTimetrue结束日期TrueIntegertrue项目IDTrue项目表_DataSet项目名称IDIntegertrue版本IDTrue版本表_DataSet名称加版本号IDtrueStringtrue执行人True用户信息视图_DataSet全名用户名jsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/eaf0055e-b7c7-4fd9-9f79-abb67577832d;schemadata={"type":"array","items":{"type":"object","properties":{"日期":{"type":"date-time"},"执行人":{"type":"string"},"执行人用户名":{"type":"string"},"项目ID":{"type":"integer"},"项目":{"type":"string"},"版本ID":{"type":"integer"},"版本名称":{"type":"string"},"任务ID":{"type":"integer"},"任务名称":{"type":"string"},"上报工时":{"type":"number"},"核定工时":{"type":"number"}}}}JSONjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/2c95e2a9-2e3a-492b-a2eb-f97669c8e580;schemadata={"type":"array","items":{"type":"object","properties":{"ID":{"type":"integer"},"项目名称":{"type":"string"}}}}JSONjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/f9f2ca80-339c-47ab-b41a-078a0a32de1d;schemadata={"type":"array","items":{"type":"object","properties":{"ID":{"type":"integer"},"项目ID":{"type":"integer"},"版本名称":{"type":"string"}}}}JSONjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/514ebb17-c46f-48fc-9097-169e0c003849;schemadata={"type":"array","items":{"type":"object","properties":{"用户名":{"type":"string"},"全名":{"type":"string"}}}}JSON日期执行人执行人用户名项目ID项目版本ID版本名称任务ID任务名称上报工时核定工时=Fields.Item("日期").Value=IIF(IsNothing(Parameters.Item("开始日期").Value), Fields.Item("开始日期").Value, Parameters.Item("开始日期").Value)GreaterThanOrEqual=Fields.Item("日期").Value=IIF(IsNothing(Parameters.Item("结束日期").Value), Fields.Item("结束日期").Value, Parameters.Item("结束日期").Value)LessThanOrEqual=Fields.Item("项目ID").Value=IIF(IsNothing(Parameters.Item("项目ID").Value), Fields.Item("项目ID").Value, Parameters.Item("项目ID").Value)Equal=Fields.Item("版本ID").Value=IIF(IsNothing(Parameters.Item("版本ID").Value), Fields.Item("版本ID").Value, Parameters.Item("版本ID").Value)Equal=Fields.Item("执行人用户名").Value=IIF(IsNothing(Parameters.Item("执行人").Value), Fields.Item("执行人用户名").Value, Parameters.Item("执行人").Value)Equal$.[*]工时表ID项目名称$.[*]项目表ID项目ID版本名称=Fields.Item("项目ID").Value=Parameters!项目ID.ValueEqual$.[*]版本表用户名全名$.[*]用户信息视图DisplayTypeGalleySizeTypeFitToWidthPaperOrientationLandscapeParametersView{"controls":[{"left":365,"top":5,"width":230,"height":75,"control":{"type":"dropdown","binding":"项目ID","label":{"display":"top","text":"项目","color":"default","font":{"bold":false,"italic":false,"underline":false,"transform":"none"}}}},{"left":605,"top":5,"width":230,"height":75,"control":{"type":"dropdown","binding":"版本ID","label":{"display":"top","text":"版本","color":"default","font":{"bold":false,"italic":false,"underline":false,"transform":"none"}}}},{"left":845,"top":5,"width":230,"height":75,"control":{"type":"dropdown","binding":"执行人","label":{"display":"top","text":"执行人","color":"default","font":{"bold":false,"italic":false,"underline":false,"transform":"none"}}}},{"left":1210,"top":35,"width":125,"height":30,"control":{"type":"button","action":"preview","text":"","background":"accent"}},{"left":10,"top":5,"width":345,"height":75,"control":{"type":"date-range","binding":["开始日期","结束日期"],"maxRange":["years",1],"viewMode":"days","daysViewHeaderFormat":"","label":{"display":"top","text":"日期范围"}}},{"left":1100,"top":35,"width":100,"height":30,"control":{"type":"button","action":"reset","background":"warning","text":""}}]}DefaultTheme.rdlx-theme
\ No newline at end of file +
="第 " & Globals!PageNumber & " 页 共 " & Globals!TotalPages & " 页"
1cm1cm29.7cm42cm1cm1cm40cmDateTimetrueTrueDateTimetrue结束日期TrueIntegertrue项目IDTrue项目表_DataSet项目名称IDIntegertrue版本IDTrue版本表_DataSet名称加版本号IDtrueStringtrue执行人True用户信息视图_DataSet全名用户名jsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/eaf0055e-b7c7-4fd9-9f79-abb67577832d;schemadata={"type":"array","items":{"type":"object","properties":{"日期":{"type":"date-time"},"执行人":{"type":"string"},"执行人用户名":{"type":"string"},"项目ID":{"type":"integer"},"项目":{"type":"string"},"版本ID":{"type":"integer"},"版本名称":{"type":"string"},"任务ID":{"type":"integer"},"任务名称":{"type":"string"},"上报工时":{"type":"number"},"核定工时":{"type":"number"}}}}JSONjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/2c95e2a9-2e3a-492b-a2eb-f97669c8e580;schemadata={"type":"array","items":{"type":"object","properties":{"ID":{"type":"integer"},"项目名称":{"type":"string"}}}}JSONjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/f9f2ca80-339c-47ab-b41a-078a0a32de1d;schemadata={"type":"array","items":{"type":"object","properties":{"ID":{"type":"integer"},"项目ID":{"type":"integer"},"版本名称":{"type":"string"}}}}JSONjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/514ebb17-c46f-48fc-9097-169e0c003849;schemadata={"type":"array","items":{"type":"object","properties":{"用户名":{"type":"string"},"全名":{"type":"string"}}}}JSON日期执行人执行人用户名项目ID项目版本ID版本名称任务ID任务名称上报工时核定工时=Fields!日期.Value=IIF(IsNothing(Parameters!开始日期.Value), Fields!开始日期.Value, Parameters!开始日期.Value)GreaterThanOrEqual=Fields!日期.Value=IIF(IsNothing(Parameters!结束日期.Value), Fields!结束日期.Value, Parameters!结束日期.Value)LessThanOrEqual=Fields!项目ID.Value=IIF(IsNothing(Parameters!项目ID.Value), Fields!项目ID.Value, Parameters!项目ID.Value)Equal=Fields!版本ID.Value=IIF(IsNothing(Parameters!版本ID.Value), Fields!版本ID.Value, Parameters!版本ID.Value)Equal=Fields!执行人用户名.Value=IIF(IsNothing(Parameters!执行人.Value), Fields!执行人用户名.Value, Parameters!执行人.Value)Equal$.[*]工时表ID项目名称$.[*]项目表ID项目ID版本名称=Fields!项目ID.Value=Parameters!项目ID.ValueEqual$.[*]版本表用户名全名$.[*]用户信息视图DisplayTypeGalleySizeTypeFitToWidthPaperOrientationLandscapeParametersView{"controls":[{"left":365,"top":5,"width":230,"height":75,"control":{"type":"dropdown","binding":"项目ID","label":{"display":"top","text":"项目","color":"default","font":{"bold":false,"italic":false,"underline":false,"transform":"none"}}}},{"left":605,"top":5,"width":230,"height":75,"control":{"type":"dropdown","binding":"版本ID","label":{"display":"top","text":"版本","color":"default","font":{"bold":false,"italic":false,"underline":false,"transform":"none"}}}},{"left":845,"top":5,"width":230,"height":75,"control":{"type":"dropdown","binding":"执行人","label":{"display":"top","text":"执行人","color":"default","font":{"bold":false,"italic":false,"underline":false,"transform":"none"}}}},{"left":1210,"top":35,"width":125,"height":30,"control":{"type":"button","action":"preview","text":"","background":"accent"}},{"left":10,"top":5,"width":345,"height":75,"control":{"type":"date-range","binding":["开始日期","结束日期"],"maxRange":["years",1],"viewMode":"days","daysViewHeaderFormat":"","label":{"display":"top","text":"日期范围"}}},{"left":1100,"top":35,"width":100,"height":30,"control":{"type":"button","action":"reset","background":"warning","text":""}}]}DefaultTheme.rdlx-theme
\ No newline at end of file diff --git a/Reports/客户工时报表.rdlx b/Reports/客户工时报表.rdlx index 9c638eb1..fa70716e 100644 --- a/Reports/客户工时报表.rdlx +++ b/Reports/客户工时报表.rdlx @@ -1 +1 @@ -客户工时报表.rdlx5.251cm0cm0cm33.951cm5.251cm工时表_DataSet客户工时报表Auto
true1.751cm6true项目服务月度报表0.75cmtrue日期true任务true文本框3负责人true版本true内容true工时
Ascending=Fields.Item("项目ID").ValueAscending=Fields.Item("日期").ValueAscending=Fields.Item("任务ID").ValueAscending=Fields.Item("执行人").Value0.75cmTrueRestrictedtrue日期=Fields.Item("日期").ValueTrueRestrictedtrue任务名称=Fields.Item("任务名称").ValueTrueRestrictedtrue执行人=Fields.Item("执行人").ValueTrueRestrictedtrue版本名称=Fields.Item("版本名称").Valuetrue执行内容=Fields.Item("执行内容").Valuetrue上报工时=Fields.Item("上报工时").Value
1cm5true合计true=Sum(Fields!上报工时.Value)
5.538cm5.035cm4.927cm4.001cm10.401cm4.049cm
true1cm4true项目名称=Fields!项目名称.Value & IIF(IsNothing(Fields!项目代号.Value), "", "(" & Fields!项目代号.Value & ")")true小计true=Sum(Fields!上报工时.Value)
=Fields.Item("项目ID").Value
1cm1cm21cm36cm1cm1cm33.951cmInteger客户True客户表_DataSet客户名称IDInteger部门True客户部门_DataSet部门名称ID客户部门_DataSetIDjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/34dec195-948f-493a-8364-02df3b09b8c6;schemadata={"type":"array","items":{"type":"object","properties":{"所属客户":{"type":"integer"},"所属客户部门":{"type":"integer"},"日期":{"type":"date-time"},"执行人":{"type":"string"},"项目ID":{"type":"integer"},"项目名称":{"type":"string"},"项目代号":{"type":"string"},"任务ID":{"type":"integer"},"任务名称":{"type":"string"},"版本名称":{"type":"string"},"执行内容":{"type":"string"},"上报工时":{"type":"number"}}}}JSONjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/e2702e2e-d2cf-4678-86b2-98b675666b47;schemadata={"type":"array","items":{"type":"object","properties":{"ID":{"type":"integer"},"客户名称":{"type":"string"}}}}JSONjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/9cbbe954-b292-43d0-888a-aab456f332ca;schemadata={"type":"array","items":{"type":"object","properties":{"ID":{"type":"integer"},"客户ID":{"type":"integer"},"部门名称":{"type":"string"}}}}JSON所属客户所属客户部门日期执行人项目ID项目名称项目代号任务ID任务名称版本名称执行内容上报工时=Fields!所属客户.Value=Parameters!客户.ValueEqual=Fields!所属客户部门.Value=Parameters!部门.ValueEqual$.[*]工时表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":575,"top":40,"width":100,"height":30,"control":{"type":"button","action":"preview","text":"","background":"accent"}},{"left":465,"top":40,"width":100,"height":30,"control":{"type":"button","action":"reset","background":"warning","text":""}}]}DefaultTheme.rdlx-theme
\ No newline at end of file +客户工时报表.rdlx5.251cm0cm0.049cm33.951cm5.251cm工时表_DataSet客户工时报表Auto
true1.751cm6true项目服务月度报表0.75cmtrue日期true任务true文本框3负责人true版本true内容true工时
Ascending=Fields.Item("项目ID").ValueAscending=Fields.Item("日期").ValueAscending=Fields.Item("任务ID").ValueAscending=Fields.Item("执行人").Value0.75cmTrueRestrictedtrue日期=Fields.Item("日期").ValueTrueRestrictedtrue任务名称=Fields.Item("任务名称").ValueTrueRestrictedtrue执行人=Fields.Item("执行人").ValueTrueRestrictedtrue版本名称=Fields.Item("版本名称").Valuetrue执行内容=Fields.Item("执行内容").Valuetrue上报工时=Fields.Item("上报工时").Value
1cm5true合计true=Sum(Fields!上报工时.Value)
5.538cm5.035cm4.927cm4.001cm10.401cm4.049cm
true1cm4true项目名称=Fields!项目名称.Value & IIF(IsNothing(Fields!项目代号.Value), "", "(" & Fields!项目代号.Value & ")")true小计true=Sum(Fields!上报工时.Value)
=Fields.Item("项目ID").Value
1cm1cm21cm36cm1cm1cm34cmInteger客户True客户表_DataSet客户名称IDInteger部门Truetrue客户部门_DataSet部门名称ID客户部门_DataSetIDjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/34dec195-948f-493a-8364-02df3b09b8c6;schemadata={"type":"array","items":{"type":"object","properties":{"所属客户":{"type":"integer"},"所属客户部门":{"type":"integer"},"日期":{"type":"date-time"},"执行人":{"type":"string"},"项目ID":{"type":"integer"},"项目名称":{"type":"string"},"项目代号":{"type":"string"},"任务ID":{"type":"integer"},"任务名称":{"type":"string"},"版本名称":{"type":"string"},"执行内容":{"type":"string"},"上报工时":{"type":"number"}}}}JSONjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/e2702e2e-d2cf-4678-86b2-98b675666b47;schemadata={"type":"array","items":{"type":"object","properties":{"ID":{"type":"integer"},"客户名称":{"type":"string"}}}}JSONjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/9cbbe954-b292-43d0-888a-aab456f332ca;schemadata={"type":"array","items":{"type":"object","properties":{"ID":{"type":"integer"},"客户ID":{"type":"integer"},"部门名称":{"type":"string"}}}}JSON所属客户所属客户部门日期执行人项目ID项目名称项目代号任务ID任务名称版本名称执行内容上报工时=Fields!所属客户.Value=Parameters!客户.ValueEqual=Fields!所属客户部门.Value=Parameters!部门.ValueIn$.[*]工时表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":575,"top":40,"width":100,"height":30,"control":{"type":"button","action":"preview","text":"","background":"accent"}},{"left":465,"top":40,"width":100,"height":30,"control":{"type":"button","action":"reset","background":"warning","text":""}}]}DefaultTheme.rdlx-theme
\ No newline at end of file diff --git a/Reports/项目工时报表.rdlx b/Reports/项目工时报表.rdlx index a0813913..993df4fb 100644 --- a/Reports/项目工时报表.rdlx +++ b/Reports/项目工时报表.rdlx @@ -1 +1 @@ -项目工时报表.rdlx5.25cm0cm0.002cm27.654cm5.25cm工时表_DataSet项目工时报表Auto
true2cm4true=Format(Parameters!开始日期.Value, "yyyy-MM-dd") & "~" & Format(Parameters!结束日期.Value, "yyyy-MM-dd") & "项目工时报表"0.75cmtrue任务true任务说明true总计划工时true总核定工时
=Fields.Item("任务ID").Value0.75cmtrue任务名称=Fields.Item("任务名称").Valuetrue任务说明=Fields.Item("任务说明").Valuetrue总计划工时=Fields.Item("上报工时").Valuetrue总核定工时=Fields.Item("核定工时").Value
1cm2true合计true=Sum(Fields.Item("上报工时").Value)true=Sum(Fields.Item("核定工时").Value)
6.499cm12.499cm4.328cm4.328cm
true0.75cmtrue项目名称=((Fields.Item("项目名称").Value & "-") & Fields.Item("版本名称").Value)true小计true=Sum(Fields.Item("上报工时").Value)true=Sum(Fields.Item("核定工时").Value)
=Fields.Item("项目ID").Value=Fields.Item("版本ID").Value
1cm1cm21cm29.7cm1cm1cm27.656cmDateTime开始日期TrueDateTime结束日期TrueInteger项目Truetrue项目表_DataSet项目名称IDjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/b496c790-735b-421c-a389-bfadb91fde62;schemadata={"type":"array","items":{"type":"object","properties":{"ID":{"type":"integer"},"任务名称":{"type":"string"}}}}JSONjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/e137dd12-5ee8-49e2-885c-b957f39a7e6d;schemadata={"type":"array","items":{"type":"object","properties":{"ID":{"type":"integer"},"项目名称":{"type":"string"}}}}JSONjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/fa568b7a-3657-42fd-9a30-16d65c837b91;schemadata={"type":"array","items":{"type":"object","properties":{"日期":{"type":"date-time"},"项目ID":{"type":"integer"},"项目名称":{"type":"string"},"任务ID":{"type":"integer"},"版本名称":{"type":"string"},"版本ID":{"type":"integer"},"执行人":{"type":"string"},"任务名称":{"type":"string"},"任务说明":{"type":"string"},"上报工时":{"type":"number"},"核定工时":{"type":"number"}}}}JSONID任务名称$.[*]任务表ID项目名称$.[*]项目表日期项目ID项目名称任务ID版本名称版本ID执行人任务名称任务说明上报工时核定工时=Fields.Item("日期").Value=IIF(IsNothing(Parameters.Item("开始日期").Value), Fields.Item("开始日期").Value, Parameters.Item("开始日期").Value)GreaterThanOrEqual=Fields.Item("日期").Value=IIF(IsNothing(Parameters.Item("结束日期").Value), Fields.Item("结束日期").Value, Parameters.Item("结束日期").Value)LessThanOrEqual=Fields.Item("项目ID").Value=IIF(IsNothing(Parameters.Item("项目ID").Value), Fields.Item("项目ID").Value, Parameters.Item("项目ID").Value)In$.[*]工时表DisplayTypeGalleySizeTypeFitToWidthPaperOrientationLandscapeParametersView{"controls":[{"left":360,"top":15,"width":200,"height":60,"control":{"type":"dropdown","binding":"项目ID","label":{"display":"top","text":"项目","color":"default","font":{"bold":false,"italic":false,"underline":false,"transform":"none"}}}},{"left":680,"top":45,"width":110,"height":30,"control":{"type":"button","action":"preview","text":"","background":"accent"}},{"left":570,"top":45,"width":100,"height":30,"control":{"type":"button","action":"reset","background":"warning","text":""}},{"left":15,"top":15,"width":335,"height":60,"control":{"type":"date-range","binding":["开始日期","结束日期"],"maxRange":["none"],"viewMode":"default","daysViewHeaderFormat":"","label":{"display":"top","text":"日期范围"}}}]}DefaultTheme.rdlx-theme
\ No newline at end of file +项目工时报表.rdlx5.25cm0cm0.002cm27.654cm5.25cm工时表_DataSet项目工时报表Auto
true2cm4true=Format(Parameters!开始日期.Value, "yyyy-MM-dd") & "~" & Format(Parameters!结束日期.Value, "yyyy-MM-dd") & "项目工时报表"0.75cmtrue任务true任务说明true总计划工时true总核定工时
=Fields.Item("任务ID").Value0.75cmtrue任务名称=Fields.Item("任务名称").Valuetrue任务说明=Fields.Item("任务说明").Valuetrue总计划工时=Fields.Item("上报工时").Valuetrue总核定工时=Fields.Item("核定工时").Value
1cm2true合计true=Sum(Fields.Item("上报工时").Value)true=Sum(Fields.Item("核定工时").Value)
6.499cm12.499cm4.328cm4.328cm
true0.75cmtrue项目名称=(Fields.Item("项目名称").Value & "-") & Fields.Item("版本名称").Valuetrue小计true=Sum(Fields.Item("上报工时").Value)true=Sum(Fields.Item("核定工时").Value)
=Fields.Item("项目ID").Value=Fields.Item("版本ID").Value
1cm1cm21cm29.7cm1cm1cm27.656cmDateTime开始日期TrueDateTime结束日期TrueInteger项目Truetrue项目表_DataSet项目名称IDjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/b496c790-735b-421c-a389-bfadb91fde62;schemadata={"type":"array","items":{"type":"object","properties":{"ID":{"type":"integer"},"任务名称":{"type":"string"}}}}JSONjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/e137dd12-5ee8-49e2-885c-b957f39a7e6d;schemadata={"type":"array","items":{"type":"object","properties":{"ID":{"type":"integer"},"项目名称":{"type":"string"}}}}JSONjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/fa568b7a-3657-42fd-9a30-16d65c837b91;schemadata={"type":"array","items":{"type":"object","properties":{"日期":{"type":"date-time"},"项目ID":{"type":"integer"},"项目名称":{"type":"string"},"任务ID":{"type":"integer"},"版本名称":{"type":"string"},"版本ID":{"type":"integer"},"执行人":{"type":"string"},"任务名称":{"type":"string"},"任务说明":{"type":"string"},"上报工时":{"type":"number"},"核定工时":{"type":"number"}}}}JSONID任务名称$.[*]任务表ID项目名称$.[*]项目表日期项目ID项目名称任务ID版本名称版本ID执行人任务名称任务说明上报工时核定工时=Fields!日期.Value=IIF(IsNothing(Parameters!开始日期.Value), Fields!开始日期.Value, Parameters!开始日期.Value)GreaterThanOrEqual=Fields!日期.Value=IIF(IsNothing(Parameters!结束日期.Value), Fields!结束日期.Value, Parameters!结束日期.Value)LessThanOrEqual=Fields!项目ID.Value=IIF(IsNothing(Parameters!项目ID.Value), Fields!项目ID.Value, Parameters!项目ID.Value)In$.[*]工时表DisplayTypeGalleySizeTypeFitToWidthPaperOrientationLandscapeParametersView{"controls":[{"left":360,"top":15,"width":200,"height":60,"control":{"type":"dropdown","binding":"项目ID","label":{"display":"top","text":"项目","color":"default","font":{"bold":false,"italic":false,"underline":false,"transform":"none"}}}},{"left":680,"top":45,"width":110,"height":30,"control":{"type":"button","action":"preview","text":"","background":"accent"}},{"left":570,"top":45,"width":100,"height":30,"control":{"type":"button","action":"reset","background":"warning","text":""}},{"left":15,"top":15,"width":335,"height":60,"control":{"type":"date-range","binding":["开始日期","结束日期"],"maxRange":["none"],"viewMode":"default","daysViewHeaderFormat":"","label":{"display":"top","text":"日期范围"}}}]}DefaultTheme.rdlx-theme
\ No newline at end of file