From d578ad3f6d38bf6c8980959452d16978dfb186c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B6=85=E5=93=A5?= Date: Thu, 20 Jun 2024 15:05:40 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"1","MessageType":2,"Modules":[{"Sta?= =?UTF-8?q?te":1,"Type":1,"Name":"PCPage/=E4=BB=BB=E5=8A=A1=E5=88=97?= =?UTF-8?q?=E8=A1=A8"},{"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-=E5=B7=A5=E6=97=B6"},{"State":1,"Type":1,"?= =?UTF-8?q?Name":"PCPage/=E6=96=B0=E5=A2=9E=E4=BB=BB=E5=8A=A1"},{"State":1?= =?UTF-8?q?,"Type":1,"Name":"PCPage/=E6=96=B0=E5=A2=9E=E6=8A=A5=E5=B7=A5"}?= =?UTF-8?q?,{"State":1,"Type":15,"Name":"ServerCommand/=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=B7=A5=E6=97=B6"},{"State":1,"Type":15,"Name":"ServerCommand?= =?UTF-8?q?/=E4=BB=BB=E5=8A=A1=E5=8F=91=E8=B5=B7=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=89=8D=E6=A0=A1=E9=AA=8C"},{"State":1,"Type":23,"Name":"Tabl?= =?UTF-8?q?eView/=E9=A1=B9=E7=9B=AE=E5=B9=B3=E8=A1=8C=E8=A7=86=E5=9B=BE"},?= =?UTF-8?q?{"State":1,"Type":23,"Name":"TableView/=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=B9=B3=E8=A1=8C=E8=A7=86=E5=9B=BE"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 108 +----- Pages/任务/任务-工时.json | 38 +- Pages/任务/任务首页.json | 132 ++++--- Pages/任务/工时/新增报工.json | 17 +- Pages/任务/新增任务.json | 63 ++-- Pages/任务/新增任务.rd | 28 +- .../项目首页/项目首页-容器页面/任务列表.json | 32 +- ServerCommands/任务/任务发起流程前校验.json | 345 +++++++----------- ServerCommands/工时/修改工时.json | 4 +- Tables/任务/任务平行视图.json | 57 +-- Tables/项目/项目平行视图.json | 30 +- 11 files changed, 342 insertions(+), 512 deletions(-) diff --git a/.collaboration b/.collaboration index 2d9cd30e..1eae0b16 100644 --- a/.collaboration +++ b/.collaboration @@ -558,19 +558,7 @@ }, { "ModuleName": "PCPage/任务列表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T14:36:11.8790504+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.rd", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.json", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目工时", @@ -682,17 +670,7 @@ }, { "ModuleName": "PCPage/任务首页", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T14:36:11.8787064+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务首页.json", - "Pages\\任务\\任务首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务部分", @@ -720,19 +698,7 @@ }, { "ModuleName": "PCPage/任务-工时", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T14:36:11.879237+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-工时.json", - "Pages\\任务\\任务-工时.rd", - "Pages\\94f8bae36aee4ae7aec2a063ca731b1.json", - "Pages\\94f8bae36aee4ae7aec2a063ca731b1.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-进展", @@ -748,17 +714,7 @@ }, { "ModuleName": "PCPage/新增任务", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T14:38:06.0984357+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\新增任务.json", - "Pages\\任务\\新增任务.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/新增进展", @@ -790,17 +746,7 @@ }, { "ModuleName": "PCPage/新增报工", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T15:05:24.8861706+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\工时\\新增报工.json", - "Pages\\任务\\工时\\新增报工.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/分配计划工时", @@ -1060,16 +1006,7 @@ }, { "ModuleName": "ServerCommand/修改工时", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T14:40:57.7651424+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\修改工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/删除任务成员所有工时", @@ -1972,16 +1909,7 @@ }, { "ModuleName": "ServerCommand/任务发起流程前校验", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T14:42:22.815817+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\任务\\任务发起流程前校验.json" - ] + "ModuleType": 15 }, { "ModuleName": "ProcessItem/新增任务流程", @@ -2021,16 +1949,7 @@ }, { "ModuleName": "TableView/项目平行视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T14:41:52.9025699+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\项目\\项目平行视图.json" - ] + "ModuleType": 23 }, { "ModuleName": "Pages/任务/任务成员", @@ -2042,16 +1961,7 @@ }, { "ModuleName": "TableView/任务平行视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T14:36:11.8782822+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\任务\\任务平行视图.json" - ] + "ModuleType": 23 }, { "ModuleName": "Pages/任务/任务类型管理", diff --git a/Pages/任务/任务-工时.json b/Pages/任务/任务-工时.json index d5ec7c30..ff262efc 100644 --- a/Pages/任务/任务-工时.json +++ b/Pages/任务/任务-工时.json @@ -319,7 +319,7 @@ "tableData": { "TableName": "任务平行视图", "ColumnName": "成员数量", - "GUID": "fbb4ed9c-cbf6-4933-b534-668474b481b5" + "GUID": "aff590e4-79c7-4d85-b972-bb231fab04d9" } }, "value": "0", @@ -332,7 +332,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "50c7327b-0464-4d82-9ce4-ff01a67d5725" + "ID": "05fa8186-2e50-4236-b901-bb024dfdc9d0" }, { "CommandList": [ @@ -371,12 +371,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "d8845c4b-f31a-4615-b98b-15c24f2b1fb9" + "ID": "26eb320a-ad38-43dd-9279-445772e6696b" } ] } ], - "ID": "700ddad3-3ccb-4251-b4a9-5373c7641cf7" + "ID": "6eaa77b3-083b-4ce8-a240-cf8e42cb2b64" } ] } @@ -400,7 +400,7 @@ "tableData": { "TableName": "任务平行视图", "ColumnName": "成员数量", - "GUID": "fe2a75e1-f948-4a35-9f9c-98d332fd8e5d" + "GUID": "91a18234-02e0-4c04-81db-bca14365e4d5" } }, "value": "0", @@ -413,7 +413,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "4d885980-2a1f-4c99-852d-761c252f4df3" + "ID": "909fdc1f-1ad7-4321-bf6e-a897fa9c02cb" }, { "CommandList": [ @@ -452,12 +452,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "5145d874-a36a-46c6-b8c1-e0ab2e5254d7" + "ID": "d302d2ba-a7a7-4654-ae84-38eb9f704599" } ] } ], - "ID": "dffc353b-942c-459d-9312-a3f0c1664bce" + "ID": "97eda98e-160d-4d24-b983-cf7342942d16" } ] } @@ -497,7 +497,7 @@ "tableData": { "TableName": "任务平行视图", "ColumnName": "成员数量", - "GUID": "a5bec9dd-7948-4d79-bdbb-13d27a368063" + "GUID": "8ca78e3f-bb10-4ff5-9a22-646a17bf0a5f" } }, "value": "0", @@ -510,7 +510,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "00fe2d7a-9994-481f-8a26-0044b697cb3c" + "ID": "1ca08ac8-a6b1-423a-98ad-016bfd5d45a7" }, { "CommandList": [ @@ -549,12 +549,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "dd9c7775-5ae3-4969-9414-da9230d74704" + "ID": "69f70ecc-6117-45bf-beb0-fc2bd7e9e757" } ] } ], - "ID": "be6260b8-309a-4e63-8e46-8ca5a264f36d" + "ID": "815cd2dc-6318-4bdf-94de-f37ff784407d" } ] } @@ -595,7 +595,7 @@ "tableData": { "TableName": "任务平行视图", "ColumnName": "成员数量", - "GUID": "6d56483e-74b7-4690-9382-70a314118cca" + "GUID": "bb186b1a-ec87-43c7-8ec5-96d0fd1ddc06" } }, "value": "0", @@ -616,7 +616,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "79962f11-e192-45b4-a503-9b41897d7ba9" + "ID": "f5ab0ab7-b4b0-49c3-b8be-cbb1211beb37" }, { "CommandList": [ @@ -655,17 +655,17 @@ "LoadBindingDataOption": 1 } ], - "ID": "4b7c0cce-b0c1-4fd3-8bd3-49b160e7197e" + "ID": "89ab4be4-4d01-4be7-ad18-87b98c287c7c" } ] } ], - "ID": "25737cab-e750-40b8-8094-6cf043daccdf" + "ID": "e937d929-f94a-46a2-82da-23014bf73163" } ] } ], - "ID": "fd58ba28-f292-47dd-bd12-66b628e266db" + "ID": "8ad3fd91-8d85-4543-a60a-3a1754801935" }, { "CommandList": [ @@ -675,7 +675,7 @@ "Message": "当前任务状态，允许上报工时" } ], - "ID": "4bf7a7d2-1d66-4018-b012-23c8f3f54d2d" + "ID": "eda88c4d-515c-4fd2-b9e8-22df70e36048" } ] } @@ -1261,4 +1261,4 @@ "Formula": "'任务-工时'!$V$14" } ] -}//xk9ySCug56ExEvsyztC0vNfUVwcNfYyxRS8mNn1EHnYqjqXF/xJkFjyHkK+3NbNzPVy454cLtXEs1rzEEyBeB7WdRhBtDVwdgxKoAf7xEuZkImDL7Vk9sp6sjGH4ptfGoYSbTO6wTCPT80OO71ygLmW96MZfIK5bROc1DHJWozL0ZXW29+KSog1qglvnhn7bGm+BE7jLqEGR1xnLFjjNmiRGJ64kiUZpTv1687Dmg2h43KNqzCAuQtAAbcirZh8uCF1KGu76rrlpgv7yU2A8yQIBSV3lKSRSp6omOmtsXfG00ey1n7Put4lYup9VcQEWy9Bgf4t0yJqOkYh0cd43+OQW8XaE0qcbpRpWt6qLuhy4nDqkmdJYunbM3oHNQiZmlbhNgkCRW4SuCCCp/P4K2ouRHCQs/iwLqEuwwgEJ8cgDkYRutrlDGPJnM9LnRJ5ryA1gvt/Oif0phTuIDf+xSmYzdSPthmHb57LFImK29m+FhKYQ0lDS061T5mvRqlXC2za4m0O3BPTTiPWyW3njMBXk/KXV6m5R3BZB0qOZsxLrvi0X3yakKauvVrvm9j09cl5+5JJe/joRLz2GuOHqJPMr6QuO9S/ml+eu+qlO17h9CBGjmiCw8TaDiCjAYn/rFtQPZxrQ88yzVKh5N8788ZpWsCqcw3OCJkMRje7JIqJg/o+M/bn6ewdX8sBDOY5e1FHjhycv0jY4tOousfbcWn3m1pFnW4zSdotlGd9pWJYNzHwljroes1hz2JuaLYk8tIObRNy29Y81Vqn0V3OQXRzxJg3knbNyyoG1gu3fE9+va/XZZC6t6Et7VI5G/g+vQAFW19n/mkspOfOibDq4Wl8sgFW9yXwk6ie2WEa6w/mhT8zrwgu6AtPeX+csaWNIKdquSG5kdl4+ayK76YSH6g==|920 \ No newline at end of file +}//2x+40Y4Tc3FuP0RmX3gPAKagDlKHUsxfSOEQocjSz/cr4W3kZzJXYbnm8WH3ke6/5rUh9utFKE8/xN962rLREreS6vsF+q0Hg8PaqBLJ1UmJPKBdB0Jo3tmEmXXyt6rgOBgQcvgN/9Jn5DSeHv4dhbv14g/RLLV8okG/IQ+9uWEw3utkstIKDbx4SmE/stuAFq7P0xVoO8uW2Xx1sLyeTFUp9DD9xqBAlfuJ758+NUCKQm+TzB1PF0CJZt8kFE4Lwww+FqfBzgHdoQQZ7qC5ORRIWtZ5ocR5egqGDqSs6ggkpimMlkV+gRRk/UITHAghA9MkFdJ2vCtLkohZxlRi2ErgoSFgDsCx8YtYPog45f267jHg+PrNmK2kEe57olyJ7qg/tzKaK7HpY+onQMYM2JiNTIr517keAfNCwdWVNvhWAP7y5Obo5gPmLuAt87guq0rlnn+XzAFHYbqcxCoVfmnq6dbgGztY50OMi7LZpCLnEQx1DpZKN5qEMWXiA+7wkZgaoYfrNOF2QxGibVlfO5vUO7uW4cpXCBnmVytFiOQy8Q8JvaqaO35ceFdEV0FgWfcn2SjaEHu8VBmQkRZ8sjcR4QlGs6AkgaZEdWsQ0AA5CbIVxzql4eNxmCusL/u988p0+rks2pr8ILrxZeOIw+u0COi1mPf4uH1f3FhY+HlDmLxkAQEt+Opq3jvUv3bJqMffAxSgJd2/fCWEkMBstS9F4AjoHdMJ/cvdl0LFbYFtq47tvbVwNTpip4BpgDaEZ1LKrrQWXecU4Sr3m0Ju650kqzXrHTAgPYIXWoo0fj22IuF5mW3PWucXHAguLEt+fhUmuoa6hifWqGrKr9hJjkf59MVhFyUWELYSJkiViciD0qAn2Up64Qa3OCJRiT1jYxRuMe0sY9IhzMSElRCrMQ==|920 \ No newline at end of file diff --git a/Pages/任务/任务首页.json b/Pages/任务/任务首页.json index 3815eedc..d1c3d696 100644 --- a/Pages/任务/任务首页.json +++ b/Pages/任务/任务首页.json @@ -1017,9 +1017,9 @@ }, "6,17": { "BindingInfo": { - "TableName": "任务平行视图", + "TableName": "任务表", "ColumnName": "流程实例ID", - "GUID": "63d29405-9476-4543-9453-c2cea279eaad" + "GUID": "451e77c4-b4f4-4c67-9985-bf39ffd40e07" }, "CellType": { "$type": "Forguncy.TextCellType, ServerDesignerCommon", @@ -1099,16 +1099,26 @@ }, "7,10": { "BindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "已分配工时", - "GUID": "9f4afb6b-ff78-4067-9c8e-244690e27646" + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "9bf45acd-a580-4418-b927-92d9f3f7ba2c", + "RelationBinding": { + "RelatedTable": "任务平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "已分配工时" + } } }, "7,17": { "BindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "成员数量", - "GUID": "93028808-d449-41f7-a838-054e684651db" + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "c64b85c5-1354-4338-99f7-3c1f2afa3398", + "RelationBinding": { + "RelatedTable": "任务平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "成员数量" + } } }, "8,4": { @@ -1433,6 +1443,25 @@ "BorderLeft": 1, "BorderRight": 1 }, + { + "FontFamily": 1, + "FontSize": 13.333333333333332, + "Foreground": 6, + "Formatter": 7, + "HorizontalAlignment": 8, + "BorderBottom": 1, + "BorderTop": 1, + "BorderLeft": 1 + }, + { + "BorderBottom": 1, + "BorderTop": 1 + }, + { + "BorderBottom": 1, + "BorderTop": 1, + "BorderRight": 1 + }, { "Background": 5, "TextIndent": 5, @@ -1478,15 +1507,6 @@ "BorderTop": 1, "BorderLeft": 1 }, - { - "BorderBottom": 1, - "BorderTop": 1 - }, - { - "BorderBottom": 1, - "BorderTop": 1, - "BorderRight": 1 - }, { "FontSize": 13.333333333333332, "Foreground": 6, @@ -1666,11 +1686,11 @@ "6,14": 16, "6,15": 17, "6,16": 17, - "6,17": 15, - "6,18": 17, - "6,19": 17, - "6,20": 17, - "6,21": 18, + "6,17": 18, + "6,18": 19, + "6,19": 19, + "6,20": 20, + "6,21": 21, "6,22": 14, "6,23": 14, "6,24": 14, @@ -1678,28 +1698,28 @@ "6,26": 14, "6,27": 14, "6,28": 14, - "6,29": 19, - "7,1": 20, + "6,29": 22, + "7,1": 23, "7,2": 14, "7,3": 14, - "7,4": 21, + "7,4": 24, "7,5": 14, "7,6": 14, "7,7": 13, "7,8": 17, "7,9": 17, - "7,10": 22, - "7,11": 23, - "7,12": 23, - "7,13": 24, + "7,10": 25, + "7,11": 19, + "7,12": 19, + "7,13": 20, "7,14": 16, "7,15": 17, "7,16": 17, - "7,17": 21, - "7,18": 17, - "7,19": 17, - "7,20": 17, - "7,21": 18, + "7,17": 25, + "7,18": 19, + "7,19": 19, + "7,20": 20, + "7,21": 21, "7,22": 14, "7,23": 14, "7,24": 14, @@ -1707,28 +1727,28 @@ "7,26": 14, "7,27": 14, "7,28": 14, - "7,29": 19, + "7,29": 22, "8,1": 13, "8,2": 17, "8,3": 17, - "8,4": 25, + "8,4": 26, "8,5": 14, "8,6": 14, "8,7": 16, "8,8": 17, "8,9": 17, - "8,10": 21, + "8,10": 24, "8,11": 14, "8,12": 14, "8,13": 14, "8,14": 13, "8,15": 17, "8,16": 17, - "8,17": 21, + "8,17": 24, "8,18": 14, "8,19": 14, "8,20": 14, - "8,21": 18, + "8,21": 21, "8,22": 14, "8,23": 14, "8,24": 14, @@ -1736,39 +1756,39 @@ "8,26": 14, "8,27": 14, "8,28": 14, - "8,29": 19, - "9,1": 26, + "8,29": 22, + "9,1": 27, "9,2": 17, "9,3": 17, - "9,4": 21, + "9,4": 24, "9,5": 14, "9,6": 14, - "9,7": 21, + "9,7": 24, "9,8": 17, "9,9": 17, - "9,10": 21, - "9,11": 21, - "9,12": 27, - "9,13": 27, + "9,10": 24, + "9,11": 24, + "9,12": 28, + "9,13": 28, "9,14": 13, "9,15": 17, "9,16": 17, - "9,17": 28, + "9,17": 29, "9,18": 14, "9,19": 14, "9,20": 14, - "9,21": 28, + "9,21": 29, "9,22": 14, "9,23": 14, - "9,24": 29, + "9,24": 30, "9,25": 14, "9,26": 14, "9,27": 14, "9,28": 14, - "9,29": 19 + "9,29": 22 }, "RowStyles": { - "4": 30 + "4": 31 }, "SheetStyle": { "FontFamily": 1 @@ -1805,12 +1825,12 @@ "8,24,1,5", "9,24,1,5", "6,14,1,3", - "6,17,1,4", "7,14,1,3", - "7,17,1,4", "9,14,1,3", "9,17,1,4", - "7,10,1,4" + "7,10,1,4", + "7,17,1,4", + "6,17,1,4" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1905,4 +1925,4 @@ "Formula": "任务首页!$H$10" } ] -}//eLB4YCUlDB5n6rOboBEhJzKUH8T7+gJxvF65pnCkpJu77oHpRdKUoAIvHvPtazYsJ9b85aFZziKsBdC8kUH29Uurx2MhOdFU7BykuSY95mDG91wc96Drb7f8mgMTRdLUCG89W9SLrTJFAHSX5h5T+W8Dsjexwfs0Tk5rA4YcJ4GKuBg62/5tVH1d5/vocPXtXP2uCi709mO/HX40xYfqJWM2TnPC4BAeccLb0El1b7fKFHmLB8nfEpodUu1rU/6BO4cnwbu0T/8ofH2wLYdQkegnzFIeKPdXE7oyaCJPLgC6904QR1QdZZ+0SdMtqsWO3RNEc/2FYZg/yYsdpYtuvRpaBHk/3I6EU0E1vas85pMtNjA2/Q8KOtMQuu8rwWfGyXsaByyiucNEsiQ0P64xGqgG1HkVw3BfDh4tNF4k05jiUaDjqfB/3B3wjY/nCyotUjDxIKQz4rHfdYK+Uy31B6x7HtWOmbeNtgSWGbA0WMOGPzBGpsA6QIz5X/Rmi7zElVpqoTYMbXALBJ0BjzDQCareDMARB1yRYl/PqzKw3P9Qykek6Eu9JSxc6gwZ/lZ9UHCnj0deBph3b6E/LlSb1Wv5x/qct7O8sukWgNUmdi8RQvCLv4UOo4uqWc69o1hf73qVXrd7lmR7ZwexdT1wSgmiwHCG+Yd9Rd2fU0E8Iw4Z4OAEW6aiHbF+xqMI4J2nG55LuU7C9Lz36qGJAoPWCUnm5c4FayFvQS3gjscQ5WfItIpC7n4LqHLdkFiotW+WPYF58ftNowGBnxJM5MNlJZiTP2KSZ/L5GJK9OhPEb0KOcfMcAw14Bus+B8NITlNklx5Pcr90uoKPDpVFrre8RasAoHfIbTGm45lYZS5kFt4rpswhMmJBJ/i/x7z7YrMoThDbcRRVXjjpKp7KyIA4Hw==|920 \ No newline at end of file +}//Cw/cXKzsgGyu44u+d/ctR5LNODoiFz2iWlP0hVBu2a/9YNE0E1cAgjTOJI2s6nWzfR/0Ut3uiXZXliXPfUtvv3oVxs/z0k7yKdjrvewdbjHLH8qm4Z7qo4U9kjOcV0D9ZrcKY3zLVW3zCW/alwNuMOFH1Rc4fv/Yvojk+HZWNwLaUNcIArDcbE9EP+yL6BSdKRmWjyLy4gzhrCnZj9mPxlRPe1y3+Uwg6Wo2Bfy8SYXjwpTF3s+wppXLnjYllaTYECsN7NPZT2N/gUyATv2IJ5kwKx/emOKQgr8v11lHU7CLqzW+rN+WpIf7waZsurbUMxkotN7TjbTv9/iIRMO30miTrqG+KfZjquIthUNs0KxlPZwtN5utNH607eOjLw1JePhpggRUhQR0uBRF06kE9xmnvayhXf9WAiY/ors9DXaysZi6QpDkP1z96b/54DqVldQasI8Y6q0M+5Z3G9dWLq5quTOg3M3l0NPTS6blpCJgvrvFfjVS42Lo5Cl3N7nCTopydoSChx17GQ1wiJeg4cS8GNLB3MrMlU/5pMfnluaXVJSLJIbrnyuHuFzYp+TeMeid3GYyZ59qGy3BPnToRPTZFOrh2QGjuzA9nLDX83r5eiKOJ3aGhRygTu5TR6qQnu19zhoHEbNBudtaCWtnOzqCD4TCnvQ67OodldkFpPHBu8XfdzJ7vunzE7gRHgJPaplBbh77ZVPw6Cr0x/UK6iU7Klmd48Eddu/1oES0ySgzAGrX6YY2mFrwAzZw/35R5alS2fQENC+ma8GpvDXUGYG75wFiUl74hyxlfsVybP0XB62OlOHaVYGilkVdgV06FahHnWYOx2chWW1B0ejpMcUTWrQbVm91SpGwxU5ghcerydWMpQtN7SC++K/ADLD4GlhTgc9QlCYp9FL1Y9OHag==|920 \ No newline at end of file diff --git a/Pages/任务/工时/新增报工.json b/Pages/任务/工时/新增报工.json index b7d2ffc0..c16efdef 100644 --- a/Pages/任务/工时/新增报工.json +++ b/Pages/任务/工时/新增报工.json @@ -277,11 +277,6 @@ }, "AttachInfos": { "2,1": { - "BindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "ID", - "GUID": "e1f8226f-2ef8-4062-98d4-48453f133d15" - }, "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", "CommandList": [], @@ -1630,12 +1625,12 @@ "29,13,1,4", "29,5,1,3", "29,8,1,4", - "2,1,1,17", "29,1,1,4", "30,1,1,3", "30,4,1,3", "31,1,1,3", - "20,13,1,5" + "20,13,1,5", + "2,1,1,17" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1670,7 +1665,7 @@ ] } ], - "ID": "1189092a-0588-4b5c-83d2-5eea7b58552f" + "ID": "b3259605-824b-4955-8c52-d863e2092362" }, { "CommandList": [ @@ -1687,7 +1682,7 @@ ] } ], - "ID": "884df376-c65e-47eb-9374-9e342b5f6f7b" + "ID": "4a3ed7b8-6e28-4362-9591-f0495e6ece3d" } ] } @@ -1708,7 +1703,7 @@ }, "RowBreakLines": [], "RepeatRangeSettings": [], - "RelatedDataTableName": "任务表" + "RelatedDataTableName": "任务平行视图" }, "PrintInfo": { "PaperSize": {}, @@ -1756,4 +1751,4 @@ "Formula": "新增报工!$B$30" } ] -}//UISP4TRBhhFniiNMvMwCV+kENdsOcSeWsUOBmQLtLtVHBmit6j5Hc1zbbYrC9diF+016Dl+wzwJESCUf9kY9ivvJ5X8MQBNi0NZ/Eqhax6EbNMMk6ASETwIb9p80Djg19SX7Uc6/fYa6AgzOVOtVfA/oR53hZR07xE5ZzPzm3DzFkQZDNB3/+aUgoggNB+9kF8U7lqLWZQZIu+tR8EqCsSevDGc65rBPw6CpvRH0BrTNZV7u9fnfOU3ugoWALEBFYqL2Gz4AzzLqHlG8o1eX9DkAYGVf+wr7hWPpTibVTFHb95OzTms0Z9/xyKGXZ/ap72D/zkUlLD1qcAu3AmEmHYOho13/joF98SVotvmKnyJmu059rDB3wVxSUYLWYV/kDaKxWUvxBcEVCxMkcLkCLfbkbwcP0hc4snpMYmj6dQiY7OJi06SnxZ0YRGSEJyUa0v+xv7VAKg3j1T4QkjRkVh1+DIuW8tsPrnt/JCqH6zSIEHGPkVuTFYmgCZUOpdyMK5QTbm3yQCtdtBZ8RYc9kvltMjKF7u47UaWFLQkrkX15oKQdaZpDBAHaerHJBdkGGOzil3jkwosePeEeY/vOY16lLWCImS6pCmdGv467XOGJj0Vh3Oy9ghyDTWLEJ8n2ryDbfZk4qANFHOH46QDMvQaEfSJKof2i49xGDX7HudvHw3B/C/qoWHjV5sA0DbRbfjWvQT3MaElb6rWL/ODOiHj0XvS7kjwCHkVXu6nqnWBbrSk7VBFmZFwH/Jg3X+zE6X34Yo+aX57ajaVeMljHF6pu2NxIvABIvs2mPmXjDdKlNdLQ84d3S9kdwl/u79mNc14jfLoiB5EBQYSclc/UOyhL1NlJEy59K7sesL3vK25pKFJXynvQaLTI41jESr9Jwej+m6K8H0xG/i5cnhURQQ==|920 \ No newline at end of file +}//TldC9z1L/ikiCEHdYRtj40FpWMz4HZcEW6OGxZ5N76mZbORH3etFGk8Snq/OsZycYRaUlpeupXFRngNUOLs9DqxHeCpz7CpPrLUdhruxt+hK4AvpiOPfe+y/j1URpXGgfbwyWQ7Y4MtjQwTUK5wtvIBTykcnMhBZnM8PU+33thLkHHykjAP620CWBMnvhQEC7s5AUMH7/Rja2gm3rWPv/XrM4zvS3cYGzTZ7BzI/NkE/W+GJiMQ28Oyz1IVupAzRElyNQ/vmHxAyDDnTN+HIn1YuEI5lxpAMYnL/ixNaQ2ecc7WdSJw1/7NPXh4KpbvRXi5xfPQ1A7VC61Jc95bZ5cv4LX1Lv/HpTB6XX2ry6KvYhHvJdkr5v8oybg4Beb930Id65yZUtVGApUVETDtUThGIYGANE4vOiTEYcgHK8MIHjF7iEY/wthjUERrESidLT15IQUjXUzeITC1eV0t8168yTdfOKyCHNHFNGzR1VNY1271pJbLBsSUtBeyOFFqH0FyCFactuSVfFgNTeCdbPZDlzzI0UKipl22AeFJnF+b9Yp5MG2XE7jL2zqgRgi1u9EszzayU7nu5K8g1HcwbSLE6+LhQhM43D0n3cBlZ7AjMfbYfvZlQz0LfdRF2y3is88HsU02j9EzTCkEmmg8sey4Xeaxwa251ZsSm3hKAao7+7uzkw2zUE1mljRYOoPrJj5JB4GemN84uA1QNHDcUxnWtB0mTOrg0XtbjrTrl1oQWyIqjlrFFgJJkcyrnCiigQeGQpcx7t+ytWRn6DDrH5ViDlNw1bTFoSxACOVv0jl8hy1ZV8IB7poS9Y6iDL1asVrz/YMpKAqfex+ybg+NK8/pyMz6M2X7q9XQuv/W8aUvWwTI2hae/m9I1WGtBLwPZRC5VHJYrGZUFV1TOfEAmoQ==|920 \ No newline at end of file diff --git a/Pages/任务/新增任务.json b/Pages/任务/新增任务.json index dee86da8..8f041d78 100644 --- a/Pages/任务/新增任务.json +++ b/Pages/任务/新增任务.json @@ -498,7 +498,7 @@ "MethodName": "ReloadBindingItems" } ], - "ID": "6485bfa5-17df-4426-9327-6d85e4774658" + "ID": "b04e0aad-39b7-4136-a150-f704b33a2dd3" } ] } @@ -743,7 +743,7 @@ "MethodName": "ReloadBindingItems" } ], - "ID": "e4da2385-e975-41d4-95e0-862f8c009295" + "ID": "c8948455-d312-413d-819e-ce4ca4851f34" } ] } @@ -1232,7 +1232,7 @@ ] } ], - "ID": "508f01f8-29c7-4490-8014-5f5180951711" + "ID": "7ef4cf6c-86ad-475f-8633-20b6e13575db" }, { "CommandList": [ @@ -1245,7 +1245,7 @@ } } ], - "ID": "c9b440ae-08a5-4b23-a31e-6e41eda0c0bd" + "ID": "aa53c4ea-387b-4b03-92a7-52ac25c3226a" } ] }, @@ -1335,7 +1335,7 @@ ] } ], - "ID": "9830f8f7-68a4-431c-a314-b3cdd7bf2f70" + "ID": "99aa5bce-f6f0-4f7b-8955-c4043f01f9b2" }, { "CommandList": [ @@ -1348,12 +1348,12 @@ } } ], - "ID": "942014c9-bc71-42d5-85e7-f669d0557eed" + "ID": "b49e64eb-531b-4548-b712-bfa753304b11" } ] } ], - "ID": "0344e4f4-9bec-4732-ab6d-5b72a3e620bb" + "ID": "d78b306a-2e28-4b8a-af87-7c751ac9169a" }, { "CommandList": [ @@ -1366,7 +1366,7 @@ } } ], - "ID": "d7eb3371-6da7-4bd0-afe4-00e3526d21ee" + "ID": "f30effd2-7ebc-4467-b0b7-a4666989fc70" } ], "Disabled": true @@ -1407,8 +1407,13 @@ "32,1": { "BindingInfo": { "TableName": "任务平行视图", - "ColumnName": "成员剩余工时", - "GUID": "860df42a-372a-4db8-9676-311a5a2eea68" + "ColumnName": "父任务ID", + "GUID": "e4770e9a-67ed-48cc-a7c0-f30b80c6b0f4", + "RelationBinding": { + "RelatedTable": "任务平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "可分配工时" + } } } }, @@ -1787,8 +1792,8 @@ "31,10,1,3", "31,13,1,2", "29,1,1,14", - "32,1,1,3", - "31,1,1,3" + "31,1,1,3", + "32,1,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1820,7 +1825,7 @@ "MethodName": "Focus" } ], - "ID": "70048c14-7ec4-4a6c-b7f1-a16fbc9591eb" + "ID": "7ad43b05-1cdf-4978-b202-67438cc72000" }, { "Condition": { @@ -1854,7 +1859,7 @@ ] } ], - "ID": "5dedd149-c811-416f-888d-6e79e844dbde" + "ID": "1a7cd3be-7bbb-4e39-bae5-d28b8e47aa9d" } ] } @@ -1933,21 +1938,21 @@ "Margin": {} }, "CustomNames": [ + { + "Name": "父任务剩余工时", + "Formula": "新增任务!$B$33" + }, { "Name": "父任务ID", "Formula": "新增任务!$B$32" }, { - "Name": "项目ID", - "Formula": "新增任务!$B$13" + "Name": "任务版本", + "Formula": "新增任务!$J$16" }, { - "Name": "项目是否开启反馈收集", - "Formula": "新增任务!$E$32" - }, - { - "Name": "任务ID", - "Formula": "新增任务!$N$32" + "Name": "任务分组", + "Formula": "新增任务!$J$13" }, { "Name": "任务负责人", @@ -1958,16 +1963,16 @@ "Formula": "新增任务!$B$16" }, { - "Name": "任务分组", - "Formula": "新增任务!$J$13" + "Name": "任务ID", + "Formula": "新增任务!$N$32" }, { - "Name": "任务版本", - "Formula": "新增任务!$J$16" + "Name": "项目是否开启反馈收集", + "Formula": "新增任务!$E$32" }, { - "Name": "父任务剩余工时", - "Formula": "新增任务!$B$33" + "Name": "项目ID", + "Formula": "新增任务!$B$13" } ] -}//mnwFgDF4iM8cUi6a4NsJ2O/Cp6qo+vnQz1qLK9sYQnRXoU5XrpC6xd+x/RDVn9N5s1kmBN3/7pubxxK45zs6PAjHB8DrSAeFn2L4jaN0Ct7E1cp9e6rXNDpm4hMrKQqH8AZkzsBYqb5w1fiI7osJ51LR4w5wd6gy8A+LvLeWE1rSOG7J0/CPioIwOqz02AzVKIHdbGKaEOWxEA/vt7yez085CtGILtJlt0xFNNPSBlsPxkDXjpsJpWtFV2qaNbJQgZu01rfTrFQNB4oLAh1cTIez4lSqRuPRsPWK+CFvtgKewBW1AMhqQoxgnREm+/ATVcT0kD0ZOr4CTFCDVwGfYOrqirJoDaqogCK2d2g5Oo81XmlPHRfGL6rCkUHNqESKuYdbZcz/Wq1DbM/f9Ue+uqSy2SJIrZ6po0+4cmU9Iov/nLCszdOKT/bTeD5psEEjdbsHFffj+P6M1bS4GFEV6+mL+JieJZeAF3Syj5AmTewsRf1hnE1RYyzshwbkx0BJTswSao+8pPRAgpu5wsYoPXLgt3XL5oFWyrW4936gwks5ZXLm6lsMx2MWIiAs3xdLzQiCFC4dcU0VCMhbOd4rVsCyCvuQSjCye0+QXL1bJevtRdnvVEgMXJ20d/uKtXHs48PZK5qx+QHFHGAgsY9GkxJ7dm8OHBU0KTWXRtmNOH3+pI57szTy1d+BWrI8yH+wa4LsmjkP7w4hR/FKTNqsfGstWTR2ssD7grrkb0rie23aTrd31bEWeNiFzqVK1Syk4o291t2I2Bmn8kamVdy7zIvSuBMb5rk9hM+btV6MKNO5xtlzY9jpI2/+a4K5pr+ClYqKK7VKAxP250B6CdDAljENST8oKs9PCDY3kzOIwu/AAJlhaLMbefVkuGBlQZleW76D8FzeO9Sk0PsvjZUrWA==|920 \ No newline at end of file +}//3VyTJwBnUf70rIrEyyKXNvz8kjWM89RR3NLjHm9dtxIj7hD1ui7PoIp6EcUgtNJmceBeuAat/5Shryo2PuakE8CsbyTR/VJaoeOunNs5ghCXUlfAXbortyawierLDIb5+1z/9z16K79gjCLJ9W9ywYeGZMkSNpSNrep/KDHF+vI4oS6EdqH5wQyB6k5XKD41oX6WUD4yWDz6ZwYWL7b7mYmUTYtpHrUrnWBB1NfqpeE+npb9QSuCoPs2W5vCSoPsH/SJ/1iGIrmmayxtk/ev1gXaNXGDalnYTx4Lh4yaewFMM4qcAAQUn4csD+5EWE9MwluYBezD6HEEVnLWAzHJ2bWC3eXmVi7K/qn+SctwcojqstACNkC/9342sN0y8u/zxB/ZTdTYILU+KBDPWUK0A+jPGi4TSIKpdyKh8grp4EGrB4uMykGg7C4Rt0xuzlboIPr4FN+BGtBPw0cDxzN4kHZygKJQ5GMuPRSYg/E7x3W20No0n2enQ4cSHXek/CINrWrtsBjeEY2dhqBV7YtcoXtygGi0thBKDqiAcHJoG85OKt6vf28ZSMC1GehEAOdaxOOE4umOYJlMyp60v4pdZix6mOSIgikQGucHqkDnG+GMSh9qliLRcgPlzqNoFg7tFBDeMli/B6AT8264fLqUVZVVKyfXGyNojLD019qCC2aHzwZUB0aQm0Z05FrK61xUntbHqJEJfq6Ti5o4F9OZlDT0CvVgm7VmaP00vncDC1xR6RIMQXxCiA1AXS11YrEjKflKeW8PBWyGjYXeSrBSU64Sm4sIoQbHxvLxcmC1qxIM18ohjSWIj9glN/mD6bS6eDhHCoaDAaPn533bKPM1sJgTpD/9UyNWmi1BvX7SSTsi+Hd96BnFatsOeby3av/kgfk9LmD6srvv3yoI+IomFQ==|920 \ No newline at end of file diff --git a/Pages/任务/新增任务.rd b/Pages/任务/新增任务.rd index ea9ec9fe..11ed88b0 100644 --- a/Pages/任务/新增任务.rd +++ b/Pages/任务/新增任务.rd @@ -9,21 +9,21 @@ "17,14": "父任务剩余工时" }, "CustomNames": [ + { + "Name": "父任务剩余工时", + "Formula": "新增任务!$B$33" + }, { "Name": "父任务ID", "Formula": "新增任务!$B$32" }, { - "Name": "项目ID", - "Formula": "新增任务!$B$13" + "Name": "任务版本", + "Formula": "新增任务!$J$16" }, { - "Name": "项目是否开启反馈收集", - "Formula": "新增任务!$E$32" - }, - { - "Name": "任务ID", - "Formula": "新增任务!$N$32" + "Name": "任务分组", + "Formula": "新增任务!$J$13" }, { "Name": "任务负责人", @@ -34,16 +34,16 @@ "Formula": "新增任务!$B$16" }, { - "Name": "任务分组", - "Formula": "新增任务!$J$13" + "Name": "任务ID", + "Formula": "新增任务!$N$32" }, { - "Name": "任务版本", - "Formula": "新增任务!$J$16" + "Name": "项目是否开启反馈收集", + "Formula": "新增任务!$E$32" }, { - "Name": "父任务剩余工时", - "Formula": "新增任务!$B$33" + "Name": "项目ID", + "Formula": "新增任务!$B$13" } ] } \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json index eed83952..2d1bc406 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json @@ -842,7 +842,7 @@ "TableName": "任务平行视图", "BindingInfos": [ { - "GUID": "b644a677-ce2b-4bb9-a607-3c65e14bba37", + "GUID": "d7ed0f9c-4001-4ede-a5a6-96eab431e5dc", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "ID", @@ -851,7 +851,7 @@ "ColumnName": "value" }, { - "GUID": "80782e03-37e4-4f73-85fa-f117234866bb", + "GUID": "b60ed274-ef2f-44b1-92cb-e219c2ca5ddc", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "父任务ID", @@ -860,7 +860,7 @@ "ColumnName": "parentValue" }, { - "GUID": "10cac797-0f55-4530-b08e-fafb344d4c82", + "GUID": "fe47ca99-f8fe-46ab-9862-67a2c93ee296", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务状态", @@ -874,7 +874,7 @@ "ColumnName": "状态" }, { - "GUID": "18e883db-a5a3-4b44-a867-0e56641bba8f", + "GUID": "6dd8b80c-ccc5-43cb-ac97-b8cc419057cd", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务名称", @@ -883,7 +883,7 @@ "ColumnName": "任务名称" }, { - "GUID": "6107d837-a833-4f22-9578-e4cf0ad73253", + "GUID": "8ecf96d2-8fad-44b4-8bb9-2802422fc5b1", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务负责人", @@ -896,7 +896,7 @@ "ColumnName": "执行者" }, { - "GUID": "6c503e40-34e7-4b95-8314-17751e4400f9", + "GUID": "d90f1c6e-887e-4d2e-83c2-d6ecc43e75f7", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "开始时间", @@ -905,7 +905,7 @@ "ColumnName": "开始时间" }, { - "GUID": "cddbbd38-c887-4fc5-838c-a90cfaad98ce", + "GUID": "c0ac1142-da7f-4621-a726-a62a137f8215", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "结束时间", @@ -914,7 +914,7 @@ "ColumnName": "结束时间" }, { - "GUID": "0f43fabd-a4b2-4bd8-9c67-11155a44ad93", + "GUID": "a413be4b-5b46-49e4-bba6-545b1e71fccb", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "已分配工时_总分配工时", @@ -923,7 +923,7 @@ "ColumnName": "已分配工时_总分配工时" }, { - "GUID": "8b1a6f71-60de-4fbb-9aa4-a9c7a5cdc9ee", + "GUID": "27181efb-41fa-408f-a565-e04aee5da537", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "总核定工时_已分配工时", @@ -932,11 +932,11 @@ "ColumnName": "总核定工时_已分配工时" }, { - "GUID": "044a0a6f-9ad7-40af-a3b2-51e0d3f2f342", + "GUID": "f61ade6f-6499-4f27-ba63-984e4eced8a6", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "成员数量", - "GUID": "3f9fbcc4-3353-4302-b0ab-4c50cd54bbaf" + "GUID": "ade97a69-372a-4e41-a424-629c60a0f34e" }, "ColumnName": "成员数量" } @@ -1159,7 +1159,7 @@ "tableData": { "TableName": "任务平行视图", "ColumnName": "成员数量", - "GUID": "a96c255a-d613-4212-84c1-766049a922ae" + "GUID": "39483242-1939-4644-8e97-91abbcc537a0" } }, "value": "0", @@ -1180,7 +1180,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "122250b1-4cbb-4e74-978c-498703efda3b" + "ID": "96abde87-9199-46d9-bb22-a8e0c6d286e2" }, { "CommandList": [ @@ -1219,12 +1219,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "1cdc34d2-03fb-44aa-8536-2bfda72f59af" + "ID": "322b9310-649b-4b6b-8a1c-04725acf201c" } ] } ], - "ID": "f749cbf6-0ff2-45ee-b7b4-79a68cd312be" + "ID": "f3e69757-b3f6-4d2e-8c94-d9a265283c8c" } ] } @@ -1617,4 +1617,4 @@ "Formula": "任务列表!$K$6" } ] -}//I51cCKLhjZOUERJXzD3o1SN8J4I0LqYBg8w0C3GWTtrcCkN6l9MsGNHOXWVKt6KuMs3wQnZT2E4SxeAWCDL+GbQHNqwtkW7bBbLi/IzBukbwoanhtigd/WXh0eyCseSvc/mk3u8Zg0f61Ji8eTk8g9b42mhmpkiA+Mn9XCqDovoHtl5hyLcsh07MARLT7de3zxALQ0HuISxExiglxkPa8nUnO8VazAxXBZvs9akq948y7sgi1KiJZ1QjVFf1bmC58BmOkkOqZfyFqbDsnXU2vaFW/hQrBn8dbs3Pe6/SKVbCVYXdrQ3h0oixG9m/o9ok1oupngFswRv3guWuvgaKQ2mLOUqmP8JuUXslfv3g+uLWqgDQHh5P97d52thULlwfqQtyQ0pJhPE/m5PXDrT/VSXSdIG2e2acUxUbPm8mmK7uHq/KYwmKDrbJc3ltpj0QnRNDZ01i1NchON0xVrlYklD08WILYtfisOcA3IWhtA0eTnlGDYvawTvyIGSmlSVhGh+WTecJPh31ke1JjZd90f8yV2epPqSEvoIWzaBRIVtD6dJ4rSwc+NEi0LEBPEtSC+Zia/nnqhSxLat1ZSXNG5AtsBu+hSqiO98lQsGS/s8+lMHY9RycjxsnElxne9BxE4aLKhvtq4Bqd5mCzB3ZWkP9U70um/xUbw7sk0jBFiU2XuMqkSDq6Bs3W6bhTR9ILZbEUijvRcBEqUKBnFx/zkGz+JUQ1Vbb7kCKIyGwIdlpCjl7QREqFclRZxQKEOn/W8N7BTmsPfOdCITxBjsdd9wSKKSzpdxmtCa/h/vZuEZ6kRylcr4lt74OvdoKLsp+PEjA7/8+3krwM3QBSER6AbnuwNYMa8ivCh3YqWiDK2WSrOQHf8yZE/K6JOhtkC0/Qi7auX8VDKad2G0McZBomQ==|920 \ No newline at end of file +}//3v3mLrQW/hzONktvYrVMjYYR43MEyV5uWPAEZ6Vbo5S1fzbdF2fLKfPW72AhmFM4FeIDGpsHtvgjjIYP4YeSWLuW5lsZizwB9SOLhSHkFCkSFwD+nm4plE48YX+Fj0wqERER7R9PG6KCZzzi5BPTEAH1zd3MGHfyPmvbtd+krRqRmMV3E05Oi6tfXgzCyvw6z4f4426QhRGkW1j7hkdgbJG3SfSSNIwL2r7r6GLEdxgWN0alwhFwUEs5o2L7y8HoXUcrNmFRh7cpqZxul6x0A6DV5MaKzwBmWf9nJcA+f6NX2C5pl2M4nxU2/gTwHce967YRx/wTDP8SS2Yrz6nRpBbnDWJAd3B6O7Xo3N0/iX1RlBr1n3fZF2IMRx92MV00idXS7ubvTAeONgNHy7/Yvg47rpGGe3WGwyRkEkN2p9XEjr087q5Tj4uyXTxK8ISh+sekPHJYdyoToMk9iE1/NjGCX9NuWfuj7VPukLfFmMXizF327rsnxzqtOB+IQfqAEBtKwnq7DHxG7vfVNDzEFo9o7x7kYIcOOIttUkppiKM1r9PmPk2K+QRUJoTLDqzzChCnDYpdfOudhbGTS/5hxoZ3Bj4uWAXdP+HQnzUCAJApR9A7zo3n7K5aCRZL/XcMYcG9kjHyWse5aPv4kQyJehZaoG56Y13DtibwMB/G9lPmiLnB34LJCNM1y273yBwLaxLBDu++QyBLtN8tUDTTCJcJPr4eEP/1pWXbUwaNImZnyIfQ6X1aUjFwI9Q9ZY5izb81gyd72gnO4gfRsCmEK0LywqA/G22MREdrZsfBUDF8jWidE8H2gPAmfiRp+n+SwfdmfCIvr0A9dKR8coWfM8zyBzV1xCiZLi83gUhxqGtzYxFM26QpNsNnS3bZztYOdvklljj8CXDiJAumpwLIiA==|920 \ No newline at end of file diff --git a/ServerCommands/任务/任务发起流程前校验.json b/ServerCommands/任务/任务发起流程前校验.json index dd8c9b4f..f8a5f21c 100644 --- a/ServerCommands/任务/任务发起流程前校验.json +++ b/ServerCommands/任务/任务发起流程前校验.json @@ -39,133 +39,26 @@ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "任务信息", "TableValue": { - "TableName": "任务表", + "TableName": "任务平行视图", "TableValueType": 1, "BindingInfos": [ { - "GUID": "f545696a-35eb-4ba7-966e-6165b2631ea9", + "GUID": "cc7c64c9-d547-44f8-a74c-d809c42cf5f6", "BindingInfo": { - "TableName": "任务表", + "TableName": "任务平行视图", "ColumnName": "项目ID", - "GUID": "50961c18-f454-469e-ae8f-eb11862b1148" + "GUID": "3fcb9229-1223-4763-a77e-ac72385bbab5" }, "ColumnName": "项目ID" }, { - "GUID": "033c1005-0793-4527-86f6-c740ac54d7dc", + "GUID": "fa36557e-c629-4282-9a76-ec532265aff8", "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务名称", - "GUID": "753ddaa6-f324-4828-ad56-f66e0d8de234" - }, - "ColumnName": "任务名称" - }, - { - "GUID": "ae271fc0-b4c3-45d2-8c25-843bb35c9d85", - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "父任务ID", - "GUID": "d043ddbd-c8a3-4a31-a47e-bcdac7551398" - }, - "ColumnName": "父任务ID" - }, - { - "GUID": "72820fcd-2acd-4d24-8bf0-123388c2ab5b", - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "父任务ID", - "GUID": "7471e7c8-3650-42a7-b438-3a775347aef8", - "RelationBinding": { - "RelatedTable": "任务表", - "RelatedColumn": "ID", - "DisplayColumn": "任务状态" - } - }, - "ColumnName": "父任务任务状态" - }, - { - "GUID": "c7a73e35-dbb7-4b5b-bc10-d995fc872f33", - "BindingInfo": { - "TableName": "任务表", + "TableName": "任务平行视图", "ColumnName": "项目ID", - "GUID": "a6f8cca7-5575-4839-9365-ffebe1facca9", + "GUID": "520135bf-2fcf-4362-9158-169ab7e3533f", "RelationBinding": { - "RelatedTable": "项目表", - "RelatedColumn": "ID", - "DisplayColumn": "ID", - "NextRelationBinding": { - "RelatedTable": "View_项目统计信息", - "RelatedColumn": "项目ID", - "DisplayColumn": "项目预算工时" - } - } - }, - "ColumnName": "项目预算工时" - }, - { - "GUID": "6969b599-8082-4a30-9444-27ba08043e08", - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "项目ID", - "GUID": "69975d40-afe9-4bc8-b156-b06f8e589350", - "RelationBinding": { - "RelatedTable": "项目表", - "RelatedColumn": "ID", - "DisplayColumn": "ID", - "NextRelationBinding": { - "RelatedTable": "View_项目统计信息", - "RelatedColumn": "项目ID", - "DisplayColumn": "已分配任务工时" - } - } - }, - "ColumnName": "已分配任务工时" - }, - { - "GUID": "b5714ec5-9660-4d97-8ec9-f6333bc5e838", - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "项目ID", - "GUID": "3256ecff-7321-48f2-9e3e-5aefeaac7b90", - "RelationBinding": { - "RelatedTable": "项目表", - "RelatedColumn": "ID", - "DisplayColumn": "项目经理" - } - }, - "ColumnName": "项目经理" - }, - { - "GUID": "40e6a4ac-0999-45e7-9d08-6c0adec2a91e", - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "项目ID", - "GUID": "3b610fae-f462-4d6d-ba6e-e6b24dfce8af", - "RelationBinding": { - "RelatedTable": "项目表", - "RelatedColumn": "ID", - "DisplayColumn": "工时分配方式" - } - }, - "ColumnName": "工时分配方式" - }, - { - "GUID": "e2faa23a-5fba-4627-a664-7fee287549cc", - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务预算工时", - "GUID": "2d53d463-1d5c-4117-aa9a-796165ad9c89" - }, - "ColumnName": "任务预算工时" - }, - { - "GUID": "2b5f11cd-87dc-4299-a6e5-07ac1a082d63", - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "项目ID", - "GUID": "b688b437-4733-4102-9763-f9dee3d372cd", - "RelationBinding": { - "RelatedTable": "项目表", + "RelatedTable": "项目平行视图", "RelatedColumn": "ID", "DisplayColumn": "严格模式" } @@ -173,20 +66,57 @@ "ColumnName": "严格模式" }, { - "GUID": "c69bfc11-e266-4e61-9f7a-dc68a17ea092", + "GUID": "7bbe0367-afcc-4774-b788-a5b7f4992c13", "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务负责人", - "GUID": "3f7a6d55-8578-48be-b14a-ba4a6e17f266" + "TableName": "任务平行视图", + "ColumnName": "项目ID", + "GUID": "dccedd60-946a-4f17-a590-e9c68adb9847", + "RelationBinding": { + "RelatedTable": "项目平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "项目可分配工时" + } }, - "ColumnName": "执行者" + "ColumnName": "项目可分配工时" }, { - "GUID": "6af3e8d3-4379-42bb-b62d-43a2ec075aff", + "GUID": "ebbc1500-2450-4da6-a039-432646d2a57d", "BindingInfo": { - "TableName": "任务表", + "TableName": "任务平行视图", + "ColumnName": "项目ID", + "GUID": "7e747a55-8682-45c0-8a9a-e3c326f41748", + "RelationBinding": { + "RelatedTable": "项目平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "项目经理" + } + }, + "ColumnName": "项目经理" + }, + { + "GUID": "b0a82edb-12b8-469b-b9fb-e43874e280b8", + "BindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "任务名称", + "GUID": "e2aacc34-2273-4151-b175-8da6d8acf713" + }, + "ColumnName": "任务名称" + }, + { + "GUID": "2cf83bd0-7a9b-49ec-9cf9-d93af702d011", + "BindingInfo": { + "TableName": "任务平行视图", "ColumnName": "任务负责人", - "GUID": "42d851ed-8e39-4a1d-bc06-92731c8fd223", + "GUID": "11139a01-b0dc-475f-8542-4fa8c3662ac5" + }, + "ColumnName": "任务负责人" + }, + { + "GUID": "02e3c579-ae91-4da8-b60a-3200dd4753fd", + "BindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "任务负责人", + "GUID": "9598f201-f250-4a2f-9fa9-ae79e86a1b1f", "AttachType": { "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", "UserColumnAttachType": 1 @@ -195,58 +125,103 @@ "ColumnName": "任务负责人_全名" }, { - "GUID": "e3b08944-6249-43fb-9158-37cbc10abcdf", + "GUID": "205ad391-8767-4d08-a3de-a11add4eb703", "BindingInfo": { - "TableName": "任务表", + "TableName": "任务平行视图", + "ColumnName": "任务预算工时", + "GUID": "54000c20-3ba4-45a0-b00c-8c725a7f78da" + }, + "ColumnName": "任务预算工时" + }, + { + "GUID": "3352d607-f8ee-4059-bc16-8393a33c3db4", + "BindingInfo": { + "TableName": "任务平行视图", "ColumnName": "任务类型", - "GUID": "050b2a2a-e802-4280-bc06-10d5e76c4e35" + "GUID": "9c80ca72-6b1b-421d-93ac-212fe7fc0dbe" }, "ColumnName": "任务类型" }, { - "GUID": "5020402d-35fe-4d89-82c7-7460745e82eb", + "GUID": "d6d1da58-1e04-4af9-9854-6a786b9c61fb", "BindingInfo": { - "TableName": "任务表", + "TableName": "任务平行视图", "ColumnName": "版本", - "GUID": "1fa6cc05-da37-4315-b822-951a8b751213" + "GUID": "816b95a0-3936-4894-b812-7ac32e536c25" }, "ColumnName": "版本" }, { - "GUID": "1f62db51-8d14-4582-bf8b-480ef7c155e4", + "GUID": "e9452e89-1aad-458d-89ce-f61679398c07", "BindingInfo": { - "TableName": "任务表", + "TableName": "任务平行视图", "ColumnName": "任务状态", - "GUID": "8b3ea124-961b-4d9c-8342-d06a89709702" + "GUID": "19e92c87-7fe8-47b0-bd25-91b91facd1ab" }, "ColumnName": "任务状态" }, { - "GUID": "d6e8b372-a40c-400c-b4f5-71f537318a9d", + "GUID": "5783df06-a66a-4418-950d-dfd0642fea8b", "BindingInfo": { - "TableName": "任务表", + "TableName": "任务平行视图", "ColumnName": "流程实例ID", - "GUID": "f0756ea2-7301-436d-8004-e5d0bed1ae01" + "GUID": "12f152b3-bb0f-40c7-8f81-f40529853a1b" }, "ColumnName": "流程实例ID" + }, + { + "GUID": "f0e8274f-9608-4778-9d66-eb8d36aa8b90", + "BindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "父任务ID", + "GUID": "dc24ea34-d67e-4edd-8dc0-8f1eb3306702" + }, + "ColumnName": "父任务ID" + }, + { + "GUID": "2dcd075c-85a3-4a82-bbbb-ad88cd31deb6", + "BindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "父任务ID", + "GUID": "dd6e075c-7aab-4cd9-b38a-8ccc2e579162", + "RelationBinding": { + "RelatedTable": "任务平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "可分配工时" + } + }, + "ColumnName": "父任务可分配工时" + }, + { + "GUID": "3befa333-23eb-4d29-a85d-b245af4f64c9", + "BindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "父任务ID", + "GUID": "9a0e290a-0970-4f72-810c-bf9e7517be87", + "RelationBinding": { + "RelatedTable": "任务平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "任务状态" + } + }, + "ColumnName": "父任务状态" } ], "SqlCondition": { "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", "ColumnBindingInfo": { - "TableName": "任务表", + "TableName": "任务平行视图", "ColumnName": "ID", - "GUID": "ae5a57e8-074d-401e-9d6b-c85747f92057" + "GUID": "2e5cdd61-2cb0-4b4f-99ed-18d29255cd70" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=任务ID" } }, - "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "b03a1cfd7eac4938992501f57ff5cc2d" + "ID": "eb8bc078107346f9835e245f468fb303" }, { "$type": "Forguncy.Model.ProcessInstanceCommand, ServerDesignerCommon", @@ -285,7 +260,7 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.父任务任务状态" + "SerializeProperty": "=任务信息.父任务状态" } }, "value": "2", @@ -300,7 +275,7 @@ "Message": "请等待父任务审批后方可发起！" } ], - "ID": "abdcd957-d6e5-46d4-9572-9e3fed0c35e9" + "ID": "f7a26904-1155-4d52-ba96-aeee4148bbe9" } ] }, @@ -326,7 +301,7 @@ "Message": "当前项目未指定项目经理，请指定后再试" } ], - "ID": "98d0fe1a-dabf-426e-9ab9-bbd52407d6fa" + "ID": "06c623ed-8d18-4376-868e-dd67dba49938" } ] }, @@ -340,7 +315,7 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.执行者" + "SerializeProperty": "=任务信息.任务负责人" } }, "value": "%Null%" @@ -349,10 +324,10 @@ { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", "ErrorCode": "400", - "Message": "请指定任务执行者" + "Message": "请指定任务负责人" } ], - "ID": "374ece9e-326f-4236-85c7-7ddfb05e868b" + "ID": "f51ef549-d53c-49d6-8b0e-e5ccb959508d" } ] }, @@ -378,7 +353,7 @@ "Message": "请指定任务类型" } ], - "ID": "b9a77a62-17a9-4364-9b06-c08856687b0f" + "ID": "21b2883d-3fc7-4742-9836-55c06e5d6a44" } ] }, @@ -404,7 +379,7 @@ "Message": "请为任务指定版本" } ], - "ID": "4e736f1c-d439-4d1f-a6e3-9d8001981de8" + "ID": "f8d8b0c5-49fd-44f0-9e7d-e11c92dc30ee" } ] }, @@ -445,78 +420,26 @@ "ParameterName": "预算工时上限", "ParameterValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.项目预算工时-任务信息.已分配任务工时" + "SerializeProperty": "=任务信息.项目可分配工时" }, - "ID": "f067411d74064d7b94eaa375d9410597" + "ID": "b866a42a1fd14b288e0fa63d199220a7" } ], - "ID": "5ce8861b-e3b4-40f6-b857-6df105d63ce6" + "ID": "1848cdd5-1953-445b-a507-e05cd778f940" }, { "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "父任务", - "TableValue": { - "TableName": "任务平行视图", - "TableValueType": 1, - "BindingInfos": [ - { - "GUID": "8468e5ee-2d0c-4653-b414-2845ded5b828", - "BindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "层级", - "GUID": "f77e0f2d-5a46-41ee-817e-8a25586086aa" - }, - "ColumnName": "层级" - }, - { - "GUID": "36f92afd-5705-417e-b76c-db3eda355d94", - "BindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "任务预算工时", - "GUID": "69c38d9a-9a17-45e9-8265-7b383df92d76" - }, - "ColumnName": "任务预算工时" - }, - { - "GUID": "6201715b-2e80-4961-88aa-230d8c064dac", - "BindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "子任务预算工时", - "GUID": "04e49339-f18b-4166-80b6-4153098333d3" - }, - "ColumnName": "子任务预算工时" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "ID", - "GUID": "1203dd82-1886-4972-bf84-daa88a6926bd" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.父任务ID" - } - }, - "NullFormulaValueQueryPolicy": 0, - "TopCount": "1" - }, - "ID": "7bd17b4b5c814c7f97e0cdcd18390d41" - }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "预算工时上限", "ParameterValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=父任务.任务预算工时-父任务.子任务预算工时" + "SerializeProperty": "=任务信息.父任务可分配工时" }, - "ID": "d9c75d72e3cb44e1928346d49e88b7da" + "ID": "bac8fd9431a640f4836d285d9ecbd597" } ], - "ID": "4fb958b0-134a-4c34-a18f-93b81a22771e" + "ID": "f089826f-d44e-49bf-bc54-10568e049f17" } ], "Comments": "严格模式下，根据是否有父任务来计算本次预算工时的上限" @@ -531,14 +454,14 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=预算工时上限" + "SerializeProperty": "=任务信息.任务预算工时" } }, "value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.任务预算工时" + "SerializeProperty": "=预算工时上限" }, - "compareType": 4 + "compareType": 2 }, "CommandList": [ { @@ -546,16 +469,16 @@ "ErrorCode": "400", "Message": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF(任务信息.父任务ID>0,\"预算工时超标：父任务可支配计划工时不足，请修改后提交！\",\"预算工时超标：项目可只配计划工时不足，请修改后提交！\")" + "SerializeProperty": "=\"任务工时超过限制，当前工时上限为：\"&预算工时上限&\"小时\"" } } ], - "ID": "40842093-b2f4-4f75-b8ab-4accb87d869e" + "ID": "99facc91-cdee-49ee-a352-553cf939e45c" } ] } ], - "ID": "851dc9d6-5375-499f-bfed-05ec00eaa385" + "ID": "51e1b7bb-21be-4bbb-8c1c-480c746a9e36" } ], "Comments": "校验工时情况是否通过" diff --git a/ServerCommands/工时/修改工时.json b/ServerCommands/工时/修改工时.json index f763d2c4..59da3236 100644 --- a/ServerCommands/工时/修改工时.json +++ b/ServerCommands/工时/修改工时.json @@ -260,7 +260,7 @@ "CheckDataValidation": true } ], - "ID": "4bffba58-e619-4983-87c0-8ab6a2049948" + "ID": "012ef4b8-c602-4cdb-9ec2-569ca9231490" }, { "CommandList": [ @@ -327,7 +327,7 @@ "CheckDataValidation": true } ], - "ID": "c4eb971f-1ad0-4f92-9ed1-c6b1457907bb" + "ID": "d5184ee9-2e79-4fd1-902d-fa3df35c07b4" } ] }, diff --git a/Tables/任务/任务平行视图.json b/Tables/任务/任务平行视图.json index f378ed06..4a91d812 100644 --- a/Tables/任务/任务平行视图.json +++ b/Tables/任务/任务平行视图.json @@ -253,62 +253,17 @@ }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", - "DatabaseColumnType": "nvarchar", + "DatabaseColumnType": "int", "MaxLength": -1, - "Name": "任务成员", - "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" - }, - { - "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "计划工时", - "GUID": "4caad800-23cc-4bf4-a9c4-abb668214b2c" - }, - "AggregateFunction": 4, - "DataColumnName": "计划工时", - "DetailTableName": "View_任务工时统计", - "Name": "成员计划工时", - "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" - }, - { - "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "实际工时", - "GUID": "ab5476e4-7d41-450c-afad-7136051b66ae" - }, - "AggregateFunction": 4, - "DataColumnName": "实际工时", - "DetailTableName": "View_任务工时统计", - "Name": "成员实际工时", - "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" - }, - { - "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", - "BindingInfo": { - "TableName": "任务成员表", - "ColumnName": "ID", - "GUID": "e962e125-89fa-438b-bacc-fc332e0f6417" - }, - "AggregateFunction": 1, - "DataColumnName": "ID", - "DetailTableName": "任务成员表", "Name": "成员数量", "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { - "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "剩余工时", - "GUID": "e8092ca2-2f94-44fd-aaa1-3658abce02e6" - }, - "AggregateFunction": 4, - "DataColumnName": "剩余工时", - "DetailTableName": "View_任务工时统计", - "Name": "成员剩余工时", - "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "任务成员", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", diff --git a/Tables/项目/项目平行视图.json b/Tables/项目/项目平行视图.json index c22b6167..abda7d4a 100644 --- a/Tables/项目/项目平行视图.json +++ b/Tables/项目/项目平行视图.json @@ -175,7 +175,12 @@ "项目预算工时": 5, "项目预算费用": 5, "预算方案": 5, - "删除": 5 + "项目总分配工时": 5, + "项目已分配工时": 5, + "项目可分配工时": 5, + "项目总核定工时": 5, + "项目可核定工时": 5, + "项目实际工时": 5 }, "subTableOperations": { "任务平行视图": 5, @@ -218,7 +223,12 @@ "项目预算工时": 5, "项目预算费用": 5, "预算方案": 5, - "删除": 5 + "项目总分配工时": 5, + "项目已分配工时": 5, + "项目可分配工时": 5, + "项目总核定工时": 5, + "项目可核定工时": 5, + "项目实际工时": 5 }, "subTableOperations": { "任务平行视图": 5, @@ -261,7 +271,12 @@ "项目预算工时": 5, "项目预算费用": 5, "预算方案": 5, - "删除": 5 + "项目总分配工时": 5, + "项目已分配工时": 5, + "项目可分配工时": 5, + "项目总核定工时": 5, + "项目可核定工时": 5, + "项目实际工时": 5 }, "subTableOperations": { "任务平行视图": 5, @@ -435,6 +450,13 @@ "Name": "立项流程示例ID", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "删除", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "nvarchar", @@ -518,7 +540,7 @@ "ConnectionId": "业务表", "SourceTableName": "项目平行视图", "SourceTableSchema": "dbo", - "CreateViewSql": "SELECT\r\n p.[ID],\r\n p.[项目名称],\r\n p.[项目代号],\r\n p.[项目简介],\r\n p.[项目封面],\r\n p.[项目经理],\r\n p.[项目分组],\r\n p.[所属客户],\r\n p.[所属客户部门],\r\n p.[工时分配方式],\r\n p.[项目预算工时],\r\n p.[项目预算费用],\r\n p.[公开],\r\n p.[严格模式],\r\n p.[计划开始日期],\r\n p.[计划完成日期],\r\n p.[项目方案],\r\n p.[预算方案],\r\n p.[网络资源],\r\n p.[开启反馈收集],\r\n p.[项目状态],\r\n p.[立项流程示例ID],\r\n\tp.FGC_Creator,\r\n p.FGC_CreateDate,\r\n p.FGC_LastModifier,\r\n (\r\n SELECT\r\n STRING_AGG([项目成员], ',')\r\n FROM\r\n [项目成员表]\r\n WHERE\r\n [项目ID] = p.ID\r\n ) AS 项目成员,\r\n ISNULL(SUM(t.[总分配工时]), 0) AS 项目总分配工时,\r\n ISNULL(SUM(t.[已分配工时]), 0) AS 项目已分配工时,\r\n ISNULL(SUM(t.[可分配工时]), 0) AS 项目可分配工时,\r\n ISNULL(SUM(t.[总核定工时]), 0) AS 项目总核定工时,\r\n ISNULL(SUM(t.[可核定工时]), 0) AS 项目可核定工时,\r\n ISNULL(SUM(t.[实际工时]), 0) AS 项目实际工时\r\n\r\nFROM [dbo].[项目表] p\r\nLEFT JOIN [任务平行视图] t ON p.ID = t.[项目ID]\r\nGROUP BY\r\n p.[ID],\r\n p.[项目名称],\r\n p.[项目代号],\r\n p.[项目简介],\r\n p.[项目封面],\r\n p.[项目经理],\r\n p.[项目分组],\r\n p.[所属客户],\r\n p.[所属客户部门],\r\n p.[工时分配方式],\r\n p.[项目预算工时],\r\n p.[项目预算费用],\r\n p.[公开],\r\n p.[严格模式],\r\n p.[计划开始日期],\r\n p.[计划完成日期],\r\n p.[项目方案],\r\n p.[预算方案],\r\n p.[网络资源],\r\n p.[开启反馈收集],\r\n p.[项目状态],\r\n p.[立项流程示例ID],\r\n\tp.FGC_Creator,\r\n p.FGC_CreateDate,\r\n p.FGC_LastModifier", + "CreateViewSql": "SELECT\r\n p.[ID],\r\n p.[项目名称],\r\n p.[项目代号],\r\n p.[项目简介],\r\n p.[项目封面],\r\n p.[项目经理],\r\n p.[项目分组],\r\n p.[所属客户],\r\n p.[所属客户部门],\r\n p.[工时分配方式],\r\n p.[项目预算工时],\r\n p.[项目预算费用],\r\n p.[公开],\r\n p.[严格模式],\r\n p.[计划开始日期],\r\n p.[计划完成日期],\r\n p.[项目方案],\r\n p.[预算方案],\r\n p.[网络资源],\r\n p.[开启反馈收集],\r\n p.[项目状态],\r\n p.[立项流程示例ID],\r\n p.[删除],\r\n\tp.FGC_Creator,\r\n p.FGC_CreateDate,\r\n p.FGC_LastModifier,\r\n (\r\n SELECT\r\n STRING_AGG([项目成员], ',')\r\n FROM\r\n [项目成员表]\r\n WHERE\r\n [项目ID] = p.ID\r\n ) AS 项目成员,\r\n ISNULL(SUM(t.[总分配工时]), 0) AS 项目总分配工时,\r\n ISNULL(SUM(t.[已分配工时]), 0) AS 项目已分配工时,\r\n ISNULL(SUM(t.[可分配工时]), 0) AS 项目可分配工时,\r\n ISNULL(SUM(t.[总核定工时]), 0) AS 项目总核定工时,\r\n ISNULL(SUM(t.[可核定工时]), 0) AS 项目可核定工时,\r\n ISNULL(SUM(t.[实际工时]), 0) AS 项目实际工时\r\n\r\nFROM [dbo].[项目表] p\r\nLEFT JOIN [任务平行视图] t ON p.ID = t.[项目ID]\r\nGROUP BY\r\n p.[ID],\r\n p.[项目名称],\r\n p.[项目代号],\r\n p.[项目简介],\r\n p.[项目封面],\r\n p.[项目经理],\r\n p.[项目分组],\r\n p.[所属客户],\r\n p.[所属客户部门],\r\n p.[工时分配方式],\r\n p.[项目预算工时],\r\n p.[项目预算费用],\r\n p.[公开],\r\n p.[严格模式],\r\n p.[计划开始日期],\r\n p.[计划完成日期],\r\n p.[项目方案],\r\n p.[预算方案],\r\n p.[网络资源],\r\n p.[开启反馈收集],\r\n p.[项目状态],\r\n p.[立项流程示例ID],\r\n p.[删除],\r\np.FGC_Creator,\r\n p.FGC_CreateDate,\r\n p.FGC_LastModifier;", "ViewInfo": { "ViewName": "项目平行视图", "QueryColumns": [