From 42a0829497abe00abd53479b95a921e63d387b39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B6=85=E5=93=A5?= Date: Thu, 4 Jul 2024 11:20:25 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"1","MessageType":2,"Modules":[{"Sta?= =?UTF-8?q?te":2,"Type":7,"Name":"Table/=E4=BB=BB=E5=8A=A1=E8=BF=9B?= =?UTF-8?q?=E5=B1=95"},{"State":1,"Type":7,"Name":"Table/=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E8=BF=9B=E5=B1=95=E7=8A=B6=E6=80=81=E8=A1=A8"},{"Stat?= =?UTF-8?q?e":1,"Type":1,"Name":"PCPage/=E9=A1=B9=E7=9B=AE=E6=A6=82?= =?UTF-8?q?=E5=86=B5"},{"State":1,"Type":1,"Name":"PCPage/=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E9=A6=96=E9=A1=B5"},{"State":1,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E4=BB=BB=E5=8A=A1=E9=83=A8=E5=88=86"},{"State":1,"Type":1,"N?= =?UTF-8?q?ame":"PCPage/=E4=BB=BB=E5=8A=A1-=E4=BB=BB=E5=8A=A1=E4=BF=A1?= =?UTF-8?q?=E6=81=AF"},{"State":1,"Type":1,"Name":"PCPage/=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1-=E5=B7=A5=E6=97=B6"},{"State":2,"Type":1,"Name":"PCPa?= =?UTF-8?q?ge/=E4=BB=BB=E5=8A=A1-=E8=BF=9B=E5=B1=95"},{"State":4,"Type":1,?= =?UTF-8?q?"Name":"PCPage/=E6=96=B0=E5=A2=9E=E8=BF=9B=E5=B1=95"},{"State":?= =?UTF-8?q?3,"Type":6,"Name":"Pages/=E9=A1=B9=E7=9B=AE/=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E9=A6=96=E9=A1=B5/=E9=A1=B9=E7=9B=AE=E9=A6=96=E9=A1=B5-?= =?UTF-8?q?=E5=AE=B9=E5=99=A8=E9=A1=B5=E9=9D=A2/=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=BF=9B=E5=B1=95"},{"State":3,"Type":7,"Name":"Table/?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=BF=9B=E5=B1=95"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 126 +--- Pages/77fae08dfbac4664a299aa7ec207218.rd | 5 - Pages/94f8bae36aee4ae7aec2a063ca731b1.json | 12 +- ...n => f9ec059d9c5d440eabbb7db442b15c9.json} | 81 ++- Pages/f9ec059d9c5d440eabbb7db442b15c9.rd | 5 + .../任务容器页面/任务-任务信息.json | 159 ++--- .../项目首页-容器页面/任务容器页面/任务-工时.json | 288 ++++----- .../项目首页-容器页面/任务容器页面/任务-进展.json | 583 ------------------ .../项目首页-容器页面/任务容器页面/任务-进展.rd | 14 - .../项目首页-容器页面/任务容器页面/任务部分.json | 351 +++++------ .../项目首页-容器页面/任务容器页面/任务部分.rd | 44 +- .../项目首页-容器页面/任务容器页面/任务首页.json | 144 +++-- .../项目首页-容器页面/任务容器页面/任务首页.rd | 2 +- .../项目首页/项目首页-容器页面/项目概况.json | 308 ++++++--- .../项目首页/项目首页-容器页面/项目概况.rd | 2 +- .../{任务容器页面 => 项目进展}/新增进展.json | 80 +-- .../{任务容器页面 => 项目进展}/新增进展.rd | 4 - .../任务进展.json => 项目/项目进展.json} | 25 +- 18 files changed, 804 insertions(+), 1429 deletions(-) delete mode 100644 Pages/77fae08dfbac4664a299aa7ec207218.rd rename Pages/{77fae08dfbac4664a299aa7ec207218.json => f9ec059d9c5d440eabbb7db442b15c9.json} (54%) create mode 100644 Pages/f9ec059d9c5d440eabbb7db442b15c9.rd delete mode 100644 Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-进展.json delete mode 100644 Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-进展.rd rename Pages/项目/项目首页/项目首页-容器页面/{任务容器页面 => 项目进展}/新增进展.json (72%) rename Pages/项目/项目首页/项目首页-容器页面/{任务容器页面 => 项目进展}/新增进展.rd (67%) rename Tables/{任务/任务进展.json => 项目/项目进展.json} (80%) diff --git a/.collaboration b/.collaboration index 1f30b899..cda6a183 100644 --- a/.collaboration +++ b/.collaboration @@ -90,19 +90,6 @@ "ModuleName": "Table/任务表", "ModuleType": 7 }, - { - "ModuleName": "Table/任务进展", - "State": 2, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T11:08:23.1048942+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\任务\\任务进展.json" - ] - }, { "ModuleName": "TableView/子任务视图", "ModuleType": 23 @@ -125,16 +112,7 @@ }, { "ModuleName": "Table/项目进展状态表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T11:07:19.5564009+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\字典表\\项目进展状态表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/工时分配方式", @@ -560,17 +538,7 @@ }, { "ModuleName": "PCPage/项目概况", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T11:04:22.9573023+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目概况.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目概况.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务列表", @@ -678,31 +646,11 @@ }, { "ModuleName": "PCPage/任务首页", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T10:53:19.5302304+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务首页.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务部分", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T10:54:19.7981892+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务部分.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务部分.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-侧栏", @@ -714,17 +662,7 @@ }, { "ModuleName": "PCPage/任务-任务信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T10:59:49.8717331+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-任务信息.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-任务信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-关联资源", @@ -736,35 +674,7 @@ }, { "ModuleName": "PCPage/任务-工时", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T11:01:04.5830876+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-工时.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-工时.rd", - "Pages\\94f8bae36aee4ae7aec2a063ca731b1.json", - "Pages\\94f8bae36aee4ae7aec2a063ca731b1.rd" - ] - }, - { - "ModuleName": "PCPage/任务-进展", - "State": 2, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T11:05:35.4397617+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-进展.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-进展.rd", - "Pages\\77fae08dfbac4664a299aa7ec207218.json", - "Pages\\77fae08dfbac4664a299aa7ec207218.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/工时详情-列头", @@ -780,17 +690,7 @@ }, { "ModuleName": "PCPage/新增进展", - "State": 4, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T11:08:23.1050998+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\新增进展.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\新增进展.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/参与成员管理", @@ -2370,22 +2270,10 @@ }, { "ModuleName": "Pages/项目/项目首页/项目首页-容器页面/项目进展", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T11:05:49.6748065+08:00", "ModuleType": 6 }, { "ModuleName": "Table/项目进展", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T11:08:23.104907+08:00", "ModuleType": 7 } ] \ No newline at end of file diff --git a/Pages/77fae08dfbac4664a299aa7ec207218.rd b/Pages/77fae08dfbac4664a299aa7ec207218.rd deleted file mode 100644 index 35d1a93d..00000000 --- a/Pages/77fae08dfbac4664a299aa7ec207218.rd +++ /dev/null @@ -1,5 +0,0 @@ -{ - "PageType": 2, - "ColumnCount": 5, - "RowCount": 3 -} \ No newline at end of file diff --git a/Pages/94f8bae36aee4ae7aec2a063ca731b1.json b/Pages/94f8bae36aee4ae7aec2a063ca731b1.json index 9b3f8109..f4c0f9ac 100644 --- a/Pages/94f8bae36aee4ae7aec2a063ca731b1.json +++ b/Pages/94f8bae36aee4ae7aec2a063ca731b1.json @@ -145,7 +145,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "7aabf009-2405-4a7f-9d04-a6eb0afdfb29" + "ID": "22897d23-edea-49bb-9b60-004e039517ba" }, { "CommandList": [ @@ -174,7 +174,7 @@ "ConfirmText": "您确定要删除吗？" } ], - "ID": "02d70c00-6cca-40e0-8b68-ae6db974d167" + "ID": "79ae3105-6534-4a9a-8b7d-b18c95a300e1" }, { "CommandList": [ @@ -184,17 +184,17 @@ "Message": "该报工已请款，无法删除" } ], - "ID": "c0f06ba7-17d4-4c2b-9eca-7267ec2c33cb" + "ID": "0ca68142-32a4-4f7b-a45b-41afab573cfe" } ] } ], - "ID": "66250523-552a-4aa6-8b03-aa860ca474da" + "ID": "35e664e8-d98c-459a-bb05-8417dfa5aa97" } ] } ], - "ID": "3619027d-9d9e-4b40-8db1-f81d4d10eccd" + "ID": "1a881986-01c7-4e67-b2b5-47e1df88f746" } ] } @@ -262,4 +262,4 @@ "PaperSize": {}, "Margin": {} } -}//QtoxMUYqQDWUKOGrbiq0m+PNERB7To9OlLIazUTZZTDEhxZjHII3qwXB2XQ/AxRxn4gxnufJbPNSrBwjDE1N/l3i8crHoRga3dRVHHqqgtWes09YtKcAztIEXIVuDV33hzCZKYO0ruDLOkVfU5A3wif9456dRW5xJclYbNBXCGDUNw/6EilhqrCerrc+n6kerz/kYiMbFwqe3ecaGkA4pIL6oWxrgTpo8TOJ/faHV8wpk8jE6DUm9Ix/ScijiYrY7UlgkrIVWD/VBvVfwbExPUB8tPIL3s2bp+STJpkAyPq0NPEnutAd4/GZpJZTLuq7JXFE0hrsXCVSvKzOGF1rkw8f2mM3LwPwZmtCh3oW4GSqO1priTGllSWJ7N4GlCNDlF52V+06vq+CfjS6XDgQxDsycfhfMzfkFPQ5NThIHaW+UgXlUpHqjsOeFQkmyGBktvEXmZTIHK4LUJYrGHEqi+I9pHqv7MzuosJkIB/C3ZQMW1Iiy5rdOY/qu+uhtTruISjObS0e48PbJVWjHHW4UAJp30adJljOfGE2mo8L37k4BqVh4USH7mJdEZlYIlebPSHKUaAhWylYDaYGaOxop7dujlnPfayM5EhtynYo9pAXMKrBbmSEieXoGqCJ80WqGjFda8ufgFfpYC4twSbZl842fCSAH8/vUx7yRQCurT8GRWjJM+fRyp5suZ0620aipzVR8TlC0LS7sVixCk/JRFcEIxVa3Z3vUMKFQVwj0yS0UiT8UFNVKcB+5Om2HjIHiXISN+GVFUhgn/CnOk5CV3mFpvLsSUm1/ctPsXD+eBBX4U8HsswaoSqwQZU4cp20vE+vI3BViAA3Bd2fwd2yTcYb868idf0WH3PjB1PFKPQfLwfISdp7vNrvGVcGJEmjVEqAMtnNjkQAgXfDNoIpUg==|920 \ No newline at end of file +}//bJF9Y4TiSFgrKfISQFyp7nyqWPbvg0dQQH/yckqfIjvV9gUu7vlbxIxEPBjwKiYg+v4xQ96cwJTEiwBp5Foc9kpB4ZGvhkbjPlUIh+/cFJdqqUtI0UkACL2cPezuwbBsuJH7uWFhPGPEVg2mBWtgtKaBuMXXFUe14cQhT5DbOtYFWR7XARpbv4/zYBghCUs2cIAMiRKyRIXve352xZMZ1wnshFWlTBuJxJx0IKVIN/B3MeFIMo7UI9ipJID8Wjb8RCfESFXLzpMzxJ1Le28+PHZuE+qygSjbh/4jTxJhqNrB7JDUaq1QYjAubRGl5OM8f8I4hPDGL2C252ypPgu29m1WZMsmDfq5KQcPpbUi1oCJOVRRziCl9eqNpA94KekMWmB7dswr048zQ25u9qs4lB033Xg+4MOaDqhXoxkb02JDKFsTkGzEd/7QAJ7OonRlIgP7Q46sWrFMzfUYX7qDR5Tj316umHDd5iz8nSu22OvBszxoUyoRATHxvSRBeqgWTbOGbIDQ6M13C0urJ+qt+NkN5jag6/yGktAP8vzAqCBo5wuTFwx93Wj4KDfPkYWInRAPlsgvcV1LdwZYapyHyktM34QdRxAzntLM1EaYNv+CpVPyoa1iHuOc+ORRYpn3F5lMC/kUKvLXb6AlNlrTY3/hVbmErRBGGL/FSXDRxpe1QMqvKo2OTMVoLiq/k+9fZvBabTS4IdUFKS7V7v2nJgBLFsXyjUu/TABR4wJtwKibURi+z3lToYN2uXcpbFDvsFK48cwSHZSe2XfhF9vcNqVpaRzdw8Z7xlpRtkwo1QeMOE5CVjcKXCePUbdsaLcrbZZVHZ0WpF91iY265EkrLLdsGrTkhC4jmzIWQKAtkX3KBAmOZYKIeKc4pVimLb9pd7D2acTQLvd//dmDL0HJJA==|920 \ No newline at end of file diff --git a/Pages/77fae08dfbac4664a299aa7ec207218.json b/Pages/f9ec059d9c5d440eabbb7db442b15c9.json similarity index 54% rename from Pages/77fae08dfbac4664a299aa7ec207218.json rename to Pages/f9ec059d9c5d440eabbb7db442b15c9.json index d462c7a3..d188aa90 100644 --- a/Pages/77fae08dfbac4664a299aa7ec207218.json +++ b/Pages/f9ec059d9c5d440eabbb7db442b15c9.json @@ -8,34 +8,31 @@ }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 26.0 + "DesignLengthInPixel": 35.0 } }, "2": { "GridRowColumnDefinition": { "DesignLengthInPixel": 10.0 } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } } }, - "Count": 3, + "InLogicalVisibleIndexes": [ + 3 + ], + "Count": 4, "DefaultSize": 10.0 }, "Cols": { "RowColumnAttachedInfos": { - "1": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 73.0, - "Mode": 1 - } - }, - "2": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 14.0 - } - }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 753.0, + "DesignLengthInPixel": 629.0, "Mode": 2, "MinLength": { "Unit": 1 @@ -44,12 +41,19 @@ "Value": 1.0 } } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 104.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 140.0 + } } }, - "Count": 5 - }, - "Values": { - "1,3": "状态名称" + "Count": 7 }, "AttachInfos": { "1,1": { @@ -97,7 +101,7 @@ } ], "separator": ",", - "size": "small", + "size": "large", "effect": "light", "allowAdd": false, "addButtonSettings": { @@ -107,39 +111,60 @@ "distinct": false, "ReadOnly": true }, - "TemplateCellSource": "进展名称" + "TemplateCellSource": "进展类型" }, "1,3": { "TemplateCellSource": "进展内容" + }, + "1,5": { + "TemplateCellSource": "创建日期" + }, + "3,1": { + "TemplateCellSource": "ID" } }, "StyleDatas": { "Styles": [ { - "FontSize": 14.666666666666666, - "Foreground": 0 + "Foreground": 0, + "HorizontalAlignment": 1 + }, + { + "Foreground": 0, + "WordWrap": true + }, + { + "FontSize": 13.333333333333332, + "Foreground": 2, + "Formatter": 3, + "HorizontalAlignment": 4 } ], "Types": { "Strs": [ - "Background 1 -50", + "black", + "Left", + "Text 1 50", + "yyyy/m/d", + "Right", "Body" ] }, "CellStyles": { - "1,3": 0 + "1,1": 0, + "1,3": 1, + "1,5": 2 }, "SheetStyle": { - "FontFamily": 1, - "FontSize": 13.333333333333332 + "FontFamily": 5 } }, "PageInfo": { "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon", - "ParentPageName": "任务-进展" + "ParentPageName": "项目概况" }, "PrintInfo": { "PaperSize": {}, "Margin": {} } -}//zxQdyOXVIOvvgJ0qCzwyJ8RUhS2Pe/BAs2OsfCjeRSt9KqNAU3P0/hPbxgkgpLjO+yx3V5xsbgnXN9JNvKO+XKEEsl5Rzfc1lYoicW67408U5r1IwAtzYqFpQQuJNciCvewIYKABQtGPONULCJ9c8GroafC4U6VzC39mZr6AUtN2T1WtTHYgR8Li9/nKBv+f/vxlM2RmWZFXyr9r+rorykfVPQUEB+3StGvi3ulUquzk+9YUpO9nJKWIQNPgwPUiDets2Mafz1cZseob8UlsQYAagWqFMTp9ujJVmox1dXfKfY1yCSbCB8Icj+Ync8mGJpLVXO2Wvg7sfRP7Ujm1X/4YI6fk0h0quKcIo5KtaKZ6Fwu4ITEERVGReHEv6S3Z61id7Ah68DV5r8GCPL26wCitQO6LN49wDzzqryz1DzMeRlRpQGMud0SiWi5EB5r4Q6ickH2k357dYz3oDsXoFwv8w9FIhDgUoHS152iLnnc+g4/VUJBET2gHYa+AwkLbl92ToAz9YcZ1WXuwD/vAaRDOPoyiS3Wpd39e9ux8A+j626Bzk0Smt3jPmMEd9c93bNvPEuOBglFF6Xi9lWpE4aliStMSLzlOajR7EWiXVlDPHcgO4+k4YfOtIsMt5/sglFzZYnQ3rfk/pe7DKFZ5s/povipsxz4HFoeN7+18gXtFlHd2vmMgYi/+8rCwKfA+AzFa5tS/G3/cSpnxcvFARsNZIf+azD815iAPFFoCLVtLRhnHxCCpxVuwu4YcJvYIzsxd9dTUlfZffimcBCHEp0MutfylUpzYnQPviIb2NT0/R+A/I4Yvk2XiVV0FmEplh87TUzkk/YIQNdiEIrNSV7XscYvgm8MOsomjv10jMwUg/Ba1cXDjEpSnxXWUWjXATwwcVOSgf7wGPQtA5QbDrA==|920 \ No newline at end of file +}//LnZ3wNKVEa24CbWK0fCvjnJEHYDWwtCpS4f3ZwoNiguBITIWkRidWC74RzaAamPaeT8hD9IWQBj0/6drQmeMK5Z1J4hQKIR0CqxVG6/o+4sXRyjuAfJJ0LqEx8mAPY8cQywyftssKYXTvl2ruIUiOgdRZelJ3aRSi42y6H1mLcxOjAwh3RSB/X9qaOXVfjxQGeKrSNchluBJ2f/9vMufM8zRL0aRA1YMiDefMNDNHoB67DQmpzVuUwORs/q/rsQSbQC73S76+iYBpkCYSNpzI4JbjNIcXA0CEIm/jFfFQMQnJSAODiwIsLlG7K4KT6hVCGaly4tGYHP9k5gVkuwioJhwBWA9wJHHRIySKWFVBAuJFAbx+YPRZQvp1objy/2CNB8HQWsEeULrJ7DB31apMmjo+6XREhZtqh394FJ0ZLeCrt5hkgVXe671fJNnNmMMnTLNPkoDnPbSzZW0h897aRm8Y3JHviq3AF+/iIOqkKmie4v/vWVcjWmR+pT/oqyc47/Q56qemjRtBy5MRMSu8mwWKMKwkPrYK/JotAh/h56qdYDBXyKXbWmPBnH8NTVvNgCFpT8q6Z30uBDCAB2zBhnr5b3Sucj0V8eKtzjIn55GcPS7d34kX+yVlNUDgKpgOSoZafydPhGT04sWkg7ISvey/+R7oY+1KHquaIsbhq46uaXyF8wVjQiWGeg6O+dSlsm0e73qEsxun2O1lsX/tnke5Yl3d6DJnqGHmpKwtBodouqJOo0vfZEWZG0g9UxIhsucn7iQ5+HPfSBW2IL2LCTvhqkcfQwz/gBN6XkUL1XlZixhzpFMUppskTty5On9TUKDQYBVI0+VrzcFlficONJBkhk0xdPGkkHJsP8naVwR3N5FgtVxqLATTsbBssdL7ATbHX71bViHw4H3+92vfg==|920 \ No newline at end of file diff --git a/Pages/f9ec059d9c5d440eabbb7db442b15c9.rd b/Pages/f9ec059d9c5d440eabbb7db442b15c9.rd new file mode 100644 index 00000000..d8c8d52d --- /dev/null +++ b/Pages/f9ec059d9c5d440eabbb7db442b15c9.rd @@ -0,0 +1,5 @@ +{ + "PageType": 2, + "ColumnCount": 7, + "RowCount": 4 +} \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-任务信息.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-任务信息.json index 5592011a..3a8f15ee 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-任务信息.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-任务信息.json @@ -164,7 +164,7 @@ "Values": { "1,1": "任务说明", "3,1": "版本", - "3,10": "添加", + "3,12": "添加", "5,1": "任务说明", "8,1": "备注", "8,2": "编辑", @@ -286,7 +286,7 @@ ] } ], - "ID": "b47edab1-30b5-478a-aca0-45c9112c21b0" + "ID": "73c8ef55-e652-436d-9534-ee8cadd25ae1" } ] } @@ -375,7 +375,7 @@ }, "DataValidationInfo": {} }, - "3,10": { + "3,12": { "CellType": { "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", "CommandList": [ @@ -410,7 +410,7 @@ "MethodName": "ReloadBindingItems" } ], - "ID": "4ce4fc43-12d4-4743-964f-e80c5c5f7747" + "ID": "7b1e5d4d-65b0-4a32-b4f7-d6048e9d95c1" } ] } @@ -495,7 +495,7 @@ ] } ], - "ID": "38c8519d-1d96-4542-afb0-1036c51ec530" + "ID": "74f7328e-75ba-497e-89ac-2ca4f529ebef" } ] } @@ -613,12 +613,12 @@ ] } ], - "ID": "0ce93f77-31f0-43d2-bbe8-a52067adcc75" + "ID": "03cbe9d0-d1aa-4bef-b9c7-e0d074d02b08" } ] } ], - "ID": "1615a5f6-7597-4960-b882-9012fc775aa9" + "ID": "6221d8fc-05e1-4db7-b38e-3202e4dead85" } ] } @@ -688,7 +688,7 @@ ] } ], - "ID": "00103600-151b-43ea-9639-86639066fd5c" + "ID": "4cdab49a-9541-4239-a6ff-c7c5654b15c2" }, { "CommandList": [ @@ -705,7 +705,7 @@ ] } ], - "ID": "05fd4d37-eac8-4684-b839-c8963b9d766e" + "ID": "abc029b3-cf5d-4914-a75b-25ce44ef7586" } ] } @@ -773,19 +773,21 @@ "HorizontalAlignment": 5 }, { + "FontFamily": 0, + "FontSize": 13.333333333333332, "HorizontalAlignment": 5, "Underline": false }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332 + }, { "FontFamily": 0, "FontSize": 13.333333333333332, "Foreground": 6, "Formatter": 4 }, - { - "FontFamily": 0, - "FontSize": 13.333333333333332 - }, { "FontFamily": 0, "FontSize": 13.333333333333332, @@ -867,37 +869,38 @@ "2,17": 0, "2,18": 0, "2,20": 1, - "3,10": 2, + "3,12": 2, + "3,13": 3, "3,20": 1, - "5,1": 3, - "5,2": 4, - "6,1": 3, - "7,0": 4, + "5,1": 4, + "5,2": 3, + "6,1": 4, + "7,0": 3, "7,1": 5, - "7,2": 4, - "7,3": 4, - "7,4": 4, - "7,5": 4, - "7,6": 4, - "7,7": 4, - "7,8": 4, - "7,9": 4, - "7,10": 4, - "7,11": 4, - "7,12": 4, - "7,13": 4, - "7,14": 4, - "7,15": 4, - "7,16": 4, - "7,17": 4, - "7,18": 4, - "7,19": 4, - "7,20": 4, - "8,0": 4, - "8,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, + "8,0": 3, + "8,1": 4, "8,2": 6, - "9,0": 4, - "9,1": 3, + "9,0": 3, + "9,1": 4, "9,2": 7, "9,3": 8, "9,4": 8, @@ -917,8 +920,8 @@ "9,18": 8, "9,19": 8, "9,20": 9, - "10,0": 4, - "10,1": 3, + "10,0": 3, + "10,1": 4, "10,2": 10, "10,3": 11, "10,4": 11, @@ -938,29 +941,29 @@ "10,18": 11, "10,19": 11, "10,20": 12, - "11,0": 4, - "11,1": 3, - "11,2": 4, - "11,3": 4, - "11,4": 4, - "11,5": 4, - "11,6": 4, - "11,7": 4, - "11,8": 4, - "11,9": 4, - "11,10": 4, - "11,11": 4, - "11,12": 4, - "11,13": 4, - "11,14": 4, - "11,15": 4, - "11,16": 4, - "11,17": 4, - "11,18": 4, - "11,19": 4, - "11,20": 4, - "12,0": 4, - "12,1": 3, + "11,0": 3, + "11,1": 4, + "11,2": 3, + "11,3": 3, + "11,4": 3, + "11,5": 3, + "11,6": 3, + "11,7": 3, + "11,8": 3, + "11,9": 3, + "11,10": 3, + "11,11": 3, + "11,12": 3, + "11,13": 3, + "11,14": 3, + "11,15": 3, + "11,16": 3, + "11,17": 3, + "11,18": 3, + "11,19": 3, + "11,20": 3, + "12,0": 3, + "12,1": 4, "12,2": 13, "12,3": 13, "12,4": 13, @@ -972,12 +975,12 @@ "12,10": 13, "12,11": 13, "12,12": 13, - "12,13": 4, - "12,14": 4, - "12,15": 4, - "12,16": 4, - "12,17": 4, - "12,18": 4 + "12,13": 3, + "12,14": 3, + "12,15": 3, + "12,16": 3, + "12,17": 3, + "12,18": 3 }, "ColStyles": { "1": 14 @@ -990,11 +993,11 @@ "Spans": [ "8,2,1,3", "12,18,1,3", - "3,2,1,8", "9,2,2,19", - "3,10,1,2", "1,1,1,3", - "5,2,2,19" + "5,2,2,19", + "3,12,1,2", + "3,2,1,10" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1029,7 +1032,7 @@ ] } ], - "ID": "b1de45c8-cc42-4a12-b0e8-52267fb50c43" + "ID": "35a041d3-4e6a-4115-af2c-09e75f4a0761" }, { "CommandList": [ @@ -1046,7 +1049,7 @@ ] } ], - "ID": "9f50e046-af49-4586-8c7e-693073a7adc4" + "ID": "d4c17d3e-3557-434f-bc7f-50ed43af5525" } ] } @@ -1120,4 +1123,4 @@ "Formula": "'任务-任务信息'!$C$10" } ] -}//XPuTDZ5bVbuZbOVpW9r1RKgpZpoqStdqrVQ89Zh5TKJoNK7hlp+r1hRSI13nvSZcybwFSmTrPyYa6MtQU+io7R0ogfX8rUtWjAjvnl6ulgX+xMqZ/Vg3UMVdwUVUtJrtKiM1ghEIwpoW+XwiKo4o4inlyigISdsrhGQSXNjc/8Qa8m0ExmIqxG1wdtJfLuFxxoqSufl1iar2EpMYcF0U02aWD/L4yvXxjRPctj5KL5rsJNFdeQwvA8ZnjCK8tGRETopQGicmaCAVtMzOZfvPr/i+MMfWQFywneqnnUo+Qc9b93RrM5MVGelYkIrySRodcMKiQXRk/Kk1H/Ex1sQ1riWBS9sk4eWBpHfhmMO2FWVd21JzvPEAj0tiWvoJ/kt3tiO5wyNjM8Ua+k6udddaSooR45IHPaUnaRVTwrlUdsIm2x7V367uBHIHGlFGVVtIEH2Pgxk+u/pVc7t/tnQqHkUSdUXpV1tyu2Sz9ZtRpyUgvuDa1UsQp6rlf3MhuQv21L7PwZ9lCcLVF2RqRGv5TIOQUIkZC4qK/2jKPLu2ReuQ5KVABXAeLDrl8PcC6Hq9tEVNcqlyxeONAtr4kskjUzYDt3y9G4T6ghrAGxwkobbKChh9tFzrk6eD8yuFSe/9wdNNs6+3uVDF5ICnmPsLie8Fc/cRNr5rOTUlillF3n1FNHqZ8oNcT9HKEGyk0+5hrpGUM+SQrza2lqg6Yn8GRzM23oG30R5vkStJW+qJzEGDu4By++ReHV6QF2a2taKly/jvozBy90yAOD+7UyyOj//+cMDlwFL500A+2I9maTdokP6QkoMcFMPSt/uuWQQvhA+5dHJVq0H3mH844Xwn5dCT+Eh1Uf84Mkj1bq8hJb18su4/P68vi6m2y0kgNJ/7fqYO+LwKOcFj+urc4jW+bg==|920 \ No newline at end of file +}//bE3uAP3cOBaVAidplWTmMgJIwuAyKWOWkKKAVYpjbrPbvh/nzT5io3mTGVxEBTMaVA+aCUb6WI32uFNEgEfTbKP5tmbP8yDVbg8ER0qJJ2IoZEpGAZvJwF2KZKrSPcM3LBhJJEdsUAQi5j797+CfcKStkn1bOTqlV+8W6zmgf3FuF86/D8nu0dF4CC7J6PYIbDC1YH23nyBYWw3T1ecf1NOu37igMCMGoAaNECMnT22VxFoXlH53tC7jADZz5O2diFVjKFPGpwfuzI37tGkf72OCq7we5HADu4mn0IQCWUPTcybixxfkskf1vxLFcb9nnKTXgaSuJLb5ZABWZIASfoDGFJ7QElf4sCRaAHDRyLhsku23b5jmtE2daWEaGmXxe5lvGTR11AOqqEAxSSSe0DxwE9hCbvaz+LxW4eKFDyifwekT4I7CvDv6d0vYrZVZ2wIe4XU5YFSrSaW75xdtN9vSV23KZOFNJM8lGV+YLJuvsY5sh1okYWRR8touFH2fSyOyRx5Y+xL1ORy6kpMYJuQODtRTMD79HEZmYD9r5Pvgqlx/HY4dPPr7RTplyHwhfgLrK164LPiLY+S5HZ+/e1XBHcBe48aqd8vk/E0armFs0Qsx4fMq7m2RFC3RV3P6K+pfCx4Fvhk59x/ILKK4v/hqTwvQjTVcNUWZK+0omTXvsBRDcqnkwT5a3ziNYH7UMuiVXx0hPza/KMZ9DV518pbOynTAjI7tjWnuH4Q56kXT3zjHhStcYPlkxya5PWK/aTGfGFz5m/ivmKv0OT+XH6x/QtjIM8dwvBgZkRMqAEVEZVr2XYotEylolHm8HZtbCe8PMjxBQPkilEbXqntYjFWj3NCAvAmlp7zM27fZ9fjjSE7RV8lUXHSf8hqRtkzb1k3UGsy84C4l5LWCKBeL7Q==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-工时.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-工时.json index 4c6d10ce..b47af80f 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-工时.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-工时.json @@ -231,20 +231,15 @@ "IconSize": 14.0 } }, - "1,19": { + "1,5": { "BindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "项目ID", - "GUID": "28c08d4f-28a6-44b3-99c3-bf3af881287d", + "TableName": "项目表", + "ColumnName": "工时分配方式", + "GUID": "46d3f984-2ac8-4d2e-b691-86e7daba848a", "RelationBinding": { - "RelatedTable": "项目平行视图", + "RelatedTable": "工时分配方式", "RelatedColumn": "ID", - "DisplayColumn": "工时分配方式", - "NextRelationBinding": { - "RelatedTable": "工时分配方式", - "RelatedColumn": "ID", - "DisplayColumn": "分配方式" - } + "DisplayColumn": "分配方式" } } }, @@ -336,7 +331,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "7fc0a422-c0ab-427e-85b2-0f5ccd284ff5" + "ID": "be33eaac-5eb9-4007-9539-6c8500cb3304" }, { "CommandList": [ @@ -375,12 +370,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "f24ef9be-1be0-430a-8fea-6c55285fb49d" + "ID": "5bc4e551-696d-495e-b80e-b163a5015904" } ] } ], - "ID": "f49309fc-3046-4bd2-8ab9-cc7b95fa2950" + "ID": "6c99be5c-feea-4790-ad96-25684b162353" } ] } @@ -435,7 +430,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "db0167a3-e349-496e-9399-38478bf60bf9" + "ID": "4d1dd66a-4bb0-44fd-9fc9-3f20f266b327" }, { "CommandList": [ @@ -445,12 +440,12 @@ "Message": "你尚未成为该任务参与人，不能报工" } ], - "ID": "bc12d943-5cae-4826-bf61-0d40b65966ce" + "ID": "2db23075-819b-41ff-b776-4fd18df09779" } ] } ], - "ID": "f0b5460a-1275-4a75-a0c4-03dc53170dac" + "ID": "ac981eae-20c2-4631-99c6-ae0d47552bde" }, { "CommandList": [ @@ -489,12 +484,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "84e2f589-2409-477c-ab8a-edc1dee45cf0" + "ID": "ffc570d8-4fa8-4f8e-bd0c-388da25290fb" } ] } ], - "ID": "e1c06cca-9595-42d9-9461-673c5da1e9c5" + "ID": "d20597f6-6f66-4723-8a0e-7ecfecce2291" } ] } @@ -547,7 +542,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "b336d4e8-9356-4e3b-afed-d2a83e6fe2e0" + "ID": "eda2463c-16ce-4996-b045-c7c15fa6a82c" }, { "CommandList": [ @@ -586,12 +581,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "0b66bd0d-78a6-4515-a708-833625be3bd5" + "ID": "5a8a04a8-8a48-4c59-b859-9879a7e16752" } ] } ], - "ID": "bd73d2f2-1021-4b9b-b23b-a08b9e278132" + "ID": "224518b4-58cc-45a1-99ae-b64c21572de1" } ] } @@ -671,7 +666,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "3470ee39-81de-49f9-83f9-45750625c648" + "ID": "ff31ed8d-02e9-40ab-bed9-f3fb4a6b3007" }, { "CommandList": [ @@ -681,12 +676,12 @@ "Message": "你尚未成为该任务参与人，不能报工！" } ], - "ID": "0844f502-2611-45f9-82be-11db99605118" + "ID": "9da3ad88-9faa-4593-81d6-e6f3eddac8d2" } ] } ], - "ID": "e8bba2ba-19cc-44d0-ab40-09fe385393fb" + "ID": "afe466d1-b5fa-47c6-b827-2f69f095c911" }, { "CommandList": [ @@ -725,17 +720,17 @@ "LoadBindingDataOption": 1 } ], - "ID": "15b26b16-43b6-412a-875a-458083a22f66" + "ID": "0698b6c0-2e10-49b1-badb-c53bc644b468" } ] } ], - "ID": "24ddb9ad-e6c3-4a20-a03e-d55cfb018f86" + "ID": "06c3100a-b4c7-4fd0-94d0-15f42a692c87" } ] } ], - "ID": "ce2650a3-7e2f-41b2-8282-a966c6f01719" + "ID": "99e886f4-52db-495d-bfc4-f5e62e85cece" }, { "CommandList": [ @@ -745,7 +740,7 @@ "Message": "当前任务状态，允许上报工时" } ], - "ID": "41e1fb58-c388-4fa8-8c81-f213f31fd826" + "ID": "24737650-fb3d-4a0b-a2fe-86a03d783275" } ] } @@ -989,7 +984,7 @@ ] } ], - "ID": "be5dea99-f05c-46e7-b111-9f64e4da7cfd" + "ID": "8d7916d2-a3d2-47b5-966e-94b3c3252fdb" }, { "CommandList": [ @@ -1009,7 +1004,7 @@ ] } ], - "ID": "b02f1672-26d5-479c-a331-8d634b050e45" + "ID": "f71ea6a5-749f-4356-afb9-81e10adeebbe" } ] } @@ -1027,15 +1022,19 @@ "HorizontalAlignment": 3 }, { - "FontSize": 12.0, "Foreground": 4, + "HorizontalAlignment": 3 + }, + { + "FontSize": 12.0, + "Foreground": 5, "TextIndent": 15, - "HorizontalAlignment": 5 + "HorizontalAlignment": 6 }, { "FontFamily": 0, "FontSize": 13.333333333333332, - "Foreground": 6 + "Foreground": 4 }, { "FontFamily": 0, @@ -1051,7 +1050,7 @@ { "FontFamily": 0, "FontSize": 13.333333333333332, - "Foreground": 4, + "Foreground": 5, "HorizontalAlignment": 8 }, { @@ -1061,7 +1060,7 @@ "Underline": false }, { - "Foreground": 6 + "Foreground": 4 }, { "FontFamily": 0, @@ -1072,7 +1071,7 @@ "Underline": false }, { - "Foreground": 4 + "Foreground": 5 } ], "Types": { @@ -1081,9 +1080,9 @@ "black", "[AUTO]General", "Left", + "Accent 1 0", "Text 1 50", "Right", - "Accent 1 0", "Background 1 -25", "Center", "General\"小时\"" @@ -1091,11 +1090,12 @@ }, "CellStyles": { "1,1": 0, - "1,19": 1, - "1,20": 2, - "1,21": 3, - "1,22": 3, - "1,23": 4, + "1,5": 1, + "1,19": 2, + "1,20": 3, + "1,21": 4, + "1,22": 4, + "1,23": 5, "2,1": 0, "2,2": 0, "2,3": 0, @@ -1117,106 +1117,106 @@ "2,19": 0, "2,20": 0, "2,21": 0, - "2,23": 4, - "4,2": 5, - "4,4": 6, - "4,20": 7, - "5,2": 5, - "5,3": 5, - "5,4": 6, - "5,5": 6, - "5,6": 6, - "5,7": 6, - "5,8": 6, - "5,9": 6, - "5,10": 6, - "5,11": 6, - "5,12": 6, - "5,13": 6, - "5,14": 6, - "5,15": 6, - "5,16": 6, - "5,17": 6, - "5,18": 6, - "8,2": 5, - "8,4": 8, - "8,20": 2, - "8,21": 3, - "8,22": 3, - "8,23": 3, - "9,2": 5, - "9,23": 3, - "10,2": 5, - "10,23": 3, - "11,2": 5, - "11,3": 5, - "11,4": 8, - "11,5": 8, - "11,6": 8, - "11,7": 8, - "11,8": 8, - "11,9": 8, - "11,10": 8, - "11,11": 8, - "11,12": 8, - "11,13": 8, - "11,14": 8, - "11,15": 8, - "11,16": 8, - "11,17": 8, - "11,18": 8, - "11,19": 3, - "11,20": 2, - "11,21": 2, - "11,22": 2, - "11,23": 3, - "12,2": 5, - "12,3": 5, - "12,4": 8, - "12,5": 8, - "12,6": 8, - "12,7": 8, - "12,8": 8, - "12,9": 8, - "12,10": 8, - "12,11": 8, - "12,12": 8, - "12,13": 8, - "12,14": 8, - "12,15": 8, - "12,16": 8, - "12,17": 8, - "12,18": 8, - "12,19": 3, - "12,20": 2, - "12,21": 2, - "12,22": 2, - "12,23": 3, - "13,2": 5, - "13,3": 5, - "13,4": 8, - "13,5": 8, - "13,6": 8, - "13,7": 8, - "13,8": 8, - "13,9": 8, - "13,10": 8, - "13,11": 8, - "13,12": 8, - "13,13": 8, - "13,14": 8, - "13,15": 8, - "13,16": 8, - "13,17": 8, - "13,18": 8, - "13,19": 3, - "13,20": 2, - "13,21": 2 + "2,23": 5, + "4,2": 6, + "4,4": 7, + "4,20": 8, + "5,2": 6, + "5,3": 6, + "5,4": 7, + "5,5": 7, + "5,6": 7, + "5,7": 7, + "5,8": 7, + "5,9": 7, + "5,10": 7, + "5,11": 7, + "5,12": 7, + "5,13": 7, + "5,14": 7, + "5,15": 7, + "5,16": 7, + "5,17": 7, + "5,18": 7, + "8,2": 6, + "8,4": 9, + "8,20": 3, + "8,21": 4, + "8,22": 4, + "8,23": 4, + "9,2": 6, + "9,23": 4, + "10,2": 6, + "10,23": 4, + "11,2": 6, + "11,3": 6, + "11,4": 9, + "11,5": 9, + "11,6": 9, + "11,7": 9, + "11,8": 9, + "11,9": 9, + "11,10": 9, + "11,11": 9, + "11,12": 9, + "11,13": 9, + "11,14": 9, + "11,15": 9, + "11,16": 9, + "11,17": 9, + "11,18": 9, + "11,19": 4, + "11,20": 3, + "11,21": 3, + "11,22": 3, + "11,23": 4, + "12,2": 6, + "12,3": 6, + "12,4": 9, + "12,5": 9, + "12,6": 9, + "12,7": 9, + "12,8": 9, + "12,9": 9, + "12,10": 9, + "12,11": 9, + "12,12": 9, + "12,13": 9, + "12,14": 9, + "12,15": 9, + "12,16": 9, + "12,17": 9, + "12,18": 9, + "12,19": 4, + "12,20": 3, + "12,21": 3, + "12,22": 3, + "12,23": 4, + "13,2": 6, + "13,3": 6, + "13,4": 9, + "13,5": 9, + "13,6": 9, + "13,7": 9, + "13,8": 9, + "13,9": 9, + "13,10": 9, + "13,11": 9, + "13,12": 9, + "13,13": 9, + "13,14": 9, + "13,15": 9, + "13,16": 9, + "13,17": 9, + "13,18": 9, + "13,19": 4, + "13,20": 3, + "13,21": 3 }, "ColStyles": { - "1": 9, - "2": 9, - "3": 9 + "1": 10, + "2": 10, + "3": 10 }, "SheetStyle": { "FontFamily": 0, @@ -1231,10 +1231,10 @@ "9,2,1,21", "10,2,1,21", "13,21,1,3", - "1,1,1,6", "1,20,1,3", "4,4,1,16", - "8,4,1,16" + "8,4,1,16", + "1,1,1,4" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1375,4 +1375,4 @@ "Formula": "'任务-工时'!$V$14" } ] -}//Sys7fg/240oNnRRsQi9DiiRPDrNZLzsGNL7EKVlzY5uPGcbMt0cTDc+K+3IVxrrWtoxDuKZrmEtCiXZG7Ms3H+3l6qGkzQPUpkuWPM9l5pK3OFTj1SlehOe/mRBrOWWxJOq2I06LyZydSFsuopbHBacfRU/Djz+oWxd7dqtEj8q8qCpKsyAw8j1CNQT3gTXRkuzFYFvHtU+pRmOpEIreKkYd07ytYTufgBf0oegX8UZW0C7N3pJgP+e5D4TCq4GaT3USy6Ajty3AB5BVQtb7xCjf4SHIK/6HgmXDajliyXsj0SpSn6FayUNyrsY2J0Xpy/lURh48Z7sCNHguROKSq0f23nbAvLNzz3B8S5S+TzTz0G3t9fXmUqtAqHmnhydrcYTDBf5m1jJlUMo8SlnJQs3D4gk4Lrp5JElH/OSHjHlcA2defi4w2zIexRddesrrZ3SxfTNukm43k88H256tCw+GewDzq3TPPBxAbvcB7jF7QNMBUlhkcG4ldWu2VWVgylS0/TCtyZb/jdY1Qx6KKvMk7AYZYYsMcHKPytgcpAQXlcwLdQJsWJbj3HfFum7f7NKrQGXsBAJ67LpLVENbTgnYjHHBWggZx8WQGp3/KkAAoBbgQjxhp+JUa5JNLbNbHv5ChhrpeSD9IfythaUMgkjlr6Is05VEXQK9vEJRXyqUqIfGNUiNi2X75UXT9AHV0Kcp3dBiHGNIArYIvQOhOlN7EKT+6V4tiLu+qS9jdYuYeKMorwH4jpFXZflEqgJyzHWpRPnN3z4ABE8kYWTgCrJlkNh0Pz5M+KZzByRM7kq7jkv9Yg/vd2MqeE4x0hfvg9XidAJnmpR2fMpBw60AvedRmE0qi/KT/maXrGklVtjOKWOu9Ngx/UcNWdeMGODIanZDGjZE7k+WTH/9XqOO9A==|920 \ No newline at end of file +}//TrzPV5wBfzphDlpRooDh+epUQOCe4TdZGJGP0tkSwSyADPdUemPh29Q8411uZRmB4X37F14D+AhZSBFSWrZKvLE2INjeb/esK309jnAtQJpkoASHTtaLK1e45kQ4AQ0fRvz0gtXSheV0ccF0QaUdDgVX/GH8r4YzGaY3jVP8oycnM6AqPnRkx788lIlV3T6Tdgtm3Gv6Fl+s0fZje440SBmAxJOS3QBiKbB4RfsDtaSBSIDlXO/g3/l7K2xjbVEG9p1AVSRGvJu3bJiwD0GNUmF/9VNglcUugJKRx3coI/Hb89ReooAW6I6yjC1TugYlJm/V1LLZE4oqiJAnY0cfcGfK01fH8SiWLP5G9PK70hvZiApFy206mD0yCav/7AsAdtoZGJlMPGsjJIykJ4CprzlX3y50ooDUCixZLKYxGoaAWAM3pqT46//6/j2sywACQ8x+g+ia/HePBa1n4AXeDTcWp/WktULvngKZGIuwBcClUk1WHIZuHFLaFzBD3ArCEMq9T4YTvtgl+nBsEOIEc1KWG+4ol6AgJLdc1fg1dsWsnpdrd/AvWYqnmk3AeLQE82JHpE+5DBuofcy6KB+DfG7TwIfdwTDpFV3C3G3YdcJD8Q6lqyJVD+mZeMfFq7UQv6eryesQ4e58XVBeRWZN9afQjoTo26ToZ76BBKdJCyutPH2LmmhlRvQxit1q707LCJpkTsFmHUSw+nrL0Dlfa2XzMWXHHTaXYJuj3Hibqx99eb64O+GQ8ke9MStoz4Hcq/5L6y20qArhKjFGvTVHGmhL4QMlIfNbMcEuSVfG7HH/hNd3WBPzSXg/dQKmitjPgH99AWJn0HuvytQshUqzFu/etWAZsd0d1x2zfFrO1HumaKO/aUkd46MmMli+ICgsJsp4Bzd1FIpQ7yVOGeAAMg==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-进展.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-进展.json deleted file mode 100644 index 9e2ebe18..00000000 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-进展.json +++ /dev/null @@ -1,583 +0,0 @@ -{ - "Rows": { - "RowColumnAttachedInfos": { - "0": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 - } - }, - "1": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "2": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 - } - }, - "3": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0, - "IsHidden": true - } - }, - "4": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0, - "IsHidden": true - } - }, - "5": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 272.0, - "Mode": 1, - "IsHidden": true - } - }, - "6": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0, - "IsHidden": true - } - }, - "8": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 27.0, - "IsHidden": true - } - } - }, - "InLogicalVisibleIndexes": [ - 3, - 4, - 5, - 6, - 7, - 8 - ], - "Count": 9, - "DefaultSize": 10.0 - }, - "Cols": { - "RowColumnAttachedInfos": { - "0": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 - } - }, - "1": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 - } - }, - "2": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 97.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, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "13": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "21": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - } - }, - "Count": 22, - "DefaultSize": 32.0 - }, - "Values": { - "1,1": "任务进展", - "4,2": "新增进展", - "8,18": 1 - }, - "Formulas": { - "1,21": "IF(折叠任务进展,上箭头,下箭头)" - }, - "AttachInfos": { - "1,1": { - "CellType": { - "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-进展'!折叠任务进展" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT('任务-进展'!折叠任务进展)" - } - } - ] - } - ], - "Text": "任务进展", - "TemplateKey": "链接样式", - "Icon": { - "Name": "报告.svg", - "Color": "Accent 1", - "UseCellTypeForeColor": true - }, - "IconSize": 14.0 - } - }, - "1,21": { - "CellType": { - "$type": "Forguncy.ImageCellType, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-进展'!折叠任务进展" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT('任务-进展'!折叠任务进展)" - } - } - ] - } - ], - "ToolTip": "展开", - "Size": 18, - "ImagePath": "下拉2.svg", - "UseCellForeColor": true - } - }, - "4,2": { - "CellType": { - "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PageName": "新增进展", - "PassValues": [ - { - "Source": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-进展'!项目ID" - }, - "TargetCell": { - "SerializeProperty": "=新增进展!项目ID" - } - }, - { - "Source": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-进展'!任务ID" - }, - "TargetCell": { - "SerializeProperty": "=新增进展!任务ID" - } - } - ] - } - ], - "Text": "新增进展", - "TemplateKey": "Gost", - "Icon": { - "Name": "Application/005_add_5.svg", - "BuiltIn": true, - "Color": "Background 1", - "UseCellTypeForeColor": true - }, - "IconSize": 14.0 - }, - "RulesGuidList": [ - "3de34b47-f0f7-44a6-bad7-b893dacefb51" - ] - }, - "5,2": { - "CellType": { - "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", - "TemplatePageName": "77fae08dfbac4664a299aa7ec207218", - "DataSourceType": 1, - "DataSource": { - "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "任务进展", - "BindingInfos": [ - { - "GUID": "4eeda89b-b665-4ce7-94b0-d65884a02bbd", - "BindingInfo": { - "TableName": "任务进展", - "ColumnName": "ID", - "GUID": "12993094-1214-41e9-b02f-4e2f2ab87981" - }, - "ColumnName": "ID" - }, - { - "GUID": "03337e1a-25fb-4c1c-8a84-fb693e229e6f", - "BindingInfo": { - "TableName": "任务进展", - "ColumnName": "进展状态ID", - "GUID": "60fe910e-8a19-47c5-87e0-af84247cd855", - "RelationBinding": { - "RelatedTable": "项目进展状态表", - "RelatedColumn": "ID", - "DisplayColumn": "进展名称" - } - }, - "ColumnName": "进展名称" - }, - { - "GUID": "6178c511-bfee-4b68-a9f0-b567bd8d9f19", - "BindingInfo": { - "TableName": "任务进展", - "ColumnName": "进展内容", - "GUID": "4a24fef8-cdfb-43c7-bdc8-c46e4cbd54d1" - }, - "ColumnName": "进展内容" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务进展", - "ColumnName": "任务ID", - "GUID": "3fae9d87-2cbe-4344-9230-8866541071da" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-进展'!任务ID" - } - }, - "OrderBySqlCondition": { - "OrderByColumns": [ - { - "ColumnBindingInfo": { - "TableName": "任务进展", - "ColumnName": "FGC_CreateDate", - "GUID": "5d603b2a-0997-47dd-a958-93b29c5ca5f2" - }, - "Order": 1 - } - ] - }, - "IsListviewDataSource": true, - "CustomColumns": [] - }, - "DataSourceListviewName": "图文列表表格1", - "TemplateKey": "竖排无样式" - } - }, - "8,18": { - "CellType": { - "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", - "Caption": "折叠", - "Style": 1, - "CommandList": [ - { - "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "Location": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-进展'!4:8" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT('任务-进展'!折叠任务进展)" - } - } - ] - } - ] - } - } - }, - "StyleDatas": { - "Styles": [ - { - "FontFamily": 0, - "FontSize": 16.0, - "Foreground": 1, - "Formatter": 2, - "HorizontalAlignment": 3 - }, - { - "FontFamily": 0, - "FontSize": 13.333333333333332, - "Foreground": 4, - "Formatter": 2, - "HorizontalAlignment": 5 - }, - { - "FontFamily": 0, - "FontSize": 13.333333333333332, - "Foreground": 6, - "Formatter": 2 - }, - { - "FontFamily": 0, - "FontSize": 13.333333333333332 - }, - { - "HorizontalAlignment": 5 - }, - { - "FontFamily": 0, - "FontSize": 13.333333333333332, - "Foreground": 6 - }, - { - "FontSize": -1.0, - "Foreground": null - }, - { - "Foreground": 7 - } - ], - "Types": { - "Strs": [ - "Body", - "black", - "[AUTO]General", - "Left", - "Background 1 -25", - "Center", - "Accent 1 0", - "Text 1 50" - ] - }, - "CellStyles": { - "1,1": 0, - "1,21": 1, - "4,2": 2, - "4,3": 3, - "4,4": 3, - "5,2": 4, - "6,2": 4, - "6,3": 4, - "6,4": 4, - "6,5": 4, - "6,6": 4, - "6,7": 4, - "6,8": 4, - "6,9": 4, - "6,10": 4, - "6,11": 4, - "6,12": 4, - "6,13": 4, - "6,14": 4, - "6,15": 4, - "6,16": 4, - "6,17": 4, - "6,18": 4, - "6,19": 4, - "6,20": 4, - "7,2": 4, - "7,3": 4, - "7,4": 4, - "7,5": 4, - "7,6": 4, - "7,7": 4, - "7,8": 4, - "7,9": 4, - "7,10": 4, - "7,11": 4, - "7,12": 4, - "7,13": 4, - "7,14": 4, - "7,15": 4, - "7,16": 4, - "7,17": 4, - "7,18": 4, - "7,19": 4, - "7,20": 4, - "8,2": 4, - "8,3": 4, - "8,4": 4, - "8,5": 4, - "8,6": 4, - "8,7": 4, - "8,8": 4, - "8,9": 4, - "8,10": 4, - "8,11": 4, - "8,12": 4, - "8,13": 4, - "8,14": 4, - "8,15": 4, - "8,16": 4, - "8,17": 4, - "8,18": 5, - "8,19": 3, - "8,20": 3 - }, - "RowStyles": { - "2": 6 - }, - "ColStyles": { - "2": 7 - }, - "SheetStyle": { - "FontFamily": 0, - "FontSize": 13.333333333333332 - } - }, - "Spans": [ - "5,2,1,19", - "8,18,1,3", - "1,1,1,4" - ], - "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": [], - "ConditionFormatRulesCollection": { - "Rules": [ - { - "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", - "Formula": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=ISBLANK('任务-进展'!任务ID)" - }, - "GUID": "3de34b47-f0f7-44a6-bad7-b893dacefb51", - "StyleInfo": { - "Underline": null, - "Strikethrough": null - }, - "IsDisabled": true, - "IsInvisible": false, - "IsReadOnly": false - } - ] - } - }, - "PrintInfo": { - "PaperSize": {}, - "Margin": {} - }, - "BackgroundPictures": [ - { - "Name": "03800ae4-18af-4c3c-98bb-40694b1eb80b.png", - "DisplayName": "背景图1", - "StyleInfo": { - "CornerRadius": 5.0, - "Fill": "Background 1 0", - "StrokeDashType": 8, - "Stroke": "Background 2 -10", - "StrokeThickness": 1.0 - }, - "IsAutomaticStroke": false, - "IsAutomaticFill": false, - "Location": "24,52", - "Size": "720,316" - }, - { - "FitToBrowserWidth": true, - "Name": "138b82b2-1efd-46c0-8ac1-7b984f417427.png", - "DisplayName": "背景图2", - "PictureCommands": [ - { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-进展'!折叠任务进展" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT('任务-进展'!折叠任务进展)" - } - } - ] - } - ], - "StyleInfo": { - "Fill": "Background 1 0" - }, - "IsAutomaticFill": false, - "Size": "744,52" - } - ], - "CustomNames": [ - { - "Name": "折叠任务进展", - "Formula": "'任务-进展'!$S$9" - } - ] -}//aNP4mXyfYYSdiHcqdV92nMjxqySVT4n8j78M0YMFi5wSTKdPRv+JWtf03oXWPOjPeEZHn7AelJs4dPJvxxMvLLfxhy+O3tySr9yZ6fZ/jaDchjPFbQOp1Ge87WAQvJDTY3X30aELgBmW2aHz4JvtHc+OTip1Y2x+hyzAAyF8DNi4eb4145/Cd6PJCjIUMEDiKM/wh/lyd7JLYxIvKF70bj+ZgJ/uo+SZHKgmlWRf15bR05RE910PXBqnMbtMrPwoyWgfbSxkfDIVQaLrybnMCKDB4qad0Ei5/dbxr40E5tHelBuuN79VBA3GaLsZrLadHxHlfKWDYEtxchMGKpFKLRWZ+UVW0Lo88YYMoH0ipmlwzF/QA+3QjjrpLMW5qEEuUXXwXHaTdlsa9qqtiHqLiykl2dK6G4Q57Hj0F4LIG+oQB+1XYPsml8PcHJJD6++xNgueYn7/DNdMbpNgXPzuoWK1xJjECaK7YAVBRhxYcQxaJwVkiSLxLuSGmzFa+FsmozV1QdD6dDy+yE0c4Bk/J+ZFBT/1ds0IHjph5w3q9SQ2c1h9z4jBHKorQL9yQWQR9NU2ybHJr8nxJVy4YjjRhI+P1iqTlAhVc1SpBNLyYc+tXF0osDYoAykksVPC+FUX/nJ7PPe3QWFWEy8YXAaAFtnBMuClloZuPZCfbzURXUHJtuNx0tXugSWihpCPfBrSvIYww4cFZRJUKX86w1v27O77zd9sy2E4RnShGJdknM/gHrNHuIxT9IkW+nkkenxIvYixFiMb9zF7gzo3c8H9+xV1rOUqnjpAh+RrSxeF2gBE9CYHOpll+KckfjfiiEqf/tcxh76txJsDLByO94FU71pWRFSu6kUbRYF7uKaMD/pa8VfUYi+6RCLWIOfNFFqfc6HbOFXG38gqdkI7Nn72BA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-进展.rd b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-进展.rd deleted file mode 100644 index fe89d19e..00000000 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-进展.rd +++ /dev/null @@ -1,14 +0,0 @@ -{ - "PageType": 0, - "ColumnCount": 22, - "RowCount": 9, - "Formulas": { - "1,21": "IF(折叠任务进展,上箭头,下箭头)" - }, - "CustomNames": [ - { - "Name": "折叠任务进展", - "Formula": "'任务-进展'!$S$9" - } - ] -} \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务部分.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务部分.json index c40da080..f61ee643 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务部分.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务部分.json @@ -88,33 +88,17 @@ } }, "16": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 5.0 - } - }, - "17": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 5.0 - } - }, - "18": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 39.0, - "Mode": 1 - } - }, - "19": { "GridRowColumnDefinition": { "DesignLengthInPixel": 16.0 } }, - "20": { + "17": { "GridRowColumnDefinition": { "DesignLengthInPixel": 39.0, "IsHidden": true } }, - "21": { + "18": { "GridRowColumnDefinition": { "DesignLengthInPixel": 39.0, "IsHidden": true @@ -122,10 +106,10 @@ } }, "InLogicalVisibleIndexes": [ - 20, - 21 + 17, + 18 ], - "Count": 22, + "Count": 19, "DefaultSize": 5.0 }, "Cols": { @@ -252,9 +236,9 @@ "6,0": "任务-子任务列表", "9,0": "任务-关联资源", "12,0": "任务-工时", - "15,0": "任务-进展", - "18,0": "任务-反馈", - "20,1": "新增子任务" + "15,0": "任务-反馈", + "17,1": "新增子任务", + "17,5": "隐藏下半部分" }, "AttachInfos": { "0,0": { @@ -288,18 +272,12 @@ } }, "15,0": { - "CellType": { - "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", - "PageName": "任务-进展" - } - }, - "18,0": { "CellType": { "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", "PageName": "任务-反馈" } }, - "20,1": { + "17,1": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -538,7 +516,7 @@ } } ], - "ID": "8a2d26da-1bdc-430b-a5e2-91449d2e788d" + "ID": "8d703b20-ac14-4308-b934-c348b6bedd1c" }, { "CommandList": [ @@ -553,7 +531,7 @@ "BtnText": "知道了" } ], - "ID": "4d5b73df-1e73-4b79-a21c-f6485d1eee48" + "ID": "9e623fda-4695-4211-894c-bf87646d92cb" } ] }, @@ -570,6 +548,66 @@ "Text": "新增子任务", "TemplateKey": "_RS_Main1" } + }, + "17,5": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "0112343c-a560-400e-9301-fc1d57b0dc92" + } + }, + "value": "%Null%" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务部分!5:16" + }, + "Value": false + } + ] + } + ], + "ID": "0504a267-91a2-480e-ad3c-e52e6167fc28" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务部分!5:16" + }, + "Value": true + } + ] + } + ], + "ID": "2ee1e647-9c81-4c6f-99cc-07068fce7490" + } + ] + } + ], + "Text": "隐藏下半部分", + "TemplateKey": "_RS_Main1" + } } }, "StyleDatas": { @@ -867,12 +905,12 @@ "13,10": 1, "13,11": 1, "13,12": 1, - "13,13": 2, - "13,14": 2, + "13,13": 4, + "13,14": 4, "13,15": 1, - "13,16": 2, - "13,17": 2, - "13,18": 2, + "13,16": 4, + "13,17": 4, + "13,18": 4, "13,19": 1, "13,20": 3, "14,0": 0, @@ -909,39 +947,41 @@ "15,10": 0, "15,11": 0, "15,12": 0, + "15,13": 5, + "15,14": 5, "15,15": 0, + "15,16": 5, + "15,17": 5, + "15,18": 5, "15,19": 0, "15,20": 0, "16,0": 0, - "16,1": 1, - "16,2": 1, - "16,3": 1, - "16,4": 1, - "16,5": 1, - "16,6": 1, - "16,7": 1, - "16,8": 1, - "16,9": 1, - "16,10": 1, - "16,11": 1, - "16,12": 1, - "16,13": 4, - "16,14": 4, - "16,15": 1, - "16,16": 4, - "16,17": 4, - "16,18": 4, - "16,19": 1, - "16,20": 3, + "16,1": 0, + "16,2": 0, + "16,3": 0, + "16,4": 0, + "16,5": 0, + "16,6": 0, + "16,7": 0, + "16,8": 0, + "16,9": 0, + "16,10": 0, + "16,11": 0, + "16,12": 0, + "16,13": 0, + "16,14": 0, + "16,15": 0, + "16,16": 0, + "16,17": 0, + "16,18": 0, + "16,19": 0, + "16,20": 0, "17,0": 0, - "17,1": 0, - "17,2": 0, - "17,3": 0, + "17,1": 6, + "17,2": 5, + "17,3": 5, "17,4": 0, "17,5": 0, - "17,6": 0, - "17,7": 0, - "17,8": 0, "17,9": 0, "17,10": 0, "17,11": 0, @@ -967,74 +1007,14 @@ "18,10": 0, "18,11": 0, "18,12": 0, - "18,13": 5, - "18,14": 5, + "18,13": 0, + "18,14": 0, "18,15": 0, - "18,16": 5, - "18,17": 5, - "18,18": 5, + "18,16": 0, + "18,17": 0, + "18,18": 0, "18,19": 0, - "18,20": 0, - "19,0": 0, - "19,1": 0, - "19,2": 0, - "19,3": 0, - "19,4": 0, - "19,5": 0, - "19,6": 0, - "19,7": 0, - "19,8": 0, - "19,9": 0, - "19,10": 0, - "19,11": 0, - "19,12": 0, - "19,13": 0, - "19,14": 0, - "19,15": 0, - "19,16": 0, - "19,17": 0, - "19,18": 0, - "19,19": 0, - "19,20": 0, - "20,0": 0, - "20,1": 6, - "20,2": 5, - "20,3": 5, - "20,4": 0, - "20,5": 0, - "20,9": 0, - "20,10": 0, - "20,11": 0, - "20,12": 0, - "20,13": 0, - "20,14": 0, - "20,15": 0, - "20,16": 0, - "20,17": 0, - "20,18": 0, - "20,19": 0, - "20,20": 0, - "21,0": 0, - "21,1": 0, - "21,2": 0, - "21,3": 0, - "21,4": 0, - "21,5": 0, - "21,6": 0, - "21,7": 0, - "21,8": 0, - "21,9": 0, - "21,10": 0, - "21,11": 0, - "21,12": 0, - "21,13": 0, - "21,14": 0, - "21,15": 0, - "21,16": 0, - "21,17": 0, - "21,18": 0, - "21,19": 0, - "21,20": 0 + "18,20": 0 }, "RowStyles": { "0": 7, @@ -1050,75 +1030,32 @@ "6,0,1,20", "9,0,1,20", "12,0,1,20", - "15,0,1,20", "0,0,1,20", "1,13,1,7", "4,13,1,7", "7,13,1,7", "10,13,1,7", + "15,0,1,20", "13,13,1,7", - "18,0,1,20", - "16,13,1,7", - "20,1,1,3" + "17,1,1,3", + "17,5,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", "PageLoadedCommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务部分!隐藏下半部分" + }, + "TargetType": "Forguncy.ButtonCellType, ServerDesignerCommon, Version=10.0.3.0, Culture=neutral, PublicKeyToken=967100671921c115", + "MethodName": "ExecuteCommand" + }, { "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", "FunctionName": "remove", "Title": "加载中" - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", - "tableData": { - "TableName": "任务表", - "ColumnName": "ID", - "GUID": "0112343c-a560-400e-9301-fc1d57b0dc92" - } - }, - "value": "%Null%" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "Location": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务部分!5:19" - }, - "Value": false - } - ] - } - ], - "ID": "a062e31e-4e0b-48a4-a33f-1869c43edec0" - }, - { - "CommandList": [ - { - "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "Location": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务部分!5:19" - }, - "Value": true - } - ] - } - ], - "ID": "46e42e7a-de81-4fac-8bba-1c476a660bea" - } - ] } ], "PermissionData": { @@ -1144,36 +1081,36 @@ }, "CustomNames": [ { - "Name": "任务信息板块", - "Formula": "任务部分!$A$1" - }, - { - "Name": "新增子任务", - "Formula": "任务部分!$B$21" - }, - { - "Name": "子任务板块", - "Formula": "任务部分!$A$7" - }, - { - "Name": "任务说明板块", - "Formula": "任务部分!$A$4" + "Name": "工时详情板块", + "Formula": "任务部分!$A$13" }, { "Name": "关联资源板块", "Formula": "任务部分!$A$10" }, { - "Name": "工时详情板块", - "Formula": "任务部分!$A$13" - }, - { - "Name": "任务进展板块", + "Name": "任务反馈板块", "Formula": "任务部分!$A$16" }, { - "Name": "任务反馈板块", - "Formula": "任务部分!$A$19" + "Name": "任务说明板块", + "Formula": "任务部分!$A$4" + }, + { + "Name": "任务信息板块", + "Formula": "任务部分!$A$1" + }, + { + "Name": "新增子任务", + "Formula": "任务部分!$B$18" + }, + { + "Name": "隐藏下半部分", + "Formula": "任务部分!$F$18" + }, + { + "Name": "子任务板块", + "Formula": "任务部分!$A$7" } ] -}//suCvK58IlhcRDfly29wmRnC54sMwWVyQ+7fPzcj4O6naTez6H+18112RBS+h4OHopF0EEo/X+lTTNr6+otANFA7dmboYUMWO2A3VpQuA6EB8WJN9AJfXgF6B5xqks0LdAGb2PiGRHgIZWqC0HtciqbVzQA7DOwUPa4nurBI0STpVSbSkqsZsOpfIl5YHCFvrox9BvWueMuqAYa1hvPM56lJovO/lYaUQI+5Vb2wCSh2GuQDwA72kOEFjNHyc3qF8Zii9LzYt/V0fcJFcNZBQzLKJDhSSsGhlLzydE+4Q29bZx1zjQpot7wL1pDnbSilyopd5nlHHFa2KuIGm7LUlqSiI3BHUJYsWSOuKIvAFHwuv54bp8eu6sevE0Vx/ox/fSGGZx2OqzWFavYlV5pSCsqpCtE/tcjadpR0x/Zv4/6wGWqLkXdu9bUW5ENPH2cC44mtnmSUSCzDCRYLy1lC0KyAtAqLGKLtXCJSX6PpRtj4UOY/yEXCN7jyBR9//BHEeXywjk1LFyc1hK+ZvfDuBiBcy7iN9Mgk7fsC0gjZYqgP4HV4E05HjuQO38QisNfWflq3XcFlYhTGNRKk1xZFfxNTU2KZnpxW99YexvlqFqKGnlSuJWEGq+ROYiaUEyLyL+jMZw/T/XeHDWWLz6CEWj4ddmjT26C6JOG+rYKGdPqzwIO3127g/sI/cy21V0aosRAJIRyHYaqWdbu9ywbCprvK2grnR7JLL7W/XTsXJxhumsnBOmPrX1aVJmyfLvox+0pLTKeKXUB8mZ2vwJeUzZsN4I5EHbsnReGIynj6JZ/d7VMqvQN6LaKVVmwDZy1obp8qMlRaehJK5gG61n8JjL3cRW+Y6X0ZEtaKa1d7H9+XnOCtQQx88EEi25iKfQx3y0TSuBK/BJh4ZmYvuPh1bKA==|920 \ No newline at end of file +}//Gq/wPjXkRO5Okbvb8q5bt3nSOj8FB/KSIANh7/aXHYuSGo/zg5S8mYFYnjJLHNXbHr3E7ICohaUv1OlFfV9pq2HyJGB6WM+uJ4QJ7uZmOt8v4yHsRLOOLpeu5DEwI/1HFjPLsQWZJwergm1WNYy1H6lZif7YSnVbqg5XAjjWsrS+1uBXrZs0/dU8JdgcSACV70tGHkn3GJCXSzRqRUJeDUWAmVZJ3TeoUrqjPExQiWeGQJSaIEbBFYUhX95jM9dJ6j2pEew2isaGyAPz4RcBOaa+Z/mtc/K/AOLewbKAS67hW9hAEoWvhxluoQA1X7wgLXF4EJ+FSRK6jgVfPXOrjE3sjveYRBa5Rjw5Wqr74neoKW5FlwI0TBSFWnGO4rditHkFIEF2R4IxY3PHXTtP9mInQ3S0xiOednYmYb4+54xtYrhzr5Kb9UVkphvXJ8VHbpIqG9Y2jK7C+RB3GMQMQCOhhwczQusF7J2zmT5fSwwV75+oboRfxrKmCA5X46aBZ4WpuLqbBG2ge71yZWdXTlC9pomoTGcwLvR0KfqshaMY00O5aZgxxQxrFkmfMTDCNhLrYP8PWDnOkUhhu6WxbQkYkE2xOcpDUNX4uTRf8vuhtAHOWfM2sjbPtzcd6L+KWddGg2WB5lsCDR09EeX542r4sk6q+/vhRtyrlIWN28AFkadJEmbkR1fVfoVJO4Rtq4EzPyIFox9BVgpPfNmzohoTP9pCaoXwQeOl9cqwAEOYetcn1W8CwSpXz+kYS7RKmBVhsAqoxvpuLrMLUL7k80SQRd+Ky2g7x5lRV9IQsCfNQ06dIE9EfG4QYmNn0pua69mnQBhcbujjZDj/HXkctFPHiaR8vzY16z2840n0a/UA1wEndpYB6oJJrt8LMg//n6PV0Q5+flNoKfPSWtqg/g==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务部分.rd b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务部分.rd index e7061842..37b4fa1d 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务部分.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务部分.rd @@ -1,39 +1,39 @@ { "PageType": 0, "ColumnCount": 21, - "RowCount": 22, + "RowCount": 19, "CustomNames": [ { - "Name": "任务信息板块", - "Formula": "任务部分!$A$1" - }, - { - "Name": "新增子任务", - "Formula": "任务部分!$B$21" - }, - { - "Name": "子任务板块", - "Formula": "任务部分!$A$7" - }, - { - "Name": "任务说明板块", - "Formula": "任务部分!$A$4" + "Name": "工时详情板块", + "Formula": "任务部分!$A$13" }, { "Name": "关联资源板块", "Formula": "任务部分!$A$10" }, { - "Name": "工时详情板块", - "Formula": "任务部分!$A$13" - }, - { - "Name": "任务进展板块", + "Name": "任务反馈板块", "Formula": "任务部分!$A$16" }, { - "Name": "任务反馈板块", - "Formula": "任务部分!$A$19" + "Name": "任务说明板块", + "Formula": "任务部分!$A$4" + }, + { + "Name": "任务信息板块", + "Formula": "任务部分!$A$1" + }, + { + "Name": "新增子任务", + "Formula": "任务部分!$B$18" + }, + { + "Name": "隐藏下半部分", + "Formula": "任务部分!$F$18" + }, + { + "Name": "子任务板块", + "Formula": "任务部分!$A$7" } ] } \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json index f1fd5554..6a82dd01 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json @@ -215,6 +215,7 @@ "DefaultSize": 32.0 }, "Values": { + "3,30": "FGC_审批记录", "4,0": "任务部分", "6,1": "任务ID：", "6,7": "项目ID：", @@ -236,37 +237,12 @@ }, "Formulas": { "1,27": "IF(收起侧栏,L10,K10)", - "3,30": "IF(任务状态码=2,\"任务-侧栏\",\"FGC_审批记录\")" + "3,30": "AE1" }, "AttachInfos": { "0,30": { "CellType": { "$type": "ElementUI.TabHeader, ElementUI", - "ClickCommand": { - "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", - "Commands": [ - { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务首页!AE4" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务首页!页签值" - } - } - ] - } - ], - "ParamProperties": { - "itemIndex": "页签编号", - "itemValue": "页签值", - "itemText": "页签标题" - } - }, "DefaultValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=IF(任务首页!任务状态码=2,\"任务-侧栏\",\"FGC_审批记录\")" @@ -291,13 +267,8 @@ "$type": "Forguncy.ProcessPanelCellType, ServerDesignerCommon", "PreCommands": [ { - "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", - "Cell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务首页!任务信息容器" - }, - "Title": "加载中", - "VBalidate": true + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "Title": "加载中" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -340,7 +311,7 @@ "ShowConfirm": false } ], - "ID": "5bb5bece-e5e5-4c39-81f5-49701c8f189c" + "ID": "748a6e15-60b8-42fc-a449-19c078a145c2" } ] }, @@ -384,12 +355,8 @@ }, "CommandList": [ { - "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", "FunctionName": "remove", - "Cell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务首页!任务信息容器" - }, "Title": "加载中" }, { @@ -404,12 +371,12 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "976139ea-7a39-4520-834c-e792e43cab11" + "ID": "192f4446-af5d-4baf-96f1-547fda3e5ef0" } ] } ], - "ID": "46118012-fb32-4170-b7a9-46ebb620d102" + "ID": "69ea90bc-6a4e-4ad1-8c8d-f37257536a68" } ] } @@ -457,7 +424,7 @@ "ID": "e2e848e0e72d48229c97757429d446a2" } ], - "ID": "79c56612-e4c9-4d4b-a675-1a25caf651ea" + "ID": "fbf205d7-21a3-44ee-9ad5-ffe08f681acf" } ] }, @@ -471,12 +438,8 @@ "MethodName": "Refresh" }, { - "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", "FunctionName": "remove", - "Cell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务首页!任务信息容器" - }, "Title": "加载中" } ], @@ -675,7 +638,7 @@ "MethodName": "Refresh" } ], - "ID": "dfdb8fe5-1fcb-40b0-8c3a-7793d706ccfb" + "ID": "280384e2-a164-4d9f-a926-2b3905f362de" }, { "CommandList": [ @@ -690,12 +653,12 @@ "BtnText": "知道了" } ], - "ID": "8f5003ea-54a9-43af-b50c-7f0006fb1e7f" + "ID": "9911357c-b9de-406b-aea3-33b4976259ea" } ] } ], - "ID": "7249c42d-e6ac-4ea4-be4b-f561d9c9eddc" + "ID": "e22a7b46-42b4-44c0-8a3c-e6c1a3fae663" } ] } @@ -815,7 +778,7 @@ "ReloadData": true } ], - "ID": "816062fa-3e0b-416c-a820-c6048b4136e9" + "ID": "080b67ae-f701-4ae8-823d-c488b97ffd35" }, { "CommandList": [ @@ -830,12 +793,12 @@ "BtnText": "知道了" } ], - "ID": "34bf04c3-223b-4829-99b8-c6e6c5deacab" + "ID": "a675bb17-562b-4a96-a1ec-fa9d74bd3943" } ] } ], - "ID": "9b46f902-eebd-4cbd-b8dc-69becb9bd029" + "ID": "48b3b50c-bf0c-4379-a0c0-ca13587dbb7f" } ] } @@ -895,6 +858,7 @@ "3,30": { "CellType": { "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", + "PageName": "FGC_审批记录", "OverflowMode": 1 } }, @@ -975,7 +939,7 @@ } } ], - "ID": "6668979a-c6f5-472a-95fb-9eeaf4910617" + "ID": "81cef670-a73b-4377-a438-8445d0b0a9e5" } ] }, @@ -1016,12 +980,12 @@ } } ], - "ID": "b632925b-d076-4e49-b989-6d38bb211b82" + "ID": "1d320c19-185d-4db4-b7bc-0fd18e2fe123" } ] } ], - "ID": "08e2099d-86d4-422a-9d02-dce966f9c0a9" + "ID": "87dd274a-ab77-4c35-8e78-ff598d4f21e3" } ] } @@ -1082,7 +1046,7 @@ } } ], - "ID": "6908e48d-047d-4613-a347-5c878a8594e7" + "ID": "e433dc30-ed5a-429f-b07d-90ced73b6557" } ] }, @@ -1123,7 +1087,7 @@ } } ], - "ID": "b914aec4-fa90-4c4b-8775-654fb2545687" + "ID": "7bf77fbe-b68b-448e-94ef-a9d63a8e0568" } ] } @@ -1238,7 +1202,7 @@ "Disabled": true } ], - "ID": "b1b50506-6c40-4f61-94a6-92c1490c2422" + "ID": "a9dc84c6-834a-45d3-8af1-a3b1b3aab8fe" } ] } @@ -1377,6 +1341,66 @@ "TargetType": "Forguncy.ProcessPanelCellType, ServerDesignerCommon, Version=10.0.3.0, Culture=neutral, PublicKeyToken=967100671921c115", "MethodName": "Refresh" }, + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务首页!隐藏下半部分" + }, + "TargetType": "Forguncy.ButtonCellType, ServerDesignerCommon, Version=10.0.3.0, Culture=neutral, PublicKeyToken=967100671921c115", + "MethodName": "ExecuteCommand" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务表", + "ColumnName": "任务状态", + "GUID": "4f0d5e7d-a694-44a5-be00-041f68f99e41" + } + }, + "value": "2" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务首页!AE1" + }, + "Value": "任务-侧栏" + } + ] + } + ], + "ID": "3c5aea19-84f8-4890-a671-99b7dd6cbdf3" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务首页!AE1" + }, + "Value": "FGC_审批记录" + } + ] + } + ], + "ID": "065a8009-900f-4fac-82aa-e78cf4801973" + } + ] + }, { "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", "Message": "刷新成功" @@ -2147,4 +2171,4 @@ "Formula": "任务首页!$Y$8" } ] -}//wRf59OZbGPfNWKNS3bwNxnE1ZoQMzqjuj9qXdBHvLnrUmwv/u3vz5MgfGfOgXHmmq0Mlf/dLRX2EgVwi8lGhaWxeW3J+IzTnRQQ4om6tYTq6pnqrujTTaVbpJk/6qLUe3TpopbLb9u3ANek6qN6Soa6Vzp4gr09d3XDYEmNrZOtgcF2Mh97da0ix90aDupif9h882g6Po51D1tbAI5l5N8bCBBFOcwTj/zwaLcggyJbcJhvi96I8TzEZl1x7r3b2I9aOypBG4jec637/LSAWZYCqK1oPvPawnOLepdOYGoDFa1xs7gOP+CEnqOIJRwzcB++ADqFHEezzpQG+a4xIsEV24UN+jYShAq1b45d9RW7Wk6Fcgj8EmfQJYFAz1YMmSk2cYje9GIMWB8Ebotld59d0cShKUh2BciAMFt6y31sYu01jsc4qc8PT0jOoOLSQE+R48DF5oMdb/cJ+MSPXSZxGV+K68FdbxrKF/J2uQADqDincWS+uAQy/LxMhW3YFq04AAo8j4RyGiSnK2sSFLJSBr7Ij7wsAtfzSc1GjII3NFBbDTxfbbcnPz636PZ9s0t7THlt1AWnN9D5QCma60GivHOxI1Nw8ZtQohANTc+TAAobk3ytTVsdBDD11t3JXK9LomhtJRjjTiWScES3rIfJckUpYt0Vp6m2htn6fbNR7uj4+XrHNTkGm0Vs2KdfhpdwIRew9qonxpMZgW9N2PM1uMsboYoJLDpQmPjf62o7hwOoNcDfxQSFxqvkIBsd3jtdFDh4tJZ7zM9jFeT+U4IufP/l0oTpb4iwZ8o0bMaa+/duiGsRQLZ2F/Yr7eH6uZkv/WVSLeyx0TV0SsJlXlJOHJOKoAFPvp4MK0tQd30K+Mlca8ljoehdbdPavmJuB7wydoB6KnUqEboTfLBb+4w==|920 \ No newline at end of file +}//Z6pKj2M34yprIGEA8qE9vMQDA5ZWRkkoAsFobEVJdz37EdSGh7MIoP+d1/wbcP4slvpNrTVRaBRcs71GZwitklgcdUjngmnQtdUXnvj3QDxI6i1m+uenU1EHEg0H1FlC9wfoYUR85VfRwCCdiFFKAO2sS+HiURtnTtHrP3Y23GmJJKDqncHsFmQum8whR6QY5Wxkq0MpiY+8FklvaxDVrarAjQkPAaAVbbaruBbdxU+5sGflVmwNoUqUHA746l2RbdIPfnxIPmIRid7BBVkl6yz1vBt8lMNA8g6sLKGB4qOV8yxeqFrxcHM4j9BHCtQARRSyoDLgDEbghDhPc2mDz9Te4p7uC160Ia/J0jD3ga6o2+PBFq3/979vc6r05BAtoOJ0zVGHS2PPI7/oDkc31WwgonzzlPx/SowE/mnksmb8Fyca9ntCt9Eb/e+VXdpHqNJ/VED2mQWFFnmgyhzLa6AXQoWJBYKmjlZNVAV0AeUwGYpxdJUkeFg1Vlu8lgYfGP8NRO9vGYOgloZIIfxWMl9gxGJGujYhuijFK9bfKWWxqHArss9767pjrwTiRso2rRj4GjqymRjDgj0sbYpZN+7BdC+3D0jK6bjRf3OoSRBKJVuCrzP8nlyfdGXqLJHpxaJoWdoyFqLGba8ENSwuy0sQJbKH557Ero2P3sZxtueOrJY7QQsy81ZIdE+NkV3id4XenzKs+sOnFwA4bTpkYHEOMpcIpe8IoYzNH3kX19rRh4WRGyJ6IxindVw9M5iaddNf3v8Yh86Mv2j8UvGJlAQ5qSQU28NSzBjzZnUCFSJIAsCP4LaBbOXJ6/XEo16EUnlEeUJK2Wi8WZhSFvs0PSpCcKuBJAmiq5GK7JdKUjwFv4l9Y+wykdiV1a9gQWGE0lIe/IiW1FNVI6IkBn+tUg==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.rd b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.rd index 0d01f3f0..9bcf9ef0 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.rd @@ -4,7 +4,7 @@ "RowCount": 10, "Formulas": { "1,27": "IF(收起侧栏,L10,K10)", - "3,30": "IF(任务状态码=2,\"任务-侧栏\",\"FGC_审批记录\")" + "3,30": "AE1" }, "CustomNames": [ { diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目概况.json b/Pages/项目/项目首页/项目首页-容器页面/项目概况.json index a044d4a8..c8a0b928 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目概况.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目概况.json @@ -61,23 +61,30 @@ }, "11": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 278.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 35.0 } }, "12": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 379.0, + "Mode": 1 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 45.0 } } }, - "Count": 13, + "InLogicalVisibleIndexes": [ + 14 + ], + "Count": 15, "DefaultSize": 24.0 }, "Cols": { @@ -289,7 +296,8 @@ "4,1": "项目三经理成员", "6,1": "项目成员", "7,1": "项目成员统计", - "11,1": "项目甘特图" + "11,1": "项目进展", + "12,1": "项目甘特图" }, "AttachInfos": { "1,1": { @@ -452,10 +460,110 @@ "Config": "{\"option\":\"\\nconst {\\n \\\"日期\\\": xAxisData,\\n \\\"工时\\\": yAxisData\\n} = ForguncyEchartsHelper.splitDataSource(Context.report);\\nconsole.log(xAxisData);\\nconsole.log(yAxisData);\\n\\n\\noption = {\\n title:{\\n text:'工时上报趋势图',\\n left: 'center'\\n },\\n color: ['#00bcd4', '#00DDFF', '#37A2FF', '#FF0087', '#FFBF00'],\\n tooltip: {\\n trigger: 'axis',\\n axisPointer: {\\n type: 'cross',\\n label: {\\n backgroundColor: '#6a7985'\\n }\\n }\\n },\\n grid:{\\n left:25,\\n right:25,\\n top:55,\\n bottom:30\\n },\\n xAxis: {\\n type: 'category',\\n data: xAxisData,\\n splitLine:{\\n show:false\\n }\\n },\\n yAxis: {\\n type: 'value',\\n splitLine:{\\n show:true,\\n lineStyle:{\\n width:0.5,\\n color:'#e6e6e6'\\n }\\n }\\n },\\n series: [\\n {\\n data: yAxisData,\\n type: 'line',\\n smooth: true,\\n lineStyle: {\\n width: 3\\n },\\n areaStyle: {\\n opacity: 0.8,\\n color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [\\n {\\n offset: 0,\\n color: 'rgba(0,188,212,0.8)'\\n },\\n {\\n offset: 1,\\n color: 'rgba(0,188,212,0)'\\n }\\n ])\\n },\\n }\\n ]\\n};\",\"graphTheme\":null,\"displayMode\":\"canvas\",\"jsCode\":\"\\n async ({Context,JSONContext,ImageContext,echarts,myChart,dat,Forguncy,d3,setInterval,setTimeout,ForguncyEchartsHelper,PublicResource})=>{\\n var datGUI=undefined;\\n var option={};\\n const { \\\"日期\\\": xAxisData, \\\"工时\\\": yAxisData } = ForguncyEchartsHelper.splitDataSource(Context.report);\\nconsole.log(xAxisData);\\nconsole.log(yAxisData);\\noption = {\\n title: {\\n text: '工时上报趋势图',\\n left: 'center'\\n },\\n color: ['#00bcd4', '#00DDFF', '#37A2FF', '#FF0087', '#FFBF00'],\\n tooltip: {\\n trigger: 'axis',\\n axisPointer: {\\n type: 'cross',\\n label: {\\n backgroundColor: '#6a7985'\\n }\\n }\\n },\\n grid: {\\n left: 25,\\n right: 25,\\n top: 55,\\n bottom: 30\\n },\\n xAxis: {\\n type: 'category',\\n data: xAxisData,\\n splitLine: {\\n show: false\\n }\\n },\\n yAxis: {\\n type: 'value',\\n splitLine: {\\n show: true,\\n lineStyle: {\\n width: 0.5,\\n color: '#e6e6e6'\\n }\\n }\\n },\\n series: [\\n {\\n data: yAxisData,\\n type: 'line',\\n smooth: true,\\n lineStyle: {\\n width: 3\\n },\\n areaStyle: {\\n opacity: 0.8,\\n color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [\\n {\\n offset: 0,\\n color: 'rgba(0,188,212,0.8)'\\n },\\n {\\n offset: 1,\\n color: 'rgba(0,188,212,0)'\\n }\\n ])\\n },\\n }\\n ]\\n};\\n\\n return {\\n option,\\n datGUI,\\n };\\n }\\n \"}" } }, - "11,1": { + "11,30": { "CellType": { - "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", - "PageName": "项目甘特图" + "$type": "Forguncy.ImageCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "新增进展", + "PassValues": [ + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目概况!项目ID" + }, + "TargetCell": { + "SerializeProperty": "=新增进展!项目ID" + } + } + ], + "LoadBindingDataOption": 2 + } + ], + "ToolTip": "添加进展", + "Size": 18, + "ImagePath": "增加.svg", + "UseCellForeColor": true + } + }, + "12,1": { + "CellType": { + "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", + "TemplatePageName": "f9ec059d9c5d440eabbb7db442b15c9", + "DataSourceType": 1, + "DataSource": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "项目进展", + "BindingInfos": [ + { + "GUID": "750994ef-dfe3-440e-ac22-18b8afd004e7", + "BindingInfo": { + "TableName": "项目进展", + "ColumnName": "ID", + "GUID": "3b337aac-9034-4abb-a639-076fb6889a3d" + }, + "ColumnName": "ID" + }, + { + "GUID": "2404a2a9-b3a0-41d6-940d-43c40b6bf7eb", + "BindingInfo": { + "TableName": "项目进展", + "ColumnName": "进展类型", + "GUID": "f4ec46ce-e7f2-4bd2-9c53-247fad9f3c4d" + }, + "ColumnName": "进展类型" + }, + { + "GUID": "85978812-5d3d-4d1e-becc-7c6bcb565669", + "BindingInfo": { + "TableName": "项目进展", + "ColumnName": "进展内容", + "GUID": "0b23e108-0c6c-4aa3-abaf-3859eadbc5fd" + }, + "ColumnName": "进展内容" + }, + { + "GUID": "967fa0dc-067d-4830-878f-92e9febdfaf5", + "BindingInfo": { + "TableName": "项目进展", + "ColumnName": "FGC_Creator", + "GUID": "6e2e341d-ed89-4c3a-89e9-370b1871dc8c", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 + } + }, + "ColumnName": "创建者_全名" + }, + { + "GUID": "a1b31387-d996-419f-83b6-50b764970b85", + "BindingInfo": { + "TableName": "项目进展", + "ColumnName": "FGC_CreateDate", + "GUID": "af7014c3-c76f-4959-b20a-5d19427c471a" + }, + "ColumnName": "创建日期" + } + ], + "OrderBySqlCondition": { + "OrderByColumns": [ + { + "ColumnBindingInfo": { + "TableName": "项目进展", + "ColumnName": "FGC_CreateDate", + "GUID": "9fe85b73-cd11-4353-ac33-18ac6189a301" + }, + "Order": 1 + } + ] + }, + "IsListviewDataSource": true, + "CustomColumns": [] + }, + "DataSourceListviewName": "图文列表表格1", + "OverflowMode": 2, + "TemplateKey": "竖排横线分割" } } }, @@ -483,10 +591,13 @@ { "FontFamily": 2 }, + { + "Foreground": 4 + }, { "FontFamily": 2, "FontSize": 13.333333333333332, - "Foreground": 4, + "Foreground": 5, "HorizontalAlignment": 3 } ], @@ -496,6 +607,7 @@ "black", "Body", "Center", + "Accent 1 0", "Text 1 50" ], "Borders": [ @@ -580,79 +692,95 @@ "9,30": 5, "9,32": 0, "10,32": 0, - "11,1": 6, - "11,2": 5, - "11,3": 5, - "11,4": 5, - "11,5": 5, - "11,6": 5, - "11,7": 5, - "11,8": 5, - "11,9": 5, - "11,10": 5, - "11,11": 5, - "11,12": 5, - "11,13": 5, - "11,14": 5, - "11,15": 5, - "11,16": 5, - "11,17": 5, - "11,18": 5, - "11,19": 5, - "11,20": 5, - "11,21": 5, - "11,22": 5, - "11,23": 5, - "11,24": 5, - "11,25": 5, - "11,26": 5, - "11,27": 5, - "11,28": 5, - "11,29": 5, - "11,30": 5, + "11,1": 3, + "11,30": 6, "11,32": 0, - "12,1": 5, - "12,2": 5, - "12,3": 5, - "12,4": 5, - "12,5": 5, - "12,6": 5, - "12,7": 5, - "12,8": 5, - "12,9": 5, - "12,10": 5, - "12,11": 5, - "12,12": 5, - "12,13": 5, - "12,14": 5, - "12,15": 5, - "12,16": 5, - "12,17": 5, - "12,18": 5, - "12,19": 5, - "12,20": 5, - "12,21": 5, - "12,22": 5, - "12,23": 5, - "12,24": 5, - "12,25": 5, - "12,26": 5, - "12,27": 5, - "12,28": 5, - "12,29": 5, - "12,30": 5, + "12,1": 7, "12,32": 0, - "12,33": 1, - "12,34": 1, - "12,35": 1, - "12,36": 1, - "12,37": 1, - "12,38": 1, - "12,39": 1, - "12,40": 1, - "12,41": 1, - "12,42": 1, - "12,43": 1 + "13,1": 7, + "13,2": 7, + "13,3": 7, + "13,4": 7, + "13,5": 7, + "13,6": 7, + "13,7": 7, + "13,8": 7, + "13,9": 7, + "13,10": 7, + "13,11": 7, + "13,12": 7, + "13,13": 7, + "13,14": 7, + "13,15": 7, + "13,16": 7, + "13,17": 7, + "13,18": 7, + "13,19": 7, + "13,20": 7, + "13,21": 7, + "13,22": 7, + "13,23": 7, + "13,24": 7, + "13,25": 7, + "13,26": 7, + "13,27": 7, + "13,28": 7, + "13,29": 7, + "13,30": 7, + "13,32": 0, + "13,33": 1, + "13,34": 1, + "13,35": 1, + "13,36": 1, + "13,37": 1, + "13,38": 1, + "13,39": 1, + "13,40": 1, + "13,41": 1, + "13,42": 1, + "13,43": 1, + "14,1": 5, + "14,2": 5, + "14,3": 5, + "14,4": 5, + "14,5": 5, + "14,6": 5, + "14,7": 5, + "14,8": 5, + "14,9": 5, + "14,10": 5, + "14,11": 5, + "14,12": 5, + "14,13": 5, + "14,14": 5, + "14,15": 5, + "14,16": 5, + "14,17": 5, + "14,18": 5, + "14,19": 5, + "14,20": 5, + "14,21": 5, + "14,22": 5, + "14,23": 5, + "14,24": 5, + "14,25": 5, + "14,26": 5, + "14,27": 5, + "14,28": 5, + "14,29": 5, + "14,30": 5, + "14,32": 0, + "14,33": 1, + "14,34": 1, + "14,35": 1, + "14,36": 1, + "14,37": 1, + "14,38": 1, + "14,39": 1, + "14,40": 1, + "14,41": 1, + "14,42": 1, + "14,43": 1 }, "SheetStyle": { "FontFamily": 2 @@ -661,10 +789,10 @@ "Spans": [ "7,1,1,30", "1,1,1,30", - "1,33,11,11", - "11,1,1,30", + "1,33,12,11", "9,1,1,30", - "4,1,1,30" + "4,1,1,30", + "12,1,1,30" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -718,4 +846,4 @@ "Formula": "项目概况!$AH$2" } ] -}//HHYz+4WViQRwBOPT6QkUAEPWMZEKB8+KKNANMpMdXVdFo13Z9Fp0W7KiSzylRt8e8GsGT3jvohDMSTsahg4M3oLycQrhs5kspxEH70RKFXDVqzxFMUaJFYurSYrLcUAYOKkLwFH1KiSKLLodFuNWZSYGiOk9dlewVVVYeiqqIdveMswhH9xitF52XhNr6cXZEi9ludfKexn0dSORaWJ4GhdH0kTEZ30wvrlUy7p5M/8hHfCvH3Dp+pctaoghZOj9g5oZ8qtEHljIpRjkxk2ZDqKM8X78Pt+Wph7yhfUxXLWkn1uxwlpXHZrJeJzWjkFEZbSlrAaugV3R4wziLoL6Hu5GvLC6cN1/o9dx4VnLyi+6H3ySClBB8pUQrCnfTSkM5CESKvOSRfg9DAJ5F7zhuiKPy5p9eMHVcMUGDh0vrxnf0lTQUVl4MWg1/8xzf/jX7jcqhgyid/abphJCe2ZCoPc0yvwW+nbnmyU+NIAittjolI8Wka3ap7EbULxcUljLYWOinGZkgj5FrfGqHMtEB5WC6qq8+NZ18T3YlbxgdFgwr27PDX2Nb432KpMWaJfLbgfVSkusVLLZxxwL1BajZfWoufG7AGwFIpzNJl69NfOXPpZALIVALNdW/sGgSIXjFykV6dUUfnWx8iMFCa0ajwv5zsAN5z1jPbuZpcMRUxOPC1BdJN9bqs/rNE7LXL4mIMloryGFpwG771IMQ5xACQVqugO/2lyk5T7iBId8Bv/YGCpGbWo/RY5shl+BhkrOo01MZYuoFU7zIsOhbIEazrJ0M0xxPMQs/ILG4ZXqSgDoFih12hxHk9XB/HD/wnpZS6cbZzNLJjRb/0xe+6xN1oFg3dKQaD4XKGKVH5ULd2Y2XfVOU9gzPzr+LopVJSV+59YjX4UEDeoANk+Uh2+81w==|920 \ No newline at end of file +}//wyAOqHSCdPvfSj01TzqYqMz4uWim/GG7lEBqk46nicE0BhDUwxn1Xyvl8f1pzJBUNrMadkQgHnSoXHc8uZG4Q48N5DSB3v+rBqXaLuKkG4/K/pKQCezPLohxb2hrheoZznz/QEyuzDZTOnrN6pkuigZOuRas3OLA2jVH0Cf83lgy5BfTnvVu6szQlNlbVyUuSSwmVMEuDD665TU6mTRT8DeNtHoc/n7syI1QM0QL3tVPMDRHTMdmTTclXYDp1sd6qO29FmBsgrazy7sQRn/oMP9IWo9Efm+L0dMc7hGgEcWQMue3dQ6EKO4gJ27FYAoCKOSr/cdlYwyvww+cnp8zno3pR2pmsiEGMTS2q7BiG2qi/P/2xNRPkvOqLQYqHk6RMoia06tV3mbtlrRUvBWfYmfngcViG9uikH1uEphvpysjr1uywSqAnkAB341t8MRpv8YdWDyA+PBbpVCGP1t1Yw+shPr1XpzzaOBPHAoJT+zJA03iE4BKknAZ0mfFGVJ2k6w5+XdbBdbVg/8WbQ8xFLMnbC4VP+IF7wJfrr3GWg98F97pagKekeneOb0JDmhwKMU0lTv83Yq/v2FDtQooA4ja9SZLUKzp7Wnc2YJ2nDEUX8di28rPsjH76FGJrtWaPLurjfVCs1zajxJhe1etugg0zAfy42nPkWy+MPn0pNlPinzaA8otblydK5zLzzvruPjm1/SVqVjtvKQAzB/LhQis9EtokoKvOeByyNGN4Fzv45bKuqrEEMFUgdDtuUzlUodsiZUJh1I+tH5hRhw3S0f+cqqTy/7e2IjmD2jQvHa930hv9YjNfYm4wXa64MMvG2nOhl6C6jeYN6W0haf2LPh9B2wlpcIitKmwOpc7HR0ONOq+CnOuwCj2iH0tW6UwoKvVjNZfwxk+abOh1D82iw==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目概况.rd b/Pages/项目/项目首页/项目首页-容器页面/项目概况.rd index 8ec4e5fd..dc97e2d9 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目概况.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/项目概况.rd @@ -1,7 +1,7 @@ { "PageType": 0, "ColumnCount": 45, - "RowCount": 13, + "RowCount": 15, "CustomNames": [ { "Name": "工时走势", diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/新增进展.json b/Pages/项目/项目首页/项目首页-容器页面/项目进展/新增进展.json similarity index 72% rename from Pages/项目/项目首页/项目首页-容器页面/任务容器页面/新增进展.json rename to Pages/项目/项目首页/项目首页-容器页面/项目进展/新增进展.json index 0529731c..e9868818 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/新增进展.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目进展/新增进展.json @@ -165,45 +165,35 @@ "DefaultSize": 32.0 }, "Values": { - "1,1": 1, + "1,1": "状态正常", "1,33": "提交" }, "AttachInfos": { "1,1": { "BindingInfo": { - "TableName": "任务进展", - "ColumnName": "进展状态ID", - "GUID": "a1d519a1-c132-4e42-9d7c-7fb8d48816d5" + "TableName": "项目进展", + "ColumnName": "进展类型", + "GUID": "a000981a-62df-4f61-9635-fd44e0a52fdd" }, "CssName": "singlebox", "CellType": { "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon", "Style": 3, - "CellDefaultValue": 1, - "IsBounding": true, - "DataSource": "项目进展状态表", - "ValueColumnBindingInfo": { - "TableName": "项目进展状态表", - "ColumnName": "ID", - "GUID": "a44811ed-762c-4777-b2e8-97fa64bee7a6" - }, - "DisplayColumnBindingInfo": { - "TableName": "项目进展状态表", - "ColumnName": "进展名称", - "GUID": "91d050ff-530f-4c8a-aa45-68154bcfb332" - }, - "ItemsQuery": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目进展状态表", - "ColumnName": "项目ID", - "GUID": "0c2287a8-c36a-4d71-99b5-1427ef278224" + "CellDefaultValue": "状态正常", + "Items": [ + { + "Value": "状态正常", + "DisplayValue": "状态正常" }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增进展!项目ID" + { + "Value": "遇到阻碍", + "DisplayValue": "遇到阻碍" + }, + { + "Value": "存在风险", + "DisplayValue": "存在风险" } - } + ] } }, "1,33": { @@ -212,7 +202,7 @@ "CommandList": [ { "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "任务进展", + "TableName": "项目进展", "UpdateType": "add", "ShowConfirm": false }, @@ -234,19 +224,19 @@ }, "3,1": { "BindingInfo": { - "TableName": "任务进展", + "TableName": "项目进展", "ColumnName": "进展内容", - "GUID": "52d86b4a-0e6a-40a6-b3c5-b71fb53561af" + "GUID": "17b8ee9c-660b-4f8a-bf44-e38bec656da5" }, "CellType": { "$type": "editormdPlugin.editormdPlugin, editormdPlugin" } }, - "5,5": { + "5,1": { "BindingInfo": { - "TableName": "任务进展", - "ColumnName": "任务ID", - "GUID": "4b24bcea-d432-432f-9d27-da1defa1ece9" + "TableName": "项目进展", + "ColumnName": "项目ID", + "GUID": "5c5ebcb3-d012-4e2b-a091-7d57a3bc09bc" } } }, @@ -258,9 +248,6 @@ { "Background": 0, "FontFamily": 1 - }, - { - "FontFamily": 1 } ], "Types": { @@ -272,22 +259,17 @@ "CellStyles": { "1,1": 0, "3,1": 0, - "5,1": 1, - "5,5": 2, - "5,6": 2, - "5,7": 2, - "5,8": 2 + "5,1": 1 }, "SheetStyle": { "FontFamily": 1 } }, "Spans": [ - "1,1,1,11", - "3,1,1,36", "1,33,1,4", - "5,5,1,4", - "5,1,1,4" + "5,1,1,4", + "1,1,1,11", + "3,1,1,36" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -336,10 +318,6 @@ { "Name": "项目ID", "Formula": "新增进展!$B$6" - }, - { - "Name": "任务ID", - "Formula": "新增进展!$F$6" } ] -}//rhgSSjfWZSUFMhFfX5LIvLQ1f3ZqDC+YShQ8XNjk64uayibijcnpsxvpss2MO8HwvPDwVBlTq3htGCuLhqgx5B2OYKkZTw12XDJpdByao/v1X7m3FQXvwUWa2OiL8Sl2mksp8xA4r0V3jog8WenaKXr5u3JXfuznYDNEuZVv9XVZD/AJAyoR55xOMIX3PkvdBaFyQ474+LGskGpUVvimJnqdBzrAGDNbGosr7hZrCGfrlhosVsh1nXlap5O8dvvpscL+jhVV+Sn2e/NvJ7Q+RRSo9q0fbTk41vmw5DdJ3PNgh0wzinZX8tnAe9+rtK064eROuUYkpRK0ddT3voiLeI6tWUDOc2y1pl7RGBCOIINH0vRhkaYIwxUYxMk/7xS3c2uIPpTHuyupTFpQmM0CYQnVn6goUHEykJtrZbjhgQb8s3m0q0huzX3JOfCQkgpAg58TyEPRPi2BhXWf4mfZsFRMya5gKRrZPbhulQdFiArWeqoGdhutIZV5W1tXEom0zFQ1OjGsQ7JApIfM7Oe8AP4Y9niAWcjCXF5jDTQvOqRIaBuK5vnFXkhCrXS0mRr6c34TgZSjoKsPu5H48x1TSZeHYiK3JEEId8hfBfoBRpVBFyjG55biwYlfSQpYzXredAvEPURn7RtxzDccKC/OhOVRD/hwxEtt7PmABE+ckukEUS/fJoMWUo6IQpPywpq2Sv1W1sOExLBw+Vb2TY4ZNyemU5G11+kSbvq8/5B1f6YwJYEbRkP8bGs2sGigQDCX/qKZDOCFAkpu4H3IMZXjO6OOUMI4V67FmSXQemfMniw2oZGqALYCrPY+UOlyrcQF2NZcRxM5rqOQ5tFIx3wLKP7Hk1zfx/ejNXBFETPjRk2aeRiY/2nawhMjBs1NHbAjNlErEkhs2CyAQeE87yNqyA==|920 \ No newline at end of file +}//ixKa7P70LpVrYKhObAd8tUorNGgaqHGiWkC1vIszTmxE/+B6rWuhAVVIVnDbVvi0Z28k4DDJzTkHml5tQuX3sTFl1NHos35Qql7zimjS95H1/xOhVw/ETNHtRirVqtDHUIKcv+zje8anMduSMR3G6KVtb2CfQhrjkUWwLKFIya/mjzR5oWlZrgzr9Oqk2sEU03LcjnNyCC43QBphiqSdoqqSoEjIURXU8mmVmbcltbhReJkwGoPww6BC6TQViLJH39uGNnGDcd4krce12ARGp+2SPxcfRfVHL4rgIk4jFRbjk5Pt2MZNlpJJf69l2YY751/kLIaFul43ZHULP6ozpGhc9UDqU21qn6KX4/KRD4lLKhytc7nc6z1uJalc61xKJ/Rkuiw0sVszccXmQZNHFIQzCBE37VnjsGCtvrjcOKjJcjRY2gQ1PFvEtj4efyqqGXCLokA/rHwQ42EnonU7Ba8nUw1zD8CnMzxk7IR9tcrjXbZUJv2EhlzJWF8J3M57JX4vvC4IPO0LHzUmlCD8mpewli3NUamc2VSnZEfvQq0DW2BJujM2zspTEUetgnv+aB1sl06ThgbzHxy0bfROz4xAzi8nE0WWXL7yic6JNp/oDCjvfifAxTeARvIHhnE96JodR47SF4WTmr306zOs9Pjd0A+dxgBvLqDelbRTCzbJZb6KwnoPicCDLwGgIzETU7t3S1i03bwCHurftFhO9tmt7ljtxmbW/E/3Ch/WT0wuB7Gh3ET9D75AIs/K3CHmAUDsrpeNa/s37Rq0qFEON0cAeppvaZjrsDYWWYeevLf/huiYVidtKWPySbo3yH7pFpglclmvNB/ex1e2E6Ki3tubpthcGrnHpQHLENzuKzb+scuFwHwpgr9fUDHObG8A0bA/MASrfUqpN10OgyoEvg==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/新增进展.rd b/Pages/项目/项目首页/项目首页-容器页面/项目进展/新增进展.rd similarity index 67% rename from Pages/项目/项目首页/项目首页-容器页面/任务容器页面/新增进展.rd rename to Pages/项目/项目首页/项目首页-容器页面/项目进展/新增进展.rd index f574cd25..28faa9f8 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/新增进展.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/项目进展/新增进展.rd @@ -6,10 +6,6 @@ { "Name": "项目ID", "Formula": "新增进展!$B$6" - }, - { - "Name": "任务ID", - "Formula": "新增进展!$F$6" } ] } \ No newline at end of file diff --git a/Tables/任务/任务进展.json b/Tables/项目/项目进展.json similarity index 80% rename from Tables/任务/任务进展.json rename to Tables/项目/项目进展.json index 664bafac..b9e3e49c 100644 --- a/Tables/任务/任务进展.json +++ b/Tables/项目/项目进展.json @@ -1,5 +1,5 @@ { - "Name": "任务进展", + "Name": "项目进展", "Columns": [ { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", @@ -15,15 +15,15 @@ "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "bigint", "MaxLength": -1, - "Name": "任务ID", + "Name": "项目ID", "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", - "DatabaseColumnType": "bigint", + "DatabaseColumnType": "nvarchar", "MaxLength": -1, - "Name": "进展状态ID", - "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + "Name": "进展类型", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", @@ -57,7 +57,7 @@ "DataBaseType": "6db454c0-531c-4395-9122-921a18942902", "AllowModifySchema": true, "ConnectionId": "业务表", - "SourceTableName": "任务进展", + "SourceTableName": "项目进展", "SourceTableSchema": "dbo" }, "PrimaryKey": [ @@ -65,17 +65,10 @@ ], "Relations": [ { - "PrimaryTable": "任务平行视图", + "PrimaryTable": "项目平行视图", "PrimaryColumn": "ID", - "ForeignTable": "任务进展", - "ForeignColumn": "任务ID", - "IsDetailTableRelation": true - }, - { - "PrimaryTable": "项目进展状态表", - "PrimaryColumn": "ID", - "ForeignTable": "任务进展", - "ForeignColumn": "进展状态ID", + "ForeignTable": "项目进展", + "ForeignColumn": "项目ID", "IsDetailTableRelation": true } ],