From 398c93e5f110b2e4b46288d16414a9333e3218f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B6=85=E5=93=A5?= Date: Wed, 26 Jun 2024 17:44:32 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"1","MessageType":2,"Modules":[{"Sta?= =?UTF-8?q?te":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/=E4=BB=BB=E5=8A=A1=E9=A6=96=E9=A1=B5"},{"State":1,"Type":1,"N?= =?UTF-8?q?ame":"PCPage/=E4=BB=BB=E5=8A=A1-=E5=B7=A5=E6=97=B6"},{"State":1?= =?UTF-8?q?,"Type":1,"Name":"PCPage/=E5=B7=A5=E6=97=B6=E8=AF=A6=E6=83=85-?= =?UTF-8?q?=E5=88=97=E5=A4=B4"},{"State":1,"Type":1,"Name":"PCPage/?= =?UTF-8?q?=E5=B7=A5=E6=97=B6=E8=AF=A6=E6=83=85"},{"State":1,"Type":1,"Nam?= =?UTF-8?q?e":"PCPage/=E4=BF=AE=E6=94=B9=E6=8A=A5=E5=B7=A5"},{"State":1,"T?= =?UTF-8?q?ype":1,"Name":"PCPage/=E6=96=B0=E5=A2=9E=E6=8A=A5=E5=B7=A5"},{"?= =?UTF-8?q?State":1,"Type":31,"Name":"UserControlPage/=E5=B7=A5=E6=97=B6?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8"},{"State":1,"Type":15,"Na?= =?UTF-8?q?me":"ServerCommand/=E4=B8=8A=E6=8A=A5=E5=AE=9E=E9=99=85?= =?UTF-8?q?=E5=B7=A5=E6=97=B6"},{"State":1,"Type":15,"Name":"ServerCommand?= =?UTF-8?q?/=E8=AE=A1=E7=AE=97=E6=8A=A5=E5=B7=A5=E6=95=B0=E6=8D=AE"},{"Sta?= =?UTF-8?q?te":1,"Type":1,"Name":"PCPage/=E6=A0=B8=E5=AE=9A=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4"},{"State":1,"Type":23,"Name":"TableView/=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=B9=B3=E8=A1=8C=E8=A7=86=E5=9B=BE"}],"Version":"v1"?= =?UTF-8?q?}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 147 +----------- Pages/31a709cea02e45ad83bb92336a6d829.json | 47 +++- Pages/36d33d0079644f28b16bd0fec90394c.json | 107 +++++++-- Pages/36d33d0079644f28b16bd0fec90394c.rd | 2 +- Pages/94f8bae36aee4ae7aec2a063ca731b1.json | 12 +- Pages/项目/项目成员详情.json | 49 ++-- .../项目首页-容器页面/任务容器页面/任务-工时.json | 101 ++++++--- .../项目首页-容器页面/任务容器页面/任务首页.json | 62 +++-- .../项目首页-容器页面/任务容器页面/任务首页.rd | 4 + .../任务容器页面/工时/修改报工.json | 26 +-- .../任务容器页面/工时/新增报工.json | 39 +++- .../任务容器页面/工时/核定确认.json | 117 +++++----- .../项目首页-容器页面/任务容器页面/工时/核定确认.rd | 4 + .../任务容器页面/工时详情-列头.json | 6 +- .../项目首页-容器页面/任务容器页面/工时详情.json | 213 ++---------------- .../项目首页-容器页面/任务容器页面/工时详情.rd | 8 +- ServerCommands/工时/上报实际工时.json | 185 +++++++++------ ServerCommands/工时/计算报工数据.json | 102 +++++---- Tables/任务/任务平行视图.json | 12 +- UserControlPages/工时记录列表.json | 11 +- 20 files changed, 622 insertions(+), 632 deletions(-) diff --git a/.collaboration b/.collaboration index a5bb154b..2fa8e5fe 100644 --- a/.collaboration +++ b/.collaboration @@ -514,17 +514,7 @@ }, { "ModuleName": "PCPage/项目成员详情", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T16:37:36.2131968+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目成员详情.json", - "Pages\\项目\\项目成员详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目岗位详情", @@ -664,17 +654,7 @@ }, { "ModuleName": "PCPage/任务首页", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T17:16:47.6766461+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务首页.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务部分", @@ -702,19 +682,7 @@ }, { "ModuleName": "PCPage/任务-工时", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T17:07:58.2958077+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-工时.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-工时.rd", - "Pages\\94f8bae36aee4ae7aec2a063ca731b1.json", - "Pages\\94f8bae36aee4ae7aec2a063ca731b1.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-进展", @@ -722,33 +690,11 @@ }, { "ModuleName": "PCPage/工时详情-列头", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T17:06:46.0122461+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\工时详情-列头.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\工时详情-列头.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/工时详情", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T17:07:15.7283209+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\工时详情.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\工时详情.rd", - "Pages\\31a709cea02e45ad83bb92336a6d829.json", - "Pages\\31a709cea02e45ad83bb92336a6d829.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/新增任务", @@ -772,31 +718,11 @@ }, { "ModuleName": "PCPage/修改报工", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T17:05:10.1178204+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\工时\\修改报工.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\工时\\修改报工.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/新增报工", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T16:59:49.4752719+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\工时\\新增报工.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\工时\\新增报工.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/分配计划工时", @@ -976,19 +902,7 @@ }, { "ModuleName": "UserControlPage/工时记录列表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T17:23:47.6329868+08:00", - "ModuleType": 31, - "ToRemoveFiles": [ - "UserControlPages\\工时记录列表.json", - "UserControlPages\\工时记录列表.rd", - "Pages\\36d33d0079644f28b16bd0fec90394c.json", - "Pages\\36d33d0079644f28b16bd0fec90394c.rd" - ] + "ModuleType": 31 }, { "ModuleName": "UserControlPage/评论组件", @@ -1052,16 +966,7 @@ }, { "ModuleName": "ServerCommand/上报实际工时", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T16:48:50.4782156+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\上报实际工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/分配任务工时", @@ -1541,30 +1446,11 @@ }, { "ModuleName": "ServerCommand/计算报工数据", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T16:41:05.3215035+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\计算报工数据.json" - ] + "ModuleType": 15 }, { "ModuleName": "PCPage/核定确认", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T16:59:25.5517968+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\工时\\核定确认.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\工时\\核定确认.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Table/素材库", @@ -1964,16 +1850,7 @@ }, { "ModuleName": "TableView/任务平行视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T17:29:10.8417399+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\任务\\任务平行视图.json" - ] + "ModuleType": 23 }, { "ModuleName": "Pages/任务/任务类型管理", diff --git a/Pages/31a709cea02e45ad83bb92336a6d829.json b/Pages/31a709cea02e45ad83bb92336a6d829.json index a14b335c..9ea4c96b 100644 --- a/Pages/31a709cea02e45ad83bb92336a6d829.json +++ b/Pages/31a709cea02e45ad83bb92336a6d829.json @@ -138,10 +138,10 @@ "TemplateCellSource": "全名" }, "1,4": { - "TemplateCellSource": "总计划工时" + "TemplateCellSource": "计划工时" }, "1,5": { - "TemplateCellSource": "总实际工时" + "TemplateCellSource": "核定工时" }, "1,6": { "CellType": { @@ -224,7 +224,7 @@ } } ], - "ID": "b252fe24-3d40-4876-b873-9a4c1cd191ae" + "ID": "334fc9ed-3e0e-4b02-b992-241ecf046a00" }, { "CommandList": [ @@ -239,12 +239,12 @@ "BtnText": "知道了" } ], - "ID": "454a74d9-ba2f-4408-9698-f2dd39d37e3a" + "ID": "2f0d7be7-3ddd-41eb-adb4-a1935295962a" } ] } ], - "ID": "69ac83b2-27f6-4055-b884-3cbe42df6509" + "ID": "2f08c35e-b031-45e6-8f86-3b36da3e367e" } ] } @@ -252,9 +252,13 @@ "ToolTip": "删除", "Size": 16, "TemplateKey": "按钮图标", + "IsInvisible": true, "ImagePath": "回收站.svg", "UseCellForeColor": true - } + }, + "RulesGuidList": [ + "b48621b8-03b6-48fa-b4ea-b21d9a9ef3bd" + ] }, "3,0": { "CellType": { @@ -366,7 +370,7 @@ "value": "编辑" }, "CommandList": [], - "ID": "f25c1d8e-4c3e-467e-9b4d-8335eda2de64" + "ID": "74ca53e5-04fb-48a2-95d7-76a8fc29bc5d" }, { "Condition": { @@ -420,17 +424,17 @@ } } ], - "ID": "2d7f3381-2de1-4839-ae84-fd862a9a05c7" + "ID": "9e86fd86-ec47-4494-8fdc-c97c8c08d87c" } ] } ], - "ID": "e8a1accf-755d-4754-ae86-68086fa1f6ff" + "ID": "b1c1d9a8-6f0f-455e-8551-34220e5fe580" } ] } ], - "ID": "5e46fac2-6bb7-4bf5-b583-2043eb199198" + "ID": "860e2189-f85b-448b-af6c-41d9453fb95c" } ] } @@ -544,10 +548,29 @@ ], "PageInfo": { "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon", - "ParentPageName": "工时详情" + "ParentPageName": "工时详情", + "ConditionFormatRulesCollection": { + "Rules": [ + { + "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='31a709cea02e45ad83bb92336a6d829'!$D$6='31a709cea02e45ad83bb92336a6d829'!当前用户" + }, + "GUID": "b48621b8-03b6-48fa-b4ea-b21d9a9ef3bd", + "StyleInfo": { + "Underline": null, + "Strikethrough": null + }, + "IsDisabled": false, + "IsInvisible": false, + "IsReadOnly": false + } + ] + } }, "PrintInfo": { "PaperSize": {}, "Margin": {} } -}//+0BgRdj0bIOXKeAs1/0mkV05OzkJlYte1y4b9mBV9iEA0eXY2LKc5tTtEM7QBXbh8CGR8MbTWI6huvzR0188DFcUPNjW3b8aMwOvPGDRW9JmYG4eJscUw+JMnX1+8rrFGfTysFSJpsEmF/idbElcs9yYEBbCSpHbN5k3b1fpgelYnKxx1rY5sK6dqsWQN1S/CnE/70j2HKtwUzjqpstVjLvJUPmM5Gu3HtMbG5MjSk9/yCvdvr5GJVtCusCpWyRSaaPYLpRH7z5lon0gJIRXJEWLQuDIBjjJTI0fLWnKuJ8wSGlZ+lqWAGVkgwecJAv6Nq9Wh8UmpJZ0zjHyNfPRBTARM6crmokV1SO2hKvg3wWwWlPnYkyPsdjtPJHDVqIGGOmY9T9A57knJuRe4PTwRFUFFrwod8oFlq/Uczbe3/uc1yrLcDBwE3bLNA3E93hYFe1FAbyRdYnXFSK7Vv3CVbDUGakcK+Eylecmn0g64+/IoHeh2urXT3A6DvoUTyN5oNXsHXTcWZYNO4c4V0k4p46a0NuFyfGVGX4fa0Y7eYJQhDsBM1TFE1miKBZMktIOu2GFlRBGY1RwtEb4AkNNU8lDUsnWnQ4h2HalrxtCtqjRHpS8urUxWQ7feIWx0X6PuI7dVOWC7sIhEeeSLXtyou11GYNtkl/TA/uiR45e8NtlUH30cFEAyPodYp4RskCyC2fn70VT8mJ7+krIl4850nOLt+zdEaR5mWrG5m4gTHoHaPSUHQ7joBXpbA5kZrOhGv+YDcxucLiVmls0V5Xcwfckgwmk3v3NY1PSq4y+pK7sFcxeQyEr+lHKGqi34YVvLYA1fTtt0lc2ow6/tDOMdezx2hQ0+QjzI5lttFo2EQ9p/0p3On8L84Z97wuc7E8BHjMIMx63r+jS6/zJP4wqyg==|920 \ No newline at end of file +}//7hX5S54Uxhfk4havmiZXap+y0D7DMql6rVSfmJtLV8CEDxHkPb2rslVF8dqIMygB3M6vbZMq+R9i0rRfbL/9gr30g3CjxkhMjD5szgEmCaz+DkDZ8MhqqUObO9/fmYt/DxixSi/PsKZgl1sTg7JngQTIzLBixXavsZ7BMV4ZWiS/UjakVNbmKXvucFHdREr3Tf2bnDNQGt2Wjm6q+K00V6uMACKB+rrR69oO6mJa3EJsWPKCqVGenUxxqtovn7eGkDw9ZGsRXlX60ie7J/n6Hdh3vHeYhw5cD/Z4Vf/vSDKoGrQ+kzPMKSDRBll/iX3ZNARzxuqc2ntAGo33h0YXH9Qy7Ks5vI2lff2iC09/Vw995IhFsZMngG0QbgB6JxzC5DUI6vEUvVeCxd38+gUgVfdfGLDtKU1+i4fEIb9Rdyl1psTANjlds78upNzoLUsgvi44mP3iFfIwHxJWnaVlMN5oMr03XMCQSD7GPr+ItNETHraL/NkV6W2xC2QjSzwrkG+5m5li5szs7BUgu4sCsqXuRX1VGbVhHUA+Y0sxNZOCpZboMJKcJswrvENAeQx954uvYimMU/1y3Z0NjV7l0NCEw/iVfr/fh2eo8dHxO6bGnKspW4NQ5IGP7+RvCwQjXqGJgcQJLfo4crlz+aE4Yfx72KasEHI05LUgWLMsMRQ1GebgVPtd9oZ3PyKjy3vJH2qSFRJQPeBiNbAYpAskB0rYIgmhDqs+XjLdGn1eItglhOgtD3hqWIqhbIKjmfWIBTLTu1xhD/xS+JsJhjmqivSZHlkn8NF4kO9dxOY1VKUp8KpTHwt+xygG5YwoxJV//6pFg9/ebQb57zVV/IgwSJRlN4oUrcOQwjIXtEnsSc7N799kaC3LnPaSpBzqz/Y+m+AtrtI32t0T26uL9rnd6w==|920 \ No newline at end of file diff --git a/Pages/36d33d0079644f28b16bd0fec90394c.json b/Pages/36d33d0079644f28b16bd0fec90394c.json index 29b2ca1b..ef19181f 100644 --- a/Pages/36d33d0079644f28b16bd0fec90394c.json +++ b/Pages/36d33d0079644f28b16bd0fec90394c.json @@ -21,9 +21,17 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 10.0 } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 27.0 + } } }, - "Count": 4, + "InLogicalVisibleIndexes": [ + 4 + ], + "Count": 5, "DefaultSize": 10.0 }, "Cols": { @@ -114,13 +122,45 @@ }, "CommandList": [ { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PopupDisplayMode": 2, - "PageName": "修改报工", - "LoadBindingDataOption": 1 + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='36d33d0079644f28b16bd0fec90394c'!B5" + } + ] + }, + "value": "%CurrentUser.UserName%" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PopupDisplayMode": 2, + "PageName": "修改报工", + "LoadBindingDataOption": 1 + } + ], + "ID": "0b8c60e2-25ba-47a7-b83a-71631bdcecbc" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": "只允许本人修改" + } + ], + "ID": "63bee85b-0f07-45d9-a65c-5a369218c271" + } + ] } ], - "ID": "862d965d-bd15-4951-a0ec-0ee42999e7e5" + "ID": "18daecc7-5832-4411-b5db-a8a0572a4bec" }, { "Condition": { @@ -154,14 +194,46 @@ }, "CommandList": [ { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "任务工时表", - "UpdateType": "delete", - "ShowConfirm": true, - "ConfirmText": "您确定要删除吗？" + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='36d33d0079644f28b16bd0fec90394c'!B5" + } + ] + }, + "value": "%CurrentUser.UserName%" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务工时表", + "UpdateType": "delete", + "ShowConfirm": true, + "ConfirmText": "您确定要删除吗？" + } + ], + "ID": "dd66745e-3079-4b1e-a24c-74052db9d02b" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": "只允许本人修改" + } + ], + "ID": "75abf162-1e13-42b9-b4b1-43721ce3427a" + } + ] } ], - "ID": "b18c7c66-04a5-4aee-9554-d059ae57095a" + "ID": "60a5766c-f611-4ef9-a8d2-479b91179e29" }, { "CommandList": [ @@ -171,17 +243,17 @@ "Message": "该报工已请款，无法删除" } ], - "ID": "13fe08a5-9bf0-443e-9f58-5272c17a4d5b" + "ID": "8c77eeea-4bbd-425e-9e7a-3294029192df" } ] } ], - "ID": "782f89ba-47a8-4d4d-9084-c16564c098ef" + "ID": "25256465-073d-4415-a85c-654df88c1b34" } ] } ], - "ID": "6401e3c0-773c-48c5-9373-518b16f9a512" + "ID": "8f70f78d-762a-4442-81dd-08154d756e21" } ] } @@ -203,6 +275,9 @@ }, "2,1": { "TemplateCellSource": "执行内容" + }, + "4,1": { + "TemplateCellSource": "执行人" } }, "StyleDatas": { @@ -249,4 +324,4 @@ "PaperSize": {}, "Margin": {} } -}//vnMWeebkuoxE2rC1EmCTZ1BhVdDDkivZgMTludzFgM/6lBqttjMHO2+uA8D3tOII7kzgqQE39FljARNh1hzt0NyVXKWrDe6hfJpXlklGR7ZDwEsa+4vavPCfW9tmANoh1RXPiehCyqyYWv3U4+xzEglN1HkigBhox1o1TpAgU0bgDoB/x97ruFmUBNFnI8pUk8aAirthRSyJ53n5lSeDLAe62/6o7zrpHOVZN4/D7ZcJ19tZ6/4+NExyheGeEHrun9BXPCPoKzo9DWtZNdM9NhDj9LmRrKR9ych3f4pN5Qmz4peFLck1n+OIT3ou3CzmH1+4ArZRQo5WpZVuiW75jKIPt80xwFH834dbpvbi29FwrctSSvOrDnFQ7nwbSkSEDpBnBtFSfsKax7aWjSkoFE5kbuYeo1SojO4vDWn2y1CQE+Uje++dwlI434VIrBIbETFKzeUEOKQ5Dcg0Eaw2k5DEYQWnDXasvv3hJPUHluwaB9WRWrS9oUog5KHMmPhtW5DucRWYhkGBIrHKMqgZpLrsazK0oqRIAkiLDxM4XrT2ciagGQ/ZRDmqnlkheaL9pggJcvWhRtaDxd1kfdgKPn00pbve7qcE2mlSKN38Lt4h9tG8OYIJnawblrh51kgzSRdw5ObI69K0/StH8inpwIatBjMfYYNKzVItGrEUVf9uMjfA3x+9vxx8FgiKmYp68uGXhhkFN6NzRCz9C8DHStB11wpaYXakX/PQOdHFi8wrf7uP8pypM+WvXXsyKIT2M4SPNRHbj8Bf2k1fSjlJniaku4gtahspznLQUYEJdYERF2nmLT1W2AUvNcZijmd+LJe5xNTRPhORaBk4LxIfKZsDhZFRCRjmDDha2Fw8nB50oBGSVoPcttjIONklhOQnHx4Ut5YbxsDen3XjK4lv7g==|920 \ No newline at end of file +}//E+4iZBqqNggM2i7IyLzCMpz1tLY2ZdaMO72+OT9erRU6Z3sBom1d3r9HBefey6pnOX3+MzZeQmZO2GXs9vhhX7Jos6796M2gWCwOJ45JEnzoXGFZVAqpUkGmH8+6Hzh+bz597jnGdaQ5AyeYydPARVLhGh6FZ379VI/geeQ2YHjx6RNzoclPMCRgLyIB7hyBVuD2GdM3bglfoHtAvjShS9RrkIV2W2uLAfLXsGqZ0OOJzlFoKCNrIl9KUYzyT8AcC7f/OsyrUtiTjOO5I97EI7QgHSc7gd0qURnLU9KJs8LaLAcQtuWgKV9TrRPEnmzCaOtwF6fMbaHUAgHvbCSfYPDsgWRsy9HUF9msF3GGLi7ywaz5qrTy6CK5LsM61kc6o5F1rf0rQj7C4Ah0T521mtQEUag6LHGaDL7RyHe97Cuo5aEZt4bB5qk9aArZWERebISu1kKrlme21CCzz7YzgNAmy9SEK23tOB2/pqwMw2n/rqrzuEeFhmhES78uLJILgUj/TR/E7C7EquNFXKK2Jv7qYuB1kN64RApZnWP0KwKnPkUz5B7GWn0Yz1UctiqddXKuPgPtCVtjqdaB1+qjv0UXWbfGUT2dY4x447EOSGueis9rrQq3RbXK0q1AuLYQrdkihhya3FMa9vtdk+2RBCFgf7KVRLYx7SnM5jY/QteLCrkD9H/3fBNbPS2NjDkkZPdjs406Luzh31tZbyRZsBUttHVjo9PksCDEP0apdFtjv1Gk8J/xMNUOhL4Ux0G8pFYH9BdY/d8QBJBUIfdU3cBim6dkjChB8WK5YWraw69fMDDnSm9hFhAe+kq8g/h56vjChaEiyMWYtPsXSj/BVZidf2LUmus316GyjhydvxOwnISO1yMDkniFVdboWnZyvB6XLVsC3mj9N9ESbBTMpw==|920 \ No newline at end of file diff --git a/Pages/36d33d0079644f28b16bd0fec90394c.rd b/Pages/36d33d0079644f28b16bd0fec90394c.rd index 8b8e787f..f97f728a 100644 --- a/Pages/36d33d0079644f28b16bd0fec90394c.rd +++ b/Pages/36d33d0079644f28b16bd0fec90394c.rd @@ -1,5 +1,5 @@ { "PageType": 2, "ColumnCount": 4, - "RowCount": 4 + "RowCount": 5 } \ No newline at end of file diff --git a/Pages/94f8bae36aee4ae7aec2a063ca731b1.json b/Pages/94f8bae36aee4ae7aec2a063ca731b1.json index 47319d18..b5e3314d 100644 --- a/Pages/94f8bae36aee4ae7aec2a063ca731b1.json +++ b/Pages/94f8bae36aee4ae7aec2a063ca731b1.json @@ -145,7 +145,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "467a9037-3731-425f-830b-e12f039309df" + "ID": "9cd963cb-ba13-4807-9e42-48c19a875640" }, { "CommandList": [ @@ -174,7 +174,7 @@ "ConfirmText": "您确定要删除吗？" } ], - "ID": "9af337a5-a015-46fd-9efa-fe846a7fc91c" + "ID": "3b000ffe-71c1-48bd-a792-b53329c97c8e" }, { "CommandList": [ @@ -184,17 +184,17 @@ "Message": "该报工已请款，无法删除" } ], - "ID": "93448722-1c18-4368-ab73-5c3f9b3946e0" + "ID": "146f8547-9980-450c-aea7-b218f818168e" } ] } ], - "ID": "85edc3c9-90e0-454d-8a21-1e9e5b9bcf7a" + "ID": "4cda89d1-b801-464e-b2ef-1316283d2a33" } ] } ], - "ID": "d3348302-9a7c-43c2-ac71-43a254e89139" + "ID": "4ffabca2-7099-45df-9ca3-303951f6e498" } ] } @@ -262,4 +262,4 @@ "PaperSize": {}, "Margin": {} } -}//Af283opIP4RPq8jhmUNOnY+w5X/xew7jOgxSoxLNV7UFVPLnFTInpV49XzBN+LWBIWks/aikF8otLCxsouc1lJcjk+4/Xzb8FV1VK/jOySFnUXe8+QQCak3W/+UYK++Uh3fQvvqVHLVbhUznexpJ7IddBzxRoVg3/eyYDwP73arwpuliip9wLqhk0IHPqHINcvdtDnJUIf4kVd0CPMEgE0uqbfF1wCuLPSPysFvvZsHQlho05rPWdFQb21p450c1DjgOQGgu2uV2+YQw5JOyIqJBmM4aN/Ux2d1e+ZE9cMT/l/VZUn2QMT1yatVCylddLXNR0NrncknlXYJvPjdSwTOS61uvekN9aOivCxmCbKQBddRDeqwbUo8UwYahpOLkKX0Ag8L+zLoE5vp8Qh5O/n1Z451us5J3cEuf/CQmByhASmbcDLdxQenZZl766YPKWoFmbYBSfdcUDfa/PQmqEwERNaMh1PSPrsAnfpncvul2fGOuXHtqaaSiDFxmiPhYUDBRNDB5C+vLScziY9RVSY7oMiQcrAWzNoXBQfPj9V979PIV0RVkcOxOaJnF2fW1XGlYEPaNNYv9IlPlH88KBVxJGM1A+4Fos+rT09nSDC1tX0ugWbi6u3ggR8iEvgqzm24gLc/ckMy/LTU7B2zSRjCfdcb6fDk8QtDb8OqBJtFHLUd6ke9iMqLX4IbYuwZRoypxfdMZHUGVvybbIqj0OfHknghxD+J7wOs3+4erL4UI+mLIL6ds5aMWVli4J92GiWEYeO7K19mBZuFLDa5BuXd1GTD8LTUCPTU+3VOKznxtGuPIVVCfqqmp7lBuF/RoIGH5zqf3FheAxru8pS0YDIM8yOsfoA20DvVR4Fy+isNpHZRpo7l62WlQFXGEyA0k8QKtbrkL16fiDZ0Y2nKd4g==|920 \ No newline at end of file +}//PkeLpoAEU7agj9l5Ca5oyK3S/24fvDlr7uJnYRs+O8dbkJu+AADS3GrIS8e4+YTp46PF5P+Yk0DTpI8u1KaOdWDSvtjmptoTT4XnPArBokxePVXUjVTf8HIKq9Lm2TV1qrQnxPK2PGdwcqJ8VujKYEyHnTKaHhlCJQUzL6AAM5GUA9+GR6r6pIRLxt08JM4KJCdSWSG8C9dCAcLBbY6K8lS3TPjnVxwKRfnf/PSsSox/Bv8MaGyffBm+Ei2rfjMSNCy9S6+zGa3cAp6x4mFR5S+8te+iaGFRnAbY2fA+nc1HPX+y+dmJ75QDTw0uISV7kvEiTQVck5jn1h386Tli8XTkzTtZxxJ4FSGzmcz2n6DL/Ke5vAjzAO6IxyJoXa12NXPDh/NXqijI/CHEZoZga8EI/rTnc3XeHtbFHiXI5d5grCo8hDDwl8W61Bq6yQ/OOKTrJ33UhUBcbyrA4z5T5uZFcahSf5HLzjuI7iXrLh1DZbUx8DmwXZFheiv8Up/8FCzRNS5EVcUEG3qmlQ4CDareervJzBVqmvERCg0FEwajoOFlhcaMWDVjTYPs79P0ZuCbB6Q8PYvCEaLpv4pjlATT19TbeqP1voqvk7mFQjVJRFHBMSM0xM4jsm6aCqz1yvGZCPRWvpRZIOF8oPAW5pHNMnGd5flKlI6ehtH0rWPWJWnhOPz7BWJdTN+oszbZ9PPqzNxKpwVBQVUkdb5+9PRPglu2g4Hf5L3O+NbxSi4JCv3x+4yTRLP78J39n5v4imQNbhIuGWdxokbAwVScmHBnk4XkWtR/iz/Qi2kvJO/CEq6r39HkrihM+vrsKPVy5qnwNBAw3DM0mrw9pe8wH7iujbOwxlg/vrTbm6ARZH6C4Gfg53XGsosuKff+KaNhVDkucRWmkHJSCwHHnfjY+g==|920 \ No newline at end of file diff --git a/Pages/项目/项目成员详情.json b/Pages/项目/项目成员详情.json index cf0c4862..fcf20102 100644 --- a/Pages/项目/项目成员详情.json +++ b/Pages/项目/项目成员详情.json @@ -259,11 +259,15 @@ "matchMethod": "contains", "loadingText": "加载中" }, - "noMatchText": "无匹配数据" + "noMatchText": "无匹配数据", + "IsDisabled": true }, "DataValidationInfo": { "IgnoreBlank": false - } + }, + "RulesGuidList": [ + "68ec1254-efa7-4623-9ca1-84a1e58629df" + ] }, "5,1": { "BindingInfo": { @@ -441,17 +445,17 @@ ] } ], - "ID": "3f8dd57c-d384-446c-8d22-6aed78c64d3c" + "ID": "25ceb69a-0fb9-43cd-847f-b7d93b20da5d" } ] } ], - "ID": "ff9b50a3-6172-4c78-9820-a54fc436d193" + "ID": "66905bf4-6a2c-4925-96aa-ea370f213b05" } ] } ], - "ID": "f03e2a2d-0e8d-42bb-b7d5-2f3954ab3888" + "ID": "eba607ee-1500-40d5-a367-c8898a8bdb62" } ] } @@ -701,7 +705,7 @@ ] } ], - "ID": "43763056-035b-4668-8545-65c38306ed9b" + "ID": "854b418a-1e74-42ad-89dd-4603b7dcd3a1" }, { "CommandList": [ @@ -711,12 +715,12 @@ "Message": "请不要重复添加成员" } ], - "ID": "59458a1f-219f-4c75-9f26-820e811be36d" + "ID": "e6ac2f48-b433-4467-8c06-3b9ffe84fbc4" } ] } ], - "ID": "317396e2-5d07-45c5-9386-95f163e66a2f" + "ID": "b7d96937-a9ca-4d12-8a09-d8ec2e245f87" }, { "CommandList": [ @@ -726,7 +730,7 @@ "ShowConfirm": false } ], - "ID": "eef385a2-8806-4c67-89ba-089a7501f43a" + "ID": "5476c2a9-d728-4c92-a399-46a84caba3f7" } ] }, @@ -748,7 +752,7 @@ ] } ], - "ID": "6f365729-65f1-432b-a6fa-1e26266e6b85" + "ID": "5670df82-5883-4905-a81c-aba565c010a3" }, { "CommandList": [ @@ -758,7 +762,7 @@ "Message": "请指定项目" } ], - "ID": "46382263-7363-4a12-8307-6f5c8c2fa485" + "ID": "4ebfc3c1-ff9a-4c92-9052-e9600f956226" } ] } @@ -1051,7 +1055,26 @@ }, "RowBreakLines": [], "RepeatRangeSettings": [], - "RelatedDataTableName": "项目成员表" + "RelatedDataTableName": "项目成员表", + "ConditionFormatRulesCollection": { + "Rules": [ + { + "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ISBLANK(项目成员详情!ID)" + }, + "GUID": "68ec1254-efa7-4623-9ca1-84a1e58629df", + "StyleInfo": { + "Underline": null, + "Strikethrough": null + }, + "IsDisabled": false, + "IsInvisible": false, + "IsReadOnly": false + } + ] + } }, "PrintInfo": { "PaperSize": {}, @@ -1071,4 +1094,4 @@ "Formula": "项目成员详情!$E$20" } ] -}//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 +}//JQHu/wAhwqt8gohbUpxSO8SF8ahDCfiLMIF/dXwUa8t3cGa4xmq9MRrBMFBicLtkgQPslhSkwuTk06YWSByDW6Bfsv3rH99GEasHMATkph6TLHJirmsrB6hp4wkmHm08l5412KJETMf7bLTQpjSzqOOegw7jpaIFdPrdaQaTJ1nt+ugPtsyv5A8vpoBbfvryoqh0baOYJfbjCDo+SrxJbDuReioLByKI5ME/xTI09CEGEKZR7fMt0NbPQLefqZrNebt9Rs872sKu1VHhV457mXl4G/SvnPAVKztK5bDWQfJ7nU8Hgeq1/t+glCNwmCkRATntaHNdDMKsHnJq1BvoKsS0VbdemtNvuM7RNeP7OaiZMx7O/oyiFrmQ64qJbH4va7bYLIaGRLJo9EHi4uiK8nja/7/C4khKxU7NcamJ7o4fGh92mVUvrhmMyyGkcIxTkIOzNMU2/o43noPxpx6hhCPvOf1RQ7zclEq7krGo7kC0ArmbCNnJglVKkZxt0UxzTzVa6nfXJbX4Mltni/fdGduNiqRO8jCQray0ZssNjJuRChSiu0LRrEe4Ikpxw/YzS7NNZwYip6atLYJiYQDsfkzvAL7/Fi85G6yvaWgyBeUnjHnIrwiNmLNpW3kDs3x5uRqf50K6BtRjtvDXijSotQljL6HIOMZhV9Vt7Aw0WKNeJV/S+C6wCqmCByIvwYDPhHJrFBkFL5as8+ZabejG2HmJZamHGFI+mFd6zbfoiL6BylHSXOb9TdIItiuQEtVbQ3jISqqhU24RIuXksFniQrSwpVNX4CQRy3M735s/sNHJ88ACG9Undg486JbQLXfEIZsGTtlFkw9VFReUJtiREnBQKEcdlYbyNjiGgYUjfXj3t4GU+Jz2jHNDnfuiDGuhAq6z2X4VRDplhESu4ihLAQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-工时.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-工时.json index bf8edfd4..d8adcfe4 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-工时.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-工时.json @@ -193,7 +193,7 @@ "1,20": "实际工时", "4,2": "计划工时", "4,20": "计划工时", - "8,2": "实际工时", + "8,2": "核定工时", "8,20": "实际工时", "13,21": 1 }, @@ -336,7 +336,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "60c32cca-b06d-45ce-93ad-778ec1f341f7" + "ID": "49e708c6-916b-48b0-a1f8-958b01c35a81" }, { "CommandList": [ @@ -375,12 +375,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "1be7e38f-1335-49da-a9c0-276cf671bb23" + "ID": "a792d097-0c08-4701-8e0d-411362f4ff73" } ] } ], - "ID": "7091111b-fc24-477f-94b4-f92431f118b4" + "ID": "ae4cf9d1-058d-463a-828b-6c2cadbf64c0" } ] } @@ -435,7 +435,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "7d0e39d6-7b1e-4e15-8a58-c09d01fc5d63" + "ID": "35918542-e8c1-4b52-b966-5793a67c9252" }, { "CommandList": [ @@ -445,12 +445,12 @@ "Message": "你尚未成为该任务参与人，不能报工" } ], - "ID": "2c7a0a8a-aa77-4115-ad6a-5c1d30075ee8" + "ID": "790fa5d4-6bbc-40c8-bd48-ac184c38b6ea" } ] } ], - "ID": "e8f676b1-292d-412e-992e-6ef8297eef79" + "ID": "3afa29a8-a1a2-488d-91ba-41e93bc393d3" }, { "CommandList": [ @@ -489,12 +489,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "68ff040c-1bc4-43ad-9fb6-766221b9b1b4" + "ID": "78a10f1a-452e-422f-9eee-571d4d3ed770" } ] } ], - "ID": "bece63a1-eec8-498c-94bf-e9a9950eb842" + "ID": "3e10da9c-186d-489e-9470-7ae478bb477e" } ] } @@ -511,14 +511,14 @@ "IconSize": 14.0 }, "RulesGuidList": [ - "b34ba4af-48de-4a25-8bd8-ddc8ff3e714d" + "c99004b8-fd01-4070-8a5b-bb83f727b4f3" ] }, "8,4": { "BindingInfo": { "TableName": "任务平行视图", - "ColumnName": "本任务实际工时", - "GUID": "44b3e8bc-f0e1-4877-b4df-6f80e4b1e7a9" + "ColumnName": "本任务核定工时", + "GUID": "a80d4c74-1a59-46c0-bd2c-c250f5ad979b" }, "CellType": { "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", @@ -547,7 +547,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "ff3e2755-7fb1-40f7-ac28-5a587ff6cb48" + "ID": "675bc634-8a10-44e1-8995-586748cbabe7" }, { "CommandList": [ @@ -586,12 +586,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "5862701f-9913-4644-9188-a709713a985f" + "ID": "cd1fbe90-4f97-43d6-88ab-1181ee0453c5" } ] } ], - "ID": "4b32ea75-1c1e-40f8-869c-084dbd38520f" + "ID": "5be9b8f6-749f-4f6d-ac52-5320f12df03e" } ] } @@ -671,22 +671,22 @@ "LoadBindingDataOption": 1 } ], - "ID": "93740fc1-aa70-4d4a-b728-1df934d53e8c" + "ID": "1809563b-4191-4d5d-91e1-04102d6c4b48" }, { "CommandList": [ { "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", "FourStandardStyle": "warning", - "Message": "你尚未成为该任务参与人，不能报工" + "Message": "你尚未成为该任务参与人，不能报工！" } ], - "ID": "fc86eb26-e4e0-4827-a663-e1a59adaf0a1" + "ID": "3207605d-795f-4cb5-b0ed-214e138181d3" } ] } ], - "ID": "ccb56027-7564-422a-b3a7-f3cbc996d8d2" + "ID": "8e3d36f6-d439-4851-a94d-51f80b149446" }, { "CommandList": [ @@ -725,17 +725,17 @@ "LoadBindingDataOption": 1 } ], - "ID": "a636a26b-895d-41d6-9dcf-42508c9a65f1" + "ID": "67a194bd-0848-4f92-9014-d7e82b11b36d" } ] } ], - "ID": "2e6c078b-dd61-48c2-8709-53e508a444c9" + "ID": "0fd93f69-4828-47f4-be62-413f04d7261f" } ] } ], - "ID": "d610214f-2743-44d0-a9ad-677ef7528134" + "ID": "6ff0d3ef-59f1-4a1d-b694-3607a106118f" }, { "CommandList": [ @@ -745,12 +745,13 @@ "Message": "当前任务状态，允许上报工时" } ], - "ID": "a8dd2400-89a3-4e3d-ba40-bbaf5c9eae58" + "ID": "bfdcfb3b-a104-407c-9fae-687ec023522b" } ] } ], "Text": "实际工时", + "IsInvisible": true, "TemplateKey": "Gost", "Icon": { "Name": "Application/005_add_5.svg", @@ -759,7 +760,10 @@ "UseCellTypeForeColor": true }, "IconSize": 14.0 - } + }, + "RulesGuidList": [ + "3f43eea5-2c34-4fc7-a4de-03e475465fec" + ] }, "9,2": { "CellType": { @@ -828,16 +832,25 @@ "GUID": "d151989a-5eb4-4ce5-85e8-ee2caa82a3bb", "BindingInfo": { "TableName": "任务工时表", - "ColumnName": "工时", - "GUID": "7f4bd192-b050-4ac5-9317-3b4ba4aa534d" + "ColumnName": "上报工时", + "GUID": "ad174679-2cc4-4789-b890-bd909f0dcb46" }, - "ColumnName": "工时" + "ColumnName": "上报工时" + }, + { + "GUID": "a64e2423-13ab-4c45-91f9-3ea366d5d3b1", + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时", + "GUID": "d64fcbc6-88c8-4e6b-b8c8-30fb30e48698" + }, + "ColumnName": "核定工时" }, { "GUID": "f31b2d5d-3f99-42f8-8c17-80adabccd9f3", "Formula": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-工时'!执行人&TEXT('任务-工时'!工时日期,\"m月d日\")&'任务-工时'!工时类型&\"工时为 \"&'任务-工时'!工时&\" 小时\"" + "SerializeProperty": "='任务-工时'!执行人&TEXT('任务-工时'!工时日期,\"m月d日\")&'任务-工时'!工时类型&\"工时为 \"&'任务-工时'!上报工时&\" 小时\"&IF('任务-工时'!核定工时='任务-工时'!上报工时,\"\",\"，核定为\"&'任务-工时'!核定工时&\"小时\")" }, "ColumnName": "描述" }, @@ -976,7 +989,7 @@ ] } ], - "ID": "9c85a4b1-9f0f-4096-bbd8-24e05228308f" + "ID": "825e4708-e427-4ebe-b71b-10af82a9084e" }, { "CommandList": [ @@ -996,7 +1009,7 @@ ] } ], - "ID": "f13a17d6-1a89-437b-b72e-3bdcb461d271" + "ID": "721344de-fb5d-4d18-a87b-29dfbb2e215f" } ] } @@ -1248,10 +1261,10 @@ "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", "Formula": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-工时'!折叠工时详情" + "SerializeProperty": "=AND('任务-工时'!任务状态码>=2,'任务-工时'!工时分配方式>=3)" }, - "Priority": 1, - "GUID": "f0252303-f510-466d-ad62-b3d710deb5b4", + "Priority": 2, + "GUID": "3f43eea5-2c34-4fc7-a4de-03e475465fec", "StyleInfo": { "Underline": null, "Strikethrough": null @@ -1264,9 +1277,25 @@ "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", "Formula": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=OR('任务-工时'!工时分配方式=1,'任务-工时'!工时分配方式=2)" + "SerializeProperty": "=AND('任务-工时'!任务状态码>=2,'任务-工时'!工时分配方式>=3,OR('任务-工时'!父任务负责人='任务-工时'!当前用户,'任务-工时'!任务负责人='任务-工时'!当前用户,'任务-工时'!项目经理='任务-工时'!当前用户))" }, - "GUID": "b34ba4af-48de-4a25-8bd8-ddc8ff3e714d", + "Priority": 1, + "GUID": "c99004b8-fd01-4070-8a5b-bb83f727b4f3", + "StyleInfo": { + "Underline": null, + "Strikethrough": null + }, + "IsDisabled": false, + "IsInvisible": false, + "IsReadOnly": false + }, + { + "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=AND('任务-工时'!任务状态码>=2,'任务-工时'!工时分配方式>=3,'任务-工时'!折叠工时详情)" + }, + "GUID": "f0252303-f510-466d-ad62-b3d710deb5b4", "StyleInfo": { "Underline": null, "Strikethrough": null @@ -1346,4 +1375,4 @@ "Formula": "'任务-工时'!$V$14" } ] -}//dpaOgagWptnC10f1HPhZI3fg4jCPa7s+BdnT0S6JPb6OT/4rdV7Q2Xlc52VXd2sGOrUDU/zw3GuaKpd12pRJNJNAm8b1Dzpv3HnbBngbIUkq6pImu3aaOU7d+m7nRSc/E3KYEE5/gT0qzNXynvfI8b1KAHWXjLtilF1Y/DoC/JzuFVnPvjvPR1y43tu7X1nfENKWF5+AFlKWqdOKPtxZxJPlrMZrXOSnpgMJRpGwiE4rtcEwwAl3GAdDlPQb0NOlkN1+sB4Luj2NOmFKZfkdTK3vktqoHUKQDALHu2LUgy87A1fUzsRw9D12fEkzHQveQoubn7gdCOKey88zG5z844/iLQD7qoXJzEPQzns0GQQPQEnrlMEfQA53QAhAMqMZuhn/fuhUFZrRnH6Qic7POUAjDUWPF2XggkwT7PfYL4VWAMK65zx12sB0BVwxJLnjmIjQ4X61M0l6lrEglCywtRJd2Mqa236XLBsSngKJr0PGkvjhRLiwbTj9VEeeVbB6/vHBK538MzBeMaVYJcZE4vvxh9tRGHQhjDuQLqucfBVKb1TTdLO/1AGdoRY/6UyuzfhdZdQjMIC+O1DfL1a5Ip2AbwGxnLeH/dwoYz23JpqUAu06C32S2vOYhmGK3jXisiF3B21Mrj2VJ+l2jtHkbYIfKtE52G3WFEFXwJCYJVyYnJFAViFc2Nb9fV3K/jmCTjoHLRGepUwkVH0a/9FKjFJPna3TOn9+d5P9BYJaHOdTopPQMVAuAN4iT7D//Qqwf6p7FM2ocAC7AZDmwdmuHgC9SZoQSiitXTVACeED98Du/z3zDkv+mUAwFF8mOmnsCEjV/A80Ni1w3UanKxqF4hlVREjfVkBz9ZO2w49O4JDSjQ3hEdUtXxRWOsFjONPUHAfyCnUKzep7OL7W9NL85Q==|920 \ No newline at end of file +}//RBTmqGY1ZwTumK3PoUva6bndbB9WDISg8IanQxDlqQamdOxKDz45X6084aMX9rfFaiBdcFrO66+FCDsIXwLbcRhmu4Pxgp9vjXjQtp/bXQV2KJ3izQVL6qgSHN8B6altIuLUEUSNBPvuo2D9t8CdgP7RhuTddrFGnAEVXrWZwQT9Wq6PVoNmtZPR2ay7SewjCOBtrCwoN+7vZ5wT0WSX+YIeERVtnHC3bQ2lR9pZVhnYqGU7EYX99ZkA5cQwKSdBJ5Xwl7ixga8npDryU3JJLaQr45dzQSKz7RSvIkKDuY29vlI2tr3ZhPvpjW0/hTs8gpH5cKepr1KKq3i9zBvxgZeoFg3QRoDASl6AMdZg9J6h0pPaEtYnaFIw6JeGEB8X4OsgL5QhCfZJUCnz410qM7ubuM4QjZprBSugUNotebGTlZt3+2f6EszUEeMKL1e0zA/vkvHh+fOtyryldKYJ4iHb0X0v+ZwUrIbTk6PzTIzFc33rYZPuVy4LQcTeq+f/yZ8uXAjRlrKqmg7mrnpXSrOZ5H5V27/vi6WuR73UCySGE83k3G106z0yUSdoN4twl5nAM5zHSBktwB9oO4c4C49yNCivgClzhR1hnSx8KXl9tSoFa1VmhBxDnZUF6GclsWS+OorE/bgnoaQ1FtgAMmAlYfwQrKR1FSoU/D+T14gMgZMsGTGLzcJ3zejEZaCNojw7kQHrzPezSQtBXp6gzqmFlu3L7h6ZdXjuYmF2wwHiqZMY+JB/O8Ed0XcN0xq74M5nUQZ+JErOv8FAZbl9INDVqAG2gHH4Ny4rXyzaP8SkMdKb1PMLRWwcoY+2zqlOwm5aCbLDJ5o/Q9+wR8HwRNlPJiWPMJmhX6DnMRWXwecve5KC6Wp7VR5elRh/d+Mnccdfe05ndGqKu9y5vprcog==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json index ea52b722..f1fd5554 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json @@ -223,6 +223,7 @@ "7,1": "工时分配方式：", "7,7": "总计划工时：", "7,14": "参与人数：", + "7,21": "任务负责人", "8,1": "项目名称：", "8,7": "项目经理：", "8,14": "任务状态：", @@ -339,7 +340,7 @@ "ShowConfirm": false } ], - "ID": "080cc3d7-c496-4fb9-850a-7934a1c21225" + "ID": "5bb5bece-e5e5-4c39-81f5-49701c8f189c" } ] }, @@ -403,12 +404,12 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "f98bfe52-ddbd-41f9-8599-503bce6314f8" + "ID": "976139ea-7a39-4520-834c-e792e43cab11" } ] } ], - "ID": "bbf7de3e-cc41-4f77-9caa-dede26829599" + "ID": "46118012-fb32-4170-b7a9-46ebb620d102" } ] } @@ -456,7 +457,7 @@ "ID": "e2e848e0e72d48229c97757429d446a2" } ], - "ID": "fc345220-28d1-4a49-9c63-285b82026208" + "ID": "79c56612-e4c9-4d4b-a675-1a25caf651ea" } ] }, @@ -674,7 +675,7 @@ "MethodName": "Refresh" } ], - "ID": "266d462f-dec9-4513-a584-5ee07f800d9e" + "ID": "dfdb8fe5-1fcb-40b0-8c3a-7793d706ccfb" }, { "CommandList": [ @@ -689,12 +690,12 @@ "BtnText": "知道了" } ], - "ID": "1b0917f8-4a83-458f-be28-d5792706465a" + "ID": "8f5003ea-54a9-43af-b50c-7f0006fb1e7f" } ] } ], - "ID": "34f97df0-8495-48da-9388-0abbe7d77527" + "ID": "7249c42d-e6ac-4ea4-be4b-f561d9c9eddc" } ] } @@ -814,7 +815,7 @@ "ReloadData": true } ], - "ID": "dc5cc33f-0ac4-4243-935e-a86551c815f1" + "ID": "816062fa-3e0b-416c-a820-c6048b4136e9" }, { "CommandList": [ @@ -829,12 +830,12 @@ "BtnText": "知道了" } ], - "ID": "27d4eaab-0fc7-4bb9-afaf-de5008c1fed7" + "ID": "34bf04c3-223b-4829-99b8-c6e6c5deacab" } ] } ], - "ID": "75df810d-9c91-4533-af8d-9520006c7225" + "ID": "9b46f902-eebd-4cbd-b8dc-69becb9bd029" } ] } @@ -974,7 +975,7 @@ } } ], - "ID": "8e113447-b76f-49a6-a1e2-a0a04b3a7508" + "ID": "6668979a-c6f5-472a-95fb-9eeaf4910617" } ] }, @@ -1015,12 +1016,12 @@ } } ], - "ID": "c5f6abe8-8b46-435b-aa82-95c83d90947f" + "ID": "b632925b-d076-4e49-b989-6d38bb211b82" } ] } ], - "ID": "c8e5cf73-f044-4ed1-8042-2d0ef2d8d145" + "ID": "08e2099d-86d4-422a-9d02-dce966f9c0a9" } ] } @@ -1081,7 +1082,7 @@ } } ], - "ID": "764984f3-4674-4449-b97b-e1796b5f1fa8" + "ID": "6908e48d-047d-4613-a347-5c878a8594e7" } ] }, @@ -1122,7 +1123,7 @@ } } ], - "ID": "0667eee6-b486-448e-8447-605e2acf5825" + "ID": "b914aec4-fa90-4c4b-8775-654fb2545687" } ] } @@ -1237,7 +1238,7 @@ "Disabled": true } ], - "ID": "5126c96c-7881-4a9d-b668-83bd11b4acfa" + "ID": "b1b50506-6c40-4f61-94a6-92c1490c2422" } ] } @@ -1292,6 +1293,13 @@ } } }, + "7,24": { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务负责人", + "GUID": "63e84529-7a5d-4d76-a58a-89f2faf1cc6b" + } + }, "8,4": { "BindingInfo": { "TableName": "项目表", @@ -1729,7 +1737,7 @@ { "FontFamily": 1, "FontSize": 13.333333333333332, - "Foreground": 11, + "Foreground": 6, "Formatter": 9, "HorizontalAlignment": 10, "BorderBottom": 1, @@ -1920,11 +1928,11 @@ "7,21": 21, "7,22": 14, "7,23": 14, - "7,24": 14, - "7,25": 14, - "7,26": 14, - "7,27": 14, - "7,28": 14, + "7,24": 22, + "7,25": 19, + "7,26": 19, + "7,27": 19, + "7,28": 20, "7,29": 23, "8,1": 13, "8,2": 17, @@ -2017,7 +2025,6 @@ "7,21,1,3", "8,21,1,3", "9,21,1,3", - "7,24,1,5", "8,24,1,5", "9,24,1,5", "6,14,1,3", @@ -2028,7 +2035,8 @@ "6,17,1,4", "8,10,1,4", "9,17,1,4", - "6,24,1,5" + "6,24,1,5", + "7,24,1,5" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -2133,6 +2141,10 @@ { "Name": "父任务负责人", "Formula": "任务首页!$Y$7" + }, + { + "Name": "任务负责人", + "Formula": "任务首页!$Y$8" } ] -}//6czjRQrdNSagNWgSe2T6vQIuIGVwfCmWUSzZ6DaxOzh5CmKAbaPyoO6SKrluDyuVXfPRnABwem01apojALurGFkOim9t81n7Q9r8GPOyL4jk5tRIGxN6IiNLnz2K9Pe5p/W6PYsgcTngWV4pJEOF46QDn2F4Z5u7b4z9rYmAdhgy57IxnpzbDC9AXRrYPafdTGufsIH5yjQlHlKWqtXPrHysU+U0cYpQFsK6EVzjJAafaQYWPdNNfyplj54UT7W9MMo1olFbXqEAvLq4Ii2WU4vV3r/EcYn4q3Np45fgHncW3glmloXMLPR9LW2U1gZVEcDjj9bR1v4yLg7qM+PBEsLMea/A8WSaRvRla4K93JktWLnJ61lHOzZS7vuiPdMpBx8XZ1Razr+/Hx2izbXanGft1oeBGumnu19WQFXgWxQlBvZ9sSfxux+UUa9GCkr/crLFDBwB3SE/bASqCN96rhaMY2UwlimddI9AWyUGcNQt5gCeFogdIC5T0WS1slbXq17Oyhsf+tNsUhC9qLNTgubZ4XSHT/goFjwbi5EhroPF/2+qY4hXYnWZa4m2THL9FOivGpZLhGwvF7+HJJzhfsBnBpcG1mPSltht3F6vWaACOyE9FxZtmpKagSPB+aZ8INzyFB8Ze/+cnGdhKxT5k/NawzBTg8EcwddayQwhHfS5j6mdD5HWagItFnV9YGVdnsbmjBJCJ1Mk0x9mTYQLnG4czfJs3fXaELWDd0JaEpHItWl70U3CqA5TSToJzhXnlipCMm0nfYm2R/ulfqjzAssEJNVLbzJiB543NO1LVMUmUK8/AWnaDuAXmx1tZu17d431OYgFQj7tQE58mcTyvGYi+bypCyK0PLYbNL3zKofzf+XZ8vaHPQXBNmd0j9ptF/XDhE55idsQnnS5ckHgVA==|920 \ No newline at end of file +}//wRf59OZbGPfNWKNS3bwNxnE1ZoQMzqjuj9qXdBHvLnrUmwv/u3vz5MgfGfOgXHmmq0Mlf/dLRX2EgVwi8lGhaWxeW3J+IzTnRQQ4om6tYTq6pnqrujTTaVbpJk/6qLUe3TpopbLb9u3ANek6qN6Soa6Vzp4gr09d3XDYEmNrZOtgcF2Mh97da0ix90aDupif9h882g6Po51D1tbAI5l5N8bCBBFOcwTj/zwaLcggyJbcJhvi96I8TzEZl1x7r3b2I9aOypBG4jec637/LSAWZYCqK1oPvPawnOLepdOYGoDFa1xs7gOP+CEnqOIJRwzcB++ADqFHEezzpQG+a4xIsEV24UN+jYShAq1b45d9RW7Wk6Fcgj8EmfQJYFAz1YMmSk2cYje9GIMWB8Ebotld59d0cShKUh2BciAMFt6y31sYu01jsc4qc8PT0jOoOLSQE+R48DF5oMdb/cJ+MSPXSZxGV+K68FdbxrKF/J2uQADqDincWS+uAQy/LxMhW3YFq04AAo8j4RyGiSnK2sSFLJSBr7Ij7wsAtfzSc1GjII3NFBbDTxfbbcnPz636PZ9s0t7THlt1AWnN9D5QCma60GivHOxI1Nw8ZtQohANTc+TAAobk3ytTVsdBDD11t3JXK9LomhtJRjjTiWScES3rIfJckUpYt0Vp6m2htn6fbNR7uj4+XrHNTkGm0Vs2KdfhpdwIRew9qonxpMZgW9N2PM1uMsboYoJLDpQmPjf62o7hwOoNcDfxQSFxqvkIBsd3jtdFDh4tJZ7zM9jFeT+U4IufP/l0oTpb4iwZ8o0bMaa+/duiGsRQLZ2F/Yr7eH6uZkv/WVSLeyx0TV0SsJlXlJOHJOKoAFPvp4MK0tQd30K+Mlca8ljoehdbdPavmJuB7wydoB6KnUqEboTfLBb+4w==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.rd b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.rd index e254ea1d..0d01f3f0 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.rd @@ -74,6 +74,10 @@ { "Name": "父任务负责人", "Formula": "任务首页!$Y$7" + }, + { + "Name": "任务负责人", + "Formula": "任务首页!$Y$8" } ] } \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/修改报工.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/修改报工.json index 54c4d25d..fbfc8e21 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/修改报工.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/修改报工.json @@ -201,7 +201,7 @@ "Values": { "1,1": "工时执行者", "1,10": "执行时间", - "5,1": "工时数", + "5,1": "上报工时(实际)", "9,1": "任务时薪", "13,1": "工作进展", "20,1": "取消", @@ -356,8 +356,8 @@ "7,1": { "BindingInfo": { "TableName": "任务工时表", - "ColumnName": "工时", - "GUID": "dab9133d-40b3-4f28-86bb-648f8b33cfe7" + "ColumnName": "上报工时", + "GUID": "8dd2028c-6efe-4967-b73f-25ce0f775be3" }, "CellType": { "$type": "ElementUI.InputNumberCellType, ElementUI", @@ -380,7 +380,7 @@ "max": "99999", "step": 1, "precision": 1, - "placeholder": "请输入", + "placeholder": "请输入实际工作的时长", "controlsPosition": true }, "DataValidationInfo": { @@ -580,7 +580,7 @@ "ReloadData": true } ], - "ID": "b379f73c-aa98-4896-9c59-a9eafa20e529" + "ID": "755d3c8b-0858-4f95-a125-7348ac6d763c" }, { "CommandList": [ @@ -595,7 +595,7 @@ "BtnText": "知道了" } ], - "ID": "acd67a7f-986a-42a2-b64f-87c54ca2bd6c" + "ID": "e8dc8ebd-1c88-4e76-a7e3-15893cefb9a0" } ] } @@ -870,12 +870,12 @@ "3,1,1,7", "3,10,1,7", "20,14,1,3", - "7,1,1,16", "15,1,2,16", "22,1,1,3", "22,4,1,3", "11,1,1,16", - "22,7,1,2" + "22,7,1,2", + "7,1,1,16" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -910,7 +910,7 @@ ] } ], - "ID": "20652f52-9dfc-4203-85eb-c7a613f25629" + "ID": "751de86b-4d68-4be5-8fbb-a224e2887f24" }, { "CommandList": [ @@ -927,7 +927,7 @@ ] } ], - "ID": "09b69303-15dc-4b26-8162-aadd0007e1ec" + "ID": "582c8623-a528-4da6-a898-5be54078d670" } ] }, @@ -984,7 +984,7 @@ ] } ], - "ID": "cfd39d09-c392-43d8-8678-95922c72a481" + "ID": "44f4fc5d-1100-4b14-a311-b8184401c644" }, { "CommandList": [ @@ -1001,7 +1001,7 @@ ] } ], - "ID": "07fb80b4-3f8a-4be8-ba63-46cd60b2ba11" + "ID": "51e6a820-ed67-428f-a856-854e776cc4c3" } ] } @@ -1057,4 +1057,4 @@ "Formula": "修改报工!$H$23" } ] -}//0t4mrARzzeBRuB9ScjBUO4Zz61DtJ6djeGOIkuDZZFNquQFc2XemjPQQSzl1w2f5BjlHAKIHVj8PT+lTlussSaR5d1iIEIxRp2PjOd5nJuLS4vcUmPBMcTJEhRqUPQRUHiL1tPDW1uJ1IwKgk/F7uVsNrPdJKRM74rwywa5z/By+Zom6rSBqZru0Vc9QajE0lbx4kZZYd684eAKHn2wo5rO2cLZC65btvbAXqxMcSZdqQ6kf2bdRgLunrMCmNJQN2TYFhQQq8hb+b9aEikWwYj9TI2GIiNzIpHyHJf1ulPfV6UiNtDB1NMb3jRrV6N0Iu/pQUwK25/ArAicokXMN8j6NVrYGvyBnf5bfNtrrk2SJ+aFnYiR1CTNP58CEMkrPvopU/4stmt85sQVVz2C9GDwUVP+DyXmiAIMFlwpaayLETyrcGDRT+0w0NPPssPv3AFF8/AR6ubSXdI6S/rdTik39ZNUIEmRwgv0+0l0rKj8EFTBKazrGwHLmD6cqaql4rBrV281Ec+5FMnE+Kz3SzXtClqm2q3uwuLPxcXbZiMN/PfrcdkQnwbZOCJkdgNYDXs+5u9plywaES4GMgZpsfS3RLP2tDDXS3c1No/YOk87eNetPA8bivyRg3ydEY6nJu3AfRAnUpDI99OLvkbMLA/DhzsQc0BkWNV3U74RD4dFr0vaFbZRANLoXBEk9vuMDOQHGH7IEAUJX8VK+9XIC35Nvd9d77xJkpuiHL5z+aNwH11FvUgk+4GQ+gAmqAsCr6/Q2nTqqVBHbtDZNke9wi3JrEFKdmrqv78+4b2rSe2e/N11mi/9rUD/T4TroVwC4EDDKuDRRTjqE9Bl+EVil3RaK044DXpd5EmLv95m49JC8TsPOoISVZTPh9KH73lyr+uieBTJNqO2aZeCldG7usg==|920 \ No newline at end of file +}//hQklGfcozUMoTJUbTHeITfMom6C/Msb9eyrB8nibuIxTnBbcRcXa4BB66e0vkPgoMqAGzODBpAvkJLiFFvCgi3CZ/vHlyZ9Ms21097KabUj2TgnNkBpa0HZaPhr6uSBa0PlXD3nf8RaExkwhez11xb8WZCIAgprqtUxlkGf7Vk2OZUXSawLhyis+g57h5SjaetfGbaUlL1DCoOAPDWfRguqIR2TPjt/w2chdcUoUP+UH8UL+gKIA0s0UARx01XE/pbKqoTJGIyeJDsa8JmFG6gW5nHgEnXIFsPgcsU/tEL7fNWchUNrt6gU67B8LTrv4g288S+z/3VtgklMKKvlKWCLSs4/2c9vnX2WsjTw7NW4UgGtCZ94d8DxnEXhMQjnu3aM/D1pCO5CmpFIED4MWNzcs/Ql5oQgPg/JI0yIEmFRXrZwHAKNuUxRIDZ6NgeAsR4k6hw8aYD0ddhn1k2M4V8/V2p8Yjgw1Y2Ryil4XVdJxEvL5WhxNw8PiZqkzmyIATAlkYxfvRkvcEehJwP1+soAuZ+5uc1bFEgsSzrWtbuKvNbmB/xGRLPlIjPuJC9n6b0K59jfkluWFM7CSwlJrhIjZVN095cr5MS55uHv+kG8U83NMTB30bWPLah566KSrDPj17adZIa+I9C0xgn3XCZsp7txTPn3DUaSg4ua7wmSA9ogEqS637UxazsCGjDYzZEtPlGt6aPBlTbBgnL95a6ebgF+rav4PT6phFdSt8FXn0YTDpcaQp5iy9yd1RyYbIZDvNs73ZxM7SMaQ35sM4AV0zb/vH+PPn8gNZIEUKwr5ttuTCbtg6QnY0NK6XvT8LGQgZVyXUKEizSSkq1THbF9eiVntd11kX41h5WS8hz6B3etK+oSNn2IJOwB9QNaqbamzc0l8KI1b6PErejkZSg==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json index b9bf49d7..b2e8b40d 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json @@ -570,7 +570,7 @@ ] } ], - "ID": "18eaf3a2-4a0c-4dc7-b7a3-686797c3a10c" + "ID": "c5e9fe2d-9736-47b9-8524-d7d0209c2792" } ] } @@ -707,7 +707,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "3cac5161-d1dd-468e-8ad9-561f39760b2f" + "ID": "26f4be4d-c182-4413-a6b5-250d66126be8" }, { "CommandList": [ @@ -819,7 +819,7 @@ } } ], - "ID": "154f3d77-7c6c-4968-979d-4effd67ff552" + "ID": "293ff116-8247-4331-95e5-cd0b7fe2089a" } ] }, @@ -833,7 +833,7 @@ "Title": "加载中" } ], - "ID": "2daf89b0-8886-42a1-8c2e-6070d4500249" + "ID": "dc884f4e-1cc8-4feb-89c3-6c305e38489a" } ] } @@ -981,6 +981,12 @@ "ResultTo": { "SerializeProperty": "核定工时说明" } + }, + { + "ResultPropertyName": "报工人姓名", + "ResultTo": { + "SerializeProperty": "报工人姓名" + } } ], "RefreshAfterFinish": true, @@ -1147,7 +1153,7 @@ "ReloadData": true } ], - "ID": "5e789458-e54f-470f-a0d8-a07c7047dcfc" + "ID": "873ad2b7-0915-441d-9cb3-6e3342dd7c51" }, { "CommandList": [ @@ -1162,12 +1168,12 @@ "BtnText": "知道了" } ], - "ID": "7d5cc5d7-f0a6-408a-913e-c3b9103ee050" + "ID": "80eaddde-fb31-431a-839b-318977ff4b05" } ] } ], - "ID": "d929f206-2f36-4f4e-b0ac-a9ec83170d1b" + "ID": "541cae1b-8cbb-4f20-a668-4888d0cc74d2" } ] } @@ -1240,11 +1246,20 @@ "TargetCell": { "SerializeProperty": "=核定确认!核定工时说明" } + }, + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!报工人姓名" + }, + "TargetCell": { + "SerializeProperty": "=核定确认!标题" + } } ] } ], - "ID": "05e354f7-0845-4953-9054-628bf74acb27" + "ID": "4b6ff782-862e-4180-a2fe-10dab1940663" }, { "CommandList": [ @@ -1259,7 +1274,7 @@ "BtnText": "知道了" } ], - "ID": "ea143803-22c4-4163-8625-83489e60f45c" + "ID": "de34dd56-94ba-4085-8bd1-e4ac0f34b1e3" } ] } @@ -1671,7 +1686,7 @@ ] } ], - "ID": "bd3f9718-d5f8-40f7-a1cd-5a1a05b118ec" + "ID": "cdb2fc93-5774-44db-94c8-5d9454cef779" }, { "CommandList": [ @@ -1688,7 +1703,7 @@ ] } ], - "ID": "dee5f996-5bd2-47e0-bc0d-767155e78d34" + "ID": "2817db3e-2952-48bc-9eee-e946a007821c" } ] } @@ -1757,4 +1772,4 @@ "Formula": "新增报工!$B$30" } ] -}//Gxktr3vsRqfFv5d6sMJY0j+ZvwlG2lNMfs1Kz0YzDY0L0EK58+tyJ173C2bwzaSvAXqEmVy8+GiK1PjxWS4RrbstAcPk5mS/jmqzQ04Nq6oBVbmTWdJRJoZgtXSbfNNWOsh28XjODgNT9/NsPi7NzV40lblKwXqmYAWmlndb/9usPhH+MD89PvPtWFzOXnJkqhJ2yomfLpElwbixH7X3bmLjnu/RROXfRaz/RRv7bmZWaig+1sKLHTS/iluqRbmc42d2KuGvkZZo+3DlfjWe0zmpoueMDdqLwy5C49mpdVpFAiQNvFg0e3iYUUVhdEJuy59N1nKIz2cM1nkIOs7NKoirewhV3xsJVpOSFUthFnbuk3qvi9WkkDGzr1GL6YASFaADSynEoQKPxTFzMkj1zSF15src0B60jGW66R+vhJsD+93zTtbKo7QLS+Xi3k+xR+/bkoN2zftC1j2MEQXwds2yWMV6aNrr6wArk4jJeyCkRFczwPnyfhyCMG57WUzYPDH0IhSR5AtHTbWVlhnLVPy7S5AxZ8WCU8Mewe3nWKO5Ht8+yj7zm6Fv71UGd4yqJ4ky9uFenfCnwPf6J42HCKv3A0GJ1/agxTjKuArod15abWDY2qVS21uHz6fdTWQIihnu9CBThmKRVtYXLCk2M7PYI2cENtpDsGmlI4IcHiML9F+DuHniI0M6dT3CQNDK8muF5y8vXFOCSdD++kRE5lTKcWGu9fzNxjyermc4G4l6/YxP7sDrYKtNVcEjgg+po752bPAWAzhBNuIj4vWETsLdyjKZ+DKQ1mRVBG1pBosSrOZbDoVhOJqLY5sE3tZrwPP9vvUdpK3V/PCu3AkiCAFGvfZHkkjdztVaqt4PHelwJfiHGPkCIu3TRkDPjwZoLJ0T1OMabBht7PRysfaOcA==|920 \ No newline at end of file +}//+WYmAvwNUb2mGIUl5jnwCPO/zISlCxqFeXCGz/Lnfkouy9KsK0IowbOSvegGXloIt0+nvKstWsxHssvZLshdRdv32zYVpYpu8KH08QkDrpDFJN6hLLj4sYsDpui4FbJynR4XkEcjvPObqeX/eGCImoIgOaTcIAwnfAk4+uWa/MIwtgwEavetAeZDl61YaVE6EFA+KRIAF+IB+ayxU5razCTzMrk7mKWQn+gjJnr41w4c9YH9RmISsQRP3VBZTLyP6B34og3IT/r3r1bH0kEfmbjFKnwH9ZZHNcPQuU27+jrf/ZjbzC/+LtOOWKBXSL/fUjXgTCAkCKn3d1AsZsotwwdaEPa3A2o6c44ZWurM2PS/d4q0XT6Vqp/zURYyvQJmAasWC/zx7dwfJRR4qdXPYDfQ+cW4vfZ3Jsx+///ryrs2l2X/874FmEIj8Dpxbc5C2zpExyoJAlxNEzlhKr+kNVXqxZA1z9V5biSZrxCj7Zb1qXDkjEEiKPBYCqGS4KTJq9/xK7X5ppt5lgpwDG7RTbsN9cjWOrxmU+pGB4SH3uO+0eSUmRqwQKj3E/fElXomdxyVY6qEuvkbib215bJBl0ZmR8NF3YmV7+95Po9o+UDv7Q8nDHhkZzuXKqEuo+uMUEIbralpe+hAbNJ+ykY9RcKyr14kcoRRPrsxKN0quCpOCxDaLF2oVDaMEogHTIT+atamYjdnG1F6mtoiWUg0Ul/ZReoiyeVpDuQYle5rtDsO1h/NNco7il5CwXgGNmPAUFcRk4cKOTfSDQxC1nl1vJWOHIHvJd0MFG3r/nrqnFfD8MaetgzD9kydzkmD7jENxo7dKur1xFICo/h+xU3yO9+ddeRaMJsC2TMkNbAw3r1R1a3YJSsLOhb+OrXWndR/MCDMHtifmJt9UTUTpTSxcg==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/核定确认.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/核定确认.json index 04163cac..31bf74dc 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/核定确认.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/核定确认.json @@ -311,115 +311,117 @@ "FontSize": 24.0, "FontWeight": 0, "Foreground": 1, - "HorizontalAlignment": 2 + "Formatter": 2, + "HorizontalAlignment": 3 }, { - "FontFamily": 3, + "FontFamily": 4, "FontSize": 13.333333333333332, - "Foreground": 4 + "Foreground": 5 }, { - "FontFamily": 3 + "FontFamily": 4 }, { - "FontFamily": 3, + "FontFamily": 4, "FontSize": 13.333333333333332, - "Foreground": 4, - "Formatter": 5 + "Foreground": 5, + "Formatter": 6 }, { - "FontFamily": 3, - "Foreground": 6 + "FontFamily": 4, + "Foreground": 7 }, { - "FontFamily": 3, + "FontFamily": 4, "FontSize": 21.333333333333332, - "Formatter": 7, - "HorizontalAlignment": 8 + "Formatter": 8, + "HorizontalAlignment": 9 }, { - "FontFamily": 3, - "FontSize": 21.333333333333332, - "Formatter": 9, - "HorizontalAlignment": 8 - }, - { - "FontFamily": 3, + "FontFamily": 4, "FontSize": 21.333333333333332, "Formatter": 10, - "HorizontalAlignment": 8 + "HorizontalAlignment": 9 }, { - "FontFamily": 3, + "FontFamily": 4, + "FontSize": 21.333333333333332, + "Formatter": 11, + "HorizontalAlignment": 9 + }, + { + "FontFamily": 4, "FontSize": 21.333333333333332, "FontWeight": 0, - "Formatter": 7, - "HorizontalAlignment": 8 + "Formatter": 8, + "HorizontalAlignment": 9 }, { - "FontFamily": 3, - "FontSize": 21.333333333333332, - "FontWeight": 0, - "Formatter": 9, - "HorizontalAlignment": 8 - }, - { - "FontFamily": 3, + "FontFamily": 4, "FontSize": 21.333333333333332, "FontWeight": 0, "Formatter": 10, - "HorizontalAlignment": 8 + "HorizontalAlignment": 9 }, { - "FontFamily": 3, + "FontFamily": 4, + "FontSize": 21.333333333333332, + "FontWeight": 0, + "Formatter": 11, + "HorizontalAlignment": 9 + }, + { + "FontFamily": 4, "FontSize": 48.0, "FontWeight": 0, - "Foreground": 11, - "Formatter": 12, - "HorizontalAlignment": 2 + "Foreground": 12, + "Formatter": 13, + "HorizontalAlignment": 3 }, { - "FontFamily": 3, + "FontFamily": 4, "FontSize": 13.333333333333332, - "Foreground": 4, - "HorizontalAlignment": 2 + "Foreground": 5, + "HorizontalAlignment": 3 }, { - "FontFamily": 3, + "FontFamily": 4, "FontSize": 13.333333333333332, - "Foreground": 4, - "HorizontalAlignment": 13 + "Foreground": 5, + "HorizontalAlignment": 14 }, { "BorderTop": 0 }, { - "FontFamily": 3, + "FontFamily": 4, "BorderTop": 0 }, { - "FontFamily": 3, + "FontFamily": 4, "FontSize": 13.333333333333332, - "Foreground": 4, - "HorizontalAlignment": 13, + "Foreground": 5, + "HorizontalAlignment": 14, "BorderTop": 0 }, { - "FontFamily": 3, + "FontFamily": 4, "FontSize": 13.333333333333332, - "Foreground": 6, - "Formatter": 5 + "Foreground": 7, + "Formatter": 6 }, { - "FontFamily": 3, + "FontFamily": 4, "FontSize": 16.0, - "Formatter": 5 + "Formatter": 6 } ], "Types": { "Strs": [ "Bold", "#FFF18F8A", + "\"✨ \"@\"，请核对您的收益 ✨\"", "Center", "Body", "Text 1 50", @@ -436,7 +438,7 @@ ], "Borders": [ { - "Color": 14 + "Color": 15 } ] }, @@ -577,7 +579,7 @@ "14,8": 18 }, "SheetStyle": { - "FontFamily": 3 + "FontFamily": 4 } }, "Spans": [ @@ -594,7 +596,8 @@ "5,7,1,4", "5,12,1,4", "5,17,1,4", - "1,1,1,21" + "1,1,1,21", + "16,10,1,4" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -665,6 +668,10 @@ { "Name": "核定工时说明", "Formula": "核定确认!$G$17" + }, + { + "Name": "标题", + "Formula": "核定确认!$B$2" } ] -}//i7wnpAiWW78Y8I4egq6MxUFap1efVxHZgYjxaNclD3HexEp4L/2dVd0WDHTYb/nD48y1YIgXU6j+EHTOI8XpTKkyM9+ScMnNz6S7xO9XTfAPiau4n26oPtoYnNcDrs2HW4MTIHfMqeyTMNOi5en4EHCFJUUb1rm+cmRbl/h1kU0j9ZHIM+a7GR6JKq0NNOLPp63ZMn7ZcZP/XxQAgFvBSZihYJa0F7JfaE+Gp5LslJ7Sg6sIh4KtegzJX9vhw9PLEVkX4nBjjn3aJJjWHzsSFgsgnxBPWqtqolvSZqhCF7Cgnwjk9xEMcOmxSNeBLl1kuI2k+BIerAjoYGXSTENGJGdwqHJOkau3MWP7Yb22/z0d6Hv/4DQfB5bga66QbztshlAhNRskYVmA1sIKrxTMc2fGltO4mswY8oaMTj7GvMA8AXUQFXDnXO/8F+1SQ+eA5eCs4sj0B7b8Vk/yhdcTP7ULXLPjs2xNQ9AWMJlCjOebJU1UfLl0jjhmi23Oe0zoO5IGnBipITxWTa8Y7UxttfizDL2upOokFL3o5WayoN7Axbhflv/icrP9U5wx8wVjnM3XnsYyNDzF2N1ZqymtOVkRc5HuJnF/AFG2+XFwmw5zcCjlS1bacJ6o7GuDnUbD1mDApQpkM+5ZXR2qK6lzFaWisYc38Sv2AworbLeN1yj8HcFUy4o0/B0GtjxQKo+1ScWYwdxUGFu41JQOHBzr9Ugcp0b8a7HluoDUFA3vwSE3ffQfRD6+VHyqsbNqZFtkmqPJnFLwlb0/vp4gW1llmnMyIy/O5oOCYkr5vnK4fkvPk3LkTDyW0O9aFBGaKx4/DuhJfUj0rgrOX3bbZKmd41jDJSTqdixMMrW9hZh9EluRfRmPm8gfTbykkrEUwEiPZUyCgFpJ/4Yc56ihbszbDw==|920 \ No newline at end of file +}//JgiHkeAGDDomXZnxKh1s08cQGYgFCZYemPsdcbwPJupebXphH9HWgTJ5KL7752TdnATlXXvym1F9HCHer0TlbLfBQq/0Cu18lkGTmtDHLozltz35TJAWkgsAWeY1ftV+j1cLkTcPChPTUpYHbUrkRJiYFmeynSeVjwQJ+nBlRvpv7KNs4bJQUmw8tCopyl+F4Kz7xawb9fWZSl4Od0vdck6CmkhY0dWp1fqccv1YosoFPUUuavmwZ87Ioqp8+Fqa/LqHsULpwEuETCn/DoNN2GPskwZQcHymXR+wKsh2ThEes4ed8CB4vb41QxP2+y7DYwsWjDF/+hFkpEx5b7p0hDGDSUv9GJtEopn+ZLkrXNRL29DmkeNzzw9R2QtCqWHolAtU6JBb7AQytkR0R6yBl8Qs8c9m/fMLMLxkx2bS5qxlwa7ulc/5U49vR8ucpUbbfrI6f5uF2vgg74Vj8tZV1EjrdzRzPSQ+SVtZMsBYfv+5x0kMeTq16dZ17YFdfRudM6aB/77mnlnFrIIEUiN5L6YxuAJ7TLHsxzaFxOog4xbxGJ93eayUtYLDmf3U5u/44SRgpPUF/zxPQGb6o6k3602zC/rMTOE/vgL1RErorJPxOTxTyJdJk3+zyz03katN2kQ6b2s+uRp+/hfpM6uuOZDEQA9WGYL7qqf1ojnWKA1WjuoZzIAlFsrC79/13qPcenDH2DFojO/KEXABRrxqHuI5CzL+J2wwZhjxWerHEwPKvV2Gp7LhqE+pKC6Zf4ZDEuxaBmLjDjIL1FUOqRPjNdqQbd0kwuPh8VvgB/7eH4jNDh+xHPMadZkQfmP7drTajoLbda+ICkTITcRXnqAqiVU+z+vNTs1ofNH5UgkQvB761tgRLvyJmIdd1T1zE9NbiWO9y32+Hd8p/riCObOI/A==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/核定确认.rd b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/核定确认.rd index cc2ce7c2..491834ea 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/核定确认.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/核定确认.rd @@ -30,6 +30,10 @@ { "Name": "核定工时说明", "Formula": "核定确认!$G$17" + }, + { + "Name": "标题", + "Formula": "核定确认!$B$2" } ] } \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时详情-列头.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时详情-列头.json index 55802a53..771cc797 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时详情-列头.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时详情-列头.json @@ -73,8 +73,8 @@ "Values": { "0,3": "执行人", "0,4": "计划工时", - "0,5": "实际工时", - "0,6": "实际/计划" + "0,5": "核定工时", + "0,6": "核定/计划" }, "StyleDatas": { "Styles": [ @@ -128,4 +128,4 @@ "PaperSize": {}, "Margin": {} } -}//KElO26OjDQlktzx0cuSu7vDSWsRbk7xww9g+wE6GBK6RKAPeVISgnBAX1RlStO4TNo/kYqJcVC1sX3LaXCCyl8q5pyOAkWyWvYXy7loOq6gHSrzY6W5nBTIwYkvmt/ARGfdWwkP+b8Hp4rjUkrXyQ86Nu6sJ5UJPlVila9fV1c0wvZIzwLnYXF4q8E/JIi7WXSHvzjOxYTGRS9+PVdcBitJdQ8OEawcki50qqIOwtDftREtkE498ycQKUiVnv669jwGJKFV3LEhl8QibllMbgcTcVkDXCa72iBYCtT7IkiNWpglif5CgbSSudzth/WCfkShA+T8saQZ005wwYyC61Z+EYrKybwQlOO/Ex63cALxIuMMsr0V8IlyHxq3hAp6qYJe6BqsYLvImFk/JaSqnfhRlfgy2gmczyPoVDEjsdNrz3egp6SGdaP4ATZK+7pymNw66V40Xd8+E6fFYNKiStlX+qKIHepCRutlj8Bf9CfpEm8gp/6dxn6ROIFmj6QhwKxRUbK+LpNLopFQ7onCcIYVsznQ6MRelq09kuJj0i4gy5nypTSTLzL29M0VJBNXD/sCS2jg2arIDBKX8KHiFBLbpLLQZOlwzdwX9NCc4bahyXXUXi09KtniwekHtsR4lbcJ7KhIxTZJHK8s7zFNA3ZZwGRUsu247VIx0igO7yZggn9FPZ1kCskcEEji+Pd6X/ZvcjeHB/MNkss/bJK+6GBmAqwNTJ2gGhGzSHKHCIvNNnr2Z/T2HlX1V81O+Q2QSph3HqdmPsJxFY2SEUFDJ/FsnW2wB8EGV402v2ju1qS2o14OyeSBHzQoEf9JmQZu16zx59Vd8WaqDJPr//fq7ohLPCNsnMSmE+Peq260hQ20ns5fLT3lhAbsHJsWu7KgV3/AJdOhl33YjSlw3fIoFFw==|920 \ No newline at end of file +}//kuVIRoz83LNQI8AGY4otacSLJGRilDZhFGGjJHjgK2jM7/Y6DFe4qA5QCrtUGCHK3jBN+JB5O0UxrSV3M0UWxkrTlhaekRwhBWvTwBanfuGvLKP0AOKCgZDFJxZhUAh6iMPNCjvvwYmTO0s/BUGAPfCRWOuGSsFSKDAkYd0TiwCfP9aKOPlNIsl4beDpPM6vw5bqIePjg4CCc+Xhsy8K6VMfzWXcT68NY6cFToQ80+IBiDM3IX3LO0H36SEVjX4mXsaOoyyyY123vAAA86jgPhGLt4khpo9Kw0AIcZWtVyPY8cKjKAvtcOFkRe9L/tkAA7KSPQIggQ2LywxdwvM0QS1NRVayvQEmGcyNiWp/7lLvl3x+J8qnkjgJsgnxtNMMTC88IPRerli7GKECZ6KcnJ1suH7p45q++e2ll/3Kx7tqxVeN352RJlgLYZI4xMhLDHkrnwOoEnoAJCrG1+eWB+qDNOlWLEF7f31kc1ubmPPXNF+BzHL9lIj012fEnUiuM+ieJ1O9iKEWMyiCuqByp42TnHS1BqohcSnRFHtzUOHJS51mw2DhkpBGUkKdT43QhFV7phRuLEDMLgh1jRxTtkQe99qpASfS6tFY2NH+qXVaRyWoNSPYb8pL5LQUfe4tK/f3CnbDXBn5x7nYqZbwnjKUC2vzq1qSICm+Ask3LNlqf0rDGQDBCfskl6NRo/HNLn31nLiU8AlD6ECT5y01vVxW9XVrQ8X/Ate5P6asjuFMhi2vx8Rc3jD16R6guXEbT6BVxStZAo4UsWjsUV6DQzG7kTziX7eh9j7IURpY+UZDCwntberadWZh46dukUkPvRSCVAtluv68XUvbwhi6XFu4Nf7q6OjYf+0B7q0Ua1+f7uqRijN/Chbt1r7P/w88wTzH7Qxull7k9r+8sDH0tA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时详情.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时详情.json index 47851031..02b5ebee 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时详情.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时详情.json @@ -46,23 +46,13 @@ "DesignLengthInPixel": 439.0 } }, - "9": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, "10": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 36.0 - } - }, - "12": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "IsHidden": true } }, - "13": { + "11": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "IsHidden": true @@ -70,10 +60,10 @@ } }, "InLogicalVisibleIndexes": [ - 12, - 13 + 10, + 11 ], - "Count": 14, + "Count": 12, "DefaultSize": 32.0 }, "Cols": { @@ -224,9 +214,7 @@ "3,12": "可报工", "3,18": "完成比例", "6,1": "工时明细", - "7,1": "工时详情-列头", - "10,9": "分配工时", - "10,14": "工时上报" + "7,1": "工时详情-列头" }, "Formulas": { "3,20": "O4/D4*100", @@ -295,7 +283,7 @@ "ColumnName": "总计划工时", "GUID": "5c7962d3-0bf1-4eff-a603-59b43df0b807" }, - "ColumnName": "总计划工时" + "ColumnName": "计划工时" }, { "GUID": "c2efb933-40aa-4dad-8fc3-1c7dfdf07441", @@ -304,13 +292,13 @@ "ColumnName": "总核定工时", "GUID": "f3031096-d234-4bca-9130-c455e8ca7f03" }, - "ColumnName": "总实际工时" + "ColumnName": "核定工时" }, { "GUID": "08d57828-8d12-4fcf-a2b0-c159bcfe83ec", "Formula": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=ROUND(工时详情!总实际工时/工时详情!总计划工时,2)*100" + "SerializeProperty": "=ROUND(工时详情!核定工时/工时详情!计划工时,2)*100" }, "ColumnName": "完成比例" } @@ -334,142 +322,14 @@ "TemplateKey": "竖排无样式" } }, - "10,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": "ef34254a-1377-437c-ae84-35e532d97189" - } - }, - "value": "%CurrentUser%", - "compareType": 10 - }, - "CommandList": [ - { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PageName": "分配计划工时", - "PassValues": [ - { - "Source": "计划", - "TargetCell": { - "SerializeProperty": "=分配计划工时!工时类型" - } - } - ], - "LoadBindingDataOption": 1 - } - ], - "ID": "cbe09e93-b1d0-4cce-b7be-bd0b557f1f44" - }, - { - "CommandList": [ - { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "FourStandardStyle": "warning", - "Message": "你尚未成为该任务参与人，不能报工" - } - ], - "ID": "3f46914e-29fe-4093-8824-025db5eea0bc" - } - ] - } - ], - "Text": "分配工时", - "IsDisabled": true, - "TemplateKey": "圆角浮动", - "Icon": { - "Name": "Application/005_add_5.svg", - "BuiltIn": true, - "Color": "Background 1", - "UseCellTypeForeColor": true - }, - "IconSize": 14.0 - }, - "RulesGuidList": [ - "a8e409dd-908f-46da-9e04-493e23e6f6ff" - ] - }, - "10,14": { - "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": "ef34254a-1377-437c-ae84-35e532d97189" - } - }, - "value": "%CurrentUser%", - "compareType": 10 - }, - "CommandList": [ - { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PageName": "新增报工", - "PassValues": [ - { - "Source": "实际", - "TargetCell": { - "SerializeProperty": "=新增报工!工时类型" - } - } - ], - "LoadBindingDataOption": 1 - } - ], - "ID": "42615e40-02b3-4489-bda6-f5a90b75318b" - }, - { - "CommandList": [ - { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "FourStandardStyle": "warning", - "Message": "你尚未成为该任务参与人，不能报工" - } - ], - "ID": "9dc52194-b130-4a31-a891-dfd2a1a36c73" - } - ] - } - ], - "Text": "工时上报", - "TemplateKey": "圆角浮动", - "Icon": { - "Name": "Application/005_add_5.svg", - "BuiltIn": true, - "Color": "Background 1", - "UseCellTypeForeColor": true - }, - "IconSize": 14.0 - } - }, - "12,1": { + "10,1": { "BindingInfo": { "TableName": "任务表", "ColumnName": "ID", "GUID": "a480c8d8-43fc-4d8f-a19e-554d2c55d49a" } }, - "12,7": { + "10,7": { "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", @@ -481,7 +341,7 @@ } } }, - "12,10": { + "10,10": { "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", @@ -686,18 +546,9 @@ "8,0": 3, "8,1": 8, "8,26": 3, - "10,9": 3, - "10,10": 3, - "10,11": 3, - "10,12": 3, - "10,13": 3, - "10,14": 6, - "10,15": 3, - "10,16": 3, - "10,17": 3, - "12,4": 9, - "12,5": 10, - "12,6": 11 + "10,4": 9, + "10,5": 10, + "10,6": 11 }, "SheetStyle": { "FontFamily": 4 @@ -706,17 +557,15 @@ "Spans": [ "3,1,1,2", "8,1,1,25", - "12,1,1,3", - "12,4,1,3", + "10,1,1,3", + "10,4,1,3", "7,1,1,25", - "10,9,1,4", - "10,14,1,4", "3,12,1,2", "3,7,1,2", "3,18,1,2", "3,20,1,6", - "12,7,1,3", - "12,10,1,4", + "10,7,1,3", + "10,10,1,4", "3,14,1,2", "3,3,1,2", "3,9,1,2" @@ -749,23 +598,7 @@ "RepeatRangeSettings": [], "RelatedDataTableName": "任务平行视图", "ConditionFormatRulesCollection": { - "Rules": [ - { - "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", - "Formula": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=OR(工时详情!$H$13=1,工时详情!$H$13=2)" - }, - "GUID": "a8e409dd-908f-46da-9e04-493e23e6f6ff", - "StyleInfo": { - "Underline": null, - "Strikethrough": null - }, - "IsDisabled": false, - "IsInvisible": false, - "IsReadOnly": false - } - ] + "Rules": [] } }, "PrintInfo": { @@ -775,15 +608,15 @@ "CustomNames": [ { "Name": "工时分配方式", - "Formula": "工时详情!$K$13" + "Formula": "工时详情!$K$11" }, { "Name": "任务ID", - "Formula": "工时详情!$B$13" + "Formula": "工时详情!$B$11" }, { "Name": "执行人", - "Formula": "工时详情!$E$13" + "Formula": "工时详情!$E$11" } ] -}//9CrSz2ffdRp38ujSZJg28pO0RFgN3ImA/71Fa4Omlj85gW1vI6kn+h5YqRWhFSTWGYjm6vqcrR4fV+0jbCrqgS4gmnS/ljBq0x33yRMQFrmvL4SHuu1MSgQM030wftuP3aE7jRL5nZfScfP8yARhH/WDvUB1RGtJ/d54uxeYa1Cat+XgSc4GUvUIh7xfxPv25YYCHGsNY9Tk3NXG+X3bCHkZ3YBPETaIKOAOMP6XAIgm7zmsDrYEIl7f2ll8OXnclqEr3TCJQow+31Q3qCaS9folIy1JAhPEUAbVjULCsqTUlcJroL1jktD50gpwp5sI+rh0e135M26OgEpDO5TwnTmnmlrqAX4SWxhZykgqgqUMk+yhnLGaI8ksSXC1GGfipezw0rS8KYIdTYd6LRlUQ0F98eYT9SobrP5S6SiqktMc8LYkRQtAJLow1f/EcOxOoqdGFCzgmEln2npFeHSpiHuMqEOLmjvAiDwaYC3gMdHMq+I4iW6S1T+uaG3QTPIeJ+6JRNzflcgNAFvGqGWgwj0yCqWGpnerE77JpofxzUN0CO7l2YXsqN0kZYbk87GNYrZha4QKWWiexpCaolyimknrR1TP/whGtEcKiGhiFhScEtgyVDNm1poqbr8CH8N+Vr5H26HyNTK3dXfvemHgkCIBPZVBvpZkNUV4/roJMYbRr2zOUv1aGPuZ4GI+qu8Lzu4OJxiM4815jlHuQlfidssdPrEc9HJnd45oCdxuIH80y6iy/aLiLnILiMDX853QEKyHaFrx+ZV8upSdF5UpJ79b5zcU4O0dxxXZMtXaL8Hy8QZCmX5En6eldLlS7gEFQ3oqR74Uj3f3uRJit2H8ujvIfaTzp8Cm2hAp34kZjGYBkFM/78liKUqFWtyeXWw8VvW2hANiv3+MsP7VLKy7Fg==|920 \ No newline at end of file +}//Gn+JoffY4bhNjoBJj64UEACmAQbMSnu5QR/d99uSHDai10SxL5wha/xlSHau7o8vMaKd7e9XizKWWN2NXQtwJcUpmF2WVW5VHTGKgNvulQvIc2ZEWfKCBwKmhiE+uPQAQLNx5RHcOwniLNF3ofZpRoCaDEmHUYDNGIiqeZXdJDyuoep6DcZ7wjn9noYJmhjNxKO8TfvdS8oNEfuWuTp856zyeyQ4NqECj7wXqRKpSCDSbjnUC1E1rL/y3mATXt87xyGIjbVrCvVgdlqPnT8iNfHPSI25Kh2XOW1MVl5P++kDbBiNffrp8GAEQJc+B1KbC91n7mI3va7Y0Q2G2ZTw3Iey8Ey1J7JwUFaet+iIDK/cslN8MWEktb+nD7u+4GKrPcbFA3eJFC63DzVsoGUtgNrETsT7PFSrmD1SuaWj1Lcv+b1GB+7dcf04lcPmYGv3aFZ79bTQS6AbxMJJsXNFIR4uipdRHbrqI0Ii9VMw8eNXMtlz0Ka/V+igirFFfZpTxmouLthxGcw4GGJI7NqBQZOs+d0F0VFYo9srQVxJt119KuYJu/abm+Dbq41V5mvul4i/dNLXpbLsg/i9cvOsgCdmUwk5LphITpsIp43VvS8l9pyUuojtwPa4vmGYFsedeGI+3ajcqSW6TDjY4LJyaX0CkbqJ/2KG5TtNIOaIeC+LCCW9eSlT9rF08ghdDaSsT/9/blEe+pkDc1w5SqXUv0FNd10wwRvs704lWENfhN1hoAbarZeHjuNOcWsxc+dNZlR2N7tikbeFaRvAHnqfpgq6QAvcHEzVWlR6gpxqz7/hV7l4smsbN7j2+fqy0IYKYOGVwaK8uCYgkxvB4Guf1ttuEQ0tWDm5byEujl0VbjIsieHal/zvjn+ConoXsEmzq7PRSlryEU5oqFJYPRO8/g==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时详情.rd b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时详情.rd index 68d18302..9a23f4c5 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时详情.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时详情.rd @@ -1,7 +1,7 @@ { "PageType": 0, "ColumnCount": 27, - "RowCount": 14, + "RowCount": 12, "Formulas": { "3,20": "O4/D4*100", "6,4": "\"当前项目采用的工时分配方式是【\"&工时分配方式&\"】\"" @@ -9,15 +9,15 @@ "CustomNames": [ { "Name": "工时分配方式", - "Formula": "工时详情!$K$13" + "Formula": "工时详情!$K$11" }, { "Name": "任务ID", - "Formula": "工时详情!$B$13" + "Formula": "工时详情!$B$11" }, { "Name": "执行人", - "Formula": "工时详情!$E$13" + "Formula": "工时详情!$E$11" } ] } \ No newline at end of file diff --git a/ServerCommands/工时/上报实际工时.json b/ServerCommands/工时/上报实际工时.json index b462e5fd..e70da1ef 100644 --- a/ServerCommands/工时/上报实际工时.json +++ b/ServerCommands/工时/上报实际工时.json @@ -271,6 +271,9 @@ "ResultTo": { "SerializeProperty": "工时核定说明" } + }, + { + "ResultPropertyName": "报工人姓名" } ], "RefreshAfterFinish": true, @@ -440,7 +443,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=ROUNDUP(核定工时/分配天数,1)" }, - "ID": "6861c18abaae4a64b85f27614c4c6480" + "ID": "1d0a8e541f5a4d8792f0be39665a1f82" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -449,10 +452,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=ROUNDUP(核定工时/分配天数,1)" }, - "ID": "34efaeaa449044baadb2591bdb778751" + "ID": "2d719d51ef5a46ee9aa64f113a34cce3" } ], - "ID": "1b2a41cd-59f2-4eb6-8722-502e9091fb35" + "ID": "8449b93c-d291-4603-800e-244f55c4686b" }, { "CommandList": [ @@ -463,7 +466,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=待分配上报工时" }, - "ID": "6cab8652a3e24a3b8b5892d1b1aa96de" + "ID": "c812d51f95704a98b5b24d093a898de5" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -472,10 +475,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=待分配工时" }, - "ID": "737f988cc853421ba2604b8663caa91e" + "ID": "11255bb1a556487e972cf64b9d1da58b" } ], - "ID": "bac1be11-862b-4214-b031-57e73855f119" + "ID": "fd1683f4-7192-4383-b8a0-441c927930bd" } ] }, @@ -519,45 +522,64 @@ "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": "1" - }, - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.工时分配方式" - } - }, - "value": "2" + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.严格模式" } - ] + }, + "value": "1" }, "CommandList": [ { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "本次核定工时", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF(计算上报工时>(个人工时情况.总计划工时-个人工时情况.总实际工时),(个人工时情况.总计划工时-个人工时情况.总实际工时),计算上报工时)" - }, - "ID": "8d491a5ef74f4ee897d8f9bb342947c2" + "$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": "2" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "本次核定工时", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IF(计算本次分配工时>(个人工时情况.总计划工时-个人工时情况.总实际工时),(个人工时情况.总计划工时-个人工时情况.总实际工时),计算本次分配工时)" + }, + "ID": "6928da5ea67d4786a7f8c0215c904bd4" + } + ], + "ID": "3fbf82ed-ecee-4194-a936-158aefeeb58e" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "本次核定工时", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=计算本次分配工时" + }, + "ID": "82c651b1c1424340b8c6b3ed1361b1fd" + } + ], + "ID": "35a7a387-e6b6-4682-95d5-d5b519b34925" + } + ] } ], "Comments": "如果是按天分配，则需要检测这一天的实际工时是否超出，", - "ID": "c4f9fdb4-9a8e-45e1-82f6-3706c3b17408" + "ID": "455323e1-5115-4edc-bfdb-7cec82e1b367" }, { "CommandList": [ @@ -566,12 +588,12 @@ "ParameterName": "本次核定工时", "ParameterValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=计算上报工时" + "SerializeProperty": "=计算本次分配工时" }, - "ID": "0ded4e0b74d841e3b3fd855e20f27dac" + "ID": "db70a34a0b184db296d7851c8b8a66ea" } ], - "ID": "5f7c012a-9219-4318-8b03-42cf4f42552b" + "ID": "e3ce249d-6e09-42fe-a1a7-b122f547395e" } ] }, @@ -709,15 +731,44 @@ "ConditionAndCommandPairList": [ { "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.工时分配方式" + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.工时分配方式" + } + }, + "value": "3" + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=本次核定工时" + } + }, + "value": "0", + "compareType": 1 + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=本次核定工时" + } + }, + "value": "0", + "compareType": 1 } - }, - "value": "3" + ] }, "CommandList": [ { @@ -730,7 +781,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "项目ID", - "GUID": "961887ae-659c-4337-a98c-ae9e991f406c" + "GUID": "89c692b0-3bbd-4628-bf3e-53b047e15f00" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -741,7 +792,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "任务ID", - "GUID": "1f066a99-5744-4544-85ac-0ab3dc160074" + "GUID": "4aa7b0a5-f2ed-4317-88ff-aecaeb125f56" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -752,7 +803,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时日期", - "GUID": "c235fd62-1dbd-43cb-9bfd-432025656e03" + "GUID": "54e443df-b632-4462-9f96-2ab560dd6225" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -763,7 +814,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时类型", - "GUID": "a67c10ac-aa54-4ffc-97e8-0375344361fd" + "GUID": "c9d1abb2-6ed8-492c-9bc8-6968ffef114f" }, "Value": "计划" }, @@ -771,7 +822,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "执行人", - "GUID": "06dcce45-051c-4277-80b3-d67838a0bdbc" + "GUID": "beb850d5-e852-483b-be17-d82becedf00f" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -782,7 +833,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "执行内容", - "GUID": "6fc34fb9-8e12-4abc-9b10-3b5eeeba365e" + "GUID": "bd4b34ed-1acd-4d90-987a-5e2a92ef9c21" }, "Value": "系统自动生成对应计划，保证任务可分配工时" }, @@ -790,7 +841,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时", - "GUID": "70556be8-7ff8-4b64-a6b7-666394855a59" + "GUID": "ad118311-9589-45ae-9af0-36b92ae97a53" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -801,7 +852,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "上报工时", - "GUID": "4be7efc6-344d-49e6-908e-ce772c45aa18" + "GUID": "6db98948-73a9-43ff-8c16-78771f37e661" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -812,7 +863,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "时薪单价", - "GUID": "8972f0f0-9282-4ce3-9c3b-bb6079acce49" + "GUID": "8910d4e3-4356-4a79-a7a2-4cdf3810bb02" }, "Value": "0" }, @@ -820,7 +871,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "提成系数", - "GUID": "b2920132-6d04-4ac1-9592-260e181e8ab7" + "GUID": "4ba4ee8a-3cd0-4521-94bf-e3f8b802b8e0" }, "Value": "0" }, @@ -828,14 +879,14 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "时薪来源", - "GUID": "8a0ff2f5-be57-4f51-b98f-c8675326fa3c" + "GUID": "ec59c1bb-ff5b-4769-acf3-efd1a71808d7" } } ] } ], "Comments": "如果是分配到任务，就补一条计划，保证任务可分配工时准确", - "ID": "ff697dae-5961-406d-993f-7a733c0baa4d" + "ID": "5bed4edb-fa9f-4982-80ed-d033a5574541" } ] } @@ -860,7 +911,7 @@ "ID": "dfe08a493a80498e8915bc2fe710ad21" } ], - "ID": "743cffb8-d438-4c95-8527-1183b66e1b45" + "ID": "c24ef391-2f26-43e0-a90c-8b52a04d9705" }, { "CommandList": [ @@ -873,7 +924,7 @@ } } ], - "ID": "fb7468a4-d48f-4f1e-a5e3-81e823c02157" + "ID": "f760c5a5-fb43-4628-98ff-8652d1b9801d" } ] } @@ -925,7 +976,7 @@ "Message": "报工成功" } ], - "ID": "2fa1520f-ce4f-4fbd-8dcf-7735a69a81e9" + "ID": "35bd723b-4ff0-459e-a576-7c26386cf201" }, { "CommandList": [ @@ -941,12 +992,12 @@ } } ], - "ID": "af3cc7de-aa1a-4d82-986e-c50d58d08d34" + "ID": "7a79a42e-c6d7-49cf-83c0-b8e307005db4" } ] } ], - "ID": "c89141bd-dba3-43ac-8c63-a744de63f27f" + "ID": "80674810-32d1-45ac-8a08-cafb041bde43" }, { "CommandList": [ @@ -959,7 +1010,7 @@ } } ], - "ID": "6e537909-5b24-4981-ae33-218036cfc9dd" + "ID": "5e38d651-9dc0-4b52-b52c-020ae46d961d" } ] } diff --git a/ServerCommands/工时/计算报工数据.json b/ServerCommands/工时/计算报工数据.json index 79ff4090..a0688b1f 100644 --- a/ServerCommands/工时/计算报工数据.json +++ b/ServerCommands/工时/计算报工数据.json @@ -61,7 +61,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "8e61c4dd-8dbb-40e1-b0c9-959c63ad922f", + "GUID": "9b9c641d-ace3-42a2-99c2-ab2ccadc9c1c", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -70,7 +70,7 @@ "ColumnName": "项目ID" }, { - "GUID": "4989d674-ee78-46b8-a072-2d7733460388", + "GUID": "ae2c1290-3e32-4258-9c80-a04d56e728aa", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -84,7 +84,7 @@ "ColumnName": "严格模式" }, { - "GUID": "82740ff8-773e-4053-b37c-207add96257f", + "GUID": "a84987bb-20e4-4636-931a-9948c65c0a4b", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -98,7 +98,7 @@ "ColumnName": "项目预算工时" }, { - "GUID": "dedf7931-edf9-4bcb-ba27-96f6aded01b2", + "GUID": "a48c5450-9b1e-4bc1-af38-ac81ce0045b7", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -112,7 +112,7 @@ "ColumnName": "项目预算费用" }, { - "GUID": "3b32ce9c-b2e9-4fa5-83d7-9be63cad05ca", + "GUID": "2d6b87a6-55e1-4d96-9dff-37587aa31e2e", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -126,7 +126,7 @@ "ColumnName": "工时分配方式" }, { - "GUID": "3bb5ef8a-c14b-44d8-942f-97123bd81cb1", + "GUID": "e6cfe7ac-3434-4d5c-b619-9cea34950968", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -140,7 +140,7 @@ "ColumnName": "已消耗成本" }, { - "GUID": "6ca8cfbe-45d5-417e-aebc-c678156925aa", + "GUID": "56dd846a-08f7-4cd7-9142-062dc7a1027a", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务名称", @@ -149,7 +149,7 @@ "ColumnName": "任务名称" }, { - "GUID": "ba2e327a-c92b-4137-9ecb-5de42cb19707", + "GUID": "8de06cf5-7571-40bf-895d-f769469cd389", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "总分配工时", @@ -158,7 +158,7 @@ "ColumnName": "总分配工时" }, { - "GUID": "1a1ae55c-d95b-4f41-b021-308483d3231f", + "GUID": "93877474-00de-40f5-9f19-538471c05315", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务状态", @@ -167,7 +167,7 @@ "ColumnName": "任务状态" }, { - "GUID": "c131e1f2-f95e-4b88-bf83-af7392addf74", + "GUID": "d1b3e65f-3ea1-4329-9567-b580512261d8", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务状态", @@ -181,7 +181,7 @@ "ColumnName": "任务状态文本" }, { - "GUID": "da7959ca-41d4-4674-aa2b-d21ed82c63ad", + "GUID": "267a4d06-1e46-42b7-b110-e9b79a7de4a2", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务类型", @@ -195,7 +195,7 @@ "ColumnName": "提成系数" }, { - "GUID": "3ed1cdd3-4df8-4a1d-afc7-b99631cf9774", + "GUID": "5326de1e-87e6-4a53-94fe-662c85dd84a3", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "可分配工时", @@ -219,7 +219,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "5f3a84069a66454684b844d7c706a7b4" + "ID": "02459cf2759c4a5c90aafb35c2b85f91" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -229,7 +229,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "a5be516e-8331-4006-88c0-c5e22f067f4e", + "GUID": "fa433705-3a1a-4ea6-bddb-412a5b92230f", "BindingInfo": { "TableName": "任务成员视图", "ColumnName": "任务成员", @@ -238,7 +238,7 @@ "ColumnName": "参与人" }, { - "GUID": "c8fc8a28-48eb-4f48-b2a5-61025f73e102", + "GUID": "c5b0add4-8302-4d3d-b419-6c13dfc274c4", "BindingInfo": { "TableName": "任务成员视图", "ColumnName": "任务成员", @@ -251,7 +251,7 @@ "ColumnName": "参与人_全名" }, { - "GUID": "76651da6-ade4-4ebe-a8e0-1011fe218cfc", + "GUID": "f6c62c31-03cf-4e57-a1ae-bb8de9557928", "BindingInfo": { "TableName": "任务成员视图", "ColumnName": "任务成员", @@ -265,7 +265,7 @@ "ColumnName": "参与人负荷" }, { - "GUID": "b9a92701-8211-4ec9-9202-50162854ee19", + "GUID": "1a61af60-f5a7-4174-a60b-b81a75a63488", "BindingInfo": { "TableName": "任务成员视图", "ColumnName": "默认时薪", @@ -274,7 +274,7 @@ "ColumnName": "成员时薪" }, { - "GUID": "372d652b-8dcc-4061-ac4d-e286baeaafaa", + "GUID": "b52f2e30-bcee-4ed5-9645-c4d550003ded", "BindingInfo": { "TableName": "任务成员视图", "ColumnName": "岗位ID", @@ -288,7 +288,7 @@ "ColumnName": "岗位时薪" }, { - "GUID": "c1eae37d-9de2-4f8d-ad1d-0f221210eddc", + "GUID": "c5a1fce5-386f-4e9b-81ae-ba0faf7700d8", "BindingInfo": { "TableName": "任务成员视图", "ColumnName": "任务成员", @@ -334,7 +334,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "caac35624fd348c88813516f23ecd04d" + "ID": "6740763a538c4fccbad4947459cb8833" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -427,7 +427,7 @@ } ], "Comments": "项目成员设置的时薪", - "ID": "ca29b261-7e0d-4289-8d94-a75676c530e6" + "ID": "9151f169-389d-48a6-a9f1-bd25a7736a40" }, { "Condition": { @@ -460,7 +460,7 @@ } ], "Comments": "项目岗位设置的时薪", - "ID": "6af943c6-f876-4976-97e3-f62e1f8b2017" + "ID": "6809b817-b411-490f-8177-b15732a541ef" }, { "Condition": { @@ -493,7 +493,7 @@ } ], "Comments": "成员用户的默认时薪", - "ID": "a39f61cc-d164-4f96-984c-c917014a073d" + "ID": "81d22a36-4961-4fe7-ac6f-8566365fcfcd" }, { "CommandList": [ @@ -510,13 +510,13 @@ "ID": "1034a8bcf12a49328a31314e519829f0" } ], - "ID": "d6ae29f8-5d46-4e64-94ec-6a1e11657bcf" + "ID": "e94ab952-0dd2-49e3-90d8-465f140b5d29" } ] } ], "Comments": "优先使用手动指定的提成金额", - "ID": "67e56cf7-7938-4db9-851a-c3479a66f1ce" + "ID": "f1ea67e0-0e21-4ae6-b59f-a8ed9b8e60e0" }, { "CommandList": [ @@ -536,7 +536,7 @@ "ID": "c9b6eb8cb30e4eaa839a7e1e28ee50a1" } ], - "ID": "257e165c-eb77-4b1d-aac4-7b1018651fd2" + "ID": "f1c2166c-7c5d-4121-9497-b6e56ed55b0c" } ], "Comments": "计算成员的时薪" @@ -695,13 +695,13 @@ } ], "Comments": "先检查个人工时余额够不够，如果不够，直接提成为0", - "ID": "39af5f93-7902-47f7-8878-e8d36a9582cc" + "ID": "497ea581-16e4-44c8-93fe-a614b360aac7" } ] } ], "Comments": "如果分配到人头，则判断该人总计划工时还够不够", - "ID": "b976e913-9337-4354-9e33-14d20d427824" + "ID": "23ad2287-f0cb-4895-868c-e0be5f4a458b" }, { "Condition": { @@ -753,13 +753,13 @@ } ], "Comments": "先检查个人工时余额够不够，如果不够，直接提成为0", - "ID": "becc2735-057f-46b4-927e-ddc42dd2e649" + "ID": "8e604321-6f85-4230-baac-3be4a5aac90a" } ] } ], "Comments": "如果是共用任务工时，则查看任务计划工时够不够", - "ID": "157b318f-113d-4f3a-8e2d-d77b6fadf1f5" + "ID": "e21ba54b-f918-4eb1-9a37-523c05c249a1" } ] }, @@ -845,11 +845,18 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=核定工时说明" } + }, + { + "ReturnPropertyName": "报工人姓名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务成员.参与人_全名" + } } ] } ], - "ID": "94eebf76-3e1f-4204-aed0-dc79f138ab7c" + "ID": "c77ebe00-a148-458c-aee6-31e589a563e7" }, { "CommandList": [ @@ -906,16 +913,23 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=核定工时说明" } + }, + { + "ReturnPropertyName": "报工人姓名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务成员.参与人_全名" + } } ] } ], - "ID": "bb2eaebf-644d-4f64-9f1a-844f6b145c6f" + "ID": "f5c11c90-24a9-49aa-8e72-d51836763d12" } ] } ], - "ID": "ebe39f8f-7104-413a-86be-2e37e355e972" + "ID": "52b54430-e0df-4346-a731-a3188d3ee488" }, { "CommandList": [ @@ -944,17 +958,20 @@ }, { "ReturnPropertyName": "核定工时说明" + }, + { + "ReturnPropertyName": "报工人姓名" } ] } ], - "ID": "5848a927-8c76-4a95-ac8f-a889d95820d5" + "ID": "0a3ba843-4318-407f-82b3-4e4636de31e8" } ] } ], "Comments": "如果提交的工时类型等于项目工时的核定方式且开启严格模式就校验本次有没有超标", - "ID": "5f08047f-b24b-4f26-a664-5a2b9cbe9712" + "ID": "c8326bf9-a17f-41d2-a405-9b9d37dc897e" }, { "CommandList": [ @@ -1007,16 +1024,19 @@ }, { "ReturnPropertyName": "核定工时说明" + }, + { + "ReturnPropertyName": "报工人姓名" } ] } ], - "ID": "f2c13fbb-4b83-4317-a071-feb0c2bc3341" + "ID": "8924c583-415b-42dc-999b-b5a08f518ff8" } ] } ], - "ID": "94085bf9-7ef3-42e4-a9ad-64f11d24d5dc" + "ID": "7f7d5744-3ff7-47b5-83a5-cc43a28eb472" }, { "CommandList": [ @@ -1045,11 +1065,14 @@ }, { "ReturnPropertyName": "核定工时说明" + }, + { + "ReturnPropertyName": "报工人姓名" } ] } ], - "ID": "713ec475-5c18-4ad2-b0cb-d9bcf9d2df72" + "ID": "39191b06-b4ce-45c3-93a8-f6c75431f562" } ] } @@ -1075,6 +1098,9 @@ }, { "Name": "核定工时说明" + }, + { + "Name": "报工人姓名" } ] } \ No newline at end of file diff --git a/Tables/任务/任务平行视图.json b/Tables/任务/任务平行视图.json index 6b1995c0..d316dccd 100644 --- a/Tables/任务/任务平行视图.json +++ b/Tables/任务/任务平行视图.json @@ -244,7 +244,8 @@ "进度": 5, "逾期状态": 5, "里程碑": 5, - "项目ID": 5 + "项目ID": 5, + "已消耗成本": 5 }, "subTableOperations": { "View_任务工时统计": 5, @@ -316,7 +317,8 @@ "进度": 5, "逾期状态": 5, "里程碑": 5, - "项目ID": 5 + "项目ID": 5, + "已消耗成本": 5 }, "subTableOperations": { "View_任务工时统计": 5, @@ -388,7 +390,8 @@ "进度": 5, "逾期状态": 5, "里程碑": 5, - "项目ID": 5 + "项目ID": 5, + "已消耗成本": 5 }, "subTableOperations": { "View_任务工时统计": 5, @@ -688,7 +691,6 @@ }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", - "Required": true, "DatabaseColumnType": "float", "MaxLength": -1, "Name": "本任务可核定工时", @@ -797,7 +799,7 @@ "ConnectionId": "业务表", "SourceTableName": "任务平行视图", "SourceTableSchema": "dbo", - "CreateViewSql": "WITH [任务递归CTE] AS (-- CTE to gather all tasks and their child tasks\r\n\tSELECT\r\n\t\tt.ID,\r\n\t\tt.[父任务ID],\r\n\t\tt.[任务预算工时],\r\n\t\tCAST ( t.ID AS VARCHAR ( MAX ) ) AS TaskPath,\r\n\t\t0 AS Depth \r\n\tFROM\r\n\t\t任务表 t \r\n\tWHERE\r\n\t\tt.[父任务ID] IS NULL\r\n\t\t\r\n\t\tUNION ALL\r\n\tSELECT\r\n\t\tt.ID,\r\n\t\tt.[父任务ID],\r\n\t\tt.任务预算工时,\r\n\t\tCAST ( cte.TaskPath + '->' + CAST ( t.ID AS VARCHAR ( 50 ) ) AS VARCHAR ( MAX ) ) AS TaskPath,\r\n\t\tcte.Depth + 1 AS Depth \r\n\tFROM\r\n\t\t任务表 t\r\n\t\tINNER JOIN [任务递归CTE] cte ON t.[父任务ID] = cte.ID\r\n\t),\r\n\t汇总工时 AS (-- Gather plan hours and actual hours from 任务工时表\r\n\tSELECT\r\n\t\t[任务ID],\r\n\t\tSUM ( CASE WHEN 工时类型 = '计划' THEN 工时 ELSE 0 END ) AS 计划工时汇总,\r\n\t\tSUM ( CASE WHEN 工时类型 = '实际' THEN 工时 ELSE 0 END ) AS 核定工时汇总,\r\n\t\tSUM ( CASE WHEN 工时类型 = '实际' THEN 上报工时 ELSE 0 END ) AS 实际工时汇总,\r\n\t\tSUM (CASE WHEN 工时类型 = '实际' THEN [时薪单价]*[提成系数]*[工时] ELSE 0 END) AS 收益汇总\r\n\t \r\n\tFROM\r\n\t\t任务工时表 \r\n\tGROUP BY\r\n\t\t[任务ID] \r\n\t),\r\n\t任务汇总 AS (-- Sum up task hours with recursive sum of child tasks\r\n\tSELECT\r\n\t\tcte.ID,\r\n\t\tISNULL( SUM ( c.任务预算工时 ), 0 ) AS 子任务分配工时 \r\n\tFROM\r\n\t\t[任务递归CTE] cte\r\n\t\tLEFT JOIN 任务表 c ON c.[父任务ID] = cte.ID AND c.[任务状态]>=1\r\n\tGROUP BY\r\n\t\tcte.ID \r\n\t),\r\n\t子任务核定工时汇总 AS (\r\n SELECT\r\n cte.ID,\r\n ISNULL(SUM(汇总.核定工时汇总), 0) AS 子任务核定工时汇总\r\n FROM\r\n [任务递归CTE] cte\r\n LEFT JOIN 任务表 c ON c.[父任务ID] = cte.ID\r\n LEFT JOIN 汇总工时 汇总 ON c.ID = 汇总.[任务ID]\r\n GROUP BY\r\n cte.ID\r\n),\r\n子任务实际工时汇总 AS (\r\n SELECT\r\n cte.ID,\r\n ISNULL(SUM(汇总.实际工时汇总), 0) AS 子任务实际工时汇总\r\n FROM\r\n [任务递归CTE] cte\r\n LEFT JOIN 任务表 c ON c.[父任务ID] = cte.ID\r\n LEFT JOIN 汇总工时 汇总 ON c.ID = 汇总.[任务ID]\r\n GROUP BY\r\n cte.ID\r\n),\r\n\t任务成员 AS ( \r\n\tSELECT \r\n\t[任务ID],\r\n\tSTRING_AGG ([任务成员],',') AS 任务成员,\r\n\tcount(*) AS [成员数量] \r\n\tFROM [任务成员表] \r\n\tGROUP BY [任务ID] \r\n\t)\r\n-- Final view definition\r\nSELECT\r\n t.*,\r\n (CASE WHEN t.[任务状态]>=1 THEN t.任务预算工时 ELSE 0 END )AS 总分配工时,\r\n ISNULL(汇总.计划工时汇总, 0) + ISNULL(任务汇总.子任务分配工时, 0) AS 已分配工时,\r\n\t\tISNULL(汇总.计划工时汇总, 0) AS 本任务已分配工时,\r\n\t\tISNULL(任务汇总.子任务分配工时, 0) AS 子任务已分配工时,\r\n t.任务预算工时 - (ISNULL(汇总.计划工时汇总, 0) + ISNULL(任务汇总.子任务分配工时, 0)) AS 可分配工时,\r\n ISNULL(汇总.核定工时汇总, 0) + ISNULL(子任务核定工时汇总.子任务核定工时汇总, 0) AS 总核定工时,\r\n\t\tISNULL(汇总.核定工时汇总, 0) AS 本任务核定工时,\r\n\t\tISNULL(子任务核定工时汇总.子任务核定工时汇总, 0) AS 子任务核定工时,\r\n (t.任务预算工时 - (ISNULL(汇总.核定工时汇总, 0) + ISNULL(子任务核定工时汇总.子任务核定工时汇总, 0))) AS 可核定工时,\r\n\t\tISNULL(汇总.计划工时汇总, 0) - ISNULL(汇总.核定工时汇总, 0) AS 本任务可核定工时,\r\n\t\tISNULL(任务汇总.子任务分配工时, 0) - ISNULL(子任务核定工时汇总.子任务核定工时汇总, 0) AS 子任务可核定工时,\r\n ISNULL(汇总.实际工时汇总, 0) + ISNULL(子任务实际工时汇总.子任务实际工时汇总, 0) AS 实际工时,\r\n\t\tISNULL(汇总.实际工时汇总, 0) AS 本任务实际工时,\r\n\t\tISNULL(子任务实际工时汇总.子任务实际工时汇总, 0) AS 子任务实际工时,\r\n\t\tISNULL(汇总.收益汇总, 0) AS 已消耗成本,\r\n 成员.[成员数量],\r\n 成员.[任务成员]\r\nFROM\r\n 任务表 t\r\n LEFT JOIN 汇总工时 汇总 ON t.ID = 汇总.[任务ID]\r\n LEFT JOIN 任务汇总 任务汇总 ON t.ID = 任务汇总.ID\r\n LEFT JOIN 子任务核定工时汇总 子任务核定工时汇总 ON t.ID = 子任务核定工时汇总.ID\r\n LEFT JOIN 子任务实际工时汇总 子任务实际工时汇总 ON t.ID = 子任务实际工时汇总.ID\r\n LEFT JOIN 任务成员 成员 ON t.ID = 成员.[任务ID];", + "CreateViewSql": "WITH [任务递归CTE] AS (-- CTE to gather all tasks and their child tasks\r\n\tSELECT\r\n\t\tt.ID,\r\n\t\tt.[父任务ID],\r\n\t\tt.[任务预算工时],\r\n\t\tCAST ( t.ID AS VARCHAR ( MAX ) ) AS TaskPath,\r\n\t\t0 AS Depth \r\n\tFROM\r\n\t\t任务表 t \r\n\tWHERE\r\n\t\tt.[父任务ID] IS NULL\r\n\t\t\r\n\t\tUNION ALL\r\n\tSELECT\r\n\t\tt.ID,\r\n\t\tt.[父任务ID],\r\n\t\tt.任务预算工时,\r\n\t\tCAST ( cte.TaskPath + '->' + CAST ( t.ID AS VARCHAR ( 50 ) ) AS VARCHAR ( MAX ) ) AS TaskPath,\r\n\t\tcte.Depth + 1 AS Depth \r\n\tFROM\r\n\t\t任务表 t\r\n\t\tINNER JOIN [任务递归CTE] cte ON t.[父任务ID] = cte.ID\r\n\t),\r\n\t汇总工时 AS (-- Gather plan hours and actual hours from 任务工时表\r\n\tSELECT\r\n\t\t[任务ID],\r\n\t\tSUM ( CASE WHEN 工时类型 = '计划' THEN 工时 ELSE 0 END ) AS 计划工时汇总,\r\n\t\tSUM ( CASE WHEN 工时类型 = '实际' THEN 工时 ELSE 0 END ) AS 核定工时汇总,\r\n\t\tSUM ( CASE WHEN 工时类型 = '实际' THEN 上报工时 ELSE 0 END ) AS 实际工时汇总,\r\n\t\tSUM (CASE WHEN 工时类型 = '实际' THEN [时薪单价]*[提成系数]*[工时] ELSE 0 END) AS 收益汇总\r\n\t \r\n\tFROM\r\n\t\t任务工时表 \r\n\tGROUP BY\r\n\t\t[任务ID] \r\n\t),\r\n\t任务汇总 AS (-- Sum up task hours with recursive sum of child tasks\r\n\tSELECT\r\n\t\tcte.ID,\r\n\t\tISNULL( SUM ( c.任务预算工时 ), 0 ) AS 子任务分配工时 \r\n\tFROM\r\n\t\t[任务递归CTE] cte\r\n\t\tLEFT JOIN 任务表 c ON c.[父任务ID] = cte.ID AND c.[任务状态]>=1\r\n\tGROUP BY\r\n\t\tcte.ID \r\n\t),\r\n\t子任务核定工时汇总 AS (\r\n SELECT\r\n cte.ID,\r\n ISNULL(SUM(汇总.核定工时汇总), 0) AS 子任务核定工时汇总\r\n FROM\r\n [任务递归CTE] cte\r\n LEFT JOIN 任务表 c ON c.[父任务ID] = cte.ID\r\n LEFT JOIN 汇总工时 汇总 ON c.ID = 汇总.[任务ID]\r\n GROUP BY\r\n cte.ID\r\n),\r\n子任务实际工时汇总 AS (\r\n SELECT\r\n cte.ID,\r\n ISNULL(SUM(汇总.实际工时汇总), 0) AS 子任务实际工时汇总\r\n FROM\r\n [任务递归CTE] cte\r\n LEFT JOIN 任务表 c ON c.[父任务ID] = cte.ID\r\n LEFT JOIN 汇总工时 汇总 ON c.ID = 汇总.[任务ID]\r\n GROUP BY\r\n cte.ID\r\n),\r\n\t任务成员 AS ( \r\n\tSELECT \r\n\t[任务ID],\r\n\tSTRING_AGG ([任务成员],',') AS 任务成员,\r\n\tcount(*) AS [成员数量] \r\n\tFROM [任务成员表] \r\n\tGROUP BY [任务ID] \r\n\t)\r\n-- Final view definition\r\nSELECT\r\n t.*,\r\n (CASE WHEN t.[任务状态]>=1 THEN t.任务预算工时 ELSE 0 END )AS 总分配工时,\r\n ISNULL(汇总.计划工时汇总, 0) + ISNULL(任务汇总.子任务分配工时, 0) AS 已分配工时,\r\n\t\tISNULL(汇总.计划工时汇总, 0) AS 本任务已分配工时,\r\n\t\tISNULL(任务汇总.子任务分配工时, 0) AS 子任务已分配工时,\r\n t.任务预算工时 - (ISNULL(汇总.计划工时汇总, 0) + ISNULL(任务汇总.子任务分配工时, 0)) AS 可分配工时,\r\n ISNULL(汇总.核定工时汇总, 0) + ISNULL(子任务核定工时汇总.子任务核定工时汇总, 0) AS 总核定工时,\r\n\t\tISNULL(汇总.核定工时汇总, 0) AS 本任务核定工时,\r\n\t\tISNULL(子任务核定工时汇总.子任务核定工时汇总, 0) AS 子任务核定工时,\r\n (CASE \r\n\tWHEN 项目.[工时分配方式]<>3 THEN t.任务预算工时 - (ISNULL(汇总.核定工时汇总, 0) + ISNULL(子任务核定工时汇总.子任务核定工时汇总, 0))\r\n\tELSE t.任务预算工时 - (ISNULL(汇总.计划工时汇总, 0) + ISNULL(任务汇总.子任务分配工时, 0))\r\nEND\r\n) AS 可核定工时,\r\n\t\t(CASE \r\n\tWHEN 项目.[工时分配方式]=3 THEN t.任务预算工时 - (ISNULL(汇总.计划工时汇总, 0) + ISNULL(任务汇总.子任务分配工时, 0))\r\n\tELSE ISNULL(汇总.计划工时汇总, 0) - ISNULL(汇总.核定工时汇总, 0)\r\nEND\r\n) AS 本任务可核定工时,\r\n\t\tISNULL(任务汇总.子任务分配工时, 0) - ISNULL(子任务核定工时汇总.子任务核定工时汇总, 0) AS 子任务可核定工时,\r\n ISNULL(汇总.实际工时汇总, 0) + ISNULL(子任务实际工时汇总.子任务实际工时汇总, 0) AS 实际工时,\r\n\t\tISNULL(汇总.实际工时汇总, 0) AS 本任务实际工时,\r\n\t\tISNULL(子任务实际工时汇总.子任务实际工时汇总, 0) AS 子任务实际工时,\r\n\t\tISNULL(汇总.收益汇总, 0) AS 已消耗成本,\r\n 成员.[成员数量],\r\n 成员.[任务成员]\r\nFROM\r\n 任务表 t\r\n LEFT JOIN 汇总工时 汇总 ON t.ID = 汇总.[任务ID]\r\n LEFT JOIN 任务汇总 任务汇总 ON t.ID = 任务汇总.ID\r\n LEFT JOIN 子任务核定工时汇总 子任务核定工时汇总 ON t.ID = 子任务核定工时汇总.ID\r\n LEFT JOIN 子任务实际工时汇总 子任务实际工时汇总 ON t.ID = 子任务实际工时汇总.ID\r\n LEFT JOIN 任务成员 成员 ON t.ID = 成员.[任务ID]\r\n\t\tLEFT JOIN [项目表] 项目 ON t.[项目ID] = 项目.ID;", "ViewInfo": { "ViewName": "任务平行视图", "QueryColumns": [ diff --git a/UserControlPages/工时记录列表.json b/UserControlPages/工时记录列表.json index a8eb973c..2776e86c 100644 --- a/UserControlPages/工时记录列表.json +++ b/UserControlPages/工时记录列表.json @@ -183,6 +183,15 @@ "SerializeProperty": "=TEXT(工时记录列表!工时日期,\"yyyy年m月d日\")&\"，\"&工时记录列表!工时类型&\"：\"&工时记录列表!工时&\" 小时\"" }, "ColumnName": "描述" + }, + { + "GUID": "5cc46399-cff3-47d7-9aed-06682dc72465", + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行人", + "GUID": "330d9561-ee36-4cc4-a1a3-dadf2df05f8f" + }, + "ColumnName": "执行人" } ], "SqlCondition": { @@ -293,4 +302,4 @@ "PaperSize": {}, "Margin": {} } -}//o76DntIz+mSflTArbZrZqkHg7ysoX37XPOUMaBIdHWgU/9wjTcslHrZ4s4Nx62E8qElN0dx3G2yi/n/zursmaKxLLACopvdLer9iqxR0IAZ1aAs+HXcloKtSYEbyVj/c1UkhMQwbk0RSehe329Omkl6n64UQWUXA/p/7hGYptaXspROgHYNwBj7XI4c6334G6ONtchwFUpv+ZOLOJPCnunEVQvrGDQIiKj258dbdRM3fqr8mWk77tjJf50HggZgOiRAaRJmRG3wPy82k7wcr0Y8DyTATJKUGiDrEF5o6B7LhyAkBsmimYpfGNCAV4D2+pA5XGZRk/UhkP2C19cH6y6bi7789p2EsybbSYZR2b44wr4dq+ixhUlEOPmNtfF9bdmszmPi0G8IjrfRmTQY86mIgdQoa9FqnEUreNeA4MSAiVsjtzWKEa/dQF8BR1tvPYuIP/08XIrvzD2noDGl+u/vMuqPDZSiRlnLDnqq1owL6mH/g8Eoots4NcGOFjniJb6ZKanBIAICHfw2JB7NrF8H4Pip91hbPz25pr/MEjb0U67g180dTiBwcS8UYxznIyVfeM/F4hHa/pk94GmrKvUble/2tK5gabkpPJC8lGuoBvKfzsvY4pfDai5w7HBfC6BICF0/R1kjBdU0kgdHd/hRFHy4dMpUEWUN2YbNNLH9jkHRdTDRhW3ZllFs8pOLarmfJCbBd6gMhYLSNI+9tTh/IYBXq3ECSjUKYcZrXGbsnNTpf3yKkcejjScyJj2sA0rKYFNXAgL/xcJMUlREnRp8vDAe5bi6KCvwnlPJlTZvzh7AqnU9tGXwjg1WkfYSHTb0PaexYK9udKpePwHuQUKr0/qkx6GLmIotWUAPQYMH3cV1nnwmH8HbHrHSf3BrxzD+u5gYA5dufS+8pWjHdNg==|920 \ No newline at end of file +}//a9oRlD43i9PvxTy6jWE/xUyNEHBYhJOBH5UlxcEhdFA0+kWtdBy3GmY4gJyQh6+5sBnWHA4i+ToGdFCvj9ohDLLRGPx2eOf3QNwWRJIhFtrG/pZ3fSeZ34ZKPSLYGmRp2SMH+m13Vn1PTgnCEnFf/pGNmyTb+6JKWb6bxVzJpLVpU38/LRdptyrFQpD4YbPII/XeS/5eET3nqoT9vr58Z+gfkRfbzr1bs3WHRRyueX/mju5pcqO+oVldIr4cXBx4zlH2tojtAboxqRbUeIVaHZdCvCQKcpDi7T+PaWPycwukiExzAdDUARolAl+z7XRbPDE+iGSM+JkG7m76KTxypZUUNlG583tcpis9l+nP03Cyv4gltjllA9j5R5+bxVjFEQLipk7O72R8UGU/a0dnHzNbKlzNAqvu2jyejg9LMO7fVW6eiq7MTMqp9dJAGAkFY5J4/U6Z2AR1NHtcXrVNxHy9IqprLE/VbBpfGkbIam5BFWNO6ytBR+EsM9TKNEl5JBPy2heF753DtdaW7X4oV+aYFJI10p98BBkHgWTsxeruGCiiAD3Q/A9Yjtr/zf1TGTOFoy3GH5XzUhhszxLTW2cgOjboX8ecwGZwYaIbBLY8TSs4mIg2mxmPEgUjtU+42u2QHzC8JFD0pEFlyATX8HBYZH5S1lR0zPHW6p4zI+eWSg43yjjNKDShviC+BGnz5C16XaEug+hXsVg/PG07DDrVY9sRIY4ZWx5yNLGWc2a+WCyuUmdIyCZvtUXpibHO4yBfiKnut+i2x0bloRBpvE48lOkD4eju+u0reXijHMrPu8u1rT6OjBplp9CDr6XdklMLqvIwREso+k6lDWaAfg5Ay35nhFZTUG9cr5X/OfJQmMcJS+ghtFx3UDMAS/oqNrxRXyzbpJoN30CcMfQQAw==|920 \ No newline at end of file