diff --git a/.collaboration b/.collaboration index c08f06c8..993befb9 100644 --- a/.collaboration +++ b/.collaboration @@ -886,17 +886,7 @@ }, { "ModuleName": "PCPage/汇报详情", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-22T09:48:16.9133041+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\个人日报\\汇报详情.json", - "Pages\\汇报\\个人日报\\汇报详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/汇报管理", @@ -1392,16 +1382,7 @@ }, { "ModuleName": "ServerCommand/上报实际工时", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-22T09:38:03.0245364+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\上报实际工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommands/客户", @@ -2525,25 +2506,10 @@ }, { "ModuleName": "ServerCommandPrivate/发送日报消息到钉钉", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-22T09:56:20.5200918+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\发送日报消息到钉钉.json" - ] + "ModuleType": 27 }, { "ModuleName": "PCPage/ReportPreview", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-22T09:56:04.2691061+08:00", "ModuleType": 1 } ] \ No newline at end of file diff --git a/Pages/汇报/ReportPreview.json b/Pages/汇报/ReportPreview.json new file mode 100644 index 00000000..d422e8bc --- /dev/null +++ b/Pages/汇报/ReportPreview.json @@ -0,0 +1,399 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 22.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 22.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 452.0, + "Mode": 1 + } + }, + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 44.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + } + }, + "Count": 11, + "DefaultSize": 32.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + } + }, + "Count": 16, + "DefaultSize": 32.0 + }, + "Values": { + "3,1": "日期", + "4,1": "汇报人", + "5,1": "汇报类型", + "6,1": "汇报对象" + }, + "Formulas": { + "1,1": "G5&TEXT(G4,\"yyyy年mm月dd日\")&G7&G6" + }, + "AttachInfos": { + "3,6": { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "开始日期", + "GUID": "2b7c53b0-c65a-4a28-8b02-09384bc30600" + } + }, + "4,6": { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报人", + "GUID": "e0d9f849-6e53-42cb-a3ad-946e04d20b80", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 + } + } + }, + "5,6": { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报类型", + "GUID": "f7337e85-d83d-4691-8d12-5dfed393b3e4" + } + }, + "6,6": { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报对象", + "GUID": "3faa50c8-4fbf-44db-a6e0-3b2f7d344bfe" + } + }, + "9,1": { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "内容", + "GUID": "9c67a615-fbd0-4777-86b4-c5a5f46b9cdc" + }, + "CellType": { + "$type": "editormdPlugin.editormdPlugin, editormdPlugin", + "Toolbar": true, + "Pren": true + } + } + }, + "StyleDatas": { + "Styles": [ + { + "FontSize": 16.0, + "Foreground": 0 + }, + { + "Foreground": 1 + }, + { + "Formatter": 2, + "HorizontalAlignment": 3 + }, + { + "FontFamily": 4, + "FontSize": 13.333333333333332 + }, + { + "FontFamily": 4, + "FontSize": 13.333333333333332, + "Foreground": 1 + }, + { + "FontFamily": 4, + "FontSize": 13.333333333333332, + "Formatter": 2, + "HorizontalAlignment": 3 + }, + { + "FontFamily": 4, + "FontSize": 13.333333333333332, + "Foreground": 1, + "Formatter": 5 + }, + { + "BorderBottom": 0 + } + ], + "Types": { + "Strs": [ + "black", + "Text 1 50", + "yyyy/m/d", + "Right", + "Body", + "[AUTO]General", + "Background 2 -10" + ], + "Borders": [ + { + "Color": 6 + } + ] + }, + "CellStyles": { + "1,1": 0, + "3,1": 1, + "3,6": 2, + "4,0": 3, + "4,1": 4, + "4,2": 3, + "4,3": 3, + "4,4": 3, + "4,5": 3, + "4,6": 5, + "4,15": 3, + "5,0": 3, + "5,1": 6, + "5,2": 3, + "5,3": 3, + "5,4": 3, + "5,5": 3, + "5,6": 5, + "5,15": 3, + "6,0": 3, + "6,1": 6, + "6,2": 3, + "6,3": 3, + "6,4": 3, + "6,5": 3, + "6,6": 5, + "6,15": 3, + "7,1": 7, + "7,2": 7, + "7,3": 7, + "7,4": 7, + "7,5": 7, + "7,6": 7, + "7,7": 7, + "7,8": 7, + "7,9": 7, + "7,10": 7, + "7,11": 7, + "7,12": 7, + "7,13": 7, + "7,14": 7 + }, + "SheetStyle": { + "FontFamily": 4, + "FontSize": 13.333333333333332 + } + }, + "Spans": [ + "3,1,1,4", + "3,6,1,9", + "4,1,1,4", + "4,6,1,9", + "5,1,1,4", + "1,1,1,14", + "5,6,1,9", + "6,1,1,4", + "6,6,1,9", + "9,1,1,14" + ], + "PageInfo": { + "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "Title": "汇报预览", + "PageLoadedCommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "ID", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IFERROR(GETURLQUERYVALUE(\"id\"),\"\")" + }, + "ID": "f9a889f0c4fc45879b305e575797c665" + }, + { + "$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": "b133d385-bc4e-4b23-ae39-106483d86925" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ReportPreview!ID" + } + } + } + ], + "ID": "27cf3a94-1a13-49f7-bd61-5d691b665eec" + } + ] + } + ], + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + }, + "RowBreakLines": [], + "RepeatRangeSettings": [] + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + } +}//eASmcWwIzXVrapG4+qOvjAUft2I4hWRLwJqlSm6Et9gHPb3qL4ozTC3h09zNGwJFIjUx+T0MIOrCyh7vtzEAhCl1MlzzotIaYEyaqWwAr4tiLroapGElmtcuRav6oAmCgXC5oA8pB+vrP78BnlyPpQEWBHvu4I2aE6mMhva5Uc8lQLaksJQWVbAkqANyTF/DtI4iSu6WQxcnfHj6I6psr2DoAlmK8/TcWDXpM7+ObMs1kxRIP1PPhak2Wom6T3HeZbMr7M2Q7dUUR/x2o+Yq771YtS6CwaHUWAcA2BRyDvVybufYroPTxO64BuI9KW/tQTDf9L8GI9wb0L2oAQBZpasu/G6c/SDUyeCW5U0N8RatT+gg7pRVTqIdqfk7+155hU0GdPUcRuSnop7GitFUc4TloBLV0ioK8yqneqW1dac748uBSinu0NxR7uP1ic9mQrTHSxEpKlt2+Ol1ZxDHqEoZDwKq3po8SEmjn8/dJa3UM4Hr/GPPjyyHEMH1RA4b6iToiKGKFI4XbF3TliYTF9GZUqJzlbB8UYucKbmp0stM2Wdl/NmYvOeGiQewGgtXhXPjNn5DR0hR/bRVB0009SMkuiQ9O6EMCBr7MSMXEF5gTnRd1qlgqBbeFmsLw66S8AEj5+PGpJ5UjZaNRElAXe1HEXS3POe2XSgut8nDrhqYiq3ru0Ijx+50bGZ0oEv+MLYJ8W5SIMfLkwmmVbDFk1AsHEf4x/h96wtD1507Y1gJ2OerIGGPGxhlxRYw1WKeDs/YqvKehWLlssyrSsdYjUxQhG1ZN9Nl/udjdNrxtyqSyy1nE+M9T7G6ucFKMrWdgvjeFY7QoyCA4le1BuYpblhXKNqlq8N1WcICYjaqcYxtCbRqsVECesoH17DzZbEsSfeVyM6QcGG9KxhyQv6Msw==|920 \ No newline at end of file diff --git a/Pages/汇报/ReportPreview.rd b/Pages/汇报/ReportPreview.rd new file mode 100644 index 00000000..e3f52b3b --- /dev/null +++ b/Pages/汇报/ReportPreview.rd @@ -0,0 +1,8 @@ +{ + "PageType": 0, + "ColumnCount": 16, + "RowCount": 11, + "Formulas": { + "1,1": "G5&TEXT(G4,\"yyyy年mm月dd日\")&G7&G6" + } +} \ No newline at end of file diff --git a/Pages/汇报/个人日报/汇报详情.json b/Pages/汇报/个人日报/汇报详情.json index a8582d84..a8c1fb90 100644 --- a/Pages/汇报/个人日报/汇报详情.json +++ b/Pages/汇报/个人日报/汇报详情.json @@ -205,7 +205,8 @@ }, "Formulas": { "6,1": "TODAY()-1", - "8,1": "IF(汇报对象=\"个人\",\"成员\",汇报对象)" + "8,1": "IF(汇报对象=\"个人\",\"成员\",汇报对象)", + "18,1": "IFERROR(GETURLQUERYVALUE(\"id\"),\"\")" }, "AttachInfos": { "3,1": { @@ -266,7 +267,7 @@ ] } ], - "ID": "87295ed2-dbd0-4630-8b78-7e8f457fa094" + "ID": "a234aaea-f51a-40c0-9e44-47d0f831c003" }, { "Condition": { @@ -302,7 +303,7 @@ ] } ], - "ID": "b2fce3fb-8e28-4e26-a23d-1ce073184577" + "ID": "82117f2d-02df-4b3c-9af1-85d8f59c2ec4" }, { "Condition": { @@ -338,7 +339,7 @@ ] } ], - "ID": "11a7647c-bdb8-49d7-893c-5daf741093f9" + "ID": "70677883-5f5b-44b9-b5c8-7ab5dee1a171" } ] } @@ -637,7 +638,7 @@ "ErrorCode": "0" } ], - "ID": "741f28f9-927a-4438-89e9-fd8723090cdf" + "ID": "24273393-d468-4e49-8379-a2ec86f352d2" }, { "CommandList": [ @@ -647,7 +648,7 @@ "Message": "必须指定成员" } ], - "ID": "0b8bee76-f362-4e96-b332-5dacdce6c926" + "ID": "b0e219e3-12aa-44ef-bb2b-db1ea78e3c1c" } ] } @@ -1032,7 +1033,7 @@ "ErrorCode": "0" } ], - "ID": "8e35bd27-8ec5-4aa5-a48e-e0d44bc9add0" + "ID": "ba28c68a-c598-4558-9d3c-4d00783551ca" }, { "CommandList": [ @@ -1042,7 +1043,7 @@ "Message": "必须指定团队" } ], - "ID": "206e60e7-cf71-49a0-9111-242e9398d62d" + "ID": "0180f826-1ee8-45ee-869d-d4e9ff40e119" } ] } @@ -1173,7 +1174,7 @@ "ErrorCode": "0" } ], - "ID": "48ec2030-9755-4c48-9f0d-b1d644b9998c" + "ID": "c8e8bfbd-d29d-4d55-b168-dd2059b21524" }, { "CommandList": [ @@ -1183,7 +1184,7 @@ "Message": "必须指定项目" } ], - "ID": "d0f76a23-85f3-41df-93df-e91a181bc2b1" + "ID": "b59422c2-cbd7-407b-9d0b-99aa090efa8d" } ] } @@ -1331,12 +1332,12 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "20a5fb36-662b-48c4-84c4-decf06921f44" + "ID": "1aa1028f-14c7-4401-9710-d4c658a83bd8" } ] } ], - "ID": "83a18ba6-fe0f-4fb3-be32-c1ae5d70a234" + "ID": "562c88a4-f8f3-4820-af54-4b15e8e8a52d" } ] }, @@ -1486,7 +1487,7 @@ ] } ], - "ID": "059fe832-b125-4798-b522-6d3caf19f77d" + "ID": "165fcb61-033f-4bae-8182-3466a5940333" }, { "CommandList": [ @@ -1500,12 +1501,12 @@ "Duration": 3000 } ], - "ID": "718b1993-63e6-47a4-9aa3-d70bd73027ea" + "ID": "08834017-b985-4d66-a241-3157812f5e32" } ] } ], - "ID": "09dff6f3-9c4f-49ea-bde6-dc939e257815" + "ID": "c35ea7b3-2782-4fff-82b2-ebcbed381e25" }, { "CommandList": [ @@ -1523,7 +1524,7 @@ "AdvancedSettings": {} } ], - "ID": "5385edf7-0d8f-473d-84ce-5258ae942d06" + "ID": "1a3db9e8-e00a-4569-9930-df0e8c2f64e3" } ] } @@ -1735,7 +1736,7 @@ ] } ], - "ID": "6d29eba0-d93b-4746-b77f-84c5745b1aff" + "ID": "47c336d6-6b56-4815-89a9-6ea47e6dccfb" }, { "CommandList": [ @@ -1894,7 +1895,7 @@ ] } ], - "ID": "ef5e73b6-ec89-4a02-a654-f6c32fc44a64" + "ID": "56695202-0fec-4038-abad-1645cdf53fc7" }, { "CommandList": [ @@ -1902,12 +1903,12 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "93fdbd03-a72b-491f-b5b3-cc5ee7b3705e" + "ID": "d1d285fd-2ec3-417e-a434-b06abde3df4c" } ] } ], - "ID": "32c13338-8e17-4015-aa58-d71f93f54cd3" + "ID": "f90c7749-b239-4234-b11f-4875d7be27e5" }, { "CommandList": [ @@ -1917,12 +1918,12 @@ "Message": "您无权限修改该汇报内容" } ], - "ID": "630a14a8-12c3-4376-9fe0-7523631bfcfb" + "ID": "b1416cf2-f2ec-4424-a2c1-39e0e7cca5df" } ] } ], - "ID": "e4b01114-2e3e-48a8-ac96-20b687d04e25" + "ID": "67428eac-61fe-4d4d-86d5-102e5dd3395a" } ] }, @@ -1939,7 +1940,7 @@ "ReloadData": true } ], - "ID": "8455879f-2585-4e95-9254-39adfd0281b9" + "ID": "25194894-7907-418d-8376-7d56c47e3609" }, { "CommandList": [ @@ -1954,12 +1955,12 @@ "AdvancedSettings": {} } ], - "ID": "7b74caf3-59f0-447b-b25d-f20af8009418" + "ID": "5a94055f-6401-4bb9-b7df-47d2efbd4485" } ] } ], - "ID": "e9156e27-992f-44f6-a054-4a06fb395b64" + "ID": "a2f4926a-4af9-43cb-b778-1dab39710821" }, { "CommandList": [ @@ -1974,7 +1975,7 @@ "AdvancedSettings": {} } ], - "ID": "635eb796-7e7f-409a-a507-d6095e80a541" + "ID": "d08e7df4-eaf1-4ce3-9a82-e716f8033c20" } ] } @@ -2000,20 +2001,57 @@ "$type": "ElementUI.InputCellType, ElementUI", "CommandList": [ { - "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", - "CurrentRowInfo": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "汇报记录表", - "ColumnName": "ID", - "GUID": "a805b144-4e31-41ef-8352-1f04189a8202" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!汇报ID" + "$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.IfConditionContextPropertyParam, ServerDesignerCommon", + "contextProperty": { + "Display": "值变更原因" + } + }, + "value": "formula" + } + ] + }, + "CommandList": [ + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "ID", + "GUID": "a805b144-4e31-41ef-8352-1f04189a8202" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!汇报ID" + } + } + } + ], + "ID": "9e6c6485-15f2-496d-bfa9-db8ea1ba82de" } - }, - "Disabled": true + ] } ], "UIPermissions": [ @@ -2465,4 +2503,4 @@ "Formula": "汇报详情!$B$11" } ] -}//zOHXFg/6y2KB7JYT3MLEyXpAUVgSdCMeDaEBuCbcpoF0Zn0Li/DmiMw7mmwmOmbDMo2HCcai62GwkHc3+/nNrGe1uxQHGUCWEnBelPpCRCS82Q7F5pGzik5hQJQRUQ9/qAS+hK18BpqY/zIQJYy5YekFizEDnqhPPA6PYVhMCBp/YcxBj27l3uRXsETKgB4EEKCJZHyZvuyo9RcO9Gkgn9OL25L4gMGvcvftYcC1WJknLB+5VQMawFn3KoMOeOhMS1ZiWFUumCDVqjmUFvGxw3j1RIBLKZNaiTlhkuLL1HtNsD4h9LllFR/tyYZNA4MeA+y6MPE2UNuoe7TghMZkkNAU+ZDdnTlZcVkwfRWdkxz2v5JzhNdOVxWkvjwv3g6xizXyy/wAPLeFoWy1lY/ajbZtazes7lUeCnMSQkkCUSnrrSRXKheFLDhsB27Iwijxm3vkB/39CEknYrkKaGpR4QVvm9iQ2Xhd6Q7iLeN8fN9FUC9wv+fRGpxVhY0s1nP92dxSIh49tHbgfKmF8moiiPLgaNmrAG28OitrLdcDPGgbPsAeTTzROtpSWLsaASG2DDJ1Ob+RwitFfqhhFPayCBytrQZZDCtKvx8CNvM3fANJwl0zJvDqWBOjrf8qxV1aLqJFKwhk0+nIjm/JbGv4rn4kHC230aJRV9BNvKtGQDCV2fIP/lghuqrP97/vrYlAaw+uzQknoLdtl4cejhm0jRuC8oan92egJvMO5jn6L13dwYiuxeYtPJb4xbRg9YBh/D2x77W4zLS0FlrhwLNYOnn4V07i9mvPcc2Ek2BXMKnayLeQvt7WLNt86h4eIkqJO/WTjSpD3P8FKbTYgTDN/LQEjX59rOhZxDMODgyd4ivpEpAiuZU4LrsY6rBoyHvTdobJOyffqEHuAfyFmH2tfQ==|920 \ No newline at end of file +}//6gecumRsSGY3k5zVv+pMifN+DT+I/MlJ+NMlG4ALpXsvlktZWqWDGTFPnhzjJwcXsUMh2F3csqN3g7GCKH4+e3U41tfyeu2y/+FrbTXzxqP/2+9OqpmItwwPUHO1lV9RseUZ/JSVrZyBFbKrxYbRcwZAdN1qReqEO2ztg/IQ7JQTxXm3hoAs3u0rSTIGeSjYZleHMgeY+9fLPVc5LTkBynkQlv9GVyD6eRBj64g6aT1m2QC8VJJlYkSznVyJriOso+PklpHHGVzdQmSfJGD5333T/7cMuiRtQNL1ZftTtFSLwYWPt23W5QnK2I77kFv0LQfRgleCV1x6Zk+MqYlhRkWLahqoT7IjW/pAE+FBl/yHMlQdcc5GKsAYqQUqC10HzucXezQ6HKGjSNr3ljl+nRUTrwV/JI96AcsHNtICZfcZ5DZYV2pGd4L9OtnoI6+dokONN8NON2nGtpvg3M4w46XJyXFO/YyQ8dJ37jw3EDCHq8cxm2S3p6Xsw6icDf+tV1z6rcChjGoT++FH1/GYcY3RuCpJJonck1fdxnisW2DTPfzXpWYGlWtMRMTJZxJxuug2JIoV3D7g33qdAIgtN1Y9eAoEsQ7DtUxuH1kyQJBtK+gTwsGpSVaDJmPdy2MwzHOoR+NVzpZju/YWhu7KGnhK6x7WHRav5q3/EacNiuJQLivxdFopOaALD0yFGODZbkjGMjsOYDykA/kiaRIC2GaIL60WBVWZ326tDcVpvHU4sCHbfUfFJFC6cIduLZ0mBFZEvq3/huriJ6Tki/bUB4GnbKQkI/+GJpsdDKNroZ8w83LPwN+VXGY8lw1IYMe8TstF6ROz4kPvS5k++hJm21NpJouRe01MQFl8cMlO04USxGAPi/5MWHxxXZ5iDQtUzXolUO05FZZefXgzCtgzOQ==|920 \ No newline at end of file diff --git a/Pages/汇报/个人日报/汇报详情.rd b/Pages/汇报/个人日报/汇报详情.rd index c21c3ff4..76bf853e 100644 --- a/Pages/汇报/个人日报/汇报详情.rd +++ b/Pages/汇报/个人日报/汇报详情.rd @@ -4,7 +4,8 @@ "RowCount": 19, "Formulas": { "6,1": "TODAY()-1", - "8,1": "IF(汇报对象=\"个人\",\"成员\",汇报对象)" + "8,1": "IF(汇报对象=\"个人\",\"成员\",汇报对象)", + "18,1": "IFERROR(GETURLQUERYVALUE(\"id\"),\"\")" }, "CustomNames": [ { diff --git a/ServerCommands/工时/上报实际工时.json b/ServerCommands/工时/上报实际工时.json index 01be45e2..cc0a154b 100644 --- a/ServerCommands/工时/上报实际工时.json +++ b/ServerCommands/工时/上报实际工时.json @@ -59,7 +59,7 @@ { "Name": "进展内容", "DataValidationInfo": {}, - "TestData": "1. 测试\r\n2.2323\r\n3、333\r\n4. 444" + "TestData": "1. 测试\r\n2.2323\r\n3、333\r\n4. 444\r\n- sdfdsf" }, { "Name": "指定时薪单价", @@ -455,7 +455,7 @@ "ID": "2d719d51ef5a46ee9aa64f113a34cce3" } ], - "ID": "6ef977a6-31ee-47d9-b3fb-80fb70bf2b55" + "ID": "5b60736d-45f9-4a98-8040-8a9d0e4d8046" }, { "CommandList": [ @@ -478,7 +478,7 @@ "ID": "11255bb1a556487e972cf64b9d1da58b" } ], - "ID": "e4418e4a-5bc3-4432-8273-e1638da05f0f" + "ID": "ab7e4879-a8f0-4d6d-9c85-d72a60cfc5c4" } ] }, @@ -560,7 +560,7 @@ } ], "Comments": "如果是分配到天，就检测当前日期该人员在任务里的计划工时是否够用", - "ID": "fe227670-3fe8-4e10-8751-f6739c860526" + "ID": "c258c8f6-9986-4ff9-b416-2e79231b9476" }, { "CommandList": [ @@ -574,13 +574,13 @@ "ID": "82c651b1c1424340b8c6b3ed1361b1fd" } ], - "ID": "ddfbde9c-2e11-4c19-9a15-656123b759dc" + "ID": "d272daa9-385c-4fb3-8714-cda480a40473" } ] } ], "Comments": "如果是按天分配，则需要检测这一天的实际工时是否超出，", - "ID": "fda85e7f-7e7f-405a-9c29-5b3fbc8e91aa" + "ID": "15f7d9f3-b957-45a9-aa3a-f1a14b968ea0" }, { "CommandList": [ @@ -594,7 +594,7 @@ "ID": "3f324a9712e14a6693472fa215c3143f" } ], - "ID": "c0fe2852-5125-412c-8119-60037a13a341" + "ID": "b87fe06d-b8df-42bc-abd3-7084cd5465b0" } ] }, @@ -627,78 +627,22 @@ }, "CommandList": [ { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=进展内容item" - } - }, - "value": "[- ]-%", - "compareType": 14 - }, - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=进展内容item" - } - }, - "value": "%Null%", - "compareType": 1 - } - ] - }, - "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "新进展内容行", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=进展内容item" - }, - "ID": "5b0e29af5b49431cbdc2a2be6a209bca" - } - ], - "ID": "96306f1c-e2e5-4bca-bb2d-087b10a16223" - }, - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=进展内容item" - } - }, - "value": "%Null%", - "compareType": 1 - }, - "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "新进展内容行", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\" - \"&进展内容item" - }, - "ID": "c7bda900d47f48b1a4fe567434981c90" - } - ], - "ID": "639eab23-a548-4c45-a9fe-db3852a0ccfe" - } - ] + "$type": "GETPOST.正则类.正则_取匹配文本, GETPOST", + "JieShouMsg": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=进展内容item" + }, + "JieShouMsg2": "^[^\\S\\r\\n]*[\\d]*[、.\\-]?[^\\S\\r\\n]*", + "FanHuiMsg": "取无用符号" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "新进展内容行", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=SUBSTITUTE(进展内容item,取无用符号,\" - \")" + }, + "ID": "20472572ee904f20a1ea7c5f32683622" }, { "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", @@ -1006,7 +950,7 @@ } ], "Comments": "如果是分配到任务，就补一条计划，保证任务可分配工时准确", - "ID": "bbca403a-4b80-42f2-b01b-37c5ed4558c1" + "ID": "51f81352-af6f-4a77-8674-5eef8aa45b73" } ], "Disabled": true @@ -1032,7 +976,7 @@ "ID": "dfe08a493a80498e8915bc2fe710ad21" } ], - "ID": "caf85a37-534c-401c-a411-be741c1b124b" + "ID": "c963de63-7574-4716-90a2-21b394f3ed01" }, { "CommandList": [ @@ -1045,7 +989,7 @@ } } ], - "ID": "c663c749-30b8-4dec-9788-3af5f2482288" + "ID": "d4d82229-a7fc-42f8-9c8b-31cc24fe86ca" } ] } @@ -1105,7 +1049,7 @@ "Message": "报工成功" } ], - "ID": "4a14c745-1adb-4a1d-9d3f-397ac2ee8c92" + "ID": "7f9764bc-0fbb-4930-a5ec-67f3ab1e60c0" }, { "CommandList": [ @@ -1121,12 +1065,12 @@ } } ], - "ID": "d7b7ad6d-786d-4216-a94a-41757ecd5f6c" + "ID": "7ba3bdbe-02f2-4280-bea7-498f26ea4cf8" } ] } ], - "ID": "f7f19e27-1fb3-4553-b508-2a3c0be86b1b" + "ID": "cbfaeab0-9778-4e00-b6c2-1e38411cc0e9" }, { "CommandList": [ @@ -1139,7 +1083,7 @@ } } ], - "ID": "446f2be7-3563-4216-8cbe-f53aa9a8db3f" + "ID": "e4365ede-cb1b-4b90-863f-2d74a03832cb" } ] } diff --git a/ServerCommands/钉钉/发送日报消息到钉钉.json b/ServerCommands/钉钉/发送日报消息到钉钉.json index b408ee01..c60c616d 100644 --- a/ServerCommands/钉钉/发送日报消息到钉钉.json +++ b/ServerCommands/钉钉/发送日报消息到钉钉.json @@ -179,9 +179,9 @@ "ParameterName": "跳转URL", "ParameterValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=baseUrl&\"汇报详情?id=\"&汇报ID" + "SerializeProperty": "=baseUrl&\"ReportPreview?id=\"&汇报ID" }, - "ID": "c28fd4468d4148e8b8a79bc915502b81" + "ID": "7d85d7a595884db08a148485d43c9406" }, { "$type": "ContentEditor.ContentEditor, ContentEditor", @@ -227,7 +227,7 @@ "Task_id": "钉钉消息任务ID" } ], - "ID": "54443f00-aa2e-4adc-9790-6da16cd2b90e" + "ID": "ce58e6d4-6549-4685-927d-b62537e585b0" } ] }