From 7062472a98f975968c5edcd27d70e9003636ac4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B6=85=E5=93=A5?= Date: Thu, 4 Jul 2024 10:13:10 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"1","MessageType":2,"Modules":[{"Sta?= =?UTF-8?q?te":1,"Type":1,"Name":"PCPage/=E5=A4=84=E7=90=86=E5=8F=8D?= =?UTF-8?q?=E9=A6=88=E5=B7=A5=E5=8D=95"},{"State":1,"Type":28,"Name":"Proc?= =?UTF-8?q?essItem/=E5=8F=8D=E9=A6=88=E5=A4=84=E7=90=86=E6=B5=81=E7=A8=8B"?= =?UTF-8?q?},{"State":3,"Type":15,"Name":"ServerCommand/=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=A4=84=E7=90=86=E7=BB=93=E6=9E=9C"}],"Vers?= =?UTF-8?q?ion":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 30 +--- Pages/项目/项目反馈/处理反馈工单.json | 162 ++++++++++++------ Pages/项目/项目反馈/处理反馈工单.rd | 3 +- Process/反馈处理流程.bpmn | 4 +- ServerCommands/项目反馈/更新项目处理结果.json | 75 ++++++++ 5 files changed, 194 insertions(+), 80 deletions(-) create mode 100644 ServerCommands/项目反馈/更新项目处理结果.json diff --git a/.collaboration b/.collaboration index e50e53c4..fcae22d4 100644 --- a/.collaboration +++ b/.collaboration @@ -646,17 +646,7 @@ }, { "ModuleName": "PCPage/处理反馈工单", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T10:07:22.9692328+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目反馈\\处理反馈工单.json", - "Pages\\项目\\项目反馈\\处理反馈工单.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务首页", @@ -1068,17 +1058,7 @@ }, { "ModuleName": "ProcessItem/反馈处理流程", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T10:09:52.6124514+08:00", - "ModuleType": 28, - "ToRemoveFiles": [ - "Process\\反馈处理流程.json", - "Process\\反馈处理流程.bpmn" - ] + "ModuleType": 28 }, { "ModuleName": "ProcessItem/结算申请", @@ -2294,12 +2274,6 @@ }, { "ModuleName": "ServerCommand/更新项目处理结果", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T10:11:39.3906631+08:00", "ModuleType": 15 } ] \ No newline at end of file diff --git a/Pages/项目/项目反馈/处理反馈工单.json b/Pages/项目/项目反馈/处理反馈工单.json index 5941ff0c..a67d044b 100644 --- a/Pages/项目/项目反馈/处理反馈工单.json +++ b/Pages/项目/项目反馈/处理反馈工单.json @@ -213,6 +213,7 @@ }, "Values": { "0,33": "FGC_审批记录", + "1,29": "展开", "3,1": "工单编号", "3,9": "所属项目", "3,17": "紧急程度", @@ -224,10 +225,12 @@ "9,1": "反馈类型", "9,9": "相关功能", "9,17": "关联任务", - "9,25": "下一节点处理人" + "9,25": "下一节点处理人", + "14,15": true }, "Formulas": { - "1,31": "IF(G15,F15,E15)" + "1,31": "IF(G15,F15,E15)", + "1,29": "IF(P15,\"收起\",\"展开\")" }, "AttachInfos": { "0,33": { @@ -288,6 +291,31 @@ ] } }, + "1,29": { + "CellType": { + "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=处理反馈工单!P15" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=NOT(处理反馈工单!P15)" + } + } + ] + } + ], + "Text": "展开", + "ClickMode": 1, + "TemplateKey": "_RS_Main" + } + }, "1,31": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", @@ -874,7 +902,32 @@ "MethodName": "Refresh" } ], - "ID": "1e70ff64-8cef-4f28-a48f-4c36ed5c3a0a" + "ID": "73014e9a-1c44-4d42-b8cc-7d48d0eb3453" + } + ] + } + ] + } + }, + "14,15": { + "CellType": { + "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", + "CellDefaultValue": true, + "Caption": "展开基本信息", + "Style": 1, + "CommandList": [ + { + "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=处理反馈工单!4:12" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=处理反馈工单!P15" + } } ] } @@ -896,18 +949,23 @@ "FontSize": 13.333333333333332 }, { - "Foreground": 1 + "FontSize": 13.333333333333332, + "HorizontalAlignment": 1, + "Underline": false + }, + { + "Foreground": 2 }, { "FontFamily": 0, "FontSize": 13.333333333333332, - "Formatter": 2 + "Formatter": 3 }, { "FontFamily": 0, "FontSize": 14.666666666666666, - "Foreground": 3, - "HorizontalAlignment": 4 + "Foreground": 4, + "HorizontalAlignment": 1 }, { "FontFamily": 0, @@ -931,10 +989,10 @@ "Types": { "Strs": [ "Body", + "Left", "Text 1 50", "[AUTO]General", "black", - "Left", "yyyy/m/d h:mm", "@" ] @@ -957,23 +1015,24 @@ "1,14": 2, "1,15": 2, "1,16": 2, - "1,31": 3, - "3,1": 4, - "3,9": 4, + "1,29": 3, + "1,31": 4, + "3,1": 5, + "3,9": 5, "3,10": 2, "3,11": 2, "3,12": 2, "3,13": 2, "3,14": 2, "3,15": 2, - "3,17": 4, + "3,17": 5, "3,18": 0, "3,19": 0, "3,20": 0, "3,21": 0, "3,22": 0, "3,23": 0, - "3,25": 4, + "3,25": 5, "3,26": 0, "3,27": 0, "3,28": 0, @@ -981,8 +1040,8 @@ "3,30": 0, "3,31": 0, "3,32": 0, - "4,1": 5, - "4,9": 6, + "4,1": 6, + "4,9": 7, "4,10": 2, "4,11": 2, "4,13": 2, @@ -996,14 +1055,14 @@ "4,22": 0, "4,23": 0, "4,24": 2, - "4,25": 5, + "4,25": 6, "4,26": 0, "4,27": 0, "4,29": 0, "4,30": 0, "4,31": 0, - "4,32": 5, - "6,9": 4, + "4,32": 6, + "6,9": 5, "6,10": 2, "6,11": 2, "6,12": 2, @@ -1011,7 +1070,7 @@ "6,14": 2, "6,15": 2, "6,16": 2, - "6,17": 4, + "6,17": 5, "6,18": 2, "6,19": 2, "6,20": 2, @@ -1019,7 +1078,7 @@ "6,22": 2, "6,23": 2, "6,24": 2, - "6,25": 4, + "6,25": 5, "6,26": 2, "6,27": 2, "6,28": 2, @@ -1027,23 +1086,23 @@ "6,30": 2, "6,31": 2, "6,32": 2, - "7,1": 7, - "7,9": 6, + "7,1": 8, + "7,9": 7, "7,10": 2, "7,11": 2, "7,13": 2, "7,14": 2, "7,15": 2, "7,16": 2, - "7,17": 6, + "7,17": 7, "7,18": 2, "7,19": 2, "7,21": 2, "7,22": 2, "7,23": 2, - "7,24": 6, - "7,25": 8, - "7,32": 8, + "7,24": 7, + "7,25": 9, + "7,32": 9, "8,0": 2, "8,1": 2, "8,2": 2, @@ -1079,14 +1138,14 @@ "8,32": 2, "8,34": 2, "9,0": 2, - "9,1": 4, + "9,1": 5, "9,2": 2, "9,3": 2, "9,4": 2, "9,5": 2, "9,6": 2, "9,7": 2, - "9,9": 4, + "9,9": 5, "9,10": 2, "9,11": 2, "9,12": 2, @@ -1094,7 +1153,7 @@ "9,14": 2, "9,15": 2, "9,16": 2, - "9,17": 4, + "9,17": 5, "9,18": 2, "9,19": 2, "9,20": 2, @@ -1102,7 +1161,7 @@ "9,22": 2, "9,23": 2, "9,24": 2, - "9,25": 4, + "9,25": 5, "9,26": 2, "9,27": 2, "9,28": 2, @@ -1112,44 +1171,47 @@ "9,32": 2, "9,34": 2, "10,0": 2, - "10,1": 6, + "10,1": 7, "10,2": 2, "10,3": 2, "10,5": 2, "10,6": 2, "10,7": 2, - "10,9": 6, + "10,9": 7, "10,10": 2, "10,11": 2, "10,13": 2, "10,14": 2, "10,15": 2, "10,16": 2, - "10,17": 6, + "10,17": 7, "10,18": 2, "10,19": 2, "10,21": 2, "10,22": 2, "10,23": 2, - "10,24": 6, - "10,25": 6, - "10,32": 6, + "10,24": 7, + "10,25": 7, + "10,32": 7, "10,34": 2, "14,4": 0, "14,5": 0, - "14,10": 9 + "14,10": 10, + "14,15": 2, + "14,16": 2, + "14,17": 2 }, "RowStyles": { - "5": 10, - "6": 10, - "7": 10, - "8": 10, - "9": 10, - "10": 10, - "11": 10, - "12": 10, - "13": 10, - "14": 10 + "5": 11, + "6": 11, + "7": 11, + "8": 11, + "9": 11, + "10": 11, + "11": 11, + "12": 11, + "13": 11, + "14": 11 }, "SheetStyle": { "FontFamily": 0 @@ -1173,7 +1235,9 @@ "1,1,1,16", "0,33,14,1", "14,6,1,3", - "14,10,1,4" + "14,10,1,4", + "1,29,1,2", + "14,15,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1205,4 +1269,4 @@ "Formula": "处理反馈工单!$B$15" } ] -}//aIn8bfzFeSPK+bUCj5BlvRUi/BS+yd2kx0fuc1/Z7sC4bsZ80PUAz+XxoVNLYtr025sCEHHCKG/DV5+askQQfmnbg/AMEWM8fWjVebotUWpb9YxPRC77aDRyM1H5y6XLKwp746GAVG9ubw1uD3jb9PonvjSuEi+Tln7tR3bWRATdZuTWh+39TN5xU7Wl3Qqr9O0DDgVNTeYemyDg89kjIQ48QxGlT9pu0oPhXeJVtOv95AJFchHZOEODer01e7VY/s1WHTo9F5PXVvzCDL44VaY5Jn9KaoiY3tj/PIqlwcpvnlNEMSVCKUlcGCU5/Paag9MsQCZ2axsfw++yUCD/NCRrQ1wjj98345LSXr/6muF6tQAk213GpzBKUJjsWlb5LUjIdJ9YXSbO6KC9XzQ+0xg2IhsMFVc1vELcIgU9muPDUF0ODj4FKUvwv5bu/rXtA1jqfUSg/vWsW3v6EaUBeJzTLzZCFVZs9jGoNuOVGrA+kXDsLWUSKP9NtHSw0gxwCKACOg0i9x7zKRbj3F5cONnBtvUAsJ5NUtIYnWMAstQKMMuCRTCjQLk3dqSVN8P/em87hxiqU+Jm3UYsAESK58e+gS0eS2SCwfhRGrkJju2tInKnq34aUK9uNS7TrqpNrAy/uD/wY5tOCXRqVdzjUf02dMu33e63TjI0R2fg3+t5zwwl2RdtnRFiUaMn7Z8EtIXZPQatKdQedpa6PIe2Js3E7hJJIZGb7bZAq4nHlQynJ7OIZ20/qEz1QItgL4pxt6gI6sDxjerKwVDkwxrjBNhP+Oatj7WTFHM8Ozv8AO1ho/4tMQsFvgokl3CsRV9R/8uM8YZoqb56kgBfDsPbSVlNjMv8txG8IKq+uhBnMC8+sI0bf4GB5zlYlyU7C/CjXtFOuClGMrV/n+6ZGlPi5w==|920 \ No newline at end of file +}//3Tix9CJhMNq/tABFr+p4Q01+puMbgxMhPYJs+hC7TT4pcWP5HdyL0B9gUPqfBOzJXEaSHQgPz+5aqIRzD4BFDqNylOWVxGdoxCB6tYyAqeClf+eQLP9oY9gjI1q1AAnWGz8pGAr9o0JSpx0NYHU6rfb1YoQ5qspxRmEsFK9qlPrCpulBpe2hwBWcqhikt5KYBXD2/128fULaxO/KY4eAihdA4OG7hcH6j3ztNXylRJ8YOj4+K7HJsc70yXJp9Rg+hhX2YUPY5yFAGtLhUxF0NiQUzRBeXS23cCvmu9Bf05Rq8BXLN9madA1Ma+KT23+WeU+8P3Sm+f/nmPusVG6sqeVUPcpZSUJxEakMyqtVIhily2I4IB6M8ppEJ8JqVdr8RR+6oYRqzwNlxFLBW6P88WKl3Vcl/XsHHATmzK0IOHubD8zTF1dlTjw7i7KrSaNl1XljOiXC0CnfYYAc/Wn715avBlNXHEF4Xd5c0r42myvyQYfwJQcb8CT8z4ClNN4JbEDjYzYFqV6sCO+u7OLKON9+WUeD5DUU81LmJA1Q6gUjiFroY+mgDklq1Ekvc3x8D3xxFOFHnxVM2wGBsyIFRSj1Z4sq3hlWfxQkyOVOswVmxUFAKiZ6MmM4gyaLP2bdRqVRviFF9TgleB0hLUTT5j44gNixoVKZ/VVhziUWHu7lZzJ3jRLRK5hcRGCB/x7HeLhlDRLAqldZkJDHjhoAsiDR9c8M/rL0rcmCE3o5qiCLjG2nmGa1pDrc+sQG+RUKwL2XOZlw4sPfeFnZuPhWuGUBrIrYKEzD0kjJXEnO7SMDUwwshqt0XeL4/M+XUoPR3hvrN5m+J9pcw3odt6NIqBdfV8OKlaBidRFPoDvHdy/+NZAlotZAGkk3wiDWcxKr++j9ntiIHxh323+ZcLZcnA==|920 \ No newline at end of file diff --git a/Pages/项目/项目反馈/处理反馈工单.rd b/Pages/项目/项目反馈/处理反馈工单.rd index b91826b3..68831cd1 100644 --- a/Pages/项目/项目反馈/处理反馈工单.rd +++ b/Pages/项目/项目反馈/处理反馈工单.rd @@ -3,7 +3,8 @@ "ColumnCount": 35, "RowCount": 15, "Formulas": { - "1,31": "IF(G15,F15,E15)" + "1,31": "IF(G15,F15,E15)", + "1,29": "IF(P15,\"收起\",\"展开\")" }, "CustomNames": [ { diff --git a/Process/反馈处理流程.bpmn b/Process/反馈处理流程.bpmn index 15106c2b..6a962c88 100644 --- a/Process/反馈处理流程.bpmn +++ b/Process/反馈处理流程.bpmn @@ -4,7 +4,7 @@ 处理用户提交的需求反馈 - + @@ -35,7 +35,7 @@ - + _8c854f9d-40d8-4aed-acb1-6778e09b2e08 Flow_0e920z7 diff --git a/ServerCommands/项目反馈/更新项目处理结果.json b/ServerCommands/项目反馈/更新项目处理结果.json new file mode 100644 index 00000000..a22d401d --- /dev/null +++ b/ServerCommands/项目反馈/更新项目处理结果.json @@ -0,0 +1,75 @@ +{ + "Name": "更新项目处理结果", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon", + "Permission": { + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + } + }, + "Parameters": [ + { + "Name": "反馈ID", + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + { + "Name": "内容", + "DataValidationInfo": {} + } + ] + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "需求反馈登记表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "ID", + "GUID": "f8a30342-a9a4-4c45-8b0f-ddadbcc20b03" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=反馈ID" + } + }, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "处理结果", + "GUID": "78e1ee6e-8504-4bdc-a37d-1e2af52caf38" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=内容" + } + } + ] + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "更新成功" + } + ] +} \ No newline at end of file