diff --git a/.collaboration b/.collaboration index 49ff42c4..c4f17568 100644 --- a/.collaboration +++ b/.collaboration @@ -28,16 +28,7 @@ }, { "ModuleName": "Table/项目表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-05T12:04:12.9388948+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目\\项目表.json" - ] + "ModuleType": 7 }, { "ModuleName": "TableView/View_项目统计信息", @@ -494,21 +485,7 @@ }, { "ModuleName": "PCPage/项目列表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-05T11:55:55.8596618+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目列表.json", - "Pages\\项目\\项目列表.rd", - "Pages\\8ee6eff0b74d43ef8e54cd3ef782f76.json", - "Pages\\8ee6eff0b74d43ef8e54cd3ef782f76.rd", - "Pages\\b90932e038f94707b54e571ff7cd84d.json", - "Pages\\b90932e038f94707b54e571ff7cd84d.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目成员详情", @@ -524,31 +501,11 @@ }, { "ModuleName": "PCPage/项目首页", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-05T12:01:36.5987442+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页.json", - "Pages\\项目\\项目首页\\项目首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目标题", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-05T11:59:22.2648872+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目标题.json", - "Pages\\项目\\项目首页\\项目标题.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/项目/项目首页/项目首页-容器页面", @@ -560,19 +517,7 @@ }, { "ModuleName": "PCPage/任务列表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-05T12:36:01.4461672+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.rd", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.json", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目工时", @@ -612,31 +557,11 @@ }, { "ModuleName": "PCPage/项目信息", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-05T11:56:18.6504546+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目配置\\项目信息.json", - "Pages\\项目\\项目首页\\项目配置\\项目信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目岗位配置", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-05T12:51:41.256673+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目配置\\项目岗位配置.json", - "Pages\\项目\\项目首页\\项目配置\\项目岗位配置.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目配置首页", @@ -712,19 +637,7 @@ }, { "ModuleName": "PCPage/任务-工时", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-05T12:34:56.2238663+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-工时.json", - "Pages\\任务\\任务-工时.rd", - "Pages\\94f8bae36aee4ae7aec2a063ca731b1.json", - "Pages\\94f8bae36aee4ae7aec2a063ca731b1.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-进展", @@ -748,17 +661,7 @@ }, { "ModuleName": "PCPage/参与成员管理", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-05T13:01:32.4988254+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\参与成员管理.json", - "Pages\\任务\\参与成员管理.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务成员详情", @@ -798,17 +701,7 @@ }, { "ModuleName": "PCPage/项目菜单", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-05T12:06:40.1219351+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\共用\\项目菜单.json", - "Pages\\共用\\项目菜单.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/编辑删除页面", @@ -876,17 +769,7 @@ }, { "ModuleName": "PCPage/人员工时统计", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-05T11:49:15.2588104+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\工时\\人员工时统计.json", - "Pages\\工时\\人员工时统计.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/个人中心", @@ -934,17 +817,7 @@ }, { "ModuleName": "PCPage/收益中心-收益明细", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-05T11:50:27.8159759+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\收益\\收益中心-收益明细.json", - "Pages\\收益\\收益中心-收益明细.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/提交结算申请单", @@ -1064,16 +937,7 @@ }, { "ModuleName": "ServerCommand/新增或修改项目", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-05T12:41:14.44981+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\项目\\新增或修改项目.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/移除项目成员", @@ -1137,16 +1001,7 @@ }, { "ModuleName": "ShareCommandContainer/跳转当前项目", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-05T12:28:30.8762512+08:00", - "ModuleType": 36, - "ToRemoveFiles": [ - "ShareCommandContainers\\跳转当前项目.json" - ] + "ModuleType": 36 }, { "ModuleName": "RdlReport/工时报表", @@ -1526,35 +1381,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-05T13:02:36.6461006+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\Echarts图表-10_0_1_0.zip", - "Plugin\\Editormd-6_0_102_0.zip", - "Plugin\\Forguncy.CustomMenu.zip", - "Plugin\\Forguncy.PassListviewDataCommand.zip", - "Plugin\\JSON数据源-10_0_1_0.zip", - "Plugin\\Notiflix-9_0_103_0(1).zip", - "Plugin\\PC组件包-ElementPlus-10_0_1_0.zip", - "Plugin\\SqlServerWrapper.zip", - "Plugin\\Tiny富文本编辑器-10_0_1_0.zip", - "Plugin\\加载动画-10_0_1_0.zip", - "Plugin\\增强关闭页面-9_0_6.zip", - "Plugin\\复制到剪贴板-7_0_3_0.zip", - "Plugin\\客户端缓存操作工具库-8_0_0_0.zip", - "Plugin\\富文本编辑器-10_0_1_0.zip", - "Plugin\\对象与集合操作工具-8_0_0_0(1).zip", - "Plugin\\支持预览的附件上传-10_0_1_0.zip", - "Plugin\\甘特图-10_0_1_0.zip", - "Plugin\\用户管理命令 V2-10_0_1_0.zip", - "Plugin\\设置当前行命令-10_0_1_0.zip", - "Plugin\\设置焦点命令-10_0_1_0.zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", @@ -1582,12 +1409,6 @@ }, { "ModuleName": "ServerCommand/删除项目岗位", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-05T12:50:27.6008058+08:00", "ModuleType": 15 } ] \ No newline at end of file diff --git a/Pages/94f8bae36aee4ae7aec2a063ca731b1.json b/Pages/94f8bae36aee4ae7aec2a063ca731b1.json index 4cd65fab..3fd65d06 100644 --- a/Pages/94f8bae36aee4ae7aec2a063ca731b1.json +++ b/Pages/94f8bae36aee4ae7aec2a063ca731b1.json @@ -145,7 +145,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "06eb9e3a-4f93-48f8-b44d-a962068fd873" + "ID": "54aca865-54c8-4723-be0e-3fbf7a86425d" }, { "CommandList": [ @@ -157,12 +157,12 @@ "ConfirmText": "您确定要删除吗?" } ], - "ID": "490f3673-ca6d-4838-a14d-608f02536a17" + "ID": "9dedeaa3-a614-4318-a4aa-bb63dcdb5bf3" } ] } ], - "ID": "bf83b8b7-7b53-49ed-9797-315b16efb1f5" + "ID": "eb948567-c8ce-4ea9-9260-01b7ae4af2ce" } ] } @@ -230,4 +230,4 @@ "PaperSize": {}, "Margin": {} } -}//TOsn/haRm31h8/3XjVcS4fcMcrGHd8Sf8guH6+QAzGTQSwmbjLJcZEos7CnQ3ONZBfXG+Iv3kKjyzdT+9IfSKimgx/2StVvkVsi9tyVL6cEvK6/W5QEgODrJmGKWFEK9TXgeJABT5gOo6tcZCnn6YpFI2C3VNSIX5MVt/FKA/psjTsVlVjHzvNBWpeOi0BsmrdltiNlHl3Jiin7xDWCH/1NiKYn/kaT0mq4rd1FEHjQUNg09CTq1Ts0wECBjJGOBNHGHT+pO6wdS2e6gfDa5ZM6BcYBIwiIUa1RBsGNfYHtPxvMmMXMIB6DBdkTjSF04zdRUykcxAXsqVk+KLMg/TwRDIVQRGiX+AoBxEum5y8a3DKZ2n8FVGBAI2b0EG+tYRLkMpL7kesNBp1nOeKZujGztiMsIJdM8R0LGP3wwCyQrmKblRM0alpu7BTZWIqgKNiisIv/5OERU2gh27Y2x2UzVulBcOJPBFZRq/MSE4QimiEUcO9WMaTXYCxSgwhNjHDOrsDWbljATzhvLc0KIJOcA/rit5zIlkTM/vIQ82kGOwVJ6al6lMiHOthnF4TCstY5LX3MduRb1Ayhn9n+B7WpLT0RvN0rQNBM+QCMpS2MCaC+RpK8/FkbUcNM0NMB46J/kISlXJnu4qWhS8zEq5t3n0OiUA7nBXsUSB+sFlrQJiiCNrNuMjg/FwIEHYA3PTORcitDKEQJHoTsGFvsSP4j0n2wtXALo1nsRNX9TzGWK7E+tQbJo/9YxctaD7IZLqwaxFn6S+tI0GQlqZ7t2K5wGV76EoSGPS4vMYTjELPF7RuCJQG+ea2zCb5jm0fJET+GuvpoC7cyHnFU7T1ud8+QgSUdrwxUFrM6Y81C7oPaadWuFXaZUfhTSx2frB9jTDiLBkL+16jUL3NiCcHQycA==|920 \ No newline at end of file +}//P4LKDj8TkCAhC8LZb6Kqo6dELMo+8BpxVk78+9Aor4uqZLF4i4XBF6DoQpEXsO9rqg5sq3OKjS0gjb4XT/NGMocgZUKfCEIk/R6Rx9cWiVd0qBGyFkeovYoZwp3UI3j8LkkNgZE+8pu9C2Zf3b1aHIu2MKOg3V4r+q7j+SKeyQT6qxyxO7Z7yJeRzjcibElBcCD5eeIvThrX2kGyfqJkCTPWdpeg0LxYkf6GQLAKtaZjB9x81rUBVrgPl1d/Ui0Mp/ld6CO/VuAA6Bz192Em8wdfvgqpCmAmXx2S4Te2v5SmPwljMVc2xZLwu1gjGeMmFIh4w6gXmKy1N7VvR2Uzh3zYBX0fRp32LvmrkjPpYVk3UVFuGenpOGsOi+7TpEgjJyNszfGkyz6jK2H8Kq+bvSfABetPyJpGwI57U2mWReCqIBvHU+eqhe31IXHJMKSC7NmE5r762PeEqct417z/i43gMKgzY3PNLzVHmP+sX9sDOPqB9wL49fFKsb7LkXGD1hSTh8SO7SC8thjwn5qzr4Gclii9F54cWJypcQ/AMlmRnPBtNU9J2aQGlzf6WScY7JZVhi9Fr4wN/gkAXldaCd2PAtfb5IsQndsJ/YS+tE2F+cN6xUtFTF+Pb255Eo6OOl0Btd/V9xgadtaru58hLzBktk/+PxM3+lcdMCndOzwUfceBIGrXqyAPHLrVbHD5Tljuah/a4kN2BqZm2HubfRRonVFaJU/Gm0rleCoqcX72dZUz8OGjw3AauyGQe32hfFfIpN74ojbmu+Zqn2NlGmH5W4Oo/lxv/0WHhlh24ztuoJ16VAppFry5nNM2BX4K2zPBT3CCJRuVwKq7AQCJPwpzEO38u/W/a1thFsS2Lx0zfKXZTWeOjAqbVMuIbQ8GLf5O23yHT9cqN+ofT0Qfdg==|920 \ No newline at end of file diff --git a/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json b/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json index e41ec140..5254b89e 100644 --- a/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json +++ b/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json @@ -196,12 +196,12 @@ ] } ], - "ID": "22ee5683-c4d9-463e-bb86-69bb451ec5aa" + "ID": "6743295b-ca52-41a9-9088-8dd8d8366556" } ] } ], - "ID": "496e96f3-a100-4367-bf2f-8989e60f9f09" + "ID": "70bfcdda-4c74-4429-8279-402fe201546c" }, { "Condition": { @@ -231,7 +231,7 @@ "Message": "复制成功" } ], - "ID": "d1fe7ed3-32c7-4af1-b2d6-b823c007d5d5" + "ID": "720e625b-6bbc-4c07-95da-8858235d16fa" }, { "Condition": { @@ -308,7 +308,7 @@ "Message": "操作成功" } ], - "ID": "e6f02f20-ca47-44b1-9471-931b31753645" + "ID": "d4405962-59d8-459c-9d3d-93fe62d0e1d5" }, { "CommandList": [ @@ -323,17 +323,17 @@ "BtnText": "知道了" } ], - "ID": "5f0a78e1-63a5-4759-8680-e68a39cfed6d" + "ID": "c92cf3e7-2e07-4a43-afa9-70ca482c036f" } ] } ], - "ID": "b8b40a74-d273-4266-8e35-444f472062b7" + "ID": "e829f3ed-7083-4bf9-8879-0fe4524c27ce" } ] } ], - "ID": "06c2af4e-bfc8-4b9c-9b38-5822ba53ea59" + "ID": "24ad90f4-454a-4665-984e-dcb7041edf45" } ] } @@ -410,4 +410,4 @@ "Size": "24,24" } ] -}//5mFads94NGX0n7C8QLvSFlZg9Y+3tjB317+6W2EwT/dUlEiy9ZjABlR3FQh5NIExm/E8XMJ0yAQytp0V+RtYr6pfv9vfh6I+z7uOP5FxrJy5DS9iMKlzRsHBrHNCXfcUNFM+1D2FYQtH2XtcVu1DFCbi1RXL7WLUFRrET8McDJPb3Pgp29T0McSoCyFJMIDrfgD2mB9hjd0b0oU25zCrEhKQb42ZWC84naZqsRo53/D/YWigof5rt+senmNWmk9z5iRUBR8g724BFIi7/prKogZ9B0p4B1IkifY737wISk3mHEE99xK0j3J6GGqf5laGprvcKKi8Xv8tsK6sQUV9h8i1K/RRUr279s2QbfFYd4+yEYsuqHjzaoGfLZN/OgtNJrE3nImZNLfYha7Zv2K8dcOhLl0DUHlGHsweWf6nh/67ZsSz5lInOn9/t3weEVAaQ2OIYfgV8Rcptl1SKOgffw6U4hmR0FQenBWNRSrTnQpQwuvlx1gxUXLpu6/5FoRfCx8dueBhO8Bqc/+6q33ntto8JIQHzHgI3Wf/zeyo7/MkD2to2eX11N49yFHc9qku0r5J/JLI9J8oq2mS2qyYv5tPOq7pOX6xSydl7053U3FTuj1QWssJ5/f1Evc/+fegKdUCdbMOQQaYN0eV/hW8bZa5ytp33FXV81dtSTl8dgSDciyPoLtJUbtdKq3flIAhqqut+kH0Oft3+Bk94AQ5OVYC8gGKWgO1HsQc07hpkBB4Yq699l4C0kylepkhPGRtMgxbXb0XLXvcFj0z7tT4OwbHgeqr2sPo90i2jw1Q6REWhMRqH5OXfmfshaoT4G7li7vPXo1F3fbfsAqtDH+tF3Rm179wcro4FT2eh0XCDpOiRKEk3mZith11E0jC/P2Vb6E/ShRMdTKxJW5lJkqByw==|920 \ No newline at end of file +}//9eICao+xunffPQOep0jT7YZLw/Mw2R6PtqL1BjSX/GRo0m15mftLi8Jikb7ihhc7v9SfKK49k38DOOsBNOWU+buaHU6jsMClD2Lvulqa0LGnhVPHyWWAsFSKF01S+iO0x/gvprDCpTiog+aZwon4EWO3BfcQU/TD6k3Haxza2P7TKlN9egH3wMRBgIafyVrLW6//P8JpkCnHRt8Oe209WLtU+3nXC9ePPMz2/ZHnf4xtWtlX31NEBlujS/L4gQoeFJ70NRuwEElThDNCx52/NrCA5Z1qYjQgplI6uQOh8HrlooO2WbutB1p0Yhs4OXjmpBAl1JUDTCKnbCjxs+ihobjVnfxFsztUELlIu6JMtWO29wrXtzoXYVwli4xD+HdbM3FM4gIOujEd3XVCoUSWyY0U5an7vXllbAlz1bcGyvEwG82SU2aBUfJHHsaRE56Il1C0qa0qxWo+1xTo2B/qwpJqM2JPqUMzjly5wW92TWyqO2Z+z7WQzZvq3U4BAakPYFRU0cNmQyHI69CA1CAUjGoPCPl5WB5Ey9eCCYulMk88JLt1nM+rqS4bh4rJJITswL+jqKESEnDq066RoGYtJN+zoFhULK19hdQ2mzQfYLYJ3YbsMJ+qO8/d6oRAQVBYBNRDrq7KGCWEfQyDi9yBkTCWhrBOqbOx/91iCE/iionG5FijkkqiboBAlHOymBemb3+zEvYoG0ibBHNsM6Y7UNFkNU36muh7dCHAdh+nqrIwUfno+RZBHcxW8w6JZ0pM3ZaneyXZ9U5VSVDoKvO3xhrMhiiSQadlGZMeXGS4j55XNFIwVp1q11EQtXCe0EZrjQggdSDQasv/Ge2DrnFczAXTv2/mhSUtNrTiCfqLgfP1WgXE7lmFQvdV/Pb2TwLgDP25fyDRutVi4bId3sTL1Q==|920 \ No newline at end of file diff --git a/Pages/任务/任务-工时.json b/Pages/任务/任务-工时.json index c201128a..4ce1003e 100644 --- a/Pages/任务/任务-工时.json +++ b/Pages/任务/任务-工时.json @@ -284,9 +284,76 @@ "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", "CommandList": [ { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PageName": "工时详情", - "LoadBindingDataOption": 1 + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务表", + "ColumnName": "参与人数", + "GUID": "7f270bce-2f3b-4c1a-bf68-176fa4240638" + } + }, + "value": "0", + "compareType": 2 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "工时详情", + "LoadBindingDataOption": 1 + } + ], + "ID": "f8a78c51-836f-402e-80bd-22e164df3134" + }, + { + "CommandList": [ + { + "$type": "ElementUI.Commands.ShowMessageBox, ElementUI", + "Title": "提示", + "Message": "该任务尚未添加成员,是否立即添加?", + "Type": "warning", + "ConfirmButtonText": "确定", + "ShowCancelButton": true, + "CancelButtonText": "取消", + "ShowClose": false, + "DialogResult": "按钮结果", + "AdvancedSettings": {} + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='任务-工时'!按钮结果" + } + ] + }, + "value": "confirm" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "参与成员管理", + "LoadBindingDataOption": 1 + } + ], + "ID": "6bd2e166-6132-4eec-9818-188e4a2f7c34" + } + ] + } + ], + "ID": "f2eaf479-d494-43b4-9736-b18a74a0001e" + } + ] } ], "ClickMode": 1, @@ -321,17 +388,51 @@ "LoadBindingDataOption": 1 } ], - "ID": "651bb733-0a91-428d-bc28-e8c51ec20dbc" + "ID": "ad37166c-46f5-46ba-8aec-4f88e8afe693" }, { "CommandList": [ { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "FourStandardStyle": "warning", - "Message": "请添加参与人后进行操作" + "$type": "ElementUI.Commands.ShowMessageBox, ElementUI", + "Title": "提示", + "Message": "该任务尚未添加成员,是否立即添加?", + "Type": "warning", + "ConfirmButtonText": "确定", + "ShowCancelButton": true, + "CancelButtonText": "取消", + "ShowClose": false, + "DialogResult": "按钮结果", + "AdvancedSettings": {} + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=按钮结果" + } + ] + }, + "value": "confirm" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "参与成员管理", + "LoadBindingDataOption": 1 + } + ], + "ID": "e4013d7e-b88b-4482-a3fc-f3bfbb6fa33f" + } + ] } ], - "ID": "f74c9d36-31db-43f7-b4b1-7b934bc5c787" + "ID": "06d1f205-be7c-4891-874c-9b62ab9566eb" } ] } @@ -361,9 +462,76 @@ "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", "CommandList": [ { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PageName": "工时详情", - "LoadBindingDataOption": 1 + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务表", + "ColumnName": "参与人数", + "GUID": "7f270bce-2f3b-4c1a-bf68-176fa4240638" + } + }, + "value": "0", + "compareType": 2 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "工时详情", + "LoadBindingDataOption": 1 + } + ], + "ID": "7eff0387-78c9-4348-ba43-ab00a515bed6" + }, + { + "CommandList": [ + { + "$type": "ElementUI.Commands.ShowMessageBox, ElementUI", + "Title": "提示", + "Message": "该任务尚未添加成员,是否立即添加?", + "Type": "warning", + "ConfirmButtonText": "确定", + "ShowCancelButton": true, + "CancelButtonText": "取消", + "ShowClose": false, + "DialogResult": "按钮结果", + "AdvancedSettings": {} + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='任务-工时'!按钮结果" + } + ] + }, + "value": "confirm" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "参与成员管理", + "LoadBindingDataOption": 1 + } + ], + "ID": "011742ed-b9f0-4a17-b38b-84987cd5ea6b" + } + ] + } + ], + "ID": "bcf125b7-f937-4f6e-99e2-47dca9112eb5" + } + ] } ], "ClickMode": 1, @@ -406,17 +574,51 @@ "LoadBindingDataOption": 1 } ], - "ID": "7bb2f23f-9c5a-46dc-8bb4-96e566e664f8" + "ID": "f0ec4d4e-7b17-4540-936f-8920f1137452" }, { "CommandList": [ { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "FourStandardStyle": "warning", - "Message": "请添加参与人后进行操作" + "$type": "ElementUI.Commands.ShowMessageBox, ElementUI", + "Title": "提示", + "Message": "该任务尚未添加成员,是否立即添加?", + "Type": "warning", + "ConfirmButtonText": "确定", + "ShowCancelButton": true, + "CancelButtonText": "取消", + "ShowClose": false, + "DialogResult": "按钮结果", + "AdvancedSettings": {} + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='任务-工时'!按钮结果" + } + ] + }, + "value": "confirm" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "参与成员管理", + "LoadBindingDataOption": 1 + } + ], + "ID": "e348772c-fb72-48aa-8154-3a501b5a7636" + } + ] } ], - "ID": "47baf1ef-15b5-4d5a-98dd-a957087ecab6" + "ID": "e8ee92da-f051-49ee-9bd9-cfe0d2a88e98" } ] } @@ -649,7 +851,7 @@ ] } ], - "ID": "bd720028-d4f0-43ba-bed9-43b3f38e7eb0" + "ID": "f288cf5e-2ff5-4344-a697-a6c45ced54bb" }, { "CommandList": [ @@ -679,7 +881,7 @@ ] } ], - "ID": "ff7c2114-1391-4a12-920d-ac840c804050" + "ID": "68264236-0da5-4bd7-a4d1-c388d5f3980f" } ] } @@ -950,4 +1152,4 @@ "Formula": "'任务-工时'!$AB$12" } ] -}//EMwDodNYMAZH3dVCUbCZ6gGMCqzv3EXIfubN4J2O4xPdwYzM+yrvhysKbZWrqZ9AYH4FbIHEjC001TeHFi/kEzqSbyt/Jet5oJrVnERJsULqTpxEKu1rO37s+d+Yad8l6sX7h8abmuYHS1Mr5H7A0AsU3HUSWdM5YbKa5eeMR3epAqKvaqxKP8N8fw4U4QFWUyMtdgQScAXjNoesGQ7JElz1Gq4tjMGiPsdkYAy1MVRsvga2ZGCslO2KTsYgoit8qlLvKg/CnDD+CJg5Hc6AHRF0ullokp+HPznPTzkzvNroV+XmoNNRao7rFDzUUYR7ctq25ysPNr2Soubt4/qXLPltQzQX3RBhQOBTzpqZ9UbRDPZ7ct2yT49IX+X2w9Wxrur5j3p0UIljaPmorRg87bIKZSyLMcYQjtwaIYrd1P5Y2WrDu48JKpGvF0soAtBs49llSvJTo3DkcPhAdtu9dv1odKdviER+r1gHDapRvlb339Zf9CxBGL2mbZIshQ5YqIrzXkkkkdxep1asm0Gt2Yvva+wT+jmY1TQeYs1USELkvFOSyw9klQAq1onDNuVWctuVMILO3gV6wKARmemv/cWnTvS5yKaDicg/JUNSWyDab83baxDgOq8x/b8aUB8DY6Krx+h9YHDa3DyZGXCdymOOIMYmuyOcDgTZNOA9MjzHdl4DvdqJO+7GTfzPi/sAPYfuL5IkMNQkUaBwDT/fpuG3SUKu/sifjzi6WkFHOww/i+lCEivKIwXWr0rAng6VojZsiOWCV3+Igaa3QJU8PIp899rxTJ6TZStW/0cCu/WxUDcUuMCOx+jGNnlsDT6mepDdq74pXzA1gUwm1jFGX5N4bnk7ixeh9I70EPUqUZBATizIKbvSvnJefilfa0lZoaKIxdDL3KSzQBGriGHLrA==|920 \ No newline at end of file +}//aX9e2MvHTXGW42u02Z7RgBikESD3gmg6ZolN0nnw/xht53aGQ6Ou9OC5FYi1I0VSHejFBuytgroju9KmTzn4Fn2IfEqBY9+6yER701tmb35d2FGdsbvfS4XPf6j5jnTwe/G4vjZxKIsGFfR66/F8z5pwxKmI+ywCq5t6f3pPgWoyF150L8aF0NsNHfrg8pr7dr2HV6fra/aK15OW8dRD+pblzT46Ja5Zj3wRPYtABd8GbL4I1wJzj+dq/Ngn+0fO8euQYUNxLXonz38AqM8XqQEdVGUG2t5zD5E/5iPelNkAU0QPL2cXK5rRhrEoL15Am7CEMeJdnB/AsmqCxS3tDK85iGdMuKL3AEfS4xiH3gJCldhE3PsNKWSDLxIJIHdnHuBDTIovF28k4tFezRYuyUp0jV9OyL/fEQYUNcGiEdy8HKBBvQgwV8jnRHd9Lu9NcKamapoTf8uAFt2AueA7lVK+D1cAOnmitVXLf/nR8PHpk1ZKzdZnVSg2FF0NAYBPGxWNo+N9tOUBexsozix9WYKlcVQg+GrnzaxMYJVYhvlkDm6AjxxjGPMZu+N0FXfivBqqUzMDJ2dIw6nD5920LrRsev8D/IaclSsuwJu/tbAVIfeYAWumOR0O5ZEysjzI1Pu7Fpw3qPJR8/hU8wQzsIUbHVxTb0WCWOzNeMFq+HNnVEPArbvf0RtsGvUcDJo/8g5JPy2zQMitmZHbN++GC5EPjSdDHT/3+zCODWDO65WkIsw24sMpCmUWuaJPyZeSs3CxZACwhRZrWsJcRsOUyAks2OryM5TXu654k3fNxu8iNVKfwdCIPcFWJQ0cpLRB2QDnHJBpYYTP5w0XGBSqar7FNINjO3ClWrWKxF7NIJpgvGUhCaSjFGN9lRL6UJ+/sfPhOOem5NjMF8EBkMWyeQ==|920 \ No newline at end of file diff --git a/Pages/任务/参与成员管理.json b/Pages/任务/参与成员管理.json index 88704f3b..6ed4006b 100644 --- a/Pages/任务/参与成员管理.json +++ b/Pages/任务/参与成员管理.json @@ -286,7 +286,7 @@ ] } ], - "ID": "6a54dc8c-b0d0-4526-a0ae-f3dfd5d3101e" + "ID": "1fcbc27e-c54b-4ac3-9136-595690d5e581" }, { "CommandList": [ @@ -298,7 +298,7 @@ "BtnText": "知道了" } ], - "ID": "d45ec786-b1b3-458b-abe4-5512dabeb181" + "ID": "3de3db54-1aca-4d50-bc8e-6ec8bb946305" } ] }, @@ -378,16 +378,34 @@ } ], "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目成员表", - "ColumnName": "项目ID", - "GUID": "323485a8-fcad-41fc-b82e-d128279a0cc9" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=参与成员管理!项目ID" - } + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目ID", + "GUID": "323485a8-fcad-41fc-b82e-d128279a0cc9" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=参与成员管理!项目ID" + } + }, + { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 9, + "ColumnBindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "2eabcabc-e698-42d7-aeff-db576012da6f" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=参与成员管理!B10" + } + } + ] }, "CustomColumns": [] }, @@ -438,7 +456,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "参与人", - "GUID": "638e0456-7356-49e7-9385-8ad1f5976da6" + "GUID": "01ae69b6-e8d9-43dc-bc1d-810923d025bb" }, "CellType": { "$type": "Forguncy.DropDownListCellType, ServerDesignerCommon", @@ -465,7 +483,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "岗位ID", - "GUID": "e5becdb3-f5bc-4056-b5e5-0efa84a95147" + "GUID": "96634184-b121-4958-ae2b-256ffcff14fe" }, "CellType": { "$type": "Forguncy.DropDownListCellType, ServerDesignerCommon", @@ -674,12 +692,12 @@ "UpdateRowType": 3 } ], - "ID": "7f54fdab-65da-47f0-8f12-2cc07832e7cd" + "ID": "a6d6c300-25e5-448b-be20-2d6c0bc0b36f" } ] } ], - "ID": "fc92a3ec-00b5-401a-a4e4-342904b48266" + "ID": "eb160186-9d0a-4859-b76d-4272a1511840" } ] } @@ -716,6 +734,10 @@ "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "Title": "提交中" + }, { "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", "ServerCommandName": "更新任务参与人", @@ -761,6 +783,11 @@ "RefreshAfterFinish": true, "CheckDataValidation": false }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "提交中" + }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -784,9 +811,13 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=参与成员管理!msg" } + }, + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ReloadData": true } ], - "ID": "04425f15-73a9-4a07-ae78-f06a4b449680" + "ID": "5c9d1beb-a191-4c37-beb7-9083dd9d04df" }, { "CommandList": [ @@ -801,7 +832,7 @@ "BtnText": "知道了" } ], - "ID": "464b8080-f6fc-4196-ac04-90ebfaacbc38" + "ID": "792a3863-fe3d-4f63-b88d-1a5cad954c64" } ] } @@ -943,4 +974,4 @@ "Formula": "参与成员管理!$J$10" } ] -}//PNr2j19h0RQlB5HG1mAjQa2kLHyy9Dm+Zq4WVoJWHO260MP3hwsKPPx0Un3uHKdoNlHJuZ4d3GyWEcAWBeKxgU3G6BVWxpMBHVgKH6oOCJlB60vwR4udRRG4SjO5V8F6uoXTOx9zO669NKfBRKyZoFJFlx+0cFqO/WZbS0yjA/jZD9bpd35QAtKGzbRzZBEKd+Cb0O88q5pzmdldPn788ePIs+9ZnqEqgMPw0/xF9ToczC3eaNUHuf8VE2GcnVkO3cwd2RDk6vvrXo+I8i/PBzfS333SWQ+Tx7bbRSSOilM05eGpndXcAplMxqCqLiH10DhNhHRUgcaf8WJIBMYsZnM1/X5VbYNMhn5HkurEtcX9rU5dR0m0feZNt21LjSDivnnpTB246ZC6YO4184gj3GnffS4vb8CEUnifSLCLX4eAdBh6m3vAvk+YBkCsgpF7+6hi/esa2lb13abawL5iOWliE93ihesZ4yeZgseIzBmisaCmgYy/D+AG1sddWcEtMyR1NUqq8OiExp/bNm7HyGZ9mkUdAfjJPKL6Kbi8CeN+yYRmjHSK8i7zRzbEPIWT6GFgPil866LELcKyn8J3J622b7H+UVhbO6goA0+2B8gPPot6a/AWCvRmNQCap2CH6GqOoajl1RtFtq7mqW+KcdOYnq4+L6exPToyA4XpPmAIvpTc578breBfVh2RxTbwYLivGvHvmbMytQHRK4Ey+hOZsNLt2hM9M+sNtLXseGB1fKZ2opxdOTb+0zg0+h16U+pnRcf+Eunau3+JE0JSgI0daY/vKDtDNnOGysU1+rBY+xbC1oxvDNwXxcvDzLGkqnjGvUxDl15zQ31f2S1EWvSuobPPvlC/9YSw/gJBFrDB+l8VefrV/I29BzBIGbEokiQbgh0V57QJsSO2Z0HnAw==|920 \ No newline at end of file +}//owNQyRi0MeesZzmdL/GtiO/4LJghQvOkLl9Fkq6T6U8qIhXEKFGAA2YqJS8+DyXJbkZR/wIoarGXWwx69yw6gpw7fdE65xOi2yTPv6wBtinrGTy7N+tSnWqm8HS0viude9XbikCahsqrjtdP9/IeqzckC6k2NwSy7O95H/G7+5WYXQExfgF9brSEInOq3FD2j+0fJzzeL7zutS+DjInvbPcPfNNhq96FatghqLN6y1o38rqf35K9G4ejC7QHzd0vqgE54i9TkRe9y/c7hWc0kcNkGgtjzVnjth9xekQJ6qaAtYosLDtHQ9gg0VMF9n8CmAbu9Ge0ai+tD0Ki+DKkJ8cEoWoelAAk4x2qzlJOBQdAutP6WCMgJHITGj2u1gU9S6FTPRhYN14rc1uXGKBqVhRw4hl9r+CogedYp+5/gW+UzcDCpm93DxTZqs2bqhDtq3t/exwoygfMgZi4vQUMg0cVXKXDlzitYFgqgEDHYU1BKKvu8CpWihvPzclF3qf1bYmuQ2fJRAFuUP1pqAm90vyjlA215VnacQSNa6khWgqg7a3hx/55iJzYfxjEAuVhegZZaGHD+seD84rJPyPdB5iTWsh9SeWD+DOkE45IbnnYT6EqwkJcBG5ggC0OSRHu31aUPSV+/3e4jRR+GjkXv4/SAWGbFXxQpcSYqQVVro1f6O6ZhbxX5fnjqlOOKWL1+Fr19sCaXR3p28gTfnrhY5sNQz7prHoKHPMdgW1UwuToqnGEfUQc1nuReoFSZ9AD3J3zN8WyrFKpk7SQPAV/oOjnfThRhjI3eg1kJizWnD2qv0hOmVNtNzg22FnUAQ1GxKm8h/AhvjPRL3jvFQ0ZvcUKgC3w75SOXwcHIXxO+qnmCTu4b/n2NdGsnhuvjjjKWwAbxZhmvHUGVU1UD5cdQg==|920 \ No newline at end of file diff --git a/Pages/共用/项目菜单.json b/Pages/共用/项目菜单.json index 44c9107d..07e10cce 100644 --- a/Pages/共用/项目菜单.json +++ b/Pages/共用/项目菜单.json @@ -416,6 +416,10 @@ { "Name": "点击按钮", "Formula": "项目菜单!$B$12" + }, + { + "Name": "项目岗位菜单", + "Formula": "项目菜单!$B$3" } ] -}//yBKo33AK8QS3UC94x48knhhlclcwVORzLqJXLza9fdT/5XOpuFbKpuEjUSTyL41Wqxy8iGbw05+J0APgJrA7grFBU6Ver/5wF5u9pNyJ0d1464RoIUbf/dEa9g7SPWJlUP8wXJJ5T3Hmc72LHGCHCOjCAkFPw34rIRESu+vxLcoWfWFHSL7JfZV2Pxckt3hwX/PJ70whxgxX7UcQNs8PMth9K/GVlxKxnhkPCPJctAIiMxBGCWErXnXIGG9k0TrQJb+d8vEA6iZI+iiF9XxdcE6XzSaPj92a1uMPZMb86wo/HSmjHBYQXM0ANdeuS7ibgC3H4/8A85p16L48ABalXjIjsCnbqPv+aPjjM/tZ59mO0lCYb/DREPsaa6ZdMPBS+LzeFeEZsYcEGYXZxMiSA4nAD9fMrh6nnJ3k0fdXf/m0OpBvJVofCgLdo8I5vGcdPoEKoNJ9CUls5HfA7s1xdvMd+E41UZel5jV+GMkmdTG6mX4yUPsl8ot6tJ3CKg2NdJyj69I8HWxYbJP0zLoxZYADGvMiDG+WFkJOI66UjvsqS0VgRp8rs3iB2VxKTn0p6lpEw2VEjS/qx+sGT5QlvSQ6J3XILmMRrsHWXefFdYW8BYpPFVeXmhSkrOcIaKE4sPUHhhuVXjZ+l7OO/mEoRRBZurAlNRF9Cwk1AEzKlqx1uGqnnjdV2nSkvP7l5zaL9HXIcb5NGFJ3ZJ9jiKGTKKEYWGeMXnmafRDel6IdNS9jsh6PYlLAAza0VMz/Nr1iZ+r0C9FSkreBZ6EzPADlkTQSc7AA4NcCks5OXWrbNZng+Fw0SJBzqDdpgQH9V0woUw+IOfXwnouYRehplEDf9BptrLljDU3susZHkU08DQULuzlJrQQ21DyPqnzIAdalCNAhrl1NU9RYt0i70owkvg==|920 \ No newline at end of file +}//1Dqj1s67YOOjr4jx/V4n9ttdbB0GUbOpturx3857iISP4HIop7ydu6oltNU+GdIWhbrnlDGxTRygDtcp4eYe6RX6VDJUGX8uuodttOxX47MdEFYIhpC9VSLcVZ5BeQ9RbqdICnx7uaOwhavMGA7JG2BC6IIiz+1CE9PaQX+EMaBzQeiJquUT6PTVV8BgMpyWMegCYU5R8me7He7SBQfkcQ3cyhZ4A0PEYwxHg4o7RPRA5XwPOoHTqNyDIHk7muVb6OrrPyAtoSE+FmQU3AKfL1xa1LTAhclNDF0BzDFuYBDuPKEzWG2QxdS27AD9CopItUewPHEewlWmtJNjGjU6pQZUgnIp5R+TkeQmegHvrKDCloqPTnwlbQvtawdwZxwXpgj27hZb1rQh/arnVFLs+wSDHzNFzjK6M5W7X4tTt9EinUwZNeSF8e5njkyg1zUqC8ZIJJxYH6SpdJVxFL+cY0RwSduq8fL+DnouXDRWzo03rfd7YtiGiq0FDUQgSTqH8gcBD7bRP30IHeJ2fcOt+JsWLRv5BEbRMMzKm8kDF8iwdsaRirmR2FpzlPV/3JQkgnPaGYpEz5+W3fQo3qpYPoql4HNaNL+CBe0WHv2i/oLZbdWgpD3oB6HnrvfC7YOOe262b7mZdIhlKF4xcO2dDLPdQQN2AZUWotMrSI9+VGEUrbYVjb9k+2FH0GMPfTKU/Uz8qu73OfrmQ0zosZgSsY0zArTNae96sh2oKQ8FOsBVIihP12bx86tE8J+kPGf6dgbCaTZms7tq4QdxzA1E8kBaC3oDe3abgzUHFMt89TNihVGIIQmaPyQaZ8mesKKMtb/fNRH3LtHjsOb7LacQ+mdqLALBSe2ZSwKVAn2ADQwuan61VGGC+SJjh4XnQ1MggqrJMQVpBAxdbTh/l0bl8w==|920 \ No newline at end of file diff --git a/Pages/共用/项目菜单.rd b/Pages/共用/项目菜单.rd index e488fc45..703de958 100644 --- a/Pages/共用/项目菜单.rd +++ b/Pages/共用/项目菜单.rd @@ -6,6 +6,10 @@ { "Name": "点击按钮", "Formula": "项目菜单!$B$12" + }, + { + "Name": "项目岗位菜单", + "Formula": "项目菜单!$B$3" } ] } \ No newline at end of file diff --git a/Pages/工时/人员工时统计.json b/Pages/工时/人员工时统计.json index 6218c627..e38f99cc 100644 --- a/Pages/工时/人员工时统计.json +++ b/Pages/工时/人员工时统计.json @@ -326,6 +326,9 @@ "1,13": "总剩余工时", "1,16": "总计算提成" }, + "Formulas": { + "2,13": "E3-H3" + }, "AttachInfos": { "1,1": { "ListViewInfo": { @@ -396,11 +399,6 @@ "NameUsedInJavaScript": "总剩余工时", "TotalRowSetting": { "FormulaType": 5 - }, - "BindingInfo": { - "TableName": "人员工时统计视图", - "ColumnName": "总剩余工时", - "GUID": "4ea9c233-35f0-4e7a-9a6b-17d6de797dd5" } }, "2,16": { @@ -482,8 +480,8 @@ "2,4,1,3", "2,7,1,3", "2,10,1,3", - "2,13,1,3", "2,16,1,3", + "2,13,1,3", "1,1,1,3", "1,4,1,3", "1,7,1,3", @@ -508,10 +506,11 @@ ] }, "RowBreakLines": [], - "RepeatRangeSettings": [] + "RepeatRangeSettings": [], + "RelatedDataTableName": "人员工时统计视图" }, "PrintInfo": { "PaperSize": {}, "Margin": {} } -}///H/10IDo3KsLmdYA+kW+e9QxaD08LW/Xyb+FnaYrBqAorB7LTYlqXtrunja2CEFNx6HSeWI37RinnjZzZZ8qcYq7fwRnC/YLqGOWlYlGInpGQQo9Cdtifu3uGRgiRui9ScG8m1CIt2hlVpnx/mzZPwJmouiKOdKX0qmvS7QZEkadunWnHYdoCF/FygDQyvEDkyIPGKyOotrxoYdouq+Bbo/d5NxTE1W/4/gT8MmFqzkUsP0WxPP/WvFkiCDfayPwPZx9JlNsdMdhkeADs5i1f+nCU2UEibLZZ4rYTt9JJKiQEj43pECdruTF/QKkffoFn/EsivY8MQOSKvmGXM0wFcAf8Bp88Uv7qgWjMWTjq1P5/nEDrZ5l+/y5KwHUObMrMoCd82PfygRk4mr9Ff9VPOqVXQTGqMDqSIGbnHRSlY1TxWeeDDaoH4UTG5QjzF5RUofLHUJRaWBhq47ptWJejcGGp/itPQnMzC93XSVy6oJ4nhnuetGCIAE3UsQ3r7C2DpwwLkcB/RiCB703zSLXfTkmc5rGf6HNcSh/Q9vNSX3l+/rmCd8M2Dii4gH7idWCptLou1IJ/svZKBBd3L3UGB9OdRadfN47wuHX4RZLCdZTQab1K3oxddpjDVq5YkqWeECwGBvJgCC670eat8CnKwcF6WZcUm84wkmVbH0AWEWTlL26OiXlvsONb1ue59aElvw8of2gLdiWeaD/3v9RPbxD/2rU8SRDmKVjvgAkzczBBteCRNT40jcgoq+1CQdCbkLq2hVJT6PkraUz3F9DZa9GsxY4Sydrld8l4F/G2Cujc6xnhEJuTrGRIzuAIP200lcKlycNGg5slna+N5boBZm9fDTjg7eOWkrDJ9bBLSJd3vmnuehdaid3IV/w3TG41ICqyUcFRfxCm11TVlyOXA==|920 \ No newline at end of file +}//uM5n4oapfpDVjBdZ9ZzVApfh/McdYf7dkwkjN7FH6rA+24OjcNT9G9HaasvAZL+MaI7RMtgjLqVC99Z9wbztgIEi4YEoAAFJeoJTE+jA25ZKDDSVZ7BhKiTgTfOcdkl9x1FEtCLoSj+mGRRc59DCjUf/db/ZEY1XiSTMCpiVLzPsKEMkYHanbn74NahyrecmngjAfLmNThAzYIlsVt2J5e9Exu9QBZeTdXVq5ixdGgW8lskCDnN4faygLzystwmu9ro6mrHNWVRLUmhSxw7keyuR0rscMe3+Oxec2yb4yUw0k/Gy8F4AavB1jHewteOgLeP7P0uB72ClQsyaMQ0EAF9GoAnxyRR/p53ZPE7KYdM3L0y2z/JI4bUeb3cXiMOyMcnJ0tmQceX5Lu6Y0KNueScpdxLfEGQKqDQ6725bGbRgFgfTvs9Ay3sEqfsHwiQ/opq3/mwdWH/LLilFwGIXn2yWWjw1kwgzPBfqLy8uvcDinCQbQIPYjDZCrM2is3FIOjQwO34SSycOpOqh8rwrYbr3LNLTNZy1sHv4hI7ugqi1WxswxCbeRuxgpytXED6WhLN9b5BEi0aReko/xzH/EGVCZvHQxZQYYEXOWDDvAWtAV7kE9dPYigdW0eGjQpsnhnI9WVtPurvFEqUoq/uCpp/5bAJqx2momWOvOrBYUYuu1b5WOrgPJU4o2qa30Zzk42yGXj/kEdYq703obKQJsVOJQlYSMQpSaHsW7jt5ZlD1JB5byZilcW6qOPfQNlsypsA46NBOPDNlfVps8s68LKUawgRUau2knCLbqC/kSb5RkO4ndV9VdVq949zVGfvo07uENSSmDPbnPgyJwSUv92S9HO4bx0kZkb/gD7bs8nhUBUSraRTghUbZb6jtG2+vWraTEB5XMdEg2pykI3yikw==|920 \ No newline at end of file diff --git a/Pages/工时/人员工时统计.rd b/Pages/工时/人员工时统计.rd index df669f3c..d5e3b101 100644 --- a/Pages/工时/人员工时统计.rd +++ b/Pages/工时/人员工时统计.rd @@ -1,5 +1,8 @@ { "PageType": 0, "ColumnCount": 20, - "RowCount": 15 + "RowCount": 15, + "Formulas": { + "2,13": "E3-H3" + } } \ No newline at end of file diff --git a/Pages/收益/收益中心-收益明细.json b/Pages/收益/收益中心-收益明细.json index f369cab1..b775d308 100644 --- a/Pages/收益/收益中心-收益明细.json +++ b/Pages/收益/收益中心-收益明细.json @@ -367,13 +367,28 @@ } ], "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "执行人", - "GUID": "40be89a4-d662-4ece-b0af-e91cfebceb41" - }, - "Value": "shamus" + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "执行人", + "GUID": "40be89a4-d662-4ece-b0af-e91cfebceb41" + }, + "Value": "shamus" + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 2, + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "实际工时", + "GUID": "3bab2356-4c54-4bcc-be4e-a2068e8ef007" + }, + "Value": "0" + } + ] }, "OrderBySqlCondition": { "OrderByColumns": [ @@ -426,14 +441,6 @@ "headerAlign": "center", "key": "6a4f4652-953c-461c-9f78-ffabf66854ca" }, - { - "$type": "ElementUI.ColumnSetting, ElementUI", - "dataColumnName": "核定方式", - "label": "核定方式", - "align": "center", - "headerAlign": "center", - "key": "52de4693-9aff-47f4-8b77-df87dd5adc10" - }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "时薪单价", @@ -468,14 +475,6 @@ "headerAlign": "center", "key": "471fb750-abeb-47c5-93b4-b9a254616ad0" }, - { - "$type": "ElementUI.ColumnSetting, ElementUI", - "dataColumnName": "核定工时", - "label": "核定工时", - "align": "center", - "headerAlign": "center", - "key": "379f09a7-3644-4e31-b3a1-d23ceafb6da5" - }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "计算收益", @@ -840,4 +839,4 @@ "Size": "3,18" } ] -}///FP7cQN5MbLF8zU8NYcBRCVDcpGiZO0jdDCzCLjmQCsXF3PO72oqQdZv1Qf1MHh8CnuzkL0ZQLj3b1ewZrEDKv6JF0BViZ5gplmu3uXUi6Ww+rq3OHgXusSCOmOM14ELm64TVpAw7F4NrBh9Nc27pWN4bW14Xaemgy4vyO/1MLp4v/AAvPhg/b0xjB4yiM3iTxf7eBegmzbMC9KSOkW0n3/SwppUpb/QYQlLx4Cn4MljvzWXAYm2LFRozXVVdM1LudXxmS3AgDiwngPUqRezn5SApsEJPefWgfoCGYmJw2PzvChuDxKUUn5D51Kz+Pxo4SdjnYvPQsdtYJV0RQwQ5mZ+BYez/d5+gIUERS4+bLX5fW29+3CHHFyjzumP4urkxWTLWMc7AaZQIT/6IWF3+VdCZNPeuSATXcuz78SweUbfVP5IZhmVRinQs00C6ri+QKpeKlnL8zrFeE0pqNKnhpacPVqlNyoAXmKT2rNguhDW06y+3rPN8DXGEgz1qf/Cr+2wzRuiyVF//TQTIOPWogmT5Jwl14bFp9lhyvImtpgeMLvnL1/mZzLq88InhuOZ64uupbfRyQmMvVpjeZdcB6ugiD8csQRqZss2AgTOafUGt9pR4u+16Fra7Oo6w9d4fb9yiL0+YP7rE+hg00/YJ6vpjDSPZi+K2/XqVkUYOku17v3yXCtPaMYSbrf7Ry+5+DpKg/eeDVRFdO5LIwhfeXQzPVt5ymp2V+KlUEFcGx3vdnnjDL6uJCjqBqGfrbiqP2WQXx/bpdCYaegxrU3ZH7ge4LOLmu5uH5XtYtB75Q5seCylEmhPZW2v1UUt5iQkhK9BVR8gDh2ulPippeMIAp8sMOpTrZLPIkRnWMGDa5jUjnvPTtai7C8BdwUPQvXxPhY74qqV5H+W8Gf723KPzA==|920 \ No newline at end of file +}//iTiDqyZXcsVCXFUCBDQWdL8ArLVydCQs5FouoAkd0usmg+1PywEwTOFHE4chCAkOw0iXvNCBn5jALntGLTj91/4ofGAvS+8u1/azsPb0pVwP1v4PqLhaGpTR2PQEeHAswOREMeIqQv0n6VBGQoD57zyvXQx5e5nqFTQdEcwV9stwTMSrC31lC/5y+N1FcUb2wQngPOyXz3RGsPwI6PkjmrbthSOqpUsgYZB8hTK7D0YX73Qd/V60t1zEwhHoN4qQw9Mu+u/Ldqcit0yhLed0b19L6drWGwE59MZ6Ijf/6IbLfQjQ/PDkaZlwqle/3L5bHDxN4fDbdFCsbOz86BBPbo5Fq6JSUOjZos9pAEiN85n0AsHyOhzyAR2uGXmVSZF8UKNLrajWHQlyEmeb/G59hiXLXLcxW9uYIAGq2oA6ksSR0Bf6ji2clN5qraay2HvGAeg4cSSActxlcbartsyYGlXC2d/TsK8zhfLNrfyp7LE/kW9Wmd4v6p08pir8hJx9S329SpKwCjHz0KyoNPTwackLMOfhL2iZOFxWbi/31s0GNOaN/6xEkdxrbk04wzIY4OfXLpJdN0iE600CEcbJNN8u1BRHMaQUKvFiU4WVlcUbGT31wdHTs/MH359jl86xcyZ/+03FJCphImcuP5ihnVYKp8H6rzbK/bVEVaZpc5kYEXWbruTS6Lxy2WLbX8LkIaOzsuMqJF/XsAVYtOyqges/rtjwxBeMA9Ao/x26VKcaMsF1/QXmvxOXFE0zicqDYycjcoqpWHjvRmIRKpllJMaVJHGKve43MG86WSHUE55u5wop2LQPIZOe5zDxe0iss9/ier0U1Zz5kdl5se8CjkTaqeQALDJqlCrWcqNCrzWRE6HY1zOGFiDsRZWgiQyUNkMKDdgeoy8pEMjM7WzwBg==|920 \ No newline at end of file diff --git a/Pages/项目/项目列表.json b/Pages/项目/项目列表.json index 7a015f37..d0b13b0c 100644 --- a/Pages/项目/项目列表.json +++ b/Pages/项目/项目列表.json @@ -376,6 +376,113 @@ "PopupDisplayMode": 3, "DrawerDirection": 3, "ShowDrawerHeader": true, + "ClosePopupCallbackCommand": { + "Commands": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=是否为确定" + } + ] + }, + "value": "1" + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=类型" + } + ] + }, + "value": "新增" + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目ID" + } + ] + }, + "value": "%Null%", + "compareType": 1 + } + ] + }, + "CommandList": [ + { + "$type": "ElementUI.Commands.ShowMessageBox, ElementUI", + "Title": "初始化", + "Message": "是否立即配置项目人员", + "Type": "info", + "ConfirmButtonText": "确定", + "ShowCancelButton": true, + "CancelButtonText": "取消", + "ShowClose": false, + "DialogResult": "按钮结果", + "AdvancedSettings": {} + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=按钮结果" + } + ] + }, + "value": "confirm" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "项目首页", + "PassValues": [ + { + "Source": "项目成员", + "TargetCell": { + "SerializeProperty": "=项目首页!项目首页导航栏" + } + } + ] + } + ], + "ID": "688fc591-f523-43f9-b035-f161d8c9fc21" + } + ] + } + ], + "ID": "79acbfc7-28a2-4fee-ba13-e89996b5556e" + } + ] + } + ], + "ParamProperties": { + "IsOK": "是否为确定", + "项目ID": "项目ID", + "类型": "类型" + } + }, "PageName": "项目信息", "LoadBindingDataOption": 2 } @@ -831,10 +938,24 @@ "$type": "Forguncy.Model.ShareCommand, ServerDesignerCommon", "ShareCommandContainerRefer": { "ShareCommandContainerID": "26f70fca-3984-43f6-a8a2-143eb5d48c1d" - } + }, + "Params": [ + { + "ParamReferObject": { + "ParamID": "4eb86791-f7de-426d-a433-ddfb616e730e", + "ShareCommandContainerReferObject": { + "ShareCommandContainerID": "26f70fca-3984-43f6-a8a2-143eb5d48c1d" + } + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目列表!ID" + } + } + ] } ], - "ID": "ada2be24-b939-4175-b31b-b4668a89076a" + "ID": "cafda1dc-336d-4807-b15c-482c56d11c3f" }, { "CommandList": [ @@ -847,7 +968,7 @@ "LoadBindingDataOption": 2 } ], - "ID": "9c18c9f9-c911-4ad2-8984-7d8fab0dc40e" + "ID": "833cf19c-a862-4d7c-ab1f-18bbc5033b2d" } ] } @@ -1422,13 +1543,13 @@ "Margin": {} }, "CustomNames": [ - { - "Name": "选中分组", - "Formula": "项目列表!$B$15" - }, { "Name": "显示搜索栏", "Formula": "项目列表!$I$15" + }, + { + "Name": "选中分组", + "Formula": "项目列表!$B$15" } ] -}//BGhCRCwSttUGS0kgF2QKyxVDAacoLOLF67AWZs554VwSot4BYlJQrhIJIiIFGRi+6i3zNNOKRcYj5dQOd1RyosA65hEquyGIF2r1/1Mq30lyXiPc1v7XHnNzA4mMV/RMvobVO8RwX2ECKRjtpjjletTe8tPXsyEjFcJ7NX+5IVRpFAry1Ui8m/USzy9eBPAnpV0fDTpT+p9J4sh28IvSfTt2bsmWhur/7PQF8NA/pgTvkhcU5vbFqo7NG9YsIDcsBVFmP/yfLaGY40oc/Pf4T3OFF3ZYichzhwA7Su4bHazkd3zTSh3GYaWYcoTOBhjT8aiqgOH770Q6nFsLr4giJgwuVWLZ2Hg2z6j5pWLsD7nz0OwBneqhj3YuIKQq4VKVrQqYhdOs04Cxf94o8j0qLvLtXup+5Rt2xGWRgZgSD29PC80a+yyrI5oKe6pko9r3ipcUOQdMU8DxmMEjr2K8JZcQJftscxiKZOdfk+8P7xYtQKRxB4+K3xFcaMwI2ogmbVN5cWjX++8yK5H6ePqjrQ0ST7wLKrlGDj/ZfNMhXTHQSdZ6O1TGVOvXhOd4OCbWU2Hn9U++LpCO8A8z3gI8he6RIWnGX26N/iJnjvo/szQQKUlxEuQjg5sitk8pwdK7gh8MGYl7jS49kr4nqb190VFNUSfRg00vm0WYoH1wcDqAIEDcxHiZK2WZdVU9q2jAmldjQLeRaWbw7iyLjsqaYE5FPeRG5xIXki6n29xMvLEsLuhBhMjsGJCxH9y40BlKw8Vj9Wxxn923okWIhEwxRZWyexPsF86ixHREky5fkd9DPgS3QlCy1gpT5b2v2DfMp9ttUhBe6XS/TEDSRJT6BSdelfEJtWGWsNay9SY1e16ec3rj4tdYyRAPtpwbORnI/UaAfaxGW6WMTuQ6zdYA2w==|920 \ No newline at end of file +}//bZ6hHyJyBWTj2zFMpaEt+pr94e8vIymuWbgcidk/ggJayFi/vFeZJzOULvS1o2c/zXQatmD6tF31NtCPxWs6oiu2xrmZmmkaEwT90Wd0jd9UG+MW5q9ZiwWKuEIKIkt82AqAuRTyZ0mZTx7zXspICWRj+o2lQbBsuMBk0sJUppIj2XlaXVlOLXcfH71GjUW0wDjoRpM9Cwp1zshlM6m6dRk/g5909ZIOQs575rR9rxr7pEweKx+YPvUW/T4nSvS8rFh2iLLjuAOf2G0yOvziLIrz+hwS4yQGbecZSoG0UwrUQgo1pZibogqyLgLUuqFNzRaUBEu95lpzteHY71iI6PwFlt17XL7RHPgJ5b0MCaYne0XOS6scRt1J7mbBveYYVWoWKUAi3JLjzKwIrNJT5h5qVm2+N5mrW3HuZFiDTv24WalvZMsx/0bTMyqI+JBAyXyXMzJhiBSXeCpFz6LLZ2E2DFrsrIefTixtrKC2THMOSIa63F8FvA7RteLQo+BDCfSl3KEJakgjG/3o0vj5Z121MejV5Jzyps/w6PkK211oe9n2dgbJ9vYS4N+732qXCnwquQz6zqzzY3wWDIqJfZNgzWPM5XzR7YyLwigyYEiUXXlkQTrxk+1zHloI7Bi9cLwpUBJkr0aCGqPo0fS9Sxy6wa+SFmsI9tlUO9sM93nF9ucfCcKPKv/ikgNsEynRdAl8PsobTKhXXt+fAq7q8mVK9QLMzCtcpQzSEi7Y6TYYwwnflLjkshWqBXiUMwOM35OI6lXlAgC+ji2mXvYvt+Ocx/dlonjq9uzF0UsAcMYwi3M2QY4vNiwSerKV2p+2NwC+UFwAujinRLp+HDSgKSgGbcc1rLOQ4tkpi80GH94NC3Vi0qi9ZmnBj0A1qWKQY2kO6IAHrZ3jXJk9JZMn8Q==|920 \ No newline at end of file diff --git a/Pages/项目/项目列表.rd b/Pages/项目/项目列表.rd index 5efb2b41..77fd600b 100644 --- a/Pages/项目/项目列表.rd +++ b/Pages/项目/项目列表.rd @@ -6,13 +6,13 @@ "10,8": "IF(选中分组=\"\",\"全部\",\"属于[\"&选中分组&\"]的\")&\"项目\"" }, "CustomNames": [ - { - "Name": "选中分组", - "Formula": "项目列表!$B$15" - }, { "Name": "显示搜索栏", "Formula": "项目列表!$I$15" + }, + { + "Name": "选中分组", + "Formula": "项目列表!$B$15" } ] } \ No newline at end of file diff --git a/Pages/项目/项目首页/项目标题.json b/Pages/项目/项目首页/项目标题.json index e10ec2ac..5eeec0e8 100644 --- a/Pages/项目/项目首页/项目标题.json +++ b/Pages/项目/项目首页/项目标题.json @@ -252,7 +252,7 @@ "$type": "LoadingCommand.EndLoadingCommand, LoadingCommand" } ], - "ID": "3d97d111-918a-4d50-abd3-ca2e03eb216f" + "ID": "9db14cd1-5a7e-4b60-b5a8-35a4bdd75817" } ] } @@ -370,7 +370,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "25a41e2d-86c5-4f63-b948-91ad83d63d80" + "ID": "48a0914e-609e-4cca-9289-4cec416eeacc" }, { "Condition": { @@ -388,10 +388,12 @@ "CommandList": [ { "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PageName": "项目配置首页" + "PopupDisplayMode": 2, + "PageName": "项目岗位配置", + "LoadBindingDataOption": 1 } ], - "ID": "b921668f-3133-403c-81e3-6618f3dc8e36" + "ID": "72a825c1-75c6-470b-ab81-779795233037" }, { "Condition": { @@ -441,7 +443,7 @@ "Disabled": true } ], - "ID": "36e68a3f-ce93-446e-8c13-3c865799eb76" + "ID": "415ec456-e0ca-4e79-a03e-cc54c73f882b" }, { "Condition": { @@ -477,7 +479,7 @@ "Message": "操作完成" } ], - "ID": "e3bf443c-8841-4726-b133-9b4af149c042" + "ID": "b42dd132-db88-499e-927b-cc2a48412952" }, { "Condition": { @@ -572,12 +574,12 @@ "IsOpenInNewTab": true } ], - "ID": "8f4fe0df-f903-4b45-a55a-513a5367f91b" + "ID": "dd96f581-d814-43f0-9340-7e5c05ce0a50" } ] } ], - "ID": "69877d00-93d8-4503-9404-ca831967e653" + "ID": "52a27d06-2345-47e1-9480-2c006e174188" }, { "CommandList": [ @@ -587,12 +589,12 @@ "Message": "当前项目未开启收集需求功能,请开启后分享!" } ], - "ID": "2b7674f4-d0bc-40d8-bf55-1442c8ecfb0f" + "ID": "e08aa797-51da-4edd-9ed9-6ff02b5cb6e4" } ] } ], - "ID": "0d357fe2-609c-4f18-a2d6-022e343fc95f" + "ID": "3e287ea9-b5d1-497c-84fc-c1b364405246" }, { "Condition": { @@ -625,12 +627,12 @@ "LoadBindingDataOption": 2 } ], - "ID": "11474e91-5379-400a-aff5-d4ca1bd4c717" + "ID": "e5e5d66f-e29c-4202-b674-b2875018992a" } ] } ], - "ID": "4a20f579-0d72-4464-834c-7f21570b6fb5" + "ID": "452236c2-0bcb-4d9d-a4eb-a5d0068e7463" } ] } @@ -704,7 +706,7 @@ ] } ], - "ID": "72d078b9-dfc2-4ba1-b372-224277736f14" + "ID": "1f04cae8-2101-4601-8472-aed13ab11eba" } ] } @@ -928,5 +930,15 @@ "PrintInfo": { "PaperSize": {}, "Margin": {} - } -}//rxspLwI04FcZY5Fo2HWgDfZZoeo+6ct2Yg8+uXSIQQxw7HgcC0GI17ZdNh7J+hx3vdQtjQqbytCleCCBvqp7P8cmS1lMPofq+rdf1hP2/KbeiilaOvMx6XA1mwbWMuTXeDHNp9bZNx/ElMC4AB6Z/RFktHDmE7iXf1a+FGtl3ZpOSRfiPzv02Z8wbKaAgTIpycrsIwQhT7EalppPL5410jMLGA3KlEGC3nRuwqFjaIZ/EW9Ndztn3mWaUQoDeobFxdn/sDz34s/ELBOAlrFGb8xi2D2ThbEciA8JLwQxFAH4CA2LCEVymToLZg1JAA2rkrR/5hZhloSEIsqcC0F3Torh2pOKycLJunhImIv48MKZGePgOT0wrvKtPf5+NmJaPeuZFYG8lV/2y7a8V82UandbOzf8WK4bic/N6rTjM4GkFpa+rbwEuj7BOtRBCtioH8Z6SHx8ptpWGsHzU3O80TDy+2tpBScrlI8FOBoLYEZ5UU6yfyj/kLPGChKglN+pxoDz8eHv+3n9iCdTnSpT23MSQ5AXBysIt9QaGDReSstVOIbG0tp0tWAPHjinIbkX8W+D8nvOOXz7nhuD6XWX/D30zxWqImgfl05Yvv+rXNbtoljddOop2VcUtbcpTphOCMxmdvcuCgPW0m3MyB1lg7dBWGHztqXVtGQKRDuGCZI2EgAy8UpBtksQ7p7GznKosd9K9Kh4lGNI24FA5tzZkkwlfTX6rSBHcitWmKqJsteDXx/vaM5/l6RtqlqyxAhjQycy3OGMZn/V4+GaGuQODHS0lBpMB1G03mjegXX0DvA2biTdArSjIezvlek6Tl+kT+IE0NxUR/uVou66SsL077rXVju9Wtay17MSBRkU83PkH1GV8htBtUr+EP3SWqVuW7aCBEU+zHHnHO9zNmdvDg==|920 \ No newline at end of file + }, + "CustomNames": [ + { + "Name": "项目首页导航栏", + "Formula": "项目标题!$F$3" + }, + { + "Name": "项目菜单", + "Formula": "项目标题!$O$2" + } + ] +}//EhwQGrrHTiJCyrcddNZ0+fpvuUVD9CGUDknRUtq2YBM/b7L42e5qUpBUgiVaySdOhPvAzLRQVaVIMMAexNULVW9sgWeJbSHruV6ZLMBjSWuuyVd68+BVs0v5QcLQGz23lGauQhNHexJnZnCFandy4aX3PDr16FGPbV93B6QQJEklVuIjKqhbbbj5bdmmeVN0QwMvgaAX51DJXNfQyzPVE9PV/C/DstP7su4FZBSFRh6V1cEDFyZpwkbZShSLWm4QWlnk9qfDvLTCW8rUDHmEecbZPfOq9QdJRWJO6Q5mWUIJQh6fgmUKIzsbChI2Ym2yN5eO4Nium8DWXHP3lWSUby5cl36qxkyzLLDJY+bnbR+iV8AvAyoXjx3auwMTe8YFUcbxJNz29d/9dRjr3LPJjE3Bta28pwb0yTYmmHjS9J8xMSjcBRv2GlNHKQET0XmoyKMq6/p/QQC4a/Ycb6OUO0MLdlrMT3Mz7VHZdT1vbP4gNdDxhjW5Hba08KClvl9XBRpuUfOgKk82b5XG2aKkdS4MnrSxpAbjytKGMMTfNFKstBAyNCN3UW8GwdJzfzVha+5dT/ueHD3HNKzuEziX/NVDVtylNVEy41L045JJ6iCmtgInHOuIL9BpU7Pykch6QIrHPli9aGQOxvSjHl8X4qUHkxg6p4TiWH3oeL85XV/I6b1ka2Ufz27OZgCV4SiKgbFu6gCKXB7XJ741z4+d3omM9qc9NP2Czygy42fYUrCVyWhp5YTxYi0JNL3usETmYdlOhGYncaiQcXnn5+W/8AfnVR+FtOn3h2qcRgMQpsF9g1/QlKQiIggyYuJt1PUqgvw4EjHMKpjps/3sxsZgMfUycWM5AzRA44hcFvTLeWEPBaR4WV6BAcUkngyawZrp2oIXq7zm0trFKbqUzlNuVg==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目标题.rd b/Pages/项目/项目首页/项目标题.rd index 7d041a15..70011c17 100644 --- a/Pages/项目/项目首页/项目标题.rd +++ b/Pages/项目/项目首页/项目标题.rd @@ -1,5 +1,15 @@ { "PageType": 0, "ColumnCount": 16, - "RowCount": 6 + "RowCount": 6, + "CustomNames": [ + { + "Name": "项目首页导航栏", + "Formula": "项目标题!$F$3" + }, + { + "Name": "项目菜单", + "Formula": "项目标题!$O$2" + } + ] } \ No newline at end of file diff --git a/Pages/项目/项目首页/项目配置/项目信息.json b/Pages/项目/项目首页/项目配置/项目信息.json index 1c4adcd4..90d1b943 100644 --- a/Pages/项目/项目首页/项目配置/项目信息.json +++ b/Pages/项目/项目首页/项目配置/项目信息.json @@ -574,7 +574,7 @@ "MethodName": "ReloadBindingItems" } ], - "ID": "810a3938-a676-4fcc-b469-062ca0af09d2" + "ID": "37f8da35-0c47-4d57-bad5-724ad04a4ad2" } ] } @@ -773,7 +773,7 @@ ] } ], - "ID": "5f1bd914-1d5f-47cd-9fe7-da5b3405f60f" + "ID": "46c1d1b5-a497-429f-ab17-ab0e0d625c62" } ] } @@ -1452,6 +1452,45 @@ "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "项目表", + "ColumnName": "ID", + "GUID": "eeb87091-36d4-48f2-a4ea-f296cbc5c857" + } + }, + "value": "%Null%" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "类型", + "ParameterValue": "新增", + "ID": "613d6db5dca642d99eb01056acdc150c" + } + ], + "ID": "115def88-3a60-4ad6-afe3-bf161e4d9421" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "类型", + "ParameterValue": "修改", + "ID": "82821c155b76412f958cc0f74f5fcfbf" + } + ], + "ID": "d8079412-798a-4cac-bb43-7329f314222e" + } + ] + }, { "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { @@ -1669,10 +1708,26 @@ }, { "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", - "ReloadData": true + "ReloadData": true, + "ClosePopupReturnValues": [ + { + "Name": "项目ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息!项目ID" + } + }, + { + "Name": "类型", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息!类型" + } + } + ] } ], - "ID": "e0fe0ceb-e9d8-404f-87d7-101c9929afa5" + "ID": "48fa2eb9-d587-47b8-8034-bb6adc2073f6" }, { "CommandList": [ @@ -1687,7 +1742,7 @@ "BtnText": "知道了" } ], - "ID": "56517abc-9c1f-46dd-b716-cfc594fcc73c" + "ID": "41bec89e-8a02-433e-84c1-1159f3918859" } ] } @@ -2357,4 +2412,4 @@ "Formula": "项目信息!$B$36" } ] -}//hCAGbBGua+lxHBxjriS0au+CCQLUu1YrR4n/4D+3O2CoO2KHtny0ThPNa0fV8eFJOFWQoGIbk9J8kJ2S75EiFWopLlzZyfMzlH1tIxol62OcBqzbLw4lbuMux4/QoIeZGsLmv/LPdPEurhtyB1QdaqwE2laeNtW5CJBhx1npm3RzOqhXaC8gKJeUVpkoBf3YHr5xFsG5lYwPa6CAtLy8TtfdYAMg3N9BV/PpF4SjSEXyc+Nh9Fa9y5m3hBwz+VahyByPV1qAsTaBgtXRe4dHr6l/f/sNA6Z1f36H2l4AG82FOeU1jw+TFQBs9W808Ok3SFF1XVqkoiR2Bg/yl9rI7IlXMEIMCs7DRLd77JCERnEocHyQ+Pmua3jxgCPM0DsG1gCoz90YyWQpB97/ctzutVL25OT6n3vFnrMRCgYJ2Om6jQ/OEIgDKkWyznz3dmEEhbI0DWh+2ro8nroRpdTYmfL/iGeZeXxUPYg/N1IXuqYIZHDswx+rdnbnNdurGDIRnwDKQKsYsw4clciK0tN/WFzDC+vb7FAi6M7qC/VYZ8Gv/gypbzwKEGvSr/P1tcv34QZ7DUr5mw5GMNiPg6wJwHlKin9ESTQxQVOtA9wJNb9gxV9dF0bY/vuD+Js4B3vkbBTfL8lHyRI76K/oTwznLkB4fd5vX+h/xocDtxP1/9OKjp/mkI69Py5a7MkzSkzrATVcQAsrYc2964NUj7Ze3s/nooaEIkhMd5AhP4PhGSCxDyIbg3cOn4IetJqxVZB9/WuJ6at53aDmt7wq7WlgRl/NmgleVqxlrOPwqHitZzshlc/l21+DnFk/0YGKDEU33m70a/YJ2BzIOdRQamUarwTZBE/OkIUDMKcyrIdJwnc2l0fjryIh9Y8m29PeNjt6t1fFBXutG58LFVuXOmTpSg==|920 \ No newline at end of file +}//Jo/oooq2l8k6kIatIqaOJyt2yLVJv6rgFZ2XM5FRa6UFMK0InfM2S4XBUaTRp41X0NYx6oc2wkS4VorsE5MoDOVZ2IIqxdAbt3IB4stRR+YRsSucg35x4rA2dN9oRuuVxDZm6RyovcDzeVdZPkPeVqvc71vXSnqjr5f4YWMuoDLtWtCaUkEUsiPOXw28pPipM0fifK7fQTakCyUrH6PkPWzzEfk8so5328RA5XLaZMZNm+E8Ew4NF+GhgnGADI8AWgPM8/ATRRnULiBWhSFPyfP4ztrytTBEgZonmITfGDFIm6XweYh3JU7AfNfL25zauUrFn7D9p6KFbROiD8EnFzlycN4+J3SzHli8Lo+KIQ3Tor3i4OMw4v+Prj8gO42Sf7lezL9qcuTQnlUY/Tcg2kF21J3P0hK3ZFFje8MWQ2bqdn9coDmkGDixbANvnmsHbpjNShPj2hnZ5cmkzolXYZ44yIUeU7cUqs/R3VpIGwCwTv3mqSmFBw7Tz4K65zyJ46xu61CpAnLzhSK8wsjwa27iwcsnsLvOThCam8Gd6Fb3g19c04NYWJtirGuHxvtGb7S5nBrhb2dcRXEJ+CClg3NgFbRDqEalEEX+Y8b4VNVhuV3zo6riSbpB6jaerSC6cGnx5zpUSqMmGNLJrFQOG9lU0g13an68hGQl+WxrEi4OwkAhEz2vB6/mGu8gTBH8+h/X/SqWgA9Kipv19bvfxIiiB0Uqbc/cI4XnJLgHSZoMcQ6Rplb+yoKHtBoRLb3l4rqiqbu3JZ8TJum60Ql4R9VZExJj3MnafMdC1BIHPxTPRfLAVO4itiftBcfbiHp0hc5nWcOCOty8+kwwHEJjiK2UNcYoR5BmwLNOoV4N5ekeJ0ccOnRfG4a9yKXhkJ0b5IwJNWRh9Yn4Y/wy7cyq1Q==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目配置/项目岗位配置.json b/Pages/项目/项目首页/项目配置/项目岗位配置.json index 13bc8d82..ce6ad02c 100644 --- a/Pages/项目/项目首页/项目配置/项目岗位配置.json +++ b/Pages/项目/项目首页/项目配置/项目岗位配置.json @@ -3,20 +3,25 @@ "RowColumnAttachedInfos": { "0": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 32.0 } }, "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "3": { "GridRowColumnDefinition": { "DesignLengthInPixel": 40.0 } }, - "2": { + "4": { "GridRowColumnDefinition": { "DesignLengthInPixel": 47.0 } }, - "3": { + "5": { "GridRowColumnDefinition": { "DesignLengthInPixel": 226.0, "Mode": 2, @@ -28,28 +33,37 @@ } } }, - "4": { + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "IsHidden": true + } + }, + "2": { "GridRowColumnDefinition": { "DesignLengthInPixel": 15.0 } } }, - "Count": 5, - "DefaultSize": 15.0 + "InLogicalVisibleIndexes": [ + 7 + ], + "Count": 8, + "DefaultSize": 32.0 }, "Cols": { "RowColumnAttachedInfos": { "0": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 - } - }, - "1": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } }, - "2": { + "1": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } @@ -70,6 +84,11 @@ } }, "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "Mode": 2, @@ -81,11 +100,6 @@ } } }, - "7": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, "8": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 @@ -106,7 +120,7 @@ "DesignLengthInPixel": 32.0 } }, - "13": { + "12": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } @@ -116,7 +130,7 @@ "DesignLengthInPixel": 32.0 } }, - "16": { + "15": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } @@ -153,26 +167,68 @@ }, "23": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 32.0 + } + }, + "24": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 } } }, - "Count": 24, + "InLogicalVisibleIndexes": [ + 2 + ], + "Count": 25, "DefaultSize": 32.0 }, "Values": { - "1,19": "操作", - "2,19": "删除" + "1,1": "岗位设置", + "1,20": "添加岗位", + "4,20": "编辑", + "4,22": "删除" }, "AttachInfos": { - "1,1": { + "1,20": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "项目岗位详情", + "PassValues": [ + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目岗位配置!项目ID" + }, + "TargetCell": { + "SerializeProperty": "=项目岗位详情!项目ID" + } + } + ], + "LoadBindingDataOption": 2 + } + ], + "Text": "添加岗位", + "TemplateKey": "_RS_Main1", + "Icon": { + "Name": "Application/001_add_1.svg", + "BuiltIn": true, + "Color": "Background 1", + "UseCellTypeForeColor": true + }, + "IconSize": 14.0 + } + }, + "3,1": { "ListViewInfo": { "Name": "表格1", "TableName": "项目岗位", - "RowIndex": 1, + "RowIndex": 3, "ColumnIndex": 1, "RowCount": 3, - "ColumnCount": 22, + "ColumnCount": 23, "DetailListViewInfo": { "ColumnOfDetailTable": "项目ID", "MasterTable": "项目表", @@ -187,9 +243,6 @@ "UseSimpleBar": true, "ReserveStyleForBlankRow": true, "PaddingBlankRow": true, - "AllowEditInListview": true, - "AllowAddNewRow": true, - "ShowDeleteButton": true, "AllowDragFill": true, "AllowDragMove": true, "RowHeaderContextMenu": { @@ -215,7 +268,16 @@ "CommitType": 1 } }, - "2,2": { + "4,2": { + "NameUsedInJavaScript": "ID", + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "ID", + "GUID": "3e7df348-a07b-4c67-a947-cad790a9efb7" + } + }, + "4,3": { + "NameUsedInJavaScript": "岗位名称", "BindingInfo": { "TableName": "项目岗位", "ColumnName": "岗位名称", @@ -234,7 +296,8 @@ "IgnoreBlank": false } }, - "2,9": { + "4,10": { + "NameUsedInJavaScript": "默认时薪", "BindingInfo": { "TableName": "项目岗位", "ColumnName": "默认时薪", @@ -249,67 +312,186 @@ "InputMessage": "留空则使用该人员默认时薪" } }, - "2,19": { + "4,20": { "CellType": { "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", "CommandList": [ { - "$type": "Forguncy.Model.UpdateListviewCommand, ServerDesignerCommon", - "ListviewName": "表格1", - "UpdateType": 2 + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "项目岗位详情", + "LoadBindingDataOption": 1 + } + ], + "Text": "编辑", + "ClickMode": 1 + } + }, + "4,22": { + "NameUsedInJavaScript": "操作", + "CellType": { + "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "删除项目岗位", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "项目ID" + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "岗位ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目岗位配置!C5" + } + } + ], + "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" + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目岗位配置!msg" + } + } + ], + "ID": "dd1ac3dc-0107-4c17-947f-50d64b34e396" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目岗位配置!msg" + }, + "BtnText": "知道了" + } + ], + "ID": "29cb873f-7e03-4fb5-8a4d-6778048dc80e" + } + ] } ], "Text": "删除", "ClickMode": 1 } + }, + "7,1": { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "ID", + "GUID": "ddfc25ba-73b9-4852-b7ce-ddc4f5f89659" + } } }, "StyleDatas": { "Styles": [ + { + "FontSize": 13.333333333333332 + }, { "FontSize": 13.333333333333332, "HorizontalAlignment": 0 }, { + "FontFamily": 1, "FontSize": 13.333333333333332, - "Formatter": 1, + "HorizontalAlignment": 0 + }, + { + "FontFamily": 1 + }, + { + "FontSize": 13.333333333333332, + "Formatter": 2, "HorizontalAlignment": 0 }, { "FontSize": 13.333333333333332, - "Foreground": 2, + "Foreground": 3, "HorizontalAlignment": 0, "Underline": false + }, + { + "FontFamily": 1, + "FontSize": 13.333333333333332, + "Foreground": 4, + "HorizontalAlignment": 0, + "Underline": false + }, + { + "Background": 5 } ], "Types": { "Strs": [ "Center", + "Body", "@", + "Accent 1", "#FFFF0000", - "Body" + "#FFFFFF00" ] }, "CellStyles": { - "1,2": 0, - "1,9": 0, - "1,19": 0, - "2,2": 1, - "2,9": 0, - "2,19": 2 + "1,20": 0, + "3,3": 1, + "3,10": 1, + "3,22": 2, + "3,23": 3, + "4,3": 4, + "4,10": 1, + "4,20": 5, + "4,22": 6, + "4,23": 3, + "7,1": 7 }, "SheetStyle": { - "FontFamily": 3 + "FontFamily": 1 } }, "Spans": [ - "3,1,1,22", - "2,19,1,4", - "2,2,1,7", - "2,9,1,10", - "1,2,1,7", - "1,9,1,10", - "1,19,1,4" + "4,3,1,7", + "4,10,1,10", + "1,20,1,4", + "4,22,1,2", + "4,20,1,2", + "3,3,1,7", + "3,10,1,10", + "3,20,1,2", + "3,22,1,2", + "5,1,1,23", + "7,1,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -328,10 +510,17 @@ ] }, "RowBreakLines": [], - "RepeatRangeSettings": [] + "RepeatRangeSettings": [], + "RelatedDataTableName": "项目岗位" }, "PrintInfo": { "PaperSize": {}, "Margin": {} - } -}//Dg8L542WKKuyqgY8TJdEucsVOqrnXSOPoZcRo0/SvzR/XZjgNFPj7bLNZMvz0nkQpUwCzuLfU6y3FA8hSpaqPV9mfC6Ezn34/LNHcT9ZiBw3WkoQAl280vOlofYhnZPiHwvnG4DMrqXt/njCL6/5XF+s9VEZUriqCJ29uWQWdiKFftZhm+IkeJxycejubSP89adUjHLd2upp+D1s/dHgXLKAYsLIR8UXdhgiwpLpYP/JkE1ew0bilQQWjMKldAsAziiz5on21LEtIYt5tgqKmpiTv7vYOAIUpZ1c5a65lYZtN0DYY6GRjZfEFSNIPiuTVFayVSmsQsElAKRaQ947wVef1FCXYwmZXj5gh4jbmhGs8tNj7K6c60JMk0kiMpWmMMI2B/I+kDRubcj5RRscxvwys3z8RPfsunq3V4PzyKZvdoQ/TSXYTPrzRnZOGnTyF1Kucyl/32DzZsCNXBq2qK5o35IQ+Zj8MqXfrrY1sEZkS7IsJ7s5G1fU9AO4meScxorlFyAoDiFgeiVho8BNvoBLxEZY5Rzp9DyPNS4OegY3V+/i9dsp5IFfsQRsuxDLhP8byWpFWz0OsuIYKv1wXbOg2F9PBkUsSezwvEnKvyXXsWIJOv/x6mY4hl54jIZI/++j0kDAX0G4nggMs39lgFfQiJV+VK9yOTxNWxruqW4YgJYBesB1wG0ATIzwAI+oXRT7aJEG3WYK+6Y6wDpXxv1K+ONo56BXwnmZjFSm/iMvUhSjigfugFcc+OpoHYBKgRgMtD0+8qQmh32YHfTBa8cdo75aXW9P0nGAGISvgIoHAnbwZt8MTVHwyrHOTrWzmf/r/az7qgxDL/RVBcIZpVEaM1BXztrB9w141YZhiF48NNTJWu/X/4pMgfUYCPUNWafMdRjBoZEUfpYhTr4JoQ==|920 \ No newline at end of file + }, + "CustomNames": [ + { + "Name": "项目ID", + "Formula": "项目岗位配置!$B$8" + } + ] +}//bTddJSwAa0sZyp+7NrSP4Q3toAAWkJqooSLIFbCTBUttu/wIW665x0aPCsPvGz/NJu2TdvpYR0p4ce2iJMO5AEjIBU8xtfbEDZtlunSqCqzglUPJRi3u4XM9NQhuhyGaKCiNKKhdAbXlGNzWB+O+f3X0jKqVX04uUbQdfQjY8kfLcFDfQ3XHmnjDaqbyjks5ECEK2bUGqZwFlt5rfKTXM2JRXzYon81lsIbIdiviV9vub7rW4yUMposDArsKpBeH7dtvC5j8/umo3N3Q7oEPcvQm2TmlVpm7xyhMtmW0htG2J3zKWSKzxPSx5kA+x5i+AI1xWpAlPcIy849iswfErrHmljB3YwGanJ1vmU+EOR+oR5QobPatbj+F1PXuogOHvNMOo1fFFE0V2mg5zWspkDONi5QeSzUT8mKZ/DbnmW384TB+TVJvo2wY7dBCBgZaACgLRfx9VwTrcK8H2p40tUsXmeMsp0O3v6YnfV/6qTtMHTuQUqVSss/js/o2NsDqiS59WaLtlP0XxnGqfwj+nem6Ggk0F9bxppVOJnoYdXRTd9bq/xDF4vU6/eucghqQrWo3MdZ89ud2r3riqwVpcmS97OdPADCfZlqrSPnuB4acpyxZj0PVgJZFKZZSwYRjvfZm0Qx+0pWELkBjonPfogoqtloRcm6WEnIZX4QVScJqAKCmyovGvzDLNnzMfzl86q6Bu59z1OcGXC6DoGE7LACONr8x+JI9hzmukefnI63Nnvo9rlmxkBQ1xlA5HbtWyf60CnfV2XsKC0mClbWDXm1Qy9HQcMVr3M8tCioFcWhuBfxrDsTcTvnxQ7fj4UkQZg+3c9EfzvGWFN4lOF/HXff4DdCtNZhhO1/r+65WvoVFQkGBQDPfwg4RpLWUeFEvabSEPJ+ChOXvHbF7asbeJA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目配置/项目岗位配置.rd b/Pages/项目/项目首页/项目配置/项目岗位配置.rd index 8d246470..916721d6 100644 --- a/Pages/项目/项目首页/项目配置/项目岗位配置.rd +++ b/Pages/项目/项目首页/项目配置/项目岗位配置.rd @@ -1,5 +1,11 @@ { "PageType": 0, - "ColumnCount": 24, - "RowCount": 5 + "ColumnCount": 25, + "RowCount": 8, + "CustomNames": [ + { + "Name": "项目ID", + "Formula": "项目岗位配置!$B$8" + } + ] } \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json index 14999d97..0b6fc742 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json @@ -429,17 +429,88 @@ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PageName": "新增任务", - "PassValues": [ + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ { - "Source": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务列表!项目ID" + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "项目表", + "ColumnName": "项目岗位数", + "GUID": "752ed267-7f19-4966-8a4e-7d743cd71966" + } + }, + "value": "0" }, - "TargetCell": { - "SerializeProperty": "=新增任务!项目ID" - } + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "info", + "Message": "您需要先配置岗位和人员后,才能新增任务" + }, + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "项目岗位详情", + "LoadBindingDataOption": 1 + } + ], + "ID": "a76e3403-2a83-4da5-8bdd-3cca8e239d0d" + }, + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "项目表", + "ColumnName": "项目成员数", + "GUID": "a6c2c184-9d63-4938-a123-5e51d1c4f84d" + } + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "info", + "Message": "您需要先配置岗位和人员后,才能新增任务" + }, + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目首页!项目子页面" + }, + "Value": "项目成员" + } + ] + } + ], + "ID": "28524c25-beb7-4c32-99f1-5a9bd038ef08" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "新增任务", + "PassValues": [ + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!项目ID" + }, + "TargetCell": { + "SerializeProperty": "=新增任务!项目ID" + } + } + ] + } + ], + "ID": "b01cebd9-3fc1-49f2-9292-335c465ec20d" } ] } @@ -1063,4 +1134,4 @@ "Formula": "任务列表!$B$4" } ] -}//bmSkf1wn3zjVv/T0PynnpcKD8Rv47wUSzXWVpHmi1NodDvcncrnN+g+eJhxDe6Desm0jF0Lg0jujuS5600nvYKZZyf8aXwM1dXd/84Q9N9wtCURg594dD5qKd4mrKVVKXI7GwGW15Tat0TyaQrKXS12yEx9IkdWZlJPpuUGZlF0jZFxMMhhECk+7ED1TW4r6m1zeTRGF8qgxCXoE9LGyhMtYhO7gsIXshKCgZ2xDEP0Fe4bmfVWqx3lyayZmMXhD2DzzGJi48dUhiyod8qotdhX4COqIkRDh052pT7SlhORKSm5WpyZGc/1ZaBZPYNzVIFVHMtw6FbGqKUDizs02X3V9YG9MaBtPJJaPCuBDa7UAHY1tbAgh++zyqidGnp3ODKfAN4yyFhIXGq0SdXkFXQ5hrUnTcw++PQ9gSvTu/ri9if+U6qlRQqJ+/QnpOIH4IR84tw2RtYjb4uHmK8KNJkowes3/llOrniQNf1idb0pQQmTYfHaEj9ZX3tQywf245N7nRz4rNpNxqMUSDDi9XpqPa8epwZYSsSsh+2vvJ42b2clQIVgm1bWGjBSzLkdyWpk7kOwvs8YLaXty3ppeJNkW+ZYaumHSJm/5UvW2qQc5fsQDZjjT+lZaG1cckhtiFh3J0lCM9GkhQnCfmtMLPqlMAq/BILXNxgZVN+wZDXy3M0V0gTXVDV4MLFuYzXisqLc0VOA9+uUKJDbP/PXO9kovjdXJvSVLcI2joCDQs7d65DH7Th56J1q27XievCjp4fYIRf8RCNN+P64kgOkJ6udVDy/mLj5dONgpJTfrWoBf08bhJyIbx9P17+4wH6Jxwj/qQ4zSCY7wOiUBPODqeEvVs/tQT40Fy/G4p0wSy6G69LtsbeVyB5uAniL9XMgv6CVjFlPloCRXiv3bib5zxQ==|920 \ No newline at end of file +}//SPDex8VP3CFFdeB1ewRBzcCpgkKt/UwEMVvXMikjfo2F+FDJswqqMuBAtLkcr0/OPntRJrm2ZlLMDZ3x2NiM+KYwl8F30fRDzJg9S/yX/eyl5JEuL0Ho6A/RZNiOxYW/Ayunz3zx3C+4mbR4IP/qmndUkmc5cm8PP44mNHOfcfKH/7szOjW1AdSDqgAAOfoZJQQmvtRxLqEhdugdu/YeIkRN0TfiOS3E8YnxSLR/mQp+VhYQpPkhaBbYC84pQo6j4nfUvpJYt1neoMoOKfCC6Nvvo/SWa9RSXtKQCbI7OJtJBjWALwN0pq1Cq8CGHzMAeHsodLmmq12t6s3RsnNtk3bwgL1tRskRUOuvEMbvHkfm+qmWlM1mu5JlgYJzvZ35RTuAGfYKFungun3+shT2fsnuXG8jEswFimCeBPp6Q48CvMBWSJCtEkPl69q5MQQfQrtr/Hqpw+p8OY5uHfKBlqbYFHYCdDWO3ZMQa/gWogNJ0NDdHsQEyL7lDc92AJltVgnzLIKLzpVaAUf/5kmyiFiU8x7+9M4XwyMUdCMDTIbsvNZqIDo62NT1UYCW58Zo9gSh5mdZq6QcsRRldYOpFSK6o6FGSDjGrPrlxtv04sJ+/XvjvdE7gX83738hnJICQLpOS0p2ral0QjzNDkqAJd6A4LWePRam8yvoCdUBnnXldzLtNxz+IMFTlxLmiscrjUm5HMvUWCqxLnRCenYIFQwZp6Rq/bCFYbmCylQ0QLp71SaN9VyPQZKlH3G6f5fmTN5gW8wbxX6vNFgyFQcOqRkQtNHg23XMoCX8LuaAkPiRgnB5wdNqlkip302LgYPxjCn+btQldT7Q94CXFMH+20yJKh/22l9+obs03ejvwFJ5xcahABFSvhGfYaD5j4pIMKgvGHHmkbQq8WLMmG76Tw==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页.json b/Pages/项目/项目首页/项目首页.json index 5dba55f7..1e884b91 100644 --- a/Pages/项目/项目首页/项目首页.json +++ b/Pages/项目/项目首页/项目首页.json @@ -329,7 +329,7 @@ "$type": "LoadingCommand.EndLoadingCommand, LoadingCommand" } ], - "ID": "5af3efb9-f6dc-4e2f-8c85-20d40ef318fe" + "ID": "e6d2995d-988a-4c9f-84e5-c07af328db1e" } ] } @@ -438,6 +438,174 @@ "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", "FunctionName": "remove", "Title": "加载中" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "项目表", + "ColumnName": "ID", + "GUID": "3b003c89-b569-459d-8e66-de08ab19a41a" + } + }, + "value": "%Null%" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "项目ID", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IFERROR(GETURLQUERYVALUE(\"ID\"),项目首页!项目ID)" + }, + "ID": "a27ecb1607a94f2b8afeac7d44144f6f" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目ID" + } + ] + }, + "value": "%Null%" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon", + "PageName": "FGC_维护中", + "PassValues": [ + { + "Source": "项目不存在", + "TargetCell": { + "SerializeProperty": "=FGC_维护中!标题" + } + }, + { + "Source": "该项目不存在,请返回首页重新进入项目", + "TargetCell": { + "SerializeProperty": "=FGC_维护中!描述" + } + } + ] + } + ], + "ID": "31ef27e1-ea0d-4bfa-9426-55b540f79e1a" + }, + { + "CommandList": [ + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目表", + "ColumnName": "ID", + "GUID": "3fb54f57-700b-47a4-a928-59323b097c77" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目首页!项目ID" + } + } + } + ], + "ID": "55ce45a0-aff0-4566-bd66-3cf87e5fbd3a" + } + ] + } + ], + "ID": "ddee4af4-c653-4eae-976e-9bd2d26252fa" + } + ] + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "项目表", + "ColumnName": "项目成员数", + "GUID": "a75511f2-5782-4ec8-8761-a5b68a3b4d43" + } + }, + "value": "0" + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "项目表", + "ColumnName": "项目岗位数", + "GUID": "b55e4a3e-2444-4ac7-85ce-09410459888c" + } + }, + "value": "0" + } + ], + "RelationType": 1 + }, + "CommandList": [ + { + "$type": "INTRO.INTROSTART, INTRO", + "Steps": [ + { + "$type": "INTRO.Step, INTRO", + "Name": "打开菜单", + "Intro": "在项目菜单中,点击“岗位配置”来设置项目的岗位及时薪标准", + "Element": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目首页!项目菜单" + }, + "Hint": false + }, + { + "$type": "INTRO.Step, INTRO", + "Name": "人员配置", + "Intro": "点击“人员”菜单,可进入人员配置", + "Element": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目首页!项目首页导航栏" + }, + "Hint": false + } + ], + "Option": { + "ShowProgress": true, + "ShowButtons": true, + "AutoHide": false, + "ShowHint": true, + "ShowBullets": false, + "DisableInteraction": true, + "DontShowAgain": true, + "KeyboardNavigation": true + }, + "WZDZ": {}, + "VBalidate": false + } + ], + "ID": "a215696b-aa3d-4616-8e32-656f8917e938" + } + ] } ], "PermissionData": { @@ -471,4 +639,4 @@ "Formula": "项目首页!$E$3" } ] -}//zt2JbNlA9PUV4Tj67yVdFyeTWOJqX1dy6tswGBy7ODOFpv1ccvL7Z4hd98l7lO/KcISIgsSMe91Yfjw6/2VDtPswAruibaZM5L7v1PfoJGsS0GbPEcG5a7gpJPtkUGRN+3jh5D/l/CF1upxAj+M558rVlV66ugZKBgmuTEM7PthgEONzWtvdBqeqvEhGBGlsWYuArd1nFvs5oSM+vC+SiJk8RF+NmQGH1FwX5oJyqKBJ2kvcjoj93X6+QAdMEkprwro5EJsxhCNbLuP8iDMzPYZ9/fwJfHRZWu6pqANbsyMk9QbJug54NHx7/vyCm84yP19IpbQfA57wU8hIC0hAQ7dmIPUwiBho5I7dse80phP6KzuEtMgqWKNglbz4+dUPEskr882RjmS+1LgUCUsTcHuUR2RlSv3V+oA9pX5+zyHLt+A+9+DVu5IM8Q47hMYat2nxgR/igPWwZagIj2XrtgW/Pl64LxRbeL4R0xOS6YfY5U0wg5WO3sy45h8Ljhcxirv95o+bMTfcwg0zflzceJpgIDrfypZqD7VjW6YNu3RP3aQJ0Yf39m1qN3XMEmBiBxREs3ynZcBLzB3ijsJYxlKiOuGurtQaBT2aXR0JvTgQoAILUD6nFUhuSQa/cNKeNGo0M+MwRQ99kdRIqnTDbQJihEczWsdhlx5Ci+XVVvvMMIBS6ITn/fN0GpyBl/HM7IjXtIGeR4QGRwuy7B3GQ/DUO6qe2TypP5y3+pS8eQnQx5gWOdQQNsGZsHgC7ZQtwtnBR4ZDmd9eozXhFRox2O7WmK1MHc1OH0beQchqyB5zP2Ql9dU3B9TBt1TbAOxz7HaupU5sEEJav3IHcDU5LLN+u+3UxnwLqtHpBgjPNhk3jz66HkPGkxqjz+cHHPrXThy3IiZDTY9+s97YSiFbMw==|920 \ No newline at end of file +}//hEEKChnjS8L7DILkke/C9KQys8QOZkJbEenqnu36korHqXRw+rT/dKhcAbUHtrPLK5b+lZzSt4+kj+x7eo+o8pFKAL9In3bHCwAplywZFPComHB7PUY5PtPL59zD8jUzJqJdf+Dxz8q4uJxXvNRc20uMemDn7J8cdT81rnxcfcEZAgAuDHBBOpjI6HGyywAFZoOym04+Klws3yrDM6GaIPfNoq4fBcYuAjPnl2FL1WOlOIbFf1fhRhNZV4HZrW9w+O28/2G/YQmcl1lqvoxXcSWhT/i8pmtz8cZ+kyQYgGArF4CQyE1rTkZ1fYZrjtrIDc8Y8lFFpo0GJ4XfYcoaB2Jxfv3iaOwWp0bnth2BxsRbQEE6dM80zlOR5eKzUiuqHT/CuUE59z+9VE1GgUJXX4uofBB/kLNIr28oRdb1oBJUTZShrKZGJUgNkx7E3MTqIRj9FB1TVohquunKO5sghIbMLAeu218VbWi0JAQSXAC/2h2MJ08W9ZA5b1cxt8LYVoVTYoHaguR0TPvAs8r7HyP+fAzkqCp7/XDO23ZMipC16SvFLg30TXBPG+XNxWMlZKmKAQZ7oe9jwKaQyNTRqKXB4qHvfE8YGBCQQAzvqyN8273zjkHIt9d8n4QXbY1lnRbJhtzxBSik++elGOMlnMm63ghHYOMDi8g7r8CoTOH+zt4cUY5d2M7PjS8YiPqseaGSqk2htgaK4R55mIeFo6BtKnNDRciNfXEaEyzCFgBodnZLOqpiq3+7mhVFZ5KzntVzaDZBVxxSEmZ8P+9CqsvtvKjuhIILEn6SXjiDcUTh16QGcnWVHZBEYZSWBAnWcuEi//lOTD+SY+naQUImBVAobb2ZgJrJp3ihHPOPIdEpCaxq/VwE6eOjp1YHMBGpvvMsmPPJoUWgpSB4IPoGtA==|920 \ No newline at end of file diff --git a/Plugin/分步引导提示-9_0_103_0.zip b/Plugin/分步引导提示-9_0_103_0.zip new file mode 100644 index 00000000..06956065 Binary files /dev/null and b/Plugin/分步引导提示-9_0_103_0.zip differ diff --git a/Plugin/对象与集合操作工具-8_0_0_0(1).zip b/Plugin/对象与集合操作工具-8_0_0_0(1).zip index be4ed5ae..1ad861b8 100644 Binary files a/Plugin/对象与集合操作工具-8_0_0_0(1).zip and b/Plugin/对象与集合操作工具-8_0_0_0(1).zip differ diff --git a/ServerCommands/项目/删除项目岗位.json b/ServerCommands/项目/删除项目岗位.json new file mode 100644 index 00000000..d00806f3 --- /dev/null +++ b/ServerCommands/项目/删除项目岗位.json @@ -0,0 +1,119 @@ +{ + "Name": "删除项目岗位", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon", + "Permission": { + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + } + }, + "Parameters": [ + { + "Name": "项目ID", + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + { + "Name": "岗位ID", + "DataValidationInfo": { + "IgnoreBlank": false + } + } + ] + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "使用数量", + "TableValue": { + "TableName": "项目成员表", + "TableValueType": 3, + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目成员表", + "ColumnName": "岗位ID", + "GUID": "b2fe1ad9-2349-4d5a-98e9-e58c383a6790" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=岗位ID" + } + }, + "NullFormulaValueQueryPolicy": 0 + }, + "ID": "b3dc90fbc1244139ac096efd621e0ba1" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=使用数量" + } + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目岗位", + "UpdateType": "delete", + "ShowConfirm": true, + "ConfirmText": "您确定要删除吗?", + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目岗位", + "ColumnName": "ID", + "GUID": "ccce0c9f-b06c-4a3b-854e-c7c96fc1459c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=岗位ID" + } + } + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "删除成功" + } + ], + "ID": "59de0374-6029-4c6d-a256-ad61986b165a" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "该岗位已被使用,无法删除!" + } + ], + "ID": "c0ad2026-80bd-424a-8412-e6d117210e65" + } + ] + } + ] +} \ No newline at end of file diff --git a/ServerCommands/项目/新增或修改项目.json b/ServerCommands/项目/新增或修改项目.json index cdd86440..46215096 100644 --- a/ServerCommands/项目/新增或修改项目.json +++ b/ServerCommands/项目/新增或修改项目.json @@ -134,322 +134,489 @@ }, "CommandList": [ { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "项目表", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目名称", - "GUID": "ba72531e-8ec1-4115-921b-38f6ad4682c8" + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "项目经理信息", + "TableValue": { + "TableName": "用户信息视图", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "fa4e0570-8b5e-4f33-892f-8effa6fb2f22" + }, + "ColumnName": "用户名" }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目名称" + { + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "默认时薪", + "GUID": "57ec6988-4dba-4b24-b256-d5318ca97211" + }, + "ColumnName": "默认时薪" } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目代号", - "GUID": "613931f4-1ab8-4ebc-9a9a-95b677831372" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目代号" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目简介", - "GUID": "55013b16-f1b9-4113-b52d-c49df71de85c" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目简介" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目封面", - "GUID": "2ab74ca7-97b9-4c55-984d-fed79eed8153" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=封面" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目经理", - "GUID": "561506d4-fe09-4599-a4c1-171d41191c5b" + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "9c0710bd-e312-4f0e-be64-a9e9498d21b9" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=管理员" } }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目分组", - "GUID": "2cd80a9d-45bc-4b0b-8bd2-85173e2d7efd" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=分组" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "所属客户", - "GUID": "87669180-329d-4d2a-83aa-b6eae07b238b" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=所属客户" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "所属客户部门", - "GUID": "8de2537a-93f9-48b8-aa57-69c811ed82ff" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=所属客户部门" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目预算工时", - "GUID": "bcc0607f-5383-47e5-9806-587a1a341eeb" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=预算工时" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目预算费用", - "GUID": "9e58b2f0-b85a-47ee-8641-5852d34a0cbc" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=预算金额" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "公开", - "GUID": "9d26b8b4-02c9-4f1d-be06-3c23a34fab81" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=权限" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "严格模式", - "GUID": "cb9075a1-d21c-4940-b874-bd6c251468a6" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=严格模式" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "工时分配方式", - "GUID": "0e931ad2-e31d-407e-97de-594507248c77" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=工时分配方式" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "开启反馈收集", - "GUID": "131d0359-f60b-49bd-8d44-f0f5398e678b" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=开启反馈收集" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目方案", - "GUID": "96442123-f90c-438e-bf3a-9e6b7d803c01" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目方案" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "预算方案", - "GUID": "4d6f5555-82e0-4e9a-9641-bce447592ea5" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=预算方案" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "计划开始日期", - "GUID": "103e4e2c-ce74-426d-92e1-65c0eb911bec" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=开始日期" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "计划完成日期", - "GUID": "16baa626-9327-49ea-b64a-9277154b4f9a" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=结束日期" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "网络资源", - "GUID": "5c0daef8-96d5-4947-89ce-58d10d5d40d8" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=网络资源" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目状态", - "GUID": "d64f6e6f-c605-4e27-9c0b-0ea67a1fcf7c" - }, - "Value": "0" - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "删除", - "GUID": "74e09ef5-2402-4d9c-aed1-9a75481d7e14" - }, - "Value": "0" - } - ], - "ParamNameToSaveNewRowValue": "新项目" - }, - { - "$type": "Forguncy.Model.ProcessStartCommand, ServerDesignerCommon", - "ProcessDefinitionResourceName": "立项流程", - "ProcessInstanceName": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目名称&\"立项审批\"" + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" }, - "SelectedTable": "项目表", - "RowsToUpdate": 1, - "RowsToUpdateCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目表", - "ColumnName": "ID", - "GUID": "2aeae676-f1b4-4bfd-bfa9-12ec0f173380" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新项目.ID" - } - }, - "Initiator": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=管理员" - }, - "ReturnResultName": "发起流程结果" + "ID": "dfc2eb923fc64d1aa5aed2802a236088" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ { "Condition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=发起流程结果" - } - }, - "value": "%Null%", - "compareType": 1 - }, - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=发起流程结果.ID" - } - }, - "value": "%Null%", - "compareType": 1 + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目经理信息" } - ] + }, + "value": "%Null%", + "compareType": 1 }, "CommandList": [ { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "0", - "Message": "项目创建成功,正在审批,别忘了在菜单里设置项目岗位和薪资哦!" - } - ], - "ID": "d4db5b4e-16f1-44d8-b0ae-d59b3c1af93e" - }, - { - "CommandList": [ + "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目名称", + "GUID": "3e96648f-0e7c-45bf-93e6-6f500c55f334" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目名称" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目代号", + "GUID": "5bd04bd5-968a-4b5c-8d68-8b436fc5899e" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目代号" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目简介", + "GUID": "ea87ea44-4258-4d89-9991-90e93231d84b" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目简介" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目封面", + "GUID": "83689259-a91f-4e9d-a64c-d8c1201dd823" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=封面" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目经理", + "GUID": "60184710-2be4-4e6d-bf5a-3127fe9d2ca2" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=管理员" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目分组", + "GUID": "b6373067-225c-41df-b843-20c7a297830f" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=分组" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "所属客户", + "GUID": "bec5ba56-41d1-4883-bffd-827753963b99" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=所属客户" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "所属客户部门", + "GUID": "c8965baa-5e55-41ea-8974-f3bf2bea7560" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=所属客户部门" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目预算工时", + "GUID": "854752be-2f4f-476f-a8a3-c2ec29901530" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=预算工时" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目预算费用", + "GUID": "c69062a2-5c1c-4f75-abc6-36d3d6a270f2" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=预算金额" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "公开", + "GUID": "1a673e3d-715d-454e-b99f-526f536c7536" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=权限" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "严格模式", + "GUID": "2ee6d9f6-6268-42be-8ed6-98dc4733f433" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=严格模式" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "工时分配方式", + "GUID": "10131c97-9740-4b75-bc56-ab4d3cf66e33" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=工时分配方式" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "开启反馈收集", + "GUID": "003b7e73-0897-40d7-879c-baa6c4241157" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=开启反馈收集" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目方案", + "GUID": "7af3baa1-fac9-4485-b694-7229e9156854" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目方案" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "预算方案", + "GUID": "f6175e4e-8ec3-478e-afb1-12007d0fc078" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=预算方案" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "计划开始日期", + "GUID": "c3d8e642-7419-497c-a8f1-11cb25fd1a04" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=开始日期" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "计划完成日期", + "GUID": "10f81871-dc90-4560-a12a-884cbcf7e3b3" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=结束日期" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "网络资源", + "GUID": "4df5c6f5-b31f-4b10-9e10-56e1edee52f7" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=网络资源" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目状态", + "GUID": "d16f45d2-8a95-4a6b-a2b1-198e7e861104" + }, + "Value": "0" + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "删除", + "GUID": "4622cb74-678c-4ba5-820a-3129c7f56e38" + }, + "Value": "0" + } + ], + "ParamNameToSaveNewRowValue": "新项目" + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目岗位", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "项目ID", + "GUID": "e7c333a4-4ae2-4336-89ef-13b74a81afdc" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新项目.ID" + } + }, + { + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "岗位名称", + "GUID": "bc6cc0de-adf0-4d7e-b906-8d50ea713b06" + }, + "Value": "项目经理" + }, + { + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "岗位描述", + "GUID": "743ea686-ec3b-45ec-812c-9ba68e8f9e06" + }, + "Value": "项目开发主要负责人" + }, + { + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "默认时薪", + "GUID": "843f9905-80ab-4a1a-8c8b-5eb86fbdb79b" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目经理信息.默认时薪" + } + } + ], + "ParamNameToSaveNewRowValue": "新岗位" + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目成员表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目ID", + "GUID": "e0ff396d-0572-43f5-97ea-f26da738a354" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新项目.ID" + } + }, + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "981b2389-c28b-4a7b-83bb-edce041511df" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目经理信息.用户名" + } + }, + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "岗位ID", + "GUID": "bc79feb2-7989-4046-bf94-1884697bc848" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新岗位.ID" + } + }, + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "默认时薪", + "GUID": "9cca855a-b469-4475-a100-461fe1567996" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目经理信息.默认时薪" + } + } + ] + } + ] + }, { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "400", - "Message": "项目已创建,但未能发起审批,请手动发起审批流程!" + "$type": "Forguncy.Model.ProcessStartCommand, ServerDesignerCommon", + "ProcessDefinitionResourceName": "立项流程", + "ProcessInstanceName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目名称&\"立项审批\"" + }, + "SelectedTable": "项目表", + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目表", + "ColumnName": "ID", + "GUID": "2aeae676-f1b4-4bfd-bfa9-12ec0f173380" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新项目.ID" + } + }, + "Initiator": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=管理员" + }, + "ReturnResultName": "发起流程结果" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=发起流程结果" + } + }, + "value": "%Null%", + "compareType": 1 + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=发起流程结果.ID" + } + }, + "value": "%Null%", + "compareType": 1 + } + ] + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "项目创建成功,正在审批,别忘了在菜单里设置项目岗位和薪资哦!" + } + ], + "ID": "8256d3e3-3ddf-40ab-9557-fbfafd8bb15c" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": "项目已创建,但未能发起审批,请手动发起审批流程!" + } + ], + "ID": "1fdf4173-7a60-45ae-8b02-a015028a8f3d" + } + ] } ], - "ID": "62c77793-4ab7-46dc-bb67-4180c2327945" + "ID": "e830892a-f7c4-466e-95aa-1da7c93999f4" } ] } ], - "ID": "b21ee447-0431-455d-8ab2-bc13039d2728" + "ID": "6d4a526e-a7de-481a-b8e6-97ca6c408553" }, { "CommandList": [ @@ -467,6 +634,14 @@ "GUID": "b8486155-4f64-4dd8-b85c-16543680907f" }, "ColumnName": "严格模式" + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目经理", + "GUID": "f5e1a885-651e-497c-90ef-1e5c341bca1a" + }, + "ColumnName": "项目经理" } ], "SqlCondition": { @@ -484,7 +659,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "284902c03cb74c7993b7d8dbf2fce968" + "ID": "768912ca847b455a9aca3255eb8cd259" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -496,7 +671,7 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=预算金额" + "SerializeProperty": "=严格模式" } }, "value": "1" @@ -556,7 +731,7 @@ }, "TopCount": "1" }, - "ID": "a14bc416e4cb49b0916ce2ea17bd826b" + "ID": "438b9541159f4e059c41ac6218483385" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -587,7 +762,7 @@ } } ], - "ID": "c36b29c9-9957-42df-9690-9f208641bdbd" + "ID": "66499e8b-2351-4c5b-b1f1-cd5b8dc717a2" }, { "Condition": { @@ -615,214 +790,297 @@ } } ], - "ID": "5426b27b-6ef9-4f1b-8da5-c19ae061359b" + "ID": "fcbb7529-21e7-4e3e-ba92-c0b99bb3e76d" } ] } ], - "Comments": "如果是更新项目,且改变了工时核定方式、严格模式,那么就要校验。超标就不允许切换", - "ID": "efd0d865-3277-431b-897a-1ff2245522bc" + "Comments": "如果是更新项目,且改变了严格模式,那么就要校验。超标就不允许切换", + "ID": "506d025b-1b61-4a91-a122-3b00b6245071" } ] }, { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "项目表", - "ShowConfirm": false, - "RowsToUpdate": 1, - "RowsToUpdateCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { + "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=管理员" + } + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息.项目经理" + }, + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目成员表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目ID", + "GUID": "db0befa6-0885-460f-b25a-6e9f19a8037f" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "7b89d50e-7e26-4adc-8edf-1df1056507ec" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息.项目经理" + } + } + ] + }, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "f1858360-ae53-4066-9519-b532e9626890" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目经理信息.用户名" + } + } + ] + } + ], + "ID": "48eb43d4-acb8-48eb-b7c3-67366f34a787" + } + ] + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", "TableName": "项目表", - "ColumnName": "ID", - "GUID": "a8a27903-2609-49d7-8f9c-318870a24d2a" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=ID" - } - }, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目名称", - "GUID": "72f3cbd1-4112-4d43-82f2-efaaa83f6835" + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目表", + "ColumnName": "ID", + "GUID": "a8a27903-2609-49d7-8f9c-318870a24d2a" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ID" + } }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目名称" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目代号", - "GUID": "608cf5fc-c310-458c-a19b-e5bf256fdabd" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目代号" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目简介", - "GUID": "ddaac69a-e94f-4345-ab8d-0250b8f16a25" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目简介" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目封面", - "GUID": "4397866f-cced-4246-aa29-628132a9c6e3" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=封面" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目经理", - "GUID": "592e09cf-4c9f-4deb-aaf9-eeeda98ef011" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=管理员" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目分组", - "GUID": "a34ae1e6-d69c-4eaa-80d1-d52164df08dc" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=分组" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "所属客户", - "GUID": "3eeb977b-42b0-4fd1-b420-9af88f8b9898" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=所属客户" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "所属客户部门", - "GUID": "2f6ed00a-a7d4-4058-b164-c26a2ad9a674" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=所属客户部门" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "公开", - "GUID": "c54fce59-e10a-4b22-8b46-5922c3e39975" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=权限" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "严格模式", - "GUID": "7cde26d9-3ede-40a6-906d-3729243fae8b" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=严格模式" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "计划开始日期", - "GUID": "3671ddb1-49d1-4e7d-be2f-5af02876e6dd" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=开始日期" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "计划完成日期", - "GUID": "a0f92d5f-21d4-4a39-8602-375ffb118f0d" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=结束日期" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目方案", - "GUID": "dc7c3287-73d9-4705-ac47-4a28d37f2c22" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目方案" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "预算方案", - "GUID": "9059092a-39e7-4e23-af6b-e6bc2ba3964f" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=预算方案" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "网络资源", - "GUID": "0081bad7-8e04-4a41-8c91-1a1e12bcddbd" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=网络资源" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "开启反馈收集", - "GUID": "287ed753-de9c-4c7d-a5d5-95d3793b4b4b" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=开启反馈收集" - } + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目名称", + "GUID": "7ddc40d8-7955-4e89-8690-1b46e11ece27" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目名称" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目代号", + "GUID": "1e4059c5-b185-494e-aa18-195aa0c5f204" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目代号" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目简介", + "GUID": "b1338e5a-9521-415f-94b9-6c1a9abcbc1f" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目简介" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目封面", + "GUID": "184d4581-59a7-4d22-abca-5268afd76020" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=封面" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目经理", + "GUID": "7563f455-296b-40e2-a822-c96d0139d20a" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=管理员" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目分组", + "GUID": "0f0b8862-a1d4-48ff-a166-122dd7e802f4" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=分组" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "所属客户", + "GUID": "05f27db9-9934-4353-91bb-333205cbc63d" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=所属客户" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "所属客户部门", + "GUID": "7ff393d2-d6bb-49f9-9ff1-2363796f8cb3" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=所属客户部门" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "公开", + "GUID": "610eb519-4062-4d06-948f-c2d9bc2f18b4" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=权限" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "严格模式", + "GUID": "b87efa95-efd1-4a6d-81dc-b7933d759b86" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=严格模式" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "计划开始日期", + "GUID": "2c510e3d-e6f7-460f-9ae5-bd1ce61ea0c9" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=开始日期" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "计划完成日期", + "GUID": "70671e09-1c83-4574-909f-97145bc9463c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=结束日期" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目方案", + "GUID": "cefa0f72-e7fd-4a47-9209-cef16d1c42fc" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目方案" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "预算方案", + "GUID": "83e17ee8-346d-49a4-98d7-bbe61738e4a1" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=预算方案" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "网络资源", + "GUID": "9337a4fb-1f99-418f-b744-1fa49ebb0f43" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=网络资源" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "开启反馈收集", + "GUID": "5c21d73b-7c99-498c-97d5-8daa01016645" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=开启反馈收集" + } + } + ] } ] + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "更新项目成功" } ], - "ID": "2e094e9c-e390-4588-9a0e-c119915e5d64" + "ID": "fd929698-43e1-4bd8-bc91-423a9fc7d807" } ] } diff --git a/ShareCommandContainers/跳转当前项目.json b/ShareCommandContainers/跳转当前项目.json index 61efd9d4..5bbd49bc 100644 --- a/ShareCommandContainers/跳转当前项目.json +++ b/ShareCommandContainers/跳转当前项目.json @@ -46,14 +46,13 @@ } } ], - "ID": "81638e77-9cff-4206-bac4-fccec872367a" + "ID": "2b3d16c1-5a6b-4392-a327-57001c24be2c" } ] }, { "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon", - "PageName": "项目首页", - "LoadBindingDataOption": 1 + "PageName": "项目首页" } ] } \ No newline at end of file diff --git a/Tables/项目/项目表.json b/Tables/项目/项目表.json index 873518d5..addaf23d 100644 --- a/Tables/项目/项目表.json +++ b/Tables/项目/项目表.json @@ -594,6 +594,32 @@ "Name": "已分配计划工时", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "ID", + "GUID": "11b3445b-d3ea-44d3-ad8a-af2e84040a79" + }, + "AggregateFunction": 1, + "DataColumnName": "ID", + "DetailTableName": "项目成员表", + "Name": "项目成员数", + "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "ID", + "GUID": "6816c340-798e-457b-8900-ea168d4dcd18" + }, + "AggregateFunction": 1, + "DataColumnName": "ID", + "DetailTableName": "项目岗位", + "Name": "项目岗位数", + "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",