From 82b48d3508e91fd8e19cab8dbf14834aa942256f Mon Sep 17 00:00:00 2001 From: "TYFEIKELE\\tyfeikele" Date: Wed, 12 Jun 2024 21:58:21 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E5=88=9B=E5=BB=BA=E6=97=A5?= =?UTF-8?q?=E6=8A=A5=E8=AF=A6=E6=83=85","MessageType":2,"Modules":[{"State?= =?UTF-8?q?":1,"Type":1,"Name":"PCPage/=E6=97=A5=E6=8A=A5=E9=A6=96?= =?UTF-8?q?=E9=A1=B5"},{"State":1,"Type":1,"Name":"PCPage/=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E8=AF=A6=E6=83=85"},{"State":1,"Type":15,"Name":"Serv?= =?UTF-8?q?erCommand/=E6=A0=B9=E6=8D=AE=E6=B1=87=E6=8A=A5=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E7=94=9F=E6=88=90=E5=86=85=E5=AE=B9"},{"State":3,"Typ?= =?UTF-8?q?e":1,"Name":"PCPage/=E6=97=A5=E6=8A=A5=E8=AF=A6=E6=83=85"},{"St?= =?UTF-8?q?ate":3,"Type":27,"Name":"ServerCommandPrivate/=E5=8D=95?= =?UTF-8?q?=E6=97=A5=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E6=97=A5=E6=8A=A5"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 47 +- Pages/ded19f0aa3d14ada9238c4218effa8e.json | 440 ++++++++++ Pages/ded19f0aa3d14ada9238c4218effa8e.rd | 8 + Pages/汇报/日报/日报详情.json | 750 ++++++++++++++++++ Pages/汇报/日报/日报详情.rd | 35 + Pages/汇报/日报/日报首页.json | 57 +- Pages/汇报/日报/日报首页.rd | 20 +- Pages/汇报/汇报模板/模板详情.json | 195 ++++- Pages/汇报/汇报模板/模板详情.rd | 6 +- ServerCommands/汇报/单日自动生成工作日报.json | 185 +++++ ServerCommands/汇报/根据汇报模板生成内容.json | 43 +- 11 files changed, 1700 insertions(+), 86 deletions(-) create mode 100644 Pages/ded19f0aa3d14ada9238c4218effa8e.json create mode 100644 Pages/ded19f0aa3d14ada9238c4218effa8e.rd create mode 100644 Pages/汇报/日报/日报详情.json create mode 100644 Pages/汇报/日报/日报详情.rd create mode 100644 ServerCommands/汇报/单日自动生成工作日报.json diff --git a/.collaboration b/.collaboration index cb9d0a3b..5c4ff1d2 100644 --- a/.collaboration +++ b/.collaboration @@ -838,17 +838,7 @@ }, { "ModuleName": "PCPage/日报首页", - "State": 1, - "LockedBy": { - "UserName": "TYFEIKELE\\tyfeikele", - "Email": "example@example.com" - }, - "LockDateTime": "2024-06-12T21:19:55.7497402+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\日报\\日报首页.json", - "Pages\\汇报\\日报\\日报首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/汇报详情", @@ -1624,49 +1614,18 @@ }, { "ModuleName": "PCPage/模板详情", - "State": 1, - "LockedBy": { - "UserName": "TYFEIKELE\\tyfeikele", - "Email": "example@example.com" - }, - "LockDateTime": "2024-06-12T20:48:22.0965771+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\汇报模板\\模板详情.json", - "Pages\\汇报\\汇报模板\\模板详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "ServerCommand/根据汇报模板生成内容", - "State": 1, - "LockedBy": { - "UserName": "TYFEIKELE\\tyfeikele", - "Email": "example@example.com" - }, - "LockDateTime": "2024-06-12T20:55:05.679454+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\汇报\\根据汇报模板生成内容.json" - ] + "ModuleType": 15 }, { "ModuleName": "PCPage/日报详情", - "State": 3, - "LockedBy": { - "UserName": "TYFEIKELE\\tyfeikele", - "Email": "example@example.com" - }, - "LockDateTime": "2024-06-12T21:07:48.1532252+08:00", "ModuleType": 1 }, { "ModuleName": "ServerCommandPrivate/单日自动生成工作日报", - "State": 3, - "LockedBy": { - "UserName": "TYFEIKELE\\tyfeikele", - "Email": "example@example.com" - }, - "LockDateTime": "2024-06-12T21:33:34.7206929+08:00", "ModuleType": 27 } ] \ No newline at end of file diff --git a/Pages/ded19f0aa3d14ada9238c4218effa8e.json b/Pages/ded19f0aa3d14ada9238c4218effa8e.json new file mode 100644 index 00000000..c6630333 --- /dev/null +++ b/Pages/ded19f0aa3d14ada9238c4218effa8e.json @@ -0,0 +1,440 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 48.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 16.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 16.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 16.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 177.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 30.0, + "Mode": 1 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 34.0, + "IsHidden": true + } + } + }, + "InLogicalVisibleIndexes": [ + 11 + ], + "Count": 12, + "DefaultSize": 15.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.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 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + } + }, + "Count": 18, + "DefaultSize": 32.0 + }, + "Values": { + "3,1": "汇报人：", + "5,1": "工时：", + "5,4": 1, + "7,1": "昨日工作：" + }, + "Formulas": { + "1,2": "E12&\" 工作日报\"" + }, + "AttachInfos": { + "3,4": { + "TemplateCellSource": "汇报人" + }, + "5,4": { + "CellType": { + "$type": "ElementUI.InputNumberCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "DefaultValue": 1, + "min": "0.1", + "max": "24", + "step": 1, + "placeholder": "单位：小时", + "controlsPosition": true + }, + "DataValidationInfo": { + "NumberType": 2, + "FirstParamValue": "0", + "SecondParamValue": "24", + "IgnoreBlank": false + } + }, + "7,4": { + "CellType": { + "$type": "ElementUI.InputCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "textarea", + "placeholder": "填写你昨日的工作汇报", + "resize": "vertical" + }, + "DataValidationInfo": { + "IgnoreBlank": false + }, + "TemplateCellSource": "内容" + }, + "11,1": { + "CellType": { + "$type": "Forguncy.TextCellType, ServerDesignerCommon", + "SavedValidators": [ + { + "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon" + } + ], + "TemplateKey": "_RS_NewLittleRoundCorner" + }, + "TemplateCellSource": "ID" + }, + "11,4": { + "TemplateCellSource": "汇报日期文本" + } + }, + "StyleDatas": { + "Styles": [ + { + "FontFamily": 0 + }, + { + "FontSize": 24.0, + "FontWeight": 1, + "HorizontalAlignment": 2 + }, + { + "FontSize": 14.666666666666666, + "Foreground": 3 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 3, + "Formatter": 4, + "HorizontalAlignment": 5 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 6, + "Formatter": 7, + "HorizontalAlignment": 2 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 3, + "HorizontalAlignment": 2 + }, + { + "FontSize": 13.333333333333332 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 8 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Formatter": 7 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 9, + "Formatter": 7, + "HorizontalAlignment": 2 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 10, + "Formatter": 7, + "HorizontalAlignment": 2 + }, + { + "Formatter": 11 + } + ], + "Types": { + "Strs": [ + "Body", + "Bold", + "Center", + "Text 1 50", + "0.0\"小时\"", + "Right", + "Accent 5 0", + "[AUTO]General", + "#FFFF0000", + "Accent 4 0", + "Accent 1 0", + "@" + ] + }, + "CellStyles": { + "1,0": 0, + "1,2": 1, + "1,16": 0, + "1,17": 0, + "2,1": 2, + "2,2": 2, + "2,3": 2, + "2,4": 2, + "2,5": 2, + "2,6": 2, + "2,7": 2, + "2,8": 2, + "2,9": 2, + "2,11": 3, + "2,12": 3, + "2,13": 3, + "2,15": 4, + "2,16": 5, + "3,1": 6, + "3,2": 7, + "3,4": 8, + "5,0": 0, + "5,1": 9, + "5,2": 7, + "5,3": 0, + "5,4": 8, + "5,17": 0, + "6,0": 0, + "6,1": 0, + "6,2": 0, + "6,3": 0, + "6,4": 0, + "6,5": 0, + "6,6": 0, + "6,7": 0, + "6,8": 0, + "6,9": 0, + "6,10": 0, + "6,11": 0, + "6,12": 0, + "6,13": 0, + "6,14": 0, + "6,15": 0, + "6,16": 0, + "6,17": 0, + "7,1": 9, + "7,2": 7, + "7,4": 8, + "9,0": 0, + "9,1": 9, + "9,2": 9, + "9,3": 0, + "9,4": 8, + "9,5": 8, + "9,6": 8, + "9,7": 8, + "9,8": 8, + "9,9": 8, + "9,10": 8, + "9,11": 8, + "9,12": 8, + "9,13": 8, + "9,14": 8, + "9,15": 8, + "9,16": 8, + "9,17": 0, + "10,0": 0, + "10,1": 10, + "10,2": 10, + "10,14": 11, + "10,15": 11, + "10,16": 11, + "10,17": 0, + "11,1": 12, + "11,4": 12 + }, + "SheetStyle": { + "FontFamily": 0 + } + }, + "Spans": [ + "11,1,1,2", + "1,2,1,14", + "11,4,1,3", + "7,4,2,13", + "5,4,1,13", + "3,4,1,13" + ], + "PageInfo": { + "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon", + "ParentPageName": "日报详情", + "ConditionFormatRulesCollection": { + "Rules": [] + } + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + } +}//IMBEv9lZrMEeK+zPBZ0/u+og/7/FuLvmHie/8T99R9OHCBj3aDp8C9Kgi9Tp6PGMbt7oYPu25QsaaieR1sSsYU9l44qc07UopwGs2XtWTBWM5yf17jyNZaYNdUgfX6RqiAurxwcWNB60/ZAWuGYkQhro/S5Ewjxuzm9cEbVxOptQGg7ug0T1p56LykTagbqJFFsT9Y4V4vi5DDlQRjkxuyRCDoPgGoXWYx5CbTMkYRKm5Q2YBvuZWeZBKXV7A25pPsys3eSDMeeSfeu3DVoPZeGgpreScANcfv7w0BjVMCA2TOGASJGPM9hfJZaWmOQpJZsUAadMBo2LaitOPiiReeAWK04D+ySvb3a5OyFHUpMGzqukk/agr9mdfd1nJhrZ0iCb7BrNoPCyNXK7b371SJVo17yk25e3r1hZowmXjbakyN5JcRsIx1yo5Wp/mV8S34cuhwcCZMNDc6hkUS2zeavtrYjfsyP4PwHjs2pQX1nYH3KdAiRvo6t4kRDrCnFOUqHZ4BOoTk9Z0xM2kSvKioARNlSuqCgJIYgumgrnnbFSHNMxPq1TulQLswTyK6r9Y6CSzzyyIGiZDrPhnh0wJSc+zSGKtfhs3vtMnY9/dCi4Pkg7HazgpVOaNNFk2zybFS9Ob6SQ+vZozHyvdsgQ9egCAybPCs+elXXqDpDacZbekhjnC7U5AmuDNJWM/NwWsr6xKUIYJORjZKdiIAfmx3/QQBzN1UZTHqF060t55EqbDb8yh/xv3Mec2o2DVqJVEfE+ICa7fnAELTNNNFWAWZbsSCKQTm82RsP18wu9yBrILTdOgEORCu3J0dAjYjHI7t/vlYIfAXo727tXVVXa81NaXqT/rhjQUCMFkHIarZ0q0fIBCEOh8mzf4ZeKUjctugcX7DrSR8NSbIt0Pg1pEg==|920 \ No newline at end of file diff --git a/Pages/ded19f0aa3d14ada9238c4218effa8e.rd b/Pages/ded19f0aa3d14ada9238c4218effa8e.rd new file mode 100644 index 00000000..0151c949 --- /dev/null +++ b/Pages/ded19f0aa3d14ada9238c4218effa8e.rd @@ -0,0 +1,8 @@ +{ + "PageType": 2, + "ColumnCount": 18, + "RowCount": 12, + "Formulas": { + "1,2": "E12&\" 工作日报\"" + } +} \ No newline at end of file diff --git a/Pages/汇报/日报/日报详情.json b/Pages/汇报/日报/日报详情.json new file mode 100644 index 00000000..ee814e8f --- /dev/null +++ b/Pages/汇报/日报/日报详情.json @@ -0,0 +1,750 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 22.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 14.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 600.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 39.0, + "IsHidden": true + } + } + }, + "InLogicalVisibleIndexes": [ + 12 + ], + "Count": 13, + "DefaultSize": 32.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "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 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "20": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "21": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "22": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 31.0 + } + } + }, + "Count": 23, + "DefaultSize": 32.0 + }, + "Values": { + "1,4": "上一天", + "1,16": "下一天", + "5,1": "今日工作", + "10,1": "*日报指的是昨日的工作总结，计划为今日工作安排", + "12,7": "新增一行", + "12,13": "%CurrentUser.UserName%", + "12,16": "%CurrentUser.FullName%", + "12,19": "%CurrentUser.UserName%" + }, + "AttachInfos": { + "1,4": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=日报详情!汇报日期" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=日报详情!汇报日期-1" + } + } + ] + } + ], + "Text": "上一天", + "TemplateKey": "Gost" + } + }, + "1,7": { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "开始日期", + "GUID": "ccc56d27-34f5-45c5-b265-13335949c620" + }, + "CellType": { + "$type": "Forguncy.DateCellType, ServerDesignerCommon", + "CellDefaultValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=TODAY()" + }, + "TemplateKey": "_RS_NewLittleRoundCorner" + } + }, + "1,16": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=日报详情!汇报日期" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=日报详情!汇报日期+1" + } + } + ] + } + ], + "Text": "下一天", + "TemplateKey": "Gost" + } + }, + "1,21": { + "CssName": "rotate-slow", + "CellType": { + "$type": "Forguncy.ImageCellType, ServerDesignerCommon", + "ToolTip": "AI助手", + "Size": 18, + "ImagePath": "gpt.svg" + } + }, + "5,6": { + "CssName": "toolbar toolbar-right ", + "CellType": { + "$type": "Forguncy.CustomMenu.ForguncyMenuCellType, Forguncy.CustomMenu", + "TemplateKey": "横向迷你菜单", + "Items": [ + { + "Value": "清空", + "Text": "清空", + "IconPath": "Application/043_brush_2.svg", + "SelectedIconColor": "Background 1", + "SelectedIconColorUseItemColor": true, + "IconColorUseItemColor": true, + "IsOldMenuPath": false, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateListviewCommand, ServerDesignerCommon", + "ListviewName": "图文列表表格1", + "UpdateType": 2, + "UpdateRowType": 2 + } + ], + "CanVisitRoleList": [ + "FGC_LoginUser" + ] + }, + { + "Value": "菜单1", + "Text": "从工时导入", + "IconPath": "Arrow/318_import_2.svg", + "SelectedIconColor": "Background 1", + "SelectedIconColorUseItemColor": true, + "IconColorUseItemColor": true, + "IsOldMenuPath": false, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "导入汇报数据", + "PassValues": [ + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=日报详情!汇报日期-1&\",\"&日报详情!汇报日期-1" + }, + "TargetCell": { + "SerializeProperty": "=导入汇报数据!日期范围" + } + } + ] + } + ], + "CanVisitRoleList": [ + "FGC_Anonymous" + ] + }, + { + "Value": "菜单1", + "Text": "新增一行", + "IconPath": "Application/001_add_1.svg", + "SelectedIconColor": "Background 1", + "SelectedIconColorUseItemColor": true, + "IconColorUseItemColor": true, + "IsOldMenuPath": false, + "CanVisitRoleList": [ + "FGC_LoginUser" + ] + } + ], + "Orientation": 0, + "MenuLevelsStyle": [ + { + "FontSize": 13.333333333333332, + "Bold": false, + "Height": 32.0, + "IconHeight": 14.0, + "IconWidth": 14.0 + } + ] + } + }, + "7,1": { + "CellType": { + "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", + "TemplatePageName": "ded19f0aa3d14ada9238c4218effa8e", + "DataSourceType": 1, + "DataSource": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "汇报记录表", + "BindingInfos": [ + { + "GUID": "66ea517b-39f5-4329-a029-f1370a1d7a7e", + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "ID", + "GUID": "1a6d1ec9-f339-46c4-989c-5e1a1c79a662" + }, + "ColumnName": "ID" + }, + { + "GUID": "f1d4c24f-297a-4b75-a5e5-7ed067a382a4", + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报类型", + "GUID": "a306d784-f9bd-474b-9d4d-73f808a805a6" + }, + "ColumnName": "汇报类型" + }, + { + "GUID": "23b7abd3-a051-4db0-8868-90f6bba58307", + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "开始日期", + "GUID": "a1c52089-dcf8-419d-b5f4-45b44cfd23b9" + }, + "ColumnName": "开始日期" + }, + { + "GUID": "b9bfcb5d-6457-4c9a-b06a-1b129f0de639", + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "截止日期", + "GUID": "a66df7aa-6f4c-4d09-a0aa-965076b7c98d" + }, + "ColumnName": "截止日期" + }, + { + "GUID": "4b406e2d-4cf6-4d98-a2be-7e3ad349e37e", + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报人", + "GUID": "6206bd47-2035-449f-8e49-84c60148a8fe" + }, + "ColumnName": "汇报人" + }, + { + "GUID": "48014f75-5331-43de-80e4-44df4d08af1d", + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "内容", + "GUID": "34950795-3537-44f0-a4a9-9f14fe2c8bec" + }, + "ColumnName": "内容" + }, + { + "GUID": "74b2bbbc-5873-4968-bc85-b645ef1621d6", + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "所有描述", + "GUID": "277ce5f6-6daf-4dab-87e1-4a9a9b9f4b64" + }, + "ColumnName": "所有描述" + }, + { + "GUID": "f9a39964-80bb-478c-bd3b-99f6a03e7697", + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报数量", + "GUID": "0f234f2f-0183-40ac-a3ac-f59e48cd41b6" + }, + "ColumnName": "汇报数量" + }, + { + "GUID": "8a68ab67-9208-4eb6-958e-6189e87c04f4", + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报日期文本", + "GUID": "b7045c9d-891d-4d11-ab7b-86c612b0fadf" + }, + "ColumnName": "汇报日期文本" + }, + { + "GUID": "067c08dd-3016-4ee4-b871-6b6adaf37769", + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "FGC_Creator", + "GUID": "a00a320c-2db7-40eb-854c-7fc05f4b7643" + }, + "ColumnName": "创建者" + }, + { + "GUID": "5b150217-a6b6-4e5b-a677-9384d88a0b6d", + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "FGC_CreateDate", + "GUID": "862296be-dedd-40c9-994e-d3fde7f23629" + }, + "ColumnName": "创建日期" + }, + { + "GUID": "e520267a-ff7e-4d69-a470-88653f5de8b2", + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "FGC_LastModifier", + "GUID": "fb73d1db-4528-4ce8-988d-f02343720166" + }, + "ColumnName": "最后更新者" + }, + { + "GUID": "7e2a26d8-0e4f-44a3-95af-92a660276582", + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "FGC_LastModifyDate", + "GUID": "5cc712d4-3104-44e5-866f-03fdbd630b21" + }, + "ColumnName": "最后更新日期" + } + ], + "OrderBySqlCondition": { + "OrderByColumns": [ + { + "ColumnBindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报日期文本", + "GUID": "65cd1871-e60d-4db4-8a76-b20d2b237df6" + }, + "Order": 1 + } + ] + }, + "IsListviewDataSource": true, + "CustomColumns": [] + }, + "DataSourceListviewName": "图文列表表格1", + "NoItemSetting": { + "ImageForNoItem": { + "Name": "暂无内容 (1).png" + }, + "NoItemImageSize": 180.0, + "TextForNoItem": "请点击\"新增一行\"开始填写", + "Orientation": 1 + }, + "TemplateKey": "横向分割", + "CommitDataWithCommand": true + } + }, + "12,3": { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "ID", + "GUID": "cdb43b1e-2041-4d56-ab6e-da5a26c7d5b0" + } + }, + "12,7": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "Text": "新增一行", + "TemplateKey": "Gost", + "Icon": { + "Name": "Application/001_add_1.svg", + "BuiltIn": true, + "Color": "Background 1", + "UseCellTypeForeColor": true + }, + "IconSize": 14.0 + } + }, + "12,13": { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报人", + "GUID": "4450a20c-d264-4f80-b4d1-9b6a98317ba5" + } + } + }, + "StyleDatas": { + "Styles": [ + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Formatter": 1 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332 + }, + { + "FontFamily": 0, + "FontSize": 16.0, + "HorizontalAlignment": 2 + }, + { + "BorderBottom": 0 + }, + { + "FontWeight": 4 + }, + { + "HorizontalAlignment": 2 + }, + { + "HorizontalAlignment": 2, + "BorderBottom": 0 + }, + { + "FontSize": 12.0, + "Foreground": 5 + }, + { + "FontSize": -1.0 + } + ], + "Types": { + "Strs": [ + "Body", + "[AUTO]General", + "Center", + "Background 2 0", + "Bold", + "Text 1 50" + ], + "Borders": [ + { + "Color": 3 + } + ] + }, + "CellStyles": { + "0,14": 0, + "0,15": 1, + "0,16": 1, + "0,17": 1, + "0,18": 1, + "0,19": 1, + "0,20": 1, + "0,21": 1, + "0,22": 1, + "1,4": 0, + "1,5": 1, + "1,6": 1, + "1,7": 2, + "1,15": 1, + "1,16": 0, + "1,17": 1, + "2,4": 0, + "2,5": 0, + "2,6": 1, + "2,7": 2, + "2,8": 2, + "2,9": 2, + "2,10": 2, + "2,11": 2, + "2,12": 2, + "2,13": 2, + "2,14": 2, + "2,15": 1, + "2,16": 0, + "2,17": 0, + "3,1": 3, + "3,2": 3, + "3,3": 3, + "3,4": 3, + "3,5": 3, + "3,6": 3, + "3,7": 3, + "3,8": 3, + "3,9": 3, + "3,10": 3, + "3,11": 3, + "3,12": 3, + "3,13": 3, + "3,14": 3, + "3,15": 3, + "3,16": 3, + "3,17": 3, + "3,18": 3, + "3,19": 3, + "3,20": 3, + "3,21": 3, + "5,1": 4, + "5,6": 1, + "5,22": 1, + "7,1": 5, + "7,22": 5, + "8,1": 6, + "8,2": 6, + "8,3": 6, + "8,4": 6, + "8,5": 6, + "8,6": 6, + "8,7": 6, + "8,8": 6, + "8,9": 6, + "8,10": 6, + "8,11": 6, + "8,12": 6, + "8,13": 6, + "8,14": 6, + "8,15": 6, + "8,16": 6, + "8,17": 6, + "8,18": 6, + "8,19": 6, + "8,20": 6, + "8,21": 6, + "8,22": 6, + "10,1": 7, + "12,3": 1, + "12,4": 1, + "12,5": 1, + "12,7": 0, + "12,8": 1, + "12,11": 1, + "12,12": 0, + "12,13": 1, + "12,16": 8, + "12,19": 1 + }, + "SheetStyle": { + "FontFamily": 0, + "FontSize": 13.333333333333332 + } + }, + "Spans": [ + "7,1,1,21", + "12,3,1,3", + "12,7,1,5", + "12,13,1,3", + "1,4,1,2", + "1,16,1,2", + "1,7,1,8", + "12,16,1,3", + "5,6,1,16", + "12,19,1,4" + ], + "PageInfo": { + "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "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": {} + }, + "CustomNames": [ + { + "Name": "汇报人", + "Formula": "日报详情!$N$13" + }, + { + "Name": "汇报日期", + "Formula": "日报详情!$H$2" + }, + { + "Name": "汇报ID", + "Formula": "日报详情!$D$13" + }, + { + "Name": "用户名", + "Formula": "日报详情!$T$13" + }, + { + "Name": "用户全名", + "Formula": "日报详情!$Q$13" + }, + { + "Name": "增加一行按钮", + "Formula": "日报详情!$H$13" + }, + { + "Name": "日报列表", + "Formula": "日报详情!$B$8" + } + ] +}//z1Oo7tVyLPwwMqzuW9zAlBgKA3Gc7MgGA3oDv7QiC/3j9emuAtbAW0cyczFpX3W78oLGroKjP6MfrvkF19L0e+lBbrYFuqe9Q/13n6wk/xe148j88aL4u5fI/hXX2FIQHd3Gny6kraw0RpZgeXjeUADhiR9PpRlPvwUghqz7MBbl6CQe3E6Oflbd+O1WccaEANDViwikLQbZ1z4AxkQWNa5W4nUz30qnhBBnGf55PzwPZvczUOI9Aau9V5/VN01V9gJKH+TQzZFDPfSavhAfqx5jBzE0c98Hd7Ood1upzla2ENEamtkx3BVyNAIpXpGENnZhnXQiJ6sTZvLBhgoIdbk2iQvLqqJAz5kdH3SpmnGyEaT1Vvb682wwXnT05N46fuUvmSFnYtaUb8e/XwnOe10EOMMBerI/+bwWYmHtq3Fk3DGVB9IuSKX1sULZnmczpOc7JL7DWx93gSB5qhrH6R26FZ222dL+Nw+S8+SToWtpLHL7vgyQmhXrSp5XaElMDbxGmHcMJHSG3BcEtm5v2E5IwCO+RT7aPDX2/vXbTNtZfy/EFhvVREAwaorOdOSJBeRlYW47v9hvswLgz5gz0/Qne2Sr2S8evWpf47RDUIYg6VkT3vFZemQJjFnDVjF5zvTjKrDlxf+BXtlu13We53/VZ6NSAkImh8y6An26lUlDVoVK2vmMitO9f+2EjlaQrD/aCa2b/A2aiBnjWDOyXS4862X7f6dGX8ohXvaDCL3WGfrf2iO/QO2mIbsWoYLgZ1QsR9QcL1j1PbnCL3pvN9r383vYKC0Km9Pb+v0CCCixwzFvAEHFx5ZKYHk8Pe1ghCgPjFK07Wc/L7BB0ceCq8dQdGJYeWB/PRGDwhhhzfyoxQtp6pCvWzGw9U1zTFfAON+KDdKwuocefhWiIzIgfg==|920 \ No newline at end of file diff --git a/Pages/汇报/日报/日报详情.rd b/Pages/汇报/日报/日报详情.rd new file mode 100644 index 00000000..854ba0d3 --- /dev/null +++ b/Pages/汇报/日报/日报详情.rd @@ -0,0 +1,35 @@ +{ + "PageType": 0, + "ColumnCount": 23, + "RowCount": 13, + "CustomNames": [ + { + "Name": "汇报人", + "Formula": "日报详情!$N$13" + }, + { + "Name": "汇报日期", + "Formula": "日报详情!$H$2" + }, + { + "Name": "汇报ID", + "Formula": "日报详情!$D$13" + }, + { + "Name": "用户名", + "Formula": "日报详情!$T$13" + }, + { + "Name": "用户全名", + "Formula": "日报详情!$Q$13" + }, + { + "Name": "增加一行按钮", + "Formula": "日报详情!$H$13" + }, + { + "Name": "日报列表", + "Formula": "日报详情!$B$8" + } + ] +} \ No newline at end of file diff --git a/Pages/汇报/日报/日报首页.json b/Pages/汇报/日报/日报首页.json index a09c875a..bc057d42 100644 --- a/Pages/汇报/日报/日报首页.json +++ b/Pages/汇报/日报/日报首页.json @@ -303,7 +303,7 @@ } } ], - "ID": "059b5dcd-2500-4876-9581-86bb712978e9" + "ID": "b9bfa37a-4d80-492c-889e-59c0ac894605" } ] } @@ -571,7 +571,55 @@ } } ], - "ID": "9b69e306-73c7-4349-a950-08fb29e28d0a" + "ID": "a25ff887-d946-42ef-be74-6cb0b758ae9b" + } + ] + } + ], + "ParamProperties": { + "IsOK": "是否为确定" + } + }, + "PageName": "日报详情", + "LoadBindingDataOption": 1 + }, + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "ShowDrawerHeader": true, + "ClosePopupCallbackCommand": { + "Commands": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=日报首页!是否为确定" + } + ] + }, + "value": "1" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=日报首页!B2" + }, + "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "ResetTable", + "ParameterValues": { + "clearSort": true, + "clearFilter": true + } + } + ], + "ID": "edf4995f-90ee-41cd-9fd7-6eb0e3cb8f07" } ] } @@ -581,7 +629,8 @@ } }, "PageName": "汇报详情", - "LoadBindingDataOption": 1 + "LoadBindingDataOption": 1, + "Disabled": true } ], "ParamProperties": { @@ -856,4 +905,4 @@ "Formula": "日报首页!$B$2" } ] -}//9wAW3pwtH/MqA8lsxrXzzL6e9T4mOcJgcVgqLpi+HWEjt2stMrhnUDROOZIo0rWhuGJmh4pkAoP1ZP0/WvioSrmblwJFLPSdllzcWwN402g5N90hZFsxUCfDcTb2sJw45eydNgWF8ZFK8CIp6koVnR+iLCzBLOQiAB2x2KGNZS0Kiahs3up1juapZr0etOwY/cDeaTQtTarDgxqBLzTJxndD1MOn9fPMLe2fhvKQLKsXol6KV2QDss1SAS4UeewhzEaI0bNJAtJZHVdE3fgDTASWv/dcwY2VxpztK45T3MJyvTPRIQkhdSZuIlwupIQkKGUpYaeDc6hmV8OtR1FTBnFZ3ffwJzKJfpHfCe0/7BEWxgy/OazdSOQqq+VZA7z26GrNgUYu8A/obL9CMOmS7mFXI+TLaIJUGYSjKmY22U8wSwcaZgcioG33uCCC/B7iz4CKqAgnZfswK3D/d2pOrCALv29A8tYjOlDSuNErhXAFJBNUJqPnWNWdaj2QZ6rvrA8rvuiy9nokJ6XBb6jMQDf3K96qPe0FjqgNpo/Gw2KFfgQQfHnlMV7RDy8jJW/QAwuXw6u7V6x94S6kpZWjYKxxpZvedYbScnroOCQlBRHbkSCImIAIcfRQQSCVGlEO4+iAqTgRdTBNCcYHMYn66ncWJEs+2bpfPknD5Hbk6gmT/7pY5eTdvw4W9egSkywK7NZIlmOuntNzTEc3kBETDNCTBDskUwAWI0gSOw2Yel67kvB0Oqxa/eozjCQGOQ+wMrFAjDQFK2tz3CTjE6AWYlworKmLoU6flSsbTuwWkdgQ/plIxcv5By4ZN4bZSvfTM7gFEJwz2+fmOJmv1cR5i+AWvbT47OjqzVFmI/ZsbfVLhqZDpyHfrytPfkq43fYe+m8ZuFgSHftpeDA1iYtkNA==|920 \ No newline at end of file +}//1mJzFkKzazvKr7QpXU4PJXUPifZEjSmrlD6m8JoxGFFyJg/gA5+Tm7PYR4Qasot3qPDbJliKYKJOSNSqWG01zmPdGhojzN2/ta8SJ34hI5ex+k4gNzdEHlZKyD4+OZ2vbLhHTyhGrbfUCFVjS9TtxQtaOCRFgL5h7KiBWI3vK4xgIwx5WNqaS532ojmSIcQI2osrU9v2rk1i1c8kbMRIFVvorjgNnkhwFTLV/V023gRgMnkFohaPmJo0pFaQjMYER2s8ut9qAFMLRA0GNK2YyIJwNM0MAPUdguN2kUfGtiMqANZ3Lodd7v8sjVDMZ21VH+jPtzYHjHAgo83TshSfD6Ge6/lpiHdE/9cINIoCPr/w/+De7vcG77i1STmbmOI2MZvTDRUVDCrsmHle/LMfY1eAwvuoyzUMl+cjT5bqWI58YZEROa6oj5LW1Ot1m7DWvFFeYWT9/DumG6BIUeZMQzknf69y33iKQ+Xka/mgP+dVNfa0MCk/NaxS0R0adrtsDq0q+tbw7gii+YtFQQuxFhMqaFwgYJuhf/f4goDEAs/I50AOwLHVgDFoePsK7Cfr+KFG4MhE69/hZnNqqdbCjevFUin1IuV6KJehNB47E7BGli5XNao1/amFuw3MXSK5Gdq0uqJFr3kI9ehpNborFi00lyj/xrnAcu3DhzW09SxkQMa7rD0ilBhZl/iRsUJHUCXIyXkv/Tg85J76RIv9kMBTA0XAttdVzdsMIrFaurfBgK8BbQrEEI9ugz6NdBCD8XgSi16bsqV+XGKKa67/k6czBjN4DC9dzZtBGw9e8AhYbA08FKNVy6qufIxPnkQSR3AnqP1rM70zlEsy3znSlbn0VIJ2OZ4OpNlLlm8SkW3mD/+ztIupHO+tM+T7ejX30jweYJuANKAolsMlWEwXkQ==|920 \ No newline at end of file diff --git a/Pages/汇报/日报/日报首页.rd b/Pages/汇报/日报/日报首页.rd index e20cf79a..8236a71d 100644 --- a/Pages/汇报/日报/日报首页.rd +++ b/Pages/汇报/日报/日报首页.rd @@ -1,11 +1,11 @@ -{ - "PageType": 0, - "ColumnCount": 31, - "RowCount": 12, - "CustomNames": [ - { - "Name": "个人日报表格", - "Formula": "日报首页!$B$2" - } - ] +{ + "PageType": 0, + "ColumnCount": 31, + "RowCount": 12, + "CustomNames": [ + { + "Name": "个人日报表格", + "Formula": "日报首页!$B$2" + } + ] } \ No newline at end of file diff --git a/Pages/汇报/汇报模板/模板详情.json b/Pages/汇报/汇报模板/模板详情.json index 0143b7d5..fa793c78 100644 --- a/Pages/汇报/汇报模板/模板详情.json +++ b/Pages/汇报/汇报模板/模板详情.json @@ -22,22 +22,32 @@ "DesignLengthInPixel": 32.0 } }, - "5": { + "8": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 32.0, + "Mode": 1, + "IsHidden": true } }, - "6": { + "9": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "IsHidden": true } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 434.0 + } } }, "InLogicalVisibleIndexes": [ - 6 + 6, + 7, + 8, + 9 ], - "Count": 7, + "Count": 10, "DefaultSize": 32.0 }, "Cols": { @@ -147,8 +157,10 @@ "DefaultSize": 32.0 }, "Values": { + "4,17": "预览", "4,21": "确认内容", - "6,12": "%CurrentUser.FullName%" + "9,12": "%CurrentUser.FullName%", + "9,17": "shamus" }, "AttachInfos": { "1,1": { @@ -184,6 +196,120 @@ "resize": "none" } }, + "4,17": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=模板详情!7:9" + }, + "Value": true + } + ] + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "根据汇报模板生成内容", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "汇报人", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=模板详情!R10" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "生成日期", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=TODAY()-1" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "ReturnPropertiesTo": [ + { + "ResultPropertyName": "生成文本", + "ResultTo": { + "SerializeProperty": "返回内容" + } + } + ], + "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" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=模板详情!B8" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=模板详情!返回内容" + } + } + ] + } + ], + "ID": "cd6b9ab3-9cc6-4065-b645-fbe92e2d0c5a" + }, + { + "CommandList": [ + { + "$type": "ElementUI.Commands.ShowMessageBox, ElementUI", + "Title": "提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=模板详情!msg" + }, + "Type": "error", + "ConfirmButtonText": "确定", + "CancelButtonText": "取消", + "ShowClose": false, + "AdvancedSettings": {} + } + ], + "ID": "e93eb596-be4b-4475-b625-1395922eaee8" + } + ] + } + ], + "Text": "预览", + "TemplateKey": "_RS_Main1" + } + }, "4,21": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", @@ -201,23 +327,66 @@ "Text": "确认内容", "TemplateKey": "_RS_Main1" } + }, + "7,1": { + "CellType": { + "$type": "TinyRichEditor.TinyRichEditorCellType, TinyRichEditor", + "UIPermissions": [ + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + } + }, + "9,17": { + "CellType": { + "$type": "Forguncy.TextCellType, ServerDesignerCommon", + "CellDefaultValue": "shamus", + "SavedValidators": [ + { + "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon" + } + ], + "TemplateKey": "_RS_NewLittleRoundCorner" + } } }, "StyleDatas": { + "Styles": [ + { + "Formatter": 0 + } + ], "Types": { "Strs": [ + "@", "Body" ] }, + "CellStyles": { + "9,17": 0 + }, "SheetStyle": { - "FontFamily": 0 + "FontFamily": 1 } }, "Spans": [ - "6,1,1,11", + "9,1,1,11", "4,21,1,4", - "6,12,1,5", - "1,1,2,24" + "9,12,1,5", + "1,1,2,24", + "7,1,1,24", + "4,17,1,3", + "9,17,1,4" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -245,11 +414,11 @@ "CustomNames": [ { "Name": "日期", - "Formula": "模板详情!$B$7" + "Formula": "模板详情!$B$10" }, { "Name": "汇报人", - "Formula": "模板详情!$M$7" + "Formula": "模板详情!$M$10" } ] -}//finC0/WEnN0J4Tq07DviXI6dQlcS6kXx1oA1VGhib6ljcqxROxXgVYTg8GH5WvXcjZM53S08rDXTDHVK6atRmmaG5tSfvVEypMCfeZuk/DnbGV65I/Kwk7PHb6SAkPbg9SD6AGi9oxoM+VeMNDGmjzdoNymYhtaxOBvxmpNX+hOrQtZbmKmxgWPDaLJFpcWjQyNGZ4zLA/EE6OxqFVsuY2zR9/swNft7Awd4Ju/adXOX9t7555GziUhRfZc38MUZYFsHuJYUcglON5etvx/uZk1OQtNPS/3J9oLmYzPN56iJBn4JJsLfLkwVtF70lEB636qDG6K6W1si1rbhE3Cm8/f0hMN4ntl6Emz76TxQc6CeoPz5Poowia6I5qaayxVKI31WDNYURmwxpwtGyyOKgilPq/yBaesxWqYJLCWF1/bl1d4bEAmQMOLD2ovEHjh5LPi/dCe1KWNMmJaLZTIHqpfv0IY/Eh7wENHskJXT3/F/zOx4RfOEtVu/IH1Nzu32k7Tgs2jXybahrfayyyUkaQ/f9gBQCrY9Vd87g30BywgMbFT65yr8C0QzGE97Vi/iPChwwdTX42do9GvIxgqtz/AWtilS3AQPSUrIIfNFqvx/tWIRNkTHmj/KB1N40mYwWCZ46/awJyRdLaz8igGwv7MmylTzWaRmTmVNYjESqQTYOzyL8Z6cWOGAzNhE9a0ReeWQC/Wv+erbVcNsZnvxP8YuWrU8uEOHsu3IeS/RTijcaihq/55YOhOffXAzC/x6edhhJN5IgqFdFnPH2CZSAFAwAERAKN2cnd0iSxIdz1v208wn5AqSBZ2origRfXfAUCakO9SZjOwiATblmTwOGFmSb9CFCHQz23AjjVxjrBlgJg77Us0aZEHIbFE8fIBeFLd/dSA/z3Kh3ozj8Prp2Q==|920 \ No newline at end of file +}//fIiYkh20M7qZc+7p7GAKR1UibPdzhjVIFHVB7qYX7jh2SG/P09DwbuBXxhTxYDM4ZnXY7S3Jp5ZLVB8eMA7poM7WquhhaXtJD9zhk5Nkd+Rk0hzVb9vsDxP+E7nmObxDKoIm7Ur98iqQbViVFV6/e308ETbdW47zAyEM5qvh07tRqrMlgCzokwILrVxlkoiP3AotVnjAxCh01qQhS83Bl9jL3J9h25mJd8S/2AQ6R9BcwHIyYqwIDYQM3LsX/H8X9Z4LpQeekolCOplYY1f/YlYxx/PAC35btA1dTLlNZN9oZJs3yBm6prKTGfFP9+yfpmPaX5nTvNDtBKPr6FVvkGjJoCwlnL9scIlDdHNC69lreWY1ZXE+cq1ICUegszrYw/rTVe2PdCmi0+jVbWoYC2zTwIlYMDV/rHzvxM7E3X+wcI6Dd13xGq4f0LPgxizWJRanYvspKzEFzLZMU2F4sbPDgBa2SQ2cI4ouZBR3t5z+mZF9bdZkle21JDCSWoBXqRmaftsQ9jbabDl2ked03Y0ZZJP58ZJU1kVzsc44s4fEXxoyPo+R0kdn/PGqI9KEmQNMhTza7NQNNQCi6Z2e5e4S/4SytijmVs0G0may6rzznASNajlsslDkjtolNkLW7IhAPxTK0TB0iIULIEnfOvHCsPtijcdkqv9MpHxQazsE7kIdDtbLu5tC4UW4oQU8fAXS5N/j/YpT6/cnCOHLdSzEwAYwZOg1lUlrYFq2GHO0eOPuhjz/yc1aG3Gjot8VtEmiT+lu/Ssx6ekdV0aZByhsTD8/mFnNNUGUEs8zXmDadVQan+oM3qz5MmJCQfgSctmpUWfWfigigDTRh7krbUAPzotVB+3kW0F4mxiUhQv388lJwVodOQ52Wv/bQczlDkPRss1DOroPDTNc9lDN3g==|920 \ No newline at end of file diff --git a/Pages/汇报/汇报模板/模板详情.rd b/Pages/汇报/汇报模板/模板详情.rd index 8e3c3cf6..628dcc52 100644 --- a/Pages/汇报/汇报模板/模板详情.rd +++ b/Pages/汇报/汇报模板/模板详情.rd @@ -1,15 +1,15 @@ { "PageType": 0, "ColumnCount": 26, - "RowCount": 7, + "RowCount": 10, "CustomNames": [ { "Name": "日期", - "Formula": "模板详情!$B$7" + "Formula": "模板详情!$B$10" }, { "Name": "汇报人", - "Formula": "模板详情!$M$7" + "Formula": "模板详情!$M$10" } ] } \ No newline at end of file diff --git a/ServerCommands/汇报/单日自动生成工作日报.json b/ServerCommands/汇报/单日自动生成工作日报.json new file mode 100644 index 00000000..5e58361a --- /dev/null +++ b/ServerCommands/汇报/单日自动生成工作日报.json @@ -0,0 +1,185 @@ +{ + "Name": "单日自动生成工作日报", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.InvokeTriggerSaveData, ServerDesignerCommon", + "Parameters": [ + { + "Name": "汇报人", + "DataValidationInfo": { + "IgnoreBlank": false + }, + "TestData": "shamus" + } + ], + "InvokeTriggerTestData": { + "UserName": "Administrator" + } + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "汇报日期", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=TODAY()-1" + }, + "ID": "a87e3ca92ae14b12b51e7629f1bbcac9" + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "根据汇报模板生成内容", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "汇报人", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报人" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "生成日期", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报日期" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "ReturnPropertiesTo": [ + { + "ResultPropertyName": "生成文本", + "ResultTo": { + "SerializeProperty": "生成汇报内容" + } + } + ], + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=code" + } + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=生成汇报内容" + } + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "汇报记录表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报类型", + "GUID": "c24375f5-368c-4882-8bc7-691ca8607982" + }, + "Value": "日报" + }, + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "开始日期", + "GUID": "90dcdd45-0dec-413f-a07b-13206a41440b" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报日期" + } + }, + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "截止日期", + "GUID": "4761c4e0-bf27-4842-bace-6c2144a7fb51" + } + }, + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报人", + "GUID": "1569dd18-fc90-4c8c-b3f3-8c3b97f0f6bf" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报人" + } + }, + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "内容", + "GUID": "db38ba4b-0673-4ade-9b64-fee68ccddf8b" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=生成汇报内容" + } + } + ] + } + ], + "ID": "c7381055-93f9-4a67-bdd8-2f93bceac794" + } + ] + } + ], + "ID": "91b650f6-722e-468a-a6d9-9b6d44cd3d5f" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=code" + }, + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=msg" + } + } + ], + "ID": "80834d9a-c680-45ed-96f8-2e4cd51b4a1b" + } + ] + } + ] +} \ No newline at end of file diff --git a/ServerCommands/汇报/根据汇报模板生成内容.json b/ServerCommands/汇报/根据汇报模板生成内容.json index be2569e9..957bbf09 100644 --- a/ServerCommands/汇报/根据汇报模板生成内容.json +++ b/ServerCommands/汇报/根据汇报模板生成内容.json @@ -46,6 +46,15 @@ "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", "OutParamaterName": "汇报列表" }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "处理汇报日期", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=TEXT(生成日期,\"yyyy-MM-dd\")" + }, + "ID": "57953c14a267457fadd1acb81491f09e" + }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "总工时", @@ -54,7 +63,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "0df5eee0-bdde-4f34-a2d0-ad9291d19272", + "GUID": "a4ea1be8-f768-4f0a-8c21-3e41578db770", "BindingInfo": { "TableName": "任务工时表", "ColumnName": "总工时", @@ -103,7 +112,7 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "a8eef77ada214e5eaaac3ce06da86e21" + "ID": "432e99ea6d31443fa9117b616a793ef3" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -112,7 +121,7 @@ "TableName": "任务工时表", "BindingInfos": [ { - "GUID": "47fae38f-8282-4267-a120-b4f55fcf8351", + "GUID": "81174126-3200-4dcc-9421-3814d4d405f1", "BindingInfo": { "TableName": "任务工时表", "ColumnName": "项目ID", @@ -121,7 +130,7 @@ "ColumnName": "项目ID" }, { - "GUID": "dd28102a-74ae-4cf7-8c23-8de534feda0c", + "GUID": "ceec9c39-5ff8-4d2c-b30d-a2d8cf5829fe", "BindingInfo": { "TableName": "任务工时表", "ColumnName": "项目ID", @@ -135,7 +144,7 @@ "ColumnName": "项目名称" }, { - "GUID": "4ec3aa4e-60f7-4f6a-b832-b2606b368a98", + "GUID": "d075611f-42bc-4c5a-992f-108e0d2add4f", "BindingInfo": { "TableName": "任务工时表", "ColumnName": "总工时", @@ -184,7 +193,7 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "57e8988a8cf146c09fbc442a1304e5ef" + "ID": "b2cf0acec9a54589b841b99ed589248d" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -221,7 +230,7 @@ "TableName": "任务工时表", "BindingInfos": [ { - "GUID": "91a3ddbd-f42d-4b41-bc71-3ff3156bea16", + "GUID": "259258c6-67d3-42e4-a5ab-d0093187d80f", "BindingInfo": { "TableName": "任务工时表", "ColumnName": "执行内容", @@ -268,12 +277,22 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=当前项目.项目ID" } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 1, + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行内容", + "GUID": "65c531dc-6b4c-4568-8153-a0ac38c3ec10" + }, + "Value": "%Null%" } ] }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "64d4a898578641de9ada1dca4ae4a13f" + "ID": "4299bb2018a34f71afc41ac0c4985620" }, { "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit", @@ -311,7 +330,7 @@ ] } ], - "ID": "38ddba3f-374d-49ea-b83c-b932d1c43a9b" + "ID": "82f93294-3dd3-45ce-a5d8-16d5d0da465e" } ] }, @@ -322,7 +341,7 @@ "Name": "汇报日期", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=生成日期" + "SerializeProperty": "=处理汇报日期" } }, { @@ -357,7 +376,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "d23ce3e3-df11-4598-802b-5ad9bac3d75f", + "GUID": "80ed5a4f-ff78-40ef-8307-9c62389ca5ab", "BindingInfo": { "TableName": "汇报模板", "ColumnName": "模板内容", @@ -378,7 +397,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "68c66ce62ba04af99c39f92383b82296" + "ID": "b6b2fdb85de741729261a8401825e36c" }, { "$type": "MustachePlugin.Render, MustachePlugin",