diff --git a/.collaboration b/.collaboration index fc3be244..78b4a4fb 100644 --- a/.collaboration +++ b/.collaboration @@ -114,16 +114,7 @@ }, { "ModuleName": "TableView/人员工时统计视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-03T13:36:06.0038303+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\工时\\人员工时统计视图.json" - ] + "ModuleType": 23 }, { "ModuleName": "Table/任务工时表", @@ -615,17 +606,7 @@ }, { "ModuleName": "PCPage/项目负荷", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-03T13:30:44.4570924+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目负荷.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目负荷.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目概况", @@ -2317,12 +2298,6 @@ }, { "ModuleName": "PCPage/项目负荷 (2)", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-03T13:30:30.8940111+08:00", "ModuleType": 1 } ] \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目负荷 (2).json b/Pages/项目/项目首页/项目首页-容器页面/项目负荷 (2).json new file mode 100644 index 00000000..f0b86871 --- /dev/null +++ b/Pages/项目/项目首页/项目首页-容器页面/项目负荷 (2).json @@ -0,0 +1,823 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 642.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "IsHidden": true + } + } + }, + "InLogicalVisibleIndexes": [ + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12 + ], + "Count": 13, + "DefaultSize": 32.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.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, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.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 + } + }, + "34": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "35": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "36": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "37": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "38": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "39": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + } + }, + "Count": 40, + "DefaultSize": 32.0 + }, + "Values": { + "5,3": "执行人用户名", + "5,6": "执行人", + "5,15": "负荷比例", + "5,18": "工时描述" + }, + "Formulas": { + "6,18": "M7&\"/\"&J7", + "6,15": "ROUNDUP(M7/J7,1)" + }, + "AttachInfos": { + "1,13": { + "CellType": { + "$type": "ElementUI.DatePickerCellType, ElementUI", + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='项目负荷 (2)'!N2" + }, + "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "GetSelectedRange", + "RetrunParamNames": { + "StartValue": { + "SerializeProperty": "='项目负荷 (2)'!开始日期" + }, + "EndValue": { + "SerializeProperty": "='项目负荷 (2)'!结束日期" + } + } + } + ], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "daterange", + "startPlaceholder": "开始日期", + "rangeSeparator": "至", + "endPlaceholder": "结束日期", + "format": "yyyy年MM月DD日", + "firstDayOfWeek": 1, + "DefautWeekFormat": "yyyy 第 WW 周" + } + }, + "3,1": { + "CellType": { + "$type": "Forguncy.PivotTableCellType, ServerDesignerCommon", + "PivotTableSetting": { + "SelectedListViewName": "表格1", + "Rows": [ + { + "DatabaseColumnName": "执行人", + "DisplayName": "执行人", + "ColumnCell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='项目负荷 (2)'!G7" + }, + "BackgroundValue": {} + } + ], + "Cols": [ + { + "DatabaseColumnName": "日期", + "DisplayName": "日期", + "ColumnCell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='项目负荷 (2)'!A7" + }, + "Format": "m\"月\"d\"日\"", + "BackgroundValue": { + "DatabaseColumnName": "日期", + "ColumnCell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='项目负荷 (2)'!A7" + } + } + } + ], + "Values": [ + { + "DatabaseColumnName": "工时描述", + "DisplayName": "工时", + "ColumnCell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='项目负荷 (2)'!S7" + }, + "Aggregator": 6, + "TotalAggregator": 6, + "BackgroundValue": {} + }, + { + "DatabaseColumnName": "负荷比例", + "DisplayName": "比例", + "ColumnCell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='项目负荷 (2)'!P7" + }, + "Format": "0%", + "Aggregator": 6, + "TotalAggregator": 6, + "BackgroundValue": {} + } + ], + "DatabaseColumns": [ + { + "DatabaseColumnName": "日期", + "ColumnCell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='项目负荷 (2)'!A7" + } + }, + { + "DatabaseColumnName": "执行人用户名", + "ColumnCell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='项目负荷 (2)'!D7" + } + }, + { + "DatabaseColumnName": "执行人", + "ColumnCell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='项目负荷 (2)'!G7" + } + }, + { + "DatabaseColumnName": "负荷", + "ColumnCell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='项目负荷 (2)'!J7" + } + }, + { + "DatabaseColumnName": "计划工时", + "ColumnCell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='项目负荷 (2)'!M7" + } + }, + { + "DatabaseColumnName": "负荷比例", + "ColumnCell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='项目负荷 (2)'!P7" + } + }, + { + "DatabaseColumnName": "工时描述", + "ColumnCell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='项目负荷 (2)'!S7" + } + } + ], + "FrozenColumnIndex": 0 + }, + "ShowRowsTotal": false, + "ShowColsTotal": false, + "PivotTableConditionalFormatSetting": { + "Conditions": [ + { + "Label": "工时" + }, + { + "Label": "比例", + "DataConditionFormatRulesCollection": { + "Rules": [ + { + "$type": "Forguncy.ConditionFormat.CellValueRule, ServerDesignerCommon", + "Operator": 1, + "Value1": "=0.8", + "Value2": "=1", + "Priority": 1, + "GUID": "205bfc96-17cf-4302-82d9-9443f8bacc0e", + "StyleInfo": { + "Foreground": "Text 1 0", + "Underline": null, + "Strikethrough": null + } + }, + { + "$type": "Forguncy.ConditionFormat.CellValueRule, ServerDesignerCommon", + "Operator": 8, + "Value1": "=0.6", + "Priority": 1, + "GUID": "541e4ba7-e333-4b6b-b9b0-719414798c5a", + "StyleInfo": { + "Foreground": "Accent 2 0", + "Underline": null, + "Strikethrough": null + } + }, + { + "$type": "Forguncy.ConditionFormat.CellValueRule, ServerDesignerCommon", + "Operator": 5, + "Value1": "=1", + "Priority": 1, + "GUID": "e364c599-ac48-49ff-93ad-503397e1c633", + "StyleInfo": { + "Foreground": "Accent 5 0", + "Underline": null, + "Strikethrough": null + } + } + ] + } + } + ] + }, + "PivotTableStyle": { + "IsDataColumnAutoFitWidth": true, + "MinDataColumnWidth": "70", + "IsRowHeaderAutoFitWidth": true, + "RowHeaderMinColumnWidth": "70", + "RowHeight": "40", + "GrayAreaColor": "Background 1 0", + "UseSimpleBar": true + }, + "PivotTableID": "4b29e26f-367b-44a1-b305-a59b73adb84f", + "TemplateKey": "负荷透视表" + } + }, + "5,0": { + "ListViewInfo": { + "Name": "表格1", + "TableName": "View_任务工时统计", + "RowIndex": 5, + "RowCount": 8, + "ColumnCount": 23, + "DetailListViewInfo": { + "ColumnOfDetailTable": "项目ID", + "MasterTable": "项目表", + "ColumnOfMasterTable": "ID", + "DataCommitType": 2 + }, + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 3, + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "日期", + "GUID": "5bda8fdb-e791-4314-81ce-1fbd90cb98ea" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='项目负荷 (2)'!开始日期" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 5, + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "日期", + "GUID": "6b0cfae9-8c05-44c4-b35a-4f68f225fd90" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='项目负荷 (2)'!结束日期" + } + } + ] + }, + "TopCondition": null, + "ListViewStyleName": "_RS_NewFashionListStyle2", + "ShowColumnHeaderInDesigner": true, + "ShowEditStatusIcon": true, + "UseSimpleBar": true, + "ColumnOperation": 2, + "CommitType": 1 + } + }, + "6,0": { + "NameUsedInJavaScript": "工时日期", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "日期", + "GUID": "754a9ca4-bb1c-4d65-a749-8dedc71fdb92" + } + }, + "6,3": { + "NameUsedInJavaScript": "执行人用户名", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "执行人", + "GUID": "e19041e4-6562-4d56-a2bb-4a31f0e3e05c" + } + }, + "6,6": { + "NameUsedInJavaScript": "执行人", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "执行人", + "GUID": "ac5be7a4-f521-4e47-8400-919ebe77db12", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 + } + } + }, + "6,9": { + "NameUsedInJavaScript": "负荷", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "执行人", + "GUID": "82a2cf01-04d0-44ee-a6c1-3e2f04073b60", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 5, + "AttachTypeTag": "负荷" + } + } + }, + "6,12": { + "NameUsedInJavaScript": "计划工时", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "计划工时", + "GUID": "daefa87a-1204-4983-8eac-e48c47ae6abe" + } + }, + "6,15": { + "NameUsedInJavaScript": "负荷比例" + }, + "6,18": { + "NameUsedInJavaScript": "工时描述" + } + }, + "StyleDatas": { + "Styles": [ + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 1, + "Formatter": 2, + "HorizontalAlignment": 3 + }, + { + "FontFamily": 0, + "HorizontalAlignment": 3 + }, + { + "FontFamily": 0 + }, + { + "Background": 4, + "BorderBottom": 0, + "BorderTop": 0, + "BorderLeft": 0, + "BorderRight": null + }, + { + "BorderBottom": 0, + "BorderTop": 0, + "BorderLeft": null, + "BorderRight": null + }, + { + "BorderBottom": 0, + "BorderTop": 0, + "BorderLeft": null, + "BorderRight": 0 + } + ], + "Types": { + "Strs": [ + "Body", + "black", + "yyyy/m/d", + "Center", + "#FFFFFF00" + ], + "Borders": [ + { + "Color": 1 + } + ] + }, + "CellStyles": { + "1,13": 0, + "3,1": 1, + "4,1": 2, + "4,2": 2, + "4,3": 2, + "4,4": 2, + "4,5": 2, + "4,6": 2, + "4,7": 2, + "4,8": 2, + "4,9": 2, + "4,10": 2, + "4,11": 2, + "4,12": 2, + "4,13": 2, + "4,14": 2, + "4,15": 2, + "4,16": 2, + "4,17": 2, + "4,18": 2, + "4,19": 2, + "4,20": 2, + "4,21": 2, + "4,22": 2, + "4,23": 2, + "4,24": 2, + "4,25": 2, + "4,26": 2, + "4,27": 2, + "4,28": 2, + "4,29": 2, + "4,30": 2, + "4,31": 2, + "4,32": 2, + "4,33": 2, + "4,34": 2, + "4,35": 2, + "4,36": 2, + "4,37": 2, + "4,38": 2, + "5,23": 3, + "5,24": 4, + "5,25": 4, + "5,26": 5, + "6,23": 3, + "6,24": 4, + "6,25": 4, + "6,26": 5 + }, + "SheetStyle": { + "FontFamily": 0 + } + }, + "Spans": [ + "1,13,1,14", + "6,3,1,3", + "6,15,1,3", + "6,18,1,3", + "5,23,1,4", + "6,23,1,4", + "3,1,1,38", + "7,0,6,23", + "6,12,1,3", + "6,0,1,3", + "6,6,1,3", + "6,9,1,3", + "5,0,1,3", + "5,3,1,3", + "5,6,1,3", + "5,9,1,3", + "5,12,1,3", + "5,15,1,3", + "5,18,1,3" + ], + "PageInfo": { + "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "PageLoadedCommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='项目负荷 (2)'!L2" + }, + "Value": "项目视图" + } + ] + }, + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='项目负荷 (2)'!项目子页面" + }, + "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": [], + "RelatedDataTableName": "View_任务工时统计", + "ConditionFormatRulesCollection": { + "Rules": [ + { + "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IF(项目工时!$L$2=\"任务详细视图\",0,1)" + }, + "GUID": "198c95da-3fbb-443d-8f32-b2a29921f3e4", + "StyleInfo": { + "Underline": null, + "Strikethrough": null + }, + "IsInvisible": true + } + ] + } + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + }, + "CustomNames": [ + { + "Name": "工时核定方式", + "Formula": "'项目负荷 (2)'!$B$6" + }, + { + "Name": "开始日期", + "Formula": "'项目负荷 (2)'!$X$6" + }, + { + "Name": "结束日期", + "Formula": "'项目负荷 (2)'!$X$7" + } + ] +}//kiZpTE2E1WFwAyk+wv9ohtl5Moa7ghWdeVHYXeNYBegO/vAGI9YhOhOZrtH/wNsCCNvxUkhRthYEmCB5FlHZG8IvqR8NOazhkI/pr3m26YZ/61Zqz5aWrXLIrBxWuWl/YJBKkQnDVy2yl514rDyDLnk6ed4bh0eUkR2oKWYpLqKGa0RiLD0QBEsJAkfaJ9qEq0NL5jAlJVKmVD/cuLIkcPoFybVj+Mf9loF6WupMefcr0D2pPZWNEJfDd8U7hcqztDvelf/eTIAaIWn7Oxi2aCFBll7wysxtysuJyicrl/dXossIyw5qP0mR5QWO0TfzCUr97ZGYBneJte/0jjyMi/oQs2Rai3Ew5Z7qV8C9lB8do1xghOZU0OmY/w4Q1k4DZCC8CTdOj7GtKdZUmprnm1GQez+Z4rZd0Fo82LzRWC+YZ2KB8vzxTMYjYj0xccK97KIKu3HjvTv1IWRzc/llTgLvlEIHHighZenK+UHEt4RtfKxVv+ogEF0zFGs5d3TqVt5ns3vrQykaQbmTzQdrq5sX505WhYL0APuk1zV1zPYeWGq22AWvTfU1Xz+HqCHVj0/z0TrH2uYFMGkpM75EjKUg0tQ15Nflt7H+Z2xwzcfUZoh9z5byWhUIUs4rxLVuFliSaIy88mcyHYuQxazlFMD8V3q7GCXsbrsZ370BooDJ/NadOwUZe0+UOWbHsLT4rsQ2QDcDbd4efAwpJEpsivCmh5XKPGnn4o1xKojlhGQy+tpDrrBQLE+VzwL7to0voQ/P/j/dMvpcWCtIjzmaVZVpvJxM+jW8ZVC5eq2s50rAXxfP+y5Mkz6fP94Zeicq2awIye+7RFvb0WV359/Silepunt+Gcpi5IN/BK0RSKmpq4RIuPrzSpLO4hTdirgYGJSCHubh8U4hRMLIenZ9Ow==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目负荷 (2).rd b/Pages/项目/项目首页/项目首页-容器页面/项目负荷 (2).rd new file mode 100644 index 00000000..e96fe7e6 --- /dev/null +++ b/Pages/项目/项目首页/项目首页-容器页面/项目负荷 (2).rd @@ -0,0 +1,23 @@ +{ + "PageType": 0, + "ColumnCount": 40, + "RowCount": 13, + "Formulas": { + "6,18": "M7&\"/\"&J7", + "6,15": "ROUNDUP(M7/J7,1)" + }, + "CustomNames": [ + { + "Name": "工时核定方式", + "Formula": "'项目负荷 (2)'!$B$6" + }, + { + "Name": "开始日期", + "Formula": "'项目负荷 (2)'!$X$6" + }, + { + "Name": "结束日期", + "Formula": "'项目负荷 (2)'!$X$7" + } + ] +} \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目负荷.json b/Pages/项目/项目首页/项目首页-容器页面/项目负荷.json index afaf5c60..9ea32ee5 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目负荷.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目负荷.json @@ -7,16 +7,6 @@ } }, "1": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "2": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 - } - }, - "3": { "GridRowColumnDefinition": { "DesignLengthInPixel": 642.0, "Mode": 2, @@ -28,12 +18,12 @@ } } }, - "4": { + "2": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } }, - "5": { + "3": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "IsHidden": true @@ -41,16 +31,9 @@ } }, "InLogicalVisibleIndexes": [ - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12 + 3 ], - "Count": 13, + "Count": 4, "DefaultSize": 32.0 }, "Cols": { @@ -117,14 +100,7 @@ }, "12": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "13": { @@ -268,385 +244,70 @@ "Count": 40, "DefaultSize": 32.0 }, - "Values": { - "5,3": "执行人用户名", - "5,6": "执行人", - "5,15": "负荷比例", - "5,18": "工时描述" - }, - "Formulas": { - "6,18": "M7&\"/\"&J7", - "6,15": "ROUNDUP(M7/J7,1)" - }, "AttachInfos": { - "1,13": { + "1,1": { "CellType": { - "$type": "ElementUI.DatePickerCellType, ElementUI", - "CommandList": [ - { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目负荷!N2" - }, - "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", - "MethodName": "GetSelectedRange", - "RetrunParamNames": { - "StartValue": { - "SerializeProperty": "=项目负荷!开始日期" + "$type": "ElementUI.CalendarCellType, ElementUI", + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "人员工时统计视图", + "BindingInfos": [ + { + "GUID": "67b9fd37-d255-4e2d-9de4-7ea7b3328211", + "BindingInfo": { + "TableName": "人员工时统计视图", + "ColumnName": "执行人", + "GUID": "ac2bed05-c25c-4538-b7b7-3fc58e3ec76d" }, - "EndValue": { - "SerializeProperty": "=项目负荷!结束日期" - } - } - } - ], - "UIPermissions": [ - { - "Scope": 2, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 4, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ], - "type": "daterange", - "startPlaceholder": "开始日期", - "rangeSeparator": "至", - "endPlaceholder": "结束日期", - "format": "yyyy年MM月DD日", - "firstDayOfWeek": 1, - "DefautWeekFormat": "yyyy 第 WW 周" - } - }, - "3,1": { - "CellType": { - "$type": "Forguncy.PivotTableCellType, ServerDesignerCommon", - "PivotTableSetting": { - "SelectedListViewName": "表格1", - "Rows": [ - { - "DatabaseColumnName": "执行人", - "DisplayName": "执行人", - "ColumnCell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目负荷!G7" - }, - "BackgroundValue": {} - } - ], - "Cols": [ - { - "DatabaseColumnName": "日期", - "DisplayName": "日期", - "ColumnCell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目负荷!A7" - }, - "Format": "m\"月\"d\"日\"", - "BackgroundValue": { - "DatabaseColumnName": "日期", - "ColumnCell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目负荷!A7" - } - } - } - ], - "Values": [ - { - "DatabaseColumnName": "工时描述", - "DisplayName": "工时", - "ColumnCell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目负荷!S7" - }, - "Aggregator": 6, - "TotalAggregator": 6, - "BackgroundValue": {} + "ColumnName": "value" }, { - "DatabaseColumnName": "负荷比例", - "DisplayName": "比例", - "ColumnCell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目负荷!P7" - }, - "Format": "0%", - "Aggregator": 6, - "TotalAggregator": 6, - "BackgroundValue": {} - } - ], - "DatabaseColumns": [ - { - "DatabaseColumnName": "日期", - "ColumnCell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目负荷!A7" - } - }, - { - "DatabaseColumnName": "执行人用户名", - "ColumnCell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目负荷!D7" - } - }, - { - "DatabaseColumnName": "执行人", - "ColumnCell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目负荷!G7" - } - }, - { - "DatabaseColumnName": "负荷", - "ColumnCell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目负荷!J7" - } - }, - { - "DatabaseColumnName": "计划工时", - "ColumnCell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目负荷!M7" - } - }, - { - "DatabaseColumnName": "负荷比例", - "ColumnCell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目负荷!P7" - } - }, - { - "DatabaseColumnName": "工时描述", - "ColumnCell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目负荷!S7" - } - } - ], - "FrozenColumnIndex": 0 - }, - "ShowRowsTotal": false, - "ShowColsTotal": false, - "PivotTableConditionalFormatSetting": { - "Conditions": [ - { - "Label": "工时" - }, - { - "Label": "比例", - "DataConditionFormatRulesCollection": { - "Rules": [ - { - "$type": "Forguncy.ConditionFormat.CellValueRule, ServerDesignerCommon", - "Operator": 1, - "Value1": "=0.8", - "Value2": "=1", - "Priority": 1, - "GUID": "205bfc96-17cf-4302-82d9-9443f8bacc0e", - "StyleInfo": { - "Foreground": "Text 1 0", - "Underline": null, - "Strikethrough": null - } - }, - { - "$type": "Forguncy.ConditionFormat.CellValueRule, ServerDesignerCommon", - "Operator": 8, - "Value1": "=0.6", - "Priority": 1, - "GUID": "541e4ba7-e333-4b6b-b9b0-719414798c5a", - "StyleInfo": { - "Foreground": "Accent 2 0", - "Underline": null, - "Strikethrough": null - } - }, - { - "$type": "Forguncy.ConditionFormat.CellValueRule, ServerDesignerCommon", - "Operator": 5, - "Value1": "=1", - "Priority": 1, - "GUID": "e364c599-ac48-49ff-93ad-503397e1c633", - "StyleInfo": { - "Foreground": "Accent 5 0", - "Underline": null, - "Strikethrough": null - } - } - ] - } - } - ] - }, - "PivotTableStyle": { - "IsDataColumnAutoFitWidth": true, - "MinDataColumnWidth": "70", - "IsRowHeaderAutoFitWidth": true, - "RowHeaderMinColumnWidth": "70", - "RowHeight": "40", - "GrayAreaColor": "Background 1 0", - "UseSimpleBar": true - }, - "PivotTableID": "4b29e26f-367b-44a1-b305-a59b73adb84f", - "TemplateKey": "负荷透视表" - } - }, - "5,0": { - "ListViewInfo": { - "Name": "表格1", - "TableName": "View_任务工时统计", - "RowIndex": 5, - "RowCount": 8, - "ColumnCount": 23, - "DetailListViewInfo": { - "ColumnOfDetailTable": "项目ID", - "MasterTable": "项目表", - "ColumnOfMasterTable": "ID", - "DataCommitType": 2 - }, - "SqlCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "CompareType": 3, - "ColumnBindingInfo": { - "TableName": "View_任务工时统计", + "GUID": "34d60899-79a4-4299-9c15-1375228f08fa", + "BindingInfo": { + "TableName": "人员工时统计视图", "ColumnName": "日期", - "GUID": "acc95739-b2db-48ae-8268-403dfebb46f7" + "GUID": "db8c302e-91a0-4dae-a5f0-5a784ee51abb" }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目负荷!开始日期" - } + "ColumnName": "date" }, { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "CompareType": 5, - "ColumnBindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "日期", - "GUID": "94badbdf-b18e-4030-8bb8-ad832127d65f" + "GUID": "4781c34b-359b-4b60-8f25-4a7e7d6d9049", + "BindingInfo": { + "TableName": "人员工时统计视图", + "ColumnName": "人员计划工时", + "GUID": "62eacfbf-bd5d-415f-9a76-e6c882411d11" }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目负荷!结束日期" - } + "ColumnName": "text" } - ] + ], + "CustomColumns": [] }, - "TopCondition": null, - "ListViewStyleName": "_RS_NewFashionListStyle2", - "ShowColumnHeaderInDesigner": true, - "ShowEditStatusIcon": true, - "UseSimpleBar": true, - "ColumnOperation": 2, - "CommitType": 1 + "firstDayOfWeek": 1 } - }, - "6,0": { - "NameUsedInJavaScript": "工时日期", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "日期", - "GUID": "da085570-df17-4e39-b2e1-c1812c9fdc6b" - } - }, - "6,3": { - "NameUsedInJavaScript": "执行人用户名", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "执行人", - "GUID": "e9bcadc0-f33a-4326-9f01-70f45ed3ae4a" - } - }, - "6,6": { - "NameUsedInJavaScript": "执行人", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "执行人", - "GUID": "e3e887eb-9854-4a25-8a2f-798897d0d128", - "AttachType": { - "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", - "UserColumnAttachType": 1 - } - } - }, - "6,9": { - "NameUsedInJavaScript": "负荷", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "执行人", - "GUID": "d7cb1e8c-29f4-4730-900a-4b7f7796dfa0", - "AttachType": { - "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", - "UserColumnAttachType": 5, - "AttachTypeTag": "负荷" - } - } - }, - "6,12": { - "NameUsedInJavaScript": "计划工时", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "计划工时", - "GUID": "534e90b2-d6e7-4020-8ca6-91c676aa50aa" - } - }, - "6,15": { - "NameUsedInJavaScript": "负荷比例" - }, - "6,18": { - "NameUsedInJavaScript": "工时描述" } }, "StyleDatas": { "Styles": [ - { - "FontFamily": 0, - "FontSize": 13.333333333333332, - "Foreground": 1, - "Formatter": 2, - "HorizontalAlignment": 3 - }, - { - "FontFamily": 0, - "HorizontalAlignment": 3 - }, { "FontFamily": 0 }, { - "Background": 4, + "Background": 1, + "FontFamily": 0, "BorderBottom": 0, "BorderTop": 0, "BorderLeft": 0, "BorderRight": null }, { + "FontFamily": 0, "BorderBottom": 0, "BorderTop": 0, "BorderLeft": null, "BorderRight": null }, { + "FontFamily": 0, "BorderBottom": 0, "BorderTop": 0, "BorderLeft": null, @@ -656,107 +317,75 @@ "Types": { "Strs": [ "Body", - "black", - "yyyy/m/d", - "Center", - "#FFFFFF00" + "#FFFFFF00", + "black" ], "Borders": [ { - "Color": 1 + "Color": 2 } ] }, "CellStyles": { - "1,13": 0, + "2,1": 0, + "2,2": 0, + "2,3": 0, + "2,4": 0, + "2,5": 0, + "2,6": 0, + "2,7": 0, + "2,8": 0, + "2,9": 0, + "2,10": 0, + "2,11": 0, + "2,12": 0, + "2,13": 0, + "2,14": 0, + "2,15": 0, + "2,16": 0, + "2,17": 0, + "2,18": 0, + "2,19": 0, + "2,20": 0, + "2,21": 0, + "2,22": 0, + "2,23": 0, + "2,24": 0, + "2,25": 0, + "2,26": 0, + "2,27": 0, + "2,28": 0, + "2,29": 0, + "2,30": 0, + "2,31": 0, + "2,32": 0, + "2,33": 0, + "2,34": 0, + "2,35": 0, + "2,36": 0, + "2,37": 0, + "2,38": 0, "3,1": 1, - "4,1": 2, - "4,2": 2, - "4,3": 2, - "4,4": 2, - "4,5": 2, - "4,6": 2, - "4,7": 2, - "4,8": 2, - "4,9": 2, - "4,10": 2, - "4,11": 2, - "4,12": 2, - "4,13": 2, - "4,14": 2, - "4,15": 2, - "4,16": 2, - "4,17": 2, - "4,18": 2, - "4,19": 2, - "4,20": 2, - "4,21": 2, - "4,22": 2, - "4,23": 2, - "4,24": 2, - "4,25": 2, - "4,26": 2, - "4,27": 2, - "4,28": 2, - "4,29": 2, - "4,30": 2, - "4,31": 2, - "4,32": 2, - "4,33": 2, - "4,34": 2, - "4,35": 2, - "4,36": 2, - "4,37": 2, - "4,38": 2, - "5,23": 3, - "5,24": 4, - "5,25": 4, - "5,26": 5, - "6,23": 3, - "6,24": 4, - "6,25": 4, - "6,26": 5 + "3,2": 2, + "3,3": 2, + "3,4": 3, + "3,5": 1, + "3,6": 2, + "3,7": 2, + "3,8": 3 }, "SheetStyle": { "FontFamily": 0 } }, "Spans": [ - "1,13,1,14", - "6,3,1,3", - "6,15,1,3", - "6,18,1,3", - "5,23,1,4", - "6,23,1,4", - "3,1,1,38", - "7,0,6,23", - "6,12,1,3", - "6,0,1,3", - "6,6,1,3", - "6,9,1,3", - "5,0,1,3", - "5,3,1,3", - "5,6,1,3", - "5,9,1,3", - "5,12,1,3", - "5,15,1,3", - "5,18,1,3" + "1,1,1,38", + "3,1,1,4", + "3,5,1,4" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", "PageLoadedCommandList": [ - { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目负荷!L2" - }, - "Value": "项目视图" - } - ] - }, { "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", "FunctionName": "remove", @@ -785,21 +414,7 @@ "RepeatRangeSettings": [], "RelatedDataTableName": "View_任务工时统计", "ConditionFormatRulesCollection": { - "Rules": [ - { - "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", - "Formula": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF(项目工时!$L$2=\"任务详细视图\",0,1)" - }, - "GUID": "232272ba-8019-4182-a6b6-71faedc6091b", - "StyleInfo": { - "Underline": null, - "Strikethrough": null - }, - "IsInvisible": true - } - ] + "Rules": [] } }, "PrintInfo": { @@ -807,17 +422,13 @@ "Margin": {} }, "CustomNames": [ - { - "Name": "工时核定方式", - "Formula": "项目负荷!$B$6" - }, { "Name": "开始日期", - "Formula": "项目负荷!$X$6" + "Formula": "项目负荷!$B$4" }, { "Name": "结束日期", - "Formula": "项目负荷!$X$7" + "Formula": "项目负荷!$F$4" } ] -}//+YHxngESNY1mv01QcFFNpi170VYBdRZ/GBivZuLhu8Q3zH+iakR8cCWEyBtV6W1qkZLnvBuyZJfNf2nD6z5fN8yRs6kR6F0jzpiFhcVcU8Z6yP0Fdo99Xl8ftvami9UImo3Qa9zVeDNV2ButQSCnm+dby/8OtMLG9cDPzVGS8e9ZAk3O4gSoW6cIiyjs2Now/5YZmDPMQHlG6XK/wwolk4Ah7ieYrRAsPJNmtlo597tayl4xJvzIMH7sCk3WGCFwfX9fdMB/Xzcw1zKR0Nt8Yqg1EkiluS5IUU40wQs5lew02yzvjApzuMp2nhGIuHtLJntK9tWYvvAKsU5JVOgfCWHWaukdstXs2nWyO7nmtI8Tjx/2OLlADAv4WIugzKal9ZO9Q1uA+8u/6CojAOXbpmXtDOxivFHUk2kDo7zZCKMdttKNiKzeIcd0qMCx/kMXJ9Wmvp1URsLcE3jP0/8RTY6v8UdT01U8b5wSi0YEs53U3MRtRZM7iT0XUYgoZqRnw7bMp1y5cBSdctIu434t5N3PQHCs7aFZ1FqYQVorhsxKtIVmPJjXLocmQ6eipus+DMVbBlihFnCQ+bVRbdaR/4ZL5fTChtIUGPlDoZZQg50pYfVhbv/clqpUy4E/Tf7vVum2h3z+BJeoozO3gcVWaDLxhBUtieDVB5C5YBta9/CV36jx074EpGyX2s1YB13J9xne6LsaKp6iKHb003ermOEGv0qaOBwwDFgiRmLrfc0cVxmdgW+ytAoMlKGxtSx4x1k1/6C5bpTW3pGuSBH4svTmNayjJ9F5iUIzEfVXa3sTi2lrJJGgp8NSm7EUmTepUqR7Eo1pE8EkKCH/J9S+nkB1jRGTq7eLCDG8hZVTHnxYhdCDlyu4na+E2Z4Tbk1VYkm3VeaPUAS0+p6aiMuRLQ==|920 \ No newline at end of file +}//nReaBI3WX9ow5xsS/+Eywqb0HqIDMRU79YON9Z6ZW0rHt4yRWP5ThLPYiWZ7uC3vhg+Nc+ve+x4pjQv/UBoYCX2msjDcO1AIfcKlMHbxSf8nB5I6MmPlhwESSP+D3tukiwUdw+pEqWb/Bu5XR+0sOUEQ3wgSfX3Hx+NWn61bNiAol3RLfABmH87pa4XGf/MAtR7JLD6fgGRCGl6TuWYhgeTT/gNlt//voCFEbgNqxsCkXSEmfrbHxF/JbK4jjoSr47t1WkJ7mvlj72u/x5JttaYhN9gTQSDX5qz4KwPWTqEBeYkQPDjrh/4Nr+klFu0fM/WNLhqB75jEe8o7g8sUmOJfcDDBnpklOneN1NlQAnTXKydQCv2WYnIxOKsH86O9b08DkYuaCtxEtGq5GkyoV8SNwGp7eiGhD4lhuqohUlt1ekkKYsB5Xtz2TQHslYVT/uziSumi3Fq8HtKIQYtXkh1L2N62KTb/mF0LrcqvONoHmrvm3VxZTjmwR/mrbGRa49YV2+IbpBYnKUdeSBYcw//EvwTBe7+kb3gT8Q1RHECgSaXlX6CIkKUdqrSBe7Dx7W72v1XLHHTTr/tfMSYVFYT1MApFD2tezAp6ygRBPYMlVOXqx07NAQE7FURDbkZEi3+i9PIanhWRBHGl0ZBuIwWL9gryLMNp8HxLcsFqO8/dv760fuknXvftoS6fUbffpAlGwQAee5NNA3wc7LLRJUtS68JznB8SF8wra0lAUP0yEHFa+DOOEzzqO83j11UgyNl0pNUw3iFAuOPN7Ql/IxDpLrr/41wGmZSmDZsu+hM/pUA6aHCuUd3y7Et1ig5s0oIHQKu9etV0BipK/0j+MsCq0KbZBsCyz5bWiWsR0VnjYIt/UaCjjFxnussfWTImoNT3EtZyQ/QswLBcX4tlxg==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目负荷.rd b/Pages/项目/项目首页/项目首页-容器页面/项目负荷.rd index 8269bd50..d82a431b 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目负荷.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/项目负荷.rd @@ -1,23 +1,15 @@ { "PageType": 0, "ColumnCount": 40, - "RowCount": 13, - "Formulas": { - "6,18": "M7&\"/\"&J7", - "6,15": "ROUNDUP(M7/J7,1)" - }, + "RowCount": 4, "CustomNames": [ - { - "Name": "工时核定方式", - "Formula": "项目负荷!$B$6" - }, { "Name": "开始日期", - "Formula": "项目负荷!$X$6" + "Formula": "项目负荷!$B$4" }, { "Name": "结束日期", - "Formula": "项目负荷!$X$7" + "Formula": "项目负荷!$F$4" } ] } \ No newline at end of file diff --git a/Tables/工时/人员工时统计视图.json b/Tables/工时/人员工时统计视图.json index e6cba2cc..409e6019 100644 --- a/Tables/工时/人员工时统计视图.json +++ b/Tables/工时/人员工时统计视图.json @@ -91,10 +91,17 @@ "DataColumnName": "核定收益", "Name": "总核定收益", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", + "Formula": "[执行人]&\"：\"&[计划工时]&\"小时\"", + "Name": "人员计划工时", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" } ], "ExternalDatabaseInfo": { "DataBaseType": "6db454c0-531c-4395-9122-921a18942902", + "AllowModifySchema": true, "ConnectionId": "业务表", "SourceTableName": "人员工时统计视图", "SourceTableSchema": "dbo",