From ce9adc67b5ff9fd400ef9a8296c5751d20b1b41f Mon Sep 17 00:00:00 2001 From: "SHAMUSPC\\NINGMEI" Date: Wed, 6 Mar 2024 16:09:17 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E4=BC=98=E5=8C=96=E5=8F=82?= =?UTF-8?q?=E4=B8=8E=E4=BA=BA=E5=90=8C=E6=AD=A5=E9=80=BB=E8=BE=91","Messag?= =?UTF-8?q?eType":2,"Modules":[{"State":1,"Type":7,"Name":"Table/=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E8=A1=A8"},{"State":1,"Type":23,"Name":"TableView/?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E8=A7=86=E5=9B=BE","Exclus?= =?UTF-8?q?iveType":0},{"State":1,"Type":23,"Name":"TableView/=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=BB=84=E7=BB=87=E5=85=B3=E7=B3=BB=E8=A7=86=E5=9B=BE?= =?UTF-8?q?","ExclusiveType":0},{"State":1,"Type":23,"Name":"TableView/?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2=E5=85=B3=E7=B3=BB=E8=A7=86?= =?UTF-8?q?=E5=9B=BE","ExclusiveType":0},{"State":1,"Type":23,"Name":"Tabl?= =?UTF-8?q?eView/=E7=BB=84=E7=BB=87=E4=BF=A1=E6=81=AF=E8=A7=86=E5=9B=BE","?= =?UTF-8?q?ExclusiveType":0},{"State":1,"Type":23,"Name":"TableView/?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=BA=A7=E5=88=AB=E8=A7=86=E5=9B=BE","Exclus?= =?UTF-8?q?iveType":0},{"State":1,"Type":23,"Name":"TableView/=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E4=BF=A1=E6=81=AF=E8=A7=86=E5=9B=BE","ExclusiveType":?= =?UTF-8?q?0},{"State":1,"Type":23,"Name":"TableView/=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E5=85=B3=E7=B3=BB=E8=A7=86=E5=9B=BE","Exclus?= =?UTF-8?q?iveType":0},{"State":1,"Type":23,"Name":"TableView/=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E6=8B=A5=E6=9C=89=E6=9D=83=E9=99=90=E8=A7=86=E5=9B=BE?= =?UTF-8?q?","ExclusiveType":0},{"State":1,"Type":23,"Name":"TableView/?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=BB=84=E7=BB=87=E5=85=B3=E7=B3=BB=E8=A7=86?= =?UTF-8?q?=E5=9B=BE","ExclusiveType":0},{"State":1,"Type":7,"Name":"Table?= =?UTF-8?q?/=E9=A1=B9=E7=9B=AE=E5=88=86=E7=BB=84","ExclusiveType":0},{"Sta?= =?UTF-8?q?te":1,"Type":7,"Name":"Table/=E9=A1=B9=E7=9B=AE=E8=A1=A8"},{"St?= =?UTF-8?q?ate":1,"Type":1,"Name":"PCPage/=E5=8F=82=E4=B8=8E=E6=88=90?= =?UTF-8?q?=E5=91=98=E7=AE=A1=E7=90=86"},{"State":1,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E6=96=B0=E5=A2=9E=E4=BB=BB=E5=8A=A1"},{"State":1,"Type":1,"N?= =?UTF-8?q?ame":"PCPage/FGC=5F=E6=88=91=E5=8F=91=E8=B5=B7=E7=9A=84"},{"Sta?= =?UTF-8?q?te":1,"Type":1,"Name":"PCPage/FGC=5F=E6=88=91=E5=A7=94=E6=89=98?= =?UTF-8?q?=E7=9A=84"},{"State":1,"Type":1,"Name":"PCPage/FGC=5F=E6=88=91?= =?UTF-8?q?=E7=9A=84=E5=B7=B2=E5=8A=9E"},{"State":1,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/FGC=5F=E6=88=91=E7=9A=84=E5=B7=B2=E9=98=85"},{"State":1,"Type?= =?UTF-8?q?":1,"Name":"PCPage/FGC=5F=E6=88=91=E7=9A=84=E5=BE=85=E5=8A=9E"}?= =?UTF-8?q?,{"State":1,"Type":1,"Name":"PCPage/FGC=5F=E6=88=91=E7=9A=84?= =?UTF-8?q?=E5=BE=85=E9=98=85"},{"State":1,"Type":3,"Name":"MasterPCPage/F?= =?UTF-8?q?GC=5F=E6=B5=81=E7=A8=8B=E4=B8=AD=E5=BF=83"},{"State":1,"Type":3?= =?UTF-8?q?,"Name":"MasterPCPage/FGC=5F=E6=AF=8D=E7=89=88=E9=A1=B5"},{"Sta?= =?UTF-8?q?te":1,"Type":15,"Name":"ServerCommand/=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=88=90=E5=91=98"},{"State":1,"Type":26,"Na?= =?UTF-8?q?me":"Upload"},{"State":1,"Type":15,"Name":"ServerCommand/?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=A1=B9=E7=9B=AE=E6=88=90=E5=91=98"},{"Stat?= =?UTF-8?q?e":1,"Type":15,"Name":"ServerCommand/=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=88=90=E5=91=98"},{"State":1,"Type":1,"Nam?= =?UTF-8?q?e":"PCPage/=E4=BB=BB=E5=8A=A1=E6=88=90=E5=91=98=E8=AF=A6?= =?UTF-8?q?=E6=83=85"},{"State":3,"Type":1,"Name":"PCPage/=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E4=B8=AD=E5=BF=83"},{"State":3,"Type":15,"Name":"Serv?= =?UTF-8?q?erCommand/=E6=9B=B4=E6=96=B0=E4=BB=BB=E5=8A=A1=E5=8F=82?= =?UTF-8?q?=E4=B8=8E=E4=BA=BA"},{"State":3,"Type":15,"Name":"ServerCommand?= =?UTF-8?q?/=E5=90=8C=E6=AD=A5=E4=BB=BB=E5=8A=A1=E5=8F=82=E4=B8=8E?= =?UTF-8?q?=E4=BA=BA=E5=AD=97=E6=AE=B5"},{"State":3,"Type":15,"Name":"Serv?= =?UTF-8?q?erCommand/=E5=90=8C=E6=AD=A5=E9=A1=B9=E7=9B=AE=E5=8F=82?= =?UTF-8?q?=E4=B8=8E=E4=BA=BA=E5=AD=97=E6=AE=B5"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 325 +-------- ForguncyDB.sqlite3 | Bin 30720 -> 31744 bytes MasterPages/FGC_母版页.json | 35 +- MasterPages/FGC_母版页.rd | 7 + .../流程母版页面文件夹/FGC_流程中心.json | 59 +- Pages/任务/任务成员详情.json | 30 +- Pages/任务/参与成员管理.json | 258 +++---- Pages/任务/参与成员管理.rd | 8 +- Pages/任务/新增任务.json | 16 +- Pages/任务/新增任务.rd | 7 +- Pages/流程页面文件夹/FGC_我发起的.json | 365 +++++----- Pages/流程页面文件夹/FGC_我发起的.rd | 4 +- Pages/流程页面文件夹/FGC_我委托的.json | 378 +++++------ Pages/流程页面文件夹/FGC_我委托的.rd | 4 +- Pages/流程页面文件夹/FGC_我的已办.json | 469 ++++++------- Pages/流程页面文件夹/FGC_我的已办.rd | 4 +- Pages/流程页面文件夹/FGC_我的已阅.json | 455 ++++++------- Pages/流程页面文件夹/FGC_我的已阅.rd | 4 +- Pages/流程页面文件夹/FGC_我的待办.json | 197 +++--- Pages/流程页面文件夹/FGC_我的待办.rd | 2 +- Pages/流程页面文件夹/FGC_我的待阅.json | 256 +++---- Pages/流程页面文件夹/FGC_我的待阅.rd | 4 +- Pages/流程页面文件夹/流程中心.json | 640 ++++++++++++++++++ Pages/流程页面文件夹/流程中心.rd | 11 + ServerCommands/任务/同步任务参与人字段.json | 98 +++ ServerCommands/任务/更新任务参与人.json | 429 ++++++++++++ ServerCommands/任务/移除任务成员.json | 44 +- ServerCommands/项目/同步项目参与人字段.json | 103 +++ ServerCommands/项目/同步项目成员.json | 443 +++++------- ServerCommands/项目/移除项目成员.json | 155 +++-- Tables/任务/任务表.json | 325 ++++++++- Tables/项目/项目表.json | 201 +++--- 32 files changed, 3282 insertions(+), 2054 deletions(-) create mode 100644 Pages/流程页面文件夹/流程中心.json create mode 100644 Pages/流程页面文件夹/流程中心.rd create mode 100644 ServerCommands/任务/同步任务参与人字段.json create mode 100644 ServerCommands/任务/更新任务参与人.json create mode 100644 ServerCommands/项目/同步项目参与人字段.json diff --git a/.collaboration b/.collaboration index 12317655..edfd3d64 100644 --- a/.collaboration +++ b/.collaboration @@ -13,16 +13,7 @@ }, { "ModuleName": "Table/任务表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T15:31:38.7117925+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\任务\\任务表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/任务进展", @@ -110,137 +101,47 @@ }, { "ModuleName": "TableView/用户信息视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T15:14:54.1072284+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/用户组织关系视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T15:14:54.1072305+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户组织关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/用户角色关系视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T15:14:54.1072319+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户角色关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/组织信息视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T15:14:54.1072346+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\组织信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/组织级别视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T15:14:54.107236+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\组织级别视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色信息视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T15:14:54.1072373+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色分类关系视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T15:14:54.1072386+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色分类关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色拥有权限视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T15:14:54.1072402+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色拥有权限视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色组织关系视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T15:14:54.1072414+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色组织关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -253,17 +154,7 @@ }, { "ModuleName": "Table/项目分组", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T15:14:54.1072076+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目\\项目分组.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -280,16 +171,7 @@ }, { "ModuleName": "Table/项目表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T15:16:32.0225022+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目\\项目表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/项目预算变动表", @@ -345,17 +227,7 @@ }, { "ModuleName": "PCPage/参与成员管理", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T15:34:43.1092188+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\参与成员管理.json", - "Pages\\任务\\参与成员管理.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/工时详情-列头", @@ -367,17 +239,7 @@ }, { "ModuleName": "PCPage/新增任务", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T15:11:39.2836067+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\新增任务.json", - "Pages\\任务\\新增任务.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/新增进展", @@ -521,87 +383,27 @@ }, { "ModuleName": "PCPage/FGC_我发起的", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T14:59:25.1931238+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\流程页面文件夹\\FGC_我发起的.json", - "Pages\\流程页面文件夹\\FGC_我发起的.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/FGC_我委托的", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T14:59:37.4812332+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\流程页面文件夹\\FGC_我委托的.json", - "Pages\\流程页面文件夹\\FGC_我委托的.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/FGC_我的已办", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T15:00:14.6454838+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\流程页面文件夹\\FGC_我的已办.json", - "Pages\\流程页面文件夹\\FGC_我的已办.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/FGC_我的已阅", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T15:00:32.9805372+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\流程页面文件夹\\FGC_我的已阅.json", - "Pages\\流程页面文件夹\\FGC_我的已阅.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/FGC_我的待办", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T14:56:59.1440192+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\流程页面文件夹\\FGC_我的待办.json", - "Pages\\流程页面文件夹\\FGC_我的待办.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/FGC_我的待阅", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T15:00:49.519692+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\流程页面文件夹\\FGC_我的待阅.json", - "Pages\\流程页面文件夹\\FGC_我的待阅.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/FGC_流程列表", @@ -721,17 +523,7 @@ }, { "ModuleName": "MasterPCPage/FGC_流程中心", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T14:52:26.0108035+08:00", - "ModuleType": 3, - "ToRemoveFiles": [ - "MasterPages\\流程母版页面文件夹\\FGC_流程中心.json", - "MasterPages\\流程母版页面文件夹\\FGC_流程中心.rd" - ] + "ModuleType": 3 }, { "ModuleName": "MasterMobilePage/FGC_流程中心_手机版", @@ -739,17 +531,7 @@ }, { "ModuleName": "MasterPCPage/FGC_母版页", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T14:58:32.6075915+08:00", - "ModuleType": 3, - "ToRemoveFiles": [ - "MasterPages\\FGC_母版页.json", - "MasterPages\\FGC_母版页.rd" - ] + "ModuleType": 3 }, { "ModuleName": "UserControlPage/工时记录列表", @@ -769,16 +551,7 @@ }, { "ModuleName": "ServerCommand/移除任务成员", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T15:53:25.0464049+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\任务\\移除任务成员.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommands/工时", @@ -1022,19 +795,7 @@ }, { "ModuleName": "Upload", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T15:14:54.1082716+08:00", - "ModuleType": 26, - "ToRemoveFiles": [ - "Upload\\485a297c-1ba3-42a6-afe8-c2409d9f01fe_app-logo2.png", - "Upload\\485a297c-1ba3-42a6-afe8-c2409d9f01fe_app-logo2.small.png", - "Upload\\a78dd055-76a1-433b-b6a1-70cff99fd6fb_app-logo2.png", - "Upload\\a78dd055-76a1-433b-b6a1-70cff99fd6fb_app-logo2.small.png" - ] + "ModuleType": 26 }, { "ModuleName": "PublishConfiguration", @@ -1066,16 +827,7 @@ }, { "ModuleName": "ServerCommand/同步项目成员", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T15:17:08.4697056+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\项目\\同步项目成员.json" - ] + "ModuleType": 15 }, { "ModuleName": "PCPage/项目成员", @@ -1107,30 +859,11 @@ }, { "ModuleName": "ServerCommand/移除项目成员", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T15:50:36.2182476+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\项目\\移除项目成员.json" - ] + "ModuleType": 15 }, { "ModuleName": "PCPage/任务成员详情", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T15:54:54.4876825+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务成员详情.json", - "Pages\\任务\\任务成员详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "ServerCommand/修改任务预算工时", @@ -1162,42 +895,18 @@ }, { "ModuleName": "PCPage/流程中心", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T14:54:38.23352+08:00", "ModuleType": 1 }, { "ModuleName": "ServerCommand/更新任务参与人", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T15:34:05.7944177+08:00", "ModuleType": 15 }, { "ModuleName": "ServerCommand/同步任务参与人字段", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T15:42:09.2843007+08:00", "ModuleType": 15 }, { "ModuleName": "ServerCommand/同步项目参与人字段", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-06T15:48:43.7046172+08:00", "ModuleType": 15 } ] \ No newline at end of file diff --git a/ForguncyDB.sqlite3 b/ForguncyDB.sqlite3 index 93bec72f74d0a2c4d10236ce416ad3a351767293..e2f9e0cc04f7b08fc1615e93e003178e16f0ab66 100644 GIT binary patch delta 736 zcmYL{OH5Ni6o%)_+`cHZw-j0^ExjG8F3?6EU6?4fLN5Z*1&L9jkxO|P6Oczx;*MJ% ziHQsAS-8=SqI-K68aJd{Hf}J)1=g@(p^2}=ps?`V65>qeo5`G$|NQe<{tnAK@TetF zVT{FT9JEUDXji<#Qlk+EZMnpz9f*rv@mu^5U&XfA5}QS{%(G5hojq-taD}%~Mr(`^ zix47VLLfk>^%6Wzf?Fvm4%Ko@?74zshbd5Cur5}`eJDT%GFCuo2ZaK?Sf1@6%`uK! zaaqeD#9)N5!8VHK8WixjE^$_>UR!yH2HUrxxb7t#*kPo=X&J^%UTOe$GesRN%=lYw z!V@rP`I&k__u@OLfgg=%*!n4bz|%FD(huPY=~sN_H4nBYB-BwjgcFH%yPV=Jn0F3@VQHcPfphUWa*2 zLcLuapK1?z+DEmMcwSRQu&b7`lK4vc;wq_(gcAw4dvS3rKRv1U_d0|2P1+5n(349* z$X0g_>%)a)0Npvczk%7@mr^&VFW{`2g zZ+JRXHME;om8f|&h)4P)G*!=G^u5Fn`NR0FU-dTg73Q`@()EuSz%HnfSZCe6*7_aacO=pT`8un11 z`wKD5&VPa^Y71p(v9=c4zypI!D7+H}>EE0LVNPl|aBCal*s=6pn73OoH}~fsDPXVr delta 659 zcmYLFO-vI(6n<}Bw=K}0ZOdDEZ% z&GK#@NRW8t&^>T4YB&+Sa1i57O)p$LXp9DDmLl~4GvKe7)1 zgL3`Del0bj?Sol}D^l`OqgfcFAM}kr(?>d@21h&xBID(;lEJ?cs_ST1MbkmkBn|XQ z>g$pejY?_@Nb)OnkD|JY@zWQhV^Clc@Q_~6I#yv4FVvhQRnIB>)YQ?-Wvj>iYIdMo z)v6-tgHa)7aa2UbuBbo(MnRX3e<3R91;_+iQ6_EG6Lzv4e9_V|Bz?BYS@!Xxw2tla z)XlHchrFIvspEfk@=dgJ&K~y$XT#NO8^==#474KTQz5L6p}LJ{)g*0z7Yq>B=?W?$ z1qQvO4JrPCzqvV!5x!K^v8y%eLGg*FYJ`2fX%AzpC4DHR*`9eWGOA2F63gZbC$r~g z3Uj&nLOz@CbZ!TEXgYyvt9gEUPd*`M8$4x&l!){{&E=BLQ$>|}Gg0Yq3cKrUS8 z)7W?SJ2?vjY~6Z?{hV0c!?@d6J%Meo1!RgWY}Fj5dwRlMTzQP-6o)vsc7%hRxpVLv DDe 岗位时薪 > 成员时薪", - "7,18": "保存" + "3,3": "成员", + "3,19": "操作", + "4,19": "移除", + "7,1": "时薪权重：任务时薪 > 项目时薪 > 个人时薪", + "7,19": "保存" }, "Formulas": { - "9,1": "TEXTJOIN(\",\",1,C5)" + "9,1": "TEXTJOIN(\",\",1,D5)" }, "AttachInfos": { "1,1": { @@ -265,7 +268,7 @@ ] } ], - "ID": "c934ad2a-5331-42e9-b9de-31fab94773c4" + "ID": "9b2df581-fe6c-48bf-85a7-7622e38cfca6" }, { "CommandList": [ @@ -277,7 +280,7 @@ "BtnText": "知道了" } ], - "ID": "2475db15-160c-4598-8015-b1075b00c5ae" + "ID": "4995489e-4d0e-4a63-824e-61fc2ac5d2db" } ] }, @@ -387,7 +390,7 @@ "RowIndex": 3, "ColumnIndex": 1, "RowCount": 3, - "ColumnCount": 20, + "ColumnCount": 21, "DetailListViewInfo": { "ColumnOfDetailTable": "任务ID", "MasterTable": "任务表", @@ -406,11 +409,19 @@ } }, "4,2": { + "NameUsedInJavaScript": "ID", + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "ID", + "GUID": "ca57b3e5-5c1c-4557-9dd4-3609545c1754" + } + }, + "4,3": { "NameUsedInJavaScript": "成员", "BindingInfo": { "TableName": "任务成员表", "ColumnName": "参与人", - "GUID": "81dd6796-2408-403d-88f4-50555d01386c" + "GUID": "69880c69-c462-46e0-ba9f-4a2c71d0af81" }, "CellType": { "$type": "Forguncy.DropDownListCellType, ServerDesignerCommon", @@ -432,12 +443,12 @@ }, "DataValidationInfo": {} }, - "4,9": { + "4,10": { "NameUsedInJavaScript": "岗位ID", "BindingInfo": { "TableName": "任务成员表", "ColumnName": "岗位ID", - "GUID": "a8ef53da-a823-49bf-997c-e8e45ad57e77" + "GUID": "83c7818e-5c43-4ca6-a078-3bfbd3a40187" }, "CellType": { "$type": "Forguncy.DropDownListCellType, ServerDesignerCommon", @@ -522,7 +533,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=参与成员管理!J5" + "SerializeProperty": "=参与成员管理!K5" } }, "NullFormulaValueQueryPolicy": 0, @@ -585,7 +596,7 @@ }, "value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=参与成员管理!O5" + "SerializeProperty": "=参与成员管理!P5" }, "compareType": 1 } @@ -646,19 +657,19 @@ "UpdateRowType": 3 } ], - "ID": "d538bb51-1227-4fa6-96a4-80709493b4ba" + "ID": "2f789457-fbeb-4379-a4d9-836fcc30e3e1" } ] } ], - "ID": "526a55fc-e56f-43ec-ac95-41a5d05337cf" + "ID": "f76e09d5-ca40-43c9-ba21-5f3e943c5ec6" } ] } ] } }, - "4,14": { + "4,15": { "NameUsedInJavaScript": "任务时薪", "BindingInfo": { "TableName": "任务成员表", @@ -669,88 +680,113 @@ "$type": "Forguncy.NumberCellType, ServerDesignerCommon" } }, - "4,18": { + "4,19": { "NameUsedInJavaScript": "操作", "CellType": { "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", "CommandList": [ { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "任务成员表", - "UpdateType": "delete", - "ShowConfirm": true, - "ConfirmText": "您确定要移除该成员吗？" + "$type": "Forguncy.Model.UpdateListviewCommand, ServerDesignerCommon", + "ListviewName": "表格1", + "UpdateType": 2 } ], "Text": "移除", "ClickMode": 1 } }, - "7,18": { + "7,19": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "任务表", - "ShowConfirm": false, - "NextUpdateDataTableCommand": { - "TableName": "项目动态", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "项目动态", - "ColumnName": "项目ID", - "GUID": "38411657-ff8c-45e1-843f-71ca54e57bf4" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=参与成员管理!项目ID" - } - }, - { - "BindingInfo": { - "TableName": "项目动态", - "ColumnName": "项目动态", - "GUID": "e4eeef35-922c-47f2-a05c-ab02a81b5f17" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"任务[\"&参与成员管理!L10&\"]调整了参与成员\"" - } - }, - { - "BindingInfo": { - "TableName": "项目动态", - "ColumnName": "执行人", - "GUID": "58a6e19c-39ce-467a-a6c2-d9ab23e002a0" - }, - "Value": "%CurrentUser%" - } - ] - } - }, { "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "同步项目成员", + "ServerCommandName": "更新任务参与人", "Parameters": [ { "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "项目ID", + "ParamName": "任务ID", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=参与成员管理!项目ID" + "SerializeProperty": "=参与成员管理!任务ID" } + }, + { + "$type": "Forguncy.Model.RequestServerCommandListviewParam, ServerDesignerCommon", + "ParamName": "参与人列表", + "ListviewName": "表格1", + "Columns": [ + { + "ArrayItemName": "ID", + "Column": "ID" + }, + { + "ArrayItemName": "成员", + "Column": "成员" + }, + { + "ArrayItemName": "岗位", + "Column": "岗位ID" + }, + { + "ArrayItemName": "时薪", + "Column": "任务时薪" + } + ] } ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, "RequestAsync": true, "CheckDataValidation": false }, { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "Message": "操作完成" + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=参与成员管理!code" + } + ] + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=参与成员管理!msg" + } + } + ], + "ID": "9a36aef5-2e4c-4d15-a0f4-fc4928a06cc1" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=参与成员管理!msg" + }, + "BtnText": "知道了" + } + ], + "ID": "02215483-3608-4cf4-adfa-39a44d362e57" + } + ] } ], "Text": "保存", @@ -764,26 +800,19 @@ "IconSize": 14.0 } }, - "9,5": { + "9,6": { "BindingInfo": { "TableName": "任务表", "ColumnName": "ID", "GUID": "8817b380-324c-4770-9a5f-98948b913fd8" } }, - "9,8": { + "9,9": { "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", "GUID": "9a14b790-cd77-4a9e-9874-993b33bd65fe" } - }, - "9,11": { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务名称", - "GUID": "40fa4f0d-f166-4824-b34a-264e9a033c65" - } } }, "StyleDatas": { @@ -817,17 +846,21 @@ ] }, "CellStyles": { - "3,9": 0, - "3,14": 1, - "4,2": 0, - "4,9": 0, - "4,14": 1, - "4,18": 2, + "3,10": 0, + "3,15": 1, + "4,3": 0, + "4,10": 0, + "4,15": 1, + "4,19": 2, "7,1": 3, + "7,2": 3, + "9,12": 4, + "9,13": 4, "9,14": 4, "9,15": 4, "9,16": 4, - "9,17": 4 + "9,17": 4, + "9,18": 4 }, "SheetStyle": { "FontFamily": 0, @@ -835,21 +868,20 @@ } }, "Spans": [ - "1,1,1,20", - "4,18,1,3", - "9,1,1,4", - "4,2,1,7", - "4,14,1,4", - "9,5,1,3", - "4,9,1,5", - "9,8,1,3", - "5,1,1,20", - "7,18,1,3", - "9,11,1,3", - "3,2,1,7", - "3,9,1,5", - "3,14,1,4", - "3,18,1,3" + "1,1,1,21", + "4,19,1,3", + "9,1,1,5", + "4,3,1,7", + "4,15,1,4", + "9,6,1,3", + "4,10,1,5", + "9,9,1,3", + "5,1,1,21", + "7,19,1,3", + "3,3,1,7", + "3,10,1,5", + "3,15,1,4", + "3,19,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -887,11 +919,11 @@ "CustomNames": [ { "Name": "任务ID", - "Formula": "参与成员管理!$F$10" + "Formula": "参与成员管理!$G$10" }, { "Name": "项目ID", - "Formula": "参与成员管理!$I$10" + "Formula": "参与成员管理!$J$10" } ] -}//hJfROHhAgSsNFKdH/EWqeHAFKPWWYnCwdIjwDVcPjFC/Qm5ierRnMJEkuFEx+IqF2yjwtU4/P7x2rotLAl29H3aXsvm6tups4DRRYV3tG90mPH5GRC73sW4zziDQ7GjgDGpleNBuTm3/3ME5UEvtStF98qDPZ1LPcf3+rL8I6lqkDSSX5eRo/LhvRoVwoKu/rZHA3VQMmXnVbhWJygVw+CU4HhxYKtrC+W7aWfU59u0KalkI8aRrO3r7oLsTqRJmyrCNWUItZJyCc26frsjUpEEqOQpjlShI2mKUTIq8rLG2oJz15pgZzXCLND3hBBne87EogZLJW5bayiOelfYqjIR2xCQwbf1ekOv26u9lNFJF35vEgvxNldDWGX6xRAy1tc3NulrkL2PhzHfHHHS/Pmhqat1CROshinUv7q10BSZ8WaJ9AYw9iQnxLHZSWkl/8R0fjIKzIS4O3hUxShbOnhPHomu1O+M+CkxQK8QT/0IWeTQwGnln2LUBIFWjDKfH8zJ3FgPXlpL2VEh5wFgiwgEYKzs4X7AN3z1GWeJBLuIlIWBKwDtQWCzaLtrzny3G0p6kT1YruJ6y0rB3qNrxqEI5J5GeDdB7uTbIusm21poEMWSjypI6SqCYtPhRrZ7DIpqpet7i3P1MCU2t6XBbKPw71Fk+FodO+MxYnmguxo/yet9d1tY6XwZ65b8xtnGrp5i0HbgNwsRFwhXL86qlH3cmL6qqNyDfpyoD1A3zLCXSjkwGSA+RuBKMcR7LN0IjWUzZ5BnrkfM399XukRJ4QNjD/qrCRHSGDPERijJxEP9Zg5S1rzZpq2E1wSwJv7aQNn7RwCI5dw8Ywrs30/U4dB11kzHZPBkZkAJ/I0zMAREX9ob7mfj1CdETvIYfM9EGCLSC8C9gZjZ1mrp6jV6SSw==|920 \ No newline at end of file +}//q+xRbR5EEjzjv/YcJFz4H+lPzclYA8ZbJ3aoAms2zbsmggREDkfW/1a5rfxmdUZw4wTmYdUym/qgQhxQFixz86zd3/BP8jWPPqc2MRDS8IPb0EWt6f09fbhY2jTv8G1bX4ygz+f2ekoHGbYMD5yU8R3+bsm2h6pZmDy+n8inCYMnCNp+TDD6hbz6SqwuU1e/hrjgddW5AZd3/rtie7vOH+hi/0c8f/wut5w4FMy5VV+4STqzdlwXlndjrsW5auP/8yu7LHNg7ujnlyF5Ox6v9yny5QYMDEq7LqIgDhWzacHKcM9jDBOxai6dl/EQSMrOgCLDd2nHE5Yf3ZXUhw55qfxqHpEPCDXuim7EMzBFyFbtfRR3nEAkrM933cMrR/bVGb8OLq6id3AYD08bBGkp3IVmkS6bqpI6uQLGtQo8dR5/D8jSzR2LJpvEGx488umG8d5Oyx8YnB0HAEPj0Ofr8HiK30XbWKhdgWspQiSikwA2/IWcOXKeThau6NDwrXxyxl79V98Lf8tsD6sNXqmZmFKGWwap4+Jjm5wMO2XPwzmF50sXSdGeeS3gEn4hGCf7P+kJUoZGkSWqMDS/z8H6oVo9Xg1Q8fOvQ/wz7K8s0DscBM7wfhjLk7LvaK5C30YgWmzA6aWLkNjdEDVIDwRTO6lwVwshh+ZmFttOyBWos89Gas8+0CPzy3FHDrIdrnVmOsi2PtrYrH3CPfFp510u/HsR/oZDC1v0x/D2n2J3n9acPCsdCDpFs9kg7lT2To2wzNF+wmITNBOTMlRqY5YDDTmbK+1zq82vE2YZ3g37mLcMTcEpPQWxOc6yY7yMD/YIywNMUQYSFgqitiwuEJj/bgkCw9oQf1BJf+ko1kNj8LJTHA0HSd8OIq5r1Rm0tPBj1DZSPApxRY/Pmgn5EyWtSA==|920 \ No newline at end of file diff --git a/Pages/任务/参与成员管理.rd b/Pages/任务/参与成员管理.rd index dff339fe..538eec36 100644 --- a/Pages/任务/参与成员管理.rd +++ b/Pages/任务/参与成员管理.rd @@ -1,18 +1,18 @@ { "PageType": 0, - "ColumnCount": 22, + "ColumnCount": 23, "RowCount": 10, "Formulas": { - "9,1": "TEXTJOIN(\",\",1,C5)" + "9,1": "TEXTJOIN(\",\",1,D5)" }, "CustomNames": [ { "Name": "任务ID", - "Formula": "参与成员管理!$F$10" + "Formula": "参与成员管理!$G$10" }, { "Name": "项目ID", - "Formula": "参与成员管理!$I$10" + "Formula": "参与成员管理!$J$10" } ] } \ No newline at end of file diff --git a/Pages/任务/新增任务.json b/Pages/任务/新增任务.json index 7c16956e..685e9e42 100644 --- a/Pages/任务/新增任务.json +++ b/Pages/任务/新增任务.json @@ -243,7 +243,8 @@ }, "Formulas": { "1,1": "IFERROR(ODATA(\"任务表?$select=任务名称&$filter=ID eq \"&IF(ISBLANK(父任务ID),\"null\",父任务ID)&\"&$top=1\"),\"请输入任务标题\")", - "17,1": "\"预算\"&F6&\"工时\"" + "17,1": "\"预算\"&取项目工时核定方式&\"工时\"", + "23,4": "IFERROR(ODATA(\"项目表?$select=工时核定方式&$filter=ID eq \"&IF(ISBLANK(项目ID),\"null\",项目ID)),\"计划\")" }, "AttachInfos": { "1,37": { @@ -978,7 +979,7 @@ "ReloadData": true } ], - "ID": "1db9310d-e162-45b0-828f-d115f8138fef" + "ID": "3f1dad41-daaf-4e9b-bca1-3cae007418d2" }, { "CommandList": [ @@ -993,7 +994,7 @@ "BtnText": "知道了" } ], - "ID": "c2cda3fe-b5a2-40e0-bddd-38ca25da6d85" + "ID": "5e26915a-9a43-4a7e-9acd-cd0158a77a30" } ] } @@ -1477,7 +1478,8 @@ "12,21,7,18", "18,1,1,18", "5,5,1,14", - "9,1,1,18" + "9,1,1,18", + "23,4,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1511,6 +1513,10 @@ { "Name": "项目ID", "Formula": "新增任务!$B$13" + }, + { + "Name": "取项目工时核定方式", + "Formula": "新增任务!$E$24" } ] -}//Mp41C+8oc/O+ARIn3ih0GMbJpbI3Hznhl5igr9t8uhp75kxzyn6bXI856NHy072UaiXCfkj9IYzYes9aoco5SCL+fr+E96yBRJ3k0Psj0Yl1Nhi0TTlwM5WGU+lLYey4oROnSEbMwHphouzJ56jM1OmFYaB6SN7Z4eoA96sGJYcVlrncciqLpdddwWs8iACqr3u6PSEapeUAMc2coI+7wzUHAydTJlvrd77JVspi57/jU36qWf2GX3YEPzXMYun/yAOZrJ5IGd5tfpPcohO2WxyJBD7M7XZ+4EAaTzTeceLXju8JQ3Jh8Agwzm/je9TwG1VqOMh9+zFnPnGh4weFg8xC132x4VGFVTJJpRIVute/3Y1MVlt3P/KU/loCbjOODVKHWFBI7zV0sxMYoiRPX58HLP0UKpqZUn7ve9rydsFOBdT3+45mpq1BYFBMQDOvXBuwrluUpj9rlx3y9/f2d/gUc0Y2C6eXlXUutpTlMZxbJNLfEojXIdO8g+u67A9HeSxM/XsIzhg42ahEJNxYBAaDtqnlyV5o/g7wGOq12M8EjUI2B8ornM61tBhYjQhP6ZCzp0pMKtlwp+ShIbTrXynX6vrk0IqI6cr0Q2NhFIq+xlRCu1EwmpcFg948Pwo7K/5uhjFQHwcqjSfFY4BT+RjeSrP49A3Z7GHbya4ktFcbSaY/A6bVdkeKSgy/5EhVwYw2JdjIjURP17pNnGRdXrvQVkFbKKKdHvvy3+FDhfRtZp7W6Xs+nt+2ltn4pFIOgKC3dWT8d8420V9ztEyZckYD8UpKzeq8e+LW6ZmLwhDDkigs87K29Q8xuu6HGb8Qo7o51IY/XkRoiHWjGtJWzKeXsKV2gAzc88NTETynawkSFL5vM5IrOuU94AmSU1zyrcpmw9nb9cu0kC209lG8ig==|920 \ No newline at end of file +}//zirpIObthEpLXOeBYQe5JJ+Gd60sjxMVpy6IQbf1wHGQC7tyq92iYJWukUFqmjg4pQyIzUt4ZJAoxsE2d6XyVPDTNnboi1aqom4Eh42UUtvpeyH9XYiX5L0hJoDH67MOctegAxOZNhxg6tMSALUwMg/vKH0TWjsrYE/HcgiwcQ2/Ie7wZ3FSI0Nva/TZmvyDaHxePFqldPX9KtpwnTvjKZI7/vWfq55N+ZlxSlleQ/lmV/2yvG81PX0pDe1d9C2cEZgEmJ732Y7VrW2hJ9L0oz3yOI+v9NldK4FQ0Aw/G1XR8+BsOduFF3Zn4TdX8gVLLS1Pl9GkjWTqewcSEsexOjv64MT3lhv0j+2acW8GIqZE5ltydFYvu1eoeP0pUICb9sHvQI0GrbhFDROxyd81RVdp7RFwU5QHFvo/0NxzJcGzVM2RytPiep796xlqNLTFJrnHruIpg7y0Mgd55Eo+4o7CYeNEI4RTcxroK9PgQQ1qnzKfrOBhDw7Q9+2Dd2OsrIxvO5ANpwYRJC29bq2BXlj/eRbcBTbZn4MLpN7iLTc6Ye6PyUo+VBG+oKdvURvdnUwSI0VKl3e5ZCSDt0juufBoy9n3oic+ICeFrYdZkH3KuHkATlFZKlOFLAdo3pBwarWYCz/JegVO+50eZxedoixDRQ8qxq95hN89h+9CbmQrSClwb//XsdqgCbbg4FR8MZaGLwhxuKsKG+yl3woQQxxuiwtDuv83Fg+uFMxJp6mPX5k63vBLF+kxrXZLqiU5AhKhctKcRJ8aZ2v0ZIFil1fJmGaPmzen4itnFHR0Uob53MLQlHHyutKir+hi/sUElowkhLi4ZJjXlEf/ysawqe2FQ9kFOvl4/Io9DU7Oo5hElkcx4saOVb4LZ3eMIhkQmVThRyQIqtPC/fza6Qit8A==|920 \ No newline at end of file diff --git a/Pages/任务/新增任务.rd b/Pages/任务/新增任务.rd index 3866b4da..bbca4c52 100644 --- a/Pages/任务/新增任务.rd +++ b/Pages/任务/新增任务.rd @@ -4,7 +4,8 @@ "RowCount": 24, "Formulas": { "1,1": "IFERROR(ODATA(\"任务表?$select=任务名称&$filter=ID eq \"&IF(ISBLANK(父任务ID),\"null\",父任务ID)&\"&$top=1\"),\"请输入任务标题\")", - "17,1": "\"预算\"&F6&\"工时\"" + "17,1": "\"预算\"&取项目工时核定方式&\"工时\"", + "23,4": "IFERROR(ODATA(\"项目表?$select=工时核定方式&$filter=ID eq \"&IF(ISBLANK(项目ID),\"null\",项目ID)),\"计划\")" }, "CustomNames": [ { @@ -14,6 +15,10 @@ { "Name": "项目ID", "Formula": "新增任务!$B$13" + }, + { + "Name": "取项目工时核定方式", + "Formula": "新增任务!$E$24" } ] } \ No newline at end of file diff --git a/Pages/流程页面文件夹/FGC_我发起的.json b/Pages/流程页面文件夹/FGC_我发起的.json index 5b3a5930..6f219c42 100644 --- a/Pages/流程页面文件夹/FGC_我发起的.json +++ b/Pages/流程页面文件夹/FGC_我发起的.json @@ -3,25 +3,20 @@ "RowColumnAttachedInfos": { "0": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 24.0 } }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 32.0 } }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 24.0 } }, "3": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } - }, - "4": { "GridRowColumnDefinition": { "DesignLengthInPixel": 40.0, "Mode": 2, @@ -33,7 +28,7 @@ } } }, - "5": { + "4": { "GridRowColumnDefinition": { "DesignLengthInPixel": 50.0, "Mode": 2, @@ -45,6 +40,18 @@ } } }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, "6": { "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0, @@ -310,6 +317,21 @@ } }, "28": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + } + }, + "Count": 29 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + }, + "1": { "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0, "Mode": 2, @@ -321,21 +343,6 @@ } } }, - "29": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } - } - }, - "Count": 30 - }, - "Cols": { - "RowColumnAttachedInfos": { - "1": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } - }, "2": { "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0, @@ -939,13 +946,7 @@ "52": { "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "IsHidden": true } }, "53": { @@ -974,8 +975,7 @@ }, "57": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "IsHidden": true + "DesignLengthInPixel": 20.0 } }, "58": { @@ -1002,35 +1002,25 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0 } - }, - "63": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } - }, - "64": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } } }, "InLogicalVisibleIndexes": [ + 52, 53, 54, 55, - 56, - 57 + 56 ], - "Count": 65 + "Count": 63 }, "Values": { - "1,2": "我发起的", - "1,58": "发起流程", - "4,4": "流程", - "4,58": "查看" + "1,1": "我发起的", + "1,57": "发起流程", + "3,3": "流程", + "3,57": "查看" }, "AttachInfos": { - "1,58": { + "1,57": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -1038,7 +1028,7 @@ "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", "PopupDisplayMode": 1, "Placement": { - "SerializeProperty": "=FGC_我发起的!BG2" + "SerializeProperty": "=FGC_我发起的!BF2" }, "PageName": "FGC_流程列表" } @@ -1047,12 +1037,12 @@ "TemplateKey": "流程样式" } }, - "4,2": { + "3,1": { "ListViewInfo": { "Name": "表格1", "TableName": "ACT_HI_PROCINST_View", - "RowIndex": 4, - "ColumnIndex": 2, + "RowIndex": 3, + "ColumnIndex": 1, "RowCount": 25, "ColumnCount": 61, "SqlCondition": { @@ -1086,7 +1076,7 @@ "ColumnOperation": 2 } }, - "5,4": { + "4,3": { "BindingInfo": { "TableName": "ACT_HI_PROCINST_View", "ColumnName": "PROC_DEF_ID_", @@ -1098,35 +1088,35 @@ } } }, - "5,14": { + "4,13": { "BindingInfo": { "TableName": "ACT_HI_PROCINST_View", "ColumnName": "START_TIME_", "GUID": "7001549a-3e47-4a68-84ee-a9a4eec7f5eb" } }, - "5,24": { + "4,23": { "BindingInfo": { "TableName": "ACT_HI_PROCINST_View", "ColumnName": "END_TIME_", "GUID": "684e7010-9dfb-4ae0-af38-7e8f2ea5d78c" } }, - "5,34": { + "4,33": { "BindingInfo": { "TableName": "ACT_HI_PROCINST_View", "ColumnName": "DELETE_REASON_", "GUID": "b9c0b0e0-0da7-440b-9b41-8d6d1b50a980" } }, - "5,53": { + "4,52": { "BindingInfo": { "TableName": "ACT_HI_PROCINST_View", "ColumnName": "ID_", "GUID": "6cf6afe4-e66b-411c-bbcc-81b9da236800" } }, - "5,58": { + "4,57": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ @@ -1148,7 +1138,7 @@ "StyleDatas": { "Styles": [ { - "FontSize": 21.333333333333332, + "FontSize": 18.666666666666664, "FontWeight": 0, "Foreground": 1 }, @@ -1156,9 +1146,6 @@ "FontFamily": 2, "Formatter": 3 }, - { - "FontFamily": 2 - }, { "HorizontalAlignment": 4 }, @@ -1237,6 +1224,9 @@ "TextIndent": 20, "HorizontalAlignment": 4 }, + { + "FontFamily": 2 + }, { "FontSize": 13.333333333333332, "Foreground": 9, @@ -1275,139 +1265,136 @@ ] }, "CellStyles": { - "1,2": 0, - "1,58": 1, - "2,57": 2, - "3,2": 3, - "3,3": 3, - "3,4": 3, - "3,5": 3, - "3,6": 3, - "3,7": 3, - "3,8": 3, - "3,9": 3, - "3,10": 3, - "3,11": 3, - "3,12": 3, - "3,13": 3, - "3,22": 4, - "3,23": 4, - "3,24": 4, - "3,25": 4, - "3,26": 4, - "3,27": 4, - "3,28": 4, - "3,29": 4, - "3,30": 4, - "3,31": 4, - "3,32": 4, - "3,33": 4, - "3,34": 4, - "3,35": 4, - "3,36": 4, - "3,37": 4, - "3,38": 4, - "3,39": 4, - "3,40": 4, - "3,41": 4, - "3,42": 4, - "3,43": 4, - "3,44": 4, - "3,45": 4, - "3,46": 4, - "3,47": 4, - "3,48": 4, - "3,49": 4, - "3,50": 4, - "3,51": 4, - "3,52": 4, - "3,53": 4, - "3,54": 4, - "3,55": 4, - "3,56": 4, - "3,57": 4, - "3,58": 4, - "3,60": 5, - "3,61": 5, - "3,62": 5, - "3,63": 5, - "3,64": 5, + "1,1": 0, + "1,57": 1, + "2,1": 2, + "2,2": 2, + "2,3": 2, + "2,4": 2, + "2,5": 2, + "2,6": 2, + "2,7": 2, + "2,8": 2, + "2,9": 2, + "2,10": 2, + "2,11": 2, + "2,12": 2, + "2,21": 3, + "2,22": 3, + "2,23": 3, + "2,24": 3, + "2,25": 3, + "2,26": 3, + "2,27": 3, + "2,28": 3, + "2,29": 3, + "2,30": 3, + "2,31": 3, + "2,32": 3, + "2,33": 3, + "2,34": 3, + "2,35": 3, + "2,36": 3, + "2,37": 3, + "2,38": 3, + "2,39": 3, + "2,40": 3, + "2,41": 3, + "2,42": 3, + "2,43": 3, + "2,44": 3, + "2,45": 3, + "2,46": 3, + "2,47": 3, + "2,48": 3, + "2,49": 3, + "2,50": 3, + "2,51": 3, + "2,52": 3, + "2,53": 3, + "2,54": 3, + "2,55": 3, + "2,56": 3, + "2,57": 3, + "2,59": 4, + "2,60": 4, + "2,61": 4, + "2,62": 4, + "3,1": 5, + "3,2": 6, + "3,3": 7, + "3,13": 8, + "3,23": 8, + "3,33": 8, + "3,52": 9, + "3,57": 10, + "4,1": 11, "4,2": 6, - "4,3": 7, - "4,4": 8, - "4,14": 9, - "4,24": 9, - "4,34": 9, - "4,53": 10, - "4,58": 11, - "5,2": 12, - "5,3": 7, - "5,4": 13, - "5,14": 14, - "5,15": 2, - "5,16": 2, - "5,17": 2, - "5,18": 2, - "5,19": 2, - "5,20": 2, - "5,21": 2, - "5,22": 2, - "5,23": 2, - "5,24": 14, - "5,25": 2, - "5,26": 2, - "5,27": 2, - "5,28": 2, - "5,29": 2, - "5,30": 2, - "5,31": 2, - "5,32": 2, - "5,33": 2, - "5,34": 15, - "5,35": 16, - "5,36": 16, - "5,37": 16, - "5,38": 16, - "5,39": 16, - "5,40": 16, - "5,41": 16, - "5,42": 16, - "5,43": 16, - "5,44": 16, - "5,45": 16, - "5,53": 17, - "5,54": 2, - "5,55": 2, - "5,56": 2, - "5,57": 2, - "5,58": 18 + "4,3": 12, + "4,13": 13, + "4,14": 14, + "4,15": 14, + "4,16": 14, + "4,17": 14, + "4,18": 14, + "4,19": 14, + "4,20": 14, + "4,21": 14, + "4,22": 14, + "4,23": 13, + "4,24": 14, + "4,25": 14, + "4,26": 14, + "4,27": 14, + "4,28": 14, + "4,29": 14, + "4,30": 14, + "4,31": 14, + "4,32": 14, + "4,33": 15, + "4,34": 16, + "4,35": 16, + "4,36": 16, + "4,37": 16, + "4,38": 16, + "4,39": 16, + "4,40": 16, + "4,41": 16, + "4,42": 16, + "4,43": 16, + "4,44": 16, + "4,52": 17, + "4,53": 14, + "4,54": 14, + "4,55": 14, + "4,56": 14, + "4,57": 18 }, "SheetStyle": { "FontFamily": 2 } }, "Spans": [ - "5,2,1,2", - "5,4,1,10", - "5,14,1,10", - "5,53,1,5", - "5,24,1,10", - "5,34,1,19", - "5,58,1,5", - "1,2,2,14", - "1,58,2,5", - "6,2,23,61", - "4,2,1,2", - "4,4,1,10", - "4,14,1,10", - "4,24,1,10", - "4,34,1,19", - "4,53,1,5", - "4,58,1,5" + "4,1,1,2", + "4,3,1,10", + "4,13,1,10", + "4,52,1,5", + "4,23,1,10", + "4,33,1,19", + "4,57,1,5", + "1,1,1,14", + "1,57,1,5", + "5,1,23,61", + "3,1,1,2", + "3,3,1,10", + "3,13,1,10", + "3,23,1,10", + "3,33,1,19", + "3,52,1,5", + "3,57,1,5" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", - "MasterPageName": "FGC_流程中心", "MobilePageName": "FGC_我发起的_手机版", "Title": "我发起的", "AuthorizeInfo": { @@ -1421,4 +1408,4 @@ "PaperSize": {}, "Margin": {} } -}//MtY5afooXJcpAOPXhF2NaGuewepPnHBM9RyRme+iJXh4vN5bC683+HZ+qVsFP2NugOihG4Ccnspj46bCJFGUJdCekwxjzzzZl0zc47xTtHBm5gxTP3LcoSfIoOlXgvVfc99SAPZ0rm2SPDxeCY4u9f11AsYK2DwU2mse/KJRnVRBbk3roZiQ6ECrludqR3RyyXpGjsGnrPRt6F1ab1fhfYTV0/i3v8BkpCOa9cjfMKvaZg0ge8UnjNPYK5BbeHkmjWBiFMg868ixM1Jbl9JLtUIxqiIQ/B3uv0sqybl2eBpabSN1wCd9TbRERh734rQkW4S2xNs8AEBO6Vb9Xir0uAg8F5zvanl8wqL66U8hIma4jO+jUg1FP1qtDCQUci43LajlzgxNjcQtO4y6au1UNp5mJc8RrLr98UOCZpH1A8PnUZfHZHVwKYiS6KWEk1J0CZ5QseibffrRKGbHaxDRJapOFwPpcM4RjF9lXFoUcmQgriRdyBEUHdAhI35U80LuGFuwOlWECa2c0abfKEi482EA1HAKPhbeZWK0vAukH5qKY+yYUYnu4tz/8orzXUH1GAcUYw0jWO95n6HHksij+hw2IHVdNtMC7EKdpcbh3UFyXYZJjH6jYA/pVkNsFvJoT2ZIHrcrj9x7vFmFCqxPO+TVavfZSwmqgvDWUrwRhMkbw1oiPvJSbEn15mHosLrH9yywAd00HKH/vcCBwT5k+0Th7HbVnLR0CrxtMkS3Tq58XG7x/SeKYlOXG2GX/bTYhhLn3JCx93Q4ShcUy1tenCq09LqUPBAZ8ZNf+P6KmeT0M3iospbCZNsYHZZowoypVYNfb7+Llr7eYnVZ8BR5QW2hiod+RtgX4t8WMk0it9WNzXCC6aVkEWtQP6p5YaGylOUHpNwJJ/LspCx0RFB3jg==|920 \ No newline at end of file +}//Z9/XbwVmg1D3MwNPNZ9jmmVIMs2dxPrlXN52snrGieTNGJWdsi6wk0nHvWAsADDWemsBgVbiT4+mEAT17UFabkVXdLPSQZ3kxj20MDf8cdg0abm5+3/Cj+B88F28f9ChMFJ5qCPWvQ/hg+iTQvOxnz9TuQyYU3k7n96R4uQPz71xn3QKdHhouFsfnCoG/V7c/PHBKmVvfZUV4Z6T7EfjGeQiu19R6ggeQpbXp4lW65z16RlK73RfBtf2CSCm9kkwHmUUTUhWmh4Q6XtBFBSXP+RHOeZpmZTcY1v3U0IYmKuVWu2U5kTEHm07VKx9/dc8Ajc/88V6Lmmhpmt9VCtD1m7Vkjz/FXLmNUdyAyHWewqc1P7OikYiVdUh+twnqJeyVVSmpyz7DvHPVEPCbN2aM5k/Tuiw8S8gvv6LogH2U/X19Ircj7l4Yqr27YKM0rhxvHvigWj/ZKlhC0ariwIfFGeQWaZn5P1Ijqeirs21KMKzvW+fb4YTdDZpb6EskWgburRmp2PRzqCJM+AXRKnpBxEkx/LwwinSL+BI6zjd5cIX1DqRA6g1zjkRCNEhwe4csJvtvdRjaoBB0LDe820lOrz9dJcp4bsJASxKl9L4p6MKB7CGX78tuhYYysZMY7xu88YCoKMr4/FnEvh3F29rjISXmTddqDG3lJxyhfYgDG+05uN9zb69ryuLRjf5CzMtlIOLlxlVy5E39xwlBH513LG+YLrard9lzwZoUQUL6nrAzvMwoo0Qqix1tHH1ZTBzKWckCPSv6SXeVTP1QjTMUlqc/zpcor/Xul9PMMXZ3jTU8zZ1DqQ0rWJDcnAjiqSoNuKnZcQb1Rdp8qkQjmcd+b0CzyToWRwXhagnl0MDQ9wM1RBMe1Ria+uDNbdN5UfJ/5g/PHJwNN4+hya4/fWtSg==|920 \ No newline at end of file diff --git a/Pages/流程页面文件夹/FGC_我发起的.rd b/Pages/流程页面文件夹/FGC_我发起的.rd index 2b070ff3..370df2ad 100644 --- a/Pages/流程页面文件夹/FGC_我发起的.rd +++ b/Pages/流程页面文件夹/FGC_我发起的.rd @@ -1,5 +1,5 @@ { "PageType": 0, - "ColumnCount": 65, - "RowCount": 30 + "ColumnCount": 63, + "RowCount": 29 } \ No newline at end of file diff --git a/Pages/流程页面文件夹/FGC_我委托的.json b/Pages/流程页面文件夹/FGC_我委托的.json index 41771549..857cf6e4 100644 --- a/Pages/流程页面文件夹/FGC_我委托的.json +++ b/Pages/流程页面文件夹/FGC_我委托的.json @@ -3,15 +3,20 @@ "RowColumnAttachedInfos": { "0": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 24.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 } }, "3": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } - }, - "4": { "GridRowColumnDefinition": { "DesignLengthInPixel": 40.0, "Mode": 2, @@ -23,7 +28,7 @@ } } }, - "5": { + "4": { "GridRowColumnDefinition": { "DesignLengthInPixel": 50.0, "Mode": 2, @@ -35,6 +40,18 @@ } } }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, "6": { "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0, @@ -298,8 +315,13 @@ "Value": 1.0 } } - }, - "28": { + } + }, + "Count": 29 + }, + "Cols": { + "RowColumnAttachedInfos": { + "1": { "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0, "Mode": 2, @@ -310,16 +332,6 @@ "Value": 1.0 } } - } - }, - "Count": 30 - }, - "Cols": { - "RowColumnAttachedInfos": { - "0": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } }, "2": { "GridRowColumnDefinition": { @@ -930,7 +942,8 @@ }, "MaxLength": { "Value": 1.0 - } + }, + "IsHidden": true } }, "53": { @@ -1059,8 +1072,7 @@ }, "MaxLength": { "Value": 1.0 - }, - "IsHidden": true + } } }, "63": { @@ -1110,26 +1122,10 @@ "Value": 1.0 } } - }, - "67": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "69": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } } }, "InLogicalVisibleIndexes": [ + 52, 53, 54, 55, @@ -1138,24 +1134,23 @@ 58, 59, 60, - 61, - 62 + 61 ], - "Count": 70 + "Count": 68 }, "Values": { - "1,2": "我委托的", - "4,4": "流程", - "4,14": "任务名称", - "4,63": "查看" + "1,1": "我委托的", + "3,3": "流程", + "3,13": "任务名称", + "3,62": "查看" }, "AttachInfos": { - "4,2": { + "3,1": { "ListViewInfo": { "Name": "表格1", "TableName": "ACT_HI_COMMENT_View", - "RowIndex": 4, - "ColumnIndex": 2, + "RowIndex": 3, + "ColumnIndex": 1, "RowCount": 25, "ColumnCount": 66, "SqlCondition": { @@ -1212,7 +1207,7 @@ "ColumnOperation": 2 } }, - "5,4": { + "4,3": { "BindingInfo": { "TableName": "ACT_HI_COMMENT_View", "ColumnName": "PROC_INST_ID_", @@ -1229,7 +1224,7 @@ } } }, - "5,14": { + "4,13": { "BindingInfo": { "TableName": "ACT_HI_COMMENT_View", "ColumnName": "TASK_ID_", @@ -1241,7 +1236,7 @@ } } }, - "5,24": { + "4,23": { "BindingInfo": { "TableName": "ACT_HI_COMMENT_View", "ColumnName": "TASK_ID_", @@ -1253,7 +1248,7 @@ } } }, - "5,34": { + "4,33": { "BindingInfo": { "TableName": "ACT_HI_COMMENT_View", "ColumnName": "TASK_ID_", @@ -1265,7 +1260,7 @@ } } }, - "5,44": { + "4,43": { "BindingInfo": { "TableName": "ACT_HI_COMMENT_View", "ColumnName": "TASK_ID_", @@ -1282,21 +1277,21 @@ } } }, - "5,53": { + "4,52": { "BindingInfo": { "TableName": "ACT_HI_COMMENT_View", "ColumnName": "TASK_ID_", "GUID": "233c641d-4b03-4ca1-8c19-d90f215819ac" } }, - "5,58": { + "4,57": { "BindingInfo": { "TableName": "ACT_HI_COMMENT_View", "ColumnName": "PROC_INST_ID_", "GUID": "05184ccb-8a71-4cc2-8ced-c0bdf8f6a200" } }, - "5,63": { + "4,62": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ @@ -1311,7 +1306,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=FGC_我委托的!BB6" + "SerializeProperty": "=FGC_我委托的!BA5" } } }, @@ -1337,7 +1332,7 @@ }, { "FontFamily": 0, - "FontSize": 21.333333333333332, + "FontSize": 18.666666666666664, "FontWeight": 1, "Foreground": 2, "Formatter": 3 @@ -1423,29 +1418,96 @@ ] }, "CellStyles": { + "0,1": 0, "0,2": 0, - "0,3": 0, - "1,2": 1, - "3,2": 2, - "3,3": 2, - "4,2": 3, - "4,4": 4, - "4,14": 4, - "4,24": 4, - "4,34": 4, - "4,44": 5, - "4,53": 5, - "4,58": 5, - "4,63": 6, - "5,2": 7, - "5,4": 8, - "5,14": 8, - "5,24": 9, - "5,34": 9, - "5,44": 10, - "5,53": 10, - "5,58": 10, - "5,63": 11, + "1,1": 1, + "2,1": 2, + "2,2": 2, + "3,1": 3, + "3,3": 4, + "3,13": 4, + "3,23": 4, + "3,33": 4, + "3,43": 5, + "3,52": 5, + "3,57": 5, + "3,62": 6, + "4,1": 7, + "4,3": 8, + "4,13": 8, + "4,23": 9, + "4,33": 9, + "4,43": 10, + "4,52": 10, + "4,57": 10, + "4,62": 11, + "5,1": 0, + "5,2": 0, + "5,3": 0, + "5,4": 0, + "5,5": 0, + "5,6": 0, + "5,7": 0, + "5,8": 0, + "5,9": 0, + "5,10": 0, + "5,11": 0, + "5,12": 0, + "5,13": 0, + "5,14": 0, + "5,15": 0, + "5,16": 0, + "5,17": 0, + "5,18": 0, + "5,19": 0, + "5,20": 0, + "5,21": 0, + "5,22": 0, + "5,23": 0, + "5,24": 0, + "5,25": 0, + "5,26": 0, + "5,27": 0, + "5,28": 0, + "5,29": 0, + "5,30": 0, + "5,31": 0, + "5,32": 0, + "5,33": 0, + "5,34": 0, + "5,35": 0, + "5,36": 0, + "5,37": 0, + "5,38": 0, + "5,39": 0, + "5,40": 0, + "5,41": 0, + "5,42": 0, + "5,43": 0, + "5,44": 0, + "5,45": 0, + "5,46": 0, + "5,47": 0, + "5,48": 0, + "5,49": 0, + "5,50": 0, + "5,51": 0, + "5,52": 0, + "5,53": 0, + "5,54": 0, + "5,55": 0, + "5,56": 0, + "5,57": 0, + "5,58": 0, + "5,59": 0, + "5,60": 0, + "5,61": 0, + "5,62": 0, + "5,63": 0, + "5,64": 0, + "5,65": 0, + "5,66": 0, + "6,1": 0, "6,2": 0, "6,3": 0, "6,4": 0, @@ -1511,7 +1573,7 @@ "6,64": 0, "6,65": 0, "6,66": 0, - "6,67": 0, + "7,1": 0, "7,2": 0, "7,3": 0, "7,4": 0, @@ -1577,7 +1639,7 @@ "7,64": 0, "7,65": 0, "7,66": 0, - "7,67": 0, + "8,1": 0, "8,2": 0, "8,3": 0, "8,4": 0, @@ -1643,7 +1705,7 @@ "8,64": 0, "8,65": 0, "8,66": 0, - "8,67": 0, + "9,1": 0, "9,2": 0, "9,3": 0, "9,4": 0, @@ -1709,7 +1771,7 @@ "9,64": 0, "9,65": 0, "9,66": 0, - "9,67": 0, + "10,1": 0, "10,2": 0, "10,3": 0, "10,4": 0, @@ -1775,7 +1837,7 @@ "10,64": 0, "10,65": 0, "10,66": 0, - "10,67": 0, + "11,1": 0, "11,2": 0, "11,3": 0, "11,4": 0, @@ -1841,7 +1903,7 @@ "11,64": 0, "11,65": 0, "11,66": 0, - "11,67": 0, + "12,1": 0, "12,2": 0, "12,3": 0, "12,4": 0, @@ -1907,7 +1969,7 @@ "12,64": 0, "12,65": 0, "12,66": 0, - "12,67": 0, + "13,1": 0, "13,2": 0, "13,3": 0, "13,4": 0, @@ -1973,7 +2035,7 @@ "13,64": 0, "13,65": 0, "13,66": 0, - "13,67": 0, + "14,1": 0, "14,2": 0, "14,3": 0, "14,4": 0, @@ -2039,7 +2101,7 @@ "14,64": 0, "14,65": 0, "14,66": 0, - "14,67": 0, + "15,1": 0, "15,2": 0, "15,3": 0, "15,4": 0, @@ -2105,7 +2167,7 @@ "15,64": 0, "15,65": 0, "15,66": 0, - "15,67": 0, + "16,1": 0, "16,2": 0, "16,3": 0, "16,4": 0, @@ -2171,7 +2233,7 @@ "16,64": 0, "16,65": 0, "16,66": 0, - "16,67": 0, + "17,1": 0, "17,2": 0, "17,3": 0, "17,4": 0, @@ -2237,7 +2299,7 @@ "17,64": 0, "17,65": 0, "17,66": 0, - "17,67": 0, + "18,1": 0, "18,2": 0, "18,3": 0, "18,4": 0, @@ -2303,7 +2365,7 @@ "18,64": 0, "18,65": 0, "18,66": 0, - "18,67": 0, + "19,1": 0, "19,2": 0, "19,3": 0, "19,4": 0, @@ -2369,7 +2431,7 @@ "19,64": 0, "19,65": 0, "19,66": 0, - "19,67": 0, + "20,1": 0, "20,2": 0, "20,3": 0, "20,4": 0, @@ -2435,7 +2497,7 @@ "20,64": 0, "20,65": 0, "20,66": 0, - "20,67": 0, + "21,1": 0, "21,2": 0, "21,3": 0, "21,4": 0, @@ -2501,7 +2563,7 @@ "21,64": 0, "21,65": 0, "21,66": 0, - "21,67": 0, + "22,1": 0, "22,2": 0, "22,3": 0, "22,4": 0, @@ -2567,7 +2629,7 @@ "22,64": 0, "22,65": 0, "22,66": 0, - "22,67": 0, + "23,1": 0, "23,2": 0, "23,3": 0, "23,4": 0, @@ -2633,7 +2695,7 @@ "23,64": 0, "23,65": 0, "23,66": 0, - "23,67": 0, + "24,1": 0, "24,2": 0, "24,3": 0, "24,4": 0, @@ -2699,7 +2761,7 @@ "24,64": 0, "24,65": 0, "24,66": 0, - "24,67": 0, + "25,1": 0, "25,2": 0, "25,3": 0, "25,4": 0, @@ -2765,7 +2827,7 @@ "25,64": 0, "25,65": 0, "25,66": 0, - "25,67": 0, + "26,1": 0, "26,2": 0, "26,3": 0, "26,4": 0, @@ -2831,7 +2893,7 @@ "26,64": 0, "26,65": 0, "26,66": 0, - "26,67": 0, + "27,1": 0, "27,2": 0, "27,3": 0, "27,4": 0, @@ -2896,74 +2958,7 @@ "27,63": 0, "27,64": 0, "27,65": 0, - "27,66": 0, - "27,67": 0, - "28,2": 0, - "28,3": 0, - "28,4": 0, - "28,5": 0, - "28,6": 0, - "28,7": 0, - "28,8": 0, - "28,9": 0, - "28,10": 0, - "28,11": 0, - "28,12": 0, - "28,13": 0, - "28,14": 0, - "28,15": 0, - "28,16": 0, - "28,17": 0, - "28,18": 0, - "28,19": 0, - "28,20": 0, - "28,21": 0, - "28,22": 0, - "28,23": 0, - "28,24": 0, - "28,25": 0, - "28,26": 0, - "28,27": 0, - "28,28": 0, - "28,29": 0, - "28,30": 0, - "28,31": 0, - "28,32": 0, - "28,33": 0, - "28,34": 0, - "28,35": 0, - "28,36": 0, - "28,37": 0, - "28,38": 0, - "28,39": 0, - "28,40": 0, - "28,41": 0, - "28,42": 0, - "28,43": 0, - "28,44": 0, - "28,45": 0, - "28,46": 0, - "28,47": 0, - "28,48": 0, - "28,49": 0, - "28,50": 0, - "28,51": 0, - "28,52": 0, - "28,53": 0, - "28,54": 0, - "28,55": 0, - "28,56": 0, - "28,57": 0, - "28,58": 0, - "28,59": 0, - "28,60": 0, - "28,61": 0, - "28,62": 0, - "28,63": 0, - "28,64": 0, - "28,65": 0, - "28,66": 0, - "28,67": 0 + "27,66": 0 }, "SheetStyle": { "FontFamily": 0, @@ -2974,30 +2969,29 @@ } }, "Spans": [ - "1,2,2,8", - "5,2,1,2", - "6,2,23,66", - "5,14,1,10", - "5,24,1,10", - "5,34,1,10", - "5,44,1,9", - "5,53,1,5", - "5,63,1,5", - "5,4,1,10", - "5,58,1,5", - "4,2,1,2", - "4,4,1,10", - "4,14,1,10", - "4,24,1,10", - "4,34,1,10", - "4,44,1,9", - "4,53,1,5", - "4,58,1,5", - "4,63,1,5" + "1,1,1,8", + "4,1,1,2", + "4,13,1,10", + "4,23,1,10", + "4,33,1,10", + "4,43,1,9", + "4,52,1,5", + "4,62,1,5", + "4,3,1,10", + "4,57,1,5", + "5,1,23,66", + "3,1,1,2", + "3,3,1,10", + "3,13,1,10", + "3,23,1,10", + "3,33,1,10", + "3,43,1,9", + "3,52,1,5", + "3,57,1,5", + "3,62,1,5" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", - "MasterPageName": "FGC_流程中心", "MobilePageName": "FGC_我委托的_手机版", "Title": "我委托的", "AuthorizeInfo": { @@ -3010,4 +3004,4 @@ "PaperSize": {}, "Margin": {} } -}//2rrqtRv4hHTpH9VDfLG3xeteierUs7KYZjjoygibTAEV60gXqM0NwUkRbClzqonIJ7A8QnZK3ni6OfNMEggnoDFAqkSbyVK1F1iYw+AtNP86CQOehsO0/Gddwjtd6e2Cw2hj6im/09HTw4s/lx5vkQq7L0b43X4WiGx5DZX/krF+6T6nFdg4jlJqaDXkjdlvPuiUonlh8dZHV0ASIC5ts2tl37BIAID56jn/xzbMhdYycwZpAp2HZwL24WXjYK3Un5ZBDQzxMFJTHjty3I9qa6++pykPML2dKIYBLvSXHSUN0YLxGmjp8W4FsWzKnfrUrRLmfN6n0R25yvI3prIODNAL2P8EU/n6jJ9qKQia0CJNWysN+0+vEe0fewoWj7EC6el+W+Js8NMOr/Z/igfCP6Q9MbMFGehXlEBHfwszZn4GSft3ceT15Vt1kn8mLQblZzOYUhqL2XshUG2vF36y8AZAqBBeekK+1CV1RMw/GtcDngdhBkIYZhBbEVdDLEmDQkPP9gMrIoIrrx1crAw3ilaB2wkWwZYspjs+4QCePPTzzTx3p0hzxefYVQ41hBmYI4fiGR2H9+gtHCuauGqeYjVtC9W4BQdiACYPwMOiL4o7Ub9u8gHeQUY8q+t8RCsN6KKC56FeDuEvlNDHaeZwp79gAFmIIZxCyPLsvncYqUA+XP20KMF56C1jyuji4ZC2G6HJDETIVTzYyL+FUZzXpdtMxrIy7VNX3oeKBng0nAyljdCqKmCDRhcRElb0Yfuj+kmV9MJDIYLSzUQrJR1z/sNkVIGipFkOV4i+NdUkzlMHmXQH2uSXlIdv8GkLak+W9W9vupBbG+rJjKEzD9FOLvE4eM3mxwk9iEQViKZMb2V3bgWsulPhwU+mqo5bR6KN5E6dn2hoggxlyEG7qw7TYQ==|920 \ No newline at end of file +}//aEhZwEqAs3/MYie0mrj0L+5F+u+K5sqzhi0MYNHOPnn7CrXN8wNpKcx43tT+5fewsYhEsrYnTe3aeHGALVxt5gGAMzYvddPzck+shnFy0XAVPwyNL9FIuyf//eD+NrIkyWpOJmbHraFCSAzOifvPWUacrF2zKdfgEoSD0+XTG1WOE3dy9ycv+TM4PSdYA/OSlOvY4b7RkAVPzgv/jHqptEVJOATRb9rBVISWlVJcWYI6bGifUvKibKrPuLNl4cFbQTIfT0AvRE4TivXz/EfCdAE4CNb/LnGoVZOUqj3rIh+UwklST+4FZ1on4fY9l1e5C4Kp1pXbASxxapdhDYQcGrr0ZDDQL2eOQH+dF4nbIlQLB1esNAEEO97daIbqEc5e910vmei8DFam9otmqyCkwI/hQegijr16V07r1alcbT1M9Z74hdWyLjMxlOubg6CA4AAmi+LhSdBbrhHFRLbRMPVDiQeCjN+Rz3UiVPZ6lwIcingFDmaeySJfSrrXQsb+aJGmczq7gpZRgMgdIoEf+61PxN2W3h3IBcoAsU1vj0lYI+RcZ8m1Xn4zWoAhoZwS2eN3TXjogwt74HgYUc0u4NwDgqvIM8fS8bIm1GfLzMvuKjZIwntk8Cnu47NrVPB5JbLgux8qXhAqJEpBXCQ1xGTp8+yW5/zX7GzCmdxYyoByGwGhBTL5C+x3C+5xNY4CGmw7ufoJQvEGS2xL4CXK5zacJJ552VHwricPWuN0qv8UK25KT9MfrDYleVA4E13FRHhMWb8jyETvBSXpWVFv7Jo+td4wy7LsKCHELPFd2/isZxETbSnnVsFCdjKZ2uubMLcWpIyMmluDSKufBtYRyTCHjCHb7KLg9i/4jZSYAyn/foKEsOPxLq18LMHweq+nmJZ8lLgOKtmw6XBhGYRKmQ==|920 \ No newline at end of file diff --git a/Pages/流程页面文件夹/FGC_我委托的.rd b/Pages/流程页面文件夹/FGC_我委托的.rd index 3d2fcd0e..078c7ec0 100644 --- a/Pages/流程页面文件夹/FGC_我委托的.rd +++ b/Pages/流程页面文件夹/FGC_我委托的.rd @@ -1,5 +1,5 @@ { "PageType": 0, - "ColumnCount": 70, - "RowCount": 30 + "ColumnCount": 68, + "RowCount": 29 } \ No newline at end of file diff --git a/Pages/流程页面文件夹/FGC_我的已办.json b/Pages/流程页面文件夹/FGC_我的已办.json index 97332273..7d912693 100644 --- a/Pages/流程页面文件夹/FGC_我的已办.json +++ b/Pages/流程页面文件夹/FGC_我的已办.json @@ -3,25 +3,20 @@ "RowColumnAttachedInfos": { "0": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 24.0 } }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 32.0 } }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 24.0 } }, "3": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } - }, - "4": { "GridRowColumnDefinition": { "DesignLengthInPixel": 40.0, "Mode": 2, @@ -33,7 +28,7 @@ } } }, - "5": { + "4": { "GridRowColumnDefinition": { "DesignLengthInPixel": 50.0, "Mode": 2, @@ -45,6 +40,18 @@ } } }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, "6": { "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0, @@ -310,6 +317,21 @@ } }, "28": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + } + }, + "Count": 29 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + }, + "1": { "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0, "Mode": 2, @@ -321,21 +343,6 @@ } } }, - "29": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } - } - }, - "Count": 30 - }, - "Cols": { - "RowColumnAttachedInfos": { - "1": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } - }, "2": { "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0, @@ -945,7 +952,8 @@ }, "MaxLength": { "Value": 1.0 - } + }, + "IsHidden": true } }, "53": { @@ -1074,8 +1082,7 @@ }, "MaxLength": { "Value": 1.0 - }, - "IsHidden": true + } } }, "63": { @@ -1125,26 +1132,10 @@ "Value": 1.0 } } - }, - "67": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "69": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } } }, "InLogicalVisibleIndexes": [ + 52, 53, 54, 55, @@ -1153,24 +1144,23 @@ 58, 59, 60, - 61, - 62 + 61 ], - "Count": 70 + "Count": 68 }, "Values": { - "1,2": "我的已办", - "4,4": "流程", - "4,14": "任务名称", - "4,63": "查看" + "1,1": "我的已办", + "3,3": "流程", + "3,13": "任务名称", + "3,62": "查看" }, "AttachInfos": { - "4,2": { + "3,1": { "ListViewInfo": { "Name": "表格1", "TableName": "ACT_HI_TASKINST_View", - "RowIndex": 4, - "ColumnIndex": 2, + "RowIndex": 3, + "ColumnIndex": 1, "RowCount": 25, "ColumnCount": 66, "SqlCondition": { @@ -1230,7 +1220,7 @@ "ShowGridLine": true } }, - "5,4": { + "4,3": { "BindingInfo": { "TableName": "ACT_HI_TASKINST_View", "ColumnName": "PROC_DEF_ID_", @@ -1242,28 +1232,28 @@ } } }, - "5,14": { + "4,13": { "BindingInfo": { "TableName": "ACT_HI_TASKINST_View", "ColumnName": "NAME_", "GUID": "b0776b10-1650-495a-ade0-0490dd02b308" } }, - "5,24": { + "4,23": { "BindingInfo": { "TableName": "ACT_HI_TASKINST_View", "ColumnName": "END_TIME_", "GUID": "18059a64-bb0c-4005-b3f2-0ea77f8f60d7" } }, - "5,34": { + "4,33": { "BindingInfo": { "TableName": "ACT_HI_TASKINST_View", "ColumnName": "DELETE_REASON_", "GUID": "8f0ceebd-cba2-44f5-bef7-47107c525741" } }, - "5,43": { + "4,42": { "BindingInfo": { "TableName": "ACT_HI_TASKINST_View", "ColumnName": "PROC_INST_ID_", @@ -1275,21 +1265,21 @@ } } }, - "5,53": { + "4,52": { "BindingInfo": { "TableName": "ACT_HI_TASKINST_View", "ColumnName": "ID_", "GUID": "705e3ce1-1584-4984-894f-b0467b481aa6" } }, - "5,58": { + "4,57": { "BindingInfo": { "TableName": "ACT_HI_TASKINST_View", "ColumnName": "PROC_INST_ID_", "GUID": "63e06d51-236b-475b-bea0-9866a0b98100" } }, - "5,63": { + "4,62": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ @@ -1312,7 +1302,7 @@ }, { "FontFamily": 0, - "FontSize": 21.333333333333332, + "FontSize": 18.666666666666664, "FontWeight": 1, "Foreground": 2 }, @@ -1434,6 +1424,7 @@ ] }, "CellStyles": { + "0,1": 0, "0,2": 0, "0,3": 0, "0,4": 0, @@ -1446,137 +1437,163 @@ "0,11": 0, "0,12": 0, "0,13": 0, - "0,14": 0, - "1,2": 1, + "1,1": 1, + "1,2": 2, "1,3": 2, "1,4": 2, "1,5": 2, "1,6": 2, - "1,7": 2, + "1,9": 2, "1,10": 2, "1,11": 2, "1,12": 2, "1,13": 2, "1,14": 2, "1,15": 2, - "1,16": 2, - "2,2": 2, - "2,3": 2, - "2,4": 2, - "2,5": 2, - "2,6": 2, - "2,7": 2, - "2,10": 2, - "2,11": 2, - "2,12": 2, - "2,13": 2, - "2,14": 2, - "2,15": 2, - "2,16": 2, - "3,2": 3, - "3,3": 3, - "3,4": 3, - "3,5": 3, - "3,6": 3, - "3,7": 3, - "3,8": 3, - "3,9": 3, - "3,10": 3, - "3,11": 3, - "3,12": 3, - "3,13": 3, - "3,14": 3, - "3,15": 3, - "3,16": 3, - "3,17": 3, - "3,18": 3, - "3,19": 3, - "3,20": 3, - "3,21": 3, - "3,22": 3, - "3,23": 3, - "3,32": 4, - "3,33": 4, - "3,34": 4, - "3,35": 4, - "3,36": 4, - "3,37": 4, - "3,38": 4, - "3,39": 4, - "3,40": 4, - "3,41": 4, - "3,42": 4, - "3,43": 4, - "3,44": 4, - "3,45": 4, - "3,46": 4, - "3,47": 4, - "3,48": 4, - "3,49": 4, - "3,50": 4, - "3,51": 4, - "3,52": 4, - "3,53": 4, - "3,54": 4, - "3,55": 4, - "3,56": 4, - "3,57": 4, - "3,58": 4, - "3,59": 4, - "3,62": 5, - "3,63": 5, - "3,64": 5, - "3,65": 5, - "3,66": 5, - "3,67": 5, - "3,68": 5, - "3,69": 5, - "4,2": 6, - "4,3": 7, - "4,4": 8, - "4,14": 8, - "4,24": 8, - "4,34": 9, - "4,43": 9, - "4,53": 9, + "2,1": 3, + "2,2": 3, + "2,3": 3, + "2,4": 3, + "2,5": 3, + "2,6": 3, + "2,7": 3, + "2,8": 3, + "2,9": 3, + "2,10": 3, + "2,11": 3, + "2,12": 3, + "2,13": 3, + "2,14": 3, + "2,15": 3, + "2,16": 3, + "2,17": 3, + "2,18": 3, + "2,19": 3, + "2,20": 3, + "2,21": 3, + "2,22": 3, + "2,31": 4, + "2,32": 4, + "2,33": 4, + "2,34": 4, + "2,35": 4, + "2,36": 4, + "2,37": 4, + "2,38": 4, + "2,39": 4, + "2,40": 4, + "2,41": 4, + "2,42": 4, + "2,43": 4, + "2,44": 4, + "2,45": 4, + "2,46": 4, + "2,47": 4, + "2,48": 4, + "2,49": 4, + "2,50": 4, + "2,51": 4, + "2,52": 4, + "2,53": 4, + "2,54": 4, + "2,55": 4, + "2,56": 4, + "2,57": 4, + "2,58": 4, + "2,61": 5, + "2,62": 5, + "2,63": 5, + "2,64": 5, + "2,65": 5, + "2,66": 5, + "2,67": 5, + "3,1": 6, + "3,2": 7, + "3,3": 8, + "3,13": 8, + "3,23": 8, + "3,33": 9, + "3,42": 9, + "3,52": 9, + "3,53": 2, + "3,54": 2, + "3,55": 2, + "3,56": 2, + "3,57": 9, + "3,62": 10, + "4,1": 11, + "4,2": 7, + "4,3": 12, + "4,13": 13, + "4,14": 2, + "4,15": 2, + "4,16": 2, + "4,17": 2, + "4,18": 2, + "4,19": 2, + "4,20": 2, + "4,21": 2, + "4,22": 2, + "4,23": 14, + "4,33": 12, + "4,42": 15, + "4,43": 16, + "4,44": 16, + "4,45": 16, + "4,46": 16, + "4,47": 16, + "4,48": 16, + "4,49": 16, + "4,50": 16, + "4,51": 16, + "4,52": 13, + "4,53": 2, "4,54": 2, "4,55": 2, "4,56": 2, - "4,57": 2, - "4,58": 9, - "4,63": 10, - "5,2": 11, - "5,3": 7, - "5,4": 12, - "5,14": 13, - "5,15": 2, - "5,16": 2, - "5,17": 2, - "5,18": 2, - "5,19": 2, - "5,20": 2, - "5,21": 2, - "5,22": 2, - "5,23": 2, - "5,24": 14, - "5,34": 12, - "5,43": 15, - "5,44": 16, - "5,45": 16, - "5,46": 16, - "5,47": 16, - "5,48": 16, - "5,49": 16, - "5,50": 16, - "5,51": 16, - "5,52": 16, - "5,53": 13, - "5,54": 2, - "5,55": 2, - "5,56": 2, - "5,57": 2, - "5,58": 12, - "5,63": 17, + "4,57": 12, + "4,62": 17, + "24,1": 7, + "24,2": 7, + "24,3": 7, + "24,4": 7, + "24,5": 7, + "24,6": 7, + "24,7": 7, + "24,8": 7, + "24,9": 7, + "24,10": 7, + "24,11": 7, + "24,12": 7, + "24,13": 7, + "24,14": 7, + "24,15": 7, + "24,16": 7, + "24,17": 7, + "24,18": 7, + "24,19": 7, + "24,20": 7, + "24,21": 7, + "24,22": 7, + "24,23": 7, + "24,24": 7, + "24,25": 7, + "24,26": 7, + "24,27": 7, + "24,28": 7, + "24,29": 7, + "24,30": 7, + "24,31": 7, + "24,32": 7, + "24,33": 7, + "24,34": 7, + "24,35": 7, + "24,36": 7, + "24,37": 7, + "24,38": 7, + "24,39": 7, + "24,40": 18, + "25,1": 7, "25,2": 7, "25,3": 7, "25,4": 7, @@ -1616,7 +1633,7 @@ "25,38": 7, "25,39": 7, "25,40": 7, - "25,41": 18, + "26,1": 7, "26,2": 7, "26,3": 7, "26,4": 7, @@ -1656,7 +1673,7 @@ "26,38": 7, "26,39": 7, "26,40": 7, - "26,41": 7, + "27,1": 7, "27,2": 7, "27,3": 7, "27,4": 7, @@ -1695,78 +1712,36 @@ "27,37": 7, "27,38": 7, "27,39": 7, - "27,40": 7, - "27,41": 7, - "28,2": 7, - "28,3": 7, - "28,4": 7, - "28,5": 7, - "28,6": 7, - "28,7": 7, - "28,8": 7, - "28,9": 7, - "28,10": 7, - "28,11": 7, - "28,12": 7, - "28,13": 7, - "28,14": 7, - "28,15": 7, - "28,16": 7, - "28,17": 7, - "28,18": 7, - "28,19": 7, - "28,20": 7, - "28,21": 7, - "28,22": 7, - "28,23": 7, - "28,24": 7, - "28,25": 7, - "28,26": 7, - "28,27": 7, - "28,28": 7, - "28,29": 7, - "28,30": 7, - "28,31": 7, - "28,32": 7, - "28,33": 7, - "28,34": 7, - "28,35": 7, - "28,36": 7, - "28,37": 7, - "28,38": 7, - "28,39": 7, - "28,40": 7, - "28,41": 7 + "27,40": 7 }, "SheetStyle": { "FontFamily": 0 } }, "Spans": [ - "1,2,2,15", - "5,2,1,2", - "5,4,1,10", - "5,14,1,10", - "5,24,1,10", - "5,34,1,9", - "5,43,1,10", - "5,53,1,5", - "5,58,1,5", - "5,63,1,5", - "6,2,23,66", - "4,2,1,2", - "4,4,1,10", - "4,14,1,10", - "4,24,1,10", - "4,34,1,9", - "4,43,1,10", - "4,53,1,5", - "4,58,1,5", - "4,63,1,5" + "1,1,1,15", + "4,1,1,2", + "4,3,1,10", + "4,13,1,10", + "4,23,1,10", + "4,33,1,9", + "4,42,1,10", + "4,52,1,5", + "4,57,1,5", + "4,62,1,5", + "5,1,23,66", + "3,1,1,2", + "3,3,1,10", + "3,13,1,10", + "3,23,1,10", + "3,33,1,9", + "3,42,1,10", + "3,52,1,5", + "3,57,1,5", + "3,62,1,5" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", - "MasterPageName": "FGC_流程中心", "MobilePageName": "FGC_我的已办_手机版", "Title": "我的已办", "AuthorizeInfo": { @@ -1780,4 +1755,4 @@ "PaperSize": {}, "Margin": {} } -}//VmBH/H20rwBlZUcfHJnZJZ1efi/X3HGEuf8m3Laj9aLPc/fwJUlFXKhLzp631u6qyOh/oxcdDRkxyhBNxtNdd0FUmwI8MGGBlWK10eQ8GhZTAJ3APiBZIzcZc2krEuf3pnhwtXp89GxInluzvWozyuq4J119Gxr2387aXHLCHGFYpRdXKl38fjTtXOvuTzOHspkWciAYc8HuVhyYg9p3yDqrANFIAKgyXDdzyZkzrYEQooPqNooCd+n6g0AW4zmPtAm/nJ0jDCGo8HzzwLqshlgSLhQ+aU6hWU7ooRvDUyYzmZt4JSOea442i+fwHwTOkXpFCylltPIv7GOzKIsfq4bIr/MLJh7IaAn52fZYQ2BwnJ15stZei9ecRQ/tPAB1mKp4Md/D0bhGKIGdrnvXmVMVlw8HgLMjkVNEPstSKwzy6Cdt2huD0u9bEXmbmzloxcJHctqMhYBaVh4f6NmkqIAwXy2llO9ZXnu/1XhVBKonSrezRbUYRQUbxQ7aF0ndkGViz6tb9a4TRwMlU5s5Urgid6+kHiEfNKbjym4lj43MS4FpBiSjk0S1jkVRPT/fo0bBErJnMz/sUbbV9Q/TtSi9hXSPRBwTTmqbOjAYg/PeriqPitDLR+2dVGc4HN88WLTRfp3MzhZeDW30Byv4+74PJMB52Kb1TsdnyzdGqFYgd1obbe1batjh4hdFKiipeWNhFLTO/kJRrxpuo4NmbyT+YwvZSN32Hfl00KJa/M5UJc7oZXsAt9IjfKZwWjRJXLvdfDnUdv/DH5IfEp1rRtLvlqPCDpCIrrk7f95YCxy2bWEE4K7nYdEO3HoC9mPkUePO8DAIRPfBJl3LrfwK9SDZ4Va4cRKvtzhzvQ7MmLOPP0fqUKnDIieksHgFq0lN/FX92ZjpILDzl1FpGH5I8w==|920 \ No newline at end of file +}//tsiJ7d7wMbV0eN2W83PiQhbCCSwuyQgDHSXp1FhPIyLQV2LXhXiyUhJE4jTdUWftceeQPBOdSzmcAWcexnl3E3ZDTf/Tpaef93WHMH3HkDuEf7J11rgBxji7phCIFjGgZgW1hnBkE/m3CLpfv5yQ1K0LSVG1r+oTamAu0jBH4/7x7bNSk3AhVyMo9REsPJHKZ9hBb+5Vzqogc5EZvRIr8/Vgszn2xZ6qC1qcAfRJ6Jzak07d38oltbtmPk8qpUFVDldYXTeWwisnPlr9I19/WRxLU2QQ9yG3o4kv8+O2ztGzm67ohxTn+xd5jTb+/mfh76m0o0oYaDKeDmEZSP/N5MaSBWIHjCjT8VDthXgWcDlsmv+YXpl3lqc6InJ+ortqucEm0O0DPuB5+r+AoKuC6195lZP4GaubBfFK9D0dcwWEtcwrlBWxIez2Hj2uxPJp6Jsn3bqJcAObqcVa8cQt2EndrkYQtk6som7FoWdAl1qfXV97ctbFjcUMhtTrl5xcb/TEkHF9FydvXHIlhIfVZz9me3Pti/DsPIxUkjqGhYldYI+QV6BfTOST4Em5BFVPUxr3+sfVu4A8kgDiMn/rfipbI1Ud/te4BExtkO/t8z4ZqpLVCxc+4rR1pOi2dMyv+7gSFs49vj8dn8N0nAW8OkDviaTkOXbrE2bS5cZxDOTOcpoPBQwvqzJ5UrSNKSIOWXMRWknhf08a7zBgAwRLYhMFyGuZP/7L4J2g/PXHiD7Dt1Ou+9CQl353Xl1+w6Incngk8vEFNxebR3h7NgC1goLDRkg4fWRf0bHb+JwXl7fDVcl2nwb3w4YjKa62iV5BwdKvlKeQVT4tegTpOsF9k7rfJkjhMVH2hMi7jENlOtx1N4NDRnQldX8GpAfFZPojmkVUhZEHZtsjtQBlDXuuvg==|920 \ No newline at end of file diff --git a/Pages/流程页面文件夹/FGC_我的已办.rd b/Pages/流程页面文件夹/FGC_我的已办.rd index 3d2fcd0e..078c7ec0 100644 --- a/Pages/流程页面文件夹/FGC_我的已办.rd +++ b/Pages/流程页面文件夹/FGC_我的已办.rd @@ -1,5 +1,5 @@ { "PageType": 0, - "ColumnCount": 70, - "RowCount": 30 + "ColumnCount": 68, + "RowCount": 29 } \ No newline at end of file diff --git a/Pages/流程页面文件夹/FGC_我的已阅.json b/Pages/流程页面文件夹/FGC_我的已阅.json index 268e2059..05017d67 100644 --- a/Pages/流程页面文件夹/FGC_我的已阅.json +++ b/Pages/流程页面文件夹/FGC_我的已阅.json @@ -3,25 +3,20 @@ "RowColumnAttachedInfos": { "0": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 24.0 } }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 32.0 } }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 24.0 } }, "3": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } - }, - "4": { "GridRowColumnDefinition": { "DesignLengthInPixel": 40.0, "Mode": 2, @@ -33,7 +28,7 @@ } } }, - "5": { + "4": { "GridRowColumnDefinition": { "DesignLengthInPixel": 50.0, "Mode": 2, @@ -45,6 +40,18 @@ } } }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, "6": { "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0, @@ -310,6 +317,21 @@ } }, "28": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + } + }, + "Count": 29 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + }, + "1": { "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0, "Mode": 2, @@ -321,21 +343,6 @@ } } }, - "29": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } - } - }, - "Count": 30 - }, - "Cols": { - "RowColumnAttachedInfos": { - "1": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } - }, "2": { "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0, @@ -945,7 +952,8 @@ }, "MaxLength": { "Value": 1.0 - } + }, + "IsHidden": true } }, "53": { @@ -1074,8 +1082,7 @@ }, "MaxLength": { "Value": 1.0 - }, - "IsHidden": true + } } }, "63": { @@ -1125,26 +1132,10 @@ "Value": 1.0 } } - }, - "67": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "69": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } } }, "InLogicalVisibleIndexes": [ + 52, 53, 54, 55, @@ -1153,24 +1144,23 @@ 58, 59, 60, - 61, - 62 + 61 ], - "Count": 70 + "Count": 68 }, "Values": { - "1,2": "我的已阅", - "4,4": "流程", - "4,14": "任务名称", - "4,63": "查看" + "1,1": "我的已阅", + "3,3": "流程", + "3,13": "任务名称", + "3,62": "查看" }, "AttachInfos": { - "4,2": { + "3,1": { "ListViewInfo": { "Name": "表格1", "TableName": "ACT_HI_TASKINST_View", - "RowIndex": 4, - "ColumnIndex": 2, + "RowIndex": 3, + "ColumnIndex": 1, "RowCount": 25, "ColumnCount": 66, "SqlCondition": { @@ -1229,7 +1219,7 @@ "ShowGridLine": true } }, - "5,4": { + "4,3": { "BindingInfo": { "TableName": "ACT_HI_TASKINST_View", "ColumnName": "PROC_DEF_ID_", @@ -1241,28 +1231,28 @@ } } }, - "5,14": { + "4,13": { "BindingInfo": { "TableName": "ACT_HI_TASKINST_View", "ColumnName": "NAME_", "GUID": "5b4ec034-2268-4e73-96cf-5b907fddfe3d" } }, - "5,24": { + "4,23": { "BindingInfo": { "TableName": "ACT_HI_TASKINST_View", "ColumnName": "START_TIME_", "GUID": "5d3a8ddf-226d-4ce0-bcf4-c607a08b87de" } }, - "5,34": { + "4,33": { "BindingInfo": { "TableName": "ACT_HI_TASKINST_View", "ColumnName": "END_TIME_", "GUID": "467b705b-7de0-4f9f-9457-70b96c9b8bbc" } }, - "5,44": { + "4,43": { "BindingInfo": { "TableName": "ACT_HI_TASKINST_View", "ColumnName": "PROC_INST_ID_", @@ -1274,21 +1264,21 @@ } } }, - "5,53": { + "4,52": { "BindingInfo": { "TableName": "ACT_HI_TASKINST_View", "ColumnName": "ID_", "GUID": "62e0d244-1351-474c-a4d5-5260df2740d7" } }, - "5,58": { + "4,57": { "BindingInfo": { "TableName": "ACT_HI_TASKINST_View", "ColumnName": "PROC_INST_ID_", "GUID": "e106f93c-0ad4-49c9-9be2-00ac3e411a23" } }, - "5,63": { + "4,62": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ @@ -1311,7 +1301,7 @@ }, { "FontFamily": 0, - "FontSize": 21.333333333333332, + "FontSize": 18.666666666666664, "FontWeight": 1, "Foreground": 2 }, @@ -1428,6 +1418,7 @@ ] }, "CellStyles": { + "0,1": 0, "0,2": 0, "0,3": 0, "0,4": 0, @@ -1440,128 +1431,156 @@ "0,11": 0, "0,12": 0, "0,13": 0, - "0,14": 0, - "1,2": 1, + "1,1": 1, + "1,2": 2, "1,3": 2, "1,4": 2, "1,5": 2, "1,6": 2, "1,7": 2, - "1,8": 2, + "1,10": 2, "1,11": 2, "1,12": 2, "1,13": 2, "1,14": 2, "1,15": 2, - "1,16": 2, - "2,2": 2, - "2,3": 2, - "2,4": 2, - "2,5": 2, - "2,6": 2, - "2,7": 2, - "2,8": 2, - "2,11": 2, - "2,12": 2, - "2,13": 2, - "2,14": 2, - "2,15": 2, - "2,16": 2, - "3,2": 3, - "3,3": 3, - "3,4": 3, - "3,5": 3, - "3,6": 3, - "3,7": 3, - "3,8": 3, - "3,9": 3, - "3,10": 3, - "3,11": 3, - "3,12": 3, - "3,13": 3, - "3,14": 3, - "3,15": 3, - "3,16": 3, - "3,17": 3, - "3,18": 3, - "3,19": 3, - "3,20": 3, - "3,21": 3, - "3,22": 3, - "3,23": 3, - "3,24": 3, - "3,25": 3, - "3,26": 3, - "3,27": 3, - "3,28": 3, - "3,29": 3, - "3,30": 3, - "3,31": 3, - "3,32": 3, - "3,33": 3, - "3,41": 4, - "3,42": 4, - "3,43": 4, - "3,44": 4, - "3,45": 4, - "3,46": 4, - "3,47": 4, - "3,48": 4, - "3,49": 4, - "3,50": 4, - "3,51": 4, - "3,52": 4, - "3,53": 4, - "3,54": 4, - "3,55": 4, - "3,56": 4, - "3,57": 4, - "3,58": 4, - "3,59": 4, - "3,62": 5, - "3,63": 5, - "3,64": 5, - "3,65": 5, - "3,66": 5, - "3,67": 5, - "3,68": 5, - "3,69": 5, - "4,2": 6, - "4,3": 7, - "4,4": 8, - "4,14": 8, - "4,24": 8, - "4,34": 8, - "4,44": 9, - "4,53": 9, + "2,1": 3, + "2,2": 3, + "2,3": 3, + "2,4": 3, + "2,5": 3, + "2,6": 3, + "2,7": 3, + "2,8": 3, + "2,9": 3, + "2,10": 3, + "2,11": 3, + "2,12": 3, + "2,13": 3, + "2,14": 3, + "2,15": 3, + "2,16": 3, + "2,17": 3, + "2,18": 3, + "2,19": 3, + "2,20": 3, + "2,21": 3, + "2,22": 3, + "2,23": 3, + "2,24": 3, + "2,25": 3, + "2,26": 3, + "2,27": 3, + "2,28": 3, + "2,29": 3, + "2,30": 3, + "2,31": 3, + "2,32": 3, + "2,40": 4, + "2,41": 4, + "2,42": 4, + "2,43": 4, + "2,44": 4, + "2,45": 4, + "2,46": 4, + "2,47": 4, + "2,48": 4, + "2,49": 4, + "2,50": 4, + "2,51": 4, + "2,52": 4, + "2,53": 4, + "2,54": 4, + "2,55": 4, + "2,56": 4, + "2,57": 4, + "2,58": 4, + "2,61": 5, + "2,62": 5, + "2,63": 5, + "2,64": 5, + "2,65": 5, + "2,66": 5, + "2,67": 5, + "3,1": 6, + "3,2": 7, + "3,3": 8, + "3,13": 8, + "3,23": 8, + "3,33": 8, + "3,43": 9, + "3,52": 9, + "3,53": 2, + "3,54": 2, + "3,55": 2, + "3,56": 2, + "3,57": 9, + "3,62": 10, + "4,1": 11, + "4,2": 7, + "4,3": 12, + "4,13": 13, + "4,23": 14, + "4,33": 14, + "4,43": 15, + "4,44": 16, + "4,45": 16, + "4,46": 16, + "4,47": 16, + "4,48": 16, + "4,49": 16, + "4,50": 16, + "4,51": 16, + "4,52": 13, + "4,53": 2, "4,54": 2, "4,55": 2, "4,56": 2, - "4,57": 2, - "4,58": 9, - "4,63": 10, - "5,2": 11, - "5,3": 7, - "5,4": 12, - "5,14": 13, - "5,24": 14, - "5,34": 14, - "5,44": 15, - "5,45": 16, - "5,46": 16, - "5,47": 16, - "5,48": 16, - "5,49": 16, - "5,50": 16, - "5,51": 16, - "5,52": 16, - "5,53": 13, - "5,54": 2, - "5,55": 2, - "5,56": 2, - "5,57": 2, - "5,58": 12, - "5,63": 17, + "4,57": 12, + "4,62": 17, + "24,1": 7, + "24,2": 7, + "24,3": 7, + "24,4": 7, + "24,5": 7, + "24,6": 7, + "24,7": 7, + "24,8": 7, + "24,9": 7, + "24,10": 7, + "24,11": 7, + "24,12": 7, + "24,13": 7, + "24,14": 7, + "24,15": 7, + "24,16": 7, + "24,17": 7, + "24,18": 7, + "24,19": 7, + "24,20": 7, + "24,21": 7, + "24,22": 7, + "24,23": 7, + "24,24": 7, + "24,25": 7, + "24,26": 7, + "24,27": 7, + "24,28": 7, + "24,29": 7, + "24,30": 7, + "24,31": 7, + "24,32": 7, + "24,33": 7, + "24,34": 7, + "24,35": 7, + "24,36": 7, + "24,37": 7, + "24,38": 7, + "24,39": 7, + "24,40": 7, + "24,41": 7, + "24,42": 7, + "25,1": 7, "25,2": 7, "25,3": 7, "25,4": 7, @@ -1603,7 +1622,7 @@ "25,40": 7, "25,41": 7, "25,42": 7, - "25,43": 7, + "26,1": 7, "26,2": 7, "26,3": 7, "26,4": 7, @@ -1645,7 +1664,7 @@ "26,40": 7, "26,41": 7, "26,42": 7, - "26,43": 7, + "27,1": 7, "27,2": 7, "27,3": 7, "27,4": 7, @@ -1686,80 +1705,36 @@ "27,39": 7, "27,40": 7, "27,41": 7, - "27,42": 7, - "27,43": 7, - "28,2": 7, - "28,3": 7, - "28,4": 7, - "28,5": 7, - "28,6": 7, - "28,7": 7, - "28,8": 7, - "28,9": 7, - "28,10": 7, - "28,11": 7, - "28,12": 7, - "28,13": 7, - "28,14": 7, - "28,15": 7, - "28,16": 7, - "28,17": 7, - "28,18": 7, - "28,19": 7, - "28,20": 7, - "28,21": 7, - "28,22": 7, - "28,23": 7, - "28,24": 7, - "28,25": 7, - "28,26": 7, - "28,27": 7, - "28,28": 7, - "28,29": 7, - "28,30": 7, - "28,31": 7, - "28,32": 7, - "28,33": 7, - "28,34": 7, - "28,35": 7, - "28,36": 7, - "28,37": 7, - "28,38": 7, - "28,39": 7, - "28,40": 7, - "28,41": 7, - "28,42": 7, - "28,43": 7 + "27,42": 7 }, "SheetStyle": { "FontFamily": 0 } }, "Spans": [ - "5,2,1,2", - "5,34,1,10", - "5,53,1,5", - "5,58,1,5", - "5,14,1,10", - "5,4,1,10", - "5,44,1,9", - "5,63,1,5", - "1,2,2,15", - "6,2,23,66", - "5,24,1,10", - "4,2,1,2", - "4,4,1,10", - "4,14,1,10", - "4,24,1,10", - "4,34,1,10", - "4,44,1,9", - "4,53,1,5", - "4,58,1,5", - "4,63,1,5" + "4,1,1,2", + "4,33,1,10", + "4,52,1,5", + "4,57,1,5", + "4,13,1,10", + "4,3,1,10", + "4,43,1,9", + "4,62,1,5", + "1,1,1,15", + "4,23,1,10", + "5,1,23,66", + "3,1,1,2", + "3,3,1,10", + "3,13,1,10", + "3,23,1,10", + "3,33,1,10", + "3,43,1,9", + "3,52,1,5", + "3,57,1,5", + "3,62,1,5" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", - "MasterPageName": "FGC_流程中心", "MobilePageName": "FGC_我的已阅_手机版", "Title": "我的已阅", "AuthorizeInfo": { @@ -1773,4 +1748,4 @@ "PaperSize": {}, "Margin": {} } -}//l6vj+zrZnPFN0B1z2u69XEnsHOyyBxHTTUVURPxTkTPwEqqja69jSOBKzX3xku9AK0WfS6OtRqcLwEjtVBtTKjawvEHYD1MJqoZkOtXe+wgoPbk6EmvTaRihnS/muV7+ma9pbHCxoyv4mKW3TI29pj5s53gO+Yc86+H2ml9XbhDteKvfWEQZiyaSYaBOwkuWPsJgd+yUlDZpqcswilgoi3OvrlIJuQfYgc9i1biQI15lYR0TT8lGvIljsKquC3vB92Ze+w56tC8CnafbROVUpGS5LTewpD00MVKet4PQzHuRj8KiftXkNRyZiNXxblHEyJcERIsB2uwtIxApZpRgr8LmEnoRTtuxvzfmFsg5j8bmqo/1c9zhIKk/1Jb0r24gc7ADbuoS+d1WszJhS7wqH+AY8dqzXOplVbm7Cd1vhNXqq6/F1gRBrwBe+259XAPgpnbrm5kWA3Lg+EdKbgQWC0KGprhxDlAkmODJy2wBmlneZqFauXPv66hlo//FYkQS6u2sNFX2vf+2AkUaVP8K8onT4xlW1XHfnfZkQIm8RRkXq4bLvoyk5FOAOc3AkwznQihNnv18rGQma759RuYO5c/wedaPZZnkBVC+F+KXsa8JipGe0KVKuNEvTUIptPTV8LGsPr7AgUIzicHtCGQZ4OfEGXkRnDg/V1UzFpSHx6VEoP6VL87QabaMbTAPbwWh1Q8Ueo6qVFWpecVeSSWFHrF9uNjZzNn+HiBEsbCZXvCU/l4ednoWbCyBxz66pqXt71ZfnexdcGaHczeY3tKc/Lu8RHsJgJibKk2WPaq+j8y2WuHIxwR2EGvdUB03qLcbZlVHPZE/ZKvJEzman4N78Vz5xf5D1ZGJujSaK5jx8S9P+LPmDCGwAfGNiWLyNv7Fpja/dNtCvSKkDm2isX1nVQ==|920 \ No newline at end of file +}//tSsM4Bp5AHUJJK00IBnTEp0MIIAjj2dsbVlHx5dOkBnWGtUW7D0jvIQeYg4yqKQ7+JJmiozf4B3BxVCaVAjNJRKTeGyF08E4dsBMjmK2gcMBroCCvcT+SCo52hWgppxyNk+O+awgL1WGQN+ApYdCZI2etPD+0B6Hr9L/vjID3x4hRfqhZuZTE4i02p5yIsoefMOhpIQdl8by8g+WVD15L2GbpkjEmfGuVlrjYLJwovDK6MiREZ7vo6R/RBXtwsmDMUlecw+z7LNxIGDVkFAz4vM8EN3PlYFmaOOwj7fzTRetmCMR+HPZXIQXspWKoExAC5Bl/FM7CTwuSTLB540jza0wfGrw48UfFCBPpQuPGAR1bx0B4d1hxmZElQ2Tg+YFM+hOHGjscUwYnR0JN/qWIuUxBkq5jdqJyPuHR7LCWfWQnZxtq5S23zrAjVmHvWvNPxWn+j1nLjLcnZQPrSYVScfUt+STchgKy/iDSipK79JYae1Nj6R7mdsI8SVHV4HBR4JBrPFEpiI3uIGdEjEYPC6/uMxZpOt+Pwh8HyPyoFfRPFqWjzIdEv2jkZn4OAIgtznzXaLnE8ewRtey8WbaWyPNa3CngVlQDP5tElK2w9qVOHDbaL4Ws2o7adxAM7JfJ9nsnXv9BtwAGCaud6gbAXtyR8Kk4Fvci2MpvZEFFeLHAq1YXtyoEbaP4Jkk2/jlvOD6NYPt/XhEH/GyM+x8rnTZnrgZ+uzA54VFHgSS01xpeWaluo49g/3b67q3UPzshX+V8x6aYjfkxKp6UoaGfUHIFlwXijmaiQt29e383uT/lC3Oi11c5PO6sZMyh0xYs5dERWPbalhcC75es0KTyk9C5pC3NNFc4xcSN4nrPMsSgnrhe6HqOGHTbhbvO7ilPtVmesG6qUEvh101JBfyYQ==|920 \ No newline at end of file diff --git a/Pages/流程页面文件夹/FGC_我的已阅.rd b/Pages/流程页面文件夹/FGC_我的已阅.rd index 3d2fcd0e..078c7ec0 100644 --- a/Pages/流程页面文件夹/FGC_我的已阅.rd +++ b/Pages/流程页面文件夹/FGC_我的已阅.rd @@ -1,5 +1,5 @@ { "PageType": 0, - "ColumnCount": 70, - "RowCount": 30 + "ColumnCount": 68, + "RowCount": 29 } \ No newline at end of file diff --git a/Pages/流程页面文件夹/FGC_我的待办.json b/Pages/流程页面文件夹/FGC_我的待办.json index 55c8d457..9ef6f730 100644 --- a/Pages/流程页面文件夹/FGC_我的待办.json +++ b/Pages/流程页面文件夹/FGC_我的待办.json @@ -326,11 +326,23 @@ }, "Cols": { "RowColumnAttachedInfos": { - "1": { + "0": { "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0 } }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, "2": { "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0, @@ -940,7 +952,8 @@ }, "MaxLength": { "Value": 1.0 - } + }, + "IsHidden": true } }, "53": { @@ -1069,8 +1082,7 @@ }, "MaxLength": { "Value": 1.0 - }, - "IsHidden": true + } } }, "63": { @@ -1120,26 +1132,10 @@ "Value": 1.0 } } - }, - "67": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "69": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } } }, "InLogicalVisibleIndexes": [ + 52, 53, 54, 55, @@ -1148,25 +1144,24 @@ 58, 59, 60, - 61, - 62 + 61 ], - "Count": 70 + "Count": 68 }, "Values": { - "1,2": "我的待办", - "3,4": "流程", - "3,14": "任务名称", - "3,34": "发起人", - "3,63": "办理" + "1,1": "我的待办", + "3,3": "流程", + "3,13": "任务名称", + "3,33": "发起人", + "3,62": "办理" }, "AttachInfos": { - "3,2": { + "3,1": { "ListViewInfo": { "Name": "表格1", "TableName": "ACT_RU_TASK_View", "RowIndex": 3, - "ColumnIndex": 2, + "ColumnIndex": 1, "RowCount": 25, "ColumnCount": 66, "SqlCondition": { @@ -1202,7 +1197,7 @@ "ShowGridLine": true } }, - "4,4": { + "4,3": { "BindingInfo": { "TableName": "ACT_RU_TASK_View", "ColumnName": "PROC_DEF_ID_", @@ -1214,21 +1209,21 @@ } } }, - "4,14": { + "4,13": { "BindingInfo": { "TableName": "ACT_RU_TASK_View", "ColumnName": "NAME_", "GUID": "56578bd2-6819-42ca-b0f1-75e637726670" } }, - "4,24": { + "4,23": { "BindingInfo": { "TableName": "ACT_RU_TASK_View", "ColumnName": "CREATE_TIME_", "GUID": "4afcb07e-a846-4814-be95-ff71ca2d3f52" } }, - "4,34": { + "4,33": { "BindingInfo": { "TableName": "ACT_RU_TASK_View", "ColumnName": "PROC_INST_ID_", @@ -1240,21 +1235,21 @@ } } }, - "4,53": { + "4,52": { "BindingInfo": { "TableName": "ACT_RU_TASK_View", "ColumnName": "ID_", "GUID": "f33d1a3b-fbc8-4405-97a8-084fc98ca6b3" } }, - "4,58": { + "4,57": { "BindingInfo": { "TableName": "ACT_RU_TASK_View", "ColumnName": "PROC_INST_ID_", "GUID": "c72deca8-6769-4f31-b4f9-623b50bac0aa" } }, - "4,63": { + "4,62": { "NameUsedInJavaScript": "", "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", @@ -1294,48 +1289,52 @@ }, { "Background": 5, + "FontSize": 13.333333333333332, "FontWeight": 2, "Foreground": 6, - "TextIndent": 20, + "TextIndent": 5, "HorizontalAlignment": 7 }, { "Background": 5, "FontFamily": 0, + "FontSize": 13.333333333333332, "FontWeight": 2, "Foreground": 6, - "TextIndent": 20, + "TextIndent": 5, "HorizontalAlignment": 7 }, { "Background": 5, "FontFamily": 0, + "FontSize": 13.333333333333332, "FontWeight": 2, - "Foreground": 6 + "Foreground": 6, + "HorizontalAlignment": 8 }, { "FontSize": 13.333333333333332, - "Foreground": 8 + "Foreground": 9 }, { "FontSize": 13.333333333333332, - "Foreground": 8, - "TextIndent": 20, + "Foreground": 9, + "TextIndent": 5, "HorizontalAlignment": 7 }, { "FontFamily": 0, "FontSize": 13.333333333333332, - "Foreground": 8, - "TextIndent": 20, + "Foreground": 9, + "TextIndent": 5, "HorizontalAlignment": 7 }, { "FontFamily": 0, "FontSize": 13.333333333333332, - "Foreground": 8, - "Formatter": 9, - "TextIndent": 20, + "Foreground": 9, + "Formatter": 10, + "TextIndent": 5, "HorizontalAlignment": 7, "BorderRight": 0 }, @@ -1352,10 +1351,7 @@ { "FontFamily": 0, "FontSize": 13.333333333333332, - "HorizontalAlignment": 11 - }, - { - "HorizontalAlignment": 11 + "HorizontalAlignment": 8 } ], "Types": { @@ -1368,18 +1364,19 @@ "#FFF3F9FC", "Text 1 50", "Left", + "Center", "Text 1 25", "yyyy/mm/dd hh:mm:ss", - "Accent 1 0", - "Center" + "Accent 1 0" ], "Borders": [ { - "Color": 10 + "Color": 11 } ] }, "CellStyles": { + "0,30": 0, "0,31": 0, "0,32": 0, "0,33": 0, @@ -1417,8 +1414,8 @@ "0,65": 0, "0,66": 0, "0,67": 0, - "0,68": 0, - "1,2": 1, + "1,1": 1, + "1,2": 2, "1,3": 2, "1,4": 2, "1,5": 2, @@ -1428,7 +1425,7 @@ "1,9": 2, "1,10": 2, "1,11": 2, - "1,12": 2, + "1,30": 0, "1,31": 0, "1,32": 0, "1,33": 0, @@ -1466,7 +1463,7 @@ "1,65": 0, "1,66": 0, "1,67": 0, - "1,68": 0, + "2,30": 0, "2,31": 0, "2,32": 0, "2,33": 0, @@ -1504,19 +1501,19 @@ "2,65": 0, "2,66": 0, "2,67": 0, - "2,68": 0, - "3,2": 3, - "3,4": 4, - "3,14": 5, - "3,24": 4, - "3,34": 4, - "3,53": 5, - "3,58": 5, - "3,63": 6, - "4,2": 7, - "4,4": 8, - "4,14": 9, - "4,24": 10, + "3,1": 3, + "3,3": 4, + "3,13": 5, + "3,23": 4, + "3,33": 4, + "3,52": 5, + "3,57": 5, + "3,62": 6, + "4,1": 7, + "4,3": 8, + "4,13": 9, + "4,23": 10, + "4,24": 11, "4,25": 11, "4,26": 11, "4,27": 11, @@ -1524,46 +1521,42 @@ "4,29": 11, "4,30": 11, "4,31": 11, - "4,32": 11, - "4,33": 12, - "4,34": 8, - "4,53": 9, + "4,32": 12, + "4,33": 8, + "4,52": 9, + "4,53": 2, "4,54": 2, "4,55": 2, "4,56": 2, - "4,57": 2, - "4,58": 8, - "4,63": 13, - "4,69": 14, - "28,69": 2 + "4,57": 8, + "4,62": 13 }, "SheetStyle": { "FontFamily": 0 } }, "Spans": [ - "1,2,1,11", - "4,2,1,2", - "4,4,1,10", - "4,14,1,10", - "4,24,1,10", - "4,34,1,19", - "4,53,1,5", - "4,58,1,5", - "4,63,1,5", - "5,2,23,66", - "3,2,1,2", - "3,4,1,10", - "3,14,1,10", - "3,24,1,10", - "3,34,1,19", - "3,53,1,5", - "3,58,1,5", - "3,63,1,5" + "1,1,1,11", + "4,1,1,2", + "4,3,1,10", + "4,13,1,10", + "4,23,1,10", + "4,33,1,19", + "4,52,1,5", + "4,57,1,5", + "4,62,1,5", + "5,1,23,66", + "3,1,1,2", + "3,3,1,10", + "3,13,1,10", + "3,23,1,10", + "3,33,1,19", + "3,52,1,5", + "3,57,1,5", + "3,62,1,5" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", - "MasterPageName": "FGC_流程中心", "MobilePageName": "FGC_我的待办_手机版", "Title": "我的待办", "AuthorizeInfo": { @@ -1577,4 +1570,4 @@ "PaperSize": {}, "Margin": {} } -}//abg//+0fRO6QR5s0x48uaynV6L7+hzYY26Fk3VhIHvRH5Z+SfFOOMt4gU7mDzGuNG5TAWEGSswIqmJ9gjLfQoju7UzdTJlRl/T7m3SSVgqb0+HcZFcQSlwxn3/vtpUIIgwKqLEW/+xMZeFGghfskKYcEh1gYsjFkxcj7AESx0ztct3z3j98j9q5WbzUnP3yRd4El4xnrEEttT3FORa3fK+jLpficu3qeu6zmKgRzqcQx9hn7bL6GdT355+e1tgxCKKEmy36ggHEtTltG7sBtxJmzRu6HCayi2ASsE3MB4qh5U1GU6bmXtL8E/OVT35bjb+MhVvqIKvZICDZbpEI4O7q6WVY0/aFHpl4RIAbc51df1Re7okGjvqkk0oesVB+xUGq9GczyXQGOYEp68JkZ698anemGRPYURPgHiN/OqOo4CcWPFZPSpSAMS3fE6Vpz6YdufFZj+W/TOehRb2JHOpmou8GsBy5LbSjaBYJjNI+s7uX6+UFucR1BgLdZpRO8LDoGOjSDcKOYnqdNG7h9h9kcnuaTr5hv/KNLHwf9gA0X1ig1fFtm3b/8xzUwxKpWltXjWS/T+S7XOPsa5H7u+qr+mRAcjGlAqam10ZTOI0ULqXFZcc8Kb1m11TxgCk6VPjIL+xIDtRoPVWxDWj9EoakLRiSg0yJ6gRokIucbZu72BkDU12hzWWqgSB//BJ86Cp8rfEDKzp19DvfTU/FkWlO+O3K8B6OmxkZnVTcU1LaIYR3zqXiXvSA1aDGzsqrpLs+UJg5TKzcqlOpTWwdJpFDSdEHFnXWMH5pISuBo63i5I79ZFn0G8eijlUrJwD+LDVO6RYnINrRDr3vZ/iwjzCUkezG+XXxmfqZ3yJn6DfCRQmyY2ZyzhYHgn5ADaYQRmNZmOP2lJ3NaslDaw0JQag==|920 \ No newline at end of file +}//sIljr5g4eifJ9fdEFF0h4cOMqC2O82w7dT+dYi4DqI/2gpaoE3gXHL75qz9tlel/ZejyrejQD2BE7YrDGYvM5I2PiB++pa/A2WxyemOoXjVEwmLVw3WZ/hfWXudfAKsN4KLQE1CLb/nZzrlv2RvsbtLNH99q+iEAQKx6JuNG/NGVOTWp/BotLFpmXFDatkjk8RlBf6TJWqfqofAEyecrqlDS/KmnD6APb2QQImdwRRhZwobfR+VGGQlVAIOgkeYCjSGz5bnJhrfsn2477vDqBLHRyBkKcUj5InUVHqnijmcGyrN8Zfue/vlLDCK4w4urahlYcAKa7IhrLLXVommuYp2SDv9NRHha8COT/aNv4ObDt7P6ck4qR3Cndk38ypTPQDUeW4GvAtrydSz0xK/0N9Oj6/EeNanCHywTuv0LnrTaGensmr0grKXAIrEUneJ4LGeUifcuVUPXOfgsjBuNR/etmVunhkXE5t008EWuG8cZg2og/t9OwKAtRSCAI5abdEZLURw5crZCFtdG6x7c2zvlZ3QS1bMOa2hudapGjv3oKIN8ebPcm06ifW3pwTuFQNBxtqjybp3p0hpIMLkUZZMMyzgSwGO1DAETNVPGm6sOPBPsH3gMcx3AleFuB0w3VbLdLjyVNlrh9SSCsaxKP+ep9EUdBWYQZmnyJ2xE+e3KvNAPOxQHodlJdn4xEJ0KzLOXuS5LMJVGLKT1qWo9sRQ9EMmDTgIJu2NXMtkoVrA0CiiDdoR6PmFFk0j+PbKyS/h0/xmiQPJRFJpsgtUGm26G1sCeoXqt3e6LmxEvKU4/NFfKuw4s8gkBKLAIQol8lzUUUp476St2Szd/ELSKjb0HToVn4PNN3UdyfeMUENUJnPnJI3prrgBNQi2MvGhD4JlbA/cfEt6AC73VLIfJAA==|920 \ No newline at end of file diff --git a/Pages/流程页面文件夹/FGC_我的待办.rd b/Pages/流程页面文件夹/FGC_我的待办.rd index 9d9c9466..078c7ec0 100644 --- a/Pages/流程页面文件夹/FGC_我的待办.rd +++ b/Pages/流程页面文件夹/FGC_我的待办.rd @@ -1,5 +1,5 @@ { "PageType": 0, - "ColumnCount": 70, + "ColumnCount": 68, "RowCount": 29 } \ No newline at end of file diff --git a/Pages/流程页面文件夹/FGC_我的待阅.json b/Pages/流程页面文件夹/FGC_我的待阅.json index 3f911ca6..38ed3552 100644 --- a/Pages/流程页面文件夹/FGC_我的待阅.json +++ b/Pages/流程页面文件夹/FGC_我的待阅.json @@ -3,25 +3,20 @@ "RowColumnAttachedInfos": { "0": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 24.0 } }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 32.0 } }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 24.0 } }, "3": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } - }, - "4": { "GridRowColumnDefinition": { "DesignLengthInPixel": 40.0, "Mode": 2, @@ -33,7 +28,7 @@ } } }, - "5": { + "4": { "GridRowColumnDefinition": { "DesignLengthInPixel": 50.0, "Mode": 2, @@ -45,6 +40,18 @@ } } }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, "6": { "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0, @@ -310,6 +317,21 @@ } }, "28": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + } + }, + "Count": 29 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + }, + "1": { "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0, "Mode": 2, @@ -321,21 +343,6 @@ } } }, - "29": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } - } - }, - "Count": 30 - }, - "Cols": { - "RowColumnAttachedInfos": { - "1": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } - }, "2": { "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0, @@ -945,7 +952,8 @@ }, "MaxLength": { "Value": 1.0 - } + }, + "IsHidden": true } }, "53": { @@ -1074,8 +1082,7 @@ }, "MaxLength": { "Value": 1.0 - }, - "IsHidden": true + } } }, "63": { @@ -1125,26 +1132,10 @@ "Value": 1.0 } } - }, - "67": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "69": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } } }, "InLogicalVisibleIndexes": [ + 52, 53, 54, 55, @@ -1153,25 +1144,24 @@ 58, 59, 60, - 61, - 62 + 61 ], - "Count": 70 + "Count": 68 }, "Values": { - "1,2": "我的待阅", - "4,4": "流程", - "4,14": "任务名称", - "4,34": "发起人", - "4,63": "查看" + "1,1": "我的待阅", + "3,3": "流程", + "3,13": "任务名称", + "3,33": "发起人", + "3,62": "查看" }, "AttachInfos": { - "4,2": { + "3,1": { "ListViewInfo": { "Name": "表格1", "TableName": "ACT_RU_TASK_View", - "RowIndex": 4, - "ColumnIndex": 2, + "RowIndex": 3, + "ColumnIndex": 1, "RowCount": 25, "ColumnCount": 66, "SqlCondition": { @@ -1206,7 +1196,7 @@ "ShowGridLine": true } }, - "5,4": { + "4,3": { "BindingInfo": { "TableName": "ACT_RU_TASK_View", "ColumnName": "PROC_DEF_ID_", @@ -1218,21 +1208,21 @@ } } }, - "5,14": { + "4,13": { "BindingInfo": { "TableName": "ACT_RU_TASK_View", "ColumnName": "NAME_", "GUID": "7fccdcd8-5594-4bf2-b0e1-2bd0b50a5a72" } }, - "5,24": { + "4,23": { "BindingInfo": { "TableName": "ACT_RU_TASK_View", "ColumnName": "CREATE_TIME_", "GUID": "b02f51c2-d08f-461a-9caf-4bcfb875f305" } }, - "5,34": { + "4,33": { "BindingInfo": { "TableName": "ACT_RU_TASK_View", "ColumnName": "PROC_INST_ID_", @@ -1244,21 +1234,21 @@ } } }, - "5,53": { + "4,52": { "BindingInfo": { "TableName": "ACT_RU_TASK_View", "ColumnName": "ID_", "GUID": "df67135a-671d-484f-8a4d-8214f784cb02" } }, - "5,58": { + "4,57": { "BindingInfo": { "TableName": "ACT_RU_TASK_View", "ColumnName": "PROC_INST_ID_", "GUID": "4cc90b52-6bc1-4bf8-932f-34a9356a50b0" } }, - "5,63": { + "4,62": { "NameUsedInJavaScript": "", "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", @@ -1283,7 +1273,7 @@ }, { "FontFamily": 0, - "FontSize": 21.333333333333332, + "FontSize": 18.666666666666664, "FontWeight": 2, "Foreground": 3, "Formatter": 4 @@ -1340,9 +1330,6 @@ "FontFamily": 0, "FontSize": 13.333333333333332, "HorizontalAlignment": 10 - }, - { - "HorizontalAlignment": 10 } ], "Types": { @@ -1361,6 +1348,7 @@ ] }, "CellStyles": { + "0,33": 0, "0,34": 0, "0,35": 0, "0,36": 0, @@ -1395,8 +1383,8 @@ "0,65": 0, "0,66": 0, "0,67": 0, - "0,68": 0, - "1,2": 1, + "1,1": 1, + "1,2": 2, "1,3": 2, "1,4": 2, "1,5": 2, @@ -1406,7 +1394,7 @@ "1,9": 2, "1,10": 2, "1,11": 2, - "1,12": 2, + "1,33": 0, "1,34": 0, "1,35": 0, "1,36": 0, @@ -1441,18 +1429,7 @@ "1,65": 0, "1,66": 0, "1,67": 0, - "1,68": 0, - "2,2": 2, - "2,3": 2, - "2,4": 2, - "2,5": 2, - "2,6": 2, - "2,7": 2, - "2,8": 2, - "2,9": 2, - "2,10": 2, - "2,11": 2, - "2,12": 2, + "2,33": 0, "2,34": 0, "2,35": 0, "2,36": 0, @@ -1487,92 +1464,53 @@ "2,65": 0, "2,66": 0, "2,67": 0, - "2,68": 0, - "3,34": 0, - "3,35": 0, - "3,36": 0, - "3,37": 0, - "3,38": 0, - "3,39": 0, - "3,40": 0, - "3,41": 0, - "3,42": 0, - "3,43": 0, - "3,44": 0, - "3,45": 0, - "3,46": 0, - "3,47": 0, - "3,48": 0, - "3,49": 0, - "3,50": 0, - "3,51": 0, - "3,52": 0, - "3,53": 0, - "3,54": 0, - "3,55": 0, - "3,56": 0, - "3,57": 0, - "3,58": 0, - "3,59": 0, - "3,60": 0, - "3,61": 0, - "3,62": 0, - "3,63": 0, - "3,64": 0, - "3,65": 0, - "3,66": 0, - "3,67": 0, - "3,68": 0, - "4,2": 3, - "4,4": 4, - "4,14": 5, - "4,24": 4, - "4,34": 4, - "4,53": 5, - "4,58": 5, - "4,63": 6, - "5,2": 7, - "5,4": 8, - "5,14": 8, - "5,24": 9, - "5,34": 8, - "5,53": 8, - "5,54": 2, - "5,55": 2, - "5,56": 2, - "5,57": 2, - "5,58": 8, - "5,63": 10, - "5,69": 11, - "29,69": 2 + "3,1": 3, + "3,3": 4, + "3,13": 5, + "3,23": 4, + "3,33": 4, + "3,52": 5, + "3,57": 5, + "3,62": 6, + "4,1": 7, + "4,3": 8, + "4,13": 8, + "4,23": 9, + "4,33": 8, + "4,52": 8, + "4,53": 2, + "4,54": 2, + "4,55": 2, + "4,56": 2, + "4,57": 8, + "4,62": 10 }, "SheetStyle": { "FontFamily": 0 } }, "Spans": [ - "5,2,1,2", - "5,4,1,10", - "5,14,1,10", - "5,53,1,5", - "5,58,1,5", - "5,63,1,5", - "1,2,2,11", - "6,2,23,66", - "5,34,1,19", - "5,24,1,10", - "4,2,1,2", - "4,4,1,10", - "4,14,1,10", - "4,24,1,10", - "4,34,1,19", - "4,53,1,5", - "4,58,1,5", - "4,63,1,5" + "4,1,1,2", + "4,3,1,10", + "4,13,1,10", + "4,52,1,5", + "4,57,1,5", + "4,62,1,5", + "1,1,1,11", + "4,33,1,19", + "4,23,1,10", + "5,1,23,66", + "3,1,1,2", + "3,3,1,10", + "3,13,1,10", + "3,23,1,10", + "3,33,1,19", + "3,52,1,5", + "3,57,1,5", + "3,62,1,5" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", - "MasterPageName": "FGC_流程中心", "MobilePageName": "FGC_我的待阅_手机版", "Title": "我的待阅", "AuthorizeInfo": { @@ -1586,4 +1524,4 @@ "PaperSize": {}, "Margin": {} } -}//9qtm6i/PP99V1VIFvYIci0XICX6b/OaXdOZbcvEjwALv/nHfWbbSxQytkMwLKCpP9smgLBCtujOhx0bbFP7OQ76Y4FF7ICOHdxOTYlRwrJlLfhdnHs/pbmAJxMJivrIcWicGsyilEJrl7odPQ7ucbLVFb/J+/4XaIrVkh1+AbVvy3G7ySI9s+Yange+IWWt4IyUl5m1ltjWrNDvFUODDC8fmmwIrwNSr3yAnKOQ2E0tZ8/gROIomfiog+HtG3wHONfG9IqfIaahAi7Vi/S6v370Txo0uJmRl1iiD/7tnGeu7DW7xKNakNpwGTpM74RqE4CB7wYIxF5Aban3JgBmf1fHzF1f0YeP2uRYQ0T2SRUDObOdX4D59zx7afK7OCwbjKrAnbwXcpQwhmj3GqNyVBXD4UEJ49hLnW3qZ8CYs9EV1yDk8pXAWOhReinlHpaPP0w8/IxsL90fOJxpXXNAYPNbSiO64hSa8u6L1R1DLAHCzEWzBWya5Pu66hZ9B1lP15EVhOB0+IsQ9qgAje4DQR1Xcd+o0om9mcysD4wTrGhDf+VqmQiMigc979OocReSvQHolbs/EoYgWIXj/i8TNxqOarsm0oPA7hCTlvBKvpc+bV8vZTISJAsTTESmTUBuHbHvH/BksAcJRfJLI83R4cUQPe4DTcoNTEWSfCSdoB8beNO7UGL2oeXHxjdJQqAalBi626wYkBq9ZbVQsrflQSFh281X2et22AByWWGEgyEWlxepPAx73SoBEgMZA6Z89WSKm3n++vx4av4FjKdoT1f3q0YVhvb4Y60oa/i3/vm1JJ6dXe3JiAR4m0bafQ9RdJZtv/ccPe0fWu2U5k7GxVioBL3abetiHbz7yLKE85fAGXPcjdsnN5ipBl/T0Pk0BYrmgo3qb+tz8sYQS9PFsZA==|920 \ No newline at end of file +}//vbI+Rvw1XnIl/KAG+HRF3bZkbYv9kIfwkEknXXX5hq2gOxSLspEG6wgY6ZECk6DJjCjDFsKuccEYwsM80svCvnEnnapcN4YrqZDIeX8SUaCOXzLQJEa8PdhP0d6usWhV+Z7bnT4gJq1rcMYDuR9L4Q8yN5mKomLAL81x7RO5viWnOsFgvMkm8XUeiyIZkFGIUKOwF8BPT1GEofr8rEOLX93RpSdCjlZmpfFfCxYJnnNjTvpApwUG6mlTYi9G588GBbJo7BHoHVx05gjoxkeBnDyhqbCW4nJjZTGAxaJHUyOFvykk5ATrShVqPQwfxpZmyfMo7TvcweVBTuXfL8tNCTyZZjeu6+0LjS/reFv7bQqAIXTaLjIe1woURFpmqPHy7ZqeNiLXrq6gu6gXCebjgpcxE+wma8970jewn9vT8ykI2L/aL3/u3CexY3euAur7jGuw5mPAa8lSThDUEDMALB2ZOY4G5sKoKXiv8jbFahnpSjm0TPidzhmWELz3sXoN53u3y3hpLxUNG1QHHcBExEP/tEh6qQq4M/kdr1KGIAQ2IwV2l9B5mTY390xKad6/m9xLnc0q72uOVkqrhzwF8RoIA3uE1u0DOVj4Z3YtyM+3JJi/Hw/dEIx555zaHs+YSClOssu5QrZQcLZEnP3hnQ1lz340zrNoUdk2R4YNU7xd47g4yAqLyvHw1ESpB6pFaDFqGHH1TfFZYstUv0INFYINHzOrCYtBjtOcWRayWACWlEWcm5Giqeta9XRtjX79pPQ3unaurNqL3/HOSwyl1kxLEsT70qLWX3d5v5I9H4M0ufZN/uxjx2aMJS9POOqNOYVudZHmlA3qGAXWa66GKv7NolrOb56U5uTZlhXyd7b2EEXCalNY92W7h/2oqyVXclcLvuWoIhfY4nQMYPhO9Q==|920 \ No newline at end of file diff --git a/Pages/流程页面文件夹/FGC_我的待阅.rd b/Pages/流程页面文件夹/FGC_我的待阅.rd index 3d2fcd0e..078c7ec0 100644 --- a/Pages/流程页面文件夹/FGC_我的待阅.rd +++ b/Pages/流程页面文件夹/FGC_我的待阅.rd @@ -1,5 +1,5 @@ { "PageType": 0, - "ColumnCount": 70, - "RowCount": 30 + "ColumnCount": 68, + "RowCount": 29 } \ No newline at end of file diff --git a/Pages/流程页面文件夹/流程中心.json b/Pages/流程页面文件夹/流程中心.json new file mode 100644 index 00000000..1404861b --- /dev/null +++ b/Pages/流程页面文件夹/流程中心.json @@ -0,0 +1,640 @@ +{ + "Rows": { + "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, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + } + }, + "Count": 20, + "DefaultSize": 32.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 167.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.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 + } + }, + "24": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "25": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "26": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "27": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "28": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "29": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "30": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "31": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "35": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "36": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "37": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + } + }, + "Count": 38, + "DefaultSize": 32.0 + }, + "AttachInfos": { + "0,0": { + "CellType": { + "$type": "Forguncy.CustomMenu.ForguncyMenuCellType, Forguncy.CustomMenu", + "TemplateKey": "BalckWhite", + "Items": [ + { + "Text": "任务", + "SelectedIconColor": "Background 1", + "SelectedIconColorUseItemColor": true, + "IconColorUseItemColor": true, + "IsOldMenuPath": false, + "CanVisitRoleList": [ + "FGC_LoginUser" + ], + "SubItems": [ + { + "Text": "我的待办", + "IconPath": "Application/029_edit_9.svg", + "SelectedIconColor": "Background 1", + "SelectedIconColorUseItemColor": true, + "IconColor": "Accent 1 0", + "IsDefaultItem": true, + "IsOldMenuPath": false, + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=流程中心!流程中心子页面" + }, + "Value": "FGC_我的待办" + } + ] + } + ], + "CanVisitRoleList": [ + "FGC_LoginUser" + ], + "Notification": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=流程中心!母版_待办数量" + } + }, + { + "Value": "我发起的", + "Text": "我发起的", + "IconPath": "Application/131_list_3.svg", + "SelectedIconColor": "Background 1", + "SelectedIconColorUseItemColor": true, + "IconColor": "Accent 1 0", + "IsOldMenuPath": false, + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=流程中心!流程中心子页面" + }, + "Value": "FGC_我发起的" + } + ] + } + ], + "CanVisitRoleList": [ + "FGC_LoginUser" + ] + }, + { + "Text": "我的已办", + "IconPath": "Application/145_check_2.svg", + "SelectedIconColor": "Background 1", + "SelectedIconColorUseItemColor": true, + "IconColor": "Accent 1 0", + "IsOldMenuPath": false, + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=流程中心!流程中心子页面" + }, + "Value": "FGC_我的已办" + } + ] + } + ], + "CanVisitRoleList": [ + "FGC_LoginUser" + ] + }, + { + "Text": "我的待阅", + "IconPath": "Application/123_send_3.svg", + "SelectedIconColor": "Background 1", + "SelectedIconColorUseItemColor": true, + "IconColor": "Accent 1 0", + "IsOldMenuPath": false, + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=流程中心!流程中心子页面" + }, + "Value": "FGC_我的待阅" + } + ] + } + ], + "CanVisitRoleList": [ + "FGC_LoginUser" + ] + }, + { + "Value": "我的已阅", + "Text": "我的已阅", + "IconPath": "Application/144_check_1.svg", + "SelectedIconColor": "Background 1", + "SelectedIconColorUseItemColor": true, + "IconColor": "Accent 1 0", + "IsOldMenuPath": false, + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=流程中心!流程中心子页面" + }, + "Value": "FGC_我的已阅" + } + ] + } + ], + "CanVisitRoleList": [ + "FGC_LoginUser" + ] + } + ] + }, + { + "Text": "委托", + "SelectedIconColor": "Background 1", + "SelectedIconColorUseItemColor": true, + "IconColorUseItemColor": true, + "IsOldMenuPath": false, + "CanVisitRoleList": [ + "FGC_LoginUser" + ], + "SubItems": [ + { + "Text": "委托设置", + "IconPath": "Application/053_settings_4.svg", + "SelectedIconColor": "Background 1", + "SelectedIconColorUseItemColor": true, + "IconColor": "Accent 1 0", + "IsOldMenuPath": false, + "CommandList": [ + { + "$type": "Forguncy.Model.ProcessDelegateSettingCommand, ServerDesignerCommon" + } + ], + "CanVisitRoleList": [ + "FGC_LoginUser" + ] + }, + { + "Value": "我委托的", + "Text": "我委托的", + "IconPath": "Application/148_copy_2.svg", + "SelectedIconColor": "Background 1", + "SelectedIconColorUseItemColor": true, + "IconColor": "Accent 1", + "IsOldMenuPath": false, + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=流程中心!流程中心子页面" + }, + "Value": "FGC_我委托的" + } + ] + } + ], + "CanVisitRoleList": [ + "FGC_LoginUser" + ] + } + ] + } + ], + "MenuLevelsStyle": [ + { + "FontSize": 13.333333333333332, + "Bold": true, + "Height": 40.0, + "IconHeight": 14.0, + "IconWidth": 14.0 + }, + { + "FontSize": 13.333333333333332, + "Bold": false, + "Height": 40.0, + "IconHeight": 14.0, + "IconWidth": 14.0 + } + ] + } + }, + "0,2": { + "CellType": { + "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", + "PageName": "FGC_我的待办" + } + } + }, + "StyleDatas": { + "Styles": [ + { + "FontFamily": 0, + "BorderBottom": null, + "BorderTop": null, + "BorderLeft": null + }, + { + "FontFamily": 0, + "BorderBottom": null, + "BorderTop": null, + "BorderLeft": null, + "BorderRight": 0 + } + ], + "Types": { + "Strs": [ + "Body", + "Background 2 -10" + ], + "Borders": [ + { + "Color": 1 + } + ] + }, + "CellStyles": { + "0,0": 0, + "0,1": 1, + "1,0": 0, + "1,1": 1, + "2,0": 0, + "2,1": 1, + "3,0": 0, + "3,1": 1, + "4,0": 0, + "4,1": 1, + "5,0": 0, + "5,1": 1, + "6,0": 0, + "6,1": 1, + "7,0": 0, + "7,1": 1, + "8,0": 0, + "8,1": 1, + "9,0": 0, + "9,1": 1, + "10,0": 0, + "10,1": 1, + "11,0": 0, + "11,1": 1, + "12,0": 0, + "12,1": 1, + "13,0": 0, + "13,1": 1, + "14,0": 0, + "14,1": 1, + "15,0": 0, + "15,1": 1, + "16,0": 0, + "16,1": 1, + "17,0": 0, + "17,1": 1, + "18,0": 0, + "18,1": 1, + "19,0": 0, + "19,1": 1 + }, + "SheetStyle": { + "FontFamily": 0 + } + }, + "Spans": [ + "0,0,20,1", + "0,2,20,36" + ], + "PageInfo": { + "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "MasterPageName": "FGC_母版页", + "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": {} + }, + "CustomNames": [ + { + "Name": "流程中心子页面", + "Formula": "流程中心!$C$1" + } + ] +}//6fw8wwbpn/rsZ7vxIvw82Dql9wD/EhFRhyLSemoV9mzSICzBAtrx4fWu8jVdFUXOUcVJTDeQwqEER45IInHKsRe4rzCr0nzHPKCR8abAeG0jhC+2Ug3Ngau0dQyz11T6Xz2tQuQy5O2Dh90du+LQdIvg7AHp6phaBV5zn4jKVsUuaAbj99+LAe8YQ6BHFAvC3QF9ral63d8cms7kInJYoyLOwvTzh3X9yYM7QrwAx9QRFPUUujBuPkhwwksfyVVB+Tkr4HWC93ffMoqPQS5QTrahiBJ4iADx9+zqU9qrFnUQo6d8OzORwgbtRl2oYkYG+dX7yKkYU+fA8nWvctZNG3iherxf1Q4rFo3WPEdbu4FVcr/Ptsc3wRJN471BphUONLG2ZmINvHvb7iAMsToSsCXU5lApp6uioabNbDGSlphPfJRwbx3arY3PLqlMFm+bsoZcooxU2j5jydInRMQBljbB1DaMBiI+U9PsecA0y2lTviVvVxUKOGkOy5r2Mkinni2BsRlgG8lJ3vNMLlvDCe/TKrYMyVjHfgbFjjFYib0JTo/u9FhUfiHzdLv3SiBNQzKeBPjq5S4M/GlCIJxFeMFZvIK2AVWTgrjkUwsqnXA8LAu8ZX4sTPJiycdg09lGxIAjGhWU2vHw8CdXPsiLDe3osKR1LemIUaWbSq+2G/PEICJy+EUU8HAe8zRsprL9+5r2EotZK12i2sp9ggf2cmDigr6VpDf/MFlg6iQPtZsKVJ/JYvnhwKASCHYAITl1RiyoznDmx6/e2BO90GjOCb/SqfkKruVf7h9tZT4YNzZghm2ZqSJTStTLKGvTiqURUAsqntp48kZHbivR5t6crB+DGAHuVwA0t+Pp892NhtQplWuC4O5edHNxVunfmMfzhcWueis2aRdB6dy7JrdAjA==|920 \ No newline at end of file diff --git a/Pages/流程页面文件夹/流程中心.rd b/Pages/流程页面文件夹/流程中心.rd new file mode 100644 index 00000000..7122d0ea --- /dev/null +++ b/Pages/流程页面文件夹/流程中心.rd @@ -0,0 +1,11 @@ +{ + "PageType": 0, + "ColumnCount": 38, + "RowCount": 20, + "CustomNames": [ + { + "Name": "流程中心子页面", + "Formula": "流程中心!$C$1" + } + ] +} \ No newline at end of file diff --git a/ServerCommands/任务/同步任务参与人字段.json b/ServerCommands/任务/同步任务参与人字段.json new file mode 100644 index 00000000..73736586 --- /dev/null +++ b/ServerCommands/任务/同步任务参与人字段.json @@ -0,0 +1,98 @@ +{ + "Name": "同步任务参与人字段", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon", + "Permission": { + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + } + }, + "Parameters": [ + { + "Name": "任务ID", + "DataValidationInfo": { + "IgnoreBlank": false + } + } + ] + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "任务信息", + "TableValue": { + "TableName": "任务表", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "参与人统计", + "GUID": "cb217fea-4529-4dff-b55a-554b24ba113f" + }, + "ColumnName": "参与人" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "560dca62-8721-4c1a-9f4b-9ee205d34d3a" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } + }, + "TopCount": "1" + }, + "ID": "f12242172b9a48eba3dd67472da396fb" + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "393fcd69-1ecf-4ce0-990e-3dd89853fe86" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } + }, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "参与人", + "GUID": "dde9f035-fc64-4f6d-9535-9e0d5c849fa6" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.参与人" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/ServerCommands/任务/更新任务参与人.json b/ServerCommands/任务/更新任务参与人.json new file mode 100644 index 00000000..d11ef8db --- /dev/null +++ b/ServerCommands/任务/更新任务参与人.json @@ -0,0 +1,429 @@ +{ + "Name": "更新任务参与人", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon", + "Permission": { + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + } + }, + "Parameters": [ + { + "Name": "任务ID", + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + { + "Type": 1, + "ArrayParamItems": [ + { + "Name": "ID", + "DataValidationInfo": {} + }, + { + "Name": "成员", + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + { + "Name": "岗位", + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + { + "Name": "时薪", + "DataValidationInfo": { + "IgnoreBlank": false + } + } + ], + "OnlySendChangedData": true, + "PrimaryKeys": [ + "ID" + ], + "Name": "参与人列表", + "DataValidationInfo": {} + } + ] + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", + "TryCommandPart": { + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "任务信息", + "TableValue": { + "TableName": "任务表", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "cea97372-d27e-43fe-bf11-394cc980045f" + }, + "ColumnName": "项目ID" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务名称", + "GUID": "f8778b5b-59e8-4106-9e8f-5e341baceee9" + }, + "ColumnName": "任务名称" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "6089b59b-1f23-455f-b64a-81664e14491d" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } + }, + "TopCount": "1" + }, + "ID": "76933ca611fb4944bb7102a7660b69ef" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息" + } + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", + "LoopInfo": { + "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon", + "LoopCount": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=参与人列表.AddRows" + }, + "LoopItemParamName": "Item" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务成员表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "项目ID", + "GUID": "261b6290-e45f-4595-abbd-36574ac3f28c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.项目ID" + } + }, + { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "任务ID", + "GUID": "2be24e49-4a55-42cc-8be6-f28a42f6c15e" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } + }, + { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "参与人", + "GUID": "2c8d6bd3-6fc6-41bf-bae9-78784cf4b729" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.成员" + } + }, + { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "岗位ID", + "GUID": "0b90628f-b229-493f-9c5d-0227ec050478" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.岗位" + } + }, + { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "任务时薪", + "GUID": "bf95d3f0-1632-4dc1-8cb9-320fb13f3e8f" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.时薪" + } + } + ] + } + ] + }, + { + "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", + "LoopInfo": { + "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon", + "LoopCount": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=参与人列表.EditRows" + }, + "LoopItemParamName": "Item" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务成员表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务成员表", + "ColumnName": "ID", + "GUID": "43efc519-1bf8-47bd-b809-383653ec559c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.ID" + } + }, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "参与人", + "GUID": "e9ffead8-6af1-40f0-bd06-8bcf55f769e6" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.成员" + } + }, + { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "岗位ID", + "GUID": "42dcdf05-28be-4b8d-ba4d-a6f705f4718e" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.岗位" + } + }, + { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "任务时薪", + "GUID": "09140a4d-b88c-42c9-9847-15110c2120c7" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.时薪" + } + } + ] + } + ] + }, + { + "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", + "LoopInfo": { + "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon", + "LoopCount": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=参与人列表.DeleteRows" + }, + "LoopItemParamName": "Item" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务成员表", + "UpdateType": "delete", + "ShowConfirm": true, + "ConfirmText": "您确定要删除吗？", + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务成员表", + "ColumnName": "ID", + "GUID": "43efc519-1bf8-47bd-b809-383653ec559c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.ID" + } + } + } + ] + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目动态", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目ID", + "GUID": "d5d82bb9-79a3-4095-bbb4-1bae803665cf" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.项目ID" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目动态", + "GUID": "bbe3d62b-3c34-4607-80c4-1e2c75d2f4fd" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"更新了任务[\"&任务信息.任务名称&\"]的参与人员\"" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "执行人", + "GUID": "6619d272-5e20-4f49-9ce5-f2d044902052" + }, + "Value": "%CurrentUser%" + } + ] + } + ] + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "同步任务参与人字段", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "任务ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "同步项目成员", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "项目ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.项目ID" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "操作完成" + } + ], + "ID": "cb3d02b8-4253-46cb-b0a3-18d119e0e3de" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": "任务不存在" + } + ], + "ID": "03375eb5-284a-476f-a57f-37cebce3ac95" + } + ] + } + ] + }, + "CatchCommandPart": { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionCode" + }, + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionMessage" + } + } + ] + } + } + ] +} \ No newline at end of file diff --git a/ServerCommands/任务/移除任务成员.json b/ServerCommands/任务/移除任务成员.json index 493561d9..ca89e2dc 100644 --- a/ServerCommands/任务/移除任务成员.json +++ b/ServerCommands/任务/移除任务成员.json @@ -76,7 +76,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "a0db2ab08aca46578fc299c091dccadf" + "ID": "b15d94ad6e7644c293da886727448cb1" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -208,13 +208,51 @@ } ] }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "同步任务参与人字段", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "任务ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } + } + ], + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "同步项目成员", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "项目ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.项目ID" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", "ErrorCode": "0", "Message": "移除成功" } ], - "ID": "0f6d22da-338b-4926-932c-a486ef40a5f8" + "ID": "30260bc1-aa8a-4d4a-8a8f-da590bca2e31" }, { "CommandList": [ @@ -224,7 +262,7 @@ "Message": "任务不存在" } ], - "ID": "15636350-a0ee-41fe-8b53-615843115301" + "ID": "a8ce8730-b1f7-4633-908b-c63620ca7727" } ] } diff --git a/ServerCommands/项目/同步项目参与人字段.json b/ServerCommands/项目/同步项目参与人字段.json new file mode 100644 index 00000000..0edb7b40 --- /dev/null +++ b/ServerCommands/项目/同步项目参与人字段.json @@ -0,0 +1,103 @@ +{ + "Name": "同步项目参与人字段", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon", + "Permission": { + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + } + }, + "Parameters": [ + { + "Name": "项目ID", + "DataValidationInfo": { + "IgnoreBlank": false + } + } + ] + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "项目", + "TableValue": { + "TableName": "项目表", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "参与人统计", + "GUID": "8b8f298b-efb2-46b4-a9a8-635d05bd0e28" + }, + "ColumnName": "参与人统计" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目表", + "ColumnName": "ID", + "GUID": "1ab3a090-8c04-49e0-a7dc-a45b89695fe3" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + }, + "TopCount": "1" + }, + "ID": "7e6ea301e3094f7e9775b0bac50ad26d" + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目表", + "ColumnName": "ID", + "GUID": "9ceabbfb-d345-46e0-9329-cf539a12e480" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + }, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "参与人", + "GUID": "40af57bc-50e4-4406-a2ce-6525bd2a97fb" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目.参与人统计" + } + } + ] + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "同步完成" + } + ] +} \ No newline at end of file diff --git a/ServerCommands/项目/同步项目成员.json b/ServerCommands/项目/同步项目成员.json index be8a1f0a..0aa68238 100644 --- a/ServerCommands/项目/同步项目成员.json +++ b/ServerCommands/项目/同步项目成员.json @@ -25,9 +25,13 @@ "Name": "项目ID", "DataValidationInfo": { "IgnoreBlank": false - } + }, + "TestData": "1" } - ] + ], + "InvokeTriggerTestData": { + "UserName": "Administrator" + } } ], "Commands": [ @@ -36,133 +40,85 @@ "TryCommandPart": { "CommandList": [ { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "成员列表", - "TableValue": { - "TableName": "任务成员表", - "BindingInfos": [ - { - "BindingInfo": { - "TableName": "任务成员表", - "ColumnName": "参与人", - "GUID": "46de6571-6826-4235-976f-a5064c56a1d7" - }, - "ColumnName": "参与人" - }, - { - "BindingInfo": { - "TableName": "任务成员表", - "ColumnName": "岗位ID", - "GUID": "dc37147b-37ae-447e-be34-44aa79248cd9" - }, - "ColumnName": "岗位ID" - }, - { - "BindingInfo": { - "TableName": "任务成员表", - "ColumnName": "任务时薪", - "GUID": "ffd017c3-0213-434a-850a-17e468a25351" - }, - "ColumnName": "任务时薪" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务成员表", - "ColumnName": "任务ID", - "GUID": "2cc2c0aa-d496-4ba1-9489-9340529dba7f", - "RelationBinding": { - "RelatedTable": "任务表", - "RelatedColumn": "ID", - "DisplayColumn": "项目ID" - } - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目ID" - } - } - }, - "ID": "5a0ad3f6027f47d6b62484d516aa2e03" - }, - { - "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", - "LoopInfo": { - "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon", - "LoopCount": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=成员列表" - }, - "LoopItemParamName": "Item" - }, + "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", "CommandList": [ { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "是否存在", + "ParameterName": "成员列表", "TableValue": { - "TableName": "项目成员表", - "TableValueType": 3, - "SqlCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目成员表", - "ColumnName": "项目ID", - "GUID": "7d33c794-4447-4038-84d0-215ede69a00c" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目ID" - } + "TableName": "任务成员表", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "参与人", + "GUID": "46de6571-6826-4235-976f-a5064c56a1d7" }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目成员表", - "ColumnName": "项目成员", - "GUID": "958cdb07-86e0-45cc-90f5-f10ddc68fc3f" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=Item.参与人" - } + "ColumnName": "参与人" + }, + { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "岗位ID", + "GUID": "dc37147b-37ae-447e-be34-44aa79248cd9" + }, + "ColumnName": "岗位ID" + }, + { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "任务时薪", + "GUID": "ffd017c3-0213-434a-850a-17e468a25351" + }, + "ColumnName": "任务时薪" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务成员表", + "ColumnName": "任务ID", + "GUID": "2cc2c0aa-d496-4ba1-9489-9340529dba7f", + "RelationBinding": { + "RelatedTable": "任务表", + "RelatedColumn": "ID", + "DisplayColumn": "项目ID" } - ] - }, - "NullFormulaValueQueryPolicy": 0 + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + } }, - "ID": "e1175777efe1428db7a940d44c33d8af" + "ID": "80ede1174f0e44d08c2ac38bacb1505f" }, { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ + "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", + "LoopInfo": { + "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon", + "LoopCount": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=成员列表" + }, + "LoopItemParamName": "Item" + }, + "CommandList": [ { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=是否存在" - } - }, - "value": "0" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "项目成员表", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "是否存在", + "TableValue": { + "TableName": "项目成员表", + "TableValueType": 3, + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ { - "BindingInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { "TableName": "项目成员表", "ColumnName": "项目ID", - "GUID": "b5dba8cc-b6c6-4453-b2c7-5eee4a72bba9" + "GUID": "7d33c794-4447-4038-84d0-215ede69a00c" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -170,185 +126,122 @@ } }, { - "BindingInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { "TableName": "项目成员表", "ColumnName": "项目成员", - "GUID": "cec1565c-6cf4-40f9-875d-c332832ca12d" + "GUID": "958cdb07-86e0-45cc-90f5-f10ddc68fc3f" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=Item.参与人" } - }, - { - "BindingInfo": { - "TableName": "项目成员表", - "ColumnName": "岗位ID", - "GUID": "a41ae40a-48be-4e06-808a-5d3180a9179d" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=Item.岗位ID" - } - }, - { - "BindingInfo": { - "TableName": "项目成员表", - "ColumnName": "默认时薪", - "GUID": "dca7ae70-52c2-4102-aa42-c3d41fe145c6" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=Item.任务时薪" - } } ] + }, + "NullFormulaValueQueryPolicy": 0 + }, + "ID": "7d2ab957b8a0418499611a4a9ae72922" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=是否存在" + } + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目成员表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目ID", + "GUID": "423a454c-0ebe-4cde-82cb-47c6bf6e7e42" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + }, + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "d6fe68a3-6354-472d-abab-fd66735bb628" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.参与人" + } + }, + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "岗位ID", + "GUID": "24cb4c61-d136-428a-bbd8-9be528a51b1e" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.岗位ID" + } + }, + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "默认时薪", + "GUID": "f539a7b6-27fd-43f6-9422-9e200ee0734b" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.任务时薪" + } + } + ] + } + ], + "ID": "7e56221d-aa8f-44e0-9ddf-6bd5c68ee53a" } - ], - "ID": "afcc2411-1b9d-4211-9b98-d668eb09da45" + ] } - ] + ], + "Comments": "查找任务成员表里的成员" } - ], - "Comments": "查找任务成员表里的成员" + ] }, { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "项目成员列表", - "TableValue": { - "TableName": "项目成员表", - "BindingInfos": [ - { - "BindingInfo": { - "TableName": "项目成员表", - "ColumnName": "ID", - "GUID": "776b34e0-2742-40f8-b25a-7442467aad3c" - }, - "ColumnName": "ID" - }, - { - "BindingInfo": { - "TableName": "项目成员表", - "ColumnName": "项目成员", - "GUID": "54c3ab22-8dfa-4375-9161-50d4240730af" - }, - "ColumnName": "项目成员" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目成员表", - "ColumnName": "项目ID", - "GUID": "a39233a0-70be-4432-9c6c-5119c5fc397e" - }, + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "同步项目参与人字段", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "项目ID", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=项目ID" } } - }, - "ID": "e06003e76e034598b3a4059476852ba3", - "Disabled": true - }, - { - "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", - "LoopInfo": { - "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon", - "LoopCount": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目成员列表" - }, - "LoopItemParamName": "Item" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "是否存在", - "TableValue": { - "TableName": "任务成员表", - "TableValueType": 3, - "SqlCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务成员表", - "ColumnName": "任务ID", - "GUID": "4a90d292-0621-4ba2-b56d-ca1ceed510a8", - "RelationBinding": { - "RelatedTable": "任务表", - "RelatedColumn": "ID", - "DisplayColumn": "项目ID" - } - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目ID" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务成员表", - "ColumnName": "参与人", - "GUID": "3bc96ff4-ca55-4f09-9c6f-ad89327ec7f6" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=Item.项目成员" - } - } - ] - } - }, - "ID": "53692da06b9444d6a0d6f2d56dc87b5c" - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=是否存在" - } - }, - "value": "0" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "项目成员表", - "UpdateType": "delete", - "ShowConfirm": true, - "ConfirmText": "您确定要删除吗？", - "RowsToUpdate": 1, - "RowsToUpdateCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目成员表", - "ColumnName": "ID", - "GUID": "c68c1577-2e22-464b-b66b-fcc6b6921063" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=Item.ID" - } - } - } - ], - "ID": "09ec1c75-f0a0-4ffa-a4b0-a5049f63561c" - } - ] - } ], - "Comments": "将多余的项目成员剔除", - "Disabled": true + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true }, { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", diff --git a/ServerCommands/项目/移除项目成员.json b/ServerCommands/项目/移除项目成员.json index d0d6bb43..8fd85144 100644 --- a/ServerCommands/项目/移除项目成员.json +++ b/ServerCommands/项目/移除项目成员.json @@ -98,7 +98,7 @@ ] } }, - "ID": "2cffba6c6bea4272bc627c5f7455e410" + "ID": "3b0e3f66ab994d029e85d7952bb2800f" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -117,79 +117,100 @@ }, "CommandList": [ { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "项目成员表", - "UpdateType": "delete", - "ShowConfirm": true, - "ConfirmText": "您确定要删除吗？", - "RowsToUpdate": 1, - "RowsToUpdateCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目成员表", - "ColumnName": "ID", - "GUID": "442c8862-a026-4267-9d73-bce2152a982d" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目ID" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目成员表", - "ColumnName": "ID", - "GUID": "fb204421-bf1a-4021-9b8b-1237c01a1fa7" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=成员用户名" - } + "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目成员表", + "UpdateType": "delete", + "ShowConfirm": true, + "ConfirmText": "您确定要删除吗？", + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目成员表", + "ColumnName": "ID", + "GUID": "442c8862-a026-4267-9d73-bce2152a982d" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目成员表", + "ColumnName": "ID", + "GUID": "fb204421-bf1a-4021-9b8b-1237c01a1fa7" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=成员用户名" + } + } + ] } - ] - } + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目动态", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目ID", + "GUID": "0247e828-bc5a-47c7-888b-5b85f15f5ba1" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目动态", + "GUID": "a1f2044f-2398-4a49-be13-49c2a5597110" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"将成员\"&成员用户名&\"从项目里移出\"" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "执行人", + "GUID": "84f04962-b95e-4012-bb85-ec041eab9ef5" + }, + "Value": "%CurrentUser%" + } + ] + } + ] }, { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "项目动态", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "同步项目成员", + "Parameters": [ { - "BindingInfo": { - "TableName": "项目动态", - "ColumnName": "项目ID", - "GUID": "1136590a-6f78-4586-8611-9c3a0ee7b2a2" - }, + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "项目ID", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=项目ID" } - }, - { - "BindingInfo": { - "TableName": "项目动态", - "ColumnName": "项目动态", - "GUID": "54034bbd-5b74-4ea9-9411-1b4646b2b513" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"将成员\"&成员用户名&\"从项目里移出\"" - } - }, - { - "BindingInfo": { - "TableName": "项目动态", - "ColumnName": "执行人", - "GUID": "60fa8f7a-e378-431e-b287-01e5b8f9a1bf" - }, - "Value": "%CurrentUser%" } - ] + ], + "RefreshAfterFinish": true, + "CheckDataValidation": true }, { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", @@ -197,7 +218,7 @@ "Message": "删除成功" } ], - "ID": "c893eeab-d955-4c20-9127-4a65b34bdfda" + "ID": "7695407f-b5a2-4276-b262-ff330f1a9b29" }, { "CommandList": [ @@ -207,7 +228,7 @@ "Message": "该成员已参与到具体任务，请先从任务中剔除后再进行删除！" } ], - "ID": "0cfa5973-d6d6-4c62-9e7f-b6d92248dd52" + "ID": "125568c7-60a2-4f89-9c38-cdc84887904a" } ] } diff --git a/Tables/任务/任务表.json b/Tables/任务/任务表.json index 82d57b1a..f8779aba 100644 --- a/Tables/任务/任务表.json +++ b/Tables/任务/任务表.json @@ -1,5 +1,319 @@ { "Name": "任务表", + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionResource, Forguncy.RbacPermission.Core", + "enabledTypes": 2, + "isExternal": true, + "detailTables": [ + { + "subTableName": "任务成员表", + "subColumnName": "任务ID", + "relatedColumnName": "ID" + }, + { + "subTableName": "任务表", + "subColumnName": "父任务ID", + "relatedColumnName": "ID" + }, + { + "subTableName": "任务进展", + "subColumnName": "任务ID", + "relatedColumnName": "ID" + }, + { + "subTableName": "View_任务工时统计", + "subColumnName": "任务ID", + "relatedColumnName": "ID" + }, + { + "subTableName": "任务工时表", + "subColumnName": "任务ID", + "relatedColumnName": "ID" + } + ] + }, + "permissionBindings": [ + { + "$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", + "项目总监" + ] + }, + { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core", + "config": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowBindingConfig, Forguncy.RbacPermission.Core", + "operationTypes": 5, + "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": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowBindingConfig, Forguncy.RbacPermission.Core", + "operationTypes": 1, + "dataFilter": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core", + "userFieldName": "执行者", + "filterType": 4, + "condition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "执行者", + "GUID": "8039e5c8-feaa-41a8-b8db-b19e9ec288d6" + }, + "Value": "%CurrentUser.UserName%" + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "307797f5-7f60-495f-90d8-5db319a11724", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "项目经理" + } + }, + "Value": "%CurrentUser.UserName%" + }, + { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 6, + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "参与人", + "GUID": "699b9e72-7bc3-4d4d-9636-a0fb2314ef00" + }, + "Value": "%CurrentUser%" + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "42e22c0d-7cdc-4673-9642-105e286c61e6", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "公开" + } + }, + "Value": "1" + } + ], + "RelationType": 1 + } + } + }, + "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": 1, + "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": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.CreateRecordBindingConfig, Forguncy.RbacPermission.Core", + "dataFilter": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.CreateRecordFilter, Forguncy.RbacPermission.Core" + } + }, + "dataPermissionType": 1, + "roleNames": [ + "FGC_LoginUser" + ] + }, + { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core", + "config": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldBindingConfig, Forguncy.RbacPermission.Core", + "fieldOperations": { + "ID": 1, + "任务名称": 5, + "任务状态": 5, + "任务类型": 5, + "任务说明": 5, + "任务预算工时": 5, + "关联资源": 5, + "分组ID": 5, + "前置任务": 5, + "参与人": 5, + "参与人数": 5, + "参与人统计": 5, + "备注": 5, + "层级": 5, + "工期": 5, + "开始报工日期": 5, + "开始时间": 5, + "总实际工时": 5, + "总计划工时": 5, + "执行者": 5, + "最后报工日期": 5, + "次序": 5, + "父任务ID": 5, + "版本": 5, + "结束时间": 5, + "进度": 5, + "里程碑": 5, + "项目ID": 5 + }, + "subTableOperations": { + "View_任务工时统计": 5, + "任务工时表": 5, + "任务成员表": 5, + "任务表": 5, + "任务进展": 5 + }, + "dataFilter": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core" + } + }, + "dataPermissionType": 4, + "roleNames": [ + "Administrator" + ] + }, + { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core", + "config": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldBindingConfig, Forguncy.RbacPermission.Core", + "fieldOperations": { + "ID": 1, + "任务名称": 5, + "任务状态": 5, + "任务类型": 5, + "任务说明": 5, + "任务预算工时": 5, + "关联资源": 5, + "分组ID": 5, + "前置任务": 5, + "参与人": 5, + "参与人数": 5, + "参与人统计": 5, + "备注": 5, + "层级": 5, + "工期": 5, + "开始报工日期": 5, + "开始时间": 5, + "总实际工时": 5, + "总计划工时": 5, + "执行者": 5, + "最后报工日期": 5, + "次序": 5, + "父任务ID": 5, + "版本": 5, + "结束时间": 5, + "进度": 5, + "里程碑": 5, + "项目ID": 5 + }, + "subTableOperations": { + "View_任务工时统计": 5, + "任务工时表": 5, + "任务成员表": 5, + "任务表": 5, + "任务进展": 5 + }, + "dataFilter": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core" + } + }, + "dataPermissionType": 4, + "roleNames": [ + "FGC_LoginUser" + ] + }, + { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core", + "config": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldBindingConfig, Forguncy.RbacPermission.Core", + "fieldOperations": { + "ID": 1, + "任务名称": 5, + "任务状态": 5, + "任务类型": 5, + "任务说明": 5, + "任务预算工时": 5, + "关联资源": 5, + "分组ID": 5, + "前置任务": 5, + "参与人": 5, + "参与人数": 5, + "参与人统计": 5, + "备注": 5, + "层级": 5, + "工期": 5, + "开始报工日期": 5, + "开始时间": 5, + "总实际工时": 5, + "总计划工时": 5, + "执行者": 5, + "最后报工日期": 5, + "次序": 5, + "父任务ID": 5, + "版本": 5, + "结束时间": 5, + "进度": 5, + "里程碑": 5, + "项目ID": 5 + }, + "subTableOperations": { + "View_任务工时统计": 5, + "任务工时表": 5, + "任务成员表": 5, + "任务表": 5, + "任务进展": 5 + }, + "dataFilter": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core" + } + }, + "dataPermissionType": 4, + "roleNames": [ + "FGC_Anonymous" + ] + } + ] + }, "Columns": [ { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", @@ -95,6 +409,13 @@ "Name": "备注", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "参与人", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.AttachmentBindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "nvarchar", @@ -202,12 +523,12 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "参与人", - "GUID": "b5f07f2a-ddac-4747-84cd-bbdef039f1c1" + "GUID": "4f582b43-e552-4d4a-b192-53f63cd2fb3a" }, "AggregateFunction": 5, "DataColumnName": "参与人", "DetailTableName": "任务成员表", - "Name": "参与人", + "Name": "参与人统计", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { diff --git a/Tables/项目/项目表.json b/Tables/项目/项目表.json index c2539420..a23651ca 100644 --- a/Tables/项目/项目表.json +++ b/Tables/项目/项目表.json @@ -8,17 +8,7 @@ "isExternal": true, "detailTables": [ { - "subTableName": "任务表", - "subColumnName": "项目ID", - "relatedColumnName": "ID" - }, - { - "subTableName": "View_任务工时统计", - "subColumnName": "项目ID", - "relatedColumnName": "ID" - }, - { - "subTableName": "任务工时表", + "subTableName": "项目成员表", "subColumnName": "项目ID", "relatedColumnName": "ID" }, @@ -41,6 +31,31 @@ "subTableName": "项目版本", "subColumnName": "项目ID", "relatedColumnName": "ID" + }, + { + "subTableName": "项目预算变动表", + "subColumnName": "项目ID", + "relatedColumnName": "ID" + }, + { + "subTableName": "任务成员表", + "subColumnName": "项目ID", + "relatedColumnName": "ID" + }, + { + "subTableName": "任务表", + "subColumnName": "项目ID", + "relatedColumnName": "ID" + }, + { + "subTableName": "View_任务工时统计", + "subColumnName": "项目ID", + "relatedColumnName": "ID" + }, + { + "subTableName": "任务工时表", + "subColumnName": "项目ID", + "relatedColumnName": "ID" } ] }, @@ -56,7 +71,8 @@ }, "dataPermissionType": 2, "roleNames": [ - "Administrator" + "Administrator", + "项目总监" ] }, { @@ -69,13 +85,38 @@ "userFieldName": "项目经理", "filterType": 4, "condition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目表", - "ColumnName": "项目经理", - "GUID": "af801a6e-4e84-49a9-a783-c160270ad6d4" - }, - "Value": "%CurrentUser.UserName%" + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目表", + "ColumnName": "项目经理", + "GUID": "af801a6e-4e84-49a9-a783-c160270ad6d4" + }, + "Value": "%CurrentUser.UserName%" + }, + { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 6, + "ColumnBindingInfo": { + "TableName": "项目表", + "ColumnName": "参与人", + "GUID": "dadb9211-c26b-4699-9f40-2110930d4cd8" + }, + "Value": "%CurrentUser%" + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目表", + "ColumnName": "公开", + "GUID": "2265f1aa-c9f6-47f3-9dab-b8833c7de01c" + }, + "Value": "1" + } + ], + "RelationType": 1 } } }, @@ -106,38 +147,12 @@ "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowBindingConfig, Forguncy.RbacPermission.Core", "operationTypes": 1, "dataFilter": { - "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core", - "userFieldName": "项目经理", - "filterType": 4, - "condition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目表", - "ColumnName": "公开", - "GUID": "03fca540-a609-4f84-b2a9-8638007dcca1" - }, - "Value": "1" - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目表", - "ColumnName": "项目经理", - "GUID": "a5b93b6f-1fab-4326-98fb-48be951bf1d8" - }, - "Value": "%Null%" - } - ], - "RelationType": 1 - } + "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core" } }, "dataPermissionType": 2, "roleNames": [ - "FGC_LoginUser" + "商务总监" ] }, { @@ -162,38 +177,39 @@ "严格模式": 5, "公开": 5, "删除": 5, + "参与人": 5, + "参与人统计": 5, "工时核定方式": 5, - "项目经理": 5, "所属客户": 5, "所属客户部门": 5, + "立项流程示例ID": 5, + "网络资源": 5, + "计划完成日期": 5, + "计划工期": 5, "计划开始日期": 5, "项目分组": 5, "项目名称": 5, "项目封面": 5, + "项目成员": 5, + "项目方案": 5, + "项目状态": 5, "项目简介": 5, + "项目经理": 5, "项目预算工时": 5, "项目预算费用": 5, - "立项流程示例ID": 5, - "项目状态": 5, - "计划完成日期": 5, - "计划工期": 5, - "项目方案": 5, - "预算方案": 5, - "网络资源": 5, - "项目成员": 5, - "参与人": 5 + "预算方案": 5 }, "subTableOperations": { "View_任务工时统计": 5, "任务工时表": 5, + "任务成员表": 5, "任务表": 5, "项目任务分组": 5, "项目动态": 5, "项目岗位": 5, - "项目版本": 5, - "项目预算变动表": 5, "项目成员表": 5, - "任务成员表": 5 + "项目版本": 5, + "项目预算变动表": 5 }, "dataFilter": { "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core" @@ -213,38 +229,39 @@ "严格模式": 5, "公开": 5, "删除": 5, + "参与人": 5, + "参与人统计": 5, "工时核定方式": 5, - "项目经理": 5, "所属客户": 5, "所属客户部门": 5, + "立项流程示例ID": 5, + "网络资源": 5, + "计划完成日期": 5, + "计划工期": 5, "计划开始日期": 5, "项目分组": 5, "项目名称": 5, "项目封面": 5, + "项目成员": 5, + "项目方案": 5, + "项目状态": 5, "项目简介": 5, + "项目经理": 5, "项目预算工时": 5, "项目预算费用": 5, - "立项流程示例ID": 5, - "项目状态": 5, - "计划完成日期": 5, - "计划工期": 5, - "项目方案": 5, - "预算方案": 5, - "网络资源": 5, - "项目成员": 5, - "参与人": 5 + "预算方案": 5 }, "subTableOperations": { "View_任务工时统计": 5, "任务工时表": 5, + "任务成员表": 5, "任务表": 5, "项目任务分组": 5, "项目动态": 5, "项目岗位": 5, - "项目版本": 5, - "项目预算变动表": 5, "项目成员表": 5, - "任务成员表": 5 + "项目版本": 5, + "项目预算变动表": 5 }, "dataFilter": { "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core" @@ -264,38 +281,39 @@ "严格模式": 5, "公开": 5, "删除": 5, + "参与人": 5, + "参与人统计": 5, "工时核定方式": 5, - "项目经理": 5, "所属客户": 5, "所属客户部门": 5, + "立项流程示例ID": 5, + "网络资源": 5, + "计划完成日期": 5, + "计划工期": 5, "计划开始日期": 5, "项目分组": 5, "项目名称": 5, "项目封面": 5, + "项目成员": 5, + "项目方案": 5, + "项目状态": 5, "项目简介": 5, + "项目经理": 5, "项目预算工时": 5, "项目预算费用": 5, - "立项流程示例ID": 5, - "项目状态": 5, - "计划完成日期": 5, - "计划工期": 5, - "项目方案": 5, - "预算方案": 5, - "网络资源": 5, - "项目成员": 5, - "参与人": 5 + "预算方案": 5 }, "subTableOperations": { "View_任务工时统计": 5, "任务工时表": 5, + "任务成员表": 5, "任务表": 5, "项目任务分组": 5, "项目动态": 5, "项目岗位": 5, - "项目版本": 5, - "项目预算变动表": 5, "项目成员表": 5, - "任务成员表": 5 + "项目版本": 5, + "项目预算变动表": 5 }, "dataFilter": { "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core" @@ -449,6 +467,13 @@ "Name": "网络资源", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "参与人", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DefaultValue": 0, @@ -490,12 +515,12 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "参与人", - "GUID": "d7436014-d17a-4780-82ce-bbfe46a7a23b" + "GUID": "fb963241-2e30-49e8-b1d2-2499f0acc6f7" }, "AggregateFunction": 5, "DataColumnName": "参与人", "DetailTableName": "任务成员表", - "Name": "参与人", + "Name": "参与人统计", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, {