diff --git a/.collaboration b/.collaboration index e6ea017e..6031f7d9 100644 --- a/.collaboration +++ b/.collaboration @@ -446,17 +446,7 @@ }, { "ModuleName": "PCPage/处理反馈工单", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-05T15:46:33.9415523+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目反馈\\处理反馈工单.json", - "Pages\\项目\\项目反馈\\处理反馈工单.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/反馈与建议", @@ -588,17 +578,7 @@ }, { "ModuleName": "PCPage/任务首页", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-05T15:44:35.6525411+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务首页.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目周报列表", @@ -746,17 +726,7 @@ }, { "ModuleName": "PCPage/项目审批", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-05T15:38:58.374853+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目流程页面\\项目审批.json", - "Pages\\项目\\项目流程页面\\项目审批.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目列表", @@ -2416,16 +2386,7 @@ }, { "ModuleName": "ServerCommand/创建项目审批待办", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-05T15:43:34.3327543+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\创建项目审批待办.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/删除钉钉待办", @@ -2445,28 +2406,10 @@ }, { "ModuleName": "ServerCommand/创建任务审批待办", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-05T15:44:25.538854+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\创建任务审批待办.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/创建反馈审批待办", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-05T15:46:13.9182353+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\创建反馈审批待办.json" - ] + "ModuleType": 15 } ] \ No newline at end of file diff --git a/Pages/项目/项目反馈/处理反馈工单.json b/Pages/项目/项目反馈/处理反馈工单.json index 5dcf881a..e3591ba6 100644 --- a/Pages/项目/项目反馈/处理反馈工单.json +++ b/Pages/项目/项目反馈/处理反馈工单.json @@ -806,17 +806,34 @@ "ConditionAndCommandPairList": [ { "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=处理反馈工单!K15" - } - ] - }, - "value": "%Null%", - "compareType": 1 + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=处理反馈工单!K15" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "ACT_HI_PROCINST_View", + "ColumnName": "ID_", + "GUID": "0624ab9d-08af-48b5-af3c-07865015a7bf" + } + }, + "value": "%Null%" + } + ] }, "CommandList": [ { @@ -873,10 +890,9 @@ "MethodName": "Refresh" } ], - "ID": "b5f8f7da-4111-44d8-a2c7-44495593067e" + "ID": "021adfec-9167-42d9-b48d-1f3e41ee271b" } - ], - "Disabled": true + ] } ] } @@ -905,6 +921,66 @@ } ] } + }, + "14,18": { + "BindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "ID", + "GUID": "06c65a7a-2d90-472d-9cac-7438b2aa1bcc" + }, + "CellType": { + "$type": "Forguncy.TextCellType, ServerDesignerCommon", + "SavedValidators": [ + { + "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon", + "Enabled": true + } + ], + "TemplateKey": "_RS_NewLittleRoundCorner", + "CommandList": [ + { + "$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": "需求反馈登记表", + "ColumnName": "ID", + "GUID": "52ce92f7-62b6-4fb4-b165-f4c2718be09c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=处理反馈工单!ID" + } + } + } + ], + "ID": "296b862f-98e4-4928-bd03-a1228a8fe682" + } + ] + } + ] + }, + "DataValidationInfo": { + "IgnoreBlank": false + } } }, "StyleDatas": { @@ -1185,7 +1261,8 @@ "14,10": 9, "14,15": 2, "14,16": 2, - "14,17": 2 + "14,17": 2, + "14,18": 9 }, "RowStyles": { "5": 10, @@ -1223,10 +1300,60 @@ "7,1,1,7", "7,9,1,7", "7,17,1,7", - "7,25,1,7" + "7,25,1,7", + "14,18,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "PageLoadedCommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "URL参数ID", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=GETURLQUERYVALUE(\"id\")" + }, + "ID": "ee23fb8389764943acfd1f918bb4ea8f" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=URL参数ID" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=处理反馈工单!ID" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=处理反馈工单!ID" + } + } + ] + } + ], + "ID": "7997dcc2-ab91-41c4-9961-2db21cdb208a" + } + ] + } + ], "PermissionData": { "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", "permissionResource": { @@ -1253,6 +1380,14 @@ { "Name": "项目ID", "Formula": "处理反馈工单!$B$15" + }, + { + "Name": "流程实例ID", + "Formula": "处理反馈工单!$K$15" + }, + { + "Name": "ID", + "Formula": "处理反馈工单!$S$15" } ] -}//V1afEwQ7isdgL27I+Ub2FhsUfDFto4ZPNcLraW5E0dogUj0RHV3xFEA68aDIBSMS4mxaz104aUCeiWKsWsGj34mzIEX9rxlR9q+Kcchnv5NeXQiK++XkO1mW2b26ADqKiSD7SCfv//vuhWueTKkyPlr0auYBTZ6EhkBgFd4lpUXFMQdRVt3oRAn6thGEjwc4da8rWgwJcBEAiquHMAPmOwAVcM8y4UtOA5mvEImwXF5Lyf30I5JtV7n5CYR4pDp2Zl96GEUxqkD56yIAZsxBwlT2B9HLuloLbcrXtyCDALDpk6oEA/08d/XoBQEOTHwbyhE63rZc17G8XDx2lwrnj6foIouYyK6TmZ0EZZ02QaV8NjHGj5SDsWZfH28b7zrg5sNQr/ZAO7T4IqNJg59lA4Y4BXcWJ9WJJ1xzxSWm66JvIcwgXTM0uhc2scvjpNz4OU7PrDCcJam3JK8nhcG6IxYpsWuXjHlcKezAMgPq4zeTrolinMImFaVbU3jQeP/Ncvn03GI7HJS9r4G81h+ZCVdXfRULGKq7BMk0fq9oAoKNTWxy7HeDp++IIauriBy8aZkEFH5Wv8aBLH2WTZO9Tf8+42bTu3R/NrI9bjLcXAyULGXV8hft6CRnPQw/7ImcXQ/kSKLKfDF5UZeQaFVioXMwECOMYV1g1CKwNNx5GTvtkgHf7mLThjANe6aXoOgZJYk4j/DNMl/3z/122zDtqUTQKJUitSK6cGHn8xG/YpL40pfYUIsYZplyN77uu7MKgX57dNnT/r7FHre3L+9Y0rowaLwkWPICB8Zl2saVUt/WNufLbtqGrqc8p4xRGkDu2br381t3fvDz+KQasEEzQAQo+vDh2TdmW+RqQFk5B3cnLWSWpLHAZmDSfiOekxxB0xLtXjnUZh0eFv14Ke1YyQ==|920 \ No newline at end of file +}//78+UZ28xwu7snUL+UpjLkZYQ6FRRgOjqoDc3teVXUR2aIUqJTKpI6gpfQW7bMSC4DEJyp+HTbNAM2xBEdNddfN4ZPpGm4tTSf4dyC7XK1769KTVAl102Ek8KGwlQQ21Xi+FPKt1v+RN6ZoMl/CvniFCfzJVyPyIDnYiCYn2xRsl5ElTIWfPs7ZzqJLC+g/ZkJ0ovbzCArT0vUHBU3jw5tJPIyuVv5nDKkKV/70Hg4GoEbSgBm0wNmXYvQb8NIFwNE30aROtKQt4WAv6wFyBP6MXpuQSZJW5xFYfl6FE5miozgcm7otpJxojfM8kbYAug6aNW0B5MzdYgNAHn4rwnadEshx0fAmgO9n4VYYeq2o3rXlt4E5jIPyIgq+9rt40jZ3qGXS+uGQwGRg5JmlbBBhL2Od8QoTeDUwg9ycFWg0+IXuJJ8JjFKwRPNFaztpvb3EK66fvbtuiTF16k8eAD2SBr0lLkHrwRhC091DBRKCRh3S/pW9/1nQZ/CZrPyEcqrRbgq9BE6uzVBCMu7A4ampjd0eFtDtsOCKdtkJd2P9UPJaur2R0+a9dbnAqtPgHetLnUBcLeMFsx95qOh+5EgKOw6c6Y7Z3ZrUOFQcZJdeBMAzu41tAtOqx6dKhO8bpvZXiLmAgevEdG3iQX/NQXyyGp0/pjvQVyhLhUWhWUuTTKtHP53Nyg/t1BXwo4Qkcc39DC5lqPNXI8zNwdP65O/L8+dPhMxHKBlrfICILod0GaJKPcLwVa4FgtQY3wfuAUOKtCdpnvgaB33yprcESCgPsUGC8+UqWJRQw5LWEPIbE7SMXyXSIBilvnm0gevQwupddj245sVTw7dMbFaMoI6o5jC76Wm1cxDJS4D0P7+se2cdASamlwd2C7+Jp/7TJHUqvZI8IMdoCMwAdEnHK98w==|920 \ No newline at end of file diff --git a/Pages/项目/项目反馈/处理反馈工单.rd b/Pages/项目/项目反馈/处理反馈工单.rd index 19f3bd37..86a15ff0 100644 --- a/Pages/项目/项目反馈/处理反馈工单.rd +++ b/Pages/项目/项目反馈/处理反馈工单.rd @@ -10,6 +10,14 @@ { "Name": "项目ID", "Formula": "处理反馈工单!$B$15" + }, + { + "Name": "流程实例ID", + "Formula": "处理反馈工单!$K$15" + }, + { + "Name": "ID", + "Formula": "处理反馈工单!$S$15" } ] } \ No newline at end of file diff --git a/Pages/项目/项目流程页面/项目审批.json b/Pages/项目/项目流程页面/项目审批.json index 2feddcd1..e9eab1f8 100644 --- a/Pages/项目/项目流程页面/项目审批.json +++ b/Pages/项目/项目流程页面/项目审批.json @@ -358,37 +358,7 @@ }, "CellType": { "$type": "ElementUI.AvatarCellType, ElementUI", - "CommandList": [ - { - "$type": "CropperImg.CropperImg, CropperImg", - "SizeType": 1, - "AspectRatioWidth": 600, - "AspectRatioHeight": 300, - "CommandList": { - "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", - "Commands": [ - { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目审批!B2" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目审批!图片文件名" - } - } - ] - } - ], - "ParamProperties": { - "filename": "图片文件名" - } - } - } - ], + "CommandList": [], "icon": { "$type": "GrapeCity.Forguncy.Plugin.ImageValue, GrapeCity.Forguncy.Plugin", "Name": "app-logo3.png" @@ -533,12 +503,12 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "1e253a2d-eaa3-47ed-8d39-86c7945c681c" + "ID": "85162a6d-9530-42d0-8746-f2bded6e3c63" } ] } ], - "ID": "b5a6a6c6-875a-4f86-88f2-e354aae83e4d" + "ID": "6108a3d7-a86b-4f41-9ecb-431c39c00036" }, { "Condition": { @@ -564,7 +534,7 @@ "MethodName": "Refresh" } ], - "ID": "e362eb31-415d-4332-a1cd-462534878fe9" + "ID": "e54b44ce-0d28-42b3-a28f-464ba28a6b5f" } ] } @@ -1702,6 +1672,161 @@ "TableName": "项目表", "ColumnName": "ID", "GUID": "f5438dcb-857e-4cc3-a805-f1b53c1958cd" + }, + "CellType": { + "$type": "Forguncy.TextCellType, ServerDesignerCommon", + "SavedValidators": [ + { + "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon", + "Enabled": true + } + ], + "TemplateKey": "_RS_NewLittleRoundCorner", + "CommandList": [ + { + "$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": "项目表", + "ColumnName": "ID", + "GUID": "efa70656-7fe7-4e27-be20-5f3952cc6eb9" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目审批!项目ID" + } + } + } + ], + "ID": "13d42b43-7484-4555-86a9-ef9bc9f1e93b" + } + ] + } + ] + }, + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + "22,11": { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "立项流程示例ID", + "GUID": "770e5590-ff9d-4876-88c8-b4f22713a50c" + }, + "CellType": { + "$type": "Forguncy.TextCellType, ServerDesignerCommon", + "SavedValidators": [ + { + "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon" + } + ], + "TemplateKey": "_RS_NewLittleRoundCorner", + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目审批!流程实例ID" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "ACT_HI_PROCINST_View", + "ColumnName": "ID_", + "GUID": "61a0552f-c5ce-4237-9334-ef6c9f4a75e9" + } + }, + "value": "%Null%" + } + ] + }, + "CommandList": [ + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "ACT_HI_PROCINST_View", + "ColumnName": "ID_", + "GUID": "e95678f3-a0c3-4b1d-9714-f1773e297cb7" + }, + "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": "e9e8a132-ee21-454a-af7f-aee7e3048acc" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目审批!流程实例ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "ACT_RU_TASK_View", + "ColumnName": "ASSIGNEE_", + "GUID": "fa7317af-44a0-4a2a-a331-d0d752606ec8" + }, + "Value": "%CurrentUser.UserName%" + } + ] + } + } + ], + "ID": "0d8855ac-25fd-4b94-9fff-32aca7a1bdb4" + } + ] + } + ] } } }, @@ -1820,6 +1945,9 @@ { "FontFamily": 0, "Foreground": 5 + }, + { + "Formatter": 12 } ], "Types": { @@ -1835,7 +1963,8 @@ "\"严格\";\"宽松\";\"宽松\"", "0.0\"小时\"", "yyyy/m/d", - "0\"天\"" + "0\"天\"", + "@" ], "Borders": [ { @@ -2184,7 +2313,8 @@ "22,2": 21, "22,6": 22, "22,7": 22, - "22,14": 14, + "22,8": 23, + "22,11": 23, "22,15": 14, "22,16": 14, "22,17": 14, @@ -2227,7 +2357,6 @@ "14,5,1,6", "14,16,1,6", "14,27,1,7", - "22,8,1,3", "3,4,1,16", "1,4,1,16", "6,1,1,4", @@ -2240,11 +2369,62 @@ "8,5,1,6", "8,16,1,6", "8,12,1,4", - "1,21,3,11" + "1,21,3,11", + "22,8,1,3", + "22,11,1,4" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", "Title": "立项", + "PageLoadedCommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "获取参数ID", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=GETURLQUERYVALUE(项目审批!id)" + }, + "ID": "7936d315496c41c0a9f157d4a660560a" + }, + { + "$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": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目审批!项目ID" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目审批!获取参数ID" + } + } + ] + } + ], + "ID": "8eda75aa-d494-47a5-a1c9-65dacf578598" + } + ] + } + ], "PermissionData": { "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", "permissionResource": { @@ -2271,6 +2451,10 @@ { "Name": "项目ID", "Formula": "项目审批!$I$23" + }, + { + "Name": "流程实例ID", + "Formula": "项目审批!$L$23" } ] -}//lcLYTm1O5Jg67BUUpaOc9edAgkv4cTRAzrherDlA8vr603/9ypoSpcP2f4FshMR9jI55p/B0kNVat6hWuXHIpxEZgBQ/aXhR4PqDZg33NZfY3oPIbaDhd+DDElh6v34HxhAsZP7/jNsNdWZfF/lux8EXsYazlX/7H0bHYPupbkDdMiPTOB+RrQ8RYhdNDoqRCed9FHTR9IAce+svGR0uQM4K8MB9dbevctqT9KNqXvHEL/8kXJdnSthshO04+TY+0zXf4xFGur3dURDgCUv1/UjVLsZLqnUGWvlYKQcgivpZKsVzvitaFDVgbLYI8P81Lbi0z12WuVsXPqaOLmv2v2qaX2XTEuYKgx2vGGy+VGeQUcTFfmSn1ps272BpI0Clpa0/vJCDvuYbl3d3NCDxg3m1JIyv7y1LsbIMfN64f+V2RK0+HhJOxtF7njz0EYAnuBHpZVqj29lworDHH/UKQdT2Uskjwjiqw1+4k0PfIis51R79q/2UuoBPHAEwCVmmDTR9oW5yAw112PyeJyOMdvrUk20CGeud9ADVrIVih1+h0eE9Ap70L0x7nTysy4xkNCT/f0/1KNYcvB3csu/tLv2x3URapPqBvXMEiMjVyV7DrMUSx1wx3Bs2snusAn8LeGkB5efsnENIkK3B4s1cdlCIuUkGfkuUzAUw9Z/riiJUKqQCaxSxjtk9OWLuiNrjI2WcnT/nDdpTg62G4H6wMs5KK0PrB348OG3dGHGX4y5fDztExNgC5DBzPm1Pphp0APKP4QuyKU6d/rnwmaztedRpiyrMfFFq9+BXLJQCmfbJlJyK0a+fcL/eChOhZCZqlENhd9rNUpOl6s9prN7ygT5zlArhVaj7mEZ0q25pxFVHj1umVdupGYSlGZXd/ycy3jxjyA3mprIUK99TaYWw6Q==|920 \ No newline at end of file +}//KY0oTw+owylO9v2IomFV75jdI0373065I5JaJJV3l6vzdMTFCLrkUfkMGFOkx3QmzQ8NTa5dJAcr59sfY9kM1e86Ra9IoEMQoEFLbTQ2QT2e4MlsFKzxNjUirdqRtEdXC94X4bixhimTcxHe167KtK5iRn1F7tVY1+cHoVYn/BM8sD/+xxhz29GqoJ7YK6mqpYBG7EVbU6+Gt8Pcd7fa8ulT7pkzkizxjViwNrdLjhSO7sI+FQPq75V5Gv6JrBvZ/lvlmKmXnbm3kG0RfxV7HOcSCOKzal8ZheJxUB2hUvScKB9+XS2yOW0GBjIuyD+tCjUJGjMr1XBWMXhFnAUXbFmUVC4zXFEtbHWpzqSMqawp5i/yVZCxsvx2lrqrfwgu9NbgukXe2WpePFp7TYrnBhWN+lRTBC+F5vnLFYcoZhQ0FCqzLjen+WG+i16f22Gq3WOdXMaEIqexXnr9NMijTlddYD1f16yjhrV7EnExCod14w5z/xpOQFErShsjrtd8KCKRaoTR+EUIwukQBjcuVjmZfeT4n8NuZ/zHNK7GrLuBDKXWT/zFp+e98BeDiqrmIuancTdymneRRIdFsoi78lzNHO8mdUrgCnU2ExU6bjnqSzwLxflgIWiI+vQtf0q+66zJkpdNnpTwQXYcF1HFE740sh+h6CCwt9YUzEWFT57/B3fIZNnGZucKnB/lDtVoCSLF1MhUccHYPwmfFUPEYHwofxGr3U9fxx0ak2tFNt1PoiKTlB/UWDq5z748kI/ZaUBgpCQhQ31SZ1cquFOpVQk95ajw5Dj3G3A7CXo2sB7/QOOhQo5HRwEGw1COcdgzikUSyIp72aoIXX36YVvbgkyWCTnLWrA9+yLYvOryXPOOJgroAdm/TgJwWv+zUv6fBcja4HpS8kOvc3diEGp0Pw==|920 \ No newline at end of file diff --git a/Pages/项目/项目流程页面/项目审批.rd b/Pages/项目/项目流程页面/项目审批.rd index 9001741c..88b5c8f8 100644 --- a/Pages/项目/项目流程页面/项目审批.rd +++ b/Pages/项目/项目流程页面/项目审批.rd @@ -12,6 +12,10 @@ { "Name": "项目ID", "Formula": "项目审批!$I$23" + }, + { + "Name": "流程实例ID", + "Formula": "项目审批!$L$23" } ] } \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json index 95a2c215..51a4c120 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json @@ -344,12 +344,12 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "3673ef22-3133-4f60-bdf7-d1aa86708234" + "ID": "81ef122f-2950-4ff7-8138-93a40ba12483" } ] } ], - "ID": "81e75801-a309-421e-8200-4aed9d7b7a6d" + "ID": "2a3862e4-5262-4c6d-a7bb-304650942a3b" } ] } @@ -397,7 +397,7 @@ "ID": "e2e848e0e72d48229c97757429d446a2" } ], - "ID": "1491d346-167e-48a7-9640-24700ec3aa70" + "ID": "cf781075-8936-4c5b-8fff-fb965a149e07" } ] }, @@ -611,7 +611,7 @@ "MethodName": "Refresh" } ], - "ID": "601fa053-27c6-4ddc-af3c-ac185c540922" + "ID": "9e0ad872-933f-4e52-bd4c-640cb5a4b233" }, { "CommandList": [ @@ -626,12 +626,12 @@ "BtnText": "知道了" } ], - "ID": "906eac88-e828-4482-b386-1b190a2f2e44" + "ID": "869fda6e-87e1-43f7-a3db-53d9e9e2f4d0" } ] } ], - "ID": "47b68c3e-31e8-4830-9cf4-81134489b816" + "ID": "f086f85d-41bb-467f-ab9a-dcd26b8eb68d" } ] } @@ -769,7 +769,7 @@ "ReloadData": true } ], - "ID": "3cd253c5-177d-43fc-961d-26933474cd6a" + "ID": "eb4b8480-9159-45be-b598-d8e59e8e5cdf" }, { "CommandList": [ @@ -784,12 +784,12 @@ "BtnText": "知道了" } ], - "ID": "8b7fb1a8-17a3-4148-b887-0f8742ac2284" + "ID": "db04d7c2-ca02-46f9-a3fc-d487d6f4c3a2" } ] } ], - "ID": "d84658c0-9767-4c35-8a88-8b6a948093ff" + "ID": "a40164a9-d24a-4d5d-b208-a84f309c9e25" }, { "CommandList": [ @@ -804,12 +804,12 @@ "BtnText": "知道了" } ], - "ID": "c06bf57f-5fa3-4939-9162-661b6243dece" + "ID": "f471af80-97a5-48f9-a306-0a4e96b31029" } ] } ], - "ID": "459d993a-7f46-4f29-bbf0-484382e0db3c" + "ID": "c3a7af8b-bc80-450c-b841-69dc7d4d00ac" } ] } @@ -950,7 +950,7 @@ } } ], - "ID": "43968352-e94e-4fe0-b4c6-18f47986ed50" + "ID": "a8039e33-ad9b-4233-92a4-59f1df7a3933" } ] }, @@ -991,12 +991,12 @@ } } ], - "ID": "08cd1527-c054-4059-b000-1f248fad453f" + "ID": "b96b7f86-7ccb-4d49-b02a-3fad3815228b" } ] } ], - "ID": "b9431ea1-a094-4929-a4a2-1503734231a5" + "ID": "74535e69-e20f-4c95-9d93-ea5171ccb349" } ] } @@ -1057,7 +1057,7 @@ } } ], - "ID": "4651f92e-d198-4ba8-84e2-f3a2ba5766da" + "ID": "e26ebf35-db40-4a3f-af24-2ccf8a5f270d" } ] }, @@ -1098,7 +1098,7 @@ } } ], - "ID": "e350c424-ffde-4e22-a199-0175c9d20e0a" + "ID": "4688afb9-b066-438e-990d-f28ad4d8afbd" } ] } @@ -1213,7 +1213,7 @@ "Disabled": true } ], - "ID": "cde64749-dd68-4f50-9bcf-367c1f2744dd" + "ID": "542cb12f-73f3-4e13-adb4-e0347e246fca" } ] } @@ -1391,7 +1391,7 @@ ] } ], - "ID": "e3136334-d68b-48ab-8949-8ddac4a51681" + "ID": "1d1b4b92-5585-4e32-a258-4169dd778753" }, { "CommandList": [ @@ -1408,7 +1408,7 @@ ] } ], - "ID": "d40892dc-7dea-479d-8367-bca78f568338" + "ID": "4271247c-4128-460a-bfd9-8e9088504e5e" } ] }, @@ -2076,6 +2076,53 @@ "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", "PageLoadedCommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "URL参数ID", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=GETURLQUERYVALUE(\"id\")" + }, + "ID": "62f31223a0d94f279f173ba2afbae7cf" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=URL参数ID" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务首页!任务ID" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务首页!URL参数ID" + } + } + ] + } + ], + "ID": "46540770-c5f5-43b5-b61c-468316057039" + } + ] + }, { "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", "FunctionName": "remove", @@ -2182,4 +2229,4 @@ "Formula": "任务首页!$Y$8" } ] -}//a44PaAb39NICI6islky6mXmdJkPfxDAdoFoSgG21kEQKx+QIsdyTesPx0Ap3F6+2+SOgLYUXthDOfHmc8bgZcNfTv8dMXOeZT69GBXb5H52GfN44QQrHM3aE/M6om0AUY4WSEd1eoLnlPUxEmv89fV4yBhhPYZcy6ziT6gDdu6bz1YKik9f98mP7QxZyqYxPqiSep/IZQIPVj2WLxsV38jaXrxTpGJ01jWT4DOoMvvTpuSTwPPILoVTEjotruMc372M0UnZOhe7TfMUqr9QskhNNAeW55EtQ4C7utIxFrAVf+E7YJY/IT53RW0O8wSsjFg5JdcgieNVGs+wx/6glk1YDYCbQjpHrInxUKwDceRllS6Nl2knpFOG97JNr46s52NywYk4ktDWp+JMWhu+g0LeG8SNDsTBvMsUg7y+ClSzCyO1sUaD/HhYGjwjX24Klp0+PCY5BYWNmwazkQTY4Svvwo3NmlOzZ0cS4GEIvT0K3dxj6k5z4VD0QVCeRe0/6+Yu0JZJhpnoyetQKIvIowywSeOgNWlcwNe26+m/kNZ/L5EotJesG1OMZqbGD69UIa2Yvb5k4IXIjUctkf9nsfDPEKDZlmy3Nc95w8/5bUgdX40+qkIANP5WKv1LP94RXGcP6fPtWuK9uwCN3LQvFc4I00cbGu7UZiBnMh8/rwMW1HqzmGbkxaTbqMMD873VI4+ik8oCz1SJpY0LiB/qN2On2iMeg9SrWU3nhmAqfIKEw/gb3nyXe7phiHy+CLPhbkKXx3R1/JmTh5kRwLaBbbiVnTmIP/onNb9Re4hq3vxf058olwW08xAqdLWNYQWwQqYNrUCsk89vQE51B8SThRKBh2kxBX2BrbdSSCEIUbRFJfOwLaav42NBAkezr2PaY9Fn7PYHSqU/w1TlsQ4bg4w==|920 \ No newline at end of file +}//T4MtLSOqLkg7tVRNXOSqZcMZIAavRY0pPCXyPpA22kPefih8UfkoxHgsUuV3kTQoIq8Luo+ZtkWXxqy3PA5A/de9maSFtuNDXrUR8o652ZzTahLnAWgIZgsf585Sop794cZPuL7lluwMBseNf7bx78nAQiKlwivYhnZJAAV6R2K/fE8KsRY7/r7o6dhYtQKPsshBUd9rWwJ9jSOrIGWGMNilo1kURXbFZB9QrniZWFaQGx0Zd36Ea00NCjr583EzuEPFiHOzeEdQiZxXsfcWHc5eJrnDt5Z1vPc7ww0RFC0HelyaQ4YY3mwE8f25BDrMA8Yw+rWc0k0TyMFaRntqZyos/QSKJqndL45F3JOR2t/fmtgudykDkvXqO4fIPQs5aW7PBTz415l9et0DDs0SZnaHDWst+KM8lZbHbIq4AGti2Nx7nJEZDfI2G6QrBbJHSaXmyR2ejtUIDRLzLc15C9Usvn8cXjN9UVzhiOHSmRqttnNmcSBG0JnrurBJfVsTUy6XNfvxHjrjKwh8kYE7Ql0DybHCfoxmyalbw+o+k8vO5ICFZlnyuWXo3uacMYZm6wNRsj6N7K9M/AflH7crETBnM4LDbwo3oTXbOSIxF9zQRYhXI55mewy6FU0t+xIaZRMHSJUbNmRpCbsyZreJ7TaYPI9ScfZRnMBcAzzeBjAPmRwKyadQM6DBolvWTkE8rMKMSLiifDNOYDavgODM648nXqmO7teWyD2fY7zyHoxocg5yMmGTcuebZk/mJyhmLfA0OW4m0vEYulyi9cHkitIfNtMg9g3UzdYJkFYIYa9rRH6KvuUGZCK20doPALj6wmD6J63aX+O8zNnLFpjqN4JghoZPBcTf5JUPTPUWPqJ8wG+63Nm0Os7JSjI3pmTV/FWqSi4oUKhnRxJ8zW9iBw==|920 \ No newline at end of file diff --git a/ServerCommands/钉钉/创建任务审批待办.json b/ServerCommands/钉钉/创建任务审批待办.json index 912be747..a37545cf 100644 --- a/ServerCommands/钉钉/创建任务审批待办.json +++ b/ServerCommands/钉钉/创建任务审批待办.json @@ -118,12 +118,18 @@ { "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", "ParamName": "APPURL", - "Value": "https://www.yugasoft.cn/clue/%E6%B5%81%E7%A8%8B%E4%B8%AD%E5%BF%83" + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"https://www.yugasoft.cn/clue/%E4%BB%BB%E5%8A%A1%E9%A6%96%E9%A1%B5?id=\"&任务ID" + } }, { "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", "ParamName": "PCURL", - "Value": "https://www.yugasoft.cn/clue/%E6%B5%81%E7%A8%8B%E4%B8%AD%E5%BF%83" + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"https://www.yugasoft.cn/clue/%E4%BB%BB%E5%8A%A1%E9%A6%96%E9%A1%B5?id=\"&任务ID" + } } ], "ResultErrorCodeTo": { @@ -165,7 +171,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "钉钉待办ID", - "GUID": "eb083e3d-be2e-43c4-96cd-53d1580c46db" + "GUID": "bf9d4bbb-46a1-455b-99fc-aa336f67c4c0" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", diff --git a/ServerCommands/钉钉/创建反馈审批待办.json b/ServerCommands/钉钉/创建反馈审批待办.json index 824f1ce1..00723684 100644 --- a/ServerCommands/钉钉/创建反馈审批待办.json +++ b/ServerCommands/钉钉/创建反馈审批待办.json @@ -118,12 +118,18 @@ { "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", "ParamName": "APPURL", - "Value": "https://www.yugasoft.cn/clue/%E6%B5%81%E7%A8%8B%E4%B8%AD%E5%BF%83" + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"https://www.yugasoft.cn/clue/%E5%A4%84%E7%90%86%E5%8F%8D%E9%A6%88%E5%B7%A5%E5%8D%95?id=\"&反馈ID" + } }, { "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", "ParamName": "PCURL", - "Value": "https://www.yugasoft.cn/clue/%E6%B5%81%E7%A8%8B%E4%B8%AD%E5%BF%83" + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"https://www.yugasoft.cn/clue/%E5%A4%84%E7%90%86%E5%8F%8D%E9%A6%88%E5%B7%A5%E5%8D%95?id=\"&反馈ID" + } } ], "ResultErrorCodeTo": { diff --git a/ServerCommands/钉钉/创建项目审批待办.json b/ServerCommands/钉钉/创建项目审批待办.json index ef7ec48a..46df2ada 100644 --- a/ServerCommands/钉钉/创建项目审批待办.json +++ b/ServerCommands/钉钉/创建项目审批待办.json @@ -118,12 +118,18 @@ { "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", "ParamName": "APPURL", - "Value": "https://www.yugasoft.cn/clue/%E6%B5%81%E7%A8%8B%E4%B8%AD%E5%BF%83" + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"https://www.yugasoft.cn/clue/%E9%A1%B9%E7%9B%AE%E5%AE%A1%E6%89%B9?id=\"&项目ID" + } }, { "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", "ParamName": "PCURL", - "Value": "https://www.yugasoft.cn/clue/%E6%B5%81%E7%A8%8B%E4%B8%AD%E5%BF%83" + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"https://www.yugasoft.cn/clue/%E9%A1%B9%E7%9B%AE%E5%AE%A1%E6%89%B9?id=\"&项目ID" + } } ], "ResultErrorCodeTo": { @@ -165,7 +171,7 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "钉钉待办ID", - "GUID": "8c68fff9-d16b-4ebf-ac57-eb66b23e8b5b" + "GUID": "3570e2b2-0668-435f-b1fb-44ba11a80cc3" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",