From 171cae40068eea2cba3250a87ddfcb7b20441725 Mon Sep 17 00:00:00 2001 From: "TYFEIKELE\\tyfeikele" Date: Fri, 14 Jun 2024 21:59:18 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E5=88=9B=E5=BB=BA=E6=97=A5?= =?UTF-8?q?=E6=8A=A5=E6=A8=A1=E6=9D=BF=E5=88=97=E8=A1=A8=E3=80=81=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=E5=8F=8A=E7=9B=B8=E5=85=B3=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=8C=E5=AE=8C=E5=96=84=E4=B8=AA=E4=BA=BA=E6=97=A5?= =?UTF-8?q?=E6=8A=A5=E8=AE=A1=E5=88=92=E4=BB=BB=E5=8A=A1=E3=80=81=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E3=80=81=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD","Messag?= =?UTF-8?q?eType":2,"Modules":[{"State":1,"Type":7,"Name":"Table/=E6=B1=87?= =?UTF-8?q?=E6=8A=A5=E8=AE=B0=E5=BD=95=E8=A1=A8"},{"State":1,"Type":1,"Nam?= =?UTF-8?q?e":"PCPage/=E6=B1=87=E6=8A=A5=E7=AE=A1=E7=90=86"},{"State":1,"T?= =?UTF-8?q?ype":1,"Name":"PCPage/=E6=97=A5=E6=8A=A5=E9=A6=96=E9=A1=B5"},{"?= =?UTF-8?q?State":1,"Type":1,"Name":"PCPage/=E6=A8=A1=E6=9D=BF=E5=88=97?= =?UTF-8?q?=E8=A1=A8"},{"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":1,"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":1,"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"},{"State":3,"Type":21,"Name":"SchedulerTask?= =?UTF-8?q?s/=E5=B7=A5=E4=BD=9C=E6=B1=87=E6=8A=A5"},{"State":3,"Type":16,"?= =?UTF-8?q?Name":"TaskScheduler/=E8=AE=A1=E5=88=92=E4=BB=BB=E5=8A=A11"},{"?= =?UTF-8?q?State":3,"Type":16,"Name":"TaskScheduler/=E6=AF=8F=E6=97=A5?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=8A=A5=E5=B7=A5=E8=87=AA=E5=8A=A8=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=B7=A5=E4=BD=9C=E6=97=A5=E6=8A=A5"},{"State":3,"Typ?= =?UTF-8?q?e":15,"Name":"ServerCommand/=E4=BF=AE=E6=94=B9=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E6=97=A5=E6=8A=A5"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 119 +-- Pages/ded19f0aa3d14ada9238c4218effa8e.json | 440 --------- Pages/ded19f0aa3d14ada9238c4218effa8e.rd | 8 - Pages/汇报/日报/日报详情.json | 721 ++++++--------- Pages/汇报/日报/日报详情.rd | 25 +- Pages/汇报/日报/日报首页.json | 54 +- Pages/汇报/汇报模板/模板列表.json | 289 ++++-- Pages/汇报/汇报模板/模板列表.rd | 4 +- Pages/汇报/汇报模板/模板详情.json | 396 ++++---- Pages/汇报/汇报模板/模板详情.rd | 15 +- Pages/汇报/汇报管理.json | 41 +- Pages/汇报/汇报管理.rd | 60 +- .../每日根据报工自动生成工作日报.json | 30 + ServerCommands/汇报/修改工作日报.json | 95 ++ ServerCommands/汇报/单日自动生成工作日报.json | 540 +++++++---- ServerCommands/汇报/根据汇报模板生成内容.json | 851 ++++++++++-------- Tables/汇报/汇报记录表.json | 8 + 17 files changed, 1807 insertions(+), 1889 deletions(-) delete mode 100644 Pages/ded19f0aa3d14ada9238c4218effa8e.json delete mode 100644 Pages/ded19f0aa3d14ada9238c4218effa8e.rd create mode 100644 SchedulerTasks/工作汇报/每日根据报工自动生成工作日报.json create mode 100644 ServerCommands/汇报/修改工作日报.json diff --git a/.collaboration b/.collaboration index 66e3e1cb..8360b3f7 100644 --- a/.collaboration +++ b/.collaboration @@ -257,16 +257,7 @@ }, { "ModuleName": "Table/汇报记录表", - "State": 1, - "LockedBy": { - "UserName": "TYFEIKELE\\tyfeikele", - "Email": "example@example.com" - }, - "LockDateTime": "2024-06-14T14:39:50.4168885+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\汇报\\汇报记录表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/汇报子表", @@ -831,17 +822,7 @@ }, { "ModuleName": "PCPage/汇报管理", - "State": 1, - "LockedBy": { - "UserName": "TYFEIKELE\\tyfeikele", - "Email": "example@example.com" - }, - "LockDateTime": "2024-06-14T17:23:11.8435823+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\汇报管理.json", - "Pages\\汇报\\汇报管理.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/汇报/项目周报", @@ -857,17 +838,7 @@ }, { "ModuleName": "PCPage/日报首页", - "State": 1, - "LockedBy": { - "UserName": "TYFEIKELE\\tyfeikele", - "Email": "example@example.com" - }, - "LockDateTime": "2024-06-14T10:12:49.66364+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\日报\\日报首页.json", - "Pages\\汇报\\日报\\日报首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/汇报详情", @@ -1639,73 +1610,23 @@ }, { "ModuleName": "PCPage/模板列表", - "State": 1, - "LockedBy": { - "UserName": "TYFEIKELE\\tyfeikele", - "Email": "example@example.com" - }, - "LockDateTime": "2024-06-14T17:26:53.2598314+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\汇报模板\\模板列表.json", - "Pages\\汇报\\汇报模板\\模板列表.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/模板详情", - "State": 1, - "LockedBy": { - "UserName": "TYFEIKELE\\tyfeikele", - "Email": "example@example.com" - }, - "LockDateTime": "2024-06-14T10:49:43.0888597+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-14T10:49:43.0886417+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\汇报\\根据汇报模板生成内容.json" - ] + "ModuleType": 15 }, { "ModuleName": "PCPage/日报详情", - "State": 1, - "LockedBy": { - "UserName": "TYFEIKELE\\tyfeikele", - "Email": "example@example.com" - }, - "LockDateTime": "2024-06-14T10:03:09.5968664+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\日报\\日报详情.json", - "Pages\\汇报\\日报\\日报详情.rd", - "Pages\\ded19f0aa3d14ada9238c4218effa8e.json", - "Pages\\ded19f0aa3d14ada9238c4218effa8e.rd" - ] + "ModuleType": 1 }, { "ModuleName": "ServerCommandPrivate/单日自动生成工作日报", - "State": 1, - "LockedBy": { - "UserName": "TYFEIKELE\\tyfeikele", - "Email": "example@example.com" - }, - "LockDateTime": "2024-06-14T10:49:43.0889176+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\汇报\\单日自动生成工作日报.json" - ] + "ModuleType": 27 }, { "ModuleName": "ServerCommands/Gitee", @@ -1853,32 +1774,14 @@ }, { "ModuleName": "SchedulerTasks/工作汇报", - "State": 3, - "LockedBy": { - "UserName": "TYFEIKELE\\tyfeikele", - "Email": "example@example.com" - }, - "LockDateTime": "2024-06-14T15:10:09.8688145+08:00", "ModuleType": 21 }, { "ModuleName": "TaskScheduler/计划任务1", - "State": 3, - "LockedBy": { - "UserName": "TYFEIKELE\\tyfeikele", - "Email": "example@example.com" - }, - "LockDateTime": "2024-06-14T15:11:05.1390322+08:00", "ModuleType": 16 }, { "ModuleName": "TaskScheduler/每日根据报工自动生成工作日报", - "State": 3, - "LockedBy": { - "UserName": "TYFEIKELE\\tyfeikele", - "Email": "example@example.com" - }, - "LockDateTime": "2024-06-14T15:14:40.5794196+08:00", "ModuleType": 16 }, { @@ -1887,12 +1790,6 @@ }, { "ModuleName": "ServerCommand/修改工作日报", - "State": 3, - "LockedBy": { - "UserName": "TYFEIKELE\\tyfeikele", - "Email": "example@example.com" - }, - "LockDateTime": "2024-06-14T15:41:29.0261864+08:00", "ModuleType": 15 } ] \ No newline at end of file diff --git a/Pages/ded19f0aa3d14ada9238c4218effa8e.json b/Pages/ded19f0aa3d14ada9238c4218effa8e.json deleted file mode 100644 index c6630333..00000000 --- a/Pages/ded19f0aa3d14ada9238c4218effa8e.json +++ /dev/null @@ -1,440 +0,0 @@ -{ - "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 deleted file mode 100644 index 0151c949..00000000 --- a/Pages/ded19f0aa3d14ada9238c4218effa8e.rd +++ /dev/null @@ -1,8 +0,0 @@ -{ - "PageType": 2, - "ColumnCount": 18, - "RowCount": 12, - "Formulas": { - "1,2": "E12&\" 工作日报\"" - } -} \ No newline at end of file diff --git a/Pages/汇报/日报/日报详情.json b/Pages/汇报/日报/日报详情.json index ee814e8f..68331ac8 100644 --- a/Pages/汇报/日报/日报详情.json +++ b/Pages/汇报/日报/日报详情.json @@ -8,37 +8,38 @@ }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 + "DesignLengthInPixel": 14.0, + "IsHidden": true } }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 50.0 } }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 - } - }, - "4": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 15.0 } }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "6": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 14.0 + "DesignLengthInPixel": 15.0 } }, "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 600.0, + "DesignLengthInPixel": 15.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 321.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, "Mode": 2, "MinLength": { "Unit": 1 @@ -48,27 +49,17 @@ } } }, - "8": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.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": 39.0, "IsHidden": true @@ -76,9 +67,10 @@ } }, "InLogicalVisibleIndexes": [ - 12 + 1, + 14 ], - "Count": 13, + "Count": 15, "DefaultSize": 32.0 }, "Cols": { @@ -188,337 +180,118 @@ "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%" + "4,1": "汇报人：", + "6,1": "昨日工时：", + "6,20": "小时", + "8,1": "昨日工作：", + "11,18": "保存", + "12,1": "*日报指的是昨日的工作总结。", + "14,13": "%CurrentUser.UserName%", + "14,16": "%CurrentUser.FullName%", + "14,19": "%CurrentUser.UserName%" + }, + "Formulas": { + "2,1": "TEXT(E15,\"yyyy-mm-dd\")&\"工作日报\"" }, "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": { + "4,4": { "BindingInfo": { "TableName": "汇报记录表", - "ColumnName": "开始日期", - "GUID": "ccc56d27-34f5-45c5-b265-13335949c620" + "ColumnName": "汇报人", + "GUID": "725c94dd-5797-482d-a9d9-4b45e706a0c9" + } + }, + "6,4": { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "总工时", + "GUID": "08715a23-3046-4102-945c-aa7ceaa7d380" }, "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": "ElementUI.InputNumberCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ { - "$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": [ + "Scope": 2, + "AllowRoles": [ "FGC_Anonymous" ] }, { - "Value": "菜单1", - "Text": "新增一行", - "IconPath": "Application/001_add_1.svg", - "SelectedIconColor": "Background 1", - "SelectedIconColorUseItemColor": true, - "IconColorUseItemColor": true, - "IsOldMenuPath": false, - "CanVisitRoleList": [ - "FGC_LoginUser" + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" ] } ], - "Orientation": 0, - "MenuLevelsStyle": [ - { - "FontSize": 13.333333333333332, - "Bold": false, - "Height": 32.0, - "IconHeight": 14.0, - "IconWidth": 14.0 - } - ] + "min": "0.1", + "max": "500", + "step": 1, + "precision": 1, + "placeholder": "请输入", + "controlsPosition": true } }, - "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": { + "8,4": { "BindingInfo": { "TableName": "汇报记录表", - "ColumnName": "ID", - "GUID": "cdb43b1e-2041-4d56-ab6e-da5a26c7d5b0" + "ColumnName": "内容", + "GUID": "67469ff5-0ac2-4a5a-836a-87f19c768ee5" + }, + "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": "none" } }, - "12,7": { + "11,18": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", - "Text": "新增一行", - "TemplateKey": "Gost", + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "汇报记录表", + "ShowConfirm": false + }, + { + "$type": "ElementUI.Commands.ShowMessage, ElementUI", + "Message": "保存成功！", + "Type": "success", + "Duration": 3000, + "Offset": null, + "Center": true + }, + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ReloadData": true + } + ], + "Text": "保存", + "TemplateKey": "_RS_Main1", "Icon": { - "Name": "Application/001_add_1.svg", + "Name": "Application/067_save_4.svg", "BuiltIn": true, "Color": "Background 1", "UseCellTypeForeColor": true @@ -526,7 +299,52 @@ "IconSize": 14.0 } }, - "12,13": { + "14,1": { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "ID", + "GUID": "cdb43b1e-2041-4d56-ab6e-da5a26c7d5b0" + }, + "CellType": { + "$type": "Forguncy.TextCellType, ServerDesignerCommon", + "SavedValidators": [ + { + "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon", + "Enabled": true + } + ], + "TemplateKey": "_RS_NewLittleRoundCorner", + "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" + } + }, + "Disabled": true + } + ] + }, + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + "14,4": { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报日期文本", + "GUID": "eeecdca0-8fbe-471d-8d6e-5e1e7f093377" + } + }, + "14,13": { "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "汇报人", @@ -546,27 +364,25 @@ "FontSize": 13.333333333333332 }, { - "FontFamily": 0, - "FontSize": 16.0, - "HorizontalAlignment": 2 + "FontSize": 24.0, + "FontWeight": 2, + "HorizontalAlignment": 3 }, { - "BorderBottom": 0 + "HorizontalAlignment": 3 }, { - "FontWeight": 4 - }, - { - "HorizontalAlignment": 2 - }, - { - "HorizontalAlignment": 2, - "BorderBottom": 0 + "HorizontalAlignment": 4 }, { "FontSize": 12.0, "Foreground": 5 }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Formatter": 6 + }, { "FontSize": -1.0 } @@ -575,15 +391,11 @@ "Strs": [ "Body", "[AUTO]General", - "Center", - "Background 2 0", "Bold", - "Text 1 50" - ], - "Borders": [ - { - "Color": 3 - } + "Center", + "Left", + "Text 1 50", + "@" ] }, "CellStyles": { @@ -596,27 +408,7 @@ "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, + "2,1": 2, "3,1": 3, "3,2": 3, "3,3": 3, @@ -638,44 +430,78 @@ "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 + "3,22": 3, + "4,1": 4, + "4,2": 3, + "4,3": 3, + "4,4": 4, + "4,22": 3, + "5,1": 3, + "5,2": 3, + "5,3": 3, + "5,4": 3, + "5,5": 3, + "5,6": 3, + "5,7": 3, + "5,8": 3, + "5,9": 3, + "5,10": 3, + "5,11": 3, + "5,12": 3, + "5,13": 3, + "5,14": 3, + "5,15": 3, + "5,16": 3, + "5,17": 3, + "5,18": 3, + "5,19": 3, + "5,20": 3, + "5,21": 3, + "5,22": 3, + "6,1": 4, + "6,2": 3, + "6,3": 3, + "6,4": 3, + "6,20": 3, + "6,21": 3, + "6,22": 3, + "7,1": 3, + "7,2": 3, + "7,3": 3, + "7,4": 3, + "7,5": 3, + "7,6": 3, + "7,7": 3, + "7,8": 3, + "7,9": 3, + "7,10": 3, + "7,11": 3, + "7,12": 3, + "7,13": 3, + "7,14": 3, + "7,15": 3, + "7,16": 3, + "7,17": 3, + "7,18": 3, + "7,19": 3, + "7,20": 3, + "7,21": 3, + "7,22": 3, + "11,18": 1, + "12,1": 5, + "14,1": 6, + "14,2": 1, + "14,3": 1, + "14,7": 0, + "14,8": 1, + "14,11": 1, + "14,12": 0, + "14,13": 1, + "14,16": 7, + "14,19": 1 + }, + "RowStyles": { + "2": 7 }, "SheetStyle": { "FontFamily": 0, @@ -683,16 +509,16 @@ } }, "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" + "14,13,1,3", + "14,16,1,3", + "14,19,1,4", + "11,18,1,4", + "2,1,1,21", + "14,1,1,3", + "4,4,1,18", + "6,4,1,16", + "8,4,2,18", + "14,4,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -711,7 +537,8 @@ ] }, "RowBreakLines": [], - "RepeatRangeSettings": [] + "RepeatRangeSettings": [], + "RelatedDataTableName": "汇报记录表" }, "PrintInfo": { "PaperSize": {}, @@ -720,31 +547,19 @@ "CustomNames": [ { "Name": "汇报人", - "Formula": "日报详情!$N$13" - }, - { - "Name": "汇报日期", - "Formula": "日报详情!$H$2" + "Formula": "日报详情!$N$15" }, { "Name": "汇报ID", - "Formula": "日报详情!$D$13" + "Formula": "日报详情!$B$15" }, { "Name": "用户名", - "Formula": "日报详情!$T$13" + "Formula": "日报详情!$T$15" }, { "Name": "用户全名", - "Formula": "日报详情!$Q$13" - }, - { - "Name": "增加一行按钮", - "Formula": "日报详情!$H$13" - }, - { - "Name": "日报列表", - "Formula": "日报详情!$B$8" + "Formula": "日报详情!$Q$15" } ] -}//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 +}//LMiMk4LElRqXmo6+IX5iE+dAX35En7PGUUSbVqcG4A6lorucM4IDJdxQeN40hAezS9PL6SKcLPxEuHSqxAmkTmLJelBPIadjbM/nRYXq2Xh0nLVlGtggQO6H2kEuSx+0IVfiiDlYlPMhq5+apuJBrYW66fNv9a3Y3iXbjW75jSsuDfdC8jQe1Is7hmhOgFQiuZsQ0xfljCDcItg+UDZ70lBXMO1Px9DenoIAgvU9aTLdAdZrc36mma1w3ROmZhyx9onGPRgYGF7LVQ3fYu+u6V0XzoayfJ9VTt4bJTl6aNdxATW3XkoMqqTpEqA6v0S5P3j+bM8OW8LsN6zPQUgNJS9aEw2UOP9aDug05f4HjAc37wA4QpnDmv8lqABrPiyJdf0HwQT/l8izXiK8/CCsb14ciPa1/1enFk7mqsALJ8K5lYfecU1eARrcjBJphZpfrnzgxSAg6HS7vMCvEiwNujLM9mY1qwq8wQDSHHNtAORm+gV2ONxlJpkEWOsBLJ0Zu81OdXj20YcHcnq/plVLoO1+VRj3wP1uRb6afpyMZSXR4ELu+kyYfeRrAo5dBel8for+YiPsYIVBcTjmFEHAY8g+0jl9vvR7cXcnM0hQs5DW0IrDCyu+lqnPVrvstFh5mSZdyESTBdLfDcDruiTgGStpK27YK8GRR2aOQSqZ7XyFbENykScYWoa8tEkRJadbukY6iTVsHRcqNy6Kkpf027P9HEepWq1QC+fDhcWoksD3dUdJDfMFnJabE5ADPdXzT+H4pPPYp5lAlQEGK5D8/T1pFDuK5i6BHUZyfGPMp8kPkkx9Cs+482rHDVAYYywbEeosv4aQauxjtTDwVP77fTfLkbjkj8nc5+R/xIuPyfVE46wW1rsrGyvpUgOd+7fMCvLJJJhHR16Ak1jv/NNULw==|920 \ No newline at end of file diff --git a/Pages/汇报/日报/日报详情.rd b/Pages/汇报/日报/日报详情.rd index 854ba0d3..b6fde61d 100644 --- a/Pages/汇报/日报/日报详情.rd +++ b/Pages/汇报/日报/日报详情.rd @@ -1,35 +1,26 @@ { "PageType": 0, "ColumnCount": 23, - "RowCount": 13, + "RowCount": 15, + "Formulas": { + "2,1": "TEXT(E15,\"yyyy-mm-dd\")&\"工作日报\"" + }, "CustomNames": [ { "Name": "汇报人", - "Formula": "日报详情!$N$13" - }, - { - "Name": "汇报日期", - "Formula": "日报详情!$H$2" + "Formula": "日报详情!$N$15" }, { "Name": "汇报ID", - "Formula": "日报详情!$D$13" + "Formula": "日报详情!$B$15" }, { "Name": "用户名", - "Formula": "日报详情!$T$13" + "Formula": "日报详情!$T$15" }, { "Name": "用户全名", - "Formula": "日报详情!$Q$13" - }, - { - "Name": "增加一行按钮", - "Formula": "日报详情!$H$13" - }, - { - "Name": "日报列表", - "Formula": "日报详情!$B$8" + "Formula": "日报详情!$Q$15" } ] } \ No newline at end of file diff --git a/Pages/汇报/日报/日报首页.json b/Pages/汇报/日报/日报首页.json index bc057d42..423d0e55 100644 --- a/Pages/汇报/日报/日报首页.json +++ b/Pages/汇报/日报/日报首页.json @@ -303,7 +303,7 @@ } } ], - "ID": "b9bfa37a-4d80-492c-889e-59c0ac894605" + "ID": "7606c42d-b0b8-4b36-abb0-aa5d20e2ffe5" } ] } @@ -340,8 +340,8 @@ "GUID": "a70f65d6-f250-4335-988a-e42dc34310f9", "BindingInfo": { "TableName": "汇报记录表", - "ColumnName": "开始日期", - "GUID": "a5cded6a-8fc4-4345-9ad6-ae579840a8c0" + "ColumnName": "汇报日期文本", + "GUID": "8d53193b-29cb-4b0e-a138-99090e544ca3" }, "ColumnName": "汇报日期" }, @@ -421,6 +421,18 @@ ] }, "NullFormulaValueQueryPolicy": 1, + "OrderBySqlCondition": { + "OrderByColumns": [ + { + "ColumnBindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "开始日期", + "GUID": "9d864edd-0c78-48d2-8222-22b36baabfae" + }, + "Order": 1 + } + ] + }, "CustomColumns": [] }, "autoGenerateColumnsByDataSource": false, @@ -571,7 +583,7 @@ } } ], - "ID": "a25ff887-d946-42ef-be74-6cb0b758ae9b" + "ID": "c3d75e0a-202e-41a4-9eda-857fa808f67c" } ] } @@ -581,6 +593,17 @@ } }, "PageName": "日报详情", + "PassValues": [ + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=日报首页!行数据.ID" + }, + "TargetCell": { + "SerializeProperty": "=日报详情!汇报ID" + } + } + ], "LoadBindingDataOption": 1 }, { @@ -619,7 +642,7 @@ } } ], - "ID": "edf4995f-90ee-41cd-9fd7-6eb0e3cb8f07" + "ID": "2c164470-5e82-4cf2-888f-3f54cca74f49" } ] } @@ -667,7 +690,6 @@ "UpdateType": "delete", "ShowConfirm": true, "ConfirmText": "您确定要删除吗？", - "ReloadAfterSucceed": false, "RowsToUpdate": 1, "RowsToUpdateCondition": { "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", @@ -680,24 +702,6 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=日报首页!行数据.ID" } - }, - "NextUpdateDataTableCommand": { - "TableName": "汇报子表", - "UpdateType": "delete", - "ShowConfirm": false, - "RowsToUpdate": 1, - "RowsToUpdateCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "汇报子表", - "ColumnName": "汇报ID", - "GUID": "7293fe8f-8ba9-4e2c-ab50-0ae6cd7f0c04" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=日报首页!行数据.ID" - } - } } }, { @@ -905,4 +909,4 @@ "Formula": "日报首页!$B$2" } ] -}//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 +}//jsfsAkYnrLg1Ctq7ys+DYsN/KjIPNb78Bhzs7QAEXsh8PjqkldClhfjRNTJ63xxxjABgt6RSpAyOuiAVvRs/jl0wgVSZ0ERHbuINLvobVXWW46bCRloqN9ErhcZm45QPIUnWoRGYHMkZrdWoIM6e+9o8AHZLooG/hKXKBJWgUUPrdSfm3n4a12xJiEUi4arPI/qWzkL2pGJo3MRisE8FYGwTOPycPkY2g0ppTugBTMug21fi1u8JrLBGOrMV+lAbcqBgbfmUzRVlA3pPmHatJJcqvLxcMiTK65NQYQL5tnjF+A/LmGA/5csYPyVICCAYnKjqVL4jSV3O4QUG6JQkmdsLgS7t9SOfBcR+JNM8xdstvtncPJWFJk49ib4A2FZid4Gatb6iemq1e8nMkaRDQKkWyYLbkN2ck8aaM6D8e8y/Gdgv/n6nwM5LWnCTBYAkvFyhbyYJtmshHA5PZV/R8Hp4IBzpO56/kQ4wZhysyBnHDDwbMLYJwBfN11wgeKEx1WEI0dzAtBJMpFYzYJyAAF2S52cz66KGJS8a4DbJ8N3VYcS8klGbtu1x0HF63xchoGHxyQJD6MP3TboLzFQ6BpR3jp5B3P6cNx8xcTWdtfQ8a/CtUBX3ThERZ2eFW82O5lZ+8Z2qbn+Gl3W7haAMuXPF7sh7PMAhoZZgwicVEnYkbWA6EYDm13iDli1OjufcH224hMbFt5At0SwLCtGcOkGBsEY7sjQrlXnrg6YcLhi0Y7PiheRmN/GQsekB6PmFhDyjJuUgl9IUd0KFQQvKQJXvy34MAshPb38FLpoQEOUn2VHa3fEuOzQJzpb0m459JJGkIE9bGR2K5GepCbPWVczf3RO8jbUPoi5aoeCYp53VZY8dbaOPXA77vzjubKphL1b6Y/w3RtH/D4Pv5Hso1Q==|920 \ No newline at end of file diff --git a/Pages/汇报/汇报模板/模板列表.json b/Pages/汇报/汇报模板/模板列表.json index 499c9a3f..29face47 100644 --- a/Pages/汇报/汇报模板/模板列表.json +++ b/Pages/汇报/汇报模板/模板列表.json @@ -11,11 +11,6 @@ "DesignLengthInPixel": 32.0 } }, - "2": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, "3": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 @@ -37,6 +32,16 @@ } }, "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "9": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "Mode": 2, @@ -48,33 +53,38 @@ } } }, - "8": { + "10": { "GridRowColumnDefinition": { "DesignLengthInPixel": 10.0 } }, - "9": { + "11": { "GridRowColumnDefinition": { "DesignLengthInPixel": 38.0, "Mode": 1 } }, - "10": { + "12": { "GridRowColumnDefinition": { "DesignLengthInPixel": 15.0 } }, - "11": { + "13": { "GridRowColumnDefinition": { "DesignLengthInPixel": 29.0, "IsHidden": true } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } } }, "InLogicalVisibleIndexes": [ - 11 + 13 ], - "Count": 12, + "Count": 14, "DefaultSize": 32.0 }, "Cols": { @@ -245,8 +255,106 @@ "Count": 31, "DefaultSize": 32.0 }, + "Values": { + "1,1": "%PageTitle%" + }, "AttachInfos": { - "1,1": { + "1,18": { + "CssName": "toolbar toolbar-right ", + "CellType": { + "$type": "Forguncy.CustomMenu.ForguncyMenuCellType, Forguncy.CustomMenu", + "TemplateKey": "横向迷你菜单", + "ClickCommand": { + "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", + "Commands": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "模板详情", + "LoadBindingDataOption": 2 + } + ], + "ParamProperties": { + "value": "值", + "label": "显示文本", + "parentId": "父节点值" + } + }, + "Items": [ + { + "Value": "菜单1", + "Text": "新增模板", + "IconPath": "Application/001_add_1.svg", + "SelectedIconColor": "Background 1", + "SelectedIconColorUseItemColor": true, + "IconColorUseItemColor": true, + "IsOldMenuPath": false, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "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": "=模板列表!个人日报表格" + }, + "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "ResetTable", + "ParameterValues": { + "clearSort": true, + "clearFilter": true + } + } + ], + "ID": "a1283aab-bab5-4ada-bd09-c5a54aad9204" + } + ] + } + ], + "ParamProperties": { + "IsOK": "是否为确定" + } + }, + "PageName": "模板详情", + "LoadBindingDataOption": 2 + } + ], + "CanVisitRoleList": [ + "FGC_LoginUser" + ] + } + ], + "Orientation": 0, + "MenuLevelsStyle": [ + { + "FontSize": 13.333333333333332, + "Bold": false, + "Height": 32.0, + "IconHeight": 14.0, + "IconWidth": 14.0 + } + ] + } + }, + "3,1": { "CellType": { "$type": "ElementUI.TableCellType, ElementUI", "ElTableName": "EL表格1", @@ -293,7 +401,7 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=模板列表!B2" + "SerializeProperty": "=模板列表!B4" }, "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", "MethodName": "ResetTable", @@ -303,7 +411,7 @@ } } ], - "ID": "1eb9b8da-329e-49e1-8934-7aad83157480" + "ID": "b42359de-bee8-4a25-8404-499b9c1e99fd" } ] } @@ -433,6 +541,7 @@ "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "是否禁用", "label": "是否禁用", + "formatStr": "[=1]\"是\";[=0]\"否\"", "align": "center", "headerAlign": "center", "colfixed": "false", @@ -517,7 +626,7 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=模板列表!B2" + "SerializeProperty": "=模板列表!B4" }, "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", "MethodName": "ResetTable", @@ -527,7 +636,7 @@ } } ], - "ID": "d0400f90-9070-43ed-be49-0c01657014a1" + "ID": "92747c77-5d28-4b3f-b2d0-8170b1315d6b" } ] } @@ -599,11 +708,10 @@ } ], "sumText": "合计", - "size": "default", - "showSelectColumn": true + "size": "default" } }, - "9,1": { + "11,1": { "CellType": { "$type": "ElementUI.CellTypes.PaginationCellType, ElementUI", "AttachElementTable": true, @@ -657,6 +765,14 @@ { "BorderRight": 0 }, + { + "FontSize": 18.666666666666664, + "FontWeight": 1, + "Formatter": 2 + }, + { + "FontFamily": 3 + }, { "FontSize": 13.333333333333332 }, @@ -668,6 +784,8 @@ "Types": { "Strs": [ "Background 2 0", + "Bold", + "[AUTO]General", "Body" ], "Borders": [ @@ -678,7 +796,9 @@ }, "CellStyles": { "0,30": 0, - "1,30": 0, + "1,1": 1, + "1,18": 2, + "1,30": 2, "2,30": 0, "3,30": 0, "4,30": 0, @@ -686,74 +806,77 @@ "6,30": 0, "7,30": 0, "8,30": 0, - "9,1": 1, - "9,29": 1, "9,30": 0, - "10,1": 1, - "10,2": 1, - "10,3": 1, - "10,4": 1, - "10,5": 1, - "10,6": 1, - "10,7": 1, - "10,8": 1, - "10,9": 1, - "10,10": 1, - "10,11": 1, - "10,12": 1, - "10,13": 1, - "10,14": 1, - "10,15": 1, - "10,16": 1, - "10,17": 1, - "10,18": 1, - "10,19": 1, - "10,20": 1, - "10,21": 1, - "10,22": 1, - "10,23": 1, - "10,24": 1, - "10,25": 1, - "10,26": 1, - "10,27": 1, - "10,28": 1, - "10,29": 1, "10,30": 0, - "11,1": 1, - "11,5": 1, - "11,6": 1, - "11,7": 1, - "11,8": 1, - "11,9": 1, - "11,10": 1, - "11,11": 1, - "11,12": 1, - "11,13": 1, - "11,14": 1, - "11,15": 1, - "11,16": 1, - "11,17": 1, - "11,18": 1, - "11,19": 1, - "11,20": 1, - "11,21": 1, - "11,22": 1, - "11,23": 1, - "11,24": 1, - "11,25": 1, - "11,26": 1, - "11,27": 1, - "11,28": 1, - "11,29": 1, - "11,30": 2 + "11,1": 3, + "11,29": 3, + "11,30": 0, + "12,1": 3, + "12,2": 3, + "12,3": 3, + "12,4": 3, + "12,5": 3, + "12,6": 3, + "12,7": 3, + "12,8": 3, + "12,9": 3, + "12,10": 3, + "12,11": 3, + "12,12": 3, + "12,13": 3, + "12,14": 3, + "12,15": 3, + "12,16": 3, + "12,17": 3, + "12,18": 3, + "12,19": 3, + "12,20": 3, + "12,21": 3, + "12,22": 3, + "12,23": 3, + "12,24": 3, + "12,25": 3, + "12,26": 3, + "12,27": 3, + "12,28": 3, + "12,29": 3, + "12,30": 0, + "13,1": 3, + "13,5": 3, + "13,6": 3, + "13,7": 3, + "13,8": 3, + "13,9": 3, + "13,10": 3, + "13,11": 3, + "13,12": 3, + "13,13": 3, + "13,14": 3, + "13,15": 3, + "13,16": 3, + "13,17": 3, + "13,18": 3, + "13,19": 3, + "13,20": 3, + "13,21": 3, + "13,22": 3, + "13,23": 3, + "13,24": 3, + "13,25": 3, + "13,26": 3, + "13,27": 3, + "13,28": 3, + "13,29": 3, + "13,30": 4 }, "SheetStyle": { - "FontFamily": 1 + "FontFamily": 3 } }, "Spans": [ - "9,1,1,28", - "1,1,7,29" + "11,1,1,28", + "3,1,7,29", + "1,18,1,12" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -789,7 +912,7 @@ "CustomNames": [ { "Name": "个人日报表格", - "Formula": "模板列表!$B$2" + "Formula": "模板列表!$B$4" } ] -}//YKQBZ9N+Wf4xfIZuHBT6jv17quuuVB/5ukmyv/moGTRSD39oJkEJAZ+OkP1xGzVX80TfxkG+1sqZFm5jn3mDMI4g3+0IK3KAhqJ4NE7BQ5EZSq9soIeUwKVcmOhSDg60fYVo/t4+O2StWuWgvpLixshkW5dITlB7cOZGInbxsYi5RZBQ7aVMy+Jkj+HRu7xxqk/P2WLcNYJVrijHViZPSDHVVdJ4VgOqfRi57m/x/UUTcGx8OnX8u4yg+nOKdbugDRarQDEv8nPdXQGO9y4RkmwLpJNr0GdqV0Bybf+zJl4QfCPEojIqsDB1DRDxG5CocFAbtHENxDh2IASSQdvgmWYVUSW8sUayN6f7oTBnuSy6BdkYSd88RKU2kb0cEf7xzWdDKL54NjQan4GizA/txhDI5SDPJW0g4B10MZ42tbjpileUI5tz4Em2PqkzWRu2Ww99paR6qx6vd+CCru00rh8JPvOc72rkKwJvk4dk+MAwDuIzW2A+Kjt0yBUp8Muc8NiYGRQLlG13sg1NDozuI3bt1ZUamUiSV3M35AGboOgHOrK+g9fQbjexA4pq6g929C8KAxWvVlPp30NzDS7fNiYH9qY/vbizMyT4cKyO0zOkU1OpbnoFEuqpFslCOEM6aeSKwz6xoBjzMBCZBaZgIgz9Pg/Wu/G3amyRZqspdLXS72L5iHXOGi1q5ZfqxV5at4xVJ6nlITA7q59H/uJ91ITtjm7OGGbzm8DiY0fAdhpjnUY/Jp0conYAeA2JXirOdwpY5wOo0HNjk3NWgjscPr4nFIt72BrREM8T0g4Yf6bAzT09zMI0L/Ijs61A8tSwoaiyrteVxrnzfeWWXE2amTYhRk4oG7O13l0C3R/ksKvSWSgYhKQXjA3A8CaJdkpanM9VHg4qqPedD+x7gSCWxw==|920 \ No newline at end of file +}//qJJl2ZEu7uculsiBSDqesfzvL+zU4HnMYa5GneLi2+oJJErlRslvix/rcKhYw77ojhNoS+uc84hqRWvML+s64AujnobRvV6g8cu3op47y2FmJcwVtEERkeWuAjmQTURHjeNFImzh2PBxEvmF8jV0YASRQCUExlvlTamYRODhRRUFcxGBa0p9Peetq4RJYPgJjWHEl8tmPISkxHcsf2vVqY8AEyUZLlRXsgxJ/DdwoBiu+HgP+wBTg6srP5Efj8jCBZJhX2HuJdF8EwgS0wc8t+gVcJm7AoiZDK2OPAQFJfsddj8LLciz8f+oAv3A65lnrm1FB/POsZf7eAwvVFVeZdT/o8K34hPnERhoWAmEKhBjom5u49FtpcNl28PxM6bGXWk6Oc6IZW5r9oghgUFyQnwF1vEh1GiUj3KKU+LiaLY424iDTpVvicxgmwgB+6wyZjlEcR4l6rXbQuqcYYBCvfL5j29meeCoiTwCf9nYURIYt79+kujaXpJAUuBWz/6uynp6gpkSmOQh0K8Wrno+4FYuid0x4SwKNd9zZDO6T7efZzkzYVG/l89Xd2BTqdom94tHI9Cgh8CW1wLjv/rwo2LCyeQPefOXbu1lmg2UhIccLiGzTPZz4D1gnieF7s361NxDu3fFg8x8ZfUNMe7GrAU89JULFKFWgS1VmpCLKf9gXao7MC21l1slySAk6twbRxOkrvjlmrlq7leENpSl3yxAtT/baffrh9en5zRPXeSOwhPKROV7Rt+xXJZ0m61c64ApU1trAXc3fxW2bX2eDPtdbD8h7aquZ/B9z+3KAqlW37uj8f3I7kOoat0+NHe6CRMXTL8IcvKVli299V4GPTrfZQbBs4PE6Crp65C5JGXuoLuvlJTy8Q6h6FlC/uDnofGzzAM6pFIPR59Wi5kcfA==|920 \ No newline at end of file diff --git a/Pages/汇报/汇报模板/模板列表.rd b/Pages/汇报/汇报模板/模板列表.rd index 8f4a716b..9cb9d35d 100644 --- a/Pages/汇报/汇报模板/模板列表.rd +++ b/Pages/汇报/汇报模板/模板列表.rd @@ -1,11 +1,11 @@ { "PageType": 0, "ColumnCount": 31, - "RowCount": 12, + "RowCount": 14, "CustomNames": [ { "Name": "个人日报表格", - "Formula": "模板列表!$B$2" + "Formula": "模板列表!$B$4" } ] } \ No newline at end of file diff --git a/Pages/汇报/汇报模板/模板详情.json b/Pages/汇报/汇报模板/模板详情.json index fa793c78..470fd49c 100644 --- a/Pages/汇报/汇报模板/模板详情.json +++ b/Pages/汇报/汇报模板/模板详情.json @@ -6,48 +6,38 @@ "DesignLengthInPixel": 32.0 } }, - "1": { + "4": { "GridRowColumnDefinition": { "DesignLengthInPixel": 358.0 } }, - "2": { + "5": { "GridRowColumnDefinition": { "DesignLengthInPixel": 67.0, "Mode": 1 } }, - "3": { + "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 16.0 } }, "8": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "Mode": 1, - "IsHidden": true + "DesignLengthInPixel": 16.0 } }, - "9": { + "11": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "IsHidden": true } - }, - "7": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 434.0 - } } }, "InLogicalVisibleIndexes": [ - 6, - 7, - 8, - 9 + 11 ], - "Count": 10, + "Count": 12, "DefaultSize": 32.0 }, "Cols": { @@ -157,13 +147,53 @@ "DefaultSize": 32.0 }, "Values": { - "4,17": "预览", - "4,21": "确认内容", - "9,12": "%CurrentUser.FullName%", - "9,17": "shamus" + "1,1": "模板名称：", + "3,1": "模板内容：", + "7,1": "是否禁用", + "9,16": "取消", + "9,21": "保存" + }, + "Formulas": { + "7,1": "IF(C8=1,\"禁用\",\"启用\")" }, "AttachInfos": { - "1,1": { + "1,4": { + "BindingInfo": { + "TableName": "汇报模板", + "ColumnName": "模板名称", + "GUID": "b2c34817-bbbd-480a-b527-795dcb42e9f9" + }, + "CellType": { + "$type": "ElementUI.InputCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "text", + "resize": "none" + }, + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + "4,1": { "BindingInfo": { "TableName": "汇报模板", "ColumnName": "模板内容", @@ -196,197 +226,210 @@ "resize": "none" } }, - "4,17": { + "7,1": { + "RulesGuidList": [ + "2444e692-9a55-4c10-9996-1db345c2cddf" + ] + }, + "7,2": { + "BindingInfo": { + "TableName": "汇报模板", + "ColumnName": "是否禁用", + "GUID": "60c28094-b784-46b3-8ed6-d629f3884c1e" + }, + "CellType": { + "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", + "Style": 2 + } + }, + "9,16": { "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.ClosePopupCommand, ServerDesignerCommon" + } + ], + "Text": "取消", + "TemplateKey": "_RS_Minor3", + "Icon": { + "Name": "Mobile/456_delete_8.svg", + "BuiltIn": true, + "Color": "Background 1", + "UseCellTypeForeColor": true + }, + "IconSize": 14.0 + } + }, + "9,21": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ { "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=模板详情!code" - } - ] - }, - "value": "0" + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=模板详情!E2" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=模板详情!B5" + } + ] + }, + "value": "%Null%", + "compareType": 1 + } + ] }, "CommandList": [ { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=模板详情!B8" + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=模板详情!B12" + } + ] + }, + "value": "%Null%" }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=模板详情!返回内容" - } + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "汇报模板", + "UpdateType": "add", + "ShowConfirm": false + } + ], + "ID": "d2911751-6bd1-4978-9a54-0527854b1e53" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "汇报模板", + "ShowConfirm": false + } + ], + "ID": "a19e211e-b223-47e4-bf1d-8b9c0935cd73" } ] + }, + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ReloadData": true } ], - "ID": "cd6b9ab3-9cc6-4065-b645-fbe92e2d0c5a" + "ID": "7d2cdf6d-aa46-4eda-8163-b7d2c28ceb50" }, { "CommandList": [ { "$type": "ElementUI.Commands.ShowMessageBox, ElementUI", "Title": "提示", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=模板详情!msg" - }, - "Type": "error", + "Message": "请输入模板名称及模板内容！", + "Type": "warning", "ConfirmButtonText": "确定", "CancelButtonText": "取消", "ShowClose": false, "AdvancedSettings": {} } ], - "ID": "e93eb596-be4b-4475-b625-1395922eaee8" + "ID": "7b0d1ef3-4d9b-4820-92fd-20dda826f75c" } ] } ], - "Text": "预览", - "TemplateKey": "_RS_Main1" + "Text": "保存", + "TemplateKey": "_RS_Main1", + "Icon": { + "Name": "Application/067_save_4.svg", + "BuiltIn": true, + "Color": "Background 1", + "UseCellTypeForeColor": true + }, + "IconSize": 14.0 } }, - "4,21": { - "CellType": { - "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "汇报模板", - "ShowConfirm": false - }, - { - "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", - "ReloadData": true - } - ], - "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" + "11,1": { + "BindingInfo": { + "TableName": "汇报模板", + "ColumnName": "ID", + "GUID": "579bbb18-4d2b-4d39-b0eb-5628439235a6" } } }, "StyleDatas": { "Styles": [ { - "Formatter": 0 + "FontSize": 13.333333333333332 + }, + { + "FontSize": 13.333333333333332, + "Foreground": 0, + "HorizontalAlignment": 1 + }, + { + "FontFamily": 2 + }, + { + "FontSize": 13.333333333333332, + "Foreground": 3 } ], "Types": { "Strs": [ - "@", - "Body" + "Accent 2 0", + "Left", + "Body", + "Text 1 50" ] }, "CellStyles": { - "9,17": 0 + "1,1": 0, + "3,1": 0, + "7,1": 1, + "7,2": 2, + "7,3": 2, + "7,4": 2, + "9,16": 3, + "9,21": 0 }, "SheetStyle": { - "FontFamily": 1 + "FontFamily": 2 } }, "Spans": [ - "9,1,1,11", - "4,21,1,4", - "9,12,1,5", - "1,1,2,24", - "7,1,1,24", - "4,17,1,3", - "9,17,1,4" + "9,21,1,4", + "4,1,2,24", + "9,16,1,4", + "11,1,1,4", + "1,4,1,21", + "7,2,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -405,20 +448,27 @@ ] }, "RowBreakLines": [], - "RepeatRangeSettings": [] + "RepeatRangeSettings": [], + "ConditionFormatRulesCollection": { + "Rules": [ + { + "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=模板详情!$C$8" + }, + "GUID": "2444e692-9a55-4c10-9996-1db345c2cddf", + "StyleInfo": { + "Foreground": "#FFFF0000", + "Underline": null, + "Strikethrough": null + } + } + ] + } }, "PrintInfo": { "PaperSize": {}, "Margin": {} - }, - "CustomNames": [ - { - "Name": "日期", - "Formula": "模板详情!$B$10" - }, - { - "Name": "汇报人", - "Formula": "模板详情!$M$10" - } - ] -}//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 + } +}//iVyuI5ZkHr8Yau37XJb2I5ZbOiK6lEH+yxjXRa4F+qsmeM0JYD+MV1eip0Eop2jLvhxLL6KY90WVuXAgrWUakAFy9ZU5myhAWtN/cJTzlcUe4v/EZLaUItBuXVCzWGoksjkcmPbE7Raxl6E1w492KIl7kjvyz5kbczv2W7tn7KKacT+P70t7gb8+cEIcE7yq7Em3S8T7ADzOImX3zh0euepwCRqe78X40ibJl9eTvhdu/QfJJJ00nMaD0lvvRxo/H6BPlR2nQhmlMdXjdpQhBxbz94BU+zBhf2REMyVVnOVKQ9TwgPGMKsOklEium5DTJXSAYiNXXZMtw3jHxAXXDvTm1p51y2X1zdpLcoZM741JWX24jecIOzlvoz+b/vzNKTFxJj9+7xbzblFSiM26TT8PcLFI5pP1QuZSQie+mMmD/ACTpksezikEJHjwpSokqlVPIwcawNrzeoh6SmK5qdk5psiahLU02ogmeyyzl/ldTPqzxPFmu0lzwq/x6q7bhoMh1vyxw08D7Yn2JqidsgEBZpJWChijSBwbKYQxXcMgISufkhY2VwUQPl6c6Z3jyyuVlJazJSmPoVsw/yq/lnmo3rfTrRVtSi3xYKf65plND7S7VAKXIwhARvFyDu2vRx3TGLJNSZ3vaPm8tjZyRccw2FZyYYQ6RE+E4UoHcCrzJ+V+wBlI8Mw2AOT4Zjg+EZN0m6BdC/QVxzqu74OgF07/2DjV2Rl9sBehXkdwzZp8eWFPlhZ0mZj97FmDHQCY4bJ3eTm+tYCJX1r6kX1bAGUyL28QgKQbEBuMOBpBmJ/l/luQiMx2kpVCFw7s8q2UAFXHNZAxvcEsndbe71pVpGwotqoNjPHC7QzQZEA3aQEA/4pHIP+sbZdd0Lb4vlOYzKDquafgcKos1c7vocKuDA==|920 \ No newline at end of file diff --git a/Pages/汇报/汇报模板/模板详情.rd b/Pages/汇报/汇报模板/模板详情.rd index 628dcc52..7d8aa65a 100644 --- a/Pages/汇报/汇报模板/模板详情.rd +++ b/Pages/汇报/汇报模板/模板详情.rd @@ -1,15 +1,8 @@ { "PageType": 0, "ColumnCount": 26, - "RowCount": 10, - "CustomNames": [ - { - "Name": "日期", - "Formula": "模板详情!$B$10" - }, - { - "Name": "汇报人", - "Formula": "模板详情!$M$10" - } - ] + "RowCount": 12, + "Formulas": { + "7,1": "IF(C8=1,\"禁用\",\"启用\")" + } } \ No newline at end of file diff --git a/Pages/汇报/汇报管理.json b/Pages/汇报/汇报管理.json index 746f63b4..5a55608d 100644 --- a/Pages/汇报/汇报管理.json +++ b/Pages/汇报/汇报管理.json @@ -296,7 +296,7 @@ "7,4": "重置" }, "AttachInfos": { - "1,24": { + "1,17": { "CssName": "toolbar toolbar-right ", "CellType": { "$type": "Forguncy.CustomMenu.ForguncyMenuCellType, Forguncy.CustomMenu", @@ -387,7 +387,7 @@ } } ], - "ID": "72eb1486-dd0f-44bb-825b-138410b5b88b" + "ID": "9f8a054a-6ef2-480e-8a3e-9915820525ba" } ] } @@ -448,7 +448,7 @@ } } ], - "ID": "a558f942-9dfa-4456-81da-12c6880e1115" + "ID": "2359200c-f0a1-4c82-80a0-feb014e34529" } ] } @@ -464,6 +464,27 @@ "CanVisitRoleList": [ "FGC_LoginUser" ] + }, + { + "Value": "设置模板", + "Text": "设置模板", + "IconPath": "设置 (1).svg", + "IsBuiltInIconPath": false, + "SelectedIconColor": "Background 1", + "SelectedIconColorUseItemColor": true, + "IconColor": null, + "IsOldMenuPath": false, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PopupDisplayMode": 4, + "ShowDrawerHeader": true, + "PageName": "模板列表" + } + ], + "CanVisitRoleList": [ + "FGC_Anonymous" + ] } ], "Orientation": 0, @@ -759,7 +780,7 @@ "CellStyles": { "0,41": 0, "1,1": 1, - "1,24": 2, + "1,17": 2, "1,41": 0, "2,26": 3, "2,27": 2, @@ -1042,7 +1063,7 @@ "5,17,1,12", "10,1,7,40", "3,4,1,25", - "1,24,1,17" + "1,17,1,24" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1085,6 +1106,10 @@ "Name": "汇报人", "Formula": "汇报管理!$E$6" }, + { + "Name": "汇报预览区", + "Formula": "汇报管理!$B$11" + }, { "Name": "结束日期", "Formula": "汇报管理!$J$19" @@ -1096,10 +1121,6 @@ { "Name": "显示搜索栏", "Formula": "汇报管理!$B$19" - }, - { - "Name": "汇报预览区", - "Formula": "汇报管理!$B$11" } ] -}//ZDgDqlRtRT2W2vwYxsNU8tuGdAPU7iL5KxyjNdYNIrweskwF6hGRImQ+rv2BxsNfdD9UMysTEreLvrFQ7qtJdLaQK9R3UxnlXBlV0dKyxPip1Wn0gfy3GuRlR/xWEPhD5GKQRioJaKlnFV9r5pIF2InSiyLcFaovnyGOEMjPbphRjQtwOeiLij2k1NPAluHXdJr7BFfXBZSnkhA4IsAfP859WErdBV9YzdnrSri/Fcm6phiWj6GHxDUXJhL+TQTxF+1oahwzk4na0nG7gaXK4CirPvhjgQGkjKh7yVc1mXnwlSxMMjWUC4QWaqvCP92BhqncITwKGYSpRHqEvJEAKkI7G80UZXrM/MaP0QVDDEl6JdPsyM5uic6rsoUb04ARpcbw/TNOaG9k1hx1i6m+xKAc2pj0ks4HUhHfvP+d9w4LrWLkXVgmL4cmMYsSPUZmcKWdHv4TCWNhq2chotQc6T2HW9s+d1Nz/i41s4jkN7NfQU9grSBr0iGfXZw4ix+reOS4W/QvLbBpbP1vlNr13IjgV0XW56sKSLXoklGRf7KOerf1t85J3+Sf8qJSgb/vQdQeufXPdj7+dyvw8q3a0M+yv47XZaDWYzz777Zf63bb6hz4hsKTiKC5fuDhSrxXfcFMGV1UEnGOk33d2ZqdKnEcDOp7K/TXPiovIYeWU2KSBSP5aoryWWgchw10Vu8UdbLHyTIZtw/ZW164Tj+QNCkn2l3Ahv6OeK9t6HjtGx70g2Zye/ke2QwZgSzm+gP0RcgFMu1bv7apOrOugclRN2aOx/AJb6hMs7PRiPCLwS8lSvmuS3fW5l7bFdQfOU3PcUnl1v+Izbd+qsE4RtIr2vy/Tc3S1zlUlkvfGD43GKpkvzpfTAYywWm3uZb+7ALoDXkcVo1+uLavgIuRQ0adDA==|920 \ No newline at end of file +}//L20qOsltrsSluS87Xjjq4isrQfQaRwZccka5VunLKvgfYvPYt88Ky2Fs9jizKT/gKBS2txHS1URfRZ4s68PQ3F15My2RSV6i4zPxSwffHQbi5V73h5UOhy5LO9YXIRRopFrwxqbLWKiQ1NHVMXr8/tdZKGoI7qoEcNAVPoD1MtuMLmULlTFqVUfmaxFUPgDfDUqrEB20zA06aVezms2b/dUhU1+7Ak4um4+G+ucGW2rYcGVI9vrLZvf2KCNRxK/1HgKY25qyC+GDJLOJvNLmK2D0+QcKWY7goAyLRtbuvM0Zd+rDNHF4sQhYu4KUF4Cy/Mzf4f547zwLAw74rEeZqTow1tcS9pxOqCeqHLC5mImwH7WrGzIETLaSE13PmGHuUr4vYwcDKW/swwixwK9NYiWXB9lCVLaTzJg7F6vUzfWpLRit+kWubQ8sdfhP99bAw5ChL4tZxQH5TtEpKyUbRiJakR2MPBAAyvprI7AQ4FD+D9uvRyn5kKn0PzjOL2f/XJ/i2iFrDygcSqBDNPDIn7EgaG3+EVhdsNhGnduYf0/NPatUx5oX4lD9i/XfQEXxyBvxGBmTWMaNk3h+1AjUUF7ZdJSvs6xYVAKbgLqJleKJ3iU6x08O+jFZiDIWYroIx7M+T35c50c37kVkawUfndiKw8/Tm0VMKmXAiT0HK8IQHVjbKxbngAtw1PztUs4dxCIKdLPGAe01NCzNqubSoZSQ7x0v8A4huoZBAvWzZOhZhmyi5wmzyAeVK9dgLIieSRZlBxT7gT83QeYh6QmzUzpKTOesB3f7gII0RwBqw1oKVQHHQntoJ+JhgT6EIgeRuMbKpw5CHWMfidJ1az67eBEZOKg02lxuB6x3bj3HKEHe3y5K7ZmBkR0z5zSi6qbbT9GEFUzs6ShI7YD3PBRPGA==|920 \ No newline at end of file diff --git a/Pages/汇报/汇报管理.rd b/Pages/汇报/汇报管理.rd index 367e307d..57288355 100644 --- a/Pages/汇报/汇报管理.rd +++ b/Pages/汇报/汇报管理.rd @@ -1,31 +1,31 @@ -{ - "PageType": 0, - "ColumnCount": 42, - "RowCount": 19, - "CustomNames": [ - { - "Name": "关键字", - "Formula": "汇报管理!$E$4" - }, - { - "Name": "汇报人", - "Formula": "汇报管理!$E$6" - }, - { - "Name": "结束日期", - "Formula": "汇报管理!$J$19" - }, - { - "Name": "开始日期", - "Formula": "汇报管理!$G$19" - }, - { - "Name": "显示搜索栏", - "Formula": "汇报管理!$B$19" - }, - { - "Name": "汇报预览区", - "Formula": "汇报管理!$B$11" - } - ] +{ + "PageType": 0, + "ColumnCount": 42, + "RowCount": 19, + "CustomNames": [ + { + "Name": "关键字", + "Formula": "汇报管理!$E$4" + }, + { + "Name": "汇报人", + "Formula": "汇报管理!$E$6" + }, + { + "Name": "汇报预览区", + "Formula": "汇报管理!$B$11" + }, + { + "Name": "结束日期", + "Formula": "汇报管理!$J$19" + }, + { + "Name": "开始日期", + "Formula": "汇报管理!$G$19" + }, + { + "Name": "显示搜索栏", + "Formula": "汇报管理!$B$19" + } + ] } \ No newline at end of file diff --git a/SchedulerTasks/工作汇报/每日根据报工自动生成工作日报.json b/SchedulerTasks/工作汇报/每日根据报工自动生成工作日报.json new file mode 100644 index 00000000..eb761b09 --- /dev/null +++ b/SchedulerTasks/工作汇报/每日根据报工自动生成工作日报.json @@ -0,0 +1,30 @@ +{ + "Name": "每日根据报工自动生成工作日报", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.DailyScheduleTriggerSaveData, ServerDesignerCommon", + "StartDateTime": 45457.0, + "ScheduleRunInDebugServer": false + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "单日自动生成工作日报", + "ResultErrorCodeTo": { + "SerializeProperty": "cdoe" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "已成功生成工作日报！" + } + ] +} \ No newline at end of file diff --git a/ServerCommands/汇报/修改工作日报.json b/ServerCommands/汇报/修改工作日报.json new file mode 100644 index 00000000..113d35df --- /dev/null +++ b/ServerCommands/汇报/修改工作日报.json @@ -0,0 +1,95 @@ +{ + "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 + } + }, + { + "Type": 1, + "ArrayParamItems": [ + { + "Name": "总工时", + "DataValidationInfo": {} + }, + { + "Name": "工作内容", + "DataValidationInfo": {} + } + ], + "OnlySendChangedData": true, + "PrimaryKeys": [ + "ID" + ], + "Name": "日报数据", + "DataValidationInfo": {} + } + ] + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", + "TryCommandPart": { + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "汇报记录表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "ID", + "GUID": "24551406-dfaf-4c71-9ae6-5eb56e59bd04" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=日报ID" + } + }, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "内容", + "GUID": "5935ce22-6b9f-46cf-953f-646fdec63883" + } + }, + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "总工时", + "GUID": "c7dbf6f9-1800-4651-9905-4bedc46bf4ce" + } + } + ] + } + ] + } + } + ] +} \ No newline at end of file diff --git a/ServerCommands/汇报/单日自动生成工作日报.json b/ServerCommands/汇报/单日自动生成工作日报.json index 5e58361a..6d523cbe 100644 --- a/ServerCommands/汇报/单日自动生成工作日报.json +++ b/ServerCommands/汇报/单日自动生成工作日报.json @@ -1,185 +1,397 @@ { "Name": "单日自动生成工作日报", + "Description": "每天8:00自动生成昨日工作内容，生成工作日报。", "Enabled": true, "Triggers": [ { "$type": "Forguncy.SaveLoad.InvokeTriggerSaveData, ServerDesignerCommon", - "Parameters": [ - { - "Name": "汇报人", - "DataValidationInfo": { - "IgnoreBlank": false - }, - "TestData": "shamus" - } - ], "InvokeTriggerTestData": { - "UserName": "Administrator" + "UserName": "shamus" } } ], "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" - } + "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", + "TryCommandPart": { + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "汇报日期", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=TODAY()-1" }, - "value": "0" + "ID": "bdbfea55954c4b629904086d70c6cf24" }, - "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" + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "汇报人", + "ParameterValue": "%CurrentUser%", + "ID": "ef89d90423994c52bc09de9aaef7299c" + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "根据汇报模板生成内容", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "汇报人", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报人" } - ] - } - ], - "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" + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "生成日期", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报日期" + } } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "ReturnPropertiesTo": [ + { + "ResultPropertyName": "生成文本", + "ResultTo": { + "SerializeProperty": "生成汇报内容" + } + }, + { + "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.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "是否已有日报", + "TableValue": { + "TableName": "汇报记录表", + "TableValueType": 1, + "BindingInfos": [ + { + "GUID": "1ecca485-8477-40bd-bc47-6dd93c597ba1", + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "ID", + "GUID": "7248b549-9806-4766-89e1-f5d49e589ddd" + }, + "ColumnName": "ID" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报人", + "GUID": "56eddff0-36fe-4dd9-af41-999289d040ac" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报人" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "开始日期", + "GUID": "2cbb0a81-fada-4134-9c8e-991fba901746" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=TODAY()" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报类型", + "GUID": "7d6310c4-6c2d-47ff-9742-434ee9c833f2" + }, + "Value": "日报" + } + ] + }, + "NullFormulaValueQueryPolicy": 0 + }, + "ID": "334a23c90ea84954b786f69ed719d8f9" + }, + { + "$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%" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "汇报记录表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报类型", + "GUID": "b3a5a232-c78d-4625-ae78-3aa6fbefcb39" + }, + "Value": "日报" + }, + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "开始日期", + "GUID": "7d040eb3-673c-4a5b-9d4c-2d0f13dee05c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=TODAY()" + } + }, + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "截止日期", + "GUID": "1ff87678-9541-442b-b47e-78f31cd11587" + } + }, + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报人", + "GUID": "0cbf0bf4-2ff5-4be8-9e84-85b4098d9f0a" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报人" + } + }, + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "内容", + "GUID": "b298647c-8024-4c13-b7c9-866b133897dd" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=生成汇报内容" + } + }, + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "总工时", + "GUID": "9ff2c05e-d7b4-4596-a35b-5fa377bf7447" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=返回总工时" + } + } + ] + } + ], + "ID": "6c072c5a-eff0-463d-9e68-f1e5cf82e8de" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "汇报记录表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "ID", + "GUID": "4f0f2548-0a72-4169-b2af-37ec269b8f80" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=是否已有日报.ID" + } + }, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "开始日期", + "GUID": "b99ff8ab-af7c-482c-ac31-72cc37bcb7a6" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报日期" + } + }, + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "截止日期", + "GUID": "153688bd-3aee-4394-b83f-a5782b86c4e1" + } + }, + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报人", + "GUID": "d96ee4c5-981d-4035-bac9-0b93bec01517" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报人" + } + }, + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "内容", + "GUID": "9c1dff95-830b-44d2-a448-a00b4e300231" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=生成汇报内容" + } + }, + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "总工时", + "GUID": "cfb960f7-22a5-4efb-8d62-3b35f103ceb1" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=返回总工时" + } + } + ] + } + ], + "ID": "de2eadd4-9642-49a4-99c0-b6eff3bff30c" + } + ] + } + ], + "ID": "f754b2b4-6995-4438-8e89-1d3600a0b77c" + } + ] + } + ], + "ID": "582b025d-ca4e-4276-a182-21b31be3db98" + } + ] + } + ] + }, + "CatchCommandPart": { + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "日志表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "标题", + "GUID": "226e0eb5-e349-400d-aadf-f1e1aaaecf75" + }, + "Value": "单日自动生成工作日报命令" + }, + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "内容", + "GUID": "f77a6239-12a7-4064-b33d-28f45eb52e09" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionCode" + } + }, + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "类型", + "GUID": "8b6812b2-6240-4396-ae2e-7d35baeedb7c" + }, + "Value": "服务端命令" + } + ] + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionCode" + }, + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionMessage" } - ], - "ID": "80834d9a-c680-45ed-96f8-2e4cd51b4a1b" - } - ] + } + ] + } } ] } \ No newline at end of file diff --git a/ServerCommands/汇报/根据汇报模板生成内容.json b/ServerCommands/汇报/根据汇报模板生成内容.json index b6df7172..b0968a3e 100644 --- a/ServerCommands/汇报/根据汇报模板生成内容.json +++ b/ServerCommands/汇报/根据汇报模板生成内容.json @@ -33,7 +33,7 @@ "DataValidationInfo": { "IgnoreBlank": false }, - "TestData": "2024/6/11" + "TestData": "2024/6/13" } ], "InvokeTriggerTestData": { @@ -43,394 +43,521 @@ ], "Commands": [ { - "$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": "总工时", - "TableValue": { - "TableName": "任务工时表", - "TableValueType": 1, - "BindingInfos": [ + "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", + "TryCommandPart": { + "CommandList": [ { - "GUID": "a4ea1be8-f768-4f0a-8c21-3e41578db770", - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "总工时", - "GUID": "46a18c6e-820c-44e3-9b0e-78348a51130d" - }, - "ColumnName": "总工时" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "执行人", - "GUID": "4b3d5f6f-19ec-4644-bc88-01914025be5c" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报人" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时日期", - "GUID": "d0d914d3-0167-477a-a9ee-1b7549dd00b0" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=生成日期" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时类型", - "GUID": "117f7a1f-f51f-4722-ac8d-5b04732bc1b3" - }, - "Value": "实际" - } - ] - }, - "NullFormulaValueQueryPolicy": 0 - }, - "ID": "432e99ea6d31443fa9117b616a793ef3" - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "最近报工项目", - "TableValue": { - "TableName": "任务工时表", - "BindingInfos": [ - { - "GUID": "81174126-3200-4dcc-9421-3814d4d405f1", - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "项目ID", - "GUID": "9fe63173-5128-4215-acc4-6709548766a8" - }, - "ColumnName": "项目ID" + "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", + "OutParamaterName": "汇报列表" }, { - "GUID": "ceec9c39-5ff8-4d2c-b30d-a2d8cf5829fe", - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "项目ID", - "GUID": "eb8227d3-06cb-489a-b20e-0ea5a64755ec", - "RelationBinding": { - "RelatedTable": "项目表", - "RelatedColumn": "ID", - "DisplayColumn": "项目名称" - } + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "处理汇报日期", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=TEXT(生成日期,\"yyyy-MM-dd\")" }, - "ColumnName": "项目名称" + "ID": "4491daaaae9c488a8c74361f2560c355" }, { - "GUID": "d075611f-42bc-4c5a-992f-108e0d2add4f", - "BindingInfo": { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "总工时", + "TableValue": { "TableName": "任务工时表", - "ColumnName": "总工时", - "GUID": "46a18c6e-820c-44e3-9b0e-78348a51130d" - }, - "ColumnName": "总工时" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "执行人", - "GUID": "4b3d5f6f-19ec-4644-bc88-01914025be5c" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报人" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时日期", - "GUID": "d0d914d3-0167-477a-a9ee-1b7549dd00b0" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=生成日期" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时类型", - "GUID": "117f7a1f-f51f-4722-ac8d-5b04732bc1b3" - }, - "Value": "实际" - } - ] - }, - "NullFormulaValueQueryPolicy": 0 - }, - "ID": "b2cf0acec9a54589b841b99ed589248d" - }, - { - "$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": "=最近报工项目.Count" - } - }, - "value": "0", - "compareType": 2 - }, - "CommandList": [ - { - "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", - "LoopInfo": { - "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon", - "LoopCount": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=最近报工项目" - }, - "LoopItemParamName": "当前项目" - }, - "CommandList": [ + "TableValueType": 1, + "BindingInfos": [ { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "项目报工信息", - "TableValue": { + "GUID": "d69c1753-9acf-4ed7-9c80-f0b8d8f2bbba", + "BindingInfo": { "TableName": "任务工时表", - "BindingInfos": [ + "ColumnName": "总工时", + "GUID": "46a18c6e-820c-44e3-9b0e-78348a51130d" + }, + "ColumnName": "总工时" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行人", + "GUID": "4b3d5f6f-19ec-4644-bc88-01914025be5c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报人" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时日期", + "GUID": "d0d914d3-0167-477a-a9ee-1b7549dd00b0" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=生成日期" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时类型", + "GUID": "117f7a1f-f51f-4722-ac8d-5b04732bc1b3" + }, + "Value": "实际" + } + ] + }, + "NullFormulaValueQueryPolicy": 0 + }, + "ID": "4c938ea260b94a89b2d72dcdaaf0d4bc" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "最近报工项目", + "TableValue": { + "TableName": "任务工时表", + "BindingInfos": [ + { + "GUID": "bdbcdbfc-8edb-445f-9dc7-e17615d51d0d", + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "项目ID", + "GUID": "9fe63173-5128-4215-acc4-6709548766a8" + }, + "ColumnName": "项目ID" + }, + { + "GUID": "e95ff5a5-080d-4f9b-9802-de0279b46123", + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "项目ID", + "GUID": "eb8227d3-06cb-489a-b20e-0ea5a64755ec", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "项目名称" + } + }, + "ColumnName": "项目名称" + }, + { + "GUID": "29c34886-ce79-49b0-97a6-937c88bfd643", + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "总工时", + "GUID": "46a18c6e-820c-44e3-9b0e-78348a51130d" + }, + "ColumnName": "总工时" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行人", + "GUID": "4b3d5f6f-19ec-4644-bc88-01914025be5c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报人" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时日期", + "GUID": "d0d914d3-0167-477a-a9ee-1b7549dd00b0" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=生成日期" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时类型", + "GUID": "117f7a1f-f51f-4722-ac8d-5b04732bc1b3" + }, + "Value": "实际" + } + ] + }, + "NullFormulaValueQueryPolicy": 0 + }, + "ID": "93129abf523d4f1382f20ff674ba15f6" + }, + { + "$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": "=最近报工项目.Count" + } + }, + "value": "0", + "compareType": 2 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", + "LoopInfo": { + "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon", + "LoopCount": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=最近报工项目" + }, + "LoopItemParamName": "当前项目" + }, + "CommandList": [ { - "GUID": "259258c6-67d3-42e4-a5ab-d0093187d80f", - "BindingInfo": { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "项目报工信息", + "TableValue": { "TableName": "任务工时表", - "ColumnName": "执行内容", - "GUID": "0a31eb22-29b7-4138-a6a0-98d920d0f715" + "BindingInfos": [ + { + "GUID": "7a86d110-fe10-4b4f-a3fd-b205bca84757", + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行内容", + "GUID": "0a31eb22-29b7-4138-a6a0-98d920d0f715" + }, + "ColumnName": "工作内容" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行人", + "GUID": "4b3d5f6f-19ec-4644-bc88-01914025be5c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报人" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时日期", + "GUID": "d0d914d3-0167-477a-a9ee-1b7549dd00b0" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=生成日期" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "项目ID", + "GUID": "d5d3e143-4db7-495f-973a-a6686207b7f3" + }, + "Value": { + "$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 }, - "ColumnName": "工作内容" + "ID": "d5039106a33d401890c287c3e151e8ef" + }, + { + "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit", + "OperationParamaterPairs": [ + { + "Name": "项目名称", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=当前项目.项目名称" + } + }, + { + "Name": "内容列表", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目报工信息" + } + } + ], + "OutParamaterName": "单个项目" + }, + { + "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", + "InParamater": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报列表" + }, + "Operation": 4, + "OperationParamaterAName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=单个项目" + }, + "OutParamaterName": "汇报列表" + } + ] + }, + { + "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit", + "OperationParamaterPairs": [ + { + "Name": "汇报列表", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报列表" + } } ], - "SqlCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "执行人", - "GUID": "4b3d5f6f-19ec-4644-bc88-01914025be5c" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报人" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时日期", - "GUID": "d0d914d3-0167-477a-a9ee-1b7549dd00b0" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=生成日期" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "项目ID", - "GUID": "d5d3e143-4db7-495f-973a-a6686207b7f3" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=当前项目.项目ID" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "CompareType": 1, - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "执行内容", - "GUID": "65c531dc-6b4c-4568-8153-a0ac38c3ec10" - }, - "Value": "%Null%" + "OutParamaterName": "数据源" + }, + { + "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit", + "OperationParamaterPairs": [ + { + "Name": "汇报日期", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=处理汇报日期" + } + }, + { + "Name": "汇报人", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报人" + } + }, + { + "Name": "总工时", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=总工时.总工时" + } + }, + { + "Name": "汇报列表", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报列表" } - ] - }, - "NullFormulaValueQueryPolicy": 0 - }, - "ID": "4299bb2018a34f71afc41ac0c4985620" - }, - { - "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit", - "OperationParamaterPairs": [ - { - "Name": "项目名称", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=当前项目.项目名称" } + ], + "OutParamaterName": "数据源", + "Disabled": true + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "日报模板", + "TableValue": { + "TableName": "汇报模板", + "TableValueType": 1, + "BindingInfos": [ + { + "GUID": "32b5f782-2d35-428e-afe4-66d120029d89", + "BindingInfo": { + "TableName": "汇报模板", + "ColumnName": "模板内容", + "GUID": "1d9bbe66-ae19-4d86-95cf-dfa2e7e4e2a8" + }, + "ColumnName": "模板内容" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "汇报模板", + "ColumnName": "ID", + "GUID": "722f4877-7cb8-44dc-8b27-c9faa8948228" + }, + "Value": "1" + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 1, + "ColumnBindingInfo": { + "TableName": "汇报模板", + "ColumnName": "是否禁用", + "GUID": "b81cdddf-c5f0-441f-8380-ba980377bd40" + }, + "Value": "1" + } + ] + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" }, - { - "Name": "内容列表", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目报工信息" + "ID": "bcfe9971a6bd4462b60e9dcebf77bdf7" + }, + { + "$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": "MustachePlugin.Render, MustachePlugin", + "DataSrouce": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=日报模板.模板内容" + }, + "UseCustomsDataHash": true, + "CustomsDataHash": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=数据源" + }, + "SetMaxRecursionDepth": 11, + "ResultTo": "输出结果" + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "成功", + "CustomReturns": [ + { + "ReturnPropertyName": "生成文本", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=输出结果" + } + }, + { + "ReturnPropertyName": "返回总工时", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=总工时.总工时" + } + } + ] + } + ], + "ID": "95494b7b-a921-46ca-a739-e58f33c777fa" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": "未找到模板", + "CustomReturns": [ + { + "ReturnPropertyName": "生成文本" + }, + { + "ReturnPropertyName": "返回总工时" + } + ] + } + ], + "ID": "ee8e3a59-924d-4d05-a811-8265fe8ee8e4" } - } - ], - "OutParamaterName": "单个项目" - }, - { - "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", - "InParamater": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报列表" - }, - "Operation": 4, - "OperationParamaterAName": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=单个项目" - }, - "OutParamaterName": "汇报列表" - } - ] - } - ], - "ID": "26c2f871-9736-49f1-b6a1-183d5504aa38" - } - ] - }, - { - "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit", - "OperationParamaterPairs": [ - { - "Name": "汇报日期", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=处理汇报日期" + ] + } + ], + "ID": "5253f66b-c75b-49f8-8760-161595c7e89a" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": "昨日无工作内容。", + "CustomReturns": [ + { + "ReturnPropertyName": "生成文本" + }, + { + "ReturnPropertyName": "返回总工时" + } + ] + } + ], + "ID": "6fc57d6e-38d9-407e-b896-151dedf7d9a8" + } + ] } - }, - { - "Name": "汇报人", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报人" - } - }, - { - "Name": "总工时", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=总工时.总工时" - } - }, - { - "Name": "汇报列表", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报列表" - } - } - ], - "OutParamaterName": "数据源" - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "日报模板", - "TableValue": { - "TableName": "汇报模板", - "TableValueType": 1, - "BindingInfos": [ + ] + }, + "CatchCommandPart": { + "CommandList": [ { - "GUID": "3ccc0c13-130a-49a9-bf47-4f288b619f2f", - "BindingInfo": { - "TableName": "汇报模板", - "ColumnName": "模板内容", - "GUID": "1d9bbe66-ae19-4d86-95cf-dfa2e7e4e2a8" + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionCode" }, - "ColumnName": "模板内容" + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionMessage" + }, + "CustomReturns": [ + { + "ReturnPropertyName": "生成文本" + }, + { + "ReturnPropertyName": "返回总工时" + } + ] } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "汇报模板", - "ColumnName": "ID", - "GUID": "722f4877-7cb8-44dc-8b27-c9faa8948228" - }, - "Value": "1" - }, - "NullFormulaValueQueryPolicy": 0, - "TopCount": "1" - }, - "ID": "a84cfa225a7c4b12b51e30a3b36c833e" - }, - { - "$type": "MustachePlugin.Render, MustachePlugin", - "DataSrouce": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=日报模板.模板内容" - }, - "UseCustomsDataHash": true, - "CustomsDataHash": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=数据源" - }, - "SetMaxRecursionDepth": 11, - "ResultTo": "输出结果" - }, - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "0", - "Message": "成功", - "CustomReturns": [ - { - "ReturnPropertyName": "生成文本", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=输出结果" - } - } - ] + ] + } } ], "ReturnProperties": [ { "Name": "生成文本" + }, + { + "Name": "返回总工时" } ] } \ No newline at end of file diff --git a/Tables/汇报/汇报记录表.json b/Tables/汇报/汇报记录表.json index c268901a..8524f2a3 100644 --- a/Tables/汇报/汇报记录表.json +++ b/Tables/汇报/汇报记录表.json @@ -59,6 +59,14 @@ "Name": "所有描述", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DefaultValue": 0.0, + "DatabaseColumnType": "float", + "MaxLength": -1, + "Name": "总工时", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", "BindingInfo": {