From b245c4c94fa029e28d356338c99f7c8b0eb9eb84 Mon Sep 17 00:00:00 2001 From: cuckooent Date: Tue, 1 Jul 2025 12:36:51 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"1","MessageType":2,"Modules":[{"Sta?= =?UTF-8?q?te":1,"Type":7,"Name":"Table/=E8=AF=B7=E6=AC=BE=E5=8D=95?= =?UTF-8?q?=E7=8A=B6=E6=80=81"},{"State":1,"Type":23,"Name":"TableView/Vie?= =?UTF-8?q?w=5F=E4=BB=BB=E5=8A=A1=E5=B7=A5=E6=97=B6=E7=BB=9F=E8=AE=A1"},{"?= =?UTF-8?q?State":1,"Type":7,"Name":"Table/=E4=BB=BB=E5=8A=A1=E5=B7=A5?= =?UTF-8?q?=E6=97=B6=E8=A1=A8"},{"State":1,"Type":1,"Name":"PCPage/?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=B7=A5=E6=97=B6"},{"State":1,"Type":1,"Nam?= =?UTF-8?q?e":"PCPage/=E4=BB=BB=E5=8A=A1-=E5=B7=A5=E6=97=B6"},{"State":1,"?= =?UTF-8?q?Type":1,"Name":"PCPage/=E7=94=9F=E6=88=90=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=8D=95"},{"State":1,"Type":15,"Name":"Serv?= =?UTF-8?q?erCommand/=E7=94=9F=E6=88=90=E8=AF=B7=E6=AC=BE=E5=8D=95"},{"Sta?= =?UTF-8?q?te":1,"Type":15,"Name":"ServerCommand/=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=AF=B7=E6=AC=BE=E5=8D=95=E7=8A=B6=E6=80=81"},{"State":1,"Typ?= =?UTF-8?q?e":15,"Name":"ServerCommand/=E5=88=A0=E9=99=A4=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=88=90=E5=91=98=E6=89=80=E6=9C=89=E5=B7=A5=E6=97=B6?= =?UTF-8?q?"},{"State":3,"Type":7,"Name":"Table/=E5=B7=A5=E6=97=B6?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E7=8A=B6=E6=80=81"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 112 +----- Pages/94f8bae36aee4ae7aec2a063ca731b1.json | 359 +++++++++++------- Pages/收益/生成结算申请单.json | 50 ++- .../项目首页-容器页面/任务容器页面/任务-工时.json | 56 +-- .../项目首页/项目首页-容器页面/项目工时.json | 67 +++- ServerCommands/工时/删除任务成员所有工时.json | 51 ++- ServerCommands/收益/修改请款单状态.json | 148 ++++++-- ServerCommands/收益/生成请款单.json | 64 ++-- Tables/字典表/工时结算状态.json | 60 +++ Tables/工时/View_任务工时统计.json | 21 +- Tables/工时/任务工时表.json | 27 +- Tables/收益/请款单状态.json | 7 + 12 files changed, 635 insertions(+), 387 deletions(-) create mode 100644 Tables/字典表/工时结算状态.json diff --git a/.collaboration b/.collaboration index c60730ea..df88bd80 100644 --- a/.collaboration +++ b/.collaboration @@ -154,16 +154,7 @@ }, { "ModuleName": "Table/请款单状态", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-07-01T12:23:08.801146+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\收益\\请款单状态.json" - ] + "ModuleType": 7 }, { "ModuleName": "Tables/财务", @@ -462,16 +453,7 @@ }, { "ModuleName": "TableView/View_任务工时统计", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-07-01T12:35:53.3904957+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\工时\\View_任务工时统计.json" - ] + "ModuleType": 23 }, { "ModuleName": "TableView/人员工时统计视图", @@ -479,16 +461,7 @@ }, { "ModuleName": "Table/任务工时表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-07-01T12:18:23.1839961+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\工时\\任务工时表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Tables/AI助手", @@ -657,19 +630,7 @@ }, { "ModuleName": "PCPage/项目工时", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-07-01T12:36:29.8738924+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目工时.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目工时.rd", - "Pages\\57e644c056074f9d885f24a5bd7b4ae.json", - "Pages\\57e644c056074f9d885f24a5bd7b4ae.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目成员统计", @@ -797,19 +758,7 @@ }, { "ModuleName": "PCPage/任务-工时", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-07-01T12:25:43.9909321+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-工时.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-工时.rd", - "Pages\\94f8bae36aee4ae7aec2a063ca731b1.json", - "Pages\\94f8bae36aee4ae7aec2a063ca731b1.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/项目/项目首页/项目首页-容器页面/项目发布", @@ -1325,17 +1274,7 @@ }, { "ModuleName": "PCPage/生成结算申请单", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-07-01T12:14:08.8682226+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\收益\\生成结算申请单.json", - "Pages\\收益\\生成结算申请单.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/个人中心", @@ -1783,16 +1722,7 @@ }, { "ModuleName": "ServerCommand/生成请款单", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-07-01T12:21:05.2956225+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\收益\\生成请款单.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/完成请款单", @@ -1800,16 +1730,7 @@ }, { "ModuleName": "ServerCommand/修改请款单状态", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-07-01T12:22:52.9231391+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\收益\\修改请款单状态.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommands/任务", @@ -1889,16 +1810,7 @@ }, { "ModuleName": "ServerCommand/删除任务成员所有工时", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-07-01T12:28:35.2202786+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\删除任务成员所有工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/上报实际工时", @@ -2822,12 +2734,6 @@ }, { "ModuleName": "Table/工时结算状态", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-07-01T12:18:59.7926076+08:00", "ModuleType": 7 } ] \ No newline at end of file diff --git a/Pages/94f8bae36aee4ae7aec2a063ca731b1.json b/Pages/94f8bae36aee4ae7aec2a063ca731b1.json index 286ecbea..960e5b5f 100644 --- a/Pages/94f8bae36aee4ae7aec2a063ca731b1.json +++ b/Pages/94f8bae36aee4ae7aec2a063ca731b1.json @@ -142,7 +142,7 @@ "BreakpointIdentity": "76cf85a7-0bd6-46d7-9ce1-9056d3b41cdd" } ], - "ID": "d1faa036-922f-486f-8e11-b2c7515338b7" + "ID": "d588d20f-c221-45f3-a80e-17e2217ae770" }, { "CommandList": [ @@ -197,7 +197,7 @@ "BreakpointIdentity": "279c891f-505a-4e47-9834-f5c7f55f6bca" } ], - "ID": "96d0e014-c153-49ed-b770-17ad7984eebd" + "ID": "744274e0-666e-4e38-a68b-6aba264e5591" }, { "CommandList": [ @@ -212,19 +212,19 @@ "BreakpointIdentity": "a438653b-0d00-4ea5-82ad-1fe365eeb889" } ], - "ID": "6c187815-bb67-49d8-ad59-bb8f86c80b3e" + "ID": "0851b34c-b81c-4883-85f0-b0d4b02322d2" } ], "BreakpointIdentity": "384d57bb-22a0-4bca-9571-464f75c35fd1" } ], - "ID": "03577d99-2be8-459b-886b-723beef126b3" + "ID": "d99c24d0-b8ec-44eb-873a-695d55675656" } ], "BreakpointIdentity": "db9dace3-d983-43c9-b0fb-5b122de1b7b1" } ], - "ID": "261a2af9-3498-4958-9b8e-c5eff976cf12" + "ID": "62cfea71-e958-442c-b3da-59a44d5ad94c" } ], "BreakpointIdentity": "d83fc4a3-8e3e-4206-82be-d50f1be8fc4a" @@ -272,62 +272,16 @@ "Condition": { "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "='94f8bae36aee4ae7aec2a063ca731b1'!选择项" - } - ] + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务工时表", + "ColumnName": "结算状态", + "GUID": "97417040-abff-4a46-94c0-5101e41841f7" + } }, - "value": "编辑" + "value": "0" }, "CommandList": [ - { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PageName": "修改报工", - "LoadBindingDataOption": 1, - "BreakpointIdentity": "f341aae6-bddc-4470-a737-09b8c309e6e5" - } - ], - "ID": "6ce46400-0f4e-4fcb-8a1a-63a9ebd7839f" - }, - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=选择项" - } - ] - }, - "value": "重算" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "重算指定报工收益", - "Parameters": [ - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "报工记录ID", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='94f8bae36aee4ae7aec2a063ca731b1'!D5" - } - } - ], - "ResultErrorCodeTo": { - "SerializeProperty": "code" - }, - "ResultMessageTo": { - "SerializeProperty": "msg" - }, - "RefreshAfterFinish": true, - "CheckDataValidation": true, - "BreakpointIdentity": "a9590111-de90-47dc-9521-54f70683c191" - }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -338,75 +292,22 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "='94f8bae36aee4ae7aec2a063ca731b1'!code" + "SerializeProperty": "='94f8bae36aee4ae7aec2a063ca731b1'!选择项" } ] }, - "value": "0" + "value": "编辑" }, "CommandList": [ { - "$type": "ElementUI.Commands.ShowMessage, ElementUI", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='94f8bae36aee4ae7aec2a063ca731b1'!msg" - }, - "Type": "success", - "Duration": 3000, - "BreakpointIdentity": "0bbdaa07-47fb-45f9-a79a-c7c4089573a7" + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "修改报工", + "LoadBindingDataOption": 1, + "BreakpointIdentity": "5f4a15aa-9c24-41b5-8dee-29292881ba05" } ], - "ID": "cfd611eb-0205-4008-909c-adfc62280b20" + "ID": "1002c5ff-955f-4aa8-bfb5-ebd1588c2a2e" }, - { - "CommandList": [ - { - "$type": "ElementUI.Commands.ShowMessage, ElementUI", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='94f8bae36aee4ae7aec2a063ca731b1'!msg" - }, - "Type": "error", - "Duration": 3000, - "BreakpointIdentity": "01254656-3b98-4b2f-8c37-5a157bc97da3" - } - ], - "ID": "47467580-51f8-48de-94ba-a610ade3fa36" - } - ], - "BreakpointIdentity": "74f1d320-cf89-41c2-a180-3a679ae457e3" - } - ], - "ID": "07dbeb63-1692-493d-bd67-3ee324965387" - }, - { - "CommandList": [ - { - "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "删除指定工时记录", - "Parameters": [ - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "报工记录ID", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='94f8bae36aee4ae7aec2a063ca731b1'!D5" - } - } - ], - "ResultErrorCodeTo": { - "SerializeProperty": "code" - }, - "ResultMessageTo": { - "SerializeProperty": "msg" - }, - "RefreshAfterFinish": true, - "CheckDataValidation": true, - "BreakpointIdentity": "07584334-3244-4e8d-9905-f8b7b2cf5806" - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ { "Condition": { "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", @@ -414,52 +315,198 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "=code" + "SerializeProperty": "=选择项" } ] }, - "value": "0" + "value": "重算" }, "CommandList": [ { - "$type": "ElementUI.Commands.ShowMessage, ElementUI", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='94f8bae36aee4ae7aec2a063ca731b1'!msg" + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "重算指定报工收益", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "报工记录ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='94f8bae36aee4ae7aec2a063ca731b1'!D5" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" }, - "Type": "success", - "Duration": 3000, - "BreakpointIdentity": "d64418f1-6db0-444f-b842-87506c3e20bc" + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true, + "BreakpointIdentity": "bf3e2915-d948-4e57-adc0-aedcf9c241bc" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='94f8bae36aee4ae7aec2a063ca731b1'!code" + } + ] + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "ElementUI.Commands.ShowMessage, ElementUI", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='94f8bae36aee4ae7aec2a063ca731b1'!msg" + }, + "Type": "success", + "Duration": 3000, + "BreakpointIdentity": "51dccb3b-9b22-473d-8c4e-bdf93e2685e2" + } + ], + "ID": "dd45b2f5-3c4a-4cc0-a3a5-59adeb6df64e" + }, + { + "CommandList": [ + { + "$type": "ElementUI.Commands.ShowMessage, ElementUI", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='94f8bae36aee4ae7aec2a063ca731b1'!msg" + }, + "Type": "error", + "Duration": 3000, + "BreakpointIdentity": "f923e82c-6281-40cf-97f4-377b125b0883" + } + ], + "ID": "c9d5609a-0c53-4221-9cf9-4bbf5b9c9214" + } + ], + "BreakpointIdentity": "a89cb16c-544b-44dd-9428-cc82ed4457a7" } ], - "ID": "f18fa50f-dc40-486f-aa72-66d16ff6bfca" + "ID": "8ca0a8f8-7d44-454b-90ac-700fe7d37d2d" }, { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=选择项" + } + ] + }, + "value": "删除" + }, "CommandList": [ { - "$type": "ElementUI.Commands.ShowMessage, ElementUI", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='94f8bae36aee4ae7aec2a063ca731b1'!msg" + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "删除指定工时记录", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "报工记录ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='94f8bae36aee4ae7aec2a063ca731b1'!D5" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" }, - "Type": "error", - "Duration": 3000, - "BreakpointIdentity": "051ddeb5-e146-4608-8398-ff2ed4966d4e" + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true, + "BreakpointIdentity": "c60f23e7-4f0b-45c0-a7b9-5696ee457b08" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=code" + } + ] + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "ElementUI.Commands.ShowMessage, ElementUI", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='94f8bae36aee4ae7aec2a063ca731b1'!msg" + }, + "Type": "success", + "Duration": 3000, + "BreakpointIdentity": "b5736300-a63b-487a-bcb6-9af3bcf5905e" + } + ], + "ID": "8733361f-d734-421c-9d3b-c34d975b79fe" + }, + { + "CommandList": [ + { + "$type": "ElementUI.Commands.ShowMessage, ElementUI", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='94f8bae36aee4ae7aec2a063ca731b1'!msg" + }, + "Type": "error", + "Duration": 3000, + "BreakpointIdentity": "37b113a6-dea4-4304-abe6-c590e4b953e7" + } + ], + "ID": "0c73d1a5-302e-4569-9007-98cb375f9551" + } + ], + "BreakpointIdentity": "380028df-e4dd-4294-a620-b58949fd35c0" } ], - "ID": "7278d93b-8381-4c76-b290-0822d2a5df6e" + "ID": "be86ca43-b876-4405-9c7d-9807fd6cfe63" } ], - "BreakpointIdentity": "cca6aeb8-7b7b-4aba-b206-326aebb44f83" + "BreakpointIdentity": "f14deccc-9598-424c-8534-d301a4c972be" } ], - "ID": "0801c836-ae50-4fe8-9929-7b8605ecbbf9" + "ID": "4a0f87be-276f-4316-8fbd-0a0496289ab1" + }, + { + "CommandList": [ + { + "$type": "ElementUI.Commands.ShowMessage, ElementUI", + "Message": "只允许修改未结算报工", + "Type": "error", + "Duration": 3000, + "BreakpointIdentity": "b2fca4c6-6257-4a92-bb1f-dcf4da2e7aa8" + } + ], + "ID": "9a87c28b-2a91-41c9-8de1-46834952f9fa" } ], - "BreakpointIdentity": "33406574-ee98-4214-b280-61596640fff6" + "BreakpointIdentity": "0f57a301-3cf6-4774-aae7-0c01d5f4e564" } ], - "ID": "41275d83-1b10-4001-a968-15196b769897" + "ID": "b5c56bb0-566e-41c6-886d-a41b6be37428" } ], "BreakpointIdentity": "717ab9b0-ca8b-4b1c-bd26-fb261fb33c38" @@ -478,15 +525,22 @@ "ToolTip": "操作", "Size": 24, "TemplateKey": "按钮图标", + "IsInvisible": true, "ImagePath": "更多.svg", "UseCellForeColor": true - } + }, + "RulesGuidList": [ + "796ffb62-1bf6-4337-8350-bc706ba8c4e2" + ] }, "2,3": { "TemplateCellSource": "执行内容" }, "4,3": { "TemplateCellSource": "ID" + }, + "4,4": { + "TemplateCellSource": "结算状态" } }, "StyleDatas": { @@ -526,10 +580,29 @@ }, "PageInfo": { "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon", - "ParentPageName": "任务-工时" + "ParentPageName": "任务-工时", + "ConditionFormatRulesCollection": { + "Rules": [ + { + "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='94f8bae36aee4ae7aec2a063ca731b1'!$E$5=0" + }, + "GUID": "796ffb62-1bf6-4337-8350-bc706ba8c4e2", + "StyleInfo": { + "Underline": null, + "Strikethrough": null + }, + "IsDisabled": false, + "IsInvisible": false, + "IsReadOnly": false + } + ] + } }, "PrintInfo": { "PaperSize": {}, "Margin": {} } -}//BMtZey2g7KPZfVrCVc/TNDB0h9FbYKuNr5ki3h7ofOQt9j4J0y+g7wt86NemIR98KX1+F1R0kineNjX5+CxUyFCtLr7VChwVKfZ1PwnaPjNc14en2CgNQYFy7Z581HOg/EsDse5Df0dP/Rm00WTfkLd8Gj5ORQozulR3NTGBi9Hvdebv+Ds8OA6fLYIk0mo1KdleObA9xDp4SiKCh5RWfDSqk5QbvrqnyOdtqG+nG05TUDzUbFpX/SwevAyLUfTgtpzAwbQb00FM31gnD9v4ncXVfskFfylSgHBtA8F+9+F33VcoDYf3lyll/RIcZ5ATqLjNu1kEEx9f6PCPokrt/XcdgGIdPUCW3eUFFwP4XU/Ozio68MkQXo7bACaOjsCzvJ53UYSXZEbGnu0myG6TRbqQizassF0L+YlZ6mj0B6TcFGYoobeaZ35FK+4diUShMaVt5Ik3V6yly4gU80L0KVrSTV0GF4h5nOC7elHpDJ41nHth6BJbjjnZZGw+1bWsfF38hE8E/GMZbbFI4Y3i59+Khd1dOH73+FTc5qpj6vVWydTgSCdVEEP+x+/Mjmm4lmQN3ha7rsSFDbS7VUaGKcz20c9QX3rHuXrIYgXwgBx7ZW55i/frYJQKN4lvz3WcnyaJ/0TU5UPsvIki7MrwWfNQejya/W/Q9oo4M40FXO1u5R3b7AvixvqtFRUzrz9RgrTQj14kGEr62yZFp8ZDt5SnulUuWUqz5q2isLeiqB2zS9jop+ucvUkQj7kwTKjBYNzLmGs99TtFiUYtRaYCOLAhR/PnoyinPvkHWMIVBQS7imB71cLUwMA1cku7uJbJ8g2+eu8HF4dTu+PfPDxWCLHFrfxcIrYNluoGC7vr9KXZsJ7hR6/WWZjm21di08sY17V2vBethtVep7wGDuNYzg==|920 \ No newline at end of file +}//PJccZi/nVuxiEquDDwknAEEc2Pgj/OMV7o8Dr9sDsjQ7DvRtjhMmz+bxyW1eHPMkIjbfZacShhHFKC6hRQI+JV5gBdb/OsEiS7IJuG/rVvJ5/ECTg25vA/GVaSWPecVrY66gIq/O9Zsa+oZCO+R8YYsnFR2uGIFppYfeb39SOD0S71uY+o7sI7D1FluZxCzdWB7lRVh50il+M2t3iHjlk9pknzr7jYo4eu3z4fenPa6UdtKMPJjl/69VlmwtG0DOpUk5i3R2QTUx7QlFleb7+uXBb/RVKC2pjRCOmT3USUnt54ZzAx3yMvan0WFKTa02uMujKr5D9i/XL1LQ8dZQH4Z/JoCGzTGFm/15oXXbsGX+WicPs9vvo1Iku930FteXoFJRSU4THSaqo4nidKRs9Ufl9qxewFjSpesZryaocz27/nmR3xRSccoXbcpEFvgtcTolXP7CuSCHO/qTgevOXKaZ/zNjwlBJxVw0yQuIw7IsqdH0tNTqTNPwev05fNFXwnEZAjT/j/nwRXeQ+/JiSnfxXngX3nSsBgmoAhsAGWZoGFszaVzgphOq16pav2t7xBqUMXAzP+v0adYAf3+k3Y9Z78iD8+UK0XQLkE7zjZ8TM/NTfwOrRnPrLXOK6SmkttDj4sOW1ve5Zv1MqoqzdEh6WSkkDzGWmyJwyAaR6zXnAP2CRtwkQozgTIDs/PPhhKubUXkRhRI8UWYTM7g+qK14t/AGpht8mHaWmwhWcyCUtRl03afArOPkbwLagES29vlD8E6evA3DEXXTRgwQmhe53qlVm/1vr/8NSmwTOUQ9MY2/H6DRb6UrawP6mWNQaH2p8SCdxQ3QUhUIH4VkqeSWKLd8itGuWTnud6zt2v5rsR+fichwIDE20P8eSkLSguXDDJyW9kB/pP8C3CXm0w==|920 \ No newline at end of file diff --git a/Pages/收益/生成结算申请单.json b/Pages/收益/生成结算申请单.json index 71e124f8..d4f01f2f 100644 --- a/Pages/收益/生成结算申请单.json +++ b/Pages/收益/生成结算申请单.json @@ -13,7 +13,7 @@ }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 508.0 + "DesignLengthInPixel": 667.0 } }, "4": { @@ -294,7 +294,7 @@ "BreakpointIdentity": "7ae1633f-ac19-4dca-bdce-a4e43c0129e4" } ], - "ID": "add0787b-c3c5-4338-859e-c67fde8c9a75" + "ID": "05450b65-0c91-41d9-b33a-19987841951f" }, { "CommandList": [ @@ -308,13 +308,13 @@ "BreakpointIdentity": "28b82df2-ddde-45f7-937c-ae8ff56efade" } ], - "ID": "87f97da7-7fcd-483c-9388-19a187473bb2" + "ID": "14ce9709-d974-4ee0-a039-bb3660ef1c08" } ], "BreakpointIdentity": "43c7eb20-b0f0-4c86-804b-fe485e876a71" } ], - "ID": "cd6be82e-2bc4-4757-90b0-baeac0df7e7c" + "ID": "ee0b6f64-6f89-4375-bbfc-b04b4c2184ff" }, { "CommandList": [ @@ -325,7 +325,7 @@ "BreakpointIdentity": "0998dfd3-3863-44b0-80db-d53a7b86c2b0" } ], - "ID": "bcc879ba-3941-4384-a21f-5e0c93095780" + "ID": "e202cc46-da90-4fa8-a9fd-41f752617151" } ], "BreakpointIdentity": "63226f95-d7d9-42c6-9a09-77015cbb2d07" @@ -557,19 +557,30 @@ } }, { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "CompareType": 1, - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "请款单ID", - "GUID": "c2afefdc-7351-4496-a4b4-8f59aee6a8be", - "RelationBinding": { - "RelatedTable": "收益请款单表", - "RelatedColumn": "ID", - "DisplayColumn": "状态" + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "结算状态", + "GUID": "21a3328f-4090-485c-a4fe-ff2211fae6df" + }, + "Value": "0", + "LeftBracket": 1 + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "结算状态", + "GUID": "0bc16a33-9406-4eb1-9099-eb54a243d2f5" + }, + "Value": "%Null%", + "RightBracket": 1 } - }, - "Value": "3" + ], + "RelationType": 1 } ] }, @@ -849,7 +860,6 @@ "1,0": 0, "1,1": 0, "1,14": 0, - "1,15": 0, "1,16": 0, "1,17": 0, "1,18": 0, @@ -858,8 +868,6 @@ "1,21": 0, "1,22": 0, "1,28": 0, - "1,29": 0, - "1,30": 0, "1,31": 1, "1,33": 2, "1,37": 0, @@ -927,4 +935,4 @@ "Formula": "生成结算申请单!$E$7" } ] -}//ZNKF95i2twhiGVOWzC0EdCJDABpl85YwMpIkjutlL5152vcWOjHTrBEkg+5dp6Pj3BxMCojNBLTuvRHFgSVngEYljpXKelo5AbY6JSQ+FPoI9LzpnSyS2C9txqHLUlPFxLiAsJH5jIM7oKfqayobvxxDObuFuh8FSWvbFvCcpjBjoBKCyl1qdoR3X04cJUFTKqLYr9lRI8HbKf/JlVmsp53ewIMO+5RNzi98jXlgiy/POjEvqO+FQ0eATRAGVNjItO3KtlQoFzR8fPnd6dhjUY4XfRwX0iM8iMG/6O16ydpfkGSssmszCraWZmV5nMMLrAmUTFZFT4L5sv9S950tz9MyFqnJKx4Km6/kWRjpRPAI24Tok0izNdHY3jad5eaSfeRXOWzKqt8Me7GJTBhv+lqxBEd1gR30kd0Hj02HTmGAGbSuq8nIrdje3yVe8DuJYHUO3ZszKmsKasXWuQcVLk2aLYn9glaAkaSFt+UJijn5ac51bQrQtJK6c4ZChhbeQ9202iyuhhcsiQI7mKAu5ZuMUQqPgkwMByMmk6aAjX2vOXnWrlWMO43XdxetZ4DgcZu0ICFbHSeLnrr4Liy5nxcEyHvh+VMAnaYWSNDzxd1qMQXFMSxFImWfaY5esERE2WBGQ8tZcg/Qbd1pnauM+8cqDb9mqxN6fp2vfbGEYZT8swDV2ManZT74vS1MiZ/kcp/K/gDJZI7w+IAP3s91pf9+nmuxNrxTJoBQvUGMhWSke6hVvYy+sZ8iSXugesiR9yuMzXLJ/z4UiKMzwlAp/Dtk3H5AgNe5DAeTTIl4ELxJQGWkclArwSBtdZe20K62jzUPBdSfWUB4PzT+P+FjP4GiYDO/XC1xMhVWQEQX/EwzWS94imNxj+iUcGfwdp30Pv3Z1UbxiOpAuQLpScf1Fg==|920 \ No newline at end of file +}//IRQ0ZgeymN5/86jnUcm6Wm1HVc4Y+nMumWeoqyCXWp/uVLXCe/rfXUhOG7kX4FT4HoXebtHOCdD7LYX/sww6XpJirzgJUcTnQGfxwbwSk1jVnadvHk437hMsHSsUCn7AGbEJ5V/AxV8N34rpA7vlhK3fRvbYqapZkH0Cab92QlwcXHus7/9JNNigast/CMc5ArhgpUj0f7gfNI5xDBFLszFiDfvvtsFTrF4jBB0oPbjeAV4YZrjrSBr5Nd3+EzuLncywBK3NOre/yi5tfLuFZGvofCENZrGcJtgZrOoA4bK5k3jNwJW0/qxCTwTDEdi2glVFlq2MDytq/btWWeZbYyh4jCaGwNoN/LaM/KlCne0zLfMsF5y1I1eRvtbrN9Lem3i9QIRftBvRknMDIy121BntIrwbwTJr5gGzuY1C7mJPFUvsTUKnuQQRIwdWNRFHmzS1A+tHaIUQ21yTpZMbwwLxw93acE0oQEecYbeaQI5zQwNaeMA6henNa1eB0YyeNQU8PSA3iMM2lyglwKBN6J2NbYMfoO181CzJSiYouxoPftYjwCMMmwFfTGSwHMxKBbVuKrrE49327Ahx9yKRCwRH3DPysk4JzXTuFWVioCjZM+XUsTC9XrbaiYQNuZuxxEwXvCDzj1nP8fXb6QmYTCR/dhC22aSpBQ2/lqJ2ZEB54v7sF/79lxeeIhg86EZkBmlkAz5TdcUH8vT5+2epMSYJdKbUrAqHu5TGgDJeacvtoqDs7qKmGCF6WToURL/uXKyaqdeVxNT5xJg/awBykQZsV2Gf51SpaI/KAJjZmmjD9VG4LbvT8C5cnfY6zjiuL94mdcqH4tAw9eylymSAOCDC//YP10CdfTn5HCPxWtS/xs7y9gRStZR0c48u61PsnWwwt8A+BigaeS6aja9OJQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-工时.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-工时.json index aa97fde7..28bbf3c5 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-工时.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-工时.json @@ -325,7 +325,7 @@ "BreakpointIdentity": "c63ddde1-6b38-48ff-af2d-f94f339ad339" } ], - "ID": "d8435d34-0e99-481d-b3d6-6c67e664d944" + "ID": "be80c82b-bbf0-4014-a5b6-c2ddf5281f07" }, { "CommandList": [ @@ -366,13 +366,13 @@ "BreakpointIdentity": "1c6065dd-6956-4224-b96d-e66cb64facef" } ], - "ID": "562da2f1-be9c-4967-8055-ecead0b88496" + "ID": "b0f9ad39-fd0d-414b-8ebd-3b3c17142646" } ], "BreakpointIdentity": "c8f7fd26-9140-4588-bc62-cd101078273b" } ], - "ID": "494e6b4c-3f97-4dce-af2c-8db08b2e1acd" + "ID": "6de86667-9f01-4413-a104-1aa772c65165" } ], "BreakpointIdentity": "14d49222-8aac-44b5-b857-242bbadcf023" @@ -429,7 +429,7 @@ "BreakpointIdentity": "b48fc0a4-ffae-4c92-9133-0b0194355db4" } ], - "ID": "c72b3951-3c5a-4596-b8bc-44d366e37cb7" + "ID": "394b3d97-1798-4cac-a81f-c2fa571012e0" }, { "CommandList": [ @@ -440,13 +440,13 @@ "BreakpointIdentity": "9e8860a0-cf0e-4157-8f2c-cd1e267ef988" } ], - "ID": "50cf37be-54db-4321-b366-96d4c911dcca" + "ID": "a9716c0a-6182-4d01-9d6a-e32d3e365405" } ], "BreakpointIdentity": "1a6dd2e2-c39d-41f0-a3f9-7e2f14ed04b3" } ], - "ID": "dd6f1a18-40db-48f3-b9a4-c6684ce59ba8" + "ID": "d31402f3-c681-4344-80d8-79c85dee008f" }, { "CommandList": [ @@ -487,13 +487,13 @@ "BreakpointIdentity": "52173cd6-8405-49a1-bac5-0206cf2ea95e" } ], - "ID": "bbf11d2b-5318-4e1c-85ab-1c9a493f4ef9" + "ID": "56e17251-79b1-406f-af6c-e1e80be3b82a" } ], "BreakpointIdentity": "2452925f-ace5-4060-9029-82b1edcfa3d2" } ], - "ID": "91e205c2-1123-40f2-9fc8-9878d6a15482" + "ID": "d514e109-37f2-43b7-a7e4-d582f4481c9f" } ], "BreakpointIdentity": "ed9f0cbb-8437-4480-b247-5b98cd6150ec" @@ -548,7 +548,7 @@ "BreakpointIdentity": "2358f00c-24d0-4e1c-b44a-64b275a6b15f" } ], - "ID": "d1bef53f-b488-4733-ae0b-116d766c05da" + "ID": "935e5912-0d8a-48bc-b2c1-8e4d054c93ae" }, { "CommandList": [ @@ -589,13 +589,13 @@ "BreakpointIdentity": "07bd0b3e-53b3-4b9e-9ee0-fee908472bdf" } ], - "ID": "a1967e52-3caf-4827-895e-7ea325d7c349" + "ID": "d19ea063-5cf7-46df-8417-5816d67c576f" } ], "BreakpointIdentity": "88ef1769-aa83-4e93-b80c-34cf6ca29567" } ], - "ID": "a716acb9-8645-4d99-bccf-d31ee5aff59e" + "ID": "8c55ee14-97d5-46a2-aed0-4d6af7867542" } ], "BreakpointIdentity": "f694ea40-2bc0-4336-aa84-a5480a953f61" @@ -677,7 +677,7 @@ "BreakpointIdentity": "621db91f-4b69-474f-a51e-7ee310e7f0d0" } ], - "ID": "f4b7dc4b-e2d3-4154-a854-b2a89760bdeb" + "ID": "a0639fe0-db6b-4b5e-9e31-a6dcbee66518" }, { "CommandList": [ @@ -688,13 +688,13 @@ "BreakpointIdentity": "d332dc0c-91d3-42b4-8e47-60c560eb75f9" } ], - "ID": "69d96a63-daa8-4319-a9a5-61f4afdc2067" + "ID": "86db8c00-a359-4b48-85c8-d2cb4b00b5ea" } ], "BreakpointIdentity": "57241bb1-46b0-4ac3-8f43-01ba33cfce3a" } ], - "ID": "884d03d3-fa1d-42bf-bed6-353ce6eca0e3" + "ID": "81a44c92-b631-4360-8bab-548d93db0c81" }, { "CommandList": [ @@ -735,19 +735,19 @@ "BreakpointIdentity": "56972b78-27b3-4197-82f4-cb1287a1f44d" } ], - "ID": "d7bf7470-edba-497f-93e4-708815ba3a97" + "ID": "8a41e8b6-d364-4245-a8f3-3103098860eb" } ], "BreakpointIdentity": "30b9a8e7-1eb0-4648-942a-528bf3267c97" } ], - "ID": "ff2f6c3f-a668-4bf9-9db0-80059cf67d67" + "ID": "72f626a7-5ca2-42a8-a350-27a4ec7bc354" } ], "BreakpointIdentity": "5a51bbd2-7d60-4944-a8e3-f3d65e357955" } ], - "ID": "9886989c-06ef-4e53-8090-60a15d825a14" + "ID": "67ad0526-9b3f-41bd-b67f-39c7809cf09a" }, { "CommandList": [ @@ -758,7 +758,7 @@ "BreakpointIdentity": "25c20408-229f-43c8-97be-d0dacc9ec10c" } ], - "ID": "71e72405-d5ed-415d-9529-197cf13da129" + "ID": "54271524-aa78-478b-adcf-af67377a8d31" } ], "BreakpointIdentity": "b3aaa4f4-a5cc-421d-82f1-cbed0d38d932" @@ -862,6 +862,15 @@ "GUID": "0f5e3814-624e-4c73-bdeb-2c09cf848918" }, "ColumnName": "执行内容" + }, + { + "GUID": "2c493874-2da5-4853-9be6-d876b7143a23", + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "结算状态", + "GUID": "e3773706-271b-48d2-b579-2d554d7e3863" + }, + "ColumnName": "结算状态" } ], "SqlCondition": { @@ -911,7 +920,8 @@ "上报工时", "核定工时", "描述", - "执行内容" + "执行内容", + "结算状态" ] }, "DataSourceListviewName": "图文列表表格1", @@ -1000,7 +1010,7 @@ "BreakpointIdentity": "a7e86905-a9f8-4602-9f1f-50def1968cb9" } ], - "ID": "055e1071-2ca4-4a0a-bc92-c06daec05675" + "ID": "3fd837b2-1412-42d5-9b96-ed49ef71eb6d" }, { "CommandList": [ @@ -1021,7 +1031,7 @@ "BreakpointIdentity": "9c0973ea-b868-4743-9bed-4acb707cd122" } ], - "ID": "da42334d-6a7e-43c9-9320-2857fc7dae9c" + "ID": "63b93668-ce84-4dad-b68f-05781b7910da" } ], "BreakpointIdentity": "776196f0-06d0-4593-8cac-76350cd25e39" @@ -1059,7 +1069,7 @@ "BreakpointIdentity": "2e34506e-5ea1-4134-a6fd-bdbc4d2387e1" } ], - "ID": "cb12f221-a519-4c02-85fc-99eaa0bcc348" + "ID": "77e339ca-ceb4-461f-9f1e-0522365fce9d" } ], "BreakpointIdentity": "5e2975f6-f6a2-4e44-9a9d-dcfc5fabe671" @@ -1432,4 +1442,4 @@ "Formula": "'任务-工时'!$V$14" } ] -}//XpTwXCzsp4Gjp0zNyPLPF1lAAfB9eVELVtdlNTIkhU8lK+eomNMQXnDrsd9cYDRatNebDWFV9mOZaAPA4wXBwwjrk7R6yRaVa+EXTtJeFmvs1g4FNplIPM2dGv0cH0IQffG7ZMRqUuv/AlIpdVFE2fvI3Um0hpUqCDSx2/eBwrWtXfgqxlXuywhUW/Xa0odkBt4maprie//owamOPxayFkcZxINsUDUpjZ87K9Wa4mlRIZtaaEQ3l5/5Av3O7bNaIsBka1mvEVzD5olL51e9IinjwQEOLpIn+8D1aOtg1Nv40eCXIMTSkk9qn2DfCEFeAkI0zPo8TRFYK5Mwffpqj56hkQDpGRf/ymF5PMT79p5PYt3R1Fhd4sFbAGKyzE3F8mkHhMPPrESR3/JainPgq7byNL3GSrG+JqbrERfJFEYPdHMbBZn+t0DbrSkZxH3peXQYUQ2MaU4uaHILYtkeUYwx+zji/qUKG0ASWDAA/m4hbUqy/r5Qy8oZC5t/T5pIdPKd/C+qRVkeVhCVf7OklCslRGICWZ5Mo9i7D27npCOgMeB5TOcg2S1tLX1QbOB+nw29+WVzOs6NO5uO9PGZJVBDrzRph0+Nv+V6VtshzIqUioq5M3dlu+L+CzuU4Lr8nPFAI49wRUxmQiM9wMOwQmbtheuYAHeHZS2xE3i8aLF95nDMzhKRSfi4RnHzbVF/PUX8bVvJIKmzoLwDqrlMDQ9NQvyOJw4znQ8XrYGxBUXZWLqNl/P6G7EJJ76W0anj8ucjMHRd1JV1CFFsy8F7PHE3YH0zANQmGK4DzF3wVBuU3WEacEmoZpWwPYHIh2qg7EXMJfBtjcDdrw29io0cWT36u5VBWAwqHeAgbRvvJEbG+g8qnp5ki349EDiTbQQVKbQquV7lyRWW6qgtUmcIXQ==|920 \ No newline at end of file +}//F0qhkvg0U7AgIJYC4OjOVlL1XUW/ArUD+0wl8WO1+fa7AAVJLl1lKCzoGlpMmRN1EUMTAlWx2wMVEsUwmNm2f4Fp/6R9vb2ziOawA1E7e5alaca0CieeNOi6cXxHbefXrrLYMIMJIK/cRAOc+LdpCiGg4viruq1R/qnUuhJB7itQ8ZtEJh9P+6L2oBAGYyX8PaQ7InBvHS12t8MXkeaeXcaDFffotXxelgOy9nQBMO0wWv+z/Gmbi8msuTfG++cqYpWBAUJ3AvcKOnOyuOfYrXZggFz92JdySekN1g/3tHcXnEDYGPxgCFHExggWG6yuFPppml74aJ1zScQmSRjPTzByLvHakj+N/Rk7hZVgHGUxOzBrnYtx42iEIPgB3pHq7dR3/w4Aq/Lm36toaWCL61C4HgAuFt6ozKKypdkjnLdBWLFCpz46f6EByA/+f61mO3nsv6XwmcxdXVt3Y02bKELUrO8SWyyzXwN6MN/5VBsT8M+t4sDCRLUHEpXo4jgq06KB3i66ioTau3psxrmxFVYlUOJ65ML76xaELavTYLJEp6aM8lHcKk2GMlU4vSCjQEcVnVP07WaBhHWByjtrQpPYOnSKzgRbSf6xDNA6/Ke8x9XEZxuYWvSaBlhxi6OoMqLSMBfjfNBh+JSBzEXYOon63qbzmhgoZVJvTuEciZdByuijFFQHMOy24AVAcnyhnQJoozC9RV+k/GY2yAtWnbgx9wTN0MuE+vOKQi31e3RjElYb8p43Y3cFasC4P7SR4uuihYNFGmh5pnR5Gf25g3XM0ua7kqdt4kckIRd0kpwgQ/RULr6X07AcHtkWogh5bGZnDP8HTakDiGIuruOHuGge4TKyY7In7UmHTxeglxwVu2PrxqA2RAUIUgfiJzAoXlY4+KxqCBup3Pdwe1oRsA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目工时.json b/Pages/项目/项目首页/项目首页-容器页面/项目工时.json index 218a9894..b4554d41 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目工时.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目工时.json @@ -401,7 +401,7 @@ "TableName": "View_任务工时统计", "BindingInfos": [ { - "GUID": "a8b5eb2b-da39-44c9-ab6d-03435f411bd2", + "GUID": "98b049d1-75cb-448c-90e7-8b981f211a7d", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "日期", @@ -410,7 +410,7 @@ "ColumnName": "日期" }, { - "GUID": "46bf6e90-9d56-4835-a366-42c7592d3454", + "GUID": "eb3b6117-a13b-4d88-b7f5-f4279df73170", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "总计划工时", @@ -419,7 +419,7 @@ "ColumnName": "总计划工时" }, { - "GUID": "a816aebb-6a2b-4012-8acd-af2539854a1c", + "GUID": "c848380f-0271-45e5-903d-64b338a5616d", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "总上报工时", @@ -428,13 +428,22 @@ "ColumnName": "总上报工时" }, { - "GUID": "d21a5b7b-bf3b-453e-9c21-1eb9b70cf414", + "GUID": "75c94f48-71e6-4309-9756-1bb306e88e1f", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "总核定工时", "GUID": "02533bb1-24de-4df8-b6a8-6ceec8a1fcc1" }, "ColumnName": "总实际工时" + }, + { + "GUID": "ab446f77-ce89-449c-b4d5-b82fc90430bc", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "总结算收益", + "GUID": "44955a82-4b08-4928-8c80-f7062c82a76a" + }, + "ColumnName": "总结算收益" } ], "SqlCondition": { @@ -451,11 +460,11 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "d1f0bebdcb4d4e0fac87ae67b38c5b1d", + "ID": "1926f4ac25304130a335ff4fcb1f845a", "BreakpointIdentity": "e72c8234-0634-4015-8c43-e43335247073" } ], - "ID": "257ea71a-22d4-4c1c-8bac-cb940328f187" + "ID": "8349e2e4-261a-42be-8c33-8936c1537094" }, { "Condition": { @@ -478,7 +487,7 @@ "TableName": "View_任务工时统计", "BindingInfos": [ { - "GUID": "67d71e49-923b-487a-b6b3-32b5467ddf9a", + "GUID": "7df94a30-f4dd-4387-8e3b-7ea636c1af76", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "任务ID", @@ -492,7 +501,7 @@ "ColumnName": "任务名称" }, { - "GUID": "7a59e7c1-3558-4f9b-91c9-45bdf98edc0b", + "GUID": "7a001a02-d5e3-4e20-a9a6-23d069b10840", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "总计划工时", @@ -501,7 +510,7 @@ "ColumnName": "总计划工时" }, { - "GUID": "9a12e486-0828-4cbc-a484-5d40af28d508", + "GUID": "b232142e-247d-4fe8-b991-85e4baae5f46", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "总上报工时", @@ -510,13 +519,22 @@ "ColumnName": "总上报工时" }, { - "GUID": "d81310ca-5184-4c61-abb9-296c257d262a", + "GUID": "09e191d7-eae1-4406-9285-2542b83a5658", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "总核定工时", "GUID": "d7ec7d6d-9b75-417a-8757-a5de515ea460" }, "ColumnName": "总实际工时" + }, + { + "GUID": "8b84ee64-08f8-40ed-8cf3-d2c0e9fef1f9", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "总结算收益", + "GUID": "32a6890b-ed4d-448d-9f14-5c334797fcb4" + }, + "ColumnName": "总结算收益" } ], "SqlCondition": { @@ -533,11 +551,11 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "c457b725b0594abba0854c091c080f4e", + "ID": "f7d69b849dfa4f7b82796691f8bcee80", "BreakpointIdentity": "8682d72c-871a-4ea4-a3a0-66a4a4084b0c" } ], - "ID": "0e609759-3f81-4225-ac04-20cd028c4002" + "ID": "8184993d-5086-44f1-b755-4665df15621f" }, { "Condition": { @@ -560,7 +578,7 @@ "TableName": "View_任务工时统计", "BindingInfos": [ { - "GUID": "2fc11344-1edd-4d05-bf13-ddfbd4208f1c", + "GUID": "ed16111c-503b-47ea-a69d-86a74cc3072f", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "执行人", @@ -573,7 +591,7 @@ "ColumnName": "执行人" }, { - "GUID": "9dbc6442-dd1d-46f8-818e-ebcf81523713", + "GUID": "27f3043a-175f-4d1d-862f-a181046ae9ee", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "总计划工时", @@ -582,7 +600,7 @@ "ColumnName": "总计划工时" }, { - "GUID": "1700762b-810f-4334-9213-0543afc70cba", + "GUID": "d50f1776-d420-4c21-9596-9c2436729e99", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "总上报工时", @@ -591,13 +609,22 @@ "ColumnName": "总上报工时" }, { - "GUID": "60d862c3-cbc6-4380-9324-41a8fae4ee28", + "GUID": "b050efa6-81a6-4f0a-bd19-9928e31b67a7", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "总核定工时", "GUID": "0e51eedc-dab5-4e3f-8ad7-b9d0dd7df5df" }, "ColumnName": "总实际工时" + }, + { + "GUID": "f835b406-44d4-4f83-9b8e-25dcd8b7e2a6", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "总结算收益", + "GUID": "10153a7c-4f46-4a17-a9af-42a64284bdf7" + }, + "ColumnName": "总结算收益" } ], "SqlCondition": { @@ -613,11 +640,11 @@ } } }, - "ID": "f86e0e7ebfd4449aa182899089ae20ab", + "ID": "4b1f3c74533c462dbc2de7b982793c3c", "BreakpointIdentity": "ba69e568-2a81-4c36-af1a-140a8b308e0c" } ], - "ID": "f968a6af-9897-4eed-981b-182c07bfe3c4" + "ID": "e39b66d1-4377-4553-b9fc-32bdef1e9f6e" } ], "BreakpointIdentity": "b4250f0b-7b0c-400e-9f99-bb76d90009a8" @@ -651,7 +678,6 @@ "columnSetting": { "$type": "ElementUI.ColumnSettingBase, ElementUI", "label": "日期", - "formatStr": "yyyy年MM月dd日", "colStyle": { "formatString": "yyyy年MM月dd日", "horizontalAlignment": 1 @@ -794,7 +820,6 @@ "FGC_Anonymous" ], "label": "日期", - "formatStr": "yyyy年MM月dd日", "colStyle": { "formatString": "yyyy年MM月dd日", "horizontalAlignment": 1 @@ -1000,4 +1025,4 @@ "Formula": "项目工时!$B$6" } ] -}//efCcsKmtF1smXpBySVlnutTSr8ODIyi+D8zmEG1a+C3H6egC2pS++RCgmitTRZ60D3YGKzhurLCvm7UH2Q44A/7IbBtKhbnZgoRXJ1iOMYntdLI3mFEEw5RklbHhfc9jCx1RM/1SzcwXyiR4qpImwEijeinyF9ehlknt2A2Ntr5s+4XWENO9iYhhvGwYjj9ZuFq9wsLTIK4Ory1dTKEhEcmW/n8hNsmId5RKOf2/aRq38B/Ub1xkuoj+jjkIvW9/R6d2Jgu7Yd/hVui6oStcmQzOdj+23XxH7FjV6WKZS256y+pfFMTkiee/2P/hUjNN3csmGLUE6MCArasRELRk8hzpAjfrj/Rof7gL2f6oXoip0j8Wqy/K58w5Hjwv6SMP6EfLwD8T2hUH9et0iIXk9Gbmd8IblRtcwNFwLdO46UehdQdVNEKuGvHIH1YSOdbqTkJzvIAMEvU1jblXfXuT3AR27g94We6umxeYTPOo6hJsHC5l8Un1UjcHV80DxTDtC+0O05hQLHOWlJ3DubsTBTQZ0BNAWWGQjxNzU37SZkvzYE4Q3PXFG5e3GSSkLNS7bO7uKjQncE9OE21HmCeToFP8hjfCZY6Yiny/Q4JUkYdGy8jHKrZ76jVDDQrf4sHggVrDf/Xl/diidY+iIyJg0tzEEmqp9ClotoLVX9EuQekSCWqdjP4FhsSZC/WQyEgVNuU6lNNJE9rJYiLNMex8Gah63UMkF1+lBnh1kT/Wm52dKX7lwJ4Mjf9vS9OQRp/J24GEB1BxZJAKS0TxLOUy+F07DhpSXJto7qFSXE9CHLTijhhekGaw/mD3DWazPACwo0NOzxypqtNDqMCYdhxO0HB4ndmReQWUUMZxGMao9rrGFz5snR05bv0RXrjUBnWTsKUGrDbdvE4+Jf3AKfQMvg==|920 \ No newline at end of file +}//Z4iZhELHeBFPz4isJaMqo0kM45rRAPNacnwoSkgZ9q5CMShA9rp2bIyT7LAQzspUM9c7im8tj9btG3GKB8XYxIdUxhtwMG4AC9hAj84gJpu/SyxIZyejDp6uUopGk31XgWJpHxRopXXiVGvV3WSZehs28q03mUrH+CQYPid1g/xGNvicX5f1x4YqjpnqpINXEBpSpzzy+maUbVMYdTU97cSeuxtWGs4ynbUFdgqHrrTUULY994MmQml7NRXoVhcqd0cMPug3e1zpWOEG+1GiIJ4fvEHiQqZtV9yAN6ViekFlPd5c0038YyMfx88VdfxqGHNIFKoE3SnKXuvwSAKppiTfZUDgKXx6qBDDgKZWweAvGzL5VjJx5OkUX5cfo9wMpRdGobVKOjRzECP3HGCNkMScwBfyQxzkx1XBjITAneaM+85n3FrtdLmjBpsAMKjNhwIaN0ySSQMFjgBquH2baSAfVEknA1ItT89N3/o8kfO2hGpNBqGhmatfIMiwUa3GiJdEDi5o1hS+/KyRQhIO4Bo2Q5Nc6716em5fYXF75ps+yeZg4Cm4y4SISUXNwbmDWsM/P5qRsQbkPP5kxnoKnUEO5f4hGYBPhM79ltU7qZ9chSt4cbKncEpbrqicDQ5l644yF2oS6Ird88MhQuNwXgSkC6Ylln44WeSZgo+/do21x9+BtUZuz/UQ15nSd3BdKzacniCVQmmZNlMj2WjdR8SHyp97iIc5OWFwNCBnO/jj5nQFVG0C+d2VzDT8/sQ/+KNRTacGK9EqzwjujsPAsZ08sk6iKBj4AzgurcY+tePtiRwdF+VPnM/VwJYdsdr89oACUEvWYIyZhlYrrA9k12kwB0lXeaJO0+8o+PSHC5MDSTAp7gNDcDK2IilswMo1wNKrwbDarHimpO2abF4sOw==|920 \ No newline at end of file diff --git a/ServerCommands/工时/删除任务成员所有工时.json b/ServerCommands/工时/删除任务成员所有工时.json index a8696855..57761d4b 100644 --- a/ServerCommands/工时/删除任务成员所有工时.json +++ b/ServerCommands/工时/删除任务成员所有工时.json @@ -59,8 +59,7 @@ "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", "TableName": "任务工时表", "UpdateType": "delete", - "ShowConfirm": true, - "ConfirmText": "您确定要删除吗？", + "ShowConfirm": false, "RowsToUpdate": 1, "RowsToUpdateCondition": { "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", @@ -98,10 +97,48 @@ "ColumnBindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", - "ColumnName": "请款单ID", - "GUID": "2d5d78b4-4e8f-49d4-bad1-fd379bcc7a70" + "ColumnName": "结算状态", + "GUID": "dd4d38ae-2abc-4e45-aa16-c0a5786fee05" }, - "Value": "%Null%" + "Value": "0" + }, + { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": { + "$type": "System.Collections.Generic.List`1[[ForguncyDataAccess.ISqlCondition, ForguncyDataAccess]], System.Private.CoreLib", + "$values": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "任务工时表", + "ColumnName": "请款单ID", + "GUID": "3d48c5d7-1cc3-4c26-9fc1-3471b883eb6b" + }, + "Value": "%Null%", + "LeftBracket": 1 + }, + { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 8, + "ColumnBindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "任务工时表", + "ColumnName": "请款单ID", + "GUID": "b3a24aac-8f6c-4acf-8c1e-d8fd74540dfd", + "RelationBinding": { + "$type": "ForguncyDataAccess.RelationBinding, ForguncyDataAccess", + "RelatedTable": "收益请款单表", + "RelatedColumn": "ID", + "DisplayColumn": "状态" + } + }, + "Value": "0,4", + "RightBracket": 1 + } + ] + }, + "RelationType": 1 } ] } @@ -115,5 +152,9 @@ "BreakpointIdentity": "74a3d2a3-8944-47dc-90e4-35bd1771bfd5" } ] + }, + "ReturnProperties": { + "$type": "System.Collections.Generic.List`1[[Forguncy.SaveLoad.ReturnPropertySaveData, ServerDesignerCommon]], System.Private.CoreLib", + "$values": [] } } \ No newline at end of file diff --git a/ServerCommands/收益/修改请款单状态.json b/ServerCommands/收益/修改请款单状态.json index 527053c5..d9c6d6f1 100644 --- a/ServerCommands/收益/修改请款单状态.json +++ b/ServerCommands/收益/修改请款单状态.json @@ -58,42 +58,130 @@ "$type": "System.Collections.Generic.List`1[[GrapeCity.Forguncy.Commands.Command, Forguncy.Commands]], System.Private.CoreLib", "$values": [ { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "收益请款单表", - "ShowConfirm": false, - "RowsToUpdate": 1, - "RowsToUpdateCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", - "TableName": "收益请款单表", - "ColumnName": "ID", - "GUID": "2501bb5e-e844-4676-a3ba-69207840f98c" + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "请款单状态", + "TableValue": { + "$type": "Forguncy.Model.Commands.ParameterTableValue, ServerDesignerCommon", + "TableName": "请款单状态", + "TableValueType": 1, + "BindingInfos": { + "$type": "System.Collections.Generic.List`1[[Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon]], System.Private.CoreLib", + "$values": [ + { + "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", + "GUID": "642f7fb7-088d-48bf-a1e4-335f6362ff28", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "请款单状态", + "ColumnName": "结算状态", + "GUID": "7c799836-e870-43e8-b15f-de46266a5426" + }, + "ColumnName": "结算状态" + } + ] }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=ID" - } + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "请款单状态", + "ColumnName": "状态码", + "GUID": "4d6d5589-47e1-4be3-80b2-1b306f6bfe35" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=状态码" + } + }, + "TopCount": "1" }, - "UpdateBindingValues": { - "$type": "System.Collections.Generic.List`1[[Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon]], System.Private.CoreLib", + "ID": "5b0e643727dd49d1a8e94e00fb874c84", + "BreakpointIdentity": "3b175375-9961-4d2d-9f5b-7de90dd68e01" + }, + { + "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", + "CommandList": { + "$type": "System.Collections.Generic.List`1[[GrapeCity.Forguncy.Commands.Command, Forguncy.Commands]], System.Private.CoreLib", "$values": [ { - "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", - "BindingInfo": { - "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", - "TableName": "收益请款单表", - "ColumnName": "状态", - "GUID": "13d2a7e9-534e-48d8-ba87-4b4eed539d72" + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "收益请款单表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "收益请款单表", + "ColumnName": "ID", + "GUID": "2501bb5e-e844-4676-a3ba-69207840f98c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ID" + } }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=状态码" - } + "UpdateBindingValues": { + "$type": "System.Collections.Generic.List`1[[Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon]], System.Private.CoreLib", + "$values": [ + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "收益请款单表", + "ColumnName": "状态", + "GUID": "36aa58b3-6ba9-451b-98d4-1a3d06c1b510" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=状态码" + } + } + ] + }, + "BreakpointIdentity": "3b34b54b-3b62-4c03-9fd8-c1198c2c9202" + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务工时表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "任务工时表", + "ColumnName": "请款单ID", + "GUID": "bd21c8e9-9b43-476d-974f-aca5b50f2c4c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ID" + } + }, + "UpdateBindingValues": { + "$type": "System.Collections.Generic.List`1[[Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon]], System.Private.CoreLib", + "$values": [ + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "任务工时表", + "ColumnName": "结算状态", + "GUID": "50ba76b4-4c0e-4bac-b25c-8e2e5a54a23c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=请款单状态.结算状态" + } + } + ] + }, + "BreakpointIdentity": "e495571b-c94d-4574-a492-566315fd2a82" } ] }, - "BreakpointIdentity": "445598dc-996e-4b8d-8c41-9d8e2d648ce7" + "BreakpointIdentity": "ff477b79-9dcf-481c-8964-2e495b23179d" }, { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", @@ -102,5 +190,9 @@ "BreakpointIdentity": "49f80f76-4037-4959-959a-296e08465806" } ] + }, + "ReturnProperties": { + "$type": "System.Collections.Generic.List`1[[Forguncy.SaveLoad.ReturnPropertySaveData, ServerDesignerCommon]], System.Private.CoreLib", + "$values": [] } } \ No newline at end of file diff --git a/ServerCommands/收益/生成请款单.json b/ServerCommands/收益/生成请款单.json index 4e51eef8..7a904ff3 100644 --- a/ServerCommands/收益/生成请款单.json +++ b/ServerCommands/收益/生成请款单.json @@ -84,27 +84,22 @@ } }, { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 8, "ColumnBindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", - "ColumnName": "请款单ID", - "GUID": "41644b02-e8c5-4634-96f6-1616c9d0c862", - "RelationBinding": { - "$type": "ForguncyDataAccess.RelationBinding, ForguncyDataAccess", - "RelatedTable": "收益请款单表", - "RelatedColumn": "ID", - "DisplayColumn": "状态" - } + "ColumnName": "结算状态", + "GUID": "59f8c5e2-b35a-406b-b715-9e804ab9adde" }, - "Value": "3" + "Value": "1,2" } ] } }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "1b38663c741e4c80b35bb33e3ddab8bb", + "ID": "0cbf0040eca6470b87adc17a0fe04788", "BreakpointIdentity": "b6343893-72b8-42f1-8f81-52a7a06d4197" }, { @@ -140,7 +135,7 @@ "$values": [ { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "1109b241-d64f-4792-bfd1-c06789ba19cc", + "GUID": "5cd2fc48-d30f-46d0-833b-12c64e1d3e03", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", @@ -151,7 +146,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "98348e66-1ee5-41b9-8d21-bc3868affc57", + "GUID": "50da4e08-4f06-4c17-b406-9d84016f0cfb", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", @@ -183,27 +178,20 @@ }, { "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "CompareType": 1, "ColumnBindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", - "ColumnName": "请款单ID", - "GUID": "28af211f-ae74-4d36-afd4-e7da082d8641", - "RelationBinding": { - "$type": "ForguncyDataAccess.RelationBinding, ForguncyDataAccess", - "RelatedTable": "收益请款单表", - "RelatedColumn": "ID", - "DisplayColumn": "状态" - } + "ColumnName": "结算状态", + "GUID": "422fe7a2-c2e6-45b7-851f-79a748033da6" }, - "Value": "3" + "Value": "0" } ] } }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "794f11011baf441783bb35a099e423b0", + "ID": "4c6a056f1ed54f11a37fa30f4d108742", "BreakpointIdentity": "34bbe0d9-71af-4a22-9658-f92c70d9d5b7" }, { @@ -247,7 +235,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "收益请款单表", "ColumnName": "请款日期", - "GUID": "a5252ab5-9b38-49b9-933b-e7bd2d2c2592" + "GUID": "76452b47-3376-45f0-a050-7c24ad7a1539" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -260,7 +248,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "收益请款单表", "ColumnName": "请款人", - "GUID": "93ec8708-69e5-4232-93e9-73e4c1fd701b" + "GUID": "3c028b50-9026-47ce-af7c-3f84af77e084" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -273,7 +261,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "收益请款单表", "ColumnName": "请款金额", - "GUID": "0983c1aa-ca3a-444c-8f2d-8801ee4e0464" + "GUID": "11aa2e56-0ae2-4590-b0b0-ef6b3a900449" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -286,7 +274,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "收益请款单表", "ColumnName": "状态", - "GUID": "3bb31ae2-9852-4f46-9c29-fcd9cf6418f4" + "GUID": "394a4a30-5054-4773-83f2-6abb62983242" }, "Value": "0" } @@ -323,12 +311,22 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", "ColumnName": "请款单ID", - "GUID": "518b6df6-f9a0-4c90-866e-dcb41a81a238" + "GUID": "60a3d5cb-60f2-4430-b76d-c52a5910c637" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=请款单.ID" } + }, + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "任务工时表", + "ColumnName": "结算状态", + "GUID": "eb45fbe5-a199-4274-8368-949bbcd828fa" + }, + "Value": "0" } ] }, @@ -359,7 +357,7 @@ } ] }, - "ID": "d58d8c29-f050-43ac-9219-4fc3003770a3" + "ID": "f03b6740-e680-4acc-9725-1426fb74a7e9" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -383,7 +381,7 @@ } ] }, - "ID": "65b99a0a-42e7-49c3-9df0-b5931382012b" + "ID": "75a1d95a-61b3-4aed-abbd-1efa75aa3319" } ] }, @@ -391,7 +389,7 @@ } ] }, - "ID": "8f8cd807-57e9-4060-a649-3601f16a6ad1" + "ID": "90c16c12-11f9-491f-902b-2de25c4fdf89" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -415,7 +413,7 @@ } ] }, - "ID": "88ad7c70-64db-4129-99b5-d17cc6fd9765" + "ID": "0e50837f-c87e-4084-876c-107530bc6556" } ] }, diff --git a/Tables/字典表/工时结算状态.json b/Tables/字典表/工时结算状态.json new file mode 100644 index 00000000..f83ee333 --- /dev/null +++ b/Tables/字典表/工时结算状态.json @@ -0,0 +1,60 @@ +{ + "Name": "工时结算状态", + "Columns": [ + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "Required": true, + "Unique": true, + "AutoIncrement": true, + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "ID", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "状态码", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "结算状态", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "Name": "FGC_Creator" + }, + { + "$type": "Forguncy.SaveLoad.DateExtraBingingColumnSaveData, ServerDesignerCommon", + "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "Name": "FGC_CreateDate" + }, + { + "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "Name": "FGC_LastModifier" + }, + { + "$type": "Forguncy.SaveLoad.DateExtraBingingColumnSaveData, ServerDesignerCommon", + "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "Name": "FGC_LastModifyDate" + } + ], + "ExternalDatabaseInfo": { + "DataBaseType": "6db454c0-531c-4395-9122-921a18942902", + "AllowModifySchema": true, + "ConnectionId": "业务表", + "SourceTableName": "工时结算状态", + "SourceTableSchema": "dbo" + }, + "PrimaryKey": [ + "ID" + ], + "Indexes": [] +} \ No newline at end of file diff --git a/Tables/工时/View_任务工时统计.json b/Tables/工时/View_任务工时统计.json index bd0e9370..8fb97399 100644 --- a/Tables/工时/View_任务工时统计.json +++ b/Tables/工时/View_任务工时统计.json @@ -122,6 +122,13 @@ "Name": "核定收益", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "float", + "MaxLength": -1, + "Name": "结算收益", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", "AggregateFunction": 4, @@ -188,6 +195,18 @@ "DataColumnName": "可核定工时", "Name": "总剩余工时", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "结算收益", + "GUID": "ab7a33e4-b67f-4293-b528-f83d2a689702" + }, + "AggregateFunction": 4, + "DataColumnName": "结算收益", + "Name": "总结算收益", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" } ], "ExternalDatabaseInfo": { @@ -196,7 +215,7 @@ "ConnectionId": "业务表", "SourceTableName": "View_任务工时统计", "SourceTableSchema": "dbo", - "CreateViewSql": "WITH c1 as (\r\n\tSELECT\r\n\t t.[ID],\r\n\t\t[项目ID],\r\n\t\t[任务ID],\r\n\t\t[执行内容],\r\n\t\t[执行人],\r\n\t\t[工时日期],\r\n\t\t[时薪单价],\r\n\t\t[提成系数],\r\n\t\t[请款单ID],\r\n\t\tISNULL([上报工时],0) AS 上报工时,\r\n\t\tROUND(CASE WHEN [工时类型] = '计划' THEN ISNULL([工时],0) ELSE 0 END,1) AS [计划工时],\r\n\t\tROUND(CASE WHEN [工时类型] = '实际' THEN ISNULL([工时],0) ELSE 0 END,1) AS [实际工时]\r\n\tFROM \r\n\t\t[dbo].[任务工时表] t\r\n\tLEFT JOIN [项目表] p ON t.项目ID = p.ID\r\n)\r\n\r\nSELECT\r\n cast(c1.[工时日期] as date) as 日期,\r\n\t\tc1.[执行人],\r\n c1.[项目ID],\r\n\t\txm.[项目名称],\r\n c1.[任务ID],\r\n\t\trw.[任务名称],\r\n\t\trw.[任务说明],\r\n\t\tSTRING_AGG(c1.[执行内容], CHAR(13) + CHAR(10)) AS 执行内容,\r\n\t\tFGC_Creator='Administrator',\r\n AVG(c1.[时薪单价]) AS 时薪单价,\r\n AVG(c1.[提成系数]) AS 提成系数,\r\n SUM(c1.[计划工时]) AS 计划工时,\r\n\t\tSUM(c1.[上报工时]) AS 上报工时,\r\n\t\tCEILING(SUM(c1.[上报工时])/8 * 10) / 10 AS 上报人天,\r\n SUM(c1.[实际工时]) AS 核定工时,\r\n\t\tCEILING(SUM(c1.[实际工时])/8 * 10) / 10 AS 核定人天,\r\n SUM(c1.[实际工时]*c1.[时薪单价] *c1.[提成系数]) as 核定收益\r\nFROM c1\r\nLEFT JOIN [项目表] xm ON c1.[项目ID] = xm.ID\r\nLEFT JOIN [任务表] rw ON c1.[任务ID] = rw.ID\r\nGROUP BY\r\ncast([工时日期] as date),\r\nc1.[执行人],\r\nc1.[项目ID],\r\nxm.[项目名称],\r\nrw.[任务说明],\r\nc1.[任务ID],\r\nrw.[任务名称]", + "CreateViewSql": "WITH c1 as (\r\n\tSELECT\r\n\t t.[ID],\r\n\t\t[项目ID],\r\n\t\t[任务ID],\r\n\t\t[执行内容],\r\n\t\t[执行人],\r\n\t\t[工时日期],\r\n\t\t[时薪单价],\r\n\t\t[提成系数],\r\n\t\t[请款单ID],\r\n\t\tISNULL([上报工时],0) AS 上报工时,\r\n\t\tROUND(CASE WHEN [工时类型] = '计划' THEN ISNULL([工时],0) ELSE 0 END,1) AS [计划工时],\r\n\t\tROUND(CASE WHEN [工时类型] = '实际' THEN ISNULL([工时],0) ELSE 0 END,1) AS [实际工时],\r\n\t\tCASE [结算状态]\r\n\tWHEN 2 THEN 1\r\n\tELSE 0\r\nEND AS 是否结算\r\n\r\n\tFROM \r\n\t\t[dbo].[任务工时表] t\r\n\tLEFT JOIN [项目表] p ON t.项目ID = p.ID\r\n)\r\n\r\nSELECT\r\n cast(c1.[工时日期] as date) as 日期,\r\n\t\tc1.[执行人],\r\n c1.[项目ID],\r\n\t\txm.[项目名称],\r\n c1.[任务ID],\r\n\t\trw.[任务名称],\r\n\t\trw.[任务说明],\r\n\t\tSTRING_AGG(c1.[执行内容], CHAR(13) + CHAR(10)) AS 执行内容,\r\n\t\tFGC_Creator='Administrator',\r\n AVG(c1.[时薪单价]) AS 时薪单价,\r\n AVG(c1.[提成系数]) AS 提成系数,\r\n SUM(c1.[计划工时]) AS 计划工时,\r\n\t\tSUM(c1.[上报工时]) AS 上报工时,\r\n\t\tCEILING(SUM(c1.[上报工时])/8 * 10) / 10 AS 上报人天,\r\n SUM(c1.[实际工时]) AS 核定工时,\r\n\t\tCEILING(SUM(c1.[实际工时])/8 * 10) / 10 AS 核定人天,\r\n\t\tSUM(c1.[实际工时]*c1.[时薪单价] *c1.[提成系数]) AS 核定收益,\r\n SUM(c1.[实际工时]*c1.[时薪单价] *c1.[提成系数]*c1.[是否结算]) AS 结算收益\r\nFROM c1\r\nLEFT JOIN [项目表] xm ON c1.[项目ID] = xm.ID\r\nLEFT JOIN [任务表] rw ON c1.[任务ID] = rw.ID\r\nGROUP BY\r\ncast([工时日期] as date),\r\nc1.[执行人],\r\nc1.[项目ID],\r\nxm.[项目名称],\r\nrw.[任务说明],\r\nc1.[任务ID],\r\nrw.[任务名称]", "ViewInfo": { "ViewName": "View_任务工时统计", "IsUpdatable": true, diff --git a/Tables/工时/任务工时表.json b/Tables/工时/任务工时表.json index 166da1ae..d5782162 100644 --- a/Tables/工时/任务工时表.json +++ b/Tables/工时/任务工时表.json @@ -121,7 +121,7 @@ "日期文本": 5, "时薪单价": 5, "时薪来源": 5, - "是否请款": 5, + "结算状态": 5, "行数": 5, "请款单ID": 5, "项目ID": 5, @@ -157,7 +157,7 @@ "日期文本": 5, "时薪单价": 5, "时薪来源": 5, - "是否请款": 5, + "结算状态": 5, "行数": 5, "请款单ID": 5, "项目ID": 5, @@ -193,7 +193,7 @@ "日期文本": 5, "时薪单价": 5, "时薪来源": 5, - "是否请款": 5, + "结算状态": 5, "行数": 5, "请款单ID": 5, "项目ID": 5, @@ -300,6 +300,14 @@ "Name": "提成系数", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DefaultValue": 0, + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "结算状态", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "bigint", @@ -326,12 +334,6 @@ "Name": "预算收益", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, - { - "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", - "Formula": "IF(ISBLANK([请款单ID]),0,1)", - "Name": "是否请款", - "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" - }, { "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", "BindingInfo": { @@ -414,6 +416,13 @@ "ForeignTable": "任务工时表", "ForeignColumn": "请款单ID", "IsDetailTableRelation": true + }, + { + "PrimaryTable": "工时结算状态", + "PrimaryColumn": "状态码", + "ForeignTable": "任务工时表", + "ForeignColumn": "结算状态", + "IsDetailTableRelation": true } ], "Indexes": [] diff --git a/Tables/收益/请款单状态.json b/Tables/收益/请款单状态.json index fda73be3..6fb802c1 100644 --- a/Tables/收益/请款单状态.json +++ b/Tables/收益/请款单状态.json @@ -25,6 +25,13 @@ "Name": "状态", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "结算状态", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",