diff --git a/.collaboration b/.collaboration index 21111bb6..ed69c6c5 100644 --- a/.collaboration +++ b/.collaboration @@ -462,17 +462,7 @@ }, { "ModuleName": "PCPage/FGC_任务详情", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T15:29:03.5112609+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\流程页面文件夹\\FGC_任务详情.json", - "Pages\\流程页面文件夹\\FGC_任务详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/FGC_审批记录", @@ -552,31 +542,11 @@ }, { "ModuleName": "PCPage/项目首页", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T15:33:37.3586215+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页.json", - "Pages\\项目\\项目首页\\项目首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目标题", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T15:31:06.1940467+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目标题.json", - "Pages\\项目\\项目首页\\项目标题.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/项目/项目首页/项目首页-容器页面", @@ -588,19 +558,7 @@ }, { "ModuleName": "PCPage/任务列表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T15:26:46.8364254+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.rd", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.json", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目工时", @@ -712,17 +670,7 @@ }, { "ModuleName": "PCPage/任务首页", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T15:30:04.6296933+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务首页.json", - "Pages\\任务\\任务首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务部分", @@ -734,31 +682,11 @@ }, { "ModuleName": "PCPage/任务-基本信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T15:42:51.3966825+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-基本信息.json", - "Pages\\任务\\任务-基本信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-任务信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T15:36:30.946255+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-任务信息.json", - "Pages\\任务\\任务-任务信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-关联资源", diff --git a/Pages/任务/任务-任务信息.json b/Pages/任务/任务-任务信息.json index 68699014..cc357f06 100644 --- a/Pages/任务/任务-任务信息.json +++ b/Pages/任务/任务-任务信息.json @@ -297,7 +297,7 @@ ] } ], - "ID": "bcee26ff-01a0-4b1a-b225-d154b05ccdb2" + "ID": "4b6ee043-b598-4185-95e3-e0930804731d" } ] } @@ -420,7 +420,7 @@ "MethodName": "ReloadBindingItems" } ], - "ID": "6a8926c8-c759-4145-97da-d330124ab7af" + "ID": "27e26873-d450-404e-83a4-b1b847a8147f" } ] } @@ -478,61 +478,36 @@ { "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", "TableName": "任务表", - "ShowConfirm": false - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", - "tableData": { - "TableName": "任务表", - "ColumnName": "任务说明", - "GUID": "ab77e68a-10be-45cf-807b-8aa850ad8b9f" - } - }, - "value": "%Null%" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "Location": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-任务信息'!7:8" - }, - "Value": false - } - ] - } - ], - "ID": "4b3d5b40-d585-440b-9de1-9eeca58c94b0" + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "a409e494-592b-40ec-9e8b-13622d6ff9f4" }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-任务信息'!任务ID" + } + }, + "UpdateBindingValues": [ { - "CommandList": [ - { - "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "Location": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-任务信息'!7:8" - }, - "Value": true - } - ] - } - ], - "ID": "b4871a6b-b11f-4f55-be38-6d03d512b4c5" + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务说明", + "GUID": "6946da00-7d41-4abc-ad88-1d8546031f92" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-任务信息'!编辑内容" + } } ] } ], - "ID": "c0ea09c1-7889-4bc7-b5e5-8e3e145ff17b" + "ID": "8b42ccca-9969-4c5e-93d1-9ad90e50bc63" } ] } @@ -579,12 +554,12 @@ "Condition": { "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", "param": { - "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", - "tableData": { - "TableName": "任务表", - "ColumnName": "任务说明", - "GUID": "4cdfa127-ffc2-47df-83b7-4eb09e19915a" - } + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='任务-任务信息'!任务说明" + } + ] }, "value": "%Null%" }, @@ -602,7 +577,7 @@ ] } ], - "ID": "2805f61b-7dbf-4b60-9b98-2f1166afcea9" + "ID": "eb86ecef-cf83-4e1d-a50e-1aeaafb7b3e6" }, { "CommandList": [ @@ -619,7 +594,7 @@ ] } ], - "ID": "6f317660-9d29-40c6-92ac-ee1f4e38104b" + "ID": "91cbf8ec-384e-4ce8-916d-05ffdd4a9dc6" } ] } @@ -675,61 +650,36 @@ { "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", "TableName": "任务表", - "ShowConfirm": false - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", - "tableData": { - "TableName": "任务表", - "ColumnName": "备注", - "GUID": "d01e5ba6-5ac5-4a6a-b140-9542d6b111f0" - } - }, - "value": "%Null%" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "Location": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-任务信息'!11:12" - }, - "Value": false - } - ] - } - ], - "ID": "58873d98-c095-49fd-8a55-b14c9bbfcd9f" + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "768a92a1-3ba4-4086-b6d4-3a1cf1eed0aa" }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-任务信息'!任务ID" + } + }, + "UpdateBindingValues": [ { - "CommandList": [ - { - "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "Location": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-任务信息'!11:12" - }, - "Value": true - } - ] - } - ], - "ID": "1882de71-96ca-44ed-89b4-fa8cf0a4b05e" + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "备注", + "GUID": "6080790a-cf5a-4f92-92e3-af00058934d5" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-任务信息'!编辑内容" + } } ] } ], - "ID": "6092ec24-6dd6-4853-a2a0-c61abe6f15bb" + "ID": "ae0dc9de-09f9-41f3-9615-4247594e8a0e" } ] } @@ -776,12 +726,12 @@ "Condition": { "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", "param": { - "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", - "tableData": { - "TableName": "任务表", - "ColumnName": "备注", - "GUID": "1033a759-9c3d-49ba-a097-27231b7e510d" - } + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='任务-任务信息'!备注" + } + ] }, "value": "%Null%" }, @@ -799,7 +749,7 @@ ] } ], - "ID": "0d050db1-da36-48e1-a2b1-419312b2354b" + "ID": "457419f6-14b6-4a6b-b4d0-cd5b099be7d6" }, { "CommandList": [ @@ -816,7 +766,7 @@ ] } ], - "ID": "34fda148-33dd-43e3-8963-6913050b4e04" + "ID": "d7fbc958-ab7b-46b7-89f5-d37eada1862b" } ] } @@ -897,6 +847,30 @@ "HorizontalAlignment": 2, "Underline": false }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "BorderTop": 0, + "BorderLeft": 0 + }, + { + "BorderTop": 0 + }, + { + "BorderTop": 0, + "BorderRight": 0 + }, + { + "BorderBottom": 0, + "BorderLeft": 0 + }, + { + "BorderBottom": 0 + }, + { + "BorderBottom": 0, + "BorderRight": 0 + }, { "FontFamily": 0, "FontSize": 13.333333333333332 @@ -927,7 +901,13 @@ "Background 1 -25", "[AUTO]General", "Center", - "Text 1 50" + "Text 1 50", + "Background 2 0" + ], + "Borders": [ + { + "Color": 7 + } ] }, "CellStyles": { @@ -958,79 +938,153 @@ "5,2": 4, "6,1": 3, "6,2": 5, + "6,3": 6, + "6,4": 6, + "6,5": 6, + "6,6": 6, + "6,7": 6, + "6,8": 6, + "6,9": 6, + "6,10": 6, + "6,11": 6, + "6,12": 6, + "6,13": 6, + "6,14": 6, + "6,15": 6, + "6,16": 6, + "6,17": 6, + "6,18": 6, + "6,19": 6, + "6,20": 7, "7,1": 3, - "8,0": 5, - "8,1": 6, - "8,2": 5, - "8,3": 5, - "8,4": 5, - "8,5": 5, - "8,6": 5, - "8,7": 5, - "8,8": 5, - "8,9": 5, - "8,10": 5, - "8,11": 5, - "8,12": 5, - "8,13": 5, - "8,14": 5, - "8,15": 5, - "8,16": 5, - "8,17": 5, - "8,18": 5, - "8,19": 5, - "8,20": 5, - "9,0": 5, + "7,2": 8, + "7,3": 9, + "7,4": 9, + "7,5": 9, + "7,6": 9, + "7,7": 9, + "7,8": 9, + "7,9": 9, + "7,10": 9, + "7,11": 9, + "7,12": 9, + "7,13": 9, + "7,14": 9, + "7,15": 9, + "7,16": 9, + "7,17": 9, + "7,18": 9, + "7,19": 9, + "7,20": 10, + "8,0": 11, + "8,1": 12, + "8,2": 11, + "8,3": 11, + "8,4": 11, + "8,5": 11, + "8,6": 11, + "8,7": 11, + "8,8": 11, + "8,9": 11, + "8,10": 11, + "8,11": 11, + "8,12": 11, + "8,13": 11, + "8,14": 11, + "8,15": 11, + "8,16": 11, + "8,17": 11, + "8,18": 11, + "8,19": 11, + "8,20": 11, + "9,0": 11, "9,1": 3, - "9,2": 7, - "10,0": 5, + "9,2": 13, + "10,0": 11, "10,1": 3, "10,2": 5, - "11,0": 5, + "10,3": 6, + "10,4": 6, + "10,5": 6, + "10,6": 6, + "10,7": 6, + "10,8": 6, + "10,9": 6, + "10,10": 6, + "10,11": 6, + "10,12": 6, + "10,13": 6, + "10,14": 6, + "10,15": 6, + "10,16": 6, + "10,17": 6, + "10,18": 6, + "10,19": 6, + "10,20": 7, + "11,0": 11, "11,1": 3, - "12,0": 5, + "11,2": 8, + "11,3": 9, + "11,4": 9, + "11,5": 9, + "11,6": 9, + "11,7": 9, + "11,8": 9, + "11,9": 9, + "11,10": 9, + "11,11": 9, + "11,12": 9, + "11,13": 9, + "11,14": 9, + "11,15": 9, + "11,16": 9, + "11,17": 9, + "11,18": 9, + "11,19": 9, + "11,20": 10, + "12,0": 11, "12,1": 3, - "12,2": 5, - "12,3": 5, - "12,4": 5, - "12,5": 5, - "12,6": 5, - "12,7": 5, - "12,8": 5, - "12,9": 5, - "12,10": 5, - "12,11": 5, - "12,12": 5, - "12,13": 5, - "12,14": 5, - "12,15": 5, - "12,16": 5, - "12,17": 5, - "12,18": 5, - "12,19": 5, - "12,20": 5, - "13,0": 5, + "12,2": 11, + "12,3": 11, + "12,4": 11, + "12,5": 11, + "12,6": 11, + "12,7": 11, + "12,8": 11, + "12,9": 11, + "12,10": 11, + "12,11": 11, + "12,12": 11, + "12,13": 11, + "12,14": 11, + "12,15": 11, + "12,16": 11, + "12,17": 11, + "12,18": 11, + "12,19": 11, + "12,20": 11, + "13,0": 11, "13,1": 3, - "13,2": 8, - "13,3": 8, - "13,4": 8, - "13,5": 8, - "13,6": 8, - "13,7": 8, - "13,8": 8, - "13,9": 8, - "13,10": 8, - "13,11": 8, - "13,12": 8, - "13,13": 5, - "13,14": 5, - "13,15": 5, - "13,16": 5, - "13,17": 5, - "13,18": 5 + "13,2": 14, + "13,3": 14, + "13,4": 14, + "13,5": 14, + "13,6": 14, + "13,7": 14, + "13,8": 14, + "13,9": 14, + "13,10": 14, + "13,11": 14, + "13,12": 14, + "13,13": 11, + "13,14": 11, + "13,15": 11, + "13,16": 11, + "13,17": 11, + "13,18": 11 }, "ColStyles": { - "1": 9 + "1": 15 }, "SheetStyle": { "FontFamily": 0, @@ -1080,7 +1134,7 @@ ] } ], - "ID": "6b2a88c8-9d03-48e4-81bb-415ebac95d4f" + "ID": "926d46c6-e38d-474b-b6e0-4b6bdf02adbf" }, { "CommandList": [ @@ -1097,7 +1151,7 @@ ] } ], - "ID": "91dbf291-940e-4138-948f-cbcbdce3ec33" + "ID": "98dc797f-a751-4640-ad8e-262e898f7b2d" } ] }, @@ -1131,7 +1185,7 @@ ] } ], - "ID": "19f57f2c-a825-4de9-9508-32c561af30d3" + "ID": "551cdbf8-620d-4c04-8d87-dbbc3b3cafb0" }, { "CommandList": [ @@ -1148,7 +1202,7 @@ ] } ], - "ID": "c48a64d8-6a18-4e8e-bf7d-82aa148bdddf" + "ID": "b29a7757-4a56-4f5b-bc6c-4ada3fdf8417" } ] } @@ -1222,4 +1276,4 @@ "Formula": "'任务-任务信息'!$C$11" } ] -}//5IX/s2D/h6y0pVzNDwa+EKxO6K6n2BYEM19lkI04BsafKDTcczWb3z7rZXatlvLyOfyC90n2d/BBXM77ERdR48tbJTB3ydCEE9Qc0Fl2Jl+dnJrwm9Q/Qw1xVFCkLpzF1UUWUG4JJbAl1zc6ea6MT8QRJZbJG7Jg6HfDMywkAhei1SAC7sZxb8RYDayCL55NphHAagyy6vNJn8kg/dsvf5w4m/WnrrLSZhHaW3SkDtYmaV4XvdT9cCNLwE0tSsWkEnKE/TIVVlfngfU5uFS1tZLTjvIe/S+z4RJsCf2Fo0ReLXp8B+2l1kMoN3lNxts1g1T7Nwcj6G9190h6LExTg598r/0Ian5ThYV6fVC7MkTw6Q7FUJf1VfI16niYBs476XhtaAh4sxT9RrNRLKBcMwOtzW/AunPM4YogP/4sooFO+OWcd2lvh5kdE6/aVy00UeEzSE7iKHOsH05aa4Fr0ASTXevl+Tc5O3xO59sv0e5Ybt/KnDUpc1OQj4Ur99sgY5fW/Z4htz1q1NnEGv7lNVgWd6hiDQxRg8ovlNuzxUNawBMr2mnitcOXYsLdmNXKsn2ttyttPl9N8P7DD7zhyL71K//SZvhNIy44mJh5KNkty7SgkCeNEwk6XslMirZHzwBIOQX2MCQEyro2ArDlPLTTeKRsF9xmO/A2SgHLRDiRkfjjsWLr3Jbc3hn7/DrpAeKonQG3jd3+DRWZK8UD/sa0rXME93F4BKoBxeuufvk4/Vw8bahYEgH6j4pjQHY6gMLFk/AGaxk8nBJj1dsw1mkfr85aXRY51wF5yLiDdLINShfSYPOSXBsPTPmeqnXNtjP/EbfSbxT+i7jmeT+oI0YHx6K3qZ45svZHYkSmvoAjEC3U/4mdnDdZa0fR0d0ScVhpBYekUlbBBB3BVzu2nA==|920 \ No newline at end of file +}//g/0bnl7FeNETDbk+g1TgV5YgTK3nM78uGmXggk/K98E5HJroM60aq+SfTfutNw0DB3zzvM5Z8ercV0kbvr+EEcb+nwJRaJoNQLm0IdSJkD7TDziuNjglyq0/nKBbYxUMTtPwG7kQdr9ulJTkeYDc7d7nsmsS3WnkCVOcfbB/hc/NM1za8H9MtaoS27xjsj/7+yHCwCHlxvQf9BI9hKZdKJsIcgUvvZBKurd0JkgYd3LnDPm84ie5vZ8p4j6dbU6PIwbpA0AFyj7zeWpE47ZLMXH4e7WU2swEIcISr5dYmh13DuYhUjUqoOBH3GW16DECJLzBt5OSQsKC8LJPUUzHKzTUM8c6eCyR1iprb++4HH7CEucPJo/kV/He2pR0JdHajkmQsr0RxIFeCMmz5bBK9vo9UhNrqS9lqJJ9LHLQCpkgRuiabyCqcmqM8p2dOOffEykZSWUXP45gN/zEVbl9/qSO+6FDm4yPTT6WBUk8E5TMqucC4bZdukIoiIXsHsPDDwWbSihfxuHIvGPLZIIDWGGgAAb/j1RyG3Q/OuUFbmY6wepdgJOTtWUfAnS8mINSekTdRYA/jqY5gN7TVorO8Q7yHRwKkVHFtmX2+MYmYq24p6+5sbShqAWfWPXCC0wFO1f2u/EIgphym+bfD8pBmwgtsLfODL0hpVIn9X+xLGmqhqVsyWDSKC8ZKSNETYo0NwnBtFQtyH1mcTmX1Udh8ItKTgEXoSy8fTdxE1ggk1V7bjgwz7+J6JAB/NC4+tArcVzuhKYqECaFQxiuSftdBGSnXGKoVX8x6KfPtiMyaKnEukvnV/f3D0zrQmFHM2mi4OJQDHQ0W+LGBtKb7WG+2cTC/XdZ19yFoneYHlwL3yDFppoSh83lk/ta7U+bRdvPoK9MZE7oRpBlBEAFzkURSg==|920 \ No newline at end of file diff --git a/Pages/任务/任务-基本信息.json b/Pages/任务/任务-基本信息.json index 9f395bc4..0309ff4f 100644 --- a/Pages/任务/任务-基本信息.json +++ b/Pages/任务/任务-基本信息.json @@ -1475,8 +1475,12 @@ "tagType": "info", "checkStrictly": true, "filterable": true, - "clearable": true - } + "clearable": true, + "IsDisabled": true + }, + "RulesGuidList": [ + "351faf93-8d96-48e8-8960-479d5746c480" + ] }, "9,2": { "BindingInfo": { @@ -1921,71 +1925,140 @@ "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": "='任务-基本信息'!L12" - } - } - ], - "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": "='任务-基本信息'!L12" + } + } + ], + "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": "367335bb-06ad-4895-bb9a-30f11e3c851c" } ] }, - "value": "0", - "compareType": 1 - }, + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!预算工时" + }, + "Title": "计算中" + } + ], + "ID": "40c8ab56-53f1-47a9-bc89-39a195429524" + }, + { "CommandList": [ { "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", "FunctionName": "warning", - "Title": "温馨提示", + "Title": "请联系项目经理或父任务负责人修改", "Message": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "='任务-基本信息'!msg" @@ -1993,21 +2066,12 @@ "BtnText": "知道了" } ], - "ID": "a7389b82-8338-4ddb-8717-c0da4c13cd43" + "ID": "e7992480-d9d6-4b4a-b064-10d93d808b01" } ] - }, - { - "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", - "FunctionName": "remove", - "Cell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-基本信息'!预算工时" - }, - "Title": "计算中" } ], - "ID": "fe99fe6d-9666-46b7-9799-bf402ec6ee3c" + "ID": "12c0c482-a034-441a-a701-5a42be0e8ca6" }, { "CommandList": [ @@ -2043,12 +2107,12 @@ ] } ], - "ID": "598ba275-a1b6-4fe4-a13a-7f922063e331" + "ID": "4af0b07d-a1f3-46ee-865f-3f1e2afc458d" } ] } ], - "ID": "0af837d3-d24d-4da7-bece-f0b5664a95d8" + "ID": "f38185b2-0dee-492a-97af-88e6952f0cb7" } ] } @@ -2071,8 +2135,12 @@ "step": 1, "precision": 1, "placeholder": "请选择", - "controlsPosition": true - } + "controlsPosition": true, + "IsDisabled": true + }, + "RulesGuidList": [ + "f7c3f6d5-8b51-481e-abe2-d1a7b9beee5e" + ] } }, "StyleDatas": { @@ -2322,7 +2390,7 @@ } } ], - "ID": "4f245875-8fdc-43f9-8175-917c62819cfc" + "ID": "c9e7bd03-1944-44fa-ab74-c306ea95d627" } ] } @@ -2431,6 +2499,38 @@ "Underline": null, "Strikethrough": null } + }, + { + "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!当前用户='任务-基本信息'!项目经理" + }, + "Priority": 6, + "GUID": "f7c3f6d5-8b51-481e-abe2-d1a7b9beee5e", + "StyleInfo": { + "Underline": null, + "Strikethrough": null + }, + "IsDisabled": false, + "IsInvisible": false, + "IsReadOnly": false + }, + { + "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!任务ID=\"\"" + }, + "Priority": 7, + "GUID": "351faf93-8d96-48e8-8960-479d5746c480", + "StyleInfo": { + "Underline": null, + "Strikethrough": null + }, + "IsDisabled": false, + "IsInvisible": false, + "IsReadOnly": false } ] } @@ -2477,4 +2577,4 @@ "Formula": "'任务-基本信息'!$C$12" } ] -}//Oimuu6NO3v4I1uOi/12C3qaFGef0NrE60esjkicsBbsNixnWbc6vDPIKB29WOPOpiyGWV4IXVIiCdVRfoOuidc4BlUd6nVa3gliaFMu0kxL09TPtJb/WDbSRcm5eZv8BmjHmElJUo2ktWF5xpIpVpH4YovGx6N3T0il0cSVb9buRXUSlOBE1/8iGSPIgjlcV0/5ZPwp6iXAV2ng5NlhJClKawBFh+ENQHLHO4kbnB+M9qOo0S33ZaldnlbLt8vx7p5od2lBDH8AiaZ+TL73DJDGf/6PLyDbT+y6UsGzT3OcRk3dk+1vhn/2GjRYfATBPdyYTksbPIn7dhgHC0p9ypG5MaeIC9qTxi/ubMoiU3IReBaF9+yAw8zsP9ty++qyCjyNhbzYwZX/jakhjB4zEePoxPhgHxolrIr93J5GKCzDeSlWXa12EvN61978cYHMRumFjuwYj/KwU5s5yVHfFHQPkv3XZNUlTACjqvrC+vO71f4Is+p9Qhp12BJNqsSwpJ57f9SvX+CWkQzFpwOimjw4EJ698deyXgUezd3R7Q8H+1YFW61y3l5Qadk89wXs5w8+X/sFKKyjgBsKUGbNw33fTtm5DOl1HIuAysoZ/bo/te7bSXlJSzVE0Lyj2VQZ7GjOeSoTobiZYFBcAndSCicipyEJoSgroXPuFPWWdTn7HviTyipqmdWdyHEOaNP/zgL3w9aETdldRw5puYZLmxerYUJpqbM5p2cOWWMjNFnW3E5JE7LUkHrmiUinAuJP6cP0mVKmcz8KCQ2SoQan1gdJcnnn8T2yl4ly2e+pRne33NWp9ZtF/fWlEM0d4hKZCtdFzDVh61JUTAZWDP9VMJ1fXudpTPoD1rmQGvCUVQlO9mWEcp+FJNECf0qrT72rZoi6VVwDLCDUB/bVCKgTR+w==|920 \ No newline at end of file +}//79BbwQI5dkZ2pkFywD5xiWI0r+T53FBfSzRQakMc0l0UJS9RnHN7eE2c7E4zy3FKZ358NgQmtsu+FtDH0VsxHU6gTFv/5xjpY/XPv4YUyIDbTbO2fTIh6vrp/UdUrJ4zyK7aZigOilNdLqRLV+uykh6V5kSLdV/TldX6/1dO6PKVP0ufhHcJ46mF3BXx/1XWSurwVQZZPD/TyGPTXOV1X9tnvG7ISKL84vlBfqaYzrMwkNplitR+swsLnc5wfVq6YzmDHCYKQWohhShf/2h1ZzNN6g8wxj2Gd+eOnlFt5+4Zyx+tG1KHDNjkd7HOwJTuRPsbu4uP5koXOEvebvXi7RARRiSiYfuvXjdPj0iO8l80SmhXKajtHfXXcAPn565POVOZyYIOE2k02vHDnpMHNXHcIoGBii011hjGMSejOL4ZDgqCVxe/1mpew25uJM9dbXV3fthJcnMR12VyKWfh5rNaTKAClX26umy9nVIjIAlR4gT8cmgJbJPMa+vrxe7wCReGkz23HM0eF+vc126WdIdAEWe3M3GWrd6GLGjEJn2N9Tq7hj1hObUqSoSshVWgt6cHNGHUBj5/jAvEWYWT/G9NFbuB1NXVQ7NLhncbEl+0Ro7qsCZJPFcLzZefkao26YcnPbp70pDARXJ0DLmLObNzL+JJXpJM5RmixvC30i5m77EE3fVfDqE5YHh+9l7AEjlmY5d/Ou+ELV6AxTwVmOjwSqmJNpPmvY32SYw6YN8fYI3xu9bWdCveW/tC3dYLy8uLlTKkeDowjCYe/Vd7RUPdlGdbk/jeKBEuOUms7saTrvMLLgJaaGQnVmmD1UF29uoYLEyKKEW3NMDp51Iqo27Oooke+HIcHgrBvHwRViuouh27RUvOHEDPsc9lpBkpSZmf1VXc5/rtL31Ux9Nu+A==|920 \ No newline at end of file diff --git a/Pages/任务/任务首页.json b/Pages/任务/任务首页.json index d1c3d696..1b924bc2 100644 --- a/Pages/任务/任务首页.json +++ b/Pages/任务/任务首页.json @@ -223,11 +223,14 @@ "7,7": "总计划工时：", "7,14": "参与人数：", "8,1": "项目名称：", + "8,7": "项目经理：", "8,14": "任务状态：", "8,17": 0, "9,1": "刷新任务", "9,4": false, - "9,7": true + "9,7": true, + "9,14": "当前用户", + "9,17": "%CurrentUser.UserName%" }, "Formulas": { "1,27": "IF(收起侧栏,L10,K10)", @@ -370,17 +373,43 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "b22d1bf3-bd8e-4dfc-9e93-dc77b36810ef" + "ID": "a8ed4e13-8243-438d-b6a4-ee7f73edea72" } ] } ], - "ID": "b0822129-df64-4bff-9723-f4a22d533b4d" + "ID": "e04236ad-a0fe-408a-b7af-fc888a83ad53" } ] } ], "PostCommands": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=Action.Name" + } + ] + }, + "value": "暂存" + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": "保存成功" + } + ], + "ID": "ced0d69d-866b-4a31-bfed-58e538827e2f" + } + ] + }, { "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { @@ -591,7 +620,7 @@ "MethodName": "Refresh" } ], - "ID": "dee0c3b8-b862-4035-be07-fbba6e16dbce" + "ID": "7a30e78c-902b-4aea-b2ea-42100ae51441" }, { "CommandList": [ @@ -606,12 +635,12 @@ "BtnText": "知道了" } ], - "ID": "21a99d81-2140-44dd-808a-373978eb0198" + "ID": "60552c60-0d89-47d3-86cf-9f5efaa98c46" } ] } ], - "ID": "6d7b01aa-d6cb-407f-874e-ea4f05aa8493" + "ID": "31078c25-194d-4ae7-82f9-6eb589857cf9" } ] } @@ -705,7 +734,7 @@ "ReloadData": true } ], - "ID": "30ee5acc-cecc-4122-a5d6-3da83f8255f0" + "ID": "36ade50d-8177-46de-a74a-2dd3003128be" }, { "CommandList": [ @@ -720,7 +749,7 @@ "BtnText": "知道了" } ], - "ID": "0401df86-c667-4441-829f-3d93eddb672e" + "ID": "380d4003-de94-4355-90a5-c916865f1e98" } ] } @@ -860,7 +889,7 @@ } } ], - "ID": "d4e5cda8-1a06-4231-9d7c-046adcb772e6" + "ID": "95c0c833-7f12-4df1-9b39-849427b00f69" } ] }, @@ -901,12 +930,12 @@ } } ], - "ID": "4b71c551-bbe9-495a-8011-15f480b7108d" + "ID": "5022e804-7dab-42dd-9045-768e5173a397" } ] } ], - "ID": "31bb9c8a-f48c-442e-89a5-7493a2f4cab4" + "ID": "e812d0ad-f488-4825-b8bd-a16c300ebae5" } ] } @@ -967,7 +996,7 @@ } } ], - "ID": "bfe01c3c-fafc-40a0-af97-c2797f62bdd9" + "ID": "b0218800-c18e-4321-a712-0db3344d3ba2" } ] }, @@ -1008,7 +1037,7 @@ } } ], - "ID": "84a6eb88-5ce2-485e-9da4-d3403d37783a" + "ID": "d446549a-15bd-4dbd-a10a-61c8cc669c4f" } ] } @@ -1030,48 +1059,84 @@ ], "CommandList": [ { - "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", - "CurrentRowInfo": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "ACT_HI_PROCINST_View", - "ColumnName": "ID_", - "GUID": "7cfc45f2-b41a-43dd-af8d-0d9bba10728c" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务首页!流程实例ID" - } - } - }, - { - "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", - "CurrentRowInfo": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "ACT_RU_TASK_View", - "ColumnName": "PROC_INST_ID_", - "GUID": "7fc12bff-cffb-4af6-8b0c-b8ee0fda95e8" + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=任务首页!流程实例ID" + } + ] }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务首页!流程实例ID" - } + "value": "%Null%", + "compareType": 1 }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "ACT_RU_TASK_View", - "ColumnName": "ASSIGNEE_", - "GUID": "f71c3b95-acf7-4dcf-9261-5e9baacd1c72" + "CommandList": [ + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "ACT_HI_PROCINST_View", + "ColumnName": "ID_", + "GUID": "7cfc45f2-b41a-43dd-af8d-0d9bba10728c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务首页!流程实例ID" + } + } }, - "Value": "%CurrentUser.UserName%" - } - ] - } + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "ACT_RU_TASK_View", + "ColumnName": "PROC_INST_ID_", + "GUID": "7fc12bff-cffb-4af6-8b0c-b8ee0fda95e8" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务首页!流程实例ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "ACT_RU_TASK_View", + "ColumnName": "ASSIGNEE_", + "GUID": "f71c3b95-acf7-4dcf-9261-5e9baacd1c72" + }, + "Value": "%CurrentUser.UserName%" + } + ] + } + } + ], + "ID": "559daa8d-9901-4347-96d8-90cbee0ee1c1" + }, + { + "CommandList": [ + { + "$type": "RemoveCurrentRowInfo.RemoveCurrentRowInfoCommand, RemoveCurrentRowInfo", + "TableName": "ACT_HI_PROCINST_View" + }, + { + "$type": "RemoveCurrentRowInfo.RemoveCurrentRowInfoCommand, RemoveCurrentRowInfo", + "TableName": "ACT_RU_TASK_View" + } + ], + "ID": "304fb53e-3929-4143-aa90-bca055067f16" + } + ] }, { "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", @@ -1128,6 +1193,18 @@ "GUID": "be5e9774-9fb8-4b0b-b741-778b06e08dd3" } }, + "8,10": { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "90adfe8b-87b4-46a2-a49e-a6312bdb8a92", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "项目经理" + } + } + }, "8,17": { "BindingInfo": { "TableName": "任务表", @@ -1538,6 +1615,16 @@ "BorderLeft": 1, "BorderRight": 1 }, + { + "FontFamily": 1, + "FontSize": 13.333333333333332, + "Foreground": 11, + "Formatter": 9, + "HorizontalAlignment": 10, + "BorderBottom": 1, + "BorderTop": 1, + "BorderLeft": 1 + }, { "FontFamily": 1, "FontSize": 13.333333333333332, @@ -1737,10 +1824,10 @@ "8,7": 16, "8,8": 17, "8,9": 17, - "8,10": 24, - "8,11": 14, - "8,12": 14, - "8,13": 14, + "8,10": 25, + "8,11": 19, + "8,12": 19, + "8,13": 20, "8,14": 13, "8,15": 17, "8,16": 17, @@ -1774,13 +1861,13 @@ "9,15": 17, "9,16": 17, "9,17": 29, - "9,18": 14, - "9,19": 14, - "9,20": 14, - "9,21": 29, + "9,18": 19, + "9,19": 19, + "9,20": 20, + "9,21": 30, "9,22": 14, "9,23": 14, - "9,24": 30, + "9,24": 31, "9,25": 14, "9,26": 14, "9,27": 14, @@ -1788,7 +1875,7 @@ "9,29": 22 }, "RowStyles": { - "4": 31 + "4": 32 }, "SheetStyle": { "FontFamily": 1 @@ -1813,7 +1900,6 @@ "9,4,1,3", "9,7,1,3", "6,10,1,4", - "8,10,1,4", "8,14,1,3", "8,17,1,4", "6,21,1,3", @@ -1827,10 +1913,11 @@ "6,14,1,3", "7,14,1,3", "9,14,1,3", - "9,17,1,4", "7,10,1,4", "7,17,1,4", - "6,17,1,4" + "6,17,1,4", + "8,10,1,4", + "9,17,1,4" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1923,6 +2010,14 @@ { "Name": "折叠全部", "Formula": "任务首页!$H$10" + }, + { + "Name": "项目经理", + "Formula": "任务首页!$K$9" + }, + { + "Name": "当前用户", + "Formula": "任务首页!$R$10" } ] -}//Cw/cXKzsgGyu44u+d/ctR5LNODoiFz2iWlP0hVBu2a/9YNE0E1cAgjTOJI2s6nWzfR/0Ut3uiXZXliXPfUtvv3oVxs/z0k7yKdjrvewdbjHLH8qm4Z7qo4U9kjOcV0D9ZrcKY3zLVW3zCW/alwNuMOFH1Rc4fv/Yvojk+HZWNwLaUNcIArDcbE9EP+yL6BSdKRmWjyLy4gzhrCnZj9mPxlRPe1y3+Uwg6Wo2Bfy8SYXjwpTF3s+wppXLnjYllaTYECsN7NPZT2N/gUyATv2IJ5kwKx/emOKQgr8v11lHU7CLqzW+rN+WpIf7waZsurbUMxkotN7TjbTv9/iIRMO30miTrqG+KfZjquIthUNs0KxlPZwtN5utNH607eOjLw1JePhpggRUhQR0uBRF06kE9xmnvayhXf9WAiY/ors9DXaysZi6QpDkP1z96b/54DqVldQasI8Y6q0M+5Z3G9dWLq5quTOg3M3l0NPTS6blpCJgvrvFfjVS42Lo5Cl3N7nCTopydoSChx17GQ1wiJeg4cS8GNLB3MrMlU/5pMfnluaXVJSLJIbrnyuHuFzYp+TeMeid3GYyZ59qGy3BPnToRPTZFOrh2QGjuzA9nLDX83r5eiKOJ3aGhRygTu5TR6qQnu19zhoHEbNBudtaCWtnOzqCD4TCnvQ67OodldkFpPHBu8XfdzJ7vunzE7gRHgJPaplBbh77ZVPw6Cr0x/UK6iU7Klmd48Eddu/1oES0ySgzAGrX6YY2mFrwAzZw/35R5alS2fQENC+ma8GpvDXUGYG75wFiUl74hyxlfsVybP0XB62OlOHaVYGilkVdgV06FahHnWYOx2chWW1B0ejpMcUTWrQbVm91SpGwxU5ghcerydWMpQtN7SC++K/ADLD4GlhTgc9QlCYp9FL1Y9OHag==|920 \ No newline at end of file +}//tdE9bTY+KNyjlATGw9Ngcst8j13lRUyTk2iBzz+YG203C9P38V3lgsLtS4DfezvxSAs25Gwar48MwSvpVBgmI8rnWR4St8XltBE2HTHLYvhzU8viZk7fNFI1wNcWhJayW3jmDh+f682SbGZ1ttq0dngfDsJZbCAu85BiojZvOj2GIWH4D4nxS5Ru6/pbtQPLEqFi81F3loM/pHVEGXR6wN4dwjXF2SaPAW4warV+fOVJCGtTj8Yb1ZBAT5NM0ZqlN6cpws6xG30chPJ4vwLzmG75pnweGkhSVf4TXjSgrDG8B2XCyTjQIjSdiKvoJXIGwzfHtEWE5JII/knxI3abQFs1aDNH60eu33WqDc6pJWA9NNNLtqovCl0u/e2dSRtCVmDc7LOkK/GYWRMofowMj7JvXT4RGJrXcJK4le3m4VUn2y2nD20tm52NDr4t/bVvviqgmPufLAaMYNAZNOkeAZoKZTiziTY/rEun12BLlcjHB72oJxc2Zz++OX6oj5ig+8QrUr10Cj0WYmg5R+q3KKBOCu1Wg4g9SBE430MkNMfkkTcMr314anhtPufwal20jnmMPizlNXOi4K582Z7VE0sQQdzMpxG6MN7ZHcujsHgQdjPqIh3+wIh6WTs92LPYD0oXNU1DLXq8UkDUu/oQQrhcwGGYZqYu0W/V1ZY5HZFL1i91qC6cGZ9nv0wpj73hCqXGCKYAAJJA1xuQB9nJaw7wsc6e/cMzWtAZJcdLyIgeB/n4R8l6O/iTTJVKLEXeRgBnpfO0/Oh11X+BuGdkrYdisjEnMM5ExaqETREukc4uFrupgI+JygaD5AeI3ffpidiePVEa4qoHF1EsWfw+xEBbciwNSTR+D/M4EeqHI+h2dk1C1NnAS0rkT9V0Wui/lp4Io7wM/9UHH1v6Dx23jA==|920 \ No newline at end of file diff --git a/Pages/任务/任务首页.rd b/Pages/任务/任务首页.rd index 8ac419ab..88c35995 100644 --- a/Pages/任务/任务首页.rd +++ b/Pages/任务/任务首页.rd @@ -62,6 +62,14 @@ { "Name": "折叠全部", "Formula": "任务首页!$H$10" + }, + { + "Name": "项目经理", + "Formula": "任务首页!$K$9" + }, + { + "Name": "当前用户", + "Formula": "任务首页!$R$10" } ] } \ No newline at end of file diff --git a/Pages/流程页面文件夹/FGC_任务详情.json b/Pages/流程页面文件夹/FGC_任务详情.json index 3de0158d..4aa00166 100644 --- a/Pages/流程页面文件夹/FGC_任务详情.json +++ b/Pages/流程页面文件夹/FGC_任务详情.json @@ -8,7 +8,7 @@ }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 30.0 + "DesignLengthInPixel": 37.0 } }, "2": { @@ -310,8 +310,40 @@ "Title": "加载中" }, { - "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", - "ReloadData": true + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=Action.Name" + } + ] + }, + "value": "暂存", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ReloadData": true + } + ], + "ID": "041ff837-1f8a-4c84-ad43-76030b13b4fc" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": "保存成功" + } + ], + "ID": "a24e7c51-b24b-4cfd-b0f5-bf84b046c989" + } + ] } ], "TemplateKey": "同意", @@ -329,8 +361,7 @@ "TemplateKey": "_RS_Error3" }, { - "ActionTitle": "受理反馈", - "TemplateKey": "流程样式" + "ActionTitle": "受理反馈" }, { "ActionTitle": "已处理", @@ -339,6 +370,14 @@ { "ActionTitle": "完成处理", "TemplateKey": "_RS_Main1" + }, + { + "ActionTitle": "结束", + "TemplateKey": "拒绝" + }, + { + "ActionTitle": "暂存", + "TemplateKey": "暂存" } ] } @@ -576,7 +615,7 @@ "IsAutomaticStroke": false, "IsAutomaticFill": false, "Location": "814,0", - "Size": "297,462" + "Size": "297,469" } ], "CustomNames": [ @@ -589,4 +628,4 @@ "Formula": "FGC_任务详情!$B$4" } ] -}//n6zjE8z/W4qePPvSqxDtLqS8gXiFAHDu4S4aX40aCsvW9TjYoDFUixo8s4+/OCqAxnfalrgq0feY8Oue61kGmHsGggmkKudomFq1IbCQTaF0yKqPT36tYm9waml9OAEFd2Ub3MomH8VR6+d5/evgNHnLQEq8uOt9OY3PoiscBuLvFivkm3S43zN6aWo3hL4jxwmK4YnmvDm8ObiUuRpZ0gEXn7ekVwATxiAU5ORXD//spbhy1aYwIqFXPkHxkwa5OtqDZSuryvQo7+h3uVpcjKxRclexCdtK6Ie3qGPQ+iyi3rnuBrekQztIlk3rIXUyrLM7lWQQbCsS7o5vPNXST/W4lcqG4/TbBXkdic6njKc314vqgtxqicjpVQFVF9Fl7pze6obxsff/IEMDMSge3w6Tdtmw+GHvmAIo/8AQBhzN8t0xGUWWTCC5l1HC+zNTc+IGn4dBEKaP1h9iZFkoED8o51GELdrdC/T3FbTb0bCIbAUeArpWIXuXNFj0js+Q7oHVT+Mg7VSjZj7IDXPAzWxwgMacsqRItt5Sx5ibGhsjw+7BEWVJ3PZ0h3Dj3MB6g3HN4am2AXfxhpnYZ8Sj85uJPkEyTDc41YImXIuJLwtbd0uYkFJNqTt2rs4SuNYGpEAjZFPYtv85LkBdyHgwjmn7Q5Axt4I08QPPWfINBRlnlfVHbwKjDxFyVV4+h5xeAgfrO5ocuU2KIy69Yk+iLHe91M/FWVWjVwcl56efhFkbkkTkByV5zz1ouK48AGxHTqKqhiGnO494z0AjtAqcXxj/cCzLxSrKQbxZkhg76Alc0NhgJ3putEciknfWmKqi24MxY+L5TxgMNMryoVKdL17N35jvuvlZCk12wqoDaxEvGHFsTyUmi4/B0WUczZJJsToOlQquivdRtAurgtEuAw==|920 \ No newline at end of file +}//tZcdiVA/E/kRd7Vx65uKpWD1p8J/L7vJZpe6ENriBP2Q/uvCiyMBCm/NbLNrBZ7IkSQrNDl1n+PrlWluuyA/ZU6PqfwU1SRDUHfG3TlWu9sxHO1kCj8DlmDiVVoDda3jFxgHG7EXbEDZDyi/bwdjkx9Mkmq8/KpvxPmEJZxY4fqUiCtEEed1lHUf5pYjf2E/HENbBJ6R6wcEjeojPqKN7ypaOSO6MGiAsEz9xag4uSap2E1aB6pQg1NtaL6SrPcRFvpMNea7nIwYgbPoQhLGb5iVBpZ5lhoXiXfX7B0ZyvV8/AyQ3qV58PnOdqyJr0MPgxAtoIMd45RbK+zyUfJXBqKSeVcHzSGEPg+rsV5OaGEt1Q4REL/RN1SMPbSYp2G30tzUmbWJuYKGv2zoq5rkCgfzXiPXMfrrj8GGTVI3hAffuAoYUUoh16Qti5jqnZncC1AUbJRJx6bWEq6khDpr3NTK8wl7LPHx9QbPwX6qsNxUZH63icY/5bjmCjKGXXx1gox5Bw1kdyNgMpdJOJBnbfz0kLSSNiOGzlnTRfphn1FOMN5tt3M/5VNIn4cBIrahIp7RcGvsC82fVC+yrMCfOIsSCG/N5AhHnFCeU49rvFLWdoDsqUAAAQelqByQ4aRm0xlUwRsqUzrlPELHUFPoxx1Fey699Zpu1ZXMa4+73RhWab68tTUPaXdPPbDmLObU2a+G35pjtN7sMwg7vnvY54uFXAVNMK1/1jHTg2L2eQDKFW+fUetcYqVEAxtgGKcxJSSf9Y4SqkcA8mHzriJmk0C4tzoPGo1lShmV1fm+t0XX2CbGBLErLb86olyQDw/Bpf6OWsnX9fmW2K5oBcXlhmNhi2c3oo9axX96T1dKpeQr7l6qvF3wn1WWptEEjEc5ZBCAuoHMHbPG+zkRNK8sMA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目标题.json b/Pages/项目/项目首页/项目标题.json index 09e15633..de51f2af 100644 --- a/Pages/项目/项目首页/项目标题.json +++ b/Pages/项目/项目首页/项目标题.json @@ -8,17 +8,17 @@ }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 36.0 } }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 11.0 + "DesignLengthInPixel": 14.0 } }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 31.0, + "DesignLengthInPixel": 29.0, "Mode": 1 } }, @@ -59,7 +59,7 @@ }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 63.0 + "DesignLengthInPixel": 83.0 } }, "4": { @@ -85,7 +85,7 @@ }, "8": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 521.0, + "DesignLengthInPixel": 513.0, "Mode": 1 } }, @@ -137,9 +137,9 @@ }, "Values": { "1,5": "加载中...", - "1,10": "进行中", - "1,12": "自定义", - "1,14": "菜单" + "3,10": "进行中", + "3,12": "自定义", + "3,14": "菜单" }, "AttachInfos": { "1,1": { @@ -240,7 +240,7 @@ ] } ], - "ID": "038dcd9a-af42-4004-baa7-a5a10aeefd00" + "ID": "25c0cb27-b221-493f-bad7-2a927ad22cd6" } ] } @@ -258,7 +258,189 @@ "UseCellForeColor": true } }, - "1,10": { + "1,9": { + "CellType": { + "$type": "Forguncy.ProcessPanelCellType, ServerDesignerCommon", + "PreCommands": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "Title": "加载中" + } + ], + "PostCommands": [ + { + "$type": "Forguncy.Model.IgnorePageDirtyCommand, ServerDesignerCommon" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=Action.Name" + } + ] + }, + "value": "暂存" + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": "保存成功" + } + ], + "ID": "5fb08138-8874-4be8-9853-b738529858ce" + } + ] + }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + } + ], + "TemplateKey": "同意", + "ActionButtonStyleTemplateInfos": [ + { + "ActionTitle": "提交", + "TemplateKey": "同意" + }, + { + "ActionTitle": "回退", + "TemplateKey": "回退" + }, + { + "ActionTitle": "暂存", + "TemplateKey": "暂存" + }, + { + "ActionTitle": "结束", + "TemplateKey": "拒绝" + } + ] + } + }, + "2,5": { + "CellType": { + "$type": "ElementUI.TabHeader, ElementUI", + "ClickCommand": { + "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", + "Commands": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目标题!页签值" + } + ] + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目标题!项目子页面" + }, + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目标题!项目子页面" + }, + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目首页!项目子页面" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目标题!页签值" + } + } + ] + } + ], + "ID": "00b63893-61b9-494b-8dea-b4adbc08d852" + } + ] + } + ], + "ParamProperties": { + "itemIndex": "页签编号", + "itemValue": "页签值", + "itemText": "页签标题" + } + }, + "DefaultValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IFERROR(GETURLQUERYVALUE(\"ProjectTag\"),\"任务列表\")" + }, + "Tabs": [ + { + "Value": "项目概况", + "Name": "概况" + }, + { + "Value": "任务列表", + "Name": "任务" + }, + { + "Value": "项目工时", + "Name": "工时" + }, + { + "Value": "项目成员", + "Name": "人员" + }, + { + "Value": "项目负荷", + "Name": "负荷" + }, + { + "Value": "项目周报首页", + "Name": "周报" + }, + { + "Value": "项目反馈", + "Name": "反馈" + }, + { + "Value": "项目文档", + "Name": "文档" + }, + { + "Value": "项目版本管理", + "Name": "版本" + }, + { + "Value": "项目代码", + "Name": "代码" + }, + { + "Value": "项目统计", + "Name": "统计" + } + ], + "type": "default", + "position": "top" + } + }, + "3,10": { "BindingInfo": { "TableName": "项目表", "ColumnName": "项目状态", @@ -298,7 +480,7 @@ "b24876da-8ff2-4736-8ffe-09e4d86a7a9d" ] }, - "1,12": { + "3,12": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [], @@ -312,7 +494,7 @@ "IconSize": 14.0 } }, - "1,14": { + "3,14": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -320,7 +502,7 @@ "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", "PopupDisplayMode": 1, "Placement": { - "SerializeProperty": "=项目标题!O2" + "SerializeProperty": "=项目标题!O4" }, "ClosePopupCallbackCommand": { "Commands": [ @@ -367,7 +549,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "55e5097b-d76c-4d84-8b87-bd6dd2dc3f3d" + "ID": "149c4d6c-f81d-4b78-a661-267f56f936c5" }, { "Condition": { @@ -389,7 +571,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "a7c6591c-9c1f-4c2c-9278-6b2ba6b49162" + "ID": "68e9f1cc-f14a-4d13-9f72-c9aa99ac20ad" }, { "Condition": { @@ -438,7 +620,7 @@ "Disabled": true } ], - "ID": "19b12dae-267f-4fb1-8676-25da484f580d" + "ID": "06693f64-6272-46ee-a95c-b8ecc80a2009" }, { "Condition": { @@ -474,7 +656,7 @@ "Message": "操作完成" } ], - "ID": "c6721d0d-3764-466a-b4c7-55266ac69925" + "ID": "44c071fe-d07f-47d8-b2e1-7b8b5c45c54b" }, { "Condition": { @@ -570,12 +752,12 @@ "IsOpenInNewTab": true } ], - "ID": "39b9f3d0-b2be-4660-9dcb-59e24c8178fe" + "ID": "05b32ffe-cb0c-4966-afde-4cfffce4bcca" } ] } ], - "ID": "51a322dc-eea5-40c7-8ca6-769fa3b7c65c" + "ID": "152bbddb-5dbf-43c0-b131-5e2ed35be334" }, { "CommandList": [ @@ -585,12 +767,12 @@ "Message": "当前项目未开启收集需求功能，请开启后分享！" } ], - "ID": "232d4e10-a871-407c-a235-8c3025091304" + "ID": "5506eac6-e2ce-4560-9bfb-e2b743098536" } ] } ], - "ID": "c4a58538-9959-4b46-bc3c-16264855d4e1" + "ID": "b60c706c-6365-412b-84d2-94c485e3ff22" }, { "Condition": { @@ -623,12 +805,12 @@ "LoadBindingDataOption": 2 } ], - "ID": "8c7a18bd-8335-4a1a-928c-73fa4a095ce9" + "ID": "01c45b01-6be3-4c16-9e71-a3999969dbde" } ] } ], - "ID": "fd99dd93-ef21-4ed7-9d2a-73eb06679394" + "ID": "38c4a63c-92f8-48f3-9b6d-42f871caa578" } ] } @@ -650,122 +832,6 @@ }, "IconSize": 14.0 } - }, - "2,5": { - "CellType": { - "$type": "ElementUI.TabHeader, ElementUI", - "ClickCommand": { - "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", - "Commands": [ - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=项目标题!页签值" - } - ] - }, - "value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目标题!项目子页面" - }, - "compareType": 1 - }, - "CommandList": [ - { - "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", - "Cell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目标题!项目子页面" - }, - "Title": "加载中" - }, - { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目首页!项目子页面" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目标题!页签值" - } - } - ] - } - ], - "ID": "db73152b-7de7-410c-b37a-ed06c3651d66" - } - ] - } - ], - "ParamProperties": { - "itemIndex": "页签编号", - "itemValue": "页签值", - "itemText": "页签标题" - } - }, - "DefaultValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IFERROR(GETURLQUERYVALUE(\"ProjectTag\"),\"任务列表\")" - }, - "Tabs": [ - { - "Value": "项目概况", - "Name": "概况" - }, - { - "Value": "任务列表", - "Name": "任务" - }, - { - "Value": "项目工时", - "Name": "工时" - }, - { - "Value": "项目成员", - "Name": "人员" - }, - { - "Value": "项目负荷", - "Name": "负荷" - }, - { - "Value": "项目周报首页", - "Name": "周报" - }, - { - "Value": "项目反馈", - "Name": "反馈" - }, - { - "Value": "项目文档", - "Name": "文档" - }, - { - "Value": "项目版本管理", - "Name": "版本" - }, - { - "Value": "项目代码", - "Name": "代码" - }, - { - "Value": "项目统计", - "Name": "统计" - } - ], - "type": "default", - "position": "top" - } } }, "StyleDatas": { @@ -785,14 +851,15 @@ { "FontFamily": 0, "FontSize": 13.333333333333332, - "Formatter": 3 + "HorizontalAlignment": 3 }, { "FontSize": 13.333333333333332 }, { "FontFamily": 0, - "FontSize": 13.333333333333332 + "FontSize": 13.333333333333332, + "Formatter": 4 } ], "Types": { @@ -800,6 +867,7 @@ "Body", "Text 1 50", "Left", + "Right", "[AUTO]General" ] }, @@ -810,30 +878,23 @@ "1,1": 1, "1,2": 1, "1,5": 2, - "1,10": 3, - "1,12": 3, - "1,13": 3, - "1,14": 3, + "1,9": 3, "2,2": 1, "2,5": 4, "2,9": 4, - "2,11": 4, - "2,13": 3, "3,2": 1, "3,5": 4, "3,7": 4, "3,8": 4, "3,9": 4, "3,10": 5, - "3,11": 4, + "3,11": 0, "3,12": 5, "3,13": 5, - "3,14": 4, + "3,14": 5, "4,10": 0, "4,12": 0, - "4,13": 0, - "5,10": 0, - "5,13": 0 + "4,13": 0 }, "SheetStyle": { "FontFamily": 0 @@ -841,11 +902,9 @@ }, "Spans": [ "2,5,2,4", - "1,12,2,1", - "1,14,2,1", "1,1,3,1", "1,3,3,1", - "1,10,2,1" + "1,9,1,6" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -937,7 +996,7 @@ "CustomNames": [ { "Name": "项目菜单", - "Formula": "项目标题!$O$2" + "Formula": "项目标题!$O$4" }, { "Name": "项目首页导航栏", @@ -948,4 +1007,4 @@ "Formula": "项目标题!$F$2" } ] -}//k9H51fc9SHSahncuk/8RESM/bgvn4wbgSXtUTRitWfIagLONLf6iE4XEvd44fSRVYeSR0iq7CQCbEIAQP0IVQxh33nyjWIZIJsLFnAfX299SUgphWoya0S6rDptc0GGx77Yg35P2KdFPTwQPYi5iCM0mej16kNyEq+8Jm8osxhTdguVqlm/fbiDd0Ab4w3KPFNX8M5JoUmP3SR5hi6KlrpQJIFBDMBbKTwYMYaB56gD+aGsnP+Pnqjw8oMw2TFEBviT4pDbXtKaHm/EpAh8EUtzqOKKIJN1IBrBtD/83Ka4rDD+Ec4yUEf0Xvu5ihwkVi3oeM28q1OTqih1fpyCtZTGNCFsSuiL+XTYGEUMJ08KGKUL+2EQuGs8nViVoxzOmdjFjlFQnASi/JduP4AGktKNKZTBJHPK/12apCjDeuymwIxuWZWQEVYW/BRGE13YZFf5TZdIF8+5mBSGvDqUmdXHyTJ0ZKzKTK4z7S5n8ynOcT7YzUkKSOMT4soW1o7idl8sVRxJ19ADoibbFgOJrVrKlIV1aW8A9HjKY6BlI9NNXjT0dsd0ThSiVSvpdhzLc6aPofZUf4ltk6fvGPxREJV1JahScRqy8G+EFgBME9ZAZLCQVjE11nB8phm5i3pJzsYMh8LEYMktwtxkYpNsa+dLOo1PeZZ9TAJxXgh4/UrJVZSpuEtF1KOJpdDoavXuw9dhNHMw97P8886gKKCjBZpqflcyo41Hd8CGBPYFhRIrFQr8Yfs+e70OPvaCjqqbqZe1UE7rXFsxonEqyeNz+flagXu1o/yE61wZIG8mbfz+UM1fOSEUTnr1fGJFDo5ZxuLivdRvaLloQ9b1KqtT7o6vbQ2dBrHe2ckwbczxLVGzOJjJFhBFyaZbxfOtMxLUhZ2zdtmEKQhcLU8uawgpzEQ==|920 \ No newline at end of file +}//0opHN4POiHCdykBIZmikZa8CVKaeTC1sOjCq+EEixxrZ0E1dghYg7v8AbdZQd+6n/cdeR6n5DroUe9KXOX1JZjfKep0FoOzVI0CsPynefya7OvPXXvGaK60A1I9xJPWMCyGFfq86I679RsfXHfjCGcwplMPbOl+qklqoe4/Je+KPmvIdJXsHBuAebWhfbz+YIMI8w7OJYBS7IuHRhsy0tvXkiwPrphKsOW0QQi1FDEyGvXXriuZjHCB4lrjzyiHtyx83Fm3Tp5LqDZ5jpq4j3/kIvhDkyUDi6NIeADQ1WhgPNJTJ2TYeBC8OOg55M/RQcgKr81Ga50I6YPY3MLRMtPNI2mKbr9xnW60e1KE6dF9qWCqFuSxuMkBj7IH8H3oN5nTVBpaRBlAWLyjLm6FBa35pt1vWM5l+YbfrFqHlq/AfsMebY06BeeUDHasQoTFnC14ODkzOfuEdOR4SVAOIiiLcMcmHB1B7IFzVyfG9HyemrhZpuf/DZbe8WY+Cb/HORlgA7ZemcapNeCl6+LskOv7MM6YkELHNz7bZfFJOO0XkOkCRKQpA9/ER5z9J3wsX7aEp2gOljTG3iMH+1fnFzNaJCchRI4G2NR6NvCNh5fH0rEcH9d2M7CDJ34zwkF85EH7yKobqYAw9jI05v/HKaiZFhc0FEntoQTB9T4kUyDXLQnRUATCn9QS2S9qlFmrdqN0y5VWUe4HWaZEF9mTOZ/EzbtFMPXNuc7m+wbSh0HnhNtP/UhHio4aGunkldnpgXvG5FGvzabVs8xBhef/90qwjHIeQviJlJtiLUORG7kpUD2u5wcxFPyvphP/ZJz6wMYmjvU86T1bRJHfak30WXKLXieoeWA9EFpZfR1ABjbcO4oVnfLWKRqpkd20ATCq6lVrwAEeHgB5YqBuFag/urw==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目标题.rd b/Pages/项目/项目首页/项目标题.rd index f1758d22..651c7320 100644 --- a/Pages/项目/项目首页/项目标题.rd +++ b/Pages/项目/项目首页/项目标题.rd @@ -5,7 +5,7 @@ "CustomNames": [ { "Name": "项目菜单", - "Formula": "项目标题!$O$2" + "Formula": "项目标题!$O$4" }, { "Name": "项目首页导航栏", diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json index a707e657..a7eabe18 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json @@ -1182,7 +1182,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "d764697d-bf08-42ad-985e-28abac497519" + "ID": "e4e1771d-aa31-4ea8-b239-990dd3ee4942" }, { "Condition": { @@ -1195,7 +1195,7 @@ "GUID": "d8ff18bd-467c-4a19-94c9-8a5e5b252b3e" } }, - "value": "3", + "value": "2", "compareType": 1 }, "CommandList": [ @@ -1208,7 +1208,7 @@ } } ], - "ID": "98c2baae-a4cd-4f51-97d2-a2ad5082a8e2" + "ID": "ed8c3c2e-b9d0-487a-ac2f-92302498c535" }, { "CommandList": [ @@ -1247,12 +1247,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "e0a60995-b2f6-4d2f-8940-69e8eddc4760" + "ID": "ee70116e-271f-45a3-a1e2-9098700b3609" } ] } ], - "ID": "29624ed2-bf10-481e-a369-2bc5ba06f926" + "ID": "e732691c-eb9d-45da-947e-9a65a2af751d" } ] } @@ -1645,4 +1645,4 @@ "Formula": "任务列表!$K$6" } ] -}//7eim8fiuJL0ndNXVGgCMEkg4dRzcoQZ5yzHgmswn/wjPRihIeSBavlHGTaGUTdSSTl/F4VjmUbhQXhye036GSINDakXvsT4V3kR3QGKIdX//x6zYhrHrR2Uut6F3J5L3FRVdYMe59k/Dj6F8oztjoxiyUh/pPbv/+R5rUMZ97X9iueethn2Fw6Bs0Bel0QSRp5KxBeLHpR3EbBf/UojN260Z58xwRqMFgqA7lOJ+nOugnMOPt30ROvewI0Ft+lojjnGNRtxBo59MRo18aUsmxISzVEDRVlagBVgkIV/01r8qgNTus4nLU4q+KOlfoAtqIjevHfbLL2IVryAif+vCux8t99ybvoXLPclNtL4FoCx1vHs3aFG8seOTnpasJT64EzRzb++oA2YZJPi+hEei4jt3rETQxZg7WmbOO3drksos12axoLeHkMU138G/0ixhGVitxyWb204+SIGOTRMcHGQXSJnKSouHldfGDSnX9HEwfNCyplv3CfMVJgLW1QnmkVCz4hLM+1Lt2NX36PXc57IVnfN6oPRy1+HNFGMYVwC6u+m4q4zMsB6To/kcasV2xxYDXE/nBS+Ff1Tyr7S087pHsk6BhKAwIzz9HeXBA0UwMHSXPWWNePT0kKwJBJWlJCCRUcF6TekNMMk56G7j7VE5AS9U0BvCKnKOu4MrAqafoKu+xRRp4avaj68gHf+jTfU0ZOYoBjYvO767wJe2JLxr1LtvqwjvRDyZRGMwpx5Fbys1G+S/TbVirIpz6xgEPPrPjBEMxsY1aVCVwxQkIEA6eHihbp9IKO2YB/qOcSWz5SzaAZ666PldtP6sM+Ge2tHYhvtwfL9InkEXuM8qaVj4NweC005l9ZimeYZUvrSIeXjH50xPBmtZpkf0VSZ1fYOkpBc6d4/uaoD9A2trZw==|920 \ No newline at end of file +}//Ae7RwdSkR/4esqFYSwyS/x/qGzU/eXdI8myAffo/KRVfE8kWYlwYoRo4etmQlvex8kcPnTEM2lvO7H+PEEjnBETkmQEE5jA/x8QstWqrDtzYOZiSEqxBmWe6IW8TSZCA7GKZgcWEeSAOj/Zpl3umKXWZmNK6+XMSX8tavRgR+u/AYHkqbJNvrAlSxk14k2WxIRnZUDkcGRiCMBDwJBrKudO2k5T3uIBM2zY63wxQ+bEvHXpbrcpnM1ZvCdeTus0zyGfpVwlD44sGqjcuW+eugG2evrlAXsziTGl3H8sp6xZ2NQVYj790VKBPdtzdcsA/vXJRTVcFwGz0RUXBhH3yHVYclQ0E8Zs2AB55jumIYU27myk4+ApKKOsHhGQO/xT3fLUTo44xYx8RDkVhw5AP4Tn1HrV4c+k4Pcw26M+Hu6sRp88m3a52TDqrAjWP62tD2RWDNlLhLTIhhbaX9g4noUvCvdYf8w0AAFsqTEgIS9exjpcKws/FldYQYDyjYL0kvj8se/M2ejlNBv/Clo55A7oHyHNU4JX7GfVqrl/eyjCcL60IBNdmmOhpYhsCV3nUgSWphsGa7/JnXf8x7dbBItjiYe49AF7rh2mvQUcLr+b7YFiHqvRt5LpgiDoZd0owl0e7ZO7aB37dRJ4UrdcwFCbFam2OAeejUhuW5R07+0m359DXob43KOxjjt5mKA2W5HBYrhi9dX5RZ87Ul2z5kvXd+RuscKeqT59rLO78nVXPQdxrzE1HzCCqdbQVVhStPs4ywe9rmsevSA2/I1XFHTMzq5HqGry0Z5OGdRHQ7XIXt4wnT7iYsr4m7Nnes0ezVeI6VHyZEqupMZKsR43UPg8FYS9Pj2hwJT1OKC0tIa1ZtoL2m8XJmUOomhqX2cVjKYKDZwHwOCXBdiDJPsKdRw==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页.json b/Pages/项目/项目首页/项目首页.json index db33cc7a..09d1ad18 100644 --- a/Pages/项目/项目首页/项目首页.json +++ b/Pages/项目/项目首页/项目首页.json @@ -432,19 +432,71 @@ "TemplateKey": "_RS_NewLittleRoundCorner", "CommandList": [ { - "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", - "CurrentRowInfo": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "ACT_HI_PROCINST_View", - "ColumnName": "ID_", - "GUID": "2ad53c2f-eeed-4e17-a245-d163cb546c7a" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目首页!立项流程实例ID" + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目首页!立项流程实例ID" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "ACT_HI_PROCINST_View", + "ColumnName": "ID_", + "GUID": "2ad53c2f-eeed-4e17-a245-d163cb546c7a" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目首页!立项流程实例ID" + } + } + }, + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "ACT_RU_TASK_View", + "ColumnName": "PROC_INST_ID_", + "GUID": "6a949dd0-e212-4108-9010-17ad1301c785" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目首页!立项流程实例ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "ACT_RU_TASK_View", + "ColumnName": "ASSIGNEE_", + "GUID": "ce34c4df-9e96-4010-8b28-79f43278ee49" + }, + "Value": "%CurrentUser.UserName%" + } + ] + } + } + ], + "ID": "a4ff36b6-93e4-46e4-943e-a225ddfcc79f" } - } + ] } ] } @@ -677,7 +729,7 @@ ] } ], - "ID": "e565f17e-1f0e-4b8c-b89d-31240c08d9d1" + "ID": "e0641ff5-84b0-4796-ab12-6d8263fcfe39" }, { "CommandList": [ @@ -697,12 +749,12 @@ } } ], - "ID": "f72286b4-3c48-419d-9225-03fae8d184b1" + "ID": "75d1205b-0f19-4687-94de-5f31c084de96" } ] } ], - "ID": "23a469af-16dd-4dce-abd4-d18a42dfb2fb" + "ID": "46bcce85-afac-494d-8c8e-7f6ea844ee3f" }, { "CommandList": [ @@ -749,7 +801,7 @@ ] } ], - "ID": "9c7334e7-4499-4ccd-87b4-3b1a319d8b34" + "ID": "78db0a1e-638b-4fb7-a4b3-c566be082039" }, { "CommandList": [ @@ -766,12 +818,12 @@ ] } ], - "ID": "fbb90bad-4dcc-423a-9918-f3787396fc0a" + "ID": "338a8fcf-af19-4b3e-af7c-cc00557c2206" } ] } ], - "ID": "fee5cfce-ecf7-489e-9cd1-5a9927bc7c8d" + "ID": "4619d24f-5cf3-49ea-8107-5c000199b237" } ] }, @@ -816,4 +868,4 @@ "Formula": "项目首页!$I$3" } ] -}//YGDqqmBtf57h6HhdW4d+NABID0dLPtPrWgHMNLwvTRgHFjB58kOkDvL1cd+e8YKwLxoqDJUzDckwS7qdk0nHtnjk9Lx324S3SOZsRWjdVSjiOWiVyvA56gdssmKZF674y+3uIl2m8nGU8arO2FUh/iJvk69j/AvzLy58qDF8HtLSucKnVBhk6qhFfpQ2GE4tpNB7bj9Uk6oPVR1IQUxmtcb3QGlSSWnS2gKCi6GVvYLxYxGenrTZw/2VoXc0GYM+SoUlPoJK4Omqdlynkx6jY1Qoe1sj0R3fYqDnSLQrsNRWJK4vMTY0TRnDkina9lCPPlDJtFBR0xzuLHzg8X7aEa54NudNUpCdQyaivHgry+Rdirqy408M0oqY4DnjapITTZ4g5VdN3p8EXhXGd3EBEsrE/DjmcKF72rp4SE38KYtLoIRGUb2pIVTzt3xuynmUlNUzcuyOKzc5r96SoHcM21PBx0LpHrzsiJ/5GgEe77JQmR9Mpqk25oza/jXonRaxDGuoxBVmpQIqOPOcG5RbZogfgexKsTWH5ZixsgewFVQYIQ9Y92nPwVdKcFiL9RPeKcpbNm00AyTs223CoL78vO5kn2AwwMW9PoIB9LmGCrtG47O4JwnMwWe6MJaPUqfm5PjInrhUVbs35SN8KOmvngXS9daHpv2IPfYxjrTyvtQ/q9Taan9kk0+vesgb4isDhBxM9tMNAARrPgCl+Iv1fuHAfMUPnL6kW6bmefTleTYj3Qrz2yWgHcVBjnxHQZPo9djO4lKEYkCtWe4VytZ56pLia3ylIi76u0BOm6dQtwct+9iZAmS5K6SOc1LDlaVjSnvm8YUdu+z5jS1RsoDqcypbJrZRacfyASx2eMD0KfTYubvToC3gpyWai51sRJnZST1/919O/r4SsRGD/qI4Vg==|920 \ No newline at end of file +}//1kH7aIyGKerb95gJC22Hrd+QFR3m/cDrherDwrnSY4LomKKg2BOEEepYZCOXvNKjkK7VfYBnD95CoLCqaIWLNb+Lca4v3zHWGIefvTWkErB/XQK3RdBvEMxu7bUAYe5PSx7foiXvcSSd39Wtqz3h0CAei6aluJx2aCIBNVXCIz484tBRFidRqnAfCjzW9zouxq55t30kylti38aC3f+tsNMQmmHyEPzgjN0z8eRRWP0iRM0Q/GB/IjpCuYbSJBZ72qzlh5rIOP3tDuzcifSzuXXVNRO/TrdvVSnDPR9mKxPBLJj5d5YHOE/L2xcmzXSP0nUp77dEyXY/sr9w1LAOTDREE8xvafRNe7b21gpYTytB7txDn6XuF9QXPIq7pqvCe+oEmCWuiadLQyDzdJwgkKISBpW4PsRKmYftP30hzZy8gsq2HeBUH0EvpjdVFQq7U5E0U3ZnaoDRenazTVNhqfx2m+KqIDGqiz/lYljZ/OsGxOM57T8lmgekAS+mG+FWnIrtD2iTKR7QaPqW6C6kYPbvwt/LtW2xnYsrNkyXaZt4UDLSzbfxBz5O4/hVVTeUDMg7HtFtL+/C8lEhiI1RDhuh17EbNVB26RHtD5X8D3MvrY0if/yhPu2qcEj9m2b4jcGzuwJdrg+CouMSC9eWeP6diTyV/gk9jkWti6+X2hZ6A/6J/4vrIsoYT22J2qY+TAZIOnWDV/TUw5/X+MkLqpyihNwhJxc38RKIhRHazkwz6/Mg217tGqdj4DzfgKLEfpwICqgWwG49t4biDlK/34MhwYogpT6MwrgUF46Eslt6v8C7uvkIwo6qxWh9ktbjKtTdvd2DQ81IeYctUt9CQX9uXBsbIRa3jTVvO9vJzmNVVTaQM4v7T5HUPMRKdmbSTIp54en2r1eSD1Kr66o91g==|920 \ No newline at end of file