From 4d0b263ac7ae72cf1724ec88ef0660a1f1931967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B6=85=E5=93=A5?= Date: Thu, 27 Jun 2024 09:49:11 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E4=BF=AE=E6=94=B9=E7=BB=93?= =?UTF-8?q?=E7=AE=97=E5=AE=A1=E6=89=B9=E9=A1=B5=E9=9D=A2","MessageType":2,?= =?UTF-8?q?"Modules":[{"State":1,"Type":23,"Name":"TableView/View=5F?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=B7=A5=E6=97=B6=E7=BB=9F=E8=AE=A1"},{"Stat?= =?UTF-8?q?e":1,"Type":7,"Name":"Table/=E4=BB=98=E6=AC=BE=E5=87=AD?= =?UTF-8?q?=E8=AF=81=E8=A1=A8"},{"State":2,"Type":1,"Name":"PCPage/?= =?UTF-8?q?=E5=B7=A5=E6=97=B6=E6=80=BB=E8=A7=88"},{"State":1,"Type":1,"Nam?= =?UTF-8?q?e":"PCPage/=E4=BB=BB=E5=8A=A1=E5=B7=A5=E6=97=B6=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1"},{"State":1,"Type":1,"Name":"PCPage/=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E5=B7=A5=E6=97=B6=E7=BB=9F=E8=AE=A1"},{"State":2,"Typ?= =?UTF-8?q?e":1,"Name":"PCPage/=E4=B8=AA=E4=BA=BA=E5=B7=A5=E6=97=B6?= =?UTF-8?q?=E9=A6=96=E9=A1=B5"},{"State":1,"Type":1,"Name":"PCPage/?= =?UTF-8?q?=E5=8A=9E=E7=90=86=E7=BB=93=E7=AE=97=E5=AE=A1=E6=89=B9=E5=8D=95?= =?UTF-8?q?"},{"State":1,"Type":3,"Name":"MasterPCPage/FGC=5F=E6=AF=8D?= =?UTF-8?q?=E7=89=88=E9=A1=B5"},{"State":1,"Type":15,"Name":"ServerCommand?= =?UTF-8?q?/=E5=88=A0=E9=99=A4=E8=AF=B7=E6=AC=BE=E5=8D=95"},{"State":3,"Ty?= =?UTF-8?q?pe":6,"Name":"Pages/=E8=B4=A2=E5=8A=A1"},{"State":3,"Type":1,"N?= =?UTF-8?q?ame":"PCPage/=E4=BB=98=E6=AC=BE=E5=87=AD=E8=AF=81=E7=AE=A1?= =?UTF-8?q?=E7=90=86"},{"State":3,"Type":1,"Name":"PCPage/=E4=BB=98?= =?UTF-8?q?=E6=AC=BE=E5=87=AD=E8=AF=81=E8=AF=A6=E6=83=85"}],"Version":"v1"?= =?UTF-8?q?}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 127 +- MasterPages/FGC_母版页.json | 173 ++- Pages/工时/个人工时首页.rd | 15 - Pages/工时/人员工时统计.json | 4 +- Pages/工时/任务工时统计.json | 588 ++++---- Pages/工时/工时总览.json | 880 ------------ Pages/工时/工时总览.rd | 8 - Pages/收益/办理结算审批单.json | 1244 ++++++++++++----- Pages/收益/办理结算审批单.rd | 19 +- .../付款凭证管理.json} | 706 +++++----- Pages/财务/付款凭证管理.rd | 19 + Pages/财务/付款凭证详情.json | 996 +++++++++++++ Pages/财务/付款凭证详情.rd | 5 + ServerCommands/收益/删除请款单.json | 10 +- Tables/工时/View_任务工时统计.json | 2 +- Tables/财务/付款凭证表.json | 2 +- 16 files changed, 2765 insertions(+), 2033 deletions(-) delete mode 100644 Pages/工时/个人工时首页.rd delete mode 100644 Pages/工时/工时总览.json delete mode 100644 Pages/工时/工时总览.rd rename Pages/{工时/个人工时首页.json => 财务/付款凭证管理.json} (60%) create mode 100644 Pages/财务/付款凭证管理.rd create mode 100644 Pages/财务/付款凭证详情.json create mode 100644 Pages/财务/付款凭证详情.rd diff --git a/.collaboration b/.collaboration index da76ce9b..704b6d3c 100644 --- a/.collaboration +++ b/.collaboration @@ -140,16 +140,7 @@ }, { "ModuleName": "TableView/View_任务工时统计", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-27T09:31:37.7598321+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\工时\\View_任务工时统计.json" - ] + "ModuleType": 23 }, { "ModuleName": "TableView/人员工时统计视图", @@ -299,16 +290,7 @@ }, { "ModuleName": "Table/付款凭证表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-27T09:14:57.8323577+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\财务\\付款凭证表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Tables/AI助手", @@ -818,61 +800,13 @@ "ModuleName": "PCPage/工时首页", "ModuleType": 1 }, - { - "ModuleName": "PCPage/工时总览", - "State": 2, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-27T09:23:51.202928+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\工时\\工时总览.json", - "Pages\\工时\\工时总览.rd" - ] - }, { "ModuleName": "PCPage/任务工时统计", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-27T09:24:10.8010178+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\工时\\任务工时统计.json", - "Pages\\工时\\任务工时统计.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/人员工时统计", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-27T09:24:18.205929+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\工时\\人员工时统计.json", - "Pages\\工时\\人员工时统计.rd" - ] - }, - { - "ModuleName": "PCPage/个人工时首页", - "State": 2, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-27T09:09:00.7082338+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\工时\\个人工时首页.json", - "Pages\\工时\\个人工时首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/个人中心", @@ -924,17 +858,7 @@ }, { "ModuleName": "PCPage/办理结算审批单", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-27T09:39:22.5475606+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\收益\\办理结算审批单.json", - "Pages\\收益\\办理结算审批单.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/首页", @@ -954,17 +878,7 @@ }, { "ModuleName": "MasterPCPage/FGC_母版页", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-27T09:17:28.0516175+08:00", - "ModuleType": 3, - "ToRemoveFiles": [ - "MasterPages\\FGC_母版页.json", - "MasterPages\\FGC_母版页.rd" - ] + "ModuleType": 3 }, { "ModuleName": "MasterPages/流程母版页面文件夹", @@ -2132,16 +2046,7 @@ }, { "ModuleName": "ServerCommand/删除请款单", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-27T09:07:38.0208585+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\收益\\删除请款单.json" - ] + "ModuleType": 15 }, { "ModuleName": "PCPage/生成结算申请单", @@ -2313,32 +2218,14 @@ }, { "ModuleName": "Pages/财务", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-27T09:08:24.4600518+08:00", "ModuleType": 6 }, { "ModuleName": "PCPage/付款凭证管理", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-27T09:09:00.7082556+08:00", "ModuleType": 1 }, { "ModuleName": "PCPage/付款凭证详情", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-27T09:12:22.1767563+08:00", "ModuleType": 1 } ] \ No newline at end of file diff --git a/MasterPages/FGC_母版页.json b/MasterPages/FGC_母版页.json index 7615e45c..5fda48cb 100644 --- a/MasterPages/FGC_母版页.json +++ b/MasterPages/FGC_母版页.json @@ -318,7 +318,7 @@ }, { "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon", - "PageName": "工时总览" + "PageName": "付款凭证管理" } ], "CanVisitRoleList": [ @@ -346,17 +346,6 @@ "FGC_LoginUser" ] }, - { - "Value": "统计", - "Text": "统计", - "SelectedIconColor": "Background 1", - "SelectedIconColorUseItemColor": true, - "IconColorUseItemColor": true, - "IsOldMenuPath": false, - "CanVisitRoleList": [ - "FGC_LoginUser" - ] - }, { "Value": "菜单1", "Text": "流程", @@ -1128,7 +1117,7 @@ "IsOpenInNewTab": true } ], - "ID": "46b23eda-47a9-4da3-8a71-b0ebac8dbde7" + "ID": "a2ce5864-5eff-472b-ad8e-d849c7d57dc1" }, { "CommandList": [ @@ -1149,12 +1138,12 @@ ] } ], - "ID": "45c08ef3-a9bd-4319-b618-916b58f09731" + "ID": "57a95a18-204f-4329-bd3b-58f0b1e588a5" } ] } ], - "ID": "0d5bb19b-dda4-4e25-aa6a-ff9cda6f1080" + "ID": "c6010720-9614-48c5-8e85-dca55231e4ee" }, { "Condition": { @@ -1204,7 +1193,7 @@ ] } ], - "ID": "30d6074a-a2f8-4b69-8d20-05062675c308" + "ID": "edec1dba-9b7f-4b26-a486-ae0145deb036" }, { "Condition": { @@ -1238,7 +1227,7 @@ ] } ], - "ID": "90edeb95-b885-4425-96b0-57358eff8a19" + "ID": "eb0dc81e-84c1-4d62-a628-44a717ad9c9f" }, { "Condition": { @@ -1274,7 +1263,7 @@ ] } ], - "ID": "cfcd7f9c-4a8f-42a1-bc19-16bb5b38d14c" + "ID": "c0cf0842-f02c-4aed-8c6f-6ae29c5c8628" }, { "Condition": { @@ -1309,17 +1298,17 @@ ] } ], - "ID": "ae36e39f-d411-44e2-ac74-45d3f54b2636" + "ID": "cd4b58cc-df5f-4990-bc37-cb98b51cf7d9" } ] } ], - "ID": "eae48d0e-4864-4923-afe8-df3300478c16" + "ID": "e4d3b5de-3382-4089-b2ec-f772d5ce9152" } ] } ], - "ID": "1986869c-281e-4008-ab84-329f7c800c00" + "ID": "2c824ba2-3889-4d80-8851-a8f43a29208e" } ] } @@ -1575,7 +1564,7 @@ "IsOpenInNewTab": true } ], - "ID": "8e61b0a9-c6f6-4e8d-8663-c03749d7ae9d" + "ID": "adb53500-3311-4c6d-87a8-7b37a3a77f8d" }, { "CommandList": [ @@ -1596,12 +1585,12 @@ ] } ], - "ID": "156934be-95aa-4648-a2f7-c9ae678ab99c" + "ID": "eeede8b6-5bc0-437f-a883-b71e3389ef54" } ] } ], - "ID": "ec2437ca-85f6-4e63-9e5b-b5ec6bda19b7" + "ID": "b027cd36-694b-4708-afac-e0dbde9fe176" }, { "Condition": { @@ -1651,7 +1640,7 @@ ] } ], - "ID": "c053dadd-58ca-4c08-ba7b-40fb04370726" + "ID": "85777ea9-73a6-4674-a566-0cc2b4785598" }, { "Condition": { @@ -1685,7 +1674,7 @@ ] } ], - "ID": "3919def7-52f2-4878-b898-b895b4085268" + "ID": "0d721f93-70ab-48f1-bad8-720845b59864" }, { "Condition": { @@ -1721,7 +1710,7 @@ ] } ], - "ID": "d912d1fd-effe-4783-b6ef-d745d21d2a76" + "ID": "05558df2-4a66-4ea6-97d3-3edaa18aee11" }, { "Condition": { @@ -1756,17 +1745,17 @@ ] } ], - "ID": "5933b01d-e537-4275-97c8-c803cdd5af51" + "ID": "d546dc01-5e70-4af5-9dcf-3e000e452421" } ] } ], - "ID": "9506fd69-39ff-41c2-8a78-b33504032d31" + "ID": "34b52aa4-142c-4e8d-90d0-83e54e8c7ee2" } ] } ], - "ID": "466bbcf5-58cc-46c9-a99c-559f9ee517f3" + "ID": "f1e6063b-3140-40d5-b7a2-19d8ecd538bc" } ] } @@ -1778,7 +1767,7 @@ "Disabled": true } ], - "ID": "ca03c629-b23a-49ed-b135-bed4585294d0" + "ID": "ab769e49-885a-4c08-9ebf-c3a819f43b9c" }, { "Condition": { @@ -1885,7 +1874,7 @@ "IsOpenInNewTab": true } ], - "ID": "655dc7ec-2c8f-49b7-9f92-fa6577a62967" + "ID": "f6407c31-1c27-4278-a6b3-f1c64514183c" }, { "CommandList": [ @@ -1906,12 +1895,12 @@ ] } ], - "ID": "891e2833-f173-4e87-a386-bf1521cc8d69" + "ID": "74baeca9-aa18-4ff4-98a7-efd954adafa9" } ] } ], - "ID": "2b7d099f-f6f4-4683-81cf-382c45fb494b" + "ID": "1d604508-4bd7-4956-9178-a4c16b296f62" }, { "Condition": { @@ -1961,7 +1950,7 @@ ] } ], - "ID": "668b49fc-66cc-4603-8ae6-d126de0c4c39" + "ID": "7a94ee7f-874a-418f-a339-a84ec762fa6b" }, { "Condition": { @@ -1995,7 +1984,7 @@ ] } ], - "ID": "d84462e5-e517-4a82-a45b-7a9e8fe0bfea" + "ID": "c82584ef-6fc2-47a0-9a53-c596ff0da1cc" }, { "Condition": { @@ -2031,7 +2020,7 @@ ] } ], - "ID": "d567d98d-7fb0-437c-a5fc-465dd1738342" + "ID": "eba2e07b-096a-4cd8-baae-84f7cebd8d11" }, { "Condition": { @@ -2066,17 +2055,17 @@ ] } ], - "ID": "dbf04a28-6782-445d-ac75-ef36ab87ba29" + "ID": "e6e23e4b-a41a-4f03-b462-bea8f81fe6fb" } ] } ], - "ID": "0438e6fb-6db2-4de1-8a70-bbea522860e0" + "ID": "ab6df3ed-5283-4486-abec-5c88836ef0ab" } ] } ], - "ID": "1d398618-764b-4f52-89bf-5708ad4ba2d0" + "ID": "77232693-7aa7-4ad4-8d1a-269eeed77fe9" } ] } @@ -2333,7 +2322,7 @@ "IsOpenInNewTab": true } ], - "ID": "823bfa3c-4e51-4922-b0e9-9465b6f4e102" + "ID": "2b6c08d6-8596-4aa9-a1f2-890bfaf3b25b" }, { "CommandList": [ @@ -2354,12 +2343,12 @@ ] } ], - "ID": "e552a888-f891-4e39-b195-554ce2fdd3c8" + "ID": "c62a926d-0f9a-4398-927e-32a3061656c3" } ] } ], - "ID": "d67549b8-01f7-4d69-a24f-7d42b100962f" + "ID": "fd97d28d-57dd-436b-989a-f99ce6532b17" }, { "Condition": { @@ -2409,7 +2398,7 @@ ] } ], - "ID": "bdcfc7a0-d4ff-4c2d-977e-c2aa53a4cb7f" + "ID": "2e0e1efb-baea-4369-9ecd-2f8f7fc37434" }, { "Condition": { @@ -2443,7 +2432,7 @@ ] } ], - "ID": "a61c8824-7108-4694-ae21-e2088007d820" + "ID": "11d588b2-130d-4a7f-addf-c3b880888ba9" }, { "Condition": { @@ -2479,7 +2468,7 @@ ] } ], - "ID": "1376c5a1-70f6-49e4-b81d-9293539804f8" + "ID": "f6cb9e3c-5071-420a-b2a4-cdae3108615f" }, { "Condition": { @@ -2514,17 +2503,17 @@ ] } ], - "ID": "ccc7abf2-d16c-48f6-bd41-d37037dc8cee" + "ID": "2dadfe82-6a6a-444c-91e2-fc0db5fb6dd8" } ] } ], - "ID": "1e4421a4-e1fe-479d-9b4e-764eccdf569b" + "ID": "d13e48b3-37ef-4ca4-97a0-e1dc9e4a2bf0" } ] } ], - "ID": "cfc558d1-ce25-42bf-a356-cd986fe83b11" + "ID": "c602d79c-142d-4d54-9b87-89585e34dc20" } ] } @@ -2536,7 +2525,7 @@ "Disabled": true } ], - "ID": "1a75d56e-b331-4fc8-99c9-38928baf421b" + "ID": "34f24a8a-34c7-4e5e-909d-62bffa103453" }, { "Condition": { @@ -2643,7 +2632,7 @@ "IsOpenInNewTab": true } ], - "ID": "d0bfe72e-d8f1-4bb0-818c-1115bb3fe9e3" + "ID": "1d3cc64d-620c-485d-8363-bef2e2122bef" }, { "CommandList": [ @@ -2664,12 +2653,12 @@ ] } ], - "ID": "d4a9ef8e-8403-4219-989a-cf080aee3542" + "ID": "d7c054e7-a391-47b7-9ad9-7129c3be11e3" } ] } ], - "ID": "6af79851-cc6a-499f-be35-26b5cd65623d" + "ID": "e89cea45-a10c-4113-9905-992e58709537" }, { "Condition": { @@ -2719,7 +2708,7 @@ ] } ], - "ID": "0ed359e6-8930-4058-b323-ac1c1536bd60" + "ID": "7f183cea-9205-4a8a-8403-b72173bd40ca" }, { "Condition": { @@ -2753,7 +2742,7 @@ ] } ], - "ID": "ce56ca49-ba4c-4b49-b9a4-2f2196bd3d04" + "ID": "359ce2f2-e218-4735-80bd-aa97d0ca20bc" }, { "Condition": { @@ -2789,7 +2778,7 @@ ] } ], - "ID": "496c0a0e-a481-4e5e-8c9a-597cc169a13a" + "ID": "44c955a9-7dbd-41e5-a328-3cc481a9ec79" }, { "Condition": { @@ -2824,17 +2813,17 @@ ] } ], - "ID": "7d53bb39-cada-40ba-b00b-6c4ca40172ab" + "ID": "bbbfad96-533f-45b3-9954-9fdf8f349235" } ] } ], - "ID": "4e521f65-609d-42af-a169-e53fc9026c88" + "ID": "bfe4f63a-4f75-4c6c-a5a3-db7443f7ee39" } ] } ], - "ID": "def04517-ca9f-49b4-91ed-d782c24bc7e5" + "ID": "6e565101-d7b3-4d78-9951-9853bd163742" } ] } @@ -3091,7 +3080,7 @@ "IsOpenInNewTab": true } ], - "ID": "47e2c8a5-3be7-472f-bce0-5d3838aa255d" + "ID": "d36537c8-6f8e-4ba4-be12-6d5b2decbbe2" }, { "CommandList": [ @@ -3112,12 +3101,12 @@ ] } ], - "ID": "5a3ef433-0fd8-47c2-ad52-9cfd7a228e81" + "ID": "81ae5c2a-ec06-463e-a6cf-b7870f251239" } ] } ], - "ID": "fda115f9-415f-4c6d-8e1c-d638121a1186" + "ID": "c7bdeac2-1641-40b2-b8d2-2d8e31eabd67" }, { "Condition": { @@ -3167,7 +3156,7 @@ ] } ], - "ID": "b4d80295-2f40-450e-b998-3c1273eb6ded" + "ID": "25aafe53-79c1-4175-868e-c9de80decaeb" }, { "Condition": { @@ -3201,7 +3190,7 @@ ] } ], - "ID": "90666644-7968-43de-975e-aa6689c7d12e" + "ID": "6092967f-da58-411d-8bdd-ce8a2a0740e1" }, { "Condition": { @@ -3237,7 +3226,7 @@ ] } ], - "ID": "d46fbeca-5660-4735-b0f9-6ddaf9a5a9ef" + "ID": "0b95332b-b546-4f36-b884-fe6bf63fb531" }, { "Condition": { @@ -3272,17 +3261,17 @@ ] } ], - "ID": "052bee87-9ab9-4928-a055-7c7b5b8a2107" + "ID": "aedbc63f-6814-4ef8-81be-62464c4247e4" } ] } ], - "ID": "47a00860-1c71-405d-adad-7e20d58dc2d2" + "ID": "af3ef282-073b-471c-8b43-c1275ebd69e9" } ] } ], - "ID": "08d14bc8-8b5b-4c0b-b0b0-498dbb958899" + "ID": "040e664e-699f-467b-9324-68ca30348268" } ] } @@ -3294,7 +3283,7 @@ "Disabled": true } ], - "ID": "098ab625-f38a-41f8-97be-594c4e3d5ba1" + "ID": "83a2fea6-7dff-46d0-bdc7-996579cdf2d6" }, { "Condition": { @@ -3401,7 +3390,7 @@ "IsOpenInNewTab": true } ], - "ID": "31e5c6c6-5534-4069-92ae-02d9b2fc8253" + "ID": "488a6d76-0d2f-4f77-90aa-fd0164b7b05c" }, { "CommandList": [ @@ -3422,12 +3411,12 @@ ] } ], - "ID": "bf303d7e-f4cc-43a3-a47c-73104bac8e5f" + "ID": "13d2042d-dda2-45ee-aa2e-5549aad62d37" } ] } ], - "ID": "f04f2265-c1f9-4f19-b529-eb53b1ac43b6" + "ID": "da9e329b-11fb-4ce6-8f89-15ed565e9634" }, { "Condition": { @@ -3477,7 +3466,7 @@ ] } ], - "ID": "95fdb7a9-d21c-44ad-ba0c-46fca151da00" + "ID": "83736179-381c-473f-a653-464881e496db" }, { "Condition": { @@ -3511,7 +3500,7 @@ ] } ], - "ID": "dd15dcba-5a89-4716-94e4-5bb4ea6886bd" + "ID": "ccaf51c8-1331-4144-85c0-631567b615d5" }, { "Condition": { @@ -3547,7 +3536,7 @@ ] } ], - "ID": "7de179d0-c54e-4d06-a800-132f834a528e" + "ID": "3285f26c-dd1c-4d82-8ab0-62d935fbced5" }, { "Condition": { @@ -3582,17 +3571,17 @@ ] } ], - "ID": "27312f69-895e-4fa1-acdc-b86b9fc44865" + "ID": "cfbe9f86-d4f2-4990-8d9a-1e888db73374" } ] } ], - "ID": "317b9eb1-305a-4c36-90ff-313054425026" + "ID": "38a3bdf1-e862-4f2e-89d9-a4be4f865414" } ] } ], - "ID": "e4746b29-e9e5-464b-9a4d-5902a6138a9a" + "ID": "2c92e2aa-a476-4a86-b365-84bb5b887a82" } ] } @@ -3849,7 +3838,7 @@ "IsOpenInNewTab": true } ], - "ID": "afb7d623-5c77-4807-8509-80b8ada60bfa" + "ID": "e54d3a1e-5ce6-4cc7-aa35-49f14c2d29ad" }, { "CommandList": [ @@ -3870,12 +3859,12 @@ ] } ], - "ID": "8b3c1660-fd23-4f43-9299-520280365e08" + "ID": "ff4e2f4a-7a74-4a90-a6d2-e3ee4848b086" } ] } ], - "ID": "d9ace25e-dad5-4726-9ace-7936cd47aae8" + "ID": "6bf2679d-e7a8-4b5a-96dc-021c4708f62d" }, { "Condition": { @@ -3925,7 +3914,7 @@ ] } ], - "ID": "6cbee6d0-aa71-43be-b787-c257e075b030" + "ID": "7b6bd07c-3d2d-4ebd-9e47-45a04e054757" }, { "Condition": { @@ -3959,7 +3948,7 @@ ] } ], - "ID": "43e852e4-d2d0-4a0b-a2ea-54fff028dfb1" + "ID": "734a8ae9-15f8-495e-9fc5-0765663d0843" }, { "Condition": { @@ -3995,7 +3984,7 @@ ] } ], - "ID": "68a25cb8-c148-406d-ae57-a9945cbe14e4" + "ID": "3de73317-d6a8-46d2-bdc8-c7346b818e78" }, { "Condition": { @@ -4030,17 +4019,17 @@ ] } ], - "ID": "2d05426b-1f06-4893-96db-20a9c2a85873" + "ID": "2b4df759-76f6-4602-9686-46b605a80a6a" } ] } ], - "ID": "b460bc88-055f-4acc-9e7b-ff9a8af750b0" + "ID": "eeb0e75e-f2db-415c-a262-d20643c53bf0" } ] } ], - "ID": "1ac7261f-a287-48f1-a828-b58f011996b0" + "ID": "dd7c6d12-447e-4646-a08e-218510a0bfd6" } ] } @@ -4052,12 +4041,12 @@ "Disabled": true } ], - "ID": "891bc4df-4648-4f01-a594-458f993097b0" + "ID": "ea969fa5-59ff-428d-87bc-28f0d07cc9e7" } ] } ], - "ID": "711c8f45-8122-4212-9e33-8118a90a0dab" + "ID": "28cfab55-63a5-4dfa-bc3e-1af33dadbfe2" }, { "Condition": { @@ -4140,12 +4129,12 @@ } } ], - "ID": "9d1dbfb5-3839-4076-82a9-b011fbae59f3" + "ID": "361cfb07-1b3f-4681-98c5-38814ba01882" } ] } ], - "ID": "7cef90a3-a823-44a9-87d6-9715cfbaab11" + "ID": "002307a3-48da-4bfe-9d56-998dbbd61dd1" } ] } @@ -4232,4 +4221,4 @@ "Formula": "FGC_母版页!$C$7" } ] -}//jktoA3USyXOoFeaTHRuUb2CxHcrLQWFnqubhr07LjGJ68XFgd+NO1WgMj3/p3869FlFLtPCUBHCD/VmWhRsoN2+T2fpfj54BmQ3P+Hd/tV442fjtc29ttBwa5Ts0/RA4xL6wlP46S1Rnbrtp89UhmSc42FaaHIs9uPW5eNaR1FSDTq64fZ0vaR5l3SIBEyRsOgkKrJtkWAdjo+r4fGkpr433Qwi/Pda6B/VuB6HOf6Gt++dr6WNagrQBUiV9kCABWIB3dZL/7/nBfNtVZizKdHwRwKLYfeNHeQQ1V1T93fqAc8/rkaRX3fvFvGrf1h4ybhlJZl/dSxX6RY0zgBbtng+xFZbJuCjbjDzrkL4HLq+MJg9OXvCk1bRfNbtyOG31LGVAoGkVKpmNxKukk2v+8x7HdiDgMjydsdp/c7y30Jb9r6EjiMXWIxMPEqeapsM+8s8jZ+t8N0Hxu0l46fe7nj/EhTZLyFU9pld7GE9FhuJrTp5B6Z/AyoIo1t9kKiYw3EayEoZc9tbreVTxsTCFkJaVoUcGSuNFW3iqY27ldrXNigTiRrsdbNPzWrjDUPIQFk6g8rxY1oZJNHkNrmb8PawgTVEH6oh2V+Ym4tcv3Jp8VdhL5NSoKhGAKox95KKW9rLexX48jJFYdQu6N6Txv6zRl64cGzUwPQZmc9BhvSdWtyKdhvgHOHtrWJZkJEcmJmpyeedDbJb010GWPx4ww5/IFcAmw8H6pN/gcBgMlxLu5U0gzbd4h1tfy8RwsLiWb52GSyAPlGwHsoMOqZQKACL0K7av5QIhqOI5ryknIydS/bBj3EpKayqCAIt0jqSbunJohZQyv5CNWHBpMZ3BBAjbw6mjfgerg7/fPYhP9BqI3O/XVQGeWk783Bi/51QeEh9Ouc73IVqfQ+VUBp/Q5g==|920 \ No newline at end of file +}//5Xm3jnO/jRljhWDjQnWTxaIGOnuWLhSiw5LvQWt12DGwgwvF2fVpd0ROQy1hKB7uov5CADl9aNHOfgewgQODW6XC5rH5RyOxmfdWS4xWjEFT19lZp7XTtyjid1KLJySTO1m3OFscpLGTeDNJ+BVGAYK8ZQOu6M9gOI7yEZDV1+3D12/z21gy66QHzyzjDo8NL5SikSVB1ZmrhpUF3Jr+lReb0uuXJbyo61ddCiYotKdUgHO4goGRWihsChYy6rSrxDZz8PmaRv4XVTtHKFuoCsy9mJqjeuYk26r9V7KBhHmW8ZOGj7pW2GONAOTxp1du1UNg2TbLQa3Ucnr8Wpd+mr+hL5wnNzl6T/ymuMDMmGf6oEjywFEpxlpIxBb0th8z6+6LkTkpOwfAYBbTv5R/UHKCbOiGqlUZKIBVk81PFo8pZ+YQLatdyc3C79/osfPSMYDpdCdHnM4AzomVm9VJhFL8N5VzO4ESoBtTvG28J2ZvcErwXgaTWAT+H0OWOYajtPQoYuANl6vwwUNqzOpbR5NKBvgnH1Y2FEsV9sLqZxOvGGRQIc8sLMOTKj9Gnb373MKtWpDZywq/YSkQJRDSggi57IPLfka9lnDOUF20vpovx2BIU/mCJeZgT2fFaHEeXZjHy1Ubl+JXWqpQ03Mhqa+vsCnscriKoM/8KdT3ybB4essqxMDdmvxHBB39iuPhzlg9T3Yp38ZEIuWGn6Ypd//orz+4E/EkwnKx0r0meFeJ3b0Gly0vFszbwodpLyZX5nYCkUSwDfrE3Gq+ny6+DoWfyghVKlS0K2mtStfpUzmdmD9O6oNbgxcNOpYbLy7H1cjMgEkH1eyDDL2pc6iTlSYk44hLD9su97ibhrqETRNKatlAZ8fjitc8zMRlFq4bZQpPSbQ+w5WZfLlECglqWQ==|920 \ No newline at end of file diff --git a/Pages/工时/个人工时首页.rd b/Pages/工时/个人工时首页.rd deleted file mode 100644 index a88864af..00000000 --- a/Pages/工时/个人工时首页.rd +++ /dev/null @@ -1,15 +0,0 @@ -{ - "PageType": 0, - "ColumnCount": 36, - "RowCount": 11, - "CustomNames": [ - { - "Name": "开始日期", - "Formula": "个人工时首页!$B$11" - }, - { - "Name": "结束日期", - "Formula": "个人工时首页!$F$11" - } - ] -} \ No newline at end of file diff --git a/Pages/工时/人员工时统计.json b/Pages/工时/人员工时统计.json index 532fd11b..c7c59424 100644 --- a/Pages/工时/人员工时统计.json +++ b/Pages/工时/人员工时统计.json @@ -3,7 +3,7 @@ "RowColumnAttachedInfos": { "0": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 32.0 } }, "1": { @@ -514,4 +514,4 @@ "PaperSize": {}, "Margin": {} } -}//vmfMY+m4p4LQG3fhapguRlwtMIrpOyEpih6irg/m8Z0zSg8IYIwdUDQXFgrcon3TwM398tz06+f7k6iCG2kRMsz3Rrz6bp4e/kZLfTUqnPUI2OJ4k8wR9F0LyU5guEfyPXHiMTD6H4D4/emlTrq/Gh3k0GQaEnvGuzHJbMbwbTsGq+uoU6uN7cCqZOx/OQDNNEGcsQ1Og76fd52kNaUJWVPv2QPhpWOi1DQkuF9vVfEc1plXBf5lVw36AH5rhmUQr/G8x/6OE/2QuTlFJZX/bVDtPRmw64uDo4MDajOAjCihDPYchvIBrPcLfAIltjFZu5vNW+McIuqLct3xb+m8CCj28WIx/ixKvecym49xe1ZlWCB4XqVp0+IxSa4oNoLsJOxlt4VDXOAXkXMdpWks8JqCoiQTmrDWWJjdB9zAcjWcfCQQPu0oNCM6z570ymvdSD+9032pUt47vljRQt1a9eR/Gkp9Gx+FjPDfSSjMj8iqWdZDWG88WRPQgrrVNIv4MXWd3CQpklFYMzGe5wjdCj3XY8venOLpbmN8FN90HIIyc6G/Pbib8EKDeWPFcGLkbhJooJm1knitOaN/yJNRW1JpGTeVDHceQidn0/QboLKSBTI2mqIvrsLanIPYdm/VIQA/qbc+urN+QyxUH1DwF9wTPmMMR/djsfT502U/S02f9LCdQ4V/So4kqwnt4sTOutcS8URS9LmCCeu72f/tzeYaBMyx6jKoNT47z8yHXoVOHOUL9xXknAXrEs/iQuwPTxdx/lsDLWPf+E6roR4H5F1ECBZ10q/uA/a6V1RqdcO+ZMxOQyeEqZDad4Ik3eTjrpxkoAiEVDdK7bSLumZA5EfTbc+Oi+MLJ02Pjby6MeyJmQCF7vZ+WPT+5BSlKSEgd5//r34g6lfrW9plOuxrfw==|920 \ No newline at end of file +}//eqePaC6r6U5zpmXDbYi2Yd21OlwCy3KL4DZgKqObqJBW8pXLVSr1Yqj92RXEv9PGj7XSEKIpl+P0SBFfrMD4OvyNAsZjZrvAeYS2VefiBKIsv/jIg8ifDWNKO13U4ft9Fw4E6QYtMiXNAvTJgctawH2vZLSj5I0G2HJECQ4Ac+xi/JTlWn7dwg3MDf/msiNp+UPFmSUZ+OhY6w0UEJLAA9acHls7tTDWOEhrXl3XrofON0cYS8+VuqjB2t0u9DyThj7ZHUP0wprgyOg6TryVPNw0jw+uRnEDzf8kGUuWo2cQUOcHvMAaP5o0Lw9FypEzhIpZbyeICYkSdPQXCFK8+KWh0Yzi0k9HQm15Gs82qh6/b7+C0xvbHHuoRB62LTNNHWcLT7Ars6KOZGFHFaPobi3/IWZLcShrqVIaROeivxwwdrqD6HFv25BS//qQ5BqZTy7PCjGe8My92l/XktJZWAi3TvmuAzSjFJDWfXyySkICaL5hUL/Wr3lC8JAQfFVP0QBIM2TINgn4dLlNvLDEb+7pFWF4vdFJ0UlgXQCSB5XlmKaxHjJkn4DpJYx840VdkTZrx5eJISdj3VKiTPbGdga4scdCO/Kwq4WVMbRppEGmxZKnKGBRfGq/qcwZ+fGMZhaFl85JBYmN4PsmdlxI9RJFskpTRNyjrFSgeUcoNN4q6YbWoMGX0PLNNZnUZ9ox3xqQ2YL3rnxtufYzJA1IMy0b9X3lquG5bRVdxHKu2yGZMgbM7fcSgD2NjVKdA5uFBvmEd4rwtdrYdtDdI2bAJvrSs8AkCi429aM74DeQZBHj7ibVQxLncChYjxhxJw8dTexdeQeKMRzFDHAi3pcBWafaZcM2F22eo3U8UtMIRcSox+2b8k5O1hmWiDcPW5iJy9ICPqu9aeZ0nIayvw2Pug==|920 \ No newline at end of file diff --git a/Pages/工时/任务工时统计.json b/Pages/工时/任务工时统计.json index 034c291a..b572ff8a 100644 --- a/Pages/工时/任务工时统计.json +++ b/Pages/工时/任务工时统计.json @@ -3,7 +3,7 @@ "RowColumnAttachedInfos": { "0": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 32.0 } }, "1": { @@ -391,283 +391,345 @@ "Count": 30, "DefaultSize": 49.0 }, - "Values": { - "1,11": "执行人", - "1,17": "分配工时", - "1,20": "上报工时", - "1,23": "核定工时", - "1,26": "可核定工时" - }, "AttachInfos": { "1,1": { - "ListViewInfo": { - "Name": "表格1", - "TableName": "View_任务工时统计", - "RowIndex": 1, - "ColumnIndex": 1, - "RowCount": 13, - "ColumnCount": 28, - "TopCondition": null, - "ListViewStyleName": "pms表格", - "ShowColumnHeaderInDesigner": true, - "ShowEditStatusIcon": true, - "UseSimpleBar": true, - "SelectionMode": 1, - "DisableAutoSelectRow": true, - "ColumnOperation": 2 - } - }, - "2,1": { - "NameUsedInJavaScript": "项目名称", - "TotalRowSetting": {}, - "IsAutoMergeInListview": true, - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "项目ID", - "GUID": "5a286e31-8138-4536-b956-1c3c2149278a", - "RelationBinding": { - "RelatedTable": "项目表", - "RelatedColumn": "ID", - "DisplayColumn": "项目名称" - } - } - }, - "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, - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "任务ID", - "GUID": "8bf7c387-65d9-4570-a4d4-377af3149883", - "RelationBinding": { - "RelatedTable": "任务表", - "RelatedColumn": "ID", - "DisplayColumn": "任务名称" - } - } - }, - "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, - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "执行人", - "GUID": "025e84a7-a272-499f-8515-82292a59b21d", - "AttachType": { - "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", - "UserColumnAttachType": 1 - } - } - }, - "2,14": { - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "任务ID", - "GUID": "ca097741-4170-432c-9fb5-9fa9ef563ca7", - "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" + "$type": "ElementUI.TableCellType, ElementUI", + "ElTableName": "EL表格1", + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "View_任务工时统计", + "BindingInfos": [ + { + "GUID": "b8d04865-340d-4d7c-b43a-8d6f493759b7", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "项目ID", + "GUID": "71a18666-3876-4f25-9410-8664b7a0e844", + "RelationBinding": { + "RelatedTable": "项目平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "项目名称" + } + }, + "ColumnName": "项目名称" + }, + { + "GUID": "b5f6617c-d833-4e75-87ca-9b1de5b5ab8f", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "任务ID", + "GUID": "8c4e2905-b75c-46b7-be49-e0ff5b094a58", + "RelationBinding": { + "RelatedTable": "任务平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "任务名称" + } + }, + "ColumnName": "任务名称" + }, + { + "GUID": "4d0dad58-29b5-4bcd-93cf-f92baa02aad3", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "任务ID", + "GUID": "95348388-d4ec-4801-8227-c343a32f03ad", + "RelationBinding": { + "RelatedTable": "任务平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "任务预算工时" + } + }, + "ColumnName": "任务预算工时" + }, + { + "GUID": "5a6ee325-3f22-4348-a8f7-e0b1a19b15ce", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "执行人", + "GUID": "351e9598-3933-4255-96fd-d98366425198", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 + } + }, + "ColumnName": "执行人_全名" + }, + { + "GUID": "69b0ad8e-c1c6-4192-8fd0-fb5843b2facc", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "总计划工时", + "GUID": "e882534c-13fa-4d95-873d-028620779457" + }, + "ColumnName": "总计划工时" + }, + { + "GUID": "a67f1a0b-c41d-413a-9454-44fa5827cd96", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "总上报工时", + "GUID": "8dca6a72-c58c-45ee-9bc3-97cf654c328d" + }, + "ColumnName": "总上报工时" + }, + { + "GUID": "855501b8-f8ea-4441-991f-8722613d2cfe", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "总核定工时", + "GUID": "5894191e-cc5f-4037-b9bd-51f7a16a5b3c" + }, + "ColumnName": "总核定工时" + }, + { + "GUID": "9bd79ee7-22ae-49ee-b6a4-cbab34753cff", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "总剩余工时", + "GUID": "63260308-051a-42f7-979c-daa0399a253e" + }, + "ColumnName": "总剩余工时" + } + ], + "NullFormulaValueQueryPolicy": 1, + "CustomColumns": [] }, - "DisplayColumnBindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "全名", - "GUID": "98c76343-77a3-430b-88a6-cffea78f5d29" - }, - "ReadOnly": true - } - }, - "2,17": { - "NameUsedInJavaScript": "总计划工时", - "TotalRowSetting": { - "FormulaType": 5, - "StaticText": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务工时统计!R3" - }, - "StyleInfo": {} - }, - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "总计划工时", - "GUID": "06cf4091-dcb6-4f81-97b5-c7e6aee268ca" - } - }, - "2,20": { - "NameUsedInJavaScript": "总上报工时", - "TotalRowSetting": { - "FormulaType": 5, - "StaticText": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务工时统计!U3" - } - }, - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "总上报工时", - "GUID": "d4d14d3f-d000-4399-acf3-e66868d6464e" - } - }, - "2,23": { - "NameUsedInJavaScript": "总实际工时", - "TotalRowSetting": { - "FormulaType": 5 - }, - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "总核定工时", - "GUID": "363a92ae-8ff9-4dad-9bb8-534aed6a9b7c" - } - }, - "2,26": { - "NameUsedInJavaScript": "总剩余工时", - "TotalRowSetting": { - "FormulaType": 5 - }, - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "总剩余工时", - "GUID": "2ed5fda8-1cdd-4d7f-acb7-77d0a9199613" + "autoGenerateColumnsByDataSource": false, + "columns": [ + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "项目名称", + "label": "项目名称", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "showOverflowTooltip": false, + "margin": true, + "key": "109dbdd2-2539-4353-af5c-f40ba85f59c1", + "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, + "margin": true, + "key": "c13c5167-3b7f-4436-8b8f-7cece3a76c73", + "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, + "margin": true, + "key": "120ffe19-5b3a-4e9f-a67b-8954fe38089c", + "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, + "margin": true, + "key": "4b7ffb26-fa35-4659-bfa0-c44207cd3295", + "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": "084d3193-f8bc-49ed-af7c-be86ec6f5766", + "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": "dd7ec532-6969-40b3-a390-76e849973da0", + "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": "a32d4fb7-e8e4-49b0-8bfc-ee1321a13c0a", + "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": "70de3c48-2d1d-4bf4-a429-316baeae211b", + "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": { - "Styles": [ - { - "FontSize": 13.333333333333332, - "HorizontalAlignment": 0 - }, - { - "FontFamily": 1, - "FontSize": 13.333333333333332, - "HorizontalAlignment": 0 - }, - { - "FontFamily": 1 - }, - { - "FontSize": 13.333333333333332, - "HorizontalAlignment": 0, - "WordWrap": true - }, - { - "FontSize": 13.333333333333332, - "Formatter": 2, - "HorizontalAlignment": 0 - }, - { - "FontFamily": 1, - "FontSize": 13.333333333333332, - "Formatter": 2, - "HorizontalAlignment": 0 - } - ], "Types": { "Strs": [ - "Center", - "Body", - "0.0" + "Body" ] }, - "CellStyles": { - "1,1": 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": 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 + "FontFamily": 0 } }, "Spans": [ - "2,1,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", - "2,9,1,2", - "1,1,1,3", - "1,4,1,2", - "1,6,1,3", - "1,9,1,2", - "1,11,1,3", - "1,14,1,3", - "1,17,1,3", - "1,20,1,3", - "1,23,1,3", - "1,26,1,3" + "1,1,13,28" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -693,4 +755,4 @@ "PaperSize": {}, "Margin": {} } -}//AnJd2wnQMtuIEZLGJKf6ESYmxgQlMbzAYEku3R1p+BNNIQuYBIpBCaHT7VX66czhx87C+0BcfYlFBeUG49NEIIq5ZDz2juh/1nueZ6HJCpqkO3pZeQ7Yo/TbZ+SH9lN9wGFgWm+WrlzQMbLDOQWpWIH1IQNWjt1iq8FoSbTJqveW3QwnId2AiJc4StcPLm0AXT9gLiVhgs945SEf7s1K8/ull4+tq3ImIx5nqCKsaeTagVyHLIMFjQ24/l11mTooIuCbzXNarrfJxVp2wvzTq2N00x9YwZBsDHAuSWjz1L6puuFKJpcXqtcllOtz45wFdS2E+0+LE4Vzh9N9mWrbdcQko2Q0hAfCvpUM/ehgoIPZLJRUrHvzd23sgdp2Zjztp30T9YynyUK/aZBs4HvuUBq6HI6eiPctUDYTK8HaZb1ca62S2oD6iKkw2+inZeZqXVW060DwcHGHfqzJb0YtQ+3B99G///kXP5iJZxdPWbs0o0j4PbWYiYExpbnjTX19FR+dkGcSyKgRLnMHxR4qT9RB8N4vBVZcuT9mcviZXa8ZVMbDaGZfuNn3Bwp0PtLigt+QeuZE2+LZmnxZuYRnwP34pBZw5OfJxGX+gPsQt56RawqoFC8Q/QA4hGKYAY2T9OCdPVzH49blWP1XiVa3LgvZ3G1WANvqz0LtHuN+ti7f/ZkBIgWITrYeYaNqmr2n2UzGSOV5b19dtfXJvVmNFPXjcvXr/WOXQ8VwJp54/L/oAG/g6HfrbnukMieBU9Tm+vO1TjkOX+n20bsZpyI3hm1rC4Z0+Iae46uYYm554Bn+HbOOSILAhAGH8tS7qmFTkfYKDAu0uo4hzw/RlFx+yEiBspvWqpL8gbphzSX96SQ7XWgv+YB9r2UEe9kL8vuJ2+/HSvoBBIBpPqkTu3SoPA==|920 \ No newline at end of file +}//ceXJ+8DTa0kdNYiQdUih+p2Vyk1kT58/6JocdkKfR1lWRKFZw4Y/k+GM4GKlincVpo0r4gblGrV5/MTK+QCc7IwiOKFwXHAmJt0SVeGazaKz9LB6Q71JlA2xEFF34/nW230HLE6t1s2S6gGu87FhgxYHp2Dtc93SFKRIUQf2S6VyMyG5ROBJGRJzttLa0xJqoW+6TkUwPglvb02eG1ZbdWZpEormrKeBP1D3X4B+sv6Ndextg4wXVxIjPeNjvsnmrsm8CpEdF4Xs4/exMKUFNJsoO1X2BG0lYa4iIYCtmYIvbGfdJXIK1ZLloUjAr/govn3v83MvvKspqERnkW7UaDAh4Z0BTAgUM0ETpPxr2FL5JhMp9BQiKn7BXAP1OZPsxoSab5CgihLTcoDqcHdMuZ9fUzezfbHVRQMLNcxgpsRFmYEDVYqOf3OvN+T/e1758tMEb93e0hmoIWHUPXC2OsdEVC4fslZApxLGCKBpVdMIK/FweIVSCxSZRGhxXpUiGo8P7gx56sqVCdyfbb6ijRVLlhzYtf2RQxNg34AiKeJ+6B/0Rzh8V04gB8iLwUt4+C5wUpkOoeMY5fg61sds+MH761xGxriw6C36YWUMfE7zTbpCORgZtg7Oqi/iYcah7Ohl5hYyO/jc3AGe+pJCPrFPfY690bYjXFYqDaRbP/gIrM97rUbgTZkQOavfc9BncGIY4cVvLZyflpb1zGbWCJLP6JoUjPF2Zmw12yMCJE2uobM8xVinHNK38dc+R18wfuHBDt80HYBLS9RqNr213cU48GJ3HiSeONOfNKz+LCqde4o0XwF+kfC9iOTr9ff+8fUV58ZSBwhCLNwCYfvOT/bzSjrsVDdrfEbDHtpemAZ3sjA57RHo5ekqJNaKN9MwRBzSQ0u+pSA6rINJVi/N1A==|920 \ No newline at end of file diff --git a/Pages/工时/工时总览.json b/Pages/工时/工时总览.json deleted file mode 100644 index 68c451fa..00000000 --- a/Pages/工时/工时总览.json +++ /dev/null @@ -1,880 +0,0 @@ -{ - "Rows": { - "RowColumnAttachedInfos": { - "0": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 - } - }, - "2": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 - } - }, - "3": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "4": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "5": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "6": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "7": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "8": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "9": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "10": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "11": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "12": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "13": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "14": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "15": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "16": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "17": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "18": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "19": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 92.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "20": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 - } - } - }, - "Count": 21, - "DefaultSize": 32.0 - }, - "Cols": { - "RowColumnAttachedInfos": { - "1": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "2": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "3": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "4": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "5": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "6": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "7": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "8": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "9": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "10": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "11": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "12": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "13": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "14": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "15": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "16": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "17": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "18": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "19": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "20": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "21": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "22": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "23": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "24": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "25": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "26": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "27": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "31": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "32": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "33": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 - } - } - }, - "Count": 34, - "DefaultSize": 32.0 - }, - "Values": { - "1,1": "月份", - "1,30": "导出Excel" - }, - "Formulas": { - "1,3": "TODAY()" - }, - "AttachInfos": { - "1,3": { - "CellType": { - "$type": "ElementUI.DatePickerCellType, ElementUI", - "CommandList": [], - "UIPermissions": [ - { - "Scope": 2, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 4, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ], - "type": "month", - "placeholder": "选择年份", - "startPlaceholder": "开始日期", - "rangeSeparator": "至", - "endPlaceholder": "结束日期", - "firstDayOfWeek": 1, - "DefautWeekFormat": "yyyy 第 WW 周" - } - }, - "1,30": { - "CellType": { - "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", - "Text": "导出Excel", - "TemplateKey": "_RS_Main3", - "Icon": { - "Name": "File/348_excel_file_1.svg", - "BuiltIn": true, - "Color": "Background 1", - "UseCellTypeForeColor": true - }, - "IconSize": 14.0 - } - }, - "3,2": { - "CellType": { - "$type": "ElementUI.TableCellType, ElementUI", - "ElTableName": "EL表格1", - "bindingOptions": { - "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "View_任务工时统计", - "BindingInfos": [ - { - "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": "c0c5f87e-a192-49a7-8e38-61519cfadfe5" - }, - "ColumnName": "核定工时" - }, - { - "GUID": "2a97dd54-f2d2-44e7-9758-cb2e1c24e73c", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "核定收益", - "GUID": "38e42d44-fe33-43b9-86f6-5f181c7f0f12" - }, - "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": { - "Styles": [ - { - "FontFamily": 0, - "FontSize": 13.333333333333332, - "Formatter": 1, - "TextIndent": 5, - "HorizontalAlignment": 2 - }, - { - "FontFamily": 0 - }, - { - "FontFamily": 0, - "FontSize": 13.333333333333332 - }, - { - "FontSize": 13.333333333333332 - } - ], - "Types": { - "Strs": [ - "Body", - "General", - "Right" - ] - }, - "CellStyles": { - "1,1": 0, - "1,2": 1, - "1,3": 2, - "1,4": 1, - "1,5": 1, - "1,6": 1, - "1,7": 1, - "1,8": 1, - "1,11": 0, - "1,12": 1, - "1,30": 3, - "3,1": 1 - }, - "SheetStyle": { - "FontFamily": 0 - } - }, - "Spans": [ - "1,30,1,3", - "1,3,1,6", - "1,1,1,2", - "3,2,17,31" - ], - "PageInfo": { - "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", - "MasterPageName": "FGC_母版页", - "Title": "财务中心", - "PageLoadedCommandList": [ - { - "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", - "FunctionName": "remove", - "Title": "加载中" - } - ], - "PermissionData": { - "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", - "permissionResource": { - "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core" - }, - "permissionBindings": [ - { - "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core", - "roleNames": [ - "FGC_LoginUser" - ] - } - ] - }, - "RowBreakLines": [], - "RepeatRangeSettings": [] - }, - "PrintInfo": { - "PaperSize": {}, - "Margin": {} - } -}//8/lFA8gtG4Wjj6t/G4Gers7WqosN+myk8XHbtKjbS3v/F7wqWuK1L0L98Zebb7I/H7vgto/K6peRNGfa4RYsvBYp1W8eJRar41rq+UNdH1S2a7mUDG0Y2Y2XGiHzAeaG9ZYiOq1iFKjNAnTnou5ZPwbCxxPP6vU8VHOHyOYuZ8hPfa2mEcQzfQEuOWtsjwCjEAWYGnyb2BnaUGTHgtnGVnIj2ECEkQyfjkxsfmf0EimXz3l7OAxZh1iMalyh7nxW0PJEMNf1qoR8nOnZXFWE+GUTsohCMpkBaURa5MuitTzRNokdXGlMWWPzqpzcuAQefn44uGslqZRwM8usYUL6LZcVQGc10KvVKTyO9pSekEFfTWLYxVbxkjgHLo9WBH3Hb5A637rdtYhORrt4rcGvFzRlVTbcs++9hOLJPTj9q0rvPrp+wC2cQ3c35ss5khFiFtHEz3SKek7KIbY5ixraoLNeO/9jbPwNNvIySnyATZettd+DSOw9l6bAaegYkN68PJlYE0wQAz1pC4A/DBPYYZZlEELC3gCBCLBRZ0nunxE0n2lTa0SYMZojMFPM7WhO87eWLjfbSVXHAZL7wSaGdoeD/FsfDltr84XLKXlhzaCuZmd6wx3Ax8oYpWbv4Qw4dXF2E+Z1SyvUMEvObD1i+Q+KCl+B281xAnBuyeJKacEYvXF9Qn0MVM9WOTWWT08vzhVlgx8lckVzZ4Wm9xZHpsT77oLIsSY067g3dU+Vu5bQExACjjjcWsy25JxElvZcbI1ne57yATaGAoJtJvzg2Iky+smbl23ArFOASrUYzPBDq3HJb8RARnqsZ3yrwAYq0HrYrk9fxYXolyRTWglpA8Iw+TkHWGF3DJVny2vsuK+OhE+ONFdV1sm8SpElnrB0+Ad52Xh2oa3n8pTyUhlceg==|920 \ No newline at end of file diff --git a/Pages/工时/工时总览.rd b/Pages/工时/工时总览.rd deleted file mode 100644 index 5245e64c..00000000 --- a/Pages/工时/工时总览.rd +++ /dev/null @@ -1,8 +0,0 @@ -{ - "PageType": 0, - "ColumnCount": 34, - "RowCount": 21, - "Formulas": { - "1,3": "TODAY()" - } -} \ No newline at end of file diff --git a/Pages/收益/办理结算审批单.json b/Pages/收益/办理结算审批单.json index 24acb172..f1f62827 100644 --- a/Pages/收益/办理结算审批单.json +++ b/Pages/收益/办理结算审批单.json @@ -1,87 +1,6 @@ { "Rows": { "RowColumnAttachedInfos": { - "4": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 - } - }, - "5": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 - } - }, - "6": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "7": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 - } - }, - "8": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 - } - }, - "9": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "10": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 - } - }, - "11": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 - } - }, - "12": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "13": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 - } - }, - "14": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 - } - }, - "15": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "16": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 - } - }, - "17": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "18": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 77.0 - } - }, - "20": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "IsHidden": true - } - }, "0": { "GridRowColumnDefinition": { "DesignLengthInPixel": 22.0 @@ -96,13 +15,130 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0 } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 25.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 16.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 25.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 16.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 25.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 16.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 25.0 + } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 16.0 + } + }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 25.0 + } + }, + "20": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "21": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 16.0 + } + }, + "22": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "23": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 100.0, + "Mode": 1 + } + }, + "25": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "IsHidden": true + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 31.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + }, + "24": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } } }, "InLogicalVisibleIndexes": [ - 20 + 25 ], - "Count": 21, - "DefaultSize": 32.0 + "Count": 26, + "DefaultSize": 35.0 }, "Cols": { "RowColumnAttachedInfos": { @@ -181,35 +217,56 @@ "DesignLengthInPixel": 36.0 } }, + "31": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 285.0, + "IsHidden": true + } + }, + "29": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 503.0 + } + }, "30": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 285.0 + "DesignLengthInPixel": 27.0 } } }, - "Count": 32, + "InLogicalVisibleIndexes": [ + 28, + 29, + 30, + 31 + ], + "Count": 33, "DefaultSize": 32.0 }, "Values": { - "1,30": "FGC_审批记录", - "3,1": "申请日期", - "3,8": "请款人", - "3,16": "应付金额", - "4,8": "%CurrentUser.UserName%", - "4,16": 0, - "6,1": "户名", - "6,8": "开户行", - "6,16": "付款日期", - "9,1": "帐号", - "9,16": "付款科目", - "12,1": "备注", - "12,16": "实际付款金额", - "15,16": "付款凭证", - "20,1": "%CurrentUser.UserName%" + "1,29": "收益明细信息", + "1,31": "FGC_审批记录", + "3,1": "请款单信息", + "5,1": "申请日期", + "5,8": "请款人", + "5,15": "应付金额", + "6,8": "%CurrentUser.UserName%", + "6,15": 0, + "8,1": "户名", + "8,8": "开户行", + "8,15": "帐号", + "11,1": "备注", + "14,1": "付款凭证信息", + "16,1": "付款日期", + "16,15": "付款科目", + "19,1": "实际付款金额", + "22,1": "付款凭证", + "25,1": "%CurrentUser.UserName%" }, "Formulas": { - "13,16": "总金额", - "7,16": "TODAY()" + "20,1": "总金额", + "17,1": "TODAY()", + "1,27": "IF(#REF!,B21,A21)" }, "AttachInfos": { "1,1": { @@ -258,7 +315,7 @@ "MethodName": "Refresh" } ], - "ID": "bf829f50-ac0c-4bb1-bacf-edffef6c457d" + "ID": "e8c1a399-5236-4428-b491-b09492d24c01" }, { "CommandList": [ @@ -266,7 +323,7 @@ "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon" } ], - "ID": "27749041-5319-44a2-a8d0-edf13fba01c6" + "ID": "8b87f8ac-e107-4e41-86c3-dda0ecfe7965" } ] } @@ -300,14 +357,366 @@ ] } }, - "1,30": { + "1,27": { + "CellType": { + "$type": "Forguncy.ImageCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=办理结算审批单!展开审批记录" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=NOT(办理结算审批单!展开审批记录)" + } + } + ] + } + ], + "ToolTip": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IF(办理结算审批单!展开审批记录,\"收起信息\",\"展开更多\")" + }, + "Size": 14, + "ImagePath": "展开1.svg", + "UseCellForeColor": true + } + }, + "1,31": { "CellType": { "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", "PageName": "FGC_审批记录", "OverflowMode": 1 } }, - "4,1": { + "3,29": { + "CellType": { + "$type": "ElementUI.TableCellType, ElementUI", + "ElTableName": "EL表格1", + "SelectionChangedCommand": { + "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", + "Commands": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "计算总金额", + "ParameterValue": "0", + "ID": "93e32b6bfbad41d79e2584c746662ec4" + }, + { + "$type": "Forguncy.Model.RunJavaScriptCommand, ServerDesignerCommon", + "JavaScript": "/**\r\n * 计算 JSON 数组中指定属性的总和\r\n * @param {Array} jsonArray - 包含对象的 JSON 数组\r\n * @param {string} propertyName - 要计算总和的属性名称\r\n * @returns {number} - 属性值的总和\r\n */\r\nfunction calculateSum(jsonArray, propertyName) {\r\n let sum = 0;\r\n if (Array.isArray(jsonArray)) {\r\n for (const item of jsonArray) {\r\n if (item.hasOwnProperty(propertyName)) {\r\n const propertyValue = parseFloat(item[propertyName]);\r\n if (!isNaN(propertyValue)) {\r\n sum += propertyValue;\r\n }\r\n }\r\n }\r\n }else{\r\n console.log(\"传入的参数不是JSON数组\")\r\n }\r\n\r\n return sum;\r\n}\r\n\r\nvar data = Forguncy.CommandHelper.getVariableValue(\"选择项\");\r\nconst totalPrices = calculateSum(data, \"收益\");\r\nForguncy.CommandHelper.setVariableValue(\"计算总金额\", totalPrices);\r\n", + "ID": "312cb024df344a669b4b243a7f522572" + }, + { + "$type": "CollectionOperationKit.ClientSideArrayOp, CollectionOperationKit", + "Operation": 16, + "InParamaterName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=办理结算审批单!选择项" + }, + "OperationParamaterAName": ",", + "OperationParamaterBName": "ID", + "OutParamaterName": "ID字符串" + }, + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=办理结算审批单!选择ID" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=办理结算审批单!ID字符串" + } + }, + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=办理结算审批单!总金额" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=办理结算审批单!计算总金额" + } + } + ] + } + ], + "ParamProperties": { + "selection": "选择项" + } + }, + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "任务工时表", + "BindingInfos": [ + { + "GUID": "601e1b61-3dd4-4060-9d91-a6f505417a8a", + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "ID", + "GUID": "ceb0d0ed-df14-4207-b791-fa2e1d08103e" + }, + "ColumnName": "ID" + }, + { + "GUID": "60fa4d3a-10e0-4d0f-ae8f-a80b55cbce97", + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时日期", + "GUID": "fe76de32-e4e9-4db1-b8c9-8486ea6653a9" + }, + "ColumnName": "工时日期" + }, + { + "GUID": "2a24d856-b884-46ff-8b33-16f388137ae2", + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "项目ID", + "GUID": "4e23df36-6cb7-4186-bcab-292bd058c8d6", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "项目名称" + } + }, + "ColumnName": "项目名称" + }, + { + "GUID": "1d7d961f-62c0-450a-bdf5-9f7570fb0425", + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "任务ID", + "GUID": "ab44e6d7-fa6d-4622-8dbc-aac668ba76a0", + "RelationBinding": { + "RelatedTable": "任务平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "任务名称" + } + }, + "ColumnName": "任务名称" + }, + { + "GUID": "921c70db-81a4-4782-9b18-204859b2e089", + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时", + "GUID": "65b9f42b-b472-46a4-9c7c-e18a895dd66c" + }, + "ColumnName": "核定工时" + }, + { + "GUID": "5e1b4ade-9bad-4bf1-ba27-d6a6c6b17467", + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "预算收益", + "GUID": "ab10f374-948b-4902-a7c1-b3cce910a8b8" + }, + "ColumnName": "预算收益" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "请款单ID", + "GUID": "ff809989-7a43-47b9-bec9-a1a56b3eeb1b" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=办理结算审批单!请款单ID" + } + }, + "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": "2679659a-e79f-4198-a202-c6388405e5cf", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "工时日期", + "label": "工时日期", + "formatStr": "yyyy/MM/dd", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "showOverflowTooltip": false, + "key": "0577d621-dc6c-4c06-a1ba-75767c4cc5ab", + "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": "0c315874-56cd-4562-8443-297017b976b2", + "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": "5cf7d2a0-5493-420c-a294-9e46611aefce", + "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": "a4378a6c-3576-4e80-aaba-ea9b8f64c573", + "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": "120c0de9-4509-45ca-81e1-f4bdfd7c9dca", + "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": "small", + "showIndexColumn": true, + "stripe": false + } + }, + "6,1": { "BindingInfo": { "TableName": "收益请款单表", "ColumnName": "请款日期", @@ -345,7 +754,7 @@ "DefautWeekFormat": "yyyy 第 WW 周" } }, - "4,8": { + "6,8": { "BindingInfo": { "TableName": "收益请款单表", "ColumnName": "请款人", @@ -430,14 +839,42 @@ "noMatchText": "无匹配数据" } }, - "4,16": { + "6,15": { "BindingInfo": { "TableName": "收益请款单表", "ColumnName": "总收益", "GUID": "c8e63e7c-7996-4acc-bfbf-6348055280e6" + }, + "CellType": { + "$type": "ElementUI.InputCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "DefaultValue": 0, + "type": "text", + "resize": "none", + "ReadOnly": true } }, - "7,1": { + "9,1": { "BindingInfo": { "TableName": "收益请款单表", "ColumnName": "户名", @@ -470,7 +907,7 @@ "resize": "none" } }, - "7,8": { + "9,8": { "BindingInfo": { "TableName": "收益请款单表", "ColumnName": "开户行", @@ -503,7 +940,53 @@ "resize": "none" } }, - "7,16": { + "9,15": { + "BindingInfo": { + "TableName": "收益请款单表", + "ColumnName": "帐号", + "GUID": "74744b0a-0d88-45ce-8c65-4db55ad744c3" + }, + "CellType": { + "$type": "ElementUI.InputCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "text", + "resize": "none" + } + }, + "12,1": { + "BindingInfo": { + "TableName": "付款凭证表", + "ColumnName": "备注", + "GUID": "722a1224-c9ea-4dd2-b32a-ec08731b670f" + }, + "CellType": { + "$type": "Forguncy.MultilineTextBox, ServerDesignerCommon", + "TemplateKey": "_RS_NewLittleRoundCorner", + "WaterMark": "请输入", + "CommandList": [] + } + }, + "17,1": { "BindingInfo": { "TableName": "付款凭证表", "ColumnName": "付款日期", @@ -544,40 +1027,7 @@ "IgnoreBlank": false } }, - "10,1": { - "BindingInfo": { - "TableName": "收益请款单表", - "ColumnName": "帐号", - "GUID": "74744b0a-0d88-45ce-8c65-4db55ad744c3" - }, - "CellType": { - "$type": "ElementUI.InputCellType, ElementUI", - "CommandList": [], - "UIPermissions": [ - { - "Scope": 2, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 4, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ], - "type": "text", - "resize": "none" - } - }, - "10,16": { + "17,15": { "BindingInfo": { "TableName": "付款凭证表", "ColumnName": "付款科目", @@ -627,20 +1077,7 @@ "IgnoreBlank": false } }, - "13,1": { - "BindingInfo": { - "TableName": "付款凭证表", - "ColumnName": "备注", - "GUID": "722a1224-c9ea-4dd2-b32a-ec08731b670f" - }, - "CellType": { - "$type": "Forguncy.MultilineTextBox, ServerDesignerCommon", - "TemplateKey": "_RS_NewLittleRoundCorner", - "WaterMark": "请输入", - "CommandList": [] - } - }, - "13,16": { + "20,1": { "BindingInfo": { "TableName": "付款凭证表", "ColumnName": "付款金额", @@ -672,7 +1109,7 @@ "IgnoreBlank": false } }, - "16,16": { + "23,1": { "BindingInfo": { "TableName": "付款凭证表", "ColumnName": "付款凭证", @@ -706,12 +1143,61 @@ "tipText": "只能上传jpg/png文件" } }, - "20,1": { + "25,1": { "BindingInfo": { "TableName": "付款凭证表", "ColumnName": "经手人", "GUID": "85a0b842-b674-4840-9da3-4b939585cc7b" } + }, + "25,5": { + "BindingInfo": { + "TableName": "收益请款单表", + "ColumnName": "ID", + "GUID": "e63be71c-a03e-40b4-89e5-4a4c54dae715" + } + }, + "25,9": { + "CellType": { + "$type": "Forguncy.ImageCellType, ServerDesignerCommon", + "ToolTip": "展开审批记录", + "Size": 14, + "ImagePath": "展开1.svg", + "UseCellForeColor": true + } + }, + "25,10": { + "CellType": { + "$type": "Forguncy.ImageCellType, ServerDesignerCommon", + "ToolTip": "展开审批记录", + "Size": 14, + "ImagePath": "收起.svg", + "UseCellForeColor": true + } + }, + "25,11": { + "CellType": { + "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", + "Caption": "展开审批记录", + "Style": 1, + "CommandList": [ + { + "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=办理结算审批单!AC:AF" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=办理结算审批单!展开审批记录" + } + } + ] + } + ] + } } }, "StyleDatas": { @@ -726,24 +1212,35 @@ }, { "FontFamily": 0, - "FontSize": 13.333333333333332, - "Foreground": 1, - "Formatter": 2 + "Foreground": 1 }, { - "FontSize": -1.0 + "FontFamily": 0, + "FontSize": 16.0, + "FontWeight": 2, + "Formatter": 3 + }, + { + "FontFamily": 0 + }, + { + "FontSize": 16.0, + "FontWeight": 2 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 1, + "Formatter": 3 }, { "FontFamily": 0, "FontSize": 14.666666666666666, - "Formatter": 3 - }, - { - "BorderRight": 0 + "Formatter": 4 }, { "FontFamily": 0, - "FontSize": 18.666666666666664, + "FontSize": 14.666666666666666, "Foreground": 5, "Formatter": 6, "HorizontalAlignment": 7 @@ -758,39 +1255,43 @@ "FontSize": 14.666666666666666 }, { - "FontFamily": 0, - "FontSize": 14.666666666666666, - "FontWeight": 8 + "FontSize": -1.0 }, { "FontFamily": 0, "FontSize": 14.666666666666666, - "Formatter": 9, - "VerticalAlignment": 10, + "Formatter": 8, + "VerticalAlignment": 9, "WordWrap": true }, { - "Formatter": 9 + "FontFamily": 0, + "FontSize": 18.666666666666664, + "Foreground": 5, + "Formatter": 6, + "HorizontalAlignment": 7 + }, + { + "FontFamily": 0, + "FontSize": 16.0, + "FontWeight": 2 + }, + { + "Formatter": 8 } ], "Types": { "Strs": [ "Body", "Text 1 50", + "Bold", "[AUTO]General", "yyyy\"年\"m\"月\"d\"日\";@", - "Background 2 -10", "#FFFF0000", "¥#,##0_);[Red](¥#,##0)", "Left", - "Bold", "@", "Top" - ], - "Borders": [ - { - "Color": 4 - } ] }, "CellStyles": { @@ -809,43 +1310,38 @@ "1,13": 1, "1,14": 1, "1,15": 1, - "1,30": 1, - "3,1": 2, - "3,2": 1, - "3,3": 1, - "3,4": 1, - "3,5": 1, - "3,6": 1, - "3,7": 1, - "3,8": 2, - "3,9": 1, - "3,10": 1, - "3,11": 1, - "3,12": 1, - "3,13": 1, - "3,16": 2, - "4,0": 3, - "4,1": 4, - "4,7": 1, - "4,8": 4, - "4,14": 5, - "4,15": 1, - "4,16": 6, - "4,29": 6, - "5,1": 1, + "1,27": 2, + "1,29": 3, + "1,31": 1, + "2,27": 4, + "3,1": 5, + "3,29": 1, + "5,1": 6, "5,2": 1, "5,3": 1, "5,4": 1, "5,5": 1, "5,6": 1, "5,7": 1, - "5,8": 1, + "5,8": 6, "5,9": 1, "5,10": 1, "5,11": 1, "5,12": 1, "5,13": 1, - "5,14": 5, + "5,15": 6, + "5,16": 1, + "5,17": 1, + "5,18": 1, + "5,19": 1, + "5,20": 1, + "5,21": 1, + "5,22": 1, + "5,23": 1, + "5,24": 1, + "5,25": 1, + "5,26": 1, + "5,27": 1, "6,1": 7, "6,2": 1, "6,3": 1, @@ -853,14 +1349,14 @@ "6,5": 1, "6,6": 1, "6,7": 1, - "6,8": 2, + "6,8": 7, "6,9": 1, "6,10": 1, "6,11": 1, "6,12": 1, "6,13": 1, - "6,14": 5, - "6,16": 7, + "6,15": 8, + "6,16": 1, "6,17": 1, "6,18": 1, "6,19": 1, @@ -872,43 +1368,47 @@ "6,25": 1, "6,26": 1, "6,27": 1, - "6,28": 1, - "6,29": 1, - "7,1": 8, - "7,7": 1, - "7,8": 8, - "7,14": 5, - "7,16": 8, - "7,29": 8, - "8,1": 8, - "8,2": 8, - "8,3": 8, - "8,4": 8, - "8,5": 8, - "8,6": 8, + "8,1": 9, + "8,2": 1, + "8,3": 1, + "8,4": 1, + "8,5": 1, + "8,6": 1, "8,7": 1, - "8,8": 1, + "8,8": 6, "8,9": 1, "8,10": 1, "8,11": 1, "8,12": 1, "8,13": 1, - "8,14": 5, - "9,1": 2, + "8,15": 6, + "8,16": 1, + "8,17": 1, + "8,18": 1, + "8,19": 1, + "8,20": 1, + "8,21": 1, + "8,22": 1, + "8,23": 1, + "8,24": 1, + "8,25": 1, + "8,26": 1, + "8,27": 1, + "9,1": 10, "9,2": 1, "9,3": 1, "9,4": 1, "9,5": 1, "9,6": 1, "9,7": 1, - "9,8": 1, + "9,8": 10, "9,9": 1, "9,10": 1, "9,11": 1, "9,12": 1, "9,13": 1, - "9,14": 5, - "9,16": 2, + "9,15": 10, + "9,16": 1, "9,17": 1, "9,18": 1, "9,19": 1, @@ -920,13 +1420,10 @@ "9,25": 1, "9,26": 1, "9,27": 1, - "9,28": 1, - "9,29": 1, - "10,1": 9, - "10,14": 5, - "10,16": 8, - "10,29": 8, - "11,1": 1, + "10,30": 1, + "10,31": 1, + "10,32": 1, + "11,1": 6, "11,2": 1, "11,3": 1, "11,4": 1, @@ -939,78 +1436,159 @@ "11,11": 1, "11,12": 1, "11,13": 1, - "11,14": 5, - "12,1": 2, - "12,2": 1, - "12,3": 1, - "12,4": 1, - "12,5": 1, - "12,6": 1, - "12,7": 1, - "12,8": 1, - "12,9": 1, - "12,10": 1, - "12,11": 1, - "12,12": 1, - "12,13": 1, - "12,14": 5, - "12,16": 2, - "12,17": 1, - "12,18": 1, - "12,19": 1, - "12,20": 1, - "12,21": 1, - "12,22": 1, - "12,23": 1, - "12,24": 1, - "12,25": 1, - "12,26": 1, - "12,27": 1, - "12,28": 1, - "12,29": 1, - "13,1": 10, - "13,14": 5, - "13,16": 8, - "13,29": 8, - "14,14": 5, - "15,14": 5, - "15,16": 2, - "15,17": 1, - "15,18": 1, - "15,19": 1, - "15,20": 1, - "15,21": 1, - "15,22": 1, - "15,23": 1, - "15,24": 1, - "15,25": 1, - "15,26": 1, - "15,27": 1, - "15,28": 1, - "15,29": 1, - "16,14": 5, - "16,16": 8, - "16,29": 8, - "17,14": 5, - "17,29": 8, - "18,14": 5, - "18,29": 8, - "19,1": 8, - "19,2": 8, - "19,3": 8, - "19,4": 8, - "19,5": 8, - "19,6": 8, - "19,7": 8, - "19,8": 8, - "19,9": 8, - "19,10": 8, - "19,11": 8, - "19,12": 8, - "19,13": 8, - "20,1": 3, - "20,5": 3, - "20,16": 11 + "12,0": 11, + "12,1": 12, + "12,30": 13, + "13,1": 1, + "13,2": 1, + "13,3": 1, + "13,4": 1, + "13,5": 1, + "13,6": 1, + "13,7": 1, + "13,8": 1, + "13,9": 1, + "13,10": 1, + "13,11": 1, + "13,12": 1, + "13,13": 1, + "14,1": 14, + "14,30": 1, + "15,1": 14, + "15,30": 1, + "16,1": 9, + "16,2": 1, + "16,3": 1, + "16,4": 1, + "16,5": 1, + "16,6": 1, + "16,7": 1, + "16,8": 1, + "16,9": 1, + "16,10": 1, + "16,11": 1, + "16,12": 1, + "16,13": 1, + "16,15": 6, + "16,16": 1, + "16,17": 1, + "16,18": 1, + "16,19": 1, + "16,20": 1, + "16,21": 1, + "16,22": 1, + "16,23": 1, + "16,24": 1, + "16,25": 1, + "16,26": 1, + "16,27": 1, + "16,30": 10, + "17,1": 10, + "17,2": 1, + "17,3": 1, + "17,4": 1, + "17,5": 1, + "17,6": 1, + "17,7": 1, + "17,8": 1, + "17,9": 1, + "17,10": 1, + "17,11": 1, + "17,12": 1, + "17,13": 1, + "17,15": 10, + "17,16": 1, + "17,17": 1, + "17,18": 1, + "17,19": 1, + "17,20": 1, + "17,21": 1, + "17,22": 1, + "17,23": 1, + "17,24": 1, + "17,25": 1, + "17,26": 1, + "17,27": 1, + "18,30": 1, + "19,1": 6, + "19,2": 1, + "19,3": 1, + "19,4": 1, + "19,5": 1, + "19,6": 1, + "19,7": 1, + "19,8": 1, + "19,9": 1, + "19,10": 1, + "19,11": 1, + "19,12": 1, + "19,13": 1, + "19,30": 10, + "20,1": 10, + "21,2": 1, + "21,3": 1, + "21,4": 1, + "21,5": 1, + "21,6": 1, + "21,7": 1, + "21,8": 1, + "21,9": 1, + "21,10": 1, + "21,11": 1, + "21,12": 1, + "21,13": 1, + "21,30": 1, + "22,1": 6, + "22,30": 10, + "23,1": 10, + "23,2": 1, + "23,3": 1, + "23,4": 1, + "23,5": 1, + "23,6": 1, + "23,7": 1, + "23,8": 1, + "23,9": 1, + "23,10": 1, + "23,11": 1, + "23,12": 1, + "23,13": 1, + "23,14": 1, + "23,15": 1, + "23,16": 1, + "23,17": 1, + "23,18": 1, + "23,19": 1, + "23,20": 1, + "23,21": 1, + "23,22": 1, + "23,23": 1, + "23,24": 1, + "23,25": 1, + "23,26": 1, + "23,27": 1, + "24,1": 10, + "24,2": 10, + "24,3": 10, + "24,4": 10, + "24,5": 10, + "24,6": 10, + "24,7": 10, + "24,8": 10, + "24,9": 10, + "24,10": 10, + "24,11": 10, + "24,12": 10, + "24,13": 10, + "25,1": 11, + "25,5": 11, + "25,9": 2, + "25,10": 2, + "25,11": 1, + "25,12": 4, + "25,13": 4, + "25,14": 4, + "25,16": 15 }, "SheetStyle": { "FontFamily": 0, @@ -1018,20 +1596,24 @@ } }, "Spans": [ - "7,16,1,13", - "10,16,1,13", - "13,16,1,13", - "4,16,1,13", - "16,16,3,13", - "13,1,6,13", "1,1,1,15", - "1,30,18,1", - "10,1,1,13", - "7,1,1,6", - "7,8,1,6", - "4,1,1,6", - "4,8,1,6", - "20,1,1,4" + "1,31,23,1", + "25,1,1,4", + "6,1,1,6", + "6,8,1,6", + "12,1,1,27", + "17,1,1,13", + "17,15,1,13", + "20,1,1,27", + "23,1,1,27", + "25,5,1,3", + "25,11,1,4", + "1,29,1,1", + "3,29,21,1", + "9,15,1,13", + "9,1,1,6", + "9,8,1,6", + "6,15,1,13" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1060,7 +1642,15 @@ "CustomNames": [ { "Name": "总金额", - "Formula": "办理结算审批单!$Q$5" + "Formula": "办理结算审批单!$P$7" + }, + { + "Name": "请款单ID", + "Formula": "办理结算审批单!$F$26" + }, + { + "Name": "展开审批记录", + "Formula": "办理结算审批单!$L$26" } ] -}//bG2aAdQGhuYFs7Slg190kONGNTcX8QYU78ws+6hsmibcqtV7nBFrriJ7C0pDI7q8VblRFKapg/lOLBpfdzaGSTVYU9b8Kuay9DEQrxIhIkNbhrXckJGcMmjXEK4lv7QjQl30z1+KY38UdsjfgtZWrClxdBE4iDDGK0cr/2Kse+8/5koLQmaeXFnaiHI+r22P4F0Lpkn9G882VvqSbd4X44g0b0PvpATmqmOvA6kqNt9YYyPxXHBd5gOfAuUE8TUoXR5JJY5KtPn2cnFFpLfPFiBu0cUSbg+/frMn4nz8ogM3MqnysKY+G31UzCkf+U0KdFn4inQjhZLA564Z4uUTqQAmWkmQ23AqvLcDOcyNEgzPB/lFCoZFsW1Ze2E81Aca1kCtDwi1jFRu5mPNHtA4cN7CQDP1h+z2fKfzY7pouht1EI2EoqcFe6zO3CVLKTuG/b/hBnx9B6mvVndjXu6NPlZj/tsueVDFwZpHb7Yb25CdRTYLpEQuw1tIA+d2w/enXIJdKb5c/asl2KvRo3K82THwr0yku2+XYo83AuKrBmhEVTKrhfve/PNzkVMq/7+T7pZaLrR3ovR2+I2VutllhbgAkVTGmmrhFGvXLm/pGtwIdwcWHM1isomSNJODypKEHR59X3iA9jskCSKJgWqtIQKhHAm1XyVOAbBHN6dCkieJq6DHjp1Je1M768VLYXE6hFj0bVdf3FsokJ+HGctjMfAhER2i+0MDlHH5jbcFvQMK7c+qMFNPuJivcCwWftOoNDS7PnTqzIwWH/EHGWcDBM9ieirTaejBMkQa7Vk0OsOQer/MZ1iJzqKPahhBjTXqs4M42tm7w7dKuInl8Rs6VF8S6fHwiyL9OQcuOjPI+A4Ct+C8+7RvHXzVwuxssqGoh0AY+H0YL1RU/MlQMaesQg==|920 \ No newline at end of file +}//q8lYqnG03NQOQU1SR8GzkaeI4Xz81bbPlJO8qFWvg9UZHpAHEvd1UK8qgq+H9sTz2w/tm2xSubpVe8YX40KMy1ldi8tF80cgwjhydfvj/e5UGash69XQDu097/iYzux2OQExi9ycQ3W2K+F7CdyGqlr3vECr84NjDpxb34+N0015jdypY+dBresTKL8rZtdMBhsN3od7y6KwGWTmDtdY1CHecEqXN1fqEfzwnJuLZWwfZUp8ENmAwfxiPcSvPn8390XbgzCP75fcy2KbT8GRxULtpT21SGZ4HhMsU8zgQx0JSBNjorp3PKtZ1Ln5zvy5chTRqokAR7cVuIFo6JEG9G7qFkC/DtfElFxPpqhiln5ozaBDGQzCxMwfZrfaJpqEvMqI7qFITvFnANPwXsmy3A35JXnKHsaTnBJ6mYr9zK38oY/2jeahhTyoz8HwEvBrmXQ4et4aflzJr1sz2xIa4MnOj6vAkQ62ljRPhP9oQp9heiGR0GgFs0YDR52ZXfZci2TV5eEiFu0ltq4EQvGz3MdSskvi7eGCgE2yDJmTC6/cqGXifb68japiT9SHHlFV1eLKHi14AND17u4uRdfJ5e002WrY54J12/6OTL0Mm0JaDrpeoL5b0a1gYRWhx6xHUW/N4WCQJkj1B58wSHJrFJ40dEHPVz1sowFdID4lMRwktxNUE/i8hdRWhAlYpMH5T1waJob+KBdgpjfWboeBvfF9TOuiSv2Krf+tEYBxbnWK9aLE23BG6r+uUd7ukAWLaZNLZjpoc8OutZijoRdGUygT1apsWeNvl89Uhn6NfyEvnC1lgpC3Wnu4IlgxF/WjONPN1aZogRT/ZuFpOpzw0j85z2CDsTvSxf3DoowYzBam9v5l+Gp/6+SyePo7i2uSscEQrzuuHGnU5GSE6f0QCQ==|920 \ No newline at end of file diff --git a/Pages/收益/办理结算审批单.rd b/Pages/收益/办理结算审批单.rd index 70bc23e7..c79d671a 100644 --- a/Pages/收益/办理结算审批单.rd +++ b/Pages/收益/办理结算审批单.rd @@ -1,15 +1,24 @@ { "PageType": 0, - "ColumnCount": 32, - "RowCount": 21, + "ColumnCount": 33, + "RowCount": 26, "Formulas": { - "13,16": "总金额", - "7,16": "TODAY()" + "20,1": "总金额", + "17,1": "TODAY()", + "1,27": "IF(#REF!,B21,A21)" }, "CustomNames": [ { "Name": "总金额", - "Formula": "办理结算审批单!$Q$5" + "Formula": "办理结算审批单!$P$7" + }, + { + "Name": "请款单ID", + "Formula": "办理结算审批单!$F$26" + }, + { + "Name": "展开审批记录", + "Formula": "办理结算审批单!$L$26" } ] } \ No newline at end of file diff --git a/Pages/工时/个人工时首页.json b/Pages/财务/付款凭证管理.json similarity index 60% rename from Pages/工时/个人工时首页.json rename to Pages/财务/付款凭证管理.json index 849ac8c0..a39e01f9 100644 --- a/Pages/工时/个人工时首页.json +++ b/Pages/财务/付款凭证管理.json @@ -13,17 +13,20 @@ }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 32.0, + "IsHidden": true } }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 20.0, + "IsHidden": true } }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 28.0 + "DesignLengthInPixel": 28.0, + "IsHidden": true } }, "6": { @@ -61,6 +64,10 @@ } }, "InLogicalVisibleIndexes": [ + 2, + 3, + 4, + 5, 10 ], "Count": 11, @@ -261,92 +268,108 @@ }, "Values": { "1,1": "%PageTitle%", - "3,1": "项目", - "3,16": "日期", + "3,1": "日期", "5,1": "查询", "5,4": "重置" }, "AttachInfos": { - "3,3": { + "1,19": { + "CssName": "toolbar toolbar-right ", "CellType": { - "$type": "ElementUI.SelectCellType, ElementUI", - "CommandList": [], - "UIPermissions": [ + "$type": "Forguncy.CustomMenu.ForguncyMenuCellType, Forguncy.CustomMenu", + "TemplateKey": "横向迷你菜单", + "Items": [ { - "Scope": 2, - "AllowRoles": [ + "Value": "菜单1", + "Text": "删除选中", + "IconPath": "删除.svg", + "IsBuiltInIconPath": false, + "SelectedIconColor": "Background 1", + "SelectedIconColorUseItemColor": true, + "IconColor": "Accent 1", + "IconColorUseItemColor": true, + "IsOldMenuPath": false + }, + { + "Value": "菜单1", + "Text": "筛选数据", + "IconPath": "搜索.svg", + "IsBuiltInIconPath": false, + "SelectedIconColor": "Background 1", + "SelectedIconColorUseItemColor": true, + "IconColor": "Accent 1", + "IconColorUseItemColor": true, + "IsOldMenuPath": false, + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=付款凭证管理!显示搜索栏" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=NOT(付款凭证管理!显示搜索栏)" + } + } + ] + } + ], + "CanVisitRoleList": [ "FGC_Anonymous" ] }, { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" + "Value": "新增单据", + "Text": "新增单据", + "IconPath": "增加.svg", + "IsBuiltInIconPath": false, + "SelectedIconColor": "Background 1", + "SelectedIconColorUseItemColor": true, + "IconColor": "Accent 1", + "IconColorUseItemColor": true, + "IsOldMenuPath": false, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "付款凭证详情", + "LoadBindingDataOption": 2 + } + ], + "CanVisitRoleList": [ + "FGC_LoginUser" ] } ], - "useBinding": true, - "options": [ + "Orientation": 0, + "MenuLevelsStyle": [ { - "value": "黄金糕", - "label": "黄金糕" + "FontSize": 13.333333333333332, + "Bold": false, + "Height": 32.0, + "IconHeight": 14.0, + "IconWidth": 14.0 }, { - "value": "双皮奶", - "label": "双皮奶" + "FontSize": 13.333333333333332, + "Bold": false, + "Height": 32.0, + "IconHeight": 14.0, + "IconWidth": 14.0 }, { - "value": "蚵仔煎", - "label": "蚵仔煎" - }, - { - "value": "龙须面", - "label": "龙须面" - }, - { - "value": "北京烤鸭", - "label": "北京烤鸭" + "FontSize": 13.333333333333332, + "Bold": false, + "Height": 32.0, + "IconHeight": 14.0, + "IconWidth": 14.0 } - ], - "bindingOptions": { - "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "项目表", - "BindingInfos": [ - { - "GUID": "7c5a1976-5bfa-438d-bc65-35efbe1eadb7", - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "ID", - "GUID": "784b8e78-f46c-4e80-81c6-3ba6782c2707" - }, - "ColumnName": "value" - }, - { - "GUID": "0c5d6f54-4a63-4004-a3a7-0f02cbea3d57", - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目名称", - "GUID": "be80e44c-eebf-40b1-8c35-ce5b62403bd5" - }, - "ColumnName": "label" - } - ], - "CustomColumns": [] - }, - "placeholder": "请选择", - "noDataText": "无数据", - "multiple": true, - "collapseTags": true, - "filterable": true, - "filterInServerOptions": { - "matchMethod": "contains", - "loadingText": "加载中" - }, - "noMatchText": "无匹配数据", - "clearable": true + ] } }, - "3,18": { + "3,3": { "CellType": { "$type": "ElementUI.DatePickerCellType, ElementUI", "CommandList": [ @@ -354,16 +377,16 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=个人工时首页!S4" + "SerializeProperty": "=付款凭证管理!D4" }, "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", "MethodName": "GetSelectedRange", "RetrunParamNames": { "StartValue": { - "SerializeProperty": "=个人工时首页!开始日期" + "SerializeProperty": "=付款凭证管理!开始日期" }, "EndValue": { - "SerializeProperty": "=个人工时首页!结束日期" + "SerializeProperty": "=付款凭证管理!结束日期" } } } @@ -417,148 +440,144 @@ "ElTableName": "EL表格1", "bindingOptions": { "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "View_任务工时统计", + "TableName": "付款凭证表", "BindingInfos": [ { - "GUID": "b116312e-7c44-4481-849a-029ee025a685", + "GUID": "2fca7bb0-5f4e-4038-933f-ba3ca08a4b2a", "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "日期", - "GUID": "4782ffb3-437b-4b7f-8b9f-2446e01d4c70" + "TableName": "付款凭证表", + "ColumnName": "ID", + "GUID": "57742e27-bd8f-459e-bcf2-21ebded111f8" }, - "ColumnName": "日期" + "ColumnName": "ID" }, { - "GUID": "9ee7b453-83ce-4c08-bf6c-e0d498b37b89", + "GUID": "30e535b3-30a1-4447-bb91-a25dac3b03b0", "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "项目ID", - "GUID": "c8b3b20e-c088-4234-8c38-443315de0cd3", - "RelationBinding": { - "RelatedTable": "项目表", - "RelatedColumn": "ID", - "DisplayColumn": "项目名称" + "TableName": "付款凭证表", + "ColumnName": "付款日期", + "GUID": "7e1d9241-ef04-4008-8033-9f4db310a277" + }, + "ColumnName": "付款日期" + }, + { + "GUID": "e8a35d58-17c9-4b00-9620-bc2e169437b5", + "BindingInfo": { + "TableName": "付款凭证表", + "ColumnName": "经手人", + "GUID": "5207407b-ccb4-4e13-a518-109d7d12d612", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 } }, - "ColumnName": "项目名称" + "ColumnName": "经手人_全名" }, { - "GUID": "718d6df0-4cb5-4ae9-9a06-bc0da11ff52e", + "GUID": "4e0e52fe-c7e9-44ba-97a2-eaa87c1ee017", "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "任务ID", - "GUID": "d856fe76-ad62-4782-b8b5-8cd6997532fc", + "TableName": "付款凭证表", + "ColumnName": "付款金额", + "GUID": "6c9cd365-275f-4781-977a-4664a0bc60c1" + }, + "ColumnName": "付款金额" + }, + { + "GUID": "65aeca2e-20b6-41cf-bac8-9a39eb800393", + "BindingInfo": { + "TableName": "付款凭证表", + "ColumnName": "付款科目", + "GUID": "c2f0c210-e07f-4d2f-96fa-18dfe2c41248" + }, + "ColumnName": "付款科目" + }, + { + "GUID": "cca19391-a166-41e7-97f3-315ec408bb73", + "BindingInfo": { + "TableName": "付款凭证表", + "ColumnName": "备注", + "GUID": "29fc391d-0c3b-41e6-9846-5976d016dc6b" + }, + "ColumnName": "备注" + }, + { + "GUID": "b62e2394-7246-478f-a822-58ddc9e0dee0", + "BindingInfo": { + "TableName": "付款凭证表", + "ColumnName": "收款人", + "GUID": "42ec0a71-cf2d-45c8-8f81-626d4fdd2308" + }, + "ColumnName": "收款人" + }, + { + "GUID": "b39096fa-eba6-4682-84d2-3ddd3d3ad83a", + "BindingInfo": { + "TableName": "付款凭证表", + "ColumnName": "户名", + "GUID": "3757cebf-fdf2-4735-a438-a6b914a31a10" + }, + "ColumnName": "户名" + }, + { + "GUID": "63339d42-568e-4d4b-8a45-c10a587d05f8", + "BindingInfo": { + "TableName": "付款凭证表", + "ColumnName": "卡号", + "GUID": "69ec6bec-61a6-4131-b864-030977764ddc" + }, + "ColumnName": "卡号" + }, + { + "GUID": "16df5807-7b62-4c7f-9adf-1df7f96fe784", + "BindingInfo": { + "TableName": "付款凭证表", + "ColumnName": "开户行", + "GUID": "37cde829-0e8b-4d37-8142-3602f345980e" + }, + "ColumnName": "开户行" + }, + { + "GUID": "b9a2b9d6-d1ff-4d24-88a5-ed28dc608957", + "BindingInfo": { + "TableName": "付款凭证表", + "ColumnName": "流程实例ID", + "GUID": "222a2fd7-4f8f-45d2-82bf-7e8d9547fea6", "RelationBinding": { - "RelatedTable": "任务平行视图", - "RelatedColumn": "ID", - "DisplayColumn": "任务名称" + "RelatedTable": "ACT_HI_PROCINST_View", + "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": "a958bb4c-a4cd-4a56-b7a0-89a6e4fc5f51" - }, - "ColumnName": "核定工时" - }, - { - "GUID": "bcb46917-c728-4c59-9aa6-d08fcd24f112", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "核定收益", - "GUID": "eeb3851c-bdb9-4290-ab51-4712534c1ebd" - }, - "ColumnName": "核定收益" + "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" + "TableName": "付款凭证表", + "ColumnName": "付款日期", + "GUID": "df10fea4-3897-4c6f-bbaa-a0476328fb4b" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=个人工时首页!开始日期" + "SerializeProperty": "=付款凭证管理!开始日期" } }, { "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", "CompareType": 5, "ColumnBindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "日期", - "GUID": "0d57eb05-081c-4efe-8df3-364fe50d139f" + "TableName": "付款凭证表", + "ColumnName": "付款日期", + "GUID": "44a93365-dc02-49ca-84ea-8ddae6f98b88" }, "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" + "SerializeProperty": "=付款凭证管理!结束日期" } } ] @@ -568,9 +587,9 @@ "OrderByColumns": [ { "ColumnBindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "日期", - "GUID": "6f82439c-f2fb-44f8-bd7a-40231875eaee" + "TableName": "付款凭证表", + "ColumnName": "付款日期", + "GUID": "32bcbe5a-e2ec-4b49-838b-42e980257fe6" }, "Order": 1 } @@ -590,8 +609,10 @@ "type": "Default", "tagType": "info", "imgType": "cover", + "resizable": false, + "showOverflowTooltip": false, "hide": true, - "key": "b1ad55c6-3a82-440f-83f2-fd727ee98d7b", + "key": "1c739f82-0525-4eef-802a-ef9aecba3559", "UIPermissions": [ { "Scope": 1, @@ -603,31 +624,10 @@ }, { "$type": "ElementUI.ColumnSetting, ElementUI", - "dataColumnName": "日期", - "label": "日期", + "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": "项目名称", + "width": 150, "align": "center", "headerAlign": "center", "colfixed": "false", @@ -635,7 +635,7 @@ "tagType": "info", "imgType": "cover", "showOverflowTooltip": false, - "key": "4c7ae872-3b0f-448a-a727-232c196df248", + "key": "0e2215cf-e59e-48a5-9c31-183a72e3eea5", "UIPermissions": [ { "Scope": 1, @@ -647,8 +647,8 @@ }, { "$type": "ElementUI.ColumnSetting, ElementUI", - "dataColumnName": "任务名称", - "label": "任务名称", + "dataColumnName": "经手人_全名", + "label": "经手人", "align": "center", "headerAlign": "center", "colfixed": "false", @@ -656,7 +656,7 @@ "tagType": "info", "imgType": "cover", "showOverflowTooltip": false, - "key": "c9a8a542-113c-4f24-aece-fc0c37c6f4e0", + "key": "e0678c8d-41af-4c1e-b1b2-451e79571ef9", "UIPermissions": [ { "Scope": 1, @@ -668,8 +668,8 @@ }, { "$type": "ElementUI.ColumnSetting, ElementUI", - "dataColumnName": "时薪单价", - "label": "时薪单价", + "dataColumnName": "付款金额", + "label": "付款金额", "formatStr": "¥#,##0.00_)", "align": "center", "headerAlign": "center", @@ -678,7 +678,7 @@ "tagType": "info", "imgType": "cover", "showOverflowTooltip": false, - "key": "deebda19-9377-420c-8169-56dc5a370f27", + "key": "9e30cc77-052f-4412-9a0e-26c31a20512d", "UIPermissions": [ { "Scope": 1, @@ -690,9 +690,28 @@ }, { "$type": "ElementUI.ColumnSetting, ElementUI", - "dataColumnName": "提成系数", - "label": "提成系数", - "formatStr": "0%", + "dataColumnName": "付款科目", + "label": "付款科目", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "key": "b75c2d53-4a28-49b3-898e-37496a33309e", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "收款人", + "label": "收款人", "align": "center", "headerAlign": "center", "colfixed": "false", @@ -700,7 +719,7 @@ "tagType": "info", "imgType": "cover", "showOverflowTooltip": false, - "key": "ff3e6b9a-2bd6-4075-ac20-3f3ae094e8d2", + "key": "9eeb4dbb-a043-4abd-b730-7eccf97a0d85", "UIPermissions": [ { "Scope": 1, @@ -712,8 +731,8 @@ }, { "$type": "ElementUI.ColumnSetting, ElementUI", - "dataColumnName": "计划工时", - "label": "计划工时", + "dataColumnName": "户名", + "label": "户名", "align": "center", "headerAlign": "center", "colfixed": "false", @@ -721,7 +740,7 @@ "tagType": "info", "imgType": "cover", "showOverflowTooltip": false, - "key": "a84eb86c-d2e0-4fed-9eda-e3a0e994ca78", + "key": "c40280e3-31fe-4d27-952d-a77fef90a8e5", "UIPermissions": [ { "Scope": 1, @@ -733,16 +752,15 @@ }, { "$type": "ElementUI.ColumnSetting, ElementUI", - "dataColumnName": "上报工时", - "label": "上报工时", + "dataColumnName": "卡号", + "label": "卡号", "align": "center", "headerAlign": "center", "colfixed": "false", "type": "Default", "tagType": "info", "imgType": "cover", - "showOverflowTooltip": false, - "key": "d5b7a859-9718-48c3-90f4-222774397c2a", + "key": "846003de-c170-41e1-8068-197790f08470", "UIPermissions": [ { "Scope": 1, @@ -754,16 +772,15 @@ }, { "$type": "ElementUI.ColumnSetting, ElementUI", - "dataColumnName": "核定工时", - "label": "核定工时", + "dataColumnName": "开户行", + "label": "开户行", "align": "center", "headerAlign": "center", "colfixed": "false", "type": "Default", "tagType": "info", "imgType": "cover", - "showOverflowTooltip": false, - "key": "f11b3f6f-0e50-4a53-9ac1-5d4c07de02ed", + "key": "1e18d4ea-906b-44aa-9eef-e29b2cae4c0d", "UIPermissions": [ { "Scope": 1, @@ -775,16 +792,15 @@ }, { "$type": "ElementUI.ColumnSetting, ElementUI", - "dataColumnName": "状态", - "label": "结算状态", + "dataColumnName": "备注", + "label": "备注", "align": "center", "headerAlign": "center", "colfixed": "false", - "type": "Tag", + "type": "Default", "tagType": "info", "imgType": "cover", - "showOverflowTooltip": false, - "key": "fe54e047-6ca4-42d8-9e50-c9fd96fc3545", + "key": "efbf35a1-18b9-48ab-a316-35d82a645f69", "UIPermissions": [ { "Scope": 1, @@ -796,17 +812,15 @@ }, { "$type": "ElementUI.ColumnSetting, ElementUI", - "dataColumnName": "核定收益", - "label": "核定收益", - "formatStr": "¥#,##0.00_)", + "dataColumnName": "当前节点", + "label": "当前节点", "align": "center", "headerAlign": "center", "colfixed": "right", - "type": "Default", + "type": "Tag", "tagType": "info", "imgType": "cover", - "showOverflowTooltip": false, - "key": "7842b8cd-ce2c-4898-bdc9-6280e89401b7", + "key": "6523066c-b27a-44a8-a2af-4a1fbf7829f1", "UIPermissions": [ { "Scope": 1, @@ -817,6 +831,7 @@ ] } ], + "showActionButtons": true, "actionButtons": [ { "$type": "ElementUI.ActionButton, ElementUI", @@ -835,34 +850,66 @@ } ], "type": "button", - "Name": "编辑", - "shape": "default" - }, - { - "$type": "ElementUI.ActionButton, ElementUI", - "UIPermissions": [ - { - "Scope": 2, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] + "Name": "查看", + "shape": "default", + "Commands": { + "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", + "Commands": [ + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "付款凭证表", + "ColumnName": "ID", + "GUID": "435efa4e-2fca-4d63-8512-9e3a88defb0f" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=付款凭证管理!行数据.ID" + } + } + }, + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "付款凭证详情", + "LoadBindingDataOption": 1 + } + ], + "ParamProperties": { + "dataRow": "行数据" } - ], - "type": "button", - "Name": "删除", - "styleType": "Accent 5", - "shape": "default" + } } ], + "operationColumnWidth": 100, "sumText": "合计", "size": "default" } + }, + "10,9": { + "CellType": { + "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", + "Caption": "显示搜索栏", + "Style": 1, + "CommandList": [ + { + "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=付款凭证管理!3:6" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=付款凭证管理!显示搜索栏" + } + } + ] + } + ] + } } }, "StyleDatas": { @@ -871,14 +918,14 @@ "FontFamily": 0, "FontSize": 18.666666666666664 }, + { + "FontFamily": 0 + }, { "FontFamily": 0, "FontSize": 13.333333333333332, "Formatter": 1 }, - { - "FontFamily": 0 - }, { "FontFamily": 0, "FontSize": 13.333333333333332 @@ -902,13 +949,40 @@ }, "CellStyles": { "1,1": 0, - "3,1": 1, - "3,2": 2, + "1,19": 1, + "1,20": 1, + "1,21": 1, + "1,22": 1, + "1,23": 1, + "1,24": 1, + "1,25": 1, + "1,26": 1, + "1,27": 1, + "1,28": 1, + "1,29": 1, + "1,30": 1, + "1,31": 1, + "1,32": 1, + "1,33": 1, + "1,34": 1, + "3,1": 2, + "3,2": 1, "3,3": 3, - "3,15": 2, + "3,4": 1, + "3,5": 1, + "3,6": 1, + "3,7": 1, + "3,8": 1, + "3,9": 1, + "3,10": 1, + "3,11": 1, + "3,12": 1, + "3,13": 1, + "3,14": 1, + "3,15": 1, "3,16": 1, - "3,17": 2, - "3,18": 3, + "3,17": 1, + "3,18": 1, "4,1": 3, "4,2": 3, "4,3": 3, @@ -933,16 +1007,16 @@ "4,22": 3, "4,23": 3, "4,24": 3, - "4,25": 2, + "4,25": 1, "4,26": 3, "4,27": 3, "4,28": 3, "4,29": 3, "5,1": 3, - "5,2": 2, - "5,3": 2, + "5,2": 1, + "5,3": 1, "5,4": 3, - "5,5": 2, + "5,5": 1, "5,6": 3, "5,7": 3, "5,8": 3, @@ -962,7 +1036,7 @@ "5,22": 3, "5,23": 3, "5,24": 3, - "5,25": 2, + "5,25": 1, "5,26": 3, "5,27": 3, "5,28": 3, @@ -1000,39 +1074,39 @@ "6,31": 4, "6,32": 4, "6,33": 4, - "7,1": 2, - "7,2": 2, - "7,3": 2, - "7,4": 2, - "7,5": 2, - "7,6": 2, - "7,7": 2, - "7,8": 2, - "7,9": 2, - "7,10": 2, - "7,11": 2, - "7,12": 2, - "7,13": 2, - "7,14": 2, - "7,15": 2, - "7,16": 2, - "7,17": 2, - "7,18": 2, - "7,19": 2, - "7,20": 2, - "7,21": 2, - "7,22": 2, - "7,23": 2, - "7,24": 2, - "7,25": 2, - "7,26": 2, - "7,27": 2, - "7,28": 2, - "7,29": 2, - "7,30": 2, - "7,31": 2, - "7,32": 2, - "7,33": 2 + "7,1": 1, + "7,2": 1, + "7,3": 1, + "7,4": 1, + "7,5": 1, + "7,6": 1, + "7,7": 1, + "7,8": 1, + "7,9": 1, + "7,10": 1, + "7,11": 1, + "7,12": 1, + "7,13": 1, + "7,14": 1, + "7,15": 1, + "7,16": 1, + "7,17": 1, + "7,18": 1, + "7,19": 1, + "7,20": 1, + "7,21": 1, + "7,22": 1, + "7,23": 1, + "7,24": 1, + "7,25": 1, + "7,26": 1, + "7,27": 1, + "7,28": 1, + "7,29": 1, + "7,30": 1, + "7,31": 1, + "7,32": 1, + "7,33": 1 }, "SheetStyle": { "FontFamily": 0 @@ -1041,13 +1115,13 @@ "Spans": [ "5,1,1,2", "5,4,1,2", - "3,1,1,2", - "3,3,1,12", - "3,16,1,2", - "3,18,1,16", "10,1,1,4", "10,5,1,4", - "8,1,1,34" + "8,1,1,34", + "3,1,1,2", + "3,3,1,16", + "1,19,1,16", + "10,9,1,4" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1084,11 +1158,15 @@ "CustomNames": [ { "Name": "开始日期", - "Formula": "个人工时首页!$B$11" + "Formula": "付款凭证管理!$B$11" }, { "Name": "结束日期", - "Formula": "个人工时首页!$F$11" + "Formula": "付款凭证管理!$F$11" + }, + { + "Name": "显示搜索栏", + "Formula": "付款凭证管理!$J$11" } ] -}//5NCpcG9Nfj/IU7uilvk+XDf20Py0xSxKLXLChSUhA0qvlB/pn8wXBGY6YE3HztLghqE5QMqBnO+YKaa70eh/zc38Zo8L6wHcgxxx0DgntZHxP8oDOfUwlLIC/jH20xgfRuhBMnrvzdq91QEi5gN0otzJ63dKUFGjw4RZuaWflTmi/4XAImXt++sDVJSZnoW3ZS+1yUO9bf3HoDSg3w49Qbix5To+ULXGRPVyIUCHub7D8pDDA3kcxP/WComJOLKrMW50Dae8XstY0rhzg5ZoyRaiIKUy+yfuQgTRnCUMfGRDr2HEtKsJNAYzs8TDYHdeAfRJ9VE+J79THPqv9hjMLOWKgsoUFDeZNyDiFDAFzB8isGRWg7mEw3YjkIX9MVzgYLPAfPWuQp/xJks53teeJLXwq0KtYGS8Y0PfI9VSiKEVqjVIHjyamUZ9zytN+fiUOlG9M0hFnlBdTUsA+wGAa1X7ssZ+qokTZLqHcT7hebmLz3ZvPFPT9m/AOkqv7xwzn7w4U44CiapuV3kSW+KmVLvYm7AIBDTr0kkF9ywDYzialQ7oDp/aBENMW2TiQRsvXkIeNukGXuUbQMK9SIkPh/6P3Ksv0V/4fibQSZH6aVFdguUOoADumWsz/Ndo96KFn7PQQM7K3bX1uf9+KsDhJf87JLr1KYti8FK4Dht8fOMHovCk//0KkR3u2iQ8U5RZwKZsyG7TLsmV7esRrXjw4BJEgTnE0HNhGwVHMS5vmhUzg0mQOPjYY7LbzbwcF9qZYDvM6DLekApiEIoB6nT1smYpjL6sLaqRjLerlC1Oiiwdo90dKRsi2TYJwKs2RP2YUN8iHZz07ZPvKvtcAZExFOuD2+GhnTUPElpRbpx7kPLnyuh1u3wS2eK2bVU4Mbkne1Khn5zPZ8QfsuvI4o/OeQ==|920 \ No newline at end of file +}//BLZa8L0OOMiGcyykLzeBPnAC/KC9bvk2Q2yJX+XxCIKU6wm6XNdXpMRcp+mEqgUnC+77Im3RswGLGwsMnakGu0y9AZ5yJ+RO9Kxk+ejdS70fUck4KeMukmckhY0h3Ku2vSzcybRgw0GE0EHlHYaSmfaZFoqFFAkqjb1UxRA0Uuzbk8x/kKfjLhizY5GI+7ROCmgdUvHrRd4iztY3jCKxoyMpDOVLlF66zDt9BWFh4WDjo7RwulAKhbrVKIds/YylDV27B29AtgLP2sT47Jzpjv31vLhhr+QuiSDdLKSzGkfW4IyfipbgEWc7xLCnYo2gBppo5KPoXsGfN/AhEcDRnWS4Km6batfir/26yfqd51cvdU8NSKTc1YPap/+XCCls0qymUTWjtZjLFApoqDQ0UEGjgNNeeRnieP0s+GOJd1Yy+cGI7sIkrefBEKSDZOz7kvgWoT/jkv1IvLB9psH43b/QH4be53z3s9rr+t9SDwDLngJOKxAF2IgwLpw8+7ubWmjoQjh+hvJQkb1MDId44OvZu/lxwvjrKWZOcxZA0e+z1A0e+SujvsfGxXK28JDWpWAqjss1oGnoAD7XsC2nuv97m+I8GAYthKCgw5JukkzpoiFmrDmfUTkUKi/Qh9fhunxLJTH/6nJCXNZfyWDVCACLmM0uTFDneWlEMI5xNFw0MwXiUqlmEnFNygf5mIXxvxkq/VxRvHUjDcmTfg+2vEh/e4teEY/tSWxQFAC/Jm5Vms3owfCptA8u66k16htMUplNg7rLwIDL/654NdXq8eBkYmvDnv1UFfa1/CLcTyuM81RvyqnH7Ys1Mxv//A6vslnUOyTgBxcnWWmgnsJXYkjaT5g1171Y5jx6tIN0vvfjxFA8a+0vt3iJTBQIXZvqmUtX5tUVvQVx0I+3vINsaQ==|920 \ No newline at end of file diff --git a/Pages/财务/付款凭证管理.rd b/Pages/财务/付款凭证管理.rd new file mode 100644 index 00000000..e2623126 --- /dev/null +++ b/Pages/财务/付款凭证管理.rd @@ -0,0 +1,19 @@ +{ + "PageType": 0, + "ColumnCount": 36, + "RowCount": 11, + "CustomNames": [ + { + "Name": "开始日期", + "Formula": "付款凭证管理!$B$11" + }, + { + "Name": "结束日期", + "Formula": "付款凭证管理!$F$11" + }, + { + "Name": "显示搜索栏", + "Formula": "付款凭证管理!$J$11" + } + ] +} \ No newline at end of file diff --git a/Pages/财务/付款凭证详情.json b/Pages/财务/付款凭证详情.json new file mode 100644 index 00000000..d80160bb --- /dev/null +++ b/Pages/财务/付款凭证详情.json @@ -0,0 +1,996 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 173.0 + } + }, + "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "20": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "21": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "22": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "IsHidden": true + } + }, + "23": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "IsHidden": true + } + } + }, + "InLogicalVisibleIndexes": [ + 22, + 23 + ], + "Count": 24, + "DefaultSize": 32.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "20": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "21": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "22": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "23": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + } + }, + "Count": 24, + "DefaultSize": 32.0 + }, + "Values": { + "1,1": "日期", + "1,13": "经手人", + "4,1": "金额", + "4,13": "科目", + "7,1": "收款人", + "7,13": "户名", + "10,1": "开户行", + "10,13": "户名", + "13,1": "备注", + "16,1": "凭证附件", + "20,15": "关闭", + "20,20": "保存" + }, + "AttachInfos": { + "2,1": { + "BindingInfo": { + "TableName": "付款凭证表", + "ColumnName": "付款日期", + "GUID": "5afbb5a2-d909-4e04-a4c4-1aef7027866d" + }, + "CellType": { + "$type": "ElementUI.DatePickerCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "date", + "startPlaceholder": "开始日期", + "rangeSeparator": "至", + "endPlaceholder": "结束日期", + "firstDayOfWeek": 1, + "DefautWeekFormat": "yyyy 第 WW 周" + } + }, + "2,13": { + "BindingInfo": { + "TableName": "付款凭证表", + "ColumnName": "经手人", + "GUID": "620a9f9e-2fda-4a77-b947-3df3ffc70a67" + }, + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "用户信息视图", + "BindingInfos": [ + { + "GUID": "97e52f4c-64fb-4b1e-a5c1-3d559403a9e1", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "594d07a2-0c2e-4e1d-8a46-ecdc9dee0f93" + }, + "ColumnName": "value" + }, + { + "GUID": "1bae1bb8-6434-43fb-b260-61058a8a2be2", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "d4a2bfc3-15c4-4b4c-add7-1a1fb44eb972" + }, + "ColumnName": "label" + } + ], + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" + } + }, + "5,1": { + "BindingInfo": { + "TableName": "付款凭证表", + "ColumnName": "付款金额", + "GUID": "d3b721ff-95a3-4fef-90b5-89c8f254c179" + }, + "CellType": { + "$type": "ElementUI.InputNumberCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "step": 1, + "controls": false + } + }, + "5,13": { + "BindingInfo": { + "TableName": "付款凭证表", + "ColumnName": "付款科目", + "GUID": "e8d66eb6-8832-4094-abae-f15277fd1312" + }, + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "DefaultValue": "工资", + "options": [ + { + "value": "工资", + "label": "工资" + }, + { + "value": "报销", + "label": "报销" + }, + { + "value": "其他", + "label": "其他" + } + ], + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" + }, + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + "8,1": { + "BindingInfo": { + "TableName": "付款凭证表", + "ColumnName": "收款人", + "GUID": "7d4a9d92-3b66-4321-b39c-a7044e8acbbc" + }, + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "用户信息视图", + "BindingInfos": [ + { + "GUID": "97e52f4c-64fb-4b1e-a5c1-3d559403a9e1", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "726959ad-125f-4d81-9516-97901f063b5f" + }, + "ColumnName": "value" + }, + { + "GUID": "1bae1bb8-6434-43fb-b260-61058a8a2be2", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "4370ddee-871d-43d4-8ffc-aea2cf113c06" + }, + "ColumnName": "label" + } + ], + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" + } + }, + "8,13": { + "BindingInfo": { + "TableName": "付款凭证表", + "ColumnName": "户名", + "GUID": "98e96d8f-ff05-4fd4-940a-3a6302d25108" + }, + "CellType": { + "$type": "ElementUI.InputCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "text", + "resize": "none" + } + }, + "11,1": { + "BindingInfo": { + "TableName": "付款凭证表", + "ColumnName": "开户行", + "GUID": "f1985971-5e01-4ffd-b6ff-bf932dfd368b" + }, + "CellType": { + "$type": "ElementUI.InputCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "text", + "resize": "none" + } + }, + "11,13": { + "BindingInfo": { + "TableName": "付款凭证表", + "ColumnName": "卡号", + "GUID": "7c8e7492-4168-4938-81ad-a9c546356abe" + }, + "CellType": { + "$type": "ElementUI.InputCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "text", + "resize": "none" + } + }, + "14,1": { + "BindingInfo": { + "TableName": "付款凭证表", + "ColumnName": "备注", + "GUID": "baff4cb8-2054-4827-b3de-66f30410880b" + }, + "CellType": { + "$type": "ElementUI.InputCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "text", + "resize": "none" + } + }, + "17,1": { + "BindingInfo": { + "TableName": "付款凭证表", + "ColumnName": "付款凭证", + "GUID": "ca7c8f59-0b6c-4dcb-9d6d-de2cf3cdd6b0" + }, + "CellType": { + "$type": "ElementUI.UploadCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "accept": "", + "buttonText": "点击上传", + "tipText": "只能上传jpg/png文件" + } + }, + "20,15": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon" + } + ], + "Text": "关闭", + "TemplateKey": "_RS_Information3" + } + }, + "20,20": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "付款凭证表", + "ColumnName": "ID", + "GUID": "95597ea4-e23d-44c7-ae08-28fdc0a9e250" + } + }, + "value": "%Null%" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "付款凭证表", + "UpdateType": "add", + "ShowConfirm": false + } + ], + "ID": "9685347b-ddf7-45f8-9a25-558c4ad981b8" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "付款凭证表", + "ShowConfirm": false + } + ], + "ID": "f1a78477-7ab4-4be6-adec-6902c2c4b064" + } + ] + }, + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": "保存成功" + }, + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ReloadData": true + } + ], + "Text": "保存", + "TemplateKey": "_RS_Main1", + "Icon": { + "Name": "Application/067_save_4.svg", + "BuiltIn": true, + "Color": "Background 1", + "UseCellTypeForeColor": true + }, + "IconSize": 14.0 + } + }, + "22,1": { + "BindingInfo": { + "TableName": "付款凭证表", + "ColumnName": "ID", + "GUID": "cd93a317-b92e-4eb1-ba42-8993507892a8" + } + } + }, + "StyleDatas": { + "Styles": [ + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Formatter": 1 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332 + }, + { + "FontFamily": 0, + "FontSize": 14.666666666666666 + }, + { + "BorderTop": 0 + } + ], + "Types": { + "Strs": [ + "Body", + "[AUTO]General", + "Background 1 -5" + ], + "Borders": [ + { + "Color": 2 + } + ] + }, + "CellStyles": { + "4,1": 0, + "4,13": 0, + "5,1": 1, + "5,13": 2, + "5,23": 1, + "7,1": 0, + "7,2": 1, + "7,3": 1, + "7,4": 1, + "7,5": 1, + "7,6": 1, + "7,7": 1, + "7,8": 1, + "7,9": 1, + "7,10": 1, + "7,13": 0, + "7,14": 1, + "7,15": 1, + "7,16": 1, + "7,17": 1, + "7,18": 1, + "7,19": 1, + "7,20": 1, + "7,21": 1, + "7,22": 1, + "8,1": 1, + "8,13": 1, + "10,1": 0, + "10,2": 1, + "10,3": 1, + "10,4": 1, + "10,5": 1, + "10,6": 1, + "10,7": 1, + "10,8": 1, + "10,9": 1, + "10,10": 1, + "10,13": 0, + "10,14": 1, + "10,15": 1, + "10,16": 1, + "10,17": 1, + "10,18": 1, + "10,19": 1, + "10,20": 1, + "10,21": 1, + "10,22": 1, + "11,1": 1, + "11,13": 1, + "11,14": 1, + "11,15": 1, + "11,16": 1, + "11,17": 1, + "11,18": 1, + "11,19": 1, + "11,20": 1, + "11,21": 1, + "11,22": 1, + "13,1": 0, + "13,2": 1, + "13,3": 1, + "13,4": 1, + "13,5": 1, + "13,6": 1, + "13,7": 1, + "13,8": 1, + "13,9": 1, + "13,10": 1, + "14,1": 1, + "16,0": 1, + "16,1": 0, + "16,2": 1, + "16,3": 1, + "16,4": 1, + "16,5": 1, + "16,6": 1, + "16,7": 1, + "16,8": 1, + "16,9": 1, + "16,10": 1, + "16,11": 1, + "16,12": 1, + "16,13": 1, + "16,14": 1, + "16,15": 1, + "16,16": 1, + "16,17": 1, + "16,18": 1, + "16,19": 1, + "16,20": 1, + "16,21": 1, + "16,22": 1, + "16,23": 1, + "19,1": 3, + "19,2": 3, + "19,3": 3, + "19,4": 3, + "19,5": 3, + "19,6": 3, + "19,7": 3, + "19,8": 3, + "19,9": 3, + "19,10": 3, + "19,11": 3, + "19,12": 3, + "19,13": 3, + "19,14": 3, + "19,15": 3, + "19,16": 3, + "19,17": 3, + "19,18": 3, + "19,19": 3, + "19,20": 3, + "19,21": 3, + "19,22": 3, + "20,15": 0, + "20,16": 1, + "20,17": 1, + "20,18": 1, + "20,19": 1, + "20,20": 0, + "20,21": 1, + "20,22": 1 + }, + "SheetStyle": { + "FontFamily": 0, + "FontSize": 13.333333333333332 + } + }, + "Spans": [ + "2,1,1,10", + "5,1,1,10", + "2,13,1,10", + "5,13,1,10", + "8,1,1,10", + "8,13,1,10", + "11,13,1,10", + "11,1,1,10", + "14,1,1,22", + "17,1,1,22", + "20,20,1,3", + "20,15,1,3", + "22,1,1,3" + ], + "PageInfo": { + "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + }, + "RowBreakLines": [], + "RepeatRangeSettings": [] + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + } +}//TlWIzCAc4NVhAVyWiYF0gqW925zfWRwfKIGOWnvQeP+6nHiHTbg6sR9rcEC5w76pURIYygrcLU+kMrNlFV+7sKPk7MClTwbh4Lb6VCaYM1r0hmVD2IVl1RMpEsbX0+VDdeEKcOrxz+3sau+zP7gqcCywuInqmCzuQoOe+0v9WIJBl7yunm6qebEBflG5YH7rEyqWJtReGEZaPCaVzKxKUjjooNnRzRi8lw5tO8yt960umOfaMy0cfYosUXcvsUgBgrUgSnsztTTlkubmnSZXrgx/FmZHwvDWiALJPNQRGjrDXIWVwS9aW1YZzx6ocjBVADtsvEIdrJI+hthyQzsblnm9KuOz1+uDmZaZuBkDQSZTzYmFfN35VPTkaQG3epViK+/p6lw1sOKQQl8V88vrZvYiR74xBqNSm7bFqzwU0pNj449qnJvd1Mjos80kG8Pddu18Mqo+qIAhACyKUhY8TuH4aDLDIpzzOirW2ASsMKpZbEX9DSrrhtN3ag8dVdXF8179v4ZVFNuL3PyhYQPb/AFWbmT+7mUq/gH7JXdu5FJLZ9R56dF84QMcfP+SWE1F4SuE9ahcg7tDnn7PV97hv4vzj7z2TtvMPLsae1WNHEyxdPIe2GTGXQr9IZN5xNMNUfb6qwxlBLU68GVPxErgZCe1NAe0YhjC5ivAzTvTDMIeklz/gjCQPhTd9lPRVJkoBkU6obPsPGt4zqGpMze/vIYod0tKMkbmRnWYW8VzL9yI3gg3H/bCMKY5mV/22KyPYYzv1t2aOyJ8nD7Qu0yKSgfTf3rPGlxOhkfkhTaYSptE0zBRwrmr/DV7Qz2e51T1Gdz+Hw0FO1XVtq7yQvhZ5/16YohSKrYO3emEuXuGlwtXY2bYw8ndRoDyB6AXTZ+JpHOFY7vzIkCc+tbAJnllmQ==|920 \ No newline at end of file diff --git a/Pages/财务/付款凭证详情.rd b/Pages/财务/付款凭证详情.rd new file mode 100644 index 00000000..14c4f5c4 --- /dev/null +++ b/Pages/财务/付款凭证详情.rd @@ -0,0 +1,5 @@ +{ + "PageType": 0, + "ColumnCount": 24, + "RowCount": 24 +} \ No newline at end of file diff --git a/ServerCommands/收益/删除请款单.json b/ServerCommands/收益/删除请款单.json index 8f92c3b7..6f1d2127 100644 --- a/ServerCommands/收益/删除请款单.json +++ b/ServerCommands/收益/删除请款单.json @@ -232,7 +232,7 @@ "OperateType": 301 } ], - "ID": "89ac583d-d486-45cf-bb4d-563fc03d2bfd" + "ID": "f357bd91-1f01-474f-9ec1-82d772447a43" } ] }, @@ -242,7 +242,7 @@ "Message": "请款单已删除" } ], - "ID": "5eb6a93b-0139-4add-8899-3ae38f9c8333" + "ID": "e6d32f9c-5465-49ea-85ac-666800b524c4" }, { "CommandList": [ @@ -252,12 +252,12 @@ "Message": "请款单未终止或已结款，无法撤销！" } ], - "ID": "1246b254-4f7e-4fef-8ccf-c3404a95f9f1" + "ID": "1c5df80f-d9b7-424c-8922-2e69331771fd" } ] } ], - "ID": "bb6ffe2b-cdfa-461b-b11c-07c9e6339219" + "ID": "5f75d0b7-5f5b-4b4f-a4c3-75c592d1512d" }, { "CommandList": [ @@ -267,7 +267,7 @@ "Message": "请款单不存在" } ], - "ID": "4081b537-d2ce-4452-aedf-c8fde875c08b" + "ID": "2ffb7070-0935-4264-af34-3106f42fb656" } ] } diff --git a/Tables/工时/View_任务工时统计.json b/Tables/工时/View_任务工时统计.json index 3a92b771..4c6c9e32 100644 --- a/Tables/工时/View_任务工时统计.json +++ b/Tables/工时/View_任务工时统计.json @@ -167,7 +167,7 @@ "IsDetailTableRelation": true }, { - "PrimaryTable": "项目表", + "PrimaryTable": "项目平行视图", "PrimaryColumn": "ID", "ForeignTable": "View_任务工时统计", "ForeignColumn": "项目ID", diff --git a/Tables/财务/付款凭证表.json b/Tables/财务/付款凭证表.json index 900b2455..33a4200e 100644 --- a/Tables/财务/付款凭证表.json +++ b/Tables/财务/付款凭证表.json @@ -56,7 +56,7 @@ "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { - "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "$type": "Forguncy.SaveLoad.UserBindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "nvarchar", "MaxLength": -1, "Name": "收款人",