From f70a24ad26c22675bf23093c4386fc6b7c3b3629 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B6=85=E5=93=A5?= Date: Mon, 24 Jun 2024 22:18:24 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E4=BC=98=E5=8C=96=E6=8A=A5?= =?UTF-8?q?=E5=B7=A5=E5=85=A5=E5=8F=A3","MessageType":2,"Modules":[{"State?= =?UTF-8?q?":1,"Type":1,"Name":"PCPage/=E4=BB=BB=E5=8A=A1=E5=88=97?= =?UTF-8?q?=E8=A1=A8"},{"State":1,"Type":1,"Name":"PCPage/=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1-=E5=B7=A5=E6=97=B6"},{"State":1,"Type":1,"Name":"PCPa?= =?UTF-8?q?ge/=E6=96=B0=E5=A2=9E=E6=8A=A5=E5=B7=A5"},{"State":1,"Type":1,"?= =?UTF-8?q?Name":"PCPage/=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86"}],"Version"?= =?UTF-8?q?:"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 54 +--- Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json | 16 +- Pages/f5fc8d78af50450e9ecd5e29f22c67b.json | 301 ++++++++++++++---- Pages/f5fc8d78af50450e9ecd5e29f22c67b.rd | 2 +- Pages/任务/任务管理.json | 11 +- .../项目首页/项目首页-容器页面/任务列表.json | 32 +- .../项目首页-容器页面/任务容器页面/任务-工时.json | 4 +- .../任务容器页面/工时/新增报工.json | 16 +- 8 files changed, 294 insertions(+), 142 deletions(-) diff --git a/.collaboration b/.collaboration index e1c51776..e4fcd601 100644 --- a/.collaboration +++ b/.collaboration @@ -558,19 +558,7 @@ }, { "ModuleName": "PCPage/任务列表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T22:11:29.614973+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.rd", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.json", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目工时", @@ -706,19 +694,7 @@ }, { "ModuleName": "PCPage/任务-工时", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T22:18:07.5816925+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-工时.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-工时.rd", - "Pages\\94f8bae36aee4ae7aec2a063ca731b1.json", - "Pages\\94f8bae36aee4ae7aec2a063ca731b1.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-进展", @@ -758,17 +734,7 @@ }, { "ModuleName": "PCPage/新增报工", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T22:17:24.4826357+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\工时\\新增报工.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\工时\\新增报工.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/分配计划工时", @@ -2184,19 +2150,7 @@ }, { "ModuleName": "PCPage/任务管理", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T22:10:33.8363349+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务管理.json", - "Pages\\任务\\任务管理.rd", - "Pages\\f5fc8d78af50450e9ecd5e29f22c67b.json", - "Pages\\f5fc8d78af50450e9ecd5e29f22c67b.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务审批", diff --git a/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json b/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json index 75124d30..b0c8fe96 100644 --- a/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json +++ b/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json @@ -155,7 +155,7 @@ ] } ], - "ID": "aec9bedb-4ed4-448b-b830-b3fd9058ad8c" + "ID": "e11dd4dd-b67c-4487-9554-0f3011d1b97a" } ] } @@ -229,7 +229,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "9f2c15c0-e05b-44cf-9bec-7a8bc969c5f1" + "ID": "f16667bb-1585-4712-b642-ae6120ccfe8b" }, { "Condition": { @@ -259,7 +259,7 @@ "Message": "复制成功" } ], - "ID": "8bd0373b-bd41-4fc1-a330-e91a693a8552" + "ID": "ec283738-a1dd-4c7c-aeb8-a6ceb6896805" }, { "Condition": { @@ -336,7 +336,7 @@ "Message": "操作成功" } ], - "ID": "849e39ed-aa6f-4fc6-a795-7013507d261f" + "ID": "8cd6f7af-7669-4756-b450-e79acdeed8a4" }, { "CommandList": [ @@ -351,17 +351,17 @@ "BtnText": "知道了" } ], - "ID": "3f2a36a9-28c3-476f-9d86-d81173a14a30" + "ID": "03541654-eb5c-4939-b2e0-02541b3f643f" } ] } ], - "ID": "3c8bf5f8-733d-41c3-98a0-37ba948bbc19" + "ID": "781f0074-296e-40fb-9f0c-41140d7197de" } ] } ], - "ID": "920b07e6-bee2-401a-8c0d-48bf3eb8b8c1" + "ID": "a4e6519b-1141-46ff-8695-3c401a60aa8d" } ] } @@ -456,4 +456,4 @@ "Size": "24,24" } ] -}//3Bic3cKKVmflcz9RvzLpHgLfUC4jtS7xdTwbc+rUmdAIp4mhtjCRfYDll9aw703qhQOS8ZbM+kGWhVc5eM2zZtQ5Yj+yBBJPANVRzpR4LQD01jZcSl8PAd2TySITlRYhkD13LxjDc6KGFpWAR8D2sp0aGVQX5WdcTqzDNhr92YvMPoGgEmQoni54BNm7HKmkzB3UQQSFzAmhf92KZkWRud9e2UqOIwlAUWsQBx3dL8n6tjU6eLK5m/CLXlyhU2kyu/b9RkI70FVdrZtDqOTrwNbqEhVBBuEiD+VDwLhqq3h1g3Wz1axkVjcD6PY5jS/CIco3K1ZaP4Ac9k3ZEK70hSMbJTB8sdawb92nBDH4lP1RQWsxHhY1Bd/NJksOhGF29jNVb8ToxwEFMhUEPWGieBQkahZnsbvMGvMqWLd6Ix26YD20u2cWd45qozEIqpeXnhxQgRZToayRjEC3bPR/ueN4L5EdoeW3EwE7BJ2CqvxIBqdPUYTrJcml8Ps1j5/j/hoAcyP4+Ht7vKROVQN3R4yqzRLkZ1nVndxrsxVOgQVej6f8/kmPwwY5h9o67gwDF6ccSwYeHF7t26tlQEdbK20jA8TJT5qNNKArxw7Zsd2bAWGLDRvNLvcDrWHOGn5eXF34rOZECYYii6CYKpsa7cSq0OL9RSlzItQyBAEITzfr0bhwkgoq1cz1L3dS9Yq6Z9f59lwOiW0B0FnbBoPIGZZULv/i2x0w/uLk0CIyLCVCuQma5OiKhxCudDIKhrgqmkj1V9D82MWFXRa6qxQIYdqLq5ke8YUCvCmweKZ7oBcHgFkIxOXmiZOHz4m5iBa/e9/oJUP8fTm8VdN8J857YTMYz5PLvuugh/XZBy1Gcpcrdy3XhX2fVqOsPgdS/+cCnAStC917adQfjI1vogEUBA==|920 \ No newline at end of file +}//4xOHT+opsYAFXg/8PtRTZcquMeGQQUMHfc5aHlmW7MMXt7tLXUKQicohmd4fmPR1ktOqyy/RG+i+Z/LdKcfCvM950G0a4y3lX9cPqtwGg7KyK6RMw/WKIKXL12pggmgsQ9bXhhnhl3RTOSasvfVhn/xRbqZBwq5qHPFf0wYmxZl2156oqzjUdaSxisJVSq+UW+s88crm5CIBGNh0TwyIW9JJYVuYLlWCkR1Bjl8u0cvU1EH/nUvkzEdXZ7KL7nYjgU29/+JQx/XiSWJs6fBhqoDGvrZVMQ2XNCjtG03J7+gJ5QqgqTpAJ8aAJD9pLiFRWxTw9w6z/U0qeckMF4OYD+DlHdEOmYZy2lH84b3rDp7EMYXDFs3OIYuHOS6iJc166oEaoLJ+5FAgmFilxkrAg0zhkAwDO17Lx4d0xFQwnj05nZMrSVY9vuD8ox8uKxWJ48Utl6/+/pmCppmeumxHQBQUNJXAuuQSCHv/EDiHflex3TCB0YbVcY9t2i1PUI0mu2ueDMDRAb3t7jwunulkBjItbVnyVpAv2N1IRKeELTg0UCiJkBeRUZhZZANCEoin+t/O5slNiCaIdxD03+Iwo08NphXLc3Hy3a901XewRp0pKBMcCSPeWi8wD1ubUzf38z2pRI0+Zr1wT/MsIfC96YJbjpr0Tkb0+/tt3rkv5O0sLG34FRCw/N1aH++zbF5mu732O44vAjr2uhKcNcEK21gKEwV48ALVXOxwu5ISJ18DtWW0o0MwLrqzZDDqeZLIQWvT2hu2ZNfqkSGNSxYiu2Qker9tQWzOCXPhsOSLqNx8lgnHdAl7RQgVuSksvHSNPw7Uz/w5+4u/837vaQdDP1+F18aFV27vGlvkOKX03GDPanb3ZPCGXnnxvA9vYt+CgjuArfaiaO66TdetyJiVqw==|920 \ No newline at end of file diff --git a/Pages/f5fc8d78af50450e9ecd5e29f22c67b.json b/Pages/f5fc8d78af50450e9ecd5e29f22c67b.json index 01a06c6c..099981c3 100644 --- a/Pages/f5fc8d78af50450e9ecd5e29f22c67b.json +++ b/Pages/f5fc8d78af50450e9ecd5e29f22c67b.json @@ -13,7 +13,7 @@ }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 25.0 + "DesignLengthInPixel": 30.0 } }, "3": { @@ -36,59 +36,82 @@ }, "Cols": { "RowColumnAttachedInfos": { - "1": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 251.0 - } - }, - "2": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 190.0, - "Mode": 1 - } - }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 181.0 + "DesignLengthInPixel": 239.0 } }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 256.0 + "DesignLengthInPixel": 179.0, + "Mode": 1 + } + }, + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 64.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 19.0 } }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 256.0 + "DesignLengthInPixel": 140.0 } }, - "6": { + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 23.0 + } + }, + "9": { "GridRowColumnDefinition": { "DesignLengthInPixel": 74.0 } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } } }, - "Count": 8 + "Count": 11, + "DefaultSize": 239.0 }, "Values": { - "1,1": "任务名称", - "1,2": 0, + "1,1": "正常", + "1,3": "任务名称", "1,4": 0, - "1,5": 0, - "1,6": "正常" + "1,6": 0, + "1,7": 0, + "1,9": "报工" }, "AttachInfos": { "1,1": { + "TemplateCellSource": "逾期状态", + "RulesGuidList": [ + "b8253a56-7b38-44cc-bb95-a30e009e05d9" + ] + }, + "1,3": { "TemplateCellSource": "名称", "RulesGuidList": [ "82861a3b-6311-48cd-aa88-ebc5601292fd" ] }, - "1,2": { + "1,4": { "CssName": "ec-label", "TemplateCellSource": "任务说明_单行" }, - "1,3": { + "1,5": { "TemplateCellSource": "动态可核定工时", "RulesGuidList": [ "ae873111-fde0-4fa1-b664-852d3e833eff", @@ -96,20 +119,174 @@ "14b601ff-8ddc-4a1f-8f75-13c61362e035" ] }, - "1,4": { + "1,6": { "TemplateCellSource": "日期范围" }, - "1,5": { + "1,7": { "TemplateCellSource": "项目" }, - "1,6": { - "TemplateCellSource": "逾期状态", - "RulesGuidList": [ - "b8253a56-7b38-44cc-bb95-a30e009e05d9" - ] + "1,9": { + "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": "成员数量", + "GUID": "39483242-1939-4644-8e97-91abbcc537a0" + } + }, + "value": "0", + "compareType": 2 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务平行视图", + "ColumnName": "任务成员", + "GUID": "1a3c3f2a-ae70-4e6b-9b90-72ab7f243551" + } + }, + "value": "%CurrentUser%", + "compareType": 10 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "新增报工", + "PassValues": [ + { + "Source": "实际", + "TargetCell": { + "SerializeProperty": "=新增报工!工时类型" + } + }, + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=f5fc8d78af50450e9ecd5e29f22c67b!E4" + }, + "TargetCell": { + "SerializeProperty": "=新增报工!任务ID" + } + } + ], + "LoadBindingDataOption": 1 + } + ], + "ID": "d76b5ada-9a7d-4288-8bb0-c89523edaaf3" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": "你尚未成为该任务参与人，不能报工" + } + ], + "ID": "0f2c29c6-a5d6-4b32-bcb4-2e8f20e69fce" + } + ] + } + ], + "ID": "a8bc4e94-c4f7-4fa5-a313-ad6e8bee1501" + }, + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务平行视图", + "ColumnName": "任务状态", + "GUID": "d8ff18bd-467c-4a19-94c9-8a5e5b252b3e" + } + }, + "value": "2", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"当前任务处于\"&f5fc8d78af50450e9ecd5e29f22c67b!行数据.状态&\"状态，不可报工！\"" + } + } + ], + "ID": "d1a35833-a02c-472a-b0cf-0193b255b193" + }, + { + "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": "=f5fc8d78af50450e9ecd5e29f22c67b!按钮结果" + } + ] + }, + "value": "confirm" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "参与成员管理", + "LoadBindingDataOption": 1 + } + ], + "ID": "61fd2df1-3799-44dd-b2a8-e2ef7eafcd3b" + } + ] + } + ], + "ID": "8ccb4bd7-9c18-43c7-bff6-9617c38abba1" + } + ] + } + ], + "Text": "报工", + "TemplateKey": "_RS_Main3" + } }, - "3,1": { + "3,3": { "TemplateCellSource": "任务状态" + }, + "3,4": { + "TemplateCellSource": "ID" } }, "StyleDatas": { @@ -121,55 +298,67 @@ "FontFamily": 0, "FontSize": 13.333333333333332, "Foreground": 1, - "Formatter": 2, - "HorizontalAlignment": 3 + "HorizontalAlignment": 2 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 3, + "Formatter": 4, + "HorizontalAlignment": 2 }, { "FontSize": 13.333333333333332, - "Formatter": 4 + "Formatter": 5 }, { "FontFamily": 0, "FontSize": 12.0, - "Foreground": 1, - "Formatter": 5, - "HorizontalAlignment": 3 - }, - { - "FontSize": 13.333333333333332, - "Foreground": 1, + "Foreground": 3, "Formatter": 6, - "HorizontalAlignment": 3 + "HorizontalAlignment": 2 + }, + { + "FontSize": 13.333333333333332, + "Foreground": 3, + "Formatter": 7, + "HorizontalAlignment": 2 + }, + { + "FontSize": 13.333333333333332, + "Foreground": 1, + "HorizontalAlignment": 8 }, { "FontSize": 13.333333333333332, - "Foreground": 7, "HorizontalAlignment": 8 } ], "Types": { "Strs": [ "Body", + "Accent 2 0", + "Left", "Text 1 50", "\"💬 \"@", - "Left", "\"⏱️ \"@\"小时\"", "\"📅 \"@", "\"💼 \"@", - "Accent 2 0", "Center" ] }, "CellStyles": { - "0,2": 0, - "1,2": 1, - "1,3": 2, - "1,4": 3, - "1,5": 4, - "1,6": 5, - "2,2": 0, - "3,2": 0, - "4,2": 0 + "0,4": 0, + "1,1": 1, + "1,4": 2, + "1,5": 3, + "1,6": 4, + "1,7": 5, + "1,8": 6, + "1,9": 7, + "2,4": 0, + "3,4": 0, + "4,4": 0 }, "SheetStyle": { "FontFamily": 0 @@ -195,7 +384,7 @@ "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", "Formula": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=OR(f5fc8d78af50450e9ecd5e29f22c67b!$B$4=3,f5fc8d78af50450e9ecd5e29f22c67b!$B$4=-1)" + "SerializeProperty": "=OR(f5fc8d78af50450e9ecd5e29f22c67b!$D$4=3,f5fc8d78af50450e9ecd5e29f22c67b!$D$4=-1)" }, "Priority": 1, "GUID": "82861a3b-6311-48cd-aa88-ebc5601292fd", @@ -248,4 +437,4 @@ "PaperSize": {}, "Margin": {} } -}//UjH/vy0v8WoWa1B7EK3MwpGst02be3maHb3PuBY53GN5fAOXBADaMj0ynRjjwWJDsSBf9Ar+59vxdepZcrG2zihcCCtA2u9batptuA2Ok4H31LQYutSGumuWvLjKvKr565P3LLISjza+ty7effOOw5AKXTKV2RT+7HnjMrcQd5Bpitvfme5FWmqD7Yzdu4Y9EhVXFB7m1/XukzJcYCIqtgqQhZQleQZAVPh42nteqerDqMYveYbfBr8DXxI9V6Pqwn7dMqpMOL5cDVZW/RlwUIpO8evLYgyjCi9N4ncjkThpXUvxo/orle0CFDoir4uTYxH5OBtOas6LxrGqsQtM+qqBXKQD6gVaa3p/Mmklxs4B7zF17WZFCSpbHpBv/YeUcJFWeyEHb0T6kpIea3pIBoBn3umh/gnqwgmGFgHDexZ2btQroWCBZ7mGmW5hHbnQIbGeAriSzjyJQObydZS2EV0yOU+i07hniiZdlhyaTjeoUAtXssh5N7ZOtU4I7vg6t3mlxhQdLSKpF1ab/nN6ocHW4Cmi7xaS+X1feGMMvNNDor5Yns2/LyG6AlyGabe302kKZ8/EQP52y3lSdxkvBx3AQJ75Lsz8YKipQL2HOv/A2YnU04hem6H5EeUYXkUeN9HEns4TEycGluXVMTBkCsPmWHBoB2M0EDO/irolaHg7Gah/hg7oebllwZl4E/uzQ5VlQtkU9trbD5vvreGyVtN5DmORJnSDna9e795Rtpngacy05T7UTjQiTP0xQTR2lZjBRpyCZ10K+Ipy4WLFUGwxWOppyNKOWx68dOZ/hV1zEyNxV3fYCOwjD73VEEsMyFs4RRxEOgAOycnPvqWtH4Vkm4TSBROMtAJgiCOvgxXSypsM8d0hRIXWSMaJCWnX+/28f7oE0ENAT9bRU5r8Ag==|920 \ No newline at end of file +}//wikBywi7i/pHAYoIRIyOrpZ2N5rmUcD1Lj3nw3pnSpqbXOKH06mk9z1rABaxnClr+ym/9s1NChk5KmlyGe0ZOE//Cdb/3hMhwndEJWW8Pmcw9BBncxBH26ZpxKwPi8lmDseNc5onRz3MMz8TzmNgg+oN0aW7nAXfc+FzjK/zub7J8iUebAcO1/BsVTxuVLJ4XNUJGE/I9Qugs63aNsfD9PwBi6BW80hhd5UUjdsqCRj1W3CjMDOsn8m5ANWGsTBry2IlDk9ubVY05bXSIiPTazNHurI7RxPn7VRJx3CpVvdqY/xeUvhqjsQDzmpMHzNgK2/R+CGh+MQCnThreR45a2QbcryyLQny/XJI6oUWuHwoAx6jJtd2qFioiMbzNvVzDVTFtRHYJ1hFmvdIzwURsY108C18EJrrxZtBNQZcJVxhcXiPz4+MmcZQFxjaGsb9XHWqDqJYjL8sgDDKEiZpRydilVSbclsAKPXQNwg/hoCviEVQOZXqXeqlnnd57/aXNSDlLOPVxdmJGkua5y/dIDL8bpWd1ReFitXbuK3Y2g6gGv7A5CXRinWXf9qvOYe9jTkw6nFt0IYpR7styrqALcxFnLHIKvJMw4iH2NfZSnvHoZUQOFKzvO4QUUREGBCkOEx7cr7Y7zy0yjzC/j2JdwCEF0C+wGqi+BCpzornXuMcwipdenJl4IWV/EeGcvQs5zVoteR/8bLjFs/veVHgf/uTVvh9mm50OWkOQ2LTyYoZ0P01c6fQUEhOvHqS6Ms9gaH2E2hFmYPExpKKEMLO6oFXxskSwvWt5mTOfkptZFvm27Gb62PAHTGOBVH7jCmfycJMeI8fcyj7JHebDA/o9TRHpNLX+dkkmOU2+q8QLHZdEy0RiA2ESNo/SPMla+KykmhrN85D+LK1x3ADjTARyA==|920 \ No newline at end of file diff --git a/Pages/f5fc8d78af50450e9ecd5e29f22c67b.rd b/Pages/f5fc8d78af50450e9ecd5e29f22c67b.rd index 908a76b1..bfb4a084 100644 --- a/Pages/f5fc8d78af50450e9ecd5e29f22c67b.rd +++ b/Pages/f5fc8d78af50450e9ecd5e29f22c67b.rd @@ -1,5 +1,5 @@ { "PageType": 2, - "ColumnCount": 8, + "ColumnCount": 11, "RowCount": 5 } \ No newline at end of file diff --git a/Pages/任务/任务管理.json b/Pages/任务/任务管理.json index 77624d01..9d11cb78 100644 --- a/Pages/任务/任务管理.json +++ b/Pages/任务/任务管理.json @@ -1373,6 +1373,15 @@ }, "ColumnName": "ID" }, + { + "GUID": "c6f0b918-8f29-46e3-964a-8e4a01b6b7cb", + "BindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "项目ID", + "GUID": "870f3686-ff1f-41ac-948c-db95d7344988" + }, + "ColumnName": "项目ID" + }, { "GUID": "82de774c-79ed-4ee9-857a-092ccaffe524", "BindingInfo": { @@ -2004,4 +2013,4 @@ "Formula": "任务管理!$E$8" } ] -}//s1NfZhqi7kcv25nYVOQgDcQDAZzmXzDIxqVWeyzZGn/VKrsthDm9MHzDqoHq9ZJ+zU410QpdNkHspJ1Gvee4bzLLMmPu84Otxpm/ndRnoFeGtv/olARsAGP+IEvbi6DbLsBxgW/CE9ncqmlaFh2fi2rJjML6V1h7S3JfsU07hSKQGxHYKb6yRjiw6XrlLl8miUK0ESUog57sLjXmn9cOd/XMxO5SlNXUHP2/TdA0NwbUVmFarYTvWqzs9/ahJ7MZbBYh+lVjhubsmTtcOH633p5E2+0ft7WkjYKpLwWTN/ohDDduVAIno7QGI8KGvWcTLo8F2Ikc3kgurthc/8+Om6Nt8xnmPBDO61YFBesATiq4BbETHjPHleGeGp07TE/0+E92PJfzVIy3IAkXjHHqVX8f7sNyeYljwcuzeTTcadqLHAE6EFwWlJCcNm841yEBY2iQtamOQ6DplUNruQTGfKbRJX6I8RAhvq+6S3xlw7nwxFrJ3TYGhGRROCMQlQjzJRm2blNIRh+sqGOIlmcELFPbsxck6DGE5OIqUWbdmpqLVnDO66gzXKm3KMtm9hOgPHFGU7jmpavoCCq/iuIEe/06wROIm5uuTpNNiuugXezlbhYe2EoBSVxSJJnmOcUITHkOvbbxXJvWJqtrPmUNv8yKvQs0vhZQB5k20rjR6FbAc+5o1bxxhcW/rcrPR1gPEoSaYvI9m87KtNK8wO24IYwDkKMoMVR6DHA/Qg3YFN9NGvWTGcr7TCDO9PSqIPDazB8OVGEqgHyBYKck0eIBjFTKRkJdxspaeXFxLxMiOz5gfYbLZ+G0cyGfCyy3t3zj/t+ySjSyVPWX6R7I1yCXN3A+Cz6B0KGFv8dutO5U4T9yVhWb+s7K21wk5utVtlE1QoXLay8kK7tuSUyZstGROg==|920 \ No newline at end of file +}//FEe11Ik9Whg8cwH0G5ju7p3+RQ3DSAjcwuGOSKdnCItFZe3A58oNvXZLo/8PBn3j0SxmvF4OZA7Oq16t6GUs0+qfget+b0PcKKWUBJKrlHPoQXiv0mDFlBY7azqSr8Mh26syOU7jyGlAnDTLc61xw+0eJM4xKYyKE7M1YNLH2GeY103hSOlXv7hjfPX5qrEY0qa+qxzhRpiLyK3skBfpTMLj5F5J9af6Kj2ZrggCqZZimEVuHPHXkG8vCcY8wSEHQ2FajZK4TQmMgBgXz8pa6O23k21igIXM9XsjdXgXfFZ0czlWKaO09AQE9p9lvZbcZpyOzkMk4o3IpLdPcTW2QjrSwtMPeHzAjoemIwynGcx1yvcxVhmVmZkd4Tj01H8SDhmtQ1AADU0jvc2YmRq5PEIuDzSIzkEi5jph26p5XtbnyT6yhkar3lSeNlMJDLeHLPGfW0ipuHqoH8r1JE/SBl0iK+dhzQ+340aPYPRhGClx6kwPw1adlOlRdNZmv42TYbIqNafqVkmwwG2spYwCTAAoSKmTRJueQSIKUCxfSsyXQJ43p3CSOXwBKjcboK7XDAHOvj3inSujsKMeL3638/txzxlwtwD2TnhBqvPcckruFoFTJqsDXs5lCrOh6wxc+60AtYIiIQg/nmyjOzrOYVh/Op0Imrw7ioevF3Yr/L2MH0N10T8o/pmLf3jLAKznmrG/Q6dhJxQpdGRVU7zrbLX44lAuI92YQoD+dzBwZnA+ypNJFI1oFFJ/lqn0Gk/xAbaTIsEvV7vYwKGzlOqe62kgfjKPO0Zr/CufFeDuhx7xrzN1rbWd2rd7wNUt1QbRWIA5NoLBcBgsItFe72Qc/n/8A0baOjRdudMAAeivoqG2m/fZzWhs1x2vxr2clSeJ+MBAUZv3P2D54Hvcjm2drg==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json index e278968e..5d62be45 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json @@ -495,7 +495,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "74b9d6e5-0ee3-4127-bd2c-1cf33206ed59" + "ID": "7fffc5f0-cd57-4f9d-bc0d-c61cfb7ef51a" }, { "Condition": { @@ -529,7 +529,7 @@ ] } ], - "ID": "26676689-b7cf-4875-8747-064d1d645f2e" + "ID": "34f8a75f-3a6c-4b6d-b105-c80b45f2779c" }, { "CommandList": [ @@ -705,7 +705,7 @@ } } ], - "ID": "84ac1ba8-0e35-476a-b784-b94e640f54f7" + "ID": "8993f71f-9328-4324-97a7-615d18aa8e5d" }, { "CommandList": [ @@ -717,12 +717,12 @@ } } ], - "ID": "d8644a57-0971-467c-976b-c4c7953465ea" + "ID": "ca1e74db-1eaf-4b81-8dff-dfdf5dcee08c" } ] } ], - "ID": "62fbae6a-30fb-4208-8121-5f26a7424bdd" + "ID": "4551033b-16df-40e4-9a59-885c0320b304" } ] }, @@ -763,7 +763,7 @@ "LoadBindingDataOption": 2 } ], - "ID": "41ff76c8-28ae-4602-b661-ff2af3250986" + "ID": "8bd4385c-fe3c-4a8e-b9fc-f4b9601c82c1" }, { "CommandList": [ @@ -778,17 +778,17 @@ "BtnText": "知道了" } ], - "ID": "9bbe2045-2e2a-4901-a949-32a797f2e301" + "ID": "593843db-d4b6-4a30-82d8-6d086d86a08e" } ] } ], - "ID": "53f62e67-b149-40f1-8c82-a24bed2d3800" + "ID": "6b1c1799-45ee-40f4-9f61-baa8ab0c04e4" } ] } ], - "ID": "afbaaf4b-3317-4326-a75e-e2261fc90ba6" + "ID": "d4f4bb62-686a-404a-ae93-214d9dd57742" } ] } @@ -1351,7 +1351,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "3dcb821d-321f-4cb2-8fbd-4c682213408c" + "ID": "86a137cb-d06d-49d8-934e-96086a3127a5" }, { "CommandList": [ @@ -1361,12 +1361,12 @@ "Message": "你尚未成为该任务参与人，不能报工" } ], - "ID": "baea8a38-3267-42e5-8c12-0a08f1c7794c" + "ID": "8829ad72-9588-4229-8b9d-583e10eedc3b" } ] } ], - "ID": "43530ba1-4bf1-4c8b-bb27-52209d2dde41" + "ID": "59eea562-82fc-4c85-8f1c-ed3cb3e938cd" }, { "Condition": { @@ -1392,7 +1392,7 @@ } } ], - "ID": "63173c5f-1c33-45d3-94c6-d7fa31c6d537" + "ID": "b9ab8d37-6c64-4925-bf81-8dfe5c1de076" }, { "CommandList": [ @@ -1431,12 +1431,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "1c591370-1ab9-4448-b4df-b0124b0ab48a" + "ID": "cf7b02f7-d1e3-4071-a3a2-8d7344fa3ef6" } ] } ], - "ID": "d692a5f1-6e1f-49ad-8a99-f556b4ad4cf3" + "ID": "0006a0ca-5354-476f-b37c-2538f575c11f" } ] } @@ -1878,4 +1878,4 @@ "Formula": "任务列表!$I$13" } ] -}//vwWeraAIalsGsO8kCWXQFFYQf+52VXQAaVIVjRNxJVKg326n0V/jp49UTT360rdHFBEuWxGCrqJ6XF2VJQCGJwr3ndeSkZGbm4AOXGcQaYA6ujtLznK8pFA6DxnbTw9ptXHJLTDUVR4qu4q78yZjFW/Ag34XWO+PDA35qdGEmEtLMAIcFppi9ar7UMS49s1A36id7w7JSmzycjViWGMoznmQLTmaYTraUKHlZjHdJWBYa5OjPuQh/Fdi478tuDysvmM+Hdo5RNajvGUWbngI3HiYfIeNqcDsNufxVDo2Tr3oqAKzf+PHRKxfMh1pWTwmYPaBRb4ErR4UTsrTLS/QMHHFpr4eMWa0V1iF1S8O6ttSCCKNXdfRtgOhk8ciawXLCrr8Sy+UHVHo3WyaiuIDZOtwz3YeQOb1oAZlv2/foLMojhx5bTyRs4GTTc9BNCQ6U7ZqIcAczT+GmwuK3tzG5VDv0ZhEfMz7vGIrzj4U9hhLWgcaaMDB3RQnajAGRNvFJY+Q37mOy2WaBBjkd+YmZea4NTcJWPJqcdG85ve+grl5ZL6KS0LJxQ4/rLtw4cm7X3bKHJ/RhAFXHEuPO1mAwws4TN2FS1M+kphokN7M8KRWEfsTepgwD5R/eSv2Y30cEOibZpwjJ9YE4ZTta+19EqovOHc19NIqz/xKJZo7fiyHmALN6X/+XsZL9vIfgOZOgEkj3gcUTRZ+1Vs/+iyKS9ZFhTGKjCK3+e6r5jC8r6NzAPlDT7Kqg8jFVZiDZbLqAa0fIx6hCqMuk0DVI+FGnf9oq8nCHuADQ0lslAdWspO4BvIHGwzbfivZAL2nUdSFEmb3ZXEddk6gY5Pm5LOFvkiKdr2+zW5XUUTpqfJHwDfIwNBw8836B/VE70KAP4w0GcfB6jHKuGUZ1oHUOTMzhA==|920 \ No newline at end of file +}//0JIo15eaDnDD363paTGzYIdK27KPV3TMYVT0e1ObE+Rn7dgMEJcApG5nA8ByZ6Eou+ePwA0JGO/DEaF+otf45NLypMGd92BCgv2BYOiGzkqdL9iXxfuGoZr0aOjR3W6z9FcgtzPbrh3MtosRWdtEf6NzGiAq6p2P9Ys+McXm95LnjNAECmo24u4ciaw8jqoBjRf25qVDm2qqZ+mHZPOttQDwCpEfMiR/r12J9pEfeyLfC0e6QfFHO8RSH8uv3CCcwzrYvCcOKfa2VfyPsNuUORgcrTccXdS4NNhOjxiyinMwkwnthqzZVcjCHbQKfgkiVhNwvrpZGz/G/tbHaLrgN3mt28hgdEhRRjHl744zaya78qVMIbKKZf8Bq1RsiHqHYFBvR5b7W36mIOKKKQRCHXEJj41DcgaVRCN6CIUbzInGTwokq18Q4rL+U2BcCYwr4cCJj6GK0nSB/SfQiWXsRwnrjEFBw5KaUBLTAD3LEu1NxAoyXJhG9aAGg8ryZB6MA5YGvw9f5ukfFTvgyna2cDaNT9VRDNe7Sc/SlfkfTzOrUOVDtsCklIyQI0fQ8w+zwT8k9ssZS/zgAJwPlmKNbB3CAhjVzQgG6aT53pT98MOk/NpBycAHxt8/8qof/FJsxGAHr5gpOba/1g0N0bTImXdnZzdMpHkMnRB72a48h0+198Tj6bQFZTW0zNv2coqsjeQ46gdlq2rd0v1b5P9o0Oqglzk0rhvqdPMx1T8flaZn0JHwSg0/T+Rw33oouMvql+c5ReFx9iynw5yunNoOdTE8ou+NsAsnFkJ5qa0hdlig04TznagSoOwaIhIaQ3H3FsBEnrgMU0qF4v4HaHse7h87JX9zA1Tq3i5WOeYI1R3criNr2V7nC/wDyiw6kCk15c32PObH8M1vzff7NGjsSg==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-工时.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-工时.json index 2c5d9b20..3b2cffe7 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-工时.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-工时.json @@ -1016,7 +1016,7 @@ { "FontSize": 12.0, "Foreground": 4, - "TextIndent": 5, + "TextIndent": 15, "HorizontalAlignment": 5 }, { @@ -1346,4 +1346,4 @@ "Formula": "'任务-工时'!$V$14" } ] -}//6BqJEPB7T52YJ/8u9mpIipJjmDWpiQjFGr5dc7qxP//7BWGv3g0nKqAKzba9LwdVFAYf6qUoJ1jGiDiLutoYh0yFF1DXPHw3Bu8ajZv8bN0cIJaguJ/2w3A3ul+BtjHwYxYFed77pyaSZHx8WAVXU8TCG1OjRiG2h5N+PKYzdvMbnMwIxM6aroB0YGthIoJxVZvNRLlTuyp6B+5qWP/Zo0W9SZEwbtQ8Ni279VzbE4Dx+Fiz/4lUJevg8I/+Twcnnj4DhBEdJVhElfO1ecCP2oagyP4XJN/liXXNrm5g9J+TMQ9hnEpQXxYOZPF9sHBbF+BquI3yP4bOOTQyekwQp2PzahucN/mlGrZ+xwlArA/R1b4WiWWo8Jp+Gmszs5bV1838oBKF7brmGgrzsmm6lxzcXB6dB9WnWFWH5ZYCbtLy6DBpyOfG/b9XaMrwDi2DheGQbj5Loe0Nzlme9g48EwMhjApU9DzZcT1d5hCOimGALf+8vtGYOOwCKGzgkENjfy+IoNgxGzkABegpnNeSASxzCUzczT/Cj+EyBBFKgh06LPrh9osmXVXa3BpTgrZltdBoCkF+vDfVaVVbIkhUT4NAk6nC2Z8EK4fnn3wu5/iPaMhD8m7OHmtyan6mteV58+HeQDPuSlyFoJj3jEv2lX482LBpZXBXap269JeTexB6JMxxxH74hP+x3bYzT30PsTFZLPYns/S5V9iaUQ1H4Fcl9rR5a9k4QypYfBAIKiWYu2ahlyPHS76eelranMwez0sZU4cIXxZa8lSylV1voFRAtTphzR0B4K+SjgwdLMKs1JzRoxXrTcYUK+7UOx5HM8tABWy7bCuO8T/cuL0owvCqzQ6Di7Kl0Tb8KWNNyPpMdzcEdyXVMA4gvH6mngt30hC5mVgnWITf5OGnGom5Fw==|920 \ No newline at end of file +}//BfhfAHow86Xp0AvPA/fDJTkpLpu2weHV+lrEJUwsP4AHRznabPw1T2GSUhAAO67cRiNoKcdlNvie736BhqkAedl7kNpdtG6Gzm1l6ZmOOQXnqeviVeNILGD+SGtonARBse89FGeNzvdP6QfKStBQc5tXMwpVhJYyNvPZU/cCZiWsG3pkVc7aXsZpjLcZGOy3FjGZ+U3YjQeAPZAlb2d4Kic8JNE0Ud07KruK3MvN0fbqh94l0ByQLIdBqwrjmT4ypDciByW2SPwIt/+rcC/WTodYKnmQQI4nFnsBKA+65CHG/9OL6uUv80Zeyt1da/dIZJ3NAtytDmYlrfaFcec03VeuZNwkqoufrxZZgLpi3nsrRbyNRWPevuibct/YsR+VbrJPkeYo5wj3PgAImOaXoHZXLcZXMpUu1HjA118f4W/+UwsJMpCHOlhJ9pwtqKd5NZ5qdR0H5RWBn37KBaY88fqMvOPDrYZb6ctvLNeVMt1r9e2CM+R+1CKfNpkE7TmwqA4vsUeY+vtpKsp/SLicL6rGOyL6DspRTJ7uR/dvqbTNn3iTsJD0gd5H1PgBrO+RX0qEsJradk5bGFmoF9wG/7izN0gfxj4y+uiS4utOpxqomy8PdIVRjX8YT5SHd/pN6k6UlEpvSY3VhcXJTYS3MMl+K/99Ysy91Hn+9Jcm3dP884gZKG88PeQnbzy+Blt6ZPBinMJXSBBYwu5XS5bwedAhyKJX7EP6muLR8uHix4jvjYG4MvhG7Ml/U+YVoNuwIfr4HX7XrZuIu9TgJ32ki6Ukpp8vP0uSA4OEzmiETCSDfysMBt4u6N4F0aV+pzis8sckkEFk4HNyeIXUq45EProFfgxOuJ7sWYU3S22VKYXkzhAINBn2C2MqREFss4yZI2O/kM5pBe5SbTRf1UOy2Q==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json index 7ef9cf9f..578161a4 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json @@ -1277,9 +1277,9 @@ }, "29,1": { "BindingInfo": { - "TableName": "项目表", - "ColumnName": "ID", - "GUID": "9682825e-fb9c-40a3-bd90-c696538dd6c3" + "TableName": "任务平行视图", + "ColumnName": "项目ID", + "GUID": "817d21e7-faf6-4b91-bb3b-4bb0c0f11004" } }, "30,1": { @@ -1631,12 +1631,12 @@ "29,13,1,4", "29,5,1,3", "29,8,1,4", - "29,1,1,4", "30,1,1,3", "30,4,1,3", "31,1,1,3", "20,13,1,5", - "2,1,1,17" + "2,1,1,17", + "29,1,1,4" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1671,7 +1671,7 @@ ] } ], - "ID": "6347e473-1f1b-4746-94c0-4682e9232a55" + "ID": "7d467f5c-4ca3-436e-857f-10f7f481b6ea" }, { "CommandList": [ @@ -1688,7 +1688,7 @@ ] } ], - "ID": "d9aa9b4b-eaa0-4232-8ce7-055efccea335" + "ID": "fb7799b1-e096-4362-8f76-a68cb268258f" } ] } @@ -1757,4 +1757,4 @@ "Formula": "新增报工!$B$30" } ] -}//oOXf2pKH0tKEc+01GdKp9ditqba9NyNGqTGW5zmSlYBTSszce2MbtS0R3dOhxzSvGjTLR9x9OyiNiJwIEvtT/943m8MP1BQosacuOVpec0m+mF4VwlYooxABzvJ+O/SOcW1hwjS4l6Jr4xR4rDShdeNWUYOJUvbPCD0RPjKZBKPaxp4Xwl9vREgaSU6875lliGS86lue6ROtRrLhpwh04LvP0uggmq1he7VaZYo9kIESBEXTzYEnx4hxNBqwHPxbY1vt4kczBt6s10R9Eu/q2uFUcADZpyP5rENqCvo3BZx1x8sCLpvkYazkDbyjPDNvuZe9TbgHe7CggIltntzIGaGp28OVW/VsXuXniRkJa2Po+H+RGYHKjN/NH0S0+MihmmJ/fT/gAAIgUTT9WHE48qMmEICmGorZEcRJOMx9lVqAFYGImM39wL0z47+1CGpNdX+gP08BItq9tg6Va+qN4lP78h/liNC44SyK/CRSpyFB3Vr7sXqVaeWJTzZU87R0L6dn/GpCdSjF0S8aSCX4+UJrXQMl6gnJRfOQZGLcvcxVMikMSne264k8nyMmi93cisyIYagGikLCyr0w6tFrCePqLv0m0h1BPMJHo6spYkd4DD3QzZ9zLFkLcc0QjiXdxbSQDxMHUuiG+0ao6egH17oeEh+NxO121tfT4Q7fVJFuGh2lb20eys9PlsMJHYASUy8s9v3cjzAzHLsA1kkGcbBIEdta4mr8HmsHRziX2u1SJ0GCL0Y+wdEflucJLAq4OSv8Pu0aESOr/q83Wo779qMkJLFGQyUDPbcEvddnNB0b1Jz9smDo8+4786C9FE//+ozQsCIDbQzXCKsEDW3NwXUCXGt5Wz/R84mIwIT9JtEpUJjJF0zzKaBhqzoApWFj+ShdPLT52kq4Y+mJFWaHoA==|920 \ No newline at end of file +}//W8b/2H55nJh1JbiclpjomO807EezJLgK7gRhz9oIBcs1hPj3bQksgijOIj7es3qdLtNnkwAL4F1snEN4UjTVOXGpc/TlrN8e4VXfgrPPV5SvhBk1Yzr1T9oMHrlIa/hJKk1u1pEczfPFAnT3MpEO+2idH3VfSTCgngqqg3l/ZzI9UIAFH6vtnvt4je88I0xNMPA/892RHwYYdEZt8IeUii1YenLghIPa+ybUFn8BFDMM3jab5j521w35hPAUVjVKPIaLpf0mr+EsbWO4EeriKbLvRYiuMQamZ96LZ9XzSMo2M3zbnHhJFO1mHsiIxw51DXYVPjFD3OzpB9ZbkEfVMPnRwKDOdnQdvLE+QuIhdpPfmQ4En4PMGn+4FacOJwpateNhU0dXywnl+KYX064TVu4SdbsTcwt/3TKXmCsfNCt4rTamC3LRd5ljpqoLgixYsVCYtPa9LdTXZi/R0pEoBWGg83WPV4LaAfb6leCgNORoeZRG4eAr3dtjbUc6NmC59ftyEfkODgv4tDrsrYjgAj8dPcMMekQCj/1hw1ZoCmxr5fLFjVTpaDG5GDhbgMRkfpln+9xBSaZlGYPN7HarEFcEXQAO0lpT57BZDCKTRaFFGLCOUeOtYZhLOW1tG013z7kPBO1iGpgg+6HfTbRxrNwzbu83h6S5UHOaT7PSG9+Yxb0EJeKjx5i9Ypvgu88daMBw4vcXYZbNNdhjW0oRUC+xp63/Z4vIfYau/hKogP/htY/TpFUVLGgvDejzLH94/991UFjS2uqKHjP7CX0s6d1wM7GYgN+Q0Z3kMlSLLtmoIpK/kxFHxX0RPVYGuCjg95+2azneOPvjUb1RZTAFVZ15iiR5a0TU8N5ZsZWc6d2tdGY4aA/7kyW9uRnR2iJybJqLB7VmUA3W/4OHKD3Guw==|920 \ No newline at end of file