diff --git a/.collaboration b/.collaboration index 63f76a18..ecf03daa 100644 --- a/.collaboration +++ b/.collaboration @@ -68,16 +68,7 @@ }, { "ModuleName": "TableView/View_项目统计信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T15:56:53.8998341+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\项目\\View_项目统计信息.json" - ] + "ModuleType": 23 }, { "ModuleName": "TableView/项目任务树视图", @@ -575,19 +566,7 @@ }, { "ModuleName": "PCPage/项目成员统计", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T16:14:21.4433158+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目成员统计.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目成员统计.rd", - "Pages\\5f448cc5e408484e9837a0183cf1365.json", - "Pages\\5f448cc5e408484e9837a0183cf1365.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目概况-关键数据", @@ -599,21 +578,7 @@ }, { "ModuleName": "PCPage/项目成员", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T15:28:16.6582237+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目成员.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目成员.rd", - "Pages\\6899a8cead694b3ba00307b6756dbd7.json", - "Pages\\6899a8cead694b3ba00307b6756dbd7.rd", - "Pages\\007ea4aa4c7440478a9a092179dace8.json", - "Pages\\007ea4aa4c7440478a9a092179dace8.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目负荷", @@ -657,19 +622,7 @@ }, { "ModuleName": "PCPage/项目岗位配置", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T15:30:12.0230886+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目配置\\项目岗位配置.json", - "Pages\\项目\\项目首页\\项目配置\\项目岗位配置.rd", - "Pages\\a6ecaec6b4e44f7abfc5c6e334c7246.json", - "Pages\\a6ecaec6b4e44f7abfc5c6e334c7246.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目审批", @@ -681,17 +634,7 @@ }, { "ModuleName": "PCPage/预算申请", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T16:06:18.9817955+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\预算申请\\预算申请.json", - "Pages\\项目\\项目首页\\预算申请\\预算申请.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/预算申请审批", @@ -699,17 +642,7 @@ }, { "ModuleName": "PCPage/项目预算申请历史", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T16:05:15.6415128+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\预算申请\\项目预算申请历史.json", - "Pages\\项目\\项目首页\\预算申请\\项目预算申请历史.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/项目/项目反馈", @@ -729,17 +662,7 @@ }, { "ModuleName": "PCPage/任务首页", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T15:44:00.6410759+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务首页.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务部分", @@ -751,31 +674,11 @@ }, { "ModuleName": "PCPage/任务-基本信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T15:39:55.7969849+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-基本信息.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-基本信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-任务信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T15:42:51.5358017+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-任务信息.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-任务信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-关联资源", @@ -839,19 +742,7 @@ }, { "ModuleName": "PCPage/切换任务状态", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T15:39:27.5446671+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\共用\\切换任务状态.json", - "Pages\\共用\\切换任务状态.rd", - "Pages\\421cd7df876b4e64a3160223673e2ea.json", - "Pages\\421cd7df876b4e64a3160223673e2ea.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/切换项目", @@ -1067,29 +958,11 @@ }, { "ModuleName": "ServerCommand/变更任务状态", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T15:34:07.6240673+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\任务\\变更任务状态.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/修改任务预算工时", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T15:49:17.5336084+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\任务\\修改任务预算工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/移除任务成员", @@ -1137,29 +1010,11 @@ }, { "ModuleName": "ServerCommand/批准项目预算申请", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T15:58:39.690705+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\项目\\批准项目预算申请.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/新增或修改项目", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T16:00:46.772136+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\项目\\新增或修改项目.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/移除项目成员", @@ -1235,16 +1090,7 @@ }, { "ModuleName": "ShareCommandContainer/发起预算申请", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T16:04:42.2115268+08:00", - "ModuleType": 36, - "ToRemoveFiles": [ - "ShareCommandContainers\\发起预算申请.json" - ] + "ModuleType": 36 }, { "ModuleName": "ShareCommandContainer/跳转当前项目", @@ -1260,17 +1106,7 @@ }, { "ModuleName": "ProcessItem/预算申请", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T16:07:20.3989401+08:00", - "ModuleType": 28, - "ToRemoveFiles": [ - "Process\\预算申请.json", - "Process\\预算申请.bpmn" - ] + "ModuleType": 28 }, { "ModuleName": "ProcessItem/反馈处理流程", @@ -1650,16 +1486,7 @@ }, { "ModuleName": "ServerCommand/计算报工数据", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T16:00:31.5095323+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\计算报工数据.json" - ] + "ModuleType": 15 }, { "ModuleName": "PCPage/核定确认", @@ -2023,30 +1850,11 @@ }, { "ModuleName": "ServerCommand/任务发起流程前校验", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T15:43:02.0673836+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\任务\\任务发起流程前校验.json" - ] + "ModuleType": 15 }, { "ModuleName": "ProcessItem/新增任务流程", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T15:32:45.5030379+08:00", - "ModuleType": 28, - "ToRemoveFiles": [ - "Process\\新增任务流程.json", - "Process\\新增任务流程.bpmn" - ] + "ModuleType": 28 }, { "ModuleName": "PCPage/页面反馈录入", diff --git a/Pages/共用/切换任务状态.json b/Pages/共用/切换任务状态.json index 50b6cc6f..534de71b 100644 --- a/Pages/共用/切换任务状态.json +++ b/Pages/共用/切换任务状态.json @@ -92,6 +92,16 @@ "ColumnName": "任务状态" } ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 3, + "ColumnBindingInfo": { + "TableName": "任务状态", + "ColumnName": "状态码", + "GUID": "b9ebf636-b9d0-4b62-ac40-acf30e02f5e9" + }, + "Value": "2" + }, "IsListviewDataSource": true, "CustomColumns": [] }, @@ -154,4 +164,4 @@ "PaperSize": {}, "Margin": {} } -}//Pm9UX9DoYVT7fajaGAKbANlATWVpGXNMA0Pghoz2JtvV+BSxnq78KsJvnQDhf0Lj8sUn11sncbhc/+skR5UD9zuNnqBgzq8iWMffcOIcDmNP4ry5OSdlUYsROh9X3tFHf7SSvHFi9KCWqN3+ySD0gR60r91BT3YWWBqOROgMc1bNoFnWsk7fAAxg3H4hfgMjBLfmJIEtfolmHqDxa6tAZjfqoJWByQDAUfqWZ/P06KkrfPwlg0CWl6Oyeq88RnxYmJkv9zJwKUNZ0xJGwQf8ryXbdGjIqZQcllwDcqhBo8X5LsATB9CKBv66hrcwh6ip2d++84omNQ5Os1U1UTxUcwPoh7TzVP9sJ5V+44DeZDnDDZonDTtco/RMeutUAWJq3DDhJFrHG7KSF6yVONeYZF9mGl2HtVWbCAMpVVQ3sL4qhtKmm35BZ0ViTaGzREUncrIOpW5u/lHZiJiz2qoME3465KGwspy9wCR2UARPO5clf/qRcTiANgGqKBZn9tuOi8Pa5hTaQskDO4H2PXavVuFC4/Q3lq056DjGTk67QSbD6Vm65s2C2QxeOo2Gbx5TZtKanCmqHKp+HaKS8Dy8cbXEm7O3DncNk96xMn2OYX1PG1668igwgPJ7uBEm8CLXICozob3I22P+slVyIh/Pe9BK2V0gv2FlkZf82R1X57jfx1iG30WfWBF5Hls5IlCpGcyWlSLmeynBm1iBjnNzZpRLOrLvDzSqGDvdY7wt5EeYfY5FDS0a8WiOxBbl2wYPJOpXFz2JoeguuC7VQjOsIFaCJ7NINrxSokHW3x/PpGW01z/fcmlgSc21uxak64bbBIKoWDYDJnaOXIeaaCq+iWLPVnJBp1MOAuiNeERgSwRwhgYXRHv95xUAh9td312pplOw9wKVmWmScH4JyJdRjA==|920 \ No newline at end of file +}//5+sx17agtVQASBz0sQxr4jvuW9cHg/p4LJGi7Lb1PHpuiwETmUQ0XyBltERSvJORcjLV93QpwJ8hsBpeyLwQ6okEqzIX6CoStWUflUgNrSVbkEEa7/d3yTnjMAnIqaYU8DMrBgHIW+KLiHFDf18vYI9Qex2Mt/dB5wrMzwVYdnhXtv2Rud6zi1EBq2o888YnNLEoGeYMq+9/g8tcx9eYPNEx70FI/sPWB9B+uaLxpNeEidG1Y9wUcCJpaLjCJYyHaIW6GGpjLf5Z1ZzAy9i6hvNUugM5l6XLjF3NOXlbHbFw/2G4pVK+aTap0XnvCe5qGypL4PtLBvm1WaG9kMm4oPolDKrMvthrFXC8K3GPkXgWFHuXe4LwL+CNCYNWPGKAxvbu+u8GiaVnVXCCa9kBayhk0od6U9QsUBepHSx2DT4KqYkpVn4M2htkoK6bRr6PdUXNAxJWydeyXn4oe73GjQCbhcodW3KTSC/1HV8E9RybLPrAWGEPjIj1hADT1Iyrr/9gN4qFot9NouN/qeMuBP0v8VfIWz9aiYQgVRVslEcCbhQJ4Qdoz3DDWxtomBQuOldH0zMjmAPGQfHGXqZZ2ZGblK9+DaKLmGDxGIy1N4W3D6emCu4+iakndVLqLjkuAZ9k8m1yqWRJ/tj1b9/707kuvGVz8UF00DRFQ7O4EBqmRmYf/ukAoSTBRCGNzB58nK6EQ/hm7PISIV0xUzIzEW3xkFHD74bhArp6oJqsMVDAw67HMBeFAb8f3w+szn+H5XtsyJ3333wylhM68leL7/bxO8IKcGhe8xVQuEwFE0kV+ijAV4B+INR/BEb4NrckOWmMbcB3MfeNIrLKympNQSuJQRvOPVvpdjkZ1OJuMyDIl0KMozos+XrGAr9LprCWQ/vpyfKVh4u5xsz/n4QX3A==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目配置/项目岗位配置.json b/Pages/项目/项目首页/项目配置/项目岗位配置.json index 5c50d4ce..b7bc41b6 100644 --- a/Pages/项目/项目首页/项目配置/项目岗位配置.json +++ b/Pages/项目/项目首页/项目配置/项目岗位配置.json @@ -96,8 +96,7 @@ }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 58.0, - "Mode": 1 + "DesignLengthInPixel": 58.0 } }, "5": { @@ -339,7 +338,7 @@ ] } ], - "ID": "5d2918f5-e0e1-41cc-98d6-ec378bd4fbfe" + "ID": "b99b1e75-b4bf-488b-880e-a02716b13e12" } ] } @@ -417,7 +416,7 @@ "Message": "请设置时薪" } ], - "ID": "85a43e14-a5b0-42c4-9b25-4d18b54660b4" + "ID": "feb047b3-7307-40f1-95f9-3bfe279e4e4c" }, { "CommandList": [ @@ -426,7 +425,7 @@ "ErrorCode": "0" } ], - "ID": "98e23878-b7d8-47b8-81be-2d050c09d0ff" + "ID": "a4a9724f-7776-4d2f-ab71-402cbc2606d4" } ] } @@ -532,7 +531,7 @@ } } ], - "ID": "47ccb8b0-3cf2-4aa1-b033-66ca69c3e19c" + "ID": "47bda40b-7c17-46f2-a994-1a17ac0bc328" }, { "CommandList": [ @@ -547,7 +546,7 @@ "BtnText": "知道了" } ], - "ID": "05620e08-f825-455c-8a11-3e33e313a081" + "ID": "0f9a3cdc-644e-4891-8578-87e673394c40" } ] } @@ -618,7 +617,7 @@ ] } ], - "ID": "88c813a6-b36a-49a3-b200-1be3bb7aeb4e" + "ID": "265d631b-4343-4399-ad7b-477ad70b1cc4" }, { "CommandList": [ @@ -628,7 +627,7 @@ "ShowConfirm": false } ], - "ID": "facb130c-be51-4dfc-b195-4ae7ffe4657e" + "ID": "50f7f408-7540-4bac-a88d-6561ca16f65d" } ] }, @@ -650,7 +649,7 @@ "Message": "操作成功" } ], - "ID": "a56e68c2-1494-4c33-b4da-acae410ac762" + "ID": "3bc71469-52e0-4cda-9096-6f135e0876cf" }, { "CommandList": [ @@ -660,7 +659,7 @@ "Message": "请指定项目" } ], - "ID": "9432f20d-e1a2-4ad4-9c5c-99332a42ed5d" + "ID": "6a9afff2-8137-4849-8acc-1b578a5f74a2" } ] } @@ -970,4 +969,4 @@ "Formula": "项目岗位配置!$B$4" } ] -}///Yd3NhIJFnBf2wLe1fe5m91OtPtRmie+RtIcfmOTZ0DJOKqg4XDvT40p23bOKE1WqTJebvg2LwwIOM7DMx6EV8YPMosHldQb8ms6ZXmnZdnMSGzUgoTNn+4ltdmMgyYivBnfxViU/W01X83QTFbPo7hAtfsKwQ1CfNHwjDuXVwIi9+UjOzDQbuqI8fYDZMaeraAfl1b2ACNaHkWAum68e6yIeAZSWJxTCeGvTFna4KFHY6q2DZGoxAvdmixopxlPtWpYGHDJcF2nfS9XQTr3Mm35VifEfxcKTyODh/rKAQJKoaE6TMU5sxkrMTzGGbiKnZWdO/YCK54rgQ5aMMmQRfb/Mu1Br+s0YE0XePjMAROmxv6esfIy+I9qDZMfJpMChLQ1jAJUvgi/f1W+7wjYn8RXuEHArTA8R/MsylbA41bTExLT7CNZn++49NqED6ZeZyM5lu7l5wrhMi0sCV4iDcPSsgBJ5vagdGYHoqd6BJbZfhDTPLuqLb/LcGfdZX5ibX6+546RMmADGjIzeFoRBibT1oDVJhJ1UnJryjKpGLIXfKJjLzykW3F++FtaoDLirlyPqGws5MvFEDhoi8RVYoOPjtUNscmVf4wVN3TAyxIrhDHlsS67M16OWQb/BE696ENQxcSCZTAvBj5FjbVpVp4IWqFiucSNbvP06Eh0+2LAYvCmUa9+zKh4wvqZSWupS4zp/SCvFjyw8VFFWLUsG6UcI0zx9mKQzjX/kExPPPrAtYfHxy5BD71AL1IMNHBTwT21stdU9Zw0ystJXXaL42jZ286vnptFPGxYKTKmGbG6Vy7rgI6/26kO9sYlO+EVxBCHdhclfdJ5qhcYpnGj/jbOyOC6EWZcSZLc1VinsnfDRAZwZncdoBcDFNyX0w5acbZgLfcVig0BiZaKDZgHuA==|920 \ No newline at end of file +}//eKzZb0iFujwIarRQ/eyDAf0gR41cRLnPPxsybDERDo624scFBAeXMcYmMuLYUOJj3HbrZMK5gVdbXRTx8Rg8qGr5keJdl782LkoQR1QiLRpZUJxMEyfvJp/fB5DrdIvUFwdwX9UlzelE8SLXvxuhiIBJM8dF2O8UnxcQylFhxiNQ01UOhHsLVVmTtkIw1K1s1l2EUXO5TKb1Lh77DqJiMQPTCIslGqu2Lu+UYghl2Yv78oVUNol7DU0Pq256bbObj5DtyyaZc3R2kowDa94VL099Js5dBgnu+N1PN3GkqXin/aA003VtEJhBThLVKXCx9HcQnnHcKxgyrjoYvG/CvGh+miw8qfnxNv2QHDUjJtvSX8lYOfGOG5i+CLmFMOnRkHPWtLYmUNEpn7ATvHtQ5L6QyESVTC8nR0gK2ZS+03a23EjLTAe7jZA695YSVKLma/75rIqpMgZM0SvEciufEoIBNfWeZX6PY04TqP/HFTr1s+C15M/ryHbbmQZX8SIkpPxw5d/osFzlOjjLl1vnu7wqmMegE7vlkz7E2RpBCDxL3LxEuoBhDfj1nr/Ph529ZiCjgBXR7+EAAoCEr/1t9JVKLivdtE6ca7XY/pI1Y+q8jnpJ+YUq/ZyNZp+M50kkspEj3fjcfaiX6Zm5nt5w15IcbQHJ+WACj6Wrqxz0JlNsIHS94oOrg/XtJEImLk/Xh/o+kWMMAj7X73GVno1PYToB9/ERb3VYLxy3gIwHz76ldDndkDCs9hAid91XqcyK2d/f7eqVUo1J+NogybKK4Zgt4JcgTLKcefG3GziFeFuc10JOpsCvkIjFSmIK5o0ylCIMUl5aD2rX/X55z7WhafV/CtiwLlkjdQLCxvV3hqObDjBu3tALkpkC+nBoapscRE26pVFb2Dnn/kxWdMszrA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-任务信息.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-任务信息.json index 71e63e71..17972951 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-任务信息.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-任务信息.json @@ -286,7 +286,7 @@ ] } ], - "ID": "6c8ade29-b146-4a4e-b39f-1f26e4518f4e" + "ID": "0d07027a-371d-491e-8570-082e772db5db" } ] } @@ -373,9 +373,7 @@ }, "noMatchText": "无匹配数据" }, - "DataValidationInfo": { - "IgnoreBlank": false - } + "DataValidationInfo": {} }, "3,10": { "CellType": { @@ -412,7 +410,7 @@ "MethodName": "ReloadBindingItems" } ], - "ID": "2b56acae-8a92-42b1-957c-e28579778989" + "ID": "94dc0972-1e48-4a45-9e1b-1af368d55e7a" } ] } @@ -497,7 +495,7 @@ ] } ], - "ID": "115ddc29-8f98-47e4-b770-cbcb7c5c5c45" + "ID": "0020c591-a816-48d4-b2d9-859b43063cb2" } ] } @@ -615,12 +613,12 @@ ] } ], - "ID": "104d1d73-a2ba-49f5-a1d6-293212f2a9eb" + "ID": "ecd81e5e-3e09-41b9-8288-a35eae9d4a77" } ] } ], - "ID": "473790eb-c71a-467f-8c40-42d81ad7f89d" + "ID": "6a4c60ed-02f6-4454-88e5-59a7841e37b9" } ] } @@ -690,7 +688,7 @@ ] } ], - "ID": "faed026c-d7c3-478d-b66b-d09f626e38ef" + "ID": "b502d6ba-842f-45f2-904f-ab40e67f0c03" }, { "CommandList": [ @@ -707,7 +705,7 @@ ] } ], - "ID": "ef4a78ce-0461-4493-a0cb-5d19c2b86b7d" + "ID": "1f784e85-4135-4748-b8a2-0149471a861b" } ] } @@ -1031,7 +1029,7 @@ ] } ], - "ID": "59aea65c-989f-4f57-b28a-72fe530abdfb" + "ID": "4d2132b2-b9ad-4180-8f7a-867916045ed0" }, { "CommandList": [ @@ -1048,7 +1046,7 @@ ] } ], - "ID": "83b3e7d7-277e-4089-9f0f-d9478b3a660b" + "ID": "c5d9970e-6b3b-479b-9cab-7f24b33a4e22" } ] } @@ -1122,4 +1120,4 @@ "Formula": "'任务-任务信息'!$C$10" } ] -}//JwHUVxHgxhcIJeti1cnDQaC79Bdzfta4gMszE9kHRj4NjfejOAo3YWWZ+xu/dbyCTbPSQaVYTX5k93jHTbJ6a4PridmSTjetvVxadjSh8Vt5RZfZTJVha8SNqPhX+q7Y8brFKgmyAwb2thQcIHCOX20vOIgJX+RaOAWzJESuXRVZ/lYMx4K3DCFvHHP3RcY424kUHrsajnmZolE62oF5ljC7WaUD5Qq8ky269ss0m3yM2fT3M27yBk5WpzuxGnrfeQp24azxwuMuFsXGZo1KldyO1CpM6/fL6PqE3C1pwc/Jy8lrANBuDwD1bkX3F2lDK+DfKzF1gt+iUl0p28phFa46vFBei9HnEHNgI6yIaWeX87tB2saMtykwFVUE3t7sTi8ksvezD31X2ePXGj0EGCumcO1i+cuMdboIqmZADIP7J0LFk09pwyf1o9mSxrrDA0n0M1aLfKMx12+BbK35L4XaPC9YUQZeeMc9EDkRGPgNRWkNIdkpHzzKC0bC/ygMT61yeHahkir0uwxqVxKntLs5NG4Khs4xqKjgILjXfb6y2mK6f4t9qBZeHCBQE/XQUV+45i+vTUTy5qBe+sJ2+PDP9BQlwgCoPwgO65oKyQdiBecqAvhdNjdS+Ln3+PJxsykdZ5tNA2rPDGkkv1VMfOmcTU5YZm+XQ7xFQxtAK4gXbPPYYyBlRNNkb8gr6So1MCZBFoZ8Z0pAQYIhqG/5ZxwN1DzE4tmSFT5bu0/IYZG+hgw7qkHC5YniJBVNW1/ynN3vPc4PPorGbVclQRdQpDPc6xs5ojfDl7gGfCJxKbrh7MIVpn/tf7S+l3k//tVdZJEW3cQ63Fw41OyRkhjtS01ao9ZeBhv3RFd3iDNWPTz3IrU1zaONC18wiPETlPFB/UZo4JwkQf6MYPQoVUfADQ==|920 \ No newline at end of file +}//KCQGyyy+3Ic08EcRfwX+zO2C7goFgSzj1vgPcLYjU+Ni0eYg0XpJQQKHFza55er7HKr/7gxZmEjPVCUquWEV7PolZ6fCVlP3cVPzTcejsp5C2ifS1ZmIrqxFXRdEXIaeoL92tZ7WL0pMdqCy4WMekUSz0JTyGng3hu2vGlL5KdLF1+Gm9tWGn7AgunF7855dpULRGsZNqZezgWzzk7AkywIMpUy0rcNV9mIfArEiffmFQGTEGpUaAkZ76mrSXsTvi8h0ILpZ292cog15mvEjo6grx7GOa8SDu/CzJaBG7b6WOJw+7o5SfTS2zhE71xRmpfkKWV2YDtxiWobo/uvbg67ClDUC/XfwREorJe18vZcs/qpm2npU+tkCi1iHkcafXieeeN/kCcHazWy2yBW/zoIxS11FIrRtwemW7Uvr1Yu/cUFDnF7+cu4lq+M+7Wzxeu76FuuGwR86TzVqYI6Z9mRPAgnNiBVJ1NN23A2r/jCVXgxnOWmb+3Oqrwm3MHJ7OQ1Ln1q7O/RGlOpnHFKzSlNRgjGl2aJDUYbq2wpuELt3VBpjCVPhPGMJUprUovZ/ysCyXWp3D/JwpvntuZshi0IvmmOCMV9JcxCKvhvG9/UtH9IeRn1egnXhvS80Vz67U3n8Ys36kytEzAPiG8eSzV3zd7Et/08LKWnt3C8T0mtKxAgN+Ig1iJUhYsvlRSUbmNHlOsqw1vFxlS5ZexZBJHIaijv+oBWO+G3N66efV19Z6f3LnVwxs411v4ugAAvls4ZftjVwxzNUygOKVhb9EUDdl7hkPenrn2I10Kb/tTM7S360kkGoswmfACIXxc8WpeS1U30kSFAZ2QXJz1quZint61GDlahfdN7cYKcQOpotYzp5OkWBBvsgCfcvKHui53NEy5aBCf2hEiX4poXIZQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json index 4460eb6d..f3baf0b4 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json @@ -297,7 +297,7 @@ ] } ], - "ID": "128387c8-48fb-4efc-b3ca-8d3aa36d7666" + "ID": "abbee7c9-2f21-429e-9226-4aa228a1417a" } ] } @@ -436,7 +436,7 @@ } } ], - "ID": "f88bf8ac-3981-4c2b-9955-309aa67db446" + "ID": "714ee0b8-ebf3-4885-918f-8b7e735d9b04" }, { "CommandList": [ @@ -451,12 +451,12 @@ "BtnText": "知道了" } ], - "ID": "7d934e81-ba73-4bc6-8560-6c67e9df710d" + "ID": "c28c21c7-7912-4bf1-adbd-c311d8027b9b" } ] } ], - "ID": "23440047-26f6-45c0-aa4c-e239624de8f0" + "ID": "3ae52d0b-4f17-4c59-a8fb-3a4c5fc64031" } ] } @@ -469,7 +469,7 @@ } ], "Comments": "小于进行中", - "ID": "4a5115a5-91b1-4b69-b536-62cf3c2c42d4" + "ID": "cd8e04f6-e102-4c25-b5e7-8a0f38c177da" }, { "CommandList": [ @@ -479,7 +479,7 @@ "Message": "任务尚未审批完成，不可修改状态" } ], - "ID": "00dd7c16-ed51-4794-8dd9-01f471fed68f" + "ID": "51d4ee99-8f4d-42cf-a1ae-d939f622210b" } ] } @@ -498,7 +498,8 @@ "b52ab65a-899a-40a4-8bff-1c40491b3971", "b8eb0bf9-3ce7-49ab-95f3-0c5cd3c4f70e", "b54a1157-1e6c-48a3-a87a-82e25dd1ba20", - "07524ea6-7d44-4d7f-9178-f3720732dcef" + "07524ea6-7d44-4d7f-9178-f3720732dcef", + "30197b74-993b-48e5-893e-b40b9ff5978d" ] }, "3,11": { @@ -577,7 +578,7 @@ ] } ], - "ID": "385a668b-678b-4844-b730-9c5c148da13e" + "ID": "a37cb7fc-0b0a-4a25-a991-f27d59a9cec5" } ] } @@ -757,7 +758,7 @@ ] } ], - "ID": "3d0ed7b3-0d05-454d-90d6-6b022de26f16" + "ID": "a6831e51-dd57-4dab-a3b2-90f781eea955" } ] } @@ -908,12 +909,17 @@ "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", "tableData": { "TableName": "任务表", - "ColumnName": "任务状态", - "GUID": "430fb608-3939-479c-b367-96a56fac1b01" + "ColumnName": "项目ID", + "GUID": "5cbb4f11-c47a-4a8e-ba65-449e7d9877db", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "工时分配方式" + } } }, - "value": "0", - "compareType": 2 + "value": "4", + "compareType": 1 }, "CommandList": [ { @@ -921,106 +927,153 @@ "ConditionAndCommandPairList": [ { "Condition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", - "tableData": { - "TableName": "项目表", - "ColumnName": "项目经理", - "GUID": "d7bbed39-1c83-44c7-aecd-0ff8dd03e4a7" - } - }, - "value": "%CurrentUser.UserName%" - }, - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", - "tableData": { - "TableName": "任务表", - "ColumnName": "父任务ID", - "GUID": "fc54712b-b3f4-400a-8acd-23b99feaea99", - "RelationBinding": { - "RelatedTable": "任务表", - "RelatedColumn": "ID", - "DisplayColumn": "任务负责人" - } - } - }, - "value": "%CurrentUser.UserName%" + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务表", + "ColumnName": "任务状态", + "GUID": "430fb608-3939-479c-b367-96a56fac1b01" } - ], - "RelationType": 1 + }, + "value": "0", + "compareType": 2 }, "CommandList": [ - { - "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", - "Cell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-基本信息'!预算工时" - }, - "Title": "校验中" - }, - { - "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "修改任务预算工时", - "Parameters": [ - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "任务ID", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-基本信息'!任务ID" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "新预算工时", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-基本信息'!L8" - } - } - ], - "ResultErrorCodeTo": { - "SerializeProperty": "code" - }, - "ResultMessageTo": { - "SerializeProperty": "msg" - }, - "ReturnPropertiesTo": [ - { - "ResultPropertyName": "新工时" - } - ], - "RefreshAfterFinish": true, - "CheckDataValidation": true - }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ { "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "项目表", + "ColumnName": "项目经理", + "GUID": "d7bbed39-1c83-44c7-aecd-0ff8dd03e4a7" + } + }, + "value": "%CurrentUser.UserName%" + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务表", + "ColumnName": "父任务ID", + "GUID": "fc54712b-b3f4-400a-8acd-23b99feaea99", + "RelationBinding": { + "RelatedTable": "任务表", + "RelatedColumn": "ID", + "DisplayColumn": "任务负责人" + } + } + }, + "value": "%CurrentUser.UserName%" + } + ], + "RelationType": 1 + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!预算工时" + }, + "Title": "校验中" + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "修改任务预算工时", + "Parameters": [ { - "SerializeProperty": "=code" + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "任务ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!任务ID" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "新预算工时", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!L8" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "ReturnPropertiesTo": [ + { + "ResultPropertyName": "新工时" + } + ], + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=code" + } + ] + }, + "value": "0", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!msg" + }, + "BtnText": "知道了" + } + ], + "ID": "4daf1b12-ff8d-4bb0-8006-327935d86a06" } ] }, - "value": "0", - "compareType": 1 - }, + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!预算工时" + }, + "Title": "计算中" + } + ], + "ID": "545d2d79-aa6c-4183-b941-08e5c9b76c45" + }, + { "CommandList": [ { "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", "FunctionName": "warning", - "Title": "温馨提示", + "Title": "请联系项目经理或父任务负责人修改", "Message": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "='任务-基本信息'!msg" @@ -1028,82 +1081,68 @@ "BtnText": "知道了" } ], - "ID": "5c281bcb-e45f-49f2-b29e-3514953df19d" + "ID": "93ee37f3-2d7f-49da-a917-9aff05e12478" } ] - }, - { - "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", - "FunctionName": "remove", - "Cell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-基本信息'!预算工时" - }, - "Title": "计算中" } ], - "ID": "1233b415-0b1f-480f-bf1e-e6d285bd46db" + "ID": "7188a6bf-5f4a-4e9e-baf5-04782685bc90" }, { "CommandList": [ { - "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", - "FunctionName": "warning", - "Title": "请联系项目经理或父任务负责人修改", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-基本信息'!msg" + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "ca8e7467-90d8-4e23-be48-ecfcf70786af" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!任务ID" + } }, - "BtnText": "知道了" + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务预算工时", + "GUID": "0ebe4a22-885d-4d86-b56d-3d65edde0876" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!预算工时" + } + } + ] } ], - "ID": "9cf60052-c790-4448-b719-8f505e8eaf32" + "ID": "291ee7e4-d2e4-4f97-849a-b04d1955b0f4" } ] } ], - "ID": "a8a5d748-ad79-4b72-a6f9-68a612323650" + "ID": "5c81f989-322c-4dd6-8edf-b22cf4bfe931" }, { "CommandList": [ { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "任务表", - "ShowConfirm": false, - "RowsToUpdate": 1, - "RowsToUpdateCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务表", - "ColumnName": "ID", - "GUID": "ca8e7467-90d8-4e23-be48-ecfcf70786af" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-基本信息'!任务ID" - } - }, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务预算工时", - "GUID": "0ebe4a22-885d-4d86-b56d-3d65edde0876" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-基本信息'!预算工时" - } - } - ] + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": "本项目已设置为“不分配”工时模式，无法修改！" } ], - "ID": "d05ffd73-c602-4e11-b06b-e5fbbb9178a1" + "ID": "a26662c3-d3d8-4104-8c07-477ec1b38184" } ] } ], - "ID": "114eb3ab-0d5f-4248-8689-29759aeea1e6" + "ID": "1942b19c-a7d4-4b50-9399-25376dc7e7be" } ] } @@ -1213,7 +1252,7 @@ ] } ], - "ID": "2858df27-a05b-4af5-a525-a1096c37764f" + "ID": "465011f0-92df-46ab-a5ff-88e2679c9ef1" } ] } @@ -1367,7 +1406,7 @@ ] } ], - "ID": "cf14cb64-1930-4500-b506-1df5b66f0c74" + "ID": "3364ee29-265e-47e1-a9d3-bb74cd70d482" } ] } @@ -1531,7 +1570,7 @@ ] } ], - "ID": "8f237d61-24a0-4515-86a5-4b62abe36e9b" + "ID": "44ea51f7-8139-4dad-97fb-d47fc588b8cc" } ] } @@ -1639,7 +1678,7 @@ ] } ], - "ID": "b8df65b5-eb9c-4c98-87cc-9be1b54e787d" + "ID": "79a40cc0-e647-4cf4-a1da-33ece42c8498" } ] } @@ -2017,7 +2056,7 @@ } } ], - "ID": "61536c94-52d4-462e-b042-da1b569a362a" + "ID": "262e48e6-bab0-433c-8c6f-01b2cbd510b8" } ] } @@ -2041,6 +2080,22 @@ "RelatedDataTableName": "项目平行视图", "ConditionFormatRulesCollection": { "Rules": [ + { + "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!任务状态码<2" + }, + "Priority": 9, + "GUID": "30197b74-993b-48e5-893e-b40b9ff5978d", + "StyleInfo": { + "Underline": null, + "Strikethrough": null + }, + "IsDisabled": false, + "IsInvisible": false, + "IsReadOnly": true + }, { "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", "Formula": { @@ -2077,7 +2132,7 @@ "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", "Formula": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=OR('任务-基本信息'!任务ID=\"\",'任务-基本信息'!任务状态码=0,'任务-基本信息'!父任务负责人='任务-基本信息'!当前用户,'任务-基本信息'!项目经理='任务-基本信息'!当前用户)" + "SerializeProperty": "=AND('任务-基本信息'!工时分配方式=4,OR('任务-基本信息'!任务ID=\"\",'任务-基本信息'!任务状态码=0,'任务-基本信息'!父任务负责人='任务-基本信息'!当前用户,'任务-基本信息'!项目经理='任务-基本信息'!当前用户))" }, "Priority": 6, "GUID": "f7c3f6d5-8b51-481e-abe2-d1a7b9beee5e", @@ -2220,4 +2275,4 @@ "Formula": "'任务-基本信息'!$C$8" } ] -}//jsSRaejQnfsHa9hTGQi3PHGtMJKnu420xpgsty+jUm+H2aP1rr6tIXLr20//r2F9FUvTLzIs2sH7oorCb1p45waQnOgWTpGhVpDKApqNGZ35OBM83u002U2eWfnMBl/6obFrgeN6gUxXoW9KxFhb/KY8a5m9ElHz4Qzl/Txpz4oqbjZpIBwIRp1S9ANvtnKrQkbzbgq8gzXxEgaOMiiZ5VdVmMe8W6Ez0/BhLZG44xPomRKgVd9F6Mql3sNV/zDwdR5ISRlM/ZfJdvHSdvvuIPxw2FFuRBN4rBs6RyyTx+A//Ax9NxqxwZ8s6iQZ+5/yNHn5/kdE7AQCR9lr5TMRaVY51evlNl1bIq/wDQGWD9tkhKSOjAdC3loYW8y1J0VNxEjn+WKGQLXHKhXaY3Va+uLyXB/EBsedvOc6wG9ALZiTDMz9xctjdCjpnFa+/lwYF55QTkvZi7QHzUPoH7iMxUJ2HaYVT/rsscmUwl4rnjRsCE0ATt16W4IFQXCZROQMw1IZNzLqk919/Hp2jdSj5WYBISGuCnDhRa6stXm4ZD2DUTn/n3ekXYRTK0M8iTipajS/Xr4sdE/ZaOg2Z6UyUV//FJ2oW9LQd3I3RcgiqnvNVkmrIJIWCovhXesBBzcbHFpgYbcP99Y0dR+kZEglMJ/45dfDGuu2zDV8fAGJEZ9CPaw5snGFXWF/x/lC4SmjehwuwNWOoVsUXhY9Hk5FdbzQzUE+CsEVRIAviZFcahCZJWyEBT/qHc8+25YgnI9FQcxOJM7rjCU04MkMtZcfEbU19bek4w9pwj7pEaCxhO3W+gr85J5QK9+8tJ9X7lzPZrc5J2t454XKsCfkacW2yfjydWiT4ixae7xP7pA+qhDZ2r1dNSgwMbaW3Ls9O87Dfmprioc6QfXBRVKmphOwwA==|920 \ No newline at end of file +}//qiHaT9qX1Lru3WmBFow0YT9/SvLKAuNBISVpxYwPe+4vMySx7OIN/FoYzrO/85jFCe5NF4JyqMoftZNuEqlGS/8qpLcL/r4oI61LxvMN/1M93GoBkvcZS5xt5m578A8Um5xXydQgAhUTocJoPOJZe8y1mZ/p3u7pb7dhEwvTfyeJLRZAvoD3fJlD63jJmtw7Wn3X3VfpKgDH5CEheCoIXFQASM/3Sylx/7dSXqlrmOF1dCQOdVcXEr28IQzc3w2Vmx8ZIt1ybyYzFwE2SOZf+dKY+HnIY0K+TnQ2QQeM38gPZyaySfJ7fWLs6raNxFsvxkGO9GUkSIdkcBIyjKzY1cC9sPieTOG5JLm3qOu8Ia/YAkVlLQ1IroPQTUz3dLMolhWawT38pdsgqY53xYgApoRtypHZ/tNz6ZdJEnKJj3OzmvOXQPeVR0c5hG8MnIdeFbOlf073LSSIWKfw6R0hpPRtJJhx64lmlV0nKizx5jFBDfjCyCEAAdNUD2FvtMWB4BFAYuRIH9mU0LtI0XkTdculttj2MpTxGsUuR8e8VS8WMGyVH13QCHjqZ/xpk0MaLxN9GdlpU2vA3NojJN2c9NMVfqD32RlBofWuXScdGR7qK+FaGYmmocxYCQSh1FO9JATJBm0skIF6Qv3IcxfMN1Tito1j3hlbQjiqMm96ZNQ0t0OxHCu+3JvrMnPc0GEMJFA/64QXL9eLHNUc4Z67sRU/6Ofgt9Oi281mgG5XV1m8WagtYkf/p68mIWVslsZHnQ0hBCZKz2C+fwGI8s08IX07DjzBAKpcnEb5mHOLE/vJ6a9v/aZYaC1NTxS8xAIAVPp+9H1UkgoFYj4z0mTLyPBPhNctJzC7bKmuuig/vw2gUrREqmEnkxKXI+FHS7ISHjQZl2Dls8PlNN8XuBPuMA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json index cc019d4a..ea52b722 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json @@ -339,7 +339,7 @@ "ShowConfirm": false } ], - "ID": "0c6b49a9-030b-4876-ae79-6a8fa236fe6a" + "ID": "080cc3d7-c496-4fb9-850a-7934a1c21225" } ] }, @@ -403,12 +403,12 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "50cc062c-53b7-4f60-808d-5106c94dd1fe" + "ID": "f98bfe52-ddbd-41f9-8599-503bce6314f8" } ] } ], - "ID": "68052af2-6429-4d88-8a58-8bc2ccd521b2" + "ID": "bbf7de3e-cc41-4f77-9caa-dede26829599" } ] } @@ -456,7 +456,7 @@ "ID": "e2e848e0e72d48229c97757429d446a2" } ], - "ID": "fcb1ee62-d080-442f-8c64-651ccf55a2a1" + "ID": "fc345220-28d1-4a49-9c63-285b82026208" } ] }, @@ -674,7 +674,7 @@ "MethodName": "Refresh" } ], - "ID": "fa10d3d2-d3bb-48ed-8121-eb3be051d067" + "ID": "266d462f-dec9-4513-a584-5ee07f800d9e" }, { "CommandList": [ @@ -689,12 +689,12 @@ "BtnText": "知道了" } ], - "ID": "26e80fed-3064-4488-a74d-18c03b775b32" + "ID": "1b0917f8-4a83-458f-be28-d5792706465a" } ] } ], - "ID": "4af28bd4-8334-4631-b2b0-e360703e5317" + "ID": "34f97df0-8495-48da-9388-0abbe7d77527" } ] } @@ -729,42 +729,13 @@ "IsOldMenuPath": false, "CommandList": [ { - "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", - "Cell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务首页!A5" - }, - "Title": "加载中" - }, - { - "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "删除任务", - "Parameters": [ - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "ID", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务首页!任务ID" - } - } - ], - "ResultErrorCodeTo": { - "SerializeProperty": "code" - }, - "ResultMessageTo": { - "SerializeProperty": "msg" - }, - "CheckDataValidation": false - }, - { - "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", - "FunctionName": "remove", - "Cell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务首页!A5" - }, - "Title": "加载中" + "$type": "Notiflix_Forguncy.Confirm_Command, Notiflix_Forguncy", + "Title": "提示", + "Message": "是否确认删除此任务？", + "Answer": "我已确认", + "OklButton": "确认", + "CancelButton": "取消", + "Result": "按钮结果" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -776,34 +747,94 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "=code" + "SerializeProperty": "=按钮结果" } ] }, - "value": "0" + "value": "确认" }, "CommandList": [ { - "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", - "ReloadData": true - } - ], - "ID": "2442c645-06fb-4da1-85f5-3acbe7ed985e" - }, - { - "CommandList": [ - { - "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", - "FunctionName": "warning", - "Title": "温馨提示", - "Message": { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "Cell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务首页!msg" + "SerializeProperty": "=任务首页!A5" }, - "BtnText": "知道了" + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "删除任务", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务首页!任务ID" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "CheckDataValidation": false + }, + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务首页!A5" + }, + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=code" + } + ] + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ReloadData": true + } + ], + "ID": "dc5cc33f-0ac4-4243-935e-a86551c815f1" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务首页!msg" + }, + "BtnText": "知道了" + } + ], + "ID": "27d4eaab-0fc7-4bb9-afaf-de5008c1fed7" + } + ] } ], - "ID": "1b1ff13e-7b68-44d6-a2e1-cd50151867e2" + "ID": "75df810d-9c91-4533-af8d-9520006c7225" } ] } @@ -827,7 +858,7 @@ { "FontSize": 13.333333333333332, "Bold": false, - "Height": 32.0, + "Height": 40.0, "IconHeight": 14.0, "IconWidth": 14.0 } @@ -943,7 +974,7 @@ } } ], - "ID": "2fcdc920-331b-4df5-aca9-18e9eb656d68" + "ID": "8e113447-b76f-49a6-a1e2-a0a04b3a7508" } ] }, @@ -984,12 +1015,12 @@ } } ], - "ID": "d9cd05d1-39ed-4a30-9d62-6d8fde7a3472" + "ID": "c5f6abe8-8b46-435b-aa82-95c83d90947f" } ] } ], - "ID": "528b2784-8a4f-4973-b388-633b69a7e90a" + "ID": "c8e5cf73-f044-4ed1-8042-2d0ef2d8d145" } ] } @@ -1050,7 +1081,7 @@ } } ], - "ID": "18207abf-6952-48c4-95da-9f1fd537b5e4" + "ID": "764984f3-4674-4449-b97b-e1796b5f1fa8" } ] }, @@ -1091,7 +1122,7 @@ } } ], - "ID": "2464fc0b-0eef-4bdc-8eb7-af42fa302a34" + "ID": "0667eee6-b486-448e-8447-605e2acf5825" } ] } @@ -1206,7 +1237,7 @@ "Disabled": true } ], - "ID": "201427d0-8fde-4e46-a54a-7da01d657e64" + "ID": "5126c96c-7881-4a9d-b668-83bd11b4acfa" } ] } @@ -2104,4 +2135,4 @@ "Formula": "任务首页!$Y$7" } ] -}//tvAGPrue66Zo1E1+isUzLdFcCyzhxxc4G6YeaqF4Mjq+UkstfLFc1iKVJp0P/zUbiGRN5v2X4YLvdUkUsm+1EZ0ZDn7Hm94lqmChVW4QdvRf8oztpArHPB0D7qqziVOdjXc2JXHTIX3zrG/uPLk2Iyfh4fcqIT2AM9Ztg27zNxh2KYu9oIbNBZu38YgEqoHFCURgxBWI7kUrCR1b9E7XScjOk8qJ4YptYmXfZvVKEm6dqFgSmEeRI+Lwelot4V6J7gGrTEBiJcO0vET92jR+CbYYzNM1FESOXH3FWAuyBNXfIGf4ELtWO9hsePSP80qPaaWVSFK0vFmJ8CdVZi3dDPDtFwzmYS0K/1ZVC3uDrRH+QKHChmslHiy41Z9SuEMGTHvnz/W8hTBl1xxdU6AgdJcvz1ubpLhxBsrlYIYJ9NvFesSJgrr6z6iojtIvyP+PTSf9X7k8YJMtykjOSRGuKOvYhz6DY1io74ysSA8ziHWjNdxYnHzj+Ul7Msy/vedv7QfhLN0JDlj1Pk5sn1zQYuNsQxfVERwbjncBbmJ5QoArLVlAwtdgar7LfTl1671RvpYP2SUFlf1j5crQcg8fdIkI4yw6PSMKVFC14zt+1NE+sG4LgVrdmG5h1wr+7pjVX028AzWDXmYNUF/2n+XIe9uYzREWNRlraEnZj1ywJcyMTDwjv0t0FfampgvQAd007TccUNZHEbKXPcQpWnWFK+w+najYycHtfPkK0m/ym4naECNvC/uQw/Aez4MPk2pSHP5WJTWKuf2Md29vtXrgwf3DlpTC/ytJnex7LYCMdXyNnHbWuBMor9/WaF8OqaxQFJa4zFKMhlD51sPpeAjAp3nB0TQLV3unMq/nrgpcWh3XGejOnelYeLyteqBCm5cGxErDP1SGywCdFXfQjfbWAQ==|920 \ No newline at end of file +}//6czjRQrdNSagNWgSe2T6vQIuIGVwfCmWUSzZ6DaxOzh5CmKAbaPyoO6SKrluDyuVXfPRnABwem01apojALurGFkOim9t81n7Q9r8GPOyL4jk5tRIGxN6IiNLnz2K9Pe5p/W6PYsgcTngWV4pJEOF46QDn2F4Z5u7b4z9rYmAdhgy57IxnpzbDC9AXRrYPafdTGufsIH5yjQlHlKWqtXPrHysU+U0cYpQFsK6EVzjJAafaQYWPdNNfyplj54UT7W9MMo1olFbXqEAvLq4Ii2WU4vV3r/EcYn4q3Np45fgHncW3glmloXMLPR9LW2U1gZVEcDjj9bR1v4yLg7qM+PBEsLMea/A8WSaRvRla4K93JktWLnJ61lHOzZS7vuiPdMpBx8XZ1Razr+/Hx2izbXanGft1oeBGumnu19WQFXgWxQlBvZ9sSfxux+UUa9GCkr/crLFDBwB3SE/bASqCN96rhaMY2UwlimddI9AWyUGcNQt5gCeFogdIC5T0WS1slbXq17Oyhsf+tNsUhC9qLNTgubZ4XSHT/goFjwbi5EhroPF/2+qY4hXYnWZa4m2THL9FOivGpZLhGwvF7+HJJzhfsBnBpcG1mPSltht3F6vWaACOyE9FxZtmpKagSPB+aZ8INzyFB8Ze/+cnGdhKxT5k/NawzBTg8EcwddayQwhHfS5j6mdD5HWagItFnV9YGVdnsbmjBJCJ1Mk0x9mTYQLnG4czfJs3fXaELWDd0JaEpHItWl70U3CqA5TSToJzhXnlipCMm0nfYm2R/ulfqjzAssEJNVLbzJiB543NO1LVMUmUK8/AWnaDuAXmx1tZu17d431OYgFQj7tQE58mcTyvGYi+bypCyK0PLYbNL3zKofzf+XZ8vaHPQXBNmd0j9ptF/XDhE55idsQnnS5ckHgVA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目成员.json b/Pages/项目/项目首页/项目首页-容器页面/项目成员.json index fa808f9b..be2022e1 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目成员.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目成员.json @@ -23,22 +23,26 @@ }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 642.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 321.0, + "Mode": 1 } }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 10.0 } }, "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 30.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "8": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "IsHidden": true @@ -46,9 +50,9 @@ } }, "InLogicalVisibleIndexes": [ - 6 + 8 ], - "Count": 7, + "Count": 9, "DefaultSize": 24.0 }, "Cols": { @@ -265,8 +269,9 @@ "DefaultSize": 32.0 }, "Values": { - "1,31": "添加岗位", - "1,36": "添加成员" + "1,31": "岗位管理", + "1,36": "添加成员", + "6,1": "添加岗位" }, "AttachInfos": { "1,1": { @@ -363,23 +368,14 @@ "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ + { + "$type": "RemoveCurrentRowInfo.RemoveCurrentRowInfoCommand, RemoveCurrentRowInfo", + "TableName": "项目成员表" + }, { "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", "ClosePopupCallbackCommand": { "Commands": [ - { - "$type": "Forguncy.Model.UpdateListviewCommand, ServerDesignerCommon", - "ListviewName": "项目岗位表格", - "UpdateType": 6, - "UpdateListviewCommandRunTimeMethodSetting": { - "MethodName": "Reload", - "ParameterValues": { - "clearFilter": false, - "clearSort": false, - "clearRuntimeQueryConditions": false - } - } - }, { "$type": "Forguncy.Model.UpdateListviewCommand, ServerDesignerCommon", "ListviewName": "项目人员表格", @@ -388,24 +384,25 @@ "MethodName": "Reload", "ParameterValues": { "clearFilter": false, - "clearSort": false, - "clearRuntimeQueryConditions": false + "clearSort": true, + "clearRuntimeQueryConditions": true } } } ], "ParamProperties": { - "IsOK": "是否为确定" + "IsOK": "是否为确定", + "成员ID": "成员ID" } }, "PageName": "项目岗位配置", "LoadBindingDataOption": 1 } ], - "Text": "添加岗位", - "TemplateKey": "_RS_Warning3", + "Text": "岗位管理", + "TemplateKey": "_RS_Main3", "Icon": { - "Name": "增加.svg", + "Name": "人才.svg", "Color": "Accent 1", "UseCellTypeForeColor": true }, @@ -637,7 +634,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "7726fbdd-7ff8-4419-93fc-732f017660e1" + "ID": "6999eccc-edeb-4dfa-981d-6e224a7db2fc" }, { "Condition": { @@ -700,17 +697,17 @@ "BtnText": "知道了" } ], - "ID": "d3bcf502-8de5-4368-b2cf-a91f1d61904d" + "ID": "827974e1-7b04-4dbd-ba6e-6f79671b195b" } ] } ], - "ID": "9d8f206f-8203-495f-96fb-68331045b2d8" + "ID": "17e371ce-af36-479e-9d8b-827f46ab7042" } ] } ], - "ID": "0599ca49-8563-46ff-be08-a5715a082abc" + "ID": "42a85b08-9c29-42be-b61b-3a21481e7c0d" } ] } @@ -832,13 +829,70 @@ } }, "6,1": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "RemoveCurrentRowInfo.RemoveCurrentRowInfoCommand, RemoveCurrentRowInfo", + "TableName": "项目岗位" + }, + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "ClosePopupCallbackCommand": { + "Commands": [ + { + "$type": "Forguncy.Model.UpdateListviewCommand, ServerDesignerCommon", + "ListviewName": "项目岗位表格", + "UpdateType": 6, + "UpdateListviewCommandRunTimeMethodSetting": { + "MethodName": "Reload", + "ParameterValues": { + "clearFilter": false, + "clearSort": false, + "clearRuntimeQueryConditions": false + } + } + }, + { + "$type": "Forguncy.Model.UpdateListviewCommand, ServerDesignerCommon", + "ListviewName": "项目人员表格", + "UpdateType": 6, + "UpdateListviewCommandRunTimeMethodSetting": { + "MethodName": "Reload", + "ParameterValues": { + "clearFilter": false, + "clearSort": false, + "clearRuntimeQueryConditions": false + } + } + } + ], + "ParamProperties": { + "IsOK": "是否为确定" + } + }, + "PageName": "项目岗位配置", + "LoadBindingDataOption": 1 + } + ], + "Text": "添加岗位", + "TemplateKey": "_RS_Minor3", + "Icon": { + "Name": "增加.svg", + "Color": "Accent 1", + "UseCellTypeForeColor": true + }, + "IconSize": 14.0 + } + }, + "8,1": { "BindingInfo": { "TableName": "项目表", "ColumnName": "项目经理", "GUID": "92ddc900-e1f3-4049-b67b-cdc5c4c0dffd" } }, - "6,5": { + "8,5": { "BindingInfo": { "TableName": "项目岗位", "ColumnName": "ID", @@ -908,6 +962,11 @@ }, { "HorizontalAlignment": 5 + }, + { + "FontFamily": 1, + "FontSize": 13.333333333333332, + "Formatter": 3 } ], "Types": { @@ -994,8 +1053,50 @@ "5,9": 14, "5,10": 14, "5,11": 13, - "6,5": 2, - "6,10": 2 + "6,1": 15, + "6,10": 14, + "6,11": 13, + "6,12": 14, + "6,13": 14, + "6,14": 14, + "6,15": 14, + "6,16": 14, + "6,17": 14, + "6,18": 14, + "6,19": 14, + "6,20": 14, + "6,21": 14, + "6,22": 14, + "6,23": 14, + "6,24": 14, + "6,25": 14, + "6,26": 14, + "6,27": 14, + "6,28": 14, + "6,29": 14, + "6,30": 14, + "6,31": 14, + "6,32": 14, + "6,33": 14, + "6,34": 14, + "6,35": 14, + "6,36": 14, + "6,37": 14, + "6,38": 14, + "6,39": 14, + "7,1": 14, + "7,2": 14, + "7,3": 14, + "7,4": 14, + "7,5": 14, + "7,6": 14, + "7,7": 14, + "7,8": 14, + "7,9": 14, + "7,10": 14, + "7,11": 13, + "8,5": 2, + "8,10": 2 }, "SheetStyle": { "FontFamily": 1 @@ -1003,12 +1104,14 @@ }, "Spans": [ "1,1,1,9", - "4,1,1,9", - "4,12,1,28", - "6,5,1,5", + "4,12,3,28", + "8,5,1,5", "1,36,1,4", - "1,31,1,4", - "6,1,1,4" + "8,1,1,4", + "4,11,3,1", + "4,1,1,9", + "6,1,1,9", + "1,31,1,4" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1064,11 +1167,11 @@ "CustomNames": [ { "Name": "当前岗位ID", - "Formula": "项目成员!$F$7" + "Formula": "项目成员!$F$9" }, { "Name": "项目经理", - "Formula": "项目成员!$B$7" + "Formula": "项目成员!$B$9" } ] -}//psiD/S90h5PJPpLV+HBqt9bLzaxvMAwkg/3tr6Urfibx3mDFZX38T8n5pnKasPFBWcU6vgSRVCBs3R5nOTeb/XWiJSJyZOpO1H9qQwcQzL0cf9TXSDMqXt3mNMEKriNWr+CTaxqTpzA49ZExRCyC7WEIjJ+zW6BSmPSqotupIYHVBbzcW0/IFtQG14CKq5LuIYdr8oz9gGwhjR4ULaxbxTX3J5qXLN3CzcdtVkMOWeZVLixZHXyrEUQTFEq+Kp+9Kyv7iohItJ3iFx1uEVJMhc4iVp2mOHlnuisekee/LmZaBEgZdDsJXtugNyhlrJR5E0UmfDcUuP11vdg7zr3aW7jtU9MOtF8uNjsP1BA9is2UqNXrI47WpE1YYnf3+lJb7a5MksJ6/H/9bZj+Hkjy5uVji8BxZN9k6XtGGvJlqFqrRPQ0QA2oc5hahsPuGUjfH2cwDGQIP7vjytVqJvIdAZrkq20kw7zbqMmldghvt4Lo0CZza0ojDy2371XXBQ3BEjyawANS3xrYjklFuvkL8i0nNsSjQYgNd7TFwRL04QKSAQypJOjUSMv9U2sz5pvmjRxL7J1ZI3gR8dcDUASzTnodTJMUeIXYxcXlpxGLhbvq0opqdqLvlnKSHpVf0LDrWOWRPg/9jbyMnwCcRTLjgdeprs4bFRGCkuVO5R4bE/+Rf5Q0vyPvgWQw51ldPheSB7Sv1R7uuqLkHJGnE8fLSqFas5GqV6Io+2GGoPEny6sRuzAqllL6bGO3mZl9anPL+Bbdwpp5PdSG4UYsBIFpXeyq/5SGfPElxsIojW8sbOHMu2v0AK9LHP9TMQfm4hIp6Y7mu2IexI/kqP3Sh2ClZrmGu/6pUwttvgJ3OhxJ+4XJUdslHYSTkfXL7JIchlicdwl0DAMamZChKujznsDP6A==|920 \ No newline at end of file +}//KfianVzZH1qg1/JRJ1PGfg4VhawUlLTtVoxSPPqk2WbCRtTudbj7+CK8LBzdbT0m2mJmP4EYlVxlOAe7moGOjPbhK9ygSniylEv/3gZ4HRAagZsHU3tsUoAmK5XO3n76aB5Sdmkw9F2v0DzCexJdMiFmPQ54x0063V7G2t8KSY3raxUutqTwRz5pdjFRobQsPN5zAk9SmbkHtAx8ttbI51BIq0K3drITi5f46BEQtGpY01jXSw+ryezorJovCpVEx9vHcoSRP4FJKWI4Fo3m6xjHTfI/Ypv6JAbgNK5PTMefYYrHdQBviPPrJfxeYMkj9WuCRnr3GIFPy/e/YvRKz46KB80HEYSsHjX72IhK6WSCY1uZpHuWoQVDl5LKGUuxayEvpPeSEIHzhAAreeraWIM/bR4EFas2Ke4unTnJvKhfoOnjGnylomhu6uxqgW4wkhbUmrA05yEW1tcUD0gp0rXut/8yMfRSsLhlSNMORc8gF4YqohlPW3dLZMX5Q5zZN2POM2qd6zqIUhLHh7JwRDbDaXOvtbvRoQYMfgUrnn4p3qZbvZHgmdDrbRyrfVD1oLAyEkjtEX8Jc9Q7mfVY3p5sRKAl0H+bCkgmfOLBnr1OJALCrtZ1UCveICthuFHk6wAtl+ImO5/W1KF6R2mip4bgzmpoE8qNAB1CpjvxleBpjOBumEIKHgHg6KCewxc/WTFNLt1p3u4araYe0RtIGG21XSGvPCZq81lVh5cn4bDB5vZDkC4ebTMJhETy2KDAisnc6dHObkd5i9DgTJg/sKvgG+56jCD8jiCVt/VhaU8DuTq4xU6OH06RoUC4NMCYqjZQlPFIeyiQTWfYBUFqS54BytbZ+lVVmofRHU9TMI+dYb2RKHYximYtLBob/O+j4rk/2Ls/YGHcsVtN3Y0gEA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目成员.rd b/Pages/项目/项目首页/项目首页-容器页面/项目成员.rd index a7148a2b..7776d5d8 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目成员.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/项目成员.rd @@ -1,15 +1,15 @@ { "PageType": 0, "ColumnCount": 41, - "RowCount": 7, + "RowCount": 9, "CustomNames": [ { "Name": "当前岗位ID", - "Formula": "项目成员!$F$7" + "Formula": "项目成员!$F$9" }, { "Name": "项目经理", - "Formula": "项目成员!$B$7" + "Formula": "项目成员!$B$9" } ] } \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目成员统计.json b/Pages/项目/项目首页/项目首页-容器页面/项目成员统计.json index c14dffd0..9ce7df9f 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目成员统计.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目成员统计.json @@ -202,6 +202,21 @@ "CellType": { "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", "TemplatePageName": "5f448cc5e408484e9837a0183cf1365", + "DblCommand": { + "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", + "Commands": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "项目成员详情", + "LoadBindingDataOption": 1 + } + ], + "ParamProperties": { + "项目成员": "项目成员", + "项目成员_全名": "项目成员_全名", + "岗位名称": "岗位名称" + } + }, "DataSourceType": 1, "DataSource": { "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", @@ -311,4 +326,4 @@ "PaperSize": {}, "Margin": {} } -}//tC0xYmRscrr1vHqLPVNN3fbVZldKe0fwwCsf1PN0+3li4OQ9CIrjCmqG2A9AMnPNtz85qXSMebLfYlTCPWDN/f1r6JYrSSrqkMmKICLBqAgrSV00VycxtnONHnX2EzzjWhrsogf4ZEcKz4JbkdF8Vo68uKj+jHsWyuZgz8ucIAwxMhjvGuyUeS8v7NYY8WbS7Ua0JrCbt+CQNCF3F7g6MkJNSQsguyVoo15KwJV+3OwzjeqhjPtUjDYUiz5xDFE1qIn/oa3cdgQPcq1M/8EwnAe5Ug09GTvw1jWygoJJbC1iak0zKilARBZbTqeeVKjz8zxfbKoDcvX0sJQrBeu1QMjE+eaA19bzfWDeyMxyLily823mkZ0H9HDp9UW6oxeJo9Rd3ON2IY7ZyxSgkv9lg0aZ5HsVpg/AMZp85a0gwk6xlmi08vEMvQqYBAliCsiDrhwSTfxd2/OEZJK7l4MEx+dX0jasfp1lVKqBuQVpZoKCeITC/NCt0GmyWzLUn5VJh8ZtzGyuvvOog9GU9VY95j6ma7sODYQjz/BmVs9MHfnCmCThf3JIt5wkeswiX3dpDMi4MNZc/5dEAPzO3AQAsqmBnPdpyMZkdJOXaGa8wZzK1TKeXNQXsJ3t+De7749eUgVHrVysxgdy6EKWvSKDkX9gFIdGU8DJDRSeP0WsV+/mhRTM3yBjuabiHY9bMg2GaMoc2Ce44cIK2EODB1deDuCQQfg+gvsHVoCpx2Weud9qqax6TjpTbhak/3X0JOaQ8gaarf3PMDEZR4MU+FLStHXKGmvo2vZn3IGg/XmmZx9Y5JknFtlv1a3B8GCHK6pP0SQtwHkE+PzeVddhs8+cLbiQh2L2ByeCD7QnO2k505q/OVcENNRT4l2JYhbsW78/ZGNh1uD/qR9HgbraOK0/dA==|920 \ No newline at end of file +}//INEIYrxzJDbwa3hyZXcnYlPQkix299UrxbXk1HXni3b1CvTr2doipCMXr0ANaGFAPjbRWz1KRzYKFWug75PawbTzwGV1/QN/LGmYo7Qb3yp4s7Q56ajNP2zHiWe/ZNe796CjS22lu2MqWX8f1IJP22jJHpU0iBgmhv+SYd8xXrbst5C+QMIXjFmH+zF/VLW4b8Yqmln2+tV/h1I4WLUqkPOLe3RplPBxIa6a5ILYi8oQG9FEqOqGsXWwTFIyn00aElyzAkDiFyvg1M3WBrVo1w8pDBExdgZHB5mbgEQlAyeqvKH7M+z/+txEIoABpmpVMEnq9Wc2E9kEpVGfyHnrL/3cYX0xU+5WNtdBnujnxZC6D4GVJy63lXlZQsZdjivGQ1h5UGfxDD+AX9k6wPB8rRYzejC2ikuxQ2u9JIuxfE5NyDBu0q6rUme0JAgaIs1MWi5fZWNaGreKNhN1DulAfK/lSV+nuru3I9Q5bOIqMT6O//SC0io7Psi0FR1mlzyVbK2ksiV3ADj9mZTMnYbjRE4hnKgwkgqQDrlORz7iGwRRKtr5FI/R164dFy/fLqZLe/aRfNsiRie90mi3jTHy7dbH1eEGZG5PGtI5cVRgbvCya0JDb3zWffpf5ghQte8B0dslZlYjrOke2V980B9NrXFAwbozPwmANFat+8npyWhDVFvlgbTn4l1nxlkyU1Z5pJFi6b/ENdSqbrP3c9A7A1s43G6MOnNwHIY/txhvls2FIYtweaFeoPcXFp2roArz0UxhylNxvqEfmPjrS819L/xiuSQz1UCo/TfLjSHIrkhWiciH2yHgy1XW6arSxwB4NaNUFnedH2p/sUq2vbSqoxzpkUU3UnG/QqTaFRASa3MYrmpLcjez1nTaKDCZC+iAtdERAE8+NTpfKYdiwQpsuA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/预算申请/项目预算申请历史.json b/Pages/项目/项目首页/预算申请/项目预算申请历史.json index c6517c5d..1dc3959a 100644 --- a/Pages/项目/项目首页/预算申请/项目预算申请历史.json +++ b/Pages/项目/项目首页/预算申请/项目预算申请历史.json @@ -116,26 +116,6 @@ "DesignLengthInPixel": 32.0 } }, - "26": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "27": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "28": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "29": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, "30": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 @@ -180,9 +160,29 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } + }, + "39": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "40": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "41": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "42": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } } }, - "Count": 39, + "Count": 43, "DefaultSize": 32.0 }, "Values": { @@ -225,7 +225,7 @@ "IconSize": 14.0 } }, - "1,33": { + "1,37": { "CellType": { "$type": "ElementUI.CellTypes.PaginationCellType, ElementUI", "AttachElementTable": true, @@ -297,6 +297,15 @@ }, "ColumnName": "申请人" }, + { + "GUID": "5138ee30-3293-42f9-bafa-458c3f1095dd", + "BindingInfo": { + "TableName": "项目预算变动表", + "ColumnName": "原预算工时", + "GUID": "4b9ac146-ee01-4005-93fb-677dd68296f6" + }, + "ColumnName": "原工时" + }, { "GUID": "52d0dc9f-b54f-49f9-ba80-2b2169d26309", "BindingInfo": { @@ -315,6 +324,15 @@ }, "ColumnName": "增加后工时" }, + { + "GUID": "22310905-8612-4945-b236-a9b053d0c7a7", + "BindingInfo": { + "TableName": "项目预算变动表", + "ColumnName": "原预算费用", + "GUID": "745c3863-191a-44ce-ac59-c686778d87e7" + }, + "ColumnName": "原费用" + }, { "GUID": "feaa396b-ceb8-4e3c-be94-4ce19205dca4", "BindingInfo": { @@ -402,7 +420,7 @@ "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "ID", "label": "ID", - "align": "left", + "align": "center", "headerAlign": "center", "colfixed": "false", "type": "Default", @@ -411,7 +429,7 @@ "resizable": false, "showOverflowTooltip": false, "hide": true, - "key": "958ee3a5-6be5-4680-8673-773c44aeca23", + "key": "dcbb200e-7d34-4565-aedb-9a45e1d8f8f2", "UIPermissions": [ { "Scope": 1, @@ -425,14 +443,35 @@ "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "申请人", "label": "申请人", - "width": 150, - "align": "left", + "align": "center", "headerAlign": "center", "colfixed": "false", "type": "Default", "tagType": "info", "imgType": "cover", - "key": "9f157271-9b2a-42b2-bda4-b50da3f13b6b", + "key": "e83d1534-2c40-4b72-90b8-39948f02987d", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "原工时", + "label": "原工时", + "width": 100, + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "showOverflowTooltip": false, + "key": "4f276671-c8cc-4fa8-8e82-96cfc094bf2f", "UIPermissions": [ { "Scope": 1, @@ -446,14 +485,15 @@ "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "增加工时", "label": "增加工时", - "width": 150, - "align": "left", + "width": 100, + "align": "center", "headerAlign": "center", "colfixed": "false", "type": "Default", "tagType": "info", "imgType": "cover", - "key": "541b8a2f-1a7e-45be-97cd-2f54401a6edc", + "showOverflowTooltip": false, + "key": "51dccfa3-a943-46c0-b5bf-3fa0abd69897", "UIPermissions": [ { "Scope": 1, @@ -467,14 +507,37 @@ "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "增加后工时", "label": "增加后工时", - "width": 150, - "align": "left", + "width": 100, + "align": "center", "headerAlign": "center", "colfixed": "false", "type": "Default", "tagType": "info", "imgType": "cover", - "key": "666e0e13-911a-4c61-86d5-2a0280db8678", + "showOverflowTooltip": false, + "key": "d345bc10-7d34-4d64-81b2-907105b9fcab", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "原费用", + "label": "原费用", + "width": 100, + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "showOverflowTooltip": false, + "key": "1b9d1b19-1523-4137-942e-373491af4a01", "UIPermissions": [ { "Scope": 1, @@ -488,15 +551,15 @@ "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "增加费用", "label": "增加费用", - "formatStr": "¥#,##0.00_)", - "width": 150, - "align": "left", + "width": 100, + "align": "center", "headerAlign": "center", "colfixed": "false", "type": "Default", "tagType": "info", "imgType": "cover", - "key": "ab7813aa-d7ad-457f-bdb4-ae705706791b", + "showOverflowTooltip": false, + "key": "1b5608a6-7c9a-4a73-a097-ac532db956c4", "UIPermissions": [ { "Scope": 1, @@ -510,15 +573,15 @@ "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "增加后费用", "label": "增加后费用", - "formatStr": "¥#,##0.00_)", - "width": 150, - "align": "left", + "width": 100, + "align": "center", "headerAlign": "center", "colfixed": "false", "type": "Default", "tagType": "info", "imgType": "cover", - "key": "5764a55f-1595-4c50-84ab-53c11279daae", + "showOverflowTooltip": false, + "key": "725aac46-2d8c-4a81-9e02-72aade943e03", "UIPermissions": [ { "Scope": 1, @@ -532,13 +595,15 @@ "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "申请理由", "label": "申请理由", - "align": "left", + "width": 100, + "align": "center", "headerAlign": "center", "colfixed": "false", "type": "Default", "tagType": "info", "imgType": "cover", - "key": "36d884a2-e948-4a97-b7ba-ef43b433ba9b", + "showOverflowTooltip": false, + "key": "0d48719d-843c-4380-9fde-731393786c7e", "UIPermissions": [ { "Scope": 1, @@ -552,13 +617,13 @@ "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "描述", "label": "描述", - "align": "left", + "align": "center", "headerAlign": "center", "colfixed": "false", "type": "Default", "tagType": "info", "imgType": "cover", - "key": "e5c98e1b-fb9e-4e0a-b761-03f1fc5eaae3", + "key": "75f6f1c8-fe87-4947-ac66-8e934947e154", "UIPermissions": [ { "Scope": 1, @@ -572,14 +637,14 @@ "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "状态", "label": "状态", - "width": 150, + "width": 100, "align": "center", "headerAlign": "center", "colfixed": "right", "type": "Tag", - "tagType": "primary", + "tagType": "info", "imgType": "cover", - "key": "59848657-1ed4-4bb3-bd63-28c6dc887e7b", + "key": "47090c0c-2b16-49fe-8d27-db5c6f480c69", "UIPermissions": [ { "Scope": 1, @@ -593,7 +658,7 @@ "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "流程实例ID", "label": "流程实例ID", - "align": "left", + "align": "center", "headerAlign": "center", "colfixed": "false", "type": "Default", @@ -602,7 +667,7 @@ "resizable": false, "showOverflowTooltip": false, "hide": true, - "key": "c00f0c71-c666-41bf-9ad2-65c943ac61a2", + "key": "e37d4908-3d4b-43b9-9e78-0e63a117e268", "UIPermissions": [ { "Scope": 1, @@ -701,28 +766,33 @@ }, { "FontFamily": 0 + }, + { + "Background": 1 } ], "Types": { "Strs": [ - "Body" + "Body", + "#FFFFFF00" ] }, "CellStyles": { "1,1": 0, "1,2": 1, "1,3": 1, - "1,33": 1 + "1,37": 1, + "6,5": 2 }, "SheetStyle": { "FontFamily": 0 } }, "Spans": [ - "3,1,1,37", + "3,1,1,41", "6,1,1,4", "1,1,1,3", - "1,33,1,5", + "1,37,1,5", "6,5,1,4" ], "PageInfo": { @@ -759,4 +829,4 @@ "Formula": "项目预算申请历史!$F$7" } ] -}//3kk5aZtYjpmOTFea7YZ/nnH6Et2QbrYSwzsAVBohD0YdQggLpPSaQSjzhcQlb6A62CZ0gX8yt2szdwPQXEqhPrwpqgsvdR1lpytn3cdnJlKhbK6gjYQlD+hgQCcS9uhnLg2dTeVXCY6cTdiDnrSDZrUprdZw7u1B6OARALiE4uaLFgMkb2grOjbdnFkzZSn8QOVZA859NBK79rEGvAp2pWv7Jp3JU7OA9P+CHpAVtthtPpzR6+zDi/5/ncXuM5ZskhJTUxmmHYtz+8zm7otl2pqoJcnXcpt36dqbXor756OHfaZgR1jMP5bH2oLLfeXpTIYscaTEAioFtKJESwraFWlh22hnPblRwIUgBkNS8LPRiNWMo3W5vaGdpgMzr+gdceTe/XxGOFCzdyNDQgLSn8JZhMTSH4H5Jon+T82OImt2F832lBmms/xufUHSWJM7p04EhYI1raCnb+BUbMuc5il/POn1aMatSilutpez7iFqaO2u6dz0hT5CZ2nWxH+zyJgf0AIzT/L9vWlCISWFdn3F6z1A7ElbQ9A/LAt/BQgULhsT0YxfxqyzgI+iN7aKB+6wA/h9Mavn2GefyrNHmCXShoHLVI8IW+sIDSPTXc3Ive1TDyrgUYLBOljsiEuyeptlbF4uq10JHz/pzXJCzh5H4tPCRq6nj52Si5E7UOZVfmvhfDshp84JLs9MlAgINfhybf29fQC/IcszIkRdl4hIzr+VZ0p3Z0arLoPqusX/6a/Ifcuk0sP3xl+zJHd7fpTBz5Q1bHC1vv4oSrnrmisuTf63Y/xndfJEXZKbu/sC0LwZV/38Z7NQwnoLgyHMaR7AsSbSltDG2gU1U7bZ4DWQJNtg4C7ecHOIQAY1lyYGpj1isKeXS/h3oBMRvsaDs8a+m/JWYYYBWOsOfveeZA==|920 \ No newline at end of file +}//sjij9YXe0WepQERnLJP9DBHNC5myayHe5AqXZpxSYH0QJxRG8oJ8OyB+y79iEPOTQhIlVUGIZMqXa58aHAsR8b7DiIbQqMflfwMKqJKxplN0YLV3Ycm3uqCL0yYxknPVzsTEAT5etc8jilChChq2t/6gnvzVNV94NOsrgea5cgjyl6QwoVvP9xtt37r4SAYuRd2Ve2s4+jK5UjFR8wX6e7AMJudSOteoznqQ9k+kGe+cnmWCyQSZRh3v4BZ3Qy0+RTymtstDrs5+fPBqMDWe/fNEwgwVFGB6sljUaV2EOiB0s1ml9wZHHwbE6OOk4DJwDEuK3mf38Dfkpyl8v73gXCiT/RYEyiUN3UXp20s1/PMs6GpWrOFPvaiPfnkagD32eZ7nsoqi+lQr5QJiuFFZMZop8GtxqcjE2Ha4/EyuUGwBZH496Hhtqb83qHygPC+yfOVk5GO4AopD6Ob26ErkEUzyHqvnZKABa8HMFu9UmhjJcgTd+TB42VCOZgbpeLsc0ai0J64Zd12+QBjPVtwZnalyDPdAHuegQaE84JSI/C5YDqM6BIVAn1hLCjYgRC5URa1/glJ604o8qwre6rOgIkK35ZAlnJTf+4kto/4ZrWGQ3SqvtFU2G3CmgqTx3T1wJstVD2+fq8nEhE78iEEzq0dt05X3Htqa8WNV/dqmkVSgVli/D6hs69MXMv5OvBCrI0KS29NaWWz7WG7147xaWV/dKMJ1CjZTidki0OGD8qGluG8BwMjtnvVO/XQIKGueMsSNxh7e1o3Xp61z9hTqdW4rKfiotDuYLFufRPCb1jr4U/dZNOcQDir4AeldIHTdkKTiLd6LnmHKvsl4/WJ5kIuy7LVRnXUeEQ0HNG1EQCKnpTbY7WWh4HJ8onkX3Ox+LO146Eq3zSpmH4Y9pjxu6A==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/预算申请/项目预算申请历史.rd b/Pages/项目/项目首页/预算申请/项目预算申请历史.rd index 17f73aa2..753056ac 100644 --- a/Pages/项目/项目首页/预算申请/项目预算申请历史.rd +++ b/Pages/项目/项目首页/预算申请/项目预算申请历史.rd @@ -1,6 +1,6 @@ { "PageType": 0, - "ColumnCount": 39, + "ColumnCount": 43, "RowCount": 7, "CustomNames": [ { diff --git a/Pages/项目/项目首页/预算申请/预算申请.json b/Pages/项目/项目首页/预算申请/预算申请.json index 40da97d9..7ccc55d3 100644 --- a/Pages/项目/项目首页/预算申请/预算申请.json +++ b/Pages/项目/项目首页/预算申请/预算申请.json @@ -176,7 +176,7 @@ }, "19": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 240.0 + "DesignLengthInPixel": 342.0 } } }, @@ -184,7 +184,7 @@ "DefaultSize": 32.0 }, "Values": { - "1,19": "申请历史", + "1,19": "FGC_审批记录", "3,1": "申请项目", "6,1": "申请人", "7,1": "%CurrentUser.UserName%", @@ -203,7 +203,8 @@ "PreCommands": [ { "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", - "Title": "加载中" + "Title": "加载中", + "VBalidate": true } ], "PostCommands": [ @@ -245,76 +246,11 @@ ] } }, - "2,19": { + "1,19": { "CellType": { - "$type": "ElementUI.TimelineCellType, ElementUI", - "useBinding": true, - "options": [ - { - "content": "活动按期开始", - "timestamp": "2018-04-15" - }, - { - "content": "通过审核", - "timestamp": "2018-04-13" - }, - { - "content": "创建成功", - "timestamp": "2018-04-11" - } - ], - "bindingOptions": { - "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "项目预算变动表", - "BindingInfos": [ - { - "GUID": "08de1220-8cfc-4269-8e08-df38dbec79c6", - "BindingInfo": { - "TableName": "项目预算变动表", - "ColumnName": "描述", - "GUID": "92f849fb-3f07-4165-b2e5-fe971faa78a5" - }, - "ColumnName": "content" - }, - { - "GUID": "9fa5fafe-dec6-4a6c-a58b-8d2c76a2a1c5", - "BindingInfo": { - "TableName": "项目预算变动表", - "ColumnName": "FGC_CreateDate", - "GUID": "0fce9c7c-6228-4d7e-a3c2-f770817128c2" - }, - "ColumnName": "timestamp" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目预算变动表", - "ColumnName": "项目ID", - "GUID": "a3a50794-2d13-4deb-9a2b-5ac663dd784e" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=预算申请!B5" - } - }, - "OrderBySqlCondition": { - "OrderByColumns": [ - { - "ColumnBindingInfo": { - "TableName": "项目预算变动表", - "ColumnName": "FGC_CreateDate", - "GUID": "2c23c1d4-b43b-4cac-8463-52047d924eb4" - }, - "Order": 1 - } - ] - }, - "CustomColumns": [] - }, - "sort": "default", - "NodeSize": "normal", - "format": "yyyy-MM-dd" + "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", + "PageName": "FGC_审批记录", + "OverflowMode": 1 } }, "4,1": { @@ -693,12 +629,12 @@ ] } ], - "ID": "ff81eaa5-3dde-4d09-a65a-74811b5d1e9a" + "ID": "d7b3455c-b098-46c9-8e66-87bb348389a5" } ] } ], - "ID": "3944c2ad-008f-4ccc-a17a-753a52f50b6c" + "ID": "2d4a2130-f617-4b75-9ad5-4500d5d1275f" } ] } @@ -903,7 +839,7 @@ "MethodName": "Refresh" } ], - "ID": "82d4c54b-d212-4963-9078-8128ae03eb2d" + "ID": "a2257ee0-68b1-4806-9e73-7febaf59c139" } ] } @@ -929,12 +865,7 @@ "FontSize": 13.333333333333332 }, { - "FontFamily": 0, - "FontSize": 13.333333333333332, - "Formatter": 1 - }, - { - "Foreground": 2 + "Foreground": 1 }, { "BorderLeft": 0 @@ -947,8 +878,8 @@ { "FontFamily": 0, "FontSize": 13.333333333333332, - "Foreground": 2, - "Formatter": 1 + "Foreground": 1, + "Formatter": 3 }, { "FontFamily": 0, @@ -977,9 +908,9 @@ "Types": { "Strs": [ "Body", - "[AUTO]General", "Text 1 50", "Background 2 0", + "[AUTO]General", "0\"小时\"", "Left", "¥#,##0_);[Red](¥#,##0)", @@ -989,7 +920,7 @@ ], "Borders": [ { - "Color": 3 + "Color": 2 } ] }, @@ -1010,13 +941,10 @@ "1,14": 1, "1,15": 1, "1,16": 1, - "1,19": 2, - "2,19": 1, - "3,1": 3, - "3,18": 4, - "3,19": 1, - "4,18": 4, - "4,19": 1, + "1,19": 1, + "3,1": 2, + "3,18": 3, + "4,18": 3, "5,0": 1, "5,1": 1, "5,2": 1, @@ -1035,11 +963,10 @@ "5,15": 1, "5,16": 1, "5,17": 1, - "5,18": 5, - "5,19": 1, + "5,18": 4, "5,20": 1, "6,0": 1, - "6,1": 6, + "6,1": 5, "6,2": 1, "6,3": 1, "6,4": 1, @@ -1056,14 +983,12 @@ "6,15": 1, "6,16": 1, "6,17": 1, - "6,18": 5, - "6,19": 1, + "6,18": 4, "6,20": 1, "7,0": 1, "7,1": 1, "7,17": 1, - "7,18": 5, - "7,19": 1, + "7,18": 4, "7,20": 1, "8,0": 1, "8,1": 1, @@ -1083,11 +1008,10 @@ "8,15": 1, "8,16": 1, "8,17": 1, - "8,18": 5, - "8,19": 1, + "8,18": 4, "8,20": 1, "9,0": 1, - "9,1": 6, + "9,1": 5, "9,2": 1, "9,3": 1, "9,4": 1, @@ -1095,7 +1019,7 @@ "9,6": 1, "9,7": 1, "9,8": 1, - "9,9": 6, + "9,9": 5, "9,10": 1, "9,11": 1, "9,12": 1, @@ -1103,19 +1027,16 @@ "9,14": 1, "9,15": 1, "9,17": 1, - "9,18": 5, - "9,19": 1, + "9,18": 4, "9,20": 1, "10,0": 1, - "10,1": 7, - "10,9": 8, + "10,1": 6, + "10,9": 7, "10,17": 1, - "10,18": 5, - "10,19": 1, + "10,18": 4, "10,20": 1, - "11,18": 4, - "11,19": 1, - "12,1": 6, + "11,18": 3, + "12,1": 5, "12,2": 1, "12,3": 1, "12,4": 1, @@ -1132,12 +1053,10 @@ "12,15": 1, "12,16": 1, "12,17": 1, - "12,18": 4, - "12,19": 1, + "12,18": 3, "13,1": 1, "13,17": 1, - "13,18": 4, - "13,19": 1, + "13,18": 3, "14,1": 1, "14,2": 1, "14,3": 1, @@ -1155,9 +1074,8 @@ "14,15": 1, "14,16": 1, "14,17": 1, - "14,18": 4, - "14,19": 1, - "15,1": 6, + "14,18": 3, + "15,1": 5, "15,2": 1, "15,3": 1, "15,4": 1, @@ -1172,14 +1090,12 @@ "15,13": 1, "15,14": 1, "15,15": 1, - "15,16": 9, + "15,16": 8, "15,17": 1, - "15,18": 4, - "15,19": 1, + "15,18": 3, "16,1": 1, "16,17": 1, - "16,18": 4, - "16,19": 1, + "16,18": 3, "17,1": 1, "17,2": 1, "17,3": 1, @@ -1197,9 +1113,8 @@ "17,15": 1, "17,16": 1, "17,17": 1, - "17,18": 4, - "17,19": 1, - "18,1": 6, + "17,18": 3, + "18,1": 5, "18,2": 1, "18,3": 1, "18,4": 1, @@ -1216,19 +1131,17 @@ "18,15": 1, "18,16": 1, "18,17": 1, - "18,18": 4, - "18,19": 1, + "18,18": 3, "19,1": 1, "19,17": 1, - "19,18": 4, - "19,19": 1, + "19,18": 3, "20,17": 1, - "20,18": 4, - "20,19": 1, - "21,18": 4, - "22,5": 10, - "22,11": 11, - "22,18": 4 + "20,18": 3, + "21,18": 3, + "21,19": 1, + "22,5": 9, + "22,11": 10, + "22,18": 3 }, "SheetStyle": { "FontFamily": 0, @@ -1245,9 +1158,9 @@ "10,1,1,8", "22,1,1,4", "1,1,1,16", - "2,19,19,1", "22,5,1,5", - "22,11,1,7" + "22,11,1,7", + "1,19,20,1" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1283,4 +1196,4 @@ "Formula": "预算申请!$B$23" } ] -}//oU7vpEz8/7FPHcz8VZRMend+/SJnkPHkn9e9+34KjfWAQN24pgJi91XdZe8DbTT0SgELEDqob9gVdONmUu4/c1cRNxR69eUckusupEghiKN3UprlnOKzKN6euS5yhXiBWP0Sdh+3vaIsaE8igESa5g6z2JsZBHaCrFo9MYd+4DvXIkVRJXXR5MkdPhp8gJ/CYpDSjoN30TAAKDf5jsrwKqXJpUZKXMWyPIzHG3eBYDLtpghMfLkaX7ioxkjJp0tfWYxBh1+y5a1EzHy2FwoTZZ32CSEvy3n3VX+JZWFbbx2mwhRAA9UAiUSWwIXeyXhEJwcLbsa5tcDcn3DWNXPLIr3HqURh6P/fjeA71XJ/PTV9BSKPxRYlxOmQF2h4iwuLQuNMbXBmzywDm58pJBIRAty1vX+NghxGxZxNbkF3FkEQGNFOLJHZBX/SYVsLNk/auJ+Dq0G4q43FCIWeJtG35vKlEI4Ge6xBl1EB+YIdwXNwsCgCWZJU00K1MMC/C8RLbvfLa1yw+e6KEy1k7geqA7XXh0eN5bGPH1jHCsEMcBBR6tpmgr/A8vAmd0b7x5esHANB6rFnyCfqdRXBPpcAp6QYbe5cn7iWanelc+IT4yFg5OG/0LLg9hRAOlCDyBF+ZIV9fooaO6/uylndDGkA9aINk4Pg1fWNDoz/Cy2F0RdmZznXmRlSF7nwy2alxlNUltRxNOo18fDQG64/I+5YDdz2pLuQmDQoFv2Kih8dKu1kcEPxsmyXRcvEeBxq3PM0bqPA3bT/FZ/YnJcvZkkeSJJHGo1+XPJR7aS/+BOG/WkfEeyBrqEfuZ+bzAh0mKYKBJ2hWArlbvcVIFmaaS6+2Yz6MpBavpHE0njzYWuqZfm6SO7cNCZY0UTtjUA8bIFiRRNzrNYWfA63YHCIQzcuiw==|920 \ No newline at end of file +}//j5TU/cS2BuJLs0oc8fbVBIOVbbA6eb49p40JGcBRo5fZvIR2Rp+jZWx1RO0uUJ+4tQwMlJKOvMk9nbbftTHHooBFhNYAoCktg0ingw+YfA8hC2WzdHB94TSqXZ2B950O0qxfB0/4qSWjulG9nW8eCOdNkL42eg/m/p8eDneLYXcmNMigtVIaiFwdPvJZTMwcV0xGxUOSF8+lHrIE61axyE/+E5og/8bLLgfqMeRQh/aNc+oBQwvMZR7CzDcJDH9qjZM4q7WEADmfhNryj20NLPKVLWTTCHXCAANECaXHID9+5S/U8omkBYRtSODPuUwZ5/yRCKKqjVopoM9oKHdL4mYlEqIOa4LdT0CnUvKxxR1YV4TP2AhNR3vtUJgQeal/DbK8K8Om8RKpwGpEfjyy5d8u6drEHSeMOXkeXit+Qv5EZUTR/C6JP/sZEkGRMdDY5/heykf+/AykCg79/wyok4zzyeTzON9bda1okX4Ud6EefQQxzJubRU5cQx3AN5Z6lxgF3UCYFjzoH1CZuosTpzTrfa7ucfxx5ud3AfSCohMvtJ+duqLlnpbnuPErTR2DsvKuU3DuWpVJaqMO68w/OJBo3PdKUwUu9lKBFNLDf4Y1s+UI2MMUwsOqXjynYMK36meya0E7R23VQ59FEQoKTwtMAfIQkasOWn73qiq1DEO7zAKWvxkD6HNIOHiRZARIvVtvXco/9RPz+n7bOB55gHaBJe4mU9S/y8s4b7v9eJT8pV2lTWHHYEbZFkOT70Ep1bf0EqtRMsNS+Z1Yo8a9GQIT6UxL+rREsVqKhSkEC3uaq/VSuMI3jMxMTBO94a+7S9CFT7imXzIqBshhMp13c+SjCSMZ/Ee299vaxdOZj2rI0F2CpB9T/OSkJbuyGOqvpIMpGms/NfW24G0aRfjsXQ==|920 \ No newline at end of file diff --git a/Process/新增任务流程.bpmn b/Process/新增任务流程.bpmn index afe35c4c..e485d00f 100644 --- a/Process/新增任务流程.bpmn +++ b/Process/新增任务流程.bpmn @@ -4,7 +4,7 @@ - + @@ -14,14 +14,14 @@ - + _4f4ab1b2-ce52-46c6-bcc8-52c43b0c4a9f Flow_0otbu5x - + Flow_0otbu5x Flow_1bfvbmv diff --git a/Process/预算申请.bpmn b/Process/预算申请.bpmn index 4acd4d25..e3ab9668 100644 --- a/Process/预算申请.bpmn +++ b/Process/预算申请.bpmn @@ -4,7 +4,7 @@ - + diff --git a/ServerCommands/任务/任务发起流程前校验.json b/ServerCommands/任务/任务发起流程前校验.json index 10217ddd..7a785f99 100644 --- a/ServerCommands/任务/任务发起流程前校验.json +++ b/ServerCommands/任务/任务发起流程前校验.json @@ -275,7 +275,7 @@ "Message": "请等待父任务审批后方可发起！" } ], - "ID": "0be8de78-c7c0-414b-9ea8-21bf727c7826" + "ID": "c66244a0-0b2c-4d80-b302-9d8646e26876" } ] }, @@ -301,7 +301,7 @@ "Message": "当前项目未指定项目经理，请指定后再试" } ], - "ID": "fbf23b28-53c3-4c6e-b04d-8fd2a22e6ff8" + "ID": "bfa64f70-1f93-43cb-b795-c7d544722030" } ] }, @@ -327,7 +327,7 @@ "Message": "请指定任务负责人" } ], - "ID": "d0460f18-1d55-4c08-a921-b6e7b1a9fc0e" + "ID": "2f4170e1-257f-40c3-98a6-17323c4e8ea2" } ] }, @@ -353,33 +353,7 @@ "Message": "请指定任务类型" } ], - "ID": "3a2ec4ad-512f-4ee6-93fd-b25226907433" - } - ] - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.版本" - } - }, - "value": "%Null%" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "400", - "Message": "请为任务指定版本" - } - ], - "ID": "f50a279e-15ee-4d37-82b6-25f971f78c6f" + "ID": "5b83fd48-5d1e-4bdd-ac19-2b1dedb5776a" } ] }, @@ -425,7 +399,7 @@ "ID": "0d5ac7332bf942d1998fe6e03c20481e" } ], - "ID": "1510307d-3f0e-4506-a698-da76ba49d1a3" + "ID": "4661da29-6cba-4137-9ee1-3d33a08eadeb" }, { "CommandList": [ @@ -439,7 +413,7 @@ "ID": "b1aff090a96e4e618b49838429706ff5" } ], - "ID": "f620c048-3338-49db-99c9-19ab316aa4d1" + "ID": "88baa758-743d-49d3-9ee6-b0b22da513df" } ], "Comments": "严格模式下，根据是否有父任务来计算本次预算工时的上限" @@ -473,12 +447,12 @@ } } ], - "ID": "8bd11489-d35c-4d5c-bd1f-dc8767600961" + "ID": "0a4e2697-1831-44b7-bfc4-f7a5439e046e" } ] } ], - "ID": "743e50f1-e5d4-4c01-9c28-f609accef155" + "ID": "7ae391ca-88f5-424d-8756-636d8cd84c69" } ], "Comments": "校验工时情况是否通过" diff --git a/ServerCommands/任务/修改任务预算工时.json b/ServerCommands/任务/修改任务预算工时.json index 3dfc5755..d4eb3134 100644 --- a/ServerCommands/任务/修改任务预算工时.json +++ b/ServerCommands/任务/修改任务预算工时.json @@ -45,7 +45,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "63b4e781-32d6-4f9d-b558-8da92670cbdb", + "GUID": "b41170ef-8882-411d-bf6c-3590f4ec537b", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -54,7 +54,7 @@ "ColumnName": "项目ID" }, { - "GUID": "f88b0aae-fe38-4484-821c-a8bb82bf1bd0", + "GUID": "abc4fdee-b86b-4311-9850-1e04eefce172", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -68,7 +68,7 @@ "ColumnName": "严格模式" }, { - "GUID": "08bfd598-0427-4fbc-9861-ab54645ae3fb", + "GUID": "8be7c72a-0bbe-4013-9fa2-793cdab46361", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -82,7 +82,7 @@ "ColumnName": "项目预算工时" }, { - "GUID": "ab0089b9-365f-429f-8afc-b4cbe79f6daf", + "GUID": "31914297-58ea-48e9-bde6-f442ea43940b", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -96,7 +96,21 @@ "ColumnName": "项目总分配工时" }, { - "GUID": "fd0ab476-0a14-44a5-9be5-189b79249777", + "GUID": "1ccf9321-bb0f-4b36-b882-91fddac00857", + "BindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "项目ID", + "GUID": "196e858f-ae77-4c8b-b383-8990780d75b3", + "RelationBinding": { + "RelatedTable": "项目平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "工时分配方式" + } + }, + "ColumnName": "工时分配方式" + }, + { + "GUID": "e92d4545-3b50-4c38-b871-f02a7403c6d2", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务名称", @@ -105,7 +119,7 @@ "ColumnName": "任务名称" }, { - "GUID": "83d79cc9-f5f2-4913-a854-f060e8001686", + "GUID": "83c3fc51-0e13-4e4f-bb13-e87cee55450c", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "总分配工时", @@ -114,7 +128,7 @@ "ColumnName": "总分配工时" }, { - "GUID": "5ea965f0-5ff0-4b4d-b95c-add43366edfa", + "GUID": "866e108f-0e48-41a8-8d08-ccbbccb87ced", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "已分配工时", @@ -123,7 +137,7 @@ "ColumnName": "已分配工时" }, { - "GUID": "819304f3-ad63-4855-af23-d171ed5cba94", + "GUID": "cef7b6e7-62ce-4273-b3c9-27cc7eccc50e", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "父任务ID", @@ -132,7 +146,7 @@ "ColumnName": "父任务ID" }, { - "GUID": "a20185ef-1a3a-4617-bcbc-fa569b9612a1", + "GUID": "44fce238-52b6-4279-8349-67ead4cdde00", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "父任务ID", @@ -146,7 +160,7 @@ "ColumnName": "父任务可分配工时" }, { - "GUID": "aa6ed496-b14c-45ba-8c49-e05ef55583c1", + "GUID": "54aac56a-a596-4bd4-972d-51b7ac2cba6a", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "本任务已分配工时", @@ -169,16 +183,7 @@ }, "TopCount": "1" }, - "ID": "6b6b64f68f064deaa1cd5773df8e8c9a" - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "项目可分配工时", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务表.项目预算工时-任务表.项目总分配工时" - }, - "ID": "23a8904191ab4dc486ac16c1ba70cd5b" + "ID": "a451c4f01e354cd397cdcdd6487450e8" }, { "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", @@ -194,12 +199,22 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务表.严格模式" + "SerializeProperty": "=任务表.工时分配方式" } }, - "value": "1" + "value": "4", + "compareType": 1 }, "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "项目可分配工时", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务表.项目预算工时-任务表.项目总分配工时" + }, + "ID": "2b08b895ad5b4f2697d6045bcb03f0c1" + }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -209,225 +224,265 @@ "param": { "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务表.严格模式" + } + }, + "value": "1" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新预算工时" + } + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务表.本任务已分配工时" + }, + "compareType": 4 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"任务已被分配消耗\"&任务表.本任务已分配工时&\"小时，修改后工时，不可低于此值。\"" + }, + "CustomReturns": [ + { + "ReturnPropertyName": "新工时", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务表.总分配工时" + } + } + ] + } + ], + "ID": "6b0aa3aa-56a9-4239-9cf8-a7cbd1c4bb6c" + } + ] + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务表.父任务ID" + } + }, + "value": "%Null%" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "上级剩余工时", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目可分配工时" + }, + "ID": "31c222793f824eb3a84d00f1e0e3811f", + "Comments": "如果没有父任务，则将项目可分配工时+任务当前的总分配工时 （相当于这个任务没有分）" + } + ], + "ID": "6e74a7be-eb9a-4408-b67b-ca21492fd483" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "上级剩余工时", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务表.父任务可分配工时" + }, + "ID": "56a7d8ee803449268e0e8eccd66dc689", + "Comments": "如果没有父任务，则将项目可分配工时+任务当前的总分配工时 （相当于这个任务没有分）" + } + ], + "ID": "c4efc85f-e4f2-44b5-b1e6-fbce69f5de0e" + } + ], + "Comments": "严格模式下，根据是否有父任务来计算本次预算工时的上限" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "预算工时上限", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=上级剩余工时+任务表.总分配工时" + }, + "ID": "bf6bea055267461f804613fa476f0ea0", + "Comments": "上级任务剩余可用的工时+当前任务的总工时，相当于没有分给它" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=预算工时上限" + } + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新预算工时" + }, + "compareType": 4 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"任务工时超标，无法修改，当前任务最大上线为：\"&预算工时上限&\"小时\"" + }, + "CustomReturns": [ + { + "ReturnPropertyName": "新工时" + } + ] + } + ], + "ID": "759b97cb-3f2d-4ea1-9ebd-d16964c057bb" + } + ] + } + ], + "ID": "8465578f-e102-4c1d-91d3-7b1323ae3650" + } + ] + }, + { + "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "36cde956-3506-4020-942d-ca6bb7016a8e" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } + }, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务预算工时", + "GUID": "87d0d5c7-6093-4548-8f03-96d4714af78b" + }, + "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=新预算工时" } - }, - "value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务表.本任务已分配工时" - }, - "compareType": 4 - }, - "CommandList": [ - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "400", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"任务已被分配消耗\"&任务表.本任务已分配工时&\"小时，修改后工时，不可低于此值。\"" - }, - "CustomReturns": [ - { - "ReturnPropertyName": "新工时", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务表.总分配工时" - } - } - ] } ], - "ID": "92793fbb-474c-4651-bf6c-219ee0a2c38d" - } - ] - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务表.父任务ID" - } - }, - "value": "%Null%" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "上级剩余工时", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目可分配工时" - }, - "ID": "0ef5c7f20704410eabf21c4b868fe64b", - "Comments": "如果没有父任务，则将项目可分配工时+任务当前的总分配工时 （相当于这个任务没有分）" - } - ], - "ID": "a49e5ab0-3ddc-459a-9d75-8fb66f87f532" + "ParamNameToSaveNewRowValue": "新任务" }, { - "CommandList": [ + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目动态", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "上级剩余工时", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务表.父任务可分配工时" + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目ID", + "GUID": "0714186a-58f5-45a1-938f-d2d93c1cc690" }, - "ID": "37e3b8c29aa54194a07548cd3ba217ce", - "Comments": "如果没有父任务，则将项目可分配工时+任务当前的总分配工时 （相当于这个任务没有分）" - } - ], - "ID": "3678e11f-48e1-4074-a7fa-fe41f8906a69" - } - ], - "Comments": "严格模式下，根据是否有父任务来计算本次预算工时的上限" - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "预算工时上限", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=上级剩余工时+任务表.总分配工时" - }, - "ID": "fc23623d44294e18935812304bbb80ee", - "Comments": "上级任务剩余可用的工时+当前任务的总工时，相当于没有分给它" - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { + "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=预算工时上限" + "SerializeProperty": "=任务表.项目ID" } }, - "value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新预算工时" - }, - "compareType": 4 - }, - "CommandList": [ { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "400", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"任务工时超标，无法修改，当前任务最大上线为：\"&预算工时上限&\"小时\"" + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目动态", + "GUID": "a2cbc92d-02bb-40e4-81ce-2f9d87c7139a" }, - "CustomReturns": [ - { - "ReturnPropertyName": "新工时" - } - ] + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"调整了任务[\"&任务表.任务名称&\"]的预算工时，\"&任务表.项目预算工时&\"=>\"&新预算工时" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "执行人", + "GUID": "616a4c98-401a-4cc1-bdcf-5f70ba8a4cc5" + }, + "Value": "%CurrentUser%" } - ], - "ID": "b3096e68-d3ff-4a72-b3fb-7a6a3551140c" + ] + } + ] + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "新增成功", + "CustomReturns": [ + { + "ReturnPropertyName": "新工时", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新预算工时" + } } ] } ], - "ID": "10e6dd03-d092-4259-b5ba-1f34b8add596" - } - ] - }, - { - "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "任务表", - "ShowConfirm": false, - "RowsToUpdate": 1, - "RowsToUpdateCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务表", - "ColumnName": "ID", - "GUID": "36cde956-3506-4020-942d-ca6bb7016a8e" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务ID" - } - }, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务预算工时", - "GUID": "fec39811-ef5c-459b-9a2a-cf3de8e3f5dd" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新预算工时" - } - } - ], - "ParamNameToSaveNewRowValue": "新任务" + "ID": "7bbbfcd6-8aa3-4496-8b2d-e803f0ec9fd1" }, { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "项目动态", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ + "CommandList": [ { - "BindingInfo": { - "TableName": "项目动态", - "ColumnName": "项目ID", - "GUID": "7859703a-b22f-4b2f-a468-853085bb1e2a" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务表.项目ID" - } - }, - { - "BindingInfo": { - "TableName": "项目动态", - "ColumnName": "项目动态", - "GUID": "3dcc1d83-66d3-4331-99fa-b37735c410ac" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"调整了任务[\"&任务表.任务名称&\"]的预算工时，\"&任务表.项目预算工时&\"=>\"&新预算工时" - } - }, - { - "BindingInfo": { - "TableName": "项目动态", - "ColumnName": "执行人", - "GUID": "7e31e6a5-cf58-4e66-9b51-bc7eeda5ba54" - }, - "Value": "%CurrentUser%" + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "项目已设置为“不分配”工时模式，无法修改！", + "CustomReturns": [ + { + "ReturnPropertyName": "新工时", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务表.总分配工时" + } + } + ] } - ] - } - ] - }, - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "0", - "Message": "新增成功", - "CustomReturns": [ - { - "ReturnPropertyName": "新工时", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新预算工时" - } + ], + "ID": "1a41098e-e66a-4c90-8be9-02aa7e59efa8" } ] } @@ -456,66 +511,6 @@ ] } ] - }, - "FinallyCommandPart": { - "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "项目统计", - "TableValue": { - "TableName": "View_项目统计信息", - "TableValueType": 1, - "BindingInfos": [ - { - "GUID": "e712cac8-db4c-4e49-bbf4-22db3754f7be", - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "项目ID", - "GUID": "e2c10b48-d276-43ff-92d3-6982554995d3", - "RelationBinding": { - "RelatedTable": "项目表", - "RelatedColumn": "ID", - "DisplayColumn": "严格模式" - } - }, - "ColumnName": "严格模式" - }, - { - "GUID": "0f378adc-4c2f-4583-9380-29ab9162a247", - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "项目预算工时", - "GUID": "df4b665e-bf05-415f-b1d6-44ef6268356f" - }, - "ColumnName": "项目预算工时" - }, - { - "GUID": "365bbef0-0c71-4147-8ca1-6fae9781df36", - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "已分配任务工时", - "GUID": "e0b92957-2058-4acf-8f85-c8cb21e7751c" - }, - "ColumnName": "已分配任务工时" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "项目ID", - "GUID": "a21318d5-5050-4baa-a025-483041bba932" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务表.项目ID" - } - }, - "TopCount": "1" - }, - "ID": "62875afcfcce4e3995ac1f427b544e8c" - } - ] } } ], diff --git a/ServerCommands/任务/变更任务状态.json b/ServerCommands/任务/变更任务状态.json index 9aac8c69..9f9a5424 100644 --- a/ServerCommands/任务/变更任务状态.json +++ b/ServerCommands/任务/变更任务状态.json @@ -50,7 +50,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "56bf3a1a-b506-4531-9d01-f209f6e2f7b3", + "GUID": "040b7e18-4298-4ef0-b6cc-1b7bb2aec85f", "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", @@ -59,7 +59,7 @@ "ColumnName": "项目ID" }, { - "GUID": "a2c50e9a-2c0f-4d7e-b43e-19456cb3c5ef", + "GUID": "97c09999-a93d-42a9-a5d1-fb5f4ee489a7", "BindingInfo": { "TableName": "任务表", "ColumnName": "任务名称", @@ -68,7 +68,7 @@ "ColumnName": "任务名称" }, { - "GUID": "c5ee4845-58d1-4e51-95c0-aef99ba9da4c", + "GUID": "85821668-8b53-4bc5-8864-e3e6a3093c6b", "BindingInfo": { "TableName": "任务表", "ColumnName": "任务状态", @@ -77,7 +77,7 @@ "ColumnName": "任务状态" }, { - "GUID": "f0106ccd-42db-42c2-862f-a612166fa173", + "GUID": "f8c364be-a0ef-4103-a63b-5548e9b392c2", "BindingInfo": { "TableName": "任务表", "ColumnName": "任务状态", @@ -91,7 +91,7 @@ "ColumnName": "任务状态文本" }, { - "GUID": "63a4f69f-e22f-4f00-a188-6ffbb5607a6a", + "GUID": "0fbac508-af88-4952-9d91-0ef3c4fa97a4", "BindingInfo": { "TableName": "任务表", "ColumnName": "任务负责人", @@ -100,7 +100,7 @@ "ColumnName": "任务负责人" }, { - "GUID": "e6246a80-54cc-403c-9f9b-566de00dc7b1", + "GUID": "744ba217-aca5-4267-a69e-9fdc4fa8bc8e", "BindingInfo": { "TableName": "任务表", "ColumnName": "开始时间", @@ -109,7 +109,7 @@ "ColumnName": "开始时间" }, { - "GUID": "5ffd390a-0c35-4cca-a52b-af7231ea8381", + "GUID": "2bd5f4e1-452a-4198-a1fd-c27007ee513a", "BindingInfo": { "TableName": "任务表", "ColumnName": "结束时间", @@ -118,7 +118,7 @@ "ColumnName": "结束时间" }, { - "GUID": "3206d98b-fd30-41e5-8041-bfd090722e03", + "GUID": "920c5f86-f188-48fe-8663-c7fae7dd80b0", "BindingInfo": { "TableName": "任务表", "ColumnName": "任务类型", @@ -142,7 +142,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "3573b52ffc3742a7bab1dc862b262276" + "ID": "0626fb25bcc8447fbc4d740f1354d568" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -183,18 +183,17 @@ "CommandList": [ { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "新任务状态", + "ParameterName": "状态表", "TableValue": { "TableName": "任务状态", - "OnlyGetValue": true, - "TableValueType": 0, + "TableValueType": 1, "BindingInfos": [ { - "GUID": "b31ec5c9-8a86-4148-8e7c-232ccc011d6a", + "GUID": "7f8cbdd1-5ad5-45a7-bd6c-7838abcb23d5", "BindingInfo": { "TableName": "任务状态", "ColumnName": "任务状态", - "GUID": "263a2a05-e711-4f5c-90ac-5114c2367ddc" + "GUID": "035b217c-625c-4d7e-8c3a-b43419938da6" }, "ColumnName": "任务状态" } @@ -210,9 +209,11 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=状态码" } - } + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" }, - "ID": "d13f627dec7147d68c48a6324b2316ff" + "ID": "95159dc8a1b14128ace3e2acc322a54f" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -224,234 +225,244 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=状态码" + "SerializeProperty": "=状态表" } }, - "value": "0" + "value": "%Null%", + "compareType": 1 }, "CommandList": [ { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "任务工时", - "TableValue": { - "TableName": "任务工时表", - "TableValueType": 3, - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "任务ID", - "GUID": "aeafd224-f511-481e-8355-8d0f79ac733a" + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=状态码" + } + }, + "value": "0" }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务ID" - } + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "任务工时", + "TableValue": { + "TableName": "任务工时表", + "TableValueType": 3, + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "任务ID", + "GUID": "aeafd224-f511-481e-8355-8d0f79ac733a" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } + }, + "NullFormulaValueQueryPolicy": 0 + }, + "ID": "d27269e4264d4915b390ea9460421bf0" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务工时" + } + }, + "value": "0", + "compareType": 2 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"该任务已报工，无法切换至\"&状态表.任务状态&\"状态\"" + } + } + ], + "ID": "0fd97c73-cc15-469c-8021-0370a82e6d86" + } + ] + } + ], + "ID": "dfb51789-4950-486f-92f0-f2cac27b52b4" }, - "NullFormulaValueQueryPolicy": 0 - }, - "ID": "ff207234ca244312adfeb7866e96d51c" - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ { "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务工时" + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=状态码" + } + }, + "value": "1" + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=状态码" + } + }, + "value": "2" } - }, - "value": "0", - "compareType": 2 + ], + "RelationType": 1 }, "CommandList": [ { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "400", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"该任务已报工，无法切换至\"&任务信息.任务状态文本&\"状态\"" - } + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.任务负责人" + } + }, + "value": "%Null%" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"任务执行者为空，不能切换至\"&状态表.任务状态&\"状态！\"" + } + } + ], + "ID": "675ce254-2eb8-4007-aa6f-3dd54ee620d6" + } + ] } ], - "ID": "7307f9cb-0a43-4b3d-9335-72465015f8e2" + "ID": "d72e4cd3-1522-4523-a27e-77a412366329" } ] + }, + { + "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "8cd30f24-ad8d-43c1-9342-2c7f001d137f" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } + }, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务状态", + "GUID": "3dd1ced8-9f74-49ce-9345-d7f35bc09d32" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=状态码" + } + } + ] + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目动态", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目ID", + "GUID": "0c5bb9ea-ed45-4f61-b076-62ad86c4c9d1" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.项目ID" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目动态", + "GUID": "a20272a7-3c69-4969-afda-37ada037c74b" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"任务[\"&任务信息.任务名称&\"]从\"&任务信息.任务状态文本&\"状态变更为\"&状态表.任务状态" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "执行人", + "GUID": "4d346a81-83f3-45bc-ab72-50b1f39025f5" + }, + "Value": "%CurrentUser%" + } + ] + } + ] + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "操作成功" } ], - "ID": "6833cd39-b4c3-44f1-ac37-e7fc1e7556dd" + "ID": "dbe03881-92a1-425a-9146-bdda6b88f817" }, { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=状态码" - } - }, - "value": "1" - }, "CommandList": [ { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.任务负责人" - } - }, - "value": "%Null%" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "400", - "Message": "任务执行者不能为空" - } - ], - "ID": "9f576937-8c65-4748-a948-5cc1b9aa9da2" - } - ] + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": "状态码无效" } ], - "ID": "483b270e-e6e6-4280-990e-9140fafef969" - }, - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=状态码" - } - }, - "value": "2" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.任务负责人" - } - }, - "value": "%Null%" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "400", - "Message": "任务执行者不能为空" - } - ], - "ID": "b1922fb3-0f59-462d-ac9c-b9dadab1b4c6" - } - ] - } - ], - "ID": "c6047401-1633-4822-9376-4de5021f3017" + "ID": "f0a89697-4026-47d5-9c10-83aa20ad2b7d" } ] - }, - { - "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "任务表", - "ShowConfirm": false, - "RowsToUpdate": 1, - "RowsToUpdateCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务表", - "ColumnName": "ID", - "GUID": "8cd30f24-ad8d-43c1-9342-2c7f001d137f" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务ID" - } - }, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务状态", - "GUID": "6edbee6e-922a-4904-b1f8-0bc7b5a7eccd" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=状态码" - } - } - ] - }, - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "项目动态", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "项目动态", - "ColumnName": "项目ID", - "GUID": "47dbb777-470d-4222-b8ce-3290bf908349" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.项目ID" - } - }, - { - "BindingInfo": { - "TableName": "项目动态", - "ColumnName": "项目动态", - "GUID": "46dff42e-9185-48a4-a09c-b1b42df875bb" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"任务[\"&任务信息.任务名称&\"]从\"&任务信息.任务状态文本&\"状态变更为\"&新任务状态" - } - }, - { - "BindingInfo": { - "TableName": "项目动态", - "ColumnName": "执行人", - "GUID": "70d9cdae-463b-44d4-97ef-dedf26616565" - }, - "Value": "%CurrentUser%" - } - ] - } - ] - }, - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "0", - "Message": "操作成功" } ], - "ID": "94ecbaa9-2b7f-4aff-9c77-305d5e58a983" + "ID": "fe5f233f-f003-47e8-b70e-d0b4b3cfe059" }, { "CommandList": [ @@ -461,12 +472,12 @@ "Message": "操作成功" } ], - "ID": "e9a1e04e-c47f-4eca-aabd-b60cbe20bcde" + "ID": "75750cc3-5c89-4526-8a9d-83ac590fa4b0" } ] } ], - "ID": "fd32ee3d-f7dd-4030-a4f0-3fce9ced5372" + "ID": "9db3cb38-b9d2-4516-a253-4a6af21b1143" }, { "CommandList": [ @@ -479,7 +490,7 @@ } } ], - "ID": "7f6ab919-fd03-43b0-a234-c9bd5299c7c9" + "ID": "461064bf-a991-48ef-a6ad-64f3770ec773" } ] } diff --git a/ServerCommands/工时/计算报工数据.json b/ServerCommands/工时/计算报工数据.json index a06ef7ff..278a8cad 100644 --- a/ServerCommands/工时/计算报工数据.json +++ b/ServerCommands/工时/计算报工数据.json @@ -413,7 +413,7 @@ } ], "Comments": "项目成员设置的时薪", - "ID": "84eb4913-28ae-4ea8-b302-f9452ecf8e8d" + "ID": "1622d6da-4a84-4d29-8c40-4e7f5c1413e9" }, { "Condition": { @@ -446,7 +446,7 @@ } ], "Comments": "项目岗位设置的时薪", - "ID": "468771ce-d2a8-4b33-8555-559a881eb843" + "ID": "ade0e4db-b029-4d18-b33b-d6a7a6312db1" }, { "Condition": { @@ -479,7 +479,7 @@ } ], "Comments": "成员用户的默认时薪", - "ID": "96658d89-b617-4dc5-a5a7-33bd6553b420" + "ID": "6f9d7a37-7338-473b-860c-11c8cfeab7fc" }, { "CommandList": [ @@ -496,13 +496,13 @@ "ID": "1034a8bcf12a49328a31314e519829f0" } ], - "ID": "3571b336-7011-433f-a851-ac9f09aeaae4" + "ID": "e9d9c695-f0f1-437b-a4ec-4a68e9fc9585" } ] } ], "Comments": "优先使用手动指定的提成金额", - "ID": "418a0bd3-4fc0-445a-9c0b-5d2fc5e45f93" + "ID": "8157b13f-b540-4c4c-bfdd-60ab5f41d4d7" }, { "CommandList": [ @@ -522,7 +522,7 @@ "ID": "c9b6eb8cb30e4eaa839a7e1e28ee50a1" } ], - "ID": "77da7dca-237a-4d22-a5b1-0d2bb6ca5f55" + "ID": "b514935e-9661-48ee-812d-70e334d4f4f8" } ], "Comments": "计算成员的时薪" @@ -681,13 +681,13 @@ } ], "Comments": "先检查个人工时余额够不够，如果不够，直接提成为0", - "ID": "54dd6f5e-3b7e-4ba1-83da-93e90f04e981" + "ID": "c24b9026-c18c-4950-a1a5-91980ebf5404" } ] } ], "Comments": "如果分配到人头，则判断该人总计划工时还够不够", - "ID": "7d11cf3f-fb7c-4336-b12d-76a718cdb842" + "ID": "4e551833-82e6-4e4a-9b80-ed39ef6d1f30" }, { "Condition": { @@ -739,13 +739,13 @@ } ], "Comments": "先检查个人工时余额够不够，如果不够，直接提成为0", - "ID": "2609606a-f5a9-4617-b822-1f559a93e78b" + "ID": "d4d24aea-150a-4797-b410-8ff6601c6f90" } ] } ], "Comments": "如果是共用任务工时，则查看任务计划工时够不够", - "ID": "5cd15c42-d06a-420a-b13a-6263fbb67379" + "ID": "05ecd057-a8c6-4c11-8edf-67424ccb7c22" } ] }, @@ -878,7 +878,7 @@ ] } ], - "ID": "86f0c8b9-8ac6-419e-8290-067631c63fe7" + "ID": "97cafc32-6501-4fc7-92fb-fd54ecee0fba" }, { "CommandList": [ @@ -939,12 +939,12 @@ ] } ], - "ID": "0a01bf3e-0108-445b-892b-822c27abc942" + "ID": "dbdf8595-2183-4cda-9929-be8921639ea9" } ] } ], - "ID": "6564b59c-450a-4099-9836-d28c9981849d" + "ID": "2f33833d-21ea-4509-ae48-11dff2c6b452" }, { "CommandList": [ @@ -977,13 +977,13 @@ ] } ], - "ID": "2c171798-c5d7-4f6e-a2cd-199c6771c1a2" + "ID": "94d11f39-180c-433a-a040-c76bb1aaf58d" } ] } ], "Comments": "如果提交的工时类型等于项目工时的核定方式且开启严格模式就校验本次有没有超标", - "ID": "1ffdcfc2-b9c3-4de8-bbad-b53366ae2a55" + "ID": "e4cae573-9b03-45a7-af22-228accb1c09a" }, { "CommandList": [ @@ -1040,12 +1040,12 @@ ] } ], - "ID": "f9c323aa-aa6a-445f-bb0e-b67eb59ac59b" + "ID": "7cd4db74-9852-4309-941d-f72e46074ed0" } ] } ], - "ID": "30d58d38-eb4a-49fb-b9e8-371934cd5d37" + "ID": "e4a9468a-adaf-4be2-ae35-9cc94cfa2c5c" }, { "CommandList": [ @@ -1078,7 +1078,7 @@ ] } ], - "ID": "50115f34-3cd6-48f3-b4ad-6b579236578f" + "ID": "66c86e72-c97f-4be8-b9a3-dbf0033d2638" } ] } diff --git a/ServerCommands/项目/批准项目预算申请.json b/ServerCommands/项目/批准项目预算申请.json index aa8b594e..2439bc17 100644 --- a/ServerCommands/项目/批准项目预算申请.json +++ b/ServerCommands/项目/批准项目预算申请.json @@ -416,7 +416,7 @@ ] } ], - "ID": "e207fec9-b98b-496f-bdd8-d11434b78590" + "ID": "7c748272-2a89-4188-8196-3aab84cbf81d" }, { "CommandList": [ @@ -462,7 +462,7 @@ ] } ], - "ID": "96fd42ed-1e5d-41ec-816d-af2ca08bbba6" + "ID": "dd6eac18-587c-430d-8d91-30338f4607a5" } ] } @@ -474,7 +474,7 @@ "Message": "应用成功" } ], - "ID": "038546ca-0ed8-4276-9392-6bd6d7aafe95" + "ID": "f7b66a25-4021-42c8-9d23-1efc2628cb31" }, { "CommandList": [ @@ -484,7 +484,7 @@ "Message": "找不到该申请记录" } ], - "ID": "87b083cf-1bde-42df-9b48-cab552e51e30" + "ID": "ab0b6fdd-c451-411f-8b75-e311e004b538" } ] } diff --git a/ServerCommands/项目/新增或修改项目.json b/ServerCommands/项目/新增或修改项目.json index 45aff325..5f8460fe 100644 --- a/ServerCommands/项目/新增或修改项目.json +++ b/ServerCommands/项目/新增或修改项目.json @@ -125,7 +125,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "9dec62d0-d26b-4ddd-a56a-d9c3da5811af", + "GUID": "a96a1a27-41ca-4fe0-9359-4bcb525d7176", "BindingInfo": { "TableName": "项目表", "ColumnName": "严格模式", @@ -134,7 +134,7 @@ "ColumnName": "严格模式" }, { - "GUID": "5ff8a8f1-9153-465f-867c-30e3f8144ddf", + "GUID": "b5b6bed0-a125-481e-a258-0f0edd8fbe94", "BindingInfo": { "TableName": "项目表", "ColumnName": "项目经理", @@ -158,7 +158,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "0cb16c10e8b545d3bbf6ab166d5024f9" + "ID": "4c7b4834021b431183f23672f24716e0" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -184,7 +184,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "a9663649-7844-4b42-b900-4a4329814754", + "GUID": "66853927-3ca9-4e53-aa1e-6db438d697dd", "BindingInfo": { "TableName": "View_项目统计信息", "ColumnName": "项目预算工时", @@ -193,16 +193,16 @@ "ColumnName": "项目预算工时" }, { - "GUID": "bf4d1923-97b1-4d84-b35f-07e2b188d5b3", + "GUID": "8a0247fc-a0b1-4422-9a50-f35a6b3a8594", "BindingInfo": { "TableName": "View_项目统计信息", - "ColumnName": "总实际工时", - "GUID": "5a3c8588-de2e-4e88-8116-09021dc36bd8" + "ColumnName": "总核定工时", + "GUID": "152697ce-8438-42b5-8e47-92f899bbbfcf" }, - "ColumnName": "总实际工时" + "ColumnName": "总核定工时" }, { - "GUID": "59b81edc-7159-49ab-baf0-ad68eb7cf4cd", + "GUID": "7937310f-a08c-4ef1-9d44-effa6068f237", "BindingInfo": { "TableName": "View_项目统计信息", "ColumnName": "项目预算费用", @@ -211,7 +211,7 @@ "ColumnName": "项目预算费用" }, { - "GUID": "17d281db-75b4-4d67-a2cf-90fed5d36f1c", + "GUID": "e471e91a-4313-4550-80e4-c1554be3c455", "BindingInfo": { "TableName": "View_项目统计信息", "ColumnName": "总成本", @@ -234,7 +234,7 @@ }, "TopCount": "1" }, - "ID": "9a0d206ca31946abb32fc405009a367a" + "ID": "ad29d68902fd4f8c9adedd07c1339b41" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -246,7 +246,7 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目统计信息.总实际工时" + "SerializeProperty": "=项目统计信息.总核定工时" } }, "value": { @@ -261,11 +261,11 @@ "ErrorCode": "400", "Message": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"项目实际工时已超标，无法为您切换为严格模式！\"" + "SerializeProperty": "=\"项目总核定工时已超标，无法为您切换为严格模式！\"" } } ], - "ID": "e56ce1ee-3c4f-477f-bd59-71f22e926d85" + "ID": "2bfe9f9c-3d33-44a8-ae36-d9a913767457" }, { "Condition": { @@ -293,13 +293,13 @@ } } ], - "ID": "81d60b93-52d5-45a3-acc8-1a52d9537b88" + "ID": "c0006edb-4bea-4893-81a2-7fc390c96a75" } ] } ], "Comments": "如果是更新项目，且改变了严格模式，那么就要校验。超标就不允许切换", - "ID": "c40817c0-9e84-41b3-8e15-67e1393fb838" + "ID": "117ac471-e667-4550-99c4-40f829747f54" } ] }, @@ -325,7 +325,7 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "项目名称", - "GUID": "c98a0226-00eb-4ab4-8390-97ee923e5c29" + "GUID": "1d7359df-f80a-488e-b303-6fe4bc9540c7" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -336,7 +336,7 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "项目代号", - "GUID": "b3e08060-71e1-4450-b99e-a2fdabb1ae8e" + "GUID": "12e7894e-e818-42da-916e-6da239ac7b0d" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -347,7 +347,7 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "项目简介", - "GUID": "36d6a0fb-1012-41c4-b873-bf49b3ad518b" + "GUID": "ed4fedf0-97cf-4397-b0b7-0c747d30c449" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -358,7 +358,7 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "项目封面", - "GUID": "39d31d57-02a9-4d61-8169-105602a03c42" + "GUID": "02c361e1-40bb-4ebc-8a8d-7d3d258fda4f" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -369,7 +369,7 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "项目经理", - "GUID": "6435ad2c-7b52-43d9-8779-d980b297b148" + "GUID": "ca2bd577-a0f5-4ee2-9ffe-0988ff829ef3" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -380,7 +380,7 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "项目分组", - "GUID": "85789292-7b6f-43c4-959c-5ce07acbbdfd" + "GUID": "4ce9236a-7f32-47ea-8e70-89bfbabe063a" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -391,7 +391,7 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "所属客户", - "GUID": "dd1418ee-7dba-48c5-b00b-4705e031ad21" + "GUID": "1bfc41d8-714b-4996-a47c-e770aedc69eb" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -402,7 +402,7 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "所属客户部门", - "GUID": "eae8417b-5d85-464a-b473-d22862357628" + "GUID": "91c39c63-d4cb-438e-8694-3cdc77112140" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -413,7 +413,7 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "公开", - "GUID": "c1032e78-c942-4e4d-bda5-bc05676cd905" + "GUID": "2ed99546-b4fb-46b9-83e1-280a670ded81" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -424,7 +424,7 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "严格模式", - "GUID": "dddd0103-b52f-4198-b4c1-7b12e734a891" + "GUID": "2de689f4-3eb2-406b-a45e-a02458e0fcc7" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -435,7 +435,7 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "计划开始日期", - "GUID": "394fd86a-c79f-4a59-b6c9-3d2d6961fbd9" + "GUID": "197303b1-7b6a-4ba4-b284-84dffb188b88" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -446,7 +446,7 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "计划完成日期", - "GUID": "fdc25fd4-3082-4b58-947f-fe3ed9e112ad" + "GUID": "00f6346d-3328-43c1-8ec8-6319b86b09d5" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -457,7 +457,7 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "项目方案", - "GUID": "919fcde7-c5d4-41fc-964b-0f56d0706949" + "GUID": "76152f46-0000-4f73-be9d-4c8ae754f3d2" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -468,7 +468,7 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "预算方案", - "GUID": "c8cd7641-43bd-4e30-bdf5-cd452e2046ac" + "GUID": "54ddeb64-0d33-4c21-aef1-08425106954a" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -479,7 +479,7 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "网络资源", - "GUID": "a6c22966-f8d7-4cfc-b4ac-f5fd2c484ea8" + "GUID": "f82ccea4-28b4-4e67-8760-ca4c5a6ea439" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -490,7 +490,7 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "开启反馈收集", - "GUID": "b02c470f-2386-4d53-b21f-65641e6c5740" + "GUID": "95d2286b-588a-4233-9470-f31e07142d7a" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", diff --git a/ShareCommandContainers/发起预算申请.json b/ShareCommandContainers/发起预算申请.json index e07ee373..9dbdcd18 100644 --- a/ShareCommandContainers/发起预算申请.json +++ b/ShareCommandContainers/发起预算申请.json @@ -134,101 +134,68 @@ "ReturnResultName": "发起流程结果" }, { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=临时流程ID" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=发起流程结果.ID" - } - } - ] - }, - { - "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", - "FunctionName": "remove", - "Title": "加载中" - }, - { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "ClosePopupCallbackCommand": { - "Commands": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "搜索", - "TableValue": { - "TableName": "项目预算变动表", - "TableValueType": 3, - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目预算变动表", - "ColumnName": "流程实例ID", - "GUID": "a468a593-0cf8-4be3-ac32-7a2de8ba2421" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=临时流程ID" + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=发起流程结果.ID" } - }, - "NullFormulaValueQueryPolicy": 0 + ] }, - "ID": "094f63c6c39f4991b0699b47afb2e631" + "value": "%Null%", + "compareType": 1 }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=搜索" - } - ] + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=临时流程ID" }, - "value": "0" - }, - "CommandList": [ + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=发起流程结果.ID" + } + } + ] + }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "ClosePopupCallbackCommand": { + "Commands": [ { - "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "删除指定流程", - "Parameters": [ - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "流程实例ID", + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "搜索", + "TableValue": { + "TableName": "项目预算变动表", + "TableValueType": 3, + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目预算变动表", + "ColumnName": "流程实例ID", + "GUID": "a468a593-0cf8-4be3-ac32-7a2de8ba2421" + }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=临时流程ID" } - } - ], - "ResultErrorCodeTo": { - "SerializeProperty": "code" + }, + "NullFormulaValueQueryPolicy": 0 }, - "ResultMessageTo": { - "SerializeProperty": "msg" - }, - "RefreshAfterFinish": true, - "CheckDataValidation": true - }, - { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=临时流程ID" - }, - "Value": "%Null%" - } - ] + "ID": "094f63c6c39f4991b0699b47afb2e631" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -240,7 +207,7 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "=code" + "SerializeProperty": "=搜索" } ] }, @@ -248,52 +215,128 @@ }, "CommandList": [ { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "Message": "已为您自动删除流程" - } - ], - "ID": "3c635ba2-8948-41aa-853f-628bd58e99bd" - }, - { - "CommandList": [ + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "删除指定流程", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "流程实例ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=临时流程ID" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "FourStandardStyle": "warning", - "Message": "您取消了流程填写，如有需要请前往待办结束刚刚发起的流程" + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=临时流程ID" + }, + "Value": "%Null%" + } + ] + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=code" + } + ] + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": "已为您自动删除流程" + } + ], + "ID": "c6c6926a-eb02-499a-ac6d-3c38e010f507" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": "您取消了流程填写，如有需要请前往待办结束刚刚发起的流程" + } + ], + "ID": "e9ed71cf-2640-43f5-b102-200b6fdb3f68" + } + ] } ], - "ID": "089135c4-ebde-485d-b572-defb67b31911" + "ID": "c666610c-5876-4013-8d58-5d030771f9f3" } ] } ], - "ID": "8e65583a-c00e-4d47-8211-a46ac384b789" - } - ] - } - ], - "ParamProperties": { - "IsOK": "是否为确定" - } - }, - "ValueFormula": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=发起流程结果.Page" - }, - "PassValues": [ + "ParamProperties": { + "IsOK": "是否为确定" + } + }, + "ValueFormula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=发起流程结果.Page" + }, + "PassValues": [ + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + }, + "CellName": "项目ID" + } + ], + "DeleteCachedQuery": true, + "LoadBindingDataOption": 1 + } + ], + "ID": "90ad987f-37e9-4b86-b05e-47eb49b67fef" + }, { - "Source": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目ID" - }, - "CellName": "项目ID" + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + }, + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=发起流程结果.ErrorMessage" + }, + "BtnText": "知道了" + } + ], + "ID": "d2979ae8-8bd1-4b38-bfca-adc25c97754e" } - ], - "DeleteCachedQuery": true, - "LoadBindingDataOption": 1 + ] } ], - "ID": "99a30896-e184-4094-bf13-e667edb73cee" + "ID": "14dd3b6e-149c-463c-aa6c-192c6fa1e1ce" }, { "CommandList": [ @@ -310,12 +353,12 @@ "BtnText": "知道了" } ], - "ID": "6cea3a61-d7e6-4d6a-82ef-9986a65fe09e" + "ID": "36b5eafa-5340-4764-9223-ca12f1c289e7" } ] } ], - "ID": "d1b4c43b-e3aa-4589-ab88-f62b8e0bd186" + "ID": "f8592ec9-53f4-45ac-95e0-fff907959559" }, { "CommandList": [ @@ -332,7 +375,7 @@ "BtnText": "知道了" } ], - "ID": "66727619-d44a-41d6-83de-8783743ab978" + "ID": "63f59a16-71b3-47aa-8690-d6406f64e822" } ] } diff --git a/Tables/项目/View_项目统计信息.json b/Tables/项目/View_项目统计信息.json index c492040d..e8d964b2 100644 --- a/Tables/项目/View_项目统计信息.json +++ b/Tables/项目/View_项目统计信息.json @@ -66,7 +66,7 @@ "Required": true, "DatabaseColumnType": "float", "MaxLength": -1, - "Name": "总实际工时", + "Name": "总核定工时", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { @@ -77,13 +77,6 @@ "Name": "项目成员数", "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, - { - "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", - "DatabaseColumnType": "int", - "MaxLength": -1, - "Name": "总任务数量", - "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" - }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "int", @@ -107,67 +100,7 @@ }, { "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", - "Formula": "[已完成任务数]&\"/\"&[总任务数量]", - "Name": "任务完成情况", - "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" - }, - { - "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", - "Formula": "IF([总任务数量]=0,0,[已完成任务数]/[总任务数量])", - "Name": "任务完成进度", - "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" - }, - { - "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", - "Formula": "[总实际工时]&\"/\"&[总计划工时]", - "Name": "工时情况", - "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" - }, - { - "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", - "Formula": "[总成本]&\"/\"&[项目预算费用]", - "Name": "费用成本情况", - "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" - }, - { - "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", - "Formula": "[总实际工时]&\"/\"&[项目预算工时]", - "Name": "工时成本情况", - "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" - }, - { - "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", - "Formula": "IF([总任务数量]=0,0,INT([已完成任务数]/[总任务数量]*100))", - "Name": "任务完成比例", - "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" - }, - { - "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", - "Formula": "IF([项目预算工时]=0,0,INT([总实际工时]/[项目预算工时]*100))", - "Name": "工时消耗比例", - "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" - }, - { - "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", - "Formula": "IF([项目预算费用]=0,0,INT([总成本]/[项目预算费用]*100))", - "Name": "预算消耗比例", - "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" - }, - { - "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", - "Formula": "IF([总计划工时]=0,0,INT([总实际工时]/[总计划工时]*100))", - "Name": "计划工时使用比例", - "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" - }, - { - "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", - "Formula": "[已分配任务工时]&\"/\"&[项目预算工时]", - "Name": "工时分配情况", - "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" - }, - { - "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", - "Formula": "IF([总实际工时]=0,0,IF([总实际工时]=0,0,ROUND([总成本]/[总实际工时],0)))", + "Formula": "IF([总核定工时]=0,0,IF([总核定工时]=0,0,ROUND([总成本]/[总核定工时],0)))", "Name": "平均时薪", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" } @@ -178,7 +111,7 @@ "ConnectionId": "业务表", "SourceTableName": "View_项目统计信息", "SourceTableSchema": "dbo", - "CreateViewSql": "-- 预先处理子查询，建立临时表 \r\nWITH cy AS (\r\n SELECT\r\n [项目ID],\r\n COUNT(DISTINCT [项目成员]) AS [项目成员数]\r\n FROM\r\n [项目成员表]\r\n GROUP BY\r\n [项目ID]\r\n), c1 AS (\r\n SELECT\r\n p.[ID] AS [项目ID],\r\n p.[项目名称] AS [项目标题],\r\n p.[项目预算工时],\r\n p.[项目预算费用],\r\n p.[项目状态],\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(cy.[项目成员数], 0) AS [项目成员数],\r\n COUNT(t.ID) AS [总任务数量]\r\n FROM\r\n [dbo].[项目表] p\r\n LEFT JOIN [View_任务工时统计] t ON p.ID = t.[项目ID]\r\n LEFT JOIN cy ON p.ID = cy.[项目ID]\r\n GROUP BY\r\n p.[ID],\r\n p.[项目名称],\r\n p.[项目预算工时],\r\n p.[项目预算费用],\r\n p.[项目状态],\r\n cy.[项目成员数]\r\n)\r\n\r\nSELECT\r\n c1.[项目ID],\r\n c1.[项目标题],\r\n c1.[项目预算工时],\r\n c1.[项目预算费用],\r\n c1.[项目状态],\r\n c1.[总成本],\r\n c1.[总计划工时],\r\n c1.[总上报工时],\r\n c1.[总实际工时],\r\n c1.[项目成员数],\r\n c1.[总任务数量],\r\n SUM(\r\n CASE\r\n WHEN task.[任务状态] = 3 THEN 1\r\n ELSE 0\r\n END\r\n ) AS [已完成任务数],\r\n SUM(\r\n CASE\r\n WHEN ISNULL(task.[任务状态], 0) < 3 THEN 1\r\n ELSE 0\r\n END\r\n ) AS [未完成任务数],\r\n SUM(ISNULL(task.任务预算工时, 0)) AS [已分配任务工时]\r\nFROM c1\r\nLEFT JOIN [任务表] task ON c1.[项目ID] = task.[项目ID] AND task.[任务状态] > 1\r\nGROUP BY\r\n c1.[项目ID],\r\n c1.[项目标题],\r\n c1.[项目预算工时],\r\n c1.[项目预算费用],\r\n c1.[项目状态],\r\n c1.[总成本],\r\n c1.[总计划工时],\r\n c1.[总上报工时],\r\n c1.[总实际工时],\r\n c1.[项目成员数],\r\n c1.[总任务数量]", + "CreateViewSql": "WITH cy AS (\r\n SELECT\r\n [项目ID],\r\n COUNT(DISTINCT [项目成员]) AS [项目成员数]\r\n FROM\r\n [项目成员表]\r\n GROUP BY\r\n [项目ID]\r\n), c1 AS (\r\n SELECT\r\n p.[ID] AS [项目ID],\r\n p.[项目名称] AS [项目标题],\r\n p.[项目预算工时],\r\n p.[项目预算费用],\r\n p.[项目状态],\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(cy.[项目成员数], 0) AS [项目成员数]\r\n FROM\r\n [dbo].[项目表] p\r\n LEFT JOIN [View_任务工时统计] t ON p.ID = t.[项目ID]\r\n LEFT JOIN cy ON p.ID = cy.[项目ID]\r\n GROUP BY\r\n p.[ID],\r\n p.[项目名称],\r\n p.[项目预算工时],\r\n p.[项目预算费用],\r\n p.[项目状态],\r\n cy.[项目成员数]\r\n)\r\n\r\nSELECT\r\n c1.[项目ID],\r\n c1.[项目标题],\r\n c1.[项目预算工时],\r\n c1.[项目预算费用],\r\n c1.[项目状态],\r\n c1.[总成本],\r\n c1.[总计划工时],\r\n c1.[总上报工时],\r\n c1.[总核定工时],\r\n c1.[项目成员数],\r\n SUM(\r\n CASE\r\n WHEN task.[任务状态] = 3 THEN 1\r\n ELSE 0\r\n END\r\n ) AS [已完成任务数],\r\n SUM(\r\n CASE\r\n WHEN ISNULL(task.[任务状态], 0) < 3 THEN 1\r\n ELSE 0\r\n END\r\n ) AS [未完成任务数],\r\n SUM(ISNULL(task.任务预算工时, 0)) AS [已分配任务工时]\r\nFROM c1\r\nLEFT JOIN [任务表] task ON c1.[项目ID] = task.[项目ID] AND task.[任务状态] > 1\r\nGROUP BY\r\n c1.[项目ID],\r\n c1.[项目标题],\r\n c1.[项目预算工时],\r\n c1.[项目预算费用],\r\n c1.[项目状态],\r\n c1.[总成本],\r\n c1.[总计划工时],\r\n c1.[总上报工时],\r\n c1.[总核定工时],\r\n c1.[项目成员数]", "ViewInfo": { "ViewName": "View_项目统计信息", "IsUpdatable": true,