From 14bb1159e230689d64dd44a537467027cf38c104 Mon Sep 17 00:00:00 2001 From: cuckooent Date: Tue, 8 Oct 2024 16:41:17 +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=E5=B7=A5?= =?UTF-8?q?=E6=97=B6=E7=BB=9F=E8=AE=A1"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 12 +--- Pages/工时/项目工时统计.json | 136 +++++++++++++++++++---------------- 2 files changed, 76 insertions(+), 72 deletions(-) diff --git a/.collaboration b/.collaboration index 103a3e8b..a921d984 100644 --- a/.collaboration +++ b/.collaboration @@ -2462,16 +2462,6 @@ }, { "ModuleName": "PCPage/项目工时统计", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-08T16:39:45.5626506+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\工时\\项目工时统计.json", - "Pages\\工时\\项目工时统计.rd" - ] + "ModuleType": 1 } ] \ No newline at end of file diff --git a/Pages/工时/项目工时统计.json b/Pages/工时/项目工时统计.json index 11754f4c..b70ad19f 100644 --- a/Pages/工时/项目工时统计.json +++ b/Pages/工时/项目工时统计.json @@ -231,7 +231,7 @@ "1,1": "成员", "1,13": "日期", "1,40": "导出原始数据", - "17,7": "执行人" + "17,17": "执行人" }, "Formulas": { "21,1": "EOMONTH(P2,-1)+1", @@ -319,6 +319,7 @@ "1,15": { "CellType": { "$type": "ElementUI.DatePickerCellType, ElementUI", + "CommandList": [], "UIPermissions": [ { "Scope": 2, @@ -385,15 +386,6 @@ "PivotTableSetting": { "SelectedListViewName": "工时记录导出", "Rows": [ - { - "DatabaseColumnName": "执行人", - "DisplayName": "执行人", - "ColumnCell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!H19" - }, - "BackgroundValue": {} - }, { "DatabaseColumnName": "项目名称", "DisplayName": "项目名称", @@ -414,7 +406,16 @@ "DisplayName": "任务名称", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!J19" + "SerializeProperty": "=项目工时统计!H19" + }, + "BackgroundValue": {} + }, + { + "DatabaseColumnName": "执行人", + "DisplayName": "执行人", + "ColumnCell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时统计!R19" }, "BackgroundValue": {} } @@ -425,17 +426,18 @@ "DisplayName": "上报工时", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!Q19" + "SerializeProperty": "=项目工时统计!O19" }, "Aggregator": 0, - "TotalAggregator": 0 + "TotalAggregator": 0, + "BackgroundValue": {} }, { "DatabaseColumnName": "核定工时", "DisplayName": "核定工时", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!N19" + "SerializeProperty": "=项目工时统计!L19" }, "Aggregator": 0, "TotalAggregator": 0, @@ -461,35 +463,35 @@ "DatabaseColumnName": "执行人", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!H19" + "SerializeProperty": "=项目工时统计!R19" } }, { "DatabaseColumnName": "任务名称", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!J19" + "SerializeProperty": "=项目工时统计!H19" } }, { "DatabaseColumnName": "执行内容", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!L19" + "SerializeProperty": "=项目工时统计!J19" } }, { "DatabaseColumnName": "核定工时", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!N19" + "SerializeProperty": "=项目工时统计!L19" } }, { "DatabaseColumnName": "上报工时", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!Q19" + "SerializeProperty": "=项目工时统计!O19" } } ], @@ -640,6 +642,38 @@ } }, "18,7": { + "NameUsedInJavaScript": "任务名称", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "任务名称", + "GUID": "afb9caf7-f991-4227-b161-81870d0ebabf" + } + }, + "18,9": { + "NameUsedInJavaScript": "执行内容", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "执行内容", + "GUID": "c80af3e4-f582-44b4-b666-8c4f2a65ad9d" + } + }, + "18,11": { + "NameUsedInJavaScript": "核定工时", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "核定工时", + "GUID": "901bde3d-3616-4efb-adfa-3adfbdeabcf5" + } + }, + "18,14": { + "NameUsedInJavaScript": "上报工时", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "上报工时", + "GUID": "ac0c7db2-a585-46ad-a59c-47e86ea236c3" + } + }, + "18,17": { "NameUsedInJavaScript": "执行人", "BindingInfo": { "TableName": "View_任务工时统计", @@ -651,36 +685,12 @@ } } }, - "18,9": { - "NameUsedInJavaScript": "任务名称", + "18,19": { + "NameUsedInJavaScript": "日期", "BindingInfo": { "TableName": "View_任务工时统计", - "ColumnName": "任务名称", - "GUID": "afb9caf7-f991-4227-b161-81870d0ebabf" - } - }, - "18,11": { - "NameUsedInJavaScript": "执行内容", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "执行内容", - "GUID": "c80af3e4-f582-44b4-b666-8c4f2a65ad9d" - } - }, - "18,13": { - "NameUsedInJavaScript": "核定工时", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "核定工时", - "GUID": "901bde3d-3616-4efb-adfa-3adfbdeabcf5" - } - }, - "18,16": { - "NameUsedInJavaScript": "上报工时", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "上报工时", - "GUID": "ac0c7db2-a585-46ad-a59c-47e86ea236c3" + "ColumnName": "日期", + "GUID": "e0c006fd-0996-469c-9df0-73ca9451cb1b" } } }, @@ -740,8 +750,9 @@ "17,13": 0, "17,14": 0, "17,15": 0, - "17,20": 3, - "17,21": 3, + "17,16": 0, + "17,17": 0, + "17,18": 0, "17,22": 3, "17,23": 3, "17,24": 3, @@ -774,8 +785,9 @@ "18,13": 0, "18,14": 0, "18,15": 0, - "18,20": 3, - "18,21": 3, + "18,16": 0, + "18,17": 0, + "18,18": 0, "18,22": 3, "18,23": 3, "18,24": 3, @@ -813,21 +825,23 @@ "19,1,2,43", "1,40,1,4", "18,1,1,3", - "18,7,1,2", "18,4,1,3", + "21,1,1,3", + "21,4,1,3", + "18,7,1,2", "18,9,1,2", - "18,11,1,2", - "18,13,1,3", + "18,11,1,3", + "18,14,1,3", + "18,17,1,2", "17,1,1,3", "17,4,1,3", "17,7,1,2", "17,9,1,2", - "17,11,1,2", - "17,13,1,3", - "21,1,1,3", - "21,4,1,3", - "18,16,1,3", - "17,16,1,3" + "17,11,1,3", + "17,14,1,3", + "17,17,1,2", + "18,19,1,3", + "17,19,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -867,4 +881,4 @@ "Formula": "项目工时统计!$E$22" } ] -}//4yM9uBmgLzc06e7D3B9epYbkMUgocBqdYlyyVyqipOp6IcHjXAPTneViqSXaHqV7U/B2/i3DoJO0JMnKuppNQNV18R6qF4gPEjdVXwXsyfetUuV2vflgY3M4CfR2NRyVI8YnGlY0gTGwmWumpTwN6OMMZlsxih4kVTzbwiAu3aUG/Dip4iTWJuCkgdPFxAiq/3OIWLyt0lF4BafdcQeBRCaH2yermUS7XONR7MBtBG0MfsUOjYVWqoP6xhf+kq2z/SNmFcUBTFsxyvFfgT6oqSGPpNhKX3KQu+b7zV0NDfxJGXQaMu+Z55uIbmBOBkLyFqILz40LbLH5BFXkmVvCMdQMAAMTJAxTr/K85z0noQU2MtA/PtDo0o5JagtRfN5QP18s1ljnc6cu6ZRZ6LgZ3ZcDY7vVXFFEiz8G+Ns4ZO3peARhS1F698Y3EgVA3uGgaXzht+P0xnBIDWFDDRgcxvoBdJlWUZ+Yjf71M3GI1wtO8iAH2jyf5k7lKxFMX1LkdquNQuMObvM0Exf88GyMlmuaBXayCyGNhzE6eiWhduCYqH31SufoaL6doa2Q/FeNYoRs+TKz4aZlZb2Lg/Ogki2Srue2Mb4CCdPFpJTOH/y6tS+BEFf+9NCHBtxBaLtgsat0GlaamKcLtbt6/QgnE4ycZg+gD1f/o25KRc78vp4St/Rb2MYmSsjBzU+9WK3RWKZ4C7cST27UZto8x8+CsQMoLF1qxyyiadvhEp/EZ80SG02NhAAdwY7XFVoaiRui8kAteYK/56hiKGTaaMhsAj6rJXr/USfle1bHxkKE4GQS3ZBZaWCqiTVkJx68h0FCpX3ODaPcAdrGJYto2liaV81SJJtjq8WwK6oQUwvkGQdNaQEqW06QrzDTXLBLh1OwE0MBrf4BjZlySVLJ3h94rQ==|920 \ No newline at end of file +}//TqqgG75qui4GWMiZqnt2/eNxn4EfBLt6oFSwAfBbxXtxLA75VmBQIIL3OkzHsra8nmPSFYMAxfSRDj4geRigLccWXiY0zKaeHEmRIgluGILqcyJ05Q3zK8JpjCHYX/Yh+GKzctiEeyOWK/LfM+6feGmVIq9zp71xLyET8XsuIR8c5cfYgBLBVd3QUeioeRd3CF4rgMe8kxZjscj4Fw/8rVKMq5UXnLQEu6Kuz7LrY1ge81Nphr8aS3lRldTQZ6lG/UnVAxQ4cRflrnR99UwmXy8MHkQFTjuG7HudHa/p8fOa7sQUm/XezD3vJ52VnQzm6A8CgccJBwT171d0S9cR2T5h33heGXaAIvqomf2+O7xp8cW9ikEOJJRn80RrjaK7iGxXapNerC9yrcnfDZMlJqW9YJ450jd/lEHAf4ddItYcM7QydeH+Uy8sbQa5H6U0oOWd/wLXzjE86n93ENkYqMAmOr9xRwEK3nvdsgiVHXJPmkeQ7naF4O998+6cJ1YFIqMnoiV1cUoCY341sELx8GAlD5olCO6grm1Ne3JM5dAUbR2uM2EgDit4TQkXeKWqur8dMQZ9U4dYxb8WmNiSNGVQ7kbE39MheWJeymruSC0x+3OtvS/flHtjNgG1ZB4JrBhna6s5QMiij3AUF0Nx5C/f3jbOhYjgU9ConBhAcs25zLqyYJhlH8WjDjymFcHZrGgxc0dsAdg47jbnHfIVZX2KSghnprEaNx4/yD1nB52hi2HGRUt12FbAy5irGSJp+fFYjsgbKdooPpzYrUPXYLIPFGpcSscpz+0jZd1I1Hgcy9DMoLfVZ1r4s47HdLMt9KQtIsJIRAPfpvUtsUgJo3JckjxYuQkomzwJCwIM5kbRqy/8KyM7jO6NOeyYopPk5PJ8MD+suEZ75YTIzyed0Q==|920 \ No newline at end of file