From c5cddd93dbbcbaf47ef78a4b39aeedd6e0417a49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B6=85=E5=93=A5?= Date: Tue, 25 Jun 2024 17:47:00 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E4=BC=98=E5=8C=96=E5=B2=97?= =?UTF-8?q?=E4=BD=8D=E8=AE=BE=E7=BD=AE","MessageType":2,"Modules":[{"State?= =?UTF-8?q?":1,"Type":1,"Name":"PCPage/=E9=A1=B9=E7=9B=AE=E6=88=90?= =?UTF-8?q?=E5=91=98=E8=AF=A6=E6=83=85"},{"State":1,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E9=A1=B9=E7=9B=AE=E5=B2=97=E4=BD=8D=E8=AF=A6=E6=83=85"},{"St?= =?UTF-8?q?ate":1,"Type":1,"Name":"PCPage/=E9=A1=B9=E7=9B=AE=E6=88=90?= =?UTF-8?q?=E5=91=98"},{"State":1,"Type":27,"Name":"ServerCommandPrivate/?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=A1=AB=E5=85=85=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=95=B0=E6=8D=AE"},{"State":3,"Type":16,"Name":"TaskScheduler?= =?UTF-8?q?/=E4=BB=BB=E5=8A=A1=E8=A1=A8=E6=9B=B4=E6=96=B0=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 57 +--- Pages/项目/项目成员详情.json | 244 ++++++++++++------ Pages/项目/项目成员详情.rd | 8 +- .../项目/项目首页/项目配置/项目岗位详情.json | 14 +- .../项目首页/项目首页-容器页面/项目成员.json | 30 ++- SchedulerTasks/任务表更新事件.json | 124 +++++++++ ServerCommands/任务/初始化填充任务数据.json | 6 +- 7 files changed, 332 insertions(+), 151 deletions(-) create mode 100644 SchedulerTasks/任务表更新事件.json diff --git a/.collaboration b/.collaboration index d962a8bb..6b93d5a4 100644 --- a/.collaboration +++ b/.collaboration @@ -522,31 +522,11 @@ }, { "ModuleName": "PCPage/项目成员详情", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-25T17:45:07.9174506+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目成员详情.json", - "Pages\\项目\\项目成员详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目岗位详情", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-25T17:44:37.6120706+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目配置\\项目岗位详情.json", - "Pages\\项目\\项目首页\\项目配置\\项目岗位详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目分组详情", @@ -598,21 +578,7 @@ }, { "ModuleName": "PCPage/项目成员", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-25T17:43:27.5403839+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目成员.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目成员.rd", - "Pages\\6899a8cead694b3ba00307b6756dbd7.json", - "Pages\\6899a8cead694b3ba00307b6756dbd7.rd", - "Pages\\007ea4aa4c7440478a9a092179dace8.json", - "Pages\\007ea4aa4c7440478a9a092179dace8.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目负荷", @@ -2096,16 +2062,7 @@ }, { "ModuleName": "ServerCommandPrivate/初始化填充任务数据", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-25T17:37:19.3307072+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\任务\\初始化填充任务数据.json" - ] + "ModuleType": 27 }, { "ModuleName": "UserControlPage/Git提交记录单块", @@ -2293,12 +2250,6 @@ }, { "ModuleName": "TaskScheduler/任务表更新事件", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-25T17:42:18.0340271+08:00", "ModuleType": 16 } ] \ No newline at end of file diff --git a/Pages/项目/项目成员详情.json b/Pages/项目/项目成员详情.json index d7991e29..cf0c4862 100644 --- a/Pages/项目/项目成员详情.json +++ b/Pages/项目/项目成员详情.json @@ -41,16 +41,6 @@ "DesignLengthInPixel": 35.0 } }, - "12": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "13": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, "14": { "GridRowColumnDefinition": { "DesignLengthInPixel": 35.0 @@ -62,6 +52,21 @@ } }, "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "19": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "IsHidden": true @@ -69,9 +74,9 @@ } }, "InLogicalVisibleIndexes": [ - 16 + 19 ], - "Count": 17, + "Count": 20, "DefaultSize": 32.0 }, "Cols": { @@ -162,12 +167,15 @@ }, "Values": { "1,1": "成员", - "4,1": "成员默认时薪", + "4,1": "默认时薪", "7,1": "岗位", - "10,1": "默认时薪", - "10,14": "*优先级高于岗位成员时薪", - "14,1": "取消", - "14,12": "保存" + "10,1": "岗位时薪", + "10,14": "*优先级高于默认时薪", + "11,1": "跟随个人默认时薪", + "13,1": "项目时薪", + "13,14": "*优先级高于岗位时薪", + "17,1": "取消", + "17,12": "保存" }, "Formulas": { "5,1": "IFERROR(ODATA(\"用户信息视图?$select=默认时薪&$filter=用户名 eq \"&IF(ISBLANK(B3),\"null\",\"'\"&B3&\"'\")&\"&$top=1\"),\"\")" @@ -398,7 +406,7 @@ }, "value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目成员详情!B12" + "SerializeProperty": "=项目成员详情!B15" }, "compareType": 1 } @@ -423,7 +431,7 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目成员详情!B12" + "SerializeProperty": "=项目成员详情!B15" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -433,17 +441,17 @@ ] } ], - "ID": "a3cfb99a-b271-4df8-9e26-a7bb679b93a3" + "ID": "3f8dd57c-d384-446c-8d22-6aed78c64d3c" } ] } ], - "ID": "3f4bffe9-5247-4fcd-b52f-eb0348f63501" + "ID": "ff9b50a3-6172-4c78-9820-a54fc436d193" } ] } ], - "ID": "a052463c-39a7-4a4c-bd42-040d4591631f" + "ID": "f03e2a2d-0e8d-42bb-b7d5-2f3954ab3888" } ] } @@ -535,6 +543,41 @@ } }, "11,1": { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "岗位ID", + "GUID": "843bdb14-43a3-40c7-88e6-078cfc899449", + "RelationBinding": { + "RelatedTable": "项目岗位", + "RelatedColumn": "ID", + "DisplayColumn": "默认时薪" + } + }, + "CellType": { + "$type": "ElementUI.InputNumberCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "DefaultValue": "跟随个人默认时薪", + "step": 1, + "controls": false, + "controlsPosition": true, + "IsDisabled": true + } + }, + "14,1": { "BindingInfo": { "TableName": "项目成员表", "ColumnName": "默认时薪", @@ -558,7 +601,7 @@ } ], "step": 1, - "placeholder": "留空则跟随岗位时薪设置", + "placeholder": "跟随岗位时薪", "controls": false }, "DataValidationInfo": { @@ -566,7 +609,7 @@ "InputMessage": "如果任务没有设置时薪，则采用此处设置的时薪来计算收益" } }, - "14,1": { + "17,1": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -578,7 +621,7 @@ "TemplateKey": "_RS_Information3" } }, - "14,12": { + "17,12": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -658,7 +701,7 @@ ] } ], - "ID": "4af62953-38b2-4ceb-b0ac-d38f408319f5" + "ID": "43763056-035b-4668-8545-65c38306ed9b" }, { "CommandList": [ @@ -668,12 +711,12 @@ "Message": "请不要重复添加成员" } ], - "ID": "915e74eb-ed50-4ba8-8b9c-a00841134042" + "ID": "59458a1f-219f-4c75-9f26-820e811be36d" } ] } ], - "ID": "969d3dcb-f245-4a2c-bdb9-3ce384bc077f" + "ID": "317396e2-5d07-45c5-9386-95f163e66a2f" }, { "CommandList": [ @@ -683,7 +726,7 @@ "ShowConfirm": false } ], - "ID": "a10a5d36-b082-46cf-9215-d2df05cf7870" + "ID": "eef385a2-8806-4c67-89ba-089a7501f43a" } ] }, @@ -705,7 +748,7 @@ ] } ], - "ID": "98599c88-c31e-409d-b773-16cd15e4e9cd" + "ID": "6f365729-65f1-432b-a6fa-1e26266e6b85" }, { "CommandList": [ @@ -715,7 +758,7 @@ "Message": "请指定项目" } ], - "ID": "6fad716c-82fc-4eca-ab31-bee07532647a" + "ID": "46382263-7363-4a12-8307-6f5c8c2fa485" } ] } @@ -724,28 +767,28 @@ "TemplateKey": "_RS_Main1" } }, - "16,0": { + "19,0": { "BindingInfo": { "TableName": "项目表", "ColumnName": "ID", "GUID": "59d90698-39f5-4c8b-bbb9-dadfb4cb5ee5" } }, - "16,4": { + "19,4": { "BindingInfo": { "TableName": "项目成员表", "ColumnName": "ID", "GUID": "314562f3-292a-48d6-ae9b-f410d11976b3" } }, - "16,7": { + "19,7": { "BindingInfo": { "TableName": "项目表", "ColumnName": "项目成员", "GUID": "f8e37c92-932d-4893-8ba6-0af354a81936" } }, - "16,11": { + "19,11": { "BindingInfo": { "TableName": "项目成员表", "ColumnName": "项目ID", @@ -774,6 +817,13 @@ "FontSize": 13.333333333333332, "Formatter": 2 }, + { + "FontFamily": 0, + "FontSize": 12.0, + "Foreground": 3, + "Formatter": 1, + "HorizontalAlignment": 4 + }, { "FontFamily": 0, "FontSize": 12.0, @@ -880,10 +930,10 @@ "9,8": 1, "9,9": 1, "9,10": 1, - "9,11": 1, - "9,12": 1, - "9,13": 1, - "9,14": 1, + "9,11": 2, + "9,12": 2, + "9,13": 2, + "9,14": 2, "9,15": 1, "10,0": 1, "10,1": 0, @@ -896,39 +946,74 @@ "10,8": 1, "10,9": 1, "10,10": 1, - "10,11": 1, - "10,12": 1, - "10,13": 1, + "10,11": 2, + "10,12": 2, + "10,13": 2, "10,14": 3, "10,15": 1, "11,0": 1, - "11,1": 1, + "11,1": 2, "11,15": 1, - "12,1": 4, - "12,2": 4, - "12,3": 4, - "12,4": 4, - "12,5": 4, - "12,6": 4, - "12,7": 4, - "12,8": 4, - "12,9": 4, - "12,10": 4, - "12,11": 4, - "12,12": 4, - "12,13": 4, - "12,14": 4, - "14,1": 0, - "14,2": 1, - "14,3": 1, - "14,12": 0, - "14,13": 1, - "14,14": 1, - "16,0": 5, - "16,1": 6, - "16,2": 6, - "16,3": 7, - "16,4": 1 + "12,0": 1, + "12,1": 1, + "12,2": 1, + "12,3": 1, + "12,4": 1, + "12,5": 1, + "12,6": 1, + "12,7": 1, + "12,8": 1, + "12,9": 1, + "12,10": 1, + "12,11": 1, + "12,12": 1, + "12,13": 1, + "12,14": 1, + "12,15": 1, + "13,0": 1, + "13,1": 0, + "13,2": 1, + "13,3": 1, + "13,4": 1, + "13,5": 1, + "13,6": 1, + "13,7": 1, + "13,8": 1, + "13,9": 1, + "13,10": 1, + "13,11": 1, + "13,12": 1, + "13,13": 1, + "13,14": 4, + "13,15": 1, + "14,0": 1, + "14,1": 1, + "14,15": 1, + "15,1": 5, + "15,2": 5, + "15,3": 5, + "15,4": 5, + "15,5": 5, + "15,6": 5, + "15,7": 5, + "15,8": 5, + "15,9": 5, + "15,10": 5, + "15,11": 5, + "15,12": 5, + "15,13": 5, + "15,14": 5, + "17,1": 0, + "17,2": 1, + "17,3": 1, + "17,12": 0, + "17,13": 1, + "17,14": 1, + "19,0": 6, + "19,1": 7, + "19,2": 7, + "19,3": 8, + "19,4": 1 }, "SheetStyle": { "FontFamily": 0, @@ -936,16 +1021,17 @@ } }, "Spans": [ - "14,1,1,3", - "14,12,1,3", + "17,1,1,3", + "17,12,1,3", "2,1,1,14", "8,1,1,14", - "11,1,1,14", - "16,4,1,3", + "14,1,1,14", + "19,4,1,3", "5,1,1,14", - "16,7,1,4", - "16,0,1,4", - "16,11,1,3" + "19,7,1,4", + "19,0,1,4", + "19,11,1,3", + "11,1,1,14" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -974,15 +1060,15 @@ "CustomNames": [ { "Name": "项目ID", - "Formula": "项目成员详情!$A$17" + "Formula": "项目成员详情!$A$20" }, { "Name": "已有项目成员", - "Formula": "项目成员详情!$H$17" + "Formula": "项目成员详情!$H$20" }, { "Name": "ID", - "Formula": "项目成员详情!$E$17" + "Formula": "项目成员详情!$E$20" } ] -}//w1o5z8QGA831HQzoIATK11poxKozy3N+W2YsZ42STFz9IRio/yk53y8QX0xiWMuRWMrr3qremj16tQ70DI9VMtDJnX3ZtjsZSq/1DWmUte3uqchWfgzxxD4WxcBDbJEP6lhTcOoQP0HYfiHWl4Wt0TB+i8wpjevy+qwav18nlUw2YDWWTpXX0aSONq6Y0xJavLxpTHDye1baS4P+2Bc2OEuzG0eMYEzrY+uV2TRV45ibwvf5mo2BTh03/o9xN+TlnFulmfkjoq2P/GDgxnqAkq5Gs2rV1g08mZpMQfmhGh7QqNPk0EhJqKkBzNpij0DoKpq/sOYQrOPdvy61FrKbvCCXJCjvrkbIrK4hg4kUIZB13JwsWsxxO90nJnzhmXcm4eDsRUDCVlFlsrkjxWYrFMGaTDmR8ctKex3iO3ReK3NQLjKih+pLd5lgZ5QaeTZSAqi7XThqm5cI5xz9996+dY/Q6cvZrfy1L1QWiWQs8sxSTKALYAuBwumeHp6o2E7LPimOQF+kTdPn32CS0lrv8K6gRbTFIhntSZyyiu3LfZ/hNcibXe2wEfp6S3qk+brozq6sKJcfoaFK8uw6+28vmn2BHePxH4PcLP3ULGkICxBfxji9IURANSfxFqe5M4IbTo3NcWp0LytSs7gz8bRlq9GhvbF2ef6E2FvxZIg5AQxVnD8hbOxob0sNESAIS6vsAEPFnaXR5LKIm/K2Khkx3JByMwc4+PgyGqToAhMNmkoaR9R3x8/AvTMxfwISRukCaOEnYZc2q7lm2zhailhLb+aB6eTWcp/iJhMRuzFaLIk95upOnStjLvC+olpCraXpCA7reNCCm17rpy5FBW1tFxXz/wh9WB5mBD3/fqWsbbHLs8hutbeD4w6hMJv8BFXnA3IVLI3tqUIVWZOEI1aeKA==|920 \ No newline at end of file +}//5NBrvpQLbb1Qo9Vq+18UAn1zsAAuUvsSh/VUehFHw671SgkJCg+WyXdJfznMehVDOKW2CoAPAd+0DvBls7yIO8DTX+q+kJCf92vC/3yip5g6wp5CxmB76ELIRLAJ+2eHl9tkEmk9jOVYztjPN3pEvnJkIKyChblpZL6KDoCHyrMIM0cX3BQyLx00URR4i+q0hMPwBRGtAL3bWwcBE9mQuILoh8m07SF5o+UeyiaM4qMcAJ8z08o4iZMkFsb5dlnMvEINr9yuOX+DyrQz5HlrQnfjBBSqB9iyEGShR8cC2rTxM75wUQS8A69ecSSRAU1GegamF59RbTcpat5OsCRDQa0ZtW/77k1HWE1bgYLV+PYHPRrnzPTgem8RGJD5bo1QKM4AQMKzMSZcblkNRWaJTi8/r9jHTqJdf7nHL7qbdTp8XiYV5ZzdV76nOyzBWLKbfxlioGu9i+7eMN+j7Oiq6fCwkLu0T6DTwKgmnLALMKx6MLitp//eafadVqtFk1umYFTna5xHmvnFId4uk5rD4HatQdCPYMU5OfOfZAHHKmZ7SxVR4SV8VQ0sTbB7nHRXmguisqAA0jCM2qdaC2BmBEBayMxKzV725SjtjUFQqTLzJ414RX4tPJ/6QoTywregFk8+uZOhgwZpkJE0M4gxToi9qXPz6BnlyDTA3eZzbDTcdwsvgo2hkEAHQ+ko6ogFGFuajh46FB22QcMqM8bZ5YhofWdHcdJqr6sIS4CPDUe/7f98iR80XFaRfn2eJPKOLXpJXORnLM4JRM+Mn8GVwTdrXYRN3DVN2nQwcq2mESNR1oaosnq0+klcVD00z6RMoVKtFqkc0+wQoLvmgZo1s8whfW0axw60XXt4X8JCTifZIn1K99ZLSrdDK4CRjRBwkxbdlvOvatjA/ZPgoG3Z3w==|920 \ No newline at end of file diff --git a/Pages/项目/项目成员详情.rd b/Pages/项目/项目成员详情.rd index 4416d85c..0104f469 100644 --- a/Pages/项目/项目成员详情.rd +++ b/Pages/项目/项目成员详情.rd @@ -1,22 +1,22 @@ { "PageType": 0, "ColumnCount": 16, - "RowCount": 17, + "RowCount": 20, "Formulas": { "5,1": "IFERROR(ODATA(\"用户信息视图?$select=默认时薪&$filter=用户名 eq \"&IF(ISBLANK(B3),\"null\",\"'\"&B3&\"'\")&\"&$top=1\"),\"\")" }, "CustomNames": [ { "Name": "项目ID", - "Formula": "项目成员详情!$A$17" + "Formula": "项目成员详情!$A$20" }, { "Name": "已有项目成员", - "Formula": "项目成员详情!$H$17" + "Formula": "项目成员详情!$H$20" }, { "Name": "ID", - "Formula": "项目成员详情!$E$17" + "Formula": "项目成员详情!$E$20" } ] } \ No newline at end of file diff --git a/Pages/项目/项目首页/项目配置/项目岗位详情.json b/Pages/项目/项目首页/项目配置/项目岗位详情.json index 12df56a1..95f22201 100644 --- a/Pages/项目/项目首页/项目配置/项目岗位详情.json +++ b/Pages/项目/项目首页/项目配置/项目岗位详情.json @@ -313,7 +313,7 @@ } } ], - "ID": "33db34e6-1225-4518-ae49-9e6c860016e5" + "ID": "5ee10dec-45d1-4232-900b-b6f7a80f930c" }, { "CommandList": [ @@ -328,7 +328,7 @@ "BtnText": "知道了" } ], - "ID": "61e5384b-481a-4d42-aa1f-c4ca5a67214d" + "ID": "8e1cbe79-7f33-4848-82ce-83cfa3cc585a" } ] } @@ -399,7 +399,7 @@ ] } ], - "ID": "d61c0fad-8849-4700-a10d-b4945f02b5d3" + "ID": "b314a464-6829-4362-8800-c9bcd952c77c" }, { "CommandList": [ @@ -409,7 +409,7 @@ "ShowConfirm": false } ], - "ID": "52034a1c-77b8-4ee8-92f0-7cf812fc4001" + "ID": "7e15f1a0-42ff-4357-a1fb-ae5d9a19e264" } ] }, @@ -423,7 +423,7 @@ "Message": "操作成功" } ], - "ID": "6373e5c3-8888-4d09-b49d-70ab9d7f2281" + "ID": "9a86c89b-bd20-4745-9cec-b83af9be498e" }, { "CommandList": [ @@ -433,7 +433,7 @@ "Message": "请指定项目" } ], - "ID": "040bfe3f-59af-468a-90b9-892df04eb101" + "ID": "8477ee62-27d9-4287-80fd-5e222cf15efc" } ] } @@ -625,4 +625,4 @@ "PaperSize": {}, "Margin": {} } -}//lhJN5sv+83YemmFuY1pT3+n2g/IFhyGU1tE8YBp/X+QesjssUrLehVSLJW4QmhoRMHXxJkJBsW01hXHAN0vo+LtHeZ0rvJ6zmGfDI4Q+h9hHkFGp187zINWt2Pj9nAuwguSIzw8yyFYmCGvKN0J9YV7aeVdaLMSIPeQmp3C9uxBOZFG/9mvogtB0a/MMwjBIif4PYcMT4PnHTzZK+J1IB5SsqQJwzynVmNrBLh9KgSwAIHnW6zMTu9X6FKC9C91wrqHqKhvt5K06uS4oAK9SikDKQRXG35Qlf3ZwE6hx9VTeBH2qeL4bWiInxKstDWbE8YdoosiCPj9nyiW9xcZjH/j1fvwHL5AOwSyhy0U/Ugf8/3qCFF35fXN3Jh0zVEdzvr17sLOuDAtN0Z8dmTXG36MlfBc5+WzuNtGS3d3AtkyJzAkAIv3/vXT35XaZ7uYXm7U6ifsjhgTett1duJihLPmFcqqf+7/GVVIpgwRFeog77UxIJ0O56nYQifvGmk8FEZXzUcF/yye3K8Jt6N/BoxZKJuZoVzjOT7w0/c+xzZz4BDeNBFG3buVw3z+ahUGEODj4kpZYai33O+XDf2DhncDuhrDoQyDuaSbCg8LyP+f0pgNXTTsj60ZZo4Ju0wcDppUMdb8bqRc4DLv4KNPvjnQwjgGEtwv/lEVmonpmyYTmuBJJcBOOTrHCgdKYe3OaW/jHSdqtbKQXX22OzD9NHg2xnV3P8JZM0YwAyXnVHsaKZQ8TAU3zfPNKIx/Wd/SR/FO5VYYlz3Z0oHinFE+hP3tgo6vrAnImU8p6lHXflsBCL1RYvAN57qTIMo3mgsBklMZ4iVkG1oFWVgd+X0sha1gNiQ3HDTaeiobgVa508qQn3FxJzYRP8F3FbIbTyeolJ5zspI13p9962ZMTtG3uxA==|920 \ No newline at end of file +}//vQKqr5wJZ3bAk5zptpBn3rIe6meiDJ29ysfdBpFBPzZN7E9IBrnrFhMe9vMA+V0dEBQHRtfIQVldjwZM9zxW8jHc6VnnbP09XWrbGKMIcxM2hCvkCX0rQzjqXNkBNnsh8sUsbOxa82JpMMMTyEVhkqOS0U7bJ3lL0j4gwV2f7s+Uv7XimEJhbQ/TPoC7lZbItO4hDXTP3yHaKwEfFNLd87e0Qp8D4NAof7R3WoUpu0GDX9k1kt7a5PZ4xtuzdE0Rl+Yb3A2rlOYhRj5XSOTCIyPUE0lyNmWiaeo9QURyJ5iVKj6mziVRQwbTAcxuU1E6LIMIvHquNIBgXjoAhmoCDUp0ZVuNESTFjXotcmB3HEJYzqbSWxnyAVNqb32npWXt5DXl9iqYcIdKjgj4G76KUdECt4U2lSDcJ6VuNeyziqLiyetQelV47u7hOOtU/auS0OvFKp6DixKGQgUHUokaoYTXLIdJ8OFwegqFYI+qFiDtPl4M5H3n+jPkyKCpQMPWwSNsn63QegaENMaxoZ31v3B7LTC4Jhc19tBeGJdqrUmzEv9BoGGwv7AVtmlJyOVEIVRfNWkQ2kLwJaTZdWfzu1cStg2OwVIYOCrWcQEWAs6qNdpJgJC3pW8x1X2kAZtMPSpSOBoDDQM76Iwq7T/v90vFyxGIXyDxrOGcnXx3MPvrfssJqfc2IfodCtrclzS/ipGMyYNLLi2VVb8eUP+7HlnCJ/TwLAkObG2R5mWpdTLdu+LLhghtWY6/9bg+ipHxSdcmo30qjn4NIJYlypuhCn7LtEbaioDpixKnWR6698xUs9UwKklVeWxtsb10P/KAbtakmHNrfl8yBqkU0s5+OQJmAtwObvGvF2HptN0R/j4ujOqR+RU+SVQUeccKrCVw7FWwdZEG6rzg8UPxRqx9gg==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目成员.json b/Pages/项目/项目首页/项目首页-容器页面/项目成员.json index 1da1f6aa..fa808f9b 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目成员.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目成员.json @@ -492,6 +492,26 @@ "Commands": [ { "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "ClosePopupCallbackCommand": { + "Commands": [ + { + "$type": "Forguncy.Model.UpdateListviewCommand, ServerDesignerCommon", + "ListviewName": "项目岗位表格", + "UpdateType": 6, + "UpdateListviewCommandRunTimeMethodSetting": { + "MethodName": "Reload", + "ParameterValues": { + "clearFilter": false, + "clearSort": true, + "clearRuntimeQueryConditions": true + } + } + } + ], + "ParamProperties": { + "IsOK": "是否为确定" + } + }, "PageName": "项目岗位详情", "LoadBindingDataOption": 1 } @@ -617,7 +637,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "3f0cf09c-e8ee-4074-80cc-7c0366c7e414" + "ID": "7726fbdd-7ff8-4419-93fc-732f017660e1" }, { "Condition": { @@ -680,17 +700,17 @@ "BtnText": "知道了" } ], - "ID": "1eecdad2-bf97-4512-b3d8-2d600cd2ce23" + "ID": "d3bcf502-8de5-4368-b2cf-a91f1d61904d" } ] } ], - "ID": "f2eda0dd-8bcf-42d7-9901-2f52ed59a00f" + "ID": "9d8f206f-8203-495f-96fb-68331045b2d8" } ] } ], - "ID": "f0fb897f-e2d3-497e-8ed7-1090ecc36a7a" + "ID": "0599ca49-8563-46ff-be08-a5715a082abc" } ] } @@ -1051,4 +1071,4 @@ "Formula": "项目成员!$B$7" } ] -}//w3IfLixcU0EnRZeKTcmB4JVOu+tuFnG7WS6Z1hx3QKWvMi0eqby+brNZ/W3ze7LkO2zIJWr5fbbgm4qp1vMGJ9oXdlKkbPE2h1Mtv/6/lg+TD6SK+daybMwMUu6438wMdr2K58Lwj/zsj0dOcJMjndiyLgqk1kiSPyQXlLixpjHFJpLf2OeeDRD8jqpwn5HpIad78g3lyeWuHCb7EZyFmxhvkKGFZ5fKcJBYMQs+vG1ZOjtA4j7p8A8vCmYSj7DuwRwSFSckQjoVfgka45rFLqxWgKv/NAV4Xyjgb6/8kq8gGAJL/ZPGawq3kc+obV9Fr8F4fkQVDJCRMCMiWheK2tiKzIY7lo4BNzwZhEszKRTXMRSmd8gNmr6NZk/aZUQDJG3+dpqh/0dC23w/Eh07TfpeOsCQIMOurWXOgWJoo3jyiuLK4bEUAVXa93+rneFltyACojcE166OELJ5C61ngyg/s3iS+dmUVgbRZEpUfLGzcwKieGWWOZXdXgwykKMKBxxrCzMciO2s1jUflK+Ct9Lh4YwG2o4XRkSlcqFRhOF6uqe05Gg+oeuENNrYZV1irVyvwYJ2Y3KFunn3aVXD1QrJbY+4OtOsWspBAOV9JbjxQtD6eoQ4nSxEyl6sRIMaupjTTQ4gP6ys5GAjeC/5fk5KquvhSt7jtHSm7OQ+bsRBKAtKWVE4Kp/eDcdAkceWfnYx4BMnqokODJpqfRf/LkX1R3cBD4LFS09mxbQ7uQl9a7uXNBVFNnuq+zJat0bvqejiTdRSxTp/c49qlD+0u5OUtMdjC+W6VFezA9iQFIytZ7ajoOzkDlzEFXdfdR0B6cM+aaAnWEhGxgDIZtq20wzFpeUFER0tNkAWOUDzCMTflo7IGlracDZZ3NyjkXwm01tL0SY1WEvjV2oLQrGXdQ==|920 \ No newline at end of file +}//psiD/S90h5PJPpLV+HBqt9bLzaxvMAwkg/3tr6Urfibx3mDFZX38T8n5pnKasPFBWcU6vgSRVCBs3R5nOTeb/XWiJSJyZOpO1H9qQwcQzL0cf9TXSDMqXt3mNMEKriNWr+CTaxqTpzA49ZExRCyC7WEIjJ+zW6BSmPSqotupIYHVBbzcW0/IFtQG14CKq5LuIYdr8oz9gGwhjR4ULaxbxTX3J5qXLN3CzcdtVkMOWeZVLixZHXyrEUQTFEq+Kp+9Kyv7iohItJ3iFx1uEVJMhc4iVp2mOHlnuisekee/LmZaBEgZdDsJXtugNyhlrJR5E0UmfDcUuP11vdg7zr3aW7jtU9MOtF8uNjsP1BA9is2UqNXrI47WpE1YYnf3+lJb7a5MksJ6/H/9bZj+Hkjy5uVji8BxZN9k6XtGGvJlqFqrRPQ0QA2oc5hahsPuGUjfH2cwDGQIP7vjytVqJvIdAZrkq20kw7zbqMmldghvt4Lo0CZza0ojDy2371XXBQ3BEjyawANS3xrYjklFuvkL8i0nNsSjQYgNd7TFwRL04QKSAQypJOjUSMv9U2sz5pvmjRxL7J1ZI3gR8dcDUASzTnodTJMUeIXYxcXlpxGLhbvq0opqdqLvlnKSHpVf0LDrWOWRPg/9jbyMnwCcRTLjgdeprs4bFRGCkuVO5R4bE/+Rf5Q0vyPvgWQw51ldPheSB7Sv1R7uuqLkHJGnE8fLSqFas5GqV6Io+2GGoPEny6sRuzAqllL6bGO3mZl9anPL+Bbdwpp5PdSG4UYsBIFpXeyq/5SGfPElxsIojW8sbOHMu2v0AK9LHP9TMQfm4hIp6Y7mu2IexI/kqP3Sh2ClZrmGu/6pUwttvgJ3OhxJ+4XJUdslHYSTkfXL7JIchlicdwl0DAMamZChKujznsDP6A==|920 \ No newline at end of file diff --git a/SchedulerTasks/任务表更新事件.json b/SchedulerTasks/任务表更新事件.json new file mode 100644 index 00000000..775c50e5 --- /dev/null +++ b/SchedulerTasks/任务表更新事件.json @@ -0,0 +1,124 @@ +{ + "Name": "任务表更新事件", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.EndDBUpdateTriggerSaveData, ServerDesignerCommon", + "DataParamName": "变更数据", + "TableNameParamName": "数据表名", + "PrimaryKeyParamName": "主键", + "OperatorParamName": "操作人", + "OperationTimeParamName": "操作时间", + "SelectTables": [ + "任务表" + ] + } + ], + "Commands": [ + { + "$type": "CollectionOperationKit.ServerSideArrayQuery, CollectionOperationKit", + "InParamater": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=变更数据" + }, + "Operation": 1, + "OperationParamaterPairs": [ + { + "Name": "ColumnName", + "Value": "任务负责人" + } + ], + "OutParamaterName": "任务负责人列" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务负责人列" + } + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务负责人列.OldValue" + } + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务负责人列.NewValue" + }, + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "初始化填充任务数据", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=主键.ID" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=code" + }, + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=msg" + } + } + ], + "ID": "cbfaf714-5c0b-4c99-93ec-45a6a09ae78a" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "负责人无变更，忽略" + } + ], + "ID": "84c1b545-9cb0-44d9-8307-06d78288f848" + } + ] + } + ], + "ID": "7f59f804-a89e-430f-9e20-4fd1c49c4323" + } + ] + } + ] +} \ No newline at end of file diff --git a/ServerCommands/任务/初始化填充任务数据.json b/ServerCommands/任务/初始化填充任务数据.json index b85237c9..5914ee94 100644 --- a/ServerCommands/任务/初始化填充任务数据.json +++ b/ServerCommands/任务/初始化填充任务数据.json @@ -204,17 +204,17 @@ ] } ], - "ID": "5457ed1c-3c5e-495b-b88b-b5a66fbf6bb1" + "ID": "780ca6cd-8476-4c45-959c-33e002b99495" } ] } ], - "ID": "b59474ac-98ae-41a7-9788-776e9121c060" + "ID": "6ae7130d-bd4d-43b7-919c-6d6088dec456" } ] } ], - "ID": "8fddd989-481d-4d10-bc88-66fe41fa4861" + "ID": "5f28a4bd-e887-4c0d-b2e8-7f5e68521af5" } ] },