diff --git a/.collaboration b/.collaboration index 1c268ee1..0b8f96e3 100644 --- a/.collaboration +++ b/.collaboration @@ -17,16 +17,7 @@ }, { "ModuleName": "Table/项目表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-04T10:01:42.9579928+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目任务\\项目表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/任务表", @@ -138,17 +129,7 @@ }, { "ModuleName": "PCPage/项目列表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-04T09:57:26.4808769+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目列表.json", - "Pages\\b90932e038f94707b54e571ff7cd84d.json" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/项目首页", @@ -156,55 +137,15 @@ }, { "ModuleName": "PCPage/项目首页", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-04T12:39:45.2009027+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目首页.json" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目标题", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-04T12:33:48.4699175+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目标题.json" - ] - }, - { - "ModuleName": "Pages/项目首页/子页面", - "State": 2, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-04T10:38:35.7164467+08:00", - "ModuleType": 6, - "ToRemoveFiles": [ - "Pages\\项目首页\\子页面" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务列表", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-04T10:38:29.3378402+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\子页面\\任务列表.json" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/任务", @@ -224,17 +165,7 @@ }, { "ModuleName": "PCPage/任务-侧栏", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-04T13:02:50.2739855+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-侧栏.json", - "Pages\\9d9faa04d5a74f1dbf8dd3b2040b6f6.json" - ] + "ModuleType": 1 }, { "ModuleName": "MasterPCPage/FGC_母版页", @@ -246,20 +177,7 @@ }, { "ModuleName": "Theme", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-04T12:44:16.3259869+08:00", - "ModuleType": 9, - "ToRemoveFiles": [ - "Theme\\CellTypeStyles", - "Theme\\ListViewStyles", - "Theme\\StyleDefaultNames", - "Theme\\ThemeConfig", - "Reports\\DefaultTheme.rdlx-theme" - ] + "ModuleType": 9 }, { "ModuleName": "image/内置图片", @@ -311,17 +229,7 @@ }, { "ModuleName": "CustomLibrary", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-04T09:56:46.6143782+08:00", - "ModuleType": 12, - "ToRemoveFiles": [ - "CustomLibraries.json", - "UserFile\\BaseCss.css" - ] + "ModuleType": 12 }, { "ModuleName": "MapJsonFile", @@ -482,16 +390,7 @@ }, { "ModuleName": "ServerCommand/新增工时", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-04T10:00:20.4257394+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\新增工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "TableView/子任务视图", @@ -531,16 +430,7 @@ }, { "ModuleName": "ServerCommand/新增任务", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-04T12:47:41.2542407+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\任务\\新增任务.json" - ] + "ModuleType": 15 }, { "ModuleName": "Image/caret-down-small.svg", @@ -629,16 +519,7 @@ }, { "ModuleName": "ServerCommand/变更任务状态", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-04T12:48:34.1961665+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\任务\\变更任务状态.json" - ] + "ModuleType": 15 }, { "ModuleName": "TableView/人员工时统计视图", @@ -666,16 +547,7 @@ }, { "ModuleName": "PCPage/参与成员管理", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-04T13:01:08.199788+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\参与成员管理.json" - ] + "ModuleType": 1 }, { "ModuleName": "Image/展开.svg", @@ -723,89 +595,34 @@ }, { "ModuleName": "ServerCommand/移除任务成员", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-04T12:50:48.9406066+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\任务\\移除任务成员.json" - ] + "ModuleType": 15 }, { "ModuleName": "PCPage/项目工时", - "State": 4, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-04T10:38:09.3634775+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目工时.json", - "Pages\\57e644c056074f9d885f24a5bd7b4ae.json" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/项目首页/项目首页子页面", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-04T10:38:04.2654736+08:00", "ModuleType": 6 }, { "ModuleName": "PCPage/项目概况", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-04T10:38:53.4293906+08:00", "ModuleType": 1 }, { "ModuleName": "PCPage/项目成员统计", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-04T12:44:16.326142+08:00", "ModuleType": 1 }, { "ModuleName": "Table/项目动态", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-04T11:01:07.6760221+08:00", "ModuleType": 7 }, { "ModuleName": "TableView/View_项目统计信息", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-04T11:29:20.3269547+08:00", "ModuleType": 23 }, { "ModuleName": "PCPage/项目概况-关键数据", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-04T11:30:07.9207905+08:00", "ModuleType": 1 } ] \ No newline at end of file diff --git a/Pages/57e644c056074f9d885f24a5bd7b4ae.json b/Pages/57e644c056074f9d885f24a5bd7b4ae.json index 1077e4fc..0157d2eb 100644 --- a/Pages/57e644c056074f9d885f24a5bd7b4ae.json +++ b/Pages/57e644c056074f9d885f24a5bd7b4ae.json @@ -6,21 +6,16 @@ "DesignLengthInPixel": 10.0 } }, - "2": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 - } - }, - "5": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 - } - }, "1": { "GridRowColumnDefinition": { "DesignLengthInPixel": 26.0 } }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, "3": { "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0 @@ -30,6 +25,11 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0 } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } } }, "Count": 6, @@ -73,13 +73,13 @@ "TemplateCellSource": "执行人姓名" }, "1,8": { - "TemplateCellSource": "总提成" - }, - "3,1": { "TemplateCellSource": "总工时" }, - "4,1": { + "3,1": { "TemplateCellSource": "平均时薪" + }, + "4,1": { + "TemplateCellSource": "总提成" } }, "StyleDatas": { @@ -93,43 +93,59 @@ "Formatter": 1 }, { - "FontSize": 13.333333333333332, - "Foreground": 2, - "Formatter": 3, - "HorizontalAlignment": 4 + "FontFamily": 2 }, { - "FontFamily": 5, + "FontFamily": 2, "FontSize": 13.333333333333332, - "Foreground": 2, + "Foreground": 3, + "Formatter": 4, + "HorizontalAlignment": 5 + }, + { + "FontSize": 13.333333333333332, + "Foreground": 3, "Formatter": 6, - "HorizontalAlignment": 4 + "HorizontalAlignment": 5 } ], "Types": { "Strs": [ "#FFFF0000", - "¥#,##0_);[Red](¥#,##0)", - "Text 1 50", - "\"总工时:\"0.0\"小时\"", - "Left", + "0.0\"小时\"", "Body", - "\"平均时薪:\" ¥#,##0.00_)" + "Text 1 50", + "\"平均时薪:\"¥#,##0.00_)", + "Left", + "\"预计收益:\"¥#,##0.00_)" ] }, "CellStyles": { "1,1": 0, "1,8": 1, - "3,1": 2, - "4,1": 3 + "3,0": 2, + "3,1": 3, + "3,2": 2, + "3,3": 2, + "3,4": 2, + "3,5": 2, + "3,6": 2, + "3,7": 2, + "3,8": 2, + "3,9": 2, + "3,10": 2, + "3,11": 2, + "3,12": 2, + "3,13": 2, + "4,1": 4 }, "SheetStyle": { - "FontFamily": 5 + "FontFamily": 2 } }, "Spans": [ - "1,8,1,5", "1,1,1,7", + "1,8,1,5", "4,1,1,9", "3,1,1,9" ], @@ -141,4 +157,4 @@ "PaperSize": {}, "Margin": {} } -}//rlIJuJXeVvEcEyvjQGWR2Za2CGeo8+4dh3Oe8RVaQDude9pAY9+8KnKsGbmtN21MurYM8XGqU/Ln379zLJrwtCRYqd8srrTV/jwe6GUa/XW04lpMuRmyulPRNHBwzZONeebPWPfw6hgJc8dgHgluMDOyeG45WEJsQSRj4g6DIx/IsSMo64V9vUDQBNcP55PSb27LDr06ThJQIDFskjZN52RDvXOAy2YeOiVAvBcKbqnGWWAVyqGCK4018oig3MYER228PeNVqY4aXAhkgmFD7FeovRfM30tEtXNH8EnZC7aVwMY6eqqTsdkfaNTUVjX4O5tATZhhVIrEUxlxnhm3X0x/3Atdea8+i90FdKd7DDUCk7K7MdryYpI7HlnpYaxJmprhiwoX6vgOW44SefPVx3WnDY34ax4MA7jm7dQxrstNJ8s6ZRt8m/kRszTxLKJv4kzlknGK+/8zgkQC/DrHV2lDneDFVsD5O6m+xE8PpQLdD/SNeormKhzCYvwXUj0UdUqrEHy/HwXImkwvViUKrdaXA+xGUDA1Uex0qTYf6x6q2c4Zaj6Gip4ErAXicOg18TLggSdH+wz1nGX66HC/BYfXsbI96OL/KsZf/vnGrLOTZXSZllj/zykzc0sR0QHYoo8xq/Zycm64n+G9YcyqZmP4/7Tiqexv2dbnryonHoxB0QpK78QnGuXE12YiUb3nxZexXwN0iQTcHJrhwxK085NsWWn15Rz7tX5BQ91FSa+PDFV9CsLHq0iwNIRvQR9KXjKx7b1aK6VbuvUvk1QZv5nQuMt8i5Qa3GdrWA2TsPL0yWrI3gk+PwKQNGwrbC7oYXf8PyNEsGr2g92dNJmqmKKjNoPXpseuZLTp2GTfvEv26cHlpXhKX02GlJw83fz4eU4cOX144B0u+p81AVum6A==|920 \ No newline at end of file +}//NHFLhdQ9xFpmSDGVOA3fBqpqjayYzvsPTQWxdxoeiihLx7InmwahmSkKoccRhHnMr7dEopO7AdsbB1yTnWtOR827prub9H/DEMtJUvZz4B8Wu7/3HvYenetiEsTPllEnuaShZ7jnG+sVHDf8m0bM8m5mtVP5KuJCFdBkZUdE6PXYGUG/7OjR06qRORDdpRMhKoQ7cnvd5AJ+pG0efX8HxQgTQpVLUR4Oq8ied8P5tJorrexYZjxbL8onJoi7HyDk3wespaJZT9Ax42nFYp/vMrmoPAjAcns/tscghWHrSTpsAnXAksJWM9l5rfRuYLRCWhZxAnDY0DtReSiRYYlYc7wVDStKmqGyGGrT1Ss83ESWHppkgd2M2uwfUyyOCck1Uj64oawHL+fXC3g+/TYwsAd9CKRVrY4a3ZJd0OyDLPC3DHpR91iCRwm6kY3qrR0K9wQoU/xhM3gBsTgCR1lyK4N1JiNtXfoR94KnAJx+QkjJyK3x3DhKwix+wsNBVGkdiMm6ykELfH90qnOWNmhBYi83aBK8Topf5TCEdiqggTqoky21bljekbBnDyu94W0Cy2vXOTYCNcpYpsexAidabgAlMu97iN0Tpby9OJGnZ0CvkGPzGw9OigA6MDs7PAfgqxldcO+2mrTNWoV11L9snoeCECyL/wv92Mth5TrAebmKL/f4WjgSnnGENoqU4IGi1AaxPhTtQ5G69//ub5rnI5ca47Aj/oqhWrI2MDTUBgoiCS2wI+60kMTY52GCqF6pI6BqBxYkH/hLkuu3eH+YY5SS/hKpTylCq+BzvjwmFhGXzCus3jKSlTcDnbFq76wjnuvPQO/8BLvekGO5C4JTNe6EwiWLH7M2sAHmAhrXf86Dn6LO3l1Jh+ZVrpM+NB2wylmdNUFGr5yk9ZQ4VxXfhw==|920 \ No newline at end of file diff --git a/Pages/5f448cc5e408484e9837a0183cf1365.json b/Pages/5f448cc5e408484e9837a0183cf1365.json new file mode 100644 index 00000000..5533c72a --- /dev/null +++ b/Pages/5f448cc5e408484e9837a0183cf1365.json @@ -0,0 +1,122 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + } + }, + "Count": 4, + "DefaultSize": 15.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 79.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + } + }, + "Count": 6, + "DefaultSize": 15.0 + }, + "Values": { + "1,4": "执行人", + "2,4": "0/0" + }, + "AttachInfos": { + "1,1": { + "CellType": { + "$type": "ElementUI.AvatarCellType, ElementUI", + "CommandList": [], + "icon": { + "$type": "GrapeCity.Forguncy.Plugin.ImageValue, GrapeCity.Forguncy.Plugin", + "Name": "app-logo3.png" + } + }, + "TemplateCellSource": "头像" + }, + "1,4": { + "TemplateCellSource": "执行人" + }, + "2,4": { + "TemplateCellSource": "工时情况" + } + }, + "StyleDatas": { + "Styles": [ + { + "FontSize": 13.333333333333332 + }, + { + "FontSize": 12.0, + "Foreground": 0 + } + ], + "Types": { + "Strs": [ + "Text 1 50", + "Body" + ] + }, + "CellStyles": { + "1,4": 0, + "2,4": 1 + }, + "SheetStyle": { + "FontFamily": 1 + } + }, + "Spans": [ + "1,1,2,2" + ], + "PageInfo": { + "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon", + "ParentPageName": "项目成员统计" + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + } +}//ZykyUhFcgbjXObjrQq6GfuFxcDIH3zBYrCFm8wn9v0saPCMQSk/V/vbsfzoJkMDGE1q3f/Y+jcFgLK7RWFGJM4WRq/kCR+bcMQyagI4Zb9JX2uoYlwLqJ+18YbYW+w9zNQpprGHoMe1k4GXJpUeB/kUwKeHN8itWmi1iVMFGi1WE5IWTnRBkwdGRmNcTJGd6e++gGqjArbruC2hYo2SL7huO3HVxGmPQFiFfmMK5KrRLXYlvpDiJ1HUnhce58Q9gaxd5OsTYGQMo2MGIRgNM14YoxzYK42iopSgw1lj28c18aiRGnR6Z4gO4463Fs+2wR39b03vcIxnDFvu1CMHji8iIYkss8zq3nzb0tYyoFmYg3lPczvsEcceHrgCbZrHgcnvpztEjRrmrWtZ3LC/j/NyEiRqY0P7b7hpzZQW5UlTrxXEM0GzOXU57ktYMECrxAkIN2P6pYS1z9fRy9f1biY/Gh6PY2QIbeiuZMaZlwIx72tm6LzoNrim/kCD5nqXF+HgR0MWOD6zc6yUhNHRQnT9roROhlqBpC28jF1HpadaxWIYnG1DSL/UZbC9TqHe92TjaDu5qNSR3jLxeYN+He7JeTQUGs7gwhAr36jYptl32LI0fFp8uR+5L9280GMPe2YDIu6QQz+svE3H/ScwFeZuLe6rCFu12hKnkyf+J5GS2jVRRRvd+U3l+WlbS5c8lNh6Utuk2IL8U9E7XCijKmCW8EIy1qvU8XNYQ5lC9awWA2ZivY/51bKkMas8HSpd117OF+s6HlaEfa60YBrqyoXKtMsJ8XReJlY/euxLfQVvkFcxvQMsUl43wPAdW4Y4U8J2vyrnAUIPqGMzy/wbSrg84gf1i8xPV8ca/CCaw8y07mRKMs5baVTceJSt51ULIiLsc0by7r0rSRQEIs8Dgdg==|920 \ No newline at end of file diff --git a/Pages/9d9faa04d5a74f1dbf8dd3b2040b6f6.json b/Pages/9d9faa04d5a74f1dbf8dd3b2040b6f6.json index 0bc87f37..21ccc867 100644 --- a/Pages/9d9faa04d5a74f1dbf8dd3b2040b6f6.json +++ b/Pages/9d9faa04d5a74f1dbf8dd3b2040b6f6.json @@ -27,6 +27,11 @@ "DesignLengthInPixel": 22.0 } }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 7.0 + } + }, "2": { "GridRowColumnDefinition": { "DesignLengthInPixel": 41.0, @@ -37,11 +42,6 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 10.0 } - }, - "1": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 7.0 - } } }, "Count": 4, @@ -94,4 +94,4 @@ "PaperSize": {}, "Margin": {} } -}//YeL4T+Oljwr2XCn04z2uehvWEL71dkB9ssWPEV3KHNQ8V+v6VLhiUGUSqT1zi1SB5zDXXwUFrpJE9FRgQ4+baJ1SgBoTYxgNTMnGbkNNR9XGlD1VoE1aqI9JWrRgjmXtEOrGkgNpDn915YLbzzd0uXkX9S5LAFO7GDhPDQRJ5sgNsALfXRM3kD8MC4FcZPduSgdOPyPamTGaDPCIjdXP0pfTlxsI7jtKge4e3Zcz+HoRu0w4KRoemXpgmn/gZ8QX/en3wD8fzf+qPaC9GxZ37nS1Z7I0SEB/BoRzbL6+EvIiBUn+AN2dEgDI9VINZ6frBWqi9U9gK794n7GS2omfnCxk/vOA0KzvVJ6zewTa90Iy1hk8t0PKZZVwWVTTuW20ICShL/YcFXmitCmhmThZfHkUtRHqau7QFPb911zi7YQXUl6PEQmQm3qoAtys5OjcYEpHskKlPIPWsDVZpulCWlg7DQAj+GEf3SYtHEJMXCQsGsTeOzsivEMWKyKJfMoXxmaCBkzrnXPwuQQJ5JIxsEL0GJKSK1Wfn3QkaRQfllmi8VlLzEaHzext799jLfgPQdd03gp8LVtNmvKwJ2lkEnZKfjEdXTNbdorbZQnhZnCVAJrW0As/RDJQ+2PqJ9ILxDBMGABflo06VRBA1r9Fnk3qNW29vECpFjE1qrRS+8uXJsLuc3vl+ZMKc4LpO9iDZleM8NZQWHgbpLufwvUofcJTtYo3x2pUXjNaiFSAEepW6kMFTDhF6ffediU7fmPxCL1UZ++QzoNMJPfpNu4YgdyoGRN6I0qP6AL7dA7rEm589F03eNe7uQOQy9EyaXqfYHQRqKzW+2UTZTYJlGkIwc5SbZquWsm4Y8bOTB566LZTPTGZwrzf45OAwdfAfb7Vz5E2mePHjE92FqalMwz7cw==|920 \ No newline at end of file +}//9QKxPWMum28YHfR33MHLKi6yb6jdsmfs4E76CfDKlUynXyszhM19JeXni6eS139V5JizpAzKM2ddfHoenq8WQGxNWVe3w8LdbkrlwkPdntdR9Swb7Z0nwcCytSE1Zr6kAlAxeNZthj7UXs8PSQ3Q6K+R/lD6Td3lVoxDv22l19GOqOGfpeyKDUhGHwMKfK522hk91qO2JqBjE3fVCUEvPyLOgTnUT/Qoo9+gX/oZ4+zPXCCjw+tFZyUJ7qnyFOgul0bDgR4kumhItL82SzYrdrgjSok/vl7PlYPR7Ovbr4UNbVzWe60pDZaKBrrhvVr/rwulDoXQijyZTZ9t+zId/DtLmWemePjYJ8Sqx5sxh95YJL33iMv6+GTCwKx7WR/nX59u5L1n3G28rp8y4goK4LcYrBTyD2n9MKK8yo7PgzXvVA9ZrUGoT4Xkjx3WopCtanWZfJweUeJERCfA00BPdFyF82lxY1koWR3hJ4xlYMpqVv5zInkODDjk+cuppgV5TFyII0ao+ecQNPe6Iqz8hoeR6L/WXMbZ0uQDLieCoadY4U1xjnRPMt1CRIgJjjwHNnFuuj2YX1er2Y46QXB0vwSOAPi+TfE2wwOySPtTHguaeZvMgdhJ9R935j4Ae1Nbe9EvNl/ztBMkI+rEjEuf/C0DoGp9LZW6e43WXXc7Apl8ZjDyQpNC7VmidBObZTNXaRsUqUiXSaix+eSb8Mr9kGTzrdtYSyC7pbfEmVG/zTbnoIqDGlVNVY5g2LJhDBTjMYEDswMx5U5h79y9GZ0Gxg6/26AnY40ztcaOePGCnSHzRlm85lNn5meG8zcOcpjgAAqDeK06s0UPFLZgHOQTzfIprS28C7Th54W6QbMLL5bnpxrxpqgGpCzIisRoeyJYDN1IOYbOGxKWneFO4JJq1A==|920 \ No newline at end of file diff --git a/Pages/b90932e038f94707b54e571ff7cd84d.json b/Pages/b90932e038f94707b54e571ff7cd84d.json index 80e33250..b547f167 100644 --- a/Pages/b90932e038f94707b54e571ff7cd84d.json +++ b/Pages/b90932e038f94707b54e571ff7cd84d.json @@ -23,7 +23,8 @@ }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 22.0 + "DesignLengthInPixel": 22.0, + "IsHidden": true } } }, @@ -100,4 +101,4 @@ "PaperSize": {}, "Margin": {} } -}//Tk/EyHRxwsyQ+zfN1yIPcag7ugNaZNQOY22Z7V1lbmFaRU3j2EidPsu2tmHpfH5YKRVfqhI9HTnuQWBUk418UHfZo2Lc3n/8E62sAfr4AAG+llvCXI/cUy1qHBdSQPIlrcDnYrT3m54GngWXNCjcY2U1cTkIHM0cWbB+YMRoMl4Dk2gCxxKlWhZW+POSXXp+Z5Z4bKN0gva3iiFO4r76vKxjbZ35NbA4Jx9POdWLdH12VG7KCR/w5R9EXgmgmIUce4n8I6H3ckEqV7tG4YZfYc8DJPOPIIUr1T9CR8pYJv4gwW6j5KBYvYsQDeBWdRfs3iTQF4dm3zAU3ComQIyNoUZHYWtGOo5S9K0XK6azeI6yjYFsFDpQhEAR5tG9OdzfILPzHKLwdVoHuGEDLOhg/P33uVtE89Acp2TnJ2hJhgMwmpOAbQIvgibXFMA3Ow0TydLogRm5Zh5Ig7JTwBtIiqrdmYqdgvMaLX8y1pgx2k+HHlsvQ0JqCDJ1lRessOdfilA70vy7fbTPitb7iOJjvKk0fHny70ARxbfNHhc4Th48T/xlyuEjW582ssV0BxVYXV00SpNJuLOZjdFiFCZdTruxOCwYNyLbLN0lrjbMdoI1MCaKLCyRMCjaY6a7zZmrQOlUpaCf0pwVhJxxFEjMnCw4AMIZeb/N81kzMiVXZCjdjp0IAN4ivmO1efRoiksT13dJqya7ofqDC72mkmQ2awWt/EukK9xGl5S6jqIZ/RRU78RT+yYc8a6yByQ/s9DH65KdvouaJfpcVzyNRjt4Kck/EzISTOXVbQjnxQQFfry/13P7BDizZyJAuvi+L+RSxzRihFD+ZY8aFyD8Z4ukNGdB0wE0q1qtiumzojVXSSZC8RKu6pCyTwhCFLkev+sIBSxdzTvjiT0VRFs4kHBFyQ==|920 \ No newline at end of file +}///bmRqoGhfPXpjBK+hllkOLio3LRPDo9aa8YOnnK2ilKCJd9wwUrSwfkAQ3s+BT6JAsmG/OEmKFfV2HoVtCoDrFcEaoYD344XU5pp7xDL7CqGSUNbrZnFbcqUOcUiK+XKeqk93yeXcpd65O3+63jM+gccR8+pqr9WHw4iIDRla2tvxEAk69K2c7v72pvQfPBZm3oVZVV+HYo7Gbp0/0xSBCOqf6QSCKBK8bQwVgutJbddahzedeiOskhWM0/dZK6m0CMghbhrx66gojHhKNpcLQTqSyzifpbyqYZefwyNYD1z3DL3OCrcJxhYEkuUCsYCROmEfS5vin9nIhXfJBcLO7kp5svdFsSPqZo8l0Q1OTY5zl+D5JdXCU+bHBmIRDA78cBZQjllaKCxCRosk5JU/Onf2ER50k47jGyT8rMUugiN+Ar6N0gKTGOj1nCYCfQz9m/Hz9YvpeQwFgVMh3FGqBg2x96bmIHPYeeohQjLARlErx7lvr5JyGMdFSIFk2/HzjMuzq1jKCddjTWlhI7+P05MkwoAuN307ynzkk7Jpwb7Ml2KmQHjFEwUA4cw0UR+75FdNKuHHu8rwcpb/oYIwGksplncYslmoRkP0atSAVZMHqgx3ppB4ABTkapxIhvv8EMBO6p+TXA+oJaJeRm4XugksE7GvHkjMHtrlZYKAHykenkuWF58c/TnxnEbn2R1mubBXw9b/JL7vk11xvDg40TKuPi9uKbc0GwSu3ho0NQyegke0nyA5Nv771J11Qme3F/kWy0ULx/Mx7heuIi57pYCPyG/r6Pf3s13iDulzuzXeJCtx7+Kqd+ymnb6qxPA9Ujfe7IDkJPC+vpY4goAcYggDBYTalVK2b5a9K/pFDzhFYmE8RkL66Samvwv6B2922enk3rzpy/S5GOLVhNA3g==|920 \ No newline at end of file diff --git a/Pages/任务/任务-侧栏.json b/Pages/任务/任务-侧栏.json index d8a4faaf..073f39f1 100644 --- a/Pages/任务/任务-侧栏.json +++ b/Pages/任务/任务-侧栏.json @@ -146,9 +146,9 @@ "LoadBindingDataOption": 1 } ], - "ToolTip": "添加", + "ToolTip": "管理成员", "Size": 18, - "ImagePath": "增加.svg", + "ImagePath": "设置.svg", "UseCellForeColor": true } }, @@ -261,32 +261,31 @@ }, { "FontFamily": 1, - "Foreground": 2 + "Foreground": 0 }, { "FontSize": 13.333333333333332, - "HorizontalAlignment": 3 + "HorizontalAlignment": 2 }, { "BorderBottom": 0 }, { "FontSize": 13.333333333333332, - "Foreground": 5 + "Foreground": 4 } ], "Types": { "Strs": [ "Text 1 50", "Body", - "Accent 1 0", "Center", "Background 2 0", "black" ], "Borders": [ { - "Color": 4 + "Color": 3 } ] }, @@ -342,4 +341,4 @@ "PaperSize": {}, "Margin": {} } -}//EmbWYVJaQPY/tqOzpboj8VMH4h7zL31S3Odd7aODv+fL40V2CrBtj3kHHapoEaap6mqqe+mH3YGclLU6FgS3l7VB+Zc0NbZP6Bij5HwXKD0CtcaMxKBTu0ENJJfBa0kESRYX5UjoCiMYnVCxbZphorFKnNR+dDe+CufCGRzbAN44Huj9pj+bmu0ygPiMusVLwl7zeLYTStdKCu18R+tM4TvQenkouasu6Ybyh82rkVo89bt2yhEhHMHwQfV0huP1ZZwZKDQ3ygE4Hw8+OO6ClSNkKSq8UuoSuSYMkUM6viIaAG6h1atPHfYniPs1arDzc+ccFRItYCKf8CUF3D6vXbE+Qj9AwTDooO2YHWTx9pNAp/VBNFFxdTW6jvogdk7ZzZN+/9cw1MtwM7PrQ/0JJAgxxtaSJEPes8uiJLYhN5XiPHmqcH+dhkqdcrgufs4LfRgDSGWdBKjLfKr3Yt8ccQ/7OVZ9YEHaVZ0+w3wii3LthtJ6whkkHd54o2B+rhVZS6FLXrwoulGnSOSzP6CH6ACabijtXQbV3oeo9p2VVf1J64gLmJkLjVTxICaoeHCsTBRo1UN5yRWe8BLx8xtSfJ01b6f90yxZFm6aqKgsYCOKnMAVWzHwk5ipCeckmfFQAj9vfPOLiPrCfAMKeZt2HDFHHn7vIr9mP1tOs1zPRlAc7e1LJdPVZ9i3RF3G6Uf8KgN7mD4H89JExb2VIQrPeTtypbZq97b5Q+eEBXQDMZZLkOKDMfrvMgsUVa8bPf6/lH8N5FiFLNegHzfhnmNyWz+REnZ7nSpmBsG0LFFxEh0Z+4EcX0k/NJ/D+7nahpoOc4jMmh9Xi8sQGczswc1vygxEhbgImxBXkcaP0kXNbDmkLodoXul7hhJANBMbxopNGMKHQIV0m7wjrkCYCz6WSA==|920 \ No newline at end of file +}//UgdUQ8idj1kbsoqDZFKQsd9omXNcH60EpODJsqCmiM83pRzpr/JUSDKXCz6w41f0U5PiicEb+NQ/wJVLyooyLoAfUqtGRYW4A6JA+SEZ0XBqnokGb/0E1t48YWKAgwEBHqJbVQOvvhKvlgr3V9FvqrRG9uMGeLLtAPsdmFpxTW703Edyb4l91D01WFXQTRkSPopI82JiRYQnLjJ1WCOxTtp2L2Nm68ZOfbtXsiUdaypNXUu1Rl54QEpZkTeW3vcbaRYcajNVUcAQ36vzvFvzLzqezHInRFKeRSc1TKDq3iEB6JA+8bNmLIpPBkPj3id2X8ZUmZ3JaEcvhegLJ09+k1ST4CAvIXSz2APP4yxUN/Bix0WUt8TlUtQEC7cXlCJDe1z0lwq17oLhNLy5JEvbaAhVqf1ArAIVKi20r2bLgGnu80WaaTUnZkx0AtIsHohvUwiG2QfiAYDE0z7TK++xuxt9VBklB9oxM8UtyVlJR4rei29xEnr1sraFY5U5P8adciXkPG16mVDHDKPJVMYbltzLESoQaKZ04kRh1w7qLXn+4uwssMHbtPScqbsvgvJFioicqEUTtv02anjo6BTY/qv83DXsRKQqezwwv0BRQhzHQPGdG7/iC5CSa1CYVaTt5CC419r8x94i2zPeGjy6dmCxcZi/G5SGytazLDi5rPAGSlK3MaDm79xkdfNadP5y/tncazeeaXhhGY2GnDFd7dN5tC76UJCdSvjAvhB6FzNRWYNy4vk70UFOHCeshDTrIzPy0puSI/1Vh/C0kxre7n6xyGXBh9yof7D5ixZ9No1fUx77Y5vB0A1MfYRGaunYBpgo/iEUQGeOZgRQMRGf2vYxww6dTjxMmcDODkPWSnnf6o61pmeSivOAHU3XL1JirdXggcZMVjrS2+Kd6uMHqw==|920 \ No newline at end of file diff --git a/Pages/任务/参与成员管理.json b/Pages/任务/参与成员管理.json index 6683ecb0..0ff414dd 100644 --- a/Pages/任务/参与成员管理.json +++ b/Pages/任务/参与成员管理.json @@ -184,7 +184,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "7f60b2a9316d461f8658c550db206dfc" + "ID": "3f928864780245229740df6621f52b79" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -238,7 +238,7 @@ ] } ], - "ID": "86642235-5846-430e-81d1-1f9dc48d625e" + "ID": "a9bfb284-1aff-44e9-a2b0-e67e31263047" }, { "CommandList": [ @@ -250,7 +250,7 @@ "BtnText": "知道了" } ], - "ID": "fff8b9d8-5847-43bf-8d37-e48548d7b019" + "ID": "0513f646-9dd5-4d41-9fc0-f10d38e4ff3d" } ] }, @@ -497,7 +497,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "1a1af55cd50f4eb08f537643f92ab98f" + "ID": "c112760f865a44f1b4a616a26964eee9" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -605,12 +605,12 @@ "UpdateRowType": 3 } ], - "ID": "0392215c-dd8d-4300-88fd-96bc3075d80c" + "ID": "23f63c82-5c82-4180-bead-a9d6b634737c" } ] } ], - "ID": "4316eac7-1a2c-4a1d-ae18-97a951f58cf8" + "ID": "ebccef91-3098-46cd-8843-8dd9578d9a22" } ] } @@ -652,7 +652,44 @@ { "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", "TableName": "任务表", - "ShowConfirm": false + "ShowConfirm": false, + "NextUpdateDataTableCommand": { + "TableName": "项目动态", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目ID", + "GUID": "392dbb09-595c-49ec-81f6-4df46083874c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=参与成员管理!项目ID" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目动态", + "GUID": "9530bf77-7088-483b-b589-9596da6d5448" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"任务[\"&参与成员管理!L10&\"]调整了参与成员\"" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "执行人", + "GUID": "949e5ad9-de64-432c-983c-c328121065d8" + }, + "Value": "%CurrentUser%" + } + ] + } }, { "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", @@ -676,6 +713,13 @@ "ColumnName": "项目ID", "GUID": "9a14b790-cd77-4a9e-9874-993b33bd65fe" } + }, + "9,11": { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务名称", + "GUID": "40fa4f0d-f166-4824-b34a-264e9a033c65" + } } }, "StyleDatas": { @@ -728,12 +772,13 @@ "9,5,1,3", "4,9,1,5", "9,8,1,3", + "5,1,1,20", + "7,18,1,3", "3,2,1,7", "3,9,1,5", "3,14,1,4", "3,18,1,3", - "5,1,1,20", - "7,18,1,3" + "9,11,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -762,7 +807,7 @@ }, "RowBreakLines": [], "RepeatRangeSettings": [], - "RelatedDataTableName": "任务成员表" + "RelatedDataTableName": "任务表" }, "PrintInfo": { "PaperSize": {}, @@ -778,4 +823,4 @@ "Formula": "参与成员管理!$I$10" } ] -}//7QcRQREI+zig1r5PjqnuHRBTnPlTASJjPmgEuaEp9IbTvN71p91un4uBpOt05Bk8EvkGcJOTxHWpQSw2bzOARils5G0YSG7yu/xubISVtWPFH1bSOyO/QIxJk+uVej2VGVo2ey3yCCUTpf8cpVH1Kzc2c7mK4XxX8demHE0zM9JM0MoF+7ZqMlK7dTqpeMzQlvYuquaQL/4R8bJJV6xQLJeZ4eNgmsaAPDZZpADQh2NNmCHRhP8tbKSbkzQ3B+cV/38eJMwaSJpddp7lITJyGTCCecVHhN5xy6CIySp9c95KLJmM8s8vBeW42A4y/AsV7iwitVRK7MH6dFjiSCMl7bcZTXyjNN/f+hWYdUpvJgypZz62wamATGPCL3Po8sdHNaTbJfB1JXnEm0AGVPlUZfNBMIF8nVAdV9UUy8u+XWxCmbugHup5aegQnq9Edoshw+cVj09c0CShmeCI7VadQeLZkZcYFhsywXY8yn0WgUNqu9GY9yCLOYme0bfbW98OyXpRtz6KELKLYxJvgT3+rm+QtDa0gJjMaztrAdc1A9+BWBSgexoym9KIhF/OkxlKU4KfTwXzwEfopAOSFSq6l6whIfsdVq9PkJC5vqyu0faSEbK4vtn6gQ009vqINy87q3F67EiZ5TRYBVFy6QSaEGcy1Uq17/SqSdgNwCPQ7UClHC+BleexnHPqueNg8+wksLzTAogWQ8kpnR3QmbPT46o++pgOZmy1L7vrn6xLBzKViRi1W2u/p8pwZWvDi7XHVoBX9IrysKspHUp3QLhOtFi36EksEWE8yIoPovlL9i2vawHvfraBkBalTaFqBX7sb0Iq1cEg56tWASEngsy0AjxxWAtZMf/yFeL9cL8e1ZqSWxrAggklHQLEH+nT3U79Lh9wkGHN487PA2mMj7aUow==|920 \ No newline at end of file +}//akhA4n2KyxZwdVWcvfRZKammJe5xcg8ZwlZN7KMmiRNDMo3OWMGxNOoFcZLd9U4RHli9CKEbTla2tQWuiz1QJ0tz18+AZ9IwagvH3ah5dGxuG+ZLhOldONjwQka+tbZH/d3XhlHgERFUih1ycgf+0RdY78XufZxmWcGnfNqJ7jAhVtn7D7Yns8y0QZ09ONrh4q038v200U2JT2dypctUhUw/EX/7WNi6nQcBrv/Bez0cmnyr4JofR5woaQrzVElkSBptsdTBHrPh37iSRfVgceIYzxi42CQBxDtMNCMFHPRwTRIoemy1r4m5N1txGnvQtBoGvkzQyYRRRVj/7q7YPyoh6UvlbHTCuES3SW18eAkN5/m7NP0xjx0P3aXdNaNwEDXUu9k+ApAlFUACYf4gtSBtlASCo1yngDbO3iURPyxwy6hffIrAGsb4GWmKnORwKayXqQbNLn8S0w3xz29T51afIxN/saIDS6dY0G5NukhWNE3d1jOCkY0r5vsrm/nnOnRbgfYQidQdb0uMDXc2gYvjhhrefl5SZs6Ds/eZx1AxUe5Z67gKRfT4adySXvOgEB+sfVf5pBmtU7tmK6TikT91tO5uUNnGNH6ZvO/zSTPVD+21nWVN8lIT9Jbu4XU7h67Tj7b4IoAPruu/l5ksz1qLhhxwKEzBb+74Qq0OORrSI36wjuM92heccR1VSNQsl1t+60qWd5DSgHsvQUV/wIg6FXoBHEyDW7l2vH9FOp2VV0b9D4PUVT01biv0UtidC+xua1SOceSstxxrwJgoOK8ppg7qK5QyJfwvP29Oj2zm6mBuKGdff87IhlIflpub0Jm87j0Jw4nxAdxTJJkN2O8B+Yfw7G+JuVLdpacvq3NJLYJSpZbA+gVIEJqBca/2e0BM/GmNXQhVGQ4sXwz1vA==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目列表.json b/Pages/项目首页/项目列表.json index de70490b..aa2d35d3 100644 --- a/Pages/项目首页/项目列表.json +++ b/Pages/项目首页/项目列表.json @@ -139,11 +139,6 @@ } }, "19": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "20": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "Mode": 2, @@ -155,6 +150,11 @@ } } }, + "20": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, "21": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 @@ -250,72 +250,16 @@ "DefaultSize": 32.0 }, "Values": { - "1,11": "添加项目" + "1,1": "参与", + "1,35": "添加项目" }, "AttachInfos": { "1,1": { - "CellType": { - "$type": "ElementUI.InputCellType, ElementUI", - "CommandList": [], - "UIPermissions": [ - { - "Scope": 2, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 4, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ], - "type": "text", - "placeholder": "搜索项目", - "suffixIcon": { - "$type": "GrapeCity.Forguncy.Plugin.ImageValue, GrapeCity.Forguncy.Plugin", - "Name": "Application/047_search_8.svg", - "BuiltIn": true, - "Color": "#c0c4cc" - }, - "resize": "none" - } - }, - "1,11": { - "CellType": { - "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PopupDisplayMode": 3, - "DrawerDirection": 3, - "ShowDrawerHeader": true, - "PageName": "项目信息", - "LoadBindingDataOption": 2 - } - ], - "Text": "添加项目", - "TemplateKey": "_RS_Main3", - "Icon": { - "Name": "增加.svg", - "Color": "Accent 1", - "UseCellTypeForeColor": true - }, - "IconSize": 14.0 - } - }, - "1,25": { - "CssName": "singe-box", + "CssName": "singlebox", "CellType": { "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon", - "Style": 1, + "Style": 3, + "CellDefaultValue": "参与", "Items": [ { "Value": "参与", @@ -341,7 +285,7 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "=项目列表!Z2" + "SerializeProperty": "=项目列表!B2" } ] }, @@ -376,10 +320,10 @@ } ] }, - "ID": "e3c29c30d51f4d2f91daef7ed8e848ec" + "ID": "927162399a35473b99bf38f38684369b" } ], - "ID": "ae158399-3a67-4ed6-bc86-fff1720355b2" + "ID": "206d3498-e9f4-4768-b655-f904b78c7b43" }, { "Condition": { @@ -388,7 +332,7 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "=项目列表!Z2" + "SerializeProperty": "=项目列表!B2" } ] }, @@ -422,10 +366,10 @@ } ] }, - "ID": "c3aa118a8c674c1bb75ddf3ced1e5d5e" + "ID": "29e78df123bb43ecbed358305a4d1191" } ], - "ID": "5e3501cd-8857-49ef-a921-842b9027bace" + "ID": "61313f85-719e-4ed8-9cfa-e2c9344579c3" }, { "Condition": { @@ -434,7 +378,7 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "=项目列表!Z2" + "SerializeProperty": "=项目列表!B2" } ] }, @@ -468,16 +412,74 @@ } ] }, - "ID": "218ecfedc1fc4a32b479c98f8a8184e2" + "ID": "52649afe09214a64b73f033e52fbb6af" } ], - "ID": "e5a6fb7c-8fab-42f6-9383-021e3635e9e8" + "ID": "22309fd4-0dac-49c0-b22d-fe3b1b038ce4" } ] } ] } }, + "1,25": { + "CellType": { + "$type": "ElementUI.InputCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "text", + "placeholder": "搜索项目", + "suffixIcon": { + "$type": "GrapeCity.Forguncy.Plugin.ImageValue, GrapeCity.Forguncy.Plugin", + "Name": "Application/047_search_8.svg", + "BuiltIn": true, + "Color": "#c0c4cc" + }, + "resize": "none" + } + }, + "1,35": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PopupDisplayMode": 3, + "DrawerDirection": 3, + "ShowDrawerHeader": true, + "PageName": "项目信息", + "LoadBindingDataOption": 2 + } + ], + "Text": "添加项目", + "TemplateKey": "_RS_Main3", + "Icon": { + "Name": "增加.svg", + "Color": "Accent 1", + "UseCellTypeForeColor": true + }, + "IconSize": 14.0 + } + }, "3,1": { "CellType": { "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", @@ -503,13 +505,17 @@ "compareType": 1 }, "CommandList": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "Title": "加载中" + }, { "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon", "PageName": "项目首页", "LoadBindingDataOption": 1 } ], - "ID": "fddc5353-08bd-48f0-9605-7e307981681b" + "ID": "ad2230e1-abcb-4692-af07-e3cdb1a8c94d" }, { "CommandList": [ @@ -522,7 +528,7 @@ "LoadBindingDataOption": 2 } ], - "ID": "788fcb81-2419-4c80-b7f2-09179ce8d9ec" + "ID": "ee9dad8a-7ef7-4e90-8493-d144080d409f" } ] } @@ -633,43 +639,54 @@ "StyleDatas": { "Styles": [ { - "Foreground": 0 - }, - { - "FontFamily": 1 - }, - { + "FontFamily": 0, "FontSize": 13.333333333333332 }, + { + "FontFamily": 0 + }, + { + "FontFamily": 0, + "Foreground": 1 + }, { "HorizontalAlignment": 2 } ], "Types": { "Strs": [ - "black", "Body", + "black", "Center" ] }, "CellStyles": { "1,1": 0, - "1,11": 1, - "1,12": 1, - "1,13": 1, - "1,14": 1, + "1,17": 1, "1,25": 2, + "1,26": 1, + "1,27": 1, + "1,28": 1, + "1,29": 1, + "1,30": 1, + "1,31": 1, + "1,32": 1, + "1,33": 1, + "1,35": 1, + "1,36": 1, + "1,37": 1, + "1,38": 1, "3,1": 3 }, "SheetStyle": { - "FontFamily": 1 + "FontFamily": 0 } }, "Spans": [ "3,1,1,38", - "1,1,1,9", - "1,11,1,4", - "1,25,1,14" + "1,1,1,7", + "1,35,1,4", + "1,25,1,9" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -695,4 +712,4 @@ "PaperSize": {}, "Margin": {} } -}//QZnux8dZjiZb/2iuT8ud+mTGhcxBM6EIQYXLauBYqifDHYCXOQyj752QOnfN365ekBr6nnjkv0Eg/L2ocsEFNZswhG0wKeGbwLsOnK3aZQ8ZN5KAgb59Hm9YqRqHaHweKAUZt8upiK/4WMYLt/agtrjbulSAq4RhDRly0ImYvVUhy9Q3rnP4VDsisLILRBhho1p05JUvBKp/l+cXp7E9JswXph3iomXfyK9b8DpifwstuhKga+rM/nCsTfbET9W1rDUX7Xr7p8QZuup3EoVoxUgNQP6zgp5kW1CGr85A5r0Ge1Dt2oknsh83TZzjx38b8yz8tM8RGwmA6rr7kgbd5+5D/7HYSrwNP+qKY78G4tRIST6nsWTpssSOLllxnpvgD9zItRkJl1T8LOiAhKCevGrgvi6vItcmJf1jui0qOfi2YlpUPQkvNK6slgZUtQQTmzFqr6Mb9K7lR1af80goeKqEOY1VOJ5/UuEJvn09DDEc642fCAYJLeV3RnR3ljVcEDiNOLEaeVzmr3bKcVE80SRlkGGuyXnDCmUb/sl6nyBvc/g6IvooBnTxzZqReK9m47zzkmT6KPmWKn2ZMHg/bQne81jOsvOuzc3nn/HT/vaA/Ji5/2iNUQTEety2dgBdi4IZx2jd7PpV/R4mnGBlLWC58fKcEsjyIUN/wnLOWKLWc9NMhvr+nG+yNrbJZN5ah3fvTpYFOjBMcaAp9GeVla9SnSOoc+3zF4UkpcQ8xyfArqghE/91+Jt2/CVQtIMP81f4jdOMFVIWCbBZZPSLxCStWMkTd7JnA9s5TL6iPCo0LSzYsewZb5AB5IqmxLbfzp3PRw4y3Np37sTjWaHOmI1b78lsLZ+uioq/p8QFrqcORfdzukXH3D6Av4f7H4aFA/wRClo3qOB4Dp+VAhz/sw==|920 \ No newline at end of file +}//DSKwkXbPbTQGqnMG2yVPQLUxG214XrREeRmRimBonEr7BuTuP9PwVVh/K4P580dOlAyo04WD1Vb9xSFXZAZk9Z8sOvLfap3jjNLBtsey20IriaHwuX9rSA5g0mK6YqaoHh77VzqRE2Mh4oA5gwsWv1EyEWJDkaMW9kCbPB/o2JLiOFnp9ThqIeOxO8wvyLamBHiz6/Q0LP6ghet1zdYoAK6AzxjWgc2kmewkCOyIgkAnx3HRxhIpr0AOOnAJv1mMiCQZo+RAeRmo4v6rI7/1jnQmDleGOTSaxAyg13hCs9hpqgT1eZrjWqhs23MuUHjvLvWJHppmOL3h3ytJAXJ8nYFdJebSeywVkDnnF40211ttvZ2ugp1n9dp5uWpqkXGC7YZ1LUb7uYKfRGbL/eSI//AFj+zB283G3qmdfp50AuqbcLiX5d7kVXOn+Yboor/d0ZErrlRpnI8OospbX9qPkiu8ef6Y+DTj6bhzYOv84VQvDXpzbdqSHpsa54lJzg+LzVTQmr9wJsA/biuyz8nOhZP2MWtSfvVWXEkRh8J0vJA0tWbl5/HllVL1Y/7o7VWU9gbihE5mpiOZx9sHdyGZnKwdZO9Z0S1QqMvPMcpbeAXjAHOap/b4JGc6nn6XEiRLpdLMwwlKjcZTJs5CG3RpMI88RgQCFLezjGMSK0AvsCiVB0dyZJ9vpic1qqjZJC1UHXGq/+cl8NgSX4zETh2Oc3PkGlrAvO1Q9ZXDnukmNZpnsxGx2442FtPwjAxr/gZNPgRPEhMw9l3O6c/eqnJi2XBlv7XBx5FaOcV+95Zd21JdoQiH851zNdujFJEu9XQ1Xnf/4kwNOuIkwIh8T6/WiO3nU0YiLDUveIjnqz1AEacltvS0DAlQYdrL9YHpk3piUms3hureRI4lVPiOu2etaA==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目标题.json b/Pages/项目首页/项目标题.json index ff584ae5..81a73ddb 100644 --- a/Pages/项目首页/项目标题.json +++ b/Pages/项目首页/项目标题.json @@ -267,6 +267,14 @@ "ClickCommand": { "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", "Commands": [ + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目标题!项目子页面" + }, + "Title": "加载中" + }, { "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", "PropertyItemsList": [ @@ -292,7 +300,7 @@ "DefaultValue": "任务列表", "Tabs": [ { - "Value": "概况", + "Value": "项目概况", "Name": "概况" }, { @@ -382,7 +390,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=项目标题!菜单回调" }, - "ID": "32945e5d3be94a3984adea5b686b590e" + "ID": "a38060fd7e9f42798d747ff0ecae0a30" }, { "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", @@ -419,7 +427,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "83b53026-036b-4953-9a8d-3e289704ab90" + "ID": "f1055ef9-a395-40a1-8dda-4fe601dd3060" }, { "Condition": { @@ -440,7 +448,7 @@ "PageName": "项目配置首页" } ], - "ID": "9687c6bb-9254-4821-9d24-6661c50fc252" + "ID": "ce5519c3-2742-41a0-99c4-7b81aaaa1f28" }, { "Condition": { @@ -476,17 +484,17 @@ "Message": "操作完成" } ], - "ID": "6cb958d0-39fb-46b9-b54d-1f4b84873b16" + "ID": "fd9682d6-e164-4096-9033-68110bf25252" } ] } ], - "ID": "53aa8768-bce0-412e-95cd-7a8c8858b509" + "ID": "1c795272-1f44-4490-afd7-b86cb6907012" } ] } ], - "ID": "2979608e-9ff8-484b-9406-c2641c4d490e" + "ID": "bea1506e-7f70-4ca6-bef6-d5241b14b64d" } ] } @@ -602,4 +610,4 @@ "Formula": "项目标题!$M$6" } ] -}//KuoLVqRO73MBsPtujbXq3KMqSt6d4jOeNa16swp6PlFJGwjiWKWjaHVvmbvpz18ufmed7G3+03l3htBw+zf32nNFLdOqtS41hcUBz1ivXEuNmWoG7bPaf2iD6u46OEWmDH/msD4mLI1UTMZ4aPENMJwsOBSZqd9+Nqf61xM36X1fSQXDNuLeDc2JgpijMH/tEESuwSVy+nmkueZT+SvJpuaVz2UxeMsw1imwniiZRomDEdkr/QnUPTHBbiJpzyRjP3BVAryiEuwRFxD6PyHqAr/8p4asayY8ig7owvOyodXg61eapmzWWsNVv3psXEHTgnFSG+cPEhI9CR7RppsxQiNMCOh3yriG27NFem0kFghJgV9dpGZcqM4qhWeHq5yfIWg5aQT9RWr9/xNK+AaTnq41NXMv6f7dJuOZcs77igkH32n8JblF2j/FLdyntjEooj/tfqo4IaX4FPT9icFBxc6Pl17AwRKAYe5HerzId4R61fll+kxsp/dSCyVRTsKNA1OYO68mUh5zBsL9cMXIA+cOSWptMH/Z9E1WZVWue4xkSmLtX8fNl/DPlis1/lcwlPveLA8OnHo4sPWPNDjrUP7In9DtFJohsodMMJsGayZZXEI03yO4ReMkHgVVrNr8RwD3P8dQGaGbmbrt4U6qqOJ5SKptwzg3QUN4OJhL54KgxbWCeMASP2Usi94srAQqQWJN8kc9+etWBca2Ljy8oVvPRVC1oZgIoFEA+wXojISYM1qwQi1keESsw8VFFKPY9qb5jsFvaPZiW5UeE3pJkaWCf8yYw1bupVcFnagdI3mY0eRPWtxpvuYaSCG7dam+kbRLR1wqwLeOa8Q7JCa+A82/SUgfZdgvW2k5zWc5ShhZILPK28YsQNJq9FwhJvF7ct8XJWcwEPeK239Xrur6pQ==|920 \ No newline at end of file +}//maQdtZ0mpsG00+UKrNxhqK16FsBoKSBiWnQtCAq1J2E6DXBFEAbjhV0gNow/P+IynvaWu1xdbyuZRCIdmyVn+Q0jM7vFJdG/3s30LAkvYIBFzkkPh/fCeao3I0Yp0sTDc352mNAbIXJA2SSICZ9VqZL7CXqUDq1YsLsCbKS8F99Dt7NWb1udZXCdTvaHR08SkOsMnGNk20ZBwdkrvlKqVSgw7yTOWrJY76oTaBJ6vRbAq5S5HDYT0p2VauK0QEKNUeV87x73USM1qqAQdcy4IEWK5OhhswN7EfozM5dHGpmmxRT597jDjjv5JICNxWWQYvT235nV79Sw5gofcjj4eSbi9GhxxxmIGrklK4IkluJSiUFZqIXkiJk4vwPtKcpUO5BLRZih29Ks69JndEpqkUsKNBVL+usrqI/kCkUFssx4ckeS2AXpiAqq5FCh1xe5SpTdxmNYMeP8BJMw7cQHqQPTnCXue72QqSCJm7vZKWuJ42Zoefv4wiNoOjWA37pJE3e5bIdamEnmFyzGibogs4d3bwOKQCOd2G0rDMEypri1UFHNxyD+byZZru+OG3IQdPGJBy5ZGTKWpVw8EFfhQ6+SRS03M8DEJQ1cp0GxhQiZAvaFVLaP7438XvCGoHXRaFiPcAE+yXJgZWKP0k+LtE7fvvGLBlOp4jQg4tae3pTMUjcg9HWWAxeYSGE25UQ6m8FJlx0iSCih/fDV88l+LfW0t3SbLK2pitcKHHPSGx1xbyt7LRi9wVCbiLogoOzyfeHt/0XjC1VJR+1CVvJrV/CG6Q83osp10QTzTxmRxm3jcRMz91NF6qCjMU5OyUQ2ewFVMDNZNBsdz9jI65UUlYRQWf5m7l5nMnoufEFC4C3Aaug9zvKjxVnOv3i+yL5whruN9kpoT+ziRYTTnJiu1g==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目首页.json b/Pages/项目首页/项目首页.json index d5573c53..bd2ee09f 100644 --- a/Pages/项目首页/项目首页.json +++ b/Pages/项目首页/项目首页.json @@ -242,27 +242,12 @@ } }, "40": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "41": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "42": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "43": { "GridRowColumnDefinition": { "DesignLengthInPixel": 15.0 } } }, - "Count": 44, + "Count": 41, "DefaultSize": 32.0 }, "Values": { @@ -338,13 +323,13 @@ { "$type": "Forguncy.Model.RunJavaScriptCommand, ServerDesignerCommon", "JavaScript": "Forguncy.Page.reloadBindingData();\r\n", - "ID": "e53878b1401e44e79a1be857a76870e0" + "ID": "2d7d267652364b68a72cc98b6606e67f" }, { "$type": "LoadingCommand.EndLoadingCommand, LoadingCommand" } ], - "ID": "90c0e312-a97a-4dd4-8bf5-be5b0c5dfc84" + "ID": "1a1d1bee-6feb-4ff0-8949-5c5d40e8a2b6" } ] } @@ -429,9 +414,6 @@ "0,38": 0, "0,39": 0, "0,40": 0, - "0,41": 0, - "0,42": 0, - "0,43": 0, "2,1": 1, "2,4": 2 }, @@ -443,14 +425,21 @@ } }, "Spans": [ - "0,0,1,44", - "1,0,1,44", + "0,0,1,41", + "1,0,1,41", "2,1,1,3", "2,4,1,4" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", "MasterPageName": "FGC_母版页", + "PageLoadedCommandList": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + } + ], "PermissionData": { "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", "permissionResource": { @@ -473,13 +462,13 @@ "Margin": {} }, "CustomNames": [ - { - "Name": "项目ID", - "Formula": "项目首页!$E$3" - }, { "Name": "项目子页面", "Formula": "项目首页!$A$2" + }, + { + "Name": "项目ID", + "Formula": "项目首页!$E$3" } ] -}//xblkVuqNZ8ivRpx0U0Qk1vsopWESERUPi/jM1Tzw4IRdi7a189y60DSmAQZwKYnCDhqXjyrSTun5oukprTLqtxEgEs/ldn/bS6i3QzmNOZ4uheG2avaF7QX+aJF1ucUPzrQ4HaVj9USuOZa6SHncO++/p/TbvMjKroybkGaajj6rB+VpMjzlymAhjPkWMy5IOgXLqMvsS7I+YkrwcPIphC2IR9YOIASjB2EKDXAotadezrBqVTv/icLbNDsPjKwQHEF56c0MC6CKJ4pV+IIHygfbl2wlvSwzLrRwZXbVFp6DSagbLYRRYw0Ceno5UmumOapgSX/tLcenb6pkA5G+bpOjKi1lzQ4RU3OJBLeXgWPwK5SCYQPVnBbZZV3H+xbaGAwrxzd33vQx5jMFLBXarYzqtesdoWona1EboRzamT4c9bOXgqko9tCb59zw6XRBEuDPRIT0yWxB1rptYvTX1EaSNQW06J4eDw+YkvIo6zf6V9fKraiaeGr93wR6A/d/K1+rGbQeICQZASQvj8W6GLaQ1TN23ca6C0pKHZfku98tM0SQiYIMOfAyWFSa4ExNK8aNpSXHWaRp7I4bjzr1FM9U9hVx7oTlCvwVZy+bwgi0kc6eCSgUg26pgMcjv43+HeqojkDatcpZOokIsGggS+SP1KQutm7NMTMND2sTQBNAlWoeSzz2SBrJBGmQWjZ6QHhOBv/G4u5ZSJDFrDZsXUUgnHYCJnE6j09l1kdpfghcyRA+t7exl/4eeoMGMCWx0uvfd8pKsM/AIRyjEu1jRW+DLO2ycnDZoYVIxxnGMra2XoLAZKuRcOQKKPqtESrIA/4ZUUXZ3lKyJZmTzwm8wOkKugZSUqWPhkahlFi8wCfl+E8fELDTli4emWEViInFpg6WL6XAhbL2PW+L/Re6CA==|920 \ No newline at end of file +}//YYidSWwqgz9KijtWL5LOCqUQebHhIUu/uEISz5vaDKRhGb109aL3z7z3rddRf0950IzTwAsXi4+29nhfoOghkHD6zZFGkaDD6n/Th8eEmJvmbkyqG2GFBUuryHgukMZxHErUevPTyhG2Lxkrs1vg6laTUjRvHMpTIlSx/CRqxxEOD+6z6NZQ3XufhSP0U6VhyoDIpCdUoQnmVAM7oX5XNh84PltzRLmyjR5pY5wW+Udj5Z2aDFx6zOlMrm57gSUaIP58/GkfdKIrnOfu4asVir+p//CUDLKWETpwrNP2sU3wIKcsraouolwyUR6G+ENAunnNX5dVmE1Pf48XteSivtjgXnCP4pOVlvaFV8l1GOwsFhZl47KSpxLM599hh3wakU0k8kF0036cME2q4uE0QiIz3yYdg6XmegIHjix7wcWfUVWWqqXZX7XGJCZKv8s4Joq39ozrdnPk6Osiyg+2bAYAhfpYQMFyKIBZ2mlrX6vcKA65L4qaNQ4aFtWr+9uJ7MiY/nqVWJCpYjdiUi+iQff168M9Ep/Zc+OoWgfd1HF4wKrNCMF89Txr8MQ/lXtQiutKAYTEjXAAGY3ltIQmB0w/kIb6ELkqq6srAwJc7G1fWuA8e2kkuqz6LQ1VEth7uBZrEs+scZfr+DgFxpuDtzoKAveCkrr4DB+xNyIyeMDrsplvTdmMusJ0rUydy5bj/zveoNVUDLh1YfSs5hoeU6BIJhtXt7lq3D6Dkvfc8wGfiduWM8z3QW93S7tVtYcK4fN0CZtyJN8me+RggTTvZuqnRm1cpRbWTh8Eu/KRMq8tezCBVx/3lHrPqJmP/jgFXtLiq2DVI/ClAfn99DV5Ib8yplG2g2VSuLxyuqoeHiZXjbr3K5bbyDc9KNY0rcNOaYxjT05CG8Iq4sI+rHsvlg==|920 \ No newline at end of file diff --git a/Pages/项目首页/子页面/任务列表.json b/Pages/项目首页/项目首页子页面/任务列表.json similarity index 93% rename from Pages/项目首页/子页面/任务列表.json rename to Pages/项目首页/项目首页子页面/任务列表.json index fbc7ce85..e41e88f1 100644 --- a/Pages/项目首页/子页面/任务列表.json +++ b/Pages/项目首页/项目首页子页面/任务列表.json @@ -645,6 +645,17 @@ ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "PageLoadedCommandList": [ + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!项目子页面" + }, + "Title": "加载中" + } + ], "PermissionData": { "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", "permissionResource": { @@ -666,4 +677,4 @@ "PaperSize": {}, "Margin": {} } -}//bC9frGUvWJHYmf2pv8jZLU5Hlckyj2TpzI2MNhPaBKLPZSod2SO8qzc8EJyVopeTEK6oUaGEo3vsc/FciYmfi5pHnNpewWFLG0ODZk2FwM59zmjWS95qN3UeHsKjE2Ho+A80VMi840I7owzeZgdRnFI0xPBQkQw+WTwwbvqfKhia/KEgFiXWG32T9FvaSdkPuhvpEpqboXO9CoOF0X2NFtZBg8OpYLDdoT2ujXNOHbBHfblgtsBJ6WK4cKI/nBp5Nx6e9fB8yt0C4sMrjd8x9XMeiHXDx9RgswqVYc+LMF8UySFGLXD98nCZD8xULmRdQ8aSA8WhPSrGbUIh1IfkaaenCcccig6Hc9U07dRoDy6Z/7Gc6nklyOJxCh6SZzH1lpCHPyMuc+OMnHPlKWeeVLXPp5RG71pbsClOFjrOCn9y7TPFHpIKtIVAn+8QyQxA8DqQKxOYEo8FgiwKVYPkb+zTyVwRYttk3DK15AUFuaCrUVXy3JLaIyY51F7jMOd1EOQs4TbQtTwMQvn0k6Cz3cgikYrh/gOX330Y3jvk8c3tg04v1TzYF18f0snXECegNfuCeJLGMPrjvuuSlNSviacF+i9r2WXpbo2denX2ZmrYR8zWX67wNtR69ka1TBZ7qCsP2XIB+a14jgxtNKR04N96zuv/kj9AknR4aRBjghZ9kuB/1UNE/jM422KQQniQ0sIjy0wuqrcxkIoG8O7/ZNHW47FrAji9MfggUjvvm7+ZiNXBBPsrkN5R5uaw3HLzDZbVVu+2+GzAaJGcjFr7ViqpMHDJBVGHYPhhFMh7UZcRMq05v8I5Bz0vqZkcNR9BJFbWhMJHpsaFcsfx7LKWNKJzkMK09uaeFm6p8uWSdkih2/iO8fThRtWVERp++6QnqXjztW4zrdeSV2EXS0FHqw==|920 \ No newline at end of file +}//AxhBFHNFeua26PFXgxq4yOLFjMmnyzc5kwX/2DSYq+uU728H99bohPLec8F8KjgotIPZCyfGERuuOG+fRROZ2WZVqzQP3QguN06/mM/maYDdcUSyzCyU+M+LaN0hHyVhMsZ/BMPnNmd25ZP3hF68FNPRNNybmfsKsLSw5EJD5QZLz/zaVYO2tLN147WUcsc1AhTZv5DtfjTnI5POI0WsVuAZv/DyrxUc+dVlaoAokzIYGB3vWHT2HIgO4QEZ7c1iF3CmWaFtGO988q/TNlzRGDNq/pNhX+33IP/XpDskAKTlg2vZ2tp0wOqHgPdFNMiUW8OZdi/uEvw9hGjISnDNwE9zGdLcSj3E6n5/WQ9N80xtKnCCkhOoNWJCDyDzEuW6LZFqMyEfj+dTr+qrONbpJumET+gANGHpxV7Ge6599wtHcKvZXc/HfhZEPgOOmjtFu03aWoxl0x5m5XeIWOVL+GQWJpVc+OGvjY8W3QvM9/h/A3GYsqxQFMRbRxSg7t2O9jx+6yct73KeTR7kHIyam9X7EAL+XhSF2ynbKYaLrwYOTT/VsbOG7L2hXwaMuLeDp47Mytd4bPHOx4yL6GnuTS7hRVTkOUKzrKnAG0bAlM3IYg+6BEHjpPMNfpqQ2HQhFdSWrMPJrqh6L6yj3oiJDmmIVKR36oBYK7+i7FJ505+3G5v10M8eJWjGhEbwIzp3saVnJ3CP0wFTNGlXn9vQ7ovnBR0oQ871EVR9BKSgdDFw1JibBFr7dQie2qM38JbjCXJKabjAPl3J/tPtCZNKLMyeX619hNpmSxYrulJHYOi9Foj5u5qGbv1cBBE5FmVxDPSFr22YY13EJNKdBqs/iXeQ1BTEoFIZXBlE2StclAP6JeJc1hFQ0hvIUAjqzk/DMkrbEHBidEE39/Vn36/3FA==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目工时.json b/Pages/项目首页/项目首页子页面/项目工时.json similarity index 89% rename from Pages/项目首页/项目工时.json rename to Pages/项目首页/项目首页子页面/项目工时.json index c1d6daee..b69999ed 100644 --- a/Pages/项目首页/项目工时.json +++ b/Pages/项目首页/项目首页子页面/项目工时.json @@ -325,6 +325,8 @@ }, "placeholder": "请选择成员", "noDataText": "无数据", + "multiple": true, + "collapseTags": true, "filterInServerOptions": { "matchMethod": "contains", "loadingText": "加载中" @@ -334,7 +336,7 @@ } }, "1,11": { - "CssName": "singe-box", + "CssName": "singlebox", "CellType": { "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon", "Style": 3, @@ -371,7 +373,7 @@ } }, "1,26": { - "CssName": "singe-box", + "CssName": "singlebox", "CellType": { "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon", "Style": 3, @@ -423,7 +425,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "任务ID", - "GUID": "7593bae3-27a6-43e9-a346-a1507f61a76c", + "GUID": "007db99a-0c20-441c-ae48-e2dd7c22e784", "RelationBinding": { "RelatedTable": "任务表", "RelatedColumn": "ID", @@ -436,7 +438,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "任务ID", - "GUID": "e170c2c3-8d4c-4f00-b146-b0fc9d609f6d", + "GUID": "24c769ed-cecc-4444-b539-8bdd01fe1f93", "RelationBinding": { "RelatedTable": "任务表", "RelatedColumn": "ID", @@ -449,7 +451,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "执行人", - "GUID": "52692137-5179-4a8e-ad2a-9627ce5a8f86", + "GUID": "724ce8a1-3b00-4021-9147-d30b72d488f1", "AttachType": { "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", "UserColumnAttachType": 1 @@ -461,7 +463,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时类型", - "GUID": "a0aeef52-6aa5-4690-b94f-fabe336fdb52" + "GUID": "0c4cbf0a-50b4-42ea-ab55-abd411093b26" }, "ColumnName": "工时类型" }, @@ -469,7 +471,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时", - "GUID": "977f264b-2c6c-4726-af0a-caed0861864d" + "GUID": "530229df-a53e-4a33-8c8f-f4705427b085" }, "ColumnName": "工时" }, @@ -477,7 +479,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "时薪单价", - "GUID": "e30fe517-f5dc-4259-9196-80dde78c72d2" + "GUID": "8451aa5b-630d-4d7d-a19c-33b431c903cb" }, "ColumnName": "时薪单价" }, @@ -485,7 +487,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "计算提成", - "GUID": "d3bea778-02d8-4b74-8728-03a62e00764c" + "GUID": "666c145c-8f07-4f6f-89ef-7d77e2d24403" }, "ColumnName": "计算提成" } @@ -498,7 +500,7 @@ "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "项目ID", - "GUID": "7021c88b-4a53-4ea2-8dde-c3725cd70a5d" + "GUID": "cdaa64ff-354e-467c-9e69-29a7d05b5035" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -510,7 +512,7 @@ "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "工时类型", - "GUID": "8da50797-986d-4783-a570-49dd42792679" + "GUID": "34445eb7-1e47-44ae-b29c-f5c3b6785126" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -518,11 +520,12 @@ } }, { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 8, "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "执行人", - "GUID": "28afb3af-bedd-43b7-afa7-46dabafd52c8" + "GUID": "2bb4e0ec-547b-4431-b4df-47669d4123fe" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -532,10 +535,10 @@ ] } }, - "ID": "afe174cca1e64659848f287da52ca4c3" + "ID": "ee1272d3f7d148be98b767adca30f333" } ], - "ID": "e3bafca6-ce95-4bab-8e13-26e1b7785172" + "ID": "85d2739a-6d06-4d2b-8996-fae9c6198d16" }, { "Condition": { @@ -561,7 +564,7 @@ "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "执行人", - "GUID": "bd24178f-78f7-4800-b5d5-d565abac0d83", + "GUID": "39f176ba-cf67-445b-b06a-1ea3c49f56b8", "RelationBinding": { "RelatedTable": "用户信息视图", "RelatedColumn": "用户名", @@ -574,7 +577,7 @@ "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "总计划工时", - "GUID": "f0147ae1-caa9-4251-afe0-48bc16f9c4cf" + "GUID": "82d5854a-8c6a-40a3-aa6b-07717ab7d83e" }, "ColumnName": "总计划工时" }, @@ -582,7 +585,7 @@ "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "总实际工时", - "GUID": "8bb51062-95b3-4443-bb6d-88a9631193e9" + "GUID": "0e51eedc-dab5-4e3f-8ad7-b9d0dd7df5df" }, "ColumnName": "总实际工时" } @@ -595,7 +598,7 @@ "ColumnBindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "项目ID", - "GUID": "d6dfdf98-880d-495c-9d33-d4756b2926f3" + "GUID": "11161dfd-418d-4b2f-a403-fd3a55983fde" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -603,11 +606,12 @@ } }, { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 8, "ColumnBindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "执行人", - "GUID": "a45cad43-2650-422c-b4e9-73d2bc590999" + "GUID": "c2cccfb9-3431-47bf-8da0-74ff61e27606" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -617,10 +621,10 @@ ] } }, - "ID": "4137fcecbd804978ab5d58f8107b6deb" + "ID": "423975ad0be54effb47397a2063fcba2" } ], - "ID": "50c77d5b-9f6e-45eb-8593-79b475366352" + "ID": "38625fca-815c-4b2c-a996-2b6285d4f156" } ] }, @@ -821,6 +825,7 @@ "StyleDatas": { "Styles": [ { + "FontSize": 13.333333333333332, "Foreground": 0 }, { @@ -890,6 +895,17 @@ ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "PageLoadedCommandList": [ + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时!项目子页面" + }, + "Title": "加载中" + } + ], "PermissionData": { "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", "permissionResource": { @@ -917,4 +933,4 @@ "Formula": "项目工时!$B$6" } ] -}//Jbe5yB0tibrvAIkQyDHj3vFh9xy4NF4PUKEMrJPrfGk+bTR7qciDVBgTCgJHx6d47ZzAeTf3WCwFWPWgudCRVCqAmMj5bW9kIawVl7wa5HFlRBKkz701Q7jZrcHG8gHOFQouSbW78OvKEY9HqtSX3WhpmZEtXwuGgqtxdn1Z7r5hKYjH5uGgmnrmddsRwIwfNb5MaKI1iFFw2IZJ8NZb7LqMbNFYtiJHZegzi4ciekj5iwtuPfvqBdQAgIx77GLjRVxAZ/we1/FHpLD009E1WZWR664fdB2jAdhWke9Dh5aNxCzSNKg96bAXPdvXPkExKitdzbasW3kgq0FQUqDn/K5JH/bC7oRJhBqralt1FmQ3gZwJ7gc3gKL/WJEnbzjyQRujmy+xLTgK+Hj4N/f9gRh1wwsEiHCGVX1OQ6LCpC6MCIRfdm1AE17+w/RnxYL/Vn4GMA4NsbBr+JxWkq8sYn959H0eV3fml0/Wd6koIcwsG3ccpPGx4oY3uD7M4JVQKoRHVTM4ZFZXJ4NpeW7GYGffCPVn/tfwhh611vaVWI9paxYvGvXsf8eXsujlhxoEx47VYZWD9hhAnmIeDGNtAUiIpJGV2Neu4eCstq47IPVuepw6gLSzWSY9qmx4Mz5moOe1FSF0BwLtAy30mRt0weiHM9L4DeIV35qKOW3eDC16cEPoZOsP4Sp5ekeUP5tPEjcFFaYw3sa+3NGKBxP+Wuhxs0fZJ3iZIOdaCoOvFLymrUUareMOpIhACoWXwIxNPFTkjaTARXqrS0c89flGjWcSF9veaiGXhHdAMBcY8Fr4/c+aKl2mRed+HfjCgJJ9J28BexBA+wnewgq6vpi4oBO5AL/ph/QQuniVlwO9SFdN5BUCTjfR3swl701Ymq1CSdpuyuiHDO+MYpE8WXVTIA==|920 \ No newline at end of file +}//DL7Q/N4AhuAXD0T3XfxncWZM3/aIr/6rlwLKHHdP6iFxZK0vt6EtOn/5elz5Xl+9c1V0xjzvDTDwGKD4lYsy8tAY4sLklr2S+ylTQtDGgWoAvxo5IH9T/YEDYiTgGs14/gxj4fAtJcQRk5S2BDCeIl8kAHLLO4rb+3H1M5Q7jR1TBtL2QGO+FDvhpXZw+KqJ8lDOomFTifNOg/KBK1ggqTdq+i0CqRyEDmGTly3Ho2MAyCZjWKHdNX9tJndROvrImwwvyRtxcRNZArcOnVYHTEw6kuZ+fuVXlq35UIHusEK3yR/Rm2w5+aunxN/N+A4/qY8PxwAo04nHL+nIvU2M4hUgmuXS6vNyBgQuxyRWNfzB4BOivEkWyrdoJQPuZf8a1gpJxJsx30e3qAfKOY0JgEXlNOKD4XSUqHQys3slnEgf7StvqERLQuqlVzFLPumgS8T3kPDTwtWXsjdqqLR2cFWDeUIq57BEjz83RZxij0bpmjkM+ugJfTgiKf/l3yLxxnPeSQbfBDS1gZAuQi83OINKIOb8kDrI1tFoopXyAw/xArGP1kizTrTJqrK9VYobg4Qp+VrWZ7K7TmFD2VJON4KQztwWl+K4E3pA8MmQukO5xwkBWmUa3OyO4pUeVBNLROjrzbu+kX4a5D1uzSf3wLCPAvsJtMpeRdSPZGFCJWZml6imWuf4pxi2ekNm8com3zBmR2Ff1Zph0sCHoNQ1G0Fin9dlyW7GJqB6W/d3NJc36EbhuzxklJZMDt/868LKIq+aoXjzrxKar6RfRCuW+LnB4vICMIcYiICe+/aJpGuBfTIiXB+Axsuc1ZF2xUCRWYCRFE4PPk8vL9ulhXC6dfVZBJW/5V6gnItMghjESIeSzh9aYq42Ffmgp+gxUl/5O5azP2rPjw2sG+6bxhkjNA==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目首页子页面/项目成员统计.json b/Pages/项目首页/项目首页子页面/项目成员统计.json new file mode 100644 index 00000000..12247806 --- /dev/null +++ b/Pages/项目首页/项目首页子页面/项目成员统计.json @@ -0,0 +1,344 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 87.0, + "Mode": 1 + } + } + }, + "Count": 2, + "DefaultSize": 32.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "20": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "21": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "22": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "23": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "24": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "25": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "26": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "27": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "28": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "29": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "30": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "31": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "32": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + } + }, + "Count": 33, + "DefaultSize": 32.0 + }, + "Values": { + "0,0": "项目成员情况" + }, + "AttachInfos": { + "1,0": { + "CellType": { + "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", + "TemplatePageName": "5f448cc5e408484e9837a0183cf1365", + "DataSourceType": 1, + "DataSource": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "View_任务工时统计", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "执行人", + "GUID": "ea960229-a6c2-4278-9c58-aa3b7f5f02c5", + "RelationBinding": { + "RelatedTable": "用户信息视图", + "RelatedColumn": "用户名", + "DisplayColumn": "全名" + } + }, + "ColumnName": "执行人" + }, + { + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "执行人", + "GUID": "ade4efc1-dd63-4ade-bdc2-70253bc35607", + "RelationBinding": { + "RelatedTable": "用户信息视图", + "RelatedColumn": "用户名", + "DisplayColumn": "头像" + } + }, + "ColumnName": "头像" + }, + { + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "总计划工时", + "GUID": "3f3675ae-3007-4159-b793-b9b07e827d35" + }, + "ColumnName": "计划工时" + }, + { + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "总实际工时", + "GUID": "760c1a1e-2726-4727-b6aa-6138afc61c7a" + }, + "ColumnName": "实际工时" + }, + { + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员统计!实际工时&\"/\"&项目成员统计!计划工时" + }, + "ColumnName": "工时情况" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "项目ID", + "GUID": "36d1a996-4e85-4b9f-8d68-8f694ca5292d" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员统计!项目ID" + } + }, + "OrderBySqlCondition": { + "OrderByColumns": [ + { + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "总实际工时", + "GUID": "099752b6-2bd0-4db8-90a8-e53e53498fef" + }, + "Order": 1 + } + ] + }, + "IsListviewDataSource": true, + "CustomColumns": [] + }, + "DataSourceListviewName": "图文列表表格1", + "DisplayMode": 2, + "TemplateKey": "渐变卡片" + } + } + }, + "StyleDatas": { + "Styles": [ + { + "FontSize": 13.333333333333332, + "Foreground": 0 + }, + { + "HorizontalAlignment": 1 + } + ], + "Types": { + "Strs": [ + "Text 1 50", + "Center", + "Body" + ] + }, + "CellStyles": { + "0,0": 0, + "1,0": 1 + }, + "SheetStyle": { + "FontFamily": 2 + } + }, + "Spans": [ + "1,0,1,33" + ], + "PageInfo": { + "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + }, + "RowBreakLines": [], + "RepeatRangeSettings": [] + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + } +}//RARfYRhv/nkQyNV+oi6iGeQCIFfak51WDwy8FBbJCn/7vhE1QdoscNoStu3y0ZkUxZrNkuQ4Ft+4wUJxlXqC2pNlDcz0ldbjZ8Xeyh+UAjGdHUBshf9SdROBId0PZyZbd39sYlQAUs6T4Y/xdy16cMrXYRYcUIIEECrx6X8+mzBJ3pBS89GYG5QnF1E/90AYQY330H/ulhXKTYsAeRVQmihtDm5MyVI+jyT0tePuDve8RHgV298wFhM6aLK5A/Utl1/x+VQLrgM/3yi7VlK4XduU5PBdKVCKjzEsTqf6sMAXpqqnsAW1ZIzcdwsxJZpHkobrjSIW4b4Ft2POhZ7AQYvAMqoj6NfIcvrV964HpD3w9M3IVi5NZP97qkFo/5TJ/k+uBnoXbDRbscv+2u9GkjJPqrks0R2MGPhvv9PnxDzhjZEt6Qh9LPWTNXBY0W23jMQna7/99ZM+kgrOZJ07Mf5efX1M7fLCrlAYGMulDJOGdh6Klu57kRntwaX1N1AYVFEO2keQYTnoLB5xnEPwE1q4qEwbYgTBbm5suH8VtrE53hHChk8fQOGDEOYODNFoS4LEpOmulqWiBvpRqedIVrHk0pyEJVCP5CQu+R4W1XS7sqfE41O7bY5bXvCBkfJWy0LDtP2SYYsyf1KAXOhQY6OocA8JCXqwEqUgp7NzYYTUXW3fb1U56ivyH4IMO9hG8u2MKrEE75e7qTwnnmiyU7ztNufgry5I2k0kurT0HhEO3fkijicMS4GDdCgafx+JsB+HO71aQOFUARvlyjfhGQY3FNYBtkvPbsfkA/5hX1FMkttAjFVhPUUCsKtU4NdzHfPznxZXCLoCPgigicSKmdpPFw3YgUr1EliorqiL0/+NWJMIASeCUIv3t7Q0fUSKPsYSAxgfOoyqRwdEObentg==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目首页子页面/项目概况-关键数据.json b/Pages/项目首页/项目首页子页面/项目概况-关键数据.json new file mode 100644 index 00000000..2c493146 --- /dev/null +++ b/Pages/项目首页/项目首页子页面/项目概况-关键数据.json @@ -0,0 +1,415 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 22.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 27.0, + "Mode": 1 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + } + }, + "Count": 4, + "DefaultSize": 15.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "21": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "22": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "23": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "24": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "25": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "26": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "27": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "29": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "30": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "31": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "32": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "34": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "35": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "38": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + } + }, + "Count": 39, + "DefaultSize": 32.0 + }, + "Values": { + "1,1": "成员数", + "1,9": "任务数", + "1,17": "工时", + "1,25": "费用成本", + "1,33": "工时成本" + }, + "AttachInfos": { + "2,1": { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "项目成员数", + "GUID": "fe9b0d76-1afd-4719-8184-fbe9f6dd3939" + } + }, + "2,9": { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "任务完成情况", + "GUID": "9061c0f5-7531-42e6-add3-6b8672ff2020" + } + }, + "2,17": { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "工时情况", + "GUID": "2552529c-1f38-4c95-87e4-caa444bc4d72" + } + }, + "2,25": { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "费用成本情况", + "GUID": "830ce54a-f4cb-4fa5-b350-30f36058b4fc" + } + }, + "2,33": { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "工时成本情况", + "GUID": "27bf41c1-9428-4320-9df2-9dc4c5275d30" + } + } + }, + "StyleDatas": { + "Styles": [ + { + "Foreground": 0 + }, + { + "FontFamily": 1, + "FontSize": 13.333333333333332, + "Foreground": 0 + }, + { + "FontFamily": 1, + "FontSize": 13.333333333333332 + }, + { + "FontFamily": 1, + "FontSize": 13.333333333333332, + "Foreground": 0, + "Formatter": 2 + }, + { + "FontSize": 18.666666666666664 + }, + { + "FontFamily": 1, + "FontSize": 18.666666666666664 + } + ], + "Types": { + "Strs": [ + "Text 1 50", + "Body", + "[AUTO]General" + ] + }, + "CellStyles": { + "1,1": 0, + "1,9": 1, + "1,10": 2, + "1,11": 2, + "1,12": 2, + "1,13": 2, + "1,17": 3, + "1,18": 2, + "1,19": 2, + "1,20": 2, + "1,21": 2, + "1,25": 3, + "1,26": 2, + "1,27": 2, + "1,28": 2, + "1,29": 2, + "1,30": 2, + "1,31": 2, + "1,32": 2, + "1,33": 3, + "1,34": 2, + "1,35": 2, + "1,36": 2, + "1,37": 2, + "2,1": 4, + "2,9": 5, + "2,17": 5, + "2,25": 5, + "2,30": 5, + "2,31": 5, + "2,32": 5, + "2,33": 5 + }, + "SheetStyle": { + "FontFamily": 1, + "FontSize": 13.333333333333332 + } + }, + "Spans": [ + "2,1,1,5", + "2,9,1,5", + "2,17,1,5", + "2,25,1,5", + "2,33,1,5" + ], + "PageInfo": { + "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + }, + "RowBreakLines": [], + "RepeatRangeSettings": [] + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + }, + "BackgroundPictures": [ + { + "Name": "03b7333f-bfbc-420b-a524-e1718dd98162.png", + "DisplayName": "背景图1", + "StyleInfo": { + "CornerRadius": 6.0, + "Fill": "Background 1 0", + "StrokeDashType": 8, + "Stroke": "Background 2 0", + "StrokeThickness": 1.0 + }, + "IsAutomaticStroke": false, + "IsAutomaticFill": false, + "Size": "190,79" + }, + { + "Name": "6154fb52-2385-4d1d-abc8-01b77955c5f6.png", + "DisplayName": "背景图2", + "StyleInfo": { + "CornerRadius": 6.0, + "Fill": "Background 1 0", + "Stroke": "Background 2 0", + "StrokeThickness": 1.0 + }, + "IsAutomaticStroke": false, + "IsAutomaticFill": false, + "Location": "205,0", + "Size": "190,79" + }, + { + "Name": "769f904e-1d99-4edb-b1dc-4a48a3dcf371.png", + "DisplayName": "背景图3", + "StyleInfo": { + "CornerRadius": 6.0, + "Fill": "Background 1 0", + "Stroke": "Background 2 0", + "StrokeThickness": 1.0 + }, + "IsAutomaticStroke": false, + "IsAutomaticFill": false, + "Location": "410,0", + "Size": "190,79" + }, + { + "Name": "4cdb3ab8-4b9f-40b2-98ff-ca716a91f9cc.png", + "DisplayName": "背景图4", + "StyleInfo": { + "CornerRadius": 6.0, + "Fill": "Background 1 0", + "Stroke": "Background 2 0", + "StrokeThickness": 1.0 + }, + "IsAutomaticStroke": false, + "IsAutomaticFill": false, + "Location": "615,0", + "Size": "190,79" + }, + { + "Name": "6512132f-7136-446d-a971-e9f12489d7ab.png", + "DisplayName": "背景图5", + "StyleInfo": { + "CornerRadius": 6.0, + "Fill": "Background 1 0", + "Stroke": "Background 2 0", + "StrokeThickness": 1.0 + }, + "IsAutomaticStroke": false, + "IsAutomaticFill": false, + "Location": "820,0", + "Size": "190,79" + } + ] +}//WC5oyeg84TOBtmXup5Wr+9ZyPziInw9KN47RWsc2yEz4z+d1bbfU5KNgGehEpZJgVu8jm/iTMQDXjBMajy8GfXv3dari2HC3Kp1vClxP+CWJ8NwfgPhDRRvnceFq9rpu+lc2kTvoWwVrO9phxOdX8qvt2GvY+UMUIDorIjraPRZe/UUyFMZPz39x15R8zwpDucqpWoMj6FIYFQ7MkQAQpgIjhmdbm1Zadg/nre5wiHENIgRiw6t1yPX2bXjbHVEIoy+tFmP5SnqQSOVP3LspTVvPKsvn3WvQwGNBuwSEYF4oE5kvXJuowRxFNG5+1puF0TpxBRpIJExrVtADgzY7yDNXNO+mvFTyx2zg9agnqrsP9HDBgm+NqSm7XC7DPxJGwSo8SeoIbNlS88C0K7J6LPoxOhnaQ3kSdde/pTM+OAKmcIMMixHFzhu7tDBv/ZiMAONOAo9F1F9hYcJQLHTuF34AvllUPLkcWJ6vZCJONDjh0OxsEY7CM8xgAVYnoQZG5eoDuD5IvkCK8Cz5N9KWj4OrXk/WjQRurGr8tto451DLij/lmXa4++QOileNy/DGzT6qgzGJETdFxWY5cMNlV2dkk4Vg9odzcd1glK5oqm9vkOhXBSfhNAahrYSnwIYptJ++vsgozfMqJgv3YSUo2ZI8C0n3KUakWXYyDeR80jcc1Z9kBEpOY1rJP74NciEYiPzIXSnT43ep8fBslCBecRmqNPmoMp2iX190I9q0MjRMPlZhlp7p6vQ6S1638NiTUQlgZM1N+XSpnC6T2UXB7KfbErmN38k775/u8bO3ugRi1D0BQcwL6kFrdKErIQzeX+epd9VUMBDxqvVZpnzWeB89T4AgGg1z7cUHwk2ku7iunDwORN+7eG/XAwDbMN7upB5Sox9W5+hLWmW6AvLoew==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目首页子页面/项目概况.json b/Pages/项目首页/项目首页子页面/项目概况.json new file mode 100644 index 00000000..7f191db6 --- /dev/null +++ b/Pages/项目首页/项目首页子页面/项目概况.json @@ -0,0 +1,527 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 82.0, + "Mode": 1 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 117.0, + "Mode": 1 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 177.0, + "Mode": 1 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 188.0, + "Mode": 1 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + } + }, + "Count": 10, + "DefaultSize": 10.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "20": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "21": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "22": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "23": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "24": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "25": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "26": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "27": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "28": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "29": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "31": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "36": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "37": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "38": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "39": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "40": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "41": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + } + }, + "Count": 42, + "DefaultSize": 32.0 + }, + "Values": { + "1,1": "项目概况-关键数据", + "3,1": "项目成员统计" + }, + "AttachInfos": { + "1,1": { + "CellType": { + "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", + "PageName": "项目概况-关键数据", + "OverflowMode": 1 + } + }, + "1,32": { + "CellType": { + "$type": "ElementUI.TimelineCellType, ElementUI", + "useBinding": true, + "options": [ + { + "content": "活动按期开始", + "timestamp": "2018-04-15" + }, + { + "content": "通过审核", + "timestamp": "2018-04-13" + }, + { + "content": "创建成功", + "timestamp": "2018-04-11" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "项目动态", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目动态", + "GUID": "65db9db5-a46b-4b9c-aa49-258bf2fdef49" + }, + "ColumnName": "content" + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "FGC_CreateDate", + "GUID": "6d9d0eee-5703-4e14-b438-a21e533e487a" + }, + "ColumnName": "timestamp" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目ID", + "GUID": "3890d53f-f1ab-4dae-9f76-f12d44261ffa" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目概况!项目ID" + } + }, + "CustomColumns": [] + }, + "sort": "descTimestamp", + "NodeSize": "normal", + "placement": 0, + "format": "yyyy-MM-dd" + } + }, + "3,1": { + "CellType": { + "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", + "PageName": "项目成员统计" + } + } + }, + "StyleDatas": { + "Styles": [ + { + "FontSize": 13.333333333333332, + "BorderLeft": 0 + }, + { + "BorderLeft": 0 + }, + { + "FontFamily": 1, + "HorizontalAlignment": 2 + }, + { + "FontFamily": 1 + } + ], + "Types": { + "Strs": [ + "Background 2 -10", + "Body", + "Center" + ], + "Borders": [ + { + "Color": 0 + } + ] + }, + "CellStyles": { + "1,32": 0, + "2,32": 1, + "3,1": 2, + "3,32": 1, + "4,32": 1, + "5,32": 1, + "6,32": 1, + "7,1": 3, + "7,2": 3, + "7,3": 3, + "7,4": 3, + "7,5": 3, + "7,6": 3, + "7,7": 3, + "7,8": 3, + "7,9": 3, + "7,10": 3, + "7,11": 3, + "7,12": 3, + "7,13": 3, + "7,14": 3, + "7,15": 3, + "7,16": 3, + "7,17": 3, + "7,18": 3, + "7,19": 3, + "7,20": 3, + "7,21": 3, + "7,22": 3, + "7,23": 3, + "7,24": 3, + "7,25": 3, + "7,26": 3, + "7,27": 3, + "7,28": 3, + "7,29": 3, + "7,30": 3, + "7,32": 1, + "8,1": 3, + "8,2": 3, + "8,3": 3, + "8,4": 3, + "8,5": 3, + "8,6": 3, + "8,7": 3, + "8,8": 3, + "8,9": 3, + "8,10": 3, + "8,11": 3, + "8,12": 3, + "8,13": 3, + "8,14": 3, + "8,15": 3, + "8,16": 3, + "8,17": 3, + "8,18": 3, + "8,19": 3, + "8,20": 3, + "8,21": 3, + "8,22": 3, + "8,23": 3, + "8,24": 3, + "8,25": 3, + "8,26": 3, + "8,27": 3, + "8,28": 3, + "8,29": 3, + "8,30": 3, + "8,32": 1 + }, + "SheetStyle": { + "FontFamily": 1 + } + }, + "Spans": [ + "3,1,1,30", + "7,1,1,30", + "5,1,1,30", + "1,1,1,30", + "1,32,8,9" + ], + "PageInfo": { + "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "PageLoadedCommandList": [ + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "项目ID", + "GUID": "3ad520ca-8715-461f-8071-64ff78b713ae" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目概况!项目ID" + } + } + }, + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目标题!项目子页面" + }, + "Title": "加载中" + } + ], + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + }, + "RowBreakLines": [], + "RepeatRangeSettings": [] + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + }, + "CustomNames": [ + { + "Name": "工时走势", + "Formula": "项目概况!$B$8" + }, + { + "Name": "关键数据", + "Formula": "项目概况!$B$2" + }, + { + "Name": "任务情况", + "Formula": "项目概况!$B$6" + }, + { + "Name": "项目成员", + "Formula": "项目概况!$B$4" + }, + { + "Name": "项目动态", + "Formula": "项目概况!$AG$2" + } + ] +}//e1ce8ObNzKXiATkA/CFY/dZRzeA2IZHt4iRdDoL+Y0uzAUO84hAJPE8U002oioYuE4RF3mEmUSm2SYDSLQISeCNA43SmhbbvXZqBCbLILmINrQFmF54/pUtOMG/Hu+rmsPOpGPG6z7u1SaJIc1pBtO3HryIdhTjN5xHF54urg4T5O0y09dDicMktJJqGJt7Fq9ZCYTKS1CTeA+OJvr2Z4It3qs/w8j+6sDMINCObbjKmDzWMO0HqtyfbIJsrhrEvj6od1Dq7cZo6a+mGtJSIAAX8LRpzqZXmrtiMQJkkEQ4B3Vr+E4RsfTsNlfi33Nl6MhUHnL8QxHeCRq5p29DSfg94qQh//uZqOAhBRLBmFwWwAZosFbrBle+z9atyz6k7Wjj743adb795CT/LaXPOoHtMG+WTiSgF5qunMASPGc84j6ZHKExJTWxLKADGfsc5JBMn2hr1LJGckja2HuSpmN06lq9lh78hGb9lWsclq/pV+0emCmKj96l4iJmqs1wiIr2wYFQKhRLWqs/89vWRqzlHJgTn3UQzSTZCvn6NO9reAH//6OdUtaVvRlQGu+Jc2XUm+yHpST8CrYVIDByx8ByftE0JMh0tMm4EIyYx6l9hrJjBuP9fr+nqfrS/KJpZ2KjVlzJIvu5tAJKf21cZw9QkLOe4rShzlokEbU1RlXRQte6vA7Q308+M/miYz6NjA5327SPxbpARJCdWDlmyYfVuoxUhlnOkOJEwEczfNQB1T6NNVsu35rvWvherHfQSv1yYF3aXKJFN0g7/qZ/ynZ8CWsQa6QMYmmTzSEQwpPkKQ8YXrHV7vNySkwNeWZ5OqHF2wB6ygvOZUNq7RdrIofFSAMvYsYiXn5+r7HjUJ/LHyreudEjPey/y7jXb8X6s9nofr8mEPzE1IBg25A5vsA==|920 \ No newline at end of file diff --git a/ServerCommands/任务/变更任务状态.json b/ServerCommands/任务/变更任务状态.json index 266ed732..c273a566 100644 --- a/ServerCommands/任务/变更任务状态.json +++ b/ServerCommands/任务/变更任务状态.json @@ -48,11 +48,27 @@ "TableName": "任务表", "TableValueType": 1, "BindingInfos": [ + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "417ccd27-5484-41ae-9712-c69d5b98c6fa" + }, + "ColumnName": "项目ID" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务名称", + "GUID": "59897440-858b-44cb-aa96-6e74d4f7751c" + }, + "ColumnName": "任务名称" + }, { "BindingInfo": { "TableName": "任务表", "ColumnName": "任务状态", - "GUID": "afbdd48e-487e-440c-b59c-e565e61e9cd1" + "GUID": "8f13c1bf-e86a-4cb1-afd2-492b85d4cc08" }, "ColumnName": "任务状态" }, @@ -60,7 +76,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "任务状态", - "GUID": "c2c55272-c31d-4118-b3a8-a8e1690ce6b5", + "GUID": "59dd4107-010a-41cb-b897-a68506488492", "RelationBinding": { "RelatedTable": "任务状态", "RelatedColumn": "状态码", @@ -73,7 +89,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "执行者", - "GUID": "f650100e-6369-4760-a093-a73cb3a74f7a" + "GUID": "1feee22d-be59-401f-bf83-954a38a92dbb" }, "ColumnName": "执行者" }, @@ -81,7 +97,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "开始时间", - "GUID": "fb57404b-3cad-4911-9eec-6a424d3ba882" + "GUID": "b582715f-80a4-4224-8423-f78cd0c8931e" }, "ColumnName": "开始时间" }, @@ -89,7 +105,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "结束时间", - "GUID": "5b07138d-c511-4f69-ba7d-46c7e067ccd0" + "GUID": "4e747135-a8aa-4f79-9c50-37d6915e63c3" }, "ColumnName": "结束时间" }, @@ -97,7 +113,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "任务类型", - "GUID": "4cd38e49-3e3a-4c0d-a71d-a3db6d2d4b60" + "GUID": "832e03dc-8b1d-42c1-8053-7e14912e96b9" }, "ColumnName": "任务类型" } @@ -107,7 +123,7 @@ "ColumnBindingInfo": { "TableName": "任务表", "ColumnName": "ID", - "GUID": "39e445d7-7f6a-4403-aaad-904e8e86474a" + "GUID": "135664f5-205c-4493-b3d0-5764de228e17" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -116,7 +132,7 @@ }, "TopCount": "1" }, - "ID": "92bcc24f55b847a9a5d795ab096048ed" + "ID": "aca960b8f6fa4b4ba9f94d2990702543" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -155,6 +171,38 @@ "compareType": 1 }, "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "新任务状态", + "TableValue": { + "TableName": "任务状态", + "OnlyGetValue": true, + "TableValueType": 0, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "任务状态", + "ColumnName": "任务状态", + "GUID": "263a2a05-e711-4f5c-90ac-5114c2367ddc" + }, + "ColumnName": "任务状态" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务状态", + "ColumnName": "状态码", + "GUID": "726e05d0-450e-4d21-9fc3-9bd5c6975e85" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=状态码" + } + } + }, + "ID": "d13f627dec7147d68c48a6324b2316ff" + }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -182,7 +230,7 @@ "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "任务ID", - "GUID": "484f7f7d-70e0-4450-b1b5-05e631733d79" + "GUID": "aeafd224-f511-481e-8355-8d0f79ac733a" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -191,7 +239,7 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "e07a763289954cb29930901258108a44" + "ID": "ff207234ca244312adfeb7866e96d51c" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -219,12 +267,12 @@ } } ], - "ID": "57d72271-f903-47ea-88b1-772145976e08" + "ID": "d2dc029c-1158-4eb6-9840-d0941f0f0802" } ] } ], - "ID": "1461a11a-f9bd-4d9f-a414-35b0e7471f86" + "ID": "69504d3b-5071-49f7-8ee4-1ce0686b49b4" }, { "Condition": { @@ -261,12 +309,12 @@ "Message": "任务执行者不能为空" } ], - "ID": "4381895d-aa83-45b0-b9a4-2c1ca6e8aa2b" + "ID": "3a3e1ca4-7b44-49f6-a725-980444eefdba" } ] } ], - "ID": "2077a523-e818-4741-bf46-2836d81ad4a9" + "ID": "e4bfc3f7-a597-4aec-b117-942450d019f5" }, { "Condition": { @@ -303,43 +351,86 @@ "Message": "任务执行者不能为空" } ], - "ID": "381e934c-ce36-4b13-8abd-f889ea350a9d" + "ID": "16ea04e5-64f8-49ac-b831-cc583cddcd83" } ] } ], - "ID": "5c67b8b1-d3d0-4068-bb42-346d51d4d375" + "ID": "51122708-5488-4f2b-8758-80955ecaabf0" } ] }, { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "任务表", - "ShowConfirm": false, - "RowsToUpdate": 1, - "RowsToUpdateCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务表", - "ColumnName": "ID", - "GUID": "a2c10ff5-a33d-46de-b3f8-ddcfcc7948a7" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务ID" - } - }, - "UpdateBindingValues": [ + "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", + "CommandList": [ { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务状态", - "GUID": "a698faf8-07b4-4e5f-ada0-dd9f31c1cdd7" + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "8cd30f24-ad8d-43c1-9342-2c7f001d137f" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=状态码" - } + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务状态", + "GUID": "b6b9fc50-b337-45f0-9d44-6a04a85738ec" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=状态码" + } + } + ] + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目动态", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目ID", + "GUID": "82e1c9b2-262a-4b83-b739-bebfd46ad1ed" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.项目ID" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目动态", + "GUID": "73537d3b-79a9-4417-85a4-b0497bd91cdf" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"任务[\"&任务信息.任务名称&\"]从\"&任务信息.任务状态文本&\"状态变更为\"&新任务状态" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "执行人", + "GUID": "29bbefd3-fbee-46d3-916c-2ef8e1642935" + }, + "Value": "%CurrentUser%" + } + ] } ] }, @@ -349,7 +440,7 @@ "Message": "操作成功" } ], - "ID": "e358cd4e-0338-48cb-8b79-d474d8343331" + "ID": "1d2abb19-40c8-48c5-8817-c9e5f56cafa5" }, { "CommandList": [ @@ -359,12 +450,12 @@ "Message": "操作成功" } ], - "ID": "a79b949e-f0ff-44e7-9685-5693135ddec8" + "ID": "595ddc94-840e-4327-aa97-52ae28da4da0" } ] } ], - "ID": "c6d0246e-17fc-45bf-b64f-33954fa2971b" + "ID": "65ee5a64-9f54-4c08-8091-ccf5f2e4f471" }, { "CommandList": [ @@ -372,7 +463,7 @@ "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon" } ], - "ID": "d6a89ce9-b9c2-4091-80a8-c431a63ae888" + "ID": "22104fdf-f46c-42f6-8386-4727f7895d1b" } ] } diff --git a/ServerCommands/任务/新增任务.json b/ServerCommands/任务/新增任务.json index e2efd099..24920394 100644 --- a/ServerCommands/任务/新增任务.json +++ b/ServerCommands/任务/新增任务.json @@ -87,7 +87,7 @@ "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "用户名", - "GUID": "51d4a9ca-c85c-4dd1-97d8-248303d2c5d1" + "GUID": "65e8a5b2-d055-4d75-980e-64ec0ff052db" }, "ColumnName": "用户名" }, @@ -95,7 +95,7 @@ "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "全名", - "GUID": "de53ee8c-3acf-4524-a8d4-88655d6504f3" + "GUID": "8847c1cf-53e1-4aac-8562-95c7325cc4b9" }, "ColumnName": "全名" }, @@ -103,7 +103,7 @@ "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "默认时薪", - "GUID": "cf38dbe9-3311-47a0-8e2b-358382d1c1e9" + "GUID": "23e39e20-adf1-40f6-ac99-7201bd166a5c" }, "ColumnName": "默认时薪" } @@ -114,7 +114,7 @@ "ColumnBindingInfo": { "TableName": "用户信息视图", "ColumnName": "用户名", - "GUID": "b3340080-0c96-47f6-8a6c-8bb0b1db7e2c" + "GUID": "5aeb92ea-1ea6-4872-9c4e-5fe7d75f5c08" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -122,7 +122,7 @@ } } }, - "ID": "cd95c7b64259445cb44beba6e33ffa63" + "ID": "e3847d67f1ab4509a4c983a05b0bd7f9" }, { "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", @@ -137,7 +137,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", - "GUID": "840c8c9e-c205-4aa6-8ae0-8fd2a2cf55f3" + "GUID": "3ac652c3-66fb-47bd-874b-4320475a21d1" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -148,7 +148,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "父任务ID", - "GUID": "e2193e55-9ed2-45fe-bb4b-ed01a39e8f0e" + "GUID": "1f07338e-2288-4d61-959b-89f635363cd4" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -159,7 +159,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "任务名称", - "GUID": "61735f45-ac25-4b94-acd4-3e0ca04c286a" + "GUID": "3718b0bd-070e-4600-8715-dcf3e24c94ac" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -170,7 +170,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "执行者", - "GUID": "8fd4e7c3-9cc8-4820-b538-8d38ce0397ac" + "GUID": "4a4488e5-8299-45b0-9af2-990e4cc76a12" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -181,7 +181,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "开始时间", - "GUID": "3c2005d1-3ffd-4fa3-a63e-8d730705f04a" + "GUID": "683a964b-4e37-4fc2-95c8-a32a5ef49b98" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -192,7 +192,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "结束时间", - "GUID": "9885b0a1-c0db-4469-a016-eec2c4c185d8" + "GUID": "2b2ffb2b-b60b-444f-9cf4-1d1205f43e1a" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -203,7 +203,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "任务类型", - "GUID": "ed0cf347-43c6-4143-a3a0-47c6b719557b" + "GUID": "db0eb559-32bc-4d77-b592-a7d1a1f9dfef" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -214,7 +214,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "分组ID", - "GUID": "fce23d46-9199-4655-9ea9-208f9c858e80" + "GUID": "a2f9ca94-58eb-4d71-9c2c-1389173fc4da" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -225,7 +225,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "版本", - "GUID": "8db3510a-7e1c-4243-afbe-48966b63b530" + "GUID": "7537bed4-54aa-4089-9ab2-3858bf5f84d4" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -236,7 +236,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "任务说明", - "GUID": "1d077053-81b2-4291-b33b-f44d29b31b27" + "GUID": "52850429-1eb2-4bbc-ada8-4aa509476764" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -247,7 +247,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "备注", - "GUID": "c614ca74-8059-486c-a881-a0ca4425df32" + "GUID": "9e46dee4-005a-4bee-a4f7-ee41d5e3ca5a" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -258,7 +258,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "工时核定方式", - "GUID": "956b54f8-b234-4423-8e41-f255c3feaac2" + "GUID": "0e919c63-7450-4099-8a2f-209f57f04de8" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -269,7 +269,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "任务状态", - "GUID": "1f8faed8-d128-4482-90c1-25e0e6cad40a" + "GUID": "85821a7c-ba18-42b2-b9d7-ba0dd5a11e00" }, "Value": "0" } @@ -297,7 +297,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "任务ID", - "GUID": "9a85ad00-0b95-4ae4-8296-04862f2c8b03" + "GUID": "361b6b3c-69df-408f-a21b-4886f6b7a4f0" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -308,7 +308,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "参与人", - "GUID": "404fdb7a-2ecd-4db1-8b39-aec7c663bfe3" + "GUID": "6bd951db-7e72-46fe-a0b0-2237549dd27f" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -319,7 +319,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "任务时薪", - "GUID": "bea75b1c-9d0c-466e-ac27-37df94c31440" + "GUID": "f239856b-04dd-4447-b3e5-4513ed30d85d" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -329,6 +329,44 @@ ] } ] + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目动态", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目ID", + "GUID": "2c28402f-de3d-469d-87d3-1f655cd25b9b" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目动态", + "GUID": "50c7025d-2a5a-4673-a963-a24315307d2a" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"新增任务[\"&任务标题&\"]\"" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "执行人", + "GUID": "035de14f-955c-484a-9d86-716840bcfffb" + }, + "Value": "%CurrentUser%" + } + ] } ] }, diff --git a/ServerCommands/任务/移除任务成员.json b/ServerCommands/任务/移除任务成员.json index b1b13896..ddc29cd5 100644 --- a/ServerCommands/任务/移除任务成员.json +++ b/ServerCommands/任务/移除任务成员.json @@ -51,7 +51,7 @@ "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "任务ID", - "GUID": "5fb317c6-8101-48cd-893d-2758d549729f" + "GUID": "bf631fc5-2aea-4f67-8c3e-5687fcd17db1" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -63,7 +63,7 @@ "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "执行人", - "GUID": "0a8199b6-268c-4a4e-87da-1c4bd4dbf6ea" + "GUID": "2a652f1e-a4f3-4c21-83cf-0e8546ac250c" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -74,7 +74,7 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "795cb7cd430945c68dbd04d92fbf1bf4" + "ID": "779d1a620e1f4c5fb9e69747944b537b" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -93,49 +93,197 @@ }, "CommandList": [ { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "任务成员表", - "UpdateType": "delete", - "ShowConfirm": true, - "ConfirmText": "您确定要删除吗?", - "RowsToUpdate": 1, - "RowsToUpdateCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "任务信息", + "TableValue": { + "TableName": "任务表", + "TableValueType": 1, + "BindingInfos": [ { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务成员表", - "ColumnName": "任务ID", - "GUID": "00ffba4f-9904-4623-bd2e-206d3b8d3614" + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "f86b2436-5824-47c8-80e9-7deaa1385b6b" }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务ID" - } + "ColumnName": "项目ID" }, { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务成员表", - "ColumnName": "参与人", - "GUID": "d107675e-70ed-47fd-b145-f99afe00253c" + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务名称", + "GUID": "85d6de7c-6adf-4725-bfea-d450b404f74e" }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=成员用户名" - } + "ColumnName": "任务名称" } - ] - } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "5f9bb9c4-f177-4206-9975-eaeb99acc1de" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } + }, + "TopCount": "1" + }, + "ID": "8174cfc9dc9c4c6e990ea8a6e0cc7dd4" }, { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "0", - "Message": "移除成功" + "$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": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "成员全名", + "TableValue": { + "TableName": "用户信息视图", + "OnlyGetValue": true, + "TableValueType": 0, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "9dd6b21a-caef-4226-9747-b359dea02e9b" + }, + "ColumnName": "全名" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "d91c3fdb-7b4a-4a6c-81e5-2e83e3d1f3b9" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=成员用户名" + } + }, + "TopCount": "1" + }, + "ID": "c3a79e37337f461e92466b13d96434af" + }, + { + "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务成员表", + "UpdateType": "delete", + "ShowConfirm": true, + "ConfirmText": "您确定要删除吗?", + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务成员表", + "ColumnName": "任务ID", + "GUID": "17bed3eb-36f7-46c3-b030-c125facc33ec" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务成员表", + "ColumnName": "参与人", + "GUID": "a66e269f-657c-4cd7-b545-5b61dc9ed8c8" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=成员用户名" + } + } + ] + } + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目动态", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目ID", + "GUID": "16af2943-b274-4526-a1a1-1d0b184df4e5" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.项目ID" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目动态", + "GUID": "00834ae4-957a-482a-91f9-fdd15fef7b25" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"任务[\"&任务信息.任务名称&\"]将\"&成员全名&\"移除\"" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "执行人", + "GUID": "1b67fbcf-23b4-4e5b-a3a0-c9a49cb17903" + }, + "Value": "%CurrentUser%" + } + ] + } + ] + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "移除成功" + } + ], + "ID": "9dcb7de5-d631-419a-9738-73fd00ef7534" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": "任务不存在" + } + ], + "ID": "c9324acc-950d-47c9-894e-9bb14eb9a90a" + } + ] } ], - "ID": "b54a97c5-6bad-4d9f-b704-8a73e3ce8cbd" + "ID": "8201f684-7b40-4039-be3c-7b3cbef6c74d" }, { "CommandList": [ @@ -145,7 +293,7 @@ "Message": "该成员存在报工记录,无法移除!" } ], - "ID": "e0a62269-f13b-4e6d-b0e2-97a5e424162e" + "ID": "482a94d6-200b-4bf9-adad-32b14cd7d24c" } ] } diff --git a/ServerCommands/工时/新增工时.json b/ServerCommands/工时/新增工时.json index 7ca7f8ba..884155d6 100644 --- a/ServerCommands/工时/新增工时.json +++ b/ServerCommands/工时/新增工时.json @@ -92,7 +92,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", - "GUID": "bf1892fb-3938-4567-bf3d-03d0108ec470" + "GUID": "bb20fdc3-0297-49f1-ab7e-1fd6a72d1b4f" }, "ColumnName": "项目ID" }, @@ -100,7 +100,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "任务状态", - "GUID": "99a610c7-d74e-41dc-8b6a-fdb8dd30874d" + "GUID": "8209e318-8db6-4b0b-be51-ac7f7708da86" }, "ColumnName": "任务状态" }, @@ -108,7 +108,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "任务状态", - "GUID": "74bdda59-4098-47df-8405-fb0214c6e424", + "GUID": "69980b59-ccac-40f8-b175-9d1ce3a0cd0f", "RelationBinding": { "RelatedTable": "任务状态", "RelatedColumn": "状态码", @@ -121,7 +121,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", - "GUID": "01bb3df8-0942-4ead-935c-6f935c35ee66", + "GUID": "7477f4b3-4261-410f-92f3-ec4f17977e56", "RelationBinding": { "RelatedTable": "项目表", "RelatedColumn": "ID", @@ -134,7 +134,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", - "GUID": "adfd8b1d-91a8-48dd-9c09-b0b8834a405d", + "GUID": "26218662-d3c9-4467-8302-886d229b9e1e", "RelationBinding": { "RelatedTable": "项目表", "RelatedColumn": "ID", @@ -147,7 +147,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", - "GUID": "373bdd3a-1052-44e5-beb9-843f8827f61f", + "GUID": "7f5ccbe0-4bcf-4fff-bed9-5099a6c7f24d", "RelationBinding": { "RelatedTable": "项目表", "RelatedColumn": "ID", @@ -160,7 +160,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", - "GUID": "f25e468b-e478-475a-8338-b29a5136c34f", + "GUID": "19794bfa-cb8a-4893-95f0-07303a3cbe29", "RelationBinding": { "RelatedTable": "项目表", "RelatedColumn": "ID", @@ -173,7 +173,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "任务类型", - "GUID": "8c7067c3-a8e1-492a-afe0-e1d046fd2c15", + "GUID": "7c7d1161-864d-46c5-89da-5eaaf1eec879", "RelationBinding": { "RelatedTable": "任务类型", "RelatedColumn": "ID", @@ -188,7 +188,7 @@ "ColumnBindingInfo": { "TableName": "任务表", "ColumnName": "ID", - "GUID": "5ddc304c-99c2-4a9d-9fd0-fb58421f3730" + "GUID": "dd9dcf5f-2c56-43e7-b1fd-fac6aa05a3ca" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -198,7 +198,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "2918ea32f3884e7e98305ac9f149746f" + "ID": "665750151a594df6a048b8d95bed1ea7" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -211,7 +211,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "参与人", - "GUID": "726fb609-b6ac-4a09-b21b-759b5bc6b612" + "GUID": "cda3345e-0eb7-4d5f-adf7-3f52ca9f73c5" }, "ColumnName": "参与人" }, @@ -219,7 +219,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "参与人", - "GUID": "c3a3ac42-a9c4-4e1b-844b-784720a48929", + "GUID": "5a9a96a5-57b7-4711-b44e-1acbf70974c8", "AttachType": { "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", "UserColumnAttachType": 5, @@ -232,7 +232,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "任务时薪", - "GUID": "c9bf3e12-738f-4805-adae-174e64aacbf0" + "GUID": "605be2d4-7bb3-4ae7-b001-9f80d68f9112" }, "ColumnName": "任务默认时薪" }, @@ -240,7 +240,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "岗位ID", - "GUID": "4f17650c-15e6-4e68-ae15-7740091c7f81", + "GUID": "697c882c-f66c-46bd-a196-cde86291560a", "RelationBinding": { "RelatedTable": "项目岗位", "RelatedColumn": "ID", @@ -253,7 +253,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "参与人", - "GUID": "fc12088c-5de9-4f86-8344-767b6c2bc66f", + "GUID": "5c2bd0b7-bb61-40de-922f-cae4993b46a6", "AttachType": { "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", "UserColumnAttachType": 5, @@ -268,7 +268,7 @@ "ColumnBindingInfo": { "TableName": "任务成员表", "ColumnName": "ID", - "GUID": "a2a8e4cc-4325-4ee1-a217-cb701c5b3c4b" + "GUID": "60c34cb9-850e-4626-99ba-dfe39eb6e2f5" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -278,7 +278,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "c04d6f601eae4b0d86569a7129aef361" + "ID": "f9be7598e218438fbcba12f354a21d2e" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -303,10 +303,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=IF(任务成员.任务默认时薪>0,任务成员.任务默认时薪,IF(任务成员.岗位默认时薪>0,任务成员.岗位默认时薪,IF(任务成员.参与人默认时薪>0,任务成员.参与人默认时薪,0)))" }, - "ID": "f857e1363832441b9ce2d6788691fa4d" + "ID": "fd0a6ff93fc147caa102137da708d9f7" } ], - "ID": "1c245c57-b8f6-4ee2-8941-9448c189cf06" + "ID": "3129685c-5bf4-4a4a-a664-03b157dfa923" }, { "CommandList": [ @@ -317,10 +317,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=指定时薪单价" }, - "ID": "59b15e69447446c49ec84c9a3121f667" + "ID": "fcccbd0c8c854b9d9a39cf048258230b" } ], - "ID": "649c9460-8b07-49d5-a5c7-fbe19280dbf4" + "ID": "f8493f97-96b1-47a1-98da-41c713e152cb" } ] }, @@ -387,7 +387,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "总工时", - "GUID": "b017e325-7294-416f-8926-47462784d7bb" + "GUID": "faf92a52-90dd-434f-8e4c-2dd18c788ae4" }, "ColumnName": "总工时" } @@ -400,7 +400,7 @@ "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "ID", - "GUID": "16b0ba7e-6a71-4a46-aa40-3f4d6ef58f5d" + "GUID": "849f349b-6d13-452a-869c-cdef36e3ad9e" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -412,7 +412,7 @@ "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "工时类型", - "GUID": "a45113f8-20d0-409b-bca0-4f362620dc21" + "GUID": "9d6cdc4d-5c2f-4e04-8880-cc49a0d8201a" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -422,7 +422,7 @@ ] } }, - "ID": "6ab1910c7268409f9266fb8e480a337b", + "ID": "00e2481e06a9420ba8b4f0891da835ab", "Comments": "检查工时是否超支" }, { @@ -454,7 +454,7 @@ } } ], - "ID": "eeeba5d7-dbf4-493d-99ec-d91f069d4c35" + "ID": "00c78b96-462f-4720-903d-f55cabbc3c4d" } ] }, @@ -468,7 +468,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "成员ID", - "GUID": "ea4383ac-a4de-4d16-810c-5c1b13209616", + "GUID": "39ac01fa-1c11-4e3f-89b8-e300b9e98826", "RelationBinding": { "RelatedTable": "任务成员表", "RelatedColumn": "ID", @@ -481,7 +481,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "成员ID", - "GUID": "6e7f9872-9cfc-4c3b-a64b-f99301cf1ad2", + "GUID": "e403c34a-b579-4e3a-9a1d-749817405d38", "RelationBinding": { "RelatedTable": "任务成员表", "RelatedColumn": "ID", @@ -494,7 +494,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "总工时", - "GUID": "fbf14cf0-4f6c-4f3e-be40-5b2aefb7c3f2" + "GUID": "5384b183-3576-4c98-afec-a35e3d97d1ea" }, "ColumnName": "总工时" } @@ -507,7 +507,7 @@ "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "ID", - "GUID": "f01504a6-9268-421d-ab6a-294bbb8d9fe9" + "GUID": "d786e2e8-d965-49f2-aca3-34474923e79c" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -519,7 +519,7 @@ "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "工时类型", - "GUID": "659082fc-ef0b-4cb0-a586-1b33af5b82a5" + "GUID": "385c56d4-82c3-4a97-9bdb-73664b687909" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -530,14 +530,14 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "4797723e6d2e41a5a0189fd1df0de453", + "ID": "0542b89aba6649e2b3e7fb9764f0b2da", "Comments": "检查预算是否超支" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "总消耗金额", "ParameterValue": "0", - "ID": "bb9e54fcc34147a397b97625b51722e5" + "ID": "7338661c547b45b684a0a8d6f28991f4" }, { "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", @@ -557,7 +557,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=总消耗金额+(Item.任务时薪*Item.总工时)" }, - "ID": "a2e540fc04904c0b8ca6c555bb97506c" + "ID": "510cee3e14ef407090c6ab0033375081" } ] }, @@ -590,18 +590,18 @@ } } ], - "ID": "642806e0-05f0-48a0-aceb-5ae4749fda53" + "ID": "35413fc8-74a0-4834-8353-3c5f5ef12f92" } ] } ], "Comments": "如果提交的工时类型等于项目工时的核定方式", - "ID": "bf08f70c-e62a-4a64-8514-aa5324ab46fe" + "ID": "e158e76c-f48d-4e31-8480-4ae8c3da237b" } ] } ], - "ID": "cdb7621d-e9e6-4ec8-abaf-5cd4e2fadede" + "ID": "5284f69c-4cdd-4e2c-be87-25e8940c2d77" } ] }, @@ -612,7 +612,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=工时数" }, - "ID": "88917d0b705740d8b313707d17e90999" + "ID": "126980c6dce445b589b0d837ea8352a4" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -621,7 +621,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=DATEDIF(开始日期,结束日期,\"d\")+1" }, - "ID": "7456d05ca461469aa54b4c73e0846743" + "ID": "dd576b98745d4a67bfe42ae84e9d9481" }, { "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", @@ -645,7 +645,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=开始日期+(index-1)" }, - "ID": "75877f8fc2f04457b6bd9d5e0d88e559" + "ID": "29f235cfbf2743818c18336764a24557" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -658,7 +658,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "总工时", - "GUID": "18cc1de2-9116-46f9-ba28-3ee44c656ae6" + "GUID": "bad45eaa-11c6-4e3a-8904-a714c109029d" }, "ColumnName": "总工时" } @@ -671,7 +671,7 @@ "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "工时日期", - "GUID": "144919b2-9e90-407e-ba06-8962389bdd23" + "GUID": "adc3a145-9b6a-47f7-8400-83443bdb81f5" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -683,7 +683,7 @@ "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "执行人", - "GUID": "76228856-18aa-48f6-9882-318807a68c22" + "GUID": "02481477-98e3-44c2-bba1-40488f4e1386" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -695,7 +695,7 @@ "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "工时类型", - "GUID": "2ea16072-94ee-41df-9cc2-a5a180d27e49" + "GUID": "25577926-1f1a-4312-8dae-6171772e81a5" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -706,7 +706,7 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "6ae0baafed3c43ff991d2907d1337efa" + "ID": "94c6dba001f14a0498de4ff9d2d7f3a6" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -735,10 +735,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=ROUNDUP(工时数/分配天数,1)" }, - "ID": "ee71499449414ba18a628588395d9a05" + "ID": "bda1df1ee564481e8c2ab06427335a4b" } ], - "ID": "1b3b80d1-30ba-4437-a6d2-d2de40fa6fa1" + "ID": "5b6a4078-4152-455d-8cf3-5e1809864231" }, { "CommandList": [ @@ -747,12 +747,12 @@ "ParameterName": "计算本次分配工时", "ParameterValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=待分配工时" + "SerializeProperty": "=ROUNDUP(待分配工时,1)" }, - "ID": "065c1e760198465994a08493bf43cee8" + "ID": "16ceb6f64bb747038fbe75470891dcf1" } ], - "ID": "b0fb2618-d6ac-421d-8210-c4fcfa690770" + "ID": "80d4e798-38ef-42d1-9948-cf6b6eb49e4e" } ] }, @@ -779,10 +779,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=IF(OR(任务成员.参与人负荷=\"\",任务成员.参与人负荷=0,任务成员.参与人负荷>24),24,任务成员.参与人负荷)" }, - "ID": "16181c6e15ff4bfca56ae0ad14d4352a" + "ID": "774578bbf7f24e13a6f4a2714f8aad3a" } ], - "ID": "bfcd2708-a55c-4839-8795-d34f4c7eb2a4" + "ID": "1d85c7d6-544e-45f1-b16d-abe79cdb5a91" }, { "Condition": { @@ -801,10 +801,10 @@ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "执行人负荷", "ParameterValue": "24", - "ID": "2c4d16f4fa6846e3a912eeabbf37bd0c" + "ID": "0d70f908359547a9ba6cc11028ae963c" } ], - "ID": "394dd2a3-3994-4c7e-a7c2-0ff8ccb80bf2" + "ID": "b385c012-060b-4bc8-a6dd-e8f8f2b7b129" } ] }, @@ -815,7 +815,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=IF(统计工时.总工时=\"\",0,统计工时.总工时)+计算本次分配工时" }, - "ID": "0a10581e19f140f89affc63ea059c53b" + "ID": "8d198be5380848faa3522373af16a625" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -844,128 +844,171 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=ROUNDUP(待分配工时-计算本次分配工时,1)" }, - "ID": "a93edabfac4844a6a4f4c730b7ab5e56" + "ID": "eed86e76439f40daaed2031e95250400" }, { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "任务工时表", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ + "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", + "CommandList": [ { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "成员ID", - "GUID": "332787ca-aa7b-4138-b767-e2108d622a9c" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=成员ID" - } + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务工时表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "成员ID", + "GUID": "437fa8e5-d746-4865-8281-0161a9af4f2d" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=成员ID" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "项目ID", + "GUID": "976d41d6-8274-497e-ac49-dd574d3d5a7c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.项目ID" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "任务ID", + "GUID": "f8a12139-e96c-4641-abb9-52ce7c8e45f0" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时日期", + "GUID": "f86a3778-9a64-4191-aba8-2a6b977adfa2" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=当前日期" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时类型", + "GUID": "234454f0-5b5a-48d6-8e49-ff07e4417be0" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=工时类型" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行人", + "GUID": "d4859e62-67be-48ec-b8ae-9643cbf7c2ab" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务成员.参与人" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行内容", + "GUID": "6cab4748-35d8-48f9-9ecd-1efcf362a60c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=进展内容" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时", + "GUID": "af198079-26a2-4240-af0c-7e2150ec998f" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=计算本次分配工时" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "时薪单价", + "GUID": "9f43f009-5b33-441c-b236-84e261a64334" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=计算时薪" + } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "提成系数", + "GUID": "55cce1b6-dac1-492a-a705-fa244d90312e" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.提成系数" + } + } + ] }, { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "项目ID", - "GUID": "1828713c-8fe2-489e-b6d2-260a7d75f5bb" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.项目ID" - } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "任务ID", - "GUID": "dc7feba1-4718-44ec-bd0e-4dcd1d8b599f" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务ID" - } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时日期", - "GUID": "b6d34589-36d8-4086-bb77-0ce31f5de1ee" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=当前日期" - } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时类型", - "GUID": "3aa4522c-b52c-4516-8c59-64a72900ca73" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=工时类型" - } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "执行人", - "GUID": "15e671e3-3910-4106-af0c-4e5d18e2c415" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务成员.参与人" - } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "执行内容", - "GUID": "5a62de3a-7bd3-414e-a942-c55c80e8bd4f" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=进展内容" - } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时", - "GUID": "3f0f57b0-84af-4b2d-99b7-9156ace3d9b4" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=计算本次分配工时" - } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "时薪单价", - "GUID": "ec8e90ba-7a7f-4d1a-acc3-c4b37f8c735b" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=计算时薪" - } - }, - { - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "提成系数", - "GUID": "8b7a0e62-d18a-4818-8273-09551c642141" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.提成系数" - } + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目动态", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目ID", + "GUID": "82b781bb-f51d-466b-87bb-ab01e5cfa334" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.项目ID" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目动态", + "GUID": "cd538298-4070-48bf-847e-9303cdbff30b" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"任务[\"&任务信息.任务名称&\"]增加\"&工时类型&\"工时\"&工时数&\"小时\"" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "执行人", + "GUID": "405f8c04-8f4e-4838-a3d7-a702276d39c6" + }, + "Value": "%CurrentUser%" + } + ] } ] } ], - "ID": "e957afd7-08c6-499e-ad39-975f0632d285" + "ID": "75a82e2b-36d8-4aa8-a328-972ebcba58a5" }, { "CommandList": [ @@ -978,7 +1021,7 @@ } } ], - "ID": "78590df5-7698-45b5-a91a-b5c4e76272a1" + "ID": "d9e80b15-3bba-45c5-af43-43277a33af2d" } ] } @@ -992,7 +1035,7 @@ "Message": "提交工时成功" } ], - "ID": "a4a1b163-561a-440b-8687-0a1814006775" + "ID": "aa5ff36f-0104-4d9c-9f42-dd83b07d3249" }, { "CommandList": [ @@ -1005,7 +1048,7 @@ } } ], - "ID": "e8d00de6-b73f-4c47-b34a-67fece1f6456" + "ID": "0bc9dcbe-d789-465e-9505-df798ec54639" } ] } diff --git a/Tables/项目任务/View_项目统计信息.json b/Tables/项目任务/View_项目统计信息.json new file mode 100644 index 00000000..9ca66c82 --- /dev/null +++ b/Tables/项目任务/View_项目统计信息.json @@ -0,0 +1,150 @@ +{ + "Name": "View_项目统计信息", + "Columns": [ + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "Required": true, + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "项目ID", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "项目标题", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "float", + "MaxLength": -1, + "Name": "项目预算工时", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "float", + "MaxLength": -1, + "Name": "项目预算费用", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "varchar", + "MaxLength": -1, + "Name": "工时核定方式", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "Required": true, + "DatabaseColumnType": "float", + "MaxLength": -1, + "Name": "总计划工时", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "Required": true, + "DatabaseColumnType": "float", + "MaxLength": -1, + "Name": "总实际工时", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "Required": true, + "DatabaseColumnType": "float", + "MaxLength": -1, + "Name": "总核定工时", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "Required": true, + "DatabaseColumnType": "float", + "MaxLength": -1, + "Name": "总成本", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "Required": true, + "DatabaseColumnType": "int", + "MaxLength": -1, + "Name": "项目成员数", + "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "Required": true, + "DatabaseColumnType": "int", + "MaxLength": -1, + "Name": "总任务数量", + "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "Required": true, + "DatabaseColumnType": "int", + "MaxLength": -1, + "Name": "已完成任务数", + "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "Required": true, + "DatabaseColumnType": "int", + "MaxLength": -1, + "Name": "未完成任务数", + "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.FormulaColumn, ServerDesignerCommon", + "Formula": "[已完成任务数]&\"/\"&[总任务数量]", + "Name": "任务完成情况", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.FormulaColumn, ServerDesignerCommon", + "Formula": "IF([已完成任务数]=0,0,[已完成任务数]/[总任务数量])", + "Name": "任务完成进度", + "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.FormulaColumn, ServerDesignerCommon", + "Formula": "[总实际工时]&\"/\"&[总计划工时]", + "Name": "工时情况", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.FormulaColumn, ServerDesignerCommon", + "Formula": "[总成本]&\"/\"&[项目预算费用]", + "Name": "费用成本情况", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.FormulaColumn, ServerDesignerCommon", + "Formula": "[总核定工时]&\"/\"&[项目预算工时]", + "Name": "工时成本情况", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + } + ], + "ExternalDatabaseInfo": { + "ConnectionId": "业务表", + "SourceTableName": "View_项目统计信息", + "SourceTableSchema": "dbo", + "CreateViewSql": "SELECT\r\n p.[ID] AS [项目ID],\r\n p.[项目名称] AS [项目标题],\r\n p.[项目预算工时],\r\n p.[项目预算费用],\r\n\t\tp.[工时核定方式],\r\n ISNULL(计划工时.总计划工时, 0) AS [总计划工时],\r\n ISNULL(实际工时.总实际工时, 0) AS [总实际工时],\r\n\t\t(CASE p.[工时核定方式]\r\n\tWHEN '计划' THEN ISNULL(计划工时.总计划工时, 0)\r\n\tELSE ISNULL(实际工时.总实际工时, 0)\r\nEND) as 总核定工时,\r\n ISNULL(总成本.总成本, 0) AS [总成本],\r\n ISNULL(项目成员.成员数量, 0) AS [项目成员数],\r\n ISNULL(任务统计.总任务数量, 0) AS [总任务数量],\r\n ISNULL(已完成任务.已完成任务数, 0) AS [已完成任务数],\r\n ISNULL(未完成任务.未完成任务数, 0) AS [未完成任务数]\r\nFROM\r\n [dbo].[项目表] p\r\nLEFT JOIN (\r\n SELECT\r\n 项目ID,\r\n SUM(工时) AS 总计划工时\r\n FROM\r\n [dbo].[任务工时表]\r\n WHERE\r\n 工时类型 = '计划'\r\n GROUP BY\r\n 项目ID\r\n) 计划工时 ON p.ID = 计划工时.项目ID\r\nLEFT JOIN (\r\n SELECT\r\n 项目ID,\r\n SUM(工时) AS 总实际工时\r\n FROM\r\n [dbo].[任务工时表]\r\n WHERE\r\n 工时类型 = '实际'\r\n GROUP BY\r\n 项目ID\r\n) 实际工时 ON p.ID = 实际工时.项目ID\r\nLEFT JOIN (\r\n SELECT\r\n 项目ID,\r\n SUM(工时 * 时薪单价 * 提成系数) AS 总成本\r\n FROM\r\n [dbo].[任务工时表]\r\n WHERE\r\n 工时类型 IN (SELECT 工时核定方式 FROM [dbo].[项目表] WHERE ID = 项目ID)\r\n GROUP BY\r\n 项目ID\r\n) 总成本 ON p.ID = 总成本.项目ID\r\nLEFT JOIN (\r\n SELECT\r\n 项目ID,\r\n COUNT(DISTINCT 执行人) AS 成员数量\r\n FROM\r\n [dbo].[任务工时表]\r\n GROUP BY\r\n 项目ID\r\n) 项目成员 ON p.ID = 项目成员.项目ID\r\nLEFT JOIN (\r\n SELECT\r\n 项目ID,\r\n COUNT(ID) AS 总任务数量\r\n FROM\r\n [dbo].[任务表]\r\n GROUP BY\r\n 项目ID\r\n) 任务统计 ON p.ID = 任务统计.项目ID\r\nLEFT JOIN (\r\n SELECT\r\n 项目ID,\r\n COUNT(ID) AS 已完成任务数\r\n FROM\r\n [dbo].[任务表]\r\n WHERE\r\n 任务状态 = 2\r\n GROUP BY\r\n 项目ID\r\n) 已完成任务 ON p.ID = 已完成任务.项目ID\r\nLEFT JOIN (\r\n SELECT\r\n 项目ID,\r\n COUNT(ID) AS 未完成任务数\r\n FROM\r\n [dbo].[任务表]\r\n WHERE\r\n 任务状态 < 2\r\n GROUP BY\r\n 项目ID\r\n) 未完成任务 ON p.ID = 未完成任务.项目ID;", + "ViewInfo": { + "ViewName": "View_项目统计信息", + "IsUpdatable": true, + "QueryColumns": [ + "项目ID" + ] + } + }, + "Indexes": [], + "Relations": [] +} \ No newline at end of file diff --git a/Tables/项目任务/项目动态.json b/Tables/项目任务/项目动态.json new file mode 100644 index 00000000..998c14ec --- /dev/null +++ b/Tables/项目任务/项目动态.json @@ -0,0 +1,79 @@ +{ + "Name": "项目动态", + "Columns": [ + { + "$type": "Forguncy.Model.Tables.BindingColumn, 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.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "项目ID", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "项目动态", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.UserBindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "执行人", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.UserExtraBingingColumn, ServerDesignerCommon", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "Name": "FGC_Creator" + }, + { + "$type": "Forguncy.Model.Tables.DateExtraBingingColumn, ServerDesignerCommon", + "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "Name": "FGC_CreateDate" + }, + { + "$type": "Forguncy.Model.Tables.UserExtraBingingColumn, ServerDesignerCommon", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "Name": "FGC_LastModifier" + }, + { + "$type": "Forguncy.Model.Tables.DateExtraBingingColumn, ServerDesignerCommon", + "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "Name": "FGC_LastModifyDate" + } + ], + "ExternalDatabaseInfo": { + "AllowModifySchema": true, + "ConnectionId": "业务表", + "SourceTableName": "项目动态", + "SourceTableSchema": "dbo" + }, + "PrimaryKey": [ + "ID" + ], + "Indexes": [], + "Relations": [ + { + "PrimarySchema": null, + "PrimaryTable": "项目表", + "PrimaryColumn": "ID", + "ForeignSchema": null, + "ForeignTable": "项目动态", + "ForeignColumn": "项目ID", + "RelationTypeOnDelete": 0, + "RelationTypeOnUpdate": 0, + "IsDetailTableRelation": true + } + ] +} \ No newline at end of file diff --git a/Tables/项目任务/项目表.json b/Tables/项目任务/项目表.json index 827f93f1..86b7fc27 100644 --- a/Tables/项目任务/项目表.json +++ b/Tables/项目任务/项目表.json @@ -62,7 +62,7 @@ }, { "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", - "DefaultValue": 1, + "DefaultValue": "计划", "DatabaseColumnType": "varchar", "MaxLength": -1, "Name": "工时核定方式", diff --git a/Theme/CellTypeStyles b/Theme/CellTypeStyles index e1e47460..b59b5bbe 100644 --- a/Theme/CellTypeStyles +++ b/Theme/CellTypeStyles @@ -1 +1 @@ -{"Forguncy.CustomMenu.ForguncyMenuCellTypeStyleTemplateSupportAttribute":[{"Key":"透明菜单","Category":"_RS_Custom","Styles":{"LEVEL0":{"NormalStyle":{"FontColor":"Background 1 -15","Background":"Text 1 0","BorderRadiusString":"6px 6px 6px 6px"},"HoverStyle":{"Background":"Text 1 15"},"SelectedStyle":{"FontColor":"Background 1 0","Background":"Background 2 -75"},"Transition":"0.3s"},"LEVEL1":{"NormalStyle":{"FontColor":"Background 1 -15","Background":"Text 1 0","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Background 1 0","Background":"Text 1 15"},"SelectedStyle":{"FontColor":"Background 1 0","Background":"Text 1 15"},"Transition":"0.3s"},"LEVEL2":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"LEVEL3":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}}}},{"Key":"BalckWhite","Category":"_RS_Custom","Styles":{"LEVEL0":{"NormalStyle":{"FontColor":"Text 1 0","Background":"Background 1 0","BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Text 1 50"},"SelectedStyle":{"FontColor":"Accent 1 0","BorderLeftString":"3px solid Accent_1_0","Bold":true},"Transition":"0.3s"},"LEVEL1":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"LEVEL2":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"LEVEL3":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}}}}],"Forguncy.RepeaterCellTypeStyleTemplateSupportAttribute":[{"Key":"普通_悬浮变白_","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"BorderRadiusString":"6px 6px 6px 6px","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"HoverStyle":{"Background":"Background 1 0","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"FocusStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"ActiveStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"SelectedStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"Transition":"0.3s"}}},{"Key":"竖排无样式","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 1 0","BorderRadiusString":"6px 6px 6px 6px","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"HoverStyle":{"Background":"Background 2 0","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"FocusStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"ActiveStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"SelectedStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"Transition":"0.3s"}}},{"Key":"BlackWhite","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 1 0","BorderString":"2px solid Background_2_0","BorderRadiusString":"8px 8px 8px 8px","BoxShadowString":"3px 3px 5px 0px #20000000","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"HoverStyle":{"BoxShadowString":"5px 7px 15px 0px #17000000","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"FocusStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"ActiveStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"SelectedStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"Transition":"0.3s"}}}],"Forguncy.ImageCellTypeStyleTemplateSupportAttribute":[{"Key":"按钮图标","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"FontColor":"Background 1 -50","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Accent 1 0"},"Transition":"0.3s"}}},{"Key":"上圆角封面","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"8px 8px 0px 0px"}}}},{"Key":"pd_10","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px","PaddingLeft":10,"PaddingRight":10,"PaddingTop":10,"PaddingBottom":10}}}},{"Key":"中圆角","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"10px 10px 10px 10px"}}}}],"Forguncy.ButtonCellTypeStyleTemplateSupportAttribute":[{"Key":"动态背景","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"6px 6px 6px 6px"},"DisableStyle":{"Opacity":0.445079736545843}}}},{"Key":"链接样式","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Text 1 0"},"Transition":"0.3s"}}},{"Key":"圆角浮动","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Background 1 -50","Background":"Background 1 0","BorderString":"1px solid Background_2_0","BorderRadiusString":"20px 20px 20px 20px","BoxShadowString":"5px 5px 16px 0px #10000000"},"HoverStyle":{"FontColor":"Background 1 0","Background":"Accent 1 0"},"Transition":"0.3s"}}},{"Key":"Gost","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"8px 8px 8px 8px"},"HoverStyle":{"Background":"Background 2 0"},"DisableStyle":{"Opacity":0.44507973654584293},"Transition":"0.3s"}}}],"Forguncy.HyperlinkCellTypeStyleTemplateSupportAttribute":[{"Key":"Gost","Category":"_RS_Custom","Styles":{"LINK":{"NormalStyle":{"Background":"#00FFFFFF","BorderRadiusString":"5px 5px 5px 5px","PaddingLeft":5,"PaddingRight":5,"PaddingTop":5,"PaddingBottom":5},"HoverStyle":{"Background":"Background 2 0"},"Transition":"0.3s"}}}],"Forguncy.TextCellTypeStyleTemplateSupportAttribute":[{"Key":"Gost","Category":"_RS_Custom","Styles":{"MAIN":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"Background":"Background 2 0"},"FocusStyle":{"FontColor":"Text 1 0","Background":"Background 2 0"},"Transition":"0.3s"},"FGC_BUILDIN_ERROR":{"NormalStyle":{"BorderString":"1px solid #FFFF0000","BorderRadiusString":"5px 5px 5px 5px"}}}}]} \ No newline at end of file +{"Forguncy.CustomMenu.ForguncyMenuCellTypeStyleTemplateSupportAttribute":[{"Key":"透明菜单","Category":"_RS_Custom","Styles":{"LEVEL0":{"NormalStyle":{"FontColor":"Background 1 -15","Background":"Text 1 0","BorderRadiusString":"6px 6px 6px 6px"},"HoverStyle":{"Background":"Text 1 15"},"SelectedStyle":{"FontColor":"Background 1 0","Background":"Background 2 -75"},"Transition":"0.3s"},"LEVEL1":{"NormalStyle":{"FontColor":"Background 1 -15","Background":"Text 1 0","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Background 1 0","Background":"Text 1 15"},"SelectedStyle":{"FontColor":"Background 1 0","Background":"Text 1 15"},"Transition":"0.3s"},"LEVEL2":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"LEVEL3":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}}}},{"Key":"BalckWhite","Category":"_RS_Custom","Styles":{"LEVEL0":{"NormalStyle":{"FontColor":"Text 1 0","Background":"Background 1 0","BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Text 1 50"},"SelectedStyle":{"FontColor":"Accent 1 0","BorderLeftString":"3px solid Accent_1_0","Bold":true},"Transition":"0.3s"},"LEVEL1":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"LEVEL2":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"LEVEL3":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}}}}],"Forguncy.RepeaterCellTypeStyleTemplateSupportAttribute":[{"Key":"渐变卡片","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"linear-gradient(-180deg, #FFFDFBFB 0.00%, #FFEBEDEE 100.00%)","BorderString":"1px solid Background_2_0","BorderRadiusString":"10px 10px 10px 10px","BoxShadowString":"3px 3px 10px 0px #0B000000","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":15},"HoverStyle":{"BorderString":"1px solid Accent_1_60","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":15},"FocusStyle":{"BorderString":"1px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":15},"ActiveStyle":{"MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":15},"SelectedStyle":{"BorderString":"1px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":15},"Transition":"0.3s"}}},{"Key":"普通_悬浮变白_","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"BorderRadiusString":"6px 6px 6px 6px","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"HoverStyle":{"Background":"Background 1 0","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"FocusStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"ActiveStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"SelectedStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"Transition":"0.3s"}}},{"Key":"竖排无样式","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 1 0","BorderRadiusString":"6px 6px 6px 6px","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"HoverStyle":{"Background":"Background 2 0","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"FocusStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"ActiveStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"SelectedStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"Transition":"0.3s"}}},{"Key":"BlackWhite","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 1 0","BorderString":"2px solid Background_2_0","BorderRadiusString":"8px 8px 8px 8px","BoxShadowString":"3px 3px 5px 0px #20000000","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"HoverStyle":{"BoxShadowString":"5px 7px 15px 0px #17000000","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"FocusStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"ActiveStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"SelectedStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"Transition":"0.3s"}}}],"Forguncy.ImageCellTypeStyleTemplateSupportAttribute":[{"Key":"按钮图标","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"FontColor":"Background 1 -50","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Accent 1 0"},"Transition":"0.3s"}}},{"Key":"上圆角封面","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"8px 8px 0px 0px"}}}},{"Key":"pd_10","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px","PaddingLeft":10,"PaddingRight":10,"PaddingTop":10,"PaddingBottom":10}}}},{"Key":"中圆角","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"10px 10px 10px 10px"}}}}],"Forguncy.ButtonCellTypeStyleTemplateSupportAttribute":[{"Key":"动态背景","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"6px 6px 6px 6px"},"DisableStyle":{"Opacity":0.445079736545843}}}},{"Key":"链接样式","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Text 1 0"},"Transition":"0.3s"}}},{"Key":"圆角浮动","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Background 1 -50","Background":"Background 1 0","BorderString":"1px solid Background_2_0","BorderRadiusString":"20px 20px 20px 20px","BoxShadowString":"5px 5px 16px 0px #10000000"},"HoverStyle":{"FontColor":"Background 1 0","Background":"Accent 1 0"},"Transition":"0.3s"}}},{"Key":"Gost","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"8px 8px 8px 8px"},"HoverStyle":{"Background":"Background 2 0"},"DisableStyle":{"Opacity":0.44507973654584293},"Transition":"0.3s"}}}],"Forguncy.HyperlinkCellTypeStyleTemplateSupportAttribute":[{"Key":"Gost","Category":"_RS_Custom","Styles":{"LINK":{"NormalStyle":{"Background":"#00FFFFFF","BorderRadiusString":"5px 5px 5px 5px","PaddingLeft":5,"PaddingRight":5,"PaddingTop":5,"PaddingBottom":5},"HoverStyle":{"Background":"Background 2 0"},"Transition":"0.3s"}}}],"Forguncy.TextCellTypeStyleTemplateSupportAttribute":[{"Key":"Gost","Category":"_RS_Custom","Styles":{"MAIN":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"Background":"Background 2 0"},"FocusStyle":{"FontColor":"Text 1 0","Background":"Background 2 0"},"Transition":"0.3s"},"FGC_BUILDIN_ERROR":{"NormalStyle":{"BorderString":"1px solid #FFFF0000","BorderRadiusString":"5px 5px 5px 5px"}}}}]} \ No newline at end of file