From f19e78a55496e45e4c17621f530730ebf4f157a0 Mon Sep 17 00:00:00 2001 From: "SHAMUSPC\\NINGMEI" Date: Thu, 28 Mar 2024 14:23:57 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E5=A2=9E=E5=8A=A0=E5=B7=A5?= =?UTF-8?q?=E6=97=B6=E6=8A=A5=E8=A1=A8","MessageType":2,"Modules":[{"State?= =?UTF-8?q?":1,"Type":23,"Name":"TableView/View=5F=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=B7=A5=E6=97=B6=E7=BB=9F=E8=AE=A1"},{"State":1,"Type":23,"Na?= =?UTF-8?q?me":"TableView/=E4=BA=BA=E5=91=98=E5=B7=A5=E6=97=B6=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E8=A7=86=E5=9B=BE"},{"State":1,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E9=A1=B9=E7=9B=AE=E5=B7=A5=E6=97=B6"},{"State":1,"Type":1,"N?= =?UTF-8?q?ame":"PCPage/=E9=A1=B9=E7=9B=AE=E6=A6=82=E5=86=B5"},{"State":1,?= =?UTF-8?q?"Type":1,"Name":"PCPage/=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8"},?= =?UTF-8?q?{"State":1,"Type":3,"Name":"MasterPCPage/FGC=5F=E6=AF=8D?= =?UTF-8?q?=E7=89=88=E9=A1=B5"},{"State":1,"Type":8,"Name":"ApplicationSet?= =?UTF-8?q?ting"},{"State":1,"Type":9,"Name":"Theme"},{"State":1,"Type":40?= =?UTF-8?q?,"Name":"Plugin"},{"State":1,"Type":1,"Name":"PCPage/=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E4=B8=AD=E5=BF=83"},{"State":1,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E9=A1=B9=E7=9B=AE=E8=B4=9F=E8=8D=B7"},{"State":1,"Type":1,"N?= =?UTF-8?q?ame":"PCPage/=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86"},{"State":1,?= =?UTF-8?q?"Type":7,"Name":"Table/=E6=B1=87=E6=8A=A5=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E8=A1=A8"},{"State":1,"Type":1,"Name":"PCPage/=E6=B1=87?= =?UTF-8?q?=E6=8A=A5=E7=AE=A1=E7=90=86"},{"State":1,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E6=B1=87=E6=8A=A5=E8=AF=A6=E6=83=85=E9=A2=84=E8=A7=88"},{"St?= =?UTF-8?q?ate":1,"Type":1,"Name":"PCPage/=E6=B1=87=E6=8A=A5=E8=AF=A6?= =?UTF-8?q?=E6=83=85"},{"State":1,"Type":1,"Name":"PCPage/=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=B1=87=E6=8A=A5=E6=95=B0=E6=8D=AE"},{"State":1,"Typ?= =?UTF-8?q?e":1,"Name":"PCPage/=E5=B7=A5=E6=97=B6=E6=8A=A5=E8=A1=A8"},{"St?= =?UTF-8?q?ate":3,"Type":18,"Name":"RdlReport/=E5=B7=A5=E6=97=B6=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 248 +------ ApplicationSettings.json | 4 + MasterPages/FGC_母版页.json | 28 +- Pages/484d3ed119274a60bf32f15d178cf60.json | 79 ++- Pages/个人中心/个人中心.json | 282 +++++++- Pages/客户/客户管理.json | 39 +- Pages/工时/工时报表.json | 56 +- Pages/工时/工时报表.rd | 2 +- Pages/汇报/导入汇报数据.json | 299 +++++--- Pages/汇报/导入汇报数据.rd | 4 +- Pages/汇报/汇报管理.json | 670 +++++++++++------- Pages/汇报/汇报管理.rd | 12 +- Pages/汇报/汇报详情.json | 35 +- Pages/汇报/汇报详情预览.json | 8 +- Pages/项目/项目列表.json | 42 +- .../项目首页/项目首页-容器页面/项目工时.json | 18 +- .../项目首页/项目首页-容器页面/项目概况.json | 10 +- .../项目首页/项目首页-容器页面/项目负荷.json | 36 +- Plugin/可交互的页面容器（iFrame）-8_0_0_0.zip | Bin 0 -> 44528 bytes Reports/工时报表.json | 106 +++ Reports/工时报表.rdlx | 1 + Tables/工时/View_任务工时统计.json | 41 +- Tables/工时/人员工时统计视图.json | 16 +- Tables/汇报/汇报记录表.json | 4 +- Theme/ListViewStyles | 2 +- favicon.ico | Bin 29877 -> 1150 bytes 26 files changed, 1321 insertions(+), 721 deletions(-) create mode 100644 Plugin/可交互的页面容器（iFrame）-8_0_0_0.zip create mode 100644 Reports/工时报表.json create mode 100644 Reports/工时报表.rdlx diff --git a/.collaboration b/.collaboration index aeb6d83e..dc5b2f47 100644 --- a/.collaboration +++ b/.collaboration @@ -61,29 +61,11 @@ }, { "ModuleName": "TableView/View_任务工时统计", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T10:02:56.7465038+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\工时\\View_任务工时统计.json" - ] + "ModuleType": 23 }, { "ModuleName": "TableView/人员工时统计视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T10:04:06.4542937+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\工时\\人员工时统计视图.json" - ] + "ModuleType": 23 }, { "ModuleName": "Table/任务工时表", @@ -488,19 +470,7 @@ }, { "ModuleName": "PCPage/项目工时", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T10:03:30.6456612+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目工时.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目工时.rd", - "Pages\\57e644c056074f9d885f24a5bd7b4ae.json", - "Pages\\57e644c056074f9d885f24a5bd7b4ae.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目成员统计", @@ -512,17 +482,7 @@ }, { "ModuleName": "PCPage/项目概况", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T10:03:10.9064244+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目概况.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目概况.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目甘特图", @@ -542,21 +502,7 @@ }, { "ModuleName": "PCPage/项目列表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T09:03:06.8919178+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目列表.json", - "Pages\\项目\\项目列表.rd", - "Pages\\8ee6eff0b74d43ef8e54cd3ef782f76.json", - "Pages\\8ee6eff0b74d43ef8e54cd3ef782f76.rd", - "Pages\\b90932e038f94707b54e571ff7cd84d.json", - "Pages\\b90932e038f94707b54e571ff7cd84d.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目审批", @@ -580,17 +526,7 @@ }, { "ModuleName": "MasterPCPage/FGC_母版页", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T09:19:08.6438197+08:00", - "ModuleType": 3, - "ToRemoveFiles": [ - "MasterPages\\FGC_母版页.json", - "MasterPages\\FGC_母版页.rd" - ] + "ModuleType": 3 }, { "ModuleName": "UserControlPage/工时记录列表", @@ -662,34 +598,11 @@ }, { "ModuleName": "ApplicationSetting", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T09:04:47.0965361+08:00", - "ModuleType": 8, - "ToRemoveFiles": [ - "ApplicationSettings.json", - "favicon.ico" - ] + "ModuleType": 8 }, { "ModuleName": "Theme", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T08:45:51.4127627+08:00", - "ModuleType": 9, - "ToRemoveFiles": [ - "Theme\\CellTypeStyles", - "Theme\\ListViewStyles", - "Theme\\StyleDefaultNames", - "Theme\\ThemeConfig", - "Reports\\DefaultTheme.rdlx-theme" - ] + "ModuleType": 9 }, { "ModuleName": "image/内置图片", @@ -881,35 +794,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T14:23:51.1189704+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\Echarts图表-10_0_0_0.zip", - "Plugin\\Editormd-6_0_102_0.zip", - "Plugin\\JSON数据源-10_0_0_0.zip", - "Plugin\\Microsoft SQL Server-10_0_0_0.zip", - "Plugin\\Notiflix-9_0_103_0(1).zip", - "Plugin\\PC组件包-ElementPlus-10_0_0_0.zip", - "Plugin\\Tiny富文本编辑器-10_0_0_0.zip", - "Plugin\\加载动画-10_0_0_0.zip", - "Plugin\\增强关闭页面-9_0_6.zip", - "Plugin\\复制到剪贴板-7_0_3_0.zip", - "Plugin\\客户端缓存操作工具库-8_0_0_0.zip", - "Plugin\\富文本编辑器-10_0_0_0.zip", - "Plugin\\对象与集合操作工具-8_0_0_0(1).zip", - "Plugin\\支持预览的附件上传-10_0_0_0.zip", - "Plugin\\甘特图-10_0_0_0.zip", - "Plugin\\用户管理命令 V2-10_0_0_0.zip", - "Plugin\\自定义菜单类型和树类型-10_0_0_0.zip", - "Plugin\\表格数据传递命令-10_0_0_0.zip", - "Plugin\\设置当前行命令-10_0_0_0.zip", - "Plugin\\设置焦点命令-10_0_0_0.zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", @@ -997,17 +882,7 @@ }, { "ModuleName": "PCPage/个人中心", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T10:11:55.0088408+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\个人中心\\个人中心.json", - "Pages\\个人中心\\个人中心.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/流程中心", @@ -1103,17 +978,7 @@ }, { "ModuleName": "PCPage/项目负荷", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T10:03:19.1052614+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目负荷.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目负荷.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目负荷子页面", @@ -1244,17 +1109,7 @@ }, { "ModuleName": "PCPage/客户管理", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T09:01:55.5200386+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\客户\\客户管理.json", - "Pages\\客户\\客户管理.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/客户信息子页面", @@ -1278,16 +1133,7 @@ }, { "ModuleName": "Table/汇报记录表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T08:52:11.5167598+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\汇报\\汇报记录表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/汇报子表", @@ -1299,47 +1145,15 @@ }, { "ModuleName": "PCPage/汇报管理", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T08:40:33.3061628+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\汇报管理.json", - "Pages\\汇报\\汇报管理.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/汇报详情预览", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T08:52:28.5250676+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\汇报详情预览.json", - "Pages\\汇报\\汇报详情预览.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/汇报详情", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T08:37:52.0808897+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\汇报详情.json", - "Pages\\汇报\\汇报详情.rd", - "Pages\\484d3ed119274a60bf32f15d178cf60.json", - "Pages\\484d3ed119274a60bf32f15d178cf60.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Image/展开 (1).svg", @@ -1359,17 +1173,7 @@ }, { "ModuleName": "PCPage/导入汇报数据", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T08:45:51.41296+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\导入汇报数据.json", - "Pages\\汇报\\导入汇报数据.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/工时", @@ -1377,26 +1181,10 @@ }, { "ModuleName": "PCPage/工时报表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T09:20:09.3369716+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\工时\\工时报表.json", - "Pages\\工时\\工时报表.rd" - ] + "ModuleType": 1 }, { "ModuleName": "RdlReport/工时报表", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T09:07:26.2150066+08:00", "ModuleType": 18 } ] \ No newline at end of file diff --git a/ApplicationSettings.json b/ApplicationSettings.json index 82483fc4..cab8888d 100644 --- a/ApplicationSettings.json +++ b/ApplicationSettings.json @@ -11,8 +11,12 @@ "ProcessDataConnectionSet": { "ExternalDatabaseId": "业务表" }, + "StartPage": "项目列表", "StartDateFiscalYear": 1, "BaseOnStartingMonth": true, + "SuppressedWarningMessages": [ + "数据表, 有部分连接到外部数据库的数据表没有检查过连接状态，如果无法连接到数据库可能会导致数据无法在页面上显示。如需确认数据库的连接状态，请点击数据表右键菜单里的“刷新”" + ], "KeepMasterPage": false, "NameConflictPolicy": 1, "PageLoadingMode": 2, diff --git a/MasterPages/FGC_母版页.json b/MasterPages/FGC_母版页.json index 676a7ef4..0c7a869e 100644 --- a/MasterPages/FGC_母版页.json +++ b/MasterPages/FGC_母版页.json @@ -147,6 +147,17 @@ "$type": "Forguncy.CustomMenu.ForguncyMenuCellType, Forguncy.CustomMenu", "TemplateKey": "透明菜单", "Items": [ + { + "Value": "菜单1", + "Text": "工作台", + "SelectedIconColor": "Background 1", + "SelectedIconColorUseItemColor": true, + "IconColorUseItemColor": true, + "IsOldMenuPath": false, + "CanVisitRoleList": [ + "FGC_LoginUser" + ] + }, { "Text": "项目", "SelectedIconColor": "Background 1", @@ -185,10 +196,21 @@ "SelectedIconColorUseItemColor": true, "IconColorUseItemColor": true, "IsOldMenuPath": false, + "CommandList": [ + { + "$type": "Forguncy.Model.OpenActiveReportCommand, ServerDesignerCommon", + "SessionGuid": "eeb52fc5-ed99-45d4-bcb2-f559ed8f8487", + "OpenReportName": "工时报表", + "Disabled": true + }, + { + "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon", + "PageName": "工时报表" + } + ], "CanVisitRoleList": [ "FGC_LoginUser" - ], - "Notification": "维" + ] }, { "Text": "汇报", @@ -817,4 +839,4 @@ "Formula": "FGC_母版页!$A$7" } ] -}//SdDNbbRKUdIEFj2QmI258rufvVrqGHnfO1qfHlpN+sGzuo53jTmrbc9SvaPmBK5lDay/p/nxX57s0y1IF3EssG90mRLTNjLrIKYyJTz78SGhI6jSyacHKCQn1O28Om6HIhpHZ5mL02tDbf30WlgvNhDejNw8Jc/+UjC2O6GZHk+OPfJKbcRfzgw6CZjN2gJGvXiMSkosiNcilATLxDph909FRmJDSSbTn5WyClZyUvJeYx+bh/C7EpufYXOyRz0gpNYIAgUMprfPD9iS2KAN2f72TtLLC7IRMmk3L0ureT5b6TE7SPNJhGSVg4jlohqPSVLOUCLp/b3/qD5hnROiGo7XbcU+e4/7fxvr0q4dTtMfoUtJTN4Sf3c5K3a0oUbqRKgO26pNfwVdzVTRu0BInrQLOCLLL/iPR8JZ5wyCIqPCOa8aqHfYrd233zVslNK2RHvaJwg6jjDTR9JvokRP3LfQwJSI/tOoRcrc+sfKY0zvqp1iqopjJlZuZZO2dr5nw9gfImCyozKoD4cdTHOVxk5oM0gTQ9v1IjMwDn8MUSG8dtgQ3DV7l4hU9q/E1JtvgDmg+13KwU6nIiEibyoVimt4rPn5MfPeRDPNsJJ6XPoZSbyFDgvfEmTKh3sAp6yAZCoql0kByBiAKt6Pb/FqI1tzx23I/f7lsvoQwYuS0XDbRoP+1FhzURF1dU+AgoAWF8Fwicr9vD0DXMhRsP1WmY1t3I4oKi6QcSLLKC6aikzgCcdbL1sXxqN+zMqEa8d8jsqSEL2GXBvG0r4N6RTmAi0w/D8gobQ9RtHn3411AH3tXevsTjtIsvf1jYY/gSEkgUQvdBTwfgvB0sIEfvnFmxTFmyaFH+5eH9AVBWoqdXfO03RQhG5z1zmLTyr3bxu3HE91PPMGlUqiyc+kztM2FQ==|920 \ No newline at end of file +}//MSc1l884wzZUuYEBe+n1kp2eSD80yU6naHVyV1m88FGFYeWPBKwdetaKidkkNBvmE0IXwcQ3c06bhKZITNrqUWpVnc/rVbDVuaPIQNpSQroJlr8etOIG684y53/MarbEkxX4sd/SVo2UDJ3pIZYAH4CO0TBwlPclue+yR2nwe/GAT4Rfi6ATiqaDZ6LLIivZOsQQN2sN94E/ib0LQA0qHR4b0l7a2MhRWXrFGcrCH/8udVyPRl1ZCyzshw/AsN/uQSzpsXvTqDGQEwDn/u1FXMAR57qge9o1GXOIxX9TU9Z2Zk8BN8mgkcayh6L9o2JzlPS+7kKUBHg/uxa9D0fyh6p4y9jo5IKyqmptdgYGMg2HWfCX5zqJOYjiVWElToHZmwaWK7+L6Q0vjjmX5cHqzuSg2+gPWandr4LQoElFPGtCBNeJ13oanCYSdkbmOSa4ARJ+AfGbX3kaI7LNSowgVxEZtuRLpfIJOiWn5fl26lZkRkH/GXuBh0lYi1st2TDMmkV+sHrPLEI4rTkAS9DIAp/ioPovbJWGAQ8LbWCcfGnOgiHUDNiBY5ejUHvvcQz/68gf9T324Kx3MQ2StO5jasRqnalFqaYV1oz0IyJPTk9MJzsdc+RU9od47AcZjrSnz8AUWFxYqilUSH6SI0vDsNizQ6d/CdJFnuc0JkK5hkrJg1h64oyFyKkx5BKJo9K9+emrHexT0t2DbDCjIa72D1X9vN/S6iWSzAfIFstHpu7Hf9RFQIv5Nd4KKDEDH73BXXS/WwD7RsdNsg2QzQtVDSjHdvyAWDyL60GoymaSlZnQGfqE5NS8Go9XfXIpRI6U2NIh1f/IET83L4Hf/C94/4YKMM1A1bh8H3rSYcyqmtYovrL+zM0+PsP8XSTFQ32XUtFaua3t+su0wsuywNKQJw==|920 \ No newline at end of file diff --git a/Pages/484d3ed119274a60bf32f15d178cf60.json b/Pages/484d3ed119274a60bf32f15d178cf60.json index d1dc67d0..f18cdf40 100644 --- a/Pages/484d3ed119274a60bf32f15d178cf60.json +++ b/Pages/484d3ed119274a60bf32f15d178cf60.json @@ -194,6 +194,7 @@ "2,1": "类型", "2,2": "*", "2,5": "日报", + "2,10": "*日报指的是昨日的工作总结，计划为今日工作安排", "4,1": "内容", "4,2": "*", "7,1": "工时", @@ -266,11 +267,11 @@ "Items": [ { "Value": "日报", - "DisplayValue": "昨日汇报" + "DisplayValue": "日报" }, { "Value": "计划", - "DisplayValue": "今日计划" + "DisplayValue": "计划" } ] }, @@ -908,7 +909,7 @@ "MethodName": "ExecuteCommand" } ], - "ID": "ad7ce55a-bebc-467a-a268-9f55d1fbc7c4" + "ID": "90a168e9-a589-46fe-a08b-9fad9fb0a8f7" }, { "CommandList": [ @@ -922,7 +923,7 @@ "MethodName": "ExecuteCommand" } ], - "ID": "b9c96142-654d-4ca2-9d1d-2b8809820d9a" + "ID": "99f3aa9c-4493-4dbe-ba32-7f9edf124317" } ] } @@ -971,8 +972,8 @@ }, { "FontFamily": 1, - "FontSize": 13.333333333333332, - "Formatter": 5 + "FontSize": 12.0, + "Foreground": 8 }, { "FontFamily": 1 @@ -980,9 +981,7 @@ { "FontFamily": 1, "FontSize": 13.333333333333332, - "Foreground": 8, - "Formatter": 5, - "HorizontalAlignment": 6 + "Formatter": 5 }, { "FontFamily": 1, @@ -992,7 +991,14 @@ "HorizontalAlignment": 6 }, { - "Formatter": 10 + "FontFamily": 1, + "FontSize": 13.333333333333332, + "Foreground": 10, + "Formatter": 5, + "HorizontalAlignment": 6 + }, + { + "Formatter": 11 } ], "Types": { @@ -1005,6 +1011,7 @@ "[AUTO]General", "Center", "#FFFF0000", + "Background 2 -10", "Accent 4 0", "Accent 1 0", "@" @@ -1019,34 +1026,43 @@ "2,1": 4, "2,2": 5, "2,5": 6, - "2,18": 6, + "2,10": 7, + "2,11": 8, + "2,12": 8, + "2,13": 8, + "2,14": 8, + "2,15": 8, + "2,16": 8, + "2,17": 8, + "2,18": 8, + "2,19": 8, "2,21": 3, - "4,1": 7, + "4,1": 9, "4,2": 5, "4,3": 8, "4,5": 6, - "7,1": 7, + "7,1": 9, "7,2": 5, "7,3": 8, "7,5": 4, "9,0": 8, - "9,1": 7, + "9,1": 9, "9,2": 8, "9,3": 8, "9,4": 8, "9,5": 6, "9,22": 8, "11,0": 8, - "11,1": 7, + "11,1": 9, "11,2": 8, "11,3": 8, "11,4": 8, "11,5": 6, "11,22": 8, "12,0": 8, - "12,1": 7, - "12,2": 7, - "12,3": 7, + "12,1": 9, + "12,2": 9, + "12,3": 9, "12,4": 8, "12,5": 6, "12,6": 6, @@ -1067,23 +1083,23 @@ "12,21": 6, "12,22": 8, "13,0": 8, - "13,1": 9, + "13,1": 10, "13,2": 8, "13,3": 8, - "13,18": 9, - "13,19": 10, + "13,18": 10, + "13,19": 11, "13,20": 8, "13,21": 8, "13,22": 8, "14,0": 8, - "14,1": 9, - "14,2": 9, - "14,3": 9, - "14,19": 10, - "14,20": 10, - "14,21": 10, + "14,1": 10, + "14,2": 10, + "14,3": 10, + "14,19": 11, + "14,20": 11, + "14,21": 11, "14,22": 8, - "15,1": 11 + "15,1": 12 }, "SheetStyle": { "FontFamily": 1 @@ -1094,14 +1110,15 @@ "7,5,1,17", "11,1,1,3", "11,5,1,17", - "2,5,1,13", "9,1,1,3", "9,5,1,17", "13,1,1,3", "13,19,1,3", "1,1,1,13", "15,1,1,3", - "1,16,1,3" + "1,16,1,3", + "2,10,1,10", + "2,5,1,5" ], "PageInfo": { "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon", @@ -1130,4 +1147,4 @@ "PaperSize": {}, "Margin": {} } -}//0exSiHXMa2+Hnzm27IVndiBgIuQeuywBycmGEuKPgNDX4JbTi88yg9ClF7bD3jIR0MHAyY0IGTBhQcfDVeU6teH6KeVFaHbAcBuCb/uiHSZg9FAWh2ffXKgbXnS/s8K+/aqD1Bzqgiq1NrN1FISX6PpLR1aOCKThCqETrnOx9NOzFwfV9ek9NeZvoUwQFAhBZYhXApN72h+vOFJc3yL0k1ybtOkVWvRc9hK9o1Lle+ARFwhgRORc9mIpucNa0fR4VUjnSw2gPh48tS19IxA5wKn/RD+T/kjbiQoSmmrZO0NGmjuvAVvkcbw/6K3g3+Pb0XMlFFotnEDwhMHNeJBVreNjZMgtXa7vSIT/J5DtSHcAu7+To6QpS6v36OajZRKC3o+oicnTW/P5Z6oVQoHC6eXTemh05i+Ea21a2MTp+PUfKbiQmCeA27i9eJLSmFdKh0ES1g/rzJhe8RUoNd4F51EFnxyXxyBPdk+q3OeI5JrkD9wwRohct/BV5uBclcRwfJENLEluUuuE6gWVyDiBfrzCRIdg8U1O3Fv0/7+e/O5mD44Z/7XvgoNqUrD43+6FelwUgiP6XhuzJO+9PTUlNXHurMJbImIaiWtIvkQ+99sN4tFUlHEdsl5ZUp3AAtbBAUouxBbwUwZXCTLC+7fX4fkApKorTMaAPu/YPBRgA8bg1nUh8tmdUKF/rFlteOIDoI0BlguMpduD3yFJ1YkWNew6AuJqmGGkXlDQWZO4HfsicVE71S7RklFlPUUlImuss/otjCPeR/q1bT98L36vpXohuDzvWErjr1TK3sSIsFchpBO+IE/8RkzDVqjoDui/qZzApbMedX9Dq6ulNSeVwJ0zZE+LF/HRKKhBLHV5IdgF3Frn8Nyu1Em1Gd01xexEdjJPYhAD5ao/1U4eo6klHA==|920 \ No newline at end of file +}//DmLw12CmtuZVaqmqUJ7QLCb0T29Pw5AP4Uwxva2ZR+8S3Eor5JSAt2NTqBQoCYNFZU/KMGl62VEL6fGNtc3HAYmfEmEwcowz5t/Vhr1x8xEGrtzpTO/oIRG/4hI5AmbrjGzb3b/LTInW7pN24sIXTxT4M8Hj2TdEee7LyG7JtH68TNXhoUQ0j+0yijt9KRj4hvG/th4DyUSdlFIxdktQjQkQnhQjIqgMgomXpMD6T8Pcug8x7wunyJVPBDxR7O8sfQPpS30oV5Vh1wbiFLQmCi7TGNVD6Pm7Mcmr6wkY7o241L3R14DvtJLMPbVUlGH4trmScArOKnn5nBxfp4hak0ecGPAQ+zrDriSI46/BcPQuJTi6Zf2YObfrznSZxQKP5VTJdvKe9hfr5U+xhKklhL3xwob6X+Qw7W2AXAETHvZ9tOi3k+i5+csYiABxVmzykCCNySqfyeo52pa4heejKWYU1sz4uSSnKNW9YPZK3511FU6dBokzeOG/0QWdrlIJSdbDQUwH8yFwGurIWqRzSfk2hNowdclhX5LwOhBqUrcm0JThb21n1U8Rl8tHzJ4V2xEXUmgGF1KGCiI/jlDHqsUfS0ARMLg5ZyINoMP8KbgCL3i7wv5xryd73EnAYICUnycjG6Usv0xKJ9XKUbVQiHpS5+4v8JGjf+gEF6gFZy2zCoFEvFh+rUEZ7PsVxX4jMJ5v/w7ZTffnFh2LoheAb5U42PoWMwBZi+Vk8HELLWyP0+NiMfhmJp1obl8zFxTQFxhvlJzJ37Tkh/HrR1Xa9O2Y0cOhTHEkGsxECdnga4Ixlc4eKpK6RZRsU4yIYzFgNfsryFtawEiRu/ksQ9ABv5IL1W+rZRs54wok+jgTGl2bho4DVnMEDdm2xyh0uMrwEI5LuuwKh1z/33lppunJew==|920 \ No newline at end of file diff --git a/Pages/个人中心/个人中心.json b/Pages/个人中心/个人中心.json index b3fdc704..e753fdc7 100644 --- a/Pages/个人中心/个人中心.json +++ b/Pages/个人中心/个人中心.json @@ -236,7 +236,14 @@ }, "27": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 32.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } } }, "28": { @@ -281,10 +288,48 @@ "Values": { "1,1": "个人中心" }, + "AttachInfos": { + "3,1": { + "CellType": { + "$type": "ElementUI.TableCellType, ElementUI", + "ElTableName": "EL表格1", + "columns": [ + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "label": "", + "align": "center", + "headerAlign": "center", + "key": "aa877f23-ddfa-4e06-b3b7-618ddfc06b23" + } + ], + "actionButtons": [ + { + "$type": "ElementUI.ActionButton, ElementUI", + "type": "button", + "Name": "编辑", + "shape": "default" + }, + { + "$type": "ElementUI.ActionButton, ElementUI", + "type": "button", + "Name": "删除", + "styleType": "Accent 5", + "shape": "default" + } + ], + "showSummary": true, + "sumText": "合计", + "size": "default" + } + } + }, "StyleDatas": { "Styles": [ { "FontSize": 18.666666666666664 + }, + { + "FontFamily": 0 } ], "Types": { @@ -293,15 +338,246 @@ ] }, "CellStyles": { - "1,1": 0 + "1,1": 0, + "3,1": 1 }, "SheetStyle": { "FontFamily": 0 } }, + "Spans": [ + "3,1,13,33" + ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", "MasterPageName": "FGC_母版页", + "PageLoadedCommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "list", + "TableValue": { + "TableName": "任务表", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "25c1dce7-b578-46ba-9e34-195ee84a36a1" + }, + "ColumnName": "ID" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "55713b31-4b7f-4077-90c3-6816673f7bf5" + }, + "ColumnName": "项目ID" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "父任务ID", + "GUID": "91340ed8-875b-44dd-983e-4c6fc69c0be3" + }, + "ColumnName": "父任务ID" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "层级", + "GUID": "13e50106-c39d-4be0-8cbb-505fcc56c78c" + }, + "ColumnName": "层级" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务名称", + "GUID": "572dc0ec-d3a9-4da3-bea4-3d9202eca5c7" + }, + "ColumnName": "任务名称" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "执行者", + "GUID": "66de0e6f-5884-4a96-aa24-0ceb98e9e124" + }, + "ColumnName": "执行者" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "开始时间", + "GUID": "192ebbbe-3c5f-4e65-b238-08d8490d9d30" + }, + "ColumnName": "开始时间" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "结束时间", + "GUID": "b8946ec0-4c27-43d7-bcba-0b6040a390b7" + }, + "ColumnName": "结束时间" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务类型", + "GUID": "7dcd003b-5d49-464e-b903-24c76672610c" + }, + "ColumnName": "任务类型" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "分组ID", + "GUID": "fd94bcf0-7b0d-43d0-b675-58d862147c9f" + }, + "ColumnName": "分组ID" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "版本", + "GUID": "b7233ecf-89fc-4e53-bd08-a954b0f92c6b" + }, + "ColumnName": "版本" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务说明", + "GUID": "3e5b856a-02a2-46aa-9fb0-f69e29d5a851" + }, + "ColumnName": "任务说明" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "备注", + "GUID": "d6e576f6-2712-4e8c-b8da-792d42379592" + }, + "ColumnName": "备注" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "参与人", + "GUID": "6e2f7567-29a0-4c44-935f-4e2bdaca8a5d" + }, + "ColumnName": "参与人" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "关联资源", + "GUID": "6fa898b9-6af9-4f0a-95a6-a1d38b434f98" + }, + "ColumnName": "关联资源" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务预算工时", + "GUID": "031bb48a-6684-4453-a292-3595423a590f" + }, + "ColumnName": "任务预算工时" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务状态", + "GUID": "09c9fff1-7a61-4028-8569-e1f6ee868e1f" + }, + "ColumnName": "任务状态" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "前置任务", + "GUID": "ffcaf146-bd68-4836-8451-be46660e4cb0" + }, + "ColumnName": "前置任务" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "工期", + "GUID": "1cb94fe9-ed62-42b1-8c35-98fe770f3845" + }, + "ColumnName": "工期" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "次序", + "GUID": "64030202-e6d9-48f7-acdb-4c3902d728c9" + }, + "ColumnName": "次序" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "里程碑", + "GUID": "47b4699b-44f4-44cb-989d-d90b81a1fba2" + }, + "ColumnName": "里程碑" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "进度", + "GUID": "622a4ab5-753a-4bd5-8455-2b400270aa00" + }, + "ColumnName": "进度" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "功能名称", + "GUID": "cca94e9f-ecee-4c1a-ad63-8ddb86c4dc8d" + }, + "ColumnName": "功能名称" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "收集反馈", + "GUID": "1c5d922e-d2de-4da5-95ab-2ade2aacfadd" + }, + "ColumnName": "收集反馈" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "功能描述", + "GUID": "f4995451-510a-49ac-9a38-f270395c2325" + }, + "ColumnName": "功能描述" + } + ] + }, + "ID": "b6e69142e2234a728b533542513d3e98" + }, + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=个人中心!B4" + }, + "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "SetJsonDataSource", + "ParameterValues": { + "dataSource": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=个人中心!list" + } + } + } + ], "PermissionData": { "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", "permissionResource": { @@ -323,4 +599,4 @@ "PaperSize": {}, "Margin": {} } -}//PWbycllxLXQkSZdG9fFRJaMHSEQQwKr5i0hf/UyGPuS5xjOuJrK8GW63qF6cZzMpHoyRDNtrYxP5qsKsySoMyJCYtkt0GNbqLvZ33KX0xHMblkaWBqivlVo2xR6upodtpbboCfwwfCNJzihkNP5MZujQeQ5nHFT5rQ8x2LNL294RGcCgboKWIH/9Tk3tco7pCChzLDneTB6eMrRKFmlS0Tyw+E3CqDcjrTzyu1npt0nIiHbr5WeAAfORPrdteyZPWlEKLB/nnhJ1p3sYSKZOf4Mv1PWx3ETIcBQNGBA7xNlPuhm2aaLHvk8+isLVzp7ZM8Y+p2gFrSqi7p7aaQ5gicD2URScuNbvDav2XUohl1oR4jdEYTHqi01IYdHiRWkNUu1fPBOZqWHwBtM+5QEipBWM5zmX9f4vAvZRf+aKi3Zo5XU4ey9KuW7yPDxqIhFWecwI+rEdFpRMl4u8bFn0eeDosTBkoKvNTsHH/c3vgtbXZHfqjOQGc2fg+SSN+MKJ5TtctM+5kbXJZeVAYqwMkxztoHgQL+Rr1vLseeGAKdfo3jGrPScWJMD7/trw5vHJY+3HmBhpQbvl6McEMniplZUqZ65EfGn44kNXlram/W71mwvR5FYEYoQHvHO8wbWIfPF6t3TFabpieIHJpAORGJjA6eFOjmxKRD7b7R0NfejX9HU4LUeXwqNw0HJLld3MGuHWVgINy32nK+IMMrYxv8FLBuMCReD3vEvHcYzIgT5RmCXfyRMWWUF8S3wswHmAR3JZ8HOnDXNC0YX7aIRZs1LHfx4O57gne0vNBXLqS3DGVrXjQD4I7uIetOhuBHHKa2YMBszLM0qgvpFeuO2SitnuQhBMkwUIR++4cIQeVYD/yzs2/3KU0R2OQUq5xPTh0g7rdU8sBRhqOXbhcXppjA==|920 \ No newline at end of file +}//T+Wm7235HvPnBXXR0+BlF3GZ8Z+O39inBftRdKGIhw+scaSObIQbbk7U4ZtNKLw6WyF6CJCH1Nx+HzTOXjZXEoIpIe91aOYpjeWImJJzlp+3yJBDFI3z2RldkTLMGx58vyXQP9eX5kTnfMPwn2goMquSoVd4WEaFHTWeI4k7B1wxh1kzIwoPDLBIuxJLEFRrEINMvTriY3IboAXF8m9BVyYB8dNGfu5P7o0GcK4hTLYyI9ROivNeRxqt4RckeAlhzoCta02oDZneNGXWMiJ+WflhbguvgpjWKMZ4t8Cy2yFaoCFELEmZIhU9+ce9UG0Sh2xBE5jCq/eG1TK5SX9zMfs0hoKwZbp+rVAP5mZDH8MaIget6v0VEdckMoZwHY7c0Ou4hB2pYy0VmWTCfB4+PFba2CBHbKNSSX/ip1stvrxL+td9/u/CRtDvVhjNvKNbQ27R9r1rYCEWEF8owNfn8Y/sesjzbGsRMQl0nb59rWHiVR0RLoze+dtYhWyKqzqshSKFm8+eBjYNFC/JEH6EPt40B0j3hxj8oksXctwAVaTYXHvrH2ZgGRLSG/7/oAnlrkqW5uQpnrSZk/moxX/JTsIBZeXEcQkxAU6jqjEOHEmu7RmjMttfN/MOatYd3pe1/HTnmzKN3kwIDPybXRZEj8doA85cOzYN6Dk4ypGKvfyCT8JpXscknkmHwdvwLX9Y7++eEUCffqkaPQzJzw1FAWX5w3nq71KydxwFyGs8TOXdDD29SXhmcXRtaj8zEZadwuBzZxthglEyd4YHZDmf60A0H6ymbSCf3T6vV7BhQj+qReGZuY3kZNhsYPB+I6E3NZihG6yAmsCp9LO1SekE5iea0hCNQq5lTTlAvTArTks/j42XuXX5paTkxWibeJ01fNd4Ux6AZTXFbFSq6wlAdA==|920 \ No newline at end of file diff --git a/Pages/客户/客户管理.json b/Pages/客户/客户管理.json index 1ff15299..975ab959 100644 --- a/Pages/客户/客户管理.json +++ b/Pages/客户/客户管理.json @@ -498,7 +498,7 @@ } } ], - "ID": "16e23e87-39ba-4216-a102-c8e1ef2fe019" + "ID": "81d91061-e3c6-45a9-8a8e-ece299f541bc" } ] } @@ -676,6 +676,33 @@ "7,4": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=客户管理!E4,客户管理!E6,客户管理!T6" + }, + "Value": "%Null%" + } + ] + }, + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=客户管理!B11" + }, + "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "ResetTable", + "ParameterValues": { + "clearSort": true, + "clearFilter": true + } + } + ], "Text": "重置", "TemplateKey": "_RS_Information3" } @@ -777,7 +804,7 @@ } } ], - "ID": "340413dd-f0ea-4f20-b161-e9b3bddf5e00" + "ID": "bcd3e7f8-40ff-4757-a951-82418ce60469" } ] } @@ -981,7 +1008,7 @@ } } ], - "ID": "4bcc8765-bfe5-4f93-8230-cb1913d51d05" + "ID": "1ef881d1-ab48-4789-a8da-e05d675b8a2c" } ] } @@ -1381,8 +1408,8 @@ "2,27,1,3", "1,18,1,12", "5,19,1,10", - "3,4,1,25", - "28,1,1,29" + "28,1,1,29", + "3,4,1,26" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1419,4 +1446,4 @@ "Formula": "客户管理!$B$31" } ] -}//L6nKycinJCurzHLrEZ/aaTU13E2RbcCVa/B1GO6as/s2PIuNb3qo3wLRm2OSnVEnpynmsm7yuNQLfmmpflf6rOLfsjYl10vIZ4ytogq0l5eJr4bslVvvq7caxvO2AOwCxyfst9tXZvVt/5UccmdQ/jUR9ztU4Cr2quYg4Gplydtgbq7yjjZaBETgAmIQmIaZYoYkKADWjUzIKU+bNNFn9Mt8SwtVixPRm8c1nID4mDT+no4eoTrQUd7CWHyt4KTID9mu5wkxiXI9jaE9F5iPi3HySBwddTF9eefrtLVuyjOEoc8TWeZzWMhD+eqOCkDJEAB9PMkT0ch8rh4nPBY51FF6HQBB3h4t+dFeAbqOA3X2gZP6dGCKS/IXoBhZQDsCvw+ccouco0GHb509N0zQHDy31mhz/6Vzp4/SQdgz7O3TZosmXkASX3P3Cb1FLnOlJssPO7wwZUKsMgfGJH3jrkn+Ge2stMGPnguQwpthGv2LjLfy8QGpwNIWEyyBu5R+BIKVP1aeS94bies+uI1aweKy3Rq88Iss8xe3aT72RBT5eci5dkZ0vxsrKM0A9XwhMRpS0874f6IYBvaVR2u0XLSmXvp+5u7+xY5S4OkGgRojwPLTeMzl2WfQaib0IvoBbUZjmn8bEeLJhEwiSXoYUwmiHZPU3qleRDHVz+UHoSS01wWZJam0QsR4PJbnOlPYOWm3ZAj1nRSHWTPi20avoFJ4HCUkOtwnWunjREA6GVJlT0cMU9ufc02p0hAJEMPi7tXnMEQCdYZjE0f0hUt9kGbDOpkmYb5TI/26U3NS4GI+CU+dN6WfvE/y9EFUA/GueEFgwnNMdyIC6+wwV56+Vy3sNYQPRmhica2YoNxwAaZ8wn1QAdrQA+mRgh9h/KLIDhNGtYqLKDtXfetcSUgRgw==|920 \ No newline at end of file +}//H0BrlUUk0vFgPUweVKnKzu0CyXaMg2UKQoELq/q7f9axv2Y2y/SYiwTUMwjv0S2Apw3/go4hFbxof9XpWXnTYF+GznRcZlM9undr7ig0GEGKVRu/NMlcKjxU8o2AasrPRgmg4cMNV+laTKB6KiZ9CD3m5OnbpaoocKjJ+R+tGry+V8AFDUcrpsTiuYN9RKDbQ9cMsKFhRnhA9feLLYAJxEiBn/Knfo41Ng2klg9fvgSilLN2yRdKVXzkcM5W5ag8yqZAwG0g7ZyNejZOEymeQjdHCXFP9Ul7aR0ppRNR8/8VShNxDIdNMi+nqlcvs0Rf0uFbrAMaeVxkr+Xn7iS0IeYm3eOnZAUJECHZG41M6EDFlvvFl45oPsJUQ/HSVq6w/D4iuG3PDeYJYFxdQwHWeFCwhioh2a0Mn0GREl58HS7tduWt2waldVSmZO7hUaVe6uc3japaiWTv5Nu5LGz5c7G8G7ZD0Df4wjXXpXZEnvWznFukax5JaDZBS6OHSSWvqjp0TWJO9w3RcmI7VFCIIlb2j5MH5NILgJbNlntz7KwxVo5A0539xcnsPZwVfc9EceFnXskJgEdIgqqtIerEDAsJCnGx2UBZTJEZrNm0nM6N2c9EUZHlbe4DBaZx6TAe24bCc98PUpkQ8U7vhE5nA74G8lRdRmXwsYYL3uzt77npBmSL5Qv2FYE0rliv3sBkMumuud2PLP23zKta4r7x8bJWl/gYGqHUiwILEaO88m1rPHaEQPuPWfovs76odpeZVJmFAvwdF25Ot8hdp14aw4+UzVuijrGM8pLf1BDNyRLBO/dMBafuURMYuXxvXOBUYeT3E4b+YBnxAllfbHQRVgCOJP2mRL3h+jzMm4ma0hzcPJi7/mezLipYkcFxYS7ZHEFFbj3NBw9t9Tj0698mDw==|920 \ No newline at end of file diff --git a/Pages/工时/工时报表.json b/Pages/工时/工时报表.json index ddd7c7ed..d3846066 100644 --- a/Pages/工时/工时报表.json +++ b/Pages/工时/工时报表.json @@ -12,9 +12,21 @@ "Value": 1.0 } } + }, + "29": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } } }, - "Count": 45 + "Count": 30 }, "Cols": { "RowColumnAttachedInfos": { @@ -33,18 +45,56 @@ }, "Count": 60 }, + "AttachInfos": { + "0,0": { + "CellType": { + "$type": "iFrameCellPlugin.iFrameCellPluginCellType, iFrameCellPlugin", + "CommandList": [] + } + } + }, "StyleDatas": { + "Styles": [ + { + "FontFamily": 0, + "Formatter": 1 + } + ], "Types": { "Strs": [ - "Body" + "Body", + "[AUTO]General" ] }, + "CellStyles": { + "0,0": 0 + }, "SheetStyle": { "FontFamily": 0 } }, + "Spans": [ + "0,0,30,60" + ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "MasterPageName": "FGC_母版页", + "PageLoadedCommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=工时报表!A1" + }, + "TargetType": "iFrameCellPlugin.iFrameCellPluginCellType, iFrameCellPlugin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null", + "MethodName": "Load", + "ParameterValues": { + "Mode": "Page：当前应用中的页面名称", + "Target": "ReportsService/preview/3006b5bc-1ffe-41e3-964e-1abf24c8c552/工时报表.rdlx", + "AttributesPairs": null + } + } + ], "PermissionData": { "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", "permissionResource": { @@ -66,4 +116,4 @@ "PaperSize": {}, "Margin": {} } -}//tbDXII0Mhpvv06FlMz+yIwY/ZdkixjJ6Agsgz8AQgu1B94XyEieuFhhppFJ02GL0nWLxleLHo/pP1vRyKxDVosDZvxcamfZb3RDZDBVRS8Dbj0f6sopHdDBVADibYBmbsGytGawU0U9+SOKIo1e6p9ukcjqsly56lwJ2izg9xe9QOINQu9Fp6rjdNEob0fioCLLKp8BD0/acak3iz3OhoWBlaQtNZ1TT5k8Srz0AmRaECDKIZXkIK9MXP0rhHBuz9QZrh6u9Fqh7H+OfNB6QTFpE8aMZFM5+go829DEVek+o30+CB160J0a2HxyW/dl0EgieKusuSmejozvRNGRmnr7S68ZvbFAJY2GdDim7M0figSTBkTLB/2t62TEwqwZNG28KsirtoL1CzFo9bJauSV1Nw6HfkAKS7LbgRol8fmCNRU3A7r0578D/mem6WpPPxk2pnNDNH4W/ISHA33fjoYdRUD31lS3mZmHAtqp9DgQbk+LjP9QiVmeJeQfWeCNbWV0ZoJzdGMHqi9URjwgJ2k2lDzet0s3BqAUIB8V/1OKwiWELVwSW6o6WgdovbrdD5wl4LTEM8GPROa/+ixu+Tcok78ZslrYlMt7mcHrZNHs4TE661S5CKNKRLzwH/igcq76JOYzUrLeI8+oM6c5C79wPYe+S5HiUWOTE1kyxXvd+C+xjMRE03jfiPj7hN3INlDhhIh/K5KVNzU+y+9zFPOPbBAUD0hEsXwQCYVAKrMLrlPpwkVy7yG62NEZga08QIsvSVingln0DwlJfZfaJBBlCY5Jq4Th2jaXXWjqcwVDj4cPbCXLrWVr6i1PztwyTm3GoF9sUT+fvSI98yfFuKMlMru8ePZHHsgxvuJ8RWKCvapAx/onJjtwSlU4mpcjS7zZ1BhnDslA9j2acLYTCDA==|920 \ No newline at end of file +}//mNjmpWwugcSGJfoxIHr3r/xkFtwiuvJcjY2oPKKA44RbTDwJl/zCHO1bgWFY0b/X66yAHQUrKFJ09WGl5UC7v1kSeEd0lyf0bjUa5cVmHJoAr/nLCZcYQb+8blZuIUe+UB5LG0nUpoVTWGgm8KJ++iC4tA5Q7EiGw0KN3Z6eRHSWVt962UuoRFi+fwPTPWUjoKQf+5W8wDrtrHVD3o49vWg7fmQPHYuHJyfVosEQDI9VycAEd8B+AbgwCMkLEDHM7qOA0I25977WzIQ7Vb9gKYTfgVW8dtqyyBhPNLWnSr70xB7ChN2oPyiMo3jpGa272gvlIqHb0RZUM0XSG0etKsceeXUqepC6RDkwYZhGvwO/4Nl/d7YGUAux+rKkZcw9Yba39QxsWA4Fya9ZxERm6l+02EhWofytIInWwc8MDYBZNkZd+BeJSbb9kjDS9AybMdw1aEf1SValYGOKL7bm3sWNYlcbiYRPRwaVnnHoxdiFmlLv6uW3V5TxDqTusrNGGLwIuFx/GD6EIQsoKXpuxdTJeHnNv0Ytx7yexVwMvTQ+9+7aU7jQ8A5XHqWvfI9rFf2NAo5R3ysrQ96Nh1E8uJDfCMYIdfcHU2iIdSJ590ZSal7kD5WVIFqAhb8nGX/n4EYB6hA/Wqi0xx+cGWiE0895O9/CrcK74R6Zh80XQeYJKckcskBwETgqW4yxR1SJqZDSPF7PjK8Bpc+rJdAE32TmyCUDs3STjfpv7qBzXO7zTRW3LBOrnz3xuwQViypStI6svJxY7o3dlnLYObWqFgTpXL3WJeMMs+QCgTqQuyUtQFCWpYuk/m+U1RUS+vq9d7k70MDDNwNW3IPfnD8nki4nI0VnlTqLbADfhqPKbRM78JcgDTxKCzpvaQwQieF0lkPrc3nPn2iNg1Nr1GOzXw==|920 \ No newline at end of file diff --git a/Pages/工时/工时报表.rd b/Pages/工时/工时报表.rd index 47790895..42b8596d 100644 --- a/Pages/工时/工时报表.rd +++ b/Pages/工时/工时报表.rd @@ -1,5 +1,5 @@ { "PageType": 0, "ColumnCount": 60, - "RowCount": 45 + "RowCount": 30 } \ No newline at end of file diff --git a/Pages/汇报/导入汇报数据.json b/Pages/汇报/导入汇报数据.json index 5f37b12f..4baf7177 100644 --- a/Pages/汇报/导入汇报数据.json +++ b/Pages/汇报/导入汇报数据.json @@ -28,7 +28,7 @@ }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 332.0 + "DesignLengthInPixel": 430.0 } }, "6": { @@ -41,13 +41,17 @@ "DesignLengthInPixel": 42.0 } }, - "8": { + "9": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 47.0 + "DesignLengthInPixel": 37.0, + "IsHidden": true } } }, - "Count": 9, + "InLogicalVisibleIndexes": [ + 9 + ], + "Count": 10, "DefaultSize": 32.0 }, "Cols": { @@ -58,6 +62,21 @@ } }, "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 41.0 + } + }, + "4": { "GridRowColumnDefinition": { "DesignLengthInPixel": 41.0 } @@ -122,11 +141,6 @@ "DesignLengthInPixel": 32.0 } }, - "17": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, "18": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 @@ -177,11 +191,6 @@ "DesignLengthInPixel": 32.0 } }, - "28": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, "29": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 @@ -202,36 +211,48 @@ "DesignLengthInPixel": 32.0 } }, - "2": { + "33": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 41.0 + "DesignLengthInPixel": 32.0 } }, - "3": { + "34": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 41.0 - } - }, - "4": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 41.0 + "DesignLengthInPixel": 32.0 } } }, - "Count": 33, + "Count": 35, "DefaultSize": 32.0 }, "Values": { "1,1": "筛选日期", - "1,21": "筛选类型", - "1,24": "日报", - "1,29": "批量导入" + "1,22": "筛选类型", + "1,31": "批量导入" }, "AttachInfos": { "1,3": { "CellType": { "$type": "ElementUI.DatePickerCellType, ElementUI", - "CommandList": [], + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=导入汇报数据!D2" + }, + "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "GetSelectedRange", + "RetrunParamNames": { + "StartValue": { + "SerializeProperty": "=导入汇报数据!B10" + }, + "EndValue": { + "SerializeProperty": "=导入汇报数据!E10" + } + } + } + ], "UIPermissions": [ { "Scope": 2, @@ -252,10 +273,6 @@ ] } ], - "DefaultValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=TODAY()-1&\",\"&TODAY()-1" - }, "type": "daterange", "startPlaceholder": "开始日期", "rangeSeparator": "至", @@ -270,8 +287,10 @@ "CellType": { "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon", "Style": 1, - "CellDefaultValue": "日报", "Items": [ + { + "DisplayValue": "全部" + }, { "Value": "日报", "DisplayValue": "日报" @@ -283,7 +302,7 @@ ] } }, - "1,29": { + "1,31": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -304,11 +323,11 @@ "TargetCell": "工时" }, { - "SourceCell": "关联任务", + "SourceCell": "关联项目", "TargetCell": "关联任务" }, { - "SourceCell": "关联项目", + "SourceCell": "关联任务", "TargetCell": "关联项目" } ], @@ -336,7 +355,74 @@ "RowIndex": 3, "ColumnIndex": 1, "RowCount": 3, - "ColumnCount": 31, + "ColumnCount": 33, + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "汇报子表", + "ColumnName": "汇报ID", + "GUID": "ef723b89-121b-41df-ade2-e9ccd0be9d11", + "RelationBinding": { + "RelatedTable": "汇报记录表", + "RelatedColumn": "ID", + "DisplayColumn": "汇报人" + } + }, + "Value": "%CurrentUser.UserName%" + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 3, + "ColumnBindingInfo": { + "TableName": "汇报子表", + "ColumnName": "汇报ID", + "GUID": "b6afd836-cb27-47fa-ab22-71b19bebb00a", + "RelationBinding": { + "RelatedTable": "汇报记录表", + "RelatedColumn": "ID", + "DisplayColumn": "汇报日期" + } + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=导入汇报数据!B10" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 5, + "ColumnBindingInfo": { + "TableName": "汇报子表", + "ColumnName": "汇报ID", + "GUID": "f588f4b6-85f9-4268-b774-eea07d70d21e", + "RelationBinding": { + "RelatedTable": "汇报记录表", + "RelatedColumn": "ID", + "DisplayColumn": "汇报日期" + } + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=导入汇报数据!E10" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "汇报子表", + "ColumnName": "汇报类型", + "GUID": "8bcd11e4-15f4-42f8-9d5f-70ac918c546c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=导入汇报数据!Y2" + } + } + ] + }, "OrderByCondition": { "OrderByColumns": [ { @@ -350,7 +436,7 @@ ] }, "TopCondition": null, - "ListViewStyleName": "_RS_NewFashionListStyle2", + "ListViewStyleName": "pms表格", "ShowColumnHeaderInDesigner": true, "IsRowHeaderCheckBoxVisible": true, "ShowEditStatusIcon": true, @@ -387,7 +473,7 @@ "GUID": "83696111-138e-466c-8944-7144a3972c56" } }, - "4,18": { + "4,19": { "NameUsedInJavaScript": "工时", "BindingInfo": { "TableName": "汇报子表", @@ -395,27 +481,60 @@ "GUID": "1693aee4-0703-4217-8119-3da803f9d90d" } }, - "4,22": { - "NameUsedInJavaScript": "关联任务", - "BindingInfo": { - "TableName": "汇报子表", - "ColumnName": "关联任务", - "GUID": "1c0174cc-4883-43ad-81a5-341f49d3612a" - } - }, - "4,27": { + "4,23": { "NameUsedInJavaScript": "关联项目", "BindingInfo": { "TableName": "汇报子表", "ColumnName": "关联项目", - "GUID": "38a33db2-f382-4621-bf04-3501e44f75d8" + "GUID": "156bcb7d-57e8-41f7-9b49-0daa3bb9c838" + }, + "CellType": { + "$type": "Forguncy.DropDownListCellType, ServerDesignerCommon", + "DropdownButtonModeInListview": 1, + "IsBounding": true, + "DataSource": "项目表", + "ValueColumnBindingInfo": { + "TableName": "项目表", + "ColumnName": "ID", + "GUID": "ce5d5354-6c8e-48bf-afdb-c847a21d8d8f" + }, + "DisplayColumnBindingInfo": { + "TableName": "项目表", + "ColumnName": "项目名称", + "GUID": "9cdd8900-86e7-4627-a055-76c6a530b9cb" + }, + "ReadOnly": true + } + }, + "4,28": { + "NameUsedInJavaScript": "关联任务", + "BindingInfo": { + "TableName": "汇报子表", + "ColumnName": "关联任务", + "GUID": "1d4061a2-b160-4db3-8bb1-5804b8f4cb40" + }, + "CellType": { + "$type": "Forguncy.DropDownListCellType, ServerDesignerCommon", + "DropdownButtonModeInListview": 1, + "IsBounding": true, + "DataSource": "任务表", + "ValueColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "da0c76c5-1e24-4894-a492-2bff2098dcf6" + }, + "DisplayColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "任务名称", + "GUID": "715802cb-f5c7-4dd4-a3da-018e80051d2b" + }, + "ReadOnly": true } }, "7,1": { "CellType": { "$type": "ElementUI.CellTypes.PaginationCellType, ElementUI", "ListviewName": "表格1", - "pageSize": 15, "pagerCount": 7, "layout": [ { @@ -483,37 +602,48 @@ "FontSize": 13.333333333333332, "HorizontalAlignment": 1, "WordWrap": true + }, + { + "BorderBottom": 0, + "BorderTop": 0, + "BorderLeft": 0, + "BorderRight": 0 } ], "Types": { "Strs": [ "Body", "Center", - "yyyy/m/d" + "yyyy/m/d", + "black" + ], + "Borders": [ + { + "Color": 3 + } ] }, "CellStyles": { "1,3": 0, + "1,24": 0, "3,1": 1, "3,2": 1, "3,10": 1, - "3,18": 2, - "3,22": 1, - "3,27": 1, + "3,19": 2, + "3,23": 1, + "3,28": 1, "4,2": 1, "4,5": 3, "4,10": 4, - "4,18": 2, - "4,22": 2, - "4,23": 0, - "4,24": 0, - "4,25": 0, - "4,26": 0, - "4,27": 2, - "4,28": 0, - "4,29": 0, - "4,30": 0, - "4,31": 0 + "4,19": 2, + "4,23": 2, + "4,28": 2, + "9,1": 5, + "9,2": 5, + "9,3": 5, + "9,4": 5, + "9,5": 5, + "9,6": 5 }, "SheetStyle": { "FontFamily": 0, @@ -521,23 +651,27 @@ } }, "Spans": [ - "4,27,1,5", - "4,22,1,5", - "4,18,1,4", - "4,10,1,8", - "7,1,1,31", + "4,19,1,4", + "4,10,1,9", + "7,1,1,33", "4,5,1,5", - "1,24,1,4", - "1,29,1,3", - "5,1,1,31", - "3,5,1,5", - "3,10,1,8", - "3,18,1,4", - "3,22,1,5", - "3,27,1,5", - "1,3,1,17", + "1,31,1,3", + "1,3,1,18", "4,2,1,3", - "3,2,1,3" + "1,24,1,6", + "1,1,1,2", + "1,22,1,2", + "4,23,1,5", + "4,28,1,6", + "3,2,1,3", + "3,5,1,5", + "3,10,1,9", + "3,19,1,4", + "3,23,1,5", + "3,28,1,6", + "5,1,1,33", + "9,1,1,3", + "9,4,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -556,10 +690,11 @@ ] }, "RowBreakLines": [], - "RepeatRangeSettings": [] + "RepeatRangeSettings": [], + "RelatedDataTableName": "汇报子表" }, "PrintInfo": { "PaperSize": {}, "Margin": {} } -}//lkDXvvYf4uGPDB1BGjHUNvBagFzmQX72XLyDd78IKjX+VSMFxxPZ5EA1U05FTREUPnQigv0iPnHeYHNUxhl441ESljARrBpBIY+DwUy4qIeG9umG7fQHc0T1uhanypXTusGuka/02U+Y15ZWtHwD3KOf0AhA7SpNDmPpNi9hOHZekajFC3ZokURvmrwK9rtPqK4WnSqalQ6kFGiIqG/c2SeOr7xH3Pd1EXRKRvLZezEbObPNGrsE3XxfECrV8Jlya1VZjSreGRR9UdQvvO+qna2u5VKVyjRm4T0FZkE7Zoa9Qoe7MwKrJcGgNCtW8Y8ccc8Qn4ef1/6evzoJLKVJCWCWAfnqeLCuNec8b+NI9mOmU2gNLuyD50wyjM5ghJXMfMBu7HWdzo4Y7K0vrn4qhVfB4KTkMsVUF6tEJNNl86dQyEnk1EFxjQAv2lujBDoOt38nJEal1jSwGcIS08TbVo4bFdZo7LxLjIki9EHjRKagVDcCRh8yd8/P0KWFbFFk0KaHUC+tTtv3GJaHPk8Jsa5hHDhBFZPA+0VniFkyNa26mt7xaf+RlN3x/z3AMP5vNSltDPUGf+SF0iUv95gKjrD+BIv01OdYELHabYsReAwlH5MRekbcYKTpKPdrT8fi3d1G6A/hkh22zENA+p/oR36ao7ogsHr0tSSlfw5tjQhHN8EFCn661HiboOg3xfmMhULklNr3XzFrIp7xGKm+ZP7tS0bs6CCoapCpL7FvNJyJy8Srnv/rROQ/LhKbkUuv3vAZIMNgJJhnjgdZOQeKH2FXGumTkweGakm8hBqkJdPJssTAugrd2i2aJ6Zp2IlRXjvOJBI4R7aootrX8ImO6wCeml/WfqlGi8j1d/gfWK5kayXO6GPNG0Vc+QpHWJ2sgbZECJCCPmIXnc3DvEoJpQ==|920 \ No newline at end of file +}//0+IDplSxwX33LtqPnguVZ4lmBFYhbxZbk9Oli9wJyJMEUsfif98vRBcQbhf/YK1aumSuhlSfUH69boucrjpDXFJhTE7KZOvibR+TXs1DkAPwFt/+qKGArtlDKi1djdxto7Nlj4cPa+g/IYvsU50sFRT7QnX8yC4MT0eHDTsH7YLIwZWgVAVI4Qz/i+4AVvqLsHWwjw0n1LA61pAiPIsn4Ea02uKUEnQKt/D4Nsn+Suf7XYLisnQRTPCRH52gixBBH1tYS2KDCvp6ZyHOD2JlVPwydz/aTLrB4o3NvxehbqfelzCZlo0ewDVJnIV1OsvBTuQdM5UjEAsb9h5eDLRCs0qicFA4jWmFFH2sfR31j3vgkgOLKXqIZRVe/rKHKt4tO01XIlW9oWteiIuko1NXKblvkSZSzHXPmf3j32wXImfdlM1S1+Clr84eMu5cbZOotvgxXs9rhxx2KgORr24pu4fO5USN7ioHpc56wnjQeW6ufcMKu29rczCfGxdxOrtIDioSYp3M+UgCwwBKuydoKYTAfC0Xsc1X+/QFySVOGQyYPrafG8lqSPFENjr2YDJkjXso/r5UVVVLwfpVBhcf/FjVtDD7x0bkhsW0BLnO/v/3VJ35DZq4Ckz9O3SN2mfzqAPKwFJctX4FNkgMEUvPRx1Bkce+VjoyJR4qAihKTr3jH87nCrWaUYTxZRUSFAsdJ2fS3a07m8jSOuGDtGmRtCnaWIehztmdC6zuggWIxT+VlyPIOBZxqhUAfQogA+aMVImP2MveNyU5y5NCqUzfIeQI7UVWaXopG1kk7ltA5+C4Kv0D1SqX+NDenKzp4cLOXqGu0WyEdQWlQiWnzAKtRsyAwiMMpdrUGFX2dU82WaqLBFTIAyoFtSLtnjaZ6lxKhtgU29a5juyKnP2RioSstA==|920 \ No newline at end of file diff --git a/Pages/汇报/导入汇报数据.rd b/Pages/汇报/导入汇报数据.rd index ae34df45..52c1ff2d 100644 --- a/Pages/汇报/导入汇报数据.rd +++ b/Pages/汇报/导入汇报数据.rd @@ -1,5 +1,5 @@ { "PageType": 0, - "ColumnCount": 33, - "RowCount": 9 + "ColumnCount": 35, + "RowCount": 10 } \ No newline at end of file diff --git a/Pages/汇报/汇报管理.json b/Pages/汇报/汇报管理.json index c467784a..17448596 100644 --- a/Pages/汇报/汇报管理.json +++ b/Pages/汇报/汇报管理.json @@ -25,35 +25,31 @@ }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0, - "IsHidden": true - } - }, - "5": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 30.0, + "DesignLengthInPixel": 15.0, "IsHidden": true } }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0, + "DesignLengthInPixel": 15.0, "IsHidden": true } }, "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 30.0, + "IsHidden": true } }, "8": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 24.0, + "IsHidden": true } }, "9": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 24.0 } }, "10": { @@ -63,7 +59,7 @@ }, "11": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 10.0 } }, "12": { @@ -97,36 +93,6 @@ } }, "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, "Mode": 2, @@ -138,23 +104,23 @@ } } }, - "25": { + "19": { "GridRowColumnDefinition": { "DesignLengthInPixel": 10.0 } }, - "26": { + "20": { "GridRowColumnDefinition": { "DesignLengthInPixel": 38.0, "Mode": 1 } }, - "27": { + "21": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } }, - "28": { + "22": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "IsHidden": true @@ -167,9 +133,11 @@ 4, 5, 6, - 28 + 7, + 8, + 22 ], - "Count": 29, + "Count": 23, "DefaultSize": 32.0 }, "Cols": { @@ -316,7 +284,12 @@ }, "28": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, + "DesignLengthInPixel": 32.0 + } + }, + "29": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0, "Mode": 2, "MinLength": { "Unit": 1 @@ -326,15 +299,9 @@ } } }, - "29": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 - } - }, "30": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "IsHidden": true + "DesignLengthInPixel": 24.0 } }, "31": { @@ -343,7 +310,7 @@ "IsHidden": true } }, - "36": { + "32": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "IsHidden": true @@ -374,6 +341,12 @@ } }, "41": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "IsHidden": true + } + }, + "42": { "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0, "IsHidden": true @@ -381,7 +354,6 @@ } }, "InLogicalVisibleIndexes": [ - 30, 31, 32, 33, @@ -392,26 +364,42 @@ 38, 39, 40, - 41 + 41, + 42 ], - "Count": 42, + "Count": 43, "DefaultSize": 32.0 }, "Values": { "1,1": "%PageTitle%", - "1,30": "汇报详情预览", + "1,31": "汇报详情预览", "3,1": "日期", - "3,19": "汇报人", - "5,1": "查询", - "5,4": "重置" + "5,1": "汇报人", + "5,15": "日期", + "7,1": "查询", + "7,4": "重置", + "10,1": "数据列表", + "10,4": "*点击行可预览数据" }, "AttachInfos": { - "1,17": { + "1,18": { "CssName": "toolbar toolbar-right ", "CellType": { "$type": "Forguncy.CustomMenu.ForguncyMenuCellType, Forguncy.CustomMenu", "TemplateKey": "横向迷你菜单", "Items": [ + { + "Value": "菜单1", + "Text": "删除选中", + "IconPath": "Application/037_delete_2.svg", + "SelectedIconColor": "Background 1", + "SelectedIconColorUseItemColor": true, + "IconColorUseItemColor": true, + "IsOldMenuPath": false, + "CanVisitRoleList": [ + "FGC_LoginUser" + ] + }, { "Value": "菜单1", "Text": "筛选数据", @@ -475,7 +463,7 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报管理!B9" + "SerializeProperty": "=汇报管理!B13" }, "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", "MethodName": "ResetTable", @@ -485,7 +473,7 @@ } } ], - "ID": "dfe10cb3-367f-47d9-994c-d1740c0991d1" + "ID": "88855ceb-0900-4318-858f-f1fba9e7c1c9" } ] } @@ -515,7 +503,7 @@ ] } }, - "1,30": { + "1,31": { "CellType": { "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", "PageName": "汇报详情预览", @@ -524,7 +512,7 @@ }, "3,4": { "CellType": { - "$type": "ElementUI.DatePickerCellType, ElementUI", + "$type": "ElementUI.InputCellType, ElementUI", "CommandList": [], "UIPermissions": [ { @@ -546,16 +534,12 @@ ] } ], - "type": "daterange", - "placeholder": "选择日期", - "startPlaceholder": "开始日期", - "rangeSeparator": "至", - "endPlaceholder": "结束日期", - "firstDayOfWeek": 1, - "DefautWeekFormat": "yyyy 第 WW 周" + "type": "text", + "placeholder": "请输入关键词", + "resize": "none" } }, - "3,22": { + "5,4": { "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", "CommandList": [], @@ -628,21 +612,81 @@ "noMatchText": "无匹配数据" } }, - "5,1": { + "5,17": { + "CellType": { + "$type": "ElementUI.DatePickerCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "daterange", + "placeholder": "选择日期", + "startPlaceholder": "开始日期", + "rangeSeparator": "至", + "endPlaceholder": "结束日期", + "firstDayOfWeek": 1, + "DefautWeekFormat": "yyyy 第 WW 周" + } + }, + "7,1": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "Text": "查询", "TemplateKey": "_RS_Main1" } }, - "5,4": { + "7,4": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报管理!E4,汇报管理!E6,汇报管理!R6" + }, + "Value": "%Null%" + } + ] + }, + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报管理!B13" + }, + "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "ResetTable", + "ParameterValues": { + "clearSort": true, + "clearFilter": true + } + } + ], "Text": "重置", "TemplateKey": "_RS_Information3" } }, - "8,1": { + "12,1": { "CellType": { "$type": "ElementUI.TableCellType, ElementUI", "ElTableName": "EL表格1", @@ -670,7 +714,7 @@ { "Location": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报管理!AE:AP" + "SerializeProperty": "=汇报管理!AF:AQ" }, "Value": true } @@ -727,7 +771,7 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报管理!B9" + "SerializeProperty": "=汇报管理!B13" }, "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", "MethodName": "ResetTable", @@ -737,7 +781,7 @@ } } ], - "ID": "af2a1d8d-8dc8-4afb-99da-3c9ff740ac94" + "ID": "72cba658-9ae3-4bac-9460-baba97ffab8e" } ] } @@ -786,6 +830,14 @@ "GUID": "c34fbd23-0bec-4df8-8019-b1e6366a66a1" }, "ColumnName": "汇报人" + }, + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报数量", + "GUID": "2b0892d3-a99c-43b8-bd38-8ad2660b13e3" + }, + "ColumnName": "汇报数量" } ], "CustomColumns": [] @@ -877,7 +929,7 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报管理!B9" + "SerializeProperty": "=汇报管理!B13" }, "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", "MethodName": "ResetTable", @@ -887,7 +939,7 @@ } } ], - "ID": "1c570625-2065-4b95-bb64-4341690509b3" + "ID": "f20b8ace-a1f6-4d33-b47d-731fce710bef" } ] } @@ -915,19 +967,47 @@ "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", "Commands": [ { - "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", - "CurrentRowInfo": { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "汇报记录表", + "UpdateType": "delete", + "ShowConfirm": true, + "ConfirmText": "您确定要删除吗？", + "ReloadAfterSucceed": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", "ColumnBindingInfo": { - "TableName": "客户表", + "TableName": "汇报记录表", "ColumnName": "ID", - "GUID": "fc1c30de-7b67-4ecc-a387-2703694f36c2" + "GUID": "b5aedc63-fdca-4050-a2fd-1dd6bb071116" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=汇报管理!行数据.ID" } + }, + "NextUpdateDataTableCommand": { + "TableName": "汇报子表", + "UpdateType": "delete", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "汇报子表", + "ColumnName": "汇报ID", + "GUID": "376e54b8-fe83-4516-ad18-649dff83308d" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报管理!行数据.ID" + } + } } + }, + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": "操作成功" } ], "ParamProperties": { @@ -937,10 +1017,11 @@ } ], "sumText": "合计", - "size": "default" + "size": "default", + "showSelectColumn": true } }, - "26,1": { + "20,1": { "CellType": { "$type": "ElementUI.CellTypes.PaginationCellType, ElementUI", "AttachElementTable": true, @@ -988,7 +1069,7 @@ "hideOnSinglePage": true } }, - "28,1": { + "22,1": { "CellType": { "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", "Caption": "显示搜索栏", @@ -1000,7 +1081,7 @@ { "Location": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报管理!3:7" + "SerializeProperty": "=汇报管理!3:9" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1041,6 +1122,14 @@ { "BorderBottom": 0 }, + { + "FontFamily": 1, + "BorderBottom": 0 + }, + { + "FontSize": 12.0, + "Foreground": 4 + }, { "FontSize": 13.333333333333332, "BorderRight": 0 @@ -1051,7 +1140,8 @@ "Background 2 0", "Body", "Bold", - "[AUTO]General" + "[AUTO]General", + "Background 2 -10" ], "Borders": [ { @@ -1060,43 +1150,31 @@ ] }, "CellStyles": { - "0,29": 0, + "0,30": 0, "1,1": 1, - "1,17": 2, - "1,29": 0, - "1,30": 2, + "1,18": 2, + "1,19": 2, + "1,20": 2, + "1,21": 2, + "1,22": 2, + "1,23": 2, + "1,24": 2, + "1,25": 2, + "1,26": 2, + "1,27": 2, + "1,28": 2, + "1,29": 2, + "1,30": 0, + "1,31": 2, "2,26": 3, "2,27": 2, "2,28": 2, - "2,29": 0, + "2,29": 3, + "2,30": 0, "3,1": 4, "3,2": 2, - "3,3": 2, - "3,4": 3, - "3,5": 2, - "3,6": 2, - "3,7": 2, - "3,8": 2, - "3,9": 2, - "3,10": 2, - "3,11": 2, - "3,12": 2, - "3,13": 2, - "3,14": 2, - "3,15": 2, - "3,16": 2, - "3,17": 2, - "3,18": 2, - "3,19": 4, - "3,20": 2, - "3,21": 2, - "3,22": 3, - "3,23": 2, - "3,24": 2, - "3,25": 2, - "3,26": 2, - "3,27": 2, - "3,29": 0, + "3,4": 5, + "3,30": 0, "4,1": 5, "4,2": 5, "4,3": 5, @@ -1124,157 +1202,207 @@ "4,26": 3, "4,27": 3, "4,28": 3, - "4,29": 0, - "5,1": 3, + "4,29": 3, + "4,30": 0, + "5,1": 4, + "5,2": 2, "5,3": 2, "5,4": 3, - "5,5": 2, - "5,6": 5, - "5,7": 5, - "5,8": 5, - "5,9": 5, - "5,10": 5, - "5,11": 5, - "5,12": 5, - "5,13": 5, - "5,14": 5, - "5,15": 5, - "5,16": 5, - "5,17": 5, - "5,18": 5, - "5,19": 5, - "5,20": 5, - "5,21": 5, - "5,22": 5, - "5,23": 5, - "5,24": 5, - "5,26": 3, - "5,27": 3, - "5,28": 3, - "5,29": 0, - "6,1": 6, - "6,2": 6, - "6,3": 6, - "6,4": 6, - "6,5": 6, - "6,6": 6, - "6,7": 6, - "6,8": 6, - "6,9": 6, - "6,10": 6, - "6,11": 6, - "6,12": 6, - "6,13": 6, - "6,14": 6, - "6,15": 6, - "6,16": 6, - "6,17": 6, - "6,18": 6, - "6,19": 6, - "6,20": 6, - "6,21": 6, - "6,22": 6, - "6,23": 6, - "6,24": 6, - "6,25": 6, - "6,26": 6, - "6,27": 6, - "6,28": 6, - "6,29": 0, - "7,29": 0, - "8,29": 0, - "9,29": 0, - "10,29": 0, - "11,29": 0, - "12,29": 0, - "13,29": 0, - "14,29": 0, - "15,29": 0, - "16,29": 0, - "17,29": 0, - "18,29": 0, - "19,29": 0, - "20,29": 0, - "21,29": 0, - "22,29": 0, - "23,29": 0, - "24,29": 0, - "25,29": 0, - "25,30": 2, - "25,31": 2, - "25,32": 2, - "25,33": 2, - "25,34": 2, - "25,35": 2, - "25,36": 2, - "25,37": 2, - "25,38": 2, - "25,39": 2, - "25,40": 2, - "26,1": 5, - "26,29": 0, - "27,1": 5, - "27,2": 5, - "27,3": 5, - "27,4": 5, - "27,5": 5, - "27,6": 5, - "27,7": 5, - "27,8": 5, - "27,9": 5, - "27,10": 5, - "27,11": 5, - "27,12": 5, - "27,13": 5, - "27,14": 5, - "27,15": 5, - "27,16": 5, - "27,17": 5, - "27,18": 5, - "27,19": 5, - "27,20": 5, - "27,21": 5, - "27,22": 5, - "27,23": 5, - "27,24": 5, - "27,25": 5, - "27,26": 5, - "27,27": 5, - "27,28": 5, - "27,29": 7, - "27,30": 5, - "27,31": 5, - "27,32": 5, - "27,33": 5, - "27,34": 5, - "27,35": 5, - "27,36": 5, - "27,37": 5, - "27,38": 5, - "27,39": 5, - "27,40": 5, - "28,29": 0 + "5,15": 4, + "5,16": 2, + "5,17": 3, + "5,30": 0, + "6,1": 5, + "6,2": 5, + "6,3": 5, + "6,4": 5, + "6,5": 5, + "6,6": 5, + "6,7": 5, + "6,8": 5, + "6,9": 5, + "6,10": 5, + "6,11": 5, + "6,12": 5, + "6,13": 5, + "6,14": 5, + "6,15": 5, + "6,16": 5, + "6,17": 5, + "6,18": 5, + "6,19": 5, + "6,20": 5, + "6,21": 5, + "6,22": 5, + "6,23": 5, + "6,24": 5, + "6,26": 3, + "6,27": 3, + "6,28": 3, + "6,29": 3, + "6,30": 0, + "7,1": 3, + "7,3": 2, + "7,4": 3, + "7,5": 2, + "7,6": 5, + "7,7": 5, + "7,8": 5, + "7,9": 5, + "7,10": 5, + "7,11": 5, + "7,12": 5, + "7,13": 5, + "7,14": 5, + "7,15": 5, + "7,16": 5, + "7,17": 5, + "7,18": 5, + "7,19": 5, + "7,20": 5, + "7,21": 5, + "7,22": 5, + "7,23": 5, + "7,24": 5, + "7,26": 3, + "7,27": 3, + "7,28": 3, + "7,29": 3, + "7,30": 0, + "8,1": 6, + "8,2": 6, + "8,3": 6, + "8,4": 6, + "8,5": 6, + "8,6": 6, + "8,7": 6, + "8,8": 6, + "8,9": 6, + "8,10": 6, + "8,11": 6, + "8,12": 6, + "8,13": 6, + "8,14": 6, + "8,15": 6, + "8,16": 6, + "8,17": 6, + "8,18": 6, + "8,19": 6, + "8,20": 6, + "8,21": 6, + "8,22": 6, + "8,23": 6, + "8,24": 6, + "8,25": 6, + "8,26": 6, + "8,27": 6, + "8,28": 6, + "8,29": 7, + "8,30": 0, + "9,29": 2, + "9,30": 0, + "10,4": 8, + "10,17": 3, + "10,18": 3, + "10,19": 3, + "10,20": 3, + "10,21": 3, + "10,22": 3, + "10,23": 3, + "10,24": 3, + "10,25": 3, + "10,26": 3, + "10,29": 3, + "10,30": 0, + "11,30": 0, + "12,30": 0, + "13,30": 0, + "14,30": 0, + "15,30": 0, + "16,30": 0, + "17,30": 0, + "18,30": 0, + "19,30": 0, + "19,31": 2, + "19,32": 2, + "19,33": 2, + "19,34": 2, + "19,35": 2, + "19,36": 2, + "19,37": 2, + "19,38": 2, + "19,39": 2, + "19,40": 2, + "19,41": 2, + "20,1": 5, + "20,29": 5, + "20,30": 0, + "21,1": 5, + "21,2": 5, + "21,3": 5, + "21,4": 5, + "21,5": 5, + "21,6": 5, + "21,7": 5, + "21,8": 5, + "21,9": 5, + "21,10": 5, + "21,11": 5, + "21,12": 5, + "21,13": 5, + "21,14": 5, + "21,15": 5, + "21,16": 5, + "21,17": 5, + "21,18": 5, + "21,19": 5, + "21,20": 5, + "21,21": 5, + "21,22": 5, + "21,23": 5, + "21,24": 5, + "21,25": 5, + "21,26": 5, + "21,27": 5, + "21,28": 5, + "21,29": 5, + "21,30": 9, + "21,31": 5, + "21,32": 5, + "21,33": 5, + "21,34": 5, + "21,35": 5, + "21,36": 5, + "21,37": 5, + "21,38": 5, + "21,39": 5, + "21,40": 5, + "21,41": 5, + "22,30": 0 }, "SheetStyle": { "FontFamily": 1 } }, "Spans": [ - "8,1,17,28", - "1,30,24,11", - "5,1,1,2", - "5,4,1,2", - "28,1,1,4", + "1,31,18,11", + "7,1,1,2", + "7,4,1,2", + "22,1,1,4", "2,26,1,3", - "1,17,1,12", - "26,1,1,28", - "28,6,1,3", - "28,9,1,3", + "20,1,1,28", + "22,6,1,3", + "22,9,1,3", + "22,12,1,3", + "5,1,1,3", "3,1,1,2", - "3,19,1,3", - "3,22,1,6", - "3,4,1,14", - "28,12,1,3" + "5,15,1,2", + "5,4,1,10", + "10,26,1,3", + "3,4,1,26", + "5,17,1,12", + "12,1,7,29", + "1,18,1,12" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1304,19 +1432,19 @@ "CustomNames": [ { "Name": "汇报预览区", - "Formula": "汇报管理!$AE$2" + "Formula": "汇报管理!$AF$2" }, { "Name": "显示搜索栏", - "Formula": "汇报管理!$B$29" + "Formula": "汇报管理!$B$23" }, { "Name": "开始日期", - "Formula": "汇报管理!$G$29" + "Formula": "汇报管理!$G$23" }, { "Name": "结束日期", - "Formula": "汇报管理!$J$29" + "Formula": "汇报管理!$J$23" } ] -}//dw62N21SnhDMA4iWpOCJjgFZ4f+kNg2pk1hfKuxsn12TrpdVrv+nfEhVIkXTR2jsQefPbXnEhcQVX7AdpAFM/SROh4xFkibm9A0K57ph2rt33vf2S5m3gsbkNjkIs3ia7X8bq4qoILOB0SqFMKIoZQhdc+e24mesQJdly8AodGO+7rFvczuhiNoc7b1PS+Dy6ToeVw9d1k3ifEqCFOz9s5seGiFQXMZ9/MKKUKXZSquEN026TUTLlvHgH7D7AOky0/kcwgux/ZRijZH17uO+1OekVTqYHr9nZevJZhz7Oqxqq0X41MAVvtyQbBsQ5goYz724/B+am1Jwxf9EB+lkEXIUH1JyaxfIHlXa7ABb8PyOsK+MMaO/qKKk/NP+yFNyE1xloMU6qHA5YaGe7VTn+Oelm36lzrz7AvscHstlTSRWMSgs1FqfajDMfXikutO39bMerW32jLgG98jxmPJVo8SX71jFUGH/n6mTyjTA9+LyT45crXZcOm7Yom7kyGGVVAsCPJbe/l52Xt8cP9LIlvpguwM1dmDOQhTqMVvc5zpTJK0LdRH+GkkcQL2nwVQLxK2NegDbAO+1NAm4ZuabIik55WSfD//QXBgueVVuvfd5QZ3FAvP5qTcqniySl/qi7/Ybi3A2WT7GrynPSrmPBwhi3mz8yo9mWHFukDA2VzlJGZSLDxokDrKcVP1cuHWYAWZO/cK+60pbPZBRzvAew8FeRNHUfPqF1jZoaijTRX0DDW1gRBPgr159wI2cdwM9yLx6R2wBEQoxgK+LHl1imMzLrki2fNW0cdpBdISbHJDhxuAHtZTwcZb+qoJ/LwHlWFNFNRmn89CbyTYrlnZeYhbU7FgXcNMS6RUogQF5RqdLMYGhP0URyk/bwIVkhq16q4aFKQS1iI58oRYadcOyug==|920 \ No newline at end of file +}//L2fMtsYTxwvlaHk1CwaqCbBVlQqqnlhxIE9UqDSUYSuhNqZw170z8giKglrI/KbTiio7IG5XBzBVs8aKRSkPt414qHuy2Nz2vQV4Rand7cxg+CvV5AL4u14CSfhtMIUOBPx5bUkG3N2yTdmULdwtXtnh/8DOJzr5pIhANFeemzHKzHZv03E1QgvnZXlIoSk6MVJjsjOXzoiuyDOZUhZJUlouKLCePu32Dkzr64JriMARoSs6oV76TIxUb8AKE2a2ivQI7HpFix68FsM4wHrng9TEocfWaw6Cpv1TsNhfk5sdfcwgbgdcVHKxM9UHH3OrBuXwXseB0PEhyrlm4bIfJKe+/WKC1vXfit/pND3gg6/BIWXS9j3MqdReTx8IPLj/oxwX4ZMgcgFbWlbr6HzahZ4TxDeijLGVscfFrwXAGAb712LoFHf95fuhtQcxNFaIxpBQN1/zqYgcYIpd7eTMk0i/j+bkKoPpdoQJz3D/yNvkVPQdTCFxDVEAA9TbG8aMSgWZk/M5yH2FnPFSpmZuO+aILRHIxecOcUJU9jVaX0OiT+Byghw4rvYlY9dJuJGOiqzbvRTwPCG2QmKHI6A5XD5GdmKBEJglIXUYUzP3eWI45fV7xJYXl4IfJ2KWc7M9atbbscEaOMth5opJKncLeGa5uZQzQ10HsBYCG3beZHe6ataWOEKVAQdpmeNUyUeSIOLosj72hfI+/M9HIaKlW20+2oWsEoBuZ4DOWUaM6jEy9sOLF5a9PErDO3DzP4zWgj642OCSWaWSjFA7QMQ3sZ1orp4W2nUJsZod6pST6VbdPu6R8jhDJZUBkRSrvqiOCnLbhQUqn7gBRuOaa/kLvv9PwYLaChE0WCDIR/ndFbPpFmSx0guqXr5d3dWuGQZqrjOyeZb1PEYrtfh9r4pzvw==|920 \ No newline at end of file diff --git a/Pages/汇报/汇报管理.rd b/Pages/汇报/汇报管理.rd index 5ff9e2c8..67bb5c17 100644 --- a/Pages/汇报/汇报管理.rd +++ b/Pages/汇报/汇报管理.rd @@ -1,23 +1,23 @@ { "PageType": 0, - "ColumnCount": 42, - "RowCount": 29, + "ColumnCount": 43, + "RowCount": 23, "CustomNames": [ { "Name": "汇报预览区", - "Formula": "汇报管理!$AE$2" + "Formula": "汇报管理!$AF$2" }, { "Name": "显示搜索栏", - "Formula": "汇报管理!$B$29" + "Formula": "汇报管理!$B$23" }, { "Name": "开始日期", - "Formula": "汇报管理!$G$29" + "Formula": "汇报管理!$G$23" }, { "Name": "结束日期", - "Formula": "汇报管理!$J$29" + "Formula": "汇报管理!$J$23" } ] } \ No newline at end of file diff --git a/Pages/汇报/汇报详情.json b/Pages/汇报/汇报详情.json index 2efb274c..d157fe25 100644 --- a/Pages/汇报/汇报详情.json +++ b/Pages/汇报/汇报详情.json @@ -53,7 +53,8 @@ }, "10": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 39.0 + "DesignLengthInPixel": 39.0, + "IsHidden": true } } }, @@ -241,9 +242,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=TODAY()" }, - "DateFormat": "yyyy年MM月dd日", - "DropDownButtonvisibility": 1, - "TemplateKey": "_RS_NewLargeRoundCorner" + "TemplateKey": "_RS_NewLittleRoundCorner" } }, "1,16": { @@ -402,7 +401,7 @@ { "Formula": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!汇报类型&\"：\"&汇报详情!汇报内容" + "SerializeProperty": "=汇报详情!汇报类型&\"：\"&IF(汇报详情!汇报内容=\"\",\"尚未填写...\",汇报详情!汇报内容)" }, "ColumnName": "类型加内容" } @@ -544,7 +543,7 @@ "ReloadData": true } ], - "ID": "b88a1d07-b920-4bb8-baf6-c9e576ad812f" + "ID": "6ecf037b-ce52-4af0-95c1-aed3cbc73516" }, { "CommandList": [ @@ -554,12 +553,12 @@ "Message": "该日期已存在汇报，请前往列表中进行更新。" } ], - "ID": "1f8a974f-eaf6-4580-8c23-55e8b530dded" + "ID": "8e032eb8-0e90-4cf6-ba1b-689ec1eb069d" } ] } ], - "ID": "f8293d17-bf2f-4d6b-9850-75bacb34e781" + "ID": "ca06338b-61c0-46a4-91d1-664764b9ede1" }, { "CommandList": [ @@ -637,7 +636,7 @@ "ReloadData": true } ], - "ID": "e96aa017-234a-46a5-90d4-996db862c6e6" + "ID": "33484cb8-4727-4862-89f6-90a124e4a17a" }, { "CommandList": [ @@ -647,12 +646,12 @@ "Message": "该日期已存在汇报，请前往列表中进行更新。" } ], - "ID": "188381c3-1e97-4e2a-9f3c-192b8ccba512" + "ID": "8d7ee01a-075f-4340-82d8-b1f8cc68951b" } ] } ], - "ID": "c3c0bedf-0b04-4d71-99e7-f38e90dee325" + "ID": "dcb321a7-b5bf-4858-a676-a7cd0c6a2965" } ] } @@ -846,12 +845,6 @@ "1,6": 1, "1,7": 1, "1,8": 2, - "1,9": 1, - "1,10": 1, - "1,11": 1, - "1,12": 1, - "1,13": 1, - "1,14": 1, "1,15": 1, "1,16": 0, "1,17": 1, @@ -920,9 +913,9 @@ "10,8,1,3", "4,10,1,12", "10,11,1,5", - "1,8,1,7", "1,5,1,2", - "1,16,1,2" + "1,16,1,2", + "1,8,1,7" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -966,7 +959,7 @@ ] } ], - "ID": "3477b01f-3268-4153-b863-a8e90a5430f7" + "ID": "0af32912-8024-4476-8467-3b932072582a" } ] } @@ -1006,4 +999,4 @@ "Formula": "汇报详情!$I$2" } ] -}//goYnVqAgVgJ5Q5P6Z3omxiolu11KXUEim6haC05VFzf+RwVyWaQke+gScsCXU8uFGR7Hcfo5IZhqoMQdQfmS+8W2a1Ah3DNLdlu3xRsnpEoaCJeoRJVNfkbyllgjwwJOyM30jii128roiW0DaWrvZQgT6LUXsv7+yj2uKqqKBiftYGKtGRw7NUwqqPLwxhFWLCwKtRfJNlNx1uipmk1wea0ymzqdjwpoJ9GjeR/D8B67XVJvJUKTn5qBCUfYG58o0+9biwC8EBU7//zhgz9MHhLJIBrEJRwYE15deJazbwPnyAZ/mWDyQvphGfs7LSadIYFJTX5e70PpwH7XWrD0iuSuSaJkWIQm4deZ82jygPxOe++EGc882cehBf4CrqDYsaE2PzpDNMMlApJfokHQloAEhL2JZOGeuIDeXvIF6nWAwdBRelZkQIfwHvHCau42CYIfOOZkFxZw0QvCzrwYuaoVJFxkhBGTYbAZAOygPkwM0cscw3N7As9sRMS5BrW2oNqQh3Z5UdZfxPBZu4pO70pSu/caJ/jB/i5ZMQalLUsSeuR+eCnoXtpm9zqm0jzIF5wrRFZ3Kxz5jpcGHXjsurISjKQEblTMFBXbD0ZS63w2O79GkJ5qkKYFVnWzTH/ciwh+V/gub9PZXQXHuPQAhWJ4iNapGWAyf6IzsNv5SGBFvJifkWLmoP5KRPh38dNXCrD+V9OQlbuBCKr2oMX+rtDtJPJCqdHzwA/t3cGyxQn6XQScbYK0LjCAK9l3Ek4yt0AzLkzhgvAjfELlsKFiutbSWbdTzAdUgUxGtxlKqu9stSMtroKdv35rCcm/FJFHCisScYoKZZyNLXt6hxcgI6i1nj2WcgQOlbsqlhbDRZAbTGGoqWJubAXJFMsDgPehJ9JlklztzNotoeDABiZQNQ==|920 \ No newline at end of file +}//bQ6QPNPlF4yjuKtOdSkZbQZu9aqUOhHt1qVuEZjGNYnOBEAfPl9ChKL3KKAHRwaBYIN0T4y8WKvjjN/SVZf0QMxoGgKl7+rN4+LmLc8o8inVPERQ/jPH3hs1XcOnaZFg7nSbKcHQWPByrp5KNvBan9cU4El5duqwY3ceeX5XKMnc5mhDTUT4JKMG3+yUvWgz5e894KdHZrYATQ5VzD4ayRPmk/jEnFZbrek8RBz8jfHn55LB+rl1zLgbdT2JO+Rt0ceV/mpmnjh6xlpIWvtrVtHrDUZX1W9ClYq7TdWIgyoaRpVwZwGI03/apL+UiZ6aZaBeIH3h+S7KEcpvMOZyyL3woN5UnAPkQxspdAdSf03Hvb5wykt2d9muqR92cpO7g/dNxoZ/TZedhFreS7um9LzoGQSVu1gr22szm8Cr7Hm3sldSlm5ObvirhMvSBelY/S+58TJOZcf6qkKKcFlWYN7qmV7ManUICv1MkFJwI8X8s/S1NSERgxEXfEjC8O6THcL0QA3hvS6BJzmbYwwbGv3HC9PEUbLhfZusSNmxd9VfomEcdyQQ4WQy2DMCNnDHelIHfq0SCd5Mf6+wgEiMAAsS739U25rbPcRZsAmmYZjB0k2YVC8Lv8oUt1YLW+pXPYmu4acSoyE2l23J5ywn3zM1cjzqdPbt8ARzfsy+fWaICrFMSHAKpooBEfAorwLjgyfI58ankfPKTYLhWUBuWBmDzn2SHf4vIYcOhjs3YGyEAWn0d6JhUXCnLdwW9zwaDja2pRfEpse3ilgT9SjvcBUG8NOobmjqg23lFm2kdvEpiR8azUpn6a0RPdE4mpFpm62pQ2+OEWBd50krLJG6nc+0Qx5k/CY0qpiGjckb/79OQ1E4xjJcMF7Oi/HCLfkU2YKakrltgmTi6mbgrcGu2w==|920 \ No newline at end of file diff --git a/Pages/汇报/汇报详情预览.json b/Pages/汇报/汇报详情预览.json index aa1feca4..9f9dfdd6 100644 --- a/Pages/汇报/汇报详情预览.json +++ b/Pages/汇报/汇报详情预览.json @@ -148,7 +148,7 @@ "3,1": "ID", "6,1": "日期", "9,1": "汇报人", - "12,1": "汇报明细" + "12,1": "汇报数量" }, "AttachInfos": { "4,1": { @@ -179,8 +179,8 @@ "13,1": { "BindingInfo": { "TableName": "汇报记录表", - "ColumnName": "子表行数", - "GUID": "fcc808fe-5aa1-4f3e-ae46-b9194a3686ad" + "ColumnName": "汇报数量", + "GUID": "7b5edd14-2e35-43e7-bd76-a42ceb9d5d35" } }, "15,1": { @@ -424,4 +424,4 @@ "Size": "3,18" } ] -}//pioaOtROOZIz83majvCsnhMUVvVcbVdptK4zMgoa4wXXmBZCY0m6tTnS1evofqs8zjcO2oagcOC+HhZ8MnDu3cMrr87LNtAWN4IZ0pq8Hyu7zca///VHRf/79iSGyf9vyb3vSlv41Cxewcf/m2A75ugUEZPsXbzcgCsmIiZDo3KpLkXukvzYiR0XxPmfeyRnse2J960PRfShq6qyVBtns/wPv6vXvhrvfT0w4zkIc/S4exk7z20uWQKJuZsYsHicIuuIE98ywJZQFVNuSGOwWwPczhuUTZsjnx6DW8GCUJu/KuXaSJ39zPUmQ/BY13I5WvFSgZ8RSl47byulhu7f+NcKcZ6EeDeXJcDIAajyEk/l/gPpSeqUDIum7RnlVrsEj0gBgvBAcuPacK+QvH6XlmzjlU5zk0ggZWN0KdH/srkom8rcBgpNkkMvO+cbJGZh8tpTYaYeoHq/kVleIZ8JpbhBKUHw5vF3f7nKqiWkzSzFNnOOQc5d7fyGSR39EcU7KcBAZH0t99rvIkkAFCWO4xnkesT2WudDfhOlC4WoDVAuzV2hCdTGU1eVign+YxAWxReRKq6SaFdKXdgy6xrjsnqWrsSuCi75mzqLlXgMW45f3C2OJqlcK97dsk39vH09+sjDo/8gY7nGmLz/mfzfxfbdTEXLl/Z4Kw20K47TjRfKsVLKs61u45BsbTvuGldbMoQlDIj5c+XshZgSKbFw6s8BUXIQydWKsZSyVPmCG/4pljqOxTJ6/zP2m4BcJr2DL4LdtjbjOcfTiKgvZDzZMFMo2nBphj6RV06IAqIr47UinrP4QLqwWjchv69VmLCY4hxjznzvniO7uDLwzafA9NaBAttSmPKYmKMM51eQBa2r7CyqFdR4yNFHF7Uh8qKxnA52t91b6iGKzksf6IGKZA==|920 \ No newline at end of file +}//Ol5JwakEWa43M7+jMDYlcpyPQjeM4f+MOx/WH0uEPjrzYECmYl6W5JygrAYRdYYa26kuIyCOo4gdSNBQ5bKUCfq4huWZ5HDryZA04GZJHKZkCoU42XL6taDPov7bl8fJFZ6iYpXvu7pzUGO/wcj0l+Q5H0FQ26Gg3EfN5FP9jpNOXRyBXTFokoPswXAlybnqoBR8h5nYb1sPhfPwYYRZnQMZut2HZsFlQznl253TWcH/4EBowELsoP185J7CBVdnVZ3mI6kesjQs+DgbS8HgJX8IdVcdBQG1yTHXxch36ObL4x1krPHaVtgUTaP7UM/HNymkL/tgyrfneEf7ivkFu7oKX5A3XI7ZKQMY8nJpgfSX9O31DxOlMmg4VdLuE1PWT8wYlaDdKZS4vGiLkTXKiBGLUcft7uRqUsiqehHbganXdbFqqj/tMpEgH/gWi4G8/e+gyb08h12Ba1s38NErWoDkUHpv14eIX4YgmkIkKLRTY2nY1uxNxTTCEtLQM4oRne9R2MLtJ7waMDlLkM7j7/fu61yh7XuPwLqccDiqbo+17d9SJ6p8koac5gFlceF8ZieYSkKOWLWlU+Ee8qfUTs3vxvNyvcsb90C05/Fx1Aib7xAYAsfjqGmxh4haxLa6U7pqRh9S3q0OEVa/u125ktiusGlqwxe/JI1M8xialApux90yG1d+0dX9bIjrNyXVPD/va48KaVfQ4sHznOhNM18ej4tQfd5jzkD3GlPBBFMKOkJwC8Vt3N+jCQj62LvECsFZx086FtOeINwxwercFqM8TRoht12BUqBj9qYbtJowNvSh/Y4nKYtJPMcVeXJebQsTnwudU57usD8Ae6LMB8n7psfsbHCH6omQEHuZtcC73AY8zhr04mGUKfhaVQn37YAI6EGjn2ghtemWfX3vlw==|920 \ No newline at end of file diff --git a/Pages/项目/项目列表.json b/Pages/项目/项目列表.json index 3ca62ebc..941b8714 100644 --- a/Pages/项目/项目列表.json +++ b/Pages/项目/项目列表.json @@ -23,12 +23,24 @@ "IsHidden": true } }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0, + "IsHidden": true + } + }, "6": { "GridRowColumnDefinition": { "DesignLengthInPixel": 15.0, "IsHidden": true } }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0, + "IsHidden": true + } + }, "8": { "GridRowColumnDefinition": { "DesignLengthInPixel": 24.0 @@ -71,16 +83,6 @@ "DesignLengthInPixel": 32.0, "IsHidden": true } - }, - "5": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 - } - }, - "7": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 - } } }, "InLogicalVisibleIndexes": [ @@ -692,6 +694,20 @@ "7,4": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目列表!E4,项目列表!N4,项目列表!W4,项目列表!AG4,项目列表!E6,项目列表!选中分组" + }, + "Value": "%Null%" + } + ] + } + ], "Text": "重置", "TemplateKey": "_RS_Information3" } @@ -823,7 +839,7 @@ } } ], - "ID": "b41bff96-c8b2-4e99-9491-82b500fce7a1" + "ID": "18f750c1-edf8-4b54-b84c-625aff5a2fa3" }, { "CommandList": [ @@ -836,7 +852,7 @@ "LoadBindingDataOption": 2 } ], - "ID": "5b19c391-2448-4a6e-b63f-97d8f675907e" + "ID": "f3b3c9de-f1b5-4713-bebc-a100ded40f1a" } ] } @@ -1420,4 +1436,4 @@ "Formula": "项目列表!$I$15" } ] -}//Xk43kcIPWERsCIbnGCdSE8zqzQ2IE2mNg3QLN7EJzTQuIuDFQ5IefugSFoIBto+PduI9kRPR/HWran8siwN5K7ZbirtseelFxa3pf8G76Ot6r6vMYznQPIwkomdNVwCQGgMjjHXW+w7z+13vZ3uA17UQrJ0lVCSrfgSbzRV5JArhN37A2R68tjjxNcsM4bxYo9fUna+NY54bkpSFB5xfLIHwQGRRlVxnPzJtbqar228PqdGTM74Xr7mB4B6jCw+PKaYpo0F226HvWBRLFUcurRaNsJwvyM6HrX5xuZe+EQqeERW86VXEGyYoyKI4im3+QHof/c/vDDJN0QJ1r8vEs+8LWu43GhAxOyt5M4xv0R89AMk+rtHrODrqwJc4DvZ3On4BHfhWxuWnrSFzt7c4BhmT6oEuGJFAQDBE8vGvGfyaO6VRsPXxf7Nv400BxAc0x28rhYQOzGX59jJglirSc3hb5tDW3JvgY2a/CBEIiql0Z6nsA3pCkr+GLrtAYtbfy6gFHs/dYR1E7LP8Mk1NSRFPy5kFJRfiwA3doo6n+rQCqSDq0sO7u+6R3HXW28yihOG3WPCawFbHsZp1NFTVNaBefvFlA9t3qdU9vSCadjtnd2FczoVwXObl8MHPfNVjUe8ZmNGRBVQoIjpLwDJRun7uhr2mw1gOP6/DitLkbnQg84SA2j1DXoioWdIyOvj1zZnKplt3OTvRp6xRGfs1fW50QZOmqBajzSe+Or0Stk1Nu2U0HohSQAGFeg3EIl/OzZNYZe0DLW5Tc9drX164gW82V+rmF0oaxozDs8zzp08d5mKiTwZxffOhNZDqDsP4dHhSjtk1Q+zDN/hLQLR+k2KhCHuvNLL5wSh6SuB/bRd5UhwT2pqODBoKKcWSLmGpTYdJJnTx+9pyDRUOl3A6iA==|920 \ No newline at end of file +}//P0Gfp+idfV2VeAz+T+PEu2YzocUeUb2w5P5MVg22hvDil6tNZdcDcHU9Id/8Mtls2RnssWp4iPMbLB3n2yS4ynYPJC9WJGZIQTZXuHFCxf+SHdUy2xE0FpEc7Hnb41Blsv+lAUIJtz8eKE858eXAbEtY9FmIf8vIGxid9GBe3Z+U1qxwGtbAIp0+8K206SwczgzFStCXb4OxcOwUiK7U3QSmUw+Bz53qNDoA6r8hGRHp2g/mPuQh+VUtkaPWxR/9GqmeYdAkVXgntj9313UGV1EcTC5FMcczAWRZMPJG3dZBUMiFhrfHpUy/NOzKcP6TnCkjAiE+HYttEnLxov35cm1YUj9CNYp9whgtQ34XYXcSGSTLI7rCpKaLp6pwAEeO6aOd0rS0kFZ9bZ1SABlWeBa3k0Lz7XK3P2RxiugCytznkGFZeBwyrq3vj9SgDHb7bjhr5ZT232+ADwDUOa4RZBnd2vL9paWK9qSgTxxZL+JDdVE0z8k7oXUhgXiSZNFBfaUD/2OpJUEgTGx7neXo7ywnXT24Ksf0THQkowU/b7tBcO4itTT/B93N7d0p5OlhceC9S6Fv1zyMser4nL6HnJDkJjeXD9JxPZMs6HObiEFc+NvHCXN5QM2hCqLQyJ2Ug7fIlQ1VbMvdnTy9pN1v5ePvlqw3Qtj5pwZZfKUjtxqNorU+NjgWoMnvhsrP3jb+kKNA/6cuzZGLlbYw+P1qOEqid7bAtK5g6BsRv5XVCFrOVpjflAc5caZERiadJ01KQ+eBejZpY2ro/iMTsEU6DXuxihCuUY4EgINaN2uYSg0n6hTyqjHrKx07moTV/QwIY9vdavuvZnbPftfDvUAegThb1JSKBB+0OC/TYghRD5loZoY8grojTzUcXsQpf8W15ORZjsExl3B+eCWI+tIzvA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目工时.json b/Pages/项目/项目首页/项目首页-容器页面/项目工时.json index 6e81e6ae..a9a2f1c6 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目工时.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目工时.json @@ -385,8 +385,8 @@ { "BindingInfo": { "TableName": "View_任务工时统计", - "ColumnName": "工时日期", - "GUID": "1eabda85-4590-4a80-97d5-4832f56c1b32" + "ColumnName": "日期", + "GUID": "7d8e1fdb-267a-4193-91cd-b4403eff1ebe" }, "ColumnName": "日期" }, @@ -429,10 +429,10 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "f9fb593fe9db492e8f528f7016e24b57" + "ID": "29769ba30a384ed0b866345d2fae554d" } ], - "ID": "9c7d6b0d-6129-49d6-987e-b4ac92917421" + "ID": "7f90af58-2d06-4ec3-b929-7f416c9f7594" }, { "Condition": { @@ -506,10 +506,10 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "ae94acb2e997401fadb422a6f136b747" + "ID": "088c9d31683644489a5142434a90a00a" } ], - "ID": "49445c83-33ab-40a2-97dc-584e245d7039" + "ID": "b59b8c31-84f5-41f0-83dd-f7f163e04a7c" }, { "Condition": { @@ -582,10 +582,10 @@ } } }, - "ID": "0ca30518e0c24ec0868448c038d1ec42" + "ID": "2fa6d81453e44b96895c363539cd8e35" } ], - "ID": "14f05650-e758-47af-a969-3eef58306edc" + "ID": "e3d72de7-ab90-495b-be85-f7a5d855c55d" } ] }, @@ -1010,4 +1010,4 @@ "Formula": "项目工时!$B$6" } ] -}//NPdVgn4Sf4GpXH5lImBPxZ1WWVrTMnnKJiEtbtic9cif1FsYmnDOqnp32xDb46hD3su/LLmtZhECNcVQe7xvX7Iaay0VoDe3MVyYjSsEA4qV6+7lCUhJQmfJZNiDaDrqWe2vPixM4LkjYdpcQsy72adLjrR/sa8X2FhcaUCQ/50rxaiqp/LWZ4smGwvtUlUH+WChiPDysjqlUk2LDWEyeeF5CUa4KafHfUb1LS1aiPQ1hZnIRafgCnRa4xwz+DsICFP4Z4b/r5Pm0RG6HBct9daocRm39GB3iQeQMkpPCdF+SfXpxAhRtPBcmQS3HnDdod0lkMROLkSRaaF2aqv0D5oOQyqva52Dj+0qYV/nda+0cPq0NsorIT+PuKToZFUmdbwFIwu/7zApzKTfyxQuSRWmc5N9veo+Dosq6BDqA16mP9IJr7lxxYJTy9PMDEPY3ptU7j5An1Hvl1Bw1xsK/m7JEtrE9e783Ufrmy2W950dzqwnIx/LR6CZ7F0LSfvVih9LwkLPjE7dzsZtoqVFit1PUJi23NoLVx9O/V5U4OHU07uYowA1GpWMzTbnqbMTI1Ubk2Sb3gy2tUmgVScOZ6p3q4t3NwBXrm3oPn/hrzd9RhqIR/eNqnGdoogrSV2j0A8q5VO62dUWoVlN2QK4wlLXRNvyHoZQFsBj9ocDj12ihq0wb7g8eS95gi6pPm7WTd3g/YUpnHQUAV6wsYxGWPRTAB1o/wasbWbsYIsLnp65qmdtK81/efrVoHP2ZqGXC7Qhc1DGlACkFMBbngdOcCvEdvSuTvYM6Q1fUXHzNWuPFEg6HOar1TLqbS6B8yJ+zt/K6snoiPPigx95XkwAR0v9aHmiLP+Vg2qC/Cp9qhnSWqkDoOhqYybtwQS2/1eBJZwQ5630ftZvB7TMRV+hhg==|920 \ No newline at end of file +}//QTKd87+tZN+palbm2oCmBghUKQlHfV4qSoJfhtNWAv9zi/csLW5LxaGejkg2buLSBNI36gRpqAohR3gFsZbp/tv/PF4njcGLOgEu4jXpbGnNAVJlrRVfdQn+5mYY2lJTwxah+TRq2HQrrCY8hCHGI3/Y3lkRDAJhqO/X4G/Gs529anVA/2Tf7xS+niBiA0ri+x+/pqFLJU+zUjF3c7XV43yuuGIuNGwuQ4swSTC0NHcqyn+SOk6UYemzZUM7D9U/81O2I0TkqGfHhj4iKLmbSICA/Tkpv7WTUqnBXJmnXiTRK0alu/GLOiLt3vmZs6OklccZFXvNWVlyJ8kOeDwt/vgJkRbv1bwcNOlC4j8+ilQli5yWQs7gCELSH8WgC9/bpV8BFq9UIWmdEEoCdX8oKitI4Sqrr9MJYKQl1HXUxbj6XwITCauU/JbL/7EXcwV7dE+Itj45PZeEhx/U6+SYJtyxf+XHnrXXCIOPTXc584tB9abiaCJYz1sD6/hZnNkv8EpQNwpMZZcz5ggl7lPY4DbvJUiLLoagjDcsi91+XbtAGD2EwAq7io+JYLewIj+B1GUZlaTUdP2dNv5YWZG7wMqkzXQ89ROVAWLDppVihjDIcJiflZ/zbehV5pZiNZsEUUzOU21O/DDmgivTSA0gZAabIPoCZMLuwv16TGcex0YJHKBlK3/TyjIhmkYIfaMcKjQf2EBqrOStMXS6erHXPNUexvPvWGHOZkl0cKII08RJKE8n/BX9Doydn8ZUTXqILtJl0r0OKu9qlcBnXHNeKF2arAN1tnj8KY2fFV8oe8Rb1izmK6STAbv6OkIDvHl4jdGJNdn8PSrxGFEujRXxkWP3uEoc9MydyiS/F5tMjoSx+RRt+QbmG91nrF4E64+XzTzVVKCMiLQKgsJ9Uw1K9A==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目概况.json b/Pages/项目/项目首页/项目首页-容器页面/项目概况.json index dfb7031d..990b8307 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目概况.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目概况.json @@ -351,8 +351,8 @@ { "BindingInfo": { "TableName": "View_任务工时统计", - "ColumnName": "工时日期", - "GUID": "0f39fdfa-8807-4169-8abb-d26ecba6c71b" + "ColumnName": "日期", + "GUID": "dd42903b-683b-4db2-bcbd-501ca3d52431" }, "ColumnName": "日期" }, @@ -378,8 +378,8 @@ { "ColumnBindingInfo": { "TableName": "View_任务工时统计", - "ColumnName": "工时日期", - "GUID": "36fbcecc-b720-41e1-a98f-c3085b20e89f" + "ColumnName": "日期", + "GUID": "7b9e6b64-9ed1-4ada-8880-5d08f2cc7caf" }, "Order": 0 } @@ -594,4 +594,4 @@ "Formula": "项目概况!$AG$2" } ] -}//+Pwb3P7i0Ls3P1c2tD1h9GUXeKSn/qqEzCk/NnowOE+JVpEn15rLmHTXX+wDStuLKaoXYRXgHFACU6RYAqCeshZHwpmuoK3sGMlsF1U0bHR4zKZ09XGNlyJKTrN5rigmDPq+xWyOSp+sPaut5AOhx0nbK9e4JilDSML2Q+Axez2KxaDW57RwUSXEttYnpKZlRiKci/9yuPtEx/kmTw7M+Pp4XGu9/2C1vRwH4SCucqlYk9W3cR5ZeOVU3Fvp2eLOLhwp+NgUavZ28j/YVgx22r5aO+8npkH3zSsCWy5+B8LWe5WJXSt6ZeQ80/MpDKzqXYLdKX46ttCa6d5X4AEY0w49F+8v6agtHc8So7YS2CsXIrkouPY13lwGgTenKJ4orEvLgY9J+t/O7rdWbUDbgtcUQeXWiZB8CWYLO1hrpKrkiBYxGyXZaV5NuuEvcnXQ0VQDx7CecoX8hs63Y31yXMj62exzbNRxRvtMV8qWq/ftk13BbK6fuhAcdm05LI4dyTUI+7IWnHBDbpKqgEA7i9WquGZy3NLlmvw942kZon2UzCEfK/qGWKghcs40YThqFklk02BrwLjL/hoYL3FW78TBpId7AKSv1SsKB0kwZnsUlTQtZo/BDOQczqQziirgChhqPYJG+3nGvSPbD7Yfb8LGmZvW34QwkBkibkMSrg/qSO0TlltfiGPhIYEqep6rhLxLMzbhRCGC6VeHMEMiICfQOgge20871lS6S+i/TPKYfeI1NXpgxsdUT4mMVn1k4+3cFyVaWZlDz/mg3uR82cfQzqZr6vQxFGJPM3/jJsjYQgxjYL38Ma0DvM7mu5ObxYalcwu+Iz91yGkHaf1Ks2haorg11qBcFtRaYVhmUPwREd0CBIf8cZGo8yfpd7iPvO1wRlYyCIHKwhZocpemyw==|920 \ No newline at end of file +}//bWkcW3eaadD+Xab7zDRmW5EVHvVyy5nZNz2Kmlv9IkgziH8zZ3di1+dCoJ6p2wBy/2bQJ9TEXanPzWapznAfbLCOMzRXQZzoI1VdjwWlOlTNGabnkkL77knqqsFKW0BI3IqoBzMyiaIVevGUN73XqOJltgeYSM/13MhWcEwA96tpJg6+AgEMFweecRjpAzBiABzHEsDi/vDRkYRns/Cdd8FlSYOC7PGzwehumEw02YtcHhGxTAeeJhIfuOGQD1sL5VvLHTdcqI5S+d9WYMhEf0vAQtTA44odtzRXtBMZLWHkNsjw3VV7+MxNo+TzUp18XOhli8xFMRLxWcd9Q2KaIrak2DapTx77XFPw9YTzJkKPIBDVVz9GvwdO2f+QSCO/zazalxKa5e+QvyWPVsCUa9waMBuu1380GiW7wRvRiitkTIC7JYt1upAmr3+4CDXJO8B792uRBzaLMLqtyjP4Yrm8NGKkiR2KHywGLddj7NPbyfIduNBz2NvEDFt8hS1fZJ2pze6K1hvvWB3C8zZBztDHja3nZOMiBMS3xdxIyW8dV1Sz4wZlvkoGs0qOMF0ncHgBek3lGhbSm2INYGXDDQz+8rI+GhWjDouY9GHe6quBqeR3aUN84ECzPJyrArOSbkCGYQRYGpPRomg2OlFSwSbebDoaqmtSLGMTw2KEHvhI84qPzTcVRu/Ce4lJ80oUePsINgTwWkQnTaM/+AaHZ/mJDWgwcQCfjKc3DKtLcCFjq/STFVT+Kt4Uzf1pyLmyeTjbz4oGqMSic6fsPUDjDWkOuv5AQ0ySPR28uc1kzY9mkr9VxSxzvrRuJ9jvDmen9byn5wDvRmrlLMQe0izqmx41VaFBW87bTR7E2D1bo3iT89hDDWkhLed5sntHQgByMO9ksoSk+d9cQNHSNYCgRw==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目负荷.json b/Pages/项目/项目首页/项目首页-容器页面/项目负荷.json index af0a43d8..bc732cbc 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目负荷.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目负荷.json @@ -348,15 +348,15 @@ ], "Cols": [ { - "DatabaseColumnName": "工时日期", - "DisplayName": "工时日期", + "DatabaseColumnName": "日期", + "DisplayName": "日期", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=项目负荷!A7" }, "Format": "m\"月\"d\"日\"", "BackgroundValue": { - "DatabaseColumnName": "工时日期", + "DatabaseColumnName": "日期", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=项目负荷!A7" @@ -391,7 +391,7 @@ ], "DatabaseColumns": [ { - "DatabaseColumnName": "工时日期", + "DatabaseColumnName": "日期", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=项目负荷!A7" @@ -496,10 +496,6 @@ ] }, "PivotTableStyle": { - "HeaderStyle": {}, - "BodyStyle": {}, - "SubtotalStyle": {}, - "TotalStyle": {}, "IsDataColumnAutoFitWidth": true, "MinDataColumnWidth": "70", "IsRowHeaderAutoFitWidth": true, @@ -533,8 +529,8 @@ "CompareType": 3, "ColumnBindingInfo": { "TableName": "View_任务工时统计", - "ColumnName": "工时日期", - "GUID": "c1cc66f5-d7a8-497c-a5c1-4748545d2ebc" + "ColumnName": "日期", + "GUID": "acc95739-b2db-48ae-8268-403dfebb46f7" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -546,8 +542,8 @@ "CompareType": 5, "ColumnBindingInfo": { "TableName": "View_任务工时统计", - "ColumnName": "工时日期", - "GUID": "c109dcaf-d89f-4b8a-bd64-830c6f4ad934" + "ColumnName": "日期", + "GUID": "94badbdf-b18e-4030-8bb8-ad832127d65f" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -569,8 +565,8 @@ "NameUsedInJavaScript": "工时日期", "BindingInfo": { "TableName": "View_任务工时统计", - "ColumnName": "工时日期", - "GUID": "e1008d3f-00e0-4f30-b5bb-31de1175f038" + "ColumnName": "日期", + "GUID": "da085570-df17-4e39-b2e1-c1812c9fdc6b" } }, "6,3": { @@ -728,7 +724,6 @@ }, "Spans": [ "1,13,1,14", - "6,0,1,3", "6,3,1,3", "6,6,1,3", "6,9,1,3", @@ -737,15 +732,16 @@ "5,23,1,4", "6,23,1,4", "3,1,1,38", - "5,0,1,3", + "7,0,6,23", + "6,12,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", - "7,0,6,23", - "6,12,1,3", - "5,12,1,3" + "6,0,1,3", + "5,0,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -825,4 +821,4 @@ "Formula": "项目负荷!$X$7" } ] -}//NK16XfNu2eWyVsxu7JzI3XOE6+xYyKia0JvfRdJ8/rBchMaqnkFCY5zUmhyNv/YU37Rty62Jh8n7N+EwtN2TH/1WiggsXaXAIlj6iY9W31UY7E1cg8D1jJNMf/cQeCXbEkdsVhfE5Cd6vzOchQPdyN1EQHF3AKqTkyQhwN3xkMOOt8r1qaaXYbtFRD2aRd6DQatDlakAlAKi2NThvuufJMlvK/3mf8h+BlEjwWMNPLe+JuUXMd+5qwa4syL+4ykozExNs5WeyrsILKCKH0tB4NRnI7cMRSW+Cc5jf9ew0scuA5yKP/nJzNqnAhx7wxhUhYKl1XtEHUgEayjUuk57Wv8y+UNpXJJqDHxP5YTRfa7a/FoplNZlXnHBsIs65Aik1UG6XjazwO842vp/wMitR1XaZ9vkjLC7NatEYTlCU9Y/Poj/RsldUxyuZznwFIfaqpCkVfb8+02qr0wRq/gLuxfArd5QirmQ46BaAN+j3xUnFSz86GJEavCIOGIsoLxbqXgMinZtj7S0o2PzEvNgz1bEUJe2ahGkb4DBBhpTQanYMqv2RxkV7TX1RmejEdJ6JPFDFKVBFJ17GIjHUcQlGmwIehz5EFInWCLpBO2dOFPmp7K/6zKzVaWa3pnkreVaEddSxulLH9uJjQvmo66JzyaKmZTbkukO4/6oHRiXtEdfBILv4OpiLiWeqNjCGKPYdgOZ5/2cSlnYVabFYDyuAt3KwLxHHVqVNtZZTBkqLLxLM6X1AeBENGE9KpZju3KTndEYpls2gz3JD7hsk6YxI9IdxK2XAG2x6dvyAjOho9MgFuiNVlXV/9dARyrLF/s2zGnkU2XGzuE8JiFu3sdAEQE1q3Tx6qIgL1XbYzYbWXyOxrWZ7fEdwRANF10n5ZHqaczVgJB6cgQVolIc5SgofA==|920 \ No newline at end of file +}//d/c+XKkyXRB96Z9t2PPtCq2IVnW2zKAtsV6Q5y/S9IVpyZYpXa8IVjbUIvnrrpIecPFyFdTea7rduUtdvjfv3KXxVfy6C19/OVUuCExkBsBdLoXpPCcYfFEVbHxisJBvHiugi0Dp1nM97S7nlmxuNdov6BGZ66PqyNMWbdhuPKyJsNZFHEGjoaDqv48GzmF6KIRi7Xb+JK7wn8UdweYwWVZcc+lJhzplCVcrG2zZQ4+NPNCbwstXnMpgk11PwqTCJIy1XenlbdtwL1V5pSPmyqDLNezhlapECnZKlJoMiio2RkpLG5raYT+8fYFmDs+eIbWpBKdWwlxdv/IVWtTJF636xI175UMABfPUAnS5M8HA2iV4+dAYkSPKhQr6fzDFMUqRpHuCB4wmbgsaQLKqlu7CjPRrTsvRiSPAbqkZRy4x2AMxOLA48CNz3ECEnuUcYC97d66N68giJMj9cfOun1EmN+4b2ap52OYzllBmO/oSmrTFNjleeOJujYSqDVcRKrTCnSJTjZGTY8l70TGAuS1FlrOimvW32RPCeOu/rINLpYo6lSIVyeSnFTcIvzhwVJ8DPxA6O5dwnyffDnxKroqZoVN0tdrFSSZ/N37oSAYbICqZCevo04Fp8Vx9Y3e8w950j0p8iQcirEDB6rSyo6e28Wf+7cNvOw/Qj8z2qLnZNwB+3P2UyQ9PVrncgE1zcnHH/qd3GfhlPGVsv3MugByrchl+gYTAN7EXwqEqsIUVBltIFkf+UJWR4vcsV/EQcckr9VJWHgmjldk7ITRyRDsW/BPE/W9qGqJ9CmC/BEWQhO2ORR746t24Bg49gr44WFEABzdn9rHt0/BE+avuopi8Yx7Bs9XNqiBkqu1yfrZtARm8AIO84TvAjIG3W95+jqVd2GpwQxNkWRAQx6l6OA==|920 \ No newline at end of file diff --git a/Plugin/可交互的页面容器（iFrame）-8_0_0_0.zip b/Plugin/可交互的页面容器（iFrame）-8_0_0_0.zip new file mode 100644 index 0000000000000000000000000000000000000000..06f8db767fe399c70e6e4881c277ca911944f390 GIT binary patch literal 44528 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 literal 0 HcmV?d00001 diff --git a/Reports/工时报表.json b/Reports/工时报表.json new file mode 100644 index 00000000..49dbfeef --- /dev/null +++ b/Reports/工时报表.json @@ -0,0 +1,106 @@ +{ + "Name": "工时报表", + "DataSources": [ + { + "Name": "人员工时统计视图", + "GUID": "81f80028-ee1f-438e-8213-052881e70f5a", + "DataSourceSetting": { + "TableName": "人员工时统计视图", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "人员工时统计视图", + "ColumnName": "执行人", + "GUID": "4885952d-309a-475e-ae29-086762677bf3" + }, + "ColumnName": "执行人" + }, + { + "BindingInfo": { + "TableName": "人员工时统计视图", + "ColumnName": "日期", + "GUID": "370ec46a-f7fa-4a77-beb1-b9043d989a22" + }, + "ColumnName": "日期" + }, + { + "BindingInfo": { + "TableName": "人员工时统计视图", + "ColumnName": "计划工时", + "GUID": "5b5bb019-9db5-466a-aa74-717484c4148f" + }, + "ColumnName": "计划" + }, + { + "BindingInfo": { + "TableName": "人员工时统计视图", + "ColumnName": "实际工时", + "GUID": "6f6059ab-b3f3-46f1-889d-981f920bd387" + }, + "ColumnName": "实际" + }, + { + "BindingInfo": { + "TableName": "人员工时统计视图", + "ColumnName": "核定工时", + "GUID": "db9c1e97-e7b0-4455-a80c-9e55823a3323" + }, + "ColumnName": "核定工时" + }, + { + "BindingInfo": { + "TableName": "人员工时统计视图", + "ColumnName": "计算提成", + "GUID": "eb690d51-a3be-4a39-9040-8cab780d936f" + }, + "ColumnName": "计算提成" + } + ], + "OrderBySqlCondition": { + "OrderByColumns": [ + { + "ColumnBindingInfo": { + "TableName": "人员工时统计视图", + "ColumnName": "日期", + "GUID": "4ab1cf8d-2028-4e41-b9b6-6d2e82491f29" + }, + "Order": 0 + } + ] + } + }, + "ColumnsType": [ + "string", + "date-time", + "number", + "number", + "number", + "number" + ] + } + ], + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.ActiveReport.ActiveReportPermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.ActiveReport.ActiveReportPermissionResource, Forguncy.RbacPermission.Core", + "activeReportType": 1 + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.ActiveReport.ActiveReportPermissionBinding, Forguncy.RbacPermission.Core", + "activeReportPermissionType": 1, + "roleNames": [ + "FGC_Anonymous" + ] + }, + { + "$type": "Forguncy.RbacPermission.Core.Impl.ActiveReport.ActiveReportPermissionBinding, Forguncy.RbacPermission.Core", + "activeReportPermissionType": 2, + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + }, + "ReportType": 1 +} \ No newline at end of file diff --git a/Reports/工时报表.rdlx b/Reports/工时报表.rdlx new file mode 100644 index 00000000..b20d0ab8 --- /dev/null +++ b/Reports/工时报表.rdlx @@ -0,0 +1 @@ +工时报表.rdlx4cm0cm0cm3.5cm1.562cm=Theme.Colors!Dark1true执行人22.5cm2.5cm2.5cm2.5cm0.939cm0cm0cm2.5cm0.75cm=Theme.Colors!Dark1true核定工时=Sum(Fields!核定工时.Value)0cm0cm2.5cm0.75cm=Theme.Colors!Dark1true计算提成=Sum(Fields!计算提成.Value)0cm0cm2.5cm0.75cm=Theme.Colors!Dark1true=Sum(Fields!核定工时.Value)0cm0cm2.5cm0.75cm=Theme.Colors!Dark1true=Sum(Fields!计算提成.Value)0.999cm0cm0cm2.5cm0.75cm=Theme.Colors!Dark1true=Sum(Fields!核定工时.Value)0cm0cm2.5cm0.75cm=Theme.Colors!Dark1true=Sum(Fields!计算提成.Value)0cm0cm2.5cm0.75cm=Theme.Colors!Dark1true=Sum(Fields!核定工时.Value)0cm0cm2.5cm0.75cm=Theme.Colors!Dark1true=Sum(Fields!计算提成.Value)=Fields!日期.ValueAscending=Fields!日期.Value0.812cm0cm0cm5cm0.812cm=Theme.Colors!Dark1true日期=Fields.Item("日期").Value0.75cm0cm0cm2.5cm0.75cm=Theme.Colors!Dark1true核定工时0.75cm0cm0cm2.5cm0.75cm=Theme.Colors!Dark1true计算提成0.812cm0cm0cm5cm0.812cm=Theme.Colors!Dark1true汇总0.75cm0cm0cm2.5cm0.75cm=Theme.Colors!Dark1true核定工时0.75cm0cm0cm2.5cm0.75cm=Theme.Colors!Dark1true计算提成=Fields!执行人.Value3.5cm0cm0cm3.5cm0.75cm=Theme.Colors!Dark1true执行人=Fields.Item("执行人").ValueTrue3.5cm0cm0cm3.5cm0.75cm=Theme.Colors!Dark1true汇总truetrue210.5cm0.5cm13.5cm3.5cmWizardModel{"layoutOptions":{"totals":{"totalsForRowGroups":true,"subtotalsForRowGroups":false,"totalsForColumnGroups":true,"subtotalsForColumnGroups":false,"showTotalsBeforeGroup":false},"features":{"expandCollapseGroups":false,"collapsedGroups":false,"enableUserSort":false,"steppedRowGroups":false,"showValuesAsRows":false}},"columnHierarchy":[{"group":{"name":"矩表1_日期_分组","field":{"name":"日期","expr":"=Fields!日期.Value"},"sorting":{"value":"=Fields!日期.Value","direction":"Ascending"},"itemName":"文本框2","itemValue":"=Fields.Item(\"日期\").Value","format":"d"},"children":[],"startBodyIndex":0,"endBodyIndex":1}],"rowHierarchy":[{"group":{"name":"矩表1_执行人_分组","field":{"name":"执行人","expr":"=Fields!执行人.Value"},"sorting":null,"itemName":"文本框1","itemValue":"=Fields.Item(\"执行人\").Value","format":""},"children":[],"startBodyIndex":0,"endBodyIndex":0}],"body":[[{"itemName":"文本框5","field":{"name":"核定工时","expr":"=Sum(Fields!核定工时.Value)"},"aggregate":"Sum","format":"d4"},{"itemName":"文本框3","field":{"name":"计算提成","expr":"=Sum(Fields!计算提成.Value)"},"aggregate":"Sum","format":"c2"}]]}人员工时统计视图_DataSet1cm1cm29.7cm42cm1cm1cm14cmjsondoc=http://localhost:40013/Forguncy/ARDataSource/GetDataSource/81f80028-ee1f-438e-8213-052881e70f5a;schemadata={"type":"array","items":{"type":"object","properties":{"执行人":{"type":"string"},"日期":{"type":"date-time"},"计划":{"type":"number"},"实际":{"type":"number"},"核定工时":{"type":"number"},"计算提成":{"type":"number"}}}}JSON执行人日期计划实际核定工时计算提成$.[*]人员工时统计视图DisplayTypeGalleySizeTypeFitToPagePaperOrientationLandscapeParametersView{"controls":[{"left":15,"top":15,"width":275,"height":60,"control":{"type":"date-range","binding":["",""],"maxRange":["none"],"viewMode":"default","daysViewHeaderFormat":"","label":{"display":"top","text":"日期范围"}}}]}DefaultTheme.rdlx-theme \ No newline at end of file diff --git a/Tables/工时/View_任务工时统计.json b/Tables/工时/View_任务工时统计.json index 30805da1..90ac6f48 100644 --- a/Tables/工时/View_任务工时统计.json +++ b/Tables/工时/View_任务工时统计.json @@ -1,6 +1,20 @@ { "Name": "View_任务工时统计", "Columns": [ + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "datetime", + "MaxLength": -1, + "Name": "日期", + "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "执行人", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "bigint", @@ -17,17 +31,24 @@ }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", - "DatabaseColumnType": "nvarchar", + "DatabaseColumnType": "varchar", "MaxLength": -1, - "Name": "执行人", + "Name": "工时核定方式", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", - "DatabaseColumnType": "datetime", + "DatabaseColumnType": "float", "MaxLength": -1, - "Name": "工时日期", - "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + "Name": "时薪单价", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "float", + "MaxLength": -1, + "Name": "提成系数", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", @@ -45,12 +66,18 @@ }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", - "Required": true, "DatabaseColumnType": "float", "MaxLength": -1, "Name": "核定工时", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "float", + "MaxLength": -1, + "Name": "计算提成", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", "AggregateFunction": 4, @@ -83,7 +110,7 @@ "ConnectionId": "业务表", "SourceTableName": "View_任务工时统计", "SourceTableSchema": "dbo", - "CreateViewSql": "SELECT \r\n [项目ID],\r\n [任务ID],\r\n [执行人],\r\n [工时日期],\r\n SUM(CASE WHEN [工时类型] = '计划' THEN [工时] ELSE 0 END) AS [计划工时],\r\n SUM(CASE WHEN [工时类型] = '实际' THEN [工时] ELSE 0 END) AS [实际工时],\r\n\t(CASE p.[工时核定方式]\r\n\tWHEN '计划' THEN ISNULL(SUM(CASE WHEN [工时类型] = '计划' THEN [工时] ELSE 0 END), 0)\r\n\tELSE ISNULL(SUM(CASE WHEN [工时类型] = '计划' THEN [工时] ELSE 0 END), 0)\r\nEND) as 核定工时\r\nFROM \r\n [dbo].[任务工时表] t\r\nLEFT JOIN [项目表] p ON t.项目ID = p.ID\r\nGROUP BY \r\n [项目ID],\r\n\t[工时核定方式],\r\n [任务ID],\r\n [执行人],\r\n [工时日期];", + "CreateViewSql": "WITH c1 as (\r\n\tSELECT\r\n\t\t[项目ID],\r\n\t\tp.[工时核定方式],\r\n\t\t[任务ID],\r\n\t\t[执行人],\r\n\t\t[工时日期],\r\n\t\t[时薪单价],\r\n\t\t[提成系数],\r\n\t\tROUND(SUM(CASE WHEN [工时类型] = '计划' THEN ISNULL([工时],0) ELSE 0 END),1) AS [计划工时],\r\n\t\tROUND(SUM(CASE WHEN [工时类型] = '实际' THEN ISNULL([工时],0) ELSE 0 END),1) AS [实际工时],\r\n\t\t(CASE p.[工时核定方式]\r\n\t\tWHEN '计划' THEN ROUND(SUM(CASE WHEN [工时类型] = '计划' THEN ISNULL([工时],0) ELSE 0 END),1)\r\n\t\tELSE ROUND(SUM(CASE WHEN [工时类型] = '实际' THEN ISNULL([工时],0) ELSE 0 END),1) \r\n\t\tEND) as 核定工时\r\n\tFROM \r\n\t\t[dbo].[任务工时表] t\r\n\tLEFT JOIN [项目表] p ON t.项目ID = p.ID\r\n\tGROUP BY \r\n\t\t[项目ID],\r\n\t\tp.[工时核定方式],\r\n\t\t[工时核定方式],\r\n\t\t[任务ID],\r\n\t\t[执行人],\r\n\t\t[工时日期],\r\n\t\t[时薪单价],\r\n\t\t[提成系数]\r\n)\r\n\r\nSELECT\r\n [工时日期] as 日期,\r\n\t\t[执行人],\r\n [项目ID],\r\n [任务ID],\r\n [工时核定方式],\r\n [时薪单价],\r\n [提成系数],\r\n [计划工时],\r\n [实际工时],\r\n [核定工时],\r\n ([核定工时] * [时薪单价] * [提成系数]) as 计算提成\r\nFROM c1;", "ViewInfo": { "ViewName": "View_任务工时统计", "IsUpdatable": true, diff --git a/Tables/工时/人员工时统计视图.json b/Tables/工时/人员工时统计视图.json index 1ec80a48..727d42db 100644 --- a/Tables/工时/人员工时统计视图.json +++ b/Tables/工时/人员工时统计视图.json @@ -28,6 +28,20 @@ "MaxLength": -1, "Name": "实际工时", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "float", + "MaxLength": -1, + "Name": "核定工时", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "float", + "MaxLength": -1, + "Name": "计算提成", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" } ], "ExternalDatabaseInfo": { @@ -35,7 +49,7 @@ "ConnectionId": "业务表", "SourceTableName": "人员工时统计视图", "SourceTableSchema": "dbo", - "CreateViewSql": "SELECT \r\n [执行人],\r\n cast([工时日期] as date) as 日期,\r\n SUM(CASE WHEN [工时类型] = '计划' THEN [工时] ELSE 0 END) AS [计划工时],\r\n SUM(CASE WHEN [工时类型] = '实际' THEN [工时] ELSE 0 END) AS [实际工时]\r\nFROM \r\n [dbo].[任务工时表]\r\nGROUP BY \r\n [执行人],\r\n [工时日期];", + "CreateViewSql": "SELECT\r\n[执行人],\r\nCAST([日期] as date) 日期,\r\n[计划工时],\r\n[实际工时],\r\n[核定工时],\r\n[计算提成]\r\nFROM [View_任务工时统计] t", "ViewInfo": { "ViewName": "人员工时统计视图", "IsUpdatable": true, diff --git a/Tables/汇报/汇报记录表.json b/Tables/汇报/汇报记录表.json index 201300cd..f371b06e 100644 --- a/Tables/汇报/汇报记录表.json +++ b/Tables/汇报/汇报记录表.json @@ -43,12 +43,12 @@ "BindingInfo": { "TableName": "汇报子表", "ColumnName": "ID", - "GUID": "45ddbd03-0fc1-41c6-af3a-e8921d6945bd" + "GUID": "a22dbff4-1213-4842-ad4b-d68ece0a25cc" }, "AggregateFunction": 1, "DataColumnName": "ID", "DetailTableName": "汇报子表", - "Name": "子表行数", + "Name": "汇报数量", "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { diff --git a/Theme/ListViewStyles b/Theme/ListViewStyles index 675bcdd6..5305641a 100644 --- a/Theme/ListViewStyles +++ b/Theme/ListViewStyles @@ -1 +1 @@ -[{"Name":"_RS_NewFashionListStyle2","Group":"_RS_RecommendStyle","ColumnHeaderBack":"Background 2 0","ColumnHeaderFore":"Text 1 50","EvenRowBack":"Background 1 0 0","EvenRowFore":"Text 1 15","OddRowBack":"Background 1 0 0","OddRowFore":"Text 1 15","SelectBack":"Background 2 0 51","ColumnHeaderHighlightBack":"Background 2 0","ColumnHeaderHighlightFore":"Text 1","ColumnHeaderHoverBack":"Background 2 0","ColumnHeaderSelectBack":"Background 2 0","ColumnHeaderSelectFore":"Text 1 15","TotalRowBack":"Background 1 0 0","TotalRowFore":"Text 1 15","SelectBorder":"Accent 2 0","DirtyCellColor":"Accent 2 40","GridLineColor":"Background 2 -10","ColumnHeaderGridLineColor":"Background 2 -10","RowHeaderGridLineColor":"Background 2 -10","ColumnFilterButtonStyle":1,"ColumnFilterIconColor":"Text 1 50","OutLineColor":"Background 2 -10","RowSelectBack":"Background 1 0","RowHoverBack":"Accent 2 80 102"}] \ No newline at end of file +[{"Name":"_RS_NewFashionListStyle2","Group":"_RS_RecommendStyle","ColumnHeaderBack":"Background 2 0","ColumnHeaderFore":"Text 1 50","EvenRowBack":"Background 1 0 0","EvenRowFore":"Text 1 15","OddRowBack":"Background 1 0 0","OddRowFore":"Text 1 15","SelectBack":"Background 2 0 51","ColumnHeaderHighlightBack":"Background 2 0","ColumnHeaderHighlightFore":"Text 1","ColumnHeaderHoverBack":"Background 2 0","ColumnHeaderSelectBack":"Background 2 0","ColumnHeaderSelectFore":"Text 1 15","TotalRowBack":"Background 1 0 0","TotalRowFore":"Text 1 15","SelectBorder":"Accent 2 0","DirtyCellColor":"Accent 2 40","GridLineColor":"Background 2 -10","ColumnHeaderGridLineColor":"Background 2 -10","RowHeaderGridLineColor":"Background 2 -10","ColumnFilterButtonStyle":1,"ColumnFilterIconColor":"Text 1 50","OutLineColor":"Background 2 -10","RowSelectBack":"Background 1 0","RowHoverBack":"Accent 2 80 102"},{"Name":"pms表格","Group":"自定义","ColumnHeaderBack":"Background 2 0","ColumnHeaderFore":"Text 1 50","EvenRowBack":"Background 1 0 0","EvenRowFore":"Text 1 15","OddRowBack":"Background 1 0 0","OddRowFore":"Text 1 15","SelectBack":"Background 2 0 51","ColumnHeaderHighlightBack":"Background 2 0","ColumnHeaderHighlightFore":"Text 1","ColumnHeaderHoverBack":"Background 2 0","ColumnHeaderSelectBack":"Background 2 0","ColumnHeaderSelectFore":"Text 1 15","TotalRowBack":"Background 1 0 0","TotalRowFore":"Text 1 15","SelectBorder":"Accent 2 0","DirtyCellColor":"Accent 2 40","GridLineColor":"Background 2 -10","ColumnHeaderGridLineColor":"Background 2 -10","RowHeaderGridLineColor":"Background 2 -10","ColumnFilterButtonStyle":1,"ColumnFilterIconColor":"Text 1 50","OutLineColor":"Background 2 -10","RowSelectFore":"black","RowHoverBack":"Accent 2 80 102"}] \ No newline at end of file diff --git a/favicon.ico b/favicon.ico index 7fdcace88996a6e6b04db073546c10d8d235cd2b..f34891246f0dd5fa68e1a1c2ef135b0947d966c1 100644 GIT binary patch literal 1150 zcma)*ze^)Q6vv;5C|nUzh=Ry%%&ii%IYNqHb0Ct!Li`IX<=QLk1o2J?qOiu~HX*i_ zg36gb7Pc7wOwm&N#)^q2svS$rMdYCBfe zSnDg4bT6B_B3QAv!q4_ijou4Z$uQ^XtQMkk4$*H8O&(tdZ<3$SUt&WHj|{jwi~k}0 zE!OWmEwR(6SSm9aRi-QE@ZR?q-ul3|$$(f_oUw>@-Z1_DSm{w=$}uk-?J`GPg3p6{ z|NV`s>M+bX_{>N-&Z;w%<XJY&EP$zYzy!3YafMHN;nMtYCQn literal 29877 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%0DpL-BS0GVM2Ttu0?xp7 z+xMgn|63T&&0!UB2<*_F)%SKdv$-Vtx4Qq;{v+G`C;a%G3IUG+wv{+`E5z>t5OA*W zxBBy%w`3lvdxFt@* z*~{PRj{AUDzma)lAN>lGw7l@I_{cIiyV|Zk>s<HoX_`_uBC^h;yzg?9A`SBO;L z1e}ZRk^a2qEt!X9lW|_SC*?iSAI?>i`X7Qw3r_UZ7v!ZEnb#BjNLpUFC%R)AI5SS_ z?++3DJ?^nj$V)Dn_g~Zh!!}ZXysq>EC#s@Udo+LkbbkMizb9kB$nYWc-w%;goTy2d z(j)zQQvW|qgZ--Zuo>_j9EWotJ<|VA`|nTrao^x?ZF`sjcpr{4G7k4he{!z#!aeDC zUVLO;Px!Gf4)-qF)h84ng4al3eI)b$3H@uH8enyC_}p&4VW0Oq&VaqV-?oA5D_*!K z{l|-s%4MP8LT-J%KzIo z^rWBu2^zQ?h1JBN0D!Z$2ytwOeg+`w->v(l{(stkf1RHKzWH0MA`aWgz9%u{nd1Ux zQz^3|T&&wRkaLw6?n$5X;v@5Z#gEtM+e02;j_*k7k1^!OVH&u5_J2$NJHiC)@nh9+ z=ynYY%Eke};$SNi&oy5CLG~3d%!|Hj9xpyJuPZH?Zp^!c^~M3O<#Ogdci)q7DBpt# z@g4>C)yO(X{MY9%dvE4H<%c_oSREW{0N@YI{yG2+1>gn%Yt8?k*sCD>;&&MCUt%@z zdPy6=j9+WsQ3|wpzlgQx0(U40xcm9jIQ&lbpO&+pSJ>|XJ#g6Ep)gsZKrPrxJ{GZ!DG!M|!65&s0!>I6wreB3Q$&PuT=*_~-UA@R~Q?>uC>o?+5;{ z@t*~#1KUT~PhbVOi%Y=W;JO1e{Czbz4FO z2sl&UzIXi!bCdmzmWeED83dL*dN80|M@V zv)0{!hFf3Eg4dDp=Jk|+UTfYGK=vR2JSGnS@HggH0qc(qU~I2r-;bvq!&}mSCl_>* z1;9QXw#nxM%mKiLFFrfb`|s9*a~PC7s7c;4$!))PLWe`0aGnVMv3`IIPK|bdUndur zbKTd8!)bhm31fVQi5r6@!%CAD4T&+$KM~0Kx#ZHZ95Rj1QQhxK0RI z2l8p{Bp>qm0q}eVfBFqk5hlv{<}zDqJJ$bO8@e5b?&zwbMsn*w?iA=Mp=z~My~`F=PP+XbY|PMF8Ib}ENHVx@ma2mOZo7t4acItvF_5PbiACaY515V z!yV@}{yoj(u7`}*CSlW)6++>cwZ8hxGnl-_n#Z_S^pFm(<+g{DfU$oB`()F)Z~q^@ z|H*cf815~%i)ZaqAH<1Y?Guq>Oych53RzC#?&!GIi%mha4weu1qPuVZZ{F)scq;!;ODO zhy8fCV@`g5bhzY;fcQeJ1F!u~ay&`g-MEtFB<@NFcjU1M9Bz@aNep>QSS76tCfv>M zG#7d@uDBn5MaMe-%o0E}0OEOL1oBT|68w$+)%%#c&wCQb>ssx0DDL|OWShHUDC5|G z%;rkw-?4YjK9>atgV}-JRc6;Tkl{6yTP$+$B^Vh;32f8%q@CO}*yhCdGTK8MV3)44 zx=RBsekR=jFduyXYM2da9;`JcZW%wtVI8U_-k4y`vkpH9e_zbHll7~7;8O=+ud_k~ z2fT&^f9C<-mpS-BzBvZa|5q}4QU-PC0^qsHdPV{ND!hk6 z4**(E>i$n?piVq4ng9y`90BmR1It&w`S8tzy-5Z4UW zO-u3pO7fZS#LxOZv;Fc;`A`S+MFsHc0c>r|Jle#IpUG^4_O!9yab5YFzu&{}54>LK z)R=vukvD%U@VD~hZz*|*`R8G1`4Pigf3800D!;8RrxJL_0}O!qQcu2%yVCK}3){3X zX63-kng=lFT-xd~8Q8|a`jR@6ycl!x@!oPnejV^yk#hjz`1vQ`E_w^g*5T5dyAJ%_ zhkNRcFbBg)UJ?VlDCEbs)n?T4Iu`?X-m#6+4D0nNKr2Aeh-E z6|I%Ym9Sn^3pP*z@b&0@4|Lf6gH9rh0Sp0#0`QdC2y3Icu>OnhqtY?_;%$V>Fb$@y I0v^o!KPShMSpWb4