From 835c1dc861e276df98731b984907e235c94ad463 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B6=85=E5=93=A5?= Date: Mon, 17 Jun 2024 17:43:00 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E8=81=94=E6=B5=8B=E5=B9=B6?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86BUG","MessageType":2,"Modul?= =?UTF-8?q?es":[{"State":1,"Type":7,"Name":"Table/=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=A1=A8"},{"State":1,"Type":23,"Name":"TableView/View=5F?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=9F=E8=AE=A1=E4=BF=A1=E6=81=AF"},{"Stat?= =?UTF-8?q?e":1,"Type":7,"Name":"Table/=E4=BB=BB=E5=8A=A1=E8=A1=A8"},{"Sta?= =?UTF-8?q?te":1,"Type":1,"Name":"PCPage/=E9=A1=B9=E7=9B=AE=E5=AE=A1?= =?UTF-8?q?=E6=89=B9"},{"State":1,"Type":1,"Name":"PCPage/=E9=A2=84?= =?UTF-8?q?=E7=AE=97=E7=94=B3=E8=AF=B7"},{"State":1,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E9=A2=84=E7=AE=97=E7=94=B3=E8=AF=B7=E5=AE=A1=E6=89=B9"},{"St?= =?UTF-8?q?ate":1,"Type":1,"Name":"PCPage/=E4=BB=BB=E5=8A=A1-=E5=9F=BA?= =?UTF-8?q?=E6=9C=AC=E4=BF=A1=E6=81=AF"},{"State":1,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E4=BB=BB=E5=8A=A1=E6=88=90=E5=91=98=E8=AF=A6=E6=83=85"},{"St?= =?UTF-8?q?ate":1,"Type":1,"Name":"PCPage/=E6=96=B0=E5=A2=9E=E6=8A=A5?= =?UTF-8?q?=E5=B7=A5"},{"State":1,"Type":1,"Name":"PCPage/=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E4=B8=AD=E5=BF=83-=E5=9F=BA=E6=9C=AC=E4=BF=A1?= =?UTF-8?q?=E6=81=AF"},{"State":1,"Type":15,"Name":"ServerCommand/?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E9=A2=84=E7=AE=97=E5=B7=A5?= =?UTF-8?q?=E6=97=B6"},{"State":2,"Type":15,"Name":"ServerCommand/?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=A1=B9=E7=9B=AE=E5=8F=82=E4=B8=8E=E4=BA=BA?= =?UTF-8?q?=E5=88=97=E8=A1=A8"},{"State":1,"Type":28,"Name":"ProcessItem/?= =?UTF-8?q?=E7=AB=8B=E9=A1=B9=E6=B5=81=E7=A8=8B"},{"State":1,"Type":28,"Na?= =?UTF-8?q?me":"ProcessItem/=E9=A2=84=E7=AE=97=E7=94=B3=E8=AF=B7"},{"State?= =?UTF-8?q?":1,"Type":28,"Name":"ProcessItem/=E5=8F=8D=E9=A6=88=E5=A4=84?= =?UTF-8?q?=E7=90=86=E6=B5=81=E7=A8=8B"},{"State":1,"Type":28,"Name":"Proc?= =?UTF-8?q?essItem/=E7=BB=93=E7=AE=97=E7=94=B3=E8=AF=B7"},{"State":1,"Type?= =?UTF-8?q?":15,"Name":"ServerCommand/=E5=90=8C=E6=AD=A5=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E7=9A=84=E6=89=80=E6=9C=89=E6=8F=90=E4=BA=A4"},{"State":1,"Typ?= =?UTF-8?q?e":15,"Name":"ServerCommand/=E4=BB=BB=E5=8A=A1=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E6=B5=81=E7=A8=8B=E5=89=8D=E6=A0=A1=E9=AA=8C"},{"Stat?= =?UTF-8?q?e":1,"Type":28,"Name":"ProcessItem/=E6=96=B0=E5=A2=9E=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=B5=81=E7=A8=8B"},{"State":1,"Type":15,"Name":"Serv?= =?UTF-8?q?erCommand/=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=E6=A3=80?= =?UTF-8?q?=E6=9F=A5"},{"State":3,"Type":16,"Name":"TaskScheduler/?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=88=90=E5=91=98=E6=96=B0=E5=A2=9E=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6"},{"State":3,"Type":27,"Name":"ServerCommandPrivate/?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=A1=B9=E7=9B=AE=E5=8F=82=E4=B8=8E=E4=BA=BA?= =?UTF-8?q?=E5=88=97=E8=A1=A8"},{"State":3,"Type":16,"Name":"TaskScheduler?= =?UTF-8?q?/=E9=A1=B9=E7=9B=AE=E6=88=90=E5=91=98=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 252 +---- Pages/个人中心/个人中心-基本信息.json | 879 +++++++++++++++--- Pages/个人中心/个人中心-基本信息.rd | 3 - Pages/任务/任务-基本信息.json | 198 ++-- Pages/任务/任务成员详情.json | 26 +- Pages/任务/工时/新增报工.json | 80 +- Pages/项目/项目首页/项目配置/项目审批.json | 46 +- Pages/项目/项目首页/预算申请/预算申请.json | 23 +- .../项目/项目首页/预算申请/预算申请审批.json | 606 +++++++----- Pages/项目/项目首页/预算申请/预算申请审批.rd | 6 +- Process/新增任务流程.bpmn | 6 +- Process/立项流程.bpmn | 28 +- SchedulerTasks/项目成员删除事件.json | 35 + SchedulerTasks/项目成员新增事件.json | 35 + ServerCommands/Gitee/同步仓库的所有提交.json | 18 +- ServerCommands/任务/任务发起流程前校验.json | 60 +- ServerCommands/任务/修改任务预算工时.json | 48 +- ServerCommands/系统/用户登录检查.json | 38 +- ServerCommands/项目/同步项目参与人列表.json | 18 +- Tables/任务/任务表.json | 75 +- Tables/项目/View_项目统计信息.json | 2 +- Tables/项目/项目表.json | 1 + 22 files changed, 1539 insertions(+), 944 deletions(-) create mode 100644 SchedulerTasks/项目成员删除事件.json create mode 100644 SchedulerTasks/项目成员新增事件.json diff --git a/.collaboration b/.collaboration index 6f716061..e6a1bf09 100644 --- a/.collaboration +++ b/.collaboration @@ -28,16 +28,7 @@ }, { "ModuleName": "Table/项目表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-17T17:28:52.7999374+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目\\项目表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/项目成员表", @@ -77,16 +68,7 @@ }, { "ModuleName": "TableView/View_项目统计信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-17T17:16:26.7934747+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\项目\\View_项目统计信息.json" - ] + "ModuleType": 23 }, { "ModuleName": "TableView/项目任务树视图", @@ -110,16 +92,7 @@ }, { "ModuleName": "Table/任务表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-17T17:05:32.5923109+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\任务\\任务表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/任务进展", @@ -657,17 +630,7 @@ }, { "ModuleName": "PCPage/项目审批", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-17T16:53:30.646177+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目配置\\项目审批.json", - "Pages\\项目\\项目首页\\项目配置\\项目审批.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/项目/项目首页/预算申请", @@ -675,31 +638,11 @@ }, { "ModuleName": "PCPage/预算申请", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-17T17:26:36.972868+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\预算申请\\预算申请.json", - "Pages\\项目\\项目首页\\预算申请\\预算申请.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/预算申请审批", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-17T17:20:39.9720628+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\预算申请\\预算申请审批.json", - "Pages\\项目\\项目首页\\预算申请\\预算申请审批.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目预算申请历史", @@ -739,17 +682,7 @@ }, { "ModuleName": "PCPage/任务-基本信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-17T17:11:05.7169862+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-基本信息.json", - "Pages\\任务\\任务-基本信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-任务信息", @@ -793,17 +726,7 @@ }, { "ModuleName": "PCPage/任务成员详情", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-17T17:31:49.6565723+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务成员详情.json", - "Pages\\任务\\任务成员详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/任务/任务创建助手", @@ -827,17 +750,7 @@ }, { "ModuleName": "PCPage/新增报工", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-17T17:36:33.9300909+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\工时\\新增报工.json", - "Pages\\任务\\工时\\新增报工.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/分配计划工时", @@ -965,17 +878,7 @@ }, { "ModuleName": "PCPage/个人中心-基本信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-17T16:39:45.9944746+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\个人中心\\个人中心-基本信息.json", - "Pages\\个人中心\\个人中心-基本信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/个人中心-我的收益", @@ -1087,16 +990,7 @@ }, { "ModuleName": "ServerCommand/修改任务预算工时", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-17T17:12:21.9825701+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\任务\\修改任务预算工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/移除任务成员", @@ -1166,19 +1060,6 @@ "ModuleName": "ServerCommand/同步项目成员", "ModuleType": 15 }, - { - "ModuleName": "ServerCommand/同步项目参与人列表", - "State": 2, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-17T17:32:04.8820926+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\项目\\同步项目参与人列表.json" - ] - }, { "ModuleName": "ServerCommand/删除项目岗位", "ModuleType": 15 @@ -1277,59 +1158,19 @@ }, { "ModuleName": "ProcessItem/立项流程", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-17T16:47:21.043444+08:00", - "ModuleType": 28, - "ToRemoveFiles": [ - "Process\\立项流程.json", - "Process\\立项流程.bpmn" - ] + "ModuleType": 28 }, { "ModuleName": "ProcessItem/预算申请", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-17T16:47:44.2279633+08:00", - "ModuleType": 28, - "ToRemoveFiles": [ - "Process\\预算申请.json", - "Process\\预算申请.bpmn" - ] + "ModuleType": 28 }, { "ModuleName": "ProcessItem/反馈处理流程", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-17T16:47:53.9830244+08:00", - "ModuleType": 28, - "ToRemoveFiles": [ - "Process\\反馈处理流程.json", - "Process\\反馈处理流程.bpmn" - ] + "ModuleType": 28 }, { "ModuleName": "ProcessItem/结算申请", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-17T16:48:04.1337386+08:00", - "ModuleType": 28, - "ToRemoveFiles": [ - "Process\\结算申请.json", - "Process\\结算申请.bpmn" - ] + "ModuleType": 28 }, { "ModuleName": "Notification/AI流消息", @@ -1977,16 +1818,7 @@ }, { "ModuleName": "ServerCommand/同步仓库的所有提交", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-17T17:42:36.7572991+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\Gitee\\同步仓库的所有提交.json" - ] + "ModuleType": 15 }, { "ModuleName": "Image/d3148bd6742da6598200d24b4966ba9f.png", @@ -2126,30 +1958,11 @@ }, { "ModuleName": "ServerCommand/任务发起流程前校验", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-17T17:08:54.9033336+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\任务\\任务发起流程前校验.json" - ] + "ModuleType": 15 }, { "ModuleName": "ProcessItem/新增任务流程", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-17T16:47:33.0442129+08:00", - "ModuleType": 28, - "ToRemoveFiles": [ - "Process\\新增任务流程.json", - "Process\\新增任务流程.bpmn" - ] + "ModuleType": 28 }, { "ModuleName": "PCPage/页面反馈录入", @@ -2173,16 +1986,7 @@ }, { "ModuleName": "ServerCommand/用户登录检查", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-17T16:41:57.389441+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\系统\\用户登录检查.json" - ] + "ModuleType": 15 }, { "ModuleName": "Notification/提醒通知", @@ -2194,32 +1998,14 @@ }, { "ModuleName": "TaskScheduler/项目成员新增事件", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-17T17:32:26.8490696+08:00", "ModuleType": 16 }, { "ModuleName": "ServerCommandPrivate/同步项目参与人列表", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-17T17:32:04.8821068+08:00", "ModuleType": 27 }, { "ModuleName": "TaskScheduler/项目成员删除事件", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-17T17:32:39.5041407+08:00", "ModuleType": 16 } ] \ No newline at end of file diff --git a/Pages/个人中心/个人中心-基本信息.json b/Pages/个人中心/个人中心-基本信息.json index 2a858522..fd3236f7 100644 --- a/Pages/个人中心/个人中心-基本信息.json +++ b/Pages/个人中心/个人中心-基本信息.json @@ -235,13 +235,133 @@ "6,12": "Gitee密码", "6,16": "%CurrentUser.GIT密码%" }, - "Formulas": { - "7,5": "CONCAT(姓名,邮箱,负荷,时薪,Git用户名,Git密码)" - }, "AttachInfos": { "2,5": { "CellType": { "$type": "ElementUI.InputCellType, ElementUI", + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionContextPropertyParam, ServerDesignerCommon", + "contextProperty": { + "Display": "值变更原因" + } + }, + "value": "userInput" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "更新用户配置", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "用户名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!母版_当前用户" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "姓名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!姓名" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "邮箱", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!邮箱" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "负荷", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!负荷" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "默认时薪", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!时薪" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "Git用户名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!Git用户名" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "Git密码", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!Git密码" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='个人中心-基本信息'!code" + } + ] + }, + "value": "0", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!msg" + } + } + ], + "ID": "ad176467-f565-4329-b3c5-e33966c4148b" + } + ] + } + ], + "ID": "22d9a18e-c629-4983-9345-738c24b344cf" + } + ] + } + ], "UIPermissions": [ { "Scope": 2, @@ -273,7 +393,129 @@ "2,16": { "CellType": { "$type": "ElementUI.InputCellType, ElementUI", - "CommandList": [], + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionContextPropertyParam, ServerDesignerCommon", + "contextProperty": { + "Display": "值变更原因" + } + }, + "value": "userInput" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "更新用户配置", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "用户名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!母版_当前用户" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "姓名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!姓名" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "邮箱", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!邮箱" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "负荷", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!负荷" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "默认时薪", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!时薪" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "Git用户名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!Git用户名" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "Git密码", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!Git密码" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='个人中心-基本信息'!code" + } + ] + }, + "value": "0", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!msg" + } + } + ], + "ID": "9c5fa398-540b-4832-a71d-8b9772c47051" + } + ] + } + ], + "ID": "17e311b0-607c-48ea-b031-291ab9550545" + } + ] + } + ], "UIPermissions": [ { "Scope": 2, @@ -336,7 +578,129 @@ "4,5": { "CellType": { "$type": "ElementUI.InputNumberCellType, ElementUI", - "CommandList": [], + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionContextPropertyParam, ServerDesignerCommon", + "contextProperty": { + "Display": "值变更原因" + } + }, + "value": "userInput" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "更新用户配置", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "用户名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!母版_当前用户" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "姓名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!姓名" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "邮箱", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!邮箱" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "负荷", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!负荷" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "默认时薪", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!时薪" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "Git用户名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!Git用户名" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "Git密码", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!Git密码" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='个人中心-基本信息'!code" + } + ] + }, + "value": "0", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!msg" + } + } + ], + "ID": "5bc361e0-8ecc-441d-9eae-29ca703b3958" + } + ] + } + ], + "ID": "add0cac2-8736-4d57-8ec1-3014f6c3d58d" + } + ] + } + ], "UIPermissions": [ { "Scope": 2, @@ -362,7 +726,129 @@ "4,16": { "CellType": { "$type": "ElementUI.InputNumberCellType, ElementUI", - "CommandList": [], + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionContextPropertyParam, ServerDesignerCommon", + "contextProperty": { + "Display": "值变更原因" + } + }, + "value": "userInput" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "更新用户配置", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "用户名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!母版_当前用户" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "姓名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!姓名" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "邮箱", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!邮箱" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "负荷", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!负荷" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "默认时薪", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!时薪" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "Git用户名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!Git用户名" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "Git密码", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!Git密码" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='个人中心-基本信息'!code" + } + ] + }, + "value": "0", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!msg" + } + } + ], + "ID": "7e9f323a-8ee7-4364-adb9-b94be47674b9" + } + ] + } + ], + "ID": "ed8c92af-8e8e-45ca-b3b1-c2fc11b7f141" + } + ] + } + ], "UIPermissions": [ { "Scope": 2, @@ -418,7 +904,129 @@ "6,5": { "CellType": { "$type": "ElementUI.InputNumberCellType, ElementUI", - "CommandList": [], + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionContextPropertyParam, ServerDesignerCommon", + "contextProperty": { + "Display": "值变更原因" + } + }, + "value": "userInput" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "更新用户配置", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "用户名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!母版_当前用户" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "姓名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!姓名" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "邮箱", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!邮箱" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "负荷", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!负荷" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "默认时薪", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!时薪" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "Git用户名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!Git用户名" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "Git密码", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!Git密码" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='个人中心-基本信息'!code" + } + ] + }, + "value": "0", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!msg" + } + } + ], + "ID": "80204521-f283-4813-8e48-9663b3081f99" + } + ] + } + ], + "ID": "ee7d281a-757d-4d2a-9f7b-3d1e44f68d51" + } + ] + } + ], "UIPermissions": [ { "Scope": 2, @@ -444,7 +1052,129 @@ "6,16": { "CellType": { "$type": "ElementUI.InputNumberCellType, ElementUI", - "CommandList": [], + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionContextPropertyParam, ServerDesignerCommon", + "contextProperty": { + "Display": "值变更原因" + } + }, + "value": "userInput" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "更新用户配置", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "用户名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!母版_当前用户" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "姓名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!姓名" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "邮箱", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!邮箱" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "负荷", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!负荷" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "默认时薪", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!时薪" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "Git用户名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!Git用户名" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "Git密码", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!Git密码" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='个人中心-基本信息'!code" + } + ] + }, + "value": "0", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!msg" + } + } + ], + "ID": "d11367f5-fb46-4574-ab79-54ebabfef50a" + } + ] + } + ], + "ID": "f99b5d57-d638-423a-9a86-de3b8388db7c" + } + ] + } + ], "UIPermissions": [ { "Scope": 2, @@ -465,120 +1195,6 @@ "step": 1, "controls": false } - }, - "7,5": { - "CellType": { - "$type": "Forguncy.TextCellType, ServerDesignerCommon", - "SavedValidators": [ - { - "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon" - } - ], - "TemplateKey": "_RS_NewLittleRoundCorner", - "CommandList": [ - { - "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "更新用户配置", - "Parameters": [ - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "用户名", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='个人中心-基本信息'!母版_当前用户" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "姓名", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='个人中心-基本信息'!姓名" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "邮箱", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='个人中心-基本信息'!邮箱" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "负荷", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='个人中心-基本信息'!负荷" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "默认时薪", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='个人中心-基本信息'!时薪" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "Git用户名", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='个人中心-基本信息'!Git用户名" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "Git密码", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='个人中心-基本信息'!Git密码" - } - } - ], - "ResultErrorCodeTo": { - "SerializeProperty": "code" - }, - "ResultMessageTo": { - "SerializeProperty": "msg" - }, - "RefreshAfterFinish": true, - "CheckDataValidation": true - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "='个人中心-基本信息'!code" - } - ] - }, - "value": "0", - "compareType": 1 - }, - "CommandList": [ - { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "FourStandardStyle": "warning", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='个人中心-基本信息'!msg" - } - } - ], - "ID": "ebbfca48-c4cf-4b02-9038-77dbc74acccc" - } - ] - } - ] - } } }, "StyleDatas": { @@ -640,10 +1256,6 @@ }, { "FontSize": -1.0 - }, - { - "FontSize": -1.0, - "Formatter": 10 } ], "Types": { @@ -657,8 +1269,7 @@ "[AUTO]General", "Left", "0\"小时\"", - " ¥#,##0.00_);[Red] ¥(#,##0.00)", - "@" + " ¥#,##0.00_);[Red] ¥(#,##0.00)" ] }, "CellStyles": { @@ -799,7 +1410,12 @@ "7,2": 10, "7,3": 10, "7,4": 10, - "7,5": 11, + "7,5": 10, + "7,6": 10, + "7,7": 10, + "7,8": 10, + "7,9": 10, + "7,10": 10, "7,11": 3, "7,12": 5, "7,13": 5, @@ -845,8 +1461,7 @@ "6,1,1,4", "6,12,1,4", "6,5,1,6", - "6,16,1,6", - "7,5,1,6" + "6,16,1,6" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -909,4 +1524,4 @@ "Formula": "'个人中心-基本信息'!$Q$7" } ] -}//ZuZXMDv5jYWjd3z92swMEnuEP10sYd6GxCUSzWzKVN74anY7PPK8q9QC4AR6gfHe3ayOg2zbVtJdiBXfIWgoMhqbZYPPsax9W2oS25wSi8yJ5Xtv+crXJ3qruA8A/z9Tx428LJnkTqUZlLnhC6j5c2pPMC8idVltbUPLXG93rbvk0NjKYtgdKxoVVqRoUCPKSwp0AC/Vk+2AQibQ30Xvk6FxB7EHm/eUFr5Kw5mwBHRfn2hN+s+Umx1GvphWidZQObOoFJ5rNjukzsXktOrcSuFvg0rZloSm61OCKVbQdEMmkr+FrG7IDA+PRhwjs8NA6SLyvv9zhGAprK0F9sr3aN7hnFo8KD032/Zi+OITR/qEMdR3YU3/YQDQDK2kN+FBPYl/lO4H6OCBA8yCxCfSlEh++sBD/xdACidAbBit2RxcfgDKDENT85xyn1GswNbFk36ILZWvnMRaOur8p2FyspVbG/noU+121ypKfukM1Iul7kIL79Ja55aCnBqduYjROa4mYDSPcTGd5hDAlOH2fXByjVlk57C82Is4+aZTa8bmanVIHIl+2dNc3Xj8ym7ZvX9V7K01pVv/2DzR6TZtcHnHURb+pa/aMasO3P4PIX0yatveF0t4EEZ498kBP4l2OHvjvNz/iUYrzDFeuza2PBpu1hWTClF8UK0WHyulb8WCtUE2YJxgdLHct47lCmuiiUB4PZoXPgEEg6959ZKih3Vi/60ASJEKbfXoSqGiz1/o2NVk28SFxmYpjpO8Z32PYhijGyyKkuYh3ehBkCP+sXcmG1FlijmmducT7pFRQC02BASzn6ZPdqD88jiBct8luYxabOsFa/SrTiITEjhf0p3Y5gt+tUcUVaxpKwyjA4emux77XNjK42V/E4ohvowxJFjn9xCAPJ/HAnE6OjjQ0g==|920 \ No newline at end of file +}//bvBbiI4KLr/PV1V1SYjQXA6w87/W4AdY5tI6xB/9pjqFjZd+oT/TOdatUGQLghOmgk9e0GbRnc/QHUGrLVI1ieX0rGG7l2tRcxeUFA+wveV0TGXaebYpy14UXDE/uXdRZsSrEAl47WSxs7WIIThNraEEwSSCWsqTZjR0WuoqBWGxlJB+HNRe72//dDpHFTecQa9D5eqWzCe5vBpMBE1qXAxBp0SW5sI6t9zb8aql9hsJfMTNHkFAPsxMYvPQvSovgecM/oUhHQ8/BIwMbtSJ/Tdt1yjXmHDvxI9Pl3Fcm3gI0Rd5D3kZRPz+9gPxYbkHl+w71eZA9gugE8bMmYDkSDa+BB01w/d1r323vwlVqcCrw6BM++Y9ATCeWoa3iFY5peO/flnkkonGUi9iOMAvRYWWanOX+n11WRL69XUxNT+nmdx0SqEFVKL7hoUGK1eHPuzfVuznndM3UmnHy6nZIEdaYMqspVireMPytKsrEUp5QzVA/VX3JekJ5yy/T0LFjG0UthKKesRfODhL9xrrTtSo0FIHTpVW+QHTEZsx7wxY50Wr6Uw9XCPOmo4Ts4crv/0zc6ezagNYfoNWcG1QweM/WOb8mFbckSyib+Ehe5epKi+7Ky8QRvUHNXnAaQQEc1L+kc53VQYdCW8Mvpi3q3q0o1oOmhEAAisKw7LlgI7amKL586hqTiaoPdAF/g1MljdxITPgR4PkFqbBID/IYO7V+Q/4HRhe4XcAI6vkv9fDKjBZr16KBTE0sKqqyqhZkSt7ZP4O3JEMDYgZE+n8EEIczyMx3768Xg+6TvzQtd2AqbKvqy7EOpctLfT960O/sb185Q9wZND1SZOlpfhHclP9Ft2u2Wsp12ViUg6kE3W/JgRqmw39VGjbWekcJdN/C/apuSwlQQfJoWzgpEce9g==|920 \ No newline at end of file diff --git a/Pages/个人中心/个人中心-基本信息.rd b/Pages/个人中心/个人中心-基本信息.rd index 8e7624a1..0d0772cb 100644 --- a/Pages/个人中心/个人中心-基本信息.rd +++ b/Pages/个人中心/个人中心-基本信息.rd @@ -2,9 +2,6 @@ "PageType": 0, "ColumnCount": 36, "RowCount": 8, - "Formulas": { - "7,5": "CONCAT(姓名,邮箱,负荷,时薪,Git用户名,Git密码)" - }, "CustomNames": [ { "Name": "姓名", diff --git a/Pages/任务/任务-基本信息.json b/Pages/任务/任务-基本信息.json index 2ab0bebe..c6258e33 100644 --- a/Pages/任务/任务-基本信息.json +++ b/Pages/任务/任务-基本信息.json @@ -226,7 +226,7 @@ "ShowConfirm": false } ], - "ID": "389a2c17-b6fe-4c76-b673-7a0953af18ac" + "ID": "a4ae4964-f31c-4587-bc94-0d0b0c4d1e49" } ] } @@ -354,7 +354,7 @@ } } ], - "ID": "860f440f-ea95-4000-8282-6a46ef5444ea" + "ID": "d9b4b0b1-0d1a-4836-b830-4429b2559b77" }, { "CommandList": [ @@ -369,12 +369,12 @@ "BtnText": "知道了" } ], - "ID": "cedb1913-85b9-4669-b1e6-d422cdfa6c6c" + "ID": "14b38b89-390b-4e5a-9533-3abc4e37899d" } ] } ], - "ID": "f8a3c9e3-d420-4671-aebf-bae51bdfff69" + "ID": "94c26646-dc1f-4c65-84d1-e1c0e1f5c973" } ] } @@ -387,7 +387,7 @@ } ], "Comments": "小于进行中", - "ID": "9f234940-ff3b-405a-9b0a-f160431d96c5" + "ID": "eece78b4-3db2-4282-bffc-2c73b8818190" }, { "CommandList": [ @@ -397,7 +397,7 @@ "Message": "任务尚未审批完成，不可修改状态" } ], - "ID": "128baf3c-54ba-4d40-8f53-77fe343f34af" + "ID": "d0ebc995-3fc1-41ff-bd03-708392f7d6aa" } ] } @@ -475,7 +475,7 @@ ] } ], - "ID": "64c2289b-9919-4489-8a4b-c09504fdedd7" + "ID": "1edf08de-fdc6-4fa6-bc0e-5281681c28d9" } ] } @@ -608,7 +608,7 @@ ] } ], - "ID": "a958d541-52b1-4aae-9b9a-78034364aff1" + "ID": "4a9ad63a-af41-4666-acd8-a27c4dfef7fb" } ] } @@ -716,7 +716,7 @@ "ShowConfirm": false } ], - "ID": "dfaaf66a-3963-490c-beb2-d3a3ad5caf9f" + "ID": "5952caac-b645-4f5a-8919-2c8102ee5599" } ] } @@ -753,7 +753,7 @@ "ShowConfirm": false } ], - "ID": "7cc265a3-4cfe-477e-ba38-2c7802a51de4" + "ID": "26e22d23-c696-4788-baf0-50a9f26502f6" } ] } @@ -888,7 +888,7 @@ ] } ], - "ID": "4b4dca07-420b-4831-8040-2a7a766c6961" + "ID": "e0b41d39-8cd2-412c-913f-092e02a29fcc" } ] } @@ -1057,7 +1057,7 @@ ] } ], - "ID": "154c2bfd-8358-47f5-9f46-a8eef1f5d98a" + "ID": "e0e8e5b5-2817-4ac3-8f53-0ceafc69c6d9" } ] } @@ -1115,58 +1115,6 @@ "value": "userInput" }, "CommandList": [ - { - "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", - "Cell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-基本信息'!任务基本信息" - }, - "Title": "校验中" - }, - { - "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "修改任务预算工时", - "Parameters": [ - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "任务ID", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-基本信息'!任务ID" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "新预算工时", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-基本信息'!C14" - } - } - ], - "ResultErrorCodeTo": { - "SerializeProperty": "code" - }, - "ResultMessageTo": { - "SerializeProperty": "msg" - }, - "ReturnPropertiesTo": [ - { - "ResultPropertyName": "新工时" - } - ], - "RefreshAfterFinish": true, - "CheckDataValidation": true - }, - { - "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", - "FunctionName": "remove", - "Cell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-基本信息'!任务基本信息" - }, - "Title": "计算中" - }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -1174,34 +1122,119 @@ "Condition": { "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=code" - } - ] + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务表", + "ColumnName": "任务状态", + "GUID": "430fb608-3939-479c-b367-96a56fac1b01" + } }, - "value": "0", - "compareType": 1 + "value": "1", + "compareType": 2 }, "CommandList": [ { - "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", - "FunctionName": "warning", - "Title": "温馨提示", - "Message": { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "Cell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-基本信息'!msg" + "SerializeProperty": "='任务-基本信息'!任务基本信息" }, - "BtnText": "知道了" + "Title": "校验中" + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "修改任务预算工时", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "任务ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!任务ID" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "新预算工时", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!C14" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "ReturnPropertiesTo": [ + { + "ResultPropertyName": "新工时" + } + ], + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=code" + } + ] + }, + "value": "0", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!msg" + }, + "BtnText": "知道了" + } + ], + "ID": "f64c3f7e-ef37-49f1-ab57-fcc690e35088" + } + ] + }, + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!任务基本信息" + }, + "Title": "计算中" } ], - "ID": "1d66bdb1-50f2-439e-b0f1-e2efc7f7ee9f" + "ID": "4d358655-73d0-40b4-9f81-55a814ef88f7" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务表", + "ShowConfirm": false + } + ], + "ID": "3a71c347-3526-4454-985d-fe76eef880e4" } ] } ], - "ID": "5105aaae-a69b-4ed2-b4a2-9b610d29518c" + "ID": "a99f2642-34a6-4cd1-956c-aa60aa033868" } ] } @@ -1209,8 +1242,9 @@ "UIPermissions": [ { "Scope": 2, + "Enabled": true, "AllowRoles": [ - "FGC_Anonymous" + "项目经理" ] }, { @@ -1574,4 +1608,4 @@ "Formula": "'任务-基本信息'!$B$2" } ] -}//s6+rkQFrX0iJ/zNwGbrKtDvrnJRrsp2GzGytpbPNBCXgOBU21jutM8Pl+/WdLtzM0J1fVUaEeJxTbWbj374MAgNQWu6JBwxVcbiIynlwSMBy3FWSf/vvITHFDdVqAZ26Zl130TQGHx48CvgayK9MN39P5OKBVlGicYLU2DNiLZutdlV8wq058/4JsE+3g+ueoYYMwbHoMWJ5ddZCsSqIvBo6h7FFrVqhaQIcE7v8KfqWcpNZJuukMHvL5nIz/nZGChtwwDqSnNmmmQQcHTfbPzHKMceDguNe35e5jgMOpuXyABGxS0pKOJGOzka2sQAk8bvsDR2nyIUm0SOWmAAtFqG+uOjXHHvFyDjZG5wguhWDgSFmerhiyDc4ieluQ0P934eLaS+mFUr5kCRfxyJHJfAU66Bk6GAJIun+UptnLGbvkHOVzTmOPgwNSCrvc5A0Z3TrC/mHbYr3l9oG0g/Lah2MBx3twwyyKZJcTciS9WxmwybOAb6qHjOchF1iBn3JQ5A/fFDvktjp2f52NOqx4EQEOyvw1n1xMNBl8PtFBpbwS251aLKSliCZj5KdHKuV0VLQ6KdfiteFFo7WbX/h4x+fL8fYQtnbf9eWDNxGx6nX3KXi6ms2TR5+CBDw+ToqBC40+Vv0HqwGlnUx4O/WnhoxLrD2FjbjMaqKqZY26ridHgFMj/8UIf0tekwA/IMKIkz2id1xMkzuJj5Xi514Tr0LxvlSkdsHW9xeKTCRY/bRrHMdw+gfYH0jYEzoExWy3hDENQPU5vnNHtNy4535mQnMN3QphQgsod6kAN+0XAlx1BvT/uzdnGTKQxPB+fWXGCYFSPcq2MDL4ZjUL6xlGIOAvPCZHmZYdgiBWtu+w2+Jui8t2ZD9p/X6iyy2QlXgU4c1z7DURckNrbs5k9ARpw==|920 \ No newline at end of file +}//oToDV2Mkaxk9qmNUEyArHAEyquAjFXycLM0/UsWWpilCam4gUtZBWTjNxMAaRJWOg4Cesmqdv6Uv7GxIPtau2bjzGYW/2FO7awk/f39o91cmsTcuH0olaa3NvjRD7drXIyXqEDCPMYJqabgrc+VC9T7Pmau5YZWwjPLcFm5b5trKrrE3QoIYE73mFBAKJi3MwQurSMwJ5Ws8jWREVY5dP9jG1s1V1ivmo1A3sCm5zSCRTHlDSLFD54SX4dVydLN7a2QwTLjOiG9TcNo2T6p9we7zWbiQXofM6lD+hVF4cdAaBRvw1zp5p7L77g6zX6ZdwCnIN2m0d/8axjimiU8rAj2Y7fQkhfSKCvL+bMXpqbWtv0sV6bGhqNJ9tXv6V6jTcJAGDHXAdlUXmXiiV7xYuKVvUVXjhnl+kdOZimHcYaZAauuc0bAzlmswq8RIoA+yc0i4FxjSrUPtHlovVHAy76eM3MSxFyUYNW9b8jxx5ahp+D/PJB1oNroNJHWzDthQg0EAhroRyUpagjiVN5Xtl2sAm9G/ErV3ieedRddLe1L0ssATEHDFrJHVpVDAPkTWR9ibLKyIgXD/HQ+/6UkGLMWe04UcGoJznRauj8zHcwTCb1OJTFVvdavWjEKSMpIo+rw7hEl0bPa7atb5LMPaIs17uwQ1vuysX+qevk+zhE1qew16Y7p+9GpQLn26kYyUIcg7lRsCEbpXjSwLlQ1KA3ZVlv21e1O4FaFGfSZLdVHxNduxbARZtxyHgpKXcEnhF0Lx5hV9D+judvjClU2hV0JRQaEm6IDEJaia/RSpLy2lhLj+8daJo2LPkgukOJmZbzQHet0Gi2FACGeKIVSbymCBQ2KdhAPpHWYCh0C6GlmJDaj48I5m+pYDzBQvGFeWJrHknV8GveqvX58awfHkmQ==|920 \ No newline at end of file diff --git a/Pages/任务/任务成员详情.json b/Pages/任务/任务成员详情.json index 35f879fb..3a02cbdd 100644 --- a/Pages/任务/任务成员详情.json +++ b/Pages/任务/任务成员详情.json @@ -314,25 +314,9 @@ ], "RequestAsync": true, "CheckDataValidation": false - }, - { - "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "同步任务参与人字段", - "Parameters": [ - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "任务ID", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务成员详情!任务ID" - } - } - ], - "RequestAsync": true, - "CheckDataValidation": false } ], - "ID": "4db76b10-39f5-405f-a27c-a13f03ef86dd" + "ID": "0e6aa2de-e339-4139-92b3-36268b86fd04" }, { "CommandList": [ @@ -342,7 +326,7 @@ "ShowConfirm": false } ], - "ID": "d5ca3c89-1711-4481-9b95-1c489196d86d" + "ID": "016d70f7-a6c7-439b-8e22-cb2992b86e58" } ] }, @@ -363,7 +347,7 @@ ] } ], - "ID": "18791b39-d659-4033-8e29-6cf5f7067175" + "ID": "62367cc3-1f17-4d73-8823-07ea8e6f55e4" }, { "CommandList": [ @@ -373,7 +357,7 @@ "Message": "请指定项目和任务" } ], - "ID": "aa562918-a26e-49ac-87ef-bd7b2aa9f772" + "ID": "3c51806a-2a68-405f-b547-0f5a51db33c9" } ] } @@ -564,4 +548,4 @@ "Formula": "任务成员详情!$N$8" } ] -}//bacogNoSvFYlHzWlmfNnkcJ0bR7+U13iXQvuaEo9XlO4mZNJrTL5Ceurpx0i+hZ6GVNy7AoZxuiPpdpZEBIy6CoMUZHVgtwW7Y2y5XtFeJ/f9gcj8Ul6Ibkb32TSnsdaBgu9mL/TvWl+iO6ByHJiG9W51XlTPeJ0kLCeGGKZjgyIT6B03kyEr/odjuJ+o9na9isypDRC1qEYb9vMLgNnkpUANZJiVqT6r0RQxX8lyN935NOhNFK2mSJvZnBfHxoDvfuW+H15PDOQnpdSKH7A5UWLUOI1eN9xc9YOq7HpBirOHYXxG1KxhK6sQg6I8oUnRjU1dNNn0eUd4WNakdjKMRFq5j8XK1gHezIIejwwWmbRzy9knVvfoAd/nvM+qAyiLGrT6h8amQbB8oIUIkoWR3vKN3HBt7HRX051MlPQ0VUCH9NX6hUF5gInXn1f//ymyQ8+RjPQJxhwRgeVvOsQLz9ICz8LuCbXDRFFLMJfEHwA5WH86DxsONjat6OzcemPM+3qX2lAFT820KZ0CiOLLslv10YopW0fVWhIVtcGJcAK/jJDmWMGhkkeXUZroyNYXzg1JUb0ds/qQbiN7NWjrYLE07dTTA4dju6UFb4k027XcDUfJgC0+uMEmhzb3d0b1WmoNUYTi3drCGE/PEDKwGsMWg9pNA6ha7FiPL7Citk4i9x5wcB9gbOyZiHpSWGIHS+WoGSDJqzj5nd1XPVJ6teFwtWwCszOcEVr8e6pvI4jm23QC4K7Sz7kkykPJLsAbFEbst/EJZWy0bIUvm9sUbx8eh682E48WXf2XXqPzSHiP9hHB/8Ypvg9mY65QtBdYCCqcXxDXOoofInxU7znI7BdiD6B6+vHVMW14ORNQOhRIS6+XjfDhby5tMwBOGRbAKvI06399OWm55KIR6zW1g==|920 \ No newline at end of file +}//0ToRXvgXPAzJul7fshlQs0BWfstOvvAX5T62ujYGen2ZJ9e9ay/TzEHXAdrxrErU/csli0bsj7uDYpPurxct7l9HlR71fBTtkNsEZto+0TxnXt3WhkCJTFF3zyPocWQ6qsJfaUM7sbUOz22WhZj9uMRV+FehPvHQUBHOnIZeV6499idsaesRI/Tu3wk1LPDIr4XAXcfqp5wARCEkyzJZP+EvdunCgf1TNQYisn3Pf0spDg6jr13bRS01gSZJqnvXoBKIcGInXimn/yzApnORFSosOnj2UOvbaOy0g7caH8ts1Toz6SP3BQMJlqxOfYFSWt4oJLcT5lNefCBDlQNz+ArZItq1CMKKX7r40amh/Kaob7ens1Rvk5k5co3ZCf7j/nQfZ+09/rLiGvl4Siw2aJpqMJY6p1volzf5/D+RYH4HKFWw3GmERoFnF5IfCxOC8v86P3TLk5FwmEzDoq4KskIK2hWpEMm9BIRhTlXoKM6+uls7uOuZ3ULFMLtfmt+5MpljobUu/ikUBIIEOACaaG9aQS6rS06CyeU/U9HNTWVJeET15lHVttlgjpUhx/V1DO1Pja3I3FJ5a6OzlZjE0Aek28pcxXviKOMt7SbD0t68pOQd6A8iOlxdUXSOMBO+P6AoT1eIXTT9bineyj973e6OnTof3s/ezdlLc0EBBhAnGjaqOXdi1p5ZUyVoMpkoV+xy2XTc7fB2nP45rPugizgUJyksdrNgqZRHojWYAJNlIZMxyJ4SEsyOow45X8Mw9WhptNKBd3tTo9E29oL+J8E+w52XvB/YqnZNn3YiKhptMMxLIhliYrh/6r3NzfQOdcv2Ya0dTdtRjGXdBagAKiMJhEQKB/TZI7WV02/N5BJnpYUN7v8bUux2MpVT9rqc6RmCFrGVkSbLYx3ul9OIww==|920 \ No newline at end of file diff --git a/Pages/任务/工时/新增报工.json b/Pages/任务/工时/新增报工.json index ca89f783..30078da0 100644 --- a/Pages/任务/工时/新增报工.json +++ b/Pages/任务/工时/新增报工.json @@ -555,7 +555,7 @@ ] } ], - "ID": "164debad-3ed1-4d59-95ed-24955bd98ffe" + "ID": "a6468d76-bcce-48c1-b98e-8a0958dcaff5" } ] } @@ -687,13 +687,35 @@ "ClosePopupCallbackCommand": { "Commands": [ { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!O21" - }, - "TargetType": "Forguncy.ButtonCellType, ServerDesignerCommon, Version=10.0.3.0, Culture=neutral, PublicKeyToken=967100671921c115", - "MethodName": "ExecuteCommand" + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=是否为确定" + } + ] + }, + "value": "1" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!O21" + }, + "TargetType": "Forguncy.ButtonCellType, ServerDesignerCommon, Version=10.0.3.0, Culture=neutral, PublicKeyToken=967100671921c115", + "MethodName": "ExecuteCommand" + } + ], + "ID": "ee45495f-95c6-4fcf-b3fd-867e5e6ce04c" + } + ] } ], "ParamProperties": { @@ -703,7 +725,7 @@ "PageName": "完善Gitee资料" } ], - "ID": "4d7842e8-7478-4fbb-ade8-abf8a942ee16" + "ID": "61bf1330-59b6-4372-a6bf-299bf83c6c4e" }, { "CommandList": [ @@ -796,7 +818,7 @@ } } ], - "ID": "3ec52c93-b6da-4f00-b347-e04e051fa78e" + "ID": "1e012f6b-d291-4433-a66f-c0876f824ac8" } ] }, @@ -810,7 +832,7 @@ "Title": "加载中" } ], - "ID": "8516141c-e93e-4a8d-b67c-5da61bf11962" + "ID": "fe0ff050-43f9-434f-a6fe-feeb57f36892" } ] } @@ -1118,7 +1140,7 @@ "ReloadData": true } ], - "ID": "eecfde35-c50e-4d15-8fd6-bcf3b0f03a38" + "ID": "180096fa-a4c8-4e80-87d2-54bab9d63c11" }, { "CommandList": [ @@ -1133,12 +1155,12 @@ "BtnText": "知道了" } ], - "ID": "1f62e450-b714-4859-ad32-1461c3eabe0a" + "ID": "dd160403-c865-46f2-be20-6087377d9f9d" } ] } ], - "ID": "37222052-a7d7-409d-9439-16f425aa32cc" + "ID": "cf899104-42f0-41e5-86fe-8fcb53baaea2" }, { "CommandList": [ @@ -1148,7 +1170,7 @@ "Message": "用户已取消" } ], - "ID": "32f9f9ab-8905-4153-b8d7-d10ee70cd77d" + "ID": "6001c0f5-51a9-47ef-a32a-df5361441c4c" } ] } @@ -1191,12 +1213,12 @@ "LoadBindingDataOption": 2 } ], - "ID": "ef11949d-e652-4f9f-a78a-d5539bf770cf" + "ID": "99c0eb19-1e09-4f05-859d-5cc005178048" } ] } ], - "ID": "cc89dea3-40a8-41bf-abf2-fe1f5dfb2098" + "ID": "55bf0ed1-c228-4edf-b990-6ccc3b30aa76" }, { "CommandList": [ @@ -1309,7 +1331,7 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "39fdb361-728a-47dc-b82a-52a1ee9b467d" + "ID": "26bf3987-3e0d-4263-afb6-b7b60eab0180" } ] }, @@ -1561,7 +1583,7 @@ "ReloadData": true } ], - "ID": "a77d9388-a462-4c64-85cd-2ee36f93820f" + "ID": "4226ec60-aadf-433a-87c6-5dee039e7425" }, { "CommandList": [ @@ -1576,12 +1598,12 @@ "BtnText": "知道了" } ], - "ID": "11eae05e-0ba0-4b4b-8f8f-36dcf01a7fac" + "ID": "ef47c4eb-50f2-486c-954b-6cf455288b3d" } ] } ], - "ID": "11505940-01c8-43e5-8bf8-df800163b58a" + "ID": "28bddfd1-89a3-4238-a013-5c3fe9dc1b4b" } ] } @@ -1658,7 +1680,7 @@ ] } ], - "ID": "52bfe329-0ca4-48f9-af90-8a346e59081f" + "ID": "2a726857-0a1f-44f7-b8ab-6e695a8e11d8" }, { "CommandList": [ @@ -1673,17 +1695,17 @@ "BtnText": "知道了" } ], - "ID": "5364e5ac-ce6e-4086-bce7-589be1803901" + "ID": "14d8daeb-6bbd-4de2-b186-ff3ea07c8800" } ] } ], - "ID": "595350e9-3077-47b1-b01c-db5feef51cc3" + "ID": "2703d210-1168-4fcf-92c5-80cefe0de167" } ] } ], - "ID": "2fa1d89a-950b-4c10-a786-b313cd63742c" + "ID": "ff913f6a-050a-4e7c-a6ea-e503ae4e0551" }, { "CommandList": [ @@ -1693,7 +1715,7 @@ "Message": "请添加参与人后进行操作" } ], - "ID": "a9f162c4-9145-4bd6-9f93-e8e4c5a475d9" + "ID": "511d5146-d4cd-42ea-ab40-2776f680cc53" } ] } @@ -2072,7 +2094,7 @@ ] } ], - "ID": "058da7f2-89eb-48e8-86aa-4559f809b640" + "ID": "b1ed50cc-7616-4928-ab27-ac70d6a4a13e" }, { "CommandList": [ @@ -2089,7 +2111,7 @@ ] } ], - "ID": "c8f5bf6d-1936-4969-922b-512cc3827365" + "ID": "b4801c77-b34d-423a-8c00-d072b0893319" } ] } @@ -2146,4 +2168,4 @@ "Formula": "新增报工!$N$30" } ] -}//2AsG5uG+kE09uqjD1+IPSz8/ZFzGgtRlSPkttCWficZxQ2ClYJyXxmnXVN7snAbqtzAf2bp5QXkzsU7+aSFfmIYRsaTdNXED3GyCZ0RiPa3ume8q4OnIGF0+WwDffWPi4/ho6taTNrZpCe/zvVZzSsTS+hi2pseLlRsaPCsoMDhp1Hgej4bgN1DLzVI0FVe+w7bk3Cr1iqcnwoY8Jzne+5RzaCGi1xDVc/0feOGtmg6NQoEPKgaNv8NVTSwtaagRuqpGvi46TwQQBg+qvomTs09Yvzo9I8xsCRLimnVUNaBuTZAdkox+sJ7PrW7unVbeguNVCX+6ed0CUrKDRcOJAfSyncXw0+qxwrf1HxlGuoZqTWz9WzY4hHMnBEgy08AY0z5QDKETqLcJgPvRdhQo+jb3E1x1Lyfo7Rj0oa5nr9yEV9f1fCVBx9nkEugX52ujIPKNqlpjTtxfSycNeEE44gSm8jov+lbn5rP8Eo9cMBNfe3pgguuYCHePr+Rxbr4yaqLU5HGQjKW18lVpW5O0dFFxxzlfslId4ETpOx1/dY91OxMVwiPr7AiFmQ1f9OhTtU/XsZxqMtURsKN7exegKiCZArCm55cIgmwzYHPfCpv3Fexu+a28eb3bQYnfUh/077P9J7ZuXjfKj8Dvcs/vOpwVYzq2tzp6FVWeyQJXeQLgV53Ppqb3UJ8GO/Uu8Y+fZe31bt4D8LON42y8ZZ0ihZIdEZ88ggr1sUdG5+MB53gxy9e5pK6bCWE3GQ52bFajObQnvudYsOhpykaBoZn7qTZR31vO/8u7RoyLm1Elgru+fM84Ses0on+edLL6RzFKP+0CWrt2Nhpw2SzqKqhjnGFy2SVXxTGFfLYX6j4FDV3xzF5BQUDx/j++SxC5a4Z1HSjJwfX/01MS5ETzEzo4ZQ==|920 \ No newline at end of file +}//RUJm81GCXTQzO4lEZjwahG2nYN5vBC/Nn/jkbmF8GozzNBKh01DmnUBY8i20xg4aTMOVxBBCbqnlGHHw3PVt36nj3akBI0nz6l3A6Km+xpaSN1JOwA/15OKn7flEm41PqUVDaas+Mt3LYiE7eh9aioSeX7Lz2+39vATLQmokEDv8Au5c5Hz0Ugk4vrWlNgkKQgrlTMgFnaaiaV/W6s31GL7fjCIzn7IN+tpsNRbVKd81c+mY2jHgoY4xL8s3KTHHSOgD6F5UgUSKexlyUZbD+debUAWSAIBgv5O9LKOhTSMV286It7Qh1TM++XTAOPxDRPF2mVVpRv2ZkbFuvKydjN/rWoXV01PNVzJKO2ggab+YutbwstlaNnVTE6bLJIeG3nDclSIosyUz0fPSXfwJE1Rul0ty1nGdPk3Ps2R6iqAzXrGj8sJzMoVYjspVWT8AF2RUe4SZ5TH6hD7y7WZnePz1m6E4MP6GBrnx9eYYOlobiL9gjgvTRl7wNtSyJftSk8gX44FSaHhh61RtOwrfVkyIMFFKRe/5Pjybinw1HhgOFzGwmOhutAGdoGSFZ4N0hUcP4uixdpt5B3GyTx0sqPTRixvt6EBbsL9Rp+bsz0xOTA6EQS7umqUbYOByyooHP1vvqDTQsapS3oiYtdNotm5D+WQfYryIGcj64t2NnFm7hAheZxUjsqTARL+CpaS7xIKgdNp5oYMdMeAYuViJfRM9rU4muXiPK7bFdYvjIlQLRuWi9x4bhgCGVqAoRC61Tf7XHi/LtQIAVkX4E5r/a26BnJPBYcY+LEuhnU9ji8e10t1Kbigu4RoV/2kZ/ewlvKKJoIhKYFh92yqhA7JoH/n/v9bm3Y4ulWPgvdkd53rQXaQmDkyfRvtwBmsZdOpRnwg74mBh8tfdoG8exliwVQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目配置/项目审批.json b/Pages/项目/项目首页/项目配置/项目审批.json index 20ade8f6..04157e10 100644 --- a/Pages/项目/项目首页/项目配置/项目审批.json +++ b/Pages/项目/项目首页/项目配置/项目审批.json @@ -71,6 +71,11 @@ "DesignLengthInPixel": 32.0 } }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 88.0 + } + }, "15": { "GridRowColumnDefinition": { "DesignLengthInPixel": 24.0 @@ -96,11 +101,6 @@ "DesignLengthInPixel": 32.0, "IsHidden": true } - }, - "14": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 88.0 - } } }, "InLogicalVisibleIndexes": [ @@ -276,15 +276,16 @@ "DesignLengthInPixel": 32.0 } }, + "35": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 311.0, + "IsHidden": true + } + }, "36": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } - }, - "35": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 311.0 - } } }, "InLogicalVisibleIndexes": [ @@ -302,7 +303,7 @@ "7,1": "客户部门：", "7,12": "客户部门：", "7,23": "客户联系人：", - "9,1": "预算成本：", + "9,1": "预算工时：", "9,12": "预算费用：", "9,23": "工时分配方式：", "11,1": "计划开始日期：", @@ -720,6 +721,12 @@ "Foreground": 5, "Formatter": 9 }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 5, + "Formatter": 10 + }, { "FontFamily": 0, "Foreground": 3 @@ -735,6 +742,7 @@ "black", "\"严格\";\"宽松\";\"宽松\"", "[AUTO]General", + "0.0\"小时\"", "yyyy/m/d", "0\"天\"" ], @@ -884,7 +892,7 @@ "9,2": 0, "9,3": 0, "9,4": 0, - "9,5": 12, + "9,5": 15, "9,6": 0, "9,7": 0, "9,8": 0, @@ -949,20 +957,20 @@ "11,2": 0, "11,3": 0, "11,4": 0, - "11,5": 15, + "11,5": 16, "11,11": 0, "11,12": 14, "11,13": 0, "11,14": 0, "11,15": 0, - "11,16": 15, + "11,16": 16, "11,22": 0, "11,23": 14, "11,24": 0, "11,25": 0, "11,26": 0, - "11,27": 16, - "11,34": 16, + "11,27": 17, + "11,34": 17, "11,36": 0, "12,0": 0, "12,1": 0, @@ -1056,8 +1064,8 @@ "16,34": 12, "16,36": 0, "17,34": 12, - "19,6": 17, - "19,7": 17 + "19,6": 18, + "19,7": 18 }, "SheetStyle": { "FontFamily": 0 @@ -1123,4 +1131,4 @@ "PaperSize": {}, "Margin": {} } -}//lNrXBE4DQuvDyVmn6rAuZrOX8FVSr42lmZ9laAQMYdq7vtiWXyjCLnJExxf2Tfq4qsydS3DJDze0um46tKAuSdhNEMfjx7+XYePD6qgOC879mRFwZZ2GtBaQz/dHwTjcNE3eCpUOrIKUCb8TIY3+DW1KvOywixh1/GTMBrhQfXPEoSTzlumLWW0SIqmqHrv++kQhDFt0HCYqaeIoyWYrwEN62IRw8KIC7oRX1ufqd+9u5EB1k5E3G9LkushlRtUkpXb/hGJ+U9Zbzn1Dm+Tl93fCBnbCclEm6Ndc4fQvhEIFS2k6p9zZ+tW9EYF/K6ErihaCu0BpZyb4mE68Vkuw7UZul2DmVt78jJ4Y3ZaRY7bnHWsTLbim2X2s8Qk0AotXw19NtIGU+FyAWF1v5UzNUQ2G8PEakC6EU1X+dClckSqf6ls1sfMEXoXlFvomC0QaMlVxXSRPpfpyZdDD058F3JwV94D+odxhlKIZeahp5gV2sQTFFrG+M3EjpusClsCq/fdlHBKlWxC71PksEGt9CjlS1UWR0oR8PRwAnchMjkh/N6TsNvz1oRInXF/uqc/v7teN71X/lL/O0jqwrP31KS2qO94/zxA8/Dp3Wo1YvIROcQ/sez6K6U1uMUqAd5udOydv3SCjkaIZ12Pp/2Fy7Ce9Oi+gwMo6FMb/XkqcgXiH207FS29yCxATxiusQYMjVlrrK5eZk7AAW6t4TwV0VJeBCPwQI+wi2DANWP4irVO+x9g/0OHK+wjgpPZQ61SQPO0NdqazGssWNU1o2coWj2pbouLcEBRUoxihuAfCm9XgDrAxIju0PzMAwSmhyCr7gXANi28nxBo3G6PIusV39eulkKVMKPp7PgqJ5/SKruuX6c+msOJTJVASnwZQOAXv2almvp+ZQe37i1sRBZPeCQ==|920 \ No newline at end of file +}//0lVMkWQC9CNaRBEpazC2CKeaVGSBLdwYZ+5Llp69tMAPY7ly8zEi39sqei9PsTJWZFiqmcZudkZxPtAIijuGrmjyKLRpQOmvaWg6hTgiiqabSxD7WIjcyC0guuAUGQIIjuu84/D61qvYFPO2frVH7ck5Qilg8hM1yj2gvgNwsbkbP7Zfvz5L4aql/8t+SREovFvo5WZAnQTzvPAr6TihpjzIXsyDtx8GZ18Lz+MNrnIT9+RZou6JUOVsXrO3OJr8IN97/4iUiY1Pvm5tR9QEA9Cm2dCUdJlXpGDDW2p6rZleybuU6Aw7M/ubhem7EKhlowBhv1aJNIW4EJJj2t0nWQlhkl1J/wVaP2IbAeDDln8Mk+PFHu1VfJbrzjSQt1aHDE7e0mj4UD2twgVFdWQZF+bQEtz1u8KKBamizglLn1Bmf2EQYVex7D0KZlGcudKPNn6oP9U+I+kB5RP49olQCowwIl+8bJxoYZd1EoeUcGNfi3tA2pHOdeRxdQDm3m5ERhFPf/r+TyZIFitjbvfDP3rE61/tSplfO20moaNS/LRZVwDwXJf/jcGuY/iA5yZcNoyBCGcqsp2Iy/hUJG7qeZaMQVN+Ar/bWCGpYW3j80xq52GvIotGlxXVf4kxtS9yxgckjuY8tlB8+PjNHMbnwgR+v1MhFez6pmQYNgVUEGmVLuIOwDfM2X6TiwZE2imwqi5enOQ253HSoK6b2xaj6muyU06mtgnQ9YZERIKpbdJsQXhcdJSZ1BNiLMnSlODsJvk3E6tuM7lJs71II/DnHONcmiTS0JW5jSKspVML1mGSnWYiGWTE23Yunbm+QIhusAm7zv3IJJOzuhdccTwP3hAVlzED1C4t7JKbBjdZqXarrSEXxRPHtbjhLyXoyHH4cCQ6IuZg05yjTmsktPLZ2g==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/预算申请/预算申请.json b/Pages/项目/项目首页/预算申请/预算申请.json index a2fc8caf..40fe9c35 100644 --- a/Pages/项目/项目首页/预算申请/预算申请.json +++ b/Pages/项目/项目首页/预算申请/预算申请.json @@ -635,12 +635,12 @@ ] } ], - "ID": "9f1f4bcf-1161-4771-a534-ac8f9c40b865" + "ID": "6a26246f-885b-4c52-b2bd-0990e41d68b8" } ] } ], - "ID": "6127ade7-41c5-4e6f-aafb-20c9004d6b6b" + "ID": "25d7cfdf-6e56-49d5-ac85-11de8c717cdd" } ] } @@ -1040,23 +1040,6 @@ ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", - "PageLoadedCommandList": [ - { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=预算申请!项目ID" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IFERROR(预算申请!传参1,\"\")" - } - } - ] - } - ], "PermissionData": { "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", "permissionResource": { @@ -1089,4 +1072,4 @@ "Formula": "预算申请!$B$21" } ] -}//Cr5RxVItRPUjr8d26Femsi5nsHXlwJv44BHjKb11dwSZrs6XfmP/j4TKs1Q/C30yQoqjbe1Se5AM+zvpTZfyt7p1BimDkvzxxiiJ9P1o2WFlWfcdzilGklra4q3+K6K6L2Ly9F2d4NUkigxaH9rN+nnji85AiOg6HNXfK+xUaBlCZIAKSoOYJHQsZ1h39t2rE7MIeFrIYtiT2R9ffgsDQxwA64ApRjgsjOj4CUoEA4HjW0yJBQ21ixyw5HMiShbkaiPo22XBy5Hmp70QHuidHcCDgIeXmpuAE0aFrxorSAoCDzDvJM68USLbBImJP8keDGoI+ZNXZtGQhoaQwrzl9jBnJgyz3/CfXbsHwLyp50ScSUBDUmnsXAkAgfmb+kridiqTrKmRWZdlqdAkxsxUv8icArLfy+hnIW4JBizFrMo8pHkTmBniNstr/3nG4GWAx2Y7Yz9rBFEYO4mZTb4s6WqYnIMfaOGzc4DZ1PAuVRkePUdn4J2VojST3orOlz8DlvUqGY5yce9SDJugfgjtZmmv3sKmc5USgwmkUfPKAAOELlZVCgNmfnVdMjqT1psmlxlTsh8Hqjoe+Q3/dAS/K7KGhtLkDlhQiEpGKL3PFWM8lKbd4lViBzlQ7ukozGdlp6bVs8yBswGRWGES7Y/qjoxfdJGoOJLzP1rmrIUQskTStN2syC+I9obuJaueeenKBMhnryJi8+co1kYMrFlCKZYOZfaUE+GmYJU/AzrBQBCaP/g1kAOJCJI/esCmOjoO+SmQmBAtpiXEdqBr6puxHNBleSqpXUhoxP9Fg7s46chYMDSKP+j06buvfbvq+zk+7nMVXKiCu1vKzNzTa8+a07OiNRn5jszI7WbK6J+33rhTg15Geuij4L7IMd32wSWE9RTTG/zh3JuEiODFJczL5A==|920 \ No newline at end of file +}//n/nUj9aaf4OlY2+JF6rUTpx5Uu4AFDMbmpPI1EoDoVfRjCrl0GkloDUpKsEjrZcqXij7fMQGxdXLX8ah09hJH8QcrHe7BSs2zY/iENFJJXJ70ER/wdT+8JcmYBw1xEi6497MYMdEa+FvoOzDfi8THBOJEXfh5ZJww9Fs4IPpOjKXW7hN/ugBYBi54ypNRP9cXfAhdsOzxTwWP1OpEGx5+3D3xACHaoF83e0qC8sySQEzkHWK6EwhC/cO9XJkp489sV3JaOqeNIKRJ9DTu1FUpWrCtDRpyljSYLM2wmIQf8R5WBBXToJmVTPOZASlhMvHY+luL1ihrO4ZPT2hcyMlOKskV80OFz1oyH4/D5PxJj5lUjmpCowTnZYTcet9sjxCJoMfHC/3B+nZnRqmALvIkaAhTFoBuYr1RS/Ug3M7c5KG1DEDaCExKPV0CcOjd4icdJdHTmVW7CCoiEZbviq0r7wBffF/aHv2bmxf61wi+bisYFgRpl78VfO/uaKowtkxe5H8KuTsKPLZz0JEwIlI3Q1FIDfUNUGRZpg1y5s/JIUwwSW1D0Puo7tGvXf9FGPW3rNouZMWQfX8Mj5HsMiTdXHK17/xTICVvmHpjAncrMsVppxV/wC2GsUhg9YYSndUazheELfuv9+FgeT1bj+S/k31ZiHCZpPgh+n/1JzMUEGR+0ET8E2w9QHzNkqOIUhnkS1aOUuD799jg8ypD/bh7iSWybv6xoHmbqra5U8KbdbY9wLHlhF4SrPcaozFo18ADEPbLOTNSZCJXPCdbY+/azs13Tz18wlVcYObJ/L1ejIcjMeJqsCoAKdmVKRbUH7Z9diWEQuqoEogMh6dhqc7QIZI0bLXk2NgzM6lATo3Ne8MBAJD9hg72+CXW2JyKtCXMRNyybgKXtpBF96NLnevzg==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/预算申请/预算申请审批.json b/Pages/项目/项目首页/预算申请/预算申请审批.json index 08b4a834..d6090c33 100644 --- a/Pages/项目/项目首页/预算申请/预算申请审批.json +++ b/Pages/项目/项目首页/预算申请/预算申请审批.json @@ -3,17 +3,17 @@ "RowColumnAttachedInfos": { "0": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 19.0 } }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 47.0 } }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 + "DesignLengthInPixel": 19.0 } }, "3": { @@ -23,7 +23,7 @@ }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 35.0 } }, "5": { @@ -33,12 +33,12 @@ }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 25.0 + "DesignLengthInPixel": 24.0 } }, "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 17.0 + "DesignLengthInPixel": 32.0 } }, "8": { @@ -48,12 +48,12 @@ }, "9": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 17.0 } }, "10": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 25.0 } }, "11": { @@ -63,15 +63,25 @@ }, "12": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 24.0 } }, "13": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 24.0 } }, "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "16": { "GridRowColumnDefinition": { "DesignLengthInPixel": 102.0, "Mode": 2, @@ -83,21 +93,21 @@ } } }, - "15": { + "17": { "GridRowColumnDefinition": { "DesignLengthInPixel": 15.0 } }, - "16": { + "18": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 40.0 } } }, "InLogicalVisibleIndexes": [ - 17 + 19 ], - "Count": 18, + "Count": 20, "DefaultSize": 32.0 }, "Cols": { @@ -176,29 +186,95 @@ "DesignLengthInPixel": 15.0 } }, - "17": { + "19": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 36.0 + } + }, + "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 380.0 + } } }, - "Count": 18, + "Count": 20, "DefaultSize": 32.0 }, "Values": { - "1,1": "项目名称", - "1,13": "申请人", - "5,3": "预算", - "5,7": "本次申请增补", - "5,11": "最终", - "6,6": "+", - "6,10": "=", + "0,18": "FGC_审批记录", + "3,1": "项目名称", + "3,13": "申请人", + "7,3": "预算", + "7,7": "本次申请增补", + "7,11": "最终", "8,6": "+", "8,10": "=", - "11,1": "申请理由" + "10,6": "+", + "10,10": "=", + "13,1": "申请理由" }, "AttachInfos": { - "2,1": { + "0,18": { + "CellType": { + "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", + "PageName": "FGC_审批记录", + "OverflowMode": 1 + } + }, + "1,1": { + "CellType": { + "$type": "Forguncy.ProcessPanelCellType, ServerDesignerCommon", + "PreCommands": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "Title": "加载中" + } + ], + "PostCommands": [ + { + "$type": "Forguncy.Model.IgnorePageDirtyCommand, ServerDesignerCommon" + }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ReloadData": true + } + ], + "TemplateKey": "同意", + "ActionButtonStyleTemplateInfos": [ + { + "ActionTitle": "提交", + "TemplateKey": "同意" + }, + { + "ActionTitle": "同意", + "TemplateKey": "同意" + }, + { + "ActionTitle": "回退", + "TemplateKey": "回退" + }, + { + "ActionTitle": "终止", + "TemplateKey": "拒绝" + }, + { + "ActionTitle": "拒绝", + "TemplateKey": "拒绝" + } + ] + } + }, + "4,1": { "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "项目ID", @@ -210,7 +286,7 @@ } } }, - "2,13": { + "4,13": { "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "申请人", @@ -221,56 +297,56 @@ } } }, - "6,3": { + "8,3": { "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "原预算工时", "GUID": "3f2b409d-8e56-4268-8f6b-f63e74655eec" } }, - "6,7": { + "8,7": { "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "增加工时", "GUID": "5f8bff8d-6e4d-45b3-8228-49e50f2ecad1" } }, - "6,11": { + "8,11": { "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "增加后工时", "GUID": "259e1581-5d54-40a6-bf01-18d9bbb9e52b" } }, - "8,3": { + "10,3": { "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "原预算费用", "GUID": "0c2a9de1-3199-4abb-a77b-55298673d38f" } }, - "8,7": { + "10,7": { "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "增加费用", "GUID": "f575847a-57ea-49df-bb5c-94d947e8b721" } }, - "8,11": { + "10,11": { "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "增加后费用", "GUID": "d1a4d2e4-58cf-4e61-bd6d-09ac2e75baa8" } }, - "14,2": { + "16,2": { "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "申请理由", "GUID": "eb534252-fbb3-44d1-a7a3-1911eacf7ea0" } }, - "17,1": { + "19,1": { "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "项目ID", @@ -280,6 +356,9 @@ }, "StyleDatas": { "Styles": [ + { + "FontSize": 16.0 + }, { "FontFamily": 0, "FontSize": 13.333333333333332, @@ -500,211 +579,226 @@ }, "CellStyles": { "1,1": 0, - "1,2": 1, - "1,3": 2, - "1,4": 2, - "1,5": 2, - "1,6": 2, - "1,7": 2, - "1,8": 2, - "1,13": 3, - "1,17": 2, - "2,1": 4, - "2,2": 2, - "2,3": 2, - "2,5": 2, - "2,6": 2, - "2,7": 2, - "2,8": 4, - "2,13": 5, - "2,14": 2, - "2,15": 2, - "2,16": 2, - "2,17": 2, - "3,0": 2, - "3,1": 2, + "1,17": 0, + "3,1": 1, "3,2": 2, - "3,3": 2, - "3,4": 2, - "3,5": 2, - "3,6": 2, - "3,7": 2, - "3,8": 2, - "3,9": 2, - "3,10": 2, - "3,11": 2, - "3,12": 2, - "3,17": 2, - "4,0": 2, - "4,1": 2, - "4,2": 2, - "4,3": 2, - "4,4": 2, - "4,5": 2, - "4,6": 2, - "4,7": 2, - "4,8": 2, - "4,9": 2, - "4,10": 2, - "4,11": 2, - "4,12": 2, - "4,13": 2, - "4,14": 2, - "4,15": 2, - "4,16": 2, - "4,17": 2, - "5,0": 2, - "5,3": 6, - "5,5": 2, - "5,6": 7, - "5,7": 6, - "5,9": 2, - "5,10": 2, - "5,11": 6, - "5,13": 2, - "5,15": 2, - "5,16": 8, - "6,0": 2, - "6,3": 9, - "6,6": 10, - "6,7": 11, - "6,9": 2, - "6,10": 12, - "6,11": 13, - "6,15": 2, - "6,16": 14, - "7,0": 2, - "7,3": 15, - "7,4": 15, - "7,5": 15, - "7,6": 10, - "7,7": 11, - "7,8": 11, - "7,9": 11, - "7,10": 12, - "7,11": 16, - "7,12": 16, - "7,13": 16, - "7,15": 2, - "7,16": 14, - "8,0": 2, - "8,1": 2, - "8,2": 2, - "8,3": 17, - "8,6": 10, - "8,7": 18, - "8,10": 12, - "8,11": 19, - "8,14": 2, - "8,15": 2, - "8,16": 14, - "8,17": 2, - "9,0": 2, - "9,3": 20, - "9,4": 20, - "9,5": 20, - "9,6": 10, - "9,7": 21, - "9,8": 21, - "9,9": 21, - "9,10": 12, - "9,11": 22, - "9,12": 22, - "9,13": 22, - "9,15": 2, - "9,16": 14, - "10,0": 2, - "10,1": 23, - "10,2": 23, - "10,3": 23, - "10,4": 23, - "10,5": 23, - "10,6": 24, - "10,7": 24, - "10,8": 24, - "10,9": 25, - "10,10": 25, - "10,11": 25, - "10,12": 25, - "10,13": 10, - "10,14": 10, - "10,15": 26, - "10,16": 26, - "10,17": 26, - "11,0": 2, - "11,1": 27, - "11,2": 27, - "11,3": 2, - "11,4": 2, - "11,5": 2, - "11,6": 2, - "11,7": 2, - "11,8": 2, - "11,9": 2, - "11,10": 2, - "11,11": 2, - "11,12": 2, - "11,13": 2, - "11,14": 2, - "11,15": 2, - "11,16": 2, - "11,17": 2, - "12,0": 2, - "12,1": 0, - "12,2": 0, - "12,3": 2, - "12,4": 2, - "12,5": 2, - "12,6": 2, - "12,7": 2, - "12,8": 2, - "12,9": 2, - "12,10": 2, - "12,11": 2, - "12,12": 2, - "12,13": 2, - "12,14": 2, - "12,15": 2, - "12,16": 2, - "12,17": 2, - "13,0": 2, - "13,1": 0, - "13,2": 0, - "13,3": 2, - "13,4": 2, - "13,5": 2, - "13,6": 2, - "13,7": 2, - "13,8": 2, - "13,9": 2, - "13,10": 2, - "13,11": 2, - "13,12": 2, - "13,13": 2, - "13,14": 2, - "13,15": 2, - "13,16": 2, - "13,17": 2, - "14,0": 2, - "14,2": 28, - "15,0": 2, - "15,1": 28, - "15,2": 28, - "15,3": 28, - "15,4": 28, - "15,5": 28, - "15,6": 28, - "15,7": 28, - "15,8": 28, - "15,9": 28, - "15,10": 28, - "15,11": 28, - "15,12": 28, - "15,13": 28, - "15,14": 28, - "15,15": 28, - "15,16": 28, - "15,17": 28 + "3,3": 3, + "3,4": 3, + "3,5": 3, + "3,6": 3, + "3,7": 3, + "3,8": 3, + "3,13": 4, + "3,17": 4, + "3,19": 3, + "4,1": 5, + "4,2": 3, + "4,3": 3, + "4,5": 3, + "4,6": 3, + "4,7": 3, + "4,8": 5, + "4,13": 6, + "4,14": 3, + "4,15": 3, + "4,16": 3, + "4,17": 6, + "4,19": 3, + "5,0": 3, + "5,1": 3, + "5,2": 3, + "5,3": 3, + "5,4": 3, + "5,5": 3, + "5,6": 3, + "5,7": 3, + "5,8": 3, + "5,9": 3, + "5,10": 3, + "5,11": 3, + "5,12": 3, + "5,19": 3, + "6,0": 3, + "6,1": 3, + "6,2": 3, + "6,3": 3, + "6,4": 3, + "6,5": 3, + "6,6": 3, + "6,7": 3, + "6,8": 3, + "6,9": 3, + "6,10": 3, + "6,11": 3, + "6,12": 3, + "6,13": 3, + "6,14": 3, + "6,15": 3, + "6,16": 3, + "6,17": 3, + "6,19": 3, + "7,0": 3, + "7,3": 7, + "7,5": 3, + "7,6": 8, + "7,7": 7, + "7,9": 3, + "7,10": 3, + "7,11": 7, + "7,13": 3, + "7,15": 3, + "7,16": 9, + "7,17": 9, + "8,0": 3, + "8,3": 10, + "8,6": 11, + "8,7": 12, + "8,9": 3, + "8,10": 13, + "8,11": 14, + "8,15": 3, + "8,16": 15, + "8,17": 15, + "9,0": 3, + "9,3": 16, + "9,4": 16, + "9,5": 16, + "9,6": 11, + "9,7": 12, + "9,8": 12, + "9,9": 12, + "9,10": 13, + "9,11": 17, + "9,12": 17, + "9,13": 17, + "9,15": 3, + "9,16": 15, + "9,17": 15, + "10,0": 3, + "10,1": 3, + "10,2": 3, + "10,3": 18, + "10,6": 11, + "10,7": 19, + "10,10": 13, + "10,11": 20, + "10,14": 3, + "10,15": 3, + "10,16": 15, + "10,17": 15, + "10,19": 3, + "11,0": 3, + "11,3": 21, + "11,4": 21, + "11,5": 21, + "11,6": 11, + "11,7": 22, + "11,8": 22, + "11,9": 22, + "11,10": 13, + "11,11": 23, + "11,12": 23, + "11,13": 23, + "11,15": 3, + "11,16": 15, + "11,17": 15, + "12,0": 3, + "12,1": 24, + "12,2": 24, + "12,3": 24, + "12,4": 24, + "12,5": 24, + "12,6": 25, + "12,7": 25, + "12,8": 25, + "12,9": 26, + "12,10": 26, + "12,11": 26, + "12,12": 26, + "12,13": 11, + "12,14": 11, + "12,15": 27, + "12,16": 27, + "12,17": 27, + "12,19": 27, + "13,0": 3, + "13,1": 28, + "13,2": 28, + "13,3": 3, + "13,4": 3, + "13,5": 3, + "13,6": 3, + "13,7": 3, + "13,8": 3, + "13,9": 3, + "13,10": 3, + "13,11": 3, + "13,12": 3, + "13,13": 3, + "13,14": 3, + "13,15": 3, + "13,16": 3, + "13,17": 3, + "13,19": 3, + "14,0": 3, + "14,1": 1, + "14,2": 1, + "14,3": 3, + "14,4": 3, + "14,5": 3, + "14,6": 3, + "14,7": 3, + "14,8": 3, + "14,9": 3, + "14,10": 3, + "14,11": 3, + "14,12": 3, + "14,13": 3, + "14,14": 3, + "14,15": 3, + "14,16": 3, + "14,17": 3, + "14,19": 3, + "15,0": 3, + "15,1": 1, + "15,2": 1, + "15,3": 3, + "15,4": 3, + "15,5": 3, + "15,6": 3, + "15,7": 3, + "15,8": 3, + "15,9": 3, + "15,10": 3, + "15,11": 3, + "15,12": 3, + "15,13": 3, + "15,14": 3, + "15,15": 3, + "15,16": 3, + "15,17": 3, + "15,19": 3, + "16,0": 3, + "16,2": 29, + "17,0": 3, + "17,1": 29, + "17,2": 29, + "17,3": 29, + "17,4": 29, + "17,5": 29, + "17,6": 29, + "17,7": 29, + "17,8": 29, + "17,9": 29, + "17,10": 29, + "17,11": 29, + "17,12": 29, + "17,13": 29, + "17,14": 29, + "17,15": 29, + "17,16": 29, + "17,17": 29, + "17,19": 29 }, "SheetStyle": { "FontFamily": 0, @@ -712,20 +806,22 @@ } }, "Spans": [ - "17,1,1,5", - "5,3,1,3", - "6,7,1,3", - "5,7,1,3", - "5,11,1,3", - "2,1,1,7", - "2,13,1,4", - "1,13,1,4", - "14,2,1,14", + "19,1,1,5", + "7,3,1,3", "8,7,1,3", + "7,7,1,3", + "7,11,1,3", + "4,1,1,7", + "4,13,1,4", + "3,13,1,4", + "16,2,1,14", + "10,7,1,3", + "10,11,1,3", "8,11,1,3", - "6,11,1,3", - "6,3,1,3", - "8,3,1,3" + "8,3,1,3", + "10,3,1,3", + "1,1,1,16", + "0,18,20,1" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -764,7 +860,7 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "32,131", + "Location": "32,184", "Size": "478,147" }, { @@ -778,14 +874,14 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "32,336", + "Location": "32,389", "Size": "478,132" } ], "CustomNames": [ { "Name": "项目ID", - "Formula": "预算申请审批!$B$18" + "Formula": "预算申请审批!$B$20" } ] -}//BnCdMOO6PQ26vTPMFu9/t47nCBz0N30MMAsxAp04lDj4MAfOmTNCzGpuSmpyH8P8EdprpScQj/eQ2pt2un7mIUSM64mho7Mr9Ruq/ULh32b8NmNmTrVkE343HcnyzwXEUpCFv9XJICf5llSfOtTigIcBlNkzOe6p+Ha9VkeyC98TvSr1vC/BiEye7G9ALKEXENHl2+N24K6Z7EZobTZZ5iEsbm5Fx3B7kL7NIaD37cB3ux6lhP66IXPOCozlK2Rx27HUSUhFvn03jc2YUp2vVj/H7+CV0vV8yk1PCikqif7xzu5nyMPjg9kwH2LeEGq1uZLK5ZQn+XgeS24khtKw55UxSUU8kExQGeNNJjKqhdrxd1HwIbrkzcuy5av60JSuPPFcshoN3HXz0a/zANOcdumI8hGOYCC0R1gqVJZGB2oJQx7qFeFt//A9pymAvOD7CBzRMBck2wVW3lxPG3oeTxiImXPYiC5VR3cl/F9xQQeFM5zzOYpIstsRYJGTrzYuzaTgaKIxYvOeXet6XoHNfVSjxyYnAyRuU8LEVNT22Co48UNY1OwKtgWGkIhdVE+TnYbCPZ/AIpuHsyuwYl4L1z3O2HAPuGDCIGccXGHqo2GsY29SvGGaRtvRv3vCTMeiS9z31UlNM60HWJszoVE/a7hJKZcCHsQ/7+qh1OxQ6CBwJkI9OVCTp7FoKhuhsmztwcMsSn1oxMMIwRznCY/pouTXYozEkeaY2mUjUBasRzzhXcezBKFTxqRG9i4oQatUXrGfTJ8HhuWK8Hg32HcXP7cxq1huWFbXRHdTJXPmGhi6wYCHo/UZ6tHVr3phY5iQW/QpB9yZKnYvv5bRa9nZ44NGNOu8MKLFc2nKniQBbTa4enjrpe+Cft/Jcc/N+mQy+riN34mXwrhWI2PLl9+84Q==|920 \ No newline at end of file +}//cwwZWmZ55p/NnYnqMKlwPrFmWNECBzO/UTHV46pQEAwNihsE9EOtlqdLeYt7HbUH+3JgTnvAFGEYldiAFlInhUOUvghffwXZ58QzY8XP6fdWQIc3tifaqPbxYRGAP4VtLz34wQs2CW3qQLJcaNWf3/CSAK4RAaP7dQwQy28jx9mHPGlCd0dkiV9BUfOK7kFcp3Vszb9/3gHmk1s4R9Oczn63cOtfLXEe2cQPe1Jr2GOFfxhtMVAb5umMg4pr4Cq2rwsMb27UA44QvMc0K6S6fXM41G2mxAQypEMUFveGW81WE/CVQtbY+MJBAoUHqYySVhnq7uhRE2VofsuiXmEMCL8jjL8RLgK1PG9UsPvUF9dzaI9wM0uOsnL4opNgfa4yDW7bCoSlbBMn1QvrJZ5pG2OOesc83zRHbVrVMqJ5ZTKHeOqC5ShaT+2A+S+Rx98igH/AiAs12v33LLxmB378QmwX1miM7bA4uampRIoRG+5huRDQlRZyB/RIxOWEb8lnXfKkq9ClOfeiXaCW/lkJyL/4f9MEtti7IagRPQD1/wTdupDe3pTSdutRtitjbZ6zlT33lm3o8KRdw0K+iZcD4zDbyNLS6NAWwkZBnY1dnCbJFqTUZ4qgUOB2LJbFpCKregdB0ScJmCRYvD7uWMO+KdigEvaTTVqmyes+jaNhk4aiL4UuPwyuHDrBBQ0iHov2pLscDMPnpvVuikLRpTz4YL74LHg/qMryWPAjbFyEaudJhvXQNA5/E1Aysef1FMAaQpZvJaQkYpATUsdILWY3pgkh6AKzfhZKYLpyo6b3vY6tmxzkPEdtBb+0dpAATD36tIdtmlpJOkKoxv7icXMafrWgykAxrm8etQME9kgf8oHKEIlbov6Qnw4KksuzM9iglj1f7w+ZSQxwOUaGH+gX3Q==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/预算申请/预算申请审批.rd b/Pages/项目/项目首页/预算申请/预算申请审批.rd index 98830a11..b2d9eb39 100644 --- a/Pages/项目/项目首页/预算申请/预算申请审批.rd +++ b/Pages/项目/项目首页/预算申请/预算申请审批.rd @@ -1,11 +1,11 @@ { "PageType": 0, - "ColumnCount": 18, - "RowCount": 18, + "ColumnCount": 20, + "RowCount": 20, "CustomNames": [ { "Name": "项目ID", - "Formula": "预算申请审批!$B$18" + "Formula": "预算申请审批!$B$20" } ] } \ No newline at end of file diff --git a/Process/新增任务流程.bpmn b/Process/新增任务流程.bpmn index 80353ca3..3a405858 100644 --- a/Process/新增任务流程.bpmn +++ b/Process/新增任务流程.bpmn @@ -4,7 +4,7 @@ - + @@ -14,14 +14,14 @@ - + _4f4ab1b2-ce52-46c6-bcc8-52c43b0c4a9f Flow_0otbu5x - + Flow_0otbu5x Flow_1bfvbmv diff --git a/Process/立项流程.bpmn b/Process/立项流程.bpmn index 135bdb1f..ed7f1e74 100644 --- a/Process/立项流程.bpmn +++ b/Process/立项流程.bpmn @@ -4,7 +4,7 @@ 用于项目的立项申请审批 - + @@ -57,36 +57,36 @@ - + - - + + - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/SchedulerTasks/项目成员删除事件.json b/SchedulerTasks/项目成员删除事件.json new file mode 100644 index 00000000..d950c473 --- /dev/null +++ b/SchedulerTasks/项目成员删除事件.json @@ -0,0 +1,35 @@ +{ + "Name": "项目成员删除事件", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.EndDBDeleteTriggerSaveData, ServerDesignerCommon", + "DataParamName": "变更数据", + "TableNameParamName": "数据表名", + "PrimaryKeyParamName": "主键", + "OperatorParamName": "操作人", + "OperationTimeParamName": "操作时间", + "SelectTables": [ + "项目成员表" + ] + } + ], + "Commands": [ + { + "$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 + } + ] +} \ No newline at end of file diff --git a/SchedulerTasks/项目成员新增事件.json b/SchedulerTasks/项目成员新增事件.json new file mode 100644 index 00000000..df8d7b35 --- /dev/null +++ b/SchedulerTasks/项目成员新增事件.json @@ -0,0 +1,35 @@ +{ + "Name": "项目成员新增事件", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.EndDBInsertTriggerSaveData, ServerDesignerCommon", + "DataParamName": "变更数据", + "TableNameParamName": "数据表名", + "PrimaryKeyParamName": "主键", + "OperatorParamName": "操作人", + "OperationTimeParamName": "操作时间", + "SelectTables": [ + "项目成员表" + ] + } + ], + "Commands": [ + { + "$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 + } + ] +} \ No newline at end of file diff --git a/ServerCommands/Gitee/同步仓库的所有提交.json b/ServerCommands/Gitee/同步仓库的所有提交.json index 18b7fa23..574a1088 100644 --- a/ServerCommands/Gitee/同步仓库的所有提交.json +++ b/ServerCommands/Gitee/同步仓库的所有提交.json @@ -298,7 +298,7 @@ "$type": "Forguncy.Model.EndLoopCommand, ServerDesignerCommon" } ], - "ID": "0be372fd-a188-4af3-bc38-3d7688a5e014" + "ID": "53d78e53-fe5b-4a6d-8428-b818c107e92d" }, { "CommandList": [ @@ -571,17 +571,17 @@ ] } ], - "ID": "2027b009-10d6-423a-903a-7f89446ffc20" + "ID": "2b706b0c-9243-4a12-bcf7-5ff809382ca9" } ] } ], - "ID": "5b70421b-06d2-4de9-a8b9-c2d6bd4ce31a" + "ID": "db714b0c-d12f-4ce9-9bf4-0c7f8ec18145" } ] } ], - "ID": "5c5a49b5-6cf1-4ebc-8b51-a2487af11aa2" + "ID": "ca82140e-8102-4080-9e21-2d87844124cf" } ] } @@ -591,7 +591,7 @@ ] } ], - "ID": "d45169f4-0451-4861-a23c-18e88b217f6b" + "ID": "c44ba308-d0df-4e90-ab7c-2c0a460b1c2c" } ] } @@ -626,7 +626,7 @@ } } ], - "ID": "36f191b4-79a4-4152-b203-88628831e32a" + "ID": "bd9ae4eb-5fa0-46d8-8b86-8a1da861c6cc" }, { "CommandList": [ @@ -642,12 +642,12 @@ } } ], - "ID": "133a0dcb-793b-4f20-90f9-dc06e9ec0d44" + "ID": "1b0dbf3e-b525-465c-bbf7-974a8b8fe39b" } ] } ], - "ID": "c771319d-e415-4569-95f3-b46db3151724" + "ID": "70b69c7b-8c2a-4564-90cf-2fc031fa793f" }, { "CommandList": [ @@ -657,7 +657,7 @@ "Message": "仓库不存在或尚未同步到系统" } ], - "ID": "5c63ebce-f2fa-4ae6-b8ba-95d6f4db667e" + "ID": "62102816-fb19-4b81-8b6d-95e7b96c334c" } ] } diff --git a/ServerCommands/任务/任务发起流程前校验.json b/ServerCommands/任务/任务发起流程前校验.json index fe785656..e92d7e61 100644 --- a/ServerCommands/任务/任务发起流程前校验.json +++ b/ServerCommands/任务/任务发起流程前校验.json @@ -43,7 +43,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "4c1c012a-0ad0-4338-9430-f1b70ac7a764", + "GUID": "51c6dcbf-fe8b-46d8-bfb4-191d546a0327", "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", @@ -52,7 +52,7 @@ "ColumnName": "项目ID" }, { - "GUID": "3026ea11-e179-43fe-a731-1f3acd8031cf", + "GUID": "cddf0559-1f01-4e67-b93c-bb1e34e4dcc8", "BindingInfo": { "TableName": "任务表", "ColumnName": "父任务ID", @@ -61,7 +61,7 @@ "ColumnName": "父任务ID" }, { - "GUID": "dc74514b-fa27-45ec-b5a9-349e11ddb9fb", + "GUID": "cd690ee7-a6c5-4904-8bf4-713f93816b13", "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", @@ -80,7 +80,7 @@ "ColumnName": "项目预算工时" }, { - "GUID": "c646f8aa-9325-4c7f-9a46-94c95431c000", + "GUID": "96e79e31-b1a4-4e37-8aee-350c62261957", "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", @@ -99,7 +99,7 @@ "ColumnName": "已分配任务工时" }, { - "GUID": "3d5bcd8b-de08-4dab-aa99-10b672410d22", + "GUID": "f0d7b2c3-9c10-4eeb-9c78-cf075c1ea8d8", "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", @@ -113,7 +113,7 @@ "ColumnName": "项目经理" }, { - "GUID": "57be8a25-ac7d-4f4c-b0cc-5fefcfdb476e", + "GUID": "7685d2a7-b8b0-4fb3-a2c4-7e8388603e5b", "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", @@ -127,7 +127,7 @@ "ColumnName": "工时分配方式" }, { - "GUID": "683595d8-69c4-47e0-8f9f-bb05e7732a15", + "GUID": "a1ce946b-fc6c-44d0-ae82-c77c153f7cf6", "BindingInfo": { "TableName": "任务表", "ColumnName": "任务预算工时", @@ -136,7 +136,7 @@ "ColumnName": "任务预算工时" }, { - "GUID": "34ff6d56-84e4-4f3f-a6f9-7528e5968792", + "GUID": "0bfff0dd-0c85-4e6e-ab5f-f1044a012c67", "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", @@ -150,7 +150,7 @@ "ColumnName": "严格模式" }, { - "GUID": "10ec1395-5a81-4cbc-acd8-8d1ef6996c99", + "GUID": "515d2b76-c70e-4d42-8127-6a735c321162", "BindingInfo": { "TableName": "任务表", "ColumnName": "执行者", @@ -159,7 +159,7 @@ "ColumnName": "执行者" }, { - "GUID": "40f27bbb-15e6-4e5b-8b04-41454bab1753", + "GUID": "91f6a0c9-9f8a-4b9a-9ee8-839ecdd8197f", "BindingInfo": { "TableName": "任务表", "ColumnName": "任务类型", @@ -168,7 +168,7 @@ "ColumnName": "任务类型" }, { - "GUID": "98dd52fd-9eef-4268-9769-5bee88e24f8b", + "GUID": "e9275819-440a-45b3-af94-bdaa6bc76357", "BindingInfo": { "TableName": "任务表", "ColumnName": "版本", @@ -192,7 +192,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "991ad217c6604c978bfc5749b20e6e33" + "ID": "4f3f746acbeb428fab74f7968f28c1a5" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -216,7 +216,7 @@ "Message": "当前项目未指定项目经理，请指定后再试" } ], - "ID": "bcf16cb9-2079-423a-a1b6-33293e2f563e" + "ID": "b646f410-c95a-4ba7-9851-2f54e22e2a71" } ] }, @@ -242,7 +242,7 @@ "Message": "请指定任务执行者" } ], - "ID": "deb73d93-205e-463a-8d34-5b5bfb1477e9" + "ID": "cf6d2a02-ef7f-4558-b11b-36b304d69aef" } ] }, @@ -268,7 +268,7 @@ "Message": "请指定任务类型" } ], - "ID": "20c338d7-189f-4ec9-8fe0-7f69ab5ba813" + "ID": "928c0d81-b13b-478e-8491-57b85c6a9eee" } ] }, @@ -294,7 +294,7 @@ "Message": "请为任务指定版本" } ], - "ID": "91321071-f269-486e-8efc-434263349f4e" + "ID": "1ec91d09-a0a1-44e9-aef6-ec5bffdc1151" } ] }, @@ -337,16 +337,16 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=任务信息.项目预算工时-任务信息.已分配任务工时" }, - "ID": "ff74d835958740a18c9a43517e5fe004" + "ID": "c115c6615384449597ebf4a85443befa" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "层级", "ParameterValue": "1", - "ID": "2a21b817513b444c9cb3a0316de2a9cc" + "ID": "8f419b6c4a3f4fb5bcf81a653a34fefc" } ], - "ID": "c519e38d-63bd-4a93-a2bf-6f4b2c414c9f" + "ID": "dc3596ec-7d37-439d-a2e5-7c9715388237" }, { "CommandList": [ @@ -358,7 +358,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "6760dadc-d949-4b45-ae70-50c034c806de", + "GUID": "07e65c5c-bafd-49d7-8ae7-4616d5e13378", "BindingInfo": { "TableName": "任务表", "ColumnName": "层级", @@ -367,7 +367,7 @@ "ColumnName": "层级" }, { - "GUID": "eb1e2579-cb27-4219-8c94-c22b985b827f", + "GUID": "20f3f014-e350-4182-b7c7-8c0f3b263e54", "BindingInfo": { "TableName": "任务表", "ColumnName": "任务预算工时", @@ -376,7 +376,7 @@ "ColumnName": "任务预算工时" }, { - "GUID": "435b9b45-862d-4a31-91e3-5b4e9ce75489", + "GUID": "5dbde190-261c-454b-9c78-adf11c3d695b", "BindingInfo": { "TableName": "任务表", "ColumnName": "总计划工时", @@ -400,7 +400,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "a772fe34c2594bce9ced25c057497185" + "ID": "ffc951c1aa654907998505d60d36bc1e" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -409,7 +409,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=父任务.任务预算工时-父任务.总计划工时" }, - "ID": "1f803427f50543e3bbc7d34be52ae616" + "ID": "e8645f329ef5428084e2e9f931213182" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -418,10 +418,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=父任务.层级+1" }, - "ID": "18d496286fcd41938205ec186b6d6fb4" + "ID": "ac58e4cdd43c49fe9f9575e244e3479b" } ], - "ID": "4afddd1e-6ec5-43b3-bd8a-62b9d375d848" + "ID": "f075c288-17d1-45c4-aaf5-07a117002cbd" } ], "Comments": "严格模式下，根据是否有父任务来计算本次预算工时的上限" @@ -441,7 +441,7 @@ }, "value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=预算工时" + "SerializeProperty": "=任务信息.任务预算工时" }, "compareType": 4 }, @@ -451,16 +451,16 @@ "ErrorCode": "400", "Message": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF(任务信息.父任务ID>0,\"预算工时超标：父任务可只配计划工时不足，请修改后提交！\",\"预算工时超标：项目可只配计划工时不足，请修改后提交！\")" + "SerializeProperty": "=IF(任务信息.父任务ID>0,\"预算工时超标：父任务可支配计划工时不足，请修改后提交！\",\"预算工时超标：项目可只配计划工时不足，请修改后提交！\")" } } ], - "ID": "04713767-c4db-4ac2-a6d2-8c9fd52d435e" + "ID": "63448099-3299-4748-ba1a-ce84dcb319e1" } ] } ], - "ID": "8cf18dc0-128a-476c-b041-a5be5f57bc47" + "ID": "456f791e-33d0-436a-85fd-1115f63fba0c" } ], "Comments": "校验工时情况是否通过" diff --git a/ServerCommands/任务/修改任务预算工时.json b/ServerCommands/任务/修改任务预算工时.json index 6a28d032..6a0ff742 100644 --- a/ServerCommands/任务/修改任务预算工时.json +++ b/ServerCommands/任务/修改任务预算工时.json @@ -49,7 +49,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "d74099eb-04bc-41c0-aa6f-470d4cc2a7a0", + "GUID": "e4efa15a-3c9e-4cfe-a495-00030d11e9c5", "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", @@ -58,7 +58,7 @@ "ColumnName": "项目ID" }, { - "GUID": "acb6b6d6-59ba-4c3f-9003-1c0aff8558f2", + "GUID": "96c4a14f-f7be-4ca1-8882-36a1c2feba42", "BindingInfo": { "TableName": "任务表", "ColumnName": "父任务ID", @@ -67,7 +67,7 @@ "ColumnName": "父任务ID" }, { - "GUID": "e302e5e0-8fd0-4bda-98d6-adbf334cf2a0", + "GUID": "a1090bc3-3a03-4758-ae63-4bf90f90913d", "BindingInfo": { "TableName": "任务表", "ColumnName": "任务名称", @@ -76,7 +76,7 @@ "ColumnName": "任务名称" }, { - "GUID": "64a3bf8d-d671-45a4-acc6-83c9855ab962", + "GUID": "ef8a7ac8-87a8-4687-8382-b81c6df691ca", "BindingInfo": { "TableName": "任务表", "ColumnName": "任务预算工时", @@ -99,7 +99,7 @@ }, "TopCount": "1" }, - "ID": "2b57c3279a694782aa04fa8d1ecdb672" + "ID": "86690732be6d422cbe4dd8b8b862d941" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -109,7 +109,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "7465c957-541d-4a33-a527-55cbafb7a01e", + "GUID": "1071aaed-c888-40f1-960a-cb391e04daf9", "BindingInfo": { "TableName": "View_项目统计信息", "ColumnName": "项目ID", @@ -123,7 +123,7 @@ "ColumnName": "严格模式" }, { - "GUID": "565a6bef-f49d-4fdc-916a-65ff82bce5bd", + "GUID": "280bf59f-50d3-47ce-9900-bdd1d38770ef", "BindingInfo": { "TableName": "View_项目统计信息", "ColumnName": "项目预算工时", @@ -132,7 +132,7 @@ "ColumnName": "项目预算工时" }, { - "GUID": "71fd0b96-1cc2-455a-951d-32a4e82cb9c4", + "GUID": "1eed9f7a-0f20-496c-822e-57487829c330", "BindingInfo": { "TableName": "View_项目统计信息", "ColumnName": "已分配任务工时", @@ -155,7 +155,7 @@ }, "TopCount": "1" }, - "ID": "4d7974b85a6845abbf13a6049e366122" + "ID": "be3e901989ee48be8342a779529ecad0" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -196,10 +196,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=项目统计.项目预算工时-项目统计.已分配任务工时-任务表.任务预算工时" }, - "ID": "b20c1c796f94456fa4c385c315a4cdda" + "ID": "e583a0048e5044a0b325443e28146bdb" } ], - "ID": "4de2f743-f240-4c31-bd39-cff558bb4544" + "ID": "deb71940-065a-41b4-912c-2cfc3975d518" }, { "CommandList": [ @@ -211,7 +211,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "882f26b4-8e5f-409d-9c8c-a9a0c453ccb2", + "GUID": "02e4d6e8-0cdb-4979-aeed-1dff7324dd02", "BindingInfo": { "TableName": "任务表", "ColumnName": "层级", @@ -220,7 +220,7 @@ "ColumnName": "层级" }, { - "GUID": "0560beff-dbba-44c6-9c74-f88617e71a2d", + "GUID": "21b06205-d508-4728-90e9-7a4b1deb5617", "BindingInfo": { "TableName": "任务表", "ColumnName": "任务预算工时", @@ -229,7 +229,7 @@ "ColumnName": "任务预算工时" }, { - "GUID": "b8e91f54-40c1-4411-8aff-2378121c5ba4", + "GUID": "abb9e663-53f4-4e96-8a27-c3139bfad61b", "BindingInfo": { "TableName": "任务表", "ColumnName": "总计划工时", @@ -253,7 +253,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "aa8c47d4b5eb4239af91776e1e32a8cb" + "ID": "b26ffe5976db4e7787b1d9c0a61fffbf" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -262,10 +262,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=父任务.任务预算工时-父任务.总计划工时--任务表.任务预算工时" }, - "ID": "cb9ee25307d1485c8e3ac45336def641" + "ID": "423c3d6d0618419c9eac630be5066c46" } ], - "ID": "d84b15f8-67b6-4109-85c1-b9100c7b6ac0" + "ID": "c8d08d3d-4822-4e2c-be89-008f2c10c375" } ], "Comments": "严格模式下，根据是否有父任务来计算本次预算工时的上限" @@ -295,7 +295,7 @@ "ErrorCode": "400", "Message": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF(父任务ID>0,\"预算工时超标：父任务可只配计划工时不足，请修改后提交！\",\"预算工时超标：项目可只配计划工时不足，请修改后提交！\")" + "SerializeProperty": "=IF(任务表.父任务ID>0,\"预算工时超标：父任务可支配计划工时不足，请修改后提交！\",\"预算工时超标：项目可只配计划工时不足，请修改后提交！\")" }, "CustomReturns": [ { @@ -304,12 +304,12 @@ ] } ], - "ID": "5bf1fe61-4770-4909-b21f-b710c30aada0" + "ID": "7ffe5688-098a-4d77-a8f3-05d3ef83d4fb" } ] } ], - "ID": "b62b0f12-fc4f-4b0d-8d30-fd33c7075fcb" + "ID": "63b82623-eb15-484f-bae6-b5d7a66500af" } ] }, @@ -338,7 +338,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "任务预算工时", - "GUID": "e283365a-ac2d-4c9e-90f5-92658dc5d899" + "GUID": "0eb570fc-b0ce-4140-be2e-a2151dd6f191" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -358,7 +358,7 @@ "BindingInfo": { "TableName": "项目动态", "ColumnName": "项目ID", - "GUID": "01da9d3d-946f-4118-8d88-5349a0502f34" + "GUID": "b30d67e3-974e-49c6-b555-58d77f4aead7" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -369,7 +369,7 @@ "BindingInfo": { "TableName": "项目动态", "ColumnName": "项目动态", - "GUID": "d7d7c0ba-fafc-4c3d-90b5-da4cd5d222f9" + "GUID": "8337d1ea-3d21-49bd-9e46-8e81777cafc2" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -380,7 +380,7 @@ "BindingInfo": { "TableName": "项目动态", "ColumnName": "执行人", - "GUID": "02e1aaae-adfd-4e74-936f-966d7d6bc110" + "GUID": "d13db88a-278c-4c08-a328-db04b1d4606b" }, "Value": "%CurrentUser%" } diff --git a/ServerCommands/系统/用户登录检查.json b/ServerCommands/系统/用户登录检查.json index 78f0807d..a84de91c 100644 --- a/ServerCommands/系统/用户登录检查.json +++ b/ServerCommands/系统/用户登录检查.json @@ -65,7 +65,7 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "e51f2af226874311858df813915873df" + "ID": "0611ce7a4e8746aa9d044a136e71f256" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -147,7 +147,7 @@ "ID": "3c94e6961f59412397003157b58e4f97" } ], - "ID": "21912be4-62a0-46b8-b84c-448434da87a7" + "ID": "f86996b1-c49b-44c0-9061-6da04d0cb2fe" } ] }, @@ -159,7 +159,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "b62e82d7-6e36-4f1f-b432-6229cc0dd370", + "GUID": "5d6049b7-e57a-44b2-8aa3-0f4d3dba9259", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "用户名", @@ -168,7 +168,7 @@ "ColumnName": "用户名" }, { - "GUID": "546b9c4a-898b-4d42-a3de-2390d9cc709c", + "GUID": "ae79ff7a-4e78-4948-8734-59de62ec815f", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "全名", @@ -177,7 +177,7 @@ "ColumnName": "全名" }, { - "GUID": "1970969e-41d5-4e6d-8fc5-be3536db0da1", + "GUID": "f39d5273-8cdd-4372-b769-32bf007963f9", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "邮件", @@ -186,7 +186,7 @@ "ColumnName": "邮件" }, { - "GUID": "12f304de-ba1a-4b5e-ae2c-2088a96bb5ba", + "GUID": "5e41c04a-276f-4d1a-bf28-a8beb710ed2e", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "有效", @@ -195,7 +195,7 @@ "ColumnName": "有效" }, { - "GUID": "9a863166-aecf-4aaf-abfa-ebd2c219284a", + "GUID": "090595ec-f730-43a0-b00d-50ea0379158f", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "角色", @@ -204,7 +204,7 @@ "ColumnName": "角色" }, { - "GUID": "2479ac84-3d5b-4b7b-b34d-233311150fcf", + "GUID": "196e8e5b-62e4-48bb-a832-ab91345549b6", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "组织上级", @@ -213,7 +213,7 @@ "ColumnName": "组织上级" }, { - "GUID": "62ace2dc-744f-4cdd-9c46-3a1dc26809eb", + "GUID": "85a59332-3723-4b7d-845b-7eb1399129b1", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "负荷", @@ -222,7 +222,7 @@ "ColumnName": "负荷" }, { - "GUID": "0cd1711a-6105-4d2e-b5de-c1331925c1dc", + "GUID": "00c98dd7-243c-41ba-82f0-212591951078", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "默认时薪", @@ -231,7 +231,7 @@ "ColumnName": "默认时薪" }, { - "GUID": "1c58aea8-eca2-4332-acd8-0a71b2c4a277", + "GUID": "e56b5e4b-c1fc-46c0-be0e-1ae7efd161fd", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "GIT用户名", @@ -240,7 +240,7 @@ "ColumnName": "GIT用户名" }, { - "GUID": "e1f01f85-08fa-443f-801c-a487f4505b27", + "GUID": "0855d12b-7a81-46af-bca9-7fa00414d299", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "GIT密码", @@ -249,7 +249,7 @@ "ColumnName": "GIT密码" }, { - "GUID": "3f0b4db0-0a1c-4162-bf89-a0024be49b45", + "GUID": "b41c8a44-cd6f-4a66-b23f-215221a534af", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "公司", @@ -258,7 +258,7 @@ "ColumnName": "公司" }, { - "GUID": "05958b31-0811-4760-b23e-586cfb3aeead", + "GUID": "017f041b-f125-419d-aa69-ca882eb1a344", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "部门", @@ -267,7 +267,7 @@ "ColumnName": "部门" }, { - "GUID": "0bf9fd6d-d02f-44b2-8e61-897ac0b5bd56", + "GUID": "90d2fb01-15ea-4545-9327-8e9ea0f1415f", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "小组", @@ -291,7 +291,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "c291000f9a804009b354317a2ea87ab3" + "ID": "044049dc6b7f4ee39323a8b040347378" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -384,10 +384,10 @@ } } ], - "ID": "5102488aabcf46ea8105f53b85315577" + "ID": "f63d01584dce4c369f1abcfe6c6a871a" } ], - "ID": "7b2a5d78-aaa8-4427-8f11-15a415027bde" + "ID": "93720d0e-27dc-4f63-886b-aab375f4fa4b" } ] }, @@ -484,7 +484,7 @@ "ID": "b10acf98d0c64d9b9ddd5048246d88d2" } ], - "ID": "86141a76-de99-431b-a02a-68841de0f619" + "ID": "50f81c54-2c07-4e74-9a5c-4a7dc26562ab" } ] }, diff --git a/ServerCommands/项目/同步项目参与人列表.json b/ServerCommands/项目/同步项目参与人列表.json index 5e2f1801..9611d9b1 100644 --- a/ServerCommands/项目/同步项目参与人列表.json +++ b/ServerCommands/项目/同步项目参与人列表.json @@ -4,23 +4,7 @@ "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" - ] - } - ] - } - }, + "$type": "Forguncy.SaveLoad.InvokeTriggerSaveData, ServerDesignerCommon", "Parameters": [ { "Name": "项目ID", diff --git a/Tables/任务/任务表.json b/Tables/任务/任务表.json index 24668028..83a932e4 100644 --- a/Tables/任务/任务表.json +++ b/Tables/任务/任务表.json @@ -22,6 +22,11 @@ "subColumnName": "任务ID", "relatedColumnName": "ID" }, + { + "subTableName": "任务评论表", + "subColumnName": "任务ID", + "relatedColumnName": "ID" + }, { "subTableName": "View_任务工时统计", "subColumnName": "任务ID", @@ -31,6 +36,16 @@ "subTableName": "任务工时表", "subColumnName": "任务ID", "relatedColumnName": "ID" + }, + { + "subTableName": "需求反馈登记表", + "subColumnName": "关联任务", + "relatedColumnName": "ID" + }, + { + "subTableName": "汇报子表", + "subColumnName": "关联任务", + "relatedColumnName": "ID" } ] }, @@ -54,7 +69,7 @@ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core", "config": { "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowBindingConfig, Forguncy.RbacPermission.Core", - "operationTypes": 5, + "operationTypes": 13, "dataFilter": { "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core", "userFieldName": "执行者", @@ -70,7 +85,7 @@ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core", "config": { "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowBindingConfig, Forguncy.RbacPermission.Core", - "operationTypes": 1, + "operationTypes": 13, "dataFilter": { "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core", "userFieldName": "执行者", @@ -139,7 +154,7 @@ "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core", "config": { "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowBindingConfig, Forguncy.RbacPermission.Core", - "operationTypes": 1, + "operationTypes": 13, "dataFilter": { "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core" } @@ -176,7 +191,10 @@ "关联资源": 5, "分组ID": 5, "前置任务": 5, + "功能名称": 5, + "功能描述": 5, "参与人": 5, + "参与人列表": 5, "参与人数": 5, "备注": 5, "层级": 5, @@ -186,29 +204,26 @@ "总实际工时": 5, "总计划工时": 5, "执行者": 5, + "收集反馈": 5, "最后报工日期": 5, "次序": 5, + "流程实例ID": 5, "父任务ID": 5, "版本": 5, "结束时间": 5, "进度": 5, "里程碑": 5, - "项目ID": 5, - "功能名称": 5, - "收集反馈": 5, - "功能描述": 5, - "参与人列表": 5, - "流程实例ID": 5 + "项目ID": 5 }, "subTableOperations": { "View_任务工时统计": 5, "任务工时表": 5, "任务成员表": 5, "任务表": 5, - "任务进展": 5, "任务评论表": 5, - "需求反馈登记表": 5, - "汇报子表": 5 + "任务进展": 5, + "汇报子表": 5, + "需求反馈登记表": 5 }, "dataFilter": { "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core" @@ -233,7 +248,10 @@ "关联资源": 5, "分组ID": 5, "前置任务": 5, + "功能名称": 5, + "功能描述": 5, "参与人": 5, + "参与人列表": 5, "参与人数": 5, "备注": 5, "层级": 5, @@ -243,29 +261,26 @@ "总实际工时": 5, "总计划工时": 5, "执行者": 5, + "收集反馈": 5, "最后报工日期": 5, "次序": 5, + "流程实例ID": 5, "父任务ID": 5, "版本": 5, "结束时间": 5, "进度": 5, "里程碑": 5, - "项目ID": 5, - "功能名称": 5, - "收集反馈": 5, - "功能描述": 5, - "参与人列表": 5, - "流程实例ID": 5 + "项目ID": 5 }, "subTableOperations": { "View_任务工时统计": 5, "任务工时表": 5, "任务成员表": 5, "任务表": 5, - "任务进展": 5, "任务评论表": 5, - "需求反馈登记表": 5, - "汇报子表": 5 + "任务进展": 5, + "汇报子表": 5, + "需求反馈登记表": 5 }, "dataFilter": { "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core" @@ -290,7 +305,10 @@ "关联资源": 5, "分组ID": 5, "前置任务": 5, + "功能名称": 5, + "功能描述": 5, "参与人": 5, + "参与人列表": 5, "参与人数": 5, "备注": 5, "层级": 5, @@ -300,29 +318,26 @@ "总实际工时": 5, "总计划工时": 5, "执行者": 5, + "收集反馈": 5, "最后报工日期": 5, "次序": 5, + "流程实例ID": 5, "父任务ID": 5, "版本": 5, "结束时间": 5, "进度": 5, "里程碑": 5, - "项目ID": 5, - "功能名称": 5, - "收集反馈": 5, - "功能描述": 5, - "参与人列表": 5, - "流程实例ID": 5 + "项目ID": 5 }, "subTableOperations": { "View_任务工时统计": 5, "任务工时表": 5, "任务成员表": 5, "任务表": 5, - "任务进展": 5, "任务评论表": 5, - "需求反馈登记表": 5, - "汇报子表": 5 + "任务进展": 5, + "汇报子表": 5, + "需求反馈登记表": 5 }, "dataFilter": { "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core" diff --git a/Tables/项目/View_项目统计信息.json b/Tables/项目/View_项目统计信息.json index c962e457..507ae235 100644 --- a/Tables/项目/View_项目统计信息.json +++ b/Tables/项目/View_项目统计信息.json @@ -177,7 +177,7 @@ "ConnectionId": "业务表", "SourceTableName": "View_项目统计信息", "SourceTableSchema": "dbo", - "CreateViewSql": "SELECT\r\n p.[ID] AS [项目ID],\r\n p.[项目名称] AS [项目标题],\r\n p.[项目预算工时],\r\n\t\tp.[项目预算费用],\r\n\t\tp.[项目状态],\r\n\t\tSUM(ISNULL(task.任务预算工时, 0)) AS [已分配任务工时],\r\n\t\tISNULL(SUM(t.计算提成), 0) AS [总成本],\r\n ISNULL(SUM(t.计划工时), 0) AS [总计划工时],\r\n\t\tISNULL(SUM(t.上报工时), 0) AS [总上报工时],\r\n ISNULL(SUM(t.实际工时), 0) AS [总实际工时],\r\n\t\tCOUNT(DISTINCT t.执行人) AS [项目成员数],\r\n\t\tCOUNT(t.ID) AS [总任务数量],\r\n\t\tSUM(CASE WHEN task.[任务状态] = 2 THEN 1 ELSE 0 END) AS [已完成任务数],\r\n\t\tSUM(CASE WHEN ISNULL(task.[任务状态], 0) < 2 THEN 1 ELSE 0 END) AS [未完成任务数]\r\n\r\nFROM [dbo].[项目表] p\r\nLEFT JOIN [View_任务工时统计] t ON p.ID = t.[项目ID]\r\nLEFT JOIN [任务表] task ON p.ID = task.[项目ID]\r\nGROUP BY \r\np.[ID],\r\np.[项目名称],\r\np.[项目预算工时],\r\np.[项目预算费用],\r\np.[项目状态];", + "CreateViewSql": "SELECT\r\n p.[ID] AS [项目ID],\r\n p.[项目名称] AS [项目标题],\r\n p.[项目预算工时],\r\n\t\tp.[项目预算费用],\r\n\t\tp.[项目状态],\r\n\t\tSUM(ISNULL(task.任务预算工时, 0)) AS [已分配任务工时],\r\n\t\tISNULL(SUM(t.计算提成), 0) AS [总成本],\r\n ISNULL(SUM(t.计划工时), 0) AS [总计划工时],\r\n\t\tISNULL(SUM(t.上报工时), 0) AS [总上报工时],\r\n ISNULL(SUM(t.实际工时), 0) AS [总实际工时],\r\n\t\tCOUNT(DISTINCT t.执行人) AS [项目成员数],\r\n\t\tCOUNT(t.ID) AS [总任务数量],\r\n\t\tSUM(CASE WHEN task.[任务状态] = 2 THEN 1 ELSE 0 END) AS [已完成任务数],\r\n\t\tSUM(CASE WHEN ISNULL(task.[任务状态], 0) < 2 THEN 1 ELSE 0 END) AS [未完成任务数]\r\n\r\nFROM [dbo].[项目表] p\r\nLEFT JOIN [View_任务工时统计] t ON p.ID = t.[项目ID]\r\nLEFT JOIN [任务表] task ON p.ID = task.[项目ID] AND [任务状态]>1\r\nGROUP BY \r\np.[ID],\r\np.[项目名称],\r\np.[项目预算工时],\r\np.[项目预算费用],\r\np.[项目状态]", "ViewInfo": { "ViewName": "View_项目统计信息", "IsUpdatable": true, diff --git a/Tables/项目/项目表.json b/Tables/项目/项目表.json index 120a2cac..c3e95265 100644 --- a/Tables/项目/项目表.json +++ b/Tables/项目/项目表.json @@ -1,5 +1,6 @@ { "Name": "项目表", + "ShowBuiltInFields": true, "PermissionData": { "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionData, Forguncy.RbacPermission.Core", "permissionResource": {