From b5aabb67590c8555743836cc7d89857be37506a7 Mon Sep 17 00:00:00 2001 From: cuckooent Date: Mon, 14 Oct 2024 15:06:50 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E4=BC=98=E5=8C=96=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=A8=A1=E5=9D=97","MessageType":2,"Modules":[{"State?= =?UTF-8?q?":2,"Type":6,"Name":"Pages/=E5=B7=A5=E6=97=B6"},{"State":4,"Typ?= =?UTF-8?q?e":1,"Name":"PCPage/=E4=BB=BB=E5=8A=A1=E5=B7=A5=E6=97=B6?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1"},{"State":4,"Type":1,"Name":"PCPage/?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=B7=A5=E6=97=B6=E7=BB=9F=E8=AE=A1"},{"Stat?= =?UTF-8?q?e":4,"Type":1,"Name":"PCPage/=E9=A1=B9=E7=9B=AE=E5=B7=A5?= =?UTF-8?q?=E6=97=B6=E7=BB=9F=E8=AE=A1"},{"State":4,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E7=BB=9F=E8=AE=A1=E9=A6=96=E9=A1=B5"},{"State":3,"Type":6,"N?= =?UTF-8?q?ame":"Pages/=E7=BB=9F=E8=AE=A1"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 67 +-- Pages/工时/任务工时统计.rd | 15 - Pages/工时/项目工时统计.rd | 23 - Pages/{工时 => 统计}/人员工时统计.json | 439 ++++++++++----- Pages/{工时 => 统计}/人员工时统计.rd | 2 +- Pages/{工时 => 统计}/任务工时统计.json | 681 +++++++++++++---------- Pages/统计/任务工时统计.rd | 15 + Pages/{工时 => 统计}/统计首页.json | 4 +- Pages/{工时 => 统计}/统计首页.rd | 0 Pages/{工时 => 统计}/项目工时统计.json | 742 +++++++++++++++++-------- Pages/统计/项目工时统计.rd | 19 + 11 files changed, 1245 insertions(+), 762 deletions(-) delete mode 100644 Pages/工时/任务工时统计.rd delete mode 100644 Pages/工时/项目工时统计.rd rename Pages/{工时 => 统计}/人员工时统计.json (70%) rename Pages/{工时 => 统计}/人员工时统计.rd (87%) rename Pages/{工时 => 统计}/任务工时统计.json (51%) create mode 100644 Pages/统计/任务工时统计.rd rename Pages/{工时 => 统计}/统计首页.json (93%) rename Pages/{工时 => 统计}/统计首页.rd (100%) rename Pages/{工时 => 统计}/项目工时统计.json (58%) create mode 100644 Pages/统计/项目工时统计.rd diff --git a/.collaboration b/.collaboration index f6460dc2..03f7de7d 100644 --- a/.collaboration +++ b/.collaboration @@ -1184,46 +1184,13 @@ "ModuleName": "PCPage/开发测试", "ModuleType": 1 }, - { - "ModuleName": "Pages/工时", - "State": 2, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-14T14:43:45.9420626+08:00", - "ModuleType": 6, - "ToRemoveFiles": [ - "Pages\\工时" - ] - }, { "ModuleName": "PCPage/任务工时统计", - "State": 4, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-14T14:43:45.9467966+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\工时\\任务工时统计.json", - "Pages\\工时\\任务工时统计.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/人员工时统计", - "State": 4, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-14T14:43:45.9469162+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\工时\\人员工时统计.json", - "Pages\\工时\\人员工时统计.rd" - ] + "ModuleType": 1 }, { "ModuleName": "MasterPages/流程母版页面文件夹", @@ -2487,40 +2454,14 @@ }, { "ModuleName": "PCPage/项目工时统计", - "State": 4, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-14T14:43:45.9466724+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\工时\\项目工时统计.json", - "Pages\\工时\\项目工时统计.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/统计首页", - "State": 4, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-14T14:43:45.9462038+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\工时\\统计首页.json", - "Pages\\工时\\统计首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/统计", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-14T14:43:45.9420707+08:00", "ModuleType": 6 } ] \ No newline at end of file diff --git a/Pages/工时/任务工时统计.rd b/Pages/工时/任务工时统计.rd deleted file mode 100644 index 32b08ff0..00000000 --- a/Pages/工时/任务工时统计.rd +++ /dev/null @@ -1,15 +0,0 @@ -{ - "PageType": 0, - "ColumnCount": 45, - "RowCount": 18, - "CustomNames": [ - { - "Name": "项目", - "Formula": "任务工时统计!$D$2" - }, - { - "Name": "成员", - "Formula": "任务工时统计!$P$2" - } - ] -} \ No newline at end of file diff --git a/Pages/工时/项目工时统计.rd b/Pages/工时/项目工时统计.rd deleted file mode 100644 index 6489b61f..00000000 --- a/Pages/工时/项目工时统计.rd +++ /dev/null @@ -1,23 +0,0 @@ -{ - "PageType": 0, - "ColumnCount": 45, - "RowCount": 22, - "Formulas": { - "21,1": "EOMONTH(P2,-1)+1", - "21,4": "EOMONTH(P2,0)" - }, - "CustomNames": [ - { - "Name": "成员", - "Formula": "项目工时统计!$D$2" - }, - { - "Name": "开始日期", - "Formula": "项目工时统计!$B$22" - }, - { - "Name": "结束日期", - "Formula": "项目工时统计!$E$22" - } - ] -} \ No newline at end of file diff --git a/Pages/工时/人员工时统计.json b/Pages/统计/人员工时统计.json similarity index 70% rename from Pages/工时/人员工时统计.json rename to Pages/统计/人员工时统计.json index d3384c1d..d88f8eb0 100644 --- a/Pages/工时/人员工时统计.json +++ b/Pages/统计/人员工时统计.json @@ -182,6 +182,11 @@ } }, "38": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "39": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "Mode": 2, @@ -193,11 +198,6 @@ } } }, - "39": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, "40": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 @@ -228,14 +228,96 @@ "DefaultSize": 32.0 }, "Values": { - "1,1": "成员", - "1,13": "日期", + "1,1": "项目", + "1,12": "成员", + "1,23": "日期", "1,40": "导出原始数据", "17,1": "执行人", - "17,3": "工时日期" + "17,3": "工时日期", + "17,9": "版本" }, "AttachInfos": { "1,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": "c439d303-fcbe-4a63-9440-6557254ad768", + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "ID", + "GUID": "56ee23d9-aa52-4376-aacb-f0f7e1b8baad" + }, + "ColumnName": "value" + }, + { + "GUID": "111f4ad2-ee50-4142-b38a-45df9ffa488e", + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目名称", + "GUID": "ea5e4952-468a-474a-accc-820947dbce33" + }, + "ColumnName": "label" + } + ], + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "multiple": true, + "collapseTags": true, + "filterable": true, + "filterInServerOptions": { + "defaultMaxOptionsCount": 10, + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据", + "clearable": true + } + }, + "1,14": { "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", "CommandList": [], @@ -313,7 +395,7 @@ "clearable": true } }, - "1,15": { + "1,25": { "CellType": { "$type": "ElementUI.DatePickerCellType, ElementUI", "CommandList": [ @@ -321,7 +403,7 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!P2" + "SerializeProperty": "=人员工时统计!Z2" }, "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", "MethodName": "GetSelectedRange", @@ -380,7 +462,7 @@ "ListViewName": "工时记录导出", "NewOtherName": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=TEXT(人员工时统计!开始日期,\"yyyymmdd\")&\"-\"&TEXT(人员工时统计!结束日期,\"yyyymmdd\")&\"工时信息导出\"" + "SerializeProperty": "=TEXT(人员工时统计!开始日期,\"yyyymmdd\")&\"-\"&TEXT(人员工时统计!结束日期,\"yyyymmdd\")&\"人员工时信息导出\"" } } ], @@ -435,6 +517,15 @@ }, "BackgroundValue": {} }, + { + "DatabaseColumnName": "版本", + "DisplayName": "版本", + "ColumnCell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=人员工时统计!J19" + }, + "BackgroundValue": {} + }, { "DatabaseColumnName": "任务名称", "DisplayName": "任务名称", @@ -449,17 +540,28 @@ "DisplayName": "执行内容", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!J19" - } + "SerializeProperty": "=人员工时统计!M19" + }, + "BackgroundValue": {} } ], "Values": [ + { + "DatabaseColumnName": "上报工时", + "DisplayName": "上报工时", + "ColumnCell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=人员工时统计!R19" + }, + "Aggregator": 0, + "TotalAggregator": 0 + }, { "DatabaseColumnName": "核定工时", "DisplayName": "核定工时", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!L19" + "SerializeProperty": "=人员工时统计!O19" }, "Aggregator": 0, "TotalAggregator": 0, @@ -496,17 +598,31 @@ } }, { - "DatabaseColumnName": "执行内容", + "DatabaseColumnName": "版本", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=人员工时统计!J19" } }, + { + "DatabaseColumnName": "执行内容", + "ColumnCell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=人员工时统计!M19" + } + }, { "DatabaseColumnName": "核定工时", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!L19" + "SerializeProperty": "=人员工时统计!O19" + } + }, + { + "DatabaseColumnName": "上报工时", + "ColumnCell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=人员工时统计!R19" } } ], @@ -537,13 +653,26 @@ "SqlCondition": { "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", "SubConditions": [ + { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 8, + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "项目ID", + "GUID": "adb022b5-bc3a-41dc-bc1b-07cf6470e532" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=人员工时统计!D2" + } + }, { "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", "CompareType": 8, "ColumnBindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "执行人", - "GUID": "f45455bb-52b0-4bb6-a9a8-a6391e36ccfc" + "GUID": "a65beec1-365e-4bf0-b717-5832748481d7" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -556,7 +685,7 @@ "ColumnBindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "日期", - "GUID": "7736200d-43ab-4db9-b9d8-e2e5ceb9e187" + "GUID": "6f9847e9-2e25-4a3e-b029-c3ca22f1c524" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -569,7 +698,7 @@ "ColumnBindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "日期", - "GUID": "abf87325-e7b4-4ffe-ab82-074a868576ee" + "GUID": "34ab4db0-6fc0-49a9-85db-c5f438be5551" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -582,7 +711,7 @@ "ColumnBindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "核定工时", - "GUID": "d2b065ac-d80a-4871-a237-05b0493cc404" + "GUID": "a7c9df28-42ef-4d1e-bdb1-87cd9bee2498" }, "Value": "0" } @@ -594,7 +723,7 @@ "ColumnBindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "执行人", - "GUID": "c9dbb588-a418-4d73-ad0d-82df43113f24" + "GUID": "3ab0e4fb-fbe8-46bb-98b0-55f3f1250acd" }, "Order": 0 }, @@ -602,7 +731,7 @@ "ColumnBindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "日期", - "GUID": "fa3a5298-2ed8-4d69-90ce-4aa752cbc1c4" + "GUID": "d5a2997a-d025-4a75-82ca-cd12e5ff6a40" }, "Order": 0 }, @@ -610,7 +739,7 @@ "ColumnBindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "项目名称", - "GUID": "f10d3ef9-dc37-446f-afbd-dceaf68e558f" + "GUID": "9a85a80d-b025-40f5-b4cd-1ca77c682356" }, "Order": 0 }, @@ -618,7 +747,7 @@ "ColumnBindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "任务名称", - "GUID": "744fec66-bf0c-4e1b-96f3-a4673d4ff5cb" + "GUID": "d86095bf-1411-480a-822c-a32a4f80e1f1" }, "Order": 0 } @@ -669,6 +798,24 @@ } }, "18,9": { + "NameUsedInJavaScript": "版本", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "任务ID", + "GUID": "1d945d7a-b819-4e2a-b900-02b5dfd9b531", + "RelationBinding": { + "RelatedTable": "任务平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "版本", + "NextRelationBinding": { + "RelatedTable": "项目版本", + "RelatedColumn": "ID", + "DisplayColumn": "名称加版本号" + } + } + } + }, + "18,12": { "NameUsedInJavaScript": "执行内容", "BindingInfo": { "TableName": "View_任务工时统计", @@ -676,17 +823,28 @@ "GUID": "b2f20b17-9533-4c52-8be7-704cbb62da1d" } }, - "18,11": { + "18,14": { "NameUsedInJavaScript": "核定工时", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "核定工时", "GUID": "3b9c1e60-eaca-4554-a1a0-1bc66696cbc6" } + }, + "18,17": { + "NameUsedInJavaScript": "上报工时", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "上报工时", + "GUID": "6c0181ce-41d7-4ef8-a01b-782a5a952123" + } } }, "StyleDatas": { "Styles": [ + { + "FontFamily": 0 + }, { "FontFamily": 0, "FontSize": 13.333333333333332 @@ -711,104 +869,117 @@ ] }, "CellStyles": { - "1,3": 0, + "0,11": 0, + "1,1": 1, + "1,2": 1, + "1,3": 1, + "1,4": 1, + "1,5": 1, + "1,6": 1, + "1,7": 1, + "1,8": 1, + "1,9": 1, + "1,10": 1, + "1,12": 1, "1,13": 1, - "1,14": 0, - "1,15": 0, - "1,16": 0, - "1,17": 0, - "1,18": 0, - "1,19": 0, - "1,20": 0, - "1,21": 0, - "1,22": 0, - "1,23": 0, - "1,24": 0, - "1,25": 0, - "1,26": 0, - "1,27": 0, - "1,28": 0, + "1,14": 1, + "1,15": 1, + "1,16": 1, + "1,17": 1, + "1,18": 1, + "1,19": 1, + "1,20": 1, + "1,21": 1, + "1,22": 1, + "1,23": 2, + "1,24": 1, + "1,25": 1, + "1,26": 1, + "1,27": 1, + "1,28": 1, + "1,29": 1, "1,30": 1, - "1,31": 0, - "3,1": 2, - "17,1": 0, - "17,2": 0, - "17,3": 0, - "17,4": 0, - "17,5": 0, - "17,6": 0, - "17,7": 0, - "17,8": 0, - "17,9": 0, - "17,10": 0, - "17,11": 0, - "17,12": 0, - "17,13": 0, - "17,18": 3, - "17,19": 3, - "17,20": 3, - "17,21": 3, - "17,22": 3, - "17,23": 3, - "17,24": 3, - "17,25": 3, - "17,26": 3, - "17,27": 3, - "17,28": 3, - "17,29": 3, - "17,30": 3, - "17,31": 3, - "17,32": 3, - "17,33": 3, - "17,34": 3, - "17,35": 3, - "17,36": 3, - "17,37": 3, - "17,38": 3, - "17,39": 3, - "17,40": 3, - "17,41": 3, - "17,42": 3, - "17,43": 3, - "18,1": 0, - "18,2": 0, - "18,3": 0, - "18,4": 0, - "18,5": 0, - "18,6": 0, - "18,7": 0, - "18,8": 0, - "18,9": 0, - "18,10": 0, - "18,11": 0, - "18,12": 0, - "18,13": 0, - "18,18": 3, - "18,19": 3, - "18,20": 3, - "18,21": 3, - "18,22": 3, - "18,23": 3, - "18,24": 3, - "18,25": 3, - "18,26": 3, - "18,27": 3, - "18,28": 3, - "18,29": 3, - "18,30": 3, - "18,31": 3, - "18,32": 3, - "18,33": 3, - "18,34": 3, - "18,35": 3, - "18,36": 3, - "18,37": 3, - "18,38": 3, - "18,39": 3, - "18,40": 3, - "18,41": 3, - "18,42": 3, - "18,43": 3 + "1,31": 1, + "1,32": 1, + "1,33": 1, + "1,34": 1, + "1,35": 1, + "1,36": 1, + "1,37": 1, + "1,38": 1, + "3,1": 3, + "17,1": 1, + "17,2": 1, + "17,3": 1, + "17,4": 1, + "17,5": 1, + "17,6": 1, + "17,7": 1, + "17,8": 1, + "17,12": 1, + "17,13": 1, + "17,14": 1, + "17,15": 1, + "17,16": 1, + "17,21": 4, + "17,22": 4, + "17,23": 4, + "17,24": 4, + "17,25": 4, + "17,26": 4, + "17,27": 4, + "17,28": 4, + "17,29": 4, + "17,30": 4, + "17,31": 4, + "17,32": 4, + "17,33": 4, + "17,34": 4, + "17,35": 4, + "17,36": 4, + "17,37": 4, + "17,38": 4, + "17,39": 4, + "17,40": 4, + "17,41": 4, + "17,42": 4, + "17,43": 4, + "18,1": 1, + "18,2": 1, + "18,3": 1, + "18,4": 1, + "18,5": 1, + "18,6": 1, + "18,7": 1, + "18,8": 1, + "18,12": 1, + "18,13": 1, + "18,14": 1, + "18,15": 1, + "18,16": 1, + "18,21": 4, + "18,22": 4, + "18,23": 4, + "18,24": 4, + "18,25": 4, + "18,26": 4, + "18,27": 4, + "18,28": 4, + "18,29": 4, + "18,30": 4, + "18,31": 4, + "18,32": 4, + "18,33": 4, + "18,34": 4, + "18,35": 4, + "18,36": 4, + "18,37": 4, + "18,38": 4, + "18,39": 4, + "18,40": 4, + "18,41": 4, + "18,42": 4, + "18,43": 4 }, "SheetStyle": { "FontFamily": 0, @@ -817,10 +988,6 @@ }, "Spans": [ "3,1,13,43", - "1,1,1,2", - "1,13,1,2", - "1,15,1,14", - "1,3,1,9", "19,1,2,43", "21,1,1,3", "21,4,1,3", @@ -828,15 +995,25 @@ "18,3,1,2", "18,5,1,2", "18,7,1,2", - "18,9,1,2", "18,1,1,2", - "18,11,1,3", + "1,23,1,2", + "1,25,1,14", + "1,12,1,2", + "1,14,1,8", + "1,1,1,2", + "1,3,1,8", + "18,12,1,2", + "18,14,1,3", "17,1,1,2", "17,3,1,2", "17,5,1,2", "17,7,1,2", - "17,9,1,2", - "17,11,1,3" + "17,12,1,2", + "17,14,1,3", + "18,9,1,3", + "17,9,1,3", + "18,17,1,4", + "17,17,1,4" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -865,7 +1042,7 @@ "CustomNames": [ { "Name": "成员", - "Formula": "人员工时统计!$D$2" + "Formula": "人员工时统计!$O$2" }, { "Name": "开始日期", @@ -876,4 +1053,4 @@ "Formula": "人员工时统计!$E$22" } ] -}//fT3C1cdxTHdmSO1J83tm/qeiah/56m1usGF5aS9OV+fKFH7pVqwN/rXtpSOqexxyiDrsD2FKowgCOgH3GgykmLJI6asFTxmsqqWK9RfSGhWCrwU2DEyAtVozg0Xw22iP2EHh3U2aADfpo2Rhcggq2V6DWjTKwOOfA9yb4ThPoh+wJrpr/E8p6pV18aDRFvDqGxyqnrwiIu7HSkEv/mRoNCzh+otZU1D7tSH23yRI9lWK7f8EQbUDziF6DmK5n19CamqNo7Oir3esAlACa2z/GYcMsC69L6BbIQcHJTq+ZOyfcOpCbY/KKqHjw+IdkoC5hXwZApVWS8UoF2uEoK1NHkrisGGlDZM3JawGeVbgfOFZQyFdmn8Vbr+ujJcq1uADd0UkpdQ7DEeAJvYI0rzb+yhgkucJ1FpSTy+gIk6OaD+uTxfvYh+4ykVNefNa3i9aXkbjgFhTvcX85gxx9oZkGMamQQ42zFatTenm7OzitGkzBDDTFF0qGCzX0Kml3tWi2FDDg3rmnBjytzfSg9qYyPtQtqxeq5Y1p7Kb3REiWw6FkhYLnb7q5AhPQgiI6239ybtef0DONTHz2qT+lUwgemaWpOPhLj+EiNiNnLRiRAf88KeMaE8EApw+Hp39TNncD37B6gkqaeEsA+h2rpzFag0QLa2HOm0GZPMAtl96WmZ6b04jRcz0IkwDUL15iEpzUDxPzvBa59G9bqhEFQysh5GePlrRd2OE8sntNylxppoidM8hUc/t/a5L5iDIPLTNSfCSr3AmxegJ8E/LrS1wn3eAFKha/e0jXkMm09/McIR0uwwgLBmJQnA4SrUDP8KVHxLmMf4VfnknS5FPVpPAD/YAbW+fuL3hD5MwPGWxxMWjpOUR2M+Rlflqfa1z61T5M6IaAJDZJWoPe0x7kQOGnQ==|920 \ No newline at end of file +}//gg7dkARCcpORycI3Q2Ei0FonAR0SQOCsbQVkvWAgzbNgK+crH/wxVI0dXlHN2I88Ddl7/bkItpQxvCQxTzMIlbWEYeStdA0IF4oPJPsQQZoD6oEBkFR/DBOvdRLYQJVmDjDv50jWW5vLY8L+6Scfv8eSInrkpIqZV4PVyWfhozYzDnerpbGq+XktS1mL3YaYKizH/swJi+EaPgxb7lAXQZVJYEGBVg6JcApHtKFUyF0yMbzpah9ytBbGjZJKvRXVj8+ozttSfP+AieIS9N1AuRFWHloOVe1k04Ge6Xzj0z1vMn3cliJH2IhfxGceRAntsGW/gdxdsDzgX+/EpWDxrGMmVlkj3XFQm1DLibIXMOZ20tTD/SEJSnAClZ26tW1zhZNgpe6aYusnS/WgETJnujPXUUMhou24rzFnstgijZ0cNGog68EOmMbi43nQg3OIYN0bqGqkd0L7jny+K94jAU6gJ8VlBE+nazfYVJ7one4TKOhYHYf5UypRRVb0MfVvflUL3TWV7a0/fcu/RUf/3aaN99b0mpvxtFFJRO4LqtKFqU1s3E6gRkemWz0JJaqYhvxbrYj2ab7uoVpT54YY3AEVExz+7PS/ZkbQmTYA8SffGb1Ta0OvzX1j4q1ik0BoGXPAXGVxMpzH4ndiA8nqVzI44ylAKN2pOct+23Ns3vQFp5OZXY2aLg/7bh4Qz8/S96nJaamftAAfg9FgaNnFlI1KNUC46mbNNLNIiSmBvBNNPUxET9pOIXZvy+xlQkk2Zo3GZE59BVKaL6Bj1wWMfwYe4T8Wj/+1/9pypManX04UWy8jAdk3k1cIDOdeNQhirwrwQtOg0W/ue2RZKtyLedpUdt3VM5nmBqsXrV432rxU3KO58Wy5owjpNPK5Xvx0TuqPIggzi0f/IO2IWkPoNQ==|920 \ No newline at end of file diff --git a/Pages/工时/人员工时统计.rd b/Pages/统计/人员工时统计.rd similarity index 87% rename from Pages/工时/人员工时统计.rd rename to Pages/统计/人员工时统计.rd index b1289ecf..3d40e36d 100644 --- a/Pages/工时/人员工时统计.rd +++ b/Pages/统计/人员工时统计.rd @@ -5,7 +5,7 @@ "CustomNames": [ { "Name": "成员", - "Formula": "人员工时统计!$D$2" + "Formula": "人员工时统计!$O$2" }, { "Name": "开始日期", diff --git a/Pages/工时/任务工时统计.json b/Pages/统计/任务工时统计.json similarity index 51% rename from Pages/工时/任务工时统计.json rename to Pages/统计/任务工时统计.json index e3917592..08f5816d 100644 --- a/Pages/工时/任务工时统计.json +++ b/Pages/统计/任务工时统计.json @@ -239,6 +239,11 @@ } }, "28": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "39": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "Mode": 2, @@ -266,7 +271,13 @@ }, "Values": { "1,1": "项目", - "1,13": "成员" + "1,13": "成员", + "1,25": "日期", + "1,40": "导出原始数据", + "3,1": "项目", + "3,10": "任务", + "3,19": "版本", + "3,26": "执行人" }, "AttachInfos": { "1,3": { @@ -337,8 +348,9 @@ }, "placeholder": "请选择", "noDataText": "无数据", + "multiple": true, + "collapseTags": true, "filterable": true, - "filterInServer": true, "filterInServerOptions": { "defaultMaxOptionsCount": 10, "matchMethod": "contains", @@ -416,305 +428,249 @@ }, "placeholder": "请选择", "noDataText": "无数据", + "multiple": true, + "collapseTags": true, "filterInServerOptions": { "matchMethod": "contains", "loadingText": "加载中" }, - "noMatchText": "无匹配数据" + "noMatchText": "无匹配数据", + "clearable": true + } + }, + "1,27": { + "CellType": { + "$type": "ElementUI.DatePickerCellType, ElementUI", + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务工时统计!AB2" + }, + "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" + ] + } + ], + "DefaultValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=TODAY()" + }, + "type": "daterange", + "placeholder": "请选择", + "startPlaceholder": "开始日期", + "rangeSeparator": "至", + "endPlaceholder": "结束日期", + "format": "yyyy年MM月DD日", + "firstDayOfWeek": 1, + "DefautWeekFormat": "yyyy 第 WW 周" + }, + "DataValidationInfo": {} + }, + "1,40": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ExportListViewToExcelCommand, ServerDesignerCommon", + "ExportExcelListviewNameMode": 1, + "ListViewName": "表格1", + "NewOtherName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=TEXT(任务工时统计!开始日期,\"yyyy-mm-dd\")&\"~\"&TEXT(任务工时统计!结束日期,\"yyyy-mm-dd\")&\"任务工时记录导出\"" + } + } + ], + "Text": "导出原始数据", + "TemplateKey": "_RS_Main1", + "Icon": { + "Name": "File/348_excel_file_1.svg", + "BuiltIn": true, + "Color": "Background 1", + "UseCellTypeForeColor": true + }, + "IconSize": 14.0 } }, "3,1": { - "CellType": { - "$type": "ElementUI.TableCellType, ElementUI", - "ElTableName": "EL表格1", - "bindingOptions": { - "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "View_任务工时统计", - "BindingInfos": [ + "ListViewInfo": { + "Name": "表格1", + "TableName": "View_任务工时统计", + "RowIndex": 3, + "ColumnIndex": 1, + "RowCount": 13, + "ColumnCount": 43, + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ { - "GUID": "b8d04865-340d-4d7c-b43a-8d6f493759b7", - "BindingInfo": { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 8, + "ColumnBindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "项目ID", - "GUID": "71a18666-3876-4f25-9410-8664b7a0e844", - "RelationBinding": { - "RelatedTable": "项目平行视图", - "RelatedColumn": "ID", - "DisplayColumn": "项目名称" - } + "GUID": "d0162329-337a-452a-b8cc-e24af8ffeeab" }, - "ColumnName": "项目名称" + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务工时统计!D2" + } }, { - "GUID": "b5f6617c-d833-4e75-87ca-9b1de5b5ab8f", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "任务ID", - "GUID": "8c4e2905-b75c-46b7-be49-e0ff5b094a58", - "RelationBinding": { - "RelatedTable": "任务平行视图", - "RelatedColumn": "ID", - "DisplayColumn": "任务名称" - } - }, - "ColumnName": "任务名称" - }, - { - "GUID": "4d0dad58-29b5-4bcd-93cf-f92baa02aad3", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "任务ID", - "GUID": "95348388-d4ec-4801-8227-c343a32f03ad", - "RelationBinding": { - "RelatedTable": "任务平行视图", - "RelatedColumn": "ID", - "DisplayColumn": "任务预算工时" - } - }, - "ColumnName": "任务预算工时" - }, - { - "GUID": "5a6ee325-3f22-4348-a8f7-e0b1a19b15ce", - "BindingInfo": { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 8, + "ColumnBindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "执行人", - "GUID": "351e9598-3933-4255-96fd-d98366425198", - "AttachType": { - "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", - "UserColumnAttachType": 1 - } + "GUID": "8db9f11d-45b1-4b5d-a239-95eaaafba9c9" }, - "ColumnName": "执行人" + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务工时统计!P2" + } }, { - "GUID": "855501b8-f8ea-4441-991f-8722613d2cfe", - "BindingInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 3, + "ColumnBindingInfo": { "TableName": "View_任务工时统计", - "ColumnName": "总核定工时", - "GUID": "5894191e-cc5f-4037-b9bd-51f7a16a5b3c" + "ColumnName": "日期", + "GUID": "8c6a1fdf-f373-46d6-98f2-137cce67c6ad" }, - "ColumnName": "总核定工时" + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务工时统计!开始日期" + } }, { - "GUID": "9bd79ee7-22ae-49ee-b6a4-cbab34753cff", - "BindingInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 5, + "ColumnBindingInfo": { "TableName": "View_任务工时统计", - "ColumnName": "总剩余工时", - "GUID": "63260308-051a-42f7-979c-daa0399a253e" + "ColumnName": "日期", + "GUID": "166b9e8b-c1d0-47ea-b086-6086554f1aa1" }, - "ColumnName": "总剩余工时" + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务工时统计!结束日期" + } } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "项目ID", - "GUID": "36f7a2a1-3205-4085-a275-d4ca778baee8" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务工时统计!项目" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "执行人", - "GUID": "599ec82d-26bb-499f-91fa-43097f3d9f38" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务工时统计!成员" - } - } - ] - }, - "NullFormulaValueQueryPolicy": 1, - "CustomColumns": [] + ] }, - "autoGenerateColumnsByDataSource": false, - "columns": [ - { - "$type": "ElementUI.ColumnSetting, ElementUI", - "dataColumnName": "项目名称", - "label": "项目名称", - "align": "center", - "headerAlign": "center", - "colfixed": "false", - "type": "Default", - "tagType": "info", - "imgType": "cover", - "showOverflowTooltip": false, - "margin": true, - "key": "109dbdd2-2539-4353-af5c-f40ba85f59c1", - "UIPermissions": [ - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ] - }, - { - "$type": "ElementUI.ColumnSetting, ElementUI", - "dataColumnName": "任务名称", - "label": "任务名称", - "align": "center", - "headerAlign": "center", - "colfixed": "false", - "type": "Default", - "tagType": "info", - "imgType": "cover", - "showOverflowTooltip": false, - "margin": true, - "key": "c13c5167-3b7f-4436-8b8f-7cece3a76c73", - "UIPermissions": [ - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ] - }, - { - "$type": "ElementUI.ColumnSetting, ElementUI", - "dataColumnName": "任务预算工时", - "label": "任务预算工时", - "align": "center", - "headerAlign": "center", - "colfixed": "false", - "type": "Default", - "tagType": "info", - "imgType": "cover", - "showOverflowTooltip": false, - "margin": true, - "key": "120ffe19-5b3a-4e9f-a67b-8954fe38089c", - "UIPermissions": [ - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ] - }, - { - "$type": "ElementUI.ColumnSetting, ElementUI", - "dataColumnName": "执行人", - "label": "执行人", - "align": "center", - "headerAlign": "center", - "colfixed": "false", - "type": "Default", - "tagType": "info", - "imgType": "cover", - "showOverflowTooltip": false, - "margin": true, - "key": "4b7ffb26-fa35-4659-bfa0-c44207cd3295", - "UIPermissions": [ - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ] - }, - { - "$type": "ElementUI.ColumnSetting, ElementUI", - "dataColumnName": "总核定工时", - "label": "总核定工时", - "formatStr": "0.00", - "align": "center", - "headerAlign": "center", - "colfixed": "false", - "type": "Default", - "tagType": "info", - "imgType": "cover", - "key": "a32d4fb7-e8e4-49b0-8bfc-ee1321a13c0a", - "UIPermissions": [ - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ] - }, - { - "$type": "ElementUI.ColumnSetting, ElementUI", - "dataColumnName": "总剩余工时", - "label": "总剩余工时", - "formatStr": "0.00", - "align": "center", - "headerAlign": "center", - "colfixed": "false", - "type": "Default", - "tagType": "info", - "imgType": "cover", - "key": "70de3c48-2d1d-4bf4-a429-316baeae211b", - "UIPermissions": [ - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ] + "TopCondition": null, + "ListViewStyleName": "_RS_NewFashionListStyle2", + "ShowColumnHeaderInDesigner": true, + "ShowEditStatusIcon": true, + "UseSimpleBar": true, + "ColumnOperation": 2 + } + }, + "4,1": { + "NameUsedInJavaScript": "项目", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "项目ID", + "GUID": "0789f7f4-72ee-4ed6-81d3-f4f1a06b2f07", + "RelationBinding": { + "RelatedTable": "项目平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "项目名称" + } + } + }, + "4,10": { + "NameUsedInJavaScript": "任务", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "任务ID", + "GUID": "a4bb5a0c-b476-4d2c-a2d8-e0dad93c6544", + "RelationBinding": { + "RelatedTable": "任务平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "任务名称" + } + } + }, + "4,19": { + "NameUsedInJavaScript": "版本", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "任务ID", + "GUID": "ff9abb55-c79d-4be3-88f6-caf17c0ce4fd", + "RelationBinding": { + "RelatedTable": "任务平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "版本", + "NextRelationBinding": { + "RelatedTable": "项目版本", + "RelatedColumn": "ID", + "DisplayColumn": "名称加版本号" } - ], - "actionButtons": [ - { - "$type": "ElementUI.ActionButton, ElementUI", - "UIPermissions": [ - { - "Scope": 2, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ], - "type": "button", - "Name": "编辑", - "shape": "default" - }, - { - "$type": "ElementUI.ActionButton, ElementUI", - "UIPermissions": [ - { - "Scope": 2, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ], - "type": "button", - "Name": "删除", - "styleType": "Accent 5", - "shape": "default" - } - ], - "sumText": "合计", - "size": "default" + } + } + }, + "4,26": { + "NameUsedInJavaScript": "执行人", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "执行人", + "GUID": "02594cd1-ffcf-4254-bb05-95bc72bed35c", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 + } + } + }, + "4,32": { + "NameUsedInJavaScript": "计划工时", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "计划工时", + "GUID": "4d6ebdc0-0e87-4780-b291-48c5f8ed40b7" + } + }, + "4,36": { + "NameUsedInJavaScript": "上报工时", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "上报工时", + "GUID": "e8110051-5f81-4695-b104-55d501ede4cc" + } + }, + "4,40": { + "NameUsedInJavaScript": "核定工时", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "核定工时", + "GUID": "15ffa16a-b395-4360-9563-809feae95da2" } } }, @@ -728,53 +684,170 @@ "FontFamily": 0, "FontSize": 13.333333333333332, "Formatter": 1 + }, + { + "FontFamily": 0 + }, + { + "FontSize": 13.333333333333332, + "TextIndent": 10, + "HorizontalAlignment": 2, + "BorderBottom": null, + "BorderTop": null, + "BorderRight": null + }, + { + "BorderBottom": null, + "BorderTop": null, + "BorderRight": null + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "TextIndent": 10, + "HorizontalAlignment": 2, + "BorderBottom": null, + "BorderTop": null, + "BorderRight": null + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "HorizontalAlignment": 3, + "BorderBottom": null, + "BorderTop": null, + "BorderRight": null + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "HorizontalAlignment": 3 + }, + { + "FontSize": 13.333333333333332, + "TextIndent": 10, + "HorizontalAlignment": 2 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "TextIndent": 10, + "HorizontalAlignment": 2 } ], "Types": { "Strs": [ "Body", - "[AUTO]General" + "[AUTO]General", + "Left", + "Center" ] }, "CellStyles": { "1,1": 0, "1,2": 0, "1,3": 0, - "1,4": 0, - "1,5": 0, - "1,6": 0, - "1,7": 0, - "1,8": 0, - "1,9": 0, - "1,10": 0, - "1,11": 0, - "1,12": 0, "1,13": 1, "1,14": 0, "1,15": 0, - "1,28": 0, - "1,29": 0, - "1,30": 0, - "1,31": 0, - "1,32": 0, - "1,33": 0, - "1,34": 0, - "1,35": 0, - "1,36": 0, - "1,37": 0, - "1,38": 0, - "1,39": 0 + "1,16": 2, + "1,17": 2, + "1,18": 2, + "1,19": 2, + "1,20": 2, + "1,21": 2, + "1,22": 2, + "1,23": 2, + "1,25": 1, + "1,26": 0, + "1,27": 0, + "1,28": 2, + "1,29": 2, + "1,30": 2, + "1,31": 2, + "1,32": 2, + "1,33": 2, + "1,34": 2, + "1,35": 2, + "1,36": 2, + "1,37": 2, + "1,38": 2, + "1,40": 0, + "1,41": 0, + "1,42": 0, + "1,43": 0, + "3,1": 3, + "3,2": 4, + "3,3": 4, + "3,4": 4, + "3,5": 4, + "3,6": 4, + "3,7": 4, + "3,8": 4, + "3,9": 4, + "3,10": 5, + "3,11": 4, + "3,12": 4, + "3,13": 4, + "3,14": 4, + "3,15": 4, + "3,16": 4, + "3,17": 4, + "3,18": 4, + "3,19": 6, + "3,20": 4, + "3,21": 4, + "3,22": 4, + "3,23": 4, + "3,24": 4, + "3,25": 4, + "3,26": 7, + "3,32": 7, + "3,36": 7, + "3,40": 7, + "4,1": 8, + "4,10": 9, + "4,19": 7, + "4,26": 7, + "4,32": 7, + "4,36": 7, + "4,40": 7, + "17,1": 0, + "17,2": 0, + "17,3": 0, + "17,4": 0, + "17,5": 0, + "17,6": 0 }, "SheetStyle": { "FontFamily": 0 } }, "Spans": [ - "3,1,13,43", "1,1,1,2", - "1,13,1,2", + "1,40,1,4", "1,3,1,9", - "1,15,1,13" + "1,13,1,2", + "1,15,1,9", + "1,25,1,2", + "1,27,1,12", + "5,1,11,43", + "4,1,1,9", + "4,10,1,9", + "4,19,1,7", + "4,32,1,4", + "4,36,1,4", + "4,40,1,4", + "4,26,1,6", + "17,1,1,3", + "17,4,1,3", + "3,1,1,9", + "3,10,1,9", + "3,19,1,7", + "3,26,1,6", + "3,32,1,4", + "3,36,1,4", + "3,40,1,4" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -802,12 +875,12 @@ }, "CustomNames": [ { - "Name": "项目", - "Formula": "任务工时统计!$D$2" + "Name": "开始日期", + "Formula": "任务工时统计!$B$18" }, { - "Name": "成员", - "Formula": "任务工时统计!$P$2" + "Name": "结束日期", + "Formula": "任务工时统计!$E$18" } ] -}//NgxsIoU+vUwnMxefP1ln+u0RTY8ZsR6al3XVpDtzkiWv1w9a7ZL2AjBuwoKfiFSPbbj9dsHdy26hODO/ToFnmY9bTkd/Qmd3zhyrMgx2Bl9AJ0RYN9Qbn/aOr9U9aX5H+FwbK9nBlfV87WCDEjutPV3tAWdEl1H3KZCn8PRpwYroRXsICJ/MHDNFOlKQtDOUO+e9hGX+8FJUzTE9SrujiQNFW6XuBqAKePp7rG75W87U21RMY0OgmMK9nC5SmIiQnoLGlf7M0RJhh5oYO0BvTuaiK26u8zXXJ/gJn6bw1/HYM70fysGLL6WFt8YMnnqk6GYmL6+zlZy4zfr/kpYmLKJZQ72Tkk/EV0RLVc2WkC3lpTtvSwSBu4Zxnv2orYi5LN/cn1Qkj/GvP7FPPdHMenquChYYCMbGdL/McmKlowC1jj+qjPU9xqF2SuKWX8I5NLmeeo+s9zDCRbXZE5JdvTxincepWmNUk3QPzPydr1wXoqoAb4QRexqwDjnaCaghdx7v8D8IQxIbAGqFSIZ5Olkpx48Zj/Ve+DF/tn7rsurSOLywC+dkxQqy5FhTMdsl5CkmaCFZR4F5nXU77GqIq9egr9O6k/o8B45zzDiPxH0TzvqMkKsM/RvfV4TunE7Iw5iccuXIM44V2eC5xcVMpOAV7sDi3ucBNIZ3tle5pql2HttB8EcY8Bg5OR2uC2CyfiV0CHRiIDWmNvZkFo+kmrTANZIPmv2ZmzCe+9+u/gzpo97hpPmQ6qu8QzzHc/CqgbfW+Zofs9l5rI4IYu4u4bbfZMKB+d9U2dFSizntx1oOm7zm5mN4YWKGfHHWqSkWKRDNcMHWbkGPbEsXbCHzYhoZ7TwXre28MKOdEAMUPrMzmWIePW5jnJPwowO34Itx/8dI8XzSO0fo/sD5jhu0FA==|920 \ No newline at end of file +}//rs1QAe2rGuyE5VC5cUb1Z/f0mAx+NtkOPvlzGGq1QtiJhErrX7pE61ERnf7ZixHW9QsCqEOh4NundRGp+j7aS+UE9/R4KYf08vP+8lHnZSq9Q3rKKX8BZZ/W15rRbMx0pzFoYtrdMcIDnCPTUVKfSWBL+zJhUof8MyzfcF4ylaEy9AFDmzjl9j6KvOb1oiK6UIbj/crG4tApPZ7Iw6cnZ1S38+3oa1HhM6EwshzVkgyS8yq1PQ8Pq8Wk95UTzWK40fs4MhzgUhBON9k9iYtQKCVyUET3wzmvrvLbidMTtuSGakv2gjlNkOMW1VIGeEb0DpYSEacECUwUlUzrDZ12KQN/uEXV77SkLSbg9JgUZOyBofVgEeooMVOmedCOxOw338cfu/eQd6IPp9C4FpHDsz59RotjkApio7DgsXb3HbDIp+eKJDrnUMK9u5gGNHnGp3uSot2pTD6KawOnFf8LNyDzpQLad1y8pKckd70MzvB8ObTCvrJHymaxWZ2W2ZTLmSORrLH9k5J3wOZCB6dwizb4bk9bsFgo/B/BgahXflvVJm79W7IxLJ4JfQXQc5JUUjWWUn+/HOcPTBj3qs1BEPD7Eb9MVBISDLjB+Nuq9aCSwYgIfcu4cFUcoK6DbxXtf42Yoz3pFFf8MXIHlmcYZqkH8WVoyQ/VclOM+sK5HW6Z4SWPJpJdYRNnf5PM8Bb4ZICNZFc4SdkteaiTLh2a9At784b+/5VNKN9sdrFF6aKrrDs0hBhMda7NwT+xzuE0yRWVtNeP6JjfuB6QEaSz8CgQXHu0TJynMEOxcEdIcZxYGcmVB86EIVN72608S4wRvIZy5xyDsOF5W/m1kRbw9WJVmvaSV/j3E6B+7hSVj9Fk9CZag8oKMtARKpomzHfExYwXpsHfiw5sMNmTRj6wpQ==|920 \ No newline at end of file diff --git a/Pages/统计/任务工时统计.rd b/Pages/统计/任务工时统计.rd new file mode 100644 index 00000000..60570bfc --- /dev/null +++ b/Pages/统计/任务工时统计.rd @@ -0,0 +1,15 @@ +{ + "PageType": 0, + "ColumnCount": 45, + "RowCount": 18, + "CustomNames": [ + { + "Name": "开始日期", + "Formula": "任务工时统计!$B$18" + }, + { + "Name": "结束日期", + "Formula": "任务工时统计!$E$18" + } + ] +} \ No newline at end of file diff --git a/Pages/工时/统计首页.json b/Pages/统计/统计首页.json similarity index 93% rename from Pages/工时/统计首页.json rename to Pages/统计/统计首页.json index 60f396b6..30d7ddb5 100644 --- a/Pages/工时/统计首页.json +++ b/Pages/统计/统计首页.json @@ -362,7 +362,7 @@ ] } ], - "ID": "7726c198-c440-4bde-8ee9-d16440cfe38a" + "ID": "4e305498-90ab-4206-8222-6731c8a98019" } ] } @@ -557,4 +557,4 @@ "Formula": "统计首页!$H$2" } ] -}//AmKbTb7L4VVVE+ThBG15glbzyxtVor0MJOPKcGqhWh7ZqNlR3VLFmq6MECtKTo4qs3ekK3HGcpdRYH83nenk/Txx1WNhuvdO2mO2vs3PoPYMD+IoZ0atdPzn8ODCUo/V4np3nfhaJcW/RkJzjm4DaygyXi0FJoBWQfndlqnfdZbySwbESyS4cI4QTa08DIobVHnM3RMZ0ORb1/Yda09RfCyJF+L40B7OPhNGZ/4yELfhNAxcMF0FtN+80jqkFWfSNHempX7YnseAC+WyWCom5/9ZQS9QsDm+GM1kC4lqrcjSWsHn5OzAZ527mP5w44PGIuBKVadQFK7LKi11a7RvBAIMRBT8RBHxWnp5btJ9Am5QVG6GLCH9M53maz6XcAECPaThZljMYWLxQzVqR18P21d/hXLDSjvDyzfyULs2BRHqChY7yiNo1V1juJOSiFqotKuQjQssDtKm6gq2xOSQMP38pRH3hEc8tgFyipSK7a10Bh9ASLifcX3hliq+Ld5X+z6oFrideyMQyKMhO1DI6TRF98r44iwshRV17ruFu8r0BNl8UDFjf/u2ZYe+7Ddl2rjQo5B5IyVpzoMdZliPROl+9ZDrfrwOJ0SSxK9ewmvkEcVdUYO/kGGL+ivT6CIeycPx9GyUKq/iRursy3V3nhDmFvbIoFA+4ZQWtVdc5Fvax96S3ajG+Y/qne3Je0bGxmMImVM4mrPKPtQyY81OkePCpVEDSspWCoAQ/y2OpyWQiMltB2lhY5tA7h97nWB3PfInj8KLQJJBRL4+GP9TCsVnAqhq0ckzIWkd7aSwwDXAv0XyK82acbE+12T7RC4ZCQLv7TNBEJxqvjP86kR97p3eoS8fveLPExGfYFgbh8WVI9bKXgL8sIWWX4jMRmqky/Lxm2byHe2pke7g+wAc9A==|920 \ No newline at end of file +}//+v6tOD1vWhZNaBYfgX+TGSFj9UI75RqJ9rE9R1LFXocXg0X2eUOmFwTifwJ48aFOwYzaYq55LFuiH/W8D5o6ins3vwrLkBzoNIjW3sQH7EdW0MxgrvmT6ASipClv4QNEmNkgpTWZoCzmRUXOKc2FRLvuE2i/KPMxL7Lt/ttIV797en+mDxonpZ9gunTuhPvy72Ie5g0BfG3LMftxyTKaJIN1aVA+qGVV5x0WZ16fHoIVuhvUmd54wrRkjzZpOgSyHW1R5NbtRL5BKTp9+1zVCzYAcsMW3WtnOWVdHWqVxloziKNwgqqC3lxCXh012eXzzif1t9yd3bnPAT1Plfu5erZAmJ2GReyqPp8ewkxFDq4qJVJsdfW6VLtOAjIfZAmqWxuGw8GAB/tVde48ktJAnNtPJg4ErOQ4mkidwl1kj9fZx6sQkoBcl+e3jvHPT/NmOicNmmNqscFPdz4T91BV0f268S6f4kqLOGODjgm+m10tLMNrLbHjBeUeAyQIg4zM9uLQjWGjKGINCLfnyc59asgeiqMoBVzqLSz1NHTFXkkDHKnZPXgo9pQJk3bFI0MjezLaykmAite86Vo9r6R3thG/jTMaxafo3fs5Mr6+7+92W5ehYZXU/oSbkktdaqInYbXeLIAMhz3kktrGLCzGXrQWm2ncKUUDKCAqhGdb+R3xDHfnVfe3LG0QZNdgBfr9mn0k8qdaJ0TFGawaJDvq0A9MGs45daZ2xl/NXQjtrafmWM5+Soo7/pfee/ccKB474qCORg5hyti1CexckScgXwtWU5o1SjdfPzQzfuLrlPyPGz7PKdlTTUTyVT6o6Neiz/jUwV410I760g+t9bcNki+mggd5c73e7XmO3gpJcK2H8kiw7Va7fWKTQqyLkfWpaY2iX8ojjqTsMN7h6Z2ALw==|920 \ No newline at end of file diff --git a/Pages/工时/统计首页.rd b/Pages/统计/统计首页.rd similarity index 100% rename from Pages/工时/统计首页.rd rename to Pages/统计/统计首页.rd diff --git a/Pages/工时/项目工时统计.json b/Pages/统计/项目工时统计.json similarity index 58% rename from Pages/工时/项目工时统计.json rename to Pages/统计/项目工时统计.json index b70ad19f..72521089 100644 --- a/Pages/工时/项目工时统计.json +++ b/Pages/统计/项目工时统计.json @@ -8,27 +8,22 @@ }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 - } - }, - "3": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 40.0 + "DesignLengthInPixel": 10.0 } }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 51.0 + "DesignLengthInPixel": 15.0 } }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 40.0 } }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 51.0 } }, "7": { @@ -72,6 +67,16 @@ } }, "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "17": { "GridRowColumnDefinition": { "DesignLengthInPixel": 272.0, "Mode": 2, @@ -83,21 +88,9 @@ } } }, - "16": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 - } - }, - "17": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 45.0, - "IsHidden": true - } - }, "18": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 45.0, - "IsHidden": true + "DesignLengthInPixel": 15.0 } }, "19": { @@ -117,16 +110,28 @@ "DesignLengthInPixel": 45.0, "IsHidden": true } + }, + "22": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 45.0, + "IsHidden": true + } + }, + "23": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 45.0, + "IsHidden": true + } } }, "InLogicalVisibleIndexes": [ - 17, - 18, 19, 20, - 21 + 21, + 22, + 23 ], - "Count": 22, + "Count": 24, "DefaultSize": 32.0 }, "Cols": { @@ -182,6 +187,11 @@ } }, "38": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "39": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "Mode": 2, @@ -193,11 +203,6 @@ } } }, - "39": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, "40": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 @@ -228,17 +233,183 @@ "DefaultSize": 32.0 }, "Values": { - "1,1": "成员", - "1,13": "日期", + "1,1": "项目", + "1,14": "版本", + "1,27": "成员", "1,40": "导出原始数据", - "17,17": "执行人" - }, - "Formulas": { - "21,1": "EOMONTH(P2,-1)+1", - "21,4": "EOMONTH(P2,0)" + "3,1": "日期", + "19,7": "版本", + "19,20": "执行人" }, "AttachInfos": { "1,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": "7687d81d-449d-4e3c-a70c-4f7a79e12732", + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "ID", + "GUID": "cf462299-b9c3-4e90-ba2d-5545834376c5" + }, + "ColumnName": "value" + }, + { + "GUID": "10531a2d-2299-4ed8-86a5-7eb9cc3e63e3", + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目名称", + "GUID": "53d1c3b7-10f8-4113-a253-f6c45318f947" + }, + "ColumnName": "label" + } + ], + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "multiple": true, + "collapseTags": true, + "filterable": true, + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据", + "clearable": true + } + }, + "1,16": { + "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": "730228ca-6c80-4199-9151-fe154ccfc7b6", + "BindingInfo": { + "TableName": "项目版本", + "ColumnName": "ID", + "GUID": "9f8c48c3-96de-4ed1-b76a-378290c5283e" + }, + "ColumnName": "value" + }, + { + "GUID": "4dc108ce-fae9-4b37-ad00-5fec483e74a4", + "BindingInfo": { + "TableName": "项目版本", + "ColumnName": "名称加版本号", + "GUID": "a6fecdfa-8be2-43cc-ad66-22964bd900fe" + }, + "ColumnName": "label" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目版本", + "ColumnName": "项目ID", + "GUID": "10e6c191-91d0-47cf-836e-f9f111b80d79" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时统计!D2" + } + }, + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据", + "clearable": true + } + }, + "1,29": { "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", "CommandList": [], @@ -288,7 +459,7 @@ "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "用户名", - "GUID": "42be4f00-0008-4171-905b-698786dce77f" + "GUID": "89130a68-01a8-42b5-a67e-0fce60ca00bc" }, "ColumnName": "value" }, @@ -297,7 +468,7 @@ "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "全名", - "GUID": "6a368cdb-08bd-4ba9-9442-ec963bcfcef2" + "GUID": "3e503f9d-8bf8-4f23-b6bd-c5f9a906f542" }, "ColumnName": "label" } @@ -316,10 +487,53 @@ "clearable": true } }, - "1,15": { + "1,40": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ExportListViewToExcelCommand, ServerDesignerCommon", + "ExportExcelListviewNameMode": 1, + "ListViewName": "工时记录导出", + "NewOtherName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=YEAR(项目工时统计!D4)&\"年\"&MONTH(项目工时统计!D4)&\"月份工时记录导出\"" + } + } + ], + "Text": "导出原始数据", + "TemplateKey": "_RS_Main1", + "Icon": { + "Name": "File/348_excel_file_1.svg", + "BuiltIn": true, + "Color": "Background 1", + "UseCellTypeForeColor": true + }, + "IconSize": 14.0 + } + }, + "3,3": { "CellType": { "$type": "ElementUI.DatePickerCellType, ElementUI", - "CommandList": [], + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时统计!D4" + }, + "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "GetSelectedRange", + "RetrunParamNames": { + "StartValue": { + "SerializeProperty": "=项目工时统计!开始日期" + }, + "EndValue": { + "SerializeProperty": "=项目工时统计!结束日期" + } + } + } + ], "UIPermissions": [ { "Scope": 2, @@ -344,7 +558,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=TODAY()" }, - "type": "month", + "type": "daterange", "placeholder": "请选择", "startPlaceholder": "开始日期", "rangeSeparator": "至", @@ -355,32 +569,7 @@ }, "DataValidationInfo": {} }, - "1,40": { - "CellType": { - "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.ExportListViewToExcelCommand, ServerDesignerCommon", - "ExportExcelListviewNameMode": 1, - "ListViewName": "工时记录导出", - "NewOtherName": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=YEAR(项目工时统计!P2)&\"年\"&MONTH(项目工时统计!P2)&\"月份工时记录导出\"" - } - } - ], - "Text": "导出原始数据", - "TemplateKey": "_RS_Main1", - "Icon": { - "Name": "File/348_excel_file_1.svg", - "BuiltIn": true, - "Color": "Background 1", - "UseCellTypeForeColor": true - }, - "IconSize": 14.0 - } - }, - "3,1": { + "5,1": { "CellType": { "$type": "Forguncy.PivotTableCellType, ServerDesignerCommon", "PivotTableSetting": { @@ -391,22 +580,30 @@ "DisplayName": "项目名称", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!E19" + "SerializeProperty": "=项目工时统计!E21" }, "BackgroundValue": { "DatabaseColumnName": "项目ID", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!B19" + "SerializeProperty": "=项目工时统计!B21" } } }, + { + "DatabaseColumnName": "版本", + "DisplayName": "版本", + "ColumnCell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时统计!H21" + } + }, { "DatabaseColumnName": "任务名称", "DisplayName": "任务名称", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!H19" + "SerializeProperty": "=项目工时统计!K21" }, "BackgroundValue": {} }, @@ -415,7 +612,7 @@ "DisplayName": "执行人", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!R19" + "SerializeProperty": "=项目工时统计!U21" }, "BackgroundValue": {} } @@ -426,7 +623,7 @@ "DisplayName": "上报工时", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!O19" + "SerializeProperty": "=项目工时统计!R21" }, "Aggregator": 0, "TotalAggregator": 0, @@ -437,7 +634,7 @@ "DisplayName": "核定工时", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!L19" + "SerializeProperty": "=项目工时统计!O21" }, "Aggregator": 0, "TotalAggregator": 0, @@ -449,49 +646,63 @@ "DatabaseColumnName": "项目ID", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!B19" + "SerializeProperty": "=项目工时统计!B21" } }, { "DatabaseColumnName": "项目名称", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!E19" + "SerializeProperty": "=项目工时统计!E21" } }, { - "DatabaseColumnName": "执行人", + "DatabaseColumnName": "版本", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!R19" + "SerializeProperty": "=项目工时统计!H21" } }, { "DatabaseColumnName": "任务名称", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!H19" + "SerializeProperty": "=项目工时统计!K21" } }, { "DatabaseColumnName": "执行内容", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!J19" + "SerializeProperty": "=项目工时统计!M21" } }, { "DatabaseColumnName": "核定工时", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!L19" + "SerializeProperty": "=项目工时统计!O21" } }, { "DatabaseColumnName": "上报工时", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!O19" + "SerializeProperty": "=项目工时统计!R21" + } + }, + { + "DatabaseColumnName": "执行人", + "ColumnCell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时统计!U21" + } + }, + { + "DatabaseColumnName": "日期", + "ColumnCell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时统计!W21" } } ], @@ -509,24 +720,54 @@ "TemplateKey": "负荷透视表" } }, - "17,1": { + "19,1": { "ListViewInfo": { "Name": "工时记录导出", "TableName": "View_任务工时统计", - "RowIndex": 17, + "RowIndex": 19, "ColumnIndex": 1, "RowCount": 4, "ColumnCount": 43, "SqlCondition": { "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", "SubConditions": [ + { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 8, + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "项目ID", + "GUID": "87e54dfd-b384-4eda-b496-056266f6aa22" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时统计!D2" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "任务ID", + "GUID": "b2b6eb34-75f2-4f45-9b96-b6f25f84d799", + "RelationBinding": { + "RelatedTable": "任务平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "版本" + } + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目工时统计!Q2" + } + }, { "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", "CompareType": 8, "ColumnBindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "执行人", - "GUID": "040f89c1-e0a8-4eb9-82e0-8733baaf7fab" + "GUID": "7aa722ab-665f-447f-b997-9f66261337f2" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -539,7 +780,7 @@ "ColumnBindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "执行人", - "GUID": "3285dff3-66fb-40d6-b4b0-8c5bc7496c4a" + "GUID": "ef230d33-849b-4da4-89cd-ae1049d3e10a" }, "Value": "%Null%" }, @@ -549,7 +790,7 @@ "ColumnBindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "日期", - "GUID": "a979191d-497f-496e-89e9-95bed2381258" + "GUID": "d76f55a2-79d6-490f-94d1-5fee95d37f13" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -562,22 +803,12 @@ "ColumnBindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "日期", - "GUID": "449b0d9e-e95d-4fb5-a3f5-58e178fc95fa" + "GUID": "ef8ee92c-00bb-4946-938a-c728e02305d9" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=项目工时统计!结束日期" } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "CompareType": 2, - "ColumnBindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "核定工时", - "GUID": "76fc500b-76b0-45b7-8118-ea4dafdaf1b9" - }, - "Value": "0" } ] }, @@ -587,7 +818,7 @@ "ColumnBindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "执行人", - "GUID": "77f13305-6e12-4346-81f9-bc38b7263de0" + "GUID": "d61b52b6-30e5-4211-9f3b-9080d66eb367" }, "Order": 0 }, @@ -595,7 +826,7 @@ "ColumnBindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "日期", - "GUID": "28348c55-9dba-48ed-bf2a-dcf24f33e7c6" + "GUID": "c4782df1-a348-456d-8ec7-70da9f6e7533" }, "Order": 0 }, @@ -603,7 +834,7 @@ "ColumnBindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "项目名称", - "GUID": "5d0ee855-191a-4dc4-9db3-285643d1bfa5" + "GUID": "b4715d1c-691d-4b9b-8fea-d5c92850f682" }, "Order": 0 }, @@ -611,7 +842,7 @@ "ColumnBindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "任务名称", - "GUID": "79aa2544-0373-40d8-a806-87515b1f00c0" + "GUID": "f94083ef-7eb4-4ff7-a77c-4e876e0ab48c" }, "Order": 0 } @@ -625,7 +856,7 @@ "ColumnOperation": 2 } }, - "18,1": { + "20,1": { "NameUsedInJavaScript": "项目ID", "BindingInfo": { "TableName": "View_任务工时统计", @@ -633,7 +864,7 @@ "GUID": "4c5e05c2-d741-46d7-b67e-fc82a0b7245e" } }, - "18,4": { + "20,4": { "NameUsedInJavaScript": "项目名称", "BindingInfo": { "TableName": "View_任务工时统计", @@ -641,7 +872,25 @@ "GUID": "4ce7785c-7d3f-4c81-8fa6-e38d8dbfd890" } }, - "18,7": { + "20,7": { + "NameUsedInJavaScript": "版本", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "任务ID", + "GUID": "a430ae72-ce59-4693-a50c-12b2df544d80", + "RelationBinding": { + "RelatedTable": "任务平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "版本", + "NextRelationBinding": { + "RelatedTable": "项目版本", + "RelatedColumn": "ID", + "DisplayColumn": "名称加版本号" + } + } + } + }, + "20,10": { "NameUsedInJavaScript": "任务名称", "BindingInfo": { "TableName": "View_任务工时统计", @@ -649,7 +898,7 @@ "GUID": "afb9caf7-f991-4227-b161-81870d0ebabf" } }, - "18,9": { + "20,12": { "NameUsedInJavaScript": "执行内容", "BindingInfo": { "TableName": "View_任务工时统计", @@ -657,7 +906,7 @@ "GUID": "c80af3e4-f582-44b4-b666-8c4f2a65ad9d" } }, - "18,11": { + "20,14": { "NameUsedInJavaScript": "核定工时", "BindingInfo": { "TableName": "View_任务工时统计", @@ -665,7 +914,7 @@ "GUID": "901bde3d-3616-4efb-adfa-3adfbdeabcf5" } }, - "18,14": { + "20,17": { "NameUsedInJavaScript": "上报工时", "BindingInfo": { "TableName": "View_任务工时统计", @@ -673,7 +922,7 @@ "GUID": "ac0c7db2-a585-46ad-a59c-47e86ea236c3" } }, - "18,17": { + "20,20": { "NameUsedInJavaScript": "执行人", "BindingInfo": { "TableName": "View_任务工时统计", @@ -685,7 +934,7 @@ } } }, - "18,19": { + "20,22": { "NameUsedInJavaScript": "日期", "BindingInfo": { "TableName": "View_任务工时统计", @@ -720,96 +969,137 @@ ] }, "CellStyles": { - "1,3": 0, - "1,13": 1, + "1,1": 0, + "1,2": 0, "1,14": 0, "1,15": 0, "1,16": 0, - "1,17": 0, - "1,18": 0, - "1,19": 0, - "1,20": 0, - "1,21": 0, - "1,22": 0, - "1,23": 0, - "1,24": 0, - "1,25": 0, - "1,26": 0, "1,27": 0, "1,28": 0, - "1,30": 1, + "1,29": 0, + "1,30": 0, "1,31": 0, - "3,1": 2, - "17,1": 2, - "17,7": 0, - "17,8": 0, - "17,9": 0, - "17,10": 0, - "17,11": 0, - "17,12": 0, - "17,13": 0, - "17,14": 0, - "17,15": 0, - "17,16": 0, - "17,17": 0, - "17,18": 0, - "17,22": 3, - "17,23": 3, - "17,24": 3, - "17,25": 3, - "17,26": 3, - "17,27": 3, - "17,28": 3, - "17,29": 3, - "17,30": 3, - "17,31": 3, - "17,32": 3, - "17,33": 3, - "17,34": 3, - "17,35": 3, - "17,36": 3, - "17,37": 3, - "17,38": 3, - "17,39": 3, - "17,40": 3, - "17,41": 3, - "17,42": 3, - "17,43": 3, - "18,1": 2, - "18,7": 0, - "18,8": 0, - "18,9": 0, - "18,10": 0, - "18,11": 0, - "18,12": 0, - "18,13": 0, - "18,14": 0, - "18,15": 0, - "18,16": 0, - "18,17": 0, - "18,18": 0, - "18,22": 3, - "18,23": 3, - "18,24": 3, - "18,25": 3, - "18,26": 3, - "18,27": 3, - "18,28": 3, - "18,29": 3, - "18,30": 3, - "18,31": 3, - "18,32": 3, - "18,33": 3, - "18,34": 3, - "18,35": 3, - "18,36": 3, - "18,37": 3, - "18,38": 3, - "18,39": 3, - "18,40": 3, - "18,41": 3, - "18,42": 3, - "18,43": 3 + "1,32": 0, + "1,33": 0, + "1,34": 0, + "1,35": 0, + "1,36": 0, + "1,37": 0, + "1,38": 0, + "2,1": 0, + "2,2": 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": 1, + "2,23": 1, + "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, + "3,1": 1, + "3,2": 0, + "3,3": 0, + "3,26": 0, + "3,27": 0, + "3,28": 0, + "3,29": 0, + "3,30": 0, + "3,31": 0, + "3,32": 0, + "3,33": 0, + "3,34": 0, + "3,35": 0, + "3,36": 0, + "3,37": 0, + "5,1": 2, + "19,1": 2, + "19,7": 0, + "19,8": 0, + "19,9": 0, + "19,10": 0, + "19,11": 0, + "19,12": 0, + "19,13": 0, + "19,14": 0, + "19,15": 0, + "19,16": 0, + "19,17": 0, + "19,18": 0, + "19,19": 0, + "19,20": 0, + "19,21": 0, + "19,22": 0, + "19,23": 0, + "19,24": 0, + "19,28": 3, + "19,29": 3, + "19,30": 3, + "19,31": 3, + "19,32": 3, + "19,33": 3, + "19,34": 3, + "19,35": 3, + "19,36": 3, + "19,37": 3, + "19,38": 3, + "19,39": 3, + "19,40": 3, + "19,41": 3, + "19,42": 3, + "19,43": 3, + "20,1": 2, + "20,7": 0, + "20,8": 0, + "20,9": 0, + "20,10": 0, + "20,11": 0, + "20,12": 0, + "20,13": 0, + "20,14": 0, + "20,15": 0, + "20,16": 0, + "20,17": 0, + "20,18": 0, + "20,19": 0, + "20,20": 0, + "20,21": 0, + "20,22": 0, + "20,23": 0, + "20,24": 0, + "20,28": 3, + "20,29": 3, + "20,30": 3, + "20,31": 3, + "20,32": 3, + "20,33": 3, + "20,34": 3, + "20,35": 3, + "20,36": 3, + "20,37": 3, + "20,38": 3, + "20,39": 3, + "20,40": 3, + "20,41": 3, + "20,42": 3, + "20,43": 3 }, "SheetStyle": { "FontFamily": 0, @@ -817,31 +1107,37 @@ } }, "Spans": [ - "3,1,13,43", - "1,1,1,2", - "1,13,1,2", - "1,15,1,14", - "1,3,1,9", - "19,1,2,43", + "5,1,13,43", "1,40,1,4", - "18,1,1,3", - "18,4,1,3", - "21,1,1,3", - "21,4,1,3", - "18,7,1,2", - "18,9,1,2", - "18,11,1,3", - "18,14,1,3", - "18,17,1,2", - "17,1,1,3", - "17,4,1,3", - "17,7,1,2", - "17,9,1,2", - "17,11,1,3", - "17,14,1,3", - "17,17,1,2", - "18,19,1,3", - "17,19,1,3" + "20,1,1,3", + "20,4,1,3", + "23,1,1,3", + "23,4,1,3", + "1,1,1,2", + "21,1,2,43", + "3,1,1,2", + "1,14,1,2", + "1,3,1,10", + "1,16,1,10", + "1,27,1,2", + "1,29,1,10", + "20,10,1,2", + "20,12,1,2", + "20,14,1,3", + "20,17,1,3", + "20,20,1,2", + "20,7,1,3", + "20,22,1,3", + "19,1,1,3", + "19,4,1,3", + "19,7,1,3", + "19,10,1,2", + "19,12,1,2", + "19,14,1,3", + "19,17,1,3", + "19,20,1,2", + "19,22,1,3", + "3,3,1,23" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -870,15 +1166,15 @@ "CustomNames": [ { "Name": "成员", - "Formula": "项目工时统计!$D$2" + "Formula": "项目工时统计!$AD$2" }, { "Name": "开始日期", - "Formula": "项目工时统计!$B$22" + "Formula": "项目工时统计!$B$24" }, { "Name": "结束日期", - "Formula": "项目工时统计!$E$22" + "Formula": "项目工时统计!$E$24" } ] -}//TqqgG75qui4GWMiZqnt2/eNxn4EfBLt6oFSwAfBbxXtxLA75VmBQIIL3OkzHsra8nmPSFYMAxfSRDj4geRigLccWXiY0zKaeHEmRIgluGILqcyJ05Q3zK8JpjCHYX/Yh+GKzctiEeyOWK/LfM+6feGmVIq9zp71xLyET8XsuIR8c5cfYgBLBVd3QUeioeRd3CF4rgMe8kxZjscj4Fw/8rVKMq5UXnLQEu6Kuz7LrY1ge81Nphr8aS3lRldTQZ6lG/UnVAxQ4cRflrnR99UwmXy8MHkQFTjuG7HudHa/p8fOa7sQUm/XezD3vJ52VnQzm6A8CgccJBwT171d0S9cR2T5h33heGXaAIvqomf2+O7xp8cW9ikEOJJRn80RrjaK7iGxXapNerC9yrcnfDZMlJqW9YJ450jd/lEHAf4ddItYcM7QydeH+Uy8sbQa5H6U0oOWd/wLXzjE86n93ENkYqMAmOr9xRwEK3nvdsgiVHXJPmkeQ7naF4O998+6cJ1YFIqMnoiV1cUoCY341sELx8GAlD5olCO6grm1Ne3JM5dAUbR2uM2EgDit4TQkXeKWqur8dMQZ9U4dYxb8WmNiSNGVQ7kbE39MheWJeymruSC0x+3OtvS/flHtjNgG1ZB4JrBhna6s5QMiij3AUF0Nx5C/f3jbOhYjgU9ConBhAcs25zLqyYJhlH8WjDjymFcHZrGgxc0dsAdg47jbnHfIVZX2KSghnprEaNx4/yD1nB52hi2HGRUt12FbAy5irGSJp+fFYjsgbKdooPpzYrUPXYLIPFGpcSscpz+0jZd1I1Hgcy9DMoLfVZ1r4s47HdLMt9KQtIsJIRAPfpvUtsUgJo3JckjxYuQkomzwJCwIM5kbRqy/8KyM7jO6NOeyYopPk5PJ8MD+suEZ75YTIzyed0Q==|920 \ No newline at end of file +}//MS+jCh5Xh4jj00Mkul1KFKPwldDsMn6+ZcgtuKVLpOExymnl2zm412qIxL9LWzoFdTqSJBbgkL2rAjVgkLs8sctIsKZgDGH/uZcLrYMnAOxYuAQgSan8dLMJUOvAstqwUon1aV4Bq/K6COY2lJHNUYvjMntrBEji6TlaZ1CXfZNkbMejURbAXeYDvo1W0Z71zdUCkRMRzEDDZ0eQ5YjM6iy3d+40qL8gjBFFnDmzrKJlcxGrMAgyam8ppq5mAw6AYwj7uivpsMc++pBxK+HxyvbHlRFQnom3mjbd2hxUck65EzVCHpuHvvAD/oTXmttHx0ROsIFR1+qLqYmKw9ocTCBjl18jugGY+4JkArZDt+EtiGdBnuqRNcDl20ydWFmNowznk/I0V474VzltnxlN8RxH0sQkp3/RDy967H2fv9aO719i2CcCAZ9cu2i5jQ3sr1a9bdsJeUzkSDK6YuSDMIXktkdzaIYifHIIC4Hzs+v3kToNNpxmlGfR0QGJwOT9DkrVrpyarZVwGxRVH/dDWAQ2Ko1m+aJphBiE/1Xv4V5GFXhmvpNzGITTGjw/eZerMSGW1G1pjBxMHUISROpI1oelvsHqQffhUB+BqBZF4BGNMxHsnkza/fWtwFfZ6eD50dzwcOomybM10P1gND+ZzCtGtOdikJaPFpYSs+oc1Tl9U3uqW6RPlL/1mZ0pPs9YWr4zcADxFRQveGr9PN/v9EmD0T3+f2M6kWLMKV6jOfdxc7EQo+cA4uvKddVzcaH2SV6gE/soHI0hw/BGQSeugwpOJJ8/O1vLvKmhu/sRZ8gP1aXyeh4ZJGbo3rJWXFWJg5qvNb4nPyVx3KVG+Wo+wIL5XectiV+edURQT6yacuB2ueyhB79y2uCkMv2LWkoKcqu6KyganxAayXI+bJjHZQ==|920 \ No newline at end of file diff --git a/Pages/统计/项目工时统计.rd b/Pages/统计/项目工时统计.rd new file mode 100644 index 00000000..fda8b7c3 --- /dev/null +++ b/Pages/统计/项目工时统计.rd @@ -0,0 +1,19 @@ +{ + "PageType": 0, + "ColumnCount": 45, + "RowCount": 24, + "CustomNames": [ + { + "Name": "成员", + "Formula": "项目工时统计!$AD$2" + }, + { + "Name": "开始日期", + "Formula": "项目工时统计!$B$24" + }, + { + "Name": "结束日期", + "Formula": "项目工时统计!$E$24" + } + ] +} \ No newline at end of file