diff --git a/.collaboration b/.collaboration index 65c256c5..f8915276 100644 --- a/.collaboration +++ b/.collaboration @@ -799,17 +799,7 @@ }, { "ModuleName": "PCPage/汇报管理", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-25T20:38:07.4935248+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\汇报管理.json", - "Pages\\汇报\\汇报管理.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/汇报详情", @@ -833,31 +823,11 @@ }, { "ModuleName": "PCPage/工时总览", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-25T19:45:37.4256722+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\工时\\工时总览.json", - "Pages\\工时\\工时总览.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/工时首页", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-25T19:51:54.4573545+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\工时\\工时首页.json", - "Pages\\工时\\工时首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务工时统计", @@ -941,17 +911,7 @@ }, { "ModuleName": "MasterPCPage/FGC_母版页", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-25T20:42:18.114969+08:00", - "ModuleType": 3, - "ToRemoveFiles": [ - "MasterPages\\FGC_母版页.json", - "MasterPages\\FGC_母版页.rd" - ] + "ModuleType": 3 }, { "ModuleName": "MasterPages/流程母版页面文件夹", @@ -1547,40 +1507,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-25T21:05:48.0644972+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\Echarts图表-10_0_1_0.zip", - "Plugin\\Editormd-6_0_102_0.zip", - "Plugin\\Forguncy.CustomMenu.zip", - "Plugin\\Forguncy.PassListviewDataCommand.zip", - "Plugin\\JSON 序列化和反序列化-10_0_1_0.zip", - "Plugin\\JSON数据源-10_0_1_0.zip", - "Plugin\\Lottie动画插图-9_0_103_0.zip", - "Plugin\\Notiflix-9_0_103_0.zip", - "Plugin\\OPENAIFORGUNCY.zip", - "Plugin\\PC组件包-ElementPlus-10_0_1_0.zip", - "Plugin\\SqlServerWrapper.zip", - "Plugin\\Tiny富文本编辑器-10_0_1_0.zip", - "Plugin\\xTools快速开发工具包-9_0_4_0.zip", - "Plugin\\加载动画-10_0_1_0.zip", - "Plugin\\增强关闭页面-9_0_6.zip", - "Plugin\\复制到剪贴板-7_0_3_0.zip", - "Plugin\\客户端缓存操作工具库-8_0_0_0.zip", - "Plugin\\富文本编辑器-10_0_1_0.zip", - "Plugin\\对象与集合操作工具-8_0_0_0.zip", - "Plugin\\支持预览的附件上传-10_0_1_0.zip", - "Plugin\\甘特图-10_0_1_0.zip", - "Plugin\\用户管理命令 V2-10_0_1_0.zip", - "Plugin\\表格报表-10_0_1_0.zip", - "Plugin\\设置当前行命令-10_0_1_0.zip", - "Plugin\\设置焦点命令-10_0_1_0.zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", @@ -1600,12 +1527,6 @@ }, { "ModuleName": "PCPage/个人工时首页", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-25T20:42:18.1149859+08:00", "ModuleType": 1 } ] \ No newline at end of file diff --git a/MasterPages/FGC_母版页.json b/MasterPages/FGC_母版页.json index 1b8fdea3..8eb0c4dd 100644 --- a/MasterPages/FGC_母版页.json +++ b/MasterPages/FGC_母版页.json @@ -209,6 +209,30 @@ "FGC_LoginUser" ] }, + { + "Text": "工时总览", + "SelectedIconColor": "Background 1", + "SelectedIconColorUseItemColor": true, + "IconColorUseItemColor": true, + "IsOldMenuPath": false, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon", + "PageName": "工时首页" + } + ], + "CanVisitRoleList": [ + "Administrator", + "项目经理", + "项目总监", + "商务总监", + "财务" + ] + }, { "Text": "工时", "SelectedIconColor": "Background 1", @@ -222,11 +246,12 @@ }, { "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon", - "PageName": "工时总览" + "PageName": "个人工时首页" } ], "CanVisitRoleList": [ - "FGC_LoginUser" + "开发工程师", + "小组主管" ] }, { @@ -902,4 +927,4 @@ "Formula": "FGC_母版页!$B$6" } ] -}//ZwlZB3d4YvaJWWwuxTS5L7cgCtrEoHZ6aeW/lvIE3SfERB6o5EJ7Tfo31SR6dV7ViM/2WDDVobcEsAaUFvEnUdNAxPObXo2nyEy7ENqJDoM9Fc8m3o2Z11SHo/7ijmFX+u8dPWXUOwoU+Ey7gvpPrTY2EAAMXqUvCvRLsnq12B0hrJltqbhH5YWxM1PPnzMhk5B6ciWWGqAfQf3UfYprkX7nrDs5r1CaXOTX7rkhjBrywWXxEH+73G5vb0Jri/W3Mmyir8RiuKftT3e6GBpd1SytTcgjN8yQAiQ4zJ+lGOO9CxOFIRx4yJXO76cNIWPmjfZVsgJEI39Mh3f4yypOXrL/ZLl6uQM5ahRkVip43FCwS6DbPRF6Lm9Mg71c8S+EciOOQ0uRlEeQNi+in2ux/pENHpR8LCD448zAMbqCHk+wmsrtQ8q+qNkaMHAVXA82hrbAasc42/so1TJQpR+26xR/hDWEEm4a7vhr6GGsANXvOV8dXzinIHRMnWNg/afH2lK0pxEx0lSPxekZ75sGVSSm0eIe3lg4rDiuQlLLlguzh3jhclfPE1mY/uugQ86ZZZS2OvV7+EC7G1jM8JdpCkysleE/LH391WA+wwoX9gS2SYUMyq66JgLYeTFqZKUPEuJDYdmHSaE720vxWnALqXKo1wvH30I0dTFxwHL8P3kdEeMX0SihHXa79c3UNxp7I6T7E84pJ44TVh+ShNEWJF36/ExmLVHovihTckzL7wAToitKs4OkiO9YDUi4xBujX6+gjVvTxiDYfB+ymWlUkOtj+yvScxGv821Ku+X7IIay60iJirKa8FzDodrRUynth/PJez3udQsJpnzdyio8OijXwTxUdNeGvyPZLPLDCCCZEFDYsAlGN+zJj2v8uzkYS3wWoSq1hHb2xhEA+kccwA==|920 \ No newline at end of file +}//6EnmlYheQNILvEnwMNfXF6OmdRVgmd0cL7LMPcE/IDTiMvv8enoLz407bRv8GFvPoaNPlatXtUWFo8Q49El2izuMX3VEAOGHkk+7Nn8EhNOGofX25xBXQr2xe8IOZSgre6OOmLTnjUpTFCa1CA3i5A3BBt6uZ61P3hG4i5CXlxL8PvbmyMjTamSRei3WA5TgZfhWotOlao8GgOwz5ATNd2wthkzkLPUthVZFahfBfjazgdsnEX3Kamg72N+BxGlj2xrW4ulHxPwwqfORy8S6mNHAeXYsU8eQxbysC+Hs6Zt77uBSkMBZNzXsqS2c0ZlLwYcbHJjs6T3mWuWlaXU2xsuRMUaNweBD+9EQ6Q5UmEMSQsatKON+7DL2MMa0uq7Agc/sm+8RmbGsPm7dHHKrhO9fcKXNZBiONy/gLfEenjNvFSOFVEgHfcdMOc4YE5tNSKf6j2Z8H9AwLPP6C4olHgAzitHpyK5FxkIkjG0ZWry6RmBxZvd3c0QFNqmb6myMxbnP+OhPhpqtZXN4bIurqJGd/1BB+lYv4Nozv98PopO9PAoqhLhVpfZpgw5KofCuPCZZix/okDFPTQzi6HbnbqJgxORlWtjtwskN2ti7tRySfRPEHRi06ZZ/r2R2Gmf4MwdAYfsBk7Hhym1BtYFe1cmC9qa5Lyaq3U5q2g9DDwZigaoj5hJJ28QlgNVnaoOUlGBXJZM30086v2faVomS1bTpJnzC97zUZi0pXuVLzFXXVX6x1nvfdk7soTQtkWK3VgXJJE6ahqverA+EKAGZBQ43BnBmUYQYeaXyiWLTrUlf9vYHJqT4V/SCOTqVj+GVLpk//+8ChkhiYcHvYQoGTEkNYNyqAIyHcPwRA04SAp6bDnyHYsCljZMNETONt3oLZgMh9g5NfeJ/chz9yHh8PA==|920 \ No newline at end of file diff --git a/Pages/工时/个人工时首页.json b/Pages/工时/个人工时首页.json new file mode 100644 index 00000000..274760ce --- /dev/null +++ b/Pages/工时/个人工时首页.json @@ -0,0 +1,894 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 28.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 634.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "IsHidden": true + } + } + }, + "InLogicalVisibleIndexes": [ + 10 + ], + "Count": 11, + "DefaultSize": 32.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "20": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "21": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "22": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "23": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "24": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "25": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "26": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "27": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "28": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "29": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "30": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "31": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "32": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "33": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "34": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "35": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + } + }, + "Count": 36, + "DefaultSize": 32.0 + }, + "Values": { + "1,1": "%PageTitle%", + "3,1": "项目", + "3,16": "日期", + "5,1": "查询", + "5,4": "重置" + }, + "AttachInfos": { + "3,3": { + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "项目表", + "BindingInfos": [ + { + "GUID": "7c5a1976-5bfa-438d-bc65-35efbe1eadb7", + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "ID", + "GUID": "784b8e78-f46c-4e80-81c6-3ba6782c2707" + }, + "ColumnName": "value" + }, + { + "GUID": "0c5d6f54-4a63-4004-a3a7-0f02cbea3d57", + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目名称", + "GUID": "be80e44c-eebf-40b1-8c35-ce5b62403bd5" + }, + "ColumnName": "label" + } + ], + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "multiple": true, + "collapseTags": true, + "filterable": true, + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据", + "clearable": true + } + }, + "3,18": { + "CellType": { + "$type": "ElementUI.DatePickerCellType, ElementUI", + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=个人工时首页!S4" + }, + "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "GetSelectedRange", + "RetrunParamNames": { + "StartValue": { + "SerializeProperty": "=个人工时首页!开始日期" + }, + "EndValue": { + "SerializeProperty": "=个人工时首页!结束日期" + } + } + } + ], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "daterange", + "placeholder": "选择日期", + "startPlaceholder": "开始日期", + "rangeSeparator": "至", + "endPlaceholder": "结束日期", + "firstDayOfWeek": 1, + "DefautWeekFormat": "yyyy 第 WW 周" + } + }, + "5,1": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "Text": "查询", + "TemplateKey": "_RS_Main1" + } + }, + "5,4": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=个人工时首页!D4,个人工时首页!S4" + }, + "Value": "%Null%" + } + ] + }, + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=个人工时首页!B9" + }, + "TargetType": "ReportSheet.ReportSheetCellType, ReportSheet, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null", + "MethodName": "ReloadDataSource", + "ParameterValues": { + "target": null, + "isMaskVisible": true + } + } + ], + "Text": "重置", + "TemplateKey": "_RS_Information3" + } + }, + "8,1": { + "CellType": { + "$type": "ReportSheet.ReportSheetCellType, ReportSheet", + "dataSources": [ + { + "Id": "141d0a40-9917-4134-ae60-0f84c1bd1319", + "name": "工时详情", + "bindingTableOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "View_任务工时统计", + "BindingInfos": [ + { + "GUID": "289afb53-8e72-4206-8dab-c3fc4384709e", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "ID", + "GUID": "63eb8fa4-de0a-42bc-8da5-3a944ca612f5" + }, + "ColumnName": "ID" + }, + { + "GUID": "3a4cd9f2-fc26-4afd-944d-9483f06ef49c", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "日期", + "GUID": "cad5af6a-d063-488e-9fff-95292c48ef8d" + }, + "ColumnName": "日期" + }, + { + "GUID": "f36fcf8a-27fa-42d5-b25b-c8431b3c638e", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "执行人", + "GUID": "30227fed-3fa0-4dce-9c65-31290bfe96c0" + }, + "ColumnName": "执行人" + }, + { + "GUID": "51541237-8df4-44d4-847c-8655b4d8af82", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "执行人", + "GUID": "5a3bb8f7-259f-40b1-9365-5e77455ddb77", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 + } + }, + "ColumnName": "执行人姓名" + }, + { + "GUID": "0d23193a-c985-45cb-901b-dbe09c4de637", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "项目ID", + "GUID": "11497995-2e35-4129-9df0-e4124813ad9d", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "项目名称" + } + }, + "ColumnName": "项目名称" + }, + { + "GUID": "9049c998-072f-4dee-97eb-ed10a9d2c4ac", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "任务ID", + "GUID": "af984443-6fd4-4aed-9ff7-45481fc52eb9", + "RelationBinding": { + "RelatedTable": "任务表", + "RelatedColumn": "ID", + "DisplayColumn": "任务名称" + } + }, + "ColumnName": "任务名称" + }, + { + "GUID": "ecdf22b2-3e03-44fb-ab33-57b7c603971e", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "时薪单价", + "GUID": "44acabe2-2f67-45c6-951d-7d9bd261e159" + }, + "ColumnName": "时薪单价" + }, + { + "GUID": "510b2219-bd4e-402d-90f7-a8088c57b543", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "提成系数", + "GUID": "549de302-441b-47cd-8560-3b98f26d1279" + }, + "ColumnName": "提成系数" + }, + { + "GUID": "fa83ffe8-08d4-4fce-a590-ddd8c43f3c1e", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "计划工时", + "GUID": "9e7df56e-9a27-4c8a-bfd1-52ad7c727c07" + }, + "ColumnName": "计划工时" + }, + { + "GUID": "42ad5559-b5a7-43d1-b5e9-9bba75e16847", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "实际工时", + "GUID": "fa9c5ea0-e5a4-48f7-89e5-43ab7da14042" + }, + "ColumnName": "实际工时" + }, + { + "GUID": "64f6ee2b-7b42-4b88-9b6b-f66cb2afd740", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "上报工时", + "GUID": "65536567-87bb-409b-8de7-62648c1fb801" + }, + "ColumnName": "上报工时" + }, + { + "GUID": "aab0b0df-75b9-4c3a-9a80-ff5995a948a6", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "计算提成", + "GUID": "a1648e3a-fb0a-4fcc-897c-d9a61b0af38b" + }, + "ColumnName": "计算提成" + }, + { + "GUID": "ef7203f1-c443-4aeb-a75e-c0bc712d3e33", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "请款单ID", + "GUID": "a23bca2e-003a-4a60-b653-5bbf0d35fbdc" + }, + "ColumnName": "请款单ID" + }, + { + "GUID": "3f85adcd-18ee-460b-ac2d-618ab0d8e388", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "请款状态", + "GUID": "7d6e9f47-a73d-4fb7-890a-8bce28545fb1" + }, + "ColumnName": "请款状态" + }, + { + "GUID": "7554270f-9246-4f93-b391-43328badb406", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "工时完成比例", + "GUID": "866ef252-7891-4f3b-833c-ef09908cecbb" + }, + "ColumnName": "工时完成比例" + }, + { + "GUID": "496b28d6-9960-4e6b-b67d-2d5924e3a173", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "剩余工时", + "GUID": "5196b3f3-1fff-490d-b422-fb0d38ee8f70" + }, + "ColumnName": "剩余工时" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 8, + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "项目ID", + "GUID": "456fa2df-a379-4a27-b114-906649816b20" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=个人工时首页!D4" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 3, + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "日期", + "GUID": "2bba4db4-ad99-464e-94c7-9a823b0b728b" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=个人工时首页!开始日期" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 5, + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "日期", + "GUID": "9c60552c-5f73-4451-9e70-28d63834ffaa" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=个人工时首页!结束日期" + } + } + ] + }, + "NullFormulaValueQueryPolicy": 1, + "CustomColumns": [] + } + } + ], + "config": "{\"version\":\"17.0.5\",\"name\":\"\",\"sheetCount\":0,\"scrollbarMaxAlign\":true,\"tabStripVisible\":false,\"newTabVisible\":false,\"allowDynamicArray\":true,\"customList\":[],\"numbersFitMode\":1,\"defaultSheetTabStyles\":{},\"activeSheetIndex\":-1,\"sheetTabCount\":1,\"activeSheetTabIndex\":0,\"sheetTabs\":{\"report\":{\"template\":{\"name\":\"report\",\"isSelected\":true,\"rowCount\":142,\"columnCount\":5,\"activeRow\":6,\"visible\":1,\"theme\":\"Office\",\"data\":{\"dataTable\":{\"0\":{\"0\":{\"value\":\"项目\",\"style\":{\"backColor\":\"Accent 1 80\",\"hAlign\":1,\"vAlign\":1,\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderTop\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderRight\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderBottom\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"showEllipsis\":true,\"imeMode\":1},\"bindingPath\":{\"type\":\"Static\",\"context\":{\"horizontal\":\"Default\",\"vertical\":\"Default\"},\"paginateBeforeRow\":false,\"paginateAfterRow\":false,\"paginateBeforeColumn\":false,\"paginateAfterColumn\":false,\"canBreakWhenPaging\":true,\"repeatContentWhenPaging\":true,\"autoExpand\":\"Vertical\",\"pin\":\"Column\"}},\"1\":{\"value\":\"任务\",\"style\":{\"backColor\":\"Accent 1 80\",\"hAlign\":1,\"vAlign\":1,\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderTop\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderRight\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderBottom\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"showEllipsis\":true,\"imeMode\":1},\"bindingPath\":{\"type\":\"Static\",\"context\":{\"horizontal\":\"Default\",\"vertical\":\"Default\"},\"paginateBeforeRow\":false,\"paginateAfterRow\":false,\"paginateBeforeColumn\":false,\"paginateAfterColumn\":false,\"canBreakWhenPaging\":true,\"repeatContentWhenPaging\":true,\"autoExpand\":\"Vertical\",\"pin\":\"Column\",\"spillDirection\":\"None\"}},\"2\":{\"style\":{\"backColor\":\"Background 1 -5\",\"hAlign\":1,\"vAlign\":1,\"themeFont\":\"Body\",\"formatter\":\"yyyy/m/d [$-804]dddd\",\"borderLeft\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderTop\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderRight\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderBottom\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"showEllipsis\":true,\"imeMode\":1},\"bindingPath\":{\"type\":\"Group\",\"context\":{\"horizontal\":\"None\",\"vertical\":\"B2\"},\"paginateBeforeRow\":false,\"paginateAfterRow\":false,\"paginateBeforeColumn\":false,\"paginateAfterColumn\":false,\"canBreakWhenPaging\":true,\"repeatContentWhenPaging\":true,\"showCollapseButton\":false,\"autoExpand\":\"Horizontal\",\"binding\":\"工时详情[日期]\",\"alias\":\"日期\",\"spillDirection\":\"Horizontal\"}},\"3\":{\"style\":{\"backColor\":\"Background 1 -5\",\"hAlign\":1,\"formatter\":\"yyyy/m/d [$-804]dddd\",\"borderLeft\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderTop\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderRight\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderBottom\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1}}},\"4\":{\"style\":{\"backColor\":\"Background 1 -5\",\"hAlign\":1,\"formatter\":\"yyyy/m/d [$-804]dddd\",\"borderLeft\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderTop\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderRight\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderBottom\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1}}}},\"1\":{\"0\":{\"style\":{\"backColor\":\"Accent 1 80\",\"hAlign\":1,\"borderLeft\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderTop\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderRight\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderBottom\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1}}},\"1\":{\"style\":{\"backColor\":\"Accent 1 80\",\"hAlign\":1,\"borderLeft\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderTop\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderRight\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderBottom\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1}}},\"2\":{\"value\":\"计划\",\"style\":{\"backColor\":\"Background 1 -5\",\"hAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderTop\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderRight\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderBottom\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}},\"3\":{\"value\":\"实际\",\"style\":{\"backColor\":\"Background 1 -5\",\"hAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderTop\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderRight\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderBottom\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}},\"4\":{\"value\":\"上报\",\"style\":{\"backColor\":\"Background 1 -5\",\"hAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderTop\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderRight\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderBottom\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"}}},\"2\":{\"0\":{\"style\":{\"hAlign\":0,\"vAlign\":1,\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderTop\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderRight\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderBottom\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"textIndent\":2,\"showEllipsis\":true,\"imeMode\":1,\"isVerticalText\":false,\"textOrientation\":0},\"bindingPath\":{\"type\":\"Group\",\"context\":{\"horizontal\":\"Default\",\"vertical\":\"Default\"},\"paginateBeforeRow\":false,\"paginateAfterRow\":false,\"paginateBeforeColumn\":false,\"paginateAfterColumn\":false,\"canBreakWhenPaging\":true,\"repeatContentWhenPaging\":true,\"showCollapseButton\":false,\"autoExpand\":\"Vertical\",\"binding\":\"工时详情[项目名称]\",\"alias\":\"项目名称\"}},\"1\":{\"style\":{\"hAlign\":0,\"vAlign\":1,\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderTop\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderRight\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderBottom\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"textIndent\":2,\"showEllipsis\":true,\"imeMode\":1,\"isVerticalText\":false,\"textOrientation\":0},\"bindingPath\":{\"type\":\"Group\",\"context\":{\"horizontal\":\"None\",\"vertical\":\"A3\"},\"paginateBeforeRow\":false,\"paginateAfterRow\":false,\"paginateBeforeColumn\":false,\"paginateAfterColumn\":false,\"canBreakWhenPaging\":true,\"repeatContentWhenPaging\":true,\"autoExpand\":\"Vertical\",\"binding\":\"工时详情[任务名称]\",\"spillDirection\":\"Vertical\",\"showCollapseButton\":false,\"alias\":\"任务名称\"}},\"2\":{\"style\":{\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderTop\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderRight\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderBottom\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"showEllipsis\":true,\"imeMode\":1,\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"},\"bindingPath\":{\"type\":\"Summary\",\"context\":{\"horizontal\":\"C1\",\"vertical\":\"B3\"},\"paginateBeforeRow\":false,\"paginateAfterRow\":false,\"paginateBeforeColumn\":false,\"paginateAfterColumn\":false,\"canBreakWhenPaging\":true,\"repeatContentWhenPaging\":true,\"autoExpand\":\"Both\",\"aggregate\":\"Sum\",\"binding\":\"工时详情[计划工时]\",\"spillDirection\":\"Horizontal\",\"showCollapseButton\":false,\"alias\":\"计划工时\"}},\"3\":{\"style\":{\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderTop\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderRight\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderBottom\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"showEllipsis\":true,\"imeMode\":1,\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"},\"bindingPath\":{\"type\":\"Summary\",\"context\":{\"horizontal\":\"C1\",\"vertical\":\"B3\"},\"paginateBeforeRow\":false,\"paginateAfterRow\":false,\"paginateBeforeColumn\":false,\"paginateAfterColumn\":false,\"canBreakWhenPaging\":true,\"repeatContentWhenPaging\":true,\"autoExpand\":\"Both\",\"aggregate\":\"Sum\",\"binding\":\"工时详情[实际工时]\",\"spillDirection\":\"Horizontal\",\"showCollapseButton\":false,\"alias\":\"实际工时\"}},\"4\":{\"style\":{\"hAlign\":1,\"vAlign\":1,\"font\":\"10pt Calibri\",\"themeFont\":\"Body\",\"borderLeft\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderTop\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderRight\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"borderBottom\":{\"color\":\"rgb(216, 216, 216)\",\"style\":1},\"showEllipsis\":true,\"imeMode\":1,\"fontSize\":\"10pt\",\"fontFamily\":\"Calibri\"},\"bindingPath\":{\"type\":\"Summary\",\"context\":{\"horizontal\":\"C1\",\"vertical\":\"B3\"},\"paginateBeforeRow\":false,\"paginateAfterRow\":false,\"paginateBeforeColumn\":false,\"paginateAfterColumn\":false,\"canBreakWhenPaging\":true,\"repeatContentWhenPaging\":true,\"autoExpand\":\"Both\",\"aggregate\":\"Sum\",\"binding\":\"工时详情[上报工时]\",\"spillDirection\":\"Horizontal\",\"showCollapseButton\":false,\"alias\":\"上报工时\"}}}},\"defaultDataNode\":{\"style\":{\"vAlign\":1,\"themeFont\":\"Body\",\"showEllipsis\":true}}},\"rowHeaderData\":{\"columnDataArray\":[{\"style\":{\"font\":\"14.6667px Calibri\",\"fontSize\":\"14.6667px\",\"fontFamily\":\"Calibri\"}}],\"defaultDataNode\":{\"style\":{\"themeFont\":\"Body\"}}},\"colHeaderData\":{\"rowDataArray\":[{\"style\":{\"font\":\"14.6667px Calibri\",\"fontSize\":\"14.6667px\",\"fontFamily\":\"Calibri\"}}],\"defaultDataNode\":{\"style\":{\"themeFont\":\"Body\"}}},\"rows\":[{\"size\":27.666656494140625},{\"size\":27.666656494140625},{\"size\":32.666656494140625},{}],\"columns\":[{\"size\":169},{\"size\":168},{\"size\":53},{\"size\":53},{\"size\":53}],\"defaultData\":{},\"leftCellIndex\":0,\"topCellIndex\":0,\"spans\":[{\"row\":0,\"col\":2,\"rowCount\":1,\"colCount\":3},{\"row\":0,\"col\":0,\"rowCount\":2,\"colCount\":1},{\"row\":0,\"col\":1,\"rowCount\":2,\"colCount\":1}],\"selections\":{\"0\":{\"row\":6,\"col\":0,\"rowCount\":1,\"colCount\":1},\"length\":1},\"rowOutlines\":{\"items\":[]},\"columnOutlines\":{\"items\":[]},\"cellStates\":{},\"states\":{},\"outlineColumnOptions\":{},\"autoMergeRangeInfos\":[],\"shapeCollectionOption\":{\"snapMode\":0},\"names\":[],\"printInfo\":{\"columnStart\":-1,\"columnEnd\":-1,\"rowStart\":-1,\"rowEnd\":-1,\"paperSize\":{\"width\":850,\"height\":1100,\"kind\":1}},\"frozenlineColor\":\"\",\"showFormulas\":true,\"gridline\":{\"showHorizontalGridline\":false,\"showVerticalGridline\":false},\"keepUnknownFormulas\":true,\"sheetAreaOffset\":{\"left\":2,\"top\":2},\"templateSetting\":{\"templateOptions\":{}},\"type\":1},\"reportName\":\"report\",\"name\":\"report\",\"sheetType\":3,\"renderMode\":\"Design\",\"printAllPages\":true,\"dirtyStyle\":{\"decoration\":{\"cornerFold\":{\"size\":6,\"position\":1,\"color\":\"#FF3D00\"}}},\"parameter\":{\"成员\":\"\"},\"index\":0,\"order\":0}},\"namedPatterns\":{},\"customFunctions\":{\"GETRESOURCESTRING\":{\"name\":\"GETRESOURCESTRING\",\"minArgs\":0,\"maxArgs\":255,\"IDt\":{\"description\":\"获取资源\",\"parameters\":[{\"name\":\"resourceKey\"},{\"name\":\"formatString\",\"repeatable\":true}],\"name\":\"GETRESOURCESTRING\"},\"typeName\":\"\"}},\"dataManager\":{\"tables\":[],\"relationships\":[]},\"forguncyData\":{\"hiddenRowsVisible\":true,\"hiddenColumnsVisible\":true,\"dataSourcesScheme\":[{\"id\":\"141d0a40-9917-4134-ae60-0f84c1bd1319\",\"dataSourceName\":\"工时详情\",\"tableName\":\"View_任务工时统计\",\"columns\":[{\"id\":\"289afb53-8e72-4206-8dab-c3fc4384709e\",\"name\":\"ID\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"3a4cd9f2-fc26-4afd-944d-9483f06ef49c\",\"name\":\"日期\",\"type\":300,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"f36fcf8a-27fa-42d5-b25b-c8431b3c638e\",\"name\":\"执行人\",\"type\":100,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"51541237-8df4-44d4-847c-8655b4d8af82\",\"name\":\"执行人姓名\",\"type\":100,\"canWriteBack\":false,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"0d23193a-c985-45cb-901b-dbe09c4de637\",\"name\":\"项目名称\",\"type\":100,\"canWriteBack\":false,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"9049c998-072f-4dee-97eb-ed10a9d2c4ac\",\"name\":\"任务名称\",\"type\":100,\"canWriteBack\":false,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"ecdf22b2-3e03-44fb-ab33-57b7c603971e\",\"name\":\"时薪单价\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"510b2219-bd4e-402d-90f7-a8088c57b543\",\"name\":\"提成系数\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"fa83ffe8-08d4-4fce-a590-ddd8c43f3c1e\",\"name\":\"计划工时\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"42ad5559-b5a7-43d1-b5e9-9bba75e16847\",\"name\":\"实际工时\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"64f6ee2b-7b42-4b88-9b6b-f66cb2afd740\",\"name\":\"上报工时\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"aab0b0df-75b9-4c3a-9a80-ff5995a948a6\",\"name\":\"计算提成\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"ef7203f1-c443-4aeb-a75e-c0bc712d3e33\",\"name\":\"请款单ID\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"3f85adcd-18ee-460b-ac2d-618ab0d8e388\",\"name\":\"请款状态\",\"type\":200,\"canWriteBack\":true,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"7554270f-9246-4f93-b391-43328badb406\",\"name\":\"工时完成比例\",\"type\":200,\"canWriteBack\":false,\"isPrimaryKey\":false,\"isAutoIncrement\":false},{\"id\":\"496b28d6-9960-4e6b-b67d-2d5924e3a173\",\"name\":\"剩余工时\",\"type\":200,\"canWriteBack\":false,\"isPrimaryKey\":false,\"isAutoIncrement\":false}]}]}}", + "eventSettings": {}, + "permissionSettings": { + "edit": [ + "FGC_LoginUser" + ], + "add": [ + "FGC_LoginUser" + ], + "delete": [ + "FGC_LoginUser" + ] + } + } + } + }, + "StyleDatas": { + "Styles": [ + { + "FontFamily": 0, + "FontSize": 18.666666666666664 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Formatter": 1 + }, + { + "FontFamily": 0 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332 + }, + { + "FontFamily": 0, + "BorderBottom": 0 + } + ], + "Types": { + "Strs": [ + "Body", + "[AUTO]General", + "Background 2 0" + ], + "Borders": [ + { + "Color": 2 + } + ] + }, + "CellStyles": { + "1,1": 0, + "3,1": 1, + "3,2": 2, + "3,3": 3, + "3,15": 2, + "3,16": 1, + "3,17": 2, + "3,18": 3, + "4,1": 3, + "4,2": 3, + "4,3": 3, + "4,4": 3, + "4,5": 3, + "4,6": 3, + "4,7": 3, + "4,8": 3, + "4,9": 3, + "4,10": 3, + "4,11": 3, + "4,12": 3, + "4,13": 3, + "4,14": 3, + "4,15": 3, + "4,16": 3, + "4,17": 3, + "4,18": 3, + "4,19": 3, + "4,20": 3, + "4,21": 3, + "4,22": 3, + "4,23": 3, + "4,24": 3, + "4,25": 2, + "4,26": 3, + "4,27": 3, + "4,28": 3, + "4,29": 3, + "5,1": 3, + "5,2": 2, + "5,3": 2, + "5,4": 3, + "5,5": 2, + "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, + "5,23": 3, + "5,24": 3, + "5,25": 2, + "5,26": 3, + "5,27": 3, + "5,28": 3, + "5,29": 3, + "6,1": 4, + "6,2": 4, + "6,3": 4, + "6,4": 4, + "6,5": 4, + "6,6": 4, + "6,7": 4, + "6,8": 4, + "6,9": 4, + "6,10": 4, + "6,11": 4, + "6,12": 4, + "6,13": 4, + "6,14": 4, + "6,15": 4, + "6,16": 4, + "6,17": 4, + "6,18": 4, + "6,19": 4, + "6,20": 4, + "6,21": 4, + "6,22": 4, + "6,23": 4, + "6,24": 4, + "6,25": 4, + "6,26": 4, + "6,27": 4, + "6,28": 4, + "6,29": 4, + "7,1": 2, + "7,2": 2, + "7,3": 2, + "7,4": 2, + "7,5": 2, + "7,6": 2, + "7,7": 2, + "7,8": 2, + "7,9": 2, + "7,10": 2, + "7,11": 2, + "7,12": 2, + "7,13": 2, + "7,14": 2, + "7,15": 2, + "7,16": 2, + "7,17": 2, + "7,18": 2, + "7,19": 2, + "7,20": 2, + "7,21": 2, + "7,22": 2, + "7,23": 2, + "7,24": 2, + "7,25": 2, + "7,26": 2, + "7,27": 2, + "7,28": 2, + "7,29": 2 + }, + "SheetStyle": { + "FontFamily": 0 + } + }, + "Spans": [ + "8,1,1,34", + "5,1,1,2", + "5,4,1,2", + "3,1,1,2", + "3,3,1,12", + "3,16,1,2", + "3,18,1,16", + "10,1,1,4", + "10,5,1,4" + ], + "PageInfo": { + "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "MasterPageName": "FGC_母版页", + "Title": "工时", + "PageLoadedCommandList": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + } + ], + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + }, + "RowBreakLines": [], + "RepeatRangeSettings": [] + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + }, + "CustomNames": [ + { + "Name": "开始日期", + "Formula": "个人工时首页!$B$11" + }, + { + "Name": "结束日期", + "Formula": "个人工时首页!$F$11" + } + ] +}//fgXRM3jI2DE9qxtzpg1bogUXUnQsyD2xnCcCfJP2ERlDlSAahatilgmRUy8k/4Kiz+MXqGdYj9bjKmprbeqWZIr+So+T0QSc7R8tEBb0g3XoVCwdVwipNuDM7jR+h3Hy/tFCdOTRKB9z90eHRleUNsyOn5SlP8Pxk9FcYA+GY+/GoRlEEuVYJnraVZJ551+UnkOKBISc3GU+nUKakHQisVxIfJ+4zgFmMlWsHHpOCyS+y99tiwtvjRXABSMIvkXijLkuaF4UQBpG+Obg7b2Gn9usilA9EujtzvokP3VM7mtGrD3zm7y9tWYHcsRsKLChCUDN3e5ClGRZNaDHzJkeowcxJRh710+IoCTYUtywxK/jnuzuOnrcAQNUePReycz/PncALl2x05CNkuROjm7idjDiNrDejli4aOZnoVA7LmEJqleNE0EHhQyHZ11FHkdLnwQX3B4CzJt6z2+SIhnhHze51BtS/YX0KDVZ2is8w4HAlmAyHOKmMhgi6XQ+Qe9a5O23NGyN/yD+k47E19es9DG09H+zeMGvghKs/ESdmHxnSCZzmh/Bz/Z0K8aMQ4RFopQNYeWnE0Prkxzl2l9z7RTTNJCKJVtaMg+5kAJ7i3noDrySDX2iBtRC8PSGUryAjweOtP4ZSiuQFlTH4QAilGn8JQ6tWmVFKZcf2d1nSZsSA/ceWM0CiQa8VecHIc+BIJXreIslyoMATQqgU0lQrwlNGf7u101hkGCea6wwUjdwKwo2o1INJcGo94J5eVZc0mTsSwQFJ+FyIXM7OH/7LNvCeMtAxD1EHEGT0LhoBpdk359PI5yfzHpCz18LjMFOHFDr1Iewlg2LxiqI6dXIjv/0B3II0Vtno9uY1QowtImVSYXBVdcgSKiJfI2mjKFrE0FIeTvgVz3ddz3yDQ60eQ==|920 \ No newline at end of file diff --git a/Pages/工时/个人工时首页.rd b/Pages/工时/个人工时首页.rd new file mode 100644 index 00000000..a88864af --- /dev/null +++ b/Pages/工时/个人工时首页.rd @@ -0,0 +1,15 @@ +{ + "PageType": 0, + "ColumnCount": 36, + "RowCount": 11, + "CustomNames": [ + { + "Name": "开始日期", + "Formula": "个人工时首页!$B$11" + }, + { + "Name": "结束日期", + "Formula": "个人工时首页!$F$11" + } + ] +} \ No newline at end of file diff --git a/Pages/工时/工时总览.json b/Pages/工时/工时总览.json index 0ffac21f..a933ea27 100644 --- a/Pages/工时/工时总览.json +++ b/Pages/工时/工时总览.json @@ -114,14 +114,9 @@ }, "Cols": { "RowColumnAttachedInfos": { - "0": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 167.0 - } - }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 32.0 } }, "2": { @@ -210,11 +205,6 @@ } }, "19": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "20": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "Mode": 2, @@ -226,6 +216,11 @@ } } }, + "20": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, "21": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 @@ -261,219 +256,34 @@ "DesignLengthInPixel": 32.0 } }, - "28": { + "31": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } }, - "29": { + "32": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } }, - "30": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "34": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "35": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "36": { + "33": { "GridRowColumnDefinition": { "DesignLengthInPixel": 24.0 } } }, - "Count": 37, + "Count": 34, "DefaultSize": 32.0 }, "Values": { - "1,3": "年度", - "1,33": "导出Excel" + "1,1": "年度", + "1,30": "导出Excel" }, "Formulas": { - "1,5": "TODAY()" + "1,3": "TODAY()" }, "AttachInfos": { - "0,0": { - "CellType": { - "$type": "Forguncy.CustomMenu.ForguncyMenuCellType, Forguncy.CustomMenu", - "TemplateKey": "BalckWhite", - "Items": [ - { - "Text": "应付", - "SelectedIconColor": "Background 1", - "SelectedIconColorUseItemColor": true, - "IconColorUseItemColor": true, - "IsOldMenuPath": false, - "CanVisitRoleList": [ - "FGC_LoginUser" - ], - "SubItems": [ - { - "Value": "我的已阅", - "Text": "工资", - "IconPath": "支出类合同审批流程.svg", - "IsBuiltInIconPath": false, - "SelectedIconColor": "Background 1", - "SelectedIconColorUseItemColor": true, - "IconColor": null, - "IsOldMenuPath": false, - "CommandList": [ - { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=工时总览!财务中心子页面" - }, - "Value": "FGC_我的已阅" - } - ] - } - ], - "CanVisitRoleList": [ - "FGC_LoginUser" - ] - }, - { - "Value": "菜单1", - "Text": "报销", - "IconPath": "售后补偿申请流程.svg", - "IsBuiltInIconPath": false, - "SelectedIconColor": "Background 1", - "SelectedIconColorUseItemColor": true, - "IconColor": null, - "IsOldMenuPath": false, - "CanVisitRoleList": [ - "FGC_Anonymous" - ] - }, - { - "Value": "菜单1", - "Text": "其他", - "IconPath": "快递到付收件申请流程.svg", - "IsBuiltInIconPath": false, - "SelectedIconColor": "Background 1", - "SelectedIconColorUseItemColor": true, - "IconColor": null, - "IsOldMenuPath": false, - "CanVisitRoleList": [ - "FGC_Anonymous" - ] - } - ] - }, - { - "Text": "已付", - "SelectedIconColor": "Background 1", - "SelectedIconColorUseItemColor": true, - "IconColorUseItemColor": true, - "IsOldMenuPath": false, - "CanVisitRoleList": [ - "FGC_LoginUser" - ], - "SubItems": [ - { - "Text": "工资", - "IconPath": "委外订单价格审批流程.svg", - "IsBuiltInIconPath": false, - "SelectedIconColor": "Background 1", - "SelectedIconColorUseItemColor": true, - "IconColor": null, - "IsOldMenuPath": false, - "CommandList": [ - { - "$type": "Forguncy.Model.ProcessDelegateSettingCommand, ServerDesignerCommon" - } - ], - "CanVisitRoleList": [ - "FGC_LoginUser" - ] - } - ] - }, - { - "Value": "菜单1", - "Text": "应收", - "SelectedIconColor": "Background 1", - "SelectedIconColorUseItemColor": true, - "IconColorUseItemColor": true, - "IsOldMenuPath": false, - "CanVisitRoleList": [ - "FGC_Anonymous" - ], - "SubItems": [ - { - "Value": "菜单1", - "Text": "项目款", - "IconPath": "财务标准用章审批流程.svg", - "IsBuiltInIconPath": false, - "SelectedIconColor": "Background 1", - "SelectedIconColorUseItemColor": true, - "IconColor": null, - "IsOldMenuPath": false, - "CanVisitRoleList": [ - "FGC_Anonymous" - ] - } - ] - }, - { - "Value": "菜单1", - "Text": "已收", - "SelectedIconColor": "Background 1", - "SelectedIconColorUseItemColor": true, - "IconColorUseItemColor": true, - "IsOldMenuPath": false, - "CanVisitRoleList": [ - "FGC_Anonymous" - ], - "SubItems": [ - { - "Value": "菜单1", - "Text": "项目款", - "IconPath": "财务标准用章审批流程.svg", - "IsBuiltInIconPath": false, - "SelectedIconColor": "Background 1", - "SelectedIconColorUseItemColor": true, - "IconColor": null, - "IsOldMenuPath": false, - "CanVisitRoleList": [ - "FGC_Anonymous" - ] - } - ] - } - ], - "MenuLevelsStyle": [ - { - "FontSize": 13.333333333333332, - "Bold": true, - "Height": 40.0, - "IconHeight": 14.0, - "IconWidth": 14.0 - }, - { - "FontSize": 13.333333333333332, - "Bold": false, - "Height": 40.0, - "IconHeight": 14.0, - "IconWidth": 14.0 - } - ] - } - }, - "1,5": { + "1,3": { "CellType": { "$type": "ElementUI.DatePickerCellType, ElementUI", "CommandList": [ @@ -481,7 +291,7 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=工时总览!C4" + "SerializeProperty": "=工时总览!B4" }, "TargetType": "ReportSheet.ReportSheetCellType, ReportSheet, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null", "MethodName": "SetParameter", @@ -493,7 +303,7 @@ "name": "年份", "value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=YEAR(工时总览!F2)" + "SerializeProperty": "=YEAR(工时总览!D2)" } } ] @@ -530,7 +340,7 @@ "DefautWeekFormat": "yyyy 第 WW 周" } }, - "1,33": { + "1,30": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -538,14 +348,14 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=工时总览!C4" + "SerializeProperty": "=工时总览!B4" }, "TargetType": "ReportSheet.ReportSheetCellType, ReportSheet, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null", "MethodName": "ExportToExcel", "ParameterValues": { "filename": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=YEAR(工时总览!F2)&\"年度项目工时总览\"" + "SerializeProperty": "=YEAR(工时总览!D2)&\"年度项目工时总览\"" }, "password": null } @@ -562,7 +372,7 @@ "IconSize": 14.0 } }, - "3,2": { + "3,1": { "CellType": { "$type": "ReportSheet.ReportSheetCellType, ReportSheet", "dataSources": [ @@ -891,7 +701,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=YEAR(工时总览!F2)" + "SerializeProperty": "=YEAR(工时总览!D2)" } }, "NullFormulaValueQueryPolicy": 1, @@ -921,37 +731,20 @@ }, "StyleDatas": { "Styles": [ - { - "FontFamily": 0, - "BorderBottom": null, - "BorderTop": null, - "BorderLeft": null - }, - { - "FontFamily": 0, - "BorderBottom": null, - "BorderTop": null, - "BorderLeft": null, - "BorderRight": 0 - }, - { - "FontFamily": 0, - "BorderRight": 0 - }, { "FontFamily": 0, "FontSize": 13.333333333333332, - "Formatter": 2, + "Formatter": 1, "TextIndent": 5, - "HorizontalAlignment": 3 + "HorizontalAlignment": 2 + }, + { + "FontFamily": 0 }, { "FontFamily": 0, "FontSize": 13.333333333333332 }, - { - "FontFamily": 0 - }, { "FontSize": 13.333333333333332 } @@ -959,84 +752,36 @@ "Types": { "Strs": [ "Body", - "Background 2 -10", "General", "Right" - ], - "Borders": [ - { - "Color": 1 - } ] }, "CellStyles": { - "0,0": 0, - "0,1": 1, - "1,1": 2, - "1,3": 3, - "1,5": 4, - "1,6": 5, - "1,7": 5, - "1,8": 5, - "1,9": 5, - "1,10": 5, - "1,12": 3, - "1,13": 5, - "1,33": 6, - "2,0": 0, - "2,1": 1, - "3,0": 0, - "3,1": 1, - "3,2": 5, - "4,0": 0, - "4,1": 1, - "5,0": 0, - "5,1": 1, - "6,0": 0, - "6,1": 1, - "7,0": 0, - "7,1": 1, - "8,0": 0, - "8,1": 1, - "9,0": 0, - "9,1": 1, - "10,0": 0, - "10,1": 1, - "11,0": 0, - "11,1": 1, - "12,0": 0, - "12,1": 1, - "13,0": 0, - "13,1": 1, - "14,0": 0, - "14,1": 1, - "15,0": 0, - "15,1": 1, - "16,0": 0, - "16,1": 1, - "17,0": 0, - "17,1": 1, - "18,0": 0, - "18,1": 1, - "19,0": 0, - "19,1": 1, - "20,0": 0, - "20,1": 1 + "1,1": 0, + "1,2": 1, + "1,3": 2, + "1,4": 1, + "1,5": 1, + "1,6": 1, + "1,7": 1, + "1,8": 1, + "1,11": 0, + "1,12": 1, + "1,30": 3, + "3,1": 1 }, "SheetStyle": { "FontFamily": 0 } }, "Spans": [ - "0,0,21,1", - "1,5,1,6", - "1,3,1,2", - "3,2,17,34", - "1,33,1,3" + "3,1,17,32", + "1,30,1,3", + "1,3,1,6", + "1,1,1,2" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", - "MasterPageName": "FGC_母版页", "Title": "财务中心", "PageLoadedCommandList": [ { @@ -1069,7 +814,7 @@ "CustomNames": [ { "Name": "财务中心子页面", - "Formula": "工时总览!$C$4" + "Formula": "工时总览!$B$4" } ] -}//QpX3huqGaG+hqhH0YKgD41OhPopXErHrgi0lYgZ9obDO8lnrsqKGaQCaWXltKNz+g7lUOtdm/+Au5ayakidBfh913SXScqK1j/ZfM2ronrMGL9501stmN/x2xjVlveZNrDl3y1+LXLEZQuSU5CAqiWHndlHnzha+QM+TccaOkH+wlPxPhFYhWjbDDsK8HMSkhLX/T7nrY8w+0t4dPs6X4yIqRwVJhBNsFEzSAI+FeMz5iwWmaSVC0WpTI4hY0iQknEdEtdUQhmNu1QL5zZY5oBYYlYX+oc7drQ/p397nL1ny7i/s6CVm/HREzn6YKM2gZjb7mpiA8e67qGnfzOBryK5YvD7ZBlJnJIgo539EPmELVEAYoq8PQM3YKPWGa3Ln5g1SKBT5ekHyjGPDKsZ3P8eu+tJE9vi09Jvvd5ijT5b4VygUwmHEogEpAPtWDmuw1kqo1H21RxHg4wgVws37TPxPmupCTHuTFa+vhmboNlNT0TMdVRuRRx5ajbiue1U2aXDySFL3erkPPWIQxhfS6YF3NFcJzBqDuyHBZyUXROdvxrqwOfsTXvNdZoqZWrhkbpoAc1kHeENvuqJ8+e4wBunxGnb5XMMnjbbjyKo4XYGOgQPpxN7lLZNEK1F0NbPSU9bif1kN8JZ1rrtwPadQYISrCDjHC99xpIo0JRWVtV6mIytTAsSst4E3mvSHVJ1NRHeVlV9SUjN/sktkCffVch2XqmVCbzMRcZ7H979FhCJrc0nAPVJ3cJdzCIYlg6Vc9EGFmRPA4MEqW+gobziA8RlPooYsorrI9EvfNc57yUBa4ZIF/GI5hdKFSgHv7jNRl8unKdFdT2zMZ2dZkPey6YE8wNrckVKy7oihbJSoINR2W0Ba7MX/ie4p6ORMgKhhNRkj1tTE5wAQiGv75tcaZg==|920 \ No newline at end of file +}//K54lmRnNE1Idu8J5eQK7iXL+1mmkyQ31GZ8P9WwX54fT/AXM6Q+i/6paG0VnrFvHsYL8uWKN9jACMR7RbeOqzWIDsZ/wJ9gZ5etGk+1egkP1HXNR+2TDzvAJYlYVPxLIW6zmYXN4axIU6+lEsAUypKcdULqL2Zb8oqaDCrlIP55O8WjlphzHCsH47fFIy5V/dsLdKR4/r7ILDmFAO+pu4Pz4/Vrh91L7fBGoMF5dPf06QIXJiS+3qa/1aKTZZqeujWHE2U1PyZRMkSQ4ATOYSLqnKdwnP9VIx/TQAqgng92ggOdpSzQ9SucjU8L9lYo0sq9sRuF34SAAXRZRxbrrIj38A+lW/osY7YW7JlRpXC6UDK+9mGclGCuqPhxOUc3vwIswpzBKV4tjjt9f6OUeaU6T7QqJtYCyjyf/9drDYXd8UsndB3NIrQr5pmlvSuH6L3+m2H68qw7YK/A5F5WksCksvb+3Mtpq/T6mb+9l8USzF0awllCL6/IGMQNPh0N2gMkGJiLQmu9FfM7cUvl0696xyi/yv0X9FY3N3Pezp8lDDRF9xszacumB7yzbEdz/rjew7FMPZcNoBUIbYLgoCIlO9VA2RBGp2Ul1dEZJr+pHquqKUSC6NcCdhEHjOiD7FQahe6sA9goaDa9RbkVutlHVkffbrcnHRDXUmL9gQwuLnUohcFfy5emKe86ug2SiTs43IdpmTUjkmuZpKybdm8ynUeRGN6R8tVheeGaiyxxE7nbFujIAynOGpvoEhK03u7i4su4yBEd2W2pK+F8pQQ6JT6ektdvKIZU6EkZgtHEhMacSDMBV05R1I4uMci7KyQqSxiXc3vU/wLObplbJICFhoxRuTF2q+afT5bN102/lqR8x+85BpKpcKB9l3MhvlN+WT3JntRUyzxkpx7zmlg==|920 \ No newline at end of file diff --git a/Pages/工时/工时总览.rd b/Pages/工时/工时总览.rd index bd4b3e81..590457d5 100644 --- a/Pages/工时/工时总览.rd +++ b/Pages/工时/工时总览.rd @@ -1,14 +1,14 @@ { "PageType": 0, - "ColumnCount": 37, + "ColumnCount": 34, "RowCount": 21, "Formulas": { - "1,5": "TODAY()" + "1,3": "TODAY()" }, "CustomNames": [ { "Name": "财务中心子页面", - "Formula": "工时总览!$C$4" + "Formula": "工时总览!$B$4" } ] } \ No newline at end of file diff --git a/Pages/工时/工时首页.json b/Pages/工时/工时首页.json index c37afcc8..27ecc388 100644 --- a/Pages/工时/工时首页.json +++ b/Pages/工时/工时首页.json @@ -336,6 +336,7 @@ "$type": "Forguncy.TabControlCellType, ServerDesignerCommon", "TemplateKey": "_RS_NewFashionStyle1", "Tabs": [ + "工时总览", "任务工时统计", "人员工时统计" ], @@ -401,4 +402,4 @@ "PaperSize": {}, "Margin": {} } -}//Sr8Y6wr9Jjc7KmbH/yN/Z1TR1bICdFT7gb3T3N6GkLuH8c0n7FYyPK5uMgK8RGa6SSs+op9XyBIVbpDiJ51Rx+G4YeMAwzNn+rb5z2xpxaXTloJB8Z+0VedsZ6s8igSdJtsJcyYE3yLm/oY7D7DzcRBmv5fW2o48UtSNehMne97pjo7CHYWZn4JqkYUFtsqFeBEod+oHsuh+5FjADpGE/D2i16etFLVp9j+VIYAFLZowfyhMdg0YZhrBJNXDpCSLhYaJHtFl9M/2c11MpOz+cJsGedMEHSUeeAnoA3VTbWzWnIxxk0hFHH9qTvIzGcX9MtxEEQ3zfnY42uLGRA3mM2eRnoZl3D1IwOEquHbZKAfR1QLpKZ8Re/0m6dZTs0Qo0g2+N99eNhmclgRKJ4BQyfBQrKp07jGK4A0LmicrvN11zf170aECY8G2FUIR0KFgVmFEO5SHdrTNbEc+sNeEBas/biaYaHpFJiUdLDJISwaYdZuBO7IlaFjx9v4N0WoodnSnHDCrxlgMWTrOA0Cb7S0wq5npBVQlPeztIMsm/+5bXTgKiyu4i8D5W1toNVGiF8b5gzqyL5iQBCvnIpR93GsLMZm/YggO91Pm0E4PZi66LGt/DMZJFQiAR0VG3t54zuQ1HW863zl2+/ms/mTp7HjktXPUjRYJi/GwyybVLJ8mGyz3q0yqB+8bZZUzLQ8yGECxwqOLKb5wHEXwzexWlw6DyIDYvM1YZzzkCqqvJjFkaIm7roPV+ozP414hK8HXPeDAQItdcRdAcwZacwDdnzV+zM6CEsalM+L7NJmGL1CXi214myGQ3RQpEc79VIR79J8k1jbdXBs+GRi1QBb6rk18dv6i7ukHoYPLDiMIrE6WwzLYl3Lzf/vPlAMlIkUJO1EQuw9C0arDBqH2v6LIoQ==|920 \ No newline at end of file +}//V9MFbBKtEk5hp18jQYy3DrBeMpVJqJ5HP2jttpK7HtTy+0UaDb9juPtrnNqZJb7wccstnf8WH1UFb70WcjsVkR43qTLMpjlzHlND52s3JdmyDaRkPdveUt39ZQChctgbIQeWe5vim9bd7yvAx1FyVYaI+xO6/KQMfbotNdBoNwxFAQPnnYhKa9HqizVZRbF9JyIqUlc7pYP/0U5vU7axaVsZ2HwJwg4nhp0B1dxGy0Sl+El78wnB7iSMWx0PTOOEmlY7b6uroPiroW8t0emSzWPdfD4WMBXL2lrdfzXMZJWH1MGjccqUZ5CL8DqIALgpYrDbDvpejEl9KLZtV9z7v6DIdP42Nb4tZ0GmWuHp9wgQWem0byhwC7ncj5Te6XGYGBguxFXNcYseOGCaT9JK7Tbso9dPGy56fbrWD52GqBl09fBKAzo9Q7EM5FJUzZyQnVGmDhYZzxOTVqdrsln8el8dcJPwQzDNULefGNvQBu03Dv8E5qZvvjD3jHUNNgDkmZxoRXvKY0fvm+fvi6bd/QICFVBqsUGY5ovbyRls0Lz0XZLNI9jPUeeQvVPYbJEstcDxozqjP92QE5hWICvHeZpchD0bHuAs6jSI8pIcMOOytydQPeoqJLWUTb1PU+CondVjng4YhmZrGClnAcoLZYaAtRLlDC7pQZggM3IruiNbgnpQsdvESr/tLGru5F/rp86JbrHc6pRauUekJmBrvBeCH3bfygXXUcgKi8FK49cYEUHsY4G/cajpBBcrci6HRS8hiur/Y9g6Fseg2tnQBwfma/45gl02wUF0BQaOyRwJuwZTZo3XKSUPFZ2wZaY/LwcaRD0lX7POfEuqEQyaXLykZjbqmYwAKC1TQLSJp2TdYEH8Dbft1vc5pCmA6zEs8PFiYK/ZBhWMnbvF96VoHA==|920 \ No newline at end of file diff --git a/Pages/汇报/汇报管理.json b/Pages/汇报/汇报管理.json index aa262fce..45d13165 100644 --- a/Pages/汇报/汇报管理.json +++ b/Pages/汇报/汇报管理.json @@ -473,7 +473,7 @@ } } ], - "ID": "b60724b7-ac3b-41bd-a8d6-8ab92f7d3f19" + "ID": "ecfd2495-e701-42ac-a2ba-446c49fcc2df" } ] } @@ -783,7 +783,7 @@ } } ], - "ID": "51bfd2b6-04d2-45a4-868a-18bbf8f69007" + "ID": "b511828e-6707-402a-93a9-437fc8823e57" } ] } @@ -946,7 +946,7 @@ } } ], - "ID": "fde3c90a-78bf-49a9-abd1-30b08cdffab4" + "ID": "c57d32fe-d336-4114-b4c4-9a01ed513167" } ] } @@ -1407,9 +1407,9 @@ "5,4,1,10", "10,26,1,3", "3,4,1,26", - "5,17,1,12", "12,1,7,29", - "1,18,1,12" + "1,18,1,12", + "5,17,1,12" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1461,4 +1461,4 @@ "Formula": "汇报管理!$J$23" } ] -}//dU4E3ZjLEJ3yg0hpPvYxVZ6cv1D9AFwJEc/sNt4FAxwzgYnMNEgMV42/ejcrCTV/0Hvt8ox+jj2nWspiI2INW+9Q4qzTn5kc39mPodjmSF7PxaAXMmxtldGMVb+u6bA16ZGdINj5Jt/UjRvaao3Y3TtJvtYUNXxBo29IUO6C8kwWQICIxReHnsYzSF7ru3AQ1+fbtjh8/kWkipe0RV/skDvGmMTXvntkyfQC0V93a9+43JKiyC0VvSJevOJnOuGwhS77iBhWATLJbffDoAQF0/aupHW/Vm74/Q4kDUG5mdUEuWepDYH9S/QasLZ1A+k6dagVwfxmOQN6RWyn39PsFFAlUhIcbgxjrdKTq2qD+CtKdt1HJEuU73WxlF0lCZgVrViYo/99CdBXgwXRKiktD8rlB3i/G9JLkEVHKBzSJqyHm08VrRBd/xNIKxAbgz6XzXrvQ8kfzYt14qpeizhJ0RehcA/rrVUSKuZ1aiDNJyW4/zampblHxKNgN/Ti/82BXJG+lPF0mNti98U4b0AgA4wLYddPBgMX2SBFMYGoEiFAE6V/3NHSnRrktG4VfUHq+3ydcuZQgserutaKKgG1pXboGf7tLluJXQDflpO2yugehQTkJIkEMRd3YY/G6Rwav5W+UKMwcPr68YhyZJMIxAoAxYKqJFR0yHW2va47kh1PNufBif0AsWedCkQrcNoM6KFzl5xLFES1xk6yYG24ugYYg5YpIFVT4xx6OXuFLAZML0OBP7ZocTCMsSMkhtuH1GnQuAjA+f7XEDjMVUDTb9GVz6nd5Sigymd1ECFaMF6nqoDF2mKyTxD4vMn7HJdSrr152l5KNJPNQb/HCfk0rsccRQiHmJ9Uj4EYEjl73MFIziZROpBQRdhPpQCDohRkQ5SdD/kqKRC/iol0m1tF3w==|920 \ No newline at end of file +}//dyR0dHPWSt1DdWCYtOHTLluKDz25ZfS8GW9avHTLSebZ83V4pqnT8kccQa5C5MLI21mTid4c2E17Bl97gfi54bGNk0ZBNo4z18YWdPUfs5SHCAwN0kjuNyLl2ysc4cx3bLnMTOA/SlnMTVggv6XJYAOi7HbN2fhnTPbptDWb9wX7LJUTAGPeNeOuQIv29BW+AEdXfj105jqwYaHUorI2sXIA4TAUizQeA9EsOXhNelFZm0g+yrNaRyAxSsAzHakiRpu3Px5G4hiz/M3HExlIZyr+PBZOzE7V3BRKfgcngwFxMGhAtl52E2TWaMjYZ3lWabYw+vjUDAN3SvQRcvFN+mUgrMt5ax+3GI49IdV+Q04WDqlcngJttF1NE+/cidgq3yhM2yyvTShHqxhAwfZp7tst2mx6W4yP39RfXLSH6PnYHJhle32saW74iYQ9lBqvOcpp+Dva/6N5+w7k4fkRYscMQmzoKenHcPFSroGxgsix/1AsM6OL86K5RtoZHpll94zo9Hl7wx7PTEupapwdpW6xuIdz+5ZK8aTM2/+agPn4LT9tLD8Qiy4Vlb397AjmLWuoMbW/v2ZzYtGAyCEsIEWns1ZDOMj7mtjXXtDXFGw+zhX9lpZT4oWE7CGRYjBzpTUIl7emDPQk6OHTEP/6g92lLZFIadwsV+MCUXvfGGaP9hePn3ApJKpqpz2Ko0JDJezUdocFUujktqYE19rAIkXWaj5gM4bAf+dY4+7PV+/hnNURDR2rcy4XmGP+8Nffqh8uR2Bq4q4kXtHvgxCwjmsAFmDiQPxRrLU2aKfzUTXOTRuQSeSCwW8BAcjKXeYH6kLZTUrAxBZP07thvHcXl468kp4IJlqsAG6G9NY+uP/JH+qvodhGa05/Pd59LInOOvwn5n5QN+kAkGQud48Y8g==|920 \ No newline at end of file diff --git a/Plugin/Echarts图表-10_0_1_0.zip b/Plugin/Echarts图表-10_0_2_0.zip similarity index 99% rename from Plugin/Echarts图表-10_0_1_0.zip rename to Plugin/Echarts图表-10_0_2_0.zip index c2286376..9c6734e4 100644 Binary files a/Plugin/Echarts图表-10_0_1_0.zip and b/Plugin/Echarts图表-10_0_2_0.zip differ diff --git a/Plugin/JSON 序列化和反序列化-10_0_1_0.zip b/Plugin/JSON 序列化和反序列化-10_0_1_0.zip deleted file mode 100644 index 4bfb7da1..00000000 Binary files a/Plugin/JSON 序列化和反序列化-10_0_1_0.zip and /dev/null differ diff --git a/Plugin/JSON 序列化和反序列化-10_0_2_0.zip b/Plugin/JSON 序列化和反序列化-10_0_2_0.zip new file mode 100644 index 00000000..29be258e Binary files /dev/null and b/Plugin/JSON 序列化和反序列化-10_0_2_0.zip differ diff --git a/Plugin/JSON数据源-10_0_1_0.zip b/Plugin/JSON数据源-10_0_1_0.zip deleted file mode 100644 index 5f79c51d..00000000 Binary files a/Plugin/JSON数据源-10_0_1_0.zip and /dev/null differ diff --git a/Plugin/JSON数据源-10_0_2_0.zip b/Plugin/JSON数据源-10_0_2_0.zip new file mode 100644 index 00000000..c73f4219 Binary files /dev/null and b/Plugin/JSON数据源-10_0_2_0.zip differ diff --git a/Plugin/PC组件包-ElementPlus-10_0_1_0.zip b/Plugin/PC组件包-ElementPlus-10_0_2_0.zip similarity index 63% rename from Plugin/PC组件包-ElementPlus-10_0_1_0.zip rename to Plugin/PC组件包-ElementPlus-10_0_2_0.zip index afb9ef82..3171dcf5 100644 Binary files a/Plugin/PC组件包-ElementPlus-10_0_1_0.zip and b/Plugin/PC组件包-ElementPlus-10_0_2_0.zip differ diff --git a/Plugin/Tiny富文本编辑器-10_0_1_0.zip b/Plugin/Tiny富文本编辑器-10_0_2_0.zip similarity index 96% rename from Plugin/Tiny富文本编辑器-10_0_1_0.zip rename to Plugin/Tiny富文本编辑器-10_0_2_0.zip index 53233239..14926c65 100644 Binary files a/Plugin/Tiny富文本编辑器-10_0_1_0.zip and b/Plugin/Tiny富文本编辑器-10_0_2_0.zip differ diff --git a/Plugin/加载动画-10_0_1_0.zip b/Plugin/加载动画-10_0_2_0.zip similarity index 66% rename from Plugin/加载动画-10_0_1_0.zip rename to Plugin/加载动画-10_0_2_0.zip index 3f1e2bce..a2f8b7f5 100644 Binary files a/Plugin/加载动画-10_0_1_0.zip and b/Plugin/加载动画-10_0_2_0.zip differ diff --git a/Plugin/富文本编辑器-10_0_1_0.zip b/Plugin/富文本编辑器-10_0_2_0.zip similarity index 94% rename from Plugin/富文本编辑器-10_0_1_0.zip rename to Plugin/富文本编辑器-10_0_2_0.zip index a7ad7184..a9877915 100644 Binary files a/Plugin/富文本编辑器-10_0_1_0.zip and b/Plugin/富文本编辑器-10_0_2_0.zip differ diff --git a/Plugin/支持预览的附件上传-10_0_1_0.zip b/Plugin/支持预览的附件上传-10_0_2_0.zip similarity index 97% rename from Plugin/支持预览的附件上传-10_0_1_0.zip rename to Plugin/支持预览的附件上传-10_0_2_0.zip index a7049286..2d57c898 100644 Binary files a/Plugin/支持预览的附件上传-10_0_1_0.zip and b/Plugin/支持预览的附件上传-10_0_2_0.zip differ diff --git a/Plugin/甘特图-10_0_1_0.zip b/Plugin/甘特图-10_0_2_0.zip similarity index 78% rename from Plugin/甘特图-10_0_1_0.zip rename to Plugin/甘特图-10_0_2_0.zip index 64a6f2f2..d9f6475b 100644 Binary files a/Plugin/甘特图-10_0_1_0.zip and b/Plugin/甘特图-10_0_2_0.zip differ diff --git a/Plugin/用户管理命令 V2-10_0_1_0.zip b/Plugin/用户管理命令 V2-10_0_1_0.zip deleted file mode 100644 index 86850a8b..00000000 Binary files a/Plugin/用户管理命令 V2-10_0_1_0.zip and /dev/null differ diff --git a/Plugin/用户管理命令 V2-10_0_2_0.zip b/Plugin/用户管理命令 V2-10_0_2_0.zip new file mode 100644 index 00000000..c6421ef3 Binary files /dev/null and b/Plugin/用户管理命令 V2-10_0_2_0.zip differ diff --git a/Plugin/表格报表-10_0_1_0.zip b/Plugin/表格报表-10_0_2_0.zip similarity index 97% rename from Plugin/表格报表-10_0_1_0.zip rename to Plugin/表格报表-10_0_2_0.zip index 87f7c1d2..7ac14f1c 100644 Binary files a/Plugin/表格报表-10_0_1_0.zip and b/Plugin/表格报表-10_0_2_0.zip differ diff --git a/Plugin/设置当前行命令-10_0_1_0.zip b/Plugin/设置当前行命令-10_0_1_0.zip deleted file mode 100644 index 45ed7d5c..00000000 Binary files a/Plugin/设置当前行命令-10_0_1_0.zip and /dev/null differ diff --git a/Plugin/设置当前行命令-10_0_2_0.zip b/Plugin/设置当前行命令-10_0_2_0.zip new file mode 100644 index 00000000..d1dc6121 Binary files /dev/null and b/Plugin/设置当前行命令-10_0_2_0.zip differ diff --git a/Plugin/设置焦点命令-10_0_1_0.zip b/Plugin/设置焦点命令-10_0_1_0.zip deleted file mode 100644 index 016f6df8..00000000 Binary files a/Plugin/设置焦点命令-10_0_1_0.zip and /dev/null differ diff --git a/Plugin/设置焦点命令-10_0_2_0.zip b/Plugin/设置焦点命令-10_0_2_0.zip new file mode 100644 index 00000000..6d297853 Binary files /dev/null and b/Plugin/设置焦点命令-10_0_2_0.zip differ