diff --git a/.collaboration b/.collaboration index 697f6abf..bc63c6b5 100644 --- a/.collaboration +++ b/.collaboration @@ -714,17 +714,7 @@ }, { "ModuleName": "PCPage/任务-任务信息", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-12-31T18:37:14.9429434+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-任务信息.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-任务信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-关联资源", @@ -736,35 +726,11 @@ }, { "ModuleName": "PCPage/任务-侧栏", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-12-31T18:37:34.6587016+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-侧栏.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-侧栏.rd", - "Pages\\9d9faa04d5a74f1dbf8dd3b2040b6f6.json", - "Pages\\9d9faa04d5a74f1dbf8dd3b2040b6f6.rd", - "Pages\\b522ad93131845cf87553eda79dfd25.json", - "Pages\\b522ad93131845cf87553eda79dfd25.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-基本信息", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-12-31T18:37:07.2563652+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-基本信息.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-基本信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-反馈", @@ -772,17 +738,7 @@ }, { "ModuleName": "PCPage/任务部分", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-12-31T18:36:58.4992455+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务部分.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务部分.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-子任务列表", @@ -2098,31 +2054,11 @@ }, { "ModuleName": "RdlReport/人员工时报表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-12-31T18:32:21.3835934+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-31T18:30:21.6835162+08:00", - "ModuleType": 18, - "ToRemoveFiles": [ - "Reports\\项目工时报表.json", - "Reports\\项目工时报表.rdlx" - ] + "ModuleType": 18 }, { "ModuleName": "RdlReport/客户部门工时报表", @@ -2130,17 +2066,7 @@ }, { "ModuleName": "RdlReport/客户工时报表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-12-31T18:34:04.9783376+08:00", - "ModuleType": 18, - "ToRemoveFiles": [ - "Reports\\客户工时报表.json", - "Reports\\客户工时报表.rdlx" - ] + "ModuleType": 18 }, { "ModuleName": "ProcessItem/项目立项流程", diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-任务信息.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-任务信息.json index 7276aa21..c8a0c2b5 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-任务信息.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-任务信息.json @@ -287,7 +287,7 @@ "BreakpointIdentity": "2aa62947-0aea-4cda-9d8a-e910babfb621" } ], - "ID": "cbd20310-95c6-44dc-8904-128cac54e588" + "ID": "1e23f2e5-e85d-4826-96d7-a9de721ddec8" } ], "BreakpointIdentity": "a87a44dd-3544-487e-829c-21a293966d1d" @@ -413,7 +413,7 @@ "BreakpointIdentity": "08c823af-ff57-401a-84b2-1fe5cf0037f6" } ], - "ID": "ab3baa63-5940-459c-8167-1263cb9a9d7a" + "ID": "e58db39e-2d72-4ad9-8b92-6c03c2229da9" } ], "BreakpointIdentity": "1c258af3-3d3f-4f2f-a28a-6d81b16d38c5" @@ -501,7 +501,7 @@ "BreakpointIdentity": "be853aef-9359-47b4-866d-7c78c3504cc6" } ], - "ID": "791165fb-4d3a-4b40-9d72-2b958652303b" + "ID": "d887a907-92fe-497a-8f86-d45762dfe40c" } ], "BreakpointIdentity": "3dcabc9c-84a9-4666-af79-9570eaf388e1" @@ -622,13 +622,13 @@ "BreakpointIdentity": "72c8b164-1f22-4d4d-8502-f361d7ffd135" } ], - "ID": "8070f9b3-0cc6-4f1e-ba21-92449dde528f" + "ID": "b2fcfb7d-8774-42cb-b5f2-9da8652b369c" } ], "BreakpointIdentity": "af2d5914-e59b-45be-bc1b-f191cb9ceb66" } ], - "ID": "b86836d9-5d66-4c94-8b69-c8e520228387" + "ID": "f60a1c94-079b-4c03-8bb9-7e62f84f6f2b" } ], "BreakpointIdentity": "249038cc-7638-4049-8bd6-31cb1bed2967" @@ -701,7 +701,7 @@ "BreakpointIdentity": "5f1cc905-439c-480a-8b5d-c85f1ccb7134" } ], - "ID": "62f06bb3-1880-4282-b38b-05d96a131621" + "ID": "9cc8a2d2-d46c-49d4-b9b3-48c71c8bfd28" }, { "CommandList": [ @@ -719,7 +719,7 @@ "BreakpointIdentity": "a89bbd19-6fc6-4a20-b55e-10d1e4eddd72" } ], - "ID": "4f6c7cb2-d30a-4db1-a03f-8206557ebb72" + "ID": "f7dabf7d-6a94-4c1d-bb48-85422ae26cc5" } ], "BreakpointIdentity": "354ce9a0-15c5-4d4a-b11b-7812c8c4f2db" @@ -1049,7 +1049,7 @@ "BreakpointIdentity": "95ad3e6e-304d-43bb-8203-c06867288f28" } ], - "ID": "bd915f0a-37cb-429a-979b-ceae46b0ff1e" + "ID": "17024d26-48e0-4473-a0a1-191653cac324" }, { "CommandList": [ @@ -1067,7 +1067,7 @@ "BreakpointIdentity": "f9830fa7-5a0f-400a-b49c-e47cf97331ce" } ], - "ID": "084f363a-a67f-4396-8d28-c9765aa0eefd" + "ID": "a3abb318-d3ff-4840-8b71-74bb149921ff" } ], "BreakpointIdentity": "050d8d9c-bd1b-440c-8e8a-2532d402b829" @@ -1089,7 +1089,8 @@ }, "RowBreakLines": [], "RepeatRangeSettings": [], - "RelatedDataTableName": "任务表" + "RelatedDataTableName": "任务表", + "PageLoadingMode": 1 }, "PrintInfo": { "PaperSize": {}, @@ -1143,4 +1144,4 @@ "Formula": "'任务-任务信息'!$C$10" } ] -}//rz+NWdNPUzxXevuYQsEU8LhDxcL4+UkO6AG3Pt7drfFpaYytJ+4enHwL/SAJTigWDnXgWqABLXVrDejwjJC8mdXwxX9k/dWYf2h6QPIEI4hOCewNQ31kpf1CNj68ozFpJP7zDW8pCx1NFjHFpxVNAJwpijjp9D235EwK4GLnut4CMVKax/1N+2mUJPXS/o5i9u7+7fPPJfQhgEivKJmyWdN0vCZKD1GHweUiDTzXm3LW4utPgG9WkIZg0PPNiwOJwrw8SMKc8SwDBrTfE2Wrvu4uHsBbE4h+2Uf6FHpAl1TmQ9nmEIxjxFcsZ8o3PM3XUN1HhWrP0Au6SOsFIruWksM4GQiNfZuwGyMrrebYPaPpaX391laNv4YucrAoHEB+eJzcHckqPwyri/MldoG9gRGvT1AEp1UeAW+MQR5HBv7pKXCB91Lh6x+hOpF/m5GqckWA1vKUQVKEpXO95rxf6g2+qdpHBTdA0QkIEqRyfzQrdz3FBlzJTmUwrLK1YZfJzErV9A1MPEviqGZ8CK/o3z+6P4eJfR74SLkklQG/SbkmRvxp9m7UDFpaQM6eWjcJRV6DKfsJJrGj7offnmtsldt0T0tjiGlr6J5eAXdIgEjEKfXrDq96N41VELKvoe6dyMvlvN4sIvasISMMHiePCADWqUNc/MMet3RSpmg6+hWbNKcThc1Q1yBVod1ERDBC43WBm6NR2qDuMh8qruKHNKGkskts+OM6CJMORjBGY1d05E63r83SQdSCa+9CBqlmkQvcr5wFOjVewijVn/SrZe55be1iMkf77gDXRRziiHVj6yfoLY/UnfMhSipttpdQh6sZ1kpFXe/ZRJD0i1CA00X4G8Nor+JMI2dSWyv+DH+PYdkcfNhGvSLls6SW2jpAOJitoXCJyCEJvJntipuzVw==|920 \ No newline at end of file +}//WTzCUDU8KwFo227Fty49Nm/58fjQ0FMIXI9iipE7byW27F7mUMD6nfx5MISw3GE7DgEXu3h//9lx+xVQvCJPyOEkBpd3cn3xew26XeFgWd+xlC1Z4X6COpeOhghN5Mfpgt0FerlA1LDw/MMAlA5NMbIcn2gQd7MfARJ4t36O7pJONuvbAVMsvQSfVcUQfL3Bd0SM9GAvVMim0XxHYgrIpXP4Su5Tw5YISLKCmrHrJje8SzbirjzxCW2ka5KhFQyhvNRl6P9GY06m73xWnlaEuDby8yimkai6lFz7T7ntgesJyLTNntEgwr9GJCgKFlWQTvcIbOQmxac8C+tUvy0k+h6PGwZZ70+pubzJYjRp1vFUF23JzUKjYDamUQZWPWhoXjP9umm9KMpEa+cUx94yy7g5KpY4HMPRnVq6v3wquLgKnJ2TYY7c1OntilnSZIkw8ePTFLk4dQm0cM1UPsCQnmV7UOQQ1le65xjmPr+ELlLH2/2qMlTpYTtn4k3LxOD7QTmnLf3zBmNoVSnT/F4QxOHlQMiKo+TpJa9VIjqtR9AaadkvAPoGa0dHhuFH9lRY9SeYwzatPjaGIlVztyUKOwPSO1O0IT6GyhiqKPHQgc3EgKgw2fmu2eo9dhPFx7o6kg8GSmW6MAASjRDalxAG6O9FODLjE6B9nTJkys2jGeiMhnQdIyzZycC8uZsAzObvn3yodUx9VTcoUNBF8DyOx/9TZLxHUj0e+GgXg+qhE6sNXJLCb203XphL56wCuRUxrXRl216sQ+VzPQQTk9w4b1xy3I4wzN4MBB9Gd/QFJXxTGu1l/+W9uhgSX6/IcOYOvk1oB/ME9C5OHlPbfNMwf1YhluJ+VTsOjkriCPt71N7HzxwX1kNaaXG+6torlrOp2DUb7xcbodBfu5Xv7fdOfA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-侧栏.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-侧栏.json index a9b9fd64..a298f941 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-侧栏.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-侧栏.json @@ -277,7 +277,7 @@ "BreakpointIdentity": "278e2fb9-5d9b-434a-a455-43df74c90ed6" } ], - "ID": "e29b6bab-85e5-4180-8622-de3cb1175c2b" + "ID": "0d6a62cf-7378-44ae-8a54-851d4d36071d" }, { "Condition": { @@ -309,7 +309,7 @@ "BreakpointIdentity": "30a701c1-3f66-4cf4-858a-22eb88d3fa89" } ], - "ID": "551c8d04-ff37-4c76-8570-08133a253d93" + "ID": "d92e3d57-e4f0-4d35-9772-70c4c52f900e" }, { "Condition": { @@ -346,7 +346,7 @@ "BreakpointIdentity": "6180ebb4-744f-4a4f-8891-f32c836fdb62" } ], - "ID": "d52d6726-9cc0-4bb8-ae4d-f9e2d8eab21e" + "ID": "6f005449-7c37-412f-88ea-170b6f0754b5" }, { "Condition": { @@ -379,7 +379,7 @@ "BreakpointIdentity": "6f4b5c81-e99e-4930-9576-25b4f90f2ff6" } ], - "ID": "b98a5119-36ae-4bec-9e0a-ef53cb28cbd2" + "ID": "6eff2f11-6cad-475e-8e58-68082deff287" } ], "BreakpointIdentity": "bccba135-eaa8-4f4e-9413-44f9f71593aa" @@ -678,7 +678,7 @@ "BreakpointIdentity": "26d39ba9-b25f-496d-8417-6a88484d18b5" } ], - "ID": "fbc19e7f-c7f8-434e-ac7a-b5897d358577" + "ID": "4cb6feb9-b1d6-49ad-a6f0-3c62903d86dd" }, { "CommandList": [ @@ -692,7 +692,7 @@ "BreakpointIdentity": "147d6098-4c69-4c64-b686-b73fc719af5b" } ], - "ID": "6d194d92-a97b-456f-be90-817ed3e35f4c" + "ID": "b788413c-c0ee-4820-9d15-7c0c8bccfd02" } ], "BreakpointIdentity": "6c06d194-7d6a-4f7d-9f6b-8083e89fbbf5" @@ -809,6 +809,7 @@ }, "RowBreakLines": [], "RepeatRangeSettings": [], + "PageLoadingMode": 1, "ConditionFormatRulesCollection": { "Rules": [] } @@ -827,4 +828,4 @@ "Formula": "'任务-侧栏'!$B$9" } ] -}//zwoUXSRF/ter/zjrY7fNkWrkOP/ktLeUZ3dVkExFNUPVrqaf1/oK+IG37qvmn+JCVrFkZwilKaWur5owK+XVH4ysUOGKC9qWgZwkfva0ORJDFqWWZSTVdDNpUSFwwbbk44l/cnWRrLiUgLZ9fU75Z5g07clKhf+eaEPrcSJ57lv4e9YeKXptb93MxV3iEf4znU3GSWdOCDI7m/PJcG9/zou8w98gJAnE+96F/d0ogKDvIcyl+IgXmyQA20l11D5uRACDSujM80S5R23kN73FN0rlWVME5CTQIPc82mbfybm9xhEqeaZec8hs7fu+IFh00bwTl6CzKZP800VQm8Nvw2ZG+uCDtTDhNrVE4vW1PJs2Rqj+BCcJ0VVGVABzyOQ1r55br3g3f8OO0WEXMghFQu1O/hAUNxNwKLKagS/sdOX4PIlhJkStN0yiKgbV/AmN1KY2bCqIwOob3aKRkn5TAFlMUoMR28XueWlEe5iFsmnY0wvv/1AJFX8AnbAQb1y5WUbu+EJHFdxhg1+PXDJbUlFKxVe38f1QrnskJDgS9BJ0pRqJ0CLxe1f5Xm3gFl5BJfcHNEa2iu2nwe+6UyXufr82JqYQFjjZ0m+PMATiPqaIpZz1sxsrwlveK8R7yEc1Al8tW8w+yc11pM1pSTjbjIiHJKmXVznGMQ4xr/FbzqkrGseER0ztWU7MRUQuQIdYqryFujefQDe8SfP4Rt2UYpgDJLmXnd568bR3QMLnGpXeVbF6b1pmIQE6zQ2oyu6cq6C4j0sezwpCNlpMlNUbei+En6IXG5zt2+pHSNOMhOSvT6C9/MzsYDKBBR19lmrnMLNNF5GznzWQDA5/tQo6EXtDfL/NYTXvy+AA6tduIlOVCE4MpjqDPrF/5Fo2v11qo53sKlaefE4wnDRmCeSEdQ==|920 \ No newline at end of file +}//0pz07gRIKIIPr0YqMpoGFZHqBY9B0/duYHxukitOqjeCbz05q2x4D1UE8f5TRQrRo1NjuuaaAv7Lsb73ToIgwqM22t9C9HTwa84x8pSfOkDzS9SoXneLYj8LGMVUfhgc60ahaqBkTa6fcNVevVkvItQc13xr/2A3HqKoi1zj9OtJkpJ45SZ8OMneyH0qVdfyilu6QoCfS4a2SPoX/WGSF5Vu8LiSLcWOrP/9H/T7UIRmyYDvrkahKa45qI6Hkv5o5oNuufus4+oZt971gKx6j9VA0lQyG6fGgyYMUZFbVHRgl4N6acgGCmoUO2UVBp6plh4QdIl2D/wBGxv0uQZErVa/81d3Cx7s8ukeSSTxEcwR8TLEzbwbWg+sfBXr39xnPztnTVYpf6PS0FQJN35j1ZKCNi+jRO20xZb6l0YZipjrh2s0/r76ZEKYkruGzA8ymUOZSZuzZCWQUuW/dn3BYckI+2OTftn0ca2Yc43sUv8UtU1qxyf51+RVULU8kjle7glnh6MAWWbuE9KxdWOEe0AYzCD9IRLnXMpmOOmdo8+VPSpzkFSucYyvqHYDU6bvkR4bmSpAC7kXjOlZwd6hRMy0OQ1g2eu9tZ5ZjzU3dK0frfgql+jW3iwLGutpOo/f5P5AxxmHHCH3vCw59uL9nLd1DtyM3GcLiyh2omcEgRVEU3gQGJm+Pjk9wOP0U8ibPgafF5vBBjJ03LoI7Mn3oQw/v0UQsTDbzisED3OaZ9/LwVzrcGa4U/s68GrRkAEE3+e44qwH9/jfI77535KiE2rmOLFvqGd9R8v8v2sHoaTlmCkf28eF4pS+XvCOm9UuM+3XRZNYo/pT0ToFu7GB5sIebY2dKtVXuKBjGvJaTbKKrlZPO1+bz4h+HuSJk4IK5YcYuIiKNjoGYGRGE0G/XA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json index 0d48abdc..2d0a9f3c 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json @@ -302,7 +302,7 @@ "BreakpointIdentity": "a9cc2040-b42e-4a2c-a14b-656b16105d02" } ], - "ID": "6341f9e0-859a-42ab-afbf-5d670b4eb92f" + "ID": "a3ac7a54-7d98-4ff2-a982-0155f51c1fbb" } ], "BreakpointIdentity": "a7e645e4-2484-4603-a471-80f514f79db7" @@ -446,7 +446,7 @@ "BreakpointIdentity": "f28e9e5c-5390-46a0-9bbb-8d1882f4f071" } ], - "ID": "6e1f019d-4511-409c-965f-cdee5bf8870f" + "ID": "1733cbbd-a121-4905-b2fb-b41e3fcf9d49" }, { "CommandList": [ @@ -462,13 +462,13 @@ "BreakpointIdentity": "7f672688-fc5d-4c02-addd-609fba82dedf" } ], - "ID": "9b8a75c9-d254-4205-b051-61f36a6fa788" + "ID": "aa913cce-24ef-4d39-83e3-f40ddaebab6a" } ], "BreakpointIdentity": "bfff997e-495c-4efc-88d7-0568788231dc" } ], - "ID": "f9d88a86-74ad-4b96-8de1-52e09dad3c46" + "ID": "6d6c6978-0771-4fc5-b4dc-8b7225687708" } ], "BreakpointIdentity": "63833371-74a6-4c87-8980-276371d3ce2d" @@ -483,7 +483,7 @@ } ], "Comments": "小于进行中", - "ID": "c1c3617e-2a29-469c-9581-7d6936ddd032" + "ID": "eea2a8b4-88f9-42cf-83ba-4e407c4c5827" }, { "CommandList": [ @@ -494,7 +494,7 @@ "BreakpointIdentity": "e51d7584-50ec-4b4a-86ad-0ffbc39f354e" } ], - "ID": "0b82e493-d925-430d-ba07-b7e33c75f4c3" + "ID": "b4e8e882-3206-4b36-ac7a-4e08f9ddc298" } ], "BreakpointIdentity": "8dbbbce7-2989-4c25-abeb-c3427dc2dd93" @@ -603,7 +603,7 @@ "BreakpointIdentity": "af152d4e-f484-4eca-b2be-15af8ebabefc" } ], - "ID": "37a9915c-fda2-4fec-8d65-4c1dc309dd9c" + "ID": "7d32f510-3d41-48f1-9cdd-5aebbe50e1f7" } ], "BreakpointIdentity": "3358bc9c-7505-4398-b90b-399a048e7a81" @@ -785,7 +785,7 @@ "BreakpointIdentity": "7165a8c9-7281-4777-b76c-da6f352eb2bd" } ], - "ID": "1b4ac94a-c40c-49cc-8828-66886dc96b23" + "ID": "5c4b42b0-7226-482c-a3b2-ed86e0f202f2" } ], "BreakpointIdentity": "eb897ead-18cb-4469-8b7e-c49750ef9ed6" @@ -1056,13 +1056,13 @@ "BreakpointIdentity": "b6db3723-fd2e-420a-aa9f-c0e978f07067" } ], - "ID": "2a324c7b-1ec2-4be5-b999-1cdfcceb67d1" + "ID": "8f882489-33a2-41b5-a229-8f21289fbc1a" } ], "BreakpointIdentity": "ee00bafb-4e68-4546-9948-61d8e9e73121" } ], - "ID": "983b8390-7b4a-4d37-b61d-7e686bd67058" + "ID": "ed1275bf-42b2-47f4-b595-1e2624a12f48" }, { "CommandList": [ @@ -1078,13 +1078,13 @@ "BreakpointIdentity": "f60a34e5-a7de-41d9-9a59-cca415af6458" } ], - "ID": "b3d791a9-2912-4037-9581-5ee4add1c41a" + "ID": "b39cc2b9-a4bb-4fec-aa98-68cb797b5e0a" } ], "BreakpointIdentity": "bcc580ca-e6b9-41f9-a6d0-2c1ceb5e2e15" } ], - "ID": "719370a7-5e50-434e-8d8c-8953c6df0535" + "ID": "e2f9b441-d72a-4c7f-8d76-30d1ae3e78af" }, { "CommandList": [ @@ -1121,7 +1121,7 @@ "BreakpointIdentity": "5ada113f-efd0-466d-86ad-592d9054b92c" } ], - "ID": "0054ecf3-8068-4a37-86a8-f52279195630" + "ID": "5d712a5f-d3cf-4ee7-ba8e-fca8605c13db" } ], "BreakpointIdentity": "dd9eb979-a979-4879-a2b0-a22d2d7851b7" @@ -1133,7 +1133,7 @@ "BreakpointIdentity": "bceb3579-424a-4b26-8e76-bdca4a8149eb" } ], - "ID": "61462a53-6e38-4456-b7b1-03ebc65a7a53" + "ID": "46bf1776-81cc-475b-8a23-7d0c7b309cc1" } ], "BreakpointIdentity": "dc5536de-8916-4a47-8b91-64e33a7be814" @@ -1242,7 +1242,7 @@ "BreakpointIdentity": "a72126a4-2b25-4ee4-ad24-9d7c4d3c5589" } ], - "ID": "2a975ed0-7eb2-4c1c-a2a6-c67e4f9c7ca4" + "ID": "ef3714d6-73cf-44d7-99dd-ca26b78a4f88" } ], "BreakpointIdentity": "b53ea723-22ed-4809-9d09-92e8ae399dcb" @@ -1402,7 +1402,7 @@ "BreakpointIdentity": "28444363-2b16-4d58-93d5-c94b9de8bbca" } ], - "ID": "63bb70ab-881e-4b52-b513-a783f4bb424f" + "ID": "bf307e98-f517-4172-9009-1a6af103d06c" } ], "BreakpointIdentity": "05fa95e4-4d4b-4c28-9351-76cb2aa5e159" @@ -1572,7 +1572,7 @@ "BreakpointIdentity": "5b6d419f-c1de-4f0f-9471-66debf92fdf1" } ], - "ID": "bf074741-51b9-4312-adf8-a84f5d273591" + "ID": "04ff05bd-142b-446d-be25-55d59ade9fa1" } ], "BreakpointIdentity": "dff90fec-8f06-4d39-9837-35ebfcdbff8e" @@ -1682,7 +1682,7 @@ "BreakpointIdentity": "4f957e85-daed-4c2a-b7ff-460b32c62feb" } ], - "ID": "d4798996-c091-415f-8687-af79221c26b6" + "ID": "65459e64-3720-4ce9-bced-202a0719f0fe" } ], "BreakpointIdentity": "1b5807e3-d658-421c-bee8-c773d3fa15f5" @@ -2060,7 +2060,7 @@ "BreakpointIdentity": "8ba0672c-be2d-4474-99ea-470fa117dbd4" } ], - "ID": "fb02d96d-d073-4c1c-a30e-a37c9ff2406e" + "ID": "148ffda3-9538-4567-aae2-7747c0c12983" } ], "BreakpointIdentity": "bdace243-73a1-488d-a182-c670c951744a" @@ -2101,7 +2101,7 @@ "BreakpointIdentity": "9a73fb77-c86a-431a-bbd7-63d1f5a823ca" } ], - "ID": "7cd8c56a-129a-498b-bce9-1a6cda9fe4d5" + "ID": "a4fc38b6-57a4-4fd7-adc3-ad65d32613da" }, { "CommandList": [ @@ -2119,7 +2119,7 @@ "BreakpointIdentity": "3c6cd22f-078b-45fe-9df7-56b54ce5a0d8" } ], - "ID": "b05e91ea-1f41-4499-9151-3528c935ad15" + "ID": "7bb13ed4-3a57-47f4-b4bf-c5be531b40f8" } ], "BreakpointIdentity": "e2c49c2d-fc1c-4dad-a673-0b677095895b" @@ -2142,6 +2142,7 @@ "RowBreakLines": [], "RepeatRangeSettings": [], "RelatedDataTableName": "项目平行视图", + "PageLoadingMode": 1, "ConditionFormatRulesCollection": { "Rules": [ { @@ -2307,4 +2308,4 @@ "Formula": "'任务-基本信息'!$C$8" } ] -}//8tVcqUg7QAyM92i39UCgkBOYxgd8C0SZQ8jtEJSDMTZAlv1MKSYAzTkI8yzAexCVauGCaIEWNKIuJQ8p8dqer9EF4hMp5dCRyidBGWEU/AyDd83NKvGX/EdpsMvCmxR38DIobEeakQC+WwjMNuTDvYiVny6JStTCK7T6oNM4bxZ32S+dcXJ7Yv7l+6b7Ol1lNgWvYUjiv4FOvKNsrr9p3CM9rUNbh1noHJSjBNQbjhgLVVyIhaTqNJxRC83tq28cajdiEWzqL2YxNDkZ47yGZZf623733QDsLPOB7KmrZ9++B/ScPytf/xL1xqgaPANdZFiys2siWQfYCBd0Wz/3h+rFEe3mVMAtAaZ6JMGf5JKzT4Ph3Le4JKRIlIKd1wqr0f+PDYnFyUBkjxa8uWZchc77CRaLv/S68ka2bIdoSyakH4U0yLZj0hFpNat2vCgHltI5g8AunryOguQFd/MJM4m7TZ4RCa2JQLZx89lcXcx/EUD/OqzCDfyIaZzo5NeUN70hWVlADzRSorqeBckrIk6m2U/+4/4SU3YqwQLqDlr/g32/mCn9PCEw1/Xt943nHrP0FI1dxcrxz2P4yroWPk5jY//rEV32JSiZwjgQ2gi8Ant379J8YtSvsrCZdVaAR0x/i7t1LJzpUDwUrR7T/QJCI7BYZLuuM4rNAiERbxFql0Q/RTkwIufteMsMHrAz1nZ4jepqpkE4OebE/KZgS9KL6pCByARhJ51YfCpWPIW9fJ45W2B+kJ9FcTms8/LLgBYA8P7W6A040jenbd8wESWFZxLu/yEkAotjPF15T+01wgsS/SFY2Oy6AJgBmRcnHdvwksK0sOOK7wxIeUZRF68CF0VgEibI6BHE5COB4M4ZODjgrLlhF2s3nXaHbDP12tcEdoF4BPDDrjK+sx9nIQ==|920 \ No newline at end of file +}//NnnvnxqAu5WMtc2bgEfvXclRUIzTaqmDTjZOf8isI2kUwFADXLwsTpI3vesCBUCADNP25Pw2lXF3NN2BAy7ciU/97Vocoye+KIZtxXKVBz5crb/VnRXAOf141lQ5XnpBLcYcICBYLxosZADY2J8J4sDU7kYUR0fPWMSWXicOGnoibB+DeieATjxmAakBe21/Y6iJ9jrx+zE0pY5wHlAcv8KN5SeMLXHRTqOd//RzG1PkTVFU4KljrPVGzhzQ8DlYVRrdgRzA1NSechbc41DfsbCHc31wmpxBCzHo7dpbdd/hWk9r9ja82CB5UH5TpJZhIEvkirqBja1LEGuMwTrZZY4lKrINFebx3y2JMNnEUBo06Ni/M9kzVoTSkk/nOxVkJNK4MtyekKR91JsEAKAWXLpe+PLJybQegI1D822TidA+uYkV59ygMLV2BbakMjIPZ2PvvibZTs2yv39hdIVir7fJ9mJK/0FwGU1nnYeqhuJmKzHWpi6TXSce2/OEB39gHoEyELon+LJEw9d07W1rau/5L+d3zNTsCBwfxHnw62P01morUG8lBFDCLNu/bOjA/xV9lueTm8YRMgFf5fZtgHuzP8sQNtuWStVd9kqm++4r5NB2Sj/vVP5wFHqsZx8dH6K8sqP0xUxzzRzMlfVXz+DWd+XoSn90C+NVo6llla1KjyHMQQVcEMwhq42xUnXztFdQJ6XNDRDa2Eda9BuTbXvYZNrP/VWlr/u8SjaBhXm2FfUqgUWaJOrR/2yV/4tlzBYuGEYk1RWXkkVxWoIDpno3Cib0C7G/Y+jpyagHPBLlRHtuqCdi8CiEHxGC5vtFQAZ8IUWWZoEm9Ov0GHvW65Ve9cZSnt1FukHMRKPS7WiipwfMmMXvaUs9kG4fbv3Sn/sbL3/BSs5HzCpCOTPRcQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务部分.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务部分.json index 8e51a463..e94eb07b 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务部分.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务部分.json @@ -522,7 +522,7 @@ "BreakpointIdentity": "6328f60b-274a-4f01-b182-32916fa470d9" } ], - "ID": "5b01065b-d2b5-4871-9173-c57d53685b4d" + "ID": "e615a75c-655f-4b66-9258-8d9c7f8286d3" }, { "CommandList": [ @@ -538,7 +538,7 @@ "BreakpointIdentity": "2f85d304-3a7a-4a90-bf43-a88237e0dbf3" } ], - "ID": "1404e3be-8a37-4716-b0d7-9fe4c7a03bd1" + "ID": "3fd17407-940b-4f80-8ef4-f18fc1e72453" } ], "BreakpointIdentity": "44bf13a3-27b2-4488-be56-073db30febaf" @@ -593,7 +593,7 @@ "BreakpointIdentity": "ad38f828-ef56-47f1-b9fd-c1f02cd3ebce" } ], - "ID": "4236f1f4-e459-41eb-b44f-2351bc393339" + "ID": "fd57e163-8414-4f15-ae27-dee2b78b2805" }, { "CommandList": [ @@ -611,7 +611,7 @@ "BreakpointIdentity": "73dd57d6-4ea2-4893-837f-8d1420c79724" } ], - "ID": "6a086bcb-c0be-42ac-ac08-0b042e1ad99c" + "ID": "71626222-ed85-4843-820c-8bfb74692f5e" } ], "BreakpointIdentity": "4b33e28f-fe98-4a9d-865d-296fda70b06f" @@ -1086,7 +1086,8 @@ ] }, "RowBreakLines": [], - "RepeatRangeSettings": [] + "RepeatRangeSettings": [], + "PageLoadingMode": 1 }, "PrintInfo": { "PaperSize": {}, @@ -1126,4 +1127,4 @@ "Formula": "任务部分!$A$7" } ] -}//AO/w3uqlTpOnV7iUUcHIRyINt9+1yjxboc3EJXoMn0iP5uSMuQ2oUghYd8GR5kH7UR7TO9pPd3VuHYbK93dPY1gOuRRNB9KKCDQS4vvXRbuvJImDTQTHxp3sUT3kR21QWlrnshzgnPn7dcumVEOKzSA3aBShJFwHSTQk+/oXXk4yOwNtfMhkb88CINfOwcgLA0HF7Fmy+rYvliQ76itZJXAhm1fV1f9zv73Ih5vC5gvCKnpIMoKDalzwYxl+tuyyemAaH+ok8tTzwXX/tgd7YEr6SPV+P78EQkbuFQs6obOJRlXH2Z1B5OyhQT/l5cg8LGVIf94460t1uxSsPy1vWtOqOKXkQVSeEsCd/XexI8VNosSRV0KO58gZBeqNKFr/6WZETplDuBv7B7vsWupROqlonELBoKy7RDAy/EBw3bGrNSkSXr66yq3EDRM4TQ4qOxSDHLtZGZaWXSFbhZswBYksSOI2RslU7reKe2mNxzUYInei8ACCXbpryKSuViP8cSapTJoEZbNRRbxcz2z7blWtioiyuBrHHliYQMruV8TAtLQmkhaLhjvqcxUaXV/vwGC/qkOWkZR+ofGIzdL89naN5kbgRl+Atfz0lE73fy84rv5ikYVv7wVQK+c5QfXnkn5cXWv0GpVoBRwfgPaJ4bpBwDff6pkvK7yU37EUK5gX+HyNuaC4uEMm7R67fiofdmaDzsJ5o7VaVMfgI/vh5XGfYEUQh/5sMEGxaLUVTfTiYpxyd8YzJatkAoO4cPuwSRo2+z8LEpJicuT/U6nM1TmYiFODCfjg8/fWBQkrz6gqA9wZ8wHqjhKsQeqcNT8QHI+l1lmG5C5dUlqlNZCVOIzbsLFmenvbIh/Gjak2+15spqqqwwv6a/5TreChe29H2Tn/DkCadk5aMBzAWxBoxw==|920 \ No newline at end of file +}//FtIbsRlcYRtKi+zDDTyOno+DHDq4BrEAKgqlJvOoz1dLhQLwblscW24butt3WvxURq+7Wwv/NIBizeX/jSjwrm6/kENicnOymZCEukkalrp+n5p15Plajy2aiXkoWPyCXTrdc/zX7nYmNfiNzOL8Msb4A+Uq2bMs331HAzjwKbL8Y6JtpFTjeSvj7iF7SWI/jZqmKc5IOzKDnDbzoKK+eLGMrTR4nl09LANpdpTdlcf7QsOxug3kxz1unC+IS4Xo1I1EppWJ4kBZxO5KQuFp7nrOEHEsK6Z3dkg1kwtebd3omFRZ2y/UZIehObscQTxvlNDKE6RENmryPgnuZfmrAYsClwBmLHbeR61dSWhsReqiiU1K+g7juimsCOUKo5o5eKafXvvxgP6fjUqWrdzWKFlqg5ypyhSMbmpO8doOb5n0XRGA+nE1Ya7IhBn1xzC2aY4LLQuORvRWNAvspOJsB9Pbay/4OnML4CAryj7upAr+rvOcB4OEHLf6QeIEzp38WgtPHjDFEOGunXfTHshDufPqWt9tWP1Txany5LVp1T0jwSI74CjkXhuPsBCW0m0DLJBVxXZ4vHt5oEgedQ+kPDo4OZhTIHlD3oHAM7tBTPsLeKUc867RiaIuI4CLfqn1kQWQVDNkLAYQ1hu3NZP+ck9ec/iPIjbuUV6lgp6gSCbhg9SqrBqFEM1dquz4ofEGvU3eQahg+4g3qievsDbpzjiCFtCLz3UcuzGvV7PXKjPtxQcKWHAI0iWIKXn5tKIYT7MEzoUB4cML4v6/QZqmwCUJxEktkpqsH7/LWq6b6qSYotai1fq6efrSLCrBXAkHDc7/ruZQa7uxnFk/O9Kr6O3YNgO7sf3ilnkTStXug5HHWf4Sbg+3wH6g2PuLax32GRg1D/g/0nnHQTq7FNLzNw==|920 \ No newline at end of file diff --git a/Reports/人员工时报表.rdlx b/Reports/人员工时报表.rdlx index 1f0d52f9..eb07e4e9 100644 --- a/Reports/人员工时报表.rdlx +++ b/Reports/人员工时报表.rdlx @@ -1,6 +1,6 @@  - 人员工时报表.rdlx11 + 人员工时报表.rdlx111 @@ -275,6 +275,7 @@ =Fields!日期.Value =Fields.Item("任务ID").Value + @@ -413,7 +414,7 @@ true 上报工时 - =Fields.Item("上报工时").Value + =Sum(Fields!上报工时.Value) @@ -436,7 +437,7 @@ true 核定工时 - =Fields.Item("核定工时").Value + =Sum(Fields!上报工时.Value) diff --git a/Reports/客户工时报表.rdlx b/Reports/客户工时报表.rdlx index 6bccdf89..85b7a7a1 100644 --- a/Reports/客户工时报表.rdlx +++ b/Reports/客户工时报表.rdlx @@ -1 +1,806 @@ -客户工时报表.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客户部门_DataSetIDDateTimetrue开始日期TrueDateTimetrue结束日期Truejsondoc=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=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":905,"top":40,"width":100,"height":30,"control":{"type":"button","action":"preview","text":"","background":"accent"}},{"left":795,"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":"日期范围"}}}]}DefaultTheme.rdlx-theme \ No newline at end of file + + + 客户工时报表.rdlx1 + + + + 5.251cm + + + 0cm + 0.049cm + 33.951cm + 5.251cm + + 工时表_DataSet + 客户工时报表 + Auto +
+ true + + + 1.751cm + + + 6 + + + + true + 开发服务月度工时报表 + + + + + + + 0.75cm + + + + + + true + 日期 + + + + + + + + true + 任务 + + + + + + + + true + 文本框3 + 负责人 + + + + + + + + true + 版本 + + + + + + + + true + 内容 + + + + + + + + true + 工时 + + + + + + +
+
+ + + =Fields!日期.Value + =Fields!任务ID.Value + + + + + Ascending + =Fields.Item("项目ID").Value + + + Ascending + =Fields.Item("日期").Value + + + Ascending + =Fields.Item("任务ID").Value + + + Ascending + =Fields.Item("执行人").Value + + + + + 0.75cm + + + Restricted + + + + + + + + + + + + true + 日期 + =Fields.Item("日期").Value + + + + + Restricted + + + + + + + + + + + + true + 任务名称 + =Fields.Item("任务名称").Value + + + + + Restricted + + + + + + + + + true + 执行人 + =Fields.Item("执行人").Value + + + + + Restricted + + + + + + + + + true + 版本名称 + =Fields.Item("版本名称").Value + + + + + + + + + + + + + true + 执行内容 + =Fields.Item("执行内容").Value + + + + + + + + + + + + + true + 上报工时 + =Sum(Fields!上报工时.Value) + + + + + + +
+
+ + + 1cm + + + 5 + + + + true + 合计 + + + + + + + + true + =Sum(Fields!上报工时.Value) + + + + + + +
+ + + 5.538cm + + + 5.035cm + + + 4.927cm + + + 4.001cm + + + 10.401cm + + + 4.049cm + + + + +
+ true + + + 1cm + + + 4 + + + + + + + + + true + 项目名称 + =Fields!项目名称.Value & IIF(IsNothing(Fields!项目代号.Value), "", "(" & Fields!项目代号.Value & ")") + + + + + + + + + + + + + true + 小计 + + + + + + + + + + + + + true + =Sum(Fields!上报工时.Value) + + + + + + +
+ + + =Fields.Item("项目ID").Value + + + + +
+ + + + Landscape + 21cm + 36cm + 1cm + 1cm + 1cm + 1cm + + 34cm + + + + + Integer + 客户 + True + + + 客户表_DataSet + 客户名称 + ID + + + + + Integer + 部门 + True + true + + + 客户部门_DataSet + 部门名称 + ID + + + + + 客户部门_DataSet + ID + + + + + DateTime + true + 开始日期 + True + + + DateTime + true + 结束日期 + True + + + + + + jsondoc=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"}}}} + JSON + + + + + jsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/e2702e2e-d2cf-4678-86b2-98b675666b47;schemadata={"type":"array","items":{"type":"object","properties":{"ID":{"type":"integer"},"客户名称":{"type":"string"}}}} + JSON + + + + + jsondoc=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!客户.Value + + Equal + + + =Fields!所属客户部门.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":905,"top":40,"width":100,"height":30,"control":{"type":"button","action":"preview","text":"","background":"accent"}},{"left":795,"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}}],"preferredLayout":"free-form","canvas":{"width":1020,"height":85}} + + + + DefaultTheme.rdlx-theme + + \ No newline at end of file diff --git a/Reports/项目工时报表.rdlx b/Reports/项目工时报表.rdlx index da971dea..3a5e94c1 100644 --- a/Reports/项目工时报表.rdlx +++ b/Reports/项目工时报表.rdlx @@ -1 +1,797 @@ -项目工时报表.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 + + + 项目工时报表.rdlx1 + + + + 5.25cm + + + 0cm + 0.002cm + 27.654cm + 5.25cm + + 工时表_DataSet + 项目工时报表 + Auto +
+ true + + + 2cm + + + 4 + + + + DimGray + + + + + + + + + + + + + + + true + =Format(Parameters!开始日期.Value, "yyyy-MM-dd") & "~" & Format(Parameters!结束日期.Value, "yyyy-MM-dd") & "项目工时报表" + + + + + + + 0.75cm + + + + + + DimGray + + + + + + + + + + + + + + + true + 任务 + + + + + + + + DimGray + + + + + + + + + + + + + + + true + 任务说明 + + + + + + + + DimGray + + + + + + + + + + + + + + + true + 总计划工时 + + + + + + + + DimGray + + + + + + + + + + + + + + + true + 总核定工时 + + + + + + +
+
+ + + =Fields.Item("任务ID").Value + + + + + 0.75cm + + + + + + #e6e6e6 + + + + + + + + + + + + true + 任务名称 + =Fields.Item("任务名称").Value + + + + + + + + #e6e6e6 + + + + + + + + + + + + + + + true + 任务说明 + =Fields.Item("任务说明").Value + + + + + + + + #e6e6e6 + + + + + + + + + + + + + + + true + 总计划工时 + =Sum(Fields!上报工时.Value) + + + + + + + + #e6e6e6 + + + + + + + + + + + + true + 总核定工时 + =Sum(Fields!核定工时.Value) + + + + + + +
+
+ + + 1cm + + + 2 + + + + DimGray + + + + + + + + + true + 合计 + + + + + + + + DimGray + + + + + + + + + + + + true + =Sum(Fields.Item("上报工时").Value) + + + + + + + + DimGray + + + + + + + + + true + =Sum(Fields.Item("核定工时").Value) + + + + + + +
+ + + 6.499cm + + + 12.499cm + + + 4.328cm + + + 4.328cm + + + + +
+ true + + + 0.75cm + + + + + + DimGray + + + + + + + + + true + 项目名称 + =(Fields.Item("项目名称").Value & "-") & Fields.Item("版本名称").Value + + + + + + + + DimGray + + + + + + + + + + + + true + 小计 + + + + + + + + DimGray + + + + + + + + + + + + true + =Sum(Fields.Item("上报工时").Value) + + + + + + + + DimGray + + + + + + + + + true + =Sum(Fields.Item("核定工时").Value) + + + + + + +
+ + + =Fields.Item("项目ID").Value + =Fields.Item("版本ID").Value + + + + +
+ + + + Landscape + 21cm + 29.7cm + 1cm + 1cm + 1cm + 1cm + + 27.656cm + + + + + DateTime + 开始日期 + True + + + DateTime + 结束日期 + True + + + Integer + 项目 + True + true + + + 项目表_DataSet + 项目名称 + ID + + + + + + + + jsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/b496c790-735b-421c-a389-bfadb91fde62;schemadata={"type":"array","items":{"type":"object","properties":{"ID":{"type":"integer"},"任务名称":{"type":"string"}}}} + JSON + + + + + jsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/e137dd12-5ee8-49e2-885c-b957f39a7e6d;schemadata={"type":"array","items":{"type":"object","properties":{"ID":{"type":"integer"},"项目名称":{"type":"string"}}}} + JSON + + + + + jsondoc=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"}}}} + JSON + + + + + + + + ID + + + 任务名称 + + + + $.[*] + 任务表 + + + + + + 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 + + + + $.[*] + 工时表 + + + + + + DisplayType + Galley + + + SizeType + FitToWidth + + + PaperOrientation + Landscape + + + ParametersView + {"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":"日期范围"},"showDefaultRanges":true}}],"preferredLayout":"free-form","canvas":{"width":805,"height":75}} + + + + DefaultTheme.rdlx-theme + + \ No newline at end of file