diff --git a/.collaboration b/.collaboration index 05d2d043..f159f054 100644 --- a/.collaboration +++ b/.collaboration @@ -554,49 +554,15 @@ }, { "ModuleName": "PCPage/项目概况", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T16:43:10.2927377+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目概况.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目概况.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务列表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T15:45:30.58164+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.rd", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.json", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目工时", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T16:48:04.8919527+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目工时.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目工时.rd", - "Pages\\57e644c056074f9d885f24a5bd7b4ae.json", - "Pages\\57e644c056074f9d885f24a5bd7b4ae.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目成员统计", @@ -604,17 +570,7 @@ }, { "ModuleName": "PCPage/项目概况-关键数据", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T16:11:55.3192011+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目概况-关键数据.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目概况-关键数据.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目甘特图", @@ -714,17 +670,7 @@ }, { "ModuleName": "PCPage/任务首页", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T15:53:13.5175545+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务首页.json", - "Pages\\任务\\任务首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务部分", @@ -736,17 +682,7 @@ }, { "ModuleName": "PCPage/任务-基本信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T16:02:23.0147955+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-基本信息.json", - "Pages\\任务\\任务-基本信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-任务信息", @@ -762,19 +698,7 @@ }, { "ModuleName": "PCPage/任务-工时", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T15:47:03.9963359+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-工时.json", - "Pages\\任务\\任务-工时.rd", - "Pages\\94f8bae36aee4ae7aec2a063ca731b1.json", - "Pages\\94f8bae36aee4ae7aec2a063ca731b1.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-进展", @@ -786,19 +710,7 @@ }, { "ModuleName": "PCPage/工时详情", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T15:47:50.0211156+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\工时详情.json", - "Pages\\任务\\工时详情.rd", - "Pages\\31a709cea02e45ad83bb92336a6d829.json", - "Pages\\31a709cea02e45ad83bb92336a6d829.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/新增任务", @@ -834,17 +746,7 @@ }, { "ModuleName": "PCPage/新增报工", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T15:41:18.5323875+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\工时\\新增报工.json", - "Pages\\任务\\工时\\新增报工.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/分配计划工时", @@ -948,59 +850,19 @@ }, { "ModuleName": "PCPage/工时总览", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T16:20:43.1049937+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\工时\\工时总览.json", - "Pages\\工时\\工时总览.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务工时统计", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T17:02:38.1831932+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\工时\\任务工时统计.json", - "Pages\\工时\\任务工时统计.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/人员工时统计", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T17:13:44.5796891+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\工时\\人员工时统计.json", - "Pages\\工时\\人员工时统计.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/个人工时首页", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T16:24:19.1979511+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\工时\\个人工时首页.json", - "Pages\\工时\\个人工时首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/个人中心", @@ -1072,17 +934,7 @@ }, { "ModuleName": "MasterPCPage/FGC_母版页", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T16:59:19.2214257+08:00", - "ModuleType": 3, - "ToRemoveFiles": [ - "MasterPages\\FGC_母版页.json", - "MasterPages\\FGC_母版页.rd" - ] + "ModuleType": 3 }, { "ModuleName": "MasterPages/流程母版页面文件夹", @@ -1130,16 +982,7 @@ }, { "ModuleName": "ServerCommand/修改任务预算工时", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T16:41:44.8226386+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\任务\\修改任务预算工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/移除任务成员", @@ -1159,16 +1002,7 @@ }, { "ModuleName": "ServerCommand/修改工时", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T16:41:20.397842+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\修改工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/删除任务成员所有工时", @@ -1636,34 +1470,11 @@ }, { "ModuleName": "UserService", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T15:39:54.8448746+08:00", - "ModuleType": 11, - "ToRemoveFiles": [ - "UserServiceDB.sqlite3", - "CloudStorageProvider\\data.json", - "SecurityProviderV2\\data.json" - ] + "ModuleType": 11 }, { "ModuleName": "CustomLibrary", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T16:39:59.5842527+08:00", - "ModuleType": 12, - "ToRemoveFiles": [ - "CustomLibraries.json", - "UserFile\\BaseCss.css", - "UserFile\\CustomFormula.js", - "UserFile\\echart.js" - ] + "ModuleType": 12 }, { "ModuleName": "MapJsonFile", @@ -1695,30 +1506,11 @@ }, { "ModuleName": "ServerCommand/计算报工数据", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T16:29:44.3855949+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\计算报工数据.json" - ] + "ModuleType": 15 }, { "ModuleName": "PCPage/核定确认", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T16:29:25.0173611+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\工时\\核定确认.json", - "Pages\\任务\\工时\\核定确认.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Table/素材库", @@ -2090,17 +1882,7 @@ }, { "ModuleName": "ProcessItem/新增任务流程", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T16:04:27.3207611+08:00", - "ModuleType": 28, - "ToRemoveFiles": [ - "Process\\新增任务流程.json", - "Process\\新增任务流程.bpmn" - ] + "ModuleType": 28 }, { "ModuleName": "PCPage/页面反馈录入", diff --git a/MasterPages/FGC_母版页.json b/MasterPages/FGC_母版页.json index a2eb8d01..696f9e9e 100644 --- a/MasterPages/FGC_母版页.json +++ b/MasterPages/FGC_母版页.json @@ -221,7 +221,7 @@ ] }, { - "Text": "工时", + "Text": "*工时", "SelectedIconColor": "Background 1", "SelectedIconColorUseItemColor": true, "IconColorUseItemColor": true, @@ -1080,7 +1080,7 @@ "IsOpenInNewTab": true } ], - "ID": "3a9b0443-5ade-4c7a-a3c5-861c7bfc9d31" + "ID": "3c146da8-ef44-42ee-b768-c6c935c7d228" }, { "CommandList": [ @@ -1101,12 +1101,12 @@ ] } ], - "ID": "2bc53ef2-9934-4524-a5fa-02b0c31060cb" + "ID": "d796acfd-e381-4a83-9b0b-6ffe5bd944e8" } ] } ], - "ID": "6efe84fb-cd32-4e2e-976e-e8230d4d30d6" + "ID": "ed28ad6d-2766-4ef1-b85e-744d35328e05" }, { "Condition": { @@ -1156,7 +1156,7 @@ ] } ], - "ID": "8e5792ca-40a3-4052-ae5d-032564fb084c" + "ID": "beb71adf-e3ad-41f0-9e8e-1d8ac8d32942" }, { "Condition": { @@ -1190,7 +1190,7 @@ ] } ], - "ID": "ba627c3d-2a7f-4fdf-a601-bd2e1aae027a" + "ID": "4401c00b-91b1-4a13-bd69-84bd88ad8066" }, { "Condition": { @@ -1226,7 +1226,7 @@ ] } ], - "ID": "0fbebf78-73f1-4c58-991f-b45e0bb4aaec" + "ID": "973dc23a-ec7b-4b3b-80c8-bd80d6dc89d1" }, { "Condition": { @@ -1261,17 +1261,17 @@ ] } ], - "ID": "8ed3f469-d4f3-4736-bd14-4bafff0139a4" + "ID": "b5927951-0c9c-48ab-a288-431f2d0d48a5" } ] } ], - "ID": "bfd21596-3b53-49ea-ad50-8199ddc467b4" + "ID": "432da94c-7897-4815-b24e-8d5ff828f0ef" } ] } ], - "ID": "f8cc8ec1-55e5-4a66-a9a3-2f23a643cf9d" + "ID": "49cd72d3-e852-4e22-8638-e53995ce60f3" } ] } @@ -1527,7 +1527,7 @@ "IsOpenInNewTab": true } ], - "ID": "d2e22029-cbe1-4a56-8270-be90a021436e" + "ID": "b01e0aa3-1957-4f57-b50b-de028dd508f2" }, { "CommandList": [ @@ -1548,12 +1548,12 @@ ] } ], - "ID": "6dc1ad40-902f-4749-ab9c-07de859aee0c" + "ID": "31795989-6469-429d-9e44-c9f8282199cd" } ] } ], - "ID": "d551d555-68d9-4cd0-8727-8bb770b5875d" + "ID": "82301f6c-a7a4-418b-95c7-345c97777895" }, { "Condition": { @@ -1603,7 +1603,7 @@ ] } ], - "ID": "918189c4-ec2c-4e6a-9cb5-bbfe1f01a507" + "ID": "520d41c1-6e1f-4e4a-b943-73e267d31329" }, { "Condition": { @@ -1637,7 +1637,7 @@ ] } ], - "ID": "6bece999-b336-45b7-956e-1c5bd8e05a67" + "ID": "782fa5d6-b389-45e1-a5b3-1f4a1ae608ac" }, { "Condition": { @@ -1673,7 +1673,7 @@ ] } ], - "ID": "2796fb15-ae22-40bb-b23d-37b54d1290fc" + "ID": "838016d0-28fb-4b96-88a3-4d296994fbcb" }, { "Condition": { @@ -1708,17 +1708,17 @@ ] } ], - "ID": "2e8b48b5-7e94-4b5e-bb58-9b28829a3023" + "ID": "739fbc44-4b44-4459-bf3d-ebf5007b4d0a" } ] } ], - "ID": "05ccd180-aa2a-4798-8ef1-bec50cbff657" + "ID": "7a3b2918-056f-45bb-ba2c-2f86b1fe9281" } ] } ], - "ID": "6252bcea-6bc4-4b56-9f7f-350475008e8d" + "ID": "4008a0ad-27da-45ef-9e9e-91278a748ee8" } ] } @@ -1730,7 +1730,7 @@ "Disabled": true } ], - "ID": "87c676e0-32e6-4202-bc3f-d278ec1c52c1" + "ID": "00d514b3-38f9-467e-b324-b7a633d0e0e8" }, { "Condition": { @@ -1837,7 +1837,7 @@ "IsOpenInNewTab": true } ], - "ID": "d7e9bda1-d842-4573-a8af-c5d0f85489a3" + "ID": "ceb3b145-819b-4e5f-878a-57479a81025e" }, { "CommandList": [ @@ -1858,12 +1858,12 @@ ] } ], - "ID": "7c6aede1-d187-49f2-b260-e26d7814b28d" + "ID": "8a31be2f-e252-4d6d-abcd-7732e46b47aa" } ] } ], - "ID": "1ed8758b-7f74-4c30-a396-fd729ed6899f" + "ID": "26cc2d14-989b-4e15-a537-acd44a36f1af" }, { "Condition": { @@ -1913,7 +1913,7 @@ ] } ], - "ID": "d60aec52-4b82-4427-9a9e-750b5305fc0e" + "ID": "c48f137e-9b91-454a-bda4-9772f48efea8" }, { "Condition": { @@ -1947,7 +1947,7 @@ ] } ], - "ID": "a2947ddd-e19d-4b45-bee0-2a89fd317575" + "ID": "2e1a0387-4bc2-40b0-bbcd-69e3614793f1" }, { "Condition": { @@ -1983,7 +1983,7 @@ ] } ], - "ID": "4a53b771-0232-4054-b8a3-8b1dc5a6de0f" + "ID": "a35160fc-a531-4873-bcfc-ab3c1d388c70" }, { "Condition": { @@ -2018,17 +2018,17 @@ ] } ], - "ID": "076fc09d-805c-4970-942b-b9e50b9d4041" + "ID": "bcf8f11e-b4ca-41ef-bb16-03b07827d737" } ] } ], - "ID": "80d3b9c6-5136-420c-bb95-f172b44c4fa4" + "ID": "111e62d0-e906-4ed7-b6ef-fffcc290f4ac" } ] } ], - "ID": "cf7022d1-53ab-46ab-9a79-ca00fec56e4e" + "ID": "3dea3421-3302-49f1-a0f1-64c5a8af9a52" } ] } @@ -2285,7 +2285,7 @@ "IsOpenInNewTab": true } ], - "ID": "4ee0635f-57fa-4656-8eb6-82ddbe390a43" + "ID": "98f85ea6-f040-47f9-ad08-ff36a59d951d" }, { "CommandList": [ @@ -2306,12 +2306,12 @@ ] } ], - "ID": "3b3fc4a3-57d0-471d-b1db-c3921b241e21" + "ID": "1ae369ca-e9b6-41ba-a515-35074cc0b819" } ] } ], - "ID": "9cccf87b-f679-475a-b431-68f0d1b07003" + "ID": "e80fe407-756f-4c73-bca4-19682771a95a" }, { "Condition": { @@ -2361,7 +2361,7 @@ ] } ], - "ID": "be4e061b-f87b-4f9c-804e-3541502bd898" + "ID": "ab70bb85-e7ef-4e71-b543-a832b0eb4f13" }, { "Condition": { @@ -2395,7 +2395,7 @@ ] } ], - "ID": "2d120f4e-3e4c-4430-88aa-24803ee50128" + "ID": "0994a5dc-ee2f-401d-a6e2-a4851a4db2ed" }, { "Condition": { @@ -2431,7 +2431,7 @@ ] } ], - "ID": "f47ef812-b26b-4467-bfa7-47ddd7f5d1a8" + "ID": "5e9dad9d-7465-4b4d-83a3-b3e6a52c34b6" }, { "Condition": { @@ -2466,17 +2466,17 @@ ] } ], - "ID": "3ffc1c67-2a40-45b9-a9eb-3932e2474d3e" + "ID": "9c3e8db6-3ee6-4f70-b8e7-30eb37b636dc" } ] } ], - "ID": "bd6cbe40-5f7a-4f45-bfaf-9c4b9abdad8b" + "ID": "b7cab6e5-7868-4d5d-ade1-e92361ce61ba" } ] } ], - "ID": "9811fd36-e296-4d9e-b2e9-0b38f4e94157" + "ID": "ee443e93-0f7c-46e5-b686-0ec9840049b8" } ] } @@ -2488,7 +2488,7 @@ "Disabled": true } ], - "ID": "5b1cdc2e-b608-43a3-be62-d61cceafa9c6" + "ID": "d0f48461-4559-43af-a462-529136344ebd" }, { "Condition": { @@ -2595,7 +2595,7 @@ "IsOpenInNewTab": true } ], - "ID": "18af5bfd-1515-40f0-9338-ca37c9c0b14d" + "ID": "da6a8d27-60ba-4d71-b18d-8522b8499b99" }, { "CommandList": [ @@ -2616,12 +2616,12 @@ ] } ], - "ID": "939720e1-dd78-4a2d-897b-25cfad06b336" + "ID": "7766757d-fe83-4f3f-a90b-8ea871c57b1f" } ] } ], - "ID": "e59afb21-e8c1-4fe3-9e9b-7b6f18733404" + "ID": "a8af125a-b9ac-49d8-b345-0b85e2f2a6c5" }, { "Condition": { @@ -2671,7 +2671,7 @@ ] } ], - "ID": "c2696bb7-eb84-453b-b712-a438c8905d5e" + "ID": "30316037-5506-4968-a6e5-f4fd40037231" }, { "Condition": { @@ -2705,7 +2705,7 @@ ] } ], - "ID": "4ee23b0d-9020-4e18-a51f-427dfc785859" + "ID": "b8af6cdb-d8ad-4641-9eac-01b54559be67" }, { "Condition": { @@ -2741,7 +2741,7 @@ ] } ], - "ID": "e3b8116b-4f31-4424-94c9-3fd599d02428" + "ID": "231b39d8-60f5-4231-b3be-9971f2492646" }, { "Condition": { @@ -2776,17 +2776,17 @@ ] } ], - "ID": "9c0439fa-a1a4-418c-80e0-9da3caf3b060" + "ID": "553cbde0-7715-4b98-8e0b-53c7474397b1" } ] } ], - "ID": "f74a01e1-0fbe-424a-a69d-fb214b6f666b" + "ID": "4028e593-89c0-416b-8fae-b16131e81241" } ] } ], - "ID": "f5c713f7-53ac-4b2a-b4f1-948ec450292a" + "ID": "e3a86d24-8c78-4785-a355-c5dde787b78d" } ] } @@ -3043,7 +3043,7 @@ "IsOpenInNewTab": true } ], - "ID": "80931562-c035-4ec4-a324-a477aa4b6567" + "ID": "022e4ae0-b8b3-47ea-ade1-3cb7658d6b9b" }, { "CommandList": [ @@ -3064,12 +3064,12 @@ ] } ], - "ID": "0904299f-075e-4772-8fcc-67f6f8cca76a" + "ID": "50d284bc-b280-4ae2-8459-5025cf986aba" } ] } ], - "ID": "4a804022-1232-4e76-bf00-90e301a0c014" + "ID": "04de6e84-611c-4c86-8cca-ac6d28cb291f" }, { "Condition": { @@ -3119,7 +3119,7 @@ ] } ], - "ID": "a3b210d3-ce56-4801-b277-1d04e8041aa5" + "ID": "756d7936-b867-4f2d-b705-217ac422b3f7" }, { "Condition": { @@ -3153,7 +3153,7 @@ ] } ], - "ID": "694f4b78-738e-436f-ac8e-fdd12a9fe304" + "ID": "2ab422aa-467c-41f0-a4d0-a7766d6484e7" }, { "Condition": { @@ -3189,7 +3189,7 @@ ] } ], - "ID": "37a24a68-b091-4a4d-9dcb-315fde7de55c" + "ID": "4497dedc-3714-4162-b739-b4b9e81b5dbf" }, { "Condition": { @@ -3224,17 +3224,17 @@ ] } ], - "ID": "eba20172-3c35-4b5e-839c-98704032a8ac" + "ID": "81385d87-d090-4d59-b5ae-af80eb720161" } ] } ], - "ID": "b66de89f-8c5a-4ec6-afb6-68fe22a6c524" + "ID": "0fd764de-bac2-44af-bd76-6bf7d4c89193" } ] } ], - "ID": "35368357-7ff4-4f91-8de2-7b1bbb1860fb" + "ID": "e5609889-7a94-4bb8-ba9a-d904b312fe7b" } ] } @@ -3246,7 +3246,7 @@ "Disabled": true } ], - "ID": "9feea613-9a25-461c-8ad4-cdab117e9278" + "ID": "912a661e-aed2-4aeb-a44a-74b2b5b8b466" }, { "Condition": { @@ -3353,7 +3353,7 @@ "IsOpenInNewTab": true } ], - "ID": "a3440464-b962-4447-8b7e-d261c3515ad2" + "ID": "83d9c5a2-3b57-4b46-8e32-3ee395c41f85" }, { "CommandList": [ @@ -3374,12 +3374,12 @@ ] } ], - "ID": "f1298d37-7b7a-45db-b91d-d876789fa134" + "ID": "175dff7c-3e7e-40ca-8c13-753aaf5ca48f" } ] } ], - "ID": "935cd397-77f4-4e73-acdc-37079cb79e09" + "ID": "9417c0e2-6d16-493d-98de-e443a8b9370a" }, { "Condition": { @@ -3429,7 +3429,7 @@ ] } ], - "ID": "795cc9cf-397f-4bcb-bdc7-fdfe030e7172" + "ID": "df625a99-c075-4805-9ec2-66e3343838f6" }, { "Condition": { @@ -3463,7 +3463,7 @@ ] } ], - "ID": "2c06edd6-ad83-4867-8fa1-9a5b98b01f45" + "ID": "46f78cac-811a-4661-b8cd-a4bd02103744" }, { "Condition": { @@ -3499,7 +3499,7 @@ ] } ], - "ID": "a9ce9bdb-9f3c-4733-bbc7-a2577b24dacb" + "ID": "0924a880-f400-4588-8705-3c412a44ca88" }, { "Condition": { @@ -3534,17 +3534,17 @@ ] } ], - "ID": "018b47cb-337e-4d56-b6f4-a620bcb36ee0" + "ID": "8989fcee-7dcc-49d7-9b4d-4f4158b22ec0" } ] } ], - "ID": "25e0e67d-e62f-48f3-8f5a-acb0df626dfa" + "ID": "dff0fc6c-1ee6-48b0-9fe7-e45c050a5670" } ] } ], - "ID": "c27558b8-d2d5-4395-96f8-50e3c60a1933" + "ID": "cc76b0b9-a01e-4c11-832b-fd0174d7f827" } ] } @@ -3801,7 +3801,7 @@ "IsOpenInNewTab": true } ], - "ID": "9dcccc2e-18cf-40da-8d37-fc7bc0e6e5a9" + "ID": "7999bd77-eea8-48c2-b1c3-70ec18bf847d" }, { "CommandList": [ @@ -3822,12 +3822,12 @@ ] } ], - "ID": "f37322e9-97b6-4925-98f7-51af1a52b62f" + "ID": "02d6e715-f1bd-47d9-b87a-92f99e3098e1" } ] } ], - "ID": "926170ab-cac2-4aee-bcda-f75fd1b2cf85" + "ID": "b59d026d-d355-4bd1-b409-abd0b7f6ea9d" }, { "Condition": { @@ -3877,7 +3877,7 @@ ] } ], - "ID": "1b8f1631-de08-4e25-a315-200f9adb868a" + "ID": "113a3467-f3f6-42ae-bc2f-9717fa7fb626" }, { "Condition": { @@ -3911,7 +3911,7 @@ ] } ], - "ID": "8a976abe-b5d7-43f4-b626-f894afb5f8a1" + "ID": "18f49116-3860-4db3-b875-b11b4174cfc3" }, { "Condition": { @@ -3947,7 +3947,7 @@ ] } ], - "ID": "d514c7a1-9def-41c4-9917-7f5fb9ef5824" + "ID": "e3f19417-18fd-40b2-9f35-269f894e66e1" }, { "Condition": { @@ -3982,17 +3982,17 @@ ] } ], - "ID": "72df66ac-3495-4113-bcea-c36b93b3de10" + "ID": "1604f830-aa8a-47ba-bc55-fc79f1b9fc65" } ] } ], - "ID": "772b10de-08c8-45ea-9c8e-5826f63ff293" + "ID": "55c9e608-6e77-4f1b-8a57-d827fef866f3" } ] } ], - "ID": "9ebf6b79-f511-4579-8d57-de774dd721a1" + "ID": "8a3251e5-4f3c-4ed0-b304-732b1b214556" } ] } @@ -4004,12 +4004,12 @@ "Disabled": true } ], - "ID": "7b003794-97b4-4ad0-82a2-4415885dbb03" + "ID": "7a89837c-b4f2-46c5-9b61-8bf2b42612b9" } ] } ], - "ID": "89fa2ba7-3670-49a0-a0f5-7793250edf6e" + "ID": "f421b086-8413-40ef-b079-2a08c6469979" }, { "Condition": { @@ -4092,12 +4092,12 @@ } } ], - "ID": "3c6a13ba-f9b5-40a2-8302-126843c6c298" + "ID": "38909a9f-a495-4593-ad62-ba43b6386622" } ] } ], - "ID": "c6ddaa2e-3a84-492e-a810-f0ee07b2b36b" + "ID": "dc8bdcd2-5611-4a10-92dd-ba1a4993fe70" } ] } @@ -4180,4 +4180,4 @@ "Formula": "FGC_母版页!$B$2" } ] -}//ZnKq/IFoWDIgHyZftCrYLl1WiUjA9OPdxjHkFjgIwp3Rbgz7KHlDgVWXZ+XbKThTvAPh0AP2KtWb11PkxEzbvCS7xcJZT2RN+NTy9qF+fohtfmfnOKyCXq3ZLBfodz6QS+HsGBm79yZbQWucUxSp7MlTregb+si83wshL0poJWsvVvZyJ6asFkiqKMnC2TSrmhSaXE2gMQglOeqCoabahoOcpMihNjc+Ss8GJGz6cIze6FFiMAuHdSpE3QsaRqOLw2hfoUFDIUYcnJfZU/sdyoSsvbFSnuml5BJlwjKA4nO3TcK0LoVORdYh5jUUrIbihcf9g/Ou8WwjuCVLQffgFaYnmDuHcgzOG3TQspwSzABYCYACTIX7Jc1c+h8265vwIZEKDtYEqGW1J5EOoMJy1k2ip6460jS08Ogd/k9AeOo249S03Rw/8gYWk/0AuZb7+LszcHOJbWC0SrK6kp42FHYzOd04mqUgT1kl0xdzztV4Hb4plINYfK4b/Nv36hCh2eofkLe/XfghmsoQFfrTq3F8A5IG5lqgIBmYZOvfHn7f8RRGQzPlTHnNCldFGksXv7IVRqTS167itIouRpr5LVrfa/dW7dPyiJYhqYFq2so4nQXilfp6XJEbkG9h+wJG37YHTL15hSXTxNt5+qS/Wp+65GttAUWzS3xc5EAvErA+hqqq6P1HQpVIZgyhhnRBijj0Vh97hGHSpOtQC7qtBnQjKnGtdgRV+GtZtGy+nogWNlvOIhwLIr2ilIky17nNg/uEXJX8Om6Rs8tZ+lZsLXF2XpNVO3e/158KQynxLMrzNsTqhOdp222/WwcRmc0c/Roj5ShF73MUW39TvwLfr6VZdZ5yBFNcMM/YP2aqshTJ9fuNcqwwJZK6NIXtUTeYnDE4qSQAmV2arId2V/bk/w==|920 \ No newline at end of file +}//9WXx1tuDbb43RMG7FsmeZobjhBfinUTRmCUp68Zc9mTbPqDf/kn/MyT77Dt5lKcJN16a8c7/0qbRbGQbk7MJ1JraA8grmsvILpfXI8DKz/fVthZe4wwz5lLvjEz/41gTxc1skJ/gdTpWTWv/Kah2qSXVl7y2bp7eyxaC9j9l8YYgeou4sJop6YO/PcJmy09RgIrQw5GiNzxMb1vOcLSaRtzxfgwtREE2nf4RQ6YnaRzUAvS7JfwrcO0u23ar8JZFPQm19Oxpe8XhL58+e0/UwCBJcnPKNM3gGGFpWjT3x8IscfvWSvoqTQq7QyNDTZs2e3eg44e/WAr7lEY4ZFLUlpNf+Vex3dbL6TN75WyiBiE0bol+kpG4NNqlOI7vGh+cRY5LaUpdqT3yXBUE/BP0L3zFXerFCLBcTOBiJ57w+w35aF0g/lCouSm4TElXrw+pMaGmgRKwu5MJrhOcWqiq2ncHUnRqyGhm+C1tuLVI3rBzpW2D77+bhl6cYIOxcttFpdtpJl30zur7TGszvh7/tNeAirX26eyWnTXNDbsAtSrNrraIptMz81y2uqGfHzTIid9uAql4DTeJk6MjnAMk94kGhSyQwoXtC2rSmIFSiDPQ87YEsRmgEjKTyHQTkmkcnbvAZoMWZSbZpQiRCsbs5S4WT3nvqHs8X6SylqmMJLGuyyJsiE2ePSZefJ9Kgb3XkzhaA2F8JeUdSmVjSJzl0Mv5ME3FqHoNTWuULi9+8RhK5uJRg0+7bqWxTcHN7OqvcdNNMRta/D912K2RZuIk86O9S/9eLWJxE5k269ddmoJH1RrTbHbtfw4u4TDBT7xNkgFYZdA/wQXPRoYNp0G0ZxOS/THncpl4uNZ8SaiM0GZrHBcHDQBkbiAm9hWmUmnADcOSdsOMWOxFYAO/7xSdww==|920 \ No newline at end of file diff --git a/Pages/31a709cea02e45ad83bb92336a6d829.json b/Pages/31a709cea02e45ad83bb92336a6d829.json index 9ffb3849..f9f4861b 100644 --- a/Pages/31a709cea02e45ad83bb92336a6d829.json +++ b/Pages/31a709cea02e45ad83bb92336a6d829.json @@ -224,7 +224,7 @@ } } ], - "ID": "760c7b0c-f2de-4722-9f49-9c5bbf2bba99" + "ID": "5bbef090-842d-41bf-859e-eaea8a67fc51" }, { "CommandList": [ @@ -239,12 +239,12 @@ "BtnText": "知道了" } ], - "ID": "6eea72a2-4e4c-4c71-9b83-3621c7001d00" + "ID": "95068e34-08b4-45c9-8a7c-e1902ea68acd" } ] } ], - "ID": "0a18ae24-33c5-4139-b7be-ec2c604d7875" + "ID": "d95dcd01-a943-4914-8569-66aba7118993" } ] } @@ -366,7 +366,7 @@ "value": "编辑" }, "CommandList": [], - "ID": "3ac97d64-3d7c-43b1-abae-45a6d851410d" + "ID": "243aaeb4-5ed0-4822-8bef-e7f9485aa016" }, { "Condition": { @@ -420,17 +420,17 @@ } } ], - "ID": "b1e90b4f-7a32-4637-aa81-726175ede3a1" + "ID": "ad4c6390-8ec2-457a-a4a6-8a455b639b30" } ] } ], - "ID": "4c1935fe-f160-48eb-8e84-6020a527dad5" + "ID": "cc0f1d36-61c6-4989-9800-ff025ac59bf3" } ] } ], - "ID": "9e75e526-9aa4-4d97-bfcd-54cf64b084fa" + "ID": "bd4ab6dc-b6f6-49ff-9e70-e480adcf7e50" } ] } @@ -550,4 +550,4 @@ "PaperSize": {}, "Margin": {} } -}//RbubtWNx+Ni5g7NtqkmMm+r7yjTGe9UnLvpoRE0PZeHFGRZbehRpSKtmIlnMlvf5+v2wjhUkgfijMIO0DL3Re2hIjN6QlrI/5VkkHRmzQPW6lyq1p4747z7sdWfUXEg1QVCv6kEzJwXmqGPxgkMEWHYYIe5np6xHPCXDB2rYyt1SEpL/H8VZ2pcUxm+DbZDz0Iqw28p+ORCCy6eHX6UIckAiUmabxGW/s5Qvc02KcJrqhwOC9KnDu+ysnQHh8iMvo/MdzOIbF/m+AY1Tzdm7fz3Acecu0RFRdWtzqNYzuaxg+yCfR/y5p+sLnJLUahRlwKjdQIuCpgdqbZnuHBGVMbXhDcabCnzkJ0UrlFPh5GHJ5VFpmHVi6w82WwlXAevs0H21JpCJZYG7pIgR5KFcD2HAZh6VVPKSXvif236LDDBmQUIUndm1WPIBomX736NBiRr7Zrcj8Ja0uHTyawGvdmpPUVioCul+d8Qy4tjuvaPi1VYVIqY7mqc7fsmYKiNSFx1DCGU9QlFx/RYFuuRLoHYW90aW3PiVEGxprr6tW4WXtz9SWBmlY6fWpZRwPxHOHS/GAD4aLe/2UVJqWJz33tDYZicoM2owVm/HibOXg8O7QyDYzUw/V3dGgmYk3xxsv5hAOt0KaW4Pb4urDtOclupJEvI2npfGNvzCArR9nHSqZjP20NYE00bMQiSbWFcUGcTjzQ9JFe1hAlvlC+vhrHgPHVNQngZy+selG9bRMpUOughLxTynCHk2DcRM5z9yiYAYUFNZ9j6InQHjqYr/G69f2QJbZ8TAv4mOXf5UPvRL6+Ddlec4oUgt6wHa7jI4dS0baKx5YYxbh4zqWa3NmeAYiPRUOTCPSYRGHZoiW9OM7F5Zke/ukpRO+fMXYzY3ObST7u7RTSJyGw2+NaLNng==|920 \ No newline at end of file +}//pl7iiKqyG9+Nbys4kwGJzx/m4ldA1vaUzBuOVua8d5WRGHvQK47qxxRbvz3/cQKB+Jx44p7uSRKmx/XPGJ9mZuVMNbsP/Z+kdIyq7ki/GUga+33T5m8w2e+WktPRUsVM+NIADOPqmuFL+MFkb0L3iYfGXtUSRcYZ4MrjeBTPrKYJrkwE/fX8YMkPuwgak14Cywcc+ly0hDhG7kgfsFUl04pPd1NFSCPqXzUS1WXmxKUoF2K8AdM8xnH6D84JJcU6fR09zknJ4rve3lYi6hxUzuny0SkJKxdTftbqE5sqhydnVFNq6/YTuEJzDLjl1OvHBtPzWRA798b5rechQGf0K7tqHOQJQur30H1qjTF6/Ly4uOOvVH8Z9mStaxrWQVOFZ8YMkJJ2wZX/4SQdm13Oe4kpOcse2HgvVYU7ybK/pxYdSClHtv+noc1qPAQHCWMttHb6z58EEy078BWMVdYK9WJWQBRZ7hUvoV2s1WKJfV7DLOOIEAl4KuQtEcKiHKQTD57VXvEunE2J+rVwvExx++MYlyFsTFTWUNX+3D2bcIUWM58UpqrQyBl4cjf0i5pgvPHbPUaMpRFld7Nh0TWElUY6qs76qz3RGSMB0Iba1iKjv5iY/R2lDzenrBl/4TT8e60BLTbLirQo9HiYGXfgV+IrHAejZjM+2cgEalMEQS2kTcRTUaZVmbqYew0ViFQQmD6VeWlYFRzd7fAnnb1w+OmrGWNpntO9c/Nozk4eTP2zzmuGHEg9FkfZQTWcQ0YwVPWi7f+PgPaaysbGpjVOJh9DIedRQKHV9M0V2UxCWL/i3UoUbVDD3ug5y8GV4eOWOUUSsac5g0Zcw/IjSDsNrcA6lk+G6UVNxxGGdmVLX2On5i2Rs16lq8uCJzh86LW5jLedn5NlqWyMKEIG1oBdug==|920 \ No newline at end of file diff --git a/Pages/94f8bae36aee4ae7aec2a063ca731b1.json b/Pages/94f8bae36aee4ae7aec2a063ca731b1.json index f8b64ac0..4823ecca 100644 --- a/Pages/94f8bae36aee4ae7aec2a063ca731b1.json +++ b/Pages/94f8bae36aee4ae7aec2a063ca731b1.json @@ -145,7 +145,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "5ebdf5f3-df0c-455c-ba08-586ac3950f86" + "ID": "da65fe26-68aa-40d2-b99b-d23fd2bc4a78" }, { "CommandList": [ @@ -174,7 +174,7 @@ "ConfirmText": "您确定要删除吗？" } ], - "ID": "fc98051f-8554-432c-b32d-81cbe07b7df3" + "ID": "0fc38658-8c01-4b5a-bed6-d275fd641ccc" }, { "CommandList": [ @@ -184,17 +184,17 @@ "Message": "该报工已请款，无法删除" } ], - "ID": "9e619cc9-0e8c-4384-99c0-d6d1642e8100" + "ID": "688f86e8-5507-4cd4-b79a-feb9314cfe70" } ] } ], - "ID": "d33f0a7b-61d8-4f85-acbd-e9c97e3ea5e5" + "ID": "7c626408-b564-47c4-9d1c-dc5bc9d4dfda" } ] } ], - "ID": "f1608231-87d2-4ac6-9f84-d30e053a6cf4" + "ID": "1ad90542-40c5-4d7a-9ced-b95df1222a2c" } ] } @@ -262,4 +262,4 @@ "PaperSize": {}, "Margin": {} } -}//6DK1cXEz0OMgJqDfkKcfnPvr6qK0sqBc5jtfJvejlGBefcvx31JbYppHwL6cNRLm+s6H6M1MsWQCGi258tU58DuyofQ0t1k/FpsnbuP9tU25KY3rVmDkhU0vYwRyqCSn7/8fselqwZxqgE1Ge+LwlxuLpYskVgooZA06nvXsY8QiApWjDa/dqyKudiL84xf4RojHDOWJKUiGCMg4hY+ZMtk1F54Kbr09KooS6i3S01FceV3WXYLy61ElLdqEX/6jyT07rH6xEDtiA/use8oeFRy6aMyj3281a/9oXPF1+dgalwyuY6AIwlVYGp5vvoXVozBmFgwdCMyPcfJAapfCpXYowWfqJzFsfOXoyaEb1uqLRNxWrsAekJ6+LZrC5ANP8RI6fDd1aF1uJo5B1FdswXXu/PokQ9bSYj5IzJQFygA34mtoIfYRBM3s9+e6OCxUPuDIiiU1JrMBfBtmcazr4VBiePSwv4IIkc9Mbg4+WsgekkAl6gcRTIN6Ky055UPIwrK0djlXQKXL20yEYfiFKwsD9KQiARqHi+/ifDQotb0uoaU2oYrR5to4cz4IwhvZl/CN3IHP4loUb2xRyloq7faybWLUAGRCER9dGCNIQkmw3brkzZW6iHlxHenFGymZAYTf/2VL/ggTpd+DOe/TBF/wEGDHQRCO7dsxYDl3BQPAFrIKfelKWghumW5dpvikzpALC6wzehuDalP4LuZ4TJJPnHGHWu3TbyBhv64h5mPM8uzhY/9GIRGiL5KxMElSMFMD3QY4RYDEwGsUTci8/vK+fL0I/wQgdgK1Bujb/NA33R42a2cxUyXbcRRCc0p3PYaCnQ2k1mwuMH3+7s5gfK0Kv/kSxFANTRET/eH8m0YyM2Y0ftWFH1mVavwq3zoNIFZbq1ziqUzvypeDc4y9Kw==|920 \ No newline at end of file +}//+bJlDacmMVzkDneMCzvhYdyK3/c5WhFPHUlqFWTojfVoQo3PrkETaXJGBsj0cCfuxN3tD9HB6bwMEHtsbZyDTttj7Bpa0PUTzoK63lAanVnjNFFkI3zjxFXk4SX8FoGC6oQ7ykTAPxbgux2hu+RXFDwC+RU8auiw8byjyW3UmcDBJZm7gH1ixRvkt3xKTZBHxWDUzTUFylrl49Z7nUowdxYVLxy6aDqf9obdzgS7drzDOw1fnmhh7nP7X6gliV7WL62CypVM8HuAbWWY9UfZtqDOIIoS1q/rM/DavsXMmev971+EcmpFZhT0HkumjxsIUOk8w8S+c9xj3byQCba0NxGzh0tuf0osNfwcUAs82GTxuqPU6P/m6nPxYho1MrpdDXYdPnUDcSuuhsGotJgGasRCli6YNYuarAkogAjZGu8NxpKy8pSkRXdN0X0x6P6HaRBx8l9dLQkLxTRYlGTB12ZzxR7NWKOl0vuoFY5JNq+qnG/pZDY4Qb7Q31bbTC8nWO/R1+HMnWMr8RajXjHcqPUrcVCMFlnWM2juxW0OYA9PZMk99QKZ5dr0B3bL7Uz4OEPUdX0bW+ASeFhXrTPF0wpM0CKmMiz3N9+D7+OiMXmOVg7x30QQV+wqkyCUParlGmoPhYxlUWZTgKerQ7RhN8wm9OZhufIRgdn1ZB/MZHW91ULECfw6BQ9cWUNp2Hbi4iMlu+DapbI4YxtqV2RYsInelF7Ed4nuGPmGjU/YGbrFO7CBlnjn5B05gvbGMZxVVZW2yEqAmpIxnyEyHOTPm8RlUIE/z08PYMIqUwXV/Ewaj3yuyOgQhC/FgEAYtilr4oR6opZOjM7axqD7O1I/WqY9JUn1UJMHDmXX2Dw1ioP+DO2M8B0FNj46IdScp0jYYuY7FLG/YChkw13VEpOsDA==|920 \ No newline at end of file diff --git a/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json b/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json index 05c2873d..75124d30 100644 --- a/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json +++ b/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json @@ -155,7 +155,7 @@ ] } ], - "ID": "53c3e748-c72f-4493-9e1d-5fcb70b51b5a" + "ID": "aec9bedb-4ed4-448b-b830-b3fd9058ad8c" } ] } @@ -229,7 +229,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "2e59aeb9-2f3e-43b7-8e5b-5b2c85adbc09" + "ID": "9f2c15c0-e05b-44cf-9bec-7a8bc969c5f1" }, { "Condition": { @@ -259,7 +259,7 @@ "Message": "复制成功" } ], - "ID": "55d71f46-eb42-4521-810e-17aefb2a28b9" + "ID": "8bd0373b-bd41-4fc1-a330-e91a693a8552" }, { "Condition": { @@ -336,7 +336,7 @@ "Message": "操作成功" } ], - "ID": "6b9ff526-ef15-4ffe-949e-10318e07d9de" + "ID": "849e39ed-aa6f-4fc6-a795-7013507d261f" }, { "CommandList": [ @@ -351,17 +351,17 @@ "BtnText": "知道了" } ], - "ID": "8be80438-9b71-473b-9039-54d11eafed55" + "ID": "3f2a36a9-28c3-476f-9d86-d81173a14a30" } ] } ], - "ID": "93299333-7f50-41c0-833e-dd40c4056ba1" + "ID": "3c8bf5f8-733d-41c3-98a0-37ba948bbc19" } ] } ], - "ID": "7886f22e-e7aa-45a9-9b41-5f2f5ba2c21c" + "ID": "920b07e6-bee2-401a-8c0d-48bf3eb8b8c1" } ] } @@ -456,4 +456,4 @@ "Size": "24,24" } ] -}//wcj3dSbuCcyaq01xugFkQbXiNh0GPJuxVm26qNRPkD9LI3pk/gNfNj7//0ZIFITkbdqSgbwSQJdYSmHHPtwZVPeJ6rtGCRaNfostW12nfPSCNb5M2OGJLPoLWbzswIuH0VVAW+SJInK03QsOAkWW58swKezKyJMD7AFtOHmC59COV6oP7VdMEK7+twh1XCODoxk+Fwuewbcu+0v8MwVrB7ZNavNCTi3yHrbAqRbQeSSOdEJFG+Aj8O95J+COh9RbjTLpLLEI+E6CpLQ5zGTXzz/JoVyrs6y/TAnohPpAQd1zM2mvH3HbyUw/txroMfTzPEapTY63FcX8jSTIF5PpiRYlgryq3hZnYqgLLZsVdirNycJvAVsWBHdnXdkz92PO7O1x5ONnG6W5zSLYQiiN6Md2jtAkFYkv/ZylIVhI8ks5VgNGWeQElaEOaSccEQtH87Sy7NHFaMFL3EL36hpcj4W+jcXpdtfDPJF0gzturx4GS6kdPxqr9oMsqUIjtSzV+BInQuwlm9JQ8tEriuVB0mb8cEUkad+fz2VbCv4ZMG42gQvfG0vYcel0nujn/3u2+5qlg7fH2eCgPdsdmCwFquLl8nE8urJTxheKfJRQS0LZJyIK0OdcCloSWhbkjzq7bsvN5NjAgtkzUSoMGDXnJ5CEPdECsUl+r1siQiYSA0P9DhZ3L4XmXDFGCEkWFTXsP4MWHNdKFvPeYZTfCiaMNbDnqMN1qdL/VVvQQ8H35LNtrkjIqCzzuJ4L6LgWDrqk2wZtPwzFvjmm+l2unnnHLE/J5Hdt1pjGzopk/op6DQdvPcUOLRqarMutCTDHTcWkOjQj0EDlqwj4hOYu58ExxTz+Z3f5c1xnIoWInUnJoGFW4Gw6c72SJ3i9WlmE9nfws5xdAM/58jbLHdC94CtbbA==|920 \ No newline at end of file +}//3Bic3cKKVmflcz9RvzLpHgLfUC4jtS7xdTwbc+rUmdAIp4mhtjCRfYDll9aw703qhQOS8ZbM+kGWhVc5eM2zZtQ5Yj+yBBJPANVRzpR4LQD01jZcSl8PAd2TySITlRYhkD13LxjDc6KGFpWAR8D2sp0aGVQX5WdcTqzDNhr92YvMPoGgEmQoni54BNm7HKmkzB3UQQSFzAmhf92KZkWRud9e2UqOIwlAUWsQBx3dL8n6tjU6eLK5m/CLXlyhU2kyu/b9RkI70FVdrZtDqOTrwNbqEhVBBuEiD+VDwLhqq3h1g3Wz1axkVjcD6PY5jS/CIco3K1ZaP4Ac9k3ZEK70hSMbJTB8sdawb92nBDH4lP1RQWsxHhY1Bd/NJksOhGF29jNVb8ToxwEFMhUEPWGieBQkahZnsbvMGvMqWLd6Ix26YD20u2cWd45qozEIqpeXnhxQgRZToayRjEC3bPR/ueN4L5EdoeW3EwE7BJ2CqvxIBqdPUYTrJcml8Ps1j5/j/hoAcyP4+Ht7vKROVQN3R4yqzRLkZ1nVndxrsxVOgQVej6f8/kmPwwY5h9o67gwDF6ccSwYeHF7t26tlQEdbK20jA8TJT5qNNKArxw7Zsd2bAWGLDRvNLvcDrWHOGn5eXF34rOZECYYii6CYKpsa7cSq0OL9RSlzItQyBAEITzfr0bhwkgoq1cz1L3dS9Yq6Z9f59lwOiW0B0FnbBoPIGZZULv/i2x0w/uLk0CIyLCVCuQma5OiKhxCudDIKhrgqmkj1V9D82MWFXRa6qxQIYdqLq5ke8YUCvCmweKZ7oBcHgFkIxOXmiZOHz4m5iBa/e9/oJUP8fTm8VdN8J857YTMYz5PLvuugh/XZBy1Gcpcrdy3XhX2fVqOsPgdS/+cCnAStC917adQfjI1vogEUBA==|920 \ No newline at end of file diff --git a/Pages/任务/任务-基本信息.json b/Pages/任务/任务-基本信息.json index fca8334a..57e79cc2 100644 --- a/Pages/任务/任务-基本信息.json +++ b/Pages/任务/任务-基本信息.json @@ -295,7 +295,7 @@ ] } ], - "ID": "32ab62b2-3e11-4c4f-95bf-b45103b7e7a8" + "ID": "9aee4140-f287-4684-9017-2431b4040d6c" } ] } @@ -434,7 +434,7 @@ } } ], - "ID": "dcf457cb-887b-40fd-8ad7-a88519440522" + "ID": "dca7b651-f808-4e2f-9a40-8924e3ed03c9" }, { "CommandList": [ @@ -449,12 +449,12 @@ "BtnText": "知道了" } ], - "ID": "9896ee58-c2ad-4ffc-9abb-3a32597ed866" + "ID": "5ee5a05e-4fdd-4272-abb7-7c837a20423b" } ] } ], - "ID": "4aec0221-9f67-4bb4-8a12-e17f231eb2f2" + "ID": "5e910725-86fe-412e-886a-8beb419a0f0a" } ] } @@ -467,7 +467,7 @@ } ], "Comments": "小于进行中", - "ID": "25277404-00cd-4ea6-93ca-67b8e7573153" + "ID": "af07cc2c-3a21-4b8e-8c58-0475a057ffc6" }, { "CommandList": [ @@ -477,7 +477,7 @@ "Message": "任务尚未审批完成，不可修改状态" } ], - "ID": "96efa13d-88d4-44a3-acab-6aba6b48357a" + "ID": "a4e9006a-f221-443c-b8c1-d61f30a67769" } ] } @@ -575,7 +575,7 @@ ] } ], - "ID": "ae8893bd-0699-4eb4-aaa5-4258d9b59aeb" + "ID": "07345b0f-466c-4e0f-ab7f-141350d6969a" } ] } @@ -765,7 +765,7 @@ "BtnText": "知道了" } ], - "ID": "ecb8e642-a377-4c12-98c0-a607aa06bde6" + "ID": "a250635e-937a-4425-ac60-7f1b1d7e93d0" } ] }, @@ -779,7 +779,7 @@ "Title": "计算中" } ], - "ID": "0666177e-baf4-4644-b5ac-55409486b64e" + "ID": "9bc80e2d-765b-48dd-83f1-62af1985baa1" }, { "CommandList": [ @@ -816,12 +816,12 @@ ] } ], - "ID": "ed45a493-01c9-4e61-96fc-cdbc007ad234" + "ID": "eb9d3ced-96ff-4601-b113-66aebfcd7300" } ] } ], - "ID": "3a99de45-b2f7-489e-b9ce-57403582b38d" + "ID": "818aaa93-73e3-49c4-b2b0-992107b59731" } ] } @@ -1243,7 +1243,7 @@ ] } ], - "ID": "6c05718e-7e36-4efc-95cc-6454f8bae077" + "ID": "5080a321-a60d-4d43-a652-caa01cd6c6dc" } ] } @@ -1511,7 +1511,7 @@ "BtnText": "知道了" } ], - "ID": "0c5ffcfc-17d0-4345-b915-3b0fa514a252" + "ID": "b508cf1d-2051-4966-b909-306b14eedd93" } ] }, @@ -1525,7 +1525,7 @@ "Title": "计算中" } ], - "ID": "6b3d6411-53be-4036-80e2-7a385153ab91" + "ID": "fd6d2ee5-4a47-4bc6-978a-049bdd25e2d6" }, { "CommandList": [ @@ -1540,12 +1540,12 @@ "BtnText": "知道了" } ], - "ID": "3b751002-d879-4f59-826e-bda52e9266d4" + "ID": "09beb4d2-e03c-44b0-a0ab-973dcc35fd2e" } ] } ], - "ID": "db33986f-036d-4f77-9bdb-f241f1da0fe1" + "ID": "7953cf6c-6f79-4d89-abd3-86fa7bf93fe0" }, { "CommandList": [ @@ -1581,12 +1581,12 @@ ] } ], - "ID": "75dc3e06-fc11-4488-8922-91e646e2c5a4" + "ID": "822ad858-c5bd-4fea-be65-3c3c77622f4c" } ] } ], - "ID": "8ecb7118-74cb-40d2-8a55-819967f2b456" + "ID": "28270ed3-ccca-4620-a694-7aaaea66a97b" } ] } @@ -1691,7 +1691,7 @@ ] } ], - "ID": "dfc3f48d-3b06-4199-97dc-03b4b31c9107" + "ID": "56b3db87-909b-41e2-b97d-cd4c878eb0dd" } ] } @@ -1842,7 +1842,7 @@ ] } ], - "ID": "1a77b74b-d190-4b82-b826-84b75ffa87b3" + "ID": "7c34c6cc-1853-4116-af26-ec3e19151a04" } ] } @@ -2006,7 +2006,7 @@ ] } ], - "ID": "20fad39e-230e-4572-8518-a3c1cc926c3d" + "ID": "7d75e77e-af8d-4f14-bcb1-822d571a9bf5" } ] } @@ -2114,7 +2114,7 @@ ] } ], - "ID": "1a733eee-0c0e-459b-ba51-ee45abbcf8f3" + "ID": "13fdb8da-7d2f-4d22-b02d-b46fa7cf2882" } ] } @@ -2455,7 +2455,7 @@ } } ], - "ID": "1416352a-e8fe-424e-9e4c-a2a22e722a3c" + "ID": "9fc848bd-5f4a-4ca2-a0a3-1d7531f15916" } ] } @@ -2479,6 +2479,22 @@ "RelatedDataTableName": "任务表", "ConditionFormatRulesCollection": { "Rules": [ + { + "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=OR('任务-基本信息'!任务ID=\"\",'任务-基本信息'!任务状态码=0,'任务-基本信息'!父任务负责人='任务-基本信息'!当前用户,'任务-基本信息'!项目经理='任务-基本信息'!当前用户)" + }, + "Priority": 8, + "GUID": "afb042c8-a4d1-42ef-be1b-21a92da752b8", + "StyleInfo": { + "Underline": null, + "Strikethrough": null + }, + "IsDisabled": false, + "IsInvisible": false, + "IsReadOnly": false + }, { "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", "Formula": { @@ -2499,7 +2515,7 @@ "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", "Formula": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=OR('任务-基本信息'!任务ID=\"\",'任务-基本信息'!父任务负责人='任务-基本信息'!当前用户,'任务-基本信息'!项目经理='任务-基本信息'!当前用户)" + "SerializeProperty": "=OR('任务-基本信息'!任务ID=\"\",'任务-基本信息'!任务状态码=0,'任务-基本信息'!父任务负责人='任务-基本信息'!当前用户,'任务-基本信息'!项目经理='任务-基本信息'!当前用户)" }, "Priority": 6, "GUID": "f7c3f6d5-8b51-481e-abe2-d1a7b9beee5e", @@ -2596,22 +2612,6 @@ "Underline": null, "Strikethrough": null } - }, - { - "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", - "Formula": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=OR('任务-基本信息'!任务ID=\"\",'任务-基本信息'!父任务负责人='任务-基本信息'!当前用户,'任务-基本信息'!项目经理='任务-基本信息'!当前用户)" - }, - "Priority": 8, - "GUID": "afb042c8-a4d1-42ef-be1b-21a92da752b8", - "StyleInfo": { - "Underline": null, - "Strikethrough": null - }, - "IsDisabled": false, - "IsInvisible": false, - "IsReadOnly": false } ] } @@ -2658,4 +2658,4 @@ "Formula": "'任务-基本信息'!$C$8" } ] -}//L7zFn+QUsM8dqjKB3Lj3TULIGW4LMhHw/Ca8Sza1e3PSHPy6cP36jS2bYAb2koVqwziVRFSf4Izi+IUOnDuC6BIzSnasz21LfvVQeeyGEWA8ZFJeC/SU83T30aKDaMuIBK31twOC2Xe0UCCg8xzRPNK11kxkbFqeA8GltVezzdds5TSOMOWaPV8dyZNOCzPArZUnjiIvy4+5CJ6siR9ZIKCtvIQFCahi4C0J1i23Qec+JYqGx5sWKEtDs98WV5wZeR5ge9vWXPhTMytxj2WtpgM9gz+w30rRuX7+/xoLMGhDdQRO/L93whgydU/SmNBMdxJoFwOKAgLmiyVk+TWwnjonOV6ig34+BxKAubo1gJS+KsDY3ICFxFt6DV8SF7K7ibmmSihSEJc6KBa+c62rdcNsBeYwsASRi2TRq9kX82uDMi/faR9Zudt4ertTmB5YmvFks5ld+WIHQd8v+mGA5gKi2XM7IeqA9uCaMFLFQx6tbXVvE6VhsXmaVDzjWEW9/KlZ9UeLjDBJkeVnZ8LWVrmM7NBTYh2xAlr2yEy1A0DA7S5RgDT4wn9l8c2jCSzJRKQdguqnrMQGYi8U/48c00RATHFY+r7eii8Lg5TJXT1yxF+TiSFGJPotMYcuTredHGlYblCy6n90yoVEy6CKNHFja6fPS3j5Jb/dGyO6QXY2nGgM3HLA87nUdoZcMqsBW0nJDst15Tg0hSQDe/vAsRZLbiOQWbpjieCA2hczFFSIwIEEpaDJRyF3bqafuQWWqungAYC00UQsZulr+Swlh7DdOD3QcpTK++SYH4K2w2wkf34MZomWrPdvPGB3E8VlNag1LiPPkHmNvDutEuFV+Zr4MZ66ZCYihw+mJPzPQgwtWrKWQBHGA9obuSrPl8vbbuB7Zj7TLEx4Hb5bBka8wg==|920 \ No newline at end of file +}//7VYSbwJ9n+NlvJcktRgTo/JAjauoG3dQo439OIto2RZUqf4GbFVf4XAeIEAf4xoRHJWJ34kFvfb7xBDVTBxvC6UVVWragOQOh3FfK3kP0QOuRtEHhEQ8wFGGI/W2+mmNnZcUPXZKOJNFwIo03yq3OhLveuiH7WAo9boC5A5LDgUbuGDhjbYqqXHnLGjTiuKHDnF700XNeWSVpfAh7xKXN3Ms8e9JCsrv4QAnHOWBJXhzSPhi/avGiS9BR26NfLcc6oNXAsxVectQMGvyDdNac6iOEIFKWuDpjOa0veaKBUic5HRHgkLIaOHj9idaccdQ/4InnO1zlTuFmPAMZ4MOVP/80LvIWO9JCpahcwPEtr82+bSSX4vK0xCPB2bMcSsMUs2JStXgyaRblC4gtAcFtRlmPyp57BJ9pl1bi1fb6UHYNUdrHxbZ6MtBWbVyFaQJZmnjrHMDNFlNN9G7wbZzwZF4B96JVkpzjYwl/VA0dcRhq+5+uQAgao0j/Q1PzQAUq9PcJA2xU9cYo4zfH4Coa9xJ5PRLYgAmLUmI5Hqm4COt+20+K0y4lKRHB3pXd92/FtxE6Q42UmBKrla00ajAIEfV1RdaPsrKDBbidr2VEhUYqU/6HGu/Tr/stkJ20l5megj57SIALuvh9kZ15Jz95OtTaGnM9vtRZWq6dM8+OpOq1DU/cI6hLMWkonlTFSl2Mrr7suipN4Ey5Be5TlxSsBJCfJGZtzDv6ulGggLsb7rPTQ5d/SJiNBs2DIqZ+u4mFUyO0/3i8C+4vMxXTAE5zfbRRY8CVpp4pCiye9QpeyM0RKHVvqEpj2S1y76EvBHkQE2dfh0+pZFre8UpglZlabBYdtB8CNrHskkMnSVm3lJnGGNUcGuT8A2xhU/vE5hrR7NW87N1CqQ8Zdat2BRVYA==|920 \ No newline at end of file diff --git a/Pages/任务/任务-工时.json b/Pages/任务/任务-工时.json index 13100256..2698b304 100644 --- a/Pages/任务/任务-工时.json +++ b/Pages/任务/任务-工时.json @@ -336,7 +336,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "895f8655-0ce6-4309-9cc1-fd6b8c4c12a3" + "ID": "716320e4-cbc7-4560-a986-6e4b61623229" }, { "CommandList": [ @@ -375,12 +375,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "71b59e8c-c3a8-4c65-8ece-2c26588e7a8c" + "ID": "5630c3a4-75d0-4fd1-909a-d7a8ae3821ce" } ] } ], - "ID": "a5b9962d-ae96-4e53-9a8e-9c3947e5f553" + "ID": "2e255b30-b15e-45c0-b5b2-6410537c18c0" } ] } @@ -412,12 +412,45 @@ }, "CommandList": [ { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PageName": "分配计划工时", - "LoadBindingDataOption": 1 + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务平行视图", + "ColumnName": "任务成员", + "GUID": "ef34254a-1377-437c-ae84-35e532d97189" + } + }, + "value": "%CurrentUser%", + "compareType": 10 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "分配计划工时", + "LoadBindingDataOption": 1 + } + ], + "ID": "83b199c0-5f78-48bd-a4c5-d195c387449e" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": "你尚未成为该任务参与人，不能报工" + } + ], + "ID": "d507d752-43d1-43c6-a13c-d9d4811d5d91" + } + ] } ], - "ID": "19e98ec9-7e5f-4ac2-8c38-4ba8406c5b95" + "ID": "de4a3a76-197a-445a-9ff4-a1256f05753a" }, { "CommandList": [ @@ -456,12 +489,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "c3114060-0513-450d-a327-790b593e9612" + "ID": "aa807580-ed8c-4a51-99c6-0a8fd7842e50" } ] } ], - "ID": "df3ccc64-29dd-48b3-8cd4-af0a449f09ba" + "ID": "49c7c319-bc07-4b5e-bcbd-44a077ae5332" } ] } @@ -514,7 +547,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "c03e5c3b-62be-44a6-bbf6-fcd3dc316f4d" + "ID": "0e96bc2c-7d72-47f1-9031-62faf08c52c3" }, { "CommandList": [ @@ -553,12 +586,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "3da0346e-2880-4461-b835-87e6a8192685" + "ID": "43e69277-5654-4a1c-a7aa-f1251d83ede7" } ] } ], - "ID": "aeba3d3c-104e-4ffe-88d6-bdcc3a04b4b4" + "ID": "88aa86bb-f591-4b64-82dc-0f46f917ee0b" } ] } @@ -607,20 +640,53 @@ }, "CommandList": [ { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PageName": "新增报工", - "PassValues": [ + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ { - "Source": "实际", - "TargetCell": { - "SerializeProperty": "=新增报工!工时类型" - } + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务平行视图", + "ColumnName": "任务成员", + "GUID": "ef34254a-1377-437c-ae84-35e532d97189" + } + }, + "value": "%CurrentUser%", + "compareType": 10 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "新增报工", + "PassValues": [ + { + "Source": "实际", + "TargetCell": { + "SerializeProperty": "=新增报工!工时类型" + } + } + ], + "LoadBindingDataOption": 1 + } + ], + "ID": "74cb4f25-fc02-4df3-bb93-dbff098e66f5" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": "你尚未成为该任务参与人，不能报工" + } + ], + "ID": "074e6b15-061c-4320-bdcb-5108310bfde5" } - ], - "LoadBindingDataOption": 1 + ] } ], - "ID": "1a1863cc-5999-4e92-be69-59600d6f5fef" + "ID": "9d8c047c-0e01-4e89-9f25-0330559d297d" }, { "CommandList": [ @@ -659,17 +725,17 @@ "LoadBindingDataOption": 1 } ], - "ID": "1afa66d8-8fc2-4e27-8ee7-ec25857413d5" + "ID": "1ba6fb93-0a86-4148-8ef0-3580221d20b6" } ] } ], - "ID": "914bd6af-b421-40de-b60a-5f15605fb842" + "ID": "d1307e89-3769-4761-ac05-26412c39a4a3" } ] } ], - "ID": "0a3a4ddf-05fa-4220-8b97-e7374888f146" + "ID": "75634a02-8a8d-4139-b52e-22723f73de96" }, { "CommandList": [ @@ -679,7 +745,7 @@ "Message": "当前任务状态，允许上报工时" } ], - "ID": "15f9dbb5-a792-43ba-aefe-b8fbc0183b39" + "ID": "4010e48e-ec64-48e9-ba4b-d41e0c33a90f" } ] } @@ -910,7 +976,7 @@ ] } ], - "ID": "5fb29e7f-d12b-4bff-b072-f60a97221846" + "ID": "55c5ceff-5069-4e3f-a7a6-515c0e5afb5e" }, { "CommandList": [ @@ -930,7 +996,7 @@ ] } ], - "ID": "8fcce238-2a55-4ba2-ac3a-b9369b453898" + "ID": "117b5d0c-4477-462b-be5b-19843e317d29" } ] } @@ -1280,4 +1346,4 @@ "Formula": "'任务-工时'!$V$14" } ] -}//knQbsdeoujpfNfq8P4HF+rATz4cp/exCRfXv0mSk5ARtOv/5IyBnzr5i02XGXJV8VatcZunRWypKzYJGV46IV/1lk6etIwoqkH1G+liPCAe4nD0Ycx3cokjsXyB/YVtunajPcZzNzwlESaOAaE37KLL6pqIMR/xy68Z3b24lca1j+ahH799zcg5FFDemhr+WZz/rH/ERQ/h4Ae0FGMlyfd+WkT2bRdYhYjH5YXlIWQGwDb9dIjByS8fosYa86s7ICowDO/3No/+3UMjLIkemi977UqKi0R7vPapO9km+pJnklZDVzrLM8ndwk9W8V0L2BkjZae/Xwb5VYHWtHe4W1yTmqAK7kdUXOWJWRQBp18Ggc0D4Wb+p6+EpHr5jWBTYtb0xqem0EIS8ZBT2tUbPDTQBY9MTpsaIoK9FInV3KkLRBN/Vld6NWMM6hrDMABGjEMlyUkkRnFTIYJmvYGLlN95GJyzG2n9lfDksSjSG3yC4G18Oe1p4PLu+MMSBjTh8unBXFlehP8dknVIr/0yMYbPEBLCN+pOd2h6WuaIDFncmzOJbmkFXAi6chPonvfiHsXxTLno50PuBfN3X73mUGvn436bCGJnMuxiVjdkovqv49pZJKM9aiF/l4HiDY2XpeiEL8uUWdAjL2kTDzzHv47QsIoDTkQ64upOtGnmjeaSn0deaS9Kw75RuiT1XbTiSnVkif3OGEHtPVRud4Wxx+pjJlDuuIOrV3brwFDpYwHXtGfTtuXss+KoKJh0S0TMcd5KCFxNmuqzd9svGg/eP1aKqOL7sXOIedHdDc85sjkzypv2sU7Chcyk9F/Zyvai5ajDZwxmArHfFfWdMarGJQWIXIjTnDOiofHjkwNQ2iqxDlb2ZbMVcYcwTyz3q4rnGDecVae1oJ6kRPCKIBqaiUg==|920 \ No newline at end of file +}//ZHx43Eqt68v6lJ1InvQBjm3ZQ6lt17CX0d8QgTxuvV5LC5Jhjx49qtAk1mvHOCytcrZquVBVTCmrQal+5Nx77TiWg6380Tww0H313Zzz1NoWWjh4tvAm8h+TaRukLC74N0uqpIc/bJl+yEyLG/kHXdJ0a1TjZZ+Y0YS+h/Iz5oFFlN0eyNepOCMYxX58FLKGnfepAGwErFP3xhrmsp3wmYVhlD1yQ5kcf8mA4LrE/X2weW0zYKMAL5BpHFT0uSiLC/bzr3FRRCu+bH3Gx7g8fWzXCgqYjxdT+zKb5BaQgZEEbo2ASKwyQRK8XpX+wJZMmvKSwQ9lZ2gHnbYNGpU0kvQmmmkkd5I91OzQ1Z1F0pYFM/ejkuKm9VF51lNpq7kjzwDusyVftrK/G2yVt0+09iDLZQ5Q+v9Dmc8g6G83+lzPW3qAFZvouz5ALGwFgYjhsjbaPKjEqZawezP6EIdGiXurME4lh0DxLHGh8CWb+QebaeV3+BeLJvx9WuDgQAuCbGJD1vzK38hOjE9nz0DCMbEMzuRPuLUtIiVrkagyaSC7HJL3EAZfz4Eoac2clz8Zw7a/2ut2DS0B0rh0iU7oLchJr/wTVAYu7coRNcF9dMnrQVHHLmHInXgaL6DA+AEXb/7fFZnOOJJzNEYxzR/LCZlIL4xjiD5j5jY1qdAROMpkIF7phJYTFk5ARmj7REq0RNEDuvnD+XmAstmPuA7OQgrk1KZrFBffpEkncn1QhK536lhckSU3qXBtuO5Jg5H2rAzssLqATN3lCnuzt+2oKDdZWEJqkkvFoH1O2wOxklvg5rFTiir0pmUSl4cFjriXWX7AhHppr6Um4jwFoLSlmGw2683Fgpzlll0SZVvZj2aJDHzgIpMWDlkeWYoK/HzhaFtaN0HDTHHIFq49AxDnhw==|920 \ No newline at end of file diff --git a/Pages/任务/任务首页.json b/Pages/任务/任务首页.json index 64579255..b6943d04 100644 --- a/Pages/任务/任务首页.json +++ b/Pages/任务/任务首页.json @@ -289,6 +289,14 @@ "CellType": { "$type": "Forguncy.ProcessPanelCellType, ServerDesignerCommon", "PreCommands": [ + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务首页!任务信息容器" + }, + "Title": "加载中" + }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -306,14 +314,6 @@ "value": "提交" }, "CommandList": [ - { - "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", - "Cell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务首页!任务信息容器" - }, - "Title": "加载中" - }, { "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", "ServerCommandName": "任务发起流程前校验", @@ -374,14 +374,23 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "2cebc37e-164c-47b3-b97d-2c7e4352fb0c" + "ID": "5e69cec5-4567-4f7d-9bcc-d2d17d35e8ce" } ] } ], - "ID": "8e9b3723-fcf9-438d-8c24-42561972b337" + "ID": "b844204c-b42d-49e7-8798-744d87c19dc3" } ] + }, + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务首页!任务信息容器" + }, + "Title": "加载中" } ], "PostCommands": [ @@ -406,13 +415,28 @@ "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", "Message": "保存成功" }, + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "bcde1900-7d7d-46a5-8cd1-facbad4d0ac5" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务首页!任务ID" + } + } + }, { "$type": "Forguncy.Model.RunJavaScriptCommand, ServerDesignerCommon", "JavaScript": "Forguncy.Page.reloadBindingData();\r\n", - "ID": "62b3d54290a24467892f7e123bd02d94" + "ID": "e2e848e0e72d48229c97757429d446a2" } ], - "ID": "71cb6e4b-4492-4933-a506-30ba69ee48f0" + "ID": "43c0ac92-73fc-41b1-81f8-def699b23b1e" } ] }, @@ -626,7 +650,7 @@ "MethodName": "Refresh" } ], - "ID": "2a24996d-6e8c-4e8b-8c7d-317085ebed65" + "ID": "19b06944-5ff7-41e4-b477-07a8621621b0" }, { "CommandList": [ @@ -641,12 +665,12 @@ "BtnText": "知道了" } ], - "ID": "6a1f8ea9-9953-4662-b969-f311660a4e0d" + "ID": "17d2245c-a408-47ba-86a7-34984a56abdc" } ] } ], - "ID": "f197ad9c-1286-44df-a2fb-2af20d89e51b" + "ID": "0562fd4c-e5cb-4d2b-a92e-d6335f3329c8" } ] } @@ -740,7 +764,7 @@ "ReloadData": true } ], - "ID": "90c44a87-4065-4b4a-aa0c-77de0f32cb85" + "ID": "acc8a4b4-e6e9-4129-9fb6-520cbc3f8423" }, { "CommandList": [ @@ -755,7 +779,7 @@ "BtnText": "知道了" } ], - "ID": "12c84a30-f214-417e-a41f-f0518fbcd291" + "ID": "5da9e128-d303-460d-800f-46b2b5abdbaa" } ] } @@ -895,7 +919,7 @@ } } ], - "ID": "bc8998cc-ffa0-4980-bb35-e70fb9a75253" + "ID": "40d51539-4458-447c-adef-d8d06b6562a6" } ] }, @@ -936,12 +960,12 @@ } } ], - "ID": "7c9dcf85-5c86-4c07-a7a3-844ebbe0709e" + "ID": "7d6c696e-d4b3-46c4-aa3f-68c22e22795f" } ] } ], - "ID": "fa0c6ae0-3047-4b99-93cb-4e8a7bb0bfd6" + "ID": "5f4af685-829b-465d-9c01-98a01ee8f254" } ] } @@ -1002,7 +1026,7 @@ } } ], - "ID": "5228301b-7089-49bd-ab93-a0cb24ec8675" + "ID": "8d27e116-bd1a-441a-a3e3-0e288b10d9bf" } ] }, @@ -1043,7 +1067,7 @@ } } ], - "ID": "95f8e566-6f80-4510-b50f-d4d814192f8e" + "ID": "09243786-f539-4502-9e33-62cb60263613" } ] } @@ -1157,7 +1181,7 @@ "MethodName": "Refresh" } ], - "ID": "689859e4-0a52-4852-ac6a-87fbe8088c92" + "ID": "af8e10de-a6f6-457e-9b0f-96a7f0e27ecb" } ] } @@ -2055,4 +2079,4 @@ "Formula": "任务首页!$Y$7" } ] -}//EjdNQ5JZ4DIZWaBL+SLlk3PO8WwC1nArcANqYFhbwFm/L3Cq3gSXYvN7pyargdjt7AFq09eqQDvkbteZ1PIp1UqU0w0S5wubG0puh41owgk09+7sbIrNhD35N/mIEJ2eO3UoJvyRorDOaOuZLxXaGJVIQu2kbNki8OJblu/SfEarnNyGApO1EWkmPoJNssgl8EGnbYSLYgdcuiNWZPJD46F3mLtvwOA0ELf+S733BcsVwn6fGJ/RH/XHZzahECUkeHDNkTR1V/xbit7kcboXVr+FAXtvWcHlSu3mpRO1W3sYmE00EVXMaTMRg31O/nPyWPq/R4sZmulsO0UHRhrNUQuxyWmYhSCj1JqekRrnmMO8QfTAiIKrnGyTRWDlG6vJyLLl+12XVnbtA2qmVi3RMnrIfJOCaBAjJlXnEjEBkWM38J3PaOeUkd6yhK61SAC4Ws5MVY1O3J0RdzDxv4tdoXAmGMz8vzPfhpbWxsthhevTZPUAS1Nq2Tn4V9zxI/h6IW9hnPxDVm2FHwf+/ACoL+zMv7FhxaiBhdfXBZg6LIc1BDOKBKYnxvE5YXu6cwwbTEhUlb5oN2vYr4prbF+DJjMVl8ALadpbHU4rXnwyICrvCChiHGxkIZbxumsA+rn6XVQcE58tZyq/CSAnouP6+0T+lOSoajSYOL8PCMc8MZJq/N6zxZZW4c+qFfmWexZo7Ktw+TaxY7UqEtnQ1os+sUzluYDDx/BNlEfWAD8KXoQbq4F0Wte6x09pJaFZbKroECVCctIRy5Nrh29VmlITWOLGAcjFSJp93gpK3PjIinza3hP79jrjlZXMulrTABPnQQiqElui8IZ3hja477MMLWyJx436+OKIeTO0raE/DJHgYA7YZh835VJ6pcbF/qi6YBvSdPRYb0JDVxTFzCV0lA==|920 \ No newline at end of file +}///pUhEMM+AvARn9oxUoFBEkFRhwM0KywnyizUB5dQY8/U4LMKot/S+fBjz+EUnAeRMIeibnMmAWpcil8JOwxFReYEQAKrmF42W8I2sZWQLMWXAl+fRtMqBcFZiOjjW00N7SzRFxe8RlP9dHSpa0FCG07lAAELNPQgt9gqtOeyxbvB9jx8bRmIJ5jfj+rPSw2mlC2osCGSoQOlxm3J0eDhXOsx7yWFbPRNUhy5ahvx/yMLMPyQsKWwxMpFvgs08LiVBeLapygNl+Xk1zrC2wx2CrU2rQl/MfjJCnm/JG2zcwrAI5IRXv+cBNZb3/M0UwiNA/fSrnxUb4AYgFVaPKwJN3aBNoQqsBmfsiVCJEgnRb8LIGx+9LvfkOtIe8VcCcxnuvmWpjG2pSGJ66WV4uZvHx1tym9n31eTmV4DAuZZpvo9pyqKH6qHfDLWo63eTmjBEXNb7b30QHgzkfi/qJ0Nqq9bn7mYJ6a0K/rH7iVZznaiczvMUjA9gNedwcj7WQ1dH1Gt4eewQsjKPdm8FSvpSroMi3VK9kvGItVB6LhCx3asMeIXruntR4WM831S71R4I1u/e7HD72z1Dpo2XEBcnESIqCULKl3Ix0ClLqI16O+pPyZs8rqFz6M7rYQDA7ukzNBQw1Se4UMBx80pCOFAo6ti3RGW4l2AeljXR+78D93cX+DSReNBGeIkeVOwzqTnGKnYQhX9V7DY0cKueC9wEbzMFJ8ayBukLifKhFCmR+EVDWKz7/EOHk6WmuYviF1RpkUqraCjXonm19b9L2TnsRuuA+hDD0lo9ORPWYFlPkv7DQCyNx9yfI5KTKlgEG6mHbVSsF+58jRv9OVUgjwi0ZxkZdxs8ptPKOC7i3ChNLN6h79ws16D8XidWwuXLSzU/6oI9YReag6dHOIQw/BBXw==|920 \ No newline at end of file diff --git a/Pages/任务/工时/新增报工.json b/Pages/任务/工时/新增报工.json index 53fc2679..a9a2202d 100644 --- a/Pages/任务/工时/新增报工.json +++ b/Pages/任务/工时/新增报工.json @@ -324,23 +324,23 @@ ], "bindingOptions": { "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "任务表", + "TableName": "任务平行视图", "BindingInfos": [ { - "GUID": "97c2655c-89f5-4a44-a037-566ea2030de0", + "GUID": "e7c0c96b-2e6a-44f6-89ac-3e4fc0a796d0", "BindingInfo": { - "TableName": "任务表", + "TableName": "任务平行视图", "ColumnName": "ID", - "GUID": "6824bbf6-656f-4f1e-a762-238798b13a53" + "GUID": "f163780a-a490-46be-92f0-e36d293d23f4" }, "ColumnName": "value" }, { - "GUID": "9f64faac-2146-46ef-85c8-7d8d88a96d55", + "GUID": "3c3a0849-34b7-4a59-be8e-52d9cc043a84", "BindingInfo": { - "TableName": "任务表", + "TableName": "任务平行视图", "ColumnName": "任务名称", - "GUID": "fcae9957-8fc6-4c13-88e4-715d89829c34" + "GUID": "2116795e-364a-45bd-bde8-30e634b4b93a" }, "ColumnName": "label" } @@ -351,9 +351,9 @@ { "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", "ColumnBindingInfo": { - "TableName": "任务表", + "TableName": "任务平行视图", "ColumnName": "项目ID", - "GUID": "25809070-f2d3-4c8a-aa77-b00ec7760e83" + "GUID": "13b54fab-23fb-4c76-acd0-82445ef0d968" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -363,9 +363,9 @@ { "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", "ColumnBindingInfo": { - "TableName": "任务表", + "TableName": "任务平行视图", "ColumnName": "任务状态", - "GUID": "a57def10-6e47-40cd-ac82-9c8b20a66dde" + "GUID": "2bdb1dcb-09e5-41aa-b178-531664327fb2" }, "Value": "2" } @@ -379,7 +379,8 @@ "matchMethod": "contains", "loadingText": "加载中" }, - "noMatchText": "无匹配数据" + "noMatchText": "无匹配数据", + "IsDisabled": true } }, "6,1": { @@ -569,7 +570,7 @@ ] } ], - "ID": "a5293aa2-316a-4a3b-af61-fac6860e8b26" + "ID": "30af84e1-b7a8-4b97-a467-dbf210b84816" } ] } @@ -706,7 +707,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "c7f65013-95d7-45d0-a28d-91ac1348f5af" + "ID": "0c3b9a35-a69d-499c-bd95-772f74c382fa" }, { "CommandList": [ @@ -818,7 +819,7 @@ } } ], - "ID": "08fe637d-0de7-4e60-ab6c-08fc9ef6c7b5" + "ID": "a22922cf-95c6-4994-85c6-491d1322b74b" } ] }, @@ -832,7 +833,7 @@ "Title": "加载中" } ], - "ID": "16ebeb33-6f8a-4f3e-90b4-53ef63568f97" + "ID": "8da81a29-9391-4313-bb05-b24bcb7c00ff" } ] } @@ -1146,7 +1147,7 @@ "ReloadData": true } ], - "ID": "82388974-49d2-4706-927e-33603bd48eba" + "ID": "1bcebe1a-2d93-43a0-a56d-6870e0f56935" }, { "CommandList": [ @@ -1161,12 +1162,12 @@ "BtnText": "知道了" } ], - "ID": "a426b464-72ce-44fe-a92f-24d1178580ae" + "ID": "8a9932b3-94ab-4d31-a3b9-711f193ce697" } ] } ], - "ID": "725cbf1f-08d3-4427-893d-ed62c31e1e7a" + "ID": "c55ba409-fde0-45f3-9998-b066c851bde5" } ] } @@ -1243,7 +1244,7 @@ ] } ], - "ID": "f8f31b87-4135-4c38-bdcb-86691219f0b9" + "ID": "0e765ee5-3d32-46dd-af23-5439a82fb3b1" }, { "CommandList": [ @@ -1258,7 +1259,7 @@ "BtnText": "知道了" } ], - "ID": "9f436a49-9bee-45c7-8b16-efa42f6d0302" + "ID": "3a648062-0023-4ff7-aa17-b80ade282849" } ] } @@ -1670,7 +1671,7 @@ ] } ], - "ID": "e4c8b3e1-5d76-400f-9265-bce0e9deba1d" + "ID": "1f35cc05-4f62-4e65-9859-86ceeee9cab6" }, { "CommandList": [ @@ -1687,7 +1688,7 @@ ] } ], - "ID": "d36f801e-e273-47fd-8939-400188a3e644" + "ID": "1f209244-c3f5-4da8-aa22-db17db298d66" } ] } @@ -1756,4 +1757,4 @@ "Formula": "新增报工!$B$30" } ] -}//H9euG2JZx9J972MAq3JCplMuR5w0VFwUT931LJWI5HbUB/0aKqRl11XKWHJfvtXX3X0kYDgEo7dx/Fo28+eSO7ku3Q9WTDWWuiH91Sn2bXZU0kLlqoZ6hEzUXDOvc8NWw4vgDlvWjRgxZkyKAviiMIeCyJ+fDg2IAvy7zDV9D+2EQaPLO5p81Dh3J9eQlGu+cDq0yO/HINezNJWhUdQZ594duLqMhhTufBmpGdfQJvrEi3v1hMh+N99UBnlZkoU4O8TsQ8GMHfaovDG4dlZ26YmtFQbwwmtDkeW19xmfoId/tXuNKE78qtPIfQy6A6bwL6ls4kRuVeVxo9zJVnNCQcIySGNSEm8eVyCQd6UePMWal8EDDrVpbwc/2MNFiJdnn8MuAxdncKbDHpOrX6k9nxHhYA/xAopH5f2G+6mz+k6jZaIj2ku9JQWys+475LT01Jr0WFvqBsoy+cRovqBbhXO7dpn5ROxBQtLGK24kAR7EGHbQ1z5+qiJRs9iyeuOxhnOnq2qY+2DoSNSqvO/fybOsKV/1IeK/lPpNTiCI2qqdJdrAx/l5JDD1/RSYXYl6FTp1KW/KHEwhnLY7ZjMS4/hnbn3U7KFmhKMo+VPadht99o/1etYjSliacLVfHEJpSXVWgAt9YfwnYq9dZqMkgTnJp5sN3m8BFBhc9arEUQgiXdDT1i8YVE3DEmvaB22CWXgW9E0io19XEYBSTLhY8/5URQPguY0uJpu6BF4ucuqXd6/4a6088rRMxnyVytbRryiire5kgasHcsQsnnvioLGbTdv31WJy79ImAWJPbknyyxqDvkD0jIcLB4hFSXwCRl0rLPItvAKv3P/3q/wkTRcGCBWN3jMJraUt0d2X5FlcbX3Kvfmet1l/oXdJEYv1EBv9ZmkjDruZzCE4c3EBSQ==|920 \ No newline at end of file +}//7dD2Cn9tifuGgE/WKIlNLwdSUlh3yZXvO16k7q8gZ3JSbjGVPkCzk8SScpG+5Gh/dJTB0FaDCnMzgp25sX5cQp3ka3nv1JX9XDILGYHFd6St3TX+R1bJTbLUd8zVcZ67BN/vyT/AJ9pmJCz3PYIoLenqETn2RKe5tTrvndDSxKCat/VZqpelCpMCSW6sDWZBwRlymJ8Ql+qD3WKRqhFGZmXn3n9d0yGYEJwMMWmYfp9NSanKyqMiBtMaUieMLb8WFMBEAVaHhlatUsps16JcoHRoJDeGseKmmc+Mn5zFJLkkLr2qYGnS5FrXr6msy0T9Qe61WhcYDODc7AOo13VkggjkUn2KH+xQYWgl19pHaT1KOsQOo9e2QjjYwAKevFqlqBGMxYEiOyAa66pFe5ob8JdEcv8zzY03UGIMgxk5w/iD4ajmiEqtASBZnGQtWuBxQBdW6Ev4KJ2CIAZVOU192LXgRVnffREB4Ddd5eI9qjTzAlChf8MXckdbnvkqxl9yczHG9iT6yP1grFYDlddkNSytLcHVuwkex8v0a7iptNUwYl/TIUE+Ww2GBDJ54n5S5fRh7PAZVSc0JGMietaU+YGs+osHZ8S10zZ9+WZ7ua6S61+aj3QWBkX57epw4E+RNk05IG3jb7BNZOE0qSYLrwfYavljrqu376lpc16d607DwT4abW0hMSHVEhTFd8Bat+Y+VWqvVvb0hV+EqFPHVkBdDkqZiPuew+3pnWDRr6JIQ7ostjZugOqywZq2f9Kv/FhLwJa/oqF6ptANty4vt0RxliX8Dm1lx/PsTwRBRGBXcUp640zQawoCJseOqh6EGQMJwmstiWCjpMfuGwhQOZbQYa/UqeSzkAWcEuHasEvN8x/xb+Qt/saIwQhUPAfdlnwLus1tcd/EBlg6pEX3FQ==|920 \ No newline at end of file diff --git a/Pages/任务/工时/核定确认.json b/Pages/任务/工时/核定确认.json index c0ca4e13..04163cac 100644 --- a/Pages/任务/工时/核定确认.json +++ b/Pages/任务/工时/核定确认.json @@ -430,7 +430,7 @@ "0%", " ¥#,##0.00\"/h\"", "#FFFF9C93", - "¥#,##0.00_);[Red](¥#,##0.00)", + "¥#,##0.00_)", "Right", "Background 1 -5" ], @@ -667,4 +667,4 @@ "Formula": "核定确认!$G$17" } ] -}//vPxXw9qqTREG6tCv4ySMCB3FlmxGyfrQJfxdVChsn+zcsUMUmfiHKzy8lzPXhBB37qg2IxNLIAZNXFszvvcPtlOplMhBm3HD2uYAUH8dp1mG1loZyL+rv49PlmqPljZi+9Kpi6K+lTvR2gAZM1nU8UUycJITeK/+iyc/Eop+h1Hx0tV6CiYzg8AUnuwucRNsrRtHSf/z14FXGVMCuPMlWXGRCupyMFuaF6Y+iFPP6JWDmBjKK+2zwyns6MRV4ocQw36uXA/J9K0dcfScgn4wd2lZBU1fNVUxlzzPFZePg/G7pssAcm1WKe69ZJ0Cftionm3AbwOsyc5r8kYCN9QHOWeTykIcWFAATJs73oy5kbMFFN3VCs8z8BXS8jnQahMYnYJV2+khhZkdATGdytkVud2DpCyhWts161v0CJ69ixeme+77poobEUkWYoLKQp/tZwejzwwGXACS8z33qUYK+RlvGy/euyUa0v+TTe3PzVyS4ChEQHiESNAy8KVLM5z7k9OnpGUgwmaq2gu+2aW4VHedKRwa8FJ555Sb5UNeRvc8YtLz9Xh10Is8oezTBTthOVHlPm7OrPyTcXSrPCJ89MpbPkc5U/ZIxYe0REdQLYcEf9bkYX3MehAJH5pha8G8eppyZAELZAptqhlpm1OKBzWd6TwiDTcbJeg9C4Xm31PU+5tkwBJpKmATxgGqCAR5/zBkp/WdjlpfS1lceDaenFUmuxmhRubLavCBTsKLZTZgLBAbBQj04LaDhby5gafdH00jjKJOfvjiE/Ch+30T2LZ6CmhH5IY8jqm8l0VtS8JaWd4ZrGgkwJ4vGck0iLAAoBNjlePSKiA54c7JLiAyxo+OTvCvzXdr9dlaYQmdNRwki29Mkectb2wc3Of2QBiGalfcIIQbad2i3tlmQFgeXA==|920 \ No newline at end of file +}//i7wnpAiWW78Y8I4egq6MxUFap1efVxHZgYjxaNclD3HexEp4L/2dVd0WDHTYb/nD48y1YIgXU6j+EHTOI8XpTKkyM9+ScMnNz6S7xO9XTfAPiau4n26oPtoYnNcDrs2HW4MTIHfMqeyTMNOi5en4EHCFJUUb1rm+cmRbl/h1kU0j9ZHIM+a7GR6JKq0NNOLPp63ZMn7ZcZP/XxQAgFvBSZihYJa0F7JfaE+Gp5LslJ7Sg6sIh4KtegzJX9vhw9PLEVkX4nBjjn3aJJjWHzsSFgsgnxBPWqtqolvSZqhCF7Cgnwjk9xEMcOmxSNeBLl1kuI2k+BIerAjoYGXSTENGJGdwqHJOkau3MWP7Yb22/z0d6Hv/4DQfB5bga66QbztshlAhNRskYVmA1sIKrxTMc2fGltO4mswY8oaMTj7GvMA8AXUQFXDnXO/8F+1SQ+eA5eCs4sj0B7b8Vk/yhdcTP7ULXLPjs2xNQ9AWMJlCjOebJU1UfLl0jjhmi23Oe0zoO5IGnBipITxWTa8Y7UxttfizDL2upOokFL3o5WayoN7Axbhflv/icrP9U5wx8wVjnM3XnsYyNDzF2N1ZqymtOVkRc5HuJnF/AFG2+XFwmw5zcCjlS1bacJ6o7GuDnUbD1mDApQpkM+5ZXR2qK6lzFaWisYc38Sv2AworbLeN1yj8HcFUy4o0/B0GtjxQKo+1ScWYwdxUGFu41JQOHBzr9Ugcp0b8a7HluoDUFA3vwSE3ffQfRD6+VHyqsbNqZFtkmqPJnFLwlb0/vp4gW1llmnMyIy/O5oOCYkr5vnK4fkvPk3LkTDyW0O9aFBGaKx4/DuhJfUj0rgrOX3bbZKmd41jDJSTqdixMMrW9hZh9EluRfRmPm8gfTbykkrEUwEiPZUyCgFpJ/4Yc56ihbszbDw==|920 \ No newline at end of file diff --git a/Pages/任务/工时详情.json b/Pages/任务/工时详情.json index 1aa19e18..a2f8a890 100644 --- a/Pages/任务/工时详情.json +++ b/Pages/任务/工时详情.json @@ -339,17 +339,50 @@ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PageName": "分配计划工时", - "PassValues": [ + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ { - "Source": "计划", - "TargetCell": { - "SerializeProperty": "=分配计划工时!工时类型" - } + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务平行视图", + "ColumnName": "任务成员", + "GUID": "ef34254a-1377-437c-ae84-35e532d97189" + } + }, + "value": "%CurrentUser%", + "compareType": 10 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "分配计划工时", + "PassValues": [ + { + "Source": "计划", + "TargetCell": { + "SerializeProperty": "=分配计划工时!工时类型" + } + } + ], + "LoadBindingDataOption": 1 + } + ], + "ID": "6a3f47ae-09a0-4469-8363-6a8a2389a6b8" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": "你尚未成为该任务参与人，不能报工" + } + ], + "ID": "1fc5316e-1022-49f0-9b97-b6158c15ef25" } - ], - "LoadBindingDataOption": 1 + ] } ], "Text": "分配工时", @@ -372,17 +405,50 @@ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PageName": "新增报工", - "PassValues": [ + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ { - "Source": "实际", - "TargetCell": { - "SerializeProperty": "=新增报工!工时类型" - } + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务平行视图", + "ColumnName": "任务成员", + "GUID": "ef34254a-1377-437c-ae84-35e532d97189" + } + }, + "value": "%CurrentUser%", + "compareType": 10 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "新增报工", + "PassValues": [ + { + "Source": "实际", + "TargetCell": { + "SerializeProperty": "=新增报工!工时类型" + } + } + ], + "LoadBindingDataOption": 1 + } + ], + "ID": "37b32f5b-3fe9-4758-9122-88a37f2e6e4b" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": "你尚未成为该任务参与人，不能报工" + } + ], + "ID": "2e3d510d-0448-4f21-9d26-04d2650da34c" } - ], - "LoadBindingDataOption": 1 + ] } ], "Text": "工时上报", @@ -720,4 +786,4 @@ "Formula": "工时详情!$E$13" } ] -}//0WaU5OwEC0FzGkaxd960W86Hn0GlSSLf9nOuSINkHafhlplmiPAIh4+3F55Ak/58YUSfsOb9u19sL+H+i/20fdxHiILT4ph6ZtH1ma8yx7qXQdR8+3NhmngYAQFTPrL28wjsoYhsmG5sEeWmEp61K+nye/96TmQ2pmwaKlPrhTCqGL584dcr7EdVQ6t/9RDp1aka2Xy6m3ftDBtZ3hLoGyfO+7RhzcZGcvahmFDlS+SxhGyJMrk7ggofeP2W54ahnIe2LwS+uOGgGxszhEh5R3p/2S1iwKRAGpVYMHLzZlRkvrbJbS0Sz66yUrEN76vAWwCxjyO10oVNFXt3jxXGjLpzCpGsJ16py7SIxVINtXS6p2JYz5BprV25GIoLUwfqXQg6JdZFhqVVVk8F0qW4Dzwsvtf35orYeZ+gYCuW1w52WLz2eMt+YIFoesCQJagcLxgR6IV1aeTaLI/7BxJryB83Mz3Su97OTV5TugSZdpt39F71L+WE2ohf5XgNt+fsKbFO8t48qijU4kX7mr3bm16dQFzr6dY0qUkssMXd3WAzivy7UxcyyHKo/9qCcdAsVG7eNGfHvTmTwSULA14k1soDF4CPvlZZYhTD/UvpmU1OjlmB3AEqOe++glacLLftmx4Sp8MgHrigrDxUskl3Czr0R699TaV9eGsB4rwfh9dQNtKZEw+CzAvi5HZ5Jykx93OUWtaLcuzdt3UjJ9J19gIEIX7Iwequ2Bv3w7TrKJt9rWY0IJRIlHcM0eG7CUh2411uxrzO/0Fs1nk0uHJFHneKY3tzPZnhfshfG6V1ioQjwqRCM8c8+u2PbER5v+g7l7ADh519oik+aqh1/a3gAakHyx0jUf9jPhFh8f02SL/WLdWyEvts9fTrz8sBNr0tm2Oyy3K8DCmHaA3On8E6vw==|920 \ No newline at end of file +}//Ukz8HO+qieZ24fjg3xUFvXE9U2M8mAX/M4reDuVVaPi/NI6EHwbNjk0ZNiE4X4aG7VV55aq+fW2joRDJWYpONnVd+8IVKAAZ1bj+10auJ+TNQ9f/s9q/D1yBun3KCszAk0678L5hPwn68M8NCg5AOZt2cl030W5DTCCm6cWEpVeDeMVXN3N70LyVhaCZ1Hz/1t3UgybkQgVLx6HuZggfBTP+nSq/aM91nU4UdSn1I+sFGBCLIFQpzq4mZpFa1nhWJop5PJrJjO3FnPbcW27N6Qf1g/1Z59+wtlqrcz10XrjsLTbYFdnpYv8d1ALu2BZuDRRb4Xc+/iYC4gfRPLiMW+o+9KvEbbmVuC2KNufUuEPEZHgZUpJWFlO9qfmUUkIHbUtnrt/hRcnx/rpMNQTjWcBfFHB+RnB45DWkxaKeJtgD6vNuys3yevQ2NDI6Br7Nf6y39YsfgV0POYuxlZvcx3fq8iQkwEQuZ3SAMYewpaJhqdaHlrbySUp9gQIuGlo6dR17BMdDqT0JelsxF9+xuEtdXSpn0AAFKUsVaWNGzHOA3bUrH69oI3OCbOPHmFEAdF5Oqz76qDo68P2/n5N904LXjH2erPddMh1HUaLBlxwVZ29NaXZOgZwGzP88/GoFpImVW0Z7VXjLnrTGyoA5UfgDS4y53NIbaiCF65ygNvW0xiqZa3tzu8K4NdPd2j0fvbjPodSaah8pXELz16nWxp5Why5CUwza8LRWf/gJ3OOdTCIw2mDLxlgoTk5EVkHcN/GWaH4gk9HlMUa33Ykb+17zLhpYU9t995zu6vE28Lby87pj0bFkwXT22SBtFS02if6gUBJHxrVpfsai2Sb7w/awOkMVm7IS9ZweaqTEBtCpGhiMUhU7CGSsLfD9duCFk+9qv5yIjbR7DiShdrl9mw==|920 \ No newline at end of file diff --git a/Pages/工时/个人工时首页.json b/Pages/工时/个人工时首页.json index d9c3c809..032001cd 100644 --- a/Pages/工时/个人工时首页.json +++ b/Pages/工时/个人工时首页.json @@ -410,6 +410,487 @@ "Text": "重置", "TemplateKey": "_RS_Information3" } + }, + "8,1": { + "CellType": { + "$type": "ElementUI.TableCellType, ElementUI", + "ElTableName": "EL表格1", + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "View_任务工时统计", + "BindingInfos": [ + { + "GUID": "d0dc8b54-22d8-4e76-9f6c-6b9b8fe442cb", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "ID", + "GUID": "9762de83-e504-4560-a886-e34b674c76d0" + }, + "ColumnName": "ID" + }, + { + "GUID": "b116312e-7c44-4481-849a-029ee025a685", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "日期", + "GUID": "4782ffb3-437b-4b7f-8b9f-2446e01d4c70" + }, + "ColumnName": "日期" + }, + { + "GUID": "9ee7b453-83ce-4c08-bf6c-e0d498b37b89", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "项目ID", + "GUID": "c8b3b20e-c088-4234-8c38-443315de0cd3", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "项目名称" + } + }, + "ColumnName": "项目名称" + }, + { + "GUID": "718d6df0-4cb5-4ae9-9a06-bc0da11ff52e", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "任务ID", + "GUID": "d856fe76-ad62-4782-b8b5-8cd6997532fc", + "RelationBinding": { + "RelatedTable": "任务平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "任务名称" + } + }, + "ColumnName": "任务名称" + }, + { + "GUID": "b9550dc2-a5af-4132-ad80-99f68483e713", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "时薪单价", + "GUID": "86348525-a0b9-48f6-a9c2-0a47e5fc9cea" + }, + "ColumnName": "时薪单价" + }, + { + "GUID": "5a55bfe1-5d28-4a87-b076-5ac8f2b729c6", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "提成系数", + "GUID": "9dcb0bec-217a-4dca-b96c-47a88f1a4e99" + }, + "ColumnName": "提成系数" + }, + { + "GUID": "2e6094f7-37d2-4d7b-bfbb-354023532785", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "计划工时", + "GUID": "da480dfc-d3ec-448c-87d2-4cb2216b5dc3" + }, + "ColumnName": "计划工时" + }, + { + "GUID": "935e72fb-ccd0-4ccb-a889-74b3af822e77", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "上报工时", + "GUID": "065d2855-b750-4832-827b-719a9ee80116" + }, + "ColumnName": "上报工时" + }, + { + "GUID": "f8cc3269-2ec9-497f-ad59-37421f697b2d", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "实际工时", + "GUID": "4f714ff4-e7ee-4751-a697-d9f1d490f1f8" + }, + "ColumnName": "核定工时" + }, + { + "GUID": "2821bf03-b994-463f-b264-44e5b19b8b17", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "请款单ID", + "GUID": "9f1e6a2f-a8db-4fba-9aeb-fe80cad985f4", + "RelationBinding": { + "RelatedTable": "收益请款单表", + "RelatedColumn": "ID", + "DisplayColumn": "状态", + "NextRelationBinding": { + "RelatedTable": "请款单状态", + "RelatedColumn": "状态码", + "DisplayColumn": "状态" + } + } + }, + "ColumnName": "状态" + }, + { + "GUID": "bcb46917-c728-4c59-9aa6-d08fcd24f112", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "计算提成", + "GUID": "bb07213f-6e8c-4118-88d6-af63de028874" + }, + "ColumnName": "核定收益" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "执行人", + "GUID": "aca842c2-7c3a-4b2a-a7cf-c5cd6da6304d" + }, + "Value": "%CurrentUser.UserName%" + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 3, + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "日期", + "GUID": "d2f79bea-50b3-4672-80ea-306f1b33f624" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=个人工时首页!开始日期" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 5, + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "日期", + "GUID": "0d57eb05-081c-4efe-8df3-364fe50d139f" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=个人工时首页!结束日期" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "项目ID", + "GUID": "7b363751-ae3d-46da-a0a2-b26838b12784" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=个人工时首页!D4" + } + } + ] + }, + "NullFormulaValueQueryPolicy": 1, + "OrderBySqlCondition": { + "OrderByColumns": [ + { + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "日期", + "GUID": "6f82439c-f2fb-44f8-bd7a-40231875eaee" + }, + "Order": 1 + } + ] + }, + "CustomColumns": [] + }, + "autoGenerateColumnsByDataSource": false, + "columns": [ + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "ID", + "label": "ID", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "hide": true, + "key": "b1ad55c6-3a82-440f-83f2-fd727ee98d7b", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "日期", + "label": "日期", + "formatStr": "yyyy年MM月dd日", + "width": 180, + "align": "center", + "headerAlign": "center", + "colfixed": "left", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "showOverflowTooltip": false, + "key": "404cec04-3cfc-41f4-b5eb-8e630af12689", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "项目名称", + "label": "项目名称", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "showOverflowTooltip": false, + "key": "4c7ae872-3b0f-448a-a727-232c196df248", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "任务名称", + "label": "任务名称", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "showOverflowTooltip": false, + "key": "c9a8a542-113c-4f24-aece-fc0c37c6f4e0", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "时薪单价", + "label": "时薪单价", + "formatStr": "¥#,##0.00_)", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "showOverflowTooltip": false, + "key": "deebda19-9377-420c-8169-56dc5a370f27", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "提成系数", + "label": "提成系数", + "formatStr": "0%", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "showOverflowTooltip": false, + "key": "ff3e6b9a-2bd6-4075-ac20-3f3ae094e8d2", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "计划工时", + "label": "计划工时", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "showOverflowTooltip": false, + "key": "a84eb86c-d2e0-4fed-9eda-e3a0e994ca78", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "上报工时", + "label": "上报工时", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "showOverflowTooltip": false, + "key": "d5b7a859-9718-48c3-90f4-222774397c2a", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "核定工时", + "label": "核定工时", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "showOverflowTooltip": false, + "key": "f11b3f6f-0e50-4a53-9ac1-5d4c07de02ed", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "状态", + "label": "结算状态", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Tag", + "tagType": "info", + "imgType": "cover", + "showOverflowTooltip": false, + "key": "fe54e047-6ca4-42d8-9e50-c9fd96fc3545", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "核定收益", + "label": "核定收益", + "formatStr": "¥#,##0.00_)", + "align": "center", + "headerAlign": "center", + "colfixed": "right", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "showOverflowTooltip": false, + "key": "7842b8cd-ce2c-4898-bdc9-6280e89401b7", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + } + ], + "actionButtons": [ + { + "$type": "ElementUI.ActionButton, ElementUI", + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "button", + "Name": "编辑", + "shape": "default" + }, + { + "$type": "ElementUI.ActionButton, ElementUI", + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "button", + "Name": "删除", + "styleType": "Accent 5", + "shape": "default" + } + ], + "sumText": "合计", + "size": "default" + } } }, "StyleDatas": { @@ -543,6 +1024,10 @@ "6,27": 4, "6,28": 4, "6,29": 4, + "6,30": 4, + "6,31": 4, + "6,32": 4, + "6,33": 4, "7,1": 2, "7,2": 2, "7,3": 2, @@ -571,7 +1056,11 @@ "7,26": 2, "7,27": 2, "7,28": 2, - "7,29": 2 + "7,29": 2, + "7,30": 2, + "7,31": 2, + "7,32": 2, + "7,33": 2 }, "SheetStyle": { "FontFamily": 0 @@ -585,7 +1074,8 @@ "3,16,1,2", "3,18,1,16", "10,1,1,4", - "10,5,1,4" + "10,5,1,4", + "8,1,1,34" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -629,4 +1119,4 @@ "Formula": "个人工时首页!$F$11" } ] -}//S5uOHV+pSAycgTQsZgBOtk0dbRzY/24doBnWSJ1IeAK0J4H7bVonGNb5RuRh8B1rrxXV2djc1dukNF454N2GvqTUWQ5rTIrzPXcStnSvHaH8hbwqgCJRYJiJcj9hMnH4ItZBAPsydRchI96QUkDQEXGxsB1cQoWV9fo4Sb7Eu2Mb6QpT5CInxcbdvP/p/t/dpCIZPZkfGbNS1t8mowlz66K/mW5rAu45Z8+pqB1a0W/iJrgrJDng9wgOUHrF+W/waRpLLRNV1JKKxZ6tWMzNxmyTMO5dO/3lBBRoJg9OGtxYLKKm6mN18J+X0sCgIukSyDidgf1axcQC9p64dHwSTvPD7L5yKdewvX3rYpE/ow/jr3EzMlJteIlhmZpeKOnLE6cKCcCBwvqkUboxfvWfcbaii6P1HmVf/epPBoi+XShNBYwXKCUqqXU3tEVquleW0nWXOc62yn8uXiTNLUyAwZvIQX/4rV+afC/nl34mhHaOvFYjC9Gkk4gZlVmDpU1044iR0MoDdNwD9XNKTjt8IVUfsJfeyJLRP0qrf3tLwkLJPVJPRulQLlHRs2GDJAnZu88/E+HAC0pe0+ZAPQFgp7HeFBrzMUO6WI7wDrhjgq3yp+TTo86vy7KpTydSgbjj5TPX+P7XSFWbnIhju/klvoQbYgCuBebT3aVMwpWxBqijWkeRMyToeBvEWxZd/DrpeYgZK44Ppq6sjie9wPExKNx6IRnpPgSOU2njsjeInaRnzGvxQvJc2T5dNBJle0jwAyILrdK34kySHBmVKLiy2ETFRA4fI4fgGGAhMy4UIJsWbw6QRMlXM6goUlVGTPbgE1FHfeXbjomxWXYFHmSKIU3JZnJVrZi4KnATWtkL3hhqLnUxCGhIJ8Dw0L8SiMiYECiDcfAH7IxAxmRfWhlAIg==|920 \ No newline at end of file +}//Yx3HaerXWisJ+2dlFycI2X11LihtZ3VkjfTX+GCiuRvm1246bJHxJ+dB/chipB+9oOEA3ViOTS/LBNsVz3TXQ/BX9aF0xf5SWcptjbD3EQt1YWoUxBKPxgU2Gj4SUlbLyZ1/SGtKmcg8WCUaQ36lVaohi4xYWAxVTxltf8wzSCucFqTnLXARZiunV35ULd3nvDQDgq+/3RvvAZgzlrtjrsrVR0kNwwy4HIBSUAYtpOnf58LiqOZFmZ6XHeN2m+I14MxLND5gxNkLW7eY/uRvi5XexOw3ttOKm3Z9ffrEWFz+5RvyGuE4xv9GmlibKI9WXou7oxr97qxoeky40Nslvvyf00J9+Gm1YqIekXYJSu/l+ZT62wkmIy8VJrT0AYNTy7uxTI2FPbtgcWRnh1QxPh4zOglAw1hG9pW1hHPrFlW6AYZtr7xwL/uR7FW7OjSbfQ2mVZw5y36jAy0HhV0+FiIWkn9hiSJmakoBCcax5H/p/EkqnjSzudcF6zsakERWs85fTGBzOTixfkIzBYbYHjmTLxg0d74+Z4GYYndGVhkRsxz0i1VeDEYm6XLDRRE3nYfhF2l/QLuUZsie/pq9VIbw89E8Gme+FFiGlRH/FL1QPBLlPF4Wh/yU/BtR1K4Taf3mLjfbAVJcIz6zy19RCfuGzzJ2gsWytUG42z5fgI5C2fL8hhHKNmRvT6v1b+7JnDpa0iipVE6Fo2Tj6Hah3yBQ0x/CUDWJ72PyAjpxgP7P1jtIb2Lt8J94M+BN6T7rn9XzAds6+bsP60PGuOjNYshjC+GF3f3WyVnFb1rnnxDk4U9b9ydA/F0EYDjgly4tmH1YUgOCklwQwNaARwHbJC0FlWgmZnpPjAMaN8bzzPmCJEFUmRamKMU+H7xPvPzBd3BpdCErp9AW/FIo+4tLDg==|920 \ No newline at end of file diff --git a/Pages/工时/人员工时统计.json b/Pages/工时/人员工时统计.json index e38f99cc..4048d7f5 100644 --- a/Pages/工时/人员工时统计.json +++ b/Pages/工时/人员工时统计.json @@ -320,10 +320,11 @@ "DefaultSize": 49.0 }, "Values": { - "1,4": "总计划工时", - "1,7": "总实际工时", - "1,10": "总上报工时", - "1,13": "总剩余工时", + "1,1": "执行人", + "1,4": "已分配工时", + "1,7": "上报工时", + "1,10": "核定工时", + "1,13": "可核定工时", "1,16": "总计算提成" }, "Formulas": { @@ -380,8 +381,8 @@ }, "BindingInfo": { "TableName": "人员工时统计视图", - "ColumnName": "总实际工时", - "GUID": "7cdc211b-60d7-4e93-8a54-70f7a07457b7" + "ColumnName": "总上报工时", + "GUID": "c7da112e-841f-45ed-ac90-b30445a36745" } }, "2,10": { @@ -391,8 +392,8 @@ }, "BindingInfo": { "TableName": "人员工时统计视图", - "ColumnName": "总上报工时", - "GUID": "a4e583f5-80b1-47be-b743-b17350d63245" + "ColumnName": "总实际工时", + "GUID": "b9a7fc9b-8f5e-4440-8c7b-631a9ba25280" } }, "2,13": { @@ -478,16 +479,16 @@ "3,1,11,18", "2,1,1,3", "2,4,1,3", - "2,7,1,3", - "2,10,1,3", "2,16,1,3", "2,13,1,3", "1,1,1,3", "1,4,1,3", - "1,7,1,3", - "1,10,1,3", "1,13,1,3", - "1,16,1,3" + "1,16,1,3", + "2,7,1,3", + "1,7,1,3", + "2,10,1,3", + "1,10,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -513,4 +514,4 @@ "PaperSize": {}, "Margin": {} } -}//uM5n4oapfpDVjBdZ9ZzVApfh/McdYf7dkwkjN7FH6rA+24OjcNT9G9HaasvAZL+MaI7RMtgjLqVC99Z9wbztgIEi4YEoAAFJeoJTE+jA25ZKDDSVZ7BhKiTgTfOcdkl9x1FEtCLoSj+mGRRc59DCjUf/db/ZEY1XiSTMCpiVLzPsKEMkYHanbn74NahyrecmngjAfLmNThAzYIlsVt2J5e9Exu9QBZeTdXVq5ixdGgW8lskCDnN4faygLzystwmu9ro6mrHNWVRLUmhSxw7keyuR0rscMe3+Oxec2yb4yUw0k/Gy8F4AavB1jHewteOgLeP7P0uB72ClQsyaMQ0EAF9GoAnxyRR/p53ZPE7KYdM3L0y2z/JI4bUeb3cXiMOyMcnJ0tmQceX5Lu6Y0KNueScpdxLfEGQKqDQ6725bGbRgFgfTvs9Ay3sEqfsHwiQ/opq3/mwdWH/LLilFwGIXn2yWWjw1kwgzPBfqLy8uvcDinCQbQIPYjDZCrM2is3FIOjQwO34SSycOpOqh8rwrYbr3LNLTNZy1sHv4hI7ugqi1WxswxCbeRuxgpytXED6WhLN9b5BEi0aReko/xzH/EGVCZvHQxZQYYEXOWDDvAWtAV7kE9dPYigdW0eGjQpsnhnI9WVtPurvFEqUoq/uCpp/5bAJqx2momWOvOrBYUYuu1b5WOrgPJU4o2qa30Zzk42yGXj/kEdYq703obKQJsVOJQlYSMQpSaHsW7jt5ZlD1JB5byZilcW6qOPfQNlsypsA46NBOPDNlfVps8s68LKUawgRUau2knCLbqC/kSb5RkO4ndV9VdVq949zVGfvo07uENSSmDPbnPgyJwSUv92S9HO4bx0kZkb/gD7bs8nhUBUSraRTghUbZb6jtG2+vWraTEB5XMdEg2pykI3yikw==|920 \ No newline at end of file +}//aAYAslZpSPI/KwZ01OQQdLwNE0/9aVw8wjnuOrrhkbJvIZ6OmZJQ1WH47z7brqnAlEbcs0eUfToAB4Z+ooMWeSCvQIi07/j9X4MULEIXEktovmMegLIvf0Gk8y4L89OBRBGd9zEZWxPf6/Sn5smmcP4oXCCz9yuM9r4bOoLbkJum30OUqq6OBsBrfyw8lIUBahn5/26yZ7jAUoNdWSFN57KBZLHgncEbI4Bzo/BwIWF4LNUdmNhNgILJdsyG7KgVhAizCe1+vnVk/7MlDnvAfJ9FZQlCeRLNOS+xTw+9oM0lp0v/ZLl+W1p1tZwoLiDIb6rFf7QOJv03wfY+KUaRgIzZhMfl/OSo33XF5X9VT9Y1LG7VEFKzWN5E/3+nv0OPWJYc2vWWj3Gq7GnbzchhcMCXrTmLwFmiD6YZGnL2RDAQW75jeNyGIOiAAQQ5DotrPGrNMIHisOUbo2bfP5RKhvpFAv4rtGYlbGER0p5nvrMxT+7rhi4VGOfkC1uvp7fUhHYtMZjGB/BmXznsB/gpUeqQUNtqiQtyMFLYQ6BMrmJe+rJ5i/BLMDv/Oiik8efKSzu+jjkloG969D7gpwFq2Lbpn5oH1hhYshKDkRv8EG9l9MwbgvjQOpwI9urppDnfEtr95ADhmlCpBid2lCbk9qI7ZZC80MBQ5YEbG7lQ60BG+mSvnlzTpYb5WIfiQEhH8/WXneh6jehxo2slOJmJomwefYucUeVtzjHdTGw+kXsRQ0VGGHE/T0Or7TU2yUXifAfmMnA1a6rGRI6S4V66eArkmWkSe7uh4Jc2S3G+C1HmqWEBjkkodwm1Gqwemi1rANCRRohV64OLoflIFt/3dA42wa7oeFaI8iWBxPtDMl/DDqsCz3sC0qPWbOIPmgoQVEP1k5WsmCqzf1+3W4hq0g==|920 \ No newline at end of file diff --git a/Pages/工时/任务工时统计.json b/Pages/工时/任务工时统计.json index 5b619d11..5b436da5 100644 --- a/Pages/工时/任务工时统计.json +++ b/Pages/工时/任务工时统计.json @@ -130,30 +130,6 @@ } } }, - "4": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 49.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "5": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 49.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, "6": { "GridRowColumnDefinition": { "DesignLengthInPixel": 49.0, @@ -190,30 +166,6 @@ } } }, - "9": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 49.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "10": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 49.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, "11": { "GridRowColumnDefinition": { "DesignLengthInPixel": 49.0, @@ -395,16 +347,56 @@ } }, "26": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 49.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "27": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 49.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "28": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 49.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "29": { "GridRowColumnDefinition": { "DesignLengthInPixel": 15.0 } } }, - "Count": 27, + "Count": 30, "DefaultSize": 49.0 }, "Values": { - "1,19": "总剩余工时" + "1,11": "执行人", + "1,17": "分配工时", + "1,20": "上报工时", + "1,23": "核定工时", + "1,26": "可核定工时" }, "AttachInfos": { "1,1": { @@ -414,7 +406,7 @@ "RowIndex": 1, "ColumnIndex": 1, "RowCount": 13, - "ColumnCount": 25, + "ColumnCount": 28, "TopCondition": null, "ListViewStyleName": "pms表格", "ShowColumnHeaderInDesigner": true, @@ -441,6 +433,24 @@ } }, "2,4": { + "IsAutoMergeInListview": true, + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "项目ID", + "GUID": "56243d61-7297-4012-a8ac-887274d20f87", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "工时分配方式", + "NextRelationBinding": { + "RelatedTable": "工时分配方式", + "RelatedColumn": "ID", + "DisplayColumn": "分配方式" + } + } + } + }, + "2,6": { "NameUsedInJavaScript": "任务名称", "TotalRowSetting": {}, "IsAutoMergeInListview": true, @@ -455,7 +465,20 @@ } } }, - "2,7": { + "2,9": { + "IsAutoMergeInListview": true, + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "任务ID", + "GUID": "bfb44b26-ae18-4917-bb13-b8abc036ce6a", + "RelationBinding": { + "RelatedTable": "任务平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "任务预算工时" + } + } + }, + "2,11": { "NameUsedInJavaScript": "执行人", "TotalRowSetting": {}, "IsAutoMergeInListview": true, @@ -469,13 +492,43 @@ } } }, - "2,10": { + "2,14": { + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "任务ID", + "GUID": "f1528479-cac5-4ccd-9029-eaf6d58f6adc", + "RelationBinding": { + "RelatedTable": "任务平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "任务成员" + } + }, + "CellType": { + "$type": "Forguncy.DropDownListCellType, ServerDesignerCommon", + "DropdownButtonModeInListview": 1, + "AllowMultiSelect": true, + "IsBounding": true, + "DataSource": "用户信息视图", + "ValueColumnBindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "2c04af57-f077-415d-8f71-1200643f10eb" + }, + "DisplayColumnBindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "98c76343-77a3-430b-88a6-cffea78f5d29" + }, + "ReadOnly": true + } + }, + "2,17": { "NameUsedInJavaScript": "总计划工时", "TotalRowSetting": { "FormulaType": 5, "StaticText": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务工时统计!K3" + "SerializeProperty": "=任务工时统计!R3" }, "StyleInfo": {} }, @@ -485,13 +538,13 @@ "GUID": "06cf4091-dcb6-4f81-97b5-c7e6aee268ca" } }, - "2,13": { + "2,20": { "NameUsedInJavaScript": "总上报工时", "TotalRowSetting": { "FormulaType": 5, "StaticText": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务工时统计!N3" + "SerializeProperty": "=任务工时统计!U3" } }, "BindingInfo": { @@ -500,7 +553,7 @@ "GUID": "d4d14d3f-d000-4399-acf3-e66868d6464e" } }, - "2,16": { + "2,23": { "NameUsedInJavaScript": "总实际工时", "TotalRowSetting": { "FormulaType": 5 @@ -511,7 +564,7 @@ "GUID": "363a92ae-8ff9-4dad-9bb8-534aed6a9b7c" } }, - "2,19": { + "2,26": { "NameUsedInJavaScript": "总剩余工时", "TotalRowSetting": { "FormulaType": 5 @@ -521,20 +574,6 @@ "ColumnName": "总剩余工时", "GUID": "2ed5fda8-1cdd-4d7f-acb7-77d0a9199613" } - }, - "2,22": { - "NameUsedInJavaScript": "总计算提成", - "TotalRowSetting": { - "FormulaType": 5, - "StyleInfo": { - "Formatter": " ¥#,##0.00_);[Red] ¥(#,##0.00)" - } - }, - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "总计算提成", - "GUID": "753269e5-a066-4871-999f-78fb2ea6cea5" - } } }, "StyleDatas": { @@ -566,42 +605,42 @@ "FontSize": 13.333333333333332, "Formatter": 2, "HorizontalAlignment": 0 - }, - { - "FontSize": 13.333333333333332, - "Formatter": 3, - "HorizontalAlignment": 0 } ], "Types": { "Strs": [ "Center", "Body", - "0.0", - "¥#,##0_);[Red](¥#,##0)" + "0.0" ] }, "CellStyles": { "1,1": 0, - "1,4": 0, - "1,7": 0, - "1,10": 0, - "1,13": 0, - "1,16": 1, - "1,17": 2, - "1,18": 2, - "1,19": 1, - "1,22": 0, + "1,4": 1, + "1,5": 2, + "1,6": 0, + "1,9": 0, + "1,11": 0, + "1,14": 0, + "1,17": 0, + "1,20": 0, + "1,23": 1, + "1,24": 2, + "1,25": 2, + "1,26": 1, "2,1": 3, - "2,4": 3, - "2,7": 3, - "2,10": 4, - "2,13": 4, - "2,16": 5, - "2,17": 2, - "2,18": 2, - "2,19": 5, - "2,22": 6 + "2,4": 1, + "2,5": 2, + "2,6": 3, + "2,9": 0, + "2,11": 3, + "2,14": 0, + "2,17": 4, + "2,20": 4, + "2,23": 5, + "2,24": 2, + "2,25": 2, + "2,26": 5 }, "SheetStyle": { "FontFamily": 1 @@ -609,22 +648,26 @@ }, "Spans": [ "2,1,1,3", - "2,4,1,3", - "2,7,1,3", - "2,10,1,3", - "2,16,1,3", - "2,13,1,3", - "2,22,1,4", - "3,1,11,25", - "2,19,1,3", + "2,6,1,3", + "2,11,1,3", + "2,17,1,3", + "2,23,1,3", + "2,20,1,3", + "3,1,11,28", + "2,26,1,3", + "2,14,1,3", + "2,4,1,2", "1,1,1,3", - "1,4,1,3", - "1,7,1,3", - "1,10,1,3", - "1,13,1,3", - "1,16,1,3", - "1,19,1,3", - "1,22,1,4" + "1,4,1,2", + "1,6,1,3", + "1,11,1,3", + "1,14,1,3", + "1,17,1,3", + "1,20,1,3", + "1,23,1,3", + "1,26,1,3", + "2,9,1,2", + "1,9,1,2" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -650,4 +693,4 @@ "PaperSize": {}, "Margin": {} } -}//Ap9EI1kyWMYsaiDLtADrjPHi+v1GWvgWlI5g0i7v4TORh2U15Rhw1r845I7A+FpBU9lo8LtNrA+uHNcVVtTzY3W0sPtz9LG+DA0ybYhjeA7JppXaQoHDrBMfDR9i5bKwH2zqODmJtzfooGBLV4PZGEGEnxEimHR10enWnSmQFJHJNv/Ma5gA8lRELDigFUIFPjGYRUlO9sWe1QNSa65jgwBT+LnEemd1x4PtC3xjLUnlyZlDjO3KgZPmwHxuwcuSvbrVyDm/OqKY2Jc9IoX+Jp4NiyZX9wjkucHAHuBB8j9UJHHxJyhRN7qczxkH44HCqdwbDBpMWxZRIGXZhNkqiuCMC8RSmMOJK8aHClgY61X1DE7BnZ/FT4lbb3gs8XMInj4bw+PLQG7mOmGt8l4lWNEKjcnor1pkp8j1wfqttvJGL9qDlV9apPm4gjgrTH+7M18nhTNQamWwD8A3hzc94DmO+VOYox4R35s+/UPUNd09p8bMm4c1xHtTcDsQfQWeRpuJJ5BwDvnOvjOiYZD/uF7RQhxiplVZ8Sqvp8OsC/JBq7X+0xyO8JUSdgTwGdYXj2rng54O3eCqCiUl8USsPgvALmf+Ot2rjca0If9wmE3D5/xwiSgJhhYE/q2Hk0XaR2ZLmuGliUMKfJWuE5deBPW23L71ZZbnpTuahyzWTreSRA2vJUuTOfuuHq77H+bFGuiBOYm32MHqwtGSJM5s432W5N6BpnguxfO0Oz04f5418jic5rU+TdnI0UIEGddOo2borJOsQ0bheLAbMvxBWpjGujTMjfs90aZe2nHhcbYH4eefOAIpACaGxAloNaD1Va1cwZOPg0SrRIvMpYpQ2AOIk3RaLv4Pk7VlZX0oQIrYsvsO0/4TIL/51tA6hlHxn0wff580T3zpKqBDRHNS+A==|920 \ No newline at end of file +}//HDhGlcSRf6AEDpCQM6GqyTpwzLY7BObEpCydlZmaN7qBHSdgmukgtJRZuDem6Ra2O1DdI3cV9A0mOcSe64OO1kWraCelDWg8uG9wD+UyZjvfHKbsiHWDu4Tk6+Pp+sGuqIQofcKxm4Fnb59suAhqvvViJ5z6tNMVPFHH6SIqMxqrHaMfVkaq3Pj5mwRn0TPHgfI9dVAawQW2sTzjpFd5TT7madVNYXWfkk54M5kEKKcoeqSgrIaueuoUquqgA0dfGrdcsQlDc5IZxvp2qXm7kc9fBBncB72rvWugLZIlhjsAwEVW2+w9CkbCtQwHjoJO7TqcpyefI/TAAYRfUIOXfvfvsIiFFg16BbLC1ATQ6yj86ruXjpWZTZqWHDBOtnZlSoF8Cl//sxQJAFDNHx3Iz3XTRrLeP4sYS2rvjyOrWEI+nUkEUDpqaFdgkWqB0eRX0fpd5eB6ms16QFzGX0n0tTpLd9MwpmQzrU5zahYOPeIFwUfNxUcjuaSuTWzocUMAjjn/WOsjAU9ibiyz1r83Y4RyWpnJjT58xSaDt2M4Xy3pCXcVb1X1a5QNaoAcsFJvdJASaRg8+X6eENHjXVbYZA2FIU0sUt/4KGSbTyWJab4l8vdRCedf4kXdqsT3R/vt+g/gJDzPlZmBwMs1kp0YL4QDwVQZpT2mT2IPBZSDY+BY+iayxcNO2u+dAypckzQdXAPbPi/Kp12Co3AxiMmcFQj2R9v30FniXDly+9nklphcFG1/LnaYrkIonniNMbludnSRcTlip4m3Y2Y6tAJeNFUyWRM8KM36TcgHfHxw9WP7EDBwnTE2MTm4yy7wF3LzJD15YOCLKGtX8Mt79znHnFPZa3lr0h9Ro+II7L8H56xJmUf01uWGDEWfV4n4FUW9hWn9uyomRQn/aL5cBTO1zw==|920 \ No newline at end of file diff --git a/Pages/工时/任务工时统计.rd b/Pages/工时/任务工时统计.rd index 6b9cd85c..b065ec17 100644 --- a/Pages/工时/任务工时统计.rd +++ b/Pages/工时/任务工时统计.rd @@ -1,5 +1,5 @@ { "PageType": 0, - "ColumnCount": 27, + "ColumnCount": 30, "RowCount": 15 } \ No newline at end of file diff --git a/Pages/工时/工时总览.json b/Pages/工时/工时总览.json index b51621ac..a172ff3a 100644 --- a/Pages/工时/工时总览.json +++ b/Pages/工时/工时总览.json @@ -276,7 +276,7 @@ "DefaultSize": 32.0 }, "Values": { - "1,1": "年度", + "1,1": "月份", "1,30": "导出Excel" }, "Formulas": { @@ -286,6 +286,7 @@ "1,3": { "CellType": { "$type": "ElementUI.DatePickerCellType, ElementUI", + "CommandList": [], "UIPermissions": [ { "Scope": 2, @@ -306,7 +307,7 @@ ] } ], - "type": "year", + "type": "month", "placeholder": "选择年份", "startPlaceholder": "开始日期", "rangeSeparator": "至", @@ -328,6 +329,497 @@ }, "IconSize": 14.0 } + }, + "3,2": { + "CellType": { + "$type": "ElementUI.TableCellType, ElementUI", + "ElTableName": "EL表格1", + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "View_任务工时统计", + "BindingInfos": [ + { + "GUID": "0020629c-91a8-4450-b32a-7e3ab1b88683", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "ID", + "GUID": "fe80e481-3c55-4e73-b9ec-cf66a5094440" + }, + "ColumnName": "ID" + }, + { + "GUID": "3ffc6557-519c-467a-8ea6-e7dc44a6fbcd", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "日期", + "GUID": "b62fa29e-e4ed-4e8d-b52d-bbe2773b92c8" + }, + "ColumnName": "日期" + }, + { + "GUID": "4b354278-96d4-4396-99fe-8210367c4bfc", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "执行人", + "GUID": "a072225b-6b93-481c-b79a-2401825fe276", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 + } + }, + "ColumnName": "执行人_全名" + }, + { + "GUID": "3e427825-7519-41d7-b803-534f03a1d748", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "项目ID", + "GUID": "94bcd2d7-d40c-44f2-bbaa-7d3148b99f7e", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "项目名称" + } + }, + "ColumnName": "项目名称" + }, + { + "GUID": "1b6f6c7e-f2f8-48d4-afa2-7dda7c72240e", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "任务ID", + "GUID": "a6eebbac-bc56-42da-9de7-110133a941ef", + "RelationBinding": { + "RelatedTable": "任务平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "任务名称" + } + }, + "ColumnName": "任务名称" + }, + { + "GUID": "87091869-5631-4bf3-b230-edc3ac32fe28", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "时薪单价", + "GUID": "61d44f8d-8540-405f-a3ef-19ba4bb551f2" + }, + "ColumnName": "时薪单价" + }, + { + "GUID": "0631757f-e62f-430c-8f6b-5e0181252577", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "提成系数", + "GUID": "5933776d-53ae-466a-8634-c81154488f3c" + }, + "ColumnName": "提成系数" + }, + { + "GUID": "ade60e61-aa08-4edb-871f-0613618f2b86", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "计划工时", + "GUID": "296e8e69-c1c9-4e4c-903a-09c47a8bf786" + }, + "ColumnName": "计划工时" + }, + { + "GUID": "2637c142-fcce-42fd-a112-d90f92291b03", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "上报工时", + "GUID": "dc445797-a6cb-41c3-bb20-9b991f03d6cf" + }, + "ColumnName": "上报工时" + }, + { + "GUID": "976acc90-73d8-4e7f-bbe8-19f6d5170d80", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "实际工时", + "GUID": "eb4a7c0f-e788-45fa-9157-1d33f0f823e6" + }, + "ColumnName": "核定工时" + }, + { + "GUID": "2a97dd54-f2d2-44e7-9758-cb2e1c24e73c", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "计算提成", + "GUID": "2eb14824-8795-4912-a445-4735de12d692" + }, + "ColumnName": "核定收益" + }, + { + "GUID": "b7dfba01-e0b2-443f-bd5b-bdc169497382", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "请款单ID", + "GUID": "a6efef98-705e-4ed1-9032-74360893f2af", + "RelationBinding": { + "RelatedTable": "收益请款单表", + "RelatedColumn": "ID", + "DisplayColumn": "状态", + "NextRelationBinding": { + "RelatedTable": "请款单状态", + "RelatedColumn": "状态码", + "DisplayColumn": "状态" + } + } + }, + "ColumnName": "状态" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "日期", + "GUID": "35c002dc-8dfe-47a7-afc6-3bd348c26fb7", + "AttachType": { + "$type": "ForguncyDataAccess.DateColumnAttachObj, ForguncyDataAccess", + "ColumnAttachType": 1 + } + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=YEAR(工时总览!D2)" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "日期", + "GUID": "05b83a6a-8df6-407f-bcc6-9648b1c1c67e", + "AttachType": { + "$type": "ForguncyDataAccess.DateColumnAttachObj, ForguncyDataAccess", + "ColumnAttachType": 4 + } + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=MONTH(工时总览!D2)" + } + } + ] + }, + "NullFormulaValueQueryPolicy": 1, + "OrderBySqlCondition": { + "OrderByColumns": [ + { + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "日期", + "GUID": "a52cf2f1-e1bc-4e7c-bf2d-2b2f86382b85" + }, + "Order": 0 + } + ] + }, + "CustomColumns": [] + }, + "autoGenerateColumnsByDataSource": false, + "columns": [ + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "ID", + "label": "ID", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "resizable": false, + "showOverflowTooltip": false, + "hide": true, + "key": "98ff1150-d54e-446c-9b3a-613cfdd52e25", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "日期", + "label": "日期", + "formatStr": "yyyy/MM/dd", + "width": 130, + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "key": "129bde89-108c-461d-a5e1-98c16d33a918", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "执行人_全名", + "label": "执行人_全名", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "key": "4e7a2844-62a5-4ef8-9ae9-1ffe12517668", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "项目名称", + "label": "项目名称", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "key": "aa501ae5-1c12-4258-97db-c466be2cfe67", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "任务名称", + "label": "任务名称", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "key": "7a5dad05-0938-469e-a493-8d5dd7b93cd0", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "时薪单价", + "label": "时薪单价", + "formatStr": "¥#,##0.00_)", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "key": "d4a740e7-0ba8-40fe-946e-bb99660f1e2d", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "提成系数", + "label": "提成系数", + "formatStr": "0%", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "key": "340d337e-e500-48f2-89b5-97cbadc95795", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "计划工时", + "label": "计划工时", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "key": "8a68db1c-6293-4166-a5f0-42088b59cd96", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "上报工时", + "label": "上报工时", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "key": "4b920b0f-5954-478c-8583-022879602c6b", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "核定工时", + "label": "核定工时", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "key": "27035de4-71f8-4361-9677-6637e9be91cd", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "核定收益", + "label": "核定收益", + "formatStr": "¥#,##0.00_)", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "key": "eb792b52-3e53-4237-8e65-81ce5a9865d6", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "状态", + "label": "状态", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "key": "60221d95-fd79-4d6d-8ffd-70d01a90be15", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + } + ], + "actionButtons": [ + { + "$type": "ElementUI.ActionButton, ElementUI", + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "button", + "Name": "编辑", + "shape": "default" + }, + { + "$type": "ElementUI.ActionButton, ElementUI", + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "button", + "Name": "删除", + "styleType": "Accent 5", + "shape": "default" + } + ], + "sumText": "合计", + "size": "default" + } } }, "StyleDatas": { @@ -378,7 +870,8 @@ "Spans": [ "1,30,1,3", "1,3,1,6", - "1,1,1,2" + "1,1,1,2", + "3,2,17,31" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -412,4 +905,4 @@ "PaperSize": {}, "Margin": {} } -}//JfFi9CcLiS7N7YZ44W1WnogeCIKIXkK9jIgIWzwJCRNtVLqAGEopDjwswmwcXOHVCkNTksAvOya1IRP/AI7UxegCgyLIu321SDeE8qxie+C9fKPAi40FcMpwD0gDEwmn1a3fJhBugxyl32ohFw3dOP7j/RqW+dzhMkad8OZKCW73RAGAtgK61ASxx+UyUrf9ZEk87x0e1ts6x8lmbNuJGktWjXw15W2naMse4SX0dDsgZUIt509oXFmLNIp035CfFa/oFxuVIE1vuyGWky3bo3AOOMnUbOqG8/fgAfJrkk8ARi6ZZVSPyFsDeyEvcwHDXqpslyT3Hi8fWFR9/qd0J6zMPINuTGs+m7cRPKaSdaMF+ulkrWWDGoplhuyK8RJXPRIL2R8E0cLT1DOLU+5PzsdfKhHw69HrinyOFyyrtzyzsmqs9PJeqUdz1NZJf0AMV5t/tGptKd5wCPYi1WyNPb9ek5fSvoMlr16ZzkCJyyBA1J4DBctuFb9hd3TSnY1CHSJRg3l/Mv2/doOt9kiwlghR7nfECYnxwlxnufrE9gg40hazS8DwRStYvanQWyMP7dU44jXt9M6SzJ2nf6YCjinnwdHbH5rkv8CdcKyE9H/xfsYftCfkrkB8MROsBfPvmimGXJk+M0o56FHLdChXoSIvxyy7G0soJNKKeog5MsL70lpJJ+XLnCQqNd3Ri3DyUVjusxzkwGjdmWPUFQWdROqrQBu2pfO47KZHvewaXiVgm1yAkyCj4ALPEDMa+g8LOA4gjFRFSf2sRjMcP5x9A76d6D3JvQ9nbGybfpPVvkLyzrYNgEw0u+QCot0Ihn+yZfos2FZyqvLRG6WPGBsHY2dbOn/d3wqAi9wiAy1UQAGMSmletBV2dM3bJ6dOblrYMMVJQiViHFm0gUTZ+KB37w==|920 \ No newline at end of file +}//q2ktkKvFm2ZUMuMIpTDDMCAJGkpbT2mCbBh5nQ5hJ6trQ+OqdAYHfFhtxQnReWYnL6JaJb1uQ1OcywBg4S0iH+5GmG/Jz8yrVhYTVQNgSe92RqOnyAamYJYfJBUrx/ot2Tv3ga1fGUIxpiSnhWypzBOeGfphqdnkiwGHA2myMA7a/C4NLcW0VWXm9AHyG2yO6cbzAih8vA1aytskLKUaZNo/W515WPkMkLvoOKOL2NOGC47ei6mC2sLi+cUvbVUfJdm1uIbiGnTxBKLzgcWQwXogrHZATUbJ9Cj4ASNTHmidY7j90taIrVqy3p8O/VnB0bX0jHn2r+/oOXEw+TyjHVBbCPVtHJv6Z1GildSETfOHIZSlwabQ6ZKDhAAGZBMQsYvUcWBYkDcoN7jUlvUMyyXgafWwWATVl5Kn5n2IlQdVkp9/Zyk9gdoBNMog5UWR/Qk4m6TSDngP/uEXKXaltzCAG2jspTi/BS4nRLrTNtkttnoywQreIbf0AZ5Eg5WaDFRtg+9CM+CgKdkAUmd/VyAtF0zxESVDXVsSofWF0jTCJECCag90iWb53Zbpre5hWcYky8BVa4OTncp3UDX29JLQY24+ufqE4L9xml/Lc22m0eVX0XFy4NowAooYnuNzHCOqaQVHyLmjOMRLqtmfOSfKOBPvHf0Km9JOku4AFHztOHjT1o35B8gB7XZiXeFq5/YzZvDuKOg6wWlbFv1n9gchcxfedjyAZyv6op0NUi2iOxWQFL36mqtJVMUxXsEOhZ59iDS65tWsq4+YDXzyGfnCBX0k42x6rvrgwJ4OabHh5Jh8tjLTg6TJQ7/kvAbf9yZk85QjzGm0Y3p4dBujO26zy0jm974lso/Ij7KGpy0R6dRKuSBAjzA5eaEAaCVKhRBAwX1kyviK/DJry1J+2A==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json index 473042f4..e278968e 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json @@ -495,7 +495,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "33ba2ba5-fc71-4652-a6c2-c4ea10d54cf8" + "ID": "74b9d6e5-0ee3-4127-bd2c-1cf33206ed59" }, { "Condition": { @@ -529,7 +529,7 @@ ] } ], - "ID": "acc2fa43-4c34-4a0c-a518-d8571be59ead" + "ID": "26676689-b7cf-4875-8747-064d1d645f2e" }, { "CommandList": [ @@ -705,7 +705,7 @@ } } ], - "ID": "dffe8149-4fe8-4ec8-a4fd-3c1f331bf795" + "ID": "84ac1ba8-0e35-476a-b784-b94e640f54f7" }, { "CommandList": [ @@ -717,12 +717,12 @@ } } ], - "ID": "e088bda2-bc85-42cb-a913-f40756cf8115" + "ID": "d8644a57-0971-467c-976b-c4c7953465ea" } ] } ], - "ID": "6d092aec-3290-42b1-b06f-a256c2b18308" + "ID": "62fbae6a-30fb-4208-8121-5f26a7424bdd" } ] }, @@ -763,7 +763,7 @@ "LoadBindingDataOption": 2 } ], - "ID": "fc797c92-fae1-4cb8-8edd-66e27584bd1e" + "ID": "41ff76c8-28ae-4602-b661-ff2af3250986" }, { "CommandList": [ @@ -778,17 +778,17 @@ "BtnText": "知道了" } ], - "ID": "df339f25-8757-4d6d-8b6b-74d3c000e75e" + "ID": "9bbe2045-2e2a-4901-a949-32a797f2e301" } ] } ], - "ID": "9bddf94a-e75b-4e9c-80e8-dfb117154acc" + "ID": "53f62e67-b149-40f1-8c82-a24bed2d3800" } ] } ], - "ID": "92b9d58e-d550-41bd-9c8a-b231a1fcbcc5" + "ID": "afbaaf4b-3317-4326-a75e-e2261fc90ba6" } ] } @@ -1311,29 +1311,62 @@ }, "CommandList": [ { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PageName": "新增报工", - "PassValues": [ + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ { - "Source": "实际", - "TargetCell": { - "SerializeProperty": "=新增报工!工时类型" - } + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务平行视图", + "ColumnName": "任务成员", + "GUID": "1a3c3f2a-ae70-4e6b-9b90-72ab7f243551" + } + }, + "value": "%CurrentUser%", + "compareType": 10 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "新增报工", + "PassValues": [ + { + "Source": "实际", + "TargetCell": { + "SerializeProperty": "=新增报工!工时类型" + } + }, + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!行数据.value" + }, + "TargetCell": { + "SerializeProperty": "=新增报工!任务ID" + } + } + ], + "LoadBindingDataOption": 1 + } + ], + "ID": "3dcb821d-321f-4cb2-8fbd-4c682213408c" }, { - "Source": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务列表!行数据.value" - }, - "TargetCell": { - "SerializeProperty": "=新增报工!任务ID" - } + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": "你尚未成为该任务参与人，不能报工" + } + ], + "ID": "baea8a38-3267-42e5-8c12-0a08f1c7794c" } - ], - "LoadBindingDataOption": 1 + ] } ], - "ID": "9dce24f4-bd40-43f1-a2bd-111618b51c5c" + "ID": "43530ba1-4bf1-4c8b-bb27-52209d2dde41" }, { "Condition": { @@ -1359,7 +1392,7 @@ } } ], - "ID": "f00f9b9a-a02c-4b76-8768-4a33dad8fef6" + "ID": "63173c5f-1c33-45d3-94c6-d7fa31c6d537" }, { "CommandList": [ @@ -1398,12 +1431,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "84d5c3cc-5cf1-4817-9eb5-55fdde69266b" + "ID": "1c591370-1ab9-4448-b4df-b0124b0ab48a" } ] } ], - "ID": "b358541d-67cd-421c-802b-32580fa729f0" + "ID": "d692a5f1-6e1f-49ad-8a99-f556b4ad4cf3" } ] } @@ -1845,4 +1878,4 @@ "Formula": "任务列表!$I$13" } ] -}//DnHhgra3fjulTW64QT9hvfi3wRDc+eS0oggYRwI+4SHb7Ptgjh0WTqEOi7jiIOEpC1ULdyjMqeftocIMrcObpg+MnXoZHrrcNJLg4gttmzRkLuhEiNU2yPldcG2LFsqhHIX6LqpKxS17IwvqxOkurU2DgSb1PSLQKMNYW9B9ioXbK/rui5JoKPksrZ8AM83LOVTMwj3UK6IPEZp3p8UVpTUCl7ffvDC1tx5Dsm3EWES9qmQ4s7FXj6lLA7XK15A9mE6fvg2inWXK7VLCOCSUbsdRrg9YJNxAFvqhIidP6riNJA8LMFdgZbYLmIv3ziQJjh3M139tWhe0BlsitE/iCgpStPhhBLK/BS+dUywb3tIy1o5YuOUsL3T/mZvw7wzgUkImCg6+369BA/J66/ayyYv4wKSjfYg8jNSu+PxZRiX/tZMb53uGjHPkr/8dBNd0r4vBVliDIrpoFYi/E4wdgZqFh2mlMtVhJ/w6plR3Uc3enJBP8JJTdH6gK1aZcDQYyj7VmJDLY87DshdpTwjrjboTC4DcjqIBI6+a+mRJn0pMlREisHN9UyuYV3wWFVr+cQfg6YtM+Ob4UCjg+lwZRuu9NBfPBbkezi89ww4EQO846e9lER7H/ri/1G6Tz6S7a5O51DA6Cnscvw3srA+rtJsh003f5qO4ZGSUcSoo5xO62tcKvgOOIz5c+tpMPoD04xcovptodj3KTxfXOJvPkQXlof79doUCdxrxsJ1HR92d8esZjWnSjj5Tp9MiF9Pv3FMWa29hBeX3WgkyU/RlUrFmHl+h7Htihp3KX9y5AuSd/iLCxAVv9E73YG84ySJ0gZj5hjBiS2P9ioIifjIascW1tCpVtiJPaSCvM131dNrYnm/663It5Cz6wGctoTzWggL1i+MzSdJHxwLZa5pMTw==|920 \ No newline at end of file +}//vwWeraAIalsGsO8kCWXQFFYQf+52VXQAaVIVjRNxJVKg326n0V/jp49UTT360rdHFBEuWxGCrqJ6XF2VJQCGJwr3ndeSkZGbm4AOXGcQaYA6ujtLznK8pFA6DxnbTw9ptXHJLTDUVR4qu4q78yZjFW/Ag34XWO+PDA35qdGEmEtLMAIcFppi9ar7UMS49s1A36id7w7JSmzycjViWGMoznmQLTmaYTraUKHlZjHdJWBYa5OjPuQh/Fdi478tuDysvmM+Hdo5RNajvGUWbngI3HiYfIeNqcDsNufxVDo2Tr3oqAKzf+PHRKxfMh1pWTwmYPaBRb4ErR4UTsrTLS/QMHHFpr4eMWa0V1iF1S8O6ttSCCKNXdfRtgOhk8ciawXLCrr8Sy+UHVHo3WyaiuIDZOtwz3YeQOb1oAZlv2/foLMojhx5bTyRs4GTTc9BNCQ6U7ZqIcAczT+GmwuK3tzG5VDv0ZhEfMz7vGIrzj4U9hhLWgcaaMDB3RQnajAGRNvFJY+Q37mOy2WaBBjkd+YmZea4NTcJWPJqcdG85ve+grl5ZL6KS0LJxQ4/rLtw4cm7X3bKHJ/RhAFXHEuPO1mAwws4TN2FS1M+kphokN7M8KRWEfsTepgwD5R/eSv2Y30cEOibZpwjJ9YE4ZTta+19EqovOHc19NIqz/xKJZo7fiyHmALN6X/+XsZL9vIfgOZOgEkj3gcUTRZ+1Vs/+iyKS9ZFhTGKjCK3+e6r5jC8r6NzAPlDT7Kqg8jFVZiDZbLqAa0fIx6hCqMuk0DVI+FGnf9oq8nCHuADQ0lslAdWspO4BvIHGwzbfivZAL2nUdSFEmb3ZXEddk6gY5Pm5LOFvkiKdr2+zW5XUUTpqfJHwDfIwNBw8836B/VE70KAP4w0GcfB6jHKuGUZ1oHUOTMzhA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目工时.json b/Pages/项目/项目首页/项目首页-容器页面/项目工时.json index ac8e7753..a9557ea0 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目工时.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目工时.json @@ -429,7 +429,7 @@ "ID": "6912426144fa4151a7665384b46d6a22" } ], - "ID": "f71a0412-febf-477d-aeec-f41fceec5001" + "ID": "69d82f8b-0a1b-4de3-a523-6b3d4b2c56af" }, { "Condition": { @@ -501,7 +501,7 @@ "ID": "4a25d702e22141f495cad5baf9ff1a9a" } ], - "ID": "391778bb-7b33-4ff2-ad3e-ea7ff0126f1b" + "ID": "a7368e41-4af0-4ffd-8d42-210c295acb26" }, { "Condition": { @@ -571,7 +571,7 @@ "ID": "e22633b6551e4332ae99e03268670571" } ], - "ID": "83c2042d-3491-4eee-92dd-97eea145cd91" + "ID": "e16a8371-af72-46d1-9595-a627fae8df9d" } ] }, @@ -1090,4 +1090,4 @@ "Formula": "项目工时!$B$6" } ] -}//W8sNNteT/S0wMsMn770nN1IB7Bic/Vt5TmXgN6S6KxXAHbjud5Ywv2DKRUObkwp3yCi5Pvq1zVUsMkYddRL4d3m6moRkq90tw64p5oPsf+MjcedHF4jgb3EOiOPWChQZncyPmWgSidSf+dK2jURwI520YDdqhiVazdpmYTyOhNj+fOxgcDKopb0hd2g+lACC60YtzulVidaoV4g1tAMA84gqWTC9pK4cD/5cNJnA/nwSp1Cioho3CdhbBvloXhqM2nZsGiY1sspTC0rbcDCtC60PbFtfV2gc7jrtXcj4z4y9yW0WsUawwmxC8yEPlieyylF0IdGVVkOM/DF7Txilq0ccOkNuMiig+IDmQak+krwurDUqfy3Lx5Rstp3yBsyx3w1FQzFBVv4DVo5GRo+IDjl9p7YFujG/2eMKXkC0qANzYNzqaLpBCbJ6MkXenvSgyZFW/mWIJPIhBlB/EZrQR/z54ZMeUzWB0GDtZNgUrbbEjTXDZFhScc8A7d0nUYfNivQsoOXFjEYMgJA/Yk69krcRR1tN+NF28WBgq5sQTnpQnU1++PLkSPnAaeLwussfIcUQPlM5qTO4Z2Lz0yIEFqL4TiSVmv1mWI5oQn2hNdnNk4EuQUBdcHSU9gdLwEhOByxXmp6dr5ekmZ0rqKpNNv7KLIqDFUKAI8y81ZLBkiKPIVmh9GmqvVw+74WqjunlyWFFfJNpfbAgXyYfU7AQpPZSI1HiBKgSDnQiW4rvl7pqO5LWM264e4Fg/pGF4P3EtAPkMWFOK3TprmOGWqMq69qmdzhWa4gNqiKAGCRFBWobnBy/nUoZTPaA1QZhk4buTSssCOU7fWcSidlEZerfS2pcJwTGF0HbrrrgFuHQtC02TU73BgEzwfnqYFfxpO9s49jPPONOwecEDPt+ajedXQ==|920 \ No newline at end of file +}//dv2S1sexC9q9M+MHwX88jIdhF35LOj+iv5li+Gmj28bSLXNQVjTpp/PS77CG6zel21ioUi5dygT5phSI9bZ1+OfD0ZM++N8MFRoOQBneZmEf03ObdHte6IhGlkW9zI6kloHxBhGncNrZcySUDve103kBKSCn2SYgLy+iNUWRTcelnBpvDZql1rVgDckIM/+bPOIgFPvXTGLS6eY2DAUy/LOMz7w755o6HHVZkrFDpYmLXFIrxgAVtwBzYhxUSiKEF/47nZv7Pg0rIrvLQoEmmTuR7iXrPr1D84uaKu7KuvPe0LlAelMV6SOA12y8J4/pcDpDZnRKLNplb42sW7kvcmZCCmvjv8lmgOnNhJYrIsNOEQPdaoQ9c5I+3dpEok07pIWFgvmbaIX/i9zkBXU6SeVxkrvVZcK45c8PBe9QOaPlpyNRx+i67DgjDCm2752xYdExRvjZDnilXBg2ZVzc2ULk71/bNI0WAQbTCC+DpnGF4jvB9TC/08SBZDGSif/5YrZosJNMr7AMVL6PMGKx/fIuALRmAMjGcQ0udAz1+Psuwk04s0DYmk55eeHb4pl3GCmruvjEdua2xmuSMoSOykqZOdGAoecE7YDbmLr0mtcimY9duQvSqlIQb/4Iu3oe26wuDfDsiWppnfElOw3mo6QLiBSF++EmcV53TwgAjxfR4fPNobft7T2gKSD+PuNuWOqhOXdM4Rqa6hOW0UMd9CUQBUqag/aPgiv8Sn6n8GS+7iK+TYP5CZhiaTH7bLl/r5dp83KXa1D+oulRtrwftZ/S83DZ8xvEsXngqxQy+UUAzJ6fRDbbtJUdtR0yEJv5kaJJoo4K6cdPMsBn1lSpL4K2dTsMAUnAJMGGruWwYseNbgI/2AmlxhQudf/T9Hu1Q0KCH69211/ONWbdvY8fNQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.json b/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.json index d68882c5..9ae930c2 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.json @@ -47,9 +47,14 @@ "DesignLengthInPixel": 32.0 } }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 15.0 } }, "6": { @@ -59,22 +64,17 @@ }, "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 50.0 } }, "8": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 10.0 } }, "9": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 50.0 - } - }, - "10": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 32.0 } }, "11": { @@ -84,57 +84,67 @@ }, "12": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 15.0 } }, "13": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 15.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 } }, "15": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 50.0 } }, "16": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 10.0 } }, "17": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 32.0 } }, "18": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 32.0 } }, "19": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 50.0 + "DesignLengthInPixel": 32.0 } }, "20": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 15.0 } }, "21": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 15.0 } }, "22": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 15.0 } }, "23": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 50.0 + } + }, + "24": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 } }, "25": { @@ -144,12 +154,12 @@ }, "26": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 32.0 } }, "27": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 32.0 } }, "28": { @@ -159,30 +169,25 @@ }, "29": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 50.0 + "DesignLengthInPixel": 15.0 } }, "30": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 15.0 } }, "31": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 50.0 } }, "32": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 10.0 } }, - "33": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "35": { + "34": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } @@ -222,29 +227,178 @@ "DesignLengthInPixel": 32.0 } }, + "44": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "45": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, "46": { "GridRowColumnDefinition": { "DesignLengthInPixel": 15.0 } + }, + "47": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 50.0 + } + }, + "48": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "50": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "52": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "53": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "54": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "55": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 50.0 + } + }, + "56": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "60": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "61": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "62": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "63": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 50.0 + } + }, + "64": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "66": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "68": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "33": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "35": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "41": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "49": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "51": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "57": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "58": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "59": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "65": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "67": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } } }, - "Count": 47, - "DefaultSize": 32.0 + "Count": 72, + "DefaultSize": 15.0 }, "Values": { "1,1": "成员", - "1,11": "完成任务/总任务", - "1,21": "实际工时/计划工时", - "1,31": "实际成本/预算成本", - "1,41": "实际工时/预算工时" + "1,7": 100, + "1,9": "预算工时", + "1,17": "已分配", + "1,25": "可分配", + "1,33": "已核定", + "1,41": "可核定", + "1,47": 100, + "1,49": "预算成本", + "1,55": 0, + "1,57": "已消耗", + "1,65": "未消耗", + "2,49": 100 + }, + "Formulas": { + "1,15": "ROUNDUP(R3/J3*100,0)", + "1,23": "ROUNDUP(Z3/J3*100,0)", + "1,31": "ROUNDUP(AH3/R3*100,0)", + "1,39": "ROUNDUP(AP3/R3*100,0)" }, "AttachInfos": { - "1,9": { - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "任务完成比例", - "GUID": "aa558919-f6dc-4a6a-9649-fae4d1d1cf46" - }, + "1,7": { "CellType": { "$type": "ElementUI.ProgressCellType, ElementUI", "CommandList": [ @@ -258,7 +412,7 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "='项目概况-关键数据'!J2" + "SerializeProperty": "='项目概况-关键数据'!H2" } ] }, @@ -270,7 +424,7 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='项目概况-关键数据'!J2" + "SerializeProperty": "='项目概况-关键数据'!H2" }, "TargetType": "ElementUI.ProgressCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", "MethodName": "SetBackgroundColor", @@ -279,7 +433,7 @@ } } ], - "ID": "1f85c81c-b15d-45c0-b07e-56b1a4f91e44" + "ID": "59db4845-cbe6-4d72-b6bb-e41836a22667" } ] } @@ -288,12 +442,7 @@ "color": "Accent 1" } }, - "1,19": { - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "计划工时使用比例", - "GUID": "99fdb20c-8ab8-4b1b-9fd9-e840512df836" - }, + "1,15": { "CellType": { "$type": "ElementUI.ProgressCellType, ElementUI", "CommandList": [ @@ -307,7 +456,7 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "='项目概况-关键数据'!T2" + "SerializeProperty": "='项目概况-关键数据'!P2" } ] }, @@ -319,7 +468,7 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='项目概况-关键数据'!T2" + "SerializeProperty": "='项目概况-关键数据'!P2" }, "TargetType": "ElementUI.ProgressCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", "MethodName": "SetBackgroundColor", @@ -328,7 +477,7 @@ } } ], - "ID": "5f2e9ceb-e64b-43a7-975d-59acce2cdb97" + "ID": "b933ecf1-e808-4428-a195-d7f1af075164" } ] } @@ -337,12 +486,7 @@ "color": "Accent 1" } }, - "1,29": { - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "预算消耗比例", - "GUID": "6e711788-bf86-4561-8bad-cffe6587568b" - }, + "1,23": { "CellType": { "$type": "ElementUI.ProgressCellType, ElementUI", "CommandList": [ @@ -356,7 +500,7 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "='项目概况-关键数据'!AD2" + "SerializeProperty": "='项目概况-关键数据'!X2" } ] }, @@ -368,7 +512,7 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='项目概况-关键数据'!AD2" + "SerializeProperty": "='项目概况-关键数据'!X2" }, "TargetType": "ElementUI.ProgressCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", "MethodName": "SetBackgroundColor", @@ -377,7 +521,51 @@ } } ], - "ID": "3c6f5727-63c2-4239-bd5b-aba211c20d47" + "ID": "34d0249a-c395-4ed9-ac68-bfd0949f8a9c" + } + ] + } + ], + "type": 2, + "color": "Accent 1" + } + }, + "1,31": { + "CellType": { + "$type": "ElementUI.ProgressCellType, ElementUI", + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='项目概况-关键数据'!AF2" + } + ] + }, + "value": "100", + "compareType": 2 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='项目概况-关键数据'!AF2" + }, + "TargetType": "ElementUI.ProgressCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "SetBackgroundColor", + "ParameterValues": { + "color": "Accent 4 0" + } + } + ], + "ID": "fe98cc30-ff5c-4037-b110-9480f7830dc9" } ] } @@ -387,11 +575,6 @@ } }, "1,39": { - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "工时消耗比例", - "GUID": "74e00eba-defd-498b-a6dd-fe03ccfb87e8" - }, "CellType": { "$type": "ElementUI.ProgressCellType, ElementUI", "CommandList": [ @@ -426,7 +609,139 @@ } } ], - "ID": "9c18e4f7-3209-49a3-8182-1bd99d99b3d8" + "ID": "bf7fad5a-6270-4485-9525-52cae05df410" + } + ] + } + ], + "type": 2, + "color": "Accent 1" + } + }, + "1,47": { + "CellType": { + "$type": "ElementUI.ProgressCellType, ElementUI", + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='项目概况-关键数据'!AV2" + } + ] + }, + "value": "100", + "compareType": 2 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='项目概况-关键数据'!AV2" + }, + "TargetType": "ElementUI.ProgressCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "SetBackgroundColor", + "ParameterValues": { + "color": "Accent 4 0" + } + } + ], + "ID": "8d6ea301-a47d-4c93-a648-e6c9fdafd111" + } + ] + } + ], + "type": 2, + "color": "Accent 1" + } + }, + "1,55": { + "CellType": { + "$type": "ElementUI.ProgressCellType, ElementUI", + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='项目概况-关键数据'!BD2" + } + ] + }, + "value": "100", + "compareType": 2 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='项目概况-关键数据'!BD2" + }, + "TargetType": "ElementUI.ProgressCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "SetBackgroundColor", + "ParameterValues": { + "color": "Accent 4 0" + } + } + ], + "ID": "09ae7ed2-bd6a-43bc-b06f-f6bfb2cd602c" + } + ] + } + ], + "type": 2, + "color": "Accent 1" + } + }, + "1,63": { + "CellType": { + "$type": "ElementUI.ProgressCellType, ElementUI", + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='项目概况-关键数据'!BL2" + } + ] + }, + "value": "100", + "compareType": 2 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='项目概况-关键数据'!BL2" + }, + "TargetType": "ElementUI.ProgressCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "SetBackgroundColor", + "ParameterValues": { + "color": "Accent 4 0" + } + } + ], + "ID": "82736b72-58af-419e-b917-2e0a236fff92" } ] } @@ -442,32 +757,39 @@ "GUID": "fe9b0d76-1afd-4719-8184-fbe9f6dd3939" } }, - "2,11": { + "2,9": { "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "任务完成情况", - "GUID": "9061c0f5-7531-42e6-add3-6b8672ff2020" + "TableName": "项目平行视图", + "ColumnName": "项目预算工时", + "GUID": "af4d7ca4-a6a8-4e94-b02f-1d8a0fdb070b" } }, - "2,21": { + "2,17": { "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "工时情况", - "GUID": "2552529c-1f38-4c95-87e4-caa444bc4d72" + "TableName": "项目平行视图", + "ColumnName": "项目已分配工时", + "GUID": "dfd4d65b-b273-4e08-979d-08f88f756788" } }, - "2,31": { + "2,25": { "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "费用成本情况", - "GUID": "830ce54a-f4cb-4fa5-b350-30f36058b4fc" + "TableName": "项目平行视图", + "ColumnName": "项目可分配工时", + "GUID": "c1b01a67-6f3f-4f1a-8535-06942fe7f124" + } + }, + "2,33": { + "BindingInfo": { + "TableName": "项目平行视图", + "ColumnName": "项目总核定工时", + "GUID": "ca06b778-4855-46ef-a81d-30289727bf94" } }, "2,41": { "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "工时成本情况", - "GUID": "27bf41c1-9428-4320-9df2-9dc4c5275d30" + "TableName": "项目平行视图", + "ColumnName": "项目可核定工时", + "GUID": "cf06885e-1f35-4806-a6e6-2f12ce865989" } } }, @@ -496,7 +818,13 @@ "Formatter": 2 }, { - "FontSize": 18.666666666666664 + "FontSize": 18.666666666666664, + "HorizontalAlignment": 3 + }, + { + "FontFamily": 0, + "FontSize": 18.666666666666664, + "HorizontalAlignment": 3 }, { "FontFamily": 0, @@ -507,37 +835,71 @@ "Strs": [ "Body", "Text 1 50", - "[AUTO]General" + "[AUTO]General", + "Left" ] }, "CellStyles": { - "0,29": 0, - "0,30": 0, + "0,23": 0, + "0,24": 0, + "0,31": 0, + "0,32": 0, + "0,37": 0, + "0,38": 0, "0,39": 0, "0,40": 0, + "0,41": 0, + "0,42": 0, + "0,43": 0, + "0,44": 0, + "0,45": 0, + "0,46": 0, + "0,47": 0, + "0,48": 0, + "0,49": 0, + "0,50": 0, + "0,51": 0, + "0,52": 0, + "0,53": 0, + "0,54": 0, + "0,55": 0, + "0,56": 0, + "0,57": 0, + "0,58": 0, + "0,59": 0, + "0,60": 0, + "0,61": 0, + "0,62": 0, + "0,63": 0, + "0,64": 0, + "0,65": 0, + "0,66": 0, + "0,67": 0, + "0,68": 0, "1,1": 1, - "1,9": 2, - "1,10": 2, - "1,11": 3, - "1,12": 0, - "1,13": 0, - "1,14": 0, - "1,15": 0, - "1,19": 2, - "1,20": 2, - "1,21": 4, - "1,22": 0, - "1,23": 0, - "1,24": 0, - "1,25": 0, - "1,29": 2, - "1,30": 2, - "1,31": 4, - "1,32": 0, - "1,33": 0, + "1,7": 2, + "1,8": 2, + "1,9": 3, + "1,10": 0, + "1,11": 0, + "1,15": 2, + "1,16": 2, + "1,17": 4, + "1,18": 0, + "1,19": 0, + "1,23": 2, + "1,24": 2, + "1,25": 4, + "1,26": 0, + "1,27": 0, + "1,28": 0, + "1,29": 0, + "1,30": 0, + "1,31": 2, + "1,32": 2, + "1,33": 4, "1,34": 0, "1,35": 0, - "1,36": 0, "1,37": 0, "1,38": 0, "1,39": 2, @@ -547,22 +909,97 @@ "1,43": 0, "1,44": 0, "1,45": 0, + "1,46": 0, + "1,47": 2, + "1,48": 2, + "1,49": 4, + "1,50": 0, + "1,51": 0, + "1,52": 0, + "1,53": 0, + "1,54": 0, + "1,55": 2, + "1,56": 2, + "1,57": 4, + "1,58": 0, + "1,59": 0, + "1,60": 0, + "1,61": 0, + "1,62": 0, + "1,63": 2, + "1,64": 2, + "1,65": 4, + "1,66": 0, + "1,67": 0, + "1,68": 0, "2,1": 5, - "2,10": 2, - "2,11": 6, - "2,20": 2, - "2,21": 6, - "2,30": 2, - "2,31": 6, - "2,36": 6, - "2,37": 6, - "2,38": 6, + "2,8": 2, + "2,9": 6, + "2,16": 2, + "2,17": 6, + "2,24": 2, + "2,25": 6, + "2,28": 7, + "2,29": 7, + "2,30": 7, + "2,32": 2, + "2,33": 6, + "2,37": 7, + "2,38": 7, "2,40": 2, "2,41": 6, - "3,29": 0, - "3,30": 0, + "2,44": 0, + "2,45": 7, + "2,46": 7, + "2,48": 2, + "2,49": 6, + "2,52": 0, + "2,53": 7, + "2,54": 7, + "2,56": 2, + "2,57": 6, + "2,60": 0, + "2,61": 7, + "2,62": 7, + "2,64": 2, + "2,65": 6, + "2,68": 0, + "3,23": 0, + "3,24": 0, + "3,31": 0, + "3,32": 0, + "3,37": 0, + "3,38": 0, "3,39": 0, - "3,40": 0 + "3,40": 0, + "3,41": 0, + "3,42": 0, + "3,43": 0, + "3,44": 0, + "3,45": 0, + "3,46": 0, + "3,47": 0, + "3,48": 0, + "3,49": 0, + "3,50": 0, + "3,51": 0, + "3,52": 0, + "3,53": 0, + "3,54": 0, + "3,55": 0, + "3,56": 0, + "3,57": 0, + "3,58": 0, + "3,59": 0, + "3,60": 0, + "3,61": 0, + "3,62": 0, + "3,63": 0, + "3,64": 0, + "3,65": 0, + "3,66": 0, + "3,67": 0, + "3,68": 0 }, "SheetStyle": { "FontFamily": 0, @@ -570,15 +1007,23 @@ } }, "Spans": [ - "2,1,1,5", - "2,11,1,5", - "2,21,1,5", - "2,31,1,5", - "2,41,1,5", - "1,19,2,1", - "1,9,2,1", - "1,29,2,1", - "1,39,2,1" + "2,1,1,3", + "2,9,1,3", + "2,17,1,3", + "2,25,1,3", + "2,33,1,3", + "2,57,1,3", + "2,65,1,3", + "1,7,2,1", + "1,15,2,1", + "1,23,2,1", + "1,31,2,1", + "2,41,1,3", + "1,39,2,1", + "2,49,1,3", + "1,55,2,1", + "1,63,2,1", + "1,47,2,1" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -597,7 +1042,8 @@ ] }, "RowBreakLines": [], - "RepeatRangeSettings": [] + "RepeatRangeSettings": [], + "RelatedDataTableName": "View_项目统计信息" }, "PrintInfo": { "PaperSize": {}, @@ -616,7 +1062,7 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Size": "190,79" + "Size": "126,79" }, { "Name": "6154fb52-2385-4d1d-abc8-01b77955c5f6.png", @@ -629,8 +1075,8 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "205,0", - "Size": "250,79" + "Location": "141,0", + "Size": "186,79" }, { "Name": "769f904e-1d99-4edb-b1dc-4a48a3dcf371.png", @@ -643,8 +1089,8 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "470,0", - "Size": "250,79" + "Location": "342,0", + "Size": "186,79" }, { "Name": "4cdb3ab8-4b9f-40b2-98ff-ca716a91f9cc.png", @@ -657,8 +1103,8 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "735,0", - "Size": "250,79" + "Location": "543,0", + "Size": "186,79" }, { "Name": "6512132f-7136-446d-a971-e9f12489d7ab.png", @@ -671,8 +1117,64 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "1000,0", - "Size": "250,79" + "Location": "744,0", + "Size": "186,79" + }, + { + "Name": "BackgroundPicture5", + "DisplayName": "背景图6", + "StyleInfo": { + "CornerRadius": 6.0, + "Fill": "Background 1 0", + "Stroke": "Background 2 0", + "StrokeThickness": 1.0 + }, + "IsAutomaticStroke": false, + "IsAutomaticFill": false, + "Location": "945,0", + "Size": "186,79" + }, + { + "Name": "BackgroundPicture6", + "DisplayName": "背景图7", + "StyleInfo": { + "CornerRadius": 6.0, + "Fill": "Background 1 0", + "Stroke": "Background 2 0", + "StrokeThickness": 1.0 + }, + "IsAutomaticStroke": false, + "IsAutomaticFill": false, + "Location": "1146,0", + "Size": "186,79" + }, + { + "Name": "BackgroundPicture7", + "DisplayName": "背景图8", + "StyleInfo": { + "CornerRadius": 6.0, + "Fill": "Background 1 0", + "Stroke": "Background 2 0", + "StrokeThickness": 1.0 + }, + "IsAutomaticStroke": false, + "IsAutomaticFill": false, + "Location": "1347,0", + "Size": "186,79" + }, + { + "Name": "BackgroundPicture8", + "DisplayName": "背景图9", + "StyleInfo": { + "CornerRadius": 6.0, + "Fill": "Background 1 0", + "Stroke": "Background 2 0", + "StrokeThickness": 1.0 + }, + "IsAutomaticStroke": false, + "IsAutomaticFill": false, + "Location": "1548,0", + "Size": "186,79" } ] -}//0Lue7YFaCMSW8OWUVnlKrHg5IeIAL7HCW4l6lIH32Hj9UPGnCroGGiJeEto7NGYcXt6fWP7QjHm4Ye1le51Kr+IfqpyBp2n8K4+AcE8iyYAta693OJS75ih9sBXNpTs7/h0stc9NLhSBPTkEogORKF1u4YGVUvw/nU4USYyaexv8vZr9xr3kckmMdPnlZzE0gJ1QNihfUMWBu7p9FLuwGxk8sbXyl2uvkkjIG2r5rf6/trnAIXU9vlCxkbgcu/Bfw56ZyDYxLzMYKjxBOnKq8adL3Fn0NoRJ9CvL1r+gcjWJXIOo8dk8i5oYdXf0baVXDpHlrQamOCONrw2BC4ZbzKotpIfhTU7k8JcX6VTiEK0LIeAHixg/zKUN+FdNIXof2M86VBiueZc0QNmUwrBbGqEExSv8/Abfp1fMshhGmabz9oXbPKStQ81a7QFfNIhYGIZIMTLk1Y50CeBqNZGuloItpDcXnwgtBjVPWFFi3U4qGISRndAju3N2d8mbVC9l8iNnsOMpny+YDdOuwuvQnLGM/cmw409Nv4lextfBWSGB51IGTqgoKuCl9cg3igSPlAk9YYZ+kTpqKsXRKMWGwOF4Jr6CL1MynH3ni6H4vjXaU452p41vbqAdEu1pR08ZUOMN1HTNqUx7X+O+PjJ6+H4TuDOSEVpFGeO6VxrKDc5qFR60Rg3ScjG043Ztf78JgjEdWoszyVnAnf6ZkfHIzkWu2IKOnx+yoDv7iZNAfkjHG/b5aPAesSyG2zNRm7/mByM0ptPUy9VkPVisUxP1oQc5gSpg9GUBjcbAdkYh9pBWwmLt7f2VSE/9ZktVpf6IyaWPKKHgihQS9dYP5t6EdzCNF9UuMU1KYReqXCxAdwxNxbRiEJWcfkcijaU8ZTn/LkXkVLqgZEgXnt/H5MqgyQ==|920 \ No newline at end of file +}//k+htq6vNBqeQoxa22CQQzEzENXzVSom0Cv1jE3t3U58m0ZIod5ZBYAR7TLWA+ZrkYLfRzNypR2+wdA4pbZ2QpJ4AJLUC9pdTudjXcI7MHAx7KzA/VqLTXjJ+8lyxshVqYHGQWc2MKf7IL0LoOYpE2qUldqSsA4VFtUVHddnq1PiqSdM7B6NZ/Ds1xYFTV0TUo7cm49hOPQj4/M+5wJlF8Y5vsda/EDdBudsz5eFRIYoJEhiLR876W2LAsCerIUwCMj+9VWtE8xEqLCsyT9oNlnj0TapKOcmpwdbl6cVxZ+p75isDaj3nUoUMKAQh2T0LNaiXpFL28Yi13u9xNSQH0o9EgBn6pQ/ldA2jU36cqOafuIXDczU0X/j3GuAI5lqmFkT53auiFCoipxyRFd0fXWG6/ywkU4qE1CBEVcU4VIrvJ+IYJosutHi6Hwqna7jSVT17MISo9/UENPR4ZUsSMX0u4LuLlyHLVJoyuaML65ZQ10Cfi5BYbkAk9w/sZEsn0zdL9hUZ9V8Jp1MliPb1NFPzNMBn0UyM7J7pJp8h+xFE57u44AQ7p3mJZ8puc9CxTybNfRby0I/D6KwkKcJ0r0tyNrtrMYxYh+bPZZ5JMWAs76qXBu43W4ltvXBp86JYy0YIrvwKmTWNKyUyrC0Uj5NEYszYX65JzUQrivtezUySd2nTk43cNNem/VtH3Ej6jG25uqc/H5DYdr6KHF5ZHyctqeRKn5Nn5tQ9Txb/F43SFLsvtrEzRUvLs4Bai6HbYsEB05gVewn5M/u0MXjqplu7fd/niBpTCJSlmeuT22hxjvfdGqWq6VAsWr8SZzK1N7tWXb8l5+avvuSby0KejbhRbMGC3S7KLuEdkxGTDwiX2QwNJ4UJ1MmRfXuGNZBMntc8xiXa6MPCwWCoBEGpsg==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.rd b/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.rd index 4cc0f485..57650034 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.rd @@ -1,5 +1,11 @@ { "PageType": 0, - "ColumnCount": 47, - "RowCount": 4 + "ColumnCount": 72, + "RowCount": 4, + "Formulas": { + "1,15": "ROUNDUP(R3/J3*100,0)", + "1,23": "ROUNDUP(Z3/J3*100,0)", + "1,31": "ROUNDUP(AH3/R3*100,0)", + "1,39": "ROUNDUP(AP3/R3*100,0)" + } } \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目概况.json b/Pages/项目/项目首页/项目首页-容器页面/项目概况.json index e85c949a..dd87546f 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目概况.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目概况.json @@ -215,12 +215,12 @@ }, "31": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 24.0 } }, - "38": { + "32": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 24.0 } }, "39": { @@ -247,9 +247,14 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } + }, + "44": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } } }, - "Count": 44, + "Count": 45, "DefaultSize": 32.0 }, "Values": { @@ -265,7 +270,7 @@ "OverflowMode": 1 } }, - "1,32": { + "1,33": { "CellType": { "$type": "ElementUI.TimelineCellType, ElementUI", "useBinding": true, @@ -420,11 +425,10 @@ "StyleDatas": { "Styles": [ { - "FontSize": 13.333333333333332, "BorderLeft": 0 }, { - "BorderLeft": 0 + "FontSize": 13.333333333333332 }, { "FontFamily": 1, @@ -438,14 +442,11 @@ "FontSize": 13.333333333333332, "Foreground": 3, "HorizontalAlignment": 2 - }, - { - "FontSize": 13.333333333333332 } ], "Types": { "Strs": [ - "Background 2 -10", + "Background 1 -15", "Body", "Center", "Text 1 50" @@ -457,10 +458,12 @@ ] }, "CellStyles": { + "0,32": 0, "1,32": 0, - "2,32": 1, + "1,33": 1, + "2,32": 0, "3,1": 2, - "3,32": 1, + "3,32": 0, "4,1": 3, "4,2": 3, "4,3": 3, @@ -491,8 +494,8 @@ "4,28": 3, "4,29": 3, "4,30": 3, - "4,32": 1, - "5,32": 1, + "4,32": 0, + "5,32": 0, "6,1": 4, "6,2": 3, "6,3": 3, @@ -523,7 +526,7 @@ "6,28": 3, "6,29": 3, "6,30": 3, - "6,32": 1, + "6,32": 0, "7,1": 3, "7,2": 3, "7,3": 3, @@ -554,17 +557,18 @@ "7,28": 3, "7,29": 3, "7,30": 3, - "7,32": 5, - "7,33": 5, - "7,34": 5, - "7,35": 5, - "7,36": 5, - "7,37": 5, - "7,38": 5, - "7,39": 5, - "7,40": 5, - "7,41": 5, - "7,42": 5 + "7,32": 0, + "7,33": 1, + "7,34": 1, + "7,35": 1, + "7,36": 1, + "7,37": 1, + "7,38": 1, + "7,39": 1, + "7,40": 1, + "7,41": 1, + "7,42": 1, + "7,43": 1 }, "SheetStyle": { "FontFamily": 1 @@ -573,7 +577,7 @@ "Spans": [ "3,1,1,30", "1,1,1,30", - "1,32,6,11", + "1,33,6,11", "6,1,1,30", "4,1,1,30" ], @@ -641,7 +645,7 @@ }, { "Name": "项目动态", - "Formula": "项目概况!$AG$2" + "Formula": "项目概况!$AH$2" } ] -}///QMUBGicW2/1/RomcxgSi+IzFB0ifo0pLEFyXcL5cKDHpDz8tASvJu4f+7KQaEos4bbQLRcVjVX4zdz9XEfisxyRBI3go8OdUi89TJN5fiSDcR+dvm5/U4eTRdgaaQ1cHHy8DQit+M4jTm9+9CQqUCiZtGcPdfjdWckWdud/tvc5sKOI3AT/stKz08g1rrWfnyHnm7CM0+lzdvbof1pKiGBpxA6t4/59ACqOF6MKlG8Q1Mq9GLeUaWTVcggfs5a0MTs4HAy8R6J0xeDi9M7h1dgK0fNimhCTxhux0qj9sHeF4k7Vft4L7lVsVsp5KWuJbBYKmWkbHs8tnHpmcW+/MulGcQVorVhgoUile8w0F3Qlq8Ggrz/6xkWPzQZ3liu7yZbRdmXmqS0H/79wMoKjnh4xBUcqU9QdZyBeuIKahIv/per7RafA06Luj4JYBH8QwGH3OTdwmHWLn7ayRre5k8PKwpJnE2ORjLeCrSahVC9o9PGL+HfccEPLXWlSx7kGFwQe1h9E6LiuWnt0PF61075jph2rFAvlnv++soMqTugS6GKrAcY99M9lPO7ukhg7VG1u3Pczz0TaiyY4phVZmvzMKXwulVXBOFMmNPc7rzAQsCKKvSlvEZKODVtfTEKmqPYE+iOqQEzRXahVeV4wwUWQDHlTrYCPHDnqnVKW3LFs6nvXJlFwsftFpH2/AtjJ9tj5H7S0X6yJJNd9xNE+XjNBHdU6uink5mCkVZ5E96dTDR9oiBk/Rzo/P/cyk8GOsm2HXOvCgcG2C9lUYO3j6ZTYkTiMBwbCtTAgnBay2XGUc7rG0V8EVBQd4Mg7S2FaylWCg0QDbKD+eJAlGFWL6TkEqu3hI7voeEzW99Z219YbxPIBiB93tKRcXH2YBPy03iy6OtavqMGl8+bx49dy/Q==|920 \ No newline at end of file +}//dL67UfkyK8qZ9p4kn8qn4gibKEryBZ+V3U96CCSH6wU48MtxquEKubJD6zMmtOUvn+eCCrC6nBngyg8NOuEwqYCckkaB6hjwxKx3Zk2PqhSWU4jKZjO7XKrfQ21fCy8uNv0YMDWCJIFTdOoAL3l7qUpCLB/A+onUe5ffWzlOD/jO3VcdE4LehFWvyx7/Di1lNVaxxnCEEzHDbBwgpGvkt0qMssOmah0wQYee8XfY0jzRLnjFAezZIS83Z+6SSJFjOW5VQzfr+CprrtGMA0ToLMKptzpwImgw4tGJKJS9Kj+dCSqfkH771aOcGqW+1ImrtCb+JIglUMWhL2yX6I0NSNOT3UOm0W6zb++0imp04gpJQCSpL10F6jtlPYmwcltPUEEv0GIHK4hkK7+8SvHMM3J/g3OUQxkfs05z7n2mbznU/1zBABl2ylKQHrrRH86pfZxMbnQ+FfdVgGBwqKUJC7s2fICcrm7Q+5Zrrh786jzJ5LIOYgiOIjP/7tnaFFQh0MgfNdQYD6KodlAS6L8bk2ORpSWBRLzmJCk4t8D0m8hRx0AQ7nbB/l1QskY3jz6B+Bp07jkfZFtcQG4Lm71VBZP9CvwV7hn7jqHBlGT8Un98rAGhMHo6iDVfxWa+WEs5GtZ5imBkHW45+o5DUcrvTlClMhR5xaamZBehDQ9O7j3dMlRVZ7sq/oppRwQzawBQTf/bGuHc9piyp7rlK8LBi+QbD9BpHLL3ZbZTWFcpujG9SmLQxMkG7IyCpQKChXh7srBpxodLK8YrZaWMbu00cMhzHe3adZBss51O3jtImJK5a8tPkcVqZesMZga87GYz24VxbDcaA0LiXKnY10u+9xCDkIXFbgmR74foGBFOyPwT3Ik4igmX5RjJd6ThiB+vubFXAurDZVfFo8CEnm2iiw==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目概况.rd b/Pages/项目/项目首页/项目首页-容器页面/项目概况.rd index a2dabc11..0f19c21b 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目概况.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/项目概况.rd @@ -1,6 +1,6 @@ { "PageType": 0, - "ColumnCount": 44, + "ColumnCount": 45, "RowCount": 8, "CustomNames": [ { @@ -17,7 +17,7 @@ }, { "Name": "项目动态", - "Formula": "项目概况!$AG$2" + "Formula": "项目概况!$AH$2" } ] } \ No newline at end of file diff --git a/Process/新增任务流程.bpmn b/Process/新增任务流程.bpmn index e511415c..2296b7b6 100644 --- a/Process/新增任务流程.bpmn +++ b/Process/新增任务流程.bpmn @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + _4f4ab1b2-ce52-46c6-bcc8-52c43b0c4a9f Flow_0otbu5x diff --git a/ServerCommands/任务/修改任务预算工时.json b/ServerCommands/任务/修改任务预算工时.json index bd8db74c..3dfc5755 100644 --- a/ServerCommands/任务/修改任务预算工时.json +++ b/ServerCommands/任务/修改任务预算工时.json @@ -45,7 +45,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "fcf545b1-38fb-4a2e-b3e3-1f4af870ac2f", + "GUID": "63b4e781-32d6-4f9d-b558-8da92670cbdb", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -54,7 +54,7 @@ "ColumnName": "项目ID" }, { - "GUID": "6835a1c1-53c9-4289-8d3f-dc5985f34647", + "GUID": "f88b0aae-fe38-4484-821c-a8bb82bf1bd0", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -68,7 +68,7 @@ "ColumnName": "严格模式" }, { - "GUID": "ef21deed-1d60-41be-ae93-47447bc963f8", + "GUID": "08bfd598-0427-4fbc-9861-ab54645ae3fb", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -82,7 +82,7 @@ "ColumnName": "项目预算工时" }, { - "GUID": "d677bdc0-525e-4549-a8cb-4c982387db0d", + "GUID": "ab0089b9-365f-429f-8afc-b4cbe79f6daf", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -96,7 +96,7 @@ "ColumnName": "项目总分配工时" }, { - "GUID": "4c2824d0-cb98-4b5b-b05c-09e82046f1da", + "GUID": "fd0ab476-0a14-44a5-9be5-189b79249777", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务名称", @@ -105,7 +105,7 @@ "ColumnName": "任务名称" }, { - "GUID": "60d2bc6f-c3b0-45f0-bbab-2dec192067ba", + "GUID": "83d79cc9-f5f2-4913-a854-f060e8001686", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "总分配工时", @@ -114,7 +114,7 @@ "ColumnName": "总分配工时" }, { - "GUID": "05d16810-fc64-4712-8fb4-0836a53b995c", + "GUID": "5ea965f0-5ff0-4b4d-b95c-add43366edfa", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "已分配工时", @@ -123,7 +123,7 @@ "ColumnName": "已分配工时" }, { - "GUID": "8fd091d2-15b2-4d23-b8ef-7527ff211841", + "GUID": "819304f3-ad63-4855-af23-d171ed5cba94", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "父任务ID", @@ -132,7 +132,7 @@ "ColumnName": "父任务ID" }, { - "GUID": "288b89c9-f815-4a07-b151-9d4959a1712f", + "GUID": "a20185ef-1a3a-4617-bcbc-fa569b9612a1", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "父任务ID", @@ -146,7 +146,7 @@ "ColumnName": "父任务可分配工时" }, { - "GUID": "55d60ec7-dfc4-4ef1-8341-43476395b337", + "GUID": "aa6ed496-b14c-45ba-8c49-e05ef55583c1", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "本任务已分配工时", @@ -169,7 +169,7 @@ }, "TopCount": "1" }, - "ID": "f9f427e2e0a249908d9c7ebc509143a3" + "ID": "6b6b64f68f064deaa1cd5773df8e8c9a" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -238,7 +238,7 @@ ] } ], - "ID": "79242b1f-9c33-4caf-aebc-9ba3ba7eba3d" + "ID": "92793fbb-474c-4651-bf6c-219ee0a2c38d" } ] }, @@ -269,7 +269,7 @@ "Comments": "如果没有父任务，则将项目可分配工时+任务当前的总分配工时 （相当于这个任务没有分）" } ], - "ID": "8caee967-34b5-40d2-bc46-63dce90f29de" + "ID": "a49e5ab0-3ddc-459a-9d75-8fb66f87f532" }, { "CommandList": [ @@ -284,7 +284,7 @@ "Comments": "如果没有父任务，则将项目可分配工时+任务当前的总分配工时 （相当于这个任务没有分）" } ], - "ID": "581e89a0-73f9-4549-b3e3-3f43273374a7" + "ID": "3678e11f-48e1-4074-a7fa-fe41f8906a69" } ], "Comments": "严格模式下，根据是否有父任务来计算本次预算工时的上限" @@ -333,12 +333,12 @@ ] } ], - "ID": "2b0f5f20-95fb-4a4e-ad23-a151636a3b61" + "ID": "b3096e68-d3ff-4a72-b3fb-7a6a3551140c" } ] } ], - "ID": "91aec6fc-2961-4d7f-b928-44110700caba" + "ID": "10e6dd03-d092-4259-b5ba-1f34b8add596" } ] }, @@ -367,7 +367,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "任务预算工时", - "GUID": "c97c73f6-9c2f-4287-bbaf-507466d52b51" + "GUID": "fec39811-ef5c-459b-9a2a-cf3de8e3f5dd" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -387,7 +387,7 @@ "BindingInfo": { "TableName": "项目动态", "ColumnName": "项目ID", - "GUID": "d7ffa3b0-6f55-478f-b1f9-bbf7d3a49549" + "GUID": "7859703a-b22f-4b2f-a468-853085bb1e2a" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -398,18 +398,18 @@ "BindingInfo": { "TableName": "项目动态", "ColumnName": "项目动态", - "GUID": "a8e4db37-d2d2-4f37-a5f8-e9205b6c6c2c" + "GUID": "3dcc1d83-66d3-4331-99fa-b37735c410ac" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"调整了任务[\"&任务表.任务名称&\"]的预算工时\"" + "SerializeProperty": "=\"调整了任务[\"&任务表.任务名称&\"]的预算工时，\"&任务表.项目预算工时&\"=>\"&新预算工时" } }, { "BindingInfo": { "TableName": "项目动态", "ColumnName": "执行人", - "GUID": "d7524510-f1ac-415a-bb26-50b182b3c50a" + "GUID": "7e31e6a5-cf58-4e66-9b51-bc7eeda5ba54" }, "Value": "%CurrentUser%" } diff --git a/ServerCommands/工时/修改工时.json b/ServerCommands/工时/修改工时.json index 59da3236..bab0db45 100644 --- a/ServerCommands/工时/修改工时.json +++ b/ServerCommands/工时/修改工时.json @@ -260,7 +260,7 @@ "CheckDataValidation": true } ], - "ID": "012ef4b8-c602-4cdb-9ec2-569ca9231490" + "ID": "bbd97da6-9d3f-487c-83e3-da3b9ab57770" }, { "CommandList": [ @@ -327,7 +327,7 @@ "CheckDataValidation": true } ], - "ID": "d5184ee9-2e79-4fd1-902d-fa3df35c07b4" + "ID": "4a8ff35b-5dee-4245-85db-5c071e275dbe" } ] }, diff --git a/ServerCommands/工时/计算报工数据.json b/ServerCommands/工时/计算报工数据.json index dc6e6b9e..a855ad9c 100644 --- a/ServerCommands/工时/计算报工数据.json +++ b/ServerCommands/工时/计算报工数据.json @@ -61,7 +61,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "6f0fb962-60d7-4236-b5e8-06fabd785c92", + "GUID": "afc70b8a-3b5c-4dcd-9f28-c2ff688947c8", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -70,7 +70,7 @@ "ColumnName": "项目ID" }, { - "GUID": "922dfd8e-8d2e-42d0-a17a-fd5d7cc6fc85", + "GUID": "d723118e-eb55-469f-a95c-57d943e8d224", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务名称", @@ -79,7 +79,7 @@ "ColumnName": "任务名称" }, { - "GUID": "3f908112-9f20-46c3-b49e-a4e3c7776790", + "GUID": "568fdd28-7ca7-487c-b79d-b31b9bf5c2b5", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "总分配工时", @@ -88,7 +88,7 @@ "ColumnName": "总分配工时" }, { - "GUID": "ab977bc4-1084-424a-b187-21524f0c7c2b", + "GUID": "45ccb343-6ebf-4bf7-ae9e-6e92cd71c2ef", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务状态", @@ -97,7 +97,7 @@ "ColumnName": "任务状态" }, { - "GUID": "3c83a686-f9b5-4dd6-95b2-66b7fe288fdd", + "GUID": "2e9cc93a-22f1-4290-b8db-57e9ce13562b", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务状态", @@ -111,7 +111,7 @@ "ColumnName": "任务状态文本" }, { - "GUID": "94ee58e8-6fe6-404d-b581-a0fb4f2a0ab3", + "GUID": "6b0d9c9f-2cae-40da-acf4-60952c085338", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -125,7 +125,7 @@ "ColumnName": "严格模式" }, { - "GUID": "db723831-a27a-430b-9284-5393a5ce14b8", + "GUID": "cca6bf37-23dc-4d69-91a8-02c3b1b472bc", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -139,7 +139,7 @@ "ColumnName": "项目预算工时" }, { - "GUID": "876b99f7-f1b4-4733-9eef-fcbde22fc1d4", + "GUID": "11118acb-9533-48b1-be1f-78d305cd4dfb", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -153,7 +153,7 @@ "ColumnName": "项目预算费用" }, { - "GUID": "9bf9a8a1-3a84-4c76-8b89-a34e7bf66942", + "GUID": "636c6ce8-5f76-4b24-b6ab-4bec06f7686b", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -167,7 +167,7 @@ "ColumnName": "工时分配方式" }, { - "GUID": "d8cf20bc-a9cc-482f-b40b-032233bbf789", + "GUID": "b0e3308f-5205-4e32-99ef-38c65207a523", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务类型", @@ -181,7 +181,7 @@ "ColumnName": "提成系数" }, { - "GUID": "907604a1-b8f2-454b-aba1-80cd9faf4852", + "GUID": "99987fb5-2450-44cb-8973-0d68d12f6591", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "可分配工时", @@ -205,7 +205,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "812b233a44554cd8b84f75c980f438c4" + "ID": "f717aacf32884bc1a7ee967f563a1959" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -413,7 +413,7 @@ } ], "Comments": "项目成员设置的时薪", - "ID": "163b1d26-361c-4d12-8d46-0df41854f910" + "ID": "f3cecd58-92dc-4c45-a33a-a9be4741249d" }, { "Condition": { @@ -446,7 +446,7 @@ } ], "Comments": "项目岗位设置的时薪", - "ID": "596edd83-fbba-4ef7-888e-71fbb8d12917" + "ID": "944f8103-63ef-4716-8c1b-d30b3949d535" }, { "Condition": { @@ -479,7 +479,7 @@ } ], "Comments": "成员用户的默认时薪", - "ID": "c748fcac-a5c4-4e6c-ab3d-514957048510" + "ID": "dadfcb03-24f1-466a-99da-0bfdec822e05" }, { "CommandList": [ @@ -496,13 +496,13 @@ "ID": "1034a8bcf12a49328a31314e519829f0" } ], - "ID": "85153d45-7f76-43dc-91d1-8b842b6ef9d9" + "ID": "3df86216-2d54-4b98-a932-299d5e9e4983" } ] } ], "Comments": "优先使用手动指定的提成金额", - "ID": "0caf6e6b-2b53-44cc-85c5-9e9c93866486" + "ID": "96797711-3589-4e4f-bfc5-aa778e4c3332" }, { "CommandList": [ @@ -522,7 +522,7 @@ "ID": "c9b6eb8cb30e4eaa839a7e1e28ee50a1" } ], - "ID": "723c6113-ee79-4aa9-9112-83b61b28301f" + "ID": "0df29ad0-e291-4646-9ae8-86bda46ac916" } ], "Comments": "计算成员的时薪" @@ -681,13 +681,13 @@ } ], "Comments": "先检查个人工时余额够不够，如果不够，直接提成为0", - "ID": "7b965af5-8bd1-48db-a79f-73b61d428601" + "ID": "f7e4ea09-ecd6-4c98-9c59-31e62151354d" } ] } ], "Comments": "如果分配到人头，则判断该人总计划工时还够不够", - "ID": "42ee6064-2b39-422f-b88b-25bb8be888d1" + "ID": "e52068bc-737f-4176-aa20-d3046d94e71e" }, { "Condition": { @@ -727,25 +727,25 @@ "ParameterName": "核定工时", "ParameterValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.可分配工时" + "SerializeProperty": "=IF(任务信息.可分配工时<0,0,任务信息.可分配工时)" }, - "ID": "1028323a56304b2a8bbae167d5ed2720" + "ID": "13f9ccabb92d4ae484ab121e41955010" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "核定工时说明", "ParameterValue": "任务工时余额不足，按剩余工时核定！", - "ID": "5563dc9e651a48df988d02a51bef94f2" + "ID": "5afd6a71883042c2aa9bf0919d9e3c6c" } ], "Comments": "先检查个人工时余额够不够，如果不够，直接提成为0", - "ID": "b12caafe-e800-44a2-9514-87efbf6c66ea" + "ID": "3e3b73a2-f093-436c-838f-750dd8525859" } ] } ], "Comments": "如果是共用任务工时，则查看任务计划工时够不够", - "ID": "75c598aa-51be-487f-b73d-e5577fb65234" + "ID": "3f7f1f9e-bbb4-4387-a9e0-46affd2a65c7" } ] }, @@ -878,7 +878,7 @@ ] } ], - "ID": "f21a4866-842d-465f-9d9d-8ad880d21886" + "ID": "875c33fc-351e-49d6-a37c-f147a04befdd" }, { "CommandList": [ @@ -939,12 +939,12 @@ ] } ], - "ID": "f23e699c-9811-4be4-93b3-1dfbc1ba9a39" + "ID": "b5cd6ccb-30ac-44fa-a9cc-e1ef62b87bd8" } ] } ], - "ID": "28296b97-b790-4140-a976-03e0adaec77d" + "ID": "c46789d7-2412-40ee-b963-bda96df4db6e" }, { "CommandList": [ @@ -977,13 +977,13 @@ ] } ], - "ID": "cbaba218-ed2e-4de9-913c-e0fd775b17b1" + "ID": "3bf512b4-7357-4959-9cab-f2822b771dd2" } ] } ], "Comments": "如果提交的工时类型等于项目工时的核定方式且开启严格模式就校验本次有没有超标", - "ID": "d3df60c0-656c-4019-93a7-12bcb2028653" + "ID": "13102dd0-43c7-4320-9bdc-7de0318c2b10" }, { "CommandList": [ @@ -1040,12 +1040,12 @@ ] } ], - "ID": "1d137532-3c06-4ae2-aae9-321d81fafb5d" + "ID": "670c9908-cf7f-4f63-a6a2-ee06ef589f29" } ] } ], - "ID": "8fefc739-0e6e-4912-a915-b1361fe53cd5" + "ID": "e0654318-c53f-4e99-821e-6b0fd1177431" }, { "CommandList": [ @@ -1078,7 +1078,7 @@ ] } ], - "ID": "1158a222-c0bf-4c31-a8cc-3ce9497fd712" + "ID": "281bd9ca-b9be-4f9e-b4ab-469348391773" } ] } diff --git a/UserFile/BaseCss.css b/UserFile/BaseCss.css index 4d75e75b..23f4c0b7 100644 --- a/UserFile/BaseCss.css +++ b/UserFile/BaseCss.css @@ -1,3 +1,8 @@ +/* 调整时间线边距 */ +.el-timeline { + padding-inline-start: 0 !important; +} + /* 子元素溢出 */ .overflowvisible{ overflow: visible !important; diff --git a/UserServiceDB.sqlite3 b/UserServiceDB.sqlite3 index ba90b937..c6ade154 100644 Binary files a/UserServiceDB.sqlite3 and b/UserServiceDB.sqlite3 differ