From 3d6738d6fdf7847c5b12b9e24f2a4bca5593d6c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B6=85=E5=93=A5?= Date: Thu, 4 Jul 2024 10:48:20 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E5=AE=8C=E5=96=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=A1=A8=E6=9D=83=E9=99=90","MessageType":2,"Modules"?= =?UTF-8?q?:[{"State":1,"Type":7,"Name":"Table/=E4=BB=BB=E5=8A=A1=E5=B7=A5?= =?UTF-8?q?=E6=97=B6=E8=A1=A8"},{"State":1,"Type":7,"Name":"Table/?= =?UTF-8?q?=E6=B1=87=E6=8A=A5=E8=AE=B0=E5=BD=95=E8=A1=A8"},{"State":1,"Typ?= =?UTF-8?q?e":7,"Name":"Table/=E6=94=B6=E7=9B=8A=E5=8F=98=E5=8A=A8?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=A1=A8"},{"State":1,"Type":7,"Name":"Table?= =?UTF-8?q?/=E6=94=B6=E6=AC=BE=E8=B4=A6=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E8=A1=A8"},{"State":1,"Type":7,"Name":"Table/=E6=94=B6?= =?UTF-8?q?=E7=9B=8A=E8=AF=B7=E6=AC=BE=E5=8D=95=E8=A1=A8"},{"State":1,"Typ?= =?UTF-8?q?e":3,"Name":"MasterPCPage/FGC=5F=E6=AF=8D=E7=89=88=E9=A1=B5"},{?= =?UTF-8?q?"State":1,"Type":11,"Name":"UserService"},{"State":1,"Type":23,?= =?UTF-8?q?"Name":"TableView/=E9=A1=B9=E7=9B=AE=E5=B9=B3=E8=A1=8C=E8=A7=86?= =?UTF-8?q?=E5=9B=BE"},{"State":1,"Type":23,"Name":"TableView/=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=B9=B3=E8=A1=8C=E8=A7=86=E5=9B=BE"}],"Version":"v1"?= =?UTF-8?q?}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 102 +++----------------------------- MasterPages/FGC_母版页.json | 95 +++++++++++++++-------------- Tables/任务/任务平行视图.json | 21 ++----- Tables/工时/任务工时表.json | 99 +++++++++++++++---------------- Tables/收益/收款账户信息表.json | 22 ++----- Tables/收益/收益变动记录表.json | 3 +- Tables/收益/收益请款单表.json | 76 +++++++++++------------- Tables/汇报/汇报记录表.json | 99 +++++++++++++++---------------- Tables/项目/项目平行视图.json | 27 +++------ UserServiceDB.sqlite3 | Bin 569344 -> 569344 bytes 10 files changed, 204 insertions(+), 340 deletions(-) diff --git a/.collaboration b/.collaboration index e0d4d2a1..fcae22d4 100644 --- a/.collaboration +++ b/.collaboration @@ -148,16 +148,7 @@ }, { "ModuleName": "Table/任务工时表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T10:47:58.7242542+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\工时\\任务工时表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Tables/流程表文件夹", @@ -262,16 +253,7 @@ }, { "ModuleName": "Table/汇报记录表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T10:47:14.3187589+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\汇报\\汇报记录表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/message_test", @@ -284,42 +266,15 @@ }, { "ModuleName": "Table/收益变动记录表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T10:46:41.5266213+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\收益\\收益变动记录表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/收款账户信息表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T10:46:26.4118972+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\收益\\收款账户信息表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/收益请款单表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T10:46:08.7863275+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\收益\\收益请款单表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/请款单状态", @@ -923,17 +878,7 @@ }, { "ModuleName": "MasterPCPage/FGC_母版页", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T10:44:25.7903686+08:00", - "ModuleType": 3, - "ToRemoveFiles": [ - "MasterPages\\FGC_母版页.json", - "MasterPages\\FGC_母版页.rd" - ] + "ModuleType": 3 }, { "ModuleName": "MasterPages/流程母版页面文件夹", @@ -1453,18 +1398,7 @@ }, { "ModuleName": "UserService", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T10:43:03.7955145+08:00", - "ModuleType": 11, - "ToRemoveFiles": [ - "UserServiceDB.sqlite3", - "CloudStorageProvider\\data.json", - "SecurityProviderV2\\data.json" - ] + "ModuleType": 11 }, { "ModuleName": "CustomLibrary", @@ -1888,16 +1822,7 @@ }, { "ModuleName": "TableView/项目平行视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T10:44:39.2915119+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\项目\\项目平行视图.json" - ] + "ModuleType": 23 }, { "ModuleName": "TableView/任务成员视图", @@ -1905,16 +1830,7 @@ }, { "ModuleName": "TableView/任务平行视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T10:45:24.1290696+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\任务\\任务平行视图.json" - ] + "ModuleType": 23 }, { "ModuleName": "Pages/任务/任务类型管理", diff --git a/MasterPages/FGC_母版页.json b/MasterPages/FGC_母版页.json index bfda3c24..7d6a920d 100644 --- a/MasterPages/FGC_母版页.json +++ b/MasterPages/FGC_母版页.json @@ -260,7 +260,8 @@ "Administrator", "项目经理", "项目总监", - "商务总监" + "商务总监", + "客服总监" ] }, { @@ -326,8 +327,6 @@ ], "CanVisitRoleList": [ "Administrator", - "项目总监", - "商务总监", "财务" ] }, @@ -1123,7 +1122,7 @@ "IsOpenInNewTab": true } ], - "ID": "ea247c42-5b24-4627-9d74-d1182a94f099" + "ID": "607e471f-ca91-47b9-b65f-af7732d7ee84" }, { "CommandList": [ @@ -1144,12 +1143,12 @@ ] } ], - "ID": "23817e92-646e-4743-a1bb-451552613d89" + "ID": "5ef2ef77-089d-47ec-84cc-007ccd756c22" } ] } ], - "ID": "6628a713-a6df-492f-a888-a94992adf709" + "ID": "3da38d98-5d08-4fa4-b112-d6afb99a3494" }, { "Condition": { @@ -1199,7 +1198,7 @@ ] } ], - "ID": "b76bdbd2-8556-4d81-9b57-45f661fb280b" + "ID": "3aaf5bc7-2e1c-4dff-b23b-cf7d37856b3c" }, { "Condition": { @@ -1233,7 +1232,7 @@ ] } ], - "ID": "ec012db8-fdae-4d36-a929-b77066ce2791" + "ID": "b80799fa-af4a-4bef-85bd-3048f27efcff" }, { "Condition": { @@ -1269,7 +1268,7 @@ ] } ], - "ID": "901f96ed-cfb6-419c-99ad-534ff6500c3a" + "ID": "17c4f6d3-aa68-464b-87ee-28d40aa801b6" }, { "Condition": { @@ -1304,17 +1303,17 @@ ] } ], - "ID": "87e15364-e083-4e7a-b9ab-6a1f3a554299" + "ID": "b6f5da0f-7a98-452f-aaa3-ab1e54d5b9ef" } ] } ], - "ID": "b6e94365-afbc-4e2e-b8ac-369f45fdf2f5" + "ID": "6d69c312-b6cd-4f3c-9132-3091dd57e729" } ] } ], - "ID": "5ca8601c-76b7-4041-bd78-4e441684ec13" + "ID": "1bfd7222-7067-4ef3-94b9-1d37cb9c9052" } ] } @@ -1327,7 +1326,7 @@ } } ], - "ID": "ea6cecf9-ca33-450e-921e-ca6a42851822" + "ID": "9aad6b14-6e82-42c7-9ac5-b4fc32491dba" }, { "Condition": { @@ -1434,7 +1433,7 @@ "IsOpenInNewTab": true } ], - "ID": "bbe39abb-d063-45c0-967d-5086dd83b161" + "ID": "32430c55-b2c7-4897-a447-6a359560b129" }, { "CommandList": [ @@ -1455,12 +1454,12 @@ ] } ], - "ID": "ef4acfde-37ee-4791-8648-e3ff2e5ac6b1" + "ID": "1f109987-1533-42eb-a8aa-6b67a54b3a70" } ] } ], - "ID": "9ca168e9-434d-4816-b07a-db2f99c8eda4" + "ID": "9a058d3c-e8a5-4d17-8481-20413ba3323d" }, { "Condition": { @@ -1510,7 +1509,7 @@ ] } ], - "ID": "78c702e4-17b3-46cb-9df2-6201d07fcbea" + "ID": "275dc669-c082-479d-9a43-6db978b0c6ea" }, { "Condition": { @@ -1544,7 +1543,7 @@ ] } ], - "ID": "0ec363d5-1c39-4827-b9d6-13b8b0f0accf" + "ID": "5f111e46-2230-475b-b816-184939409d63" }, { "Condition": { @@ -1580,7 +1579,7 @@ ] } ], - "ID": "5299acb3-0b86-4182-be1d-de7e5529e738" + "ID": "e04d8829-ba4d-4885-8b40-901d8b615749" }, { "Condition": { @@ -1615,17 +1614,17 @@ ] } ], - "ID": "ad9f0b45-1bb7-4610-ad90-8703453026cc" + "ID": "5bf5242c-9baf-4365-a66f-3820bb428e06" } ] } ], - "ID": "5a862a41-5f28-46d5-b706-f945c2c9537a" + "ID": "7eb05733-dd04-40e4-88ac-64e43bd5cc43" } ] } ], - "ID": "c6d9c53d-6bae-468b-a2e2-3c4dc2a77170" + "ID": "f085ab81-c69f-40b4-89c3-285062ed36f0" } ] } @@ -1638,7 +1637,7 @@ } } ], - "ID": "c746a8ff-4fa3-464a-b059-009f9696a5e9" + "ID": "998ac8fc-2856-4802-a64f-6bc83f45e365" }, { "Condition": { @@ -1745,7 +1744,7 @@ "IsOpenInNewTab": true } ], - "ID": "c019a1a8-68f8-46b3-8ea4-830de80b54eb" + "ID": "7ab7168d-9290-4621-a23d-15dae3a3cf79" }, { "CommandList": [ @@ -1766,12 +1765,12 @@ ] } ], - "ID": "c0bec0ed-ed48-4922-a94f-780808614905" + "ID": "4b9e9957-9a02-47f6-8679-d4efcbe6239a" } ] } ], - "ID": "b22f5309-1cec-4057-8594-8809d7ea282e" + "ID": "2c4bc69a-916c-4e10-abae-9ca588d7e30f" }, { "Condition": { @@ -1821,7 +1820,7 @@ ] } ], - "ID": "bc91cbce-7679-4a73-9642-b32f114a7bd9" + "ID": "cf9461ab-8bf7-4201-83ce-8867855f2118" }, { "Condition": { @@ -1855,7 +1854,7 @@ ] } ], - "ID": "a29608aa-5d05-4b3f-b87b-0b8492831c73" + "ID": "b7a28d09-459e-4d68-b9f8-c6db6c18d6f6" }, { "Condition": { @@ -1891,7 +1890,7 @@ ] } ], - "ID": "67018e7c-8051-4e0b-ad5c-7e945938cd1e" + "ID": "e5be36b2-03ba-468c-af9e-218f29b7b0df" }, { "Condition": { @@ -1926,17 +1925,17 @@ ] } ], - "ID": "3d820f38-555c-4d52-8e20-72518b81ee43" + "ID": "f07a4cd7-738a-4fc2-89ef-73bdeffdb7fd" } ] } ], - "ID": "7e8de023-627d-4346-b31e-76a40b476d86" + "ID": "1df5e47e-2360-4386-a079-f853be763a0a" } ] } ], - "ID": "9dc7d8f3-c0c1-40c9-9322-e1ed133ed73c" + "ID": "040c0de8-2047-4257-94ec-00c019888720" } ] } @@ -1949,7 +1948,7 @@ } } ], - "ID": "81709277-70e2-49f0-93d6-5bc8333b2577" + "ID": "11591e33-8b09-4968-866e-3c15d64cb759" }, { "Condition": { @@ -2056,7 +2055,7 @@ "IsOpenInNewTab": true } ], - "ID": "1302c230-aa4f-4752-80c4-6dc7aeeab404" + "ID": "dc1d4862-2b30-4aed-8128-ffdfdd0c6684" }, { "CommandList": [ @@ -2077,12 +2076,12 @@ ] } ], - "ID": "7f513aa3-fe1a-4ffb-906f-8c647a6cc4c9" + "ID": "9b378875-2e2b-4c30-90b1-20c96ad833c0" } ] } ], - "ID": "97e96e68-2921-476b-be4a-2ea9f91a2b62" + "ID": "4692ed4f-fd46-4b4b-ba40-f05012073b62" }, { "Condition": { @@ -2132,7 +2131,7 @@ ] } ], - "ID": "ef0d6469-24b5-4404-9472-a5f73df7b9d0" + "ID": "8e4e0302-84de-4349-9816-1d72581b51be" }, { "Condition": { @@ -2166,7 +2165,7 @@ ] } ], - "ID": "a2b68f85-5041-4c71-abf2-5aa5129c67cd" + "ID": "29836de5-b1d5-48b1-a6cd-b8b7a9b68e78" }, { "Condition": { @@ -2202,7 +2201,7 @@ ] } ], - "ID": "79e93654-eb65-4d2b-b23e-c186ad203bb9" + "ID": "31cc2d97-803f-4c75-a687-3048c015265d" }, { "Condition": { @@ -2237,17 +2236,17 @@ ] } ], - "ID": "8a591381-900b-4d42-8908-6ffec8ce94cd" + "ID": "1ddc53f8-71dd-4085-b473-8a5bb8c10912" } ] } ], - "ID": "cb8cd067-408c-4ce0-bfd6-139727f35b02" + "ID": "77b8d31f-1d8d-4cb3-9476-2a0494145557" } ] } ], - "ID": "772194d0-f445-4c3f-9589-9876b5283aab" + "ID": "0b2e6afd-6df1-4c9f-aeef-740a90a36802" } ] } @@ -2260,12 +2259,12 @@ } } ], - "ID": "a03a295d-f69f-4422-96c6-a7e83510a77f" + "ID": "e304d12c-6b3e-43a4-99a7-8e95d22b71a8" } ] } ], - "ID": "525623cf-759e-4811-a6f4-265bdcdf270a" + "ID": "cc4ddb31-2051-4c13-a277-cb4c7988c81e" }, { "Condition": { @@ -2348,12 +2347,12 @@ } } ], - "ID": "604f2bde-53cb-4867-8464-82f9dd5f6910" + "ID": "90bb3b1d-ea97-47cb-bd29-2afc3d82e429" } ] } ], - "ID": "7aca5d8f-a3e1-4ec4-8069-7b64eef0b668" + "ID": "672f59f1-6e14-48cd-ab4e-308ff54c87a2" } ] } @@ -2398,7 +2397,7 @@ ] } ], - "ID": "78f019d9-c9c0-43ba-b537-8286d2420ef0" + "ID": "c6ca041f-0e10-48b5-8ad8-b074b29bd2e0" } ] } @@ -2471,4 +2470,4 @@ "Formula": "FGC_母版页!$C$7" } ] -}//HyGLE4SOq4+rAXINL/9lYNFMBZe8oOC3CIRsVkT1NN72bZLEbKKWa1dryYR0MrYuwqzJAgz5rpmV0bAi88XgibFrm7vpW0m628JiZl+NvDMI7dVFhWkxBFyCOHpGnl9zvJpIcV+cQ2p5L1cQyurbhN/vymiaYK9Xu2j3Jg/qlp1kX61wkNrYtjgZ5zCl+dcT5QWcYQXZQDK6OpGYAR5Z3RuhBGWep8EqnCFb6NlWRvIAmgBFzSH5RM6bSYPkK8bsCZbmU/Kxglie1JFIUNA5DKznvZQ8KVUZMzkAgwBtq2kt6lhrK3iNBbdve2lrwdJV5aqK9HXqaFsyCNyxhz5YK4GoO/UmNEn0o9Nvmc1yTjB3pCiQyjCF/QOcDNRs/T5aXEUNd2W+jjLXiMjWYIcGoUTDkjMlDNbPTmMuKvv8KxY/YPkMtzCAHyXjFxRmmMlSUb0k5FKlstd4x5Vbf0s0rdpji3Eput6p1nwEHocZNZrQMSxUmHZIXzsA6EeTNh4aUW3I3FNKT5pHt47bLsFR0gmiUhX2VB/DECOU9BkS+AXB37c9+aNQ5h6AjJHIAxxUayNImdV6A6UCyNqY429NIn8wljegMCIAk6u787WmC02trq2j6WoEU6kKF2YAF6didLL1ct4oW9uK+2aTCRvLMmz8F4tnRZJl3+m/Z67HJiHzTIrEtA3P+qnBu3UnWX+MN21Ohc7SfonUUdmlb0X3NsAN+RpHv54vGwCV5Do6G4dHGho9SK5WZ1U7HGXnrJZTYPnZI6EqAnpop+piK+fSHnhk9R9+sj987BdboLqKumyfn2tvgRtGHlofN2OwvAZO3EAduNaESq/Qg5RsbBggfZgHilDaFBQNeF5ncsq9Nl3CCmWVpa+ME61v3LEpNfuHWtKVvcmCTE21WxMgDUhwVg==|920 \ No newline at end of file +}//1UAO9ry0zqaTR/weR0YSJ+Hl4OeX8GLXzD/gW0LWwfyd/30Nt0AZY/8iMkU4lBMZDNbSC1deIBCwvYLso9uu3D+BlsFXWW3yvogRL+bgPv8IS7ZWl9mUiFmD+OAS3xKp2BioenAu4d1vAWjQIBj8Bda9yOBY7t1jYMeUrtGo3ANBAjEzIclk+jK6Ss3zcZQy0P+iQgf/0VJBlhpMkKfYoZeJ0MQQEMcVSo2BKRZO5SRzeghH7RuCgdfcCAzaqGWwOqgXfiqoYQhsVE69WeLOz2iI1rILffWRiQZ4Pw11SplKTbw3UZjNhpPTBHukLH4Xo/omGQa6/LwKw4D8kbr69JydWitbd/mMmm+3V2gdP4t3o+nxOiQF6WQtBlC7toWZaZDlOyMW0bz8XmyeT78Os2ls2CB0K6W6+Tai1V/U0z1IBXufaDcWgJlyM83fssR+uUFM1meHVrW7YBlgsELUbegB2jEF5GuXwDz/2RNfWNt5hI25rNcdbWTzPbiGkuj8UVuCbjKchx9jezrrd5EZfcLIFhn3FoNDu/Tlj9VNO56ZUum/yIi2t1Uf285uJtw+TKVaGc4SR5GrPRqbScrD/eEBPAa0dp4CeRi77UfJl1j+r9ubsUP0+FkWbhvlEhHeluxly5RNER4TJzykIuEVyXxkUvbbka1TyGYQgctlt+kHGsEfKreRmnrcUrIIp+AWlZsr+I1Ot4fPbbjKkPmVPFgNmubofaENTm/nJNfWG/Xkt2FXW5Wr7CXxlHZ1i59F6G/lUadKeFgWTo1DLX9LY4D9HynS/EP5Pr4ZQuFVJUu5NpE6TgrwW1s2qWDuBnnSnTaKUeeNBh3KaHiHcB40nQF0i8h8W8dOs95Yq/znjOz1sG9oRtP5lHpyWlGRMslxqMbkHDcbte+n6sWl1/dewg==|920 \ No newline at end of file diff --git a/Tables/任务/任务平行视图.json b/Tables/任务/任务平行视图.json index b977ceda..6087a276 100644 --- a/Tables/任务/任务平行视图.json +++ b/Tables/任务/任务平行视图.json @@ -62,24 +62,11 @@ }, "dataPermissionType": 2, "roleNames": [ - "Administrator" - ] - }, - { - "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core", - "config": { - "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowBindingConfig, Forguncy.RbacPermission.Core", - "operationTypes": 13, - "dataFilter": { - "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core", - "userFieldName": "任务负责人" - } - }, - "dataPermissionType": 2, - "roleNames": [ - "项目总监", + "Administrator", + "财务", + "客服总监", "商务总监", - "财务" + "项目总监" ] }, { diff --git a/Tables/工时/任务工时表.json b/Tables/工时/任务工时表.json index c881cb0e..166da1ae 100644 --- a/Tables/工时/任务工时表.json +++ b/Tables/工时/任务工时表.json @@ -21,46 +21,9 @@ }, "dataPermissionType": 2, "roleNames": [ - "Administrator" - ] - }, - { - "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core", - "config": { - "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowBindingConfig, Forguncy.RbacPermission.Core", - "operationTypes": 13, - "dataFilter": { - "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core", - "userFieldName": "执行人", - "filterType": 4, - "condition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "执行人", - "GUID": "080ff6d7-1f57-4264-9fc3-578ad59cca9c" - }, - "Value": "%CurrentUser.UserName%" - } - } - }, - "dataPermissionType": 2, - "roleNames": [ - "FGC_LoginUser" - ] - }, - { - "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core", - "config": { - "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowBindingConfig, Forguncy.RbacPermission.Core", - "operationTypes": 13, - "dataFilter": { - "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core" - } - }, - "dataPermissionType": 2, - "roleNames": [ + "Administrator", "财务", + "客服总监", "商务总监", "项目总监" ] @@ -73,7 +36,36 @@ "dataFilter": { "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core", "userFieldName": "执行人", - "filterType": 5 + "filterType": 4, + "condition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行人", + "GUID": "080ff6d7-1f57-4264-9fc3-578ad59cca9c" + }, + "Value": "%CurrentUser.UserName%" + }, + { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 6, + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行人", + "GUID": "421d1ff1-a216-4483-bdfc-09c9147f5729", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 8 + } + }, + "Value": "%CurrentUser.UserName%" + } + ], + "RelationType": 1 + } } }, "dataPermissionType": 2, @@ -125,14 +117,15 @@ "执行人": 5, "执行内容": 5, "提成系数": 5, + "收益求和": 5, + "日期文本": 5, "时薪单价": 5, "时薪来源": 5, - "请款单ID": 5, - "项目ID": 5, - "预算收益": 5, "是否请款": 5, "行数": 5, - "收益求和": 5 + "请款单ID": 5, + "项目ID": 5, + "预算收益": 5 }, "subTableOperations": {}, "dataFilter": { @@ -160,14 +153,15 @@ "执行人": 5, "执行内容": 5, "提成系数": 5, + "收益求和": 5, + "日期文本": 5, "时薪单价": 5, "时薪来源": 5, - "请款单ID": 5, - "项目ID": 5, - "预算收益": 5, "是否请款": 5, "行数": 5, - "收益求和": 5 + "请款单ID": 5, + "项目ID": 5, + "预算收益": 5 }, "subTableOperations": {}, "dataFilter": { @@ -195,14 +189,15 @@ "执行人": 5, "执行内容": 5, "提成系数": 5, + "收益求和": 5, + "日期文本": 5, "时薪单价": 5, "时薪来源": 5, - "请款单ID": 5, - "项目ID": 5, - "预算收益": 5, "是否请款": 5, "行数": 5, - "收益求和": 5 + "请款单ID": 5, + "项目ID": 5, + "预算收益": 5 }, "subTableOperations": {}, "dataFilter": { diff --git a/Tables/收益/收款账户信息表.json b/Tables/收益/收款账户信息表.json index e20add85..1be2e23a 100644 --- a/Tables/收益/收款账户信息表.json +++ b/Tables/收益/收款账户信息表.json @@ -20,7 +20,11 @@ }, "dataPermissionType": 2, "roleNames": [ - "Administrator" + "Administrator", + "财务", + "客服总监", + "商务总监", + "项目总监" ] }, { @@ -48,22 +52,6 @@ "FGC_LoginUser" ] }, - { - "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core", - "config": { - "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowBindingConfig, Forguncy.RbacPermission.Core", - "operationTypes": 13, - "dataFilter": { - "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core" - } - }, - "dataPermissionType": 2, - "roleNames": [ - "财务", - "商务总监", - "项目总监" - ] - }, { "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core", "config": { diff --git a/Tables/收益/收益变动记录表.json b/Tables/收益/收益变动记录表.json index e4a90bda..af0abc11 100644 --- a/Tables/收益/收益变动记录表.json +++ b/Tables/收益/收益变动记录表.json @@ -23,7 +23,8 @@ "Administrator", "财务", "商务总监", - "项目总监" + "项目总监", + "客服总监" ] }, { diff --git a/Tables/收益/收益请款单表.json b/Tables/收益/收益请款单表.json index ecd2556c..1edddf7a 100644 --- a/Tables/收益/收益请款单表.json +++ b/Tables/收益/收益请款单表.json @@ -36,42 +36,13 @@ }, "dataPermissionType": 2, "roleNames": [ - "Administrator" - ] - }, - { - "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core", - "config": { - "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowBindingConfig, Forguncy.RbacPermission.Core", - "operationTypes": 13, - "dataFilter": { - "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core", - "userFieldName": "请款人" - } - }, - "dataPermissionType": 2, - "roleNames": [ + "Administrator", "财务", + "客服总监", "商务总监", "项目总监" ] }, - { - "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core", - "config": { - "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowBindingConfig, Forguncy.RbacPermission.Core", - "operationTypes": 13, - "dataFilter": { - "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core", - "userFieldName": "请款人", - "filterType": 5 - } - }, - "dataPermissionType": 2, - "roleNames": [ - "FGC_LoginUser" - ] - }, { "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core", "config": { @@ -82,13 +53,33 @@ "userFieldName": "请款人", "filterType": 4, "condition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "收益请款单表", - "ColumnName": "请款人", - "GUID": "5802daf0-5ac2-43f9-b3d2-010188b59333" - }, - "Value": "%CurrentUser.UserName%" + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "收益请款单表", + "ColumnName": "请款人", + "GUID": "5802daf0-5ac2-43f9-b3d2-010188b59333" + }, + "Value": "%CurrentUser.UserName%" + }, + { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 6, + "ColumnBindingInfo": { + "TableName": "收益请款单表", + "ColumnName": "请款人", + "GUID": "372c0f5e-09d6-4988-b44c-d19d5f4cfff9", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 8 + } + }, + "Value": "%CurrentUser.UserName%" + } + ], + "RelationType": 1 } } }, @@ -127,7 +118,8 @@ "流程实例ID": 5, "状态": 5, "请款人": 5, - "请款日期": 5 + "请款日期": 5, + "请款金额": 5 }, "subTableOperations": { "View_任务工时统计": 5, @@ -160,7 +152,8 @@ "流程实例ID": 5, "状态": 5, "请款人": 5, - "请款日期": 5 + "请款日期": 5, + "请款金额": 5 }, "subTableOperations": { "View_任务工时统计": 5, @@ -193,7 +186,8 @@ "流程实例ID": 5, "状态": 5, "请款人": 5, - "请款日期": 5 + "请款日期": 5, + "请款金额": 5 }, "subTableOperations": { "View_任务工时统计": 5, diff --git a/Tables/汇报/汇报记录表.json b/Tables/汇报/汇报记录表.json index b7793c87..d895c161 100644 --- a/Tables/汇报/汇报记录表.json +++ b/Tables/汇报/汇报记录表.json @@ -7,13 +7,7 @@ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionResource, Forguncy.RbacPermission.Core", "enabledTypes": 2, "isExternal": true, - "detailTables": [ - { - "subTableName": "汇报子表", - "subColumnName": "汇报ID", - "relatedColumnName": "ID" - } - ] + "detailTables": [] }, "permissionBindings": [ { @@ -27,7 +21,10 @@ }, "dataPermissionType": 2, "roleNames": [ - "Administrator" + "Administrator", + "客服总监", + "商务总监", + "项目总监" ] }, { @@ -40,13 +37,33 @@ "userFieldName": "汇报人", "filterType": 4, "condition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "汇报记录表", - "ColumnName": "汇报人", - "GUID": "c054b6d0-fd87-435c-9c17-a5c9da44d283" - }, - "Value": "%CurrentUser.UserName%" + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报人", + "GUID": "c054b6d0-fd87-435c-9c17-a5c9da44d283" + }, + "Value": "%CurrentUser.UserName%" + }, + { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 6, + "ColumnBindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报人", + "GUID": "54cbfa33-315a-457c-81d8-0743c7315939", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 8 + } + }, + "Value": "%CurrentUser.UserName%" + } + ], + "RelationType": 1 } } }, @@ -55,22 +72,6 @@ "FGC_LoginUser" ] }, - { - "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core", - "config": { - "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowBindingConfig, Forguncy.RbacPermission.Core", - "operationTypes": 13, - "dataFilter": { - "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core", - "userFieldName": "汇报人", - "filterType": 5 - } - }, - "dataPermissionType": 2, - "roleNames": [ - "FGC_LoginUser" - ] - }, { "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core", "config": { @@ -94,17 +95,15 @@ "开始日期": 5, "总工时": 5, "汇报人": 5, + "汇报对象": 5, + "汇报对象ID": 5, "汇报日期文本": 5, "汇报类型": 5, "状态": 5, - "行数": 5, - "汇报对象": 5, - "汇报对象ID": 5, - "纯文本内容": 5 - }, - "subTableOperations": { - "汇报子表": 5 + "纯文本内容": 5, + "行数": 5 }, + "subTableOperations": {}, "dataFilter": { "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core" } @@ -124,17 +123,15 @@ "开始日期": 5, "总工时": 5, "汇报人": 5, + "汇报对象": 5, + "汇报对象ID": 5, "汇报日期文本": 5, "汇报类型": 5, "状态": 5, - "行数": 5, - "汇报对象": 5, - "汇报对象ID": 5, - "纯文本内容": 5 - }, - "subTableOperations": { - "汇报子表": 5 + "纯文本内容": 5, + "行数": 5 }, + "subTableOperations": {}, "dataFilter": { "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core" } @@ -154,17 +151,15 @@ "开始日期": 5, "总工时": 5, "汇报人": 5, + "汇报对象": 5, + "汇报对象ID": 5, "汇报日期文本": 5, "汇报类型": 5, "状态": 5, - "行数": 5, - "汇报对象": 5, - "汇报对象ID": 5, - "纯文本内容": 5 - }, - "subTableOperations": { - "汇报子表": 5 + "纯文本内容": 5, + "行数": 5 }, + "subTableOperations": {}, "dataFilter": { "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core" } diff --git a/Tables/项目/项目平行视图.json b/Tables/项目/项目平行视图.json index 057a281e..09f2189e 100644 --- a/Tables/项目/项目平行视图.json +++ b/Tables/项目/项目平行视图.json @@ -37,7 +37,11 @@ }, "dataPermissionType": 2, "roleNames": [ - "Administrator" + "Administrator", + "客服总监", + "商务总监", + "项目总监", + "财务" ] }, { @@ -113,23 +117,6 @@ "FGC_LoginUser" ] }, - { - "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core", - "config": { - "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowBindingConfig, Forguncy.RbacPermission.Core", - "operationTypes": 13, - "dataFilter": { - "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core", - "userFieldName": "项目经理" - } - }, - "dataPermissionType": 2, - "roleNames": [ - "商务总监", - "项目总监", - "财务" - ] - }, { "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core", "config": { @@ -517,6 +504,7 @@ }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "Required": true, "DatabaseColumnType": "int", "MaxLength": -1, "Name": "成员数量", @@ -524,6 +512,7 @@ }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "Required": true, "DatabaseColumnType": "float", "MaxLength": -1, "Name": "项目总分配工时", @@ -582,7 +571,7 @@ "ConnectionId": "业务表", "SourceTableName": "项目平行视图", "SourceTableSchema": "dbo", - "CreateViewSql": "WITH cy AS (\r\nSELECT [项目ID], STRING_AGG([项目成员], ',') AS 项目成员,count(*) AS 成员数量\r\nFROM [项目成员表]\r\nGROUP BY [项目ID]\r\n),\r\nc1 AS (\r\n SELECT\r\n p.[ID],\r\n p.[项目名称],\r\n p.[项目代号],\r\n p.[项目简介],\r\n p.[项目封面],\r\n p.[项目经理],\r\n p.[商务经理],\r\n p.[客服经理],\r\n p.[项目分组],\r\n p.[所属客户],\r\n p.[所属客户部门],\r\n p.[工时分配方式],\r\n p.[项目预算工时],\r\n p.[项目预算费用],\r\n p.[公开],\r\n p.[严格模式],\r\n p.[计划开始日期],\r\n p.[计划完成日期],\r\n p.[项目方案],\r\n p.[预算方案],\r\n p.[网络资源],\r\n p.[开启反馈收集],\r\n p.[项目状态],\r\n p.[立项流程示例ID],\r\n p.[删除],\r\n p.FGC_Creator,\r\n p.FGC_CreateDate,\r\n p.FGC_LastModifier,\r\n\t\t\t\tMAX(cy.[项目成员]) AS 项目成员,\r\n\t\t\t\tMAX(cy.[成员数量]) AS 成员数量,\r\n p.[项目预算工时] AS 项目总分配工时,\r\n ISNULL(SUM(t.[总核定工时]), 0) AS 项目总核定工时,\r\n ISNULL(SUM(t.[本任务可核定工时]), 0) AS 项目可核定工时,\r\n ISNULL(SUM(t.[实际工时]), 0) AS 项目实际工时,\r\n\t\t\t\tISNULL(SUM(t.[已消耗成本]), 0) AS 已消耗成本\r\n FROM [dbo].[项目表] p\r\n LEFT JOIN [任务平行视图] t ON p.ID = t.[项目ID]\r\n\t\tLEFT JOIN cy ON p.ID = cy.[项目ID]\r\n GROUP BY\r\n p.[ID],\r\n p.[项目名称],\r\n p.[项目代号],\r\n p.[项目简介],\r\n p.[项目封面],\r\n p.[项目经理],\r\n p.[商务经理],\r\n p.[客服经理],\r\n p.[项目分组],\r\n p.[所属客户],\r\n p.[所属客户部门],\r\n p.[工时分配方式],\r\n p.[项目预算工时],\r\n p.[项目预算费用],\r\n p.[公开],\r\n p.[严格模式],\r\n p.[计划开始日期],\r\n p.[计划完成日期],\r\n p.[项目方案],\r\n p.[预算方案],\r\n p.[网络资源],\r\n p.[开启反馈收集],\r\n p.[项目状态],\r\n p.[立项流程示例ID],\r\n p.[删除],\r\n p.FGC_Creator,\r\n p.FGC_CreateDate,\r\n p.FGC_LastModifier\r\n)\r\nSELECT\r\n c1.*,\r\n x.项目已分配工时,\r\n c1.[项目预算工时] - x.项目已分配工时 AS 项目可分配工时\r\nFROM c1\r\nOUTER APPLY (\r\n SELECT ISNULL(SUM(t.[总分配工时]), 0) AS 项目已分配工时\r\n FROM [任务平行视图] t \r\n WHERE c1.ID = t.[项目ID] AND t.[父任务ID] IS NULL\r\n) x;", + "CreateViewSql": "WITH cy AS (\r\nSELECT [项目ID], STRING_AGG([项目成员], ',') AS 项目成员,count(*) AS 成员数量\r\nFROM [项目成员表]\r\nGROUP BY [项目ID]\r\n),\r\nc1 AS (\r\n SELECT\r\n p.[ID],\r\n p.[项目名称],\r\n p.[项目代号],\r\n p.[项目简介],\r\n p.[项目封面],\r\n p.[项目经理],\r\n p.[商务经理],\r\n p.[客服经理],\r\n p.[项目分组],\r\n p.[所属客户],\r\n p.[所属客户部门],\r\n p.[工时分配方式],\r\n p.[项目预算工时],\r\n p.[项目预算费用],\r\n p.[公开],\r\n p.[严格模式],\r\n p.[计划开始日期],\r\n p.[计划完成日期],\r\n p.[项目方案],\r\n p.[预算方案],\r\n p.[网络资源],\r\n p.[开启反馈收集],\r\n p.[项目状态],\r\n p.[立项流程示例ID],\r\n p.[删除],\r\n p.FGC_Creator,\r\n p.FGC_CreateDate,\r\n p.FGC_LastModifier,\r\n\t\t\t\tMAX(cy.[项目成员]) AS 项目成员,\r\n\t\t\t\tISNULL(MAX(cy.[成员数量]), 0) AS 成员数量,\r\n ISNULL(p.[项目预算工时], 0) AS 项目总分配工时,\r\n ISNULL(SUM(t.[总核定工时]), 0) AS 项目总核定工时,\r\n ISNULL(SUM(t.[本任务可核定工时]), 0) AS 项目可核定工时,\r\n ISNULL(SUM(t.[实际工时]), 0) AS 项目实际工时,\r\n\t\t\t\tISNULL(SUM(t.[已消耗成本]), 0) AS 已消耗成本\r\n FROM [dbo].[项目表] p\r\n LEFT JOIN [任务平行视图] t ON p.ID = t.[项目ID]\r\n\t\tLEFT JOIN cy ON p.ID = cy.[项目ID]\r\n GROUP BY\r\n p.[ID],\r\n p.[项目名称],\r\n p.[项目代号],\r\n p.[项目简介],\r\n p.[项目封面],\r\n p.[项目经理],\r\n p.[商务经理],\r\n p.[客服经理],\r\n p.[项目分组],\r\n p.[所属客户],\r\n p.[所属客户部门],\r\n p.[工时分配方式],\r\n p.[项目预算工时],\r\n p.[项目预算费用],\r\n p.[公开],\r\n p.[严格模式],\r\n p.[计划开始日期],\r\n p.[计划完成日期],\r\n p.[项目方案],\r\n p.[预算方案],\r\n p.[网络资源],\r\n p.[开启反馈收集],\r\n p.[项目状态],\r\n p.[立项流程示例ID],\r\n p.[删除],\r\n p.FGC_Creator,\r\n p.FGC_CreateDate,\r\n p.FGC_LastModifier\r\n)\r\nSELECT\r\n c1.*,\r\n x.项目已分配工时,\r\n c1.[项目预算工时] - x.项目已分配工时 AS 项目可分配工时\r\nFROM c1\r\nOUTER APPLY (\r\n SELECT ISNULL(SUM(t.[总分配工时]), 0) AS 项目已分配工时\r\n FROM [任务平行视图] t \r\n WHERE c1.ID = t.[项目ID] AND t.[父任务ID] IS NULL\r\n) x;", "ViewInfo": { "ViewName": "项目平行视图", "QueryColumns": [ diff --git a/UserServiceDB.sqlite3 b/UserServiceDB.sqlite3 index 8f97f46e0984efec4a28e41bf0e145d6fd05ba9b..6486448c889a65fa1490e70a207b5a408653d47c 100644 GIT binary patch delta 555 zcmXYtPe@cz6vpp;@7{UO=j1mt%{(QgWN@5$j}~ez!iD3)wz_Z`!B88apg?G0go6q# zBvc+W14@PMEYuj85oa-v7NXKZ2B8RvA@UCu7zJWOpl6=l%XiPYaPIG(^Q9}%bR|07 z9JCo@lcfKP+cQ_Mar<4WKFJN|esYXkxuayHx5+>^!w>Ah#am=Cfk(K5est$LTQ4IV zvV1JY^b327^ZRqp_S40K*%_yQDo@YW8UEoIzwjO3@CBbx#s{qDf~f^$wx?8)=^5o6 zPW7dsniz7lS1}z=2>t*=guadz*{E`E$E8W3D=R$Z3(2-ff|T&3%XH zL0VG|21%cVmOf2IJV-J$@qs#?@BjwV??J6vbHdng}$x6;_2r)w{a|2t&mOzMvM94&kQEVwwXTLzpdDQ>_