From bd41d627b14a89ee5e0da3e41d2042611c142673 Mon Sep 17 00:00:00 2001 From: cuckooent Date: Tue, 3 Sep 2024 12:01:08 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E9=A1=B9=E7=9B=AE=E8=BF=9B?= =?UTF-8?q?=E5=B1=95=E5=A2=9E=E5=8A=A0=E2=80=9C=E8=BF=9B=E5=BA=A6=E2=80=9D?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=9B","MessageType":2,"Modules":[{"State?= =?UTF-8?q?":1,"Type":23,"Name":"TableView/=E9=A1=B9=E7=9B=AE=E5=B9=B3?= =?UTF-8?q?=E8=A1=8C=E8=A7=86=E5=9B=BE"},{"State":1,"Type":7,"Name":"Table?= =?UTF-8?q?/=E9=A1=B9=E7=9B=AE=E8=A1=A8"},{"State":1,"Type":1,"Name":"PCPa?= =?UTF-8?q?ge/=E6=96=B0=E5=A2=9E=E8=BF=9B=E5=B1=95"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 34 +----------- .../项目首页-容器页面/项目进展/新增进展.json | 55 ++++++++++++++++--- Tables/项目/项目平行视图.json | 9 ++- Tables/项目/项目表.json | 7 +++ 4 files changed, 65 insertions(+), 40 deletions(-) diff --git a/.collaboration b/.collaboration index 0e65a7e6..dd52144a 100644 --- a/.collaboration +++ b/.collaboration @@ -294,16 +294,7 @@ }, { "ModuleName": "TableView/项目平行视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-03T11:55:51.8850866+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\项目\\项目平行视图.json" - ] + "ModuleType": 23 }, { "ModuleName": "Table/项目预算变动表", @@ -335,16 +326,7 @@ }, { "ModuleName": "Table/项目表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-03T11:54:58.5720741+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目\\项目表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Tables/字典表", @@ -648,17 +630,7 @@ }, { "ModuleName": "PCPage/新增进展", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-03T12:00:04.2997635+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目进展\\新增进展.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目进展\\新增进展.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/项目/项目首页/项目首页-容器页面/项目发布", diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目进展/新增进展.json b/Pages/项目/项目首页/项目首页-容器页面/项目进展/新增进展.json index e9868818..66a81eb3 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目进展/新增进展.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目进展/新增进展.json @@ -166,6 +166,7 @@ }, "Values": { "1,1": "状态正常", + "1,24": "项目进度", "1,33": "提交" }, "AttachInfos": { @@ -196,6 +197,35 @@ ] } }, + "1,25": { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "进度", + "GUID": "0a308d14-56db-493d-88e0-46b1bd9f4107" + }, + "CellType": { + "$type": "ElementUI.InputNumberCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "min": 0, + "max": 100, + "step": 1, + "controls": false + } + }, "1,33": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", @@ -246,30 +276,39 @@ "FontSize": 13.333333333333332 }, { - "Background": 0, - "FontFamily": 1 + "FontFamily": 0, + "FontSize": 13.333333333333332, + "TextIndent": 10, + "HorizontalAlignment": 1 + }, + { + "Background": 2, + "FontFamily": 0 } ], "Types": { "Strs": [ - "#FFFFFF00", - "Body" + "Body", + "Right", + "#FFFFFF00" ] }, "CellStyles": { "1,1": 0, + "1,24": 1, "3,1": 0, - "5,1": 1 + "5,1": 2 }, "SheetStyle": { - "FontFamily": 1 + "FontFamily": 0 } }, "Spans": [ "1,33,1,4", "5,1,1,4", "1,1,1,11", - "3,1,1,36" + "3,1,1,36", + "1,25,1,7" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -320,4 +359,4 @@ "Formula": "新增进展!$B$6" } ] -}//ixKa7P70LpVrYKhObAd8tUorNGgaqHGiWkC1vIszTmxE/+B6rWuhAVVIVnDbVvi0Z28k4DDJzTkHml5tQuX3sTFl1NHos35Qql7zimjS95H1/xOhVw/ETNHtRirVqtDHUIKcv+zje8anMduSMR3G6KVtb2CfQhrjkUWwLKFIya/mjzR5oWlZrgzr9Oqk2sEU03LcjnNyCC43QBphiqSdoqqSoEjIURXU8mmVmbcltbhReJkwGoPww6BC6TQViLJH39uGNnGDcd4krce12ARGp+2SPxcfRfVHL4rgIk4jFRbjk5Pt2MZNlpJJf69l2YY751/kLIaFul43ZHULP6ozpGhc9UDqU21qn6KX4/KRD4lLKhytc7nc6z1uJalc61xKJ/Rkuiw0sVszccXmQZNHFIQzCBE37VnjsGCtvrjcOKjJcjRY2gQ1PFvEtj4efyqqGXCLokA/rHwQ42EnonU7Ba8nUw1zD8CnMzxk7IR9tcrjXbZUJv2EhlzJWF8J3M57JX4vvC4IPO0LHzUmlCD8mpewli3NUamc2VSnZEfvQq0DW2BJujM2zspTEUetgnv+aB1sl06ThgbzHxy0bfROz4xAzi8nE0WWXL7yic6JNp/oDCjvfifAxTeARvIHhnE96JodR47SF4WTmr306zOs9Pjd0A+dxgBvLqDelbRTCzbJZb6KwnoPicCDLwGgIzETU7t3S1i03bwCHurftFhO9tmt7ljtxmbW/E/3Ch/WT0wuB7Gh3ET9D75AIs/K3CHmAUDsrpeNa/s37Rq0qFEON0cAeppvaZjrsDYWWYeevLf/huiYVidtKWPySbo3yH7pFpglclmvNB/ex1e2E6Ki3tubpthcGrnHpQHLENzuKzb+scuFwHwpgr9fUDHObG8A0bA/MASrfUqpN10OgyoEvg==|920 \ No newline at end of file +}//l8HjSMIrRG/wpGIv7yBdU9NTkF9Na0xtwgY1j1xCpmRAzACMokiSE64L/vETo3PSEpqZVgMHF+PcQLHEntsBlAmr2ECuYDQrOlH5RjAQPvfvHSsw9NzTEIekslX2zHPuuZ9OTStHJSzAeU2sMX/eZ5WF+tBQkequVlgCulxIqt2OjLECgQxKrKV/BS9v/z6BgKjO74VQUUlJjmcrJl4Uyb2kFcEp9BkN7byXyifwKTkGB1WuwgTyoYB1LaFqysNzUPHp9cr4b6Z/NYaaW3fWow0Egt60OaZsZZOdSOqea5Sn96nIaQstLx3TAufJSq1Kmab8yoyvt3tbpZJ2+NPoLhSYn8w7PMmQMANFzRKWHrqF1kD7L43rJM0B0rx3+z7nRgeKVaKwnCFr5X74YGWhX0fBGieERiw44BPXSjNP7TRvgbQxz39Gr2be/BDPNtVmU4Q0AnxUxeCQ5DykZtu6PlucTvdjBBd4HSqaBGXlTc76R3HjnNj+WVoHNYL7nt0CFjb7Bjp9j93STBKkLMQdV6R1koOKnW3/XhnyaSaRr4pfO1Gw3Ms9BSR8baNJPMp6Tbylpa1Jw3mHCyPjEVIdHjBpWcgy1xYK3IhePi6ECZkf51ZUr2u7dz/VVKn+6aX6DXPLp7v0UEN3OsUkrNTbwE9WaEd+AknEk2f/T34qBZb6iCsiB1lhRjOBdK9DLPd1Q7MqDnlOi+uhjzkpkPkVkBHIvSUxrSZTuHzNR5jqKpXOIThvN3lnHsnhfRvS/mtk2DlXJ87XNXKF1cC9ULNrCy3I64VmgXeNVxJzm2pzVKoEOlC+3ozZM3Gl8Zw6jPLzkpIcsqYEes+YWYh7RUutvxlbJMvkY30v68+wkEWPE4QPh9vz+BCiaE3YoSpJNPa36sZ20QRbsg3El82eFB3moA==|920 \ No newline at end of file diff --git a/Tables/项目/项目平行视图.json b/Tables/项目/项目平行视图.json index 09f2189e..8824a9af 100644 --- a/Tables/项目/项目平行视图.json +++ b/Tables/项目/项目平行视图.json @@ -453,6 +453,13 @@ "Name": "开启反馈收集", "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": "bigint", @@ -571,7 +578,7 @@ "ConnectionId": "业务表", "SourceTableName": "项目平行视图", "SourceTableSchema": "dbo", - "CreateViewSql": "WITH cy AS (\r\nSELECT [项目ID], STRING_AGG([项目成员], ',') AS 项目成员,count(*) AS 成员数量\r\nFROM [项目成员表]\r\nGROUP BY [项目ID]\r\n),\r\nc1 AS (\r\n SELECT\r\n p.[ID],\r\n p.[项目名称],\r\n p.[项目代号],\r\n p.[项目简介],\r\n p.[项目封面],\r\n p.[项目经理],\r\n p.[商务经理],\r\n p.[客服经理],\r\n p.[项目分组],\r\n p.[所属客户],\r\n p.[所属客户部门],\r\n p.[工时分配方式],\r\n p.[项目预算工时],\r\n p.[项目预算费用],\r\n p.[公开],\r\n p.[严格模式],\r\n p.[计划开始日期],\r\n p.[计划完成日期],\r\n p.[项目方案],\r\n p.[预算方案],\r\n p.[网络资源],\r\n p.[开启反馈收集],\r\n p.[项目状态],\r\n p.[立项流程示例ID],\r\n p.[删除],\r\n p.FGC_Creator,\r\n p.FGC_CreateDate,\r\n p.FGC_LastModifier,\r\n\t\t\t\tMAX(cy.[项目成员]) AS 项目成员,\r\n\t\t\t\tISNULL(MAX(cy.[成员数量]), 0) AS 成员数量,\r\n ISNULL(p.[项目预算工时], 0) AS 项目总分配工时,\r\n ISNULL(SUM(t.[总核定工时]), 0) AS 项目总核定工时,\r\n ISNULL(SUM(t.[本任务可核定工时]), 0) AS 项目可核定工时,\r\n ISNULL(SUM(t.[实际工时]), 0) AS 项目实际工时,\r\n\t\t\t\tISNULL(SUM(t.[已消耗成本]), 0) AS 已消耗成本\r\n FROM [dbo].[项目表] p\r\n LEFT JOIN [任务平行视图] t ON p.ID = t.[项目ID]\r\n\t\tLEFT JOIN cy ON p.ID = cy.[项目ID]\r\n GROUP BY\r\n p.[ID],\r\n p.[项目名称],\r\n p.[项目代号],\r\n p.[项目简介],\r\n p.[项目封面],\r\n p.[项目经理],\r\n p.[商务经理],\r\n p.[客服经理],\r\n p.[项目分组],\r\n p.[所属客户],\r\n p.[所属客户部门],\r\n p.[工时分配方式],\r\n p.[项目预算工时],\r\n p.[项目预算费用],\r\n p.[公开],\r\n p.[严格模式],\r\n p.[计划开始日期],\r\n p.[计划完成日期],\r\n p.[项目方案],\r\n p.[预算方案],\r\n p.[网络资源],\r\n p.[开启反馈收集],\r\n p.[项目状态],\r\n p.[立项流程示例ID],\r\n p.[删除],\r\n p.FGC_Creator,\r\n p.FGC_CreateDate,\r\n p.FGC_LastModifier\r\n)\r\nSELECT\r\n c1.*,\r\n x.项目已分配工时,\r\n c1.[项目预算工时] - x.项目已分配工时 AS 项目可分配工时\r\nFROM c1\r\nOUTER APPLY (\r\n SELECT ISNULL(SUM(t.[总分配工时]), 0) AS 项目已分配工时\r\n FROM [任务平行视图] t \r\n WHERE c1.ID = t.[项目ID] AND t.[父任务ID] IS NULL\r\n) x;", + "CreateViewSql": "WITH cy AS (\r\nSELECT [项目ID], STRING_AGG([项目成员], ',') AS 项目成员,count(*) AS 成员数量\r\nFROM [项目成员表]\r\nGROUP BY [项目ID]\r\n),\r\nc1 AS (\r\n SELECT\r\n p.[ID],\r\n p.[项目名称],\r\n p.[项目代号],\r\n p.[项目简介],\r\n p.[项目封面],\r\n p.[项目经理],\r\n p.[商务经理],\r\n p.[客服经理],\r\n p.[项目分组],\r\n p.[所属客户],\r\n p.[所属客户部门],\r\n p.[工时分配方式],\r\n p.[项目预算工时],\r\n p.[项目预算费用],\r\n p.[公开],\r\n p.[严格模式],\r\n p.[计划开始日期],\r\n p.[计划完成日期],\r\n p.[项目方案],\r\n p.[预算方案],\r\n p.[网络资源],\r\n p.[开启反馈收集],\r\n p.[进度],\r\n p.[项目状态],\r\n p.[立项流程示例ID],\r\n p.[删除],\r\n p.FGC_Creator,\r\n p.FGC_CreateDate,\r\n p.FGC_LastModifier,\r\n\t\t\t\tMAX(cy.[项目成员]) AS 项目成员,\r\n\t\t\t\tISNULL(MAX(cy.[成员数量]), 0) AS 成员数量,\r\n ISNULL(p.[项目预算工时], 0) AS 项目总分配工时,\r\n ISNULL(SUM(t.[本任务核定工时]), 0) AS 项目总核定工时,\r\n ISNULL(SUM(t.[本任务可核定工时]), 0) AS 项目可核定工时,\r\n ISNULL(SUM(t.[本任务实际工时]), 0) AS 项目实际工时,\r\n\t\t\t\tISNULL(SUM(t.[已消耗成本]), 0) AS 已消耗成本\r\n FROM [dbo].[项目表] p\r\n LEFT JOIN [任务平行视图] t ON p.ID = t.[项目ID]\r\n\t\tLEFT JOIN cy ON p.ID = cy.[项目ID]\r\n GROUP BY\r\n p.[ID],\r\n p.[项目名称],\r\n p.[项目代号],\r\n p.[项目简介],\r\n p.[项目封面],\r\n p.[项目经理],\r\n p.[商务经理],\r\n p.[客服经理],\r\n p.[项目分组],\r\n p.[所属客户],\r\n p.[所属客户部门],\r\n p.[工时分配方式],\r\n p.[项目预算工时],\r\n p.[项目预算费用],\r\n p.[公开],\r\n p.[严格模式],\r\n p.[计划开始日期],\r\n p.[计划完成日期],\r\n p.[项目方案],\r\n p.[预算方案],\r\n p.[网络资源],\r\n p.[开启反馈收集],\r\n p.[进度],\r\n p.[项目状态],\r\n p.[立项流程示例ID],\r\n p.[删除],\r\n p.FGC_Creator,\r\n p.FGC_CreateDate,\r\n p.FGC_LastModifier\r\n)\r\nSELECT\r\n c1.*,\r\n x.项目已分配工时,\r\n c1.[项目预算工时] - x.项目已分配工时 AS 项目可分配工时\r\nFROM c1\r\nOUTER APPLY (\r\n SELECT ISNULL(SUM(t.[总分配工时]), 0) AS 项目已分配工时\r\n FROM [任务平行视图] t \r\n WHERE c1.ID = t.[项目ID] AND t.[父任务ID] IS NULL\r\n) x", "ViewInfo": { "ViewName": "项目平行视图", "QueryColumns": [ diff --git a/Tables/项目/项目表.json b/Tables/项目/项目表.json index c363730a..328da7f5 100644 --- a/Tables/项目/项目表.json +++ b/Tables/项目/项目表.json @@ -546,6 +546,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.BindingColumnSaveData, ServerDesignerCommon", "DefaultValue": 1,